HPLIP 3.13.5 - This release has the following changes:

Added Support for the Following New Printers:

- HP LaserJet Enterprise MFP M725 series
- HP LaserJet Enterprise MFP M725dn
- HP LaserJet Enterprise MFP M725fw
- HP LaserJet Enterprise MFP M725z
- HP LaserJet Enterprise MFP M725z+
- HP Officejet Pro 3610 Black and White e-All-in-One
- HP Officejet Pro 3620 Black and White e-All-in-One

Launchpad fixes:
1176470 - hp-setup fails with the message "ethernet cable is plugged in"
	- But it isn't
1157701 - soapfax.py:139:setStationName:UnicodeEncodeError: 'ascii'
	  codec can't encode characters in position 0-3: ordinal not in
	  range(128)
1163339 - hplip online documentation: manual tarball installation shows
	  package dependancies which are out-of-date

Issues fixed:
- Bottom margin is not printing on 8.5x13in paper size for DeskJet 2050
  J510 device
- Fixed cross resolution issue for pcl3gui2

Detailed Change Log:
- Added 56-hpmud.rules and removed 56-hpmud_support, 86-hpmud_plugin,
  56-hpmud_add_printer, 55-hpmud and 40-hplip rules
- Added hplip-printer@.service to support systemd services in Udev for
  OpenSuSe 12.3

4 files changed, 37 insertions, 29 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index a3afb5e2a43..7a1e1cd5e4c 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2013/04/25 03:53:11 sbd Exp $
+# $NetBSD: Makefile,v 1.20 2013/05/26 00:43:23 schnoebe Exp $
 #
 
-DISTNAME=		hplip-3.13.4
-PKGREVISION=		1
+DISTNAME=		hplip-3.13.5
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hplip/}
 
diff --git a/print/hplip/PLIST.base b/print/hplip/PLIST.base
index f48a6c2fdb0..cfc43899292 100644
--- a/print/hplip/PLIST.base
+++ b/print/hplip/PLIST.base
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.base,v 1.5 2013/04/12 03:47:30 schnoebe Exp $
+@comment $NetBSD: PLIST.base,v 1.6 2013/05/26 00:43:23 schnoebe Exp $
 bin/hp-align
 bin/hp-check
 bin/hp-clean
@@ -41,6 +41,7 @@ lib/libhpmud.la
 ${PYSITELIB}/cupsext.la
 ${PYSITELIB}/hpmudext.la
 ${PYSITELIB}/pcardext.la
+lib/systemd/system/hplip-printer@.service
 libexec/cups/backend/hp
 libexec/cups/filter/foomatic-rip-hplip
 libexec/cups/filter/hpcac
@@ -87,10 +88,7 @@ share/doc/${PKGNAME}/uninstalling.html
 share/doc/${PKGNAME}/upgrading.html
 share/examples/hplip/cron.daily/hplip_cron
 share/examples/hplip/hp/hplip.conf
-share/examples/hplip/udev/rules.d/55-hpmud.rules
-share/examples/hplip/udev/rules.d/56-hpmud_add_printer.rules
-share/examples/hplip/udev/rules.d/56-hpmud_support.rules
-share/examples/hplip/udev/rules.d/86-hpmud_plugin.rules
+share/examples/hplip/udev/rules.d/56-hpmud.rules
 share/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
 share/hplip/__init__.py
 share/hplip/__init__.pyc
@@ -1232,6 +1230,7 @@ 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
@@ -1534,6 +1533,10 @@ share/hplip/ppd/HP/hp-officejet_pro_1170c_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_1170c_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_251dw_printer-ps.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_276dw_mfp-ps.ppd.gz
+share/hplip/ppd/HP/hp-officejet_pro_3610-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_pro_3610.ppd.gz
+share/hplip/ppd/HP/hp-officejet_pro_3620-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_pro_3620.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_451_series-ps.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_476_576_series-ps.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_551_series-ps.ppd.gz
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index ebc01e1c82e..5a331b095f9 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.5 2013/04/12 03:47:30 schnoebe Exp $
+$NetBSD: distinfo,v 1.6 2013/05/26 00:43:23 schnoebe Exp $
 
-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 (hplip-3.13.5.tar.gz) = a28ebd754a94a83e493aa91673def890564c85f1
+RMD160 (hplip-3.13.5.tar.gz) = 056289cd233e4c95cb16cf30e136bebe691deed7
+Size (hplip-3.13.5.tar.gz) = 20737422 bytes
 SHA1 (patch-aa) = bad4a3a9570d9bbd1e0fe226b625f1ddc3f31b8c
 SHA1 (patch-ab) = ce2775ef74746aefd942bda49c4e548f7c771ff5
 SHA1 (patch-ad) = 468fbf167e1f20bb8617e444977969e46b19f3be
