Update to 3.13.4:

Changes,etc:

HPLIP 3.13.4 - This release has the following changes:
Added Support for the Following New Printers:

- HP Designjet Z5200 44-in PostScript Printer
- HP LaserJet Pro M521dn Multifunction Printer
- HP LaserJet Pro M521dw Multifunction Printer
- HP Officejet Pro 251dw Printer
- HP Officejet Pro 276dw Multifunction Printer

Added support for the following new Distro's:

- Debian 6.0.7
- OpenSuse 12.3

Launchpad fixes:

1132172 - Typo in Webpage "hplip Manual install - su ..."
1153555 - hp-doctor:137:install_plugin:NameError: global name 'sts' is
            not defined
1048114 - toolbox.py crashed with KeyError in
is_auto_installer_support(): 0

Issues fixed:

- The tab name is "Print Settings" instead of "Fax Settings" when fax
  device is selected in "Device Manager"
- Pin to Print support for HP LaserJet Enterprise 500 Color M551
- "Status and Supplies" informations are missing in 'Device Manager' for
  HP LaserJet P3015 Printer
- Envelop paper sizes were missing for HP Photosmart 5510d e-All-in-One
- Scan operation fails with IO error, after Print job for HP Deskjet
  3070 B611 series
- 'hp-levels' command does not give any details about cartridges for HP
  DeskJet 3000 j310 series and HP Deskjet 3050 J610 series
- Error attempting to read r-value(2) is getting displayed in terminal
  when execute 'hp-info' and 'hp-levles' commands
- Extra text is displayed in the option "Output Order" under "Printer
  Settings" tab in "Device Manager"
- Print job can not be launched with 'hp-scan -o ~/test01.jpg
  --printer=PSC_2170_Series' command, after the scan job is completed
- Device IO Error occurs while configuring HP Officejet Pro X451dw
  Printer via WiFi through USB
- Clean functionality from command line and 'Device Manager' supported
  for applicable InkJet devices
- Removed PPD warnings and errors by updating version information and
  constraints

HPLIP 3.13.3 - This release has the following changes:
Added support for the following new Distro's:

- LinuxMint 14

Launchpad fixes:

1131596 - Not able to install HP 3.13.2 plugin
1130272 - hplip-3.13.2 installation stalls
1099853 - Fix use of PIL(Python Imaging Library) to support Pillow

Issues fixed:

- "Device Manager" window disappears after entering wrong password in
  authentication window three times.
- Traceback message appears in terminal when pressed "Ctrl+C" button on
  the keyboard while configuring the device through 'hp-setup'

HPLIP 3.13.2 - This release has the following changes:
Added Support for the Following New Printers:

- HP Officejet Pro X451dw Printer
- HP Officejet Pro X451dn Printer
- HP Officejet Pro X476dn MFP
- HP Officejet Pro X476dw MFP
- HP Officejet Pro X551dw Printer
- HP Officejet Pro X576dw MFP
- HP Officejet 7110 Wide Format ePrinter
- HP LaserJet 400 M401dne

Added support for the following new Distro's:

- Fedora 18

Launchpad fixes:

1084435 - Wrong toner part No.36A shown for LJ Pro P1606dn
1112306 - Under some circumstances HPLIP removes user from all groups
1091567 - upgrade.py crashes if a captive portal is used
1082413 - hplip-3.12.10a prnt/drv/hpijs.drv missing } after LJZjsColor
          definition causing lots of ppds to be incorrectly generated
816763  - Wrong syslog facility for debug messages

Issues fixed:

- Command "hp-scan -m 'lineart'" gives unexpected scanned output with HP
  LaserJet 200 Color MFP M275 device
- Fixed duplicate scanner displays in xsane
- Scan issue fixed in Linuxmint 64bit OS

Detailed Change Log:

- Secure Printing Support for HP LaserJet 5500 and Hp LaserJet 8150
- Updated Media Types for HP Color LaserJet CP5520 Series

6 files changed, 49 insertions, 39 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 99e3a36c5eb..cc5fc19df05 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2013/03/16 22:45:45 dholland Exp $
+# $NetBSD: Makefile,v 1.18 2013/04/12 03:47:30 schnoebe Exp $
 #
 
