- Update to 3.9.6b

PR: 135702 Submitteed by: Chris Petrik <c.petrik.sosa@gmail.com> Thanks to: "Juergen Lock" <nox@jelal.kn-bremen.de>
author: amdmi3 <amdmi3@FreeBSD.org> 2009-08-05 08:44:53 +0800
committer: amdmi3 <amdmi3@FreeBSD.org> 2009-08-05 08:44:53 +0800
commit: 870f23db75637a3604b3010e44ce7cb415876ffc (patch)
tree: 6f65be464c1bc33b91214330f12573c4779e91aa /print
parent: 7cf7d9be7babd18ef17834cb8f635d5281625f8e (diff)
download: freebsd-ports-gnome-870f23db75637a3604b3010e44ce7cb415876ffc.tar.gz
freebsd-ports-gnome-870f23db75637a3604b3010e44ce7cb415876ffc.tar.zst
freebsd-ports-gnome-870f23db75637a3604b3010e44ce7cb415876ffc.zip
15 files changed, 1159 insertions, 1440 deletions
diff --git a/print/hplip3/Makefile b/print/hplip3/Makefile
index a8629e452bc8..d7d9025476c8 100644
--- a/print/hplip3/Makefile
+++ b/print/hplip3/Makefile
@@ -6,129 +6,125 @@
 #
 
 PORTNAME=	hplip
-PORTVERSION=	2.8.2
-PORTREVISION=	5
+PORTVERSION=	3.9.6b
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	hplip
+MASTER_SITES=	SF
 
-MAINTAINER=	amistry@am-productions.biz
+MAINTAINER=	chris@officialunix.com
 COMMENT=	Drivers and utilities for HP Printers and All-in-One devices
 
+LATEST_LINK=	${PORTNAME}3
+
 LIB_DEPENDS=	jpeg.10:${PORTSDIR}/graphics/jpeg \
 		sane.1:${PORTSDIR}/graphics/sane-backends \
 		cups.2:${PORTSDIR}/print/cups-base \
+		dbus-1.3:${PORTSDIR}/devel/dbus \
 		netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp
-
+BUILD_DEPENDS=	ppdc:${PORTSDIR}/print/cupsddk
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2 \
+		espgs:${PORTSDIR}/print/cups-pstoraster \
 		foomatic-rip:${PORTSDIR}/print/foomatic-filters
 
-CONFLICTS=	hpijs-*
+CONFLICTS=	hpijs-[0-9]* hplip-[0-9]*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--disable-pp-build \
 		--enable-foomatic-ppd-install \
+		--enable-foomatic-rip-hplip-install \
+		--enable-hpijs-install \
 		--with-icondir=${LOCALBASE}/share/applications \
 		--with-cupsbackenddir=${LOCALBASE}/libexec/cups/backend \
 		--with-cupsfilterdir=${LOCALBASE}/libexec/cups/filter \
-		--with-drvdir=${LOCALBASE}/libexec/cups/driver
+		--with-drvdir=${LOCALBASE}/libexec/cups/driver \
+		--with-hppddir=${LOCALBASE}/share/ppd/HP
 
 USE_LDCONFIG=	yes
 USE_GHOSTSCRIPT_RUN=	yes
-USE_PYTHON=	yes
-USE_RC_SUBR=	hpssd.sh
+USE_PYTHON=	25+
+USE_RC_SUBR=	hpssd
 MAKE_JOBS_SAFE=	yes
+SUB_FILES=	pkg-message
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-
-MAKE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-PKGDEINSTALL=	${PKGINSTALL}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-OPTIONS=	GUI "build with Python QT" on
+OPTIONS=	GUI "build with Python QT" on \
+		DBUS "dbus support" on \
+		XSANE "build xsane scanner app" on
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} IJSVER=2.7.4
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 800069
 LIB_DEPENDS+=	usb:${PORTSDIR}/devel/libusb
 .endif
 
-.if !defined(WITHOUT_GUI) || exists(${LOCALBASE}/bin/pylupdate)
-RUN_DEPENDS+=	pylupdate:${PORTSDIR}/x11-toolkits/py-qt
-CONFIGURE_ARGS+=	--enable-gui-build
+.if !defined(WITHOUT_GUI)
+USE_QT_VER=	4
+QT_COMPONENTS=	gui
+CONFIGURE_ARGS+=--enable-qt4
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
+LIB_DEPENDS+=	pyglib-2.0:${PORTSDIR}/devel/py-gobject
 .endif
 
