Update to 3.12.11:

Significant Changes:
  - RHEL5 supported with hpcups

Added Support for the Following New Printers:
  - HP LaserJet Pro 500 color MFP M570dw
  - HP LaserJet Pro 500 color MFP M570dn
  - HP LaserJet Enterprise flow MFP M525
  - HP LaserJet Enterprise color flow MFP M575
  - HP LaserJet Enterprise 700 M712n
  - HP LaserJet Enterprise 700 M712dn
  - HP LaserJet Enterprise 700 M712xh
  - HP LaserJet Enterprise 700 color MFP M775dn
  - HP LaserJet Enterprise 700 color MFP M775f
  - HP LaserJet Enterprise 700 color MFP M775z
  - HP LaserJet Enterprise 700 color MFP M775z+


Added support for the following new Distro's:
  - Ubuntu 12.10
  - Debian 6.0.6

Launchpad fixes:
  1073650 - musb.c:get_interface() doesn't check return value of
  libusb_get_config_descriptor()
  1070758 - can't run hp-check without GUI
  1048754 - HP Setup crashes with ValueError
  1067697 - manual  of hp-check mentions '--runtime' option
  1067689 - 'hp-check -r' starts HPLIP status service (hp-systray)
  1064107 - CUPSEXT could not be loaded
  1066235 - 'hp-check' does not find installed XSane
  1065582 - Cannot add a parallel printer


Issues fixed:
  - Delay in status display on USB connection for certain classes of
    devices
  - Secure Printing support for HP LaserJet P3010 Series

Detailed Change Log:
  - Job storage support with postscript finishing filter

5 files changed, 23 insertions, 16 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index dd92a5cd80f..397513cf57f 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2013/01/26 21:38:42 adam Exp $
+# $NetBSD: Makefile,v 1.14 2013/01/27 05:25:02 schnoebe Exp $
 #
 
-DISTNAME=		hplip-3.12.10a
-PKGREVISION=		2
+DISTNAME=		hplip-3.12.11
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hplip/}
 