-DISTNAME=		hplip-3.12.11
-PKGREVISION=		3
+DISTNAME=		hplip-3.13.4
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hplip/}
 
diff --git a/print/hplip/PLIST.base b/print/hplip/PLIST.base
index fcea6123371..f48a6c2fdb0 100644
--- a/print/hplip/PLIST.base
+++ b/print/hplip/PLIST.base
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST.base,v 1.4 2013/01/27 05:25:03 schnoebe Exp $
+@comment $NetBSD: PLIST.base,v 1.5 2013/04/12 03:47:30 schnoebe Exp $
 bin/hp-align
 bin/hp-check
-bin/hp-check-plugin
 bin/hp-clean
 bin/hp-colorcal
 bin/hp-config_usb_printer
 bin/hp-devicesettings
 bin/hp-diagnose_plugin
 bin/hp-diagnose_queues
+bin/hp-doctor
 bin/hp-fab
 bin/hp-faxsetup
 bin/hp-firmware
@@ -128,6 +128,10 @@ share/hplip/base/models.py
 share/hplip/base/models.pyc
 share/hplip/base/module.py
 share/hplip/base/module.pyc
+share/hplip/base/os_utils.py
+share/hplip/base/os_utils.pyc
+share/hplip/base/password.py
+share/hplip/base/password.pyc
 share/hplip/base/pexpect.py
 share/hplip/base/pexpect.pyc
 share/hplip/base/pkit.py
@@ -136,8 +140,12 @@ share/hplip/base/pml.py
 share/hplip/base/pml.pyc
 share/hplip/base/queues.py
 share/hplip/base/queues.pyc
+share/hplip/base/services.py
+share/hplip/base/services.pyc
 share/hplip/base/slp.py
 share/hplip/base/slp.pyc
+share/hplip/base/smart_install.py
+share/hplip/base/smart_install.pyc
 share/hplip/base/status.py
 share/hplip/base/status.pyc
 share/hplip/base/strings.py
@@ -205,6 +213,8 @@ share/hplip/diagnose_plugin.py
 share/hplip/diagnose_plugin.pyc
 share/hplip/diagnose_queues.py
 share/hplip/diagnose_queues.pyc
+share/hplip/doctor.py
+share/hplip/doctor.pyc
 share/hplip/fab.py
 share/hplip/fab.pyc
 share/hplip/faxsetup.py
@@ -224,6 +234,8 @@ share/hplip/installer/core_install.pyc
 share/hplip/installer/dcheck.py
 share/hplip/installer/dcheck.pyc
 share/hplip/installer/distros.dat
+share/hplip/installer/pluginhandler.py
+share/hplip/installer/pluginhandler.pyc
 share/hplip/levels.py
 share/hplip/levels.pyc
 share/hplip/linefeedcal.py
@@ -496,7 +508,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_z5200_postscript-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
@@ -1002,7 +1014,7 @@ share/hplip/ppd/HP/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_4000_series-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_4000_series-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_400_m401-ps.ppd.gz
-share/hplip/ppd/HP/hp-laserjet_400_m401d-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_400_m401dne-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_400_mfp_m425-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_4050_series-pcl3.ppd.gz
@@ -1059,7 +1071,6 @@ share/hplip/ppd/HP/hp-laserjet_5000_series-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_500_color_m551-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_500_color_mfp_m570-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_500_color_mfp_m575-ps.ppd.gz
-share/hplip/ppd/HP/hp-laserjet_500_mfp_m521-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_500_mfp_m525-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_5100_series-pcl3.ppd.gz
@@ -1221,7 +1232,6 @@ 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
@@ -1464,6 +1474,8 @@ share/hplip/ppd/HP/hp-officejet_7000_e809a_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7000_e809a_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7100_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7100_series.ppd.gz
+share/hplip/ppd/HP/hp-officejet_7110_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_7110_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7200_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7200_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7300_series-hpijs.ppd.gz
@@ -1932,5 +1944,4 @@ share/hplip/upgrade.py
 share/hplip/upgrade.pyc
 share/hplip/wificonfig.py
 share/hplip/wificonfig.pyc
