9 files changed, 126 insertions, 148 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 681b50b30292..99bf5a5cca88 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	hplip
-# Date created:		1 April 2006
-# Whom:			amistry@am-productions.biz
-#
+# Created by: amistry@am-productions.biz
 # $FreeBSD$
-#
 
 PORTNAME=	hplip
-PORTVERSION=	3.12.2
-PORTREVISION=	2
+PORTVERSION=	3.12.11
 CATEGORIES=	print
 MASTER_SITES=	SF
 
@@ -41,7 +36,8 @@ CONFIGURE_ARGS=	--enable-foomatic-ppd-install \
 		--with-hpppddir=${PREFIX}/share/ppd/HP \
 		--with-mimedir=${PREFIX}/etc/cups \
 		--with-docdir=${DOCSDIR} \
-		--with-drvdir=${PREFIX}/libexec/cups/driver
+		--with-drvdir=${PREFIX}/libexec/cups/driver \
+		--enable-libusb01_build
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
@@ -155,6 +151,11 @@ post-patch:
 		${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e '/[[:space:]]install-dist_rulesDATA/ s,install-dist_rulesDATA,,' \
 		-e '/[[:space:]]install-hplip_confDATA/ s,install-hplip_confDATA,,' \
+		-e '/[[:space:]]install-dist_hplip_LogDATA/ s,install-dist_hplip_LogDATA,,' \
+		-e '/[[:space:]]install-dist_cronDATA/ s,install-dist_cronDATA,,' \
+		-e '/[[:space:]]install-dist_halpreDATA/ s,install-dist_halpreDATA,,' \
+		-e '/[[:space:]]install-dist_hplip_stateDATA/ s,install-dist_hplip_stateDATA,,' \
+		-e '/[[:space:]]install-dist_hplip_tmpDATA/ s,install-dist_hplip_tmpDATA,,' \
 		${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e 's,/etc/hp,${PREFIX}&,g' \
 		-e 's,/etc/cups,${LOCALBASE}&,g' \
@@ -171,7 +172,9 @@ post-patch:
 .endif
 
 post-install:
+.if ${PORT_OPTIONS:MQT}
 	${INSTALL_DATA} ${WRKSRC}/hplip-systray.desktop ${PREFIX}/etc/xdg/autostart/hplip-systray.desktop
+.endif
 	${MKDIR} ${PREFIX}/etc/hp
 	${INSTALL_DATA} ${WRKSRC}/hplip.conf ${PREFIX}/etc/hp/hplip.conf.sample
 	if [ ! -f ${PREFIX}/etc/hp/hplip.conf ]; then \
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index 3144490e2116..ef9fd8dce4fd 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hplip-3.12.2.tar.gz) = 6eaa0cc6f255cc3ebeddb73dee208e6bdc22ba467e3b1da943844ae266d3c314
-SIZE (hplip-3.12.2.tar.gz) = 20579749
+SHA256 (hplip-3.12.11.tar.gz) = c5b81167b21aa4ee6bdf3f5c120bfa050d0c794608da8bcc32e2580234919ffa
+SIZE (hplip-3.12.11.tar.gz) = 21932088
diff --git a/print/hplip/files/patch-Makefile.in b/print/hplip/files/patch-Makefile.in
index aa4eb9dc287c..a458a6223d7d 100644
--- a/print/hplip/files/patch-Makefile.in
+++ b/print/hplip/files/patch-Makefile.in
@@ -1,49 +1,6 @@
---- ./Makefile.in.orig	2011-12-09 11:23:55.000000000 +0000
-+++ ./Makefile.in	2012-01-14 20:21:23.105509188 +0000
-@@ -90,8 +90,8 @@
- # ip library
- @HPLIP_BUILD_TRUE@am__append_1 = libhpmud.la libhpip.la
- @HPLIP_BUILD_TRUE@hp_mkuri_PROGRAMS = hp-mkuri$(EXEEXT)
--@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@am__append_2 = data/rules/40-hplip.rules
--@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@am__append_3 = data/rules/55-hpmud.rules
-+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@am__append_2 = data/rules/40-hplip.rules
-+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@am__append_3 = data/rules/55-hpmud.rules
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_4 =  \
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	scan/sane/hpaio.desc \
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	prnt/drv/hpijs.drv.in.template \
-@@ -2214,9 +2214,9 @@
- 	ppd/hpcups/hp-psc_950vr.ppd.gz ppd/hpcups/hp-psc_950xi.ppd.gz
- am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \
- 	prnt/pcl.py prnt/colorcal.py
--am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \
--	data/rules/86-hpmud_plugin.rules data/rules/40-hplip.rules \
--	data/rules/55-hpmud.rules
-+#am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \
-+#	data/rules/86-hpmud_plugin.rules data/rules/40-hplip.rules \
-+#	data/rules/55-hpmud.rules
- am__dist_scan_DATA_DIST = scan/__init__.py scan/sane.py
- am__dist_ui_DATA_DIST = ui/alignform.py ui/colorcalform_base.py \
- 	ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py \
-@@ -4106,12 +4106,12 @@
- @HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
- 
- # hpmud.rules
--@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
--@HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \
--@HPLIP_BUILD_TRUE@	data/rules/86-hpmud_plugin.rules \
--@HPLIP_BUILD_TRUE@	$(am__append_2) $(am__append_3)
--@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor
--@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi
-+#@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
-+#@HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \
-+#@HPLIP_BUILD_TRUE@	data/rules/86-hpmud_plugin.rules \
-+#@HPLIP_BUILD_TRUE@	$(am__append_2) $(am__append_3)
-+#@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor
-+#@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi
- 
- # hplip.conf
- @HPLIP_BUILD_TRUE@hplip_confdir = /etc/hp
-@@ -4169,14 +4169,14 @@
+--- ./Makefile.in.orig	2012-09-04 12:35:24.000000000 +0000
++++ ./Makefile.in	2012-09-12 15:40:02.278587826 +0000
+@@ -4374,14 +4346,14 @@
  
  # data
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@modelsdir = $(hplipdir)/data/models
@@ -66,22 +23,3 @@
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@pcldir = $(hplipdir)/data/pcl
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ldldir = $(hplipdir)/data/ldl
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@postscriptdir = $(hplipdir)/data/ps
-@@ -8581,12 +8581,12 @@
- 
- 
- install-dist_hplip_LogDATA:
--@FULL_BUILD_TRUE@	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
--@FULL_BUILD_TRUE@	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
--@FULL_BUILD_TRUE@	chmod 774 $(DESTDIR)$(hplip_Logdir)
--@HPLIP_BUILD_TRUE@	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
--@HPLIP_BUILD_TRUE@	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
--@HPLIP_BUILD_TRUE@	chmod 774 $(DESTDIR)$(hplip_Logdir)
-+#@FULL_BUILD_TRUE@	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
-+#@FULL_BUILD_TRUE@	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
-+#@FULL_BUILD_TRUE@	chmod 774 $(DESTDIR)$(hplip_Logdir)
-+#@HPLIP_BUILD_TRUE@	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
-+#@HPLIP_BUILD_TRUE@	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
-+#@HPLIP_BUILD_TRUE@	chmod 774 $(DESTDIR)$(hplip_Logdir)
- 
- install-data-hook:
- #	   If scanner build, add hpaio entry to sane dll.conf.
diff --git a/print/hplip/files/patch-base__utils.py b/print/hplip/files/patch-base__utils.py
deleted file mode 100644
index 81793d5bfa1b..000000000000
--- a/print/hplip/files/patch-base__utils.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./base/utils.py.orig	2011-05-14 22:26:06.000000000 +0400
-+++ ./base/utils.py	2011-07-04 11:57:33.000000000 +0400
-@@ -840,8 +840,8 @@
-     return True
- 
- 
--BROWSERS = ['firefox', 'mozilla', 'konqueror', 'galeon', 'skipstone'] # in preferred order
--BROWSER_OPTS = {'firefox': '-new-window', 'mozilla' : '', 'konqueror': '', 'galeon': '-w', 'skipstone': ''}
-+BROWSERS = ['xdg-open', 'firefox', 'mozilla', 'konqueror', 'galeon', 'skipstone'] # in preferred order
-+BROWSER_OPTS = {'xdg-open': '','firefox': '-new-window', 'mozilla' : '', 'konqueror': '', 'galeon': '-w', 'skipstone': ''}
- 
- 
- def find_browser():
diff --git a/print/hplip/files/patch-core_install.py b/print/hplip/files/patch-core_install.py
deleted file mode 100644
index ff1f03610561..000000000000
--- a/print/hplip/files/patch-core_install.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./installer/core_install.py.orig	2010-08-26 02:29:22.000000000 +0400
-+++ ./installer/core_install.py	2010-08-26 02:30:22.429959790 +0400
-@@ -833,7 +833,7 @@
-         if not check_lib('libusb'):
-             return False
- 
--        return len(locate_file_contains("usb.h", '/usr/include', 'usb_init(void)'))
-+        return len(locate_file_contains("usb.h", '%USB_INCLUDE%', 'usb_init(void)'))
- 
- 
-     def check_libjpeg(self):
diff --git a/print/hplip/files/patch-installer__core_install.py b/print/hplip/files/patch-installer__core_install.py
new file mode 100644
index 000000000000..a35c8eb3ed0a
--- /dev/null
+++ b/print/hplip/files/patch-installer__core_install.py
@@ -0,0 +1,11 @@
+--- ./installer/core_install.py.orig	2012-09-04 12:31:53.000000000 +0000
++++ ./installer/core_install.py	2012-09-12 15:01:59.259583493 +0000
+@@ -885,7 +885,7 @@
+             if not check_lib('libusb'):
+                 return False
+             if self.distro_name != "rhel":
+-                return len(locate_file_contains("usb.h", '/usr/include', 'usb_init'))
++                return len(locate_file_contains("usb.h", '%USB_INCLUDE%', 'usb_init'))
+             else:
+                 return True
+         else:
diff --git a/print/hplip/files/patch-io-hpmud-musb.c b/print/hplip/files/patch-io-hpmud-musb.c
index 8d87a88df271..bad60e64460d 100644
--- a/print/hplip/files/patch-io-hpmud-musb.c
+++ b/print/hplip/files/patch-io-hpmud-musb.c
@@ -1,21 +1,22 @@
-Index: io/hpmud/musb.c
-@@ -122,10 +122,16 @@
-    {
-       ret = usb_control_msg(dev, USB_ENDPOINT_IN, USB_REQ_GET_DESCRIPTOR, (USB_DT_STRING << 8) + index, 
-                0x409, tbuf, sizeof(tbuf), LIBUSB_CONTROL_REQ_TIMEOUT);
--      if (ret==0)
-+      if (ret==0
+--- ./io/hpmud/musb.c.orig	2012-11-20 09:55:09.000000000 +0000
++++ ./io/hpmud/musb.c	2012-12-07 21:32:31.615696389 +0000
+@@ -135,10 +135,16 @@
+ 				0x409,
+ 				tbuf, sizeof(tbuf), LIBUSB_CONTROL_REQ_TIMEOUT);
+ 
+-		if (ret==0)
++		if (ret==0
 +#ifdef __FreeBSD__
-+       || ret == -EIO
++			|| ret == -EIO
 +#endif
-+       )
-       {
--         /* This retry is necessary for lj1000 and lj1005. des 12/12/07 */
--         BUG("get_string_descriptor zero result, retrying...");
-+         /* This retry is necessary for lj1000 and lj1005. des 12/12/07
-+         Also HP Photosmart 42xx seems to suffer transient errors with serial id */
-+         BUG("get_string_descriptor error result %d, retrying in 2 secs...", ret);
-+         sleep(2);
-          continue;
-       }
-       break;
++		)
+ 		{
+-			/* This retry is necessary for lj1000 and lj1005. des 12/12/07 */
+-			BUG("get_string_descriptor zero result, retrying...");
++			/* This retry is necessary for lj1000 and lj1005. des 12/12/07
++			Also HP Photosmart 42xx seems to suffer transient errors with serial id */
++			BUG("get_string_descriptor error result %d, retrying in 2 secs...", ret);
++			sleep(2);
+ 			continue;
+ 		}
+ 		break;
diff --git a/print/hplip/files/patch-prnt__hpcups__HPCupsFilter.cpp b/print/hplip/files/patch-prnt__hpcups__HPCupsFilter.cpp
deleted file mode 100644
index 227e069a2db6..000000000000
--- a/print/hplip/files/patch-prnt__hpcups__HPCupsFilter.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./prnt/hpcups/HPCupsFilter.cpp.orig	2010-08-25 11:15:08.000000000 +0400
-+++ ./prnt/hpcups/HPCupsFilter.cpp	2010-08-25 11:35:36.000000000 +0400
-@@ -433,13 +433,14 @@
- 
-     memset(&m_JA, 0, sizeof(JobAttributes));
-     struct    tm       *t;
--    struct    timeb    tb;
-+    struct    timeval    tv;
-+    struct    timezone   tz;
-     time_t             long_time;
-     time(&long_time);
-     t = localtime(&long_time);
--    ftime(&tb);
-+    gettimeofday(&tv, &tz);
-     strncpy(m_JA.job_start_time, asctime(t), sizeof(m_JA.job_start_time)-1);    // returns Fri Jun  5 08:12:16 2009
--    snprintf(m_JA.job_start_time+19, sizeof(m_JA.job_start_time) - 20, ":%d %d", tb.millitm, t->tm_year + 1900); // add milliseconds
-+    snprintf(m_JA.job_start_time+19, sizeof(m_JA.job_start_time) - 20, ":%d %d", tv.tv_usec/1000, t->tm_year + 1900); // add milliseconds
- 
-     getLogLevel();
-     m_JA.job_id = atoi(argv[1]);
diff --git a/print/hplip/pkg-plist b/print/hplip/pkg-plist
index 23f85cd8b228..dd0ee3408def 100644
--- a/print/hplip/pkg-plist
+++ b/print/hplip/pkg-plist
@@ -3,14 +3,17 @@ bin/hp-check
 bin/hp-check-plugin
 bin/hp-clean
 bin/hp-colorcal
+bin/hp-config_usb_printer
 bin/hp-devicesettings
 bin/hp-diagnose_plugin
+bin/hp-diagnose_queues
 bin/hp-fab
 bin/hp-faxsetup
 bin/hp-firmware
 bin/hp-info
 bin/hp-levels
 bin/hp-linefeedcal
+bin/hp-logcapture
 bin/hp-makecopies
 bin/hp-makeuri
 bin/hp-mkuri
@@ -28,7 +31,9 @@ bin/hp-systray
 bin/hp-testpage
 bin/hp-timedate
 %%GUI%%bin/hp-toolbox
+bin/hp-uninstall
 bin/hp-unload
+bin/hp-upgrade
 bin/hp-wificonfig
 bin/hpijs
 %%FAX%%etc/cups/pstotiff.convs
@@ -36,7 +41,7 @@ bin/hpijs
 @unexec if cmp -s %D/etc/hp/hplip.conf.sample %D/etc/hp/hplip.conf; then rm -f %D/etc/hp/hplip.conf; fi
 etc/hp/hplip.conf.sample
 @exec if [ ! -f %B/hplip.conf ]; then cp -p %D/%F %B/hplip.conf; fi
-etc/xdg/autostart/hplip-systray.desktop
+%%GUI%%etc/xdg/autostart/hplip-systray.desktop
 lib/libhpip.la
 lib/libhpip.so
 lib/libhpip.so.0
@@ -64,7 +69,7 @@ libexec/cups/filter/hpcups
 libexec/cups/filter/hplipjs
 libexec/cups/filter/hpps
 libexec/cups/filter/pstotiff
-share/applications/hplip.desktop
+%%GUI%%share/applications/hplip.desktop
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README_LIBJPG
 %%PORTDOCS%%%%DOCSDIR%%/commandline.html
@@ -120,6 +125,7 @@ share/applications/hplip.desktop
 %%DATADIR%%/base/pexpect.py
 %%DATADIR%%/base/pkit.py
 %%DATADIR%%/base/pml.py
+%%DATADIR%%/base/queues.py
 %%DATADIR%%/base/slp.py
 %%DATADIR%%/base/status.py
 %%DATADIR%%/base/strings.py
@@ -131,6 +137,7 @@ share/applications/hplip.desktop
 %%DATADIR%%/check.py
 %%DATADIR%%/clean.py
 %%DATADIR%%/colorcal.py
+%%DATADIR%%/config_usb_printer.py
 %%DATADIR%%/copier/__init__.py
 %%DATADIR%%/copier/copier.py
 %%GUI%%%%DATADIR%%/data/images/128x128/audio.png
@@ -186,6 +193,7 @@ share/applications/hplip.desktop
 %%GUI%%%%DATADIR%%/data/images/16x16/status_refresh.png
 %%GUI%%%%DATADIR%%/data/images/16x16/thumbnail.png
 %%GUI%%%%DATADIR%%/data/images/16x16/toner.png
+%%GUI%%%%DATADIR%%/data/images/16x16/troubleshoot.png
 %%GUI%%%%DATADIR%%/data/images/16x16/up.png
 %%GUI%%%%DATADIR%%/data/images/16x16/up_user.png
 %%GUI%%%%DATADIR%%/data/images/16x16/warning.png
@@ -239,6 +247,7 @@ share/applications/hplip.desktop
 %%GUI%%%%DATADIR%%/data/images/32x32/testpage.png
 %%GUI%%%%DATADIR%%/data/images/32x32/toner.png
 %%GUI%%%%DATADIR%%/data/images/32x32/toner_cartridge.png
+%%GUI%%%%DATADIR%%/data/images/32x32/troubleshoot.png
 %%GUI%%%%DATADIR%%/data/images/32x32/warning.png
 %%GUI%%%%DATADIR%%/data/images/32x32/wireless.png
 %%GUI%%%%DATADIR%%/data/images/64x64/hp_logo.png
@@ -486,6 +495,7 @@ share/applications/hplip.desktop
 %%DATADIR%%/data/ps/testpage.ps.gz
 %%DATADIR%%/devicesettings.py
 %%DATADIR%%/diagnose_plugin.py
+%%DATADIR%%/diagnose_queues.py
 %%DATADIR%%/fab.py
 %%FAX%%%%DATADIR%%/fax/__init__.py
 %%FAX%%%%DATADIR%%/fax/coverpages.py
@@ -510,6 +520,7 @@ share/applications/hplip.desktop
 %%DATADIR%%/installer/distros.dat
 %%DATADIR%%/levels.py
 %%DATADIR%%/linefeedcal.py
+%%DATADIR%%/logcapture.py
 %%DATADIR%%/makecopies.py
 %%DATADIR%%/makeuri.py
 %%DATADIR%%/pcard/__init__.py
@@ -585,6 +596,7 @@ share/applications/hplip.desktop
 %%GUI%%%%DATADIR%%/ui4/printsettingstoolbox.py
 %%GUI%%%%DATADIR%%/ui4/printtestpagedialog.py
 %%GUI%%%%DATADIR%%/ui4/printtestpagedialog_base.py
+%%GUI%%%%DATADIR%%/ui4/queuesconf.py
 %%GUI%%%%DATADIR%%/ui4/readonlyradiobutton.py
 %%GUI%%%%DATADIR%%/ui4/sendfaxdialog.py
 %%GUI%%%%DATADIR%%/ui4/sendfaxdialog_base.py
@@ -596,9 +608,13 @@ share/applications/hplip.desktop
 %%GUI%%%%DATADIR%%/ui4/systrayframe.py
 %%GUI%%%%DATADIR%%/ui4/systrayframe_base.py
 %%GUI%%%%DATADIR%%/ui4/ui_utils.py
+%%GUI%%%%DATADIR%%/ui4/upgradedialog.py
+%%GUI%%%%DATADIR%%/ui4/upgradedialog_base.py
 %%GUI%%%%DATADIR%%/ui4/wifisetupdialog.py
 %%GUI%%%%DATADIR%%/ui4/wifisetupdialog_base.py
+%%DATADIR%%/uninstall.py
 %%DATADIR%%/unload.py
+%%DATADIR%%/upgrade.py
 %%DATADIR%%/wificonfig.py
 %%FAX%%share/ppd/HP/HP-Fax-hpcups.ppd.gz
 %%FAX%%share/ppd/HP/HP-Fax-hpijs.ppd.gz
@@ -776,6 +792,7 @@ share/ppd/HP/hp-designjet_t770_postscript-ps.ppd.gz
 share/ppd/HP/hp-designjet_t770ps_24in-ps.ppd.gz
 share/ppd/HP/hp-designjet_t790ps_24in-ps.ppd.gz
 share/ppd/HP/hp-designjet_t790ps_44in-ps.ppd.gz
+share/ppd/HP/hp-designjet_t800_t2000_premium-ps.ppd.gz
 share/ppd/HP/hp-designjet_z6100ps_42in_photo-ps.ppd.gz
 share/ppd/HP/hp-designjet_z6100ps_60in_photo-ps.ppd.gz
 share/ppd/HP/hp-designjet_z6200_42in_photo-ps.ppd.gz
@@ -792,7 +809,10 @@ share/ppd/HP/hp-deskjet_1600c-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_1600cm-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_1600cn-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_2000_j210_series-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_2020_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_2050_j510_series-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_2510_series-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_2520_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3000_j310_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3050_j610_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3050a_j611_series-hpijs.ppd.gz
@@ -803,6 +823,8 @@ share/ppd/HP/hp-deskjet_3420-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3425-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3450-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3500-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_3510_series-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_3520_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3550-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3600-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3650-hpijs.ppd.gz
@@ -821,6 +843,8 @@ share/ppd/HP/hp-deskjet_3940-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_400-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_400l-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_460-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_4610_series-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_4620_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_500-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_500c-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_505j-hpijs.ppd.gz
@@ -830,6 +854,7 @@ share/ppd/HP/hp-deskjet_520-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_540-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_5400_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_550c-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_5520_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_5550-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_5551-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_5552-hpijs.ppd.gz
@@ -852,6 +877,7 @@ share/ppd/HP/hp-deskjet_632c-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_640c-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_648c-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_6500-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_6520_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_656c-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_660-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_6600-hpijs.ppd.gz
@@ -945,6 +971,7 @@ share/ppd/HP/hp-dj350-hpijs.ppd.gz
 share/ppd/HP/hp-dj450-hpijs.ppd.gz
 share/ppd/HP/hp-envy_100_d410_series-hpijs.ppd.gz
 share/ppd/HP/hp-envy_110_series-hpijs.ppd.gz
+share/ppd/HP/hp-envy_120_series-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_1000-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_1005_series-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_100_color_mfp_m175-ps.ppd.gz
@@ -989,7 +1016,9 @@ share/ppd/HP/hp-laserjet_1320nw-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_1320nw-ps.ppd.gz
 share/ppd/HP/hp-laserjet_1320tn-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_1320tn-ps.ppd.gz
+share/ppd/HP/hp-laserjet_200_color_m251-ps.ppd.gz
 share/ppd/HP/hp-laserjet_200_colormfp_m275-ps.ppd.gz
+share/ppd/HP/hp-laserjet_200_colormfp_m276-ps.ppd.gz
 share/ppd/HP/hp-laserjet_2100-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_2100-ps.ppd.gz
 share/ppd/HP/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz
@@ -1036,6 +1065,9 @@ share/ppd/HP/hp-laserjet_3392-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_4-ps.ppd.gz
 share/ppd/HP/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_4000_series-ps.ppd.gz
+share/ppd/HP/hp-laserjet_400_m401-ps.ppd.gz
+share/ppd/HP/hp-laserjet_400_m401d-ps.ppd.gz
+share/ppd/HP/hp-laserjet_400_mfp_m425-ps.ppd.gz
 share/ppd/HP/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_4050_series-ps.ppd.gz
 share/ppd/HP/hp-laserjet_4100_mfp-hpijs-pcl3.ppd.gz
@@ -1071,6 +1103,10 @@ share/ppd/HP/hp-laserjet_5000-ps.ppd.gz
 share/ppd/HP/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_5000_series-ps.ppd.gz
 share/ppd/HP/hp-laserjet_500_color_m551-ps.ppd.gz
+share/ppd/HP/hp-laserjet_500_color_mfp_m570-ps.ppd.gz
+share/ppd/HP/hp-laserjet_500_color_mfp_m575-ps.ppd.gz
+share/ppd/HP/hp-laserjet_500_mfp_m521-ps.ppd.gz
+share/ppd/HP/hp-laserjet_500_mfp_m525-ps.ppd.gz
 share/ppd/HP/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_5100_series-ps.ppd.gz
 share/ppd/HP/hp-laserjet_5200-hpijs-pcl3.ppd.gz
@@ -1094,6 +1130,8 @@ share/ppd/HP/hp-laserjet_6mp-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_6mp-ps.ppd.gz
 share/ppd/HP/hp-laserjet_6p-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_6p-ps.ppd.gz
+share/ppd/HP/hp-laserjet_700_color_mfp_m775-ps.ppd.gz
+share/ppd/HP/hp-laserjet_700_m712-ps.ppd.gz
 share/ppd/HP/hp-laserjet_8000-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_8000-ps.ppd.gz
 share/ppd/HP/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz
@@ -1130,14 +1168,13 @@ share/ppd/HP/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_cp1021-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_cp1022-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_cp1023-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz
 share/ppd/HP/hp-laserjet_cp1025-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_cp1025nw-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_cp1027nw-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_cp1028nw-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_cp1520_series-ps.ppd.gz
+share/ppd/HP/hp-laserjet_cp_1025-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_cp_1025nw-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_flow_mfp_m525-ps.ppd.gz
 share/ppd/HP/hp-laserjet_m1005-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_m1120_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_m1120n_mfp-hpijs.ppd.gz
@@ -1147,7 +1184,6 @@ share/ppd/HP/hp-laserjet_m1522n_mfp-ps.ppd.gz
 share/ppd/HP/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m1522nf_mfp-ps.ppd.gz
 share/ppd/HP/hp-laserjet_m1530_mfp_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_m1536dnf_mfp-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz
@@ -1173,6 +1209,8 @@ share/ppd/HP/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m9050_mfp-ps.ppd.gz
 share/ppd/HP/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m9059_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_mfp_m521-ps.ppd.gz
+share/ppd/HP/hp-laserjet_mfp_m725-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p1005-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_p1006-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_p1007-hpijs.ppd.gz
@@ -1222,19 +1260,37 @@ share/ppd/HP/hp-laserjet_p4515x-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_p4515xm-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_m1137_mfp-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_m1138_mfp-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_m1139_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_m1218nfg_mfp-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_m1218nfs_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_m1219nf_mfp-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_m1219nfg_mfp-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_m1219nfs_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_p1102-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1102s-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_p1102w-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_p1106-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_p1106w-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_p1107-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_p1107w-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_p1108-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_p1108w-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_p1109-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_p1109w-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_p1566-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_p1567-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_p1568-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_p1569-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_p1606dn-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_p1607dn-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_p1608dn-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_p1609dn-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_professional_p_1102w-hpijs.ppd.gz
 share/ppd/HP/hp-lj_300_400_color_m351_m451-ps.ppd.gz
 share/ppd/HP/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz
@@ -1244,6 +1300,7 @@ share/ppd/HP/hp-mopier_320-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-mopier_320-ps.ppd.gz
 share/ppd/HP/hp-officejet-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_100_mobile_l411-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_150_mobile_l511-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_4000_k210-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_4100_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_4105-hpijs.ppd.gz
@@ -1256,6 +1313,8 @@ share/ppd/HP/hp-officejet_4500_g510a-f-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_4500_g510g-m-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_4500_g510n-z-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_4500_k710-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_4610_series-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_4620_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_5100_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_5105-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_5110-hpijs.ppd.gz
@@ -1264,6 +1323,7 @@ share/ppd/HP/hp-officejet_5500_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_5600_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_6000_e609a-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_6000_e609n-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_6100-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_6100_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_6150_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_6200_series-hpijs.ppd.gz
@@ -1272,6 +1332,8 @@ share/ppd/HP/hp-officejet_6500_e709a-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_6500_e709n-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_6500_e710a-f-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_6500_e710n-z-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_6600-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_6700-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_7000_e809a-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_7000_e809a_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_7100_series-hpijs.ppd.gz
@@ -1303,6 +1365,11 @@ share/ppd/HP/hp-officejet_k80xi-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_lx-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_pro_1150c-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_pro_1170c_series-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_pro_251dw_printer-ps.ppd.gz
+share/ppd/HP/hp-officejet_pro_276dw_mfp-ps.ppd.gz
+share/ppd/HP/hp-officejet_pro_451_series-ps.ppd.gz
+share/ppd/HP/hp-officejet_pro_476_576_series-ps.ppd.gz
+share/ppd/HP/hp-officejet_pro_551_series-ps.ppd.gz
 share/ppd/HP/hp-officejet_pro_8000_a809-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz
 share/ppd/HP/hp-officejet_pro_8100-hpijs.ppd.gz
@@ -1333,7 +1400,6 @@ share/ppd/HP/hp-officejet_series_310-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_series_320-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_series_330-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_series_350-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_500-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_series_520-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_series_570-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_series_580-hpijs.ppd.gz
@@ -1373,13 +1439,16 @@ share/ppd/HP/hp-photosmart_420_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_470_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_5510_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_5510d_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_5520_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_6510_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_6520_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_7150-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_7200_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_7345-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_7350-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_7400_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_7510_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_7520_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_7550-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_7600_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_7700_series-hpijs.ppd.gz