- Update to 3.10.6

- Remove rc.d script (remains from hplip2, not used nowadays)
  and simplify pkg-message
- Make fax and scanning support optional and off by default [1]
- Respect PREFIX/LOCALBASE, other minor cleanups

PR:		ports/147346 [1] (based on)
Submitted by:	Christopher Petrik <chris at officialunix.com>

10 files changed, 641 insertions, 682 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index de6a38e16b33..388e959a6846 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	hplip
-PORTVERSION=	3.10.5
-PORTREVISION=	1
+PORTVERSION=	3.10.6
 CATEGORIES=	print
 MASTER_SITES=	SF
 
@@ -15,132 +14,156 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Drivers and utilities for HP Printers and All-in-One devices
 
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		sane.1:${PORTSDIR}/graphics/sane-backends \
 		cupsdriver.1:${PORTSDIR}/print/cups-base \
 		cups.2:${PORTSDIR}/print/cups-client \
-		cupsimage.2:${PORTSDIR}/print/cups-image
-		
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2 \
-		espgs:${PORTSDIR}/print/cups-pstoraster \
+		cupsimage.2:${PORTSDIR}/print/cups-image \
+		dbus-1.3:${PORTSDIR}/devel/dbus
+RUN_DEPENDS=	espgs:${PORTSDIR}/print/cups-pstoraster \
 		foomatic-rip:${PORTSDIR}/print/foomatic-filters \
-		mDNSClientPosix:${PORTSDIR}/net/mDNSResponder
+		${PYTHON_SITELIBDIR}/gtk-2.0/gobject/_gobject.so:${PORTSDIR}/devel/py-gobject \
+		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
 
