Update to 3.16.2:

Release Notes:

Significant Changes:

- Queue configuration using 'hp-setup' command is no more supported for
  HP ScanJets. Scan frontends like xsane, hp-scan, scanimage, simplescan
  will automatically detect usb and network ScanJets.

Added Support for the Following New Printers:

- HP ScanJet Pro 4500 fn1 Network scanner
- HP LaserJet Pro MFP M127fs
- HP DeskJet Ultra Ink Advantage 2029 Printer
- HP DeskJet Ink Advantage Ultra 2529 All-in-One Printer

Added support for the following new Distro's:

- LinuxMint 17.3
- Debian 8.3

Launchpad fixes:

1521687 - /usr/lib/sane/libsane-hpaio.so.1: undefined symbol:
          mdns_probe_nw_scanners
1537467 - udev: 56-hpmud.rules should not run usb_id for all USB devices
          out there
1517494 - Upgrade to HPLIP-3.15.11 fails
1536762 - HPLIP installation fails with non-english locale
1483820 - hp-plugin hangs on 'su'
1484916 - hp-plugin infinite loop
1510950 - hp-plugin not working - stuck on permission
1502025 - HP plugin installation hangs after accepting license
1534404 - Debian 8's hplip version is 3.14.6, not 3.15.2
1532451 - Laserjet Pro MFP M127fs is not supported

7 files changed, 25 insertions, 18 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index a3e37375b7e..53beb2c339f 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2015/12/07 11:02:26 adam Exp $
+# $NetBSD: Makefile,v 1.48 2016/02/28 20:37:28 schnoebe Exp $
 
-DISTNAME=	hplip-3.15.11
+DISTNAME=	hplip-3.16.2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hplip/}
 
@@ -171,7 +171,6 @@ post-install:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../print/cups15/buildlink3.mk"
diff --git a/print/hplip/PLIST.base b/print/hplip/PLIST.base
index 6d3f4422ae3..4668c58a5a7 100644
--- a/print/hplip/PLIST.base
+++ b/print/hplip/PLIST.base
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.base,v 1.18 2015/12/07 11:02:26 adam Exp $
+@comment $NetBSD: PLIST.base,v 1.19 2016/02/28 20:37:28 schnoebe Exp $
 bin/hp-align
 bin/hp-check
 bin/hp-clean
@@ -1436,6 +1436,8 @@ share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fn-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fn.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fp-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fp.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fs-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m127fw.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz
@@ -2066,8 +2068,6 @@ share/hplip/ppd/HP/hp-psc_950vr-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-psc_950vr.ppd.gz
 share/hplip/ppd/HP/hp-psc_950xi-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-psc_950xi.ppd.gz
-share/hplip/ppd/HP/hp-scanjet_pro_3500_f1-hpijs.ppd.gz
-share/hplip/ppd/HP/hp-scanjet_pro_3500_f1.ppd.gz
 share/hplip/pqdiag.py
 share/hplip/pqdiag.pyc
 share/hplip/print.py
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index 84a487142cc..b22b31acaec 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.21 2015/12/07 11:02:26 adam Exp $
+$NetBSD: distinfo,v 1.22 2016/02/28 20:37:28 schnoebe Exp $
 
-SHA1 (hplip-3.15.11.tar.gz) = c28f373e85a1355c10c3112e1274138372a9c832
-RMD160 (hplip-3.15.11.tar.gz) = 1d6c50650f2e6e1d4549d0b539023e4ce51bd8c6
-SHA512 (hplip-3.15.11.tar.gz) = 003789e30f45d71a78ebcd2fa57231381ba7bf7aba0ebbcfffda5b01a9c4e8bf763c03488883aba77368920d0dea31a2e80da2d036cf5cb7d07cf65511a7eb49
-Size (hplip-3.15.11.tar.gz) = 22277756 bytes
+SHA1 (hplip-3.16.2.tar.gz) = 28efa845832c77e7015442e7934fc01cc5c4b346
+RMD160 (hplip-3.16.2.tar.gz) = 9e83fbfc8517b13e664135006ea240bf1f7ff3cb
+SHA512 (hplip-3.16.2.tar.gz) = fa73f85cc255a30486ebde12d1615a4c164dd4ecb616a8d509b6ad5857aa52edca14c488e2b11ade4254f71d76bea1ca8d85dc2b0ee99ba32d9381ef42fc80a5
+Size (hplip-3.16.2.tar.gz) = 22285808 bytes
 SHA1 (patch-ab) = 82b8ab80f778a6a31c1031688d9a16dbd4c55462
 SHA1 (patch-ae) = c4bae69fce7d9061d4c7dc53f1f8c5404577c605