@@ -68,6 +67,7 @@ CONF_FILES+=
 
 REPLACE_PYTHON=		*.py */*.py */*/*.py
 REPLACE_PYTHON+=	fax/filters/pstotiff
+REPLACE_PYTHON+=	prnt/filters/hpps
 REPLACE_PERL=		prnt/filters/hpcac prnt/hpijs/foomatic-rip-hplip
 
 PY_PATCHPLIST=		yes
diff --git a/print/hplip/PLIST.base b/print/hplip/PLIST.base
index 9e150d3bf65..fcea6123371 100644
--- a/print/hplip/PLIST.base
+++ b/print/hplip/PLIST.base
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.base,v 1.3 2012/11/18 00:50:42 schnoebe Exp $
+@comment $NetBSD: PLIST.base,v 1.4 2013/01/27 05:25:03 schnoebe Exp $
 bin/hp-align
 bin/hp-check
 bin/hp-check-plugin
@@ -134,6 +134,8 @@ share/hplip/base/pkit.py
 share/hplip/base/pkit.pyc
 share/hplip/base/pml.py
 share/hplip/base/pml.pyc
+share/hplip/base/queues.py
+share/hplip/base/queues.pyc
 share/hplip/base/slp.py
 share/hplip/base/slp.pyc
 share/hplip/base/status.py
@@ -494,6 +496,7 @@ share/hplip/ppd/HP/hp-designjet_t770_postscript-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t770ps_24in-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t790ps_24in-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_t790ps_44in-ps.ppd.gz
+share/hplip/ppd/HP/hp-designjet_t800_t2000_premium-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_z6100ps_42in_photo-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_z6100ps_60in_photo-ps.ppd.gz
 share/hplip/ppd/HP/hp-designjet_z6200_42in_photo-ps.ppd.gz
@@ -1217,6 +1220,8 @@ share/hplip/ppd/HP/hp-laserjet_m9050_mfp-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m9059_mfp-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m9059_mfp-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_mfp_m521-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_mfp_m725-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_p1005-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_p1005.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_p1006-hpijs.ppd.gz
diff --git a/print/hplip/PLIST.gui b/print/hplip/PLIST.gui
index 109063262e2..0b6e9a6a905 100644
--- a/print/hplip/PLIST.gui
+++ b/print/hplip/PLIST.gui
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.gui,v 1.2 2012/11/18 00:50:42 schnoebe Exp $
+@comment $NetBSD: PLIST.gui,v 1.3 2013/01/27 05:25:03 schnoebe Exp $
 bin/hp-toolbox
 share/PolicyKit/policy/com.hp.hplip.policy
 share/applications/hplip.desktop
@@ -58,6 +58,7 @@ share/hplip/data/images/16x16/settings.png
 share/hplip/data/images/16x16/status_refresh.png
 share/hplip/data/images/16x16/thumbnail.png
 share/hplip/data/images/16x16/toner.png
+share/hplip/data/images/16x16/troubleshoot.png
 share/hplip/data/images/16x16/up.png
 share/hplip/data/images/16x16/up_user.png
 share/hplip/data/images/16x16/warning.png
@@ -111,6 +112,7 @@ share/hplip/data/images/32x32/settings.png
 share/hplip/data/images/32x32/testpage.png
 share/hplip/data/images/32x32/toner.png
 share/hplip/data/images/32x32/toner_cartridge.png
+share/hplip/data/images/32x32/troubleshoot.png
 share/hplip/data/images/32x32/warning.png
 share/hplip/data/images/32x32/wireless.png
 share/hplip/data/images/64x64/hp_logo.png
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index 94f045ec776..9b5f3f18d59 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.3 2012/11/18 00:50:42 schnoebe Exp $
+$NetBSD: distinfo,v 1.4 2013/01/27 05:25:03 schnoebe Exp $
 
-SHA1 (hplip-3.12.10a.tar.gz) = 4a0710ed15350b5f70cb2dcd38b5bf53fd6f31e6
-RMD160 (hplip-3.12.10a.tar.gz) = 1141dc59b41df65d6e2694d1c611ab97064f283a
-Size (hplip-3.12.10a.tar.gz) = 21827613 bytes
+SHA1 (hplip-3.12.11.tar.gz) = f8637e742ec506b30d4d22ca21ea2727619791be
+RMD160 (hplip-3.12.11.tar.gz) = 45e8ee962742ba8d2845105c696ec1657a46e4e1
+Size (hplip-3.12.11.tar.gz) = 21932088 bytes
 SHA1 (patch-aa) = bad4a3a9570d9bbd1e0fe226b625f1ddc3f31b8c
 SHA1 (patch-ab) = ce2775ef74746aefd942bda49c4e548f7c771ff5
 SHA1 (patch-ad) = 468fbf167e1f20bb8617e444977969e46b19f3be
-SHA1 (patch-ae) = 556beb7afe1983c8112f0bf3d275f00c21f09db7
+SHA1 (patch-ae) = b7bedc93ad876048a382ba8d0fbb516a11d1cf13
 SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555
 SHA1 (patch-io_hpmud_pml.c) = 9bd341140afbc9ddb8eb8dff7eee05365231f94f
 SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0
diff --git a/print/hplip/patches/patch-ae b/print/hplip/patches/patch-ae
index cf960d9f71f..d0cd4958020 100644
--- a/print/hplip/patches/patch-ae
+++ b/print/hplip/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.3 2012/11/18 00:50:42 schnoebe Exp $
+$NetBSD: patch-ae,v 1.4 2013/01/27 05:25:03 schnoebe Exp $
 
 # Conform to autoconf's standard variable usage, making it easier
 # to install on pkgsrc platforms
 
 # reported upstream as https://bugs.launchpad.net/hplip/+bug/726218
 
---- Makefile.am.orig	2012-10-10 06:14:21.000000000 +0000
+--- Makefile.am.orig	2012-11-20 09:55:15.000000000 +0000
 +++ Makefile.am
 @@ -107,11 +107,11 @@ hp_mkuri_LDADD = -ldl libhpmud.la
  hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
@@ -69,24 +69,24 @@ $NetBSD: patch-ae,v 1.3 2012/11/18 00:50:42 schnoebe Exp $
  if FULL_BUILD
  	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
 -	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
--	chmod 774 $(DESTDIR)$(hplip_Logdir)
+-	chmod 777 $(DESTDIR)$(hplip_Logdir)
  endif	#FULL_BUILD
  if HPLIP_BUILD
  	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
 -	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
--	chmod 774 $(DESTDIR)$(hplip_Logdir)
+-	chmod 777 $(DESTDIR)$(hplip_Logdir)
  endif	#FULL_BUILD
  
  install-dist_hplip_tmpDATA:
  if FULL_BUILD
  	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
 -	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
--	chmod 1774 $(DESTDIR)$(hplip_tmpdir)
+-	chmod 1777 $(DESTDIR)$(hplip_tmpdir)
  endif	#FULL_BUILD
  if HPLIP_BUILD
  	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
 -	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
--	chmod 1774 $(DESTDIR)$(hplip_tmpdir)
+-	chmod 1777 $(DESTDIR)$(hplip_tmpdir)
  endif	#FULL_BUILD
  
  install-dist_cronDATA:$(dist_cron_DATA)