6 files changed, 122 insertions, 132 deletions

diff --git a/print/hplip3/Makefile b/print/hplip3/Makefile
index cbb9522dbbfe..4ae4ddc44839 100644
--- a/print/hplip3/Makefile
+++ b/print/hplip3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	hplip
-PORTVERSION=	3.9.8
-PORTREVISION=	4
+PORTVERSION=	3.10.2
 CATEGORIES=	print
 MASTER_SITES=	SF
 
@@ -37,7 +36,8 @@ CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--with-cupsbackenddir=${LOCALBASE}/libexec/cups/backend \
 		--with-cupsfilterdir=${LOCALBASE}/libexec/cups/filter \
 		--with-drvdir=${LOCALBASE}/libexec/cups/driver \
-		--with-hppddir=${LOCALBASE}/share/ppd/HP
+		--with-hpppddir=${LOCALBASE}/share/ppd/HP \
+		--with-mimedir=${LOCALBASE}/etc/cups
 
 USE_LDCONFIG=	yes
 USE_GHOSTSCRIPT_RUN=	yes
@@ -45,9 +45,10 @@ USE_PYTHON=	25+
 USE_RC_SUBR=	hpssd
 MAKE_JOBS_SAFE=	yes
 SUB_FILES=	pkg-message
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lcompat
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
@@ -55,8 +56,6 @@ 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.options.mk>
 
 .if ${OSVERSION} < 800069
@@ -87,7 +86,7 @@ CONFIGURE_ARGS+=	--enable-doc-build=no
 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}/Makefile.in \
 		${WRKSRC}/check.py ${WRKSRC}/hpssd.py \
 		${WRKSRC}/base/g.py ${WRKSRC}/fax/backend/hpfax.py \
 		${WRKSRC}/installer/distros.dat \