-LATEST_LINK=	${PORTNAME}3
-CONFLICTS=	hpijs-[0-9]* hplip-2*
+CONFLICTS=	hpijs-[0-9]*
+
+USE_GHOSTSCRIPT_RUN=	yes
+USE_PYTHON=	2.5+
+USE_GNOME=	pkgconfig
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-dependency-tracking \
-		--disable-pp-build \
-		--enable-foomatic-ppd-install \
+CONFIGURE_ARGS=	--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-hpppddir=${LOCALBASE}/share/ppd/HP \
-		--with-mimedir=${LOCALBASE}/etc/cups \
-		--with-docdir=${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+		--with-cupsbackenddir=${PREFIX}/libexec/cups/backend \
+		--with-cupsfilterdir=${PREFIX}/libexec/cups/filter \
+		--with-icondir=${DESKTOPDIR} \
+		--with-systraydir=${PREFIX}/etc/xdg/autostart \
+		--with-hpppddir=${PREFIX}/share/ppd/HP \
+		--with-mimedir=${PREFIX}/etc/cups \
+		--with-docdir=${DOCSDIR} \
+		--with-drvdir=${PREFIX}/libexec/cups/driver
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 USE_LDCONFIG=	yes
-USE_GHOSTSCRIPT_RUN=	yes
-USE_PYTHON=	25+
-USE_RC_SUBR=	hpssd
 MAKE_JOBS_SAFE=	yes
+
 SUB_FILES=	pkg-message
 USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=.+\.(c|cpp|h|py)$
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lcompat
-
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
-OPTIONS=	QT "Build QT4 gui" off \
-		DBUS "D-Bus support (required for fax tools)" off \
-		XSANE "Scanning support via XSane" off \
-		SNMP "Support for Simple Network Management Protocol" off
+FILES4FIX=	Makefile.in \
+		base/codes.py \
+		base/g.py \
+		base/pkit.py \
+		base/status.py \
+		base/utils.py \
+		check.py \
+		fax/backend/hpfax.py \
+		hplip.list.in \
+		installer/core_install.py \
+		installer/dcheck.py \
+		installer/distros.dat \
+		io/hpmud/hp-mkuri.c \
+		prnt/cups.py \
+		prnt/hpcups/HPCupsFilter.cpp \
+		prnt/hpcups/Utils.cpp \
+		prnt/hpijs/globals.cpp \
+		prnt/hpijs/hpcupsfax.cpp \
+		prnt/hpijs/hpijs.cpp \
+		setup.py \
+		ui/devmgr4.py \
+		ui/setupform.py \
+		ui4/devmgr5.py
+
+OPTIONS=	QT "Graphical User Interface (Qt4)" on \
+		FAX "PC Send Fax support" off \
+		SNMP "Network/JetDirect support" off \
+		SCAN "Scanning support" off \
+		XSANE "Install XSane for scanning (requires SCAN)" off
 
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 800069
 LIB_DEPENDS+=	usb:${PORTSDIR}/devel/libusb
-.endif
-
-.if defined(WITH_SNMP) && (${ARCH} == i386)
-BROKEN=	can't link with libsnmp, net-mgmt/net-snmp should be fixed first
+USB_INCLUDE=	${LOCALBASE}/include
+.else
+USB_INCLUDE=	/usr/include
 .endif
 
 .if !defined(WITHOUT_QT)
-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
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
+		${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbus
+CONFIGURE_ARGS+=	--enable-qt4 \
+			--enable-gui-build
+PLIST_SUB+=	GUI=""
+.else
+CONFIGURE_ARGS+=	--disable-qt4 \
+			--disable-gui-build
+PLIST_SUB+=	GUI="@comment "
 .endif
 
-.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
-LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
-# fax added as, no dbus no fax
-CONFIGURE_ARGS+=	--enable-dbus-build \
-			--enable-fax-build
+.if defined(WITH_FAX)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2
+CONFIGURE_ARGS+=	--enable-fax-build
 PLIST_SUB+=	FAX=""
 .else
-CONFIGURE_ARGS+=	--disable-dbus-build \
-			--disable-fax-build
+CONFIGURE_ARGS+=	--disable-fax-build
 PLIST_SUB+=	FAX="@comment "
 .endif
 
-.if !defined(WITHOUT_XSANE)
-RUN_DEPENDS+=	xsane:${PORTSDIR}/graphics/xsane
-.endif
-
 .if defined(WITH_SNMP)
+USE_OPENSSL=	yes
 LIB_DEPENDS+=	netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp
 CONFIGURE_ARGS+=	--enable-network-build
+. if ${ARCH} == i386
+# http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/144833
+CONFIGURE_ENV+=	LIBS="-lssp_nonshared"
+. endif
 .else
 CONFIGURE_ARGS+=	--disable-network-build
 .endif
 
+.if defined(WITH_SCAN)
+. if defined(WITH_XSANE)
+RUN_DEPENDS+=	xsane:${PORTSDIR}/graphics/xsane
+. endif
+LIB_DEPENDS+=	sane.1:${PORTSDIR}/graphics/sane-backends
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PIL/_imaging.so:${PORTSDIR}/graphics/py-imaging
+CONFIGURE_ARGS+=	--enable-scan-build
+PLIST_SUB+=	SCAN=""
+.else
+CONFIGURE_ARGS+=	--disable-scan-build
+PLIST_SUB+=	SCAN="@comment "
+.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.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 \
-		${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.in
-	@${REINPLACE_CMD} 's|/etc/xdg|${PREFIX}&|g; s|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|install-dist_prntSCRIPTS install-dist_rulesDATA|install-dist_prntSCRIPTS|g ; \
-			s|install-hpPROGRAMS install-hplip_confDATA|install-hpPROGRAMS|g' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|-ldld||g; s|-ldl||g; s|-dld||g' \
+	${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \
+		-e 's|-ldld||g; s|-ldl||g' \
 		${WRKSRC}/configure \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|/usr/bin/env python|${LOCALBASE}/bin/python|g' \
-		${WRKSRC}/hpssd.py
+	${REINPLACE_CMD} -e '/[[:space:]]install-dist_rulesDATA/ s,install-dist_rulesDATA,,' \
+		-e '/[[:space:]]install-hplip_confDATA/ s,install-hplip_confDATA,,' \
+		${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e 's,/etc/hp,${PREFIX}&,g' \
+		-e 's,/etc/cups,${LOCALBASE}&,g' \
+		-e 's,/etc/init.d,${LOCALBASE}/etc/rc.d,g' \
+		-e 's,/etc/sane.d,${LOCALBASE}&,g' \
+		-e 's,/usr/share,${LOCALBASE}/share,g' \
+		-e 's,/usr/include,${LOCALBASE}/include,g' \
+		${FILES4FIX:S,^,${WRKSRC}/,}
+	${REINPLACE_CMD} -e 's,%USB_INCLUDE%,${USB_INCLUDE},' \
+		${WRKSRC}/installer/core_install.py
 .if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e '/[[:space:]]install-docDATA/ s|install-docDATA||' \
+	${REINPLACE_CMD} -e '/[[:space:]]install-docDATA/ s|install-docDATA||' \
 		${WRKSRC}/Makefile.in
 .endif
 
 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
@@ -148,7 +171,6 @@ post-install:
 		${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/hplip/distinfo b/print/hplip/distinfo
index d5d53612861d..f425c6aa3cbb 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,3 +1,3 @@
-MD5 (hplip-3.10.5.tar.gz) = a4a3679d5987520226ef70d834b63b88
-SHA256 (hplip-3.10.5.tar.gz) = 1701e32b01eb90ab5e90f301fb115ee4a8e3e48e4739c331230646d5b24dd4d3
-SIZE (hplip-3.10.5.tar.gz) = 21495175
+MD5 (hplip-3.10.6.tar.gz) = 96c36e3baf35e93cf9436a772f0c9ef4
+SHA256 (hplip-3.10.6.tar.gz) = 3ee0e68a613d2b966dcb6df9fd8e074c4c3e590249e61c0d792de3373b84fdeb
+SIZE (hplip-3.10.6.tar.gz) = 21577342
diff --git a/print/hplip/files/hpssd.in b/print/hplip/files/hpssd.in
deleted file mode 100644
index 3cedb3ad051f..000000000000
--- a/print/hplip/files/hpssd.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: hpssd
-# BEFORE:  cupsd
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name=hpssd
-rcvar=${name}_enable
-
-command="%%PREFIX%%/sbin/${name}"
-command_interpreter="%%PREFIX%%/bin/python"
-pidfile="/var/run/${name}.pid"
-hpssd_user=nobody
-command_args=">/dev/null"
-
-start_precmd="hpssd_prestart"
-
-load_rc_config $name
-
-: ${hpssd_enable="NO"}
-
-hpssd_prestart()
-{
-	touch ${pidfile}
-	chown ${hpssd_user} ${pidfile}
-}
-
-run_rc_command $*
diff --git a/print/hplip/files/patch-Makefile.in b/print/hplip/files/patch-Makefile.in
index 353440779da1..1f5a3f737a49 100644
--- a/print/hplip/files/patch-Makefile.in
+++ b/print/hplip/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.old	2010-03-28 15:07:10.000000000 -0600
-+++ Makefile.in	2010-03-28 15:08:01.000000000 -0600
+--- ./Makefile.in.orig	2010-07-19 06:20:23.000000000 +0400
++++ ./Makefile.in	2010-08-27 00:58:13.822031467 +0400
 @@ -89,8 +89,8 @@
  # ip library
  @HPLIP_BUILD_TRUE@am__append_1 = libhpmud.la libhpip.la
@@ -11,7 +11,7 @@
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_4 =  \
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	scan/sane/hpaio.desc \
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	prnt/drv/hpijs.drv.in.template \
-@@ -2041,8 +2041,8 @@
+@@ -2084,8 +2084,8 @@
  	ppd/hpcups/hp-psc_950vr.ppd.gz ppd/hpcups/hp-psc_950xi.ppd.gz
  am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \
  	prnt/pcl.py prnt/colorcal.py
@@ -22,7 +22,7 @@
  am__dist_scan_DATA_DIST = scan/__init__.py scan/sane.py
  am__dist_ui_DATA_DIST = ui/alignform.py ui/colorcalform_base.py \
  	ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py \
-@@ -3777,11 +3777,11 @@
+@@ -3862,11 +3862,11 @@
  @HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
  
  # hpmud.rules
@@ -39,3 +39,26 @@
  
  # hplip.conf
  @HPLIP_BUILD_TRUE@hplip_confdir = /etc/hp
+@@ -3921,14 +3921,14 @@
+ 
+ # data
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@modelsdir = $(hplipdir)/data/models
+-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_16x16dir = $(hplipdir)/data/images/16x16
+-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_24x24dir = $(hplipdir)/data/images/24x24
+-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_32x32dir = $(hplipdir)/data/images/32x32
+-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_64x64dir = $(hplipdir)/data/images/64x64
+-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_128x128dir = $(hplipdir)/data/images/128x128
+-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_256x256dir = $(hplipdir)/data/images/256x256
+-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_devicesdir = $(hplipdir)/data/images/devices
+-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_otherdir = $(hplipdir)/data/images/other
++@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_16x16dir = $(hplipdir)/data/images/16x16
++@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_24x24dir = $(hplipdir)/data/images/24x24
++@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_32x32dir = $(hplipdir)/data/images/32x32
++@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_64x64dir = $(hplipdir)/data/images/64x64
++@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_128x128dir = $(hplipdir)/data/images/128x128
++@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_256x256dir = $(hplipdir)/data/images/256x256
++@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_devicesdir = $(hplipdir)/data/images/devices
++@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_otherdir = $(hplipdir)/data/images/other
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@pcldir = $(hplipdir)/data/pcl
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ldldir = $(hplipdir)/data/ldl
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@postscriptdir = $(hplipdir)/data/ps
diff --git a/print/hplip/files/patch-check.py b/print/hplip/files/patch-check.py
deleted file mode 100644
index 554e1ac5d836..000000000000
--- a/print/hplip/files/patch-check.py
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/hplip/files/patch-core_install.py b/print/hplip/files/patch-core_install.py
index 41cba9d9edcf..ff1f03610561 100644
--- a/print/hplip/files/patch-core_install.py
+++ b/print/hplip/files/patch-core_install.py
@@ -1,11 +1,11 @@
---- installer/core_install.py.old	2010-04-30 05:23:48.000000000 -0500
-+++ installer/core_install.py	2010-04-30 05:24:07.000000000 -0500
-@@ -897,7 +897,7 @@
+--- ./installer/core_install.py.orig	2010-08-26 02:29:22.000000000 +0400
++++ ./installer/core_install.py	2010-08-26 02:30:22.429959790 +0400
+@@ -833,7 +833,7 @@
+         if not check_lib('libusb'):
+             return False
  
+-        return len(locate_file_contains("usb.h", '/usr/include', 'usb_init(void)'))
++        return len(locate_file_contains("usb.h", '%USB_INCLUDE%', 'usb_init(void)'))
  
-     def check_sane_devel(self):
--        return len(locate_file_contains("sane.h", '/usr/include', 'extern SANE_Status sane_init'))
-+        return len(locate_file_contains("sane.h", '/usr/local/include/sane', 'extern SANE_Status sane_init'))
  
- 
-     def check_xsane(self):
+     def check_libjpeg(self):
diff --git a/print/hplip/files/patch-cups.py b/print/hplip/files/patch-cups.py
deleted file mode 100644
index a04535bff76a..000000000000
--- a/print/hplip/files/patch-cups.py
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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/hplip/files/patch-prnt__hpcups__HPCupsFilter.cpp b/print/hplip/files/patch-prnt__hpcups__HPCupsFilter.cpp
new file mode 100644
index 000000000000..227e069a2db6
--- /dev/null
+++ b/print/hplip/files/patch-prnt__hpcups__HPCupsFilter.cpp
@@ -0,0 +1,20 @@
+--- ./prnt/hpcups/HPCupsFilter.cpp.orig	2010-08-25 11:15:08.000000000 +0400
++++ ./prnt/hpcups/HPCupsFilter.cpp	2010-08-25 11:35:36.000000000 +0400
+@@ -433,13 +433,14 @@
+ 
+     memset(&m_JA, 0, sizeof(JobAttributes));
+     struct    tm       *t;
+-    struct    timeb    tb;
++    struct    timeval    tv;
++    struct    timezone   tz;
+     time_t             long_time;
+     time(&long_time);
+     t = localtime(&long_time);
+-    ftime(&tb);
++    gettimeofday(&tv, &tz);
+     strncpy(m_JA.job_start_time, asctime(t), sizeof(m_JA.job_start_time)-1);    // returns Fri Jun  5 08:12:16 2009
+-    snprintf(m_JA.job_start_time+19, sizeof(m_JA.job_start_time) - 20, ":%d %d", tb.millitm, t->tm_year + 1900); // add milliseconds
++    snprintf(m_JA.job_start_time+19, sizeof(m_JA.job_start_time) - 20, ":%d %d", tv.tv_usec/1000, t->tm_year + 1900); // add milliseconds
+ 
+     getLogLevel();
+     m_JA.job_id = atoi(argv[1]);
diff --git a/print/hplip/files/pkg-message.in b/print/hplip/files/pkg-message.in
index 63524932c62c..56a2d82cd91c 100644
--- a/print/hplip/files/pkg-message.in
+++ b/print/hplip/files/pkg-message.in
@@ -1,54 +1,13 @@
-**********************************************************
+=====================================================================
 
-**************** UPGRADE FROM 1.X NOTICE *****************
+HPLIP expects printers to be attached as a ugen(4) devices.  This
+means that you must NOT have "device ulpt" in your kernel and ulpt
+must NOT be loaded as a kernel module (you may also want to compile
+print/cups-base with LIBUSB support). Please, follow the instructions
+from print/cups-base pkg-message to setup correct permission for
+usb devices.
 
-NOTE: If you are upgrading from 1.x you will need to
-change your devfs ruleset as hpiod is now gone, so remove
-it from you rc.conf.  The printer communication now runs
-through cupsd.  You will need to make the devfs ruleset
-changes to allow cups to access the usb bus and ugen
-devices so that it can enumerate the printers.  You will
-also need to update your hplip.conf.  See the instructions
-below.
+In order to enable full functionality of hp tools, users must be
+added to group `cups'.
 
-**************** UPGRADE FROM 1.X NOTICE *****************
-
-*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:
-
-add path 'usb*' group cups
-add path 'usb*' mode 0660
-add path 'ugen*' group cups
-add path 'ugen*' mode 0660
-
-If you have never setup devfs.rules please read the
-manpage and see:
-http://am-productions.biz/docs/devfs.rules.php
-
-The printer MUST attach as a ugen(4) device.  This means
-that you must NOT have "device ulpt" in your kernel and
-ulpt must NOT be loaded as a kernel module.
-
-If you are seeing device connection errors restart the
-printing chain with the following command.  NOTE: It MUST
-be restarted in the stated order.
-%%PREFIX%%/etc/rc.d/hpssd restart && \
-%%PREFIX%%/etc/rc.d/cupsd restart
-
-If upgrading from a version < 2.7.9 copy the new
-hplip.conf.sample config.
-cp %%PREFIX%%/etc/hp/hplip.conf.sample \
-   %%PREFIX%%/etc/hp/hplip.conf
-
-If you are still having problems check:
-http://am-productions.biz/docs/hplip.php
-If you are still having problems send the relevant part
-of your /var/log/messages, console output from the hp-*
-utility that you are trying to run, and your rc.conf +
-devfs.rules files and the output of "ls -l /dev" to the
-maintainer.
-**********************************************************
+=====================================================================
diff --git a/print/hplip/pkg-plist b/print/hplip/pkg-plist
index c014d8e12923..e1879c7877b5 100644
--- a/print/hplip/pkg-plist
+++ b/print/hplip/pkg-plist
@@ -25,17 +25,16 @@ bin/hp-setup
 bin/hp-systray
 bin/hp-testpage
 bin/hp-timedate
-bin/hp-toolbox
+%%GUI%%bin/hp-toolbox
 bin/hp-unload
 bin/hp-wificonfig
 bin/hpijs
-sbin/hpssd
+%%FAX%%etc/cups/pstotiff.convs
+%%FAX%%etc/cups/pstotiff.types
 @unexec if cmp -s %D/etc/hp/hplip.conf.sample %D/etc/hp/hplip.conf; then rm -f %D/etc/hp/hplip.conf; fi
 etc/hp/hplip.conf.sample
 @exec if [ ! -f %B/hplip.conf ]; then cp -p %D/%F %B/hplip.conf; fi
 etc/xdg/autostart/hplip-systray.desktop
-%%FAX%%etc/cups/pstotiff.convs
-%%FAX%%etc/cups/pstotiff.types
 lib/libhpip.la
 lib/libhpip.so
 lib/libhpip.so.0
@@ -48,20 +47,21 @@ lib/libhpmud.so.0
 %%PYTHON_SITELIBDIR%%/hpmudext.so
 %%PYTHON_SITELIBDIR%%/pcardext.la
 %%PYTHON_SITELIBDIR%%/pcardext.so
-%%PYTHON_SITELIBDIR%%/scanext.la
-%%PYTHON_SITELIBDIR%%/scanext.so
-lib/sane/libsane-hpaio.la
-lib/sane/libsane-hpaio.so
-lib/sane/libsane-hpaio.so.1
+%%SCAN%%%%PYTHON_SITELIBDIR%%/scanext.la
+%%SCAN%%%%PYTHON_SITELIBDIR%%/scanext.so
+%%SCAN%%lib/sane/libsane-hpaio.la
+%%SCAN%%lib/sane/libsane-hpaio.so
+%%SCAN%%lib/sane/libsane-hpaio.so.1
+libexec/cups/backend/hp
+%%FAX%%libexec/cups/backend/hpfax
+libexec/cups/driver/hpcups.drv
+libexec/cups/filter/foomatic-rip-hplip
 libexec/cups/filter/hpcac
 libexec/cups/filter/hpcups
 %%FAX%%libexec/cups/filter/hpcupsfax
 libexec/cups/filter/hplipjs
 libexec/cups/filter/pstotiff
-libexec/cups/backend/hp
-%%FAX%%libexec/cups/backend/hpfax
-libexec/cups/driver/hpcups.drv
-libexec/cups/filter/foomatic-rip-hplip
+share/applications/hplip.desktop
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README_LIBJPG
 %%PORTDOCS%%%%DOCSDIR%%/commandline.html
@@ -128,319 +128,319 @@ libexec/cups/filter/foomatic-rip-hplip
 %%DATADIR%%/colorcal.py
 %%DATADIR%%/copier/__init__.py
 %%DATADIR%%/copier/copier.py
-%%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/256x256/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
+%%GUI%%%%DATADIR%%/data/images/128x128/audio.png
+%%GUI%%%%DATADIR%%/data/images/128x128/bmp.png
+%%GUI%%%%DATADIR%%/data/images/128x128/gif.png
+%%GUI%%%%DATADIR%%/data/images/128x128/hp_logo.png
+%%GUI%%%%DATADIR%%/data/images/128x128/jpg.png
+%%GUI%%%%DATADIR%%/data/images/128x128/movie.png
+%%GUI%%%%DATADIR%%/data/images/128x128/mpg.png
+%%GUI%%%%DATADIR%%/data/images/128x128/png.png
+%%GUI%%%%DATADIR%%/data/images/128x128/tif.png
+%%GUI%%%%DATADIR%%/data/images/128x128/unknown.png
+%%GUI%%%%DATADIR%%/data/images/16x16/active.png
+%%GUI%%%%DATADIR%%/data/images/16x16/add_user.png
+%%GUI%%%%DATADIR%%/data/images/16x16/add_user_quick.png
+%%GUI%%%%DATADIR%%/data/images/16x16/add_users.png
+%%GUI%%%%DATADIR%%/data/images/16x16/battery.png
+%%GUI%%%%DATADIR%%/data/images/16x16/busy.png
+%%GUI%%%%DATADIR%%/data/images/16x16/cancel.png
+%%GUI%%%%DATADIR%%/data/images/16x16/close.png
+%%GUI%%%%DATADIR%%/data/images/16x16/down.png
+%%GUI%%%%DATADIR%%/data/images/16x16/down_user.png
+%%GUI%%%%DATADIR%%/data/images/16x16/download.png
+%%GUI%%%%DATADIR%%/data/images/16x16/edit.png
+%%GUI%%%%DATADIR%%/data/images/16x16/error.png
+%%GUI%%%%DATADIR%%/data/images/16x16/fab.png
+%%GUI%%%%DATADIR%%/data/images/16x16/fax.png
+%%GUI%%%%DATADIR%%/data/images/16x16/folder_open.png
+%%GUI%%%%DATADIR%%/data/images/16x16/folder_remove.png
+%%GUI%%%%DATADIR%%/data/images/16x16/help.png
+%%GUI%%%%DATADIR%%/data/images/16x16/hp_logo.png
+%%GUI%%%%DATADIR%%/data/images/16x16/idle.png
+%%GUI%%%%DATADIR%%/data/images/16x16/info.png
+%%GUI%%%%DATADIR%%/data/images/16x16/inkdrop.png
+%%GUI%%%%DATADIR%%/data/images/16x16/list_add.png
+%%GUI%%%%DATADIR%%/data/images/16x16/list_remove.png
+%%GUI%%%%DATADIR%%/data/images/16x16/makecopies.png
+%%GUI%%%%DATADIR%%/data/images/16x16/mimetypes.png
+%%GUI%%%%DATADIR%%/data/images/16x16/minus.png
+%%GUI%%%%DATADIR%%/data/images/16x16/next.png
+%%GUI%%%%DATADIR%%/data/images/16x16/ok.png
+%%GUI%%%%DATADIR%%/data/images/16x16/paper.png
+%%GUI%%%%DATADIR%%/data/images/16x16/pcard.png
+%%GUI%%%%DATADIR%%/data/images/16x16/plus.png
+%%GUI%%%%DATADIR%%/data/images/16x16/prev.png
+%%GUI%%%%DATADIR%%/data/images/16x16/print.png
+%%GUI%%%%DATADIR%%/data/images/16x16/quit.png
+%%GUI%%%%DATADIR%%/data/images/16x16/refresh.png
+%%GUI%%%%DATADIR%%/data/images/16x16/refresh1.png
+%%GUI%%%%DATADIR%%/data/images/16x16/remove_user.png
+%%GUI%%%%DATADIR%%/data/images/16x16/scan.png
+%%GUI%%%%DATADIR%%/data/images/16x16/settings.png
+%%GUI%%%%DATADIR%%/data/images/16x16/status_refresh.png
+%%GUI%%%%DATADIR%%/data/images/16x16/thumbnail.png
+%%GUI%%%%DATADIR%%/data/images/16x16/toner.png
+%%GUI%%%%DATADIR%%/data/images/16x16/up.png
+%%GUI%%%%DATADIR%%/data/images/16x16/up_user.png
+%%GUI%%%%DATADIR%%/data/images/16x16/warning.png
+%%GUI%%%%DATADIR%%/data/images/24x24/add_to_group.png
+%%GUI%%%%DATADIR%%/data/images/24x24/new_group.png
+%%GUI%%%%DATADIR%%/data/images/24x24/new_group_from_selection.png
+%%GUI%%%%DATADIR%%/data/images/24x24/new_user.png
+%%GUI%%%%DATADIR%%/data/images/24x24/remove_from_group.png
+%%GUI%%%%DATADIR%%/data/images/24x24/remove_group.png
+%%GUI%%%%DATADIR%%/data/images/24x24/remove_user.png
+%%GUI%%%%DATADIR%%/data/images/24x24/rename_group.png
+%%GUI%%%%DATADIR%%/data/images/256x256/hp_logo.png
+%%GUI%%%%DATADIR%%/data/images/256x256/logo.png
+%%GUI%%%%DATADIR%%/data/images/32x32/align.png
+%%GUI%%%%DATADIR%%/data/images/32x32/battery.png
+%%GUI%%%%DATADIR%%/data/images/32x32/busy.png
+%%GUI%%%%DATADIR%%/data/images/32x32/clean.png
+%%GUI%%%%DATADIR%%/data/images/32x32/colorcal.png
+%%GUI%%%%DATADIR%%/data/images/32x32/cups.png
+%%GUI%%%%DATADIR%%/data/images/32x32/download.png
+%%GUI%%%%DATADIR%%/data/images/32x32/error.png
+%%GUI%%%%DATADIR%%/data/images/32x32/ews.png
+%%GUI%%%%DATADIR%%/data/images/32x32/fab.png
+%%GUI%%%%DATADIR%%/data/images/32x32/fax-disabled.png
+%%GUI%%%%DATADIR%%/data/images/32x32/fax.png
+%%GUI%%%%DATADIR%%/data/images/32x32/fax_machine.png
+%%GUI%%%%DATADIR%%/data/images/32x32/fax_setup.png
+%%GUI%%%%DATADIR%%/data/images/32x32/firmware.png
+%%GUI%%%%DATADIR%%/data/images/32x32/help.png
+%%GUI%%%%DATADIR%%/data/images/32x32/hp_logo.png
+%%GUI%%%%DATADIR%%/data/images/32x32/idle.png
+%%GUI%%%%DATADIR%%/data/images/32x32/info.png
+%%GUI%%%%DATADIR%%/data/images/32x32/inkdrop.png
+%%GUI%%%%DATADIR%%/data/images/32x32/keys.png
+%%GUI%%%%DATADIR%%/data/images/32x32/linefeed_cal.png
+%%GUI%%%%DATADIR%%/data/images/32x32/lock.png
+%%GUI%%%%DATADIR%%/data/images/32x32/lporg.png
+%%GUI%%%%DATADIR%%/data/images/32x32/makecopies-disabled.png
+%%GUI%%%%DATADIR%%/data/images/32x32/makecopies.png
+%%GUI%%%%DATADIR%%/data/images/32x32/ok.png
+%%GUI%%%%DATADIR%%/data/images/32x32/paper.png
+%%GUI%%%%DATADIR%%/data/images/32x32/pcard-disabled.png
+%%GUI%%%%DATADIR%%/data/images/32x32/pcard.png
+%%GUI%%%%DATADIR%%/data/images/32x32/plugin.png
+%%GUI%%%%DATADIR%%/data/images/32x32/pq_diag.png
+%%GUI%%%%DATADIR%%/data/images/32x32/print-disabled.png
+%%GUI%%%%DATADIR%%/data/images/32x32/print.png
+%%GUI%%%%DATADIR%%/data/images/32x32/scan-disabled.png
+%%GUI%%%%DATADIR%%/data/images/32x32/scan.png
+%%GUI%%%%DATADIR%%/data/images/32x32/settings.png
+%%GUI%%%%DATADIR%%/data/images/32x32/testpage.png
+%%GUI%%%%DATADIR%%/data/images/32x32/toner.png
+%%GUI%%%%DATADIR%%/data/images/32x32/toner_cartridge.png
+%%GUI%%%%DATADIR%%/data/images/32x32/warning.png
+%%GUI%%%%DATADIR%%/data/images/32x32/wireless.png
+%%GUI%%%%DATADIR%%/data/images/64x64/hp_logo.png
+%%GUI%%%%DATADIR%%/data/images/devices/120.png
+%%GUI%%%%DATADIR%%/data/images/devices/COLOR_INKJET_PRINTER_CP1700.png
+%%GUI%%%%DATADIR%%/data/images/devices/CP_1700.png
+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_1120C.png
+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_1220C.png
+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_2500C.png
+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_3820.png
+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_5740.png
+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_610.png
+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_630C.png
+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_650C.png
+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_840C.png
+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_916C.png
+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_9600.png
+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_960C.png
+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_970C.png
+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_990C.png
+%%GUI%%%%DATADIR%%/data/images/devices/DESKJET_995C.png
+%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_3740.png
+%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_5400_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_5700.png
+%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_5900_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_6500.png
+%%GUI%%%%DATADIR%%/data/images/devices/Deskjet_6800.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_2000C.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_2500C.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_BI_3000.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_Business_Inkjet_1200.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_1500.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_2840.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_4500.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_4730mfp.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_8550.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_LJ1xxx.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_1012.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_1220.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_3200M.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_3300_3310_3320.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_4000.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_4100_MFP.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_4M.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_5Si.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_6MP.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_8100_Series.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_9000_MFP.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_9040_MFP.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_9500dn.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_m1005.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_LaserJet_m1522.png
+%%GUI%%%%DATADIR%%/data/images/devices/HP_Officejet_Pro_L7700.png
+%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_3500.png
+%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_4650.png
+%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_4650dtn.png
+%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_5500.png
+%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_5500dtn.png
+%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_5550.png
+%%GUI%%%%DATADIR%%/data/images/devices/LASERJET_5550DTN.png
+%%GUI%%%%DATADIR%%/data/images/devices/OFFICEJET_PRO_1150C.png
+%%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_5105.png
+%%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_6100_Series.png
+%%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_G85.png
+%%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_Series_300.png
+%%GUI%%%%DATADIR%%/data/images/devices/Officejet_6150_Series.png
+%%GUI%%%%DATADIR%%/data/images/devices/Officejet_6200_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/Officejet_7200_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/Officejet_9100_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/PHOTOSMART_100.png
+%%GUI%%%%DATADIR%%/data/images/devices/PHOTOSMART_1218.png
+%%GUI%%%%DATADIR%%/data/images/devices/PHOTOSMART_1315.png
+%%GUI%%%%DATADIR%%/data/images/devices/PHOTOSMART_P1100.png
+%%GUI%%%%DATADIR%%/data/images/devices/PSC_900_Series.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_2600_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_2700_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_3300_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_370_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_7400_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_8050.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_8100_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_8250.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_8400_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_8750_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_C3100.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_C4100.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_C5100.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_C6100.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_D5060.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_D5100.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_D6160.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_D7100.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_D7300.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_Pro_B8300.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_Pro_B9180.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_a310.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_a510.png
+%%GUI%%%%DATADIR%%/data/images/devices/Photosmart_a710.png
+%%GUI%%%%DATADIR%%/data/images/devices/cp1160.png
+%%GUI%%%%DATADIR%%/data/images/devices/default_business_inkjet.png
+%%GUI%%%%DATADIR%%/data/images/devices/default_designjet.png
+%%GUI%%%%DATADIR%%/data/images/devices/default_deskjet.png
+%%GUI%%%%DATADIR%%/data/images/devices/default_laserjet.png
+%%GUI%%%%DATADIR%%/data/images/devices/default_officejet.png
+%%GUI%%%%DATADIR%%/data/images/devices/default_photosmart.png
+%%GUI%%%%DATADIR%%/data/images/devices/default_printer.png
+%%GUI%%%%DATADIR%%/data/images/devices/default_psc.png
+%%GUI%%%%DATADIR%%/data/images/devices/desket_5650.png
+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_1280.png
+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3200.png
+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3320.png
+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3325.png
+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3420.png
+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3425.png
+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3500.png
+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3600.png
+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_3840.png
+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_5100.png
+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_5550.png
+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_5552.png
+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_5600.png
+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_6120.png
+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_6980.png
+%%GUI%%%%DATADIR%%/data/images/devices/deskjet_D2360.png
+%%GUI%%%%DATADIR%%/data/images/devices/dj350.png
+%%GUI%%%%DATADIR%%/data/images/devices/dj450.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_1200.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_2100.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_3015.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_3020.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_4345_mfp.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_5000.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_LaserJet_8000.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_business_inkjet_1100.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_business_inkjet_2200.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_business_inkjet_2600.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_business_inkjet_3000.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_2550.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_3700.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_4600.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_9500.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cm1015_mfp.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cm1312_mfp.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp2025.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp3505.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp3525.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp4005.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp6015.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_deskjet_9300.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_deskjet_f4200.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_laserjet_3050.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_laserjet_m2727_mfp.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_laserjet_p2015.png
+%%GUI%%%%DATADIR%%/data/images/devices/hp_photosmart_b8500_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/laserjet_2410.png
+%%GUI%%%%DATADIR%%/data/images/devices/officejet_4200_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/officejet_500.png
+%%GUI%%%%DATADIR%%/data/images/devices/officejet_5500_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/officejet_5600.png
+%%GUI%%%%DATADIR%%/data/images/devices/officejet_j3600_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/officejet_j5500_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/officejet_k550.png
+%%GUI%%%%DATADIR%%/data/images/devices/officejet_k80.png
+%%GUI%%%%DATADIR%%/data/images/devices/photosmart_7150.png
+%%GUI%%%%DATADIR%%/data/images/devices/photosmart_7900_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/photosmart_a610.png
+%%GUI%%%%DATADIR%%/data/images/devices/photosmart_a820_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/psc_1100_series.png
+%%GUI%%%%DATADIR%%/data/images/devices/psc_1610.png
+%%GUI%%%%DATADIR%%/data/images/devices/psc_2300_series.png
+%%GUI%%%%DATADIR%%/data/images/other/aio_align.png
+%%GUI%%%%DATADIR%%/data/images/other/align10.png
+%%GUI%%%%DATADIR%%/data/images/other/clean.png
+%%GUI%%%%DATADIR%%/data/images/other/color_adj.png
+%%GUI%%%%DATADIR%%/data/images/other/confidential_coverpage.png
+%%GUI%%%%DATADIR%%/data/images/other/confidential_title.png
+%%GUI%%%%DATADIR%%/data/images/other/fax.png
+%%GUI%%%%DATADIR%%/data/images/other/fax2.png
+%%GUI%%%%DATADIR%%/data/images/other/generic_coverpage.png
+%%GUI%%%%DATADIR%%/data/images/other/generic_title.png
+%%GUI%%%%DATADIR%%/data/images/other/h-kc-2.png
+%%GUI%%%%DATADIR%%/data/images/other/h-kc-3.png
+%%GUI%%%%DATADIR%%/data/images/other/hp-tux-printer.png
+%%GUI%%%%DATADIR%%/data/images/other/load_paper.png
+%%GUI%%%%DATADIR%%/data/images/other/opensource-75x65.png
+%%GUI%%%%DATADIR%%/data/images/other/panel_lcd.png
+%%GUI%%%%DATADIR%%/data/images/other/pens.png
+%%GUI%%%%DATADIR%%/data/images/other/powered_by_python.png
+%%GUI%%%%DATADIR%%/data/images/other/signal0.png
+%%GUI%%%%DATADIR%%/data/images/other/signal1.png
+%%GUI%%%%DATADIR%%/data/images/other/signal2.png
+%%GUI%%%%DATADIR%%/data/images/other/signal3.png
+%%GUI%%%%DATADIR%%/data/images/other/signal4.png
+%%GUI%%%%DATADIR%%/data/images/other/signal5.png
+%%GUI%%%%DATADIR%%/data/images/other/standard_coverpage.png
+%%GUI%%%%DATADIR%%/data/images/other/type4_color_patch.png
+%%GUI%%%%DATADIR%%/data/images/other/type4_gray_patch.png
+%%GUI%%%%DATADIR%%/data/images/other/urgent_coverpage.png
+%%GUI%%%%DATADIR%%/data/images/other/urgent_title.png
+%%GUI%%%%DATADIR%%/data/images/other/usb_connection.png
+%%GUI%%%%DATADIR%%/data/images/other/v-c-2.png
+%%GUI%%%%DATADIR%%/data/images/other/v-c-3.png
+%%GUI%%%%DATADIR%%/data/images/other/v-k-2.png
+%%GUI%%%%DATADIR%%/data/images/other/v-k-3.png
+%%GUI%%%%DATADIR%%/data/images/other/v-kc-2.png
+%%GUI%%%%DATADIR%%/data/images/other/v-kc-3.png
+%%GUI%%%%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
@@ -482,12 +482,12 @@ libexec/cups/filter/foomatic-rip-hplip
 %%FAX%%%%DATADIR%%/fax/coverpages.py
 %%FAX%%%%DATADIR%%/fax/fax.py
 %%FAX%%%%DATADIR%%/fax/faxdevice.py
-%%FAX%%%%DATADIR%%/fax/pmlfax.py
-%%FAX%%%%DATADIR%%/fax/soapfax.py
 %%FAX%%%%DATADIR%%/fax/marvellfax.py
+%%FAX%%%%DATADIR%%/fax/pmlfax.py
 %%FAX%%%%DATADIR%%/fax/pstotiff
 %%FAX%%%%DATADIR%%/fax/pstotiff.convs
 %%FAX%%%%DATADIR%%/fax/pstotiff.types
+%%FAX%%%%DATADIR%%/fax/soapfax.py
 %%DATADIR%%/faxsetup.py
 %%DATADIR%%/firmware.py
 %%DATADIR%%/hpdio.py
@@ -516,79 +516,83 @@ libexec/cups/filter/foomatic-rip-hplip
 %%DATADIR%%/probe.py
 %%DATADIR%%/query.py
 %%DATADIR%%/scan.py
-%%DATADIR%%/scan/__init__.py
-%%DATADIR%%/scan/sane.py
+%%SCAN%%%%DATADIR%%/scan/__init__.py
+%%SCAN%%%%DATADIR%%/scan/sane.py
 %%DATADIR%%/sendfax.py
 %%DATADIR%%/setup.py
 %%DATADIR%%/systray.py
 %%DATADIR%%/testpage.py
 %%DATADIR%%/timedate.py
 %%DATADIR%%/toolbox.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
+%%GUI%%%%DATADIR%%/ui4/__init__.py
+%%GUI%%%%DATADIR%%/ui4/aboutdialog.py
+%%GUI%%%%DATADIR%%/ui4/aboutdialog_base.py
+%%GUI%%%%DATADIR%%/ui4/aligndialog.py
+%%GUI%%%%DATADIR%%/ui4/aligndialog_base.py
+%%GUI%%%%DATADIR%%/ui4/cleandialog.py
+%%GUI%%%%DATADIR%%/ui4/cleandialog_base.py
+%%GUI%%%%DATADIR%%/ui4/colorcaldialog.py
+%%GUI%%%%DATADIR%%/ui4/colorcaldialog_base.py
+%%GUI%%%%DATADIR%%/ui4/devicesetupdialog.py
+%%GUI%%%%DATADIR%%/ui4/devicesetupdialog_base.py
+%%GUI%%%%DATADIR%%/ui4/deviceuricombobox.py
+%%GUI%%%%DATADIR%%/ui4/devmgr5.py
+%%GUI%%%%DATADIR%%/ui4/devmgr5_base.py
+%%GUI%%%%DATADIR%%/ui4/fabgrouptable.py
+%%GUI%%%%DATADIR%%/ui4/fabnametable.py
+%%GUI%%%%DATADIR%%/ui4/fabwindow.py
+%%GUI%%%%DATADIR%%/ui4/fabwindow_base.py
+%%GUI%%%%DATADIR%%/ui4/faxsetupdialog.py
+%%GUI%%%%DATADIR%%/ui4/faxsetupdialog_base.py
+%%GUI%%%%DATADIR%%/ui4/filetable.py
+%%GUI%%%%DATADIR%%/ui4/firmwaredialog.py
+%%GUI%%%%DATADIR%%/ui4/firmwaredialog_base.py
+%%GUI%%%%DATADIR%%/ui4/infodialog.py
+%%GUI%%%%DATADIR%%/ui4/infodialog_base.py
+%%GUI%%%%DATADIR%%/ui4/linefeedcaldialog.py
+%%GUI%%%%DATADIR%%/ui4/linefeedcaldialog_base.py
+%%GUI%%%%DATADIR%%/ui4/loadpapergroupbox.py
+%%GUI%%%%DATADIR%%/ui4/makecopiesdialog.py
+%%GUI%%%%DATADIR%%/ui4/makecopiesdialog_base.py
+%%GUI%%%%DATADIR%%/ui4/mimetypesdialog.py
+%%GUI%%%%DATADIR%%/ui4/mimetypesdialog_base.py
+%%GUI%%%%DATADIR%%/ui4/nodevicesdialog.py
+%%GUI%%%%DATADIR%%/ui4/nodevicesdialog_base.py
+%%GUI%%%%DATADIR%%/ui4/plugindialog.py
+%%GUI%%%%DATADIR%%/ui4/plugindialog_base.py
+%%GUI%%%%DATADIR%%/ui4/pluginlicensedialog.py
+%%GUI%%%%DATADIR%%/ui4/pluginlicensedialog_base.py
+%%GUI%%%%DATADIR%%/ui4/pqdiagdialog.py
+%%GUI%%%%DATADIR%%/ui4/pqdiagdialog_base.py
+%%GUI%%%%DATADIR%%/ui4/printdialog.py
+%%GUI%%%%DATADIR%%/ui4/printdialog_base.py
+%%GUI%%%%DATADIR%%/ui4/printernamecombobox.py
+%%GUI%%%%DATADIR%%/ui4/printsettingsdialog.py
+%%GUI%%%%DATADIR%%/ui4/printsettingsdialog_base.py
+%%GUI%%%%DATADIR%%/ui4/printsettingstoolbox.py
+%%GUI%%%%DATADIR%%/ui4/printtestpagedialog.py
+%%GUI%%%%DATADIR%%/ui4/printtestpagedialog_base.py
+%%GUI%%%%DATADIR%%/ui4/readonlyradiobutton.py
+%%GUI%%%%DATADIR%%/ui4/sendfaxdialog.py
+%%GUI%%%%DATADIR%%/ui4/sendfaxdialog_base.py
+%%GUI%%%%DATADIR%%/ui4/settingsdialog.py
+%%GUI%%%%DATADIR%%/ui4/settingsdialog_base.py
+%%GUI%%%%DATADIR%%/ui4/setupdialog.py
+%%GUI%%%%DATADIR%%/ui4/setupdialog_base.py
+%%GUI%%%%DATADIR%%/ui4/systemtray.py
+%%GUI%%%%DATADIR%%/ui4/systrayframe.py
+%%GUI%%%%DATADIR%%/ui4/systrayframe_base.py
+%%GUI%%%%DATADIR%%/ui4/ui_utils.py
+%%GUI%%%%DATADIR%%/ui4/wifisetupdialog.py
+%%GUI%%%%DATADIR%%/ui4/wifisetupdialog_base.py
 %%DATADIR%%/unload.py
 %%DATADIR%%/wificonfig.py
 %%FAX%%share/ppd/HP/HP-Fax-hpcups.ppd.gz
+%%FAX%%share/ppd/HP/HP-Fax-hpijs.ppd.gz
 %%FAX%%share/ppd/HP/HP-Fax2-hpcups.ppd.gz
+%%FAX%%share/ppd/HP/HP-Fax2-hpijs.ppd.gz
+%%FAX%%share/ppd/HP/HP-Fax3-hpcups.ppd.gz
+%%FAX%%share/ppd/HP/HP-Fax3-hpijs.ppd.gz
 share/ppd/HP/hp-2000c-hpijs.ppd.gz
 share/ppd/HP/hp-2500c-hpijs.ppd.gz
 share/ppd/HP/hp-910-hpijs.ppd.gz
@@ -696,6 +700,7 @@ 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_cm6040_mfp-ps.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
@@ -719,15 +724,26 @@ 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_cp4020_series-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp4020_series-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp4520_series-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp5225-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp5225dn-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz
+share/ppd/HP/hp-color_laserjet_cp5225n-ps.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-designjet_t1200_postscript-ps.ppd.gz
+share/ppd/HP/hp-designjet_t770_postscript-ps.ppd.gz
+share/ppd/HP/hp-designjet_t770ps_24in-ps.ppd.gz
+share/ppd/HP/hp-deskjet_1050_j410_series-hpijs.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
@@ -737,6 +753,7 @@ 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_2050_j510_series-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
@@ -796,6 +813,7 @@ share/ppd/HP/hp-deskjet_656c-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_660-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_6600-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_670-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_670c-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_670tv-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_672c-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_680-hpijs.ppd.gz
@@ -855,6 +873,7 @@ 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_d1600_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
@@ -862,16 +881,21 @@ 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_d5500_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_f2400_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_f4500_series-hpijs.ppd.gz
 share/ppd/HP/hp-deskjet_f735-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz
+share/ppd/HP/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz
 share/ppd/HP/hp-dj350-hpijs.ppd.gz
 share/ppd/HP/hp-dj450-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_1000-hpijs.ppd.gz
@@ -948,6 +972,8 @@ share/ppd/HP/hp-laserjet_3052-ps.ppd.gz
 share/ppd/HP/hp-laserjet_3055-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.ppd.gz
+share/ppd/HP/hp-laserjet_3200m-hpijs-pcl3.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-pcl3.ppd.gz
@@ -1068,6 +1094,7 @@ 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_m5039_mfp-hpijs-pcl3.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
@@ -1111,6 +1138,8 @@ 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-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_p3010_series-ps.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
@@ -1137,17 +1166,31 @@ 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-laserjet_professional_m1132_mfp-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_p1102-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_p1102w-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_p1566-hpijs.ppd.gz
+share/ppd/HP/hp-laserjet_professional_p1606dn-hpijs.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_150_mobile_l511-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_4000_k210-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_4100_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_4105-hpijs.ppd.gz
 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_4400_k410-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_4500_g510a-f-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_4500_g510g-m-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_4500_g510n-z-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_4500_k710-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_5100_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_5105-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_5110-hpijs.ppd.gz
@@ -1162,10 +1205,13 @@ 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_6500_e709a-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_6500_e709n-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_7000_e809a-hpijs.ppd.gz
+share/ppd/HP/hp-officejet_7000_e809a_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_7100_series-hpijs.ppd.gz
 share/ppd/HP/hp-officejet_7200_series-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_7500_e910-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
@@ -1174,6 +1220,7 @@ 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_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
@@ -1278,8 +1325,13 @@ 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_a640_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_b010_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_b109a-m-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_b109a_series-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_b110_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
@@ -1290,6 +1342,7 @@ 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_c4700_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
@@ -1300,6 +1353,7 @@ 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_d110_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_d5060_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_d5100_series-hpijs.ppd.gz
 share/ppd/HP/hp-photosmart_d5300_series-hpijs.ppd.gz
@@ -1312,8 +1366,12 @@ 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_plus_b209a-m-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz
+share/ppd/HP/hp-photosmart_premium_c309g-m-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-photosmart_wireless_b109n-z-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
@@ -1346,60 +1404,11 @@ 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
-%%FAX%%share/ppd/HP/HP-Fax-hpijs.ppd.gz
-%%FAX%%share/ppd/HP/HP-Fax2-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p3010_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-officejet_7000_e809a-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_plus_b209a-m-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c4700_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_670c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_d1600_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_d5500_series-hpijs.ppd.gz
-%%FAX%%share/ppd/HP/HP-Fax3-hpcups.ppd.gz
-%%FAX%%share/ppd/HP/HP-Fax3-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp5225-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm6040_mfp-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp5225n-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp4020_series-ps.ppd.gz
-share/ppd/HP/hp-designjet_t770_postscript-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp5225dn-ps.ppd.gz
-share/ppd/HP/hp-designjet_t770ps_24in-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp4520_series-ps.ppd.gz
-share/ppd/HP/hp-designjet_t1200_postscript-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-photosmart_b109a_series-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-deskjet_f4500_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_f2400_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4500_g510g-m-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_premium_c309g-m-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3200-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4500_g510a-f-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3200m-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_a640_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1606dn-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1102w-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_150_mobile_l511-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1566-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_d110_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4400_k410-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4000_k210-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1102-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 share/ppd/HP
+@dirrm share/ppd
+%%GUI%%@dirrm %%DATADIR%%/ui4/plugins
+%%GUI%%@dirrm %%DATADIR%%/ui4
+%%SCAN%%@dirrm %%DATADIR%%/scan
 @dirrm %%DATADIR%%/prnt
 @dirrm %%DATADIR%%/pcard
 @dirrm %%DATADIR%%/installer
@@ -1409,15 +1418,15 @@ share/applications/hplip.desktop
 @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
+%%GUI%%@dirrm %%DATADIR%%/data/images/other
+%%GUI%%@dirrm %%DATADIR%%/data/images/devices
+%%GUI%%@dirrm %%DATADIR%%/data/images/64x64
+%%GUI%%@dirrm %%DATADIR%%/data/images/32x32
+%%GUI%%@dirrm %%DATADIR%%/data/images/256x256
+%%GUI%%@dirrm %%DATADIR%%/data/images/24x24
+%%GUI%%@dirrm %%DATADIR%%/data/images/16x16
+%%GUI%%@dirrm %%DATADIR%%/data/images/128x128
+%%GUI%%@dirrm %%DATADIR%%/data/images
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%/copier
 @dirrm %%DATADIR%%/base
@@ -1426,16 +1435,15 @@ share/applications/hplip.desktop
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
-@dirrmtry lib/sane
-@dirrmtry lib/%%PYTHON_VERSION%%/site-packages
-@dirrmtry lib/%%PYTHON_VERSION%%
 @dirrmtry libexec/cups/filter
-@dirrmtry libexec/cups/backends
+@dirrmtry libexec/cups/backend
 @dirrmtry libexec/cups
-@dirrmtry etc/hp
+%%SCAN%%@dirrmtry lib/sane
+@dirrmtry %%PYTHON_SITELIBDIR%%
 @dirrmtry etc/xdg/autostart
 @dirrmtry etc/xdg
-@dirrmtry etc/cups
-@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
+@dirrmtry etc/hp
+%%FAX%%@dirrmtry etc/cups
+%%GUI%%@exec mkdir -p %D/%%DATADIR%%/ui4/plugins
+%%SCAN%%@exec if ! grep ^hpaio %%LOCALBASE%%/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then echo hpaio >> %%LOCALBASE%%/etc/sane.d/dll.conf; fi
+%%SCAN%%@unexec sed -i "" -e '/^hpaio$/d' %%LOCALBASE%%/etc/sane.d/dll.conf