-post-extract:
-	@${RM} -r ${WRKSRC}/data/images/CVS
+.if !defined(WITHOUT_DBUS)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus \
+		${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbus
+.endif
+
+.if !defined(WITHOUT_XSANE)
+RUN_DEPENDS+=	xsane:${PORTSDIR}/graphics/xsane
+.endif
+
+.if defined(NOPORTDOCS)
+CONFIGURE_ARGS+=	--enable-doc-build=no
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/hp|${LOCALBASE}/etc/hp|g ; \
-		s|/etc/sane.d|${LOCALBASE}/etc/sane.d|g' \
-		${WRKSRC}/Makefile.am \
-		${WRKSRC}/Makefile.in \
-		${WRKSRC}/check.py \
-		${WRKSRC}/hpssd.py \
-		${WRKSRC}/base/g.py \
-		${WRKSRC}/doc/release_notes.html \
-		${WRKSRC}/doc/tech_docs/man_pages/hpssd.html \
-		${WRKSRC}/fax/backend/hpfax.py \
+			s|/etc/sane.d|${LOCALBASE}/etc/sane.d|g' \
+		${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in \
+		${WRKSRC}/check.py ${WRKSRC}/hpssd.py \
+		${WRKSRC}/base/g.py ${WRKSRC}/fax/backend/hpfax.py \
 		${WRKSRC}/installer/distros.dat \
 		${WRKSRC}/installer/core_install.py \
-		${WRKSRC}/prnt/hpijs/ljzjs.cpp
-
-	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/configure.in
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|install-dist_www7DATA install-docDATA|install-dist_www7DATA|g ; \
-				s|install-dist_unrelDATA install-dist_www0DATA|install-dist_unrelDATA|g ; \
-				s|install-dist_www1DATA install-dist_www21DATA||g ; \
-				s|install-dist_www22DATA install-dist_www23DATA||g ; \
-				s|install-dist_www241DATA install-dist_www242DATA||g ; \
-				s|install-dist_www243DATA install-dist_www24DATA||g ; \
-				s|install-dist_www251DATA install-dist_www252DATA||g ; \
-				s|install-dist_www261DATA install-dist_www2DATA||g ; \
-				s|install-dist_www3DATA install-dist_www4DATA||g ; \
-				s|install-dist_www5DATA install-dist_www61DATA||g ; \
-				s|install-dist_www6DATA install-dist_www7DATA||g' \
-		${WRKSRC}/Makefile.in
-.endif
+		${WRKSRC}/prnt/hpijs/ljzjs.cpp \
+		${WRKSRC}/prnt/hpijs/globals.cpp \
+		${WRKSRC}/ui/devmgr4.py \
+		${WRKSRC}/ui4/devmgr5.py
+	@${REINPLACE_CMD} -e 's|/etc/dbus-1/system.d|${LOCALBASE}/etc/dbus-1/system.d|g ; \
+			s|/usr/share/dbus-1/system-services|${LOCALBASE}/share/dbus-1/system-services|g' \
+		${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} 's|/etc/xdg|${PREFIX}&|g; s|-lpthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure ${WRKSRC}/configure.in
 	@${REINPLACE_CMD} -e 's|install-dist_prntSCRIPTS install-dist_rulesDATA|install-dist_prntSCRIPTS|g ; \
-				s|install-hpPROGRAMS install-hplip_confDATA|install-hpPROGRAMS|g' \
+			s|install-hpPROGRAMS install-hplip_confDATA|install-hpPROGRAMS|g' \
 		${WRKSRC}/Makefile.in
-#	@${REINPLACE_CMD} -e 's|install-dist_www7DATA install-docDATA|install-dist_www7DATA|g' \
-#		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|-ldld||g ; \
-			s|-ldl||g ; \
-			s|-dld||g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/configure.in \
-		${WRKSRC}/Makefile.in \
-		${WRKSRC}/Makefile.am \
+	@${REINPLACE_CMD} -e 's|-ldld||g; s|-ldl||g; s|-dld||g' \
+		${WRKSRC}/configure ${WRKSRC}/configure.in \
+		${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.am \
 		${WRKSRC}/aclocal.m4
-
 	@${REINPLACE_CMD} -e 's|/usr/bin/env python|${LOCALBASE}/bin/python|g' \
 		${WRKSRC}/hpssd.py
-
-pre-su-install:
-	@${MKDIR} ${PREFIX}/share/applications
-
-post-install:
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
-	@${LN} -sf ${PREFIX}/share/hplip/hpssd.py ${PREFIX}/sbin/hpssd
-	@${MKDIR} ${PREFIX}/etc/hp
-	# Auto-generate sample configuration file
-	@${INSTALL_DATA} ${WRKSRC}/hplip.conf ${PREFIX}/etc/hp/hplip.conf.sample
-.if !exists(${PREFIX}/etc/hp/hplip.conf)
-	@${INSTALL_DATA} ${WRKSRC}/hplip.conf ${PREFIX}/etc/hp/hplip.conf
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e '/install-.*install-docDATA.*install-/ s|install-docDATA||' \
+		${WRKSRC}/Makefile.in
 .endif
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+post-install:
+	${LN} -sf ${PREFIX}/share/hplip/hpssd.py ${PREFIX}/sbin/hpssd
+	${INSTALL_DATA} ${WRKSRC}/hplip-systray.desktop ${PREFIX}/etc/xdg/autostart/hplip-systray.desktop
+	${MKDIR} ${PREFIX}/etc/hp
+	${INSTALL_DATA} ${WRKSRC}/hplip.conf ${PREFIX}/etc/hp/hplip.conf.sample
+	if [ ! -f ${PREFIX}/etc/hp/hplip.conf ]; then \
+		${INSTALL_DATA} ${PREFIX}/etc/hp/hplip.conf.sample \
+			${PREFIX}/etc/hp/hplip.conf; \
+	fi
+	${ECHO_CMD} hpaio >> ${PREFIX}/etc/sane.d/dll.conf
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/print/hplip3/distinfo b/print/hplip3/distinfo
index e70e07deaf6d..aef29d91227a 100644
--- a/print/hplip3/distinfo
+++ b/print/hplip3/distinfo
@@ -1,3 +1,3 @@
-MD5 (hplip-2.8.2.tar.gz) = ea57b92483622d3eae359994c5fd3dc3
-SHA256 (hplip-2.8.2.tar.gz) = 2135f2e02077cf5388c4b9b8214f0fd56f24f8bb2ccfa564a80402520e2d5aa8
-SIZE (hplip-2.8.2.tar.gz) = 14195737
+MD5 (hplip-3.9.6b.tar.gz) = 49a87fe7d7a57a075ed9631113cee662
+SHA256 (hplip-3.9.6b.tar.gz) = c0e643affe9bf524fe90185ff6894bd0b56e379eb434ee97038fbddaca9d9c8a
+SIZE (hplip-3.9.6b.tar.gz) = 15593920
diff --git a/print/hplip3/files/hpssd.sh.in b/print/hplip3/files/hpssd.in
index 90d0d0b0f123..90d0d0b0f123 100644
--- a/print/hplip3/files/hpssd.sh.in
+++ b/print/hplip3/files/hpssd.in
diff --git a/print/hplip3/files/patch-CVE-2008-2940 b/print/hplip3/files/patch-CVE-2008-2940
deleted file mode 100644
index dbe14fa417e8..000000000000
--- a/print/hplip3/files/patch-CVE-2008-2940
+++ /dev/null
@@ -1,74 +0,0 @@
-Patch for CVE-2008-2940
-
-Please note that alerts are now system-wide and they live in
-/etc/hp/alerts.conf
-
-See: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2940
-Obtained from: https://bugzilla.redhat.com/attachment.cgi?id=312878
-Obtained from: https://bugzilla.redhat.com/attachment.cgi?id=312880
-
-diff -up hplip-1.6.7/hpssd.py.validate-uri hplip-1.6.7/hpssd.py
---- hpssd.py.validate-uri	2008-07-29 12:48:28.000000000 +0100
-+++ hpssd.py	2008-07-29 13:41:29.000000000 +0100
-@@ -1021,6 +1021,9 @@ class hpssd_handler(dispatcher):
-         event_type = self.fields.get('event-type', 'event')
-         event_code = self.fields.get('event-code', 0)
-         device_uri = self.fields.get('device-uri', '').replace('hpfax:', 'hp:')
-+        result_code = self.__checkdevice(device_uri)
-+        if result_code != ERROR_SUCCESS:
-+            return
-         log.debug("Device URI: %s" % device_uri)
- 
-         try:
-diff -up hplip-1.6.7/base/g.py.static-alerts-table hplip-1.6.7/base/g.py
---- base/g.py.orig	2008-01-18 02:10:29.000000000 +0300
-+++ base/g.py	2008-11-23 22:39:11.000000000 +0300
-@@ -134,6 +134,7 @@
- # Config file: directories and ports
- prop.sys_config_file = '/etc/hp/hplip.conf'
- prop.user_dir = os.path.expanduser('~/.hplip')
-+prop.alerts_config_file = '/etc/hp/alerts.conf'
- 
- os.umask(0037)
- try:
-@@ -154,6 +155,7 @@
-     
- sys_cfg = Config(prop.sys_config_file, True)
- user_cfg = Config(prop.user_config_file)
-+alerts_cfg = Config(prop.alerts_config_file)
- 
- 
- # Language settings
-diff -up hplip-1.6.7/hpssd.py.static-alerts-table hplip-1.6.7/hpssd.py
---- hpssd.py.static-alerts-table	2008-07-29 14:57:04.000000000 +0100
-+++ hpssd.py	2008-07-29 15:22:15.000000000 +0100
-@@ -71,6 +71,12 @@ from prnt import cups
- 
- # Per user alert settings
- alerts = {}
-+for user, cfg in alerts_cfg.iteritems ():
-+    entry = {}
-+    entry['email-alerts'] = utils.to_bool (cfg.get('email-alerts', 0))
-+    entry['email-from-address'] = cfg.get('email-from-address', '')
-+    entry['email-to-addresses'] = cfg.get('email-to-addresses', '')
-+    alerts[user] = entry
- 
- # Fax temp files
- fax_file = {}
-@@ -803,15 +809,10 @@ class hpssd_handler(dispatcher):
-         self.out_buffer = buildResultMessage('InjectValueResult', None, result_code)
-         
- 
--    # TODO: Need to load alerts at start-up
-     def handle_setalerts(self):
-         result_code = ERROR_SUCCESS
--        username = self.fields.get('username', '')
- 
--        alerts[username] = {'email-alerts'       : utils.to_bool(self.fields.get('email-alerts', '0')),
--                            'email-from-address' : self.fields.get('email-from-address', ''),
--                            'email-to-addresses' : self.fields.get('email-to-addresses', ''),
--                           }
-+        # Do nothing.  We use the alerts table in /etc/hp/alerts.conf.
- 
-         self.out_buffer = buildResultMessage('SetAlertsResult', None, result_code)
- 
diff --git a/print/hplip3/files/patch-CVE-2008-2941 b/print/hplip3/files/patch-CVE-2008-2941
deleted file mode 100644
index f4bb8ee06caa..000000000000
--- a/print/hplip3/files/patch-CVE-2008-2941
+++ /dev/null
@@ -1,210 +0,0 @@
-Patch for CVE-2008-2941
-
-Fixes parser fragility: original code expects only strings or numbers as
-the input values, but not both.  And hpssd client has the full control
-on the input data, so when number is tried to be transformed as string
-(by calling lower() method, for example) the unhandled exception
-terminates the daemon.
-
-Based on: https://bugzilla.redhat.com/attachment.cgi?id=312881
-
---- hpssd.py.orig	2008-11-23 22:41:08.000000000 +0300
-+++ hpssd.py	2008-11-23 22:57:51.000000000 +0300
-@@ -203,7 +203,7 @@
-                 log.debug(self.out_buffer)
-                 return True
- 
--            msg_type = self.fields.get('msg', 'unknown').lower()
-+            msg_type = str(self.fields.get('msg', 'unknown')).lower()
-             log.debug("Handling: %s %s %s" % ("*"*20, msg_type, "*"*20))
-             log.debug(repr(self.in_buffer))
- 
-@@ -260,9 +260,9 @@
- 
- 
-     def handle_getvalue(self):
--        device_uri = self.fields.get('device-uri', '').replace('hpfax:', 'hp:')
-+        device_uri = str(self.fields.get('device-uri', '')).replace('hpfax:', 'hp:')
-         value = ''
--        key = self.fields.get('key', '')
-+        key = str(self.fields.get('key', ''))
-         result_code = self.__checkdevice(device_uri)
- 
-         if result_code == ERROR_SUCCESS:
-@@ -274,9 +274,9 @@
-         self.out_buffer = buildResultMessage('GetValueResult', value, result_code)
- 
-     def handle_setvalue(self):
--        device_uri = self.fields.get('device-uri', '').replace('hpfax:', 'hp:')
--        key = self.fields.get('key', '')
--        value = self.fields.get('value', '')
-+        device_uri = str(self.fields.get('device-uri', '')).replace('hpfax:', 'hp:')
-+        key = str(self.fields.get('key', ''))
-+        value = str(self.fields.get('value', ''))
-         result_code = self.__checkdevice(device_uri)
- 
-         if result_code == ERROR_SUCCESS:    
-@@ -285,7 +285,7 @@
-         self.out_buffer = buildResultMessage('SetValueResult', None, ERROR_SUCCESS)
- 
-     def handle_queryhistory(self):
--        device_uri = self.fields.get('device-uri', '').replace('hpfax:', 'hp:')
-+        device_uri = str(self.fields.get('device-uri', '')).replace('hpfax:', 'hp:')
-         payload = ''
-         result_code = self.__checkdevice(device_uri)
- 
-@@ -305,8 +305,8 @@
- 
-     # EVENT
-     def handle_registerguievent(self):
--        username = self.fields.get('username', '')
--        typ = self.fields.get('type', 'unknown')
-+        username = str(self.fields.get('username', ''))
-+        typ = str(self.fields.get('type', 'unknown'))
-         self.typ = typ
-         self.username = username
-         self.send_events = True
-@@ -314,13 +314,13 @@
- 
-     # EVENT
-     def handle_unregisterguievent(self):
--        username = self.fields.get('username', '')
-+        username = str(self.fields.get('username', ''))
-         self.send_events = False
- 
- 
-     def handle_test_email(self):
-         result_code = ERROR_SUCCESS
--        username = self.fields.get('username', prop.username)
-+        username = str(self.fields.get('username', prop.username))
-         message = device.queryString('email_test_message')
-         subject = device.queryString('email_test_subject')
-         result_code = self.sendEmail(username, subject, message, True)
-@@ -343,11 +343,14 @@
- 
-     # sent by hpfax: to indicate the start of a complete fax rendering job
-     def handle_hpfaxbegin(self):
--        username = self.fields.get('username', prop.username)
--        job_id = self.fields.get('job-id', 0)
--        printer_name = self.fields.get('printer', '')
--        device_uri = self.fields.get('device-uri', '').replace('hp:', 'hpfax:')
--        title = self.fields.get('title', '')
-+        username = str(self.fields.get('username', prop.username))
-+        try:
-+            job_id = int(self.fields.get('job-id', 0))
-+        except ValueError:
-+            job_id = 0
-+        printer_name = str(self.fields.get('printer', ''))
-+        device_uri = str(self.fields.get('device-uri', '')).replace('hp:', 'hpfax:')
-+        title = str(self.fields.get('title', ''))
- 
-         log.debug("Creating data store for %s:%d" % (username, job_id))
-         fax_file[(username, job_id)] = tempfile.NamedTemporaryFile(prefix="hpfax")
-@@ -360,8 +363,11 @@
- 
-     # sent by hpfax: to transfer completed fax rendering data
-     def handle_hpfaxdata(self):
--        username = self.fields.get('username', prop.username)
--        job_id = self.fields.get('job-id', 0)
-+        username = str(self.fields.get('username', prop.username))
-+        try:
-+            job_id = int(self.fields.get('job-id', 0))
-+        except ValueError:
-+            job_id = 0
- 
-         if self.payload and (username, job_id) in fax_file and \
-             not fax_file_ready[(username, job_id)]:
-@@ -373,12 +379,18 @@
- 
-     # sent by hpfax: to indicate the end of a complete fax rendering job
-     def handle_hpfaxend(self):
--        username = self.fields.get('username', '')
--        job_id = self.fields.get('job-id', 0)
--        printer_name = self.fields.get('printer', '')
--        device_uri = self.fields.get('device-uri', '').replace('hp:', 'hpfax:')
--        title = self.fields.get('title', '')
--        job_size = self.fields.get('job-size', 0)
-+        username = str(self.fields.get('username', ''))
-+        try:
-+            job_id = int(self.fields.get('job-id', 0))
-+        except ValueError:
-+            job_id = 0
-+        printer_name = str(self.fields.get('printer', ''))
-+        device_uri = str(self.fields.get('device-uri', '')).replace('hp:', 'hpfax:')
-+        title = str(self.fields.get('title', ''))
-+        try:
-+            job_size = int(self.fields.get('job-size', 0))
-+        except ValueError:
-+            job_size = 0
- 
-         fax_file[(username, job_id)].seek(0)
-         fax_file_ready[(username, job_id)] = True
-@@ -389,7 +401,7 @@
- 
-     # sent by hp-sendfax to see if any faxes have been printed and need to be picked up
-     def handle_faxcheck(self):
--        username = self.fields.get('username', '')
-+        username = str(self.fields.get('username', ''))
-         result_code = ERROR_NO_DATA_AVAILABLE
-         other_fields = {}
- 
-@@ -413,8 +425,11 @@
-     # after being run with --job param, both after a hpfaxend message
-     def handle_faxgetdata(self):
-         result_code = ERROR_SUCCESS
--        username = self.fields.get('username', '')
--        job_id = self.fields.get('job-id', 0)
-+        username = str(self.fields.get('username', ''))
-+        try:
-+            job_id = int(self.fields.get('job-id', 0))
-+        except ValueError:
-+            job_id = 0
- 
-         try:
-             fax_file[(username, job_id)]
-@@ -442,15 +457,18 @@
-     # EVENT
-     def handle_event(self):
-         gui_port, gui_host = None, None
--        event_type = self.fields.get('event-type', 'event')
-+        event_type = str(self.fields.get('event-type', 'event'))
-         
--        event_code = self.fields.get('event-code', STATUS_PRINTER_IDLE)
-+        try:
-+            event_code = int(self.fields.get('event-code', STATUS_PRINTER_IDLE))
-+        except ValueError:
-+            event_code = STATUS_PRINTER_IDLE
-         
-         # If event-code > 10001, its a PJL error code, so convert it
-         if event_code > EVENT_MAX_EVENT:
-             event_code = status.MapPJLErrorCode(event_code)
-             
--        device_uri = self.fields.get('device-uri', '').replace('hpfax:', 'hp:')
-+        device_uri = str(self.fields.get('device-uri', '')).replace('hpfax:', 'hp:')
-         result_code = self.__checkdevice(device_uri)
-         if result_code != ERROR_SUCCESS:
-             return
-@@ -461,7 +479,10 @@
- 
-         log.debug("Short/Long: %s/%s" % (error_string_short, error_string_long))
- 
--        job_id = self.fields.get('job-id', 0)
-+        try:
-+            job_id = int(self.fields.get('job-id', 0))
-+        except ValueError:
-+            job_id = 0
- 
-         try:
-             username = self.fields['username']
-@@ -480,7 +501,10 @@
- 
-         no_fwd = utils.to_bool(self.fields.get('no-fwd', '0'))
-         log.debug("Username (jobid): %s (%d)" % (username, job_id))
--        retry_timeout = self.fields.get('retry-timeout', 0)
-+        try:
-+            retry_timeout = int(self.fields.get('retry-timeout', 0))
-+        except ValueError:
-+            retry_timeout = 0
-         user_alerts = alerts.get(username, {})        
- 
-         dup_event = False
diff --git a/print/hplip3/files/patch-Makefile.am b/print/hplip3/files/patch-Makefile.am
index beb9769cde6c..f6cd7ca3fd7b 100644
--- a/print/hplip3/files/patch-Makefile.am
+++ b/print/hplip3/files/patch-Makefile.am
@@ -1,37 +1,33 @@
---- Makefile.am.orig	Fri Sep 21 15:36:07 2007
-+++ Makefile.am	Tue Oct  9 19:31:35 2007
-@@ -45,7 +45,7 @@
- www243dir = $(docdir)/install/step4/suse
- dist_www243_DATA = $(wwwsrc)/install/step4/suse/*
- www251dir = $(docdir)/install/manual
--dist_www251_DATA = $(wwwsrc)/install/manual/*
-+dist_www251_DATA = $(wwwsrc)/install/manual/*.html
- www252dir = $(docdir)/install/manual/distros
- dist_www252_DATA = $(wwwsrc)/install/manual/distros/*
- www261dir = $(docdir)/install/install
-@@ -53,13 +53,13 @@
+--- Makefile.am.orig	2009-06-18 01:00:23.000000000 +0400
++++ Makefile.am	2009-06-29 02:25:37.000000000 +0400
+@@ -24,11 +24,11 @@
+ if DOC_BUILD
+ wwwsrc = doc
+ www0dir = $(docdir)
+-dist_www0_DATA = $(wwwsrc)/index.html $(wwwsrc)/commandline.html $(wwwsrc)/copying.html $(wwwsrc)/devicemanager.html $(wwwsrc)/faxtrouble.html $(wwwsrc)/gettinghelp.html $(wwwsrc)/hpscan.html $(wwwsrc)/mainttask.html $(wwwsrc)/plugins.html $(wwwsrc)/print.html $(wwwsrc)/printing.html $(wwwsrc)/printoptions.html $(wwwsrc)/printtroubleshooting.html $(wwwsrc)/scanning.html $(wwwsrc)/scantrouble.html $(wwwsrc)/sendfax.html $(wwwsrc)/setup.html $(wwwsrc)/systray.html $(wwwsrc)/troubleshooting.html $(wwwsrc)/uninstalling.html $(wwwsrc)/upgrading.html
++dist_www0_DATA = $(wwwsrc)/*.html
  www3dir = $(docdir)/styles
- dist_www3_DATA = $(wwwsrc)/styles/*
+-dist_www3_DATA = $(wwwsrc)/styles/*
++dist_www3_DATA = $(wwwsrc)/styles/*.css
  www4dir = $(docdir)/images
 -dist_www4_DATA = $(wwwsrc)/images/*
-+dist_www4_DATA = $(wwwsrc)/images/*.png
- www5dir = $(docdir)/supported_devices
- dist_www5_DATA = $(wwwsrc)/supported_devices/*
- www6dir = $(docdir)/tech_docs
--dist_www6_DATA = $(wwwsrc)/tech_docs/*
-+dist_www6_DATA = $(wwwsrc)/tech_docs/*.html
- www61dir = $(docdir)/tech_docs/man_pages
--dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*
-+dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*.html
- www7dir = $(docdir)/troubleshooting
- dist_www7_DATA = $(wwwsrc)/troubleshooting/*
++dist_www4_DATA = $(wwwsrc)/images/*.png $(wwwsrc)/images/*.ico
  endif
-@@ -131,7 +131,7 @@
- dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz
- dist_models_DATA = data/models/models.dat
- if GUI_BUILD
--dist_images_DATA = data/images/*
-+dist_images_DATA = data/images/*.png
- endif
- dist_pcl_DATA = data/pcl/align1_8xx.pcl.gz data/pcl/align1_9xx.pcl.gz data/pcl/align2_8xx.pcl.gz data/pcl/align3_8xx.pcl.gz data/pcl/align4_8xx.pcl.gz \
- 	data/pcl/align5_8xx.pcl.gz data/pcl/align2_9xx.pcl.gz data/pcl/align3_9xx.pcl.gz data/pcl/align4_450.pcl.gz data/pcl/align6_450.pcl.gz \
+ 
+ if HPLIP_BUILD
+@@ -89,10 +89,11 @@
+ hp_mkuri_LDADD = -ldl libhpmud.la
+ 
+ # hpmud.rules
+-rulesdir = /etc/udev/rules.d
+-dist_rules_DATA = data/rules/55-hpmud.rules data/rules/56-hpmud_support.rules
+-halpredir = /usr/share/hal/fdi/preprobe/10osvendor
+-dist_halpre_DATA = data/rules/20-hplip-devices.fdi
++# FreeBSD doesn't use udev so why install the rules?
++#rulesdir = /etc/udev/rules.d
++#dist_rules_DATA = data/rules/55-hpmud.rules data/rules/56-hpmud_support.rules
++#halpredir = /usr/share/hal/fdi/preprobe/10osvendor
++#dist_halpre_DATA = data/rules/20-hplip-devices.fdi
+ 
+ # hplip.conf
+ hplip_confdir = /etc/hp
diff --git a/print/hplip3/files/patch-Makefile.in b/print/hplip3/files/patch-Makefile.in
index f0c43469274f..410547300860 100644
--- a/print/hplip3/files/patch-Makefile.in
+++ b/print/hplip3/files/patch-Makefile.in
@@ -1,99 +1,44 @@
---- Makefile.in.orig	2008-02-09 10:06:41.000000000 +0800
-+++ Makefile.in	2008-03-16 01:24:58.000000000 +0800
-@@ -697,7 +697,7 @@
- dist_faxppdDATA_INSTALL = $(INSTALL_DATA)
- am__dist_hplip_DATA_DIST = scan/sane/hpaio.desc
- dist_hplipDATA_INSTALL = $(INSTALL_DATA)
--am__dist_images_DATA_DIST = data/images/*
-+am__dist_images_DATA_DIST = data/images/*.png
- dist_imagesDATA_INSTALL = $(INSTALL_DATA)
- am__dist_ldl_DATA_DIST = data/ldl/cb2pcal.ldl.gz \
- 	data/ldl/cb2pcal_done.ldl.gz data/ldl/cbbcal.ldl.gz \
-@@ -1190,7 +1190,7 @@
- dist_www242DATA_INSTALL = $(INSTALL_DATA)
- am__dist_www243_DATA_DIST = $(wwwsrc)/install/step4/suse/*
- dist_www243DATA_INSTALL = $(INSTALL_DATA)
--am__dist_www251_DATA_DIST = $(wwwsrc)/install/manual/*
-+am__dist_www251_DATA_DIST = $(wwwsrc)/install/manual/*.html
- dist_www251DATA_INSTALL = $(INSTALL_DATA)
- am__dist_www252_DATA_DIST = $(wwwsrc)/install/manual/distros/*
- dist_www252DATA_INSTALL = $(INSTALL_DATA)
-@@ -1198,13 +1198,13 @@
- dist_www261DATA_INSTALL = $(INSTALL_DATA)
- am__dist_www3_DATA_DIST = $(wwwsrc)/styles/*
+--- Makefile.in.old	2009-06-22 23:34:25.000000000 -0500
++++ Makefile.in	2009-06-22 23:41:26.000000000 -0500
+@@ -1980,22 +1980,11 @@
+ 	data/rules/56-hpmud_support.rules
+ dist_rulesDATA_INSTALL = $(INSTALL_DATA)
+ dist_unrelDATA_INSTALL = $(INSTALL_DATA)
+-am__dist_www0_DATA_DIST = $(wwwsrc)/index.html \
+-	$(wwwsrc)/commandline.html $(wwwsrc)/copying.html \
+-	$(wwwsrc)/devicemanager.html $(wwwsrc)/faxtrouble.html \
+-	$(wwwsrc)/gettinghelp.html $(wwwsrc)/hpscan.html \
+-	$(wwwsrc)/mainttask.html $(wwwsrc)/plugins.html \
+-	$(wwwsrc)/print.html $(wwwsrc)/printing.html \
+-	$(wwwsrc)/printoptions.html \
+-	$(wwwsrc)/printtroubleshooting.html $(wwwsrc)/scanning.html \
+-	$(wwwsrc)/scantrouble.html $(wwwsrc)/sendfax.html \
+-	$(wwwsrc)/setup.html $(wwwsrc)/systray.html \
+-	$(wwwsrc)/troubleshooting.html $(wwwsrc)/uninstalling.html \
+-	$(wwwsrc)/upgrading.html
++am__dist_www0_DATA_DIST = $(wwwsrc)/*.html
+ dist_www0DATA_INSTALL = $(INSTALL_DATA)
+-am__dist_www3_DATA_DIST = $(wwwsrc)/styles/*
++am__dist_www3_DATA_DIST = $(wwwsrc)/styles/*.css
  dist_www3DATA_INSTALL = $(INSTALL_DATA)
 -am__dist_www4_DATA_DIST = $(wwwsrc)/images/*
-+am__dist_www4_DATA_DIST = $(wwwsrc)/images/*.png
++am__dist_www4_DATA_DIST = $(wwwsrc)/images/*.png $(wwwsrc)/images/*.ico
  dist_www4DATA_INSTALL = $(INSTALL_DATA)
- am__dist_www5_DATA_DIST = $(wwwsrc)/supported_devices/*
- dist_www5DATA_INSTALL = $(INSTALL_DATA)
--am__dist_www6_DATA_DIST = $(wwwsrc)/tech_docs/*
-+am__dist_www6_DATA_DIST = $(wwwsrc)/tech_docs/*.html
- dist_www6DATA_INSTALL = $(INSTALL_DATA)
--am__dist_www61_DATA_DIST = $(wwwsrc)/tech_docs/man_pages/*
-+am__dist_www61_DATA_DIST = $(wwwsrc)/tech_docs/man_pages/*.html
- dist_www61DATA_INSTALL = $(INSTALL_DATA)
- am__dist_www7_DATA_DIST = $(wwwsrc)/troubleshooting/*
- dist_www7DATA_INSTALL = $(INSTALL_DATA)
-@@ -1425,7 +1425,7 @@
- @DOC_BUILD_TRUE@www243dir = $(docdir)/install/step4/suse
- @DOC_BUILD_TRUE@dist_www243_DATA = $(wwwsrc)/install/step4/suse/*
- @DOC_BUILD_TRUE@www251dir = $(docdir)/install/manual
--@DOC_BUILD_TRUE@dist_www251_DATA = $(wwwsrc)/install/manual/*
-+@DOC_BUILD_TRUE@dist_www251_DATA = $(wwwsrc)/install/manual/*.html
- @DOC_BUILD_TRUE@www252dir = $(docdir)/install/manual/distros
- @DOC_BUILD_TRUE@dist_www252_DATA = $(wwwsrc)/install/manual/distros/*
- @DOC_BUILD_TRUE@www261dir = $(docdir)/install/install
-@@ -1433,13 +1433,13 @@
- @DOC_BUILD_TRUE@www3dir = $(docdir)/styles
- @DOC_BUILD_TRUE@dist_www3_DATA = $(wwwsrc)/styles/*
- @DOC_BUILD_TRUE@www4dir = $(docdir)/images
--@DOC_BUILD_TRUE@dist_www4_DATA = $(wwwsrc)/images/*
-+@DOC_BUILD_TRUE@dist_www4_DATA = $(wwwsrc)/images/*.png
- @DOC_BUILD_TRUE@www5dir = $(docdir)/supported_devices
- @DOC_BUILD_TRUE@dist_www5_DATA = $(wwwsrc)/supported_devices/*
- @DOC_BUILD_TRUE@www6dir = $(docdir)/tech_docs
--@DOC_BUILD_TRUE@dist_www6_DATA = $(wwwsrc)/tech_docs/*
-+@DOC_BUILD_TRUE@dist_www6_DATA = $(wwwsrc)/tech_docs/*.html
- @DOC_BUILD_TRUE@www61dir = $(docdir)/tech_docs/man_pages
--@DOC_BUILD_TRUE@dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*
-+@DOC_BUILD_TRUE@dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*.html
- @DOC_BUILD_TRUE@www7dir = $(docdir)/troubleshooting
- @DOC_BUILD_TRUE@dist_www7_DATA = $(wwwsrc)/troubleshooting/*
- @HPLIP_BUILD_TRUE@dist_hplip_DATA = scan/sane/hpaio.desc
-@@ -1489,7 +1489,7 @@
- @HPLIP_BUILD_TRUE@localzdir = $(hplipdir)/data/localization
- @HPLIP_BUILD_TRUE@dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz
- @HPLIP_BUILD_TRUE@dist_models_DATA = data/models/models.dat
--@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_images_DATA = data/images/*
-+@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_images_DATA = data/images/*.png
- @HPLIP_BUILD_TRUE@dist_pcl_DATA = data/pcl/align1_8xx.pcl.gz data/pcl/align1_9xx.pcl.gz data/pcl/align2_8xx.pcl.gz data/pcl/align3_8xx.pcl.gz data/pcl/align4_8xx.pcl.gz \
- @HPLIP_BUILD_TRUE@	data/pcl/align5_8xx.pcl.gz data/pcl/align2_9xx.pcl.gz data/pcl/align3_9xx.pcl.gz data/pcl/align4_450.pcl.gz data/pcl/align6_450.pcl.gz \
- @HPLIP_BUILD_TRUE@	data/pcl/colorcal1_450.pcl.gz data/pcl/colorcal2_450.pcl.gz data/pcl/crbcal.pcl.gz data/pcl/crcaldone.pcl.gz data/pcl/crcbcal.pcl.gz data/pcl/crccal.pcl.gz \
-@@ -2170,7 +2170,7 @@
- .SUFFIXES: .c .cpp .lo .o .obj
- am--refresh:
- 	@:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/unreleased.inc $(srcdir)/foomatic_drv.inc $(am__configure_deps)
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/unreleased.inc $(srcdir)/foomatic_drv.inc
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
-@@ -2197,7 +2197,7 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	$(SHELL) ./config.status --recheck
+ docDATA_INSTALL = $(INSTALL_DATA)
+ hplip_confDATA_INSTALL = $(INSTALL_DATA)
+@@ -3635,10 +3624,11 @@
+ @HPLIP_BUILD_TRUE@hp_mkuri_LDADD =  libhpmud.la
  
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure:
- 	cd $(srcdir) && $(AUTOCONF)
- $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
- 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-@@ -6210,7 +6210,7 @@
- 	install-dist_pcardSCRIPTS install-dist_pclDATA \
- 	install-dist_pluginsSCRIPTS install-dist_postscriptDATA \
- 	install-dist_prntSCRIPTS install-dist_ripSCRIPTS \
--	install-dist_rulesDATA install-dist_scanSCRIPTS \
-+	install-dist_scanSCRIPTS \
- 	install-dist_uiSCRIPTS install-dist_unrelDATA \
- 	install-dist_www0DATA install-dist_www1DATA \
- 	install-dist_www21DATA install-dist_www22DATA \
+ # hpmud.rules
+-@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
+-@HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/55-hpmud.rules data/rules/56-hpmud_support.rules
+-@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor
+-@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi
++# same applys here.
++#@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
++#@HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/55-hpmud.rules data/rules/56-hpmud_support.rules
++#@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 = /usr/local/etc/hp
diff --git a/print/hplip3/files/patch-base_utils.py b/print/hplip3/files/patch-base_utils.py
deleted file mode 100644
index 92d4757c8cee..000000000000
--- a/print/hplip3/files/patch-base_utils.py
+++ /dev/null
@@ -1,53 +0,0 @@
---- base/utils.py.orig	Wed Oct 10 00:23:07 2007
-+++ base/utils.py	Wed Oct 10 00:27:04 2007
-@@ -54,6 +54,50 @@
- 
-     return callable
- 
-+# For pidfile locking (must be "static" and global to the whole app)
-+prv_pidfile = None
-+prv_pidfile_name = ""
-+
-+def get_pidfile_lock (a_pidfile_name=""):
-+    """ Call this to either lock the pidfile, or to update it after a fork()
-+        Credit: Henrique M. Holschuh <hmh@debian.org>
-+    """
-+    global prv_pidfile
-+    global prv_pidfile_name
-+    if prv_pidfile_name == "":
-+        try:
-+            prv_pidfile_name = a_pidfile_name
-+            prv_pidfile = os.fdopen(os.open(prv_pidfile_name, os.O_RDWR | os.O_CREAT, 0644), 'r+')
-+            fcntl.fcntl(prv_pidfile.fileno(), fcntl.F_SETFD, fcntl.FD_CLOEXEC)
-+            while 1:
-+                try:
-+                    fcntl.flock(prv_pidfile.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
-+                except (OSError, IOError), e:
-+                    if e.errno == errno.EINTR:
-+                        continue
-+                    elif e.errno == errno.EWOULDBLOCK:
-+                        try:
-+                            prv_pidfile.seek(0)
-+                            otherpid = int(prv_pidfile.readline(), 10)
-+                            sys.stderr.write ("can't lock %s, running daemon's pid may be %d\n" % (prv_pidfile_name, otherpid))
-+                        except (OSError, IOError), e:
-+                            sys.stderr.write ("error reading pidfile %s: (%d) %s\n" % (prv_pidfile_name, e.errno, e.strerror))
-+
-+                        sys.exit(1)
-+                    sys.stderr.write ("can't lock %s: (%d) %s\n" % (prv_pidfile_name, e.errno, e.strerror))
-+                    sys.exit(1)
-+                break
-+        except (OSError, IOError), e:
-+            sys.stderr.write ("can't open pidfile %s: (%d) %s\n" % (prv_pidfile_name, e.errno, e.strerror))
-+            sys.exit(1)
-+    try:
-+        prv_pidfile.seek(0)
-+        prv_pidfile.write("%d\n" % (os.getpid()))
-+        prv_pidfile.flush()
-+        prv_pidfile.truncate()
-+    except (OSError, IOError), e:
-+        log.error("can't update pidfile %s: (%d) %s\n" % (prv_pidfile_name, e.errno, e.strerror))
-+
- def daemonize (stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'):
-     """
-     Credit: Jürgen Hermann, Andy Gimblett, and Noah Spurrier
diff --git a/print/hplip3/files/patch-check.py b/print/hplip3/files/patch-check.py
new file mode 100644
index 000000000000..554e1ac5d836
--- /dev/null
+++ b/print/hplip3/files/patch-check.py
@@ -0,0 +1,20 @@
+--- check.py.bak	2009-07-31 05:33:11.000000000 -0500
++++ check.py	2009-07-31 05:34:36.000000000 -0500
+@@ -337,7 +337,7 @@
+             num_errors += 1
+ 
+     if cups_ok:
+-        cups_conf = '/etc/cups/cupsd.conf'
++        cups_conf = '/usr/local/etc/cups/cupsd.conf'
+ 
+         try:
+             f = file(cups_conf, 'r')
+@@ -600,7 +600,7 @@
+                 #log.info("Installed in HPLIP?: %s" % x)
+                 log.info("Device URI: %s" % device_uri)
+ 
+-                ppd = os.path.join('/etc/cups/ppd', printer_name + '.ppd')
++                ppd = os.path.join('/usr/local/etc/cups/ppd', printer_name + '.ppd')
+ 
+                 if os.path.exists(ppd):
+                     log.info("PPD: %s" % ppd)
diff --git a/print/hplip3/files/patch-cups.py b/print/hplip3/files/patch-cups.py
new file mode 100644
index 000000000000..a04535bff76a
--- /dev/null
+++ b/print/hplip3/files/patch-cups.py
@@ -0,0 +1,23 @@
+--- prnt/cups.py.bak	2009-07-31 05:28:04.000000000 -0500
++++ prnt/cups.py	2009-07-31 05:29:26.000000000 -0500
+@@ -202,9 +202,9 @@
+ 
+ def getAllowableMIMETypes():
+     """
+-        Scan all /etc/cups/*.convs files for allowable file formats.
++        Scan all /usr/local/etc/cups/*.convs files for allowable file formats.
+     """
+-    files = glob.glob("/etc/cups/*.convs")
++    files = glob.glob("/usr/local/etc/cups/*.convs")
+ 
+     allowable_mime_types = []
+ 
+@@ -527,7 +527,7 @@
+ 
+ 
+ def getErrorLogLevel():
+-    cups_conf = '/etc/cups/cupsd.conf'
++    cups_conf = '/usr/local/etc/cups/cupsd.conf'
+     try:
+         f = file(cups_conf, 'r')
+     except OSError:
diff --git a/print/hplip3/files/patch-hpssd.py b/print/hplip3/files/patch-hpssd.py
deleted file mode 100644
index f3e7a9c8b22e..000000000000
--- a/print/hplip3/files/patch-hpssd.py
+++ /dev/null
@@ -1,21 +0,0 @@
---- hpssd.py	Fri Oct 12 19:42:15 2007
-+++ /usr/local/sbin/hpssd	Fri Oct 12 23:59:31 2007
-@@ -664,6 +664,10 @@
-     if prop.daemonize:
-         utils.daemonize()
- 
-+    # Lock pidfile before we muck around with system state
-+    # Patch by Henrique M. Holschuh <hmh@debian.org>
-+    utils.get_pidfile_lock(os.path.join(sys_cfg.dirs.run, 'hpssd.pid'))
-+
-     # hpssd server dispatcher object
-     try:
-         server = hpssd_server(prop.hpssd_host, prop.hpssd_port)
-@@ -688,6 +692,7 @@
- 
-         log.debug("Cleaning up...")
-     finally:
-+        os.remove(os.path.join(sys_cfg.dirs.run, 'hpssd.pid'))
-         server.close()
-         return 0
- 
diff --git a/print/hplip3/files/patch-io-hpmud-musb.c b/print/hplip3/files/patch-io-hpmud-musb.c
index 0333cdaa0372..8d87a88df271 100644
--- a/print/hplip3/files/patch-io-hpmud-musb.c
+++ b/print/hplip3/files/patch-io-hpmud-musb.c
@@ -1,12 +1,18 @@
---- io/hpmud/musb.c.orig	2008-01-23 01:27:15.000000000 +0100
-+++ io/hpmud/musb.c	2009-03-25 17:01:30.000000000 +0100
-@@ -123,8 +123,10 @@
+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)
++      if (ret==0
++#ifdef __FreeBSD__
++       || 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
++         /* 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);
diff --git a/print/hplip3/pkg-message b/print/hplip3/files/pkg-message.in
index 9ebb2c083a13..63524932c62c 100644
--- a/print/hplip3/pkg-message
+++ b/print/hplip3/files/pkg-message.in
@@ -13,9 +13,9 @@ below.
 
 **************** UPGRADE FROM 1.X NOTICE *****************
 
-Add the following to your rc.conf:
-
-hpssd_enable="YES"
+*Please note, the new version does not need a rc.d startup file
+hplip now has it's own toolbox icon which gets started,
+during system startup.
 
 So all you have to do if you have a custom ruleset setup
 is add the following to that ruleset in devfs.rules:
diff --git a/print/hplip3/pkg-install b/print/hplip3/pkg-install
deleted file mode 100644
index e6f2dc26c7ed..000000000000
--- a/print/hplip3/pkg-install
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-USER=hplip
-GROUP=operator
-UID=116
-
-DLLFILE=${PKG_PREFIX}/etc/sane.d/dll.conf
-
-case $2 in
-POST-INSTALL)
-	echo "hpaio" >> ${DLLFILE}
-	;;
-
-POST-DEINSTALL)
-	cp ${DLLFILE} ${DLLFILE}.orig
-	cat ${DLLFILE}.orig | grep -v hpaio > ${DLLFILE}
-	rm ${DLLFILE}.orig
-	;;
-esac
diff --git a/print/hplip3/pkg-plist b/print/hplip3/pkg-plist
index 76e49a3d8bbf..e910a3601105 100644
--- a/print/hplip3/pkg-plist
+++ b/print/hplip3/pkg-plist
@@ -2,25 +2,38 @@ bin/hp-align
 bin/hp-check
 bin/hp-clean
 bin/hp-colorcal
+bin/hp-devicesettings
 bin/hp-fab
+bin/hp-faxsetup
 bin/hp-firmware
 bin/hp-info
 bin/hp-levels
+bin/hp-linefeedcal
 bin/hp-makecopies
 bin/hp-makeuri
+bin/hp-mkuri
+bin/hp-pkservice
+bin/hp-plugin
+bin/hp-pqdiag
 bin/hp-print
+bin/hp-printsettings
 bin/hp-probe
+bin/hp-query
 bin/hp-scan
 bin/hp-sendfax
 bin/hp-setup
+bin/hp-systray
 bin/hp-testpage
 bin/hp-timedate
 bin/hp-toolbox
 bin/hp-unload
+bin/hp-wificonfig
 bin/hpijs
+sbin/hpssd
 @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 %D/etc/hp/hplip.conf ] ; then cp -p %D/%F %B/hplip.conf; fi
+@exec if [ ! -f %B/hplip.conf ]; then cp -p %D/%F %B/hplip.conf; fi
+etc/xdg/autostart/hplip-systray.desktop
 lib/libhpip.la
 lib/libhpip.so
 lib/libhpip.so.0
@@ -38,561 +51,392 @@ lib/libhpmud.so.0
 lib/sane/libsane-hpaio.la
 lib/sane/libsane-hpaio.so
 lib/sane/libsane-hpaio.so.1
+libexec/cups/filter/hpcac
+libexec/cups/filter/hpcups
+libexec/cups/filter/hpcupsfax
+libexec/cups/filter/hplipjs
 libexec/cups/backend/hp
 libexec/cups/backend/hpfax
-libexec/cups/driver/hpijs.drv
+libexec/cups/driver/hpcups.drv
 libexec/cups/filter/foomatic-rip-hplip
-sbin/hpssd
-share/applications/hplip.desktop
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/README_LIBJPG
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/about.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/contacts.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/downloads.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/faqs.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/features.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/build.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/faxing.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/install.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/io.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/known.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/negative.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/other.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/pcard.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/printing.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/scanning.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/toolbox.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/uninstall.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Screenshot-xsane.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/back.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/button.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_device_list.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_left.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_model_list.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_opening.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_printer_model.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/download.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_1.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_2.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_3.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_4.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/gs_hpijs.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hp-tux-printer.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hp_invent_logo.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hplip_overview.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hpliplogo.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hplogo.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hplogo2.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/linux_printing_logo.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/linuxlogo.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/network_appssocket.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/network_device_list.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/network_device_uri.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/network_model_list.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/osi_certified.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/python-logo.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/rest2web.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_functions_copies.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_functions_fax.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_functions_unload.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_functions_xsane.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_hp_setup_step1.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_hp_setup_step2.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_hp_setup_step3.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_hp_setup_step4.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_hp_setup_step5.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_hp_setup_step6.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_installer_1.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_installer_10_postfix.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_installer_11.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_installer_12.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_installer_13.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_installer_14.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_installer_15.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_installer_2.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_installer_3.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_installer_4.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_installer_5.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_installer_6.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_installer_7_postfix.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_installer_9_postfix.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_toolbox_emailalerts.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_toolbox_functions.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_toolbox_functions_autorefresh.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_toolbox_functions_commands.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_toolbox_print_control.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_toolbox_print_functions.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_toolbox_print_print.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_toolbox_print_print1.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_toolbox_print_settings.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_toolbox_settings.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_toolbox_status.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_toolbox_supplies.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_lg_toolbox_tools.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_functions_copies.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_functions_fax.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_functions_unload.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_functions_xsane.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_hp_setup_step1.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_hp_setup_step2.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_hp_setup_step3.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_hp_setup_step4.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_hp_setup_step5.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_hp_setup_step6.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_installer_1.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_installer_10_postfix.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_installer_11.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_installer_12.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_installer_13.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_installer_14.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_installer_15.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_installer_2.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_installer_3.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_installer_4.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_installer_5.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_installer_6.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_installer_7_postfix.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_installer_9_postfix.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_toolbox_emailalerts.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_toolbox_functions.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_toolbox_functions_autorefresh.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_toolbox_functions_commands.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_toolbox_print_control.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_toolbox_print_functions.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_toolbox_print_print.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_toolbox_print_print1.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_toolbox_print_settings.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_toolbox_settings.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_toolbox_status.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_toolbox_supplies.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/screenshots_sm_toolbox_tools.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/sflogo.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/topbar.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/tux.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/tuxlogo.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/tuxlogo2.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/view.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_hardware.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_opening_hw.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_other_configure.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_other_kind.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_other_printer.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_printer_model.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/installtree.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/install/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/configure.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/centos.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/debian.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/eeepc.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/fedora_core.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/freebsd.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/gentoo.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/igos.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/lfs.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/linspire.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/mac.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/mandriva.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/mepis.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/novell.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/other.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/pclinuxos.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/redhat.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/redhatenterprise.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/slackware.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/ubuntu.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/windows.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros/xandros.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/download.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/final.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/hp_setup.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/make.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/make_install.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/permissions.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/apt.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/rpm.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/debian.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/fc4.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/freebsd.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/mandriva06.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/other.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/slackware.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/suse10.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/ubuntu510.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/ubuntu606.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step3/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step4/cups/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step4/cups/local.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step4/cups/net.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step4/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step4/setup/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step4/setup/local.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step4/setup/net.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step4/suse/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/legal.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/license.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/mailing_lists.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/other_support.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/release_notes.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/screenshots.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/styles/default.css
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/styles/rest.css
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/support_statement.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/color_laser.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/color_laser_mfp.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/combined.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/edgeline.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/inkjet.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/inkjet_aio.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/laser.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/mono_laser_mfp.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/photosmart.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/scanjet.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/unsupported.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/system_requirements.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/device_classes.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/hpijs.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/align.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/check.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/clean.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/colorcal.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/fab.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/firmware.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/hpssd.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/info.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/install.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/levels.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makecopies.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makeuri.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/print.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/probe.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/scan.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/sendfax.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/setup.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/testpage.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/timedate.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/toolbox.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/unload.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/overview.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/page_sizes.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/printable_areas.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/tarball_install.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/build.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/distro.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/faxing.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/install.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/io.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/network.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/other.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/parallel.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/pcard.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/printing.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/scanning.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/toolbox.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/COPYING
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/README_LIBJPG
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/commandline.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/copying.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/copyright
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/devicemanager.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/faxtrouble.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/gettinghelp.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/hpscan.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/images/favicon.ico
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/images/print.png
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/images/toolbox_actions.png
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/images/toolbox_fax.png
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/images/toolbox_print_control.png
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/images/toolbox_print_settings.png
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/images/toolbox_status.png
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/images/toolbox_supplies.png
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/images/xsane.png
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/index.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/mainttask.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/plugins.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/print.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/printing.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/printoptions.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/printtroubleshooting.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/scanning.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/scantrouble.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/sendfax.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/setup.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/styles/css.css
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/systray.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/troubleshooting.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/uninstalling.html
+%%PORTDOCS%%%%DOCSDIR%%-3.9.6b/upgrading.html
 %%DATADIR%%/__init__.py
 %%DATADIR%%/align.py
 %%DATADIR%%/base/__init__.py
-%%DATADIR%%/base/async.py
-%%DATADIR%%/base/async_qt.py
 %%DATADIR%%/base/codes.py
 %%DATADIR%%/base/device.py
 %%DATADIR%%/base/dime.py
 %%DATADIR%%/base/exif.py
 %%DATADIR%%/base/g.py
 %%DATADIR%%/base/imagesize.py
-%%DATADIR%%/base/kirbybase.py
+%%DATADIR%%/base/ldif.py
 %%DATADIR%%/base/logger.py
 %%DATADIR%%/base/magic.py
 %%DATADIR%%/base/maint.py
 %%DATADIR%%/base/mdns.py
 %%DATADIR%%/base/mfpdtf.py
 %%DATADIR%%/base/models.py
-%%DATADIR%%/base/msg.py
+%%DATADIR%%/base/module.py
 %%DATADIR%%/base/pexpect.py
+%%DATADIR%%/base/pkit.py
 %%DATADIR%%/base/pml.py
-%%DATADIR%%/base/service.py
 %%DATADIR%%/base/slp.py
 %%DATADIR%%/base/status.py
 %%DATADIR%%/base/strings.py
 %%DATADIR%%/base/tui.py
 %%DATADIR%%/base/utils.py
+%%DATADIR%%/base/vcard.py
+%%DATADIR%%/base/wifi.py
 %%DATADIR%%/check.py
 %%DATADIR%%/clean.py
 %%DATADIR%%/colorcal.py
 %%DATADIR%%/copier/__init__.py
 %%DATADIR%%/copier/copier.py
-%%DATADIR%%/data/images/120.png
-%%DATADIR%%/data/images/COLOR_INKJET_PRINTER_CP1700.png
-%%DATADIR%%/data/images/CP_1700.png
-%%DATADIR%%/data/images/DESKJET_1120C.png
-%%DATADIR%%/data/images/DESKJET_1220C.png
-%%DATADIR%%/data/images/DESKJET_2500C.png
-%%DATADIR%%/data/images/DESKJET_3820.png
-%%DATADIR%%/data/images/DESKJET_5740.png
-%%DATADIR%%/data/images/DESKJET_610.png
-%%DATADIR%%/data/images/DESKJET_630C.png
-%%DATADIR%%/data/images/DESKJET_650C.png
-%%DATADIR%%/data/images/DESKJET_840C.png
-%%DATADIR%%/data/images/DESKJET_916C.png
-%%DATADIR%%/data/images/DESKJET_9600.png
-%%DATADIR%%/data/images/DESKJET_960C.png
-%%DATADIR%%/data/images/DESKJET_970C.png
-%%DATADIR%%/data/images/DESKJET_990C.png
-%%DATADIR%%/data/images/DESKJET_995C.png
-%%DATADIR%%/data/images/Deskjet_3740.png
-%%DATADIR%%/data/images/Deskjet_5400_series.png
-%%DATADIR%%/data/images/Deskjet_5700.png
-%%DATADIR%%/data/images/Deskjet_5900_series.png
-%%DATADIR%%/data/images/Deskjet_6500.png
-%%DATADIR%%/data/images/Deskjet_6800.png
-%%DATADIR%%/data/images/HP_2000C.png
-%%DATADIR%%/data/images/HP_2500C.png
-%%DATADIR%%/data/images/HP_BI_3000.png
-%%DATADIR%%/data/images/HP_Business_Inkjet_1200.png
-%%DATADIR%%/data/images/HP_Color_LaserJet_1500.png
-%%DATADIR%%/data/images/HP_Color_LaserJet_2840.png
-%%DATADIR%%/data/images/HP_Color_LaserJet_4500.png
-%%DATADIR%%/data/images/HP_Color_LaserJet_4730mfp.png
-%%DATADIR%%/data/images/HP_Color_LaserJet_8550.png
-%%DATADIR%%/data/images/HP_LJ1xxx.png
-%%DATADIR%%/data/images/HP_LaserJet_1012.png
-%%DATADIR%%/data/images/HP_LaserJet_1220.png
-%%DATADIR%%/data/images/HP_LaserJet_3200M.png
-%%DATADIR%%/data/images/HP_LaserJet_3300_3310_3320.png
-%%DATADIR%%/data/images/HP_LaserJet_4000.png
-%%DATADIR%%/data/images/HP_LaserJet_4100_MFP.png
-%%DATADIR%%/data/images/HP_LaserJet_4M.png
-%%DATADIR%%/data/images/HP_LaserJet_5Si.png
-%%DATADIR%%/data/images/HP_LaserJet_6MP.png
-%%DATADIR%%/data/images/HP_LaserJet_8100_Series.png
-%%DATADIR%%/data/images/HP_LaserJet_9000_MFP.png
-%%DATADIR%%/data/images/HP_LaserJet_9040_MFP.png
-%%DATADIR%%/data/images/HP_LaserJet_9500dn.png
-%%DATADIR%%/data/images/HP_Officejet_Pro_L7700.png
-%%DATADIR%%/data/images/HPmenu.png
-%%DATADIR%%/data/images/LASERJET_3500.png
-%%DATADIR%%/data/images/LASERJET_4650.png
-%%DATADIR%%/data/images/LASERJET_4650dtn.png
-%%DATADIR%%/data/images/LASERJET_5500.png
-%%DATADIR%%/data/images/LASERJET_5500dtn.png
-%%DATADIR%%/data/images/LASERJET_5550.png
-%%DATADIR%%/data/images/LASERJET_5550DTN.png
-%%DATADIR%%/data/images/OFFICEJET_PRO_1150C.png
-%%DATADIR%%/data/images/OfficeJet_5105.png
-%%DATADIR%%/data/images/OfficeJet_6100_Series.png
-%%DATADIR%%/data/images/OfficeJet_G85.png
-%%DATADIR%%/data/images/OfficeJet_Series_300.png
-%%DATADIR%%/data/images/Officejet_6150_Series.png
-%%DATADIR%%/data/images/Officejet_6200_series.png
-%%DATADIR%%/data/images/Officejet_7200_series.png
-%%DATADIR%%/data/images/Officejet_9100_series.png
-%%DATADIR%%/data/images/PHOTOSMART_100.png
-%%DATADIR%%/data/images/PHOTOSMART_1218.png
-%%DATADIR%%/data/images/PHOTOSMART_1315.png
-%%DATADIR%%/data/images/PHOTOSMART_P1100.png
-%%DATADIR%%/data/images/PSC_900_Series.png
-%%DATADIR%%/data/images/Photosmart_2600_series.png
-%%DATADIR%%/data/images/Photosmart_2700_series.png
-%%DATADIR%%/data/images/Photosmart_3300_series.png
-%%DATADIR%%/data/images/Photosmart_370_series.png
-%%DATADIR%%/data/images/Photosmart_7400_series.png
-%%DATADIR%%/data/images/Photosmart_8050.png
-%%DATADIR%%/data/images/Photosmart_8100_series.png
-%%DATADIR%%/data/images/Photosmart_8250.png
-%%DATADIR%%/data/images/Photosmart_8400_series.png
-%%DATADIR%%/data/images/Photosmart_8750_series.png
-%%DATADIR%%/data/images/Photosmart_C3100.png
-%%DATADIR%%/data/images/Photosmart_C4100.png
-%%DATADIR%%/data/images/Photosmart_C5100.png
-%%DATADIR%%/data/images/Photosmart_C6100.png
-%%DATADIR%%/data/images/Photosmart_D5060.png
-%%DATADIR%%/data/images/Photosmart_D5100.png
-%%DATADIR%%/data/images/Photosmart_D6160.png
-%%DATADIR%%/data/images/Photosmart_D7100.png
-%%DATADIR%%/data/images/Photosmart_D7300.png
-%%DATADIR%%/data/images/Photosmart_Pro_B8300.png
-%%DATADIR%%/data/images/Photosmart_Pro_B9180.png
-%%DATADIR%%/data/images/Photosmart_a310.png
-%%DATADIR%%/data/images/Photosmart_a510.png
-%%DATADIR%%/data/images/Photosmart_a710.png
-%%DATADIR%%/data/images/add-user-disabled.png
-%%DATADIR%%/data/images/add-user-quick-disabled.png
-%%DATADIR%%/data/images/add-user-quick.png
-%%DATADIR%%/data/images/add-user.png
-%%DATADIR%%/data/images/add-users-disabled.png
-%%DATADIR%%/data/images/add-users.png
-%%DATADIR%%/data/images/align10.png
-%%DATADIR%%/data/images/audio.png
-%%DATADIR%%/data/images/bmp.png
-%%DATADIR%%/data/images/busy.png
-%%DATADIR%%/data/images/busy_small.png
-%%DATADIR%%/data/images/clean.png
-%%DATADIR%%/data/images/color-adj.png
-%%DATADIR%%/data/images/cp1160.png
-%%DATADIR%%/data/images/default_business_inkjet.png
-%%DATADIR%%/data/images/default_deskjet.png
-%%DATADIR%%/data/images/default_laserjet.png
-%%DATADIR%%/data/images/default_officejet.png
-%%DATADIR%%/data/images/default_photosmart.png
-%%DATADIR%%/data/images/default_printer.png
-%%DATADIR%%/data/images/default_psc.png
-%%DATADIR%%/data/images/desket_5650.png
-%%DATADIR%%/data/images/deskjet_3200.png
-%%DATADIR%%/data/images/deskjet_3320.png
-%%DATADIR%%/data/images/deskjet_3420.png
-%%DATADIR%%/data/images/deskjet_3425.png
-%%DATADIR%%/data/images/deskjet_3500.png
-%%DATADIR%%/data/images/deskjet_3600.png
-%%DATADIR%%/data/images/deskjet_3840.png
-%%DATADIR%%/data/images/deskjet_5100.png
-%%DATADIR%%/data/images/deskjet_5550.png
-%%DATADIR%%/data/images/deskjet_5552.png
-%%DATADIR%%/data/images/deskjet_5600.png
-%%DATADIR%%/data/images/deskjet_6120.png
-%%DATADIR%%/data/images/deskjet_D2360.png
-%%DATADIR%%/data/images/dj350.png
-%%DATADIR%%/data/images/dj450.png
-%%DATADIR%%/data/images/down-disabled.png
-%%DATADIR%%/data/images/down-user-disabled.png
-%%DATADIR%%/data/images/down-user.png
-%%DATADIR%%/data/images/down.png
-%%DATADIR%%/data/images/download-small-disabled.png
-%%DATADIR%%/data/images/download-small.png
-%%DATADIR%%/data/images/download.png
-%%DATADIR%%/data/images/edit-disabled.png
-%%DATADIR%%/data/images/edit.png
-%%DATADIR%%/data/images/error.png
-%%DATADIR%%/data/images/error_small.png
-%%DATADIR%%/data/images/fab.png
-%%DATADIR%%/data/images/fax-disabled.png
-%%DATADIR%%/data/images/fax.png
-%%DATADIR%%/data/images/fax_icon.png
-%%DATADIR%%/data/images/fax_icon_disabled.png
-%%DATADIR%%/data/images/folder_open.png
-%%DATADIR%%/data/images/folder_remove.png
-%%DATADIR%%/data/images/gif.png
-%%DATADIR%%/data/images/h-kc-2.png
-%%DATADIR%%/data/images/h-kc-3.png
-%%DATADIR%%/data/images/help.png
-%%DATADIR%%/data/images/hp-tux-printer.png
-%%DATADIR%%/data/images/hp_LaserJet_1200.png
-%%DATADIR%%/data/images/hp_LaserJet_2100.png
-%%DATADIR%%/data/images/hp_LaserJet_3015.png
-%%DATADIR%%/data/images/hp_LaserJet_3020.png
-%%DATADIR%%/data/images/hp_LaserJet_4345_mfp.png
-%%DATADIR%%/data/images/hp_LaserJet_5000.png
-%%DATADIR%%/data/images/hp_LaserJet_8000.png
-%%DATADIR%%/data/images/hp_business_inkjet_1100.png
-%%DATADIR%%/data/images/hp_business_inkjet_2200.png
-%%DATADIR%%/data/images/hp_business_inkjet_2600.png
-%%DATADIR%%/data/images/hp_business_inkjet_3000.png
-%%DATADIR%%/data/images/hp_color_LaserJet_2550.png
-%%DATADIR%%/data/images/hp_color_LaserJet_3700.png
-%%DATADIR%%/data/images/hp_color_LaserJet_4600.png
-%%DATADIR%%/data/images/hp_color_LaserJet_9500.png
-%%DATADIR%%/data/images/hp_deskjet_9300.png
-%%DATADIR%%/data/images/hp_laserjet_3050.png
-%%DATADIR%%/data/images/hp_laserjet_m2727_mfp.png
-%%DATADIR%%/data/images/hp_laserjet_p2015.png
-%%DATADIR%%/data/images/icon_align.png
-%%DATADIR%%/data/images/icon_battery.png
-%%DATADIR%%/data/images/icon_clean.png
-%%DATADIR%%/data/images/icon_colorcal.png
-%%DATADIR%%/data/images/icon_cups.png
-%%DATADIR%%/data/images/icon_ews.png
-%%DATADIR%%/data/images/icon_fax.png
-%%DATADIR%%/data/images/icon_info.png
-%%DATADIR%%/data/images/icon_linefeed_cal.png
-%%DATADIR%%/data/images/icon_lporg.png
-%%DATADIR%%/data/images/icon_pq_diag.png
-%%DATADIR%%/data/images/icon_settings.png
-%%DATADIR%%/data/images/icon_support.png
-%%DATADIR%%/data/images/icon_support2.png
-%%DATADIR%%/data/images/icon_testpage.png
-%%DATADIR%%/data/images/icon_toner_cartridge.png
-%%DATADIR%%/data/images/idle.png
-%%DATADIR%%/data/images/info.png
-%%DATADIR%%/data/images/inkdrop.png
-%%DATADIR%%/data/images/inkdrop_small.png
-%%DATADIR%%/data/images/jpg.png
-%%DATADIR%%/data/images/laserjet_2410.png
-%%DATADIR%%/data/images/list-add-disabled.png
-%%DATADIR%%/data/images/list-add.png
-%%DATADIR%%/data/images/list-remove-disabled.png
-%%DATADIR%%/data/images/list-remove.png
-%%DATADIR%%/data/images/load_paper.png
-%%DATADIR%%/data/images/makecopies_icon.png
-%%DATADIR%%/data/images/makecopies_icon_disabled.png
-%%DATADIR%%/data/images/mimetypes.png
-%%DATADIR%%/data/images/movie.png
-%%DATADIR%%/data/images/mpg.png
-%%DATADIR%%/data/images/next.png
-%%DATADIR%%/data/images/officejet_4200_series.png
-%%DATADIR%%/data/images/officejet_500.png
-%%DATADIR%%/data/images/officejet_5500_series.png
-%%DATADIR%%/data/images/officejet_5600.png
-%%DATADIR%%/data/images/officejet_j3600_series.png
-%%DATADIR%%/data/images/officejet_j5500_series.png
-%%DATADIR%%/data/images/officejet_k550.png
-%%DATADIR%%/data/images/officejet_k80.png
-%%DATADIR%%/data/images/ok.png
-%%DATADIR%%/data/images/ok_small.png
-%%DATADIR%%/data/images/opensource-75x65.png
-%%DATADIR%%/data/images/paper.png
-%%DATADIR%%/data/images/paper_small.png
-%%DATADIR%%/data/images/pcard_icon.png
-%%DATADIR%%/data/images/pcard_icon_disabled.png
-%%DATADIR%%/data/images/pens.png
-%%DATADIR%%/data/images/photosmart_7150.png
-%%DATADIR%%/data/images/photosmart_7900_series.png
-%%DATADIR%%/data/images/photosmart_a610.png
-%%DATADIR%%/data/images/photosmart_a820_series.png
-%%DATADIR%%/data/images/png.png
-%%DATADIR%%/data/images/powered_by_python.png
-%%DATADIR%%/data/images/prev.png
-%%DATADIR%%/data/images/print-disabled.png
-%%DATADIR%%/data/images/print.png
-%%DATADIR%%/data/images/print_icon.png
-%%DATADIR%%/data/images/print_icon_disabled.png
-%%DATADIR%%/data/images/psc_1100_series.png
-%%DATADIR%%/data/images/psc_1610.png
-%%DATADIR%%/data/images/psc_2300_series.png
-%%DATADIR%%/data/images/remove-user-disabled.png
-%%DATADIR%%/data/images/remove-user.png
-%%DATADIR%%/data/images/scan_icon.png
-%%DATADIR%%/data/images/scan_icon_disabled.png
-%%DATADIR%%/data/images/standard_coverpage.png
-%%DATADIR%%/data/images/status_refresh.png
-%%DATADIR%%/data/images/thumbnail.png
-%%DATADIR%%/data/images/tif.png
-%%DATADIR%%/data/images/toner.png
-%%DATADIR%%/data/images/toner_small.png
-%%DATADIR%%/data/images/type4_color_patch.png
-%%DATADIR%%/data/images/type4_gray_patch.png
-%%DATADIR%%/data/images/unknown.png
-%%DATADIR%%/data/images/up-disabled.png
-%%DATADIR%%/data/images/up-user-disabled.png
-%%DATADIR%%/data/images/up-user.png
-%%DATADIR%%/data/images/up.png
-%%DATADIR%%/data/images/v-c-2.png
-%%DATADIR%%/data/images/v-c-3.png
-%%DATADIR%%/data/images/v-k-2.png
-%%DATADIR%%/data/images/v-k-3.png
-%%DATADIR%%/data/images/v-kc-2.png
-%%DATADIR%%/data/images/v-kc-3.png
-%%DATADIR%%/data/images/warning.png
-%%DATADIR%%/data/images/warning_small.png
-%%DATADIR%%/data/images/zca.png
+%%DATADIR%%/data/images/128x128/audio.png
+%%DATADIR%%/data/images/128x128/bmp.png
+%%DATADIR%%/data/images/128x128/gif.png
+%%DATADIR%%/data/images/128x128/hp_logo.png
+%%DATADIR%%/data/images/128x128/jpg.png
+%%DATADIR%%/data/images/128x128/movie.png
+%%DATADIR%%/data/images/128x128/mpg.png
+%%DATADIR%%/data/images/128x128/png.png
+%%DATADIR%%/data/images/128x128/tif.png
+%%DATADIR%%/data/images/128x128/unknown.png
+%%DATADIR%%/data/images/16x16/active.png
+%%DATADIR%%/data/images/16x16/add_user.png
+%%DATADIR%%/data/images/16x16/add_user_quick.png
+%%DATADIR%%/data/images/16x16/add_users.png
+%%DATADIR%%/data/images/16x16/battery.png
+%%DATADIR%%/data/images/16x16/busy.png
+%%DATADIR%%/data/images/16x16/cancel.png
+%%DATADIR%%/data/images/16x16/close.png
+%%DATADIR%%/data/images/16x16/down.png
+%%DATADIR%%/data/images/16x16/down_user.png
+%%DATADIR%%/data/images/16x16/download.png
+%%DATADIR%%/data/images/16x16/edit.png
+%%DATADIR%%/data/images/16x16/error.png
+%%DATADIR%%/data/images/16x16/fab.png
+%%DATADIR%%/data/images/16x16/fax.png
+%%DATADIR%%/data/images/16x16/folder_open.png
+%%DATADIR%%/data/images/16x16/folder_remove.png
+%%DATADIR%%/data/images/16x16/help.png
+%%DATADIR%%/data/images/16x16/hp_logo.png
+%%DATADIR%%/data/images/16x16/idle.png
+%%DATADIR%%/data/images/16x16/info.png
+%%DATADIR%%/data/images/16x16/inkdrop.png
+%%DATADIR%%/data/images/16x16/list_add.png
+%%DATADIR%%/data/images/16x16/list_remove.png
+%%DATADIR%%/data/images/16x16/makecopies.png
+%%DATADIR%%/data/images/16x16/mimetypes.png
+%%DATADIR%%/data/images/16x16/minus.png
+%%DATADIR%%/data/images/16x16/next.png
+%%DATADIR%%/data/images/16x16/ok.png
+%%DATADIR%%/data/images/16x16/paper.png
+%%DATADIR%%/data/images/16x16/pcard.png
+%%DATADIR%%/data/images/16x16/plus.png
+%%DATADIR%%/data/images/16x16/prev.png
+%%DATADIR%%/data/images/16x16/print.png
+%%DATADIR%%/data/images/16x16/quit.png
+%%DATADIR%%/data/images/16x16/refresh.png
+%%DATADIR%%/data/images/16x16/refresh1.png
+%%DATADIR%%/data/images/16x16/remove_user.png
+%%DATADIR%%/data/images/16x16/scan.png
+%%DATADIR%%/data/images/16x16/settings.png
+%%DATADIR%%/data/images/16x16/status_refresh.png
+%%DATADIR%%/data/images/16x16/thumbnail.png
+%%DATADIR%%/data/images/16x16/toner.png
+%%DATADIR%%/data/images/16x16/up.png
+%%DATADIR%%/data/images/16x16/up_user.png
+%%DATADIR%%/data/images/16x16/warning.png
+%%DATADIR%%/data/images/24x24/add_to_group.png
+%%DATADIR%%/data/images/24x24/new_group.png
+%%DATADIR%%/data/images/24x24/new_group_from_selection.png
+%%DATADIR%%/data/images/24x24/new_user.png
+%%DATADIR%%/data/images/24x24/remove_from_group.png
+%%DATADIR%%/data/images/24x24/remove_group.png
+%%DATADIR%%/data/images/24x24/remove_user.png
+%%DATADIR%%/data/images/24x24/rename_group.png
+%%DATADIR%%/data/images/256x256/hp_logo.png
+%%DATADIR%%/data/images/32x32/align.png
+%%DATADIR%%/data/images/32x32/battery.png
+%%DATADIR%%/data/images/32x32/busy.png
+%%DATADIR%%/data/images/32x32/clean.png
+%%DATADIR%%/data/images/32x32/colorcal.png
+%%DATADIR%%/data/images/32x32/cups.png
+%%DATADIR%%/data/images/32x32/download.png
+%%DATADIR%%/data/images/32x32/error.png
+%%DATADIR%%/data/images/32x32/ews.png
+%%DATADIR%%/data/images/32x32/fab.png
+%%DATADIR%%/data/images/32x32/fax-disabled.png
+%%DATADIR%%/data/images/32x32/fax.png
+%%DATADIR%%/data/images/32x32/fax_machine.png
+%%DATADIR%%/data/images/32x32/fax_setup.png
+%%DATADIR%%/data/images/32x32/firmware.png
+%%DATADIR%%/data/images/32x32/help.png
+%%DATADIR%%/data/images/32x32/hp_logo.png
+%%DATADIR%%/data/images/32x32/idle.png
+%%DATADIR%%/data/images/32x32/info.png
+%%DATADIR%%/data/images/32x32/inkdrop.png
+%%DATADIR%%/data/images/32x32/keys.png
+%%DATADIR%%/data/images/32x32/linefeed_cal.png
+%%DATADIR%%/data/images/32x32/lock.png
+%%DATADIR%%/data/images/32x32/lporg.png
+%%DATADIR%%/data/images/32x32/makecopies-disabled.png
+%%DATADIR%%/data/images/32x32/makecopies.png
+%%DATADIR%%/data/images/32x32/ok.png
+%%DATADIR%%/data/images/32x32/paper.png
+%%DATADIR%%/data/images/32x32/pcard-disabled.png
+%%DATADIR%%/data/images/32x32/pcard.png
+%%DATADIR%%/data/images/32x32/plugin.png
+%%DATADIR%%/data/images/32x32/pq_diag.png
+%%DATADIR%%/data/images/32x32/print-disabled.png
+%%DATADIR%%/data/images/32x32/print.png
+%%DATADIR%%/data/images/32x32/scan-disabled.png
+%%DATADIR%%/data/images/32x32/scan.png
+%%DATADIR%%/data/images/32x32/settings.png
+%%DATADIR%%/data/images/32x32/testpage.png
+%%DATADIR%%/data/images/32x32/toner.png
+%%DATADIR%%/data/images/32x32/toner_cartridge.png
+%%DATADIR%%/data/images/32x32/warning.png
+%%DATADIR%%/data/images/32x32/wireless.png
+%%DATADIR%%/data/images/64x64/hp_logo.png
+%%DATADIR%%/data/images/devices/120.png
+%%DATADIR%%/data/images/devices/COLOR_INKJET_PRINTER_CP1700.png
+%%DATADIR%%/data/images/devices/CP_1700.png
+%%DATADIR%%/data/images/devices/DESKJET_1120C.png
+%%DATADIR%%/data/images/devices/DESKJET_1220C.png
+%%DATADIR%%/data/images/devices/DESKJET_2500C.png
+%%DATADIR%%/data/images/devices/DESKJET_3820.png
+%%DATADIR%%/data/images/devices/DESKJET_5740.png
+%%DATADIR%%/data/images/devices/DESKJET_610.png
+%%DATADIR%%/data/images/devices/DESKJET_630C.png
+%%DATADIR%%/data/images/devices/DESKJET_650C.png
+%%DATADIR%%/data/images/devices/DESKJET_840C.png
+%%DATADIR%%/data/images/devices/DESKJET_916C.png
+%%DATADIR%%/data/images/devices/DESKJET_9600.png
+%%DATADIR%%/data/images/devices/DESKJET_960C.png
+%%DATADIR%%/data/images/devices/DESKJET_970C.png
+%%DATADIR%%/data/images/devices/DESKJET_990C.png
+%%DATADIR%%/data/images/devices/DESKJET_995C.png
+%%DATADIR%%/data/images/devices/Deskjet_3740.png
+%%DATADIR%%/data/images/devices/Deskjet_5400_series.png
+%%DATADIR%%/data/images/devices/Deskjet_5700.png
+%%DATADIR%%/data/images/devices/Deskjet_5900_series.png
+%%DATADIR%%/data/images/devices/Deskjet_6500.png
+%%DATADIR%%/data/images/devices/Deskjet_6800.png
+%%DATADIR%%/data/images/devices/HP_2000C.png
+%%DATADIR%%/data/images/devices/HP_2500C.png
+%%DATADIR%%/data/images/devices/HP_BI_3000.png
+%%DATADIR%%/data/images/devices/HP_Business_Inkjet_1200.png
+%%DATADIR%%/data/images/devices/HP_Color_LaserJet_1500.png
+%%DATADIR%%/data/images/devices/HP_Color_LaserJet_2840.png
+%%DATADIR%%/data/images/devices/HP_Color_LaserJet_4500.png
+%%DATADIR%%/data/images/devices/HP_Color_LaserJet_4730mfp.png
+%%DATADIR%%/data/images/devices/HP_Color_LaserJet_8550.png
+%%DATADIR%%/data/images/devices/HP_LJ1xxx.png
+%%DATADIR%%/data/images/devices/HP_LaserJet_1012.png
+%%DATADIR%%/data/images/devices/HP_LaserJet_1220.png
+%%DATADIR%%/data/images/devices/HP_LaserJet_3200M.png
+%%DATADIR%%/data/images/devices/HP_LaserJet_3300_3310_3320.png
+%%DATADIR%%/data/images/devices/HP_LaserJet_4000.png
+%%DATADIR%%/data/images/devices/HP_LaserJet_4100_MFP.png
+%%DATADIR%%/data/images/devices/HP_LaserJet_4M.png
+%%DATADIR%%/data/images/devices/HP_LaserJet_5Si.png
+%%DATADIR%%/data/images/devices/HP_LaserJet_6MP.png
+%%DATADIR%%/data/images/devices/HP_LaserJet_8100_Series.png
+%%DATADIR%%/data/images/devices/HP_LaserJet_9000_MFP.png
+%%DATADIR%%/data/images/devices/HP_LaserJet_9040_MFP.png
+%%DATADIR%%/data/images/devices/HP_LaserJet_9500dn.png
+%%DATADIR%%/data/images/devices/HP_LaserJet_m1005.png
+%%DATADIR%%/data/images/devices/HP_LaserJet_m1522.png
+%%DATADIR%%/data/images/devices/HP_Officejet_Pro_L7700.png
+%%DATADIR%%/data/images/devices/LASERJET_3500.png
+%%DATADIR%%/data/images/devices/LASERJET_4650.png
+%%DATADIR%%/data/images/devices/LASERJET_4650dtn.png
+%%DATADIR%%/data/images/devices/LASERJET_5500.png
+%%DATADIR%%/data/images/devices/LASERJET_5500dtn.png
+%%DATADIR%%/data/images/devices/LASERJET_5550.png
+%%DATADIR%%/data/images/devices/LASERJET_5550DTN.png
+%%DATADIR%%/data/images/devices/OFFICEJET_PRO_1150C.png
+%%DATADIR%%/data/images/devices/OfficeJet_5105.png
+%%DATADIR%%/data/images/devices/OfficeJet_6100_Series.png
+%%DATADIR%%/data/images/devices/OfficeJet_G85.png
+%%DATADIR%%/data/images/devices/OfficeJet_Series_300.png
+%%DATADIR%%/data/images/devices/Officejet_6150_Series.png
+%%DATADIR%%/data/images/devices/Officejet_6200_series.png
+%%DATADIR%%/data/images/devices/Officejet_7200_series.png
+%%DATADIR%%/data/images/devices/Officejet_9100_series.png
+%%DATADIR%%/data/images/devices/PHOTOSMART_100.png
+%%DATADIR%%/data/images/devices/PHOTOSMART_1218.png
+%%DATADIR%%/data/images/devices/PHOTOSMART_1315.png
+%%DATADIR%%/data/images/devices/PHOTOSMART_P1100.png
+%%DATADIR%%/data/images/devices/PSC_900_Series.png
+%%DATADIR%%/data/images/devices/Photosmart_2600_series.png
+%%DATADIR%%/data/images/devices/Photosmart_2700_series.png
+%%DATADIR%%/data/images/devices/Photosmart_3300_series.png
+%%DATADIR%%/data/images/devices/Photosmart_370_series.png
+%%DATADIR%%/data/images/devices/Photosmart_7400_series.png
+%%DATADIR%%/data/images/devices/Photosmart_8050.png
+%%DATADIR%%/data/images/devices/Photosmart_8100_series.png
+%%DATADIR%%/data/images/devices/Photosmart_8250.png
+%%DATADIR%%/data/images/devices/Photosmart_8400_series.png
+%%DATADIR%%/data/images/devices/Photosmart_8750_series.png
+%%DATADIR%%/data/images/devices/Photosmart_C3100.png
+%%DATADIR%%/data/images/devices/Photosmart_C4100.png
+%%DATADIR%%/data/images/devices/Photosmart_C5100.png
+%%DATADIR%%/data/images/devices/Photosmart_C6100.png
+%%DATADIR%%/data/images/devices/Photosmart_D5060.png
+%%DATADIR%%/data/images/devices/Photosmart_D5100.png
+%%DATADIR%%/data/images/devices/Photosmart_D6160.png
+%%DATADIR%%/data/images/devices/Photosmart_D7100.png
+%%DATADIR%%/data/images/devices/Photosmart_D7300.png
+%%DATADIR%%/data/images/devices/Photosmart_Pro_B8300.png
+%%DATADIR%%/data/images/devices/Photosmart_Pro_B9180.png
+%%DATADIR%%/data/images/devices/Photosmart_a310.png
+%%DATADIR%%/data/images/devices/Photosmart_a510.png
+%%DATADIR%%/data/images/devices/Photosmart_a710.png
+%%DATADIR%%/data/images/devices/cp1160.png
+%%DATADIR%%/data/images/devices/default_business_inkjet.png
+%%DATADIR%%/data/images/devices/default_designjet.png
+%%DATADIR%%/data/images/devices/default_deskjet.png
+%%DATADIR%%/data/images/devices/default_laserjet.png
+%%DATADIR%%/data/images/devices/default_officejet.png
+%%DATADIR%%/data/images/devices/default_photosmart.png
+%%DATADIR%%/data/images/devices/default_printer.png
+%%DATADIR%%/data/images/devices/default_psc.png
+%%DATADIR%%/data/images/devices/desket_5650.png
+%%DATADIR%%/data/images/devices/deskjet_1280.png
+%%DATADIR%%/data/images/devices/deskjet_3200.png
+%%DATADIR%%/data/images/devices/deskjet_3320.png
+%%DATADIR%%/data/images/devices/deskjet_3325.png
+%%DATADIR%%/data/images/devices/deskjet_3420.png
+%%DATADIR%%/data/images/devices/deskjet_3425.png
+%%DATADIR%%/data/images/devices/deskjet_3500.png
+%%DATADIR%%/data/images/devices/deskjet_3600.png
+%%DATADIR%%/data/images/devices/deskjet_3840.png
+%%DATADIR%%/data/images/devices/deskjet_5100.png
+%%DATADIR%%/data/images/devices/deskjet_5550.png
+%%DATADIR%%/data/images/devices/deskjet_5552.png
+%%DATADIR%%/data/images/devices/deskjet_5600.png
+%%DATADIR%%/data/images/devices/deskjet_6120.png
+%%DATADIR%%/data/images/devices/deskjet_6980.png
+%%DATADIR%%/data/images/devices/deskjet_D2360.png
+%%DATADIR%%/data/images/devices/dj350.png
+%%DATADIR%%/data/images/devices/dj450.png
+%%DATADIR%%/data/images/devices/hp_LaserJet_1200.png
+%%DATADIR%%/data/images/devices/hp_LaserJet_2100.png
+%%DATADIR%%/data/images/devices/hp_LaserJet_3015.png
+%%DATADIR%%/data/images/devices/hp_LaserJet_3020.png
+%%DATADIR%%/data/images/devices/hp_LaserJet_4345_mfp.png
+%%DATADIR%%/data/images/devices/hp_LaserJet_5000.png
+%%DATADIR%%/data/images/devices/hp_LaserJet_8000.png
+%%DATADIR%%/data/images/devices/hp_business_inkjet_1100.png
+%%DATADIR%%/data/images/devices/hp_business_inkjet_2200.png
+%%DATADIR%%/data/images/devices/hp_business_inkjet_2600.png
+%%DATADIR%%/data/images/devices/hp_business_inkjet_3000.png
+%%DATADIR%%/data/images/devices/hp_color_LaserJet_2550.png
+%%DATADIR%%/data/images/devices/hp_color_LaserJet_3700.png
+%%DATADIR%%/data/images/devices/hp_color_LaserJet_4600.png
+%%DATADIR%%/data/images/devices/hp_color_LaserJet_9500.png
+%%DATADIR%%/data/images/devices/hp_color_laserjet_cm1015_mfp.png
+%%DATADIR%%/data/images/devices/hp_color_laserjet_cm1312_mfp.png
+%%DATADIR%%/data/images/devices/hp_color_laserjet_cp2025.png
+%%DATADIR%%/data/images/devices/hp_color_laserjet_cp3505.png
+%%DATADIR%%/data/images/devices/hp_color_laserjet_cp3525.png
+%%DATADIR%%/data/images/devices/hp_color_laserjet_cp4005.png
+%%DATADIR%%/data/images/devices/hp_color_laserjet_cp6015.png
+%%DATADIR%%/data/images/devices/hp_deskjet_9300.png
+%%DATADIR%%/data/images/devices/hp_deskjet_f4200.png
+%%DATADIR%%/data/images/devices/hp_laserjet_3050.png
+%%DATADIR%%/data/images/devices/hp_laserjet_m2727_mfp.png
+%%DATADIR%%/data/images/devices/hp_laserjet_p2015.png
+%%DATADIR%%/data/images/devices/hp_photosmart_b8500_series.png
+%%DATADIR%%/data/images/devices/laserjet_2410.png
+%%DATADIR%%/data/images/devices/officejet_4200_series.png
+%%DATADIR%%/data/images/devices/officejet_500.png
+%%DATADIR%%/data/images/devices/officejet_5500_series.png
+%%DATADIR%%/data/images/devices/officejet_5600.png
+%%DATADIR%%/data/images/devices/officejet_j3600_series.png
+%%DATADIR%%/data/images/devices/officejet_j5500_series.png
+%%DATADIR%%/data/images/devices/officejet_k550.png
+%%DATADIR%%/data/images/devices/officejet_k80.png
+%%DATADIR%%/data/images/devices/photosmart_7150.png
+%%DATADIR%%/data/images/devices/photosmart_7900_series.png
+%%DATADIR%%/data/images/devices/photosmart_a610.png
+%%DATADIR%%/data/images/devices/photosmart_a820_series.png
+%%DATADIR%%/data/images/devices/psc_1100_series.png
+%%DATADIR%%/data/images/devices/psc_1610.png
+%%DATADIR%%/data/images/devices/psc_2300_series.png
+%%DATADIR%%/data/images/other/aio_align.png
+%%DATADIR%%/data/images/other/align10.png
+%%DATADIR%%/data/images/other/clean.png
+%%DATADIR%%/data/images/other/color_adj.png
+%%DATADIR%%/data/images/other/confidential_coverpage.png
+%%DATADIR%%/data/images/other/confidential_title.png
+%%DATADIR%%/data/images/other/fax.png
+%%DATADIR%%/data/images/other/fax2.png
+%%DATADIR%%/data/images/other/generic_coverpage.png
+%%DATADIR%%/data/images/other/generic_title.png
+%%DATADIR%%/data/images/other/h-kc-2.png
+%%DATADIR%%/data/images/other/h-kc-3.png
+%%DATADIR%%/data/images/other/hp-tux-printer.png
+%%DATADIR%%/data/images/other/load_paper.png
+%%DATADIR%%/data/images/other/opensource-75x65.png
+%%DATADIR%%/data/images/other/panel_lcd.png
+%%DATADIR%%/data/images/other/pens.png
+%%DATADIR%%/data/images/other/powered_by_python.png
+%%DATADIR%%/data/images/other/signal0.png
+%%DATADIR%%/data/images/other/signal1.png
+%%DATADIR%%/data/images/other/signal2.png
+%%DATADIR%%/data/images/other/signal3.png
+%%DATADIR%%/data/images/other/signal4.png
+%%DATADIR%%/data/images/other/signal5.png
+%%DATADIR%%/data/images/other/standard_coverpage.png
+%%DATADIR%%/data/images/other/type4_color_patch.png
+%%DATADIR%%/data/images/other/type4_gray_patch.png
+%%DATADIR%%/data/images/other/urgent_coverpage.png
+%%DATADIR%%/data/images/other/urgent_title.png
+%%DATADIR%%/data/images/other/usb_connection.png
+%%DATADIR%%/data/images/other/v-c-2.png
+%%DATADIR%%/data/images/other/v-c-3.png
+%%DATADIR%%/data/images/other/v-k-2.png
+%%DATADIR%%/data/images/other/v-k-3.png
+%%DATADIR%%/data/images/other/v-kc-2.png
+%%DATADIR%%/data/images/other/v-kc-3.png
+%%DATADIR%%/data/images/other/zca.png
 %%DATADIR%%/data/ldl/cb2pcal.ldl.gz
 %%DATADIR%%/data/ldl/cb2pcal_done.ldl.gz
 %%DATADIR%%/data/ldl/cbbcal.ldl.gz
@@ -628,6 +472,7 @@ share/applications/hplip.desktop
 %%DATADIR%%/data/pcl/crpcal.pcl.gz
 %%DATADIR%%/data/ps/clean_page.pdf.gz
 %%DATADIR%%/data/ps/testpage.ps.gz
+%%DATADIR%%/devicesettings.py
 %%DATADIR%%/fab.py
 %%DATADIR%%/fax/__init__.py
 %%DATADIR%%/fax/coverpages.py
@@ -635,205 +480,109 @@ share/applications/hplip.desktop
 %%DATADIR%%/fax/faxdevice.py
 %%DATADIR%%/fax/pmlfax.py
 %%DATADIR%%/fax/soapfax.py
+%%DATADIR%%/faxsetup.py
 %%DATADIR%%/firmware.py
-%%DATADIR%%/hpaio.desc
-%%DATADIR%%/hplip-install
+%%DATADIR%%/hpdio.py
 %%DATADIR%%/hpssd.py
 %%DATADIR%%/info.py
-%%DATADIR%%/install.py
 %%DATADIR%%/installer/__init__.py
 %%DATADIR%%/installer/core_install.py
 %%DATADIR%%/installer/dcheck.py
 %%DATADIR%%/installer/distros.dat
 %%DATADIR%%/levels.py
+%%DATADIR%%/linefeedcal.py
 %%DATADIR%%/makecopies.py
 %%DATADIR%%/makeuri.py
 %%DATADIR%%/pcard/__init__.py
 %%DATADIR%%/pcard/photocard.py
-%%DATADIR%%/plugins/Deskjet_460.py
-%%DATADIR%%/plugins/Officejet_H470.py
-%%DATADIR%%/plugins/__init__.py
-%%DATADIR%%/plugins/dj450.py
-%%DATADIR%%/plugins/powersettings.py
-%%DATADIR%%/plugins/powersettings2.py
-%%DATADIR%%/plugins/powersettingsdialog.py
-%%DATADIR%%/plugins/powersettingsdialog_base.py
+%%DATADIR%%/pkservice.py
+%%DATADIR%%/plugin.py
+%%DATADIR%%/pqdiag.py
 %%DATADIR%%/print.py
+%%DATADIR%%/printsettings.py
 %%DATADIR%%/prnt/__init__.py
 %%DATADIR%%/prnt/colorcal.py
 %%DATADIR%%/prnt/cups.py
 %%DATADIR%%/prnt/ldl.py
 %%DATADIR%%/prnt/pcl.py
-%%DATADIR%%/prnt/printable_areas.py
 %%DATADIR%%/probe.py
+%%DATADIR%%/query.py
 %%DATADIR%%/scan.py
 %%DATADIR%%/scan/__init__.py
 %%DATADIR%%/scan/sane.py
 %%DATADIR%%/sendfax.py
 %%DATADIR%%/setup.py
+%%DATADIR%%/systray.py
 %%DATADIR%%/testpage.py
 %%DATADIR%%/timedate.py
 %%DATADIR%%/toolbox.py
-%%DATADIR%%/ui/__init__.py
-%%DATADIR%%/ui/aboutdlg.py
-%%DATADIR%%/ui/aboutdlg_base.py
-%%DATADIR%%/ui/align10form.py
-%%DATADIR%%/ui/align10form_base.py
-%%DATADIR%%/ui/alignform.py
-%%DATADIR%%/ui/aligntype6form1.py
-%%DATADIR%%/ui/aligntype6form1_base.py
-%%DATADIR%%/ui/aligntype6form2.py
-%%DATADIR%%/ui/aligntype6form2_base.py
-%%DATADIR%%/ui/allowabletypesdlg.py
-%%DATADIR%%/ui/allowabletypesdlg_base.py
-%%DATADIR%%/ui/choosedevicedlg.py
-%%DATADIR%%/ui/chooseprinterdlg.py
-%%DATADIR%%/ui/cleaningform.py
-%%DATADIR%%/ui/cleaningform2.py
-%%DATADIR%%/ui/cleaningform2_base.py
-%%DATADIR%%/ui/cleaningform_base.py
-%%DATADIR%%/ui/coloradjform.py
-%%DATADIR%%/ui/coloradjform_base.py
-%%DATADIR%%/ui/colorcal4form.py
-%%DATADIR%%/ui/colorcal4form_base.py
-%%DATADIR%%/ui/colorcal4form_base.ui
-%%DATADIR%%/ui/colorcalform.py
-%%DATADIR%%/ui/colorcalform2.py
-%%DATADIR%%/ui/colorcalform2_base.py
-%%DATADIR%%/ui/colorcalform_base.py
-%%DATADIR%%/ui/coverpageform.py
-%%DATADIR%%/ui/coverpageform_base.py
-%%DATADIR%%/ui/devmgr4.py
-%%DATADIR%%/ui/devmgr4_base.py
-%%DATADIR%%/ui/faxaddrbookeditform_base.py
-%%DATADIR%%/ui/faxaddrbookform.py
-%%DATADIR%%/ui/faxaddrbookform_base.py
-%%DATADIR%%/ui/faxaddrbookgroupeditform_base.py
-%%DATADIR%%/ui/faxaddrbookgroupsform_base.py
-%%DATADIR%%/ui/faxsendjobform.py
-%%DATADIR%%/ui/faxsettingsform.py
-%%DATADIR%%/ui/faxsettingsform_base.py
-%%DATADIR%%/ui/imagepropertiesdlg.py
-%%DATADIR%%/ui/imagepropertiesdlg_base.py
-%%DATADIR%%/ui/loadpaperform.py
-%%DATADIR%%/ui/loadpaperform_base.py
-%%DATADIR%%/ui/makecopiesform.py
-%%DATADIR%%/ui/nodevicesform.py
-%%DATADIR%%/ui/nodevicesform_base.py
-%%DATADIR%%/ui/paperedgealignform.py
-%%DATADIR%%/ui/paperedgealignform_base.py
-%%DATADIR%%/ui/pluginform.py
-%%DATADIR%%/ui/pluginform_base.py
-%%DATADIR%%/ui/printerform.py
-%%DATADIR%%/ui/scrollcopy.py
-%%DATADIR%%/ui/scrollfax.py
-%%DATADIR%%/ui/scrollfunc.py
-%%DATADIR%%/ui/scrollprint.py
-%%DATADIR%%/ui/scrollprintcontrol.py
-%%DATADIR%%/ui/scrollprintsettings.py
-%%DATADIR%%/ui/scrollstatus.py
-%%DATADIR%%/ui/scrollsupplies.py
-%%DATADIR%%/ui/scrolltool.py
-%%DATADIR%%/ui/scrollunload.py
-%%DATADIR%%/ui/scrollview.py
-%%DATADIR%%/ui/settingsdialog.py
-%%DATADIR%%/ui/settingsdialog_base.py
-%%DATADIR%%/ui/setupform.py
-%%DATADIR%%/ui/setupform_base.py
-%%DATADIR%%/ui/setupmanualfind.py
-%%DATADIR%%/ui/setupmanualfind_base.py
-%%DATADIR%%/ui/setupsettings.py
-%%DATADIR%%/ui/setupsettings_base.py
-%%DATADIR%%/ui/unloadform.py
-%%DATADIR%%/ui/waitform.py
-%%DATADIR%%/ui/waitform_base.py
+%%DATADIR%%/ui4/__init__.py
+%%DATADIR%%/ui4/aboutdialog.py
+%%DATADIR%%/ui4/aboutdialog_base.py
+%%DATADIR%%/ui4/aligndialog.py
+%%DATADIR%%/ui4/aligndialog_base.py
+%%DATADIR%%/ui4/cleandialog.py
+%%DATADIR%%/ui4/cleandialog_base.py
+%%DATADIR%%/ui4/colorcaldialog.py
+%%DATADIR%%/ui4/colorcaldialog_base.py
+%%DATADIR%%/ui4/devicesetupdialog.py
+%%DATADIR%%/ui4/devicesetupdialog_base.py
+%%DATADIR%%/ui4/deviceuricombobox.py
+%%DATADIR%%/ui4/devmgr5.py
+%%DATADIR%%/ui4/devmgr5_base.py
+%%DATADIR%%/ui4/fabgrouptable.py
+%%DATADIR%%/ui4/fabnametable.py
+%%DATADIR%%/ui4/fabwindow.py
+%%DATADIR%%/ui4/fabwindow_base.py
+%%DATADIR%%/ui4/faxsetupdialog.py
+%%DATADIR%%/ui4/faxsetupdialog_base.py
+%%DATADIR%%/ui4/filetable.py
+%%DATADIR%%/ui4/firmwaredialog.py
+%%DATADIR%%/ui4/firmwaredialog_base.py
+%%DATADIR%%/ui4/infodialog.py
+%%DATADIR%%/ui4/infodialog_base.py
+%%DATADIR%%/ui4/linefeedcaldialog.py
+%%DATADIR%%/ui4/linefeedcaldialog_base.py
+%%DATADIR%%/ui4/loadpapergroupbox.py
+%%DATADIR%%/ui4/makecopiesdialog.py
+%%DATADIR%%/ui4/makecopiesdialog_base.py
+%%DATADIR%%/ui4/mimetypesdialog.py
+%%DATADIR%%/ui4/mimetypesdialog_base.py
+%%DATADIR%%/ui4/nodevicesdialog.py
+%%DATADIR%%/ui4/nodevicesdialog_base.py
+%%DATADIR%%/ui4/plugindialog.py
+%%DATADIR%%/ui4/plugindialog_base.py
+%%DATADIR%%/ui4/pluginlicensedialog.py
+%%DATADIR%%/ui4/pluginlicensedialog_base.py
+%%DATADIR%%/ui4/pqdiagdialog.py
+%%DATADIR%%/ui4/pqdiagdialog_base.py
+%%DATADIR%%/ui4/printdialog.py
+%%DATADIR%%/ui4/printdialog_base.py
+%%DATADIR%%/ui4/printernamecombobox.py
+%%DATADIR%%/ui4/printsettingsdialog.py
+%%DATADIR%%/ui4/printsettingsdialog_base.py
+%%DATADIR%%/ui4/printsettingstoolbox.py
+%%DATADIR%%/ui4/printtestpagedialog.py
+%%DATADIR%%/ui4/printtestpagedialog_base.py
+%%DATADIR%%/ui4/readonlyradiobutton.py
+%%DATADIR%%/ui4/sendfaxdialog.py
+%%DATADIR%%/ui4/sendfaxdialog_base.py
+%%DATADIR%%/ui4/settingsdialog.py
+%%DATADIR%%/ui4/settingsdialog_base.py
+%%DATADIR%%/ui4/setupdialog.py
+%%DATADIR%%/ui4/setupdialog_base.py
+%%DATADIR%%/ui4/systemtray.py
+%%DATADIR%%/ui4/systrayframe.py
+%%DATADIR%%/ui4/systrayframe_base.py
+%%DATADIR%%/ui4/ui_utils.py
+%%DATADIR%%/ui4/wifisetupdialog.py
+%%DATADIR%%/ui4/wifisetupdialog_base.py
 %%DATADIR%%/unload.py
-share/ppd/HP/HP-Fax-hplip.ppd.gz
-share/ppd/HP/HP-Fax2-hplip.ppd
-share/ppd/HP/HP_Business_Inkjet_2250-ps.ppd.gz
-share/ppd/HP/HP_Business_Inkjet_2280-ps.ppd.gz
-share/ppd/HP/HP_Business_Inkjet_2600-ps.ppd.gz
-share/ppd/HP/HP_Business_Inkjet_2800-ps.ppd.gz
-share/ppd/HP/HP_Business_Inkjet_3000-ps.ppd.gz
-share/ppd/HP/HP_CM8050_CM8060_MFP-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_2550-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_2605-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_2700-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_2800-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_3000-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_3800-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_4500-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_4550-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_4700-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_4730_MFP-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_5550-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_5M-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_8500-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_8550-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_CM1015-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_CM4730_MFP-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_CP3505-ps.ppd.gz
-share/ppd/HP/HP_Color_LaserJet_CP4005-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_1200-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_1220-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_1320_Series-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_2100_Series-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_2200-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_2410-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_2420-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_2430-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_3050-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_3052-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_3200-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_3300_Series-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_3390-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_4-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_4000_Series-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_4050_Series-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_4100_MFP-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_4100_Series-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_4240-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_4250-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_4345_MFP-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_4350-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_4ML-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_4MP-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_4Si_v2011.110-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_4V-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_4_Plus-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_5000_Series-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_5100_Series-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_5200-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_5200L-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_5M-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_5MP-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_5Si-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_5Si_Mopier-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_6MP-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_8000_Series-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_8100_Series-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_8150_Series-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_9000_MFP-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_9000_Series-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_9040-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_9040_9050_MFP-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_9050-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_9055_9065_MFP-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_M2727_MFP-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_M3027_MFP-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_M3035_MFP-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_M4345_MFP-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_M5025_MFP-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_M5035_MFP-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_P2015-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_P3004-ps.ppd.gz
-share/ppd/HP/HP_LaserJet_P3005-ps.ppd.gz
-share/ppd/HP/HP_Mopier_240-ps.ppd.gz
-share/ppd/HP/HP_Mopier_320-ps.ppd.gz
+%%DATADIR%%/wificonfig.py
+share/ppd/HP/HP-Fax-hpcups.ppd.gz
+share/ppd/HP/HP-Fax2-hpcups.ppd.gz
 share/ppd/HP/hp-2000c-hpijs.ppd.gz
 share/ppd/HP/hp-2500c-hpijs.ppd.gz
-share/ppd/HP/hp-2500cm-hpijs.ppd.gz
 share/ppd/HP/hp-910-hpijs.ppd.gz
 share/ppd/HP/hp-915-hpijs.ppd.gz
 share/ppd/HP/hp-business_inkjet_1000-hpijs.ppd.gz
@@ -841,38 +590,136 @@ share/ppd/HP/hp-business_inkjet_1100-hpijs.ppd.gz
 share/ppd/HP/hp-business_inkjet_1200-hpijs.ppd.gz
 share/ppd/HP/hp-business_inkjet_2200-hpijs.ppd.gz
 share/ppd/HP/hp-business_inkjet_2230-hpijs.ppd.gz
-share/ppd/HP/hp-business_inkjet_2250-hpijs.ppd.gz
-share/ppd/HP/hp-business_inkjet_2280-hpijs.ppd.gz
-share/ppd/HP/hp-business_inkjet_2300-hpijs.ppd.gz
-share/ppd/HP/hp-business_inkjet_2600-hpijs.ppd.gz
-share/ppd/HP/hp-business_inkjet_2800-hpijs.ppd.gz
-share/ppd/HP/hp-business_inkjet_3000-hpijs.ppd.gz
+share/ppd/HP/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-business_inkjet_2250-ps.ppd.gz
+share/ppd/HP/hp-business_inkjet_2280-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-business_inkjet_2280-ps.ppd.gz
+share/ppd/HP/hp-business_inkjet_2300-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-business_inkjet_2300-ps.ppd.gz
+share/ppd/HP/hp-business_inkjet_2600-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-business_inkjet_2600-ps.ppd.gz
+share/ppd/HP/hp-business_inkjet_2800-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-business_inkjet_2800-ps.ppd.gz
+share/ppd/HP/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-business_inkjet_3000-ps.ppd.gz
+share/ppd/HP/hp-cm8050_mfp_with_edgeline-ps.ppd.gz
+share/ppd/HP/hp-cm8060_mfp_with_edgeline-ps.ppd.gz
 share/ppd/HP/hp-color_inkjet_cp1700-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_2500-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_3000-hpijs.ppd.gz
+share/ppd/HP/hp-color_inkjet_printer_cp1700-hpijs.ppd.gz
+share/ppd/HP/hp-color_laserjet-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_1600-hpijs.ppd.gz
+share/ppd/HP/hp-color_laserjet_2500-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_2500-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_2500_series-hpijs.ppd.gz
+share/ppd/HP/hp-color_laserjet_2500_series-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_2550_series-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_2600n-hpijs.ppd.gz
+share/ppd/HP/hp-color_laserjet_2605-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_2605dn-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_2605dtn-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_2700-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_2700n-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_2800-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_2820-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_2830-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_2840-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_3000-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_3500-hpijs.ppd.gz
+share/ppd/HP/hp-color_laserjet_3500n-hpijs.ppd.gz
 share/ppd/HP/hp-color_laserjet_3550-hpijs.ppd.gz
+share/ppd/HP/hp-color_laserjet_3550n-hpijs.ppd.gz
 share/ppd/HP/hp-color_laserjet_3600-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_3700-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_3800-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_4500-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_4550-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_4600-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_4610-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_4650-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_4700-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_4730mfp-hpijs.ppd.gz
+share/ppd/HP/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_3700-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_3700n-hpijs.ppd.gz
+share/ppd/HP/hp-color_laserjet_3700n-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_3800-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_3800-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_4500-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_4550-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_4550-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_4600-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_4600_series-hpijs.ppd.gz
+share/ppd/HP/hp-color_laserjet_4600_series-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_4610-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_4610-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_4650-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_4700-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_4730mfp-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_5-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_5500-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_5550-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_5m-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_8500-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_8550-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_9500-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_9500mfp-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp3505-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp4005-hpijs.ppd.gz
+share/ppd/HP/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_5500-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_5550-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_5m-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_5m-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_8500-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_8550-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_8550-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_9500-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_9500_mfp-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-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm1312_mfp-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm2320_mfp-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm3530_mfp-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm4730_mfp-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm6030_mfp-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz
+share/ppd/HP/hp-color_laserjet_cm6049_mfp-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp1215-hpijs.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp1514n-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp1515n-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp1518ni-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp1518ni-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp2025-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp2025-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp2025dn-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp2025n-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp2025n-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp2025x-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp3505-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp3525-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp4005-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp6015-ps.ppd.gz
 share/ppd/HP/hp-cp1160-hpijs.ppd.gz
+share/ppd/HP/hp-designjet_4020ps-ps.ppd.gz
+share/ppd/HP/hp-designjet_4520mfp-ps.ppd.gz
+share/ppd/HP/hp-designjet_4520ps-ps.ppd.gz
 share/ppd/HP/hp-deskjet_1100-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_1120-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_1125-hpijs.ppd.gz
@@ -880,13 +727,16 @@ share/ppd/HP/hp-deskjet_1200c-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_1220c-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_1280-hpijs.ppd.gz
 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_3320-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3325-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3420-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3425-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3520-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3535-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_3550-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_3600-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3650-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3740-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3810-hpijs.ppd.gz
@@ -895,8 +745,13 @@ share/ppd/HP/hp-deskjet_3819-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3820-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3822-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3840-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_3870-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_3900-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_3910-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_3920-hpijs.ppd.gz
+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_500-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_500c-hpijs.ppd.gz
@@ -905,18 +760,22 @@ share/ppd/HP/hp-deskjet_510-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_5100-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_520-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_540-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_5440_series-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_5550-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_5551-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_5552-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_5600-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_5650-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_5652-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_5700-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_5800-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_5850-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_5900_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_600-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_6100_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_610c-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_610cl-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_6120-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_6122-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_6127-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_612c-hpijs.ppd.gz
@@ -934,6 +793,7 @@ share/ppd/HP/hp-deskjet_672c-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_680-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_6800-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_682-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_690-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_690c-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_692-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_693-hpijs.ppd.gz
@@ -986,150 +846,374 @@ share/ppd/HP/hp-deskjet_990c-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_995c-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_d1300_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_d1400_series-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_d1500_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_d2300_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_d2400_series-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_d2500_series-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_d2600_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_d4100_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_d4200_series-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_d4300_series-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_d730-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_f2100_series-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_f2200_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_f300_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_f4100_series-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_f4200_series-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_f4210_series-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_f4213_series-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_f4400_series-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_f735-hpijs.ppd.gz
 share/ppd/HP/hp-dj350-hpijs.ppd.gz
 share/ppd/HP/hp-dj450-hpijs.ppd.gz
-share/ppd/HP/hp-e_printer_e20-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_1010-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_1012-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_1015-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_1022-hpijs-pcl.ppd.gz
+share/ppd/HP/hp-laserjet_1018-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_1020-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_1022-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_1022-hpijs-zjs.ppd.gz
+share/ppd/HP/hp-laserjet_1022n-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_1022n-hpijs-zjs.ppd.gz
+share/ppd/HP/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_1022nw-hpijs-zjs.ppd.gz
 share/ppd/HP/hp-laserjet_1100-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_1100a-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_1100xi-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_1150-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_1160-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_1200-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_1220-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_1300-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_1160_series-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_1200-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_1200-ps.ppd.gz
+share/ppd/HP/hp-laserjet_1200n-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_1200n-ps.ppd.gz
+share/ppd/HP/hp-laserjet_1220-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_1220-ps.ppd.gz
+share/ppd/HP/hp-laserjet_1220se-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_1220se-ps.ppd.gz
+share/ppd/HP/hp-laserjet_1300-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_1300-ps.ppd.gz
+share/ppd/HP/hp-laserjet_1300n-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_1300n-ps.ppd.gz
+share/ppd/HP/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_1300xi-ps.ppd.gz
 share/ppd/HP/hp-laserjet_1320-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_1320-ps.ppd.gz
+share/ppd/HP/hp-laserjet_1320_series-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_1320_series-ps.ppd.gz
+share/ppd/HP/hp-laserjet_1320n-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_1320n-ps.ppd.gz
+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_2100-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_2100m-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_2200-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_2300-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_2410-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_2420-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_2430-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3015-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3020-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3030-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3050-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3052-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_2100-ps.ppd.gz
+share/ppd/HP/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_2100_series-ps.ppd.gz
+share/ppd/HP/hp-laserjet_2200-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_2200-ps.ppd.gz
+share/ppd/HP/hp-laserjet_2200_series-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_2200_series-ps.ppd.gz
+share/ppd/HP/hp-laserjet_2300-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_2300-ps.ppd.gz
+share/ppd/HP/hp-laserjet_2300_series-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_2300_series-ps.ppd.gz
+share/ppd/HP/hp-laserjet_2410-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_2410-ps.ppd.gz
+share/ppd/HP/hp-laserjet_2420-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_2420-ps.ppd.gz
+share/ppd/HP/hp-laserjet_2430-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_2430-ps.ppd.gz
+share/ppd/HP/hp-laserjet_3015-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_3015-ps.ppd.gz
+share/ppd/HP/hp-laserjet_3020-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_3020-ps.ppd.gz
+share/ppd/HP/hp-laserjet_3030-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_3030-ps.ppd.gz
+share/ppd/HP/hp-laserjet_3050-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_3050-ps.ppd.gz
+share/ppd/HP/hp-laserjet_3052-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_3052-ps.ppd.gz
 share/ppd/HP/hp-laserjet_3055-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3200-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_3100-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_3150-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_3200-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_3200-ps.ppd.gz
+share/ppd/HP/hp-laserjet_3200_series-ps.ppd.gz
 share/ppd/HP/hp-laserjet_3200m-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_3200m-ps.ppd.gz
 share/ppd/HP/hp-laserjet_3200se-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3300_3310_3320-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3380-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3390-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_3200se-ps.ppd.gz
+share/ppd/HP/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_3300_3310_3320-ps.ppd.gz
+share/ppd/HP/hp-laserjet_3330-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_3380-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_3380-ps.ppd.gz
+share/ppd/HP/hp-laserjet_3390-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_3390-ps.ppd.gz
 share/ppd/HP/hp-laserjet_3392-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_4-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_4000_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_4050_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_4100_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_4200-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_4240-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_4250-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_4300-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_4345_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_4350-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_4_plus-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_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
+share/ppd/HP/hp-laserjet_4100_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_4100_series-ps.ppd.gz
+share/ppd/HP/hp-laserjet_4150_series-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_4200-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_4200-ps.ppd.gz
+share/ppd/HP/hp-laserjet_4240-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_4240-ps.ppd.gz
+share/ppd/HP/hp-laserjet_4250-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_4250-ps.ppd.gz
+share/ppd/HP/hp-laserjet_4300-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_4300-ps.ppd.gz
+share/ppd/HP/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_4345_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_4350-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_4350-ps.ppd.gz
+share/ppd/HP/hp-laserjet_4_plus-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_4_plus-ps.ppd.gz
 share/ppd/HP/hp-laserjet_4l-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_4si-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_4v-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_4ml-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_4ml-ps.ppd.gz
+share/ppd/HP/hp-laserjet_4mp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_4mp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_4si-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_4si-ps.ppd.gz
+share/ppd/HP/hp-laserjet_4v-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_4v-ps.ppd.gz
 share/ppd/HP/hp-laserjet_5000-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_5100_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_5200-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_5200l-hpijs.ppd.gz
+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_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
+share/ppd/HP/hp-laserjet_5200-ps.ppd.gz
+share/ppd/HP/hp-laserjet_5200l-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_5200l-ps.ppd.gz
+share/ppd/HP/hp-laserjet_5200lx-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_5200lx-ps.ppd.gz
 share/ppd/HP/hp-laserjet_5l-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_5mp-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_5mp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_5mp-ps.ppd.gz
 share/ppd/HP/hp-laserjet_5p-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_5si-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_6-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_6mp-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_5p-ps.ppd.gz
+share/ppd/HP/hp-laserjet_5si-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_5si-ps.ppd.gz
+share/ppd/HP/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_5si_mopier-ps.ppd.gz
+share/ppd/HP/hp-laserjet_6l-hpijs.ppd.gz
+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_8000-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_8100_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_8150_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_9000_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_9000_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_9040-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_9040_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_9050-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_9050_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_9055mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_9065mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_m1522_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_m2727_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_m3027_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_m3035_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_m4345_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_m5025_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_m5035_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p1505-hpijs-pcl.ppd.gz
-share/ppd/HP/hp-laserjet_p2010-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p2015_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p3004-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p3005-hpijs.ppd.gz
-share/ppd/HP/hp-mopier_320-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_8000-ps.ppd.gz
+share/ppd/HP/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_8000_series-ps.ppd.gz
+share/ppd/HP/hp-laserjet_8100_mfp-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_8100_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_8100_series-ps.ppd.gz
+share/ppd/HP/hp-laserjet_8150_mfp-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_8150_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_9000_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_9000_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_9000_series-ps.ppd.gz
+share/ppd/HP/hp-laserjet_9040-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_9040-ps.ppd.gz
+share/ppd/HP/hp-laserjet_9040_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_9040_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_9050-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_9050-ps.ppd.gz
+share/ppd/HP/hp-laserjet_9050_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_9050_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_9055mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_9065mfp-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
+share/ppd/HP/hp-laserjet_m1319f_mfp-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_m1522_mfp-ps.ppd.gz
+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_m2727_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_m2727_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_m2727nf_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_m2727nfs_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_m3027_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_m3035_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_m4345_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_m4349_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_m5025_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_m5035_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_m9040_mfp-ps.ppd.gz
+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_p1005-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p1006-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p1007-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p1008-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p1009-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p1505-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_p1505n-hpijs-zxs.ppd.gz
+share/ppd/HP/hp-laserjet_p2014-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_p2014-hpijs-zxs.ppd.gz
+share/ppd/HP/hp-laserjet_p2014n-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_p2014n-hpijs-zxs.ppd.gz
+share/ppd/HP/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_p2015_series-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p2015d_series-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p2015dn_series-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p2015dn_series-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p2015n_series-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p2015n_series-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p2015x_series-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p2015x_series-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p2035-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_p2035-hpijs-zjs.ppd.gz
+share/ppd/HP/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_p2035n-hpijs-zjs.ppd.gz
+share/ppd/HP/hp-laserjet_p2055-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_p2055-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_p2055d-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_p2055dn-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_p2055x-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p3004-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_p3004-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p3005-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_p3005-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p3010_series-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p4014-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p4014-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p4014dn-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p4014dn-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p4014n-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p4014n-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p4015-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p4015-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p4015dn-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p4015dn-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p4015n-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p4015n-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p4015tn-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p4015tn-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p4015x-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p4015x-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p4515-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p4515-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p4515n-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p4515n-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p4515tn-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p4515tn-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p4515x-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p4515x-ps.ppd.gz
+share/ppd/HP/hp-laserjet_p4515xm-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_p4515xm-ps.ppd.gz
+share/ppd/HP/hp-mopier_240-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-mopier_240-ps.ppd.gz
+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_300-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_330-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_350-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_4100_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_4105-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_4115_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_4200_series-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_4255-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_4300_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
 share/ppd/HP/hp-officejet_5110v-hpijs.ppd.gz
 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_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_6150_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_6200_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_6300_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_700-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_710-hpijs.ppd.gz
+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_7100_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_7200_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_725-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_7300_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_7400_series-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_9100_series-hpijs-pcl3.ppd.gz
 share/ppd/HP/hp-officejet_d_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_g55-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_g55xi-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_g85-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_g85xi-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_g95-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_h470-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_j5700-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_j3500_series-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_j3600_series-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_j4500_series-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_j4660_series-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_j4680_series-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_j5500_series-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_j5700_series-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_j6400_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_k60-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_k60xi-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_k7100-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_k80-hpijs.ppd.gz
 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_1175c_series-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_pro_8000_a809-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_pro_8500_a909a-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_pro_8500_a909g-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_pro_8500_a909n-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_pro_k5300-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_pro_k5400-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_pro_k550-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_pro_k850-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_pro_k8600-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_pro_l7300-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_pro_l7400-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_pro_l7500-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_pro_l7600-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_pro_l7700-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_r40-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_r40xi-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_r45-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_r60-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_r65-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_r80-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_r80xi-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_series_300-hpijs.ppd.gz
+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
@@ -1138,10 +1222,15 @@ share/ppd/HP/hp-officejet_series_590-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_series_600-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_series_610-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_series_630-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_635-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_series_700-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_series_710-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_series_720-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_series_725-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_t_series-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_v30-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_v40-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_v40xi-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_v45-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_100-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_1115-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_1215-hpijs.ppd.gz
@@ -1154,7 +1243,7 @@ share/ppd/HP/hp-photosmart_240_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_2570_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_2600_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_2700_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_3100-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_3100_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_3200_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_320_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_3300_series-hpijs.ppd.gz
@@ -1184,70 +1273,88 @@ share/ppd/HP/hp-photosmart_a430_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_a440_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_a510_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_a520_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_a530_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_a610_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_a620_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_a630_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_a710_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_a820_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_b8500_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_c309a_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_c3100_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_c4100_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_c4200_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_c4340_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_c4380_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_c4400_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_c4500_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_c4600_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_c5100_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_c5200_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_c5300_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_c5500_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_c6100_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_c6200_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_c6300_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_c7100_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_c7200_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_c8100_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_d5060_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_d5100-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_d6100-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_d7100-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_d5100_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_d5300_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_d5400_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_d6100_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_d7100_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_d7200_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_d7300_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_d7400_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_d7500_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_p1000-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_p1100-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_pro_b8300_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_pro_b8800_series-hpijs.ppd.gz
+share/ppd/HP/hp-printer_scanner_copier_300-hpijs.ppd.gz
+share/ppd/HP/hp-psc_1000_series-hpijs.ppd.gz
 share/ppd/HP/hp-psc_1100_series-hpijs.ppd.gz
 share/ppd/HP/hp-psc_1200_series-hpijs.ppd.gz
 share/ppd/HP/hp-psc_1300_series-hpijs.ppd.gz
 share/ppd/HP/hp-psc_1310_series-hpijs.ppd.gz
+share/ppd/HP/hp-psc_1358_series-hpijs.ppd.gz
 share/ppd/HP/hp-psc_1400_series-hpijs.ppd.gz
+share/ppd/HP/hp-psc_1500_series-hpijs.ppd.gz
 share/ppd/HP/hp-psc_1510_series-hpijs.ppd.gz
 share/ppd/HP/hp-psc_1600_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_2110_series-hpijs.ppd.gz
+share/ppd/HP/hp-psc_2100_series-hpijs.ppd.gz
+share/ppd/HP/hp-psc_2150_series-hpijs.ppd.gz
+share/ppd/HP/hp-psc_2170_series-hpijs.ppd.gz
+share/ppd/HP/hp-psc_2200_series-hpijs.ppd.gz
 share/ppd/HP/hp-psc_2210_series-hpijs.ppd.gz
 share/ppd/HP/hp-psc_2300_series-hpijs.ppd.gz
 share/ppd/HP/hp-psc_2350_series-hpijs.ppd.gz
 share/ppd/HP/hp-psc_2400_series-hpijs.ppd.gz
 share/ppd/HP/hp-psc_2500_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_370-hpijs.ppd.gz
-share/ppd/HP/hp-psc_380-hpijs.ppd.gz
 share/ppd/HP/hp-psc_500-hpijs.ppd.gz
+share/ppd/HP/hp-psc_720-hpijs.ppd.gz
 share/ppd/HP/hp-psc_750-hpijs.ppd.gz
 share/ppd/HP/hp-psc_750xi-hpijs.ppd.gz
+share/ppd/HP/hp-psc_760-hpijs.ppd.gz
+share/ppd/HP/hp-psc_780-hpijs.ppd.gz
+share/ppd/HP/hp-psc_780xi-hpijs.ppd.gz
+share/ppd/HP/hp-psc_900_series-hpijs.ppd.gz
+share/ppd/HP/hp-psc_920-hpijs.ppd.gz
 share/ppd/HP/hp-psc_950-hpijs.ppd.gz
+share/ppd/HP/hp-psc_950vr-hpijs.ppd.gz
 share/ppd/HP/hp-psc_950xi-hpijs.ppd.gz
-share/ppd/HP/hp_LaserJet_1300_series-ps.ppd.gz
-share/ppd/HP/hp_LaserJet_2300-ps.ppd.gz
-share/ppd/HP/hp_LaserJet_3015-ps.ppd.gz
-share/ppd/HP/hp_LaserJet_3020_3030-ps.ppd.gz
-share/ppd/HP/hp_LaserJet_3380-ps.ppd.gz
-share/ppd/HP/hp_LaserJet_4200_Series-ps.ppd.gz
-share/ppd/HP/hp_LaserJet_4300_Series-ps.ppd.gz
-share/ppd/HP/hp_business_inkjet_2300-ps.ppd.gz
-share/ppd/HP/hp_color_LaserJet_2500-ps.ppd.gz
-share/ppd/HP/hp_color_LaserJet_3700-ps.ppd.gz
-share/ppd/HP/hp_color_LaserJet_4600-ps.ppd.gz
-share/ppd/HP/hp_color_LaserJet_4610-ps.ppd.gz
-share/ppd/HP/hp_color_LaserJet_4650-ps.ppd.gz
-share/ppd/HP/hp_color_LaserJet_5500-ps.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_officejet_9100_series-ps.ppd.gz
-@dirrm share/ppd/HP
-@dirrm share/ppd
-@unexec rm -f %D/%%DATADIR%%/*/*.pyc 2>/dev/null || true
-@dirrm %%DATADIR%%/ui
+share/ppd/HP/HP-Fax-hpijs.ppd.gz
+share/ppd/HP/HP-Fax2-hpijs.ppd.gz
+share/applications/hplip.desktop
+@dirrmtry share/ppd/HP
+@dirrmtry share/ppd
+@dirrmtry share/applications
+@dirrm %%DATADIR%%/ui4/plugins
+@dirrm %%DATADIR%%/ui4
 @dirrm %%DATADIR%%/scan
 @dirrm %%DATADIR%%/prnt
-@dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/pcard
 @dirrm %%DATADIR%%/installer
 @dirrm %%DATADIR%%/fax
@@ -1256,30 +1363,33 @@ share/ppd/HP/hp_officejet_9100_series-ps.ppd.gz
 @dirrm %%DATADIR%%/data/models
 @dirrm %%DATADIR%%/data/localization
 @dirrm %%DATADIR%%/data/ldl
+@dirrm %%DATADIR%%/data/images/other
+@dirrm %%DATADIR%%/data/images/devices
+@dirrm %%DATADIR%%/data/images/64x64
+@dirrm %%DATADIR%%/data/images/32x32
+@dirrm %%DATADIR%%/data/images/256x256
+@dirrm %%DATADIR%%/data/images/24x24
+@dirrm %%DATADIR%%/data/images/16x16
+@dirrm %%DATADIR%%/data/images/128x128
 @dirrm %%DATADIR%%/data/images
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%/copier
 @dirrm %%DATADIR%%/base
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/troubleshooting
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/tech_docs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/supported_devices
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/styles
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/step4/suse
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/step4/setup
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/step4/cups
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/step4
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/step3
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/step2
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/step1
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/manual/distros
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/manual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install/install
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/install
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/howtos
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.9.6b/styles
+%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.9.6b/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.9.6b
 @dirrmtry share/applications
-@dirrmtry share/gnome
+@dirrmtry lib/sane
+@dirrmtry lib/python2.5/site-packages
+@dirrmtry lib/python2.5
+@dirrmtry libexec/cups/filter
+@dirrmtry libexec/cups/backends
+@dirrmtry libexec/cups/driver
+@dirrmtry libexec/cups
 @dirrmtry etc/hp
+@dirrmtry etc/xdg/autostart
+@dirrmtry etc/xdg
+@exec mkdir -p %D/%%DATADIR%%/ui4/plugins
+@exec echo hpaio >> %D/etc/sane.d/dll.conf
+@unexec sed -i "" -e '/^hpaio$/d' %D/etc/sane.d/dll.conf
author	amdmi3 <amdmi3@FreeBSD.org>	2009-08-05 08:44:53 +0800
committer	amdmi3 <amdmi3@FreeBSD.org>	2009-08-05 08:44:53 +0800
commit	870f23db75637a3604b3010e44ce7cb415876ffc (patch)
tree	6f65be464c1bc33b91214330f12573c4779e91aa /print
parent	7cf7d9be7babd18ef17834cb8f635d5281625f8e (diff)
download	freebsd-ports-gnome-870f23db75637a3604b3010e44ce7cb415876ffc.tar.gz freebsd-ports-gnome-870f23db75637a3604b3010e44ce7cb415876ffc.tar.zst freebsd-ports-gnome-870f23db75637a3604b3010e44ce7cb415876ffc.zip