14 files changed, 416 insertions, 170 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 1fad4c031d46..93e42d48ff9a 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hplip
-PORTVERSION=	0.9.10
+PORTVERSION=	0.9.11
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hplip
@@ -19,7 +19,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		cups.2:${PORTSDIR}/print/cups-base \
 		usb:${PORTSDIR}/devel/libusb \
 		netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp
-RUN_DEPENDS=	pylupdate:${PORTSDIR}/x11-toolkits/py-qt
 
 CONFLITS=	hpijs-* foomatic-filters-*
 
@@ -39,12 +38,22 @@ MAKE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 
 PKGDEINSTALL=	${PKGINSTALL}
 
+OPTIONS=	GUI "build with Python QT" on
+
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 5000000
+.if ${OSVERSION} < 500000
 BROKEN=		does not compile
 .endif
 
+.if exists(${LOCALBASE}/bin/pylupdate)
+WITH_GUI=      yes
+.endif
+
+.if defined(WITH_GUI)
+RUN_DEPENDS+=	pylupdate:${PORTSDIR}/x11-toolkits/py-qt
+.endif
+
 post-extract:
 	@${RM} -r ${WRKSRC}/data/images/CVS
 
@@ -63,7 +72,6 @@ post-patch:
 		s|/usr/lib/cups/filter|${LOCALBASE}/libexec/cups/filter|g' \
 			${WRKSRC}/base/g.py \
 			${WRKSRC}/fax/backend/hpfax.py \
-			${WRKSRC}/hplip_readme.html \
 			${WRKSRC}/hpssd.py \
 			${WRKSRC}/io/hpiod/hpiod.h \
 			${WRKSRC}/prnt/hpijs/hplip_api.h \
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index 1a692b8fb02a..b33909556b95 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,3 +1,3 @@
-MD5 (hplip-0.9.10.tar.gz) = 349489b10fb44d1bf105b04ff5352551
-SHA256 (hplip-0.9.10.tar.gz) = a6a6247b396aba173d0cd7b2aadffc5467d0f82d5aa037503222b98b8d5fe8b1
-SIZE (hplip-0.9.10.tar.gz) = 9296866
+MD5 (hplip-0.9.11.tar.gz) = 5cf362c972d5b1733af4fb8e2ade92e4
+SHA256 (hplip-0.9.11.tar.gz) = 9c6f39863280d74a72bdce632f2453fa5bbbfffd286b1fd0535cfba76dcf5b42
+SIZE (hplip-0.9.11.tar.gz) = 9924094
diff --git a/print/hplip/files/hpiod.sh.in b/print/hplip/files/hpiod.sh.in
index 8e2bee4637e9..4852d2568d98 100644
--- a/print/hplip/files/hpiod.sh.in
+++ b/print/hplip/files/hpiod.sh.in
@@ -2,25 +2,24 @@
 
 # PROVIDE: hpiod
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
-
-[ -z "${hpiod_enable}" ] && hpiod_enable="NO"
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
-prefix=%%PREFIX%%
-
 name=hpiod
+rcvar=${name}_enable
+
+command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 portfile="/var/run/${name}.port"
 hpiod_user=hplip
-command="${prefix}/sbin/${name}"
-start_precmd="hpiod_prestart"
 
-rcvar=`set_rcvar`
+start_precmd="hpiod_prestart"
 
 load_rc_config $name
 