-SHA1 (patch-ae) = 1d619e74413d14271bdd428ce1dafcd1944c2423
+SHA1 (patch-ae) = da7a6f9ccb3787101496dd6588c3ebd31f69157d
 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 81238664dc7..a9e512106ab 100644
--- a/print/hplip/patches/patch-ae
+++ b/print/hplip/patches/patch-ae
@@ -1,15 +1,23 @@
-$NetBSD: patch-ae,v 1.5 2013/04/12 03:47:30 schnoebe Exp $
+$NetBSD: patch-ae,v 1.6 2013/05/26 00:43:23 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	2013-03-08 07:15:32.000000000 +0000
+# still needs to handle the buildlink path for libusb-1.0 :(
+# schnoebe -- Fri May 24 14:55:57 CDT 2013
+
+--- Makefile.am.orig	2013-05-10 10:09:32.000000000 +0000
 +++ Makefile.am
-@@ -110,11 +110,11 @@ hp_mkuri_LDADD = -ldl libhpmud.la
+@@ -110,26 +110,26 @@ hp_mkuri_LDADD = -ldl libhpmud.la
  hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
  
+ #hpmud rules data dir
+-rulessystemdir=/usr/lib/systemd/system
++rulessystemdir= $(libdir)/systemd/system
+ dist_rulessystem_DATA =data/rules/hplip-printer@.service
+ 
  # cron files
 -crondir = /etc/cron.daily
 +crondir = $(sysconfdir)/cron.daily
@@ -19,12 +27,11 @@ $NetBSD: patch-ae,v 1.5 2013/04/12 03:47:30 schnoebe Exp $
 -rulesdir = /etc/udev/rules.d
 +rulesdir = $(sysconfdir)/udev/rules.d
  if UDEV_SYSFS_RULES
- dist_rules_DATA = data/rules/56-hpmud_support_sysfs.rules
- dist_rules_DATA += data/rules/86-hpmud_plugin_sysfs.rules
-@@ -134,11 +134,11 @@ else
- dist_rules_DATA += data/rules/55-hpmud.rules
- endif
+ dist_rules_DATA = data/rules/56-hpmud_sysfs.rules
+ else
+ dist_rules_DATA = data/rules/56-hpmud.rules
  endif
+ 
 -halpredir = /usr/share/hal/fdi/preprobe/10osvendor
 +halpredir = $(datadir)/hal/fdi/preprobe/10osvendor
  dist_halpre_DATA = data/rules/20-hplip-devices.fdi
@@ -35,24 +42,23 @@ $NetBSD: patch-ae,v 1.5 2013/04/12 03:47:30 schnoebe Exp $
  hplip_conf_DATA = hplip.conf
  
  #pstotiff filter
-@@ -146,13 +146,13 @@ pstotiffdir = $(cupsfilterdir)
+@@ -137,12 +137,12 @@ pstotiffdir = $(cupsfilterdir)
  pstotiff_SCRIPTS = fax/filters/pstotiff
  
  # hplip.state
 -hplip_statedir = /var/lib/hp
-+hplip_statedir = ($localstatedir)/lib/hp
++hplip_statedir = $(localstatedir)/lib/hp
  dist_hplip_state_DATA =
- #dist_hplip_state_DATA = hplip.state
  
  # Log Files
 -hplip_Logdir=/var/log/hp
 -hplip_tmpdir=/var/log/hp/tmp
-+hplip_Logdir=$(localstatedir)/log/hp
-+hplip_tmpdir=$(localstatedir)/log/hp/tmp
++hplip_Logdir= $(localstatedir)/log/hp
++hplip_tmpdir= $(localstatedir)/log/hp/tmp
  
  if FULL_BUILD
  
-@@ -372,9 +372,9 @@ endif
+@@ -358,9 +358,9 @@ endif
  
  # PolicyKit
  if POLICYKIT_INSTALL
@@ -64,7 +70,7 @@ $NetBSD: patch-ae,v 1.5 2013/04/12 03:47:30 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
-@@ -563,25 +563,17 @@ endif
+@@ -549,25 +549,17 @@ endif
  install-dist_hplip_LogDATA:
  if FULL_BUILD
  	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
@@ -90,7 +96,7 @@ $NetBSD: patch-ae,v 1.5 2013/04/12 03:47:30 schnoebe Exp $
  endif	#FULL_BUILD
  
  install-dist_cronDATA:$(dist_cron_DATA)
-@@ -600,13 +592,13 @@ install-data-hook:
+@@ -586,13 +578,13 @@ install-data-hook:
  if HPLIP_BUILD
  #	   If scanner build, add hpaio entry to sane dll.conf.
  	if [ "$(scan_build)" = "yes" ]; then \