-SHA1 (patch-configure.in) = 329ff2e27acf3acb57c1afc182e8e32da45aab9a
-SHA1 (patch-diagnose_queues.py) = aa3e544dc131accf4f799d26924b50f511c8c69f
+SHA1 (patch-configure.in) = c5d3d88a4ae5b1c30c23bc27ac94caf6be493851
+SHA1 (patch-diagnose_queues.py) = 0ef5c12a3f3de217064d5b0c40611ba3f1e72c9e
 SHA1 (patch-installer_dcheck.py) = e381086ccdfbdcd84d3ffe29995d5d3643709be6
 SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555
 SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0
 SHA1 (patch-prnt_hpijs_foomatic-rip-hplip) = a94c7bbdc90dd68d001ce0325b7aabcd470233eb
 SHA1 (patch-prnt_hpijs_hjzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c
-SHA1 (patch-protocol_discovery_mdns.c) = 3923ebc318e702b45ea69c533d275cc16986c979
+SHA1 (patch-protocol_discovery_mdns.c) = e2ca43f6ab13fe2124a38bcc0eff292a57b34b06
 SHA1 (patch-scan.py) = 4d942ee0580d5f1818e43164c07edd018529395d
diff --git a/print/hplip/options.mk b/print/hplip/options.mk
index c887e746388..d2ed1b2440d 100644
--- a/print/hplip/options.mk
+++ b/print/hplip/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2015/12/05 21:25:55 adam Exp $
+# $NetBSD: options.mk,v 1.9 2016/02/28 20:37:28 schnoebe Exp $
 #
 # HPLIP dependencies are detailed in the following page:
 # http://hplipopensource.com/hplip-web/install/manual/distros/other.html
@@ -52,6 +52,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/desktop-file-utils/desktopdb.mk"
 DEPENDS+=	${PYPKGPREFIX}-notify-[0-9]*:../../sysutils/py-notify
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # py-notify
 .else
diff --git a/print/hplip/patches/patch-configure.in b/print/hplip/patches/patch-configure.in
index 84d92a517ef..2bcd9687de4 100644
--- a/print/hplip/patches/patch-configure.in
+++ b/print/hplip/patches/patch-configure.in
@@ -1,4 +1,7 @@
-$NetBSD: patch-configure.in,v 1.1 2015/12/07 11:02:26 adam Exp $
+$NetBSD: patch-configure.in,v 1.2 2016/02/28 20:37:28 schnoebe Exp $
+
+convert configure to use more configure paths instead of hard coded
+paths.
 
 --- configure.in.orig	2015-11-12 10:29:29.000000000 +0000
 +++ configure.in
diff --git a/print/hplip/patches/patch-diagnose_queues.py b/print/hplip/patches/patch-diagnose_queues.py
index 1644afae246..33b361014c9 100644
--- a/print/hplip/patches/patch-diagnose_queues.py
+++ b/print/hplip/patches/patch-diagnose_queues.py
@@ -1,4 +1,6 @@
-$NetBSD: patch-diagnose_queues.py,v 1.1 2015/11/03 15:08:50 schnoebe Exp $
+$NetBSD: patch-diagnose_queues.py,v 1.2 2016/02/28 20:37:28 schnoebe Exp $
+
+Correct the spelling on the module name.
 
 --- diagnose_queues.py.orig	2015-08-19 13:25:37.000000000 +0000
 +++ diagnose_queues.py
diff --git a/print/hplip/patches/patch-protocol_discovery_mdns.c b/print/hplip/patches/patch-protocol_discovery_mdns.c
index 050307123c5..20e2cb7855e 100644
--- a/print/hplip/patches/patch-protocol_discovery_mdns.c
+++ b/print/hplip/patches/patch-protocol_discovery_mdns.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-protocol_discovery_mdns.c,v 1.1 2015/12/07 11:02:26 adam Exp $
+$NetBSD: patch-protocol_discovery_mdns.c,v 1.2 2016/02/28 20:37:28 schnoebe Exp $
+
+Add <sys/time> to allow building on a wider variety of systems.
 
 --- protocol/discovery/mdns.c.orig	2015-12-05 13:17:06.000000000 +0000
 +++ protocol/discovery/mdns.c