diff --git a/print/epson-inkjet-printer-escpr2/Makefile b/print/epson-inkjet-printer-escpr2/Makefile
index 3a882dbf3281..23833d63005a 100644
--- a/print/epson-inkjet-printer-escpr2/Makefile
+++ b/print/epson-inkjet-printer-escpr2/Makefile
@@ -1,13 +1,13 @@
 PORTNAME=	epson-inkjet-printer-escpr2
-DISTVERSION=	1.1.49
+DISTVERSION=	1.1.58
 DISTVERSIONSUFFIX=	-1lsb3.2
 CATEGORIES=	print
-MASTER_SITES=	https://download3.ebz.epson.net/dsc/f/03/00/13/76/47/7dc899751d52b18d92a0b90bb1348ad3daf32851/:i386 \
-		https://download3.ebz.epson.net/dsc/f/03/00/13/76/47/1e4896743ee2c0ee9e2b4c1d00783d113c4f119d/:amd64 \
-		https://download3.ebz.epson.net/dsc/f/03/00/13/76/47/16f624dc1dfad10c3b4eb141c50c651a6360f69a/:SOURCE
+MASTER_SITES=	https://download3.ebz.epson.net/dsc/f/03/00/14/17/01/e3cfb031cc65faf4c3054594c7151fadd1ff864a/:i386 \
+		https://download3.ebz.epson.net/dsc/f/03/00/14/17/01/9194a525b962128d97cd35b9acbcec8c05782b93/:amd64 \
+		https://download3.ebz.epson.net/dsc/f/03/00/14/17/01/df74203a1461cde6311a0b90e2930f6fcb3842eb/:SOURCE
 EXTRACT_SUFX=	.rpm
 DISTFILES_amd64=	${DISTNAME}.x86_64${EXTRACT_SUFX}:amd64 \
-		${_SRC_DISTFILES}
+			${_SRC_DISTFILES}
 DISTFILES_i386=	${DISTNAME}.i486${EXTRACT_SUFX}:i386 \
 		${_SRC_DISTFILES}
 
@@ -20,15 +20,15 @@ LICENSE_COMB=	multi
 LICENSE_NAME_EPSON=	SEIKO EPSON CORPORATION SOFTWARE LICENSE AGREEMENT
 LICENSE_FILE_EPSON=	${WRKSRC}/${PKGNAME}/COPYING.EPSON
 LICENSE_FILE_LGPL21=	${WRKSRC}/${PKGNAME}/COPYING.LIB
-LICENSE_PERMS_EPSON=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
+LICENSE_PERMS_EPSON=		no-dist-mirror no-dist-sell no-pkg-mirror \
+				no-pkg-sell
 LICENSE_DISTFILES_EPSON=	${DISTNAME}.i486${EXTRACT_SUFX} \
 				${DISTNAME}.x86_64${EXTRACT_SUFX} \
 				${DISTNAME}.src${EXTRACT_SUFX}
 
 LEGAL_TEXT=	License does not permit public sharing and revenue earning, and restricts exports
 ONLY_FOR_ARCHS=	amd64 i386
-ONLY_FOR_ARCHS_REASON=	${PORTNAME} for ARM is available.\
-			But binaries that can be used on aarch64 need to be built.
+ONLY_FOR_ARCHS_REASON=	${PORTNAME} for ARM is available. But binaries that can be used on aarch64 need to be built.
 
 RUN_DEPENDS=	${LOCALBASE}/libexec/cups/filter/gstoraster:print/cups-filters \
 		cupsfilter:print/cups
@@ -46,11 +46,11 @@ PLIST_SUB=	LINUXBASE=${LINUXBASE}
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64
-PLIST_SUB+=	ARCH_AMD64=""
-PLIST_SUB+=	ARCH_I386="@comment "
+PLIST_SUB+=	ARCH_AMD64="" \
+		ARCH_I386="@comment "
 .elif ${ARCH} == i386
-PLIST_SUB+=	ARCH_AMD64="@comment "
-PLIST_SUB+=	ARCH_I386=""
+PLIST_SUB+=	ARCH_AMD64="@comment " \
+		ARCH_I386=""
 .endif
 
 post-extract:
diff --git a/print/epson-inkjet-printer-escpr2/distinfo b/print/epson-inkjet-printer-escpr2/distinfo
index cfd124ebe3b9..d199b107f14b 100644
--- a/print/epson-inkjet-printer-escpr2/distinfo
+++ b/print/epson-inkjet-printer-escpr2/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1659668400
-SHA256 (epson-inkjet-printer-escpr2-1.1.49-1lsb3.2.i486.rpm) = b6b055e53dd494d20807126c2277f2d49ab8d2cb62ba2eab015450f9430fb34b
-SIZE (epson-inkjet-printer-escpr2-1.1.49-1lsb3.2.i486.rpm) = 3387143
-SHA256 (epson-inkjet-printer-escpr2-1.1.49-1lsb3.2.src.rpm) = 58a0cea52ed82fb27f21a3507138dca325cd5c918eb847b1a29761605b9b7f9d
-SIZE (epson-inkjet-printer-escpr2-1.1.49-1lsb3.2.src.rpm) = 4201450
-SHA256 (epson-inkjet-printer-escpr2-1.1.49-1lsb3.2.x86_64.rpm) = 9e1f6916510ec1a267ab311de7430080537d8d8db16d0f4c3ede353e0034b36f
-SIZE (epson-inkjet-printer-escpr2-1.1.49-1lsb3.2.x86_64.rpm) = 3386722
+TIMESTAMP = 1671678000
+SHA256 (epson-inkjet-printer-escpr2-1.1.58-1lsb3.2.i486.rpm) = 3591a28373475c933c98ee81187e587e3be08d18614b54e6f27a3352a3445b05
+SIZE (epson-inkjet-printer-escpr2-1.1.58-1lsb3.2.i486.rpm) = 3664807
+SHA256 (epson-inkjet-printer-escpr2-1.1.58-1lsb3.2.src.rpm) = df2eb5959ecbf0adb5ba4ae08e60deffdbf1aa364910b82bc3095e90d7efbbd8
+SIZE (epson-inkjet-printer-escpr2-1.1.58-1lsb3.2.src.rpm) = 4521656
+SHA256 (epson-inkjet-printer-escpr2-1.1.58-1lsb3.2.x86_64.rpm) = a81f686b7a6342f4c7fb11629ec5f6f1e6045af8eaf7cd298535758d7582e65d
+SIZE (epson-inkjet-printer-escpr2-1.1.58-1lsb3.2.x86_64.rpm) = 3664212
diff --git a/print/epson-inkjet-printer-escpr2/pkg-descr b/print/epson-inkjet-printer-escpr2/pkg-descr
index b3392be2a89c..9c64c7fccbe4 100644
--- a/print/epson-inkjet-printer-escpr2/pkg-descr
+++ b/print/epson-inkjet-printer-escpr2/pkg-descr
@@ -5,5 +5,6 @@ with Seiko Epson Color Ink Jet Printers.
 This product supports only EPSON ESC/P-R printers. This package can be
 used for all EPSON ESC/P-R printers.
 
-For detail list of supported printer, please refer to below site:
-http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
+For detail list of supported printer, please refer to WWW site
+provided by the following command:
+pkg rquery %w epson-inkjet-printer-escpr2
diff --git a/print/epson-inkjet-printer-escpr2/pkg-plist b/print/epson-inkjet-printer-escpr2/pkg-plist
index 6707a81d4129..66de7e011ba9 100644
--- a/print/epson-inkjet-printer-escpr2/pkg-plist
+++ b/print/epson-inkjet-printer-escpr2/pkg-plist
@@ -22,12 +22,15 @@
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-EP-882A_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-EP-883A_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-EP-884A_Series-epson-inkjet-printer-escpr2.ppd.gz
+%%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-EP-885A_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-EP-982A3_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-ET-15000_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-ET-16150_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-ET-16600_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-ET-16650_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-ET-16680_Series-epson-inkjet-printer-escpr2.ppd.gz
+%%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-ET-2830_Series-epson-inkjet-printer-escpr2.ppd.gz
+%%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-ET-2840_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-ET-3700_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-ET-3710_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-ET-3750_Series-epson-inkjet-printer-escpr2.ppd.gz
@@ -73,6 +76,9 @@
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-L15150_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-L15160_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-L15180_Series-epson-inkjet-printer-escpr2.ppd.gz
+%%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-L3550_Series-epson-inkjet-printer-escpr2.ppd.gz
+%%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-L3560_Series-epson-inkjet-printer-escpr2.ppd.gz
+%%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-L5590_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-L6160_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-L6170_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-L6190_Series-epson-inkjet-printer-escpr2.ppd.gz
@@ -84,6 +90,7 @@
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-L6550_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-L6570_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-L6580_Series-epson-inkjet-printer-escpr2.ppd.gz
+%%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-L8050_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-L8160_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-L8180_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-M1140_Series-epson-inkjet-printer-escpr2.ppd.gz
@@ -121,6 +128,7 @@
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-PX-M884F-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-PX-M885F-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-PX-M886FL-epson-inkjet-printer-escpr2.ppd.gz
+%%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-PX-M887F-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-PX-S270T_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-PX-S380-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-PX-S381L-epson-inkjet-printer-escpr2.ppd.gz
@@ -132,9 +140,11 @@
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-PX-S7090X-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-PX-S7110-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-PX-S7110P-epson-inkjet-printer-escpr2.ppd.gz
+%%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-PX-S730_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-PX-S880X-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-PX-S884-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-PX-S885-epson-inkjet-printer-escpr2.ppd.gz
+%%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-PX-S887-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-ST-3000_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-ST-4000_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-ST-C4100_Series-epson-inkjet-printer-escpr2.ppd.gz
@@ -160,6 +170,7 @@
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-7820_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-7830_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-7840_Series-epson-inkjet-printer-escpr2.ppd.gz
+%%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C4310_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C4810_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C5210_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C5290BA-epson-inkjet-printer-escpr2.ppd.gz
@@ -168,6 +179,9 @@
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C529RB-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C529RBAM-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C529R_Series-epson-inkjet-printer-escpr2.ppd.gz
+%%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C5310_Series-epson-inkjet-printer-escpr2.ppd.gz
+%%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C5390BAM-epson-inkjet-printer-escpr2.ppd.gz
+%%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C5390_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C5710_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C5790BA-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C5790BAM-epson-inkjet-printer-escpr2.ppd.gz
@@ -175,6 +189,9 @@
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C579RB-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C579RBAM-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C579R_Series-epson-inkjet-printer-escpr2.ppd.gz
+%%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C5810_Series-epson-inkjet-printer-escpr2.ppd.gz
+%%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C5890BAM-epson-inkjet-printer-escpr2.ppd.gz
+%%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C5890_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C8190B-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C8190_Series-epson-inkjet-printer-escpr2.ppd.gz
 %%LINUXBASE%%/opt/epson-inkjet-printer-escpr2/ppds/Epson/Epson-WF-C8610_Series-epson-inkjet-printer-escpr2.ppd.gz