+: ${hpiod_enable="NO"}
+
 hpiod_prestart()
 {
 	touch ${pidfile}
diff --git a/print/hplip/files/hpssd.sh.in b/print/hplip/files/hpssd.sh.in
index 4e7dc15f11b0..3b0303e7afe9 100644
--- a/print/hplip/files/hpssd.sh.in
+++ b/print/hplip/files/hpssd.sh.in
@@ -3,27 +3,26 @@
 # PROVIDE: hpssd
 # REQUIRE: hpiod
 # BEFORE:  cupsd
-# KEYWORD: FreeBSD shutdown
-
-[ -z "${hpssd_enable}" ] && hpssd_enable="NO"
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
-prefix=%%PREFIX%%
-
 name=hpssd
+rcvar=${name}_enable
+
+command="%%PREFIX%%/sbin/${name}"
+command_interpreter="%%PREFIX%%/bin/python"
 pidfile="/var/run/${name}.pid"
 portfile="/var/run/${name}.port"
 hpssd_user=nobody
-command="${prefix}/sbin/${name}"
-command_interpreter="$prefix/bin/python"
 command_args=">/dev/null"
-start_precmd="hpssd_prestart"
 
-rcvar=`set_rcvar`
+start_precmd="hpssd_prestart"
 
 load_rc_config $name
 
+: ${hpssd_enable="NO"}
+
 hpssd_prestart()
 {
 	touch ${pidfile}
diff --git a/print/hplip/files/patch-Makefile.in b/print/hplip/files/patch-Makefile.in
index b96eda6ffb3e..db2e6271d52b 100644
--- a/print/hplip/files/patch-Makefile.in
+++ b/print/hplip/files/patch-Makefile.in
@@ -1,6 +1,18 @@
---- Makefile.in.orig	Thu Mar 23 22:35:33 2006
-+++ Makefile.in	Mon Apr 24 09:15:54 2006
-@@ -1973,15 +1973,9 @@
+--- Makefile.in.orig	Tue May  9 14:18:36 2006
++++ Makefile.in	Sun May 21 14:32:27 2006
+@@ -377,9 +377,9 @@
+ www5dir = $(docdir)/supported_devices
+ dist_www5_DATA = $(wwwsrc)/supported_devices/*
+ www6dir = $(docdir)/tech_docs
+-dist_www6_DATA = $(wwwsrc)/tech_docs/*
++dist_www6_DATA = $(wwwsrc)/tech_docs/*.html
+ www61dir = $(docdir)/tech_docs/man_pages
+-dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*
++dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*.html
+ www7dir = $(docdir)/troubleshooting
+ dist_www7_DATA = $(wwwsrc)/troubleshooting/*
+ dist_hplip_DATA = $(doc_DATA) hplip.conf
+@@ -2348,15 +2348,9 @@
  #
  #       Do full install if not rpm_install.
  	if [ "$(rpm_install)" = "no" ]; then \
@@ -19,7 +31,7 @@
  	fi
  
  install-data-hook: test-destdir
-@@ -2039,30 +2033,31 @@
+@@ -2414,7 +2408,7 @@
  	    newname=$${i%.*}; \
  	    mv $(DESTDIR)$(hplipdir)/$$i $(DESTDIR)$(hplipdir)/$$newname; \
  	    if [ "$(rpm_install)" = "no" ]; then \
@@ -28,39 +40,7 @@
  	    fi \
  	done
  #
- #       Edit hpiod.conf in destdir.
- 	echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
- 	echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
--	echo -ne "# Following values are determined at configure time and cannot be changed.\n[configure]\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
-+	echo "# Following values are determined at configure time and cannot be changed." >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
-+	echo "[configure]" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
- 	if [ "$(rpm_install)" = "yes" ]; then \
--	   echo -ne "rpm-install=1\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "rpm-install=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	else \
--	   echo -ne "rpm-install=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "rpm-install=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	fi 
- 	if [ "$(network_build)" = "yes" ]; then \
--	   echo -ne "network-build=1\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "network-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	else \
--	   echo -ne "network-build=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "network-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	fi
- 	if [ "$(pp_build)" = "yes" ]; then \
--	   echo -ne "pp-build=1\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "pp-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	else \
--	   echo -ne "pp-build=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "pp-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	fi
--	echo -ne "internal-tag=$(PACKAGE_BUGREPORT)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf;
-+	echo "internal-tag=$(PACKAGE_BUGREPORT)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf;
- 
- #
- #       Edit hpiod.sh in destdir.
-@@ -2074,16 +2069,6 @@
+@@ -2449,16 +2443,6 @@
  	if [ "$(rpm_install)" = "no" ]; then \
  	   $(mkinstalldirs) $(DESTDIR)/etc/hp; \
  	   $(INSTALL_DATA) $(DESTDIR)$(hplipdir)/$(PACKAGE).conf $(DESTDIR)/etc/hp; \
diff --git a/print/hplip/files/patch-io_hpiod_device.cpp b/print/hplip/files/patch-io_hpiod_device.cpp
index 1a9b2ead672d..288b8be0ab04 100644
--- a/print/hplip/files/patch-io_hpiod_device.cpp
+++ b/print/hplip/files/patch-io_hpiod_device.cpp
@@ -264,13 +264,4 @@
 +	syslog(LOG_ERR, "danger! Device::ReleaseInterface, releasing an interface with an active write %s: %s %d\n", URI, __FILE__, __LINE__);
  #else
        usb_reap_urb_ex(FD[fd].pHD, &FD[fd].urb_write);
- #endif
-@@ -913,7 +1155,7 @@
-    /* Make sure uri model still matches device id model. */
-    pSys->GetURIModel(URI, uriModel, sizeof(uriModel));
-    pSys->GetModel(ID, model, sizeof(model));
--   if (strcmp(uriModel, model) != 0)
-+   if (strcasecmp(uriModel, model) != 0)
-    {
-       *result = R_INVALID_DEVICE_NODE;  /* found different device plugged in */  
-       syslog(LOG_ERR, "invalid model %s != %s Device::Open %s %d\n", uriModel, model, __FILE__, __LINE__);
+ #endif
\ No newline at end of file
diff --git a/print/hplip/pkg-plist b/print/hplip/pkg-plist
index b7409e3b5ca2..29cb5e534011 100644
--- a/print/hplip/pkg-plist
+++ b/print/hplip/pkg-plist
@@ -15,7 +15,6 @@ bin/hp-testpage
 bin/hp-toolbox
 bin/hp-unload
 bin/hpijs
-bin/hppgsz
 etc/hp/hplip.conf
 lib/libhpip.la
 lib/libhpip.so
@@ -35,13 +34,124 @@ sbin/hpiod
 sbin/hpssd
 share/applications/hplip.desktop
 share/cups/model/foomatic-ppds
-%%PORTDOCS%%share/doc/hpijs-2.1.9/COPYING
-%%PORTDOCS%%share/doc/hpijs-2.1.9/README_LIBJPG
-%%PORTDOCS%%share/doc/hpijs-2.1.9/gs_hpijs.png
-%%PORTDOCS%%share/doc/hpijs-2.1.9/hpijs_readme.html
-%%PORTDOCS%%share/doc/hplip-0.9.10/COPYING
-%%PORTDOCS%%share/doc/hplip-0.9.10/hplip_overview.png
-%%PORTDOCS%%share/doc/hplip-0.9.10/hplip_readme.html
+%%PORTDOCS%%share/doc/hpijs-2.1.10/COPYING
+%%PORTDOCS%%share/doc/hpijs-2.1.10/README_LIBJPG
+%%PORTDOCS%%share/doc/hplip-0.9.11/COPYING
+%%PORTDOCS%%share/doc/hplip-0.9.11/contacts.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/faqs.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/features.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/build.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/faxing.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/install.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/io.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/other.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/pcard.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/printing.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/scanning.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/toolbox.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_ManagePrint.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_ManageSend_Fax-1.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_ManageSend_Fax-2.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_Manager-1.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_Manager-2.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_Manager-3.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_Manager-4.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_Manager.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_ManagerPhoto_Card.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_ManagerSend_Fax.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/Screenshot-xsane.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/cups_device_list.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/cups_model_list.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/cups_opening.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/cups_printer_model.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/gs_hpijs.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/hp-tux-printer.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/hplip_device_manager.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/hplip_overview.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/network_appssocket.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/network_device_list.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/network_device_uri.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/network_model_list.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/sflogo.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_hardware.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_opening_hw.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_other_configure.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_other_kind.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_other_printer.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_printer_model.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step1/apt.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step1/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step1/rpm.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/debian.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/fc4.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/mandriva06.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/other.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/suse10.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/ubuntu510.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step3/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/cups/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/cups/local.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/cups/net.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/setup/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/setup/local.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/setup/net.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/suse/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/legal.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/license.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/mailing_lists.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/release_notes.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/screenshots.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/styles/default.css
+%%PORTDOCS%%share/doc/hplip-0.9.11/styles/rest.css
+%%PORTDOCS%%share/doc/hplip-0.9.11/support_statement.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/color_laser.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/color_laser_mfp.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/inkjet.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/inkjet_aio.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/laser.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/mono_laser_mfp.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/photosmart.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/unsupported.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/system_requirements.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/device_classes.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/hpijs.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/align.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/check.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/clean.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/colorcal.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/fab.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/hpssd.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/info.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/levels.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/makeuri.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/photo.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/print.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/setup.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/testpage.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/toolbox.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/unload.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/overview.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/page_sizes.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/printable_areas.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/tarball_install.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/build.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/faxing.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/install.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/io.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/other.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/pcard.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/printing.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/scanning.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/toolbox.html
 %%DATADIR%%/COPYING
 %%DATADIR%%/__init__.py
 %%DATADIR%%/align
@@ -88,17 +198,20 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/images/DESKJET_970C.png
 %%DATADIR%%/data/images/DESKJET_990C.png
 %%DATADIR%%/data/images/DESKJET_995C.png
-%%DATADIR%%/data/images/Deskjet_350.png
 %%DATADIR%%/data/images/Deskjet_3740.png
+%%DATADIR%%/data/images/Deskjet_5400_series.png
 %%DATADIR%%/data/images/Deskjet_5700.png
+%%DATADIR%%/data/images/Deskjet_5900_series.png
 %%DATADIR%%/data/images/Deskjet_6500.png
 %%DATADIR%%/data/images/Deskjet_6800.png
 %%DATADIR%%/data/images/HP_2000C.png
+%%DATADIR%%/data/images/HP_2500C.png
 %%DATADIR%%/data/images/HP_BI_3000.png
 %%DATADIR%%/data/images/HP_Business_Inkjet_1200.png
 %%DATADIR%%/data/images/HP_Color_LaserJet_1500.png
 %%DATADIR%%/data/images/HP_Color_LaserJet_2840.png
 %%DATADIR%%/data/images/HP_Color_LaserJet_4500.png
+%%DATADIR%%/data/images/HP_Color_LaserJet_4730mfp.png
 %%DATADIR%%/data/images/HP_Color_LaserJet_8550.png
 %%DATADIR%%/data/images/HP_LJ1xxx.png
 %%DATADIR%%/data/images/HP_LaserJet_1012.png
@@ -108,6 +221,8 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/images/HP_LaserJet_4000.png
 %%DATADIR%%/data/images/HP_LaserJet_4100_MFP.png
 %%DATADIR%%/data/images/HP_LaserJet_4M.png
+%%DATADIR%%/data/images/HP_LaserJet_5Si.png
+%%DATADIR%%/data/images/HP_LaserJet_6MP.png
 %%DATADIR%%/data/images/HP_LaserJet_8100_Series.png
 %%DATADIR%%/data/images/HP_LaserJet_9000_MFP.png
 %%DATADIR%%/data/images/HP_LaserJet_9040_MFP.png
@@ -120,10 +235,15 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/images/LASERJET_5500dtn.png
 %%DATADIR%%/data/images/LASERJET_5550.png
 %%DATADIR%%/data/images/LASERJET_5550DTN.png
+%%DATADIR%%/data/images/OFFICEJET_PRO_1150C.png
+%%DATADIR%%/data/images/OfficeJet_Series_300.png
+%%DATADIR%%/data/images/OfficeJet_5105.png
 %%DATADIR%%/data/images/OfficeJet_6100_Series.png
 %%DATADIR%%/data/images/OfficeJet_G85.png
 %%DATADIR%%/data/images/Officejet_6150_Series.png
+%%DATADIR%%/data/images/Officejet_6200_series.png
 %%DATADIR%%/data/images/Officejet_7200_series.png
+%%DATADIR%%/data/images/Officejet_9100_series.png
 %%DATADIR%%/data/images/PHOTOSMART_100.png
 %%DATADIR%%/data/images/PHOTOSMART_1218.png
 %%DATADIR%%/data/images/PHOTOSMART_1315.png
@@ -168,6 +288,7 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/images/deskjet_5552.png
 %%DATADIR%%/data/images/deskjet_5600.png
 %%DATADIR%%/data/images/deskjet_6120.png
+%%DATADIR%%/data/images/dj350.png
 %%DATADIR%%/data/images/dj450.png
 %%DATADIR%%/data/images/down.png
 %%DATADIR%%/data/images/error.png
@@ -240,11 +361,13 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/images/next.png
 %%DATADIR%%/data/images/officejet_4200_series.png
 %%DATADIR%%/data/images/officejet_500.png
+%%DATADIR%%/data/images/officejet_5500_series.png
 %%DATADIR%%/data/images/officejet_5600.png
 %%DATADIR%%/data/images/officejet_k550.png
 %%DATADIR%%/data/images/officejet_k80.png
 %%DATADIR%%/data/images/ok.png
 %%DATADIR%%/data/images/ok_small.png
+%%DATADIR%%/data/images/opensource-75x65.png
 %%DATADIR%%/data/images/panel_lcd.xpm
 %%DATADIR%%/data/images/paper.png
 %%DATADIR%%/data/images/paper_small.png
@@ -252,6 +375,7 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/images/photosmart_7150.png
 %%DATADIR%%/data/images/photosmart_7900_series.png
 %%DATADIR%%/data/images/png.png
+%%DATADIR%%/data/images/powered_by_python.png
 %%DATADIR%%/data/images/prev.png
 %%DATADIR%%/data/images/psc_1100_series.png
 %%DATADIR%%/data/images/psc_2300_series.png
@@ -304,6 +428,7 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/xml/HPLIP-0.9.7.xml
 %%DATADIR%%/data/xml/HPLIP-02-2006.xml
 %%DATADIR%%/data/xml/HPLIP-03-2006.xml
+%%DATADIR%%/data/xml/HPLIP-05-2006.xml
 %%DATADIR%%/data/xml/models.xml
 %%DATADIR%%/data/xml/unsupported.xml
 %%DATADIR%%/fab
@@ -315,8 +440,6 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/hplip
 %%DATADIR%%/hplip.conf
 %%DATADIR%%/hplip.sh
-%%DATADIR%%/hplip_overview.png
-%%DATADIR%%/hplip_readme.html
 %%DATADIR%%/hpssd.py
 %%DATADIR%%/info
 %%DATADIR%%/levels
@@ -375,6 +498,8 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/ui/faxaddrbookform_base.py
 %%DATADIR%%/ui/faxaddrbookgroupeditform_base.py
 %%DATADIR%%/ui/faxaddrbookgroupsform_base.py
+%%DATADIR%%/ui/faxallowabletypesdlg.py
+%%DATADIR%%/ui/faxallowabletypesdlg_base.py
 %%DATADIR%%/ui/faxsendjobform.py
 %%DATADIR%%/ui/faxsendjobform_base.py
 %%DATADIR%%/ui/faxsettingsform.py
@@ -624,6 +749,8 @@ share/ppd/HP/HP-LaserJet_4_Plus-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_5-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_5000-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_5100-hpijs.ppd.gz
+share/ppd/HP/HP-LaserJet_5200-hpijs.ppd.gz
+share/ppd/HP/HP-LaserJet_5200L-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_5L-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_5M-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_5MP-hpijs.ppd.gz
@@ -655,6 +782,8 @@ share/ppd/HP/HP-OfficeJet_4105-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_4110-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_4115-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_4200-hpijs.ppd.gz
+share/ppd/HP/HP-OfficeJet_4300-hpijs.ppd.gz
+share/ppd/HP/HP-OfficeJet_6300-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_500-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_5105-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_5110-hpijs.ppd.gz
@@ -686,7 +815,6 @@ share/ppd/HP/HP-OfficeJet_7200-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_725-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_7300-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_7400-hpijs.ppd.gz
-share/ppd/HP/HP-OfficeJet_9100-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_D125-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_D135-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_D145-hpijs.ppd.gz
@@ -787,6 +915,7 @@ share/ppd/HP/HP_Business_Inkjet_2800.ppd.gz
 share/ppd/HP/HP_Business_Inkjet_3000.ppd.gz
 share/ppd/HP/HP_Color_LaserJet.ppd.gz
 share/ppd/HP/HP_Color_LaserJet_2550.ppd.gz
+share/ppd/HP/HP_Color_LaserJet_2605.ppd.gz
 share/ppd/HP/HP_Color_LaserJet_2800.ppd.gz
 share/ppd/HP/HP_Color_LaserJet_3000.ppd.gz
 share/ppd/HP/HP_Color_LaserJet_3800.ppd.gz
@@ -827,6 +956,8 @@ share/ppd/HP/HP_LaserJet_4V.ppd.gz
 share/ppd/HP/HP_LaserJet_4_Plus.ppd.gz
 share/ppd/HP/HP_LaserJet_5000_Series.ppd.gz
 share/ppd/HP/HP_LaserJet_5100_Series.ppd.gz
+share/ppd/HP/HP_LaserJet_5200.ppd.gz
+share/ppd/HP/HP_LaserJet_5200L.ppd.gz
 share/ppd/HP/HP_LaserJet_5M.ppd.gz
 share/ppd/HP/HP_LaserJet_5MP.ppd.gz
 share/ppd/HP/HP_LaserJet_5Si.ppd.gz
@@ -882,6 +1013,21 @@ share/ppd/HP/hp_officejet_9100_series.ppd.gz
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%/base
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm share/doc/hplip-0.9.10
-%%PORTDOCS%%@dirrm share/doc/hpijs-2.1.9
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/troubleshooting
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/tech_docs/man_pages
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/tech_docs
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/supported_devices
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/styles
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step4/suse
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step4/setup
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step4/cups
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step4
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step3
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step2
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step1
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/images
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/howtos
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11
+%%PORTDOCS%%@dirrm share/doc/hpijs-2.1.10
 @dirrm etc/hp
diff --git a/print/hplip3/Makefile b/print/hplip3/Makefile
index 1fad4c031d46..93e42d48ff9a 100644
--- a/print/hplip3/Makefile
+++ b/print/hplip3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hplip
-PORTVERSION=	0.9.10
+PORTVERSION=	0.9.11
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hplip
@@ -19,7 +19,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		cups.2:${PORTSDIR}/print/cups-base \
 		usb:${PORTSDIR}/devel/libusb \
 		netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp
-RUN_DEPENDS=	pylupdate:${PORTSDIR}/x11-toolkits/py-qt
 
 CONFLITS=	hpijs-* foomatic-filters-*
 
@@ -39,12 +38,22 @@ MAKE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 
 PKGDEINSTALL=	${PKGINSTALL}
 
+OPTIONS=	GUI "build with Python QT" on
+
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 5000000
+.if ${OSVERSION} < 500000
 BROKEN=		does not compile
 .endif
 
+.if exists(${LOCALBASE}/bin/pylupdate)
+WITH_GUI=      yes
+.endif
+
+.if defined(WITH_GUI)
+RUN_DEPENDS+=	pylupdate:${PORTSDIR}/x11-toolkits/py-qt
+.endif
+
 post-extract:
 	@${RM} -r ${WRKSRC}/data/images/CVS
 
@@ -63,7 +72,6 @@ post-patch:
 		s|/usr/lib/cups/filter|${LOCALBASE}/libexec/cups/filter|g' \
 			${WRKSRC}/base/g.py \
 			${WRKSRC}/fax/backend/hpfax.py \
-			${WRKSRC}/hplip_readme.html \
 			${WRKSRC}/hpssd.py \
 			${WRKSRC}/io/hpiod/hpiod.h \
 			${WRKSRC}/prnt/hpijs/hplip_api.h \
diff --git a/print/hplip3/distinfo b/print/hplip3/distinfo
index 1a692b8fb02a..b33909556b95 100644
--- a/print/hplip3/distinfo
+++ b/print/hplip3/distinfo
@@ -1,3 +1,3 @@
-MD5 (hplip-0.9.10.tar.gz) = 349489b10fb44d1bf105b04ff5352551
-SHA256 (hplip-0.9.10.tar.gz) = a6a6247b396aba173d0cd7b2aadffc5467d0f82d5aa037503222b98b8d5fe8b1
-SIZE (hplip-0.9.10.tar.gz) = 9296866
+MD5 (hplip-0.9.11.tar.gz) = 5cf362c972d5b1733af4fb8e2ade92e4
+SHA256 (hplip-0.9.11.tar.gz) = 9c6f39863280d74a72bdce632f2453fa5bbbfffd286b1fd0535cfba76dcf5b42
+SIZE (hplip-0.9.11.tar.gz) = 9924094
diff --git a/print/hplip3/files/hpiod.sh.in b/print/hplip3/files/hpiod.sh.in
index 8e2bee4637e9..4852d2568d98 100644
--- a/print/hplip3/files/hpiod.sh.in
+++ b/print/hplip3/files/hpiod.sh.in
@@ -2,25 +2,24 @@
 
 # PROVIDE: hpiod
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
-
-[ -z "${hpiod_enable}" ] && hpiod_enable="NO"
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
-prefix=%%PREFIX%%
-
 name=hpiod
+rcvar=${name}_enable
+
+command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 portfile="/var/run/${name}.port"
 hpiod_user=hplip
-command="${prefix}/sbin/${name}"
-start_precmd="hpiod_prestart"
 
-rcvar=`set_rcvar`
+start_precmd="hpiod_prestart"
 
 load_rc_config $name
 
+: ${hpiod_enable="NO"}
+
 hpiod_prestart()
 {
 	touch ${pidfile}
diff --git a/print/hplip3/files/hpssd.sh.in b/print/hplip3/files/hpssd.sh.in
index 4e7dc15f11b0..3b0303e7afe9 100644
--- a/print/hplip3/files/hpssd.sh.in
+++ b/print/hplip3/files/hpssd.sh.in
@@ -3,27 +3,26 @@
 # PROVIDE: hpssd
 # REQUIRE: hpiod
 # BEFORE:  cupsd
-# KEYWORD: FreeBSD shutdown
-
-[ -z "${hpssd_enable}" ] && hpssd_enable="NO"
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
-prefix=%%PREFIX%%
-
 name=hpssd
+rcvar=${name}_enable
+
+command="%%PREFIX%%/sbin/${name}"
+command_interpreter="%%PREFIX%%/bin/python"
 pidfile="/var/run/${name}.pid"
 portfile="/var/run/${name}.port"
 hpssd_user=nobody
-command="${prefix}/sbin/${name}"
-command_interpreter="$prefix/bin/python"
 command_args=">/dev/null"
-start_precmd="hpssd_prestart"
 
-rcvar=`set_rcvar`
+start_precmd="hpssd_prestart"
 
 load_rc_config $name
 
+: ${hpssd_enable="NO"}
+
 hpssd_prestart()
 {
 	touch ${pidfile}
diff --git a/print/hplip3/files/patch-Makefile.in b/print/hplip3/files/patch-Makefile.in
index b96eda6ffb3e..db2e6271d52b 100644
--- a/print/hplip3/files/patch-Makefile.in
+++ b/print/hplip3/files/patch-Makefile.in
@@ -1,6 +1,18 @@
---- Makefile.in.orig	Thu Mar 23 22:35:33 2006
-+++ Makefile.in	Mon Apr 24 09:15:54 2006
-@@ -1973,15 +1973,9 @@
+--- Makefile.in.orig	Tue May  9 14:18:36 2006
++++ Makefile.in	Sun May 21 14:32:27 2006
+@@ -377,9 +377,9 @@
+ www5dir = $(docdir)/supported_devices
+ dist_www5_DATA = $(wwwsrc)/supported_devices/*
+ www6dir = $(docdir)/tech_docs
+-dist_www6_DATA = $(wwwsrc)/tech_docs/*
++dist_www6_DATA = $(wwwsrc)/tech_docs/*.html
+ www61dir = $(docdir)/tech_docs/man_pages
+-dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*
++dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*.html
+ www7dir = $(docdir)/troubleshooting
+ dist_www7_DATA = $(wwwsrc)/troubleshooting/*
+ dist_hplip_DATA = $(doc_DATA) hplip.conf
+@@ -2348,15 +2348,9 @@
  #
  #       Do full install if not rpm_install.
  	if [ "$(rpm_install)" = "no" ]; then \
@@ -19,7 +31,7 @@
  	fi
  
  install-data-hook: test-destdir
-@@ -2039,30 +2033,31 @@
+@@ -2414,7 +2408,7 @@
  	    newname=$${i%.*}; \
  	    mv $(DESTDIR)$(hplipdir)/$$i $(DESTDIR)$(hplipdir)/$$newname; \
  	    if [ "$(rpm_install)" = "no" ]; then \
@@ -28,39 +40,7 @@
  	    fi \
  	done
  #
- #       Edit hpiod.conf in destdir.
- 	echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
- 	echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
--	echo -ne "# Following values are determined at configure time and cannot be changed.\n[configure]\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
-+	echo "# Following values are determined at configure time and cannot be changed." >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
-+	echo "[configure]" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
- 	if [ "$(rpm_install)" = "yes" ]; then \
--	   echo -ne "rpm-install=1\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "rpm-install=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	else \
--	   echo -ne "rpm-install=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "rpm-install=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	fi 
- 	if [ "$(network_build)" = "yes" ]; then \
--	   echo -ne "network-build=1\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "network-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	else \
--	   echo -ne "network-build=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "network-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	fi
- 	if [ "$(pp_build)" = "yes" ]; then \
--	   echo -ne "pp-build=1\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "pp-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	else \
--	   echo -ne "pp-build=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "pp-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	fi
--	echo -ne "internal-tag=$(PACKAGE_BUGREPORT)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf;
-+	echo "internal-tag=$(PACKAGE_BUGREPORT)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf;
- 
- #
- #       Edit hpiod.sh in destdir.
-@@ -2074,16 +2069,6 @@
+@@ -2449,16 +2443,6 @@
  	if [ "$(rpm_install)" = "no" ]; then \
  	   $(mkinstalldirs) $(DESTDIR)/etc/hp; \
  	   $(INSTALL_DATA) $(DESTDIR)$(hplipdir)/$(PACKAGE).conf $(DESTDIR)/etc/hp; \
diff --git a/print/hplip3/files/patch-io_hpiod_device.cpp b/print/hplip3/files/patch-io_hpiod_device.cpp
index 1a9b2ead672d..288b8be0ab04 100644
--- a/print/hplip3/files/patch-io_hpiod_device.cpp
+++ b/print/hplip3/files/patch-io_hpiod_device.cpp
@@ -264,13 +264,4 @@
 +	syslog(LOG_ERR, "danger! Device::ReleaseInterface, releasing an interface with an active write %s: %s %d\n", URI, __FILE__, __LINE__);
  #else
        usb_reap_urb_ex(FD[fd].pHD, &FD[fd].urb_write);
- #endif
-@@ -913,7 +1155,7 @@
-    /* Make sure uri model still matches device id model. */
-    pSys->GetURIModel(URI, uriModel, sizeof(uriModel));
-    pSys->GetModel(ID, model, sizeof(model));
--   if (strcmp(uriModel, model) != 0)
-+   if (strcasecmp(uriModel, model) != 0)
-    {
-       *result = R_INVALID_DEVICE_NODE;  /* found different device plugged in */  
-       syslog(LOG_ERR, "invalid model %s != %s Device::Open %s %d\n", uriModel, model, __FILE__, __LINE__);
+ #endif
\ No newline at end of file
diff --git a/print/hplip3/pkg-plist b/print/hplip3/pkg-plist
index b7409e3b5ca2..29cb5e534011 100644
--- a/print/hplip3/pkg-plist
+++ b/print/hplip3/pkg-plist
@@ -15,7 +15,6 @@ bin/hp-testpage
 bin/hp-toolbox
 bin/hp-unload
 bin/hpijs
-bin/hppgsz
 etc/hp/hplip.conf
 lib/libhpip.la
 lib/libhpip.so
@@ -35,13 +34,124 @@ sbin/hpiod
 sbin/hpssd
 share/applications/hplip.desktop
 share/cups/model/foomatic-ppds
-%%PORTDOCS%%share/doc/hpijs-2.1.9/COPYING
-%%PORTDOCS%%share/doc/hpijs-2.1.9/README_LIBJPG
-%%PORTDOCS%%share/doc/hpijs-2.1.9/gs_hpijs.png
-%%PORTDOCS%%share/doc/hpijs-2.1.9/hpijs_readme.html
-%%PORTDOCS%%share/doc/hplip-0.9.10/COPYING
-%%PORTDOCS%%share/doc/hplip-0.9.10/hplip_overview.png
-%%PORTDOCS%%share/doc/hplip-0.9.10/hplip_readme.html
+%%PORTDOCS%%share/doc/hpijs-2.1.10/COPYING
+%%PORTDOCS%%share/doc/hpijs-2.1.10/README_LIBJPG
+%%PORTDOCS%%share/doc/hplip-0.9.11/COPYING
+%%PORTDOCS%%share/doc/hplip-0.9.11/contacts.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/faqs.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/features.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/build.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/faxing.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/install.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/io.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/other.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/pcard.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/printing.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/scanning.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/toolbox.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_ManagePrint.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_ManageSend_Fax-1.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_ManageSend_Fax-2.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_Manager-1.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_Manager-2.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_Manager-3.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_Manager-4.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_Manager.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_ManagerPhoto_Card.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_ManagerSend_Fax.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/Screenshot-xsane.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/cups_device_list.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/cups_model_list.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/cups_opening.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/cups_printer_model.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/gs_hpijs.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/hp-tux-printer.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/hplip_device_manager.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/hplip_overview.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/network_appssocket.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/network_device_list.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/network_device_uri.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/network_model_list.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/sflogo.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_hardware.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_opening_hw.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_other_configure.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_other_kind.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_other_printer.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_printer_model.png
+%%PORTDOCS%%share/doc/hplip-0.9.11/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step1/apt.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step1/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step1/rpm.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/debian.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/fc4.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/mandriva06.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/other.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/suse10.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/ubuntu510.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step3/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/cups/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/cups/local.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/cups/net.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/setup/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/setup/local.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/setup/net.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/suse/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/legal.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/license.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/mailing_lists.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/release_notes.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/screenshots.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/styles/default.css
+%%PORTDOCS%%share/doc/hplip-0.9.11/styles/rest.css
+%%PORTDOCS%%share/doc/hplip-0.9.11/support_statement.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/color_laser.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/color_laser_mfp.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/inkjet.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/inkjet_aio.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/laser.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/mono_laser_mfp.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/photosmart.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/unsupported.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/system_requirements.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/device_classes.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/hpijs.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/align.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/check.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/clean.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/colorcal.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/fab.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/hpssd.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/info.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/levels.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/makeuri.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/photo.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/print.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/setup.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/testpage.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/toolbox.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/unload.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/overview.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/page_sizes.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/printable_areas.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/tarball_install.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/build.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/faxing.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/index.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/install.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/io.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/other.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/pcard.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/printing.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/scanning.html
+%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/toolbox.html
 %%DATADIR%%/COPYING
 %%DATADIR%%/__init__.py
 %%DATADIR%%/align
@@ -88,17 +198,20 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/images/DESKJET_970C.png
 %%DATADIR%%/data/images/DESKJET_990C.png
 %%DATADIR%%/data/images/DESKJET_995C.png
-%%DATADIR%%/data/images/Deskjet_350.png
 %%DATADIR%%/data/images/Deskjet_3740.png
+%%DATADIR%%/data/images/Deskjet_5400_series.png
 %%DATADIR%%/data/images/Deskjet_5700.png
+%%DATADIR%%/data/images/Deskjet_5900_series.png
 %%DATADIR%%/data/images/Deskjet_6500.png
 %%DATADIR%%/data/images/Deskjet_6800.png
 %%DATADIR%%/data/images/HP_2000C.png
+%%DATADIR%%/data/images/HP_2500C.png
 %%DATADIR%%/data/images/HP_BI_3000.png
 %%DATADIR%%/data/images/HP_Business_Inkjet_1200.png
 %%DATADIR%%/data/images/HP_Color_LaserJet_1500.png
 %%DATADIR%%/data/images/HP_Color_LaserJet_2840.png
 %%DATADIR%%/data/images/HP_Color_LaserJet_4500.png
+%%DATADIR%%/data/images/HP_Color_LaserJet_4730mfp.png
 %%DATADIR%%/data/images/HP_Color_LaserJet_8550.png
 %%DATADIR%%/data/images/HP_LJ1xxx.png
 %%DATADIR%%/data/images/HP_LaserJet_1012.png
@@ -108,6 +221,8 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/images/HP_LaserJet_4000.png
 %%DATADIR%%/data/images/HP_LaserJet_4100_MFP.png
 %%DATADIR%%/data/images/HP_LaserJet_4M.png
+%%DATADIR%%/data/images/HP_LaserJet_5Si.png
+%%DATADIR%%/data/images/HP_LaserJet_6MP.png
 %%DATADIR%%/data/images/HP_LaserJet_8100_Series.png
 %%DATADIR%%/data/images/HP_LaserJet_9000_MFP.png
 %%DATADIR%%/data/images/HP_LaserJet_9040_MFP.png
@@ -120,10 +235,15 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/images/LASERJET_5500dtn.png
 %%DATADIR%%/data/images/LASERJET_5550.png
 %%DATADIR%%/data/images/LASERJET_5550DTN.png
+%%DATADIR%%/data/images/OFFICEJET_PRO_1150C.png
+%%DATADIR%%/data/images/OfficeJet_Series_300.png
+%%DATADIR%%/data/images/OfficeJet_5105.png
 %%DATADIR%%/data/images/OfficeJet_6100_Series.png
 %%DATADIR%%/data/images/OfficeJet_G85.png
 %%DATADIR%%/data/images/Officejet_6150_Series.png
+%%DATADIR%%/data/images/Officejet_6200_series.png
 %%DATADIR%%/data/images/Officejet_7200_series.png
+%%DATADIR%%/data/images/Officejet_9100_series.png
 %%DATADIR%%/data/images/PHOTOSMART_100.png
 %%DATADIR%%/data/images/PHOTOSMART_1218.png
 %%DATADIR%%/data/images/PHOTOSMART_1315.png
@@ -168,6 +288,7 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/images/deskjet_5552.png
 %%DATADIR%%/data/images/deskjet_5600.png
 %%DATADIR%%/data/images/deskjet_6120.png
+%%DATADIR%%/data/images/dj350.png
 %%DATADIR%%/data/images/dj450.png
 %%DATADIR%%/data/images/down.png
 %%DATADIR%%/data/images/error.png
@@ -240,11 +361,13 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/images/next.png
 %%DATADIR%%/data/images/officejet_4200_series.png
 %%DATADIR%%/data/images/officejet_500.png
+%%DATADIR%%/data/images/officejet_5500_series.png
 %%DATADIR%%/data/images/officejet_5600.png
 %%DATADIR%%/data/images/officejet_k550.png
 %%DATADIR%%/data/images/officejet_k80.png
 %%DATADIR%%/data/images/ok.png
 %%DATADIR%%/data/images/ok_small.png
+%%DATADIR%%/data/images/opensource-75x65.png
 %%DATADIR%%/data/images/panel_lcd.xpm
 %%DATADIR%%/data/images/paper.png
 %%DATADIR%%/data/images/paper_small.png
@@ -252,6 +375,7 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/images/photosmart_7150.png
 %%DATADIR%%/data/images/photosmart_7900_series.png
 %%DATADIR%%/data/images/png.png
+%%DATADIR%%/data/images/powered_by_python.png
 %%DATADIR%%/data/images/prev.png
 %%DATADIR%%/data/images/psc_1100_series.png
 %%DATADIR%%/data/images/psc_2300_series.png
@@ -304,6 +428,7 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/data/xml/HPLIP-0.9.7.xml
 %%DATADIR%%/data/xml/HPLIP-02-2006.xml
 %%DATADIR%%/data/xml/HPLIP-03-2006.xml
+%%DATADIR%%/data/xml/HPLIP-05-2006.xml
 %%DATADIR%%/data/xml/models.xml
 %%DATADIR%%/data/xml/unsupported.xml
 %%DATADIR%%/fab
@@ -315,8 +440,6 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/hplip
 %%DATADIR%%/hplip.conf
 %%DATADIR%%/hplip.sh
-%%DATADIR%%/hplip_overview.png
-%%DATADIR%%/hplip_readme.html
 %%DATADIR%%/hpssd.py
 %%DATADIR%%/info
 %%DATADIR%%/levels
@@ -375,6 +498,8 @@ share/cups/model/foomatic-ppds
 %%DATADIR%%/ui/faxaddrbookform_base.py
 %%DATADIR%%/ui/faxaddrbookgroupeditform_base.py
 %%DATADIR%%/ui/faxaddrbookgroupsform_base.py
+%%DATADIR%%/ui/faxallowabletypesdlg.py
+%%DATADIR%%/ui/faxallowabletypesdlg_base.py
 %%DATADIR%%/ui/faxsendjobform.py
 %%DATADIR%%/ui/faxsendjobform_base.py
 %%DATADIR%%/ui/faxsettingsform.py
@@ -624,6 +749,8 @@ share/ppd/HP/HP-LaserJet_4_Plus-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_5-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_5000-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_5100-hpijs.ppd.gz
+share/ppd/HP/HP-LaserJet_5200-hpijs.ppd.gz
+share/ppd/HP/HP-LaserJet_5200L-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_5L-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_5M-hpijs.ppd.gz
 share/ppd/HP/HP-LaserJet_5MP-hpijs.ppd.gz
@@ -655,6 +782,8 @@ share/ppd/HP/HP-OfficeJet_4105-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_4110-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_4115-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_4200-hpijs.ppd.gz
+share/ppd/HP/HP-OfficeJet_4300-hpijs.ppd.gz
+share/ppd/HP/HP-OfficeJet_6300-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_500-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_5105-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_5110-hpijs.ppd.gz
@@ -686,7 +815,6 @@ share/ppd/HP/HP-OfficeJet_7200-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_725-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_7300-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_7400-hpijs.ppd.gz
-share/ppd/HP/HP-OfficeJet_9100-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_D125-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_D135-hpijs.ppd.gz
 share/ppd/HP/HP-OfficeJet_D145-hpijs.ppd.gz
@@ -787,6 +915,7 @@ share/ppd/HP/HP_Business_Inkjet_2800.ppd.gz
 share/ppd/HP/HP_Business_Inkjet_3000.ppd.gz
 share/ppd/HP/HP_Color_LaserJet.ppd.gz
 share/ppd/HP/HP_Color_LaserJet_2550.ppd.gz
+share/ppd/HP/HP_Color_LaserJet_2605.ppd.gz
 share/ppd/HP/HP_Color_LaserJet_2800.ppd.gz
 share/ppd/HP/HP_Color_LaserJet_3000.ppd.gz
 share/ppd/HP/HP_Color_LaserJet_3800.ppd.gz
@@ -827,6 +956,8 @@ share/ppd/HP/HP_LaserJet_4V.ppd.gz
 share/ppd/HP/HP_LaserJet_4_Plus.ppd.gz
 share/ppd/HP/HP_LaserJet_5000_Series.ppd.gz
 share/ppd/HP/HP_LaserJet_5100_Series.ppd.gz
+share/ppd/HP/HP_LaserJet_5200.ppd.gz
+share/ppd/HP/HP_LaserJet_5200L.ppd.gz
 share/ppd/HP/HP_LaserJet_5M.ppd.gz
 share/ppd/HP/HP_LaserJet_5MP.ppd.gz
 share/ppd/HP/HP_LaserJet_5Si.ppd.gz
@@ -882,6 +1013,21 @@ share/ppd/HP/hp_officejet_9100_series.ppd.gz
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%/base
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm share/doc/hplip-0.9.10
-%%PORTDOCS%%@dirrm share/doc/hpijs-2.1.9
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/troubleshooting
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/tech_docs/man_pages
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/tech_docs
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/supported_devices
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/styles
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step4/suse
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step4/setup
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step4/cups
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step4
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step3
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step2
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step1
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/images
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/howtos
+%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11
+%%PORTDOCS%%@dirrm share/doc/hpijs-2.1.10
 @dirrm etc/hp