@@ -98,16 +97,15 @@ post-patch:
 		${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
+		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} 's|/etc/xdg|${PREFIX}&|g; s|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure ${WRKSRC}/configure.in
+		${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' \
-		${WRKSRC}/configure ${WRKSRC}/configure.in \
-		${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.am \
-		${WRKSRC}/aclocal.m4
+		${WRKSRC}/configure \
+		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr/bin/env python|${LOCALBASE}/bin/python|g' \
 		${WRKSRC}/hpssd.py
 .if defined(NOPORTDOCS)
diff --git a/print/hplip3/distinfo b/print/hplip3/distinfo
index a50ae5996c71..6c636fee1688 100644
--- a/print/hplip3/distinfo
+++ b/print/hplip3/distinfo
@@ -1,3 +1,3 @@
-MD5 (hplip-3.9.8.tar.gz) = cb1cf49c5f062993b78fc2768f531ed8
-SHA256 (hplip-3.9.8.tar.gz) = 6471d99bde2b1182f45082c50dbd9e424a3ec2c0e98c48c934a1cd0d4ccb4e36
-SIZE (hplip-3.9.8.tar.gz) = 15715640
+MD5 (hplip-3.10.2.tar.gz) = 4df6f16c47ae7edd015bf2cf5155f26f
+SHA256 (hplip-3.10.2.tar.gz) = bb9a3aeda9a8d31f0cc790e629f14d2122f9bff111b0d3cc97ac19a8607d7956
+SIZE (hplip-3.10.2.tar.gz) = 21446275
diff --git a/print/hplip3/files/patch-Makefile.am b/print/hplip3/files/patch-Makefile.am
deleted file mode 100644
index 6642be204412..000000000000
--- a/print/hplip3/files/patch-Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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/*.css
- www4dir = $(docdir)/images
--dist_www4_DATA = $(wwwsrc)/images/*
-+dist_www4_DATA = $(wwwsrc)/images/*.png $(wwwsrc)/images/*.ico
- endif
- 
- if HPLIP_BUILD
-@@ -89,15 +89,16 @@
- hp_mkuri_LDADD = -ldl libhpmud.la
- 
- # hpmud.rules
--rulesdir = /etc/udev/rules.d
--dist_rules_DATA = data/rules/56-hpmud_support.rules
--if UDEV_ACL_RULES
--dist_rules_DATA += data/rules/40-hplip.rules
--else
--dist_rules_DATA += data/rules/55-hpmud.rules
--endif
--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/56-hpmud_support.rules
-+#if UDEV_ACL_RULES
-+#dist_rules_DATA += data/rules/40-hplip.rules
-+#else
-+#dist_rules_DATA += data/rules/55-hpmud.rules
-+#endif
-+#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 665afa7f3b5e..353440779da1 100644
--- a/print/hplip3/files/patch-Makefile.in
+++ b/print/hplip3/files/patch-Makefile.in
@@ -1,33 +1,29 @@
---- Makefile.in.old	2009-06-22 23:34:25.000000000 -0500
-+++ Makefile.in	2009-06-22 23:41:26.000000000 -0500
-@@ -2006,22 +2006,11 @@
- 	data/rules/40-hplip.rules data/rules/55-hpmud.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 $(wwwsrc)/images/*.ico
- dist_www4DATA_INSTALL = $(INSTALL_DATA)
- docDATA_INSTALL = $(INSTALL_DATA)
- hplip_confDATA_INSTALL = $(INSTALL_DATA)
-@@ -3679,11 +3668,12 @@
- @HPLIP_BUILD_TRUE@hp_mkuri_LDADD = -ldl libhpmud.la
+--- Makefile.in.old	2010-03-28 15:07:10.000000000 -0600
++++ Makefile.in	2010-03-28 15:08:01.000000000 -0600
+@@ -89,8 +89,8 @@
+ # ip library
+ @HPLIP_BUILD_TRUE@am__append_1 = libhpmud.la libhpip.la
+ @HPLIP_BUILD_TRUE@hp_mkuri_PROGRAMS = hp-mkuri$(EXEEXT)
+-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@am__append_2 = data/rules/40-hplip.rules
+-@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@am__append_3 = data/rules/55-hpmud.rules
++#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@am__append_2 = data/rules/40-hplip.rules
++#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@am__append_3 = data/rules/55-hpmud.rules
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_4 =  \
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	scan/sane/hpaio.desc \
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	prnt/drv/hpijs.drv.in.template \
+@@ -2041,8 +2041,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
+-am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \
+-	data/rules/40-hplip.rules data/rules/55-hpmud.rules
++#am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \
++#	data/rules/40-hplip.rules data/rules/55-hpmud.rules
+ am__dist_scan_DATA_DIST = scan/__init__.py scan/sane.py
+ am__dist_ui_DATA_DIST = ui/alignform.py ui/colorcalform_base.py \
+ 	ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py \
+@@ -3777,11 +3777,11 @@
+ @HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
  
  # hpmud.rules
 -@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
@@ -35,7 +31,6 @@
 -@HPLIP_BUILD_TRUE@	$(am__append_2) $(am__append_3)
 -@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor
 -@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi
-+# same applys here.
 +#@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
 +#@HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \
 +#@HPLIP_BUILD_TRUE@	$(am__append_2) $(am__append_3)
diff --git a/print/hplip3/files/patch-prnt__hpcups__ErnieFilter.cpp b/print/hplip3/files/patch-prnt__hpcups__ErnieFilter.cpp
new file mode 100644
index 000000000000..d595776fd745
--- /dev/null
+++ b/print/hplip3/files/patch-prnt__hpcups__ErnieFilter.cpp
@@ -0,0 +1,11 @@
+--- ./prnt/hpcups/ErnieFilter.cpp.orig	2010-02-25 02:04:09.000000000 +0300
++++ ./prnt/hpcups/ErnieFilter.cpp	2010-04-18 10:49:13.471529924 +0400
+@@ -50,7 +50,7 @@
+ #include "ErnieFilter.h"
+ 
+ 
+-#if defined(__APPLE__) || defined(__linux)
++#if defined(__APPLE__) || defined(__linux) || (__FreeBSD__)
+ #include <math.h>
+ #endif
+ 
diff --git a/print/hplip3/pkg-plist b/print/hplip3/pkg-plist
index 24bd7904ea4d..e7f969546061 100644
--- a/print/hplip3/pkg-plist
+++ b/print/hplip3/pkg-plist
@@ -34,6 +34,8 @@ sbin/hpssd
 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
+etc/cups/pstotiff.convs
+etc/cups/pstotiff.types
 lib/libhpip.la
 lib/libhpip.so
 lib/libhpip.so.0
@@ -55,44 +57,45 @@ libexec/cups/filter/hpcac
 libexec/cups/filter/hpcups
 libexec/cups/filter/hpcupsfax
 libexec/cups/filter/hplipjs
+libexec/cups/filter/pstotiff
 libexec/cups/backend/hp
 libexec/cups/backend/hpfax
 libexec/cups/driver/hpcups.drv
 libexec/cups/filter/foomatic-rip-hplip
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/COPYING
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/README_LIBJPG
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/commandline.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/copying.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/copyright
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/devicemanager.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/faxtrouble.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/gettinghelp.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/hpscan.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/favicon.ico
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/print.png
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_actions.png
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_fax.png
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_print_control.png
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_print_settings.png
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_status.png
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/toolbox_supplies.png
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/images/xsane.png
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/index.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/mainttask.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/print.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/printing.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/printoptions.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/printtroubleshooting.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/scanning.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/scantrouble.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/sendfax.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/setup.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/styles/css.css
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/systray.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/troubleshooting.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/uninstalling.html
-%%PORTDOCS%%%%DOCSDIR%%-3.9.8/upgrading.html
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README_LIBJPG
+%%PORTDOCS%%%%DOCSDIR%%/commandline.html
+%%PORTDOCS%%%%DOCSDIR%%/copying.html
+%%PORTDOCS%%%%DOCSDIR%%/copyright
+%%PORTDOCS%%%%DOCSDIR%%/devicemanager.html
+%%PORTDOCS%%%%DOCSDIR%%/faxtrouble.html
+%%PORTDOCS%%%%DOCSDIR%%/gettinghelp.html
+%%PORTDOCS%%%%DOCSDIR%%/hpscan.html
+%%PORTDOCS%%%%DOCSDIR%%/images/favicon.ico
+%%PORTDOCS%%%%DOCSDIR%%/images/print.png
+%%PORTDOCS%%%%DOCSDIR%%/images/toolbox_actions.png
+%%PORTDOCS%%%%DOCSDIR%%/images/toolbox_fax.png
+%%PORTDOCS%%%%DOCSDIR%%/images/toolbox_print_control.png
+%%PORTDOCS%%%%DOCSDIR%%/images/toolbox_print_settings.png
+%%PORTDOCS%%%%DOCSDIR%%/images/toolbox_status.png
+%%PORTDOCS%%%%DOCSDIR%%/images/toolbox_supplies.png
+%%PORTDOCS%%%%DOCSDIR%%/images/xsane.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/mainttask.html
+%%PORTDOCS%%%%DOCSDIR%%/plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/print.html
+%%PORTDOCS%%%%DOCSDIR%%/printing.html
+%%PORTDOCS%%%%DOCSDIR%%/printoptions.html
+%%PORTDOCS%%%%DOCSDIR%%/printtroubleshooting.html
+%%PORTDOCS%%%%DOCSDIR%%/scanning.html
+%%PORTDOCS%%%%DOCSDIR%%/scantrouble.html
+%%PORTDOCS%%%%DOCSDIR%%/sendfax.html
+%%PORTDOCS%%%%DOCSDIR%%/setup.html
+%%PORTDOCS%%%%DOCSDIR%%/styles/css.css
+%%PORTDOCS%%%%DOCSDIR%%/systray.html
+%%PORTDOCS%%%%DOCSDIR%%/troubleshooting.html
+%%PORTDOCS%%%%DOCSDIR%%/uninstalling.html
+%%PORTDOCS%%%%DOCSDIR%%/upgrading.html
 %%DATADIR%%/__init__.py
 %%DATADIR%%/align.py
 %%DATADIR%%/base/__init__.py
@@ -233,6 +236,7 @@ libexec/cups/filter/foomatic-rip-hplip
 %%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
@@ -480,6 +484,10 @@ libexec/cups/filter/foomatic-rip-hplip
 %%DATADIR%%/fax/faxdevice.py
 %%DATADIR%%/fax/pmlfax.py
 %%DATADIR%%/fax/soapfax.py
+%%DATADIR%%/fax/marvellfax.py
+%%DATADIR%%/fax/pstotiff
+%%DATADIR%%/fax/pstotiff.convs
+%%DATADIR%%/fax/pstotiff.types
 %%DATADIR%%/faxsetup.py
 %%DATADIR%%/firmware.py
 %%DATADIR%%/hpdio.py
@@ -940,13 +948,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-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_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
@@ -1171,7 +1174,6 @@ 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
@@ -1356,6 +1358,32 @@ 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
+share/ppd/HP/HP-Fax3-hpcups.ppd.gz
+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-designjet_t1120ps_24in-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_t1120ps_44in-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/applications/hplip.desktop
 @dirrmtry share/ppd/HP
 @dirrmtry share/ppd
@@ -1385,9 +1413,9 @@ share/applications/hplip.desktop
 @dirrm %%DATADIR%%/copier
 @dirrm %%DATADIR%%/base
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.9.8/styles
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.9.8/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%-3.9.8
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/styles
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
 @dirrmtry lib/sane
 @dirrmtry lib/python2.5/site-packages
@@ -1398,6 +1426,7 @@ share/applications/hplip.desktop
 @dirrmtry etc/hp
 @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