-@pkgdir share/examples/hplip/log/hp
 @pkgdir share/examples/hplip/log/hp/tmp
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index 9b5f3f18d59..ebc01e1c82e 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.4 2013/01/27 05:25:03 schnoebe Exp $
+$NetBSD: distinfo,v 1.5 2013/04/12 03:47:30 schnoebe Exp $
 
-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 (hplip-3.13.4.tar.gz) = df8e1cd027e7fc56f4d344904cd58d0105914e9d
+RMD160 (hplip-3.13.4.tar.gz) = 65df3b65aec0b588d80635cdff7dc88e21d22424
+Size (hplip-3.13.4.tar.gz) = 20680774 bytes
 SHA1 (patch-aa) = bad4a3a9570d9bbd1e0fe226b625f1ddc3f31b8c
 SHA1 (patch-ab) = ce2775ef74746aefd942bda49c4e548f7c771ff5
 SHA1 (patch-ad) = 468fbf167e1f20bb8617e444977969e46b19f3be
-SHA1 (patch-ae) = b7bedc93ad876048a382ba8d0fbb516a11d1cf13
+SHA1 (patch-ae) = 1d619e74413d14271bdd428ce1dafcd1944c2423
 SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555
 SHA1 (patch-io_hpmud_pml.c) = 9bd341140afbc9ddb8eb8dff7eee05365231f94f
 SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0
 SHA1 (patch-prnt_hpijs_hjzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c
-SHA1 (patch-scan.py) = 3db0f55a915812fa9535fcf1fa2eaebd9daa93e3
+SHA1 (patch-scan.py) = 6f861843ee3b990cc1eaaa0d957cdfd5e6f5f262
diff --git a/print/hplip/options.mk b/print/hplip/options.mk
index 5bb237bd796..aa4c1c16a6b 100644
--- a/print/hplip/options.mk
+++ b/print/hplip/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2012/05/18 03:03:20 schnoebe Exp $
+# $NetBSD: options.mk,v 1.2 2013/04/12 03:47:30 schnoebe Exp $
 #
 # HPLIP dependencies are detailed in the following page:
 # http://hplipopensource.com/hplip-web/install/manual/distros/other.html
@@ -46,7 +46,7 @@ EGFILES+=		dbus-1/system.d/com.hp.hplip.conf
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/dbus-1/system.d
 .include "../../x11/py-qt4/buildlink3.mk"
 .include "../../security/policykit/buildlink3.mk"
-.include "../../sysutils/py-notify/buildlink3.mk"
+DEPENDS+=	${PYPKGPREFIX}-notify-[0-9]*:../../sysutils/py-notify
 .else
 CONFIGURE_ARGS+=	--disable-policykit
 CONFIGURE_ARGS+=	--disable-qt4
diff --git a/print/hplip/patches/patch-ae b/print/hplip/patches/patch-ae
index d0cd4958020..81238664dc7 100644
--- a/print/hplip/patches/patch-ae
+++ b/print/hplip/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.4 2013/01/27 05:25:03 schnoebe Exp $
+$NetBSD: patch-ae,v 1.5 2013/04/12 03:47:30 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-11-20 09:55:15.000000000 +0000
+--- Makefile.am.orig	2013-03-08 07:15:32.000000000 +0000
 +++ Makefile.am
-@@ -107,11 +107,11 @@ hp_mkuri_LDADD = -ldl libhpmud.la
+@@ -110,11 +110,11 @@ hp_mkuri_LDADD = -ldl libhpmud.la
  hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
  
  # cron files
@@ -21,7 +21,7 @@ $NetBSD: patch-ae,v 1.4 2013/01/27 05:25:03 schnoebe Exp $
  if UDEV_SYSFS_RULES
  dist_rules_DATA = data/rules/56-hpmud_support_sysfs.rules
  dist_rules_DATA += data/rules/86-hpmud_plugin_sysfs.rules
-@@ -131,11 +131,11 @@ else
+@@ -134,11 +134,11 @@ else
  dist_rules_DATA += data/rules/55-hpmud.rules
  endif
  endif
@@ -35,13 +35,13 @@ $NetBSD: patch-ae,v 1.4 2013/01/27 05:25:03 schnoebe Exp $
  hplip_conf_DATA = hplip.conf
  
  #pstotiff filter
-@@ -143,13 +143,13 @@ pstotiffdir = $(cupsfilterdir)
+@@ -146,13 +146,13 @@ pstotiffdir = $(cupsfilterdir)
  pstotiff_SCRIPTS = fax/filters/pstotiff
  
  # hplip.state
 -hplip_statedir = /var/lib/hp
-+hplip_statedir = $(localstatedir)/lib/hp
- dist_hplip_state_DATA = 
++hplip_statedir = ($localstatedir)/lib/hp
+ dist_hplip_state_DATA =
  #dist_hplip_state_DATA = hplip.state
  
  # Log Files
@@ -52,7 +52,7 @@ $NetBSD: patch-ae,v 1.4 2013/01/27 05:25:03 schnoebe Exp $
  
  if FULL_BUILD
  
-@@ -365,9 +365,9 @@ endif
+@@ -372,9 +372,9 @@ endif
  
  # PolicyKit
  if POLICYKIT_INSTALL
@@ -64,33 +64,33 @@ $NetBSD: patch-ae,v 1.4 2013/01/27 05:25:03 schnoebe Exp $
  dist_policykit_dbus_share_DATA = data/policykit/com.hp.hplip.service
  policykit_policydir = $(policykit_dir)
  dist_policykit_policy_DATA = data/policykit/com.hp.hplip.policy
-@@ -552,25 +552,17 @@ endif
+@@ -563,25 +563,17 @@ endif
  install-dist_hplip_LogDATA:
  if FULL_BUILD
  	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
 -	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
--	chmod 777 $(DESTDIR)$(hplip_Logdir)
+-	chmod 775 $(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 777 $(DESTDIR)$(hplip_Logdir)
+-	chmod 775 $(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 1777 $(DESTDIR)$(hplip_tmpdir)
+-	chmod 1775 $(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 1777 $(DESTDIR)$(hplip_tmpdir)
+-	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
  endif	#FULL_BUILD
  
  install-dist_cronDATA:$(dist_cron_DATA)
-@@ -589,13 +581,13 @@ install-data-hook:
+@@ -600,13 +592,13 @@ install-data-hook:
  if HPLIP_BUILD
  #	   If scanner build, add hpaio entry to sane dll.conf.
  	if [ "$(scan_build)" = "yes" ]; then \
diff --git a/print/hplip/patches/patch-scan.py b/print/hplip/patches/patch-scan.py
index 967c9918580..8780f861b30 100644
--- a/print/hplip/patches/patch-scan.py
+++ b/print/hplip/patches/patch-scan.py
@@ -1,19 +1,19 @@
-$NetBSD: patch-scan.py,v 1.1.1.1 2012/05/18 03:03:22 schnoebe Exp $
+$NetBSD: patch-scan.py,v 1.2 2013/04/12 03:47:30 schnoebe Exp $
 
 Try to work better with multiple versions of Python
 
---- scan.py.orig	2011-10-02 03:06:19.000000000 +0000
+--- scan.py.orig	2013-03-08 07:15:32.000000000 +0000
 +++ scan.py
-@@ -620,7 +620,7 @@ try:
-         scan_px = scan_area * res * res / 645.16 # res is in DPI
-         
+@@ -665,7 +665,7 @@ try:
+         scan_area = (brx - tlx) * (bry - tly) # mm^2
+ 
          valid_res = device.getOptionObj('resolution').constraint
 -        log.debug("Device supported resolutions %s" % (valid_res,))
-+        log.debug("Device supported resolutions %s" % ', '.join([str(x) for x in valid_res]))
++        log.debug("Device supported resolutions %s" % ', ' . join([str(x) for x in valid_res]))
          if 0 in valid_res: #min-max range in tuple
             if res < valid_res[0] or res > valid_res[1]:
               log.warn("Invalid resolution. Using closest valid resolution of %d dpi" % res)
-@@ -633,6 +633,7 @@ try:
+@@ -678,6 +678,7 @@ try:
            if res not in valid_res:
              log.warn("Invalid resolution. Using closest valid resolution of %d dpi" % res)
              log.warn("Valid resolutions are %s dpi." % ', '.join([str(x) for x in valid_res]))