print/hplip(-plugin): Update to 3.23.5

5 files changed, 46 insertions, 22 deletions

diff --git a/print/hplip-plugin/Makefile b/print/hplip-plugin/Makefile
index ea8fed276481..4a0abc219fcc 100644
--- a/print/hplip-plugin/Makefile
+++ b/print/hplip-plugin/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	hplip-plugin
-PORTVERSION=	3.22.10
-PORTREVISION=	1
+PORTVERSION=	3.23.5
 CATEGORIES=	print
 MASTER_SITES=	https://developers.hp.com/sites/default/files/
 DISTNAME=	hplip-${DISTVERSION}-plugin
@@ -16,7 +15,7 @@ LICENSE_NAME=	HPLIP Driver Plug-in License
 LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_PERMS=	none
 
-ONLY_FOR_ARCHS=	amd64 i386 # arm
+ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 RUN_DEPENDS=	hp-plugin:print/hplip
 
@@ -34,10 +33,12 @@ PLIST_SUB+=	LINARCH="${LINARCH}"
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == "i386"
-LINARCH=	x86_32
+.if ${ARCH} == "aarch64"
+LINARCH=	arm64
 .elif ${ARCH} == "amd64"
 LINARCH=	x86_64
+.elif ${ARCH} == "i386"
+LINARCH=	x86_32
 .endif
 
 do-extract:
diff --git a/print/hplip-plugin/distinfo b/print/hplip-plugin/distinfo
index 02924b2da5d0..dd0688a62ecd 100644
--- a/print/hplip-plugin/distinfo
+++ b/print/hplip-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669273786
-SHA256 (hplip-3.22.10-plugin.run) = bb9648ea0626a9b3cfa29e260348d5d617f328c55b66eda346384c04f4740b1f
-SIZE (hplip-3.22.10-plugin.run) = 11494258
+TIMESTAMP = 1686413082
+SHA256 (hplip-3.23.5-plugin.run) = fa3ebf6b4258b960590698aba3b96aa9421f10b3618cd8fb2eac6035756a268d
+SIZE (hplip-3.23.5-plugin.run) = 11491464
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 004d02a9ae6a..614f9ce3aefe 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	hplip
-PORTVERSION=	3.22.10
-PORTREVISION=	2
+PORTVERSION=	3.23.5
 CATEGORIES=	print
 MASTER_SITES=	SF
 
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index a5c42fb83b51..8cbb422f109e 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669268108
-SHA256 (hplip-3.22.10.tar.gz) = 533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624
-SIZE (hplip-3.22.10.tar.gz) = 29333247
+TIMESTAMP = 1686411529
+SHA256 (hplip-3.23.5.tar.gz) = f68e5ed749b122fc3654a69c4206e840a53b68d981e55e023fb4d3fb8995cbc8
+SIZE (hplip-3.23.5.tar.gz) = 30111293
diff --git a/print/hplip/pkg-plist b/print/hplip/pkg-plist
index 0f57ba7a034e..73f75c7797a9 100644
--- a/print/hplip/pkg-plist
+++ b/print/hplip/pkg-plist
@@ -99,6 +99,7 @@ share/cups/drv/hpcups.drv
 %%PORTDOCS%%%%DOCSDIR%%/troubleshooting.html
 %%DATADIR%%/__init__.py
 %%DATADIR%%/align.py
+%%DATADIR%%/base/CdmWifi.py
 %%DATADIR%%/base/LedmWifi.py
 %%DATADIR%%/base/__init__.py
 %%DATADIR%%/base/avahi.py
@@ -719,8 +720,11 @@ share/ppd/HP/hp-color_laserjet_5500-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_5500-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_5550-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_5550-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_5700-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_5m-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_5m-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_6700-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_6701-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_8500-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_8500-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_8550-pcl3.ppd.gz
@@ -729,6 +733,7 @@ share/ppd/HP/hp-color_laserjet_9500-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_9500-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_9500_mfp-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_E65150_E65160-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_X557-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_cm1015-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_cm1017-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz
@@ -798,6 +803,10 @@ share/ppd/HP/hp-color_laserjet_e67550_e67560-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_e67650_e67660-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_e75245-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_e85055-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_flow_5800-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_flow_6800-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_flow_X579-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_flow_X57945-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_flow_e57540-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz
@@ -831,6 +840,9 @@ share/ppd/HP/hp-color_laserjet_m750-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_m751-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_m855-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_m856-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_5800-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_6800-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_6801-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_e47528-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_e57540-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_e77422-ps.ppd.gz
@@ -838,15 +850,6 @@ share/ppd/HP/hp-color_laserjet_mfp_e77428-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_e78223-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_e78228-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_e78323-25-30-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_mfp_m274-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_mfp_m480-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_mfp_m577-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_mfp_m578-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_mfp_m680-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_mfp_m776-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_e785-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_e78523-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_e78528-ps.ppd.gz
@@ -859,10 +862,24 @@ share/ppd/HP/hp-color_laserjet_mfp_e87740-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_e87750-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_e87760-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_e87770-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_m274-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_m480-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_m577-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_m578-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_m680-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_m776-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_x677-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_x67755-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_x67765-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_pro_4201-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_pro_m252-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_pro_m453-4-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_pro_m478f-9f-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_pro_m479-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_pro_mfp_4301-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_pro_mfp_m176n.ppd.gz
 share/ppd/HP/hp-color_laserjet_pro_mfp_m177fw.ppd.gz
 share/ppd/HP/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz
@@ -870,6 +887,9 @@ share/ppd/HP/hp-color_laserjet_pro_mfp_m377-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_x654-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_x65455-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_x65465-ps.ppd.gz
 share/ppd/HP/hp-cp1160.ppd.gz
 share/ppd/HP/hp-designjet_4000ps.ppd.gz
 share/ppd/HP/hp-designjet_4020ps-ps.ppd.gz
@@ -1930,10 +1950,14 @@ share/ppd/HP/hp-psc_920.ppd.gz
 share/ppd/HP/hp-psc_950.ppd.gz
 share/ppd/HP/hp-psc_950vr.ppd.gz
 share/ppd/HP/hp-psc_950xi.ppd.gz
+share/ppd/HP/hp-smart_tank_210-220_series.ppd.gz
 share/ppd/HP/hp-smart_tank_350_series.ppd.gz
 share/ppd/HP/hp-smart_tank_500_series.ppd.gz
+share/ppd/HP/hp-smart_tank_5100_series.ppd.gz
 share/ppd/HP/hp-smart_tank_510_series.ppd.gz
+share/ppd/HP/hp-smart_tank_520_540_series.ppd.gz
 share/ppd/HP/hp-smart_tank_530_series.ppd.gz
+share/ppd/HP/hp-smart_tank_580-590_series.ppd.gz
 share/ppd/HP/hp-smart_tank_6000_series.ppd.gz
 share/ppd/HP/hp-smart_tank_610_series.ppd.gz
 share/ppd/HP/hp-smart_tank_660-670_series.ppd.gz