Update to hplip 3.16.3:

Upstream Release Notes

HPLIP 3.16.3 - This release has the following changes:

Added Support for the Following New Printers:

- HP PageWide Pro 577dw Multifunction Printer
- HP PageWide Pro 577z Multifunction Printer
- HP PageWide Pro 552dw Printer
- HP PageWide Pro 452dw Printer
- HP PageWide Pro 452dn Printer
- HP PageWide Pro 477dw Multifunction Printer
- HP PageWide Pro 477dn Multifunction Printer
- HP DeskJet GT 5810 All-in-One Printer
- HP DeskJet GT 5820 All-in-One Printer

Added support for the following new Distro's:
- Ubuntu 16.04 (beta)

Issues fixed:
- Traceback error occurs when ESC button is hit upon the promt for
  root/superuser credentials while installing hp-plugin.

Announcements:
- Discontinued the RPM packaging for RHEL-5.X

4 files changed, 46 insertions, 20 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 111889b64d6..51de2afc1c5 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2016/03/23 11:51:39 khorben Exp $
+# $NetBSD: Makefile,v 1.51 2016/04/26 22:51:30 schnoebe Exp $
 
-DISTNAME=	hplip-3.16.2
-PKGREVISION=	2
+DISTNAME=	hplip-3.16.3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hplip/}
 
@@ -68,7 +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
+REPLACE_PERL=		prnt/hpijs/foomatic-rip-hplip
 
 PY_PATCHPLIST=		yes
 
diff --git a/print/hplip/PLIST.base b/print/hplip/PLIST.base
index 4668c58a5a7..a6db69a6d11 100644
--- a/print/hplip/PLIST.base
+++ b/print/hplip/PLIST.base
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.base,v 1.19 2016/02/28 20:37:28 schnoebe Exp $
+@comment $NetBSD: PLIST.base,v 1.20 2016/04/26 22:51:30 schnoebe Exp $
 bin/hp-align
 bin/hp-check
 bin/hp-clean
@@ -713,6 +713,10 @@ share/hplip/ppd/HP/hp-deskjet_5700-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5700.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5800-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5800.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_5810_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_5810_series.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_5820_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_5820_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5850-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5850.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_5900_series-hpijs.ppd.gz
@@ -1794,6 +1798,10 @@ share/hplip/ppd/HP/hp-officejet_v40xi-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_v40xi.ppd.gz
 share/hplip/ppd/HP/hp-officejet_v45-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_v45.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_pro_452_printer-ps.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_pro_477_mfp-ps.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_pro_552_printer-ps.ppd.gz
+share/hplip/ppd/HP/hp-pagewide_pro_577_mfp-ps.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_100-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_100.ppd.gz
 share/hplip/ppd/HP/hp-photosmart_1115-hpijs.ppd.gz
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index b22b31acaec..866aa385d5c 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.22 2016/02/28 20:37:28 schnoebe Exp $
+$NetBSD: distinfo,v 1.23 2016/04/26 22:51:30 schnoebe Exp $
 
-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 (hplip-3.16.3.tar.gz) = fad988c34fc070431cb3c9a73062073a7e6ba6a1
+RMD160 (hplip-3.16.3.tar.gz) = ddeb473508cd6213cc7ffb7bee50c136e1d4177e
+SHA512 (hplip-3.16.3.tar.gz) = 32d2f88c0983208e77592f73bf65cf2900cd6aa234d09220a18b45b5fc4bd0d10e9cfc8c7a10639e5a51ad5f5d0f8ed7bd477d08c86b89c633a1bbcd42682915
+Size (hplip-3.16.3.tar.gz) = 22408596 bytes
 SHA1 (patch-ab) = 82b8ab80f778a6a31c1031688d9a16dbd4c55462
 SHA1 (patch-ae) = c4bae69fce7d9061d4c7dc53f1f8c5404577c605
-SHA1 (patch-configure.in) = c5d3d88a4ae5b1c30c23bc27ac94caf6be493851
+SHA1 (patch-configure.in) = a155b9590a7ab93ca6922a3f55b09d8d531cb9e6
 SHA1 (patch-diagnose_queues.py) = 0ef5c12a3f3de217064d5b0c40611ba3f1e72c9e
 SHA1 (patch-installer_dcheck.py) = e381086ccdfbdcd84d3ffe29995d5d3643709be6
 SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555
diff --git a/print/hplip/patches/patch-configure.in b/print/hplip/patches/patch-configure.in
index 2bcd9687de4..fe129d53541 100644
--- a/print/hplip/patches/patch-configure.in
+++ b/print/hplip/patches/patch-configure.in
@@ -1,9 +1,9 @@
-$NetBSD: patch-configure.in,v 1.2 2016/02/28 20:37:28 schnoebe Exp $
+$NetBSD: patch-configure.in,v 1.3 2016/04/26 22:51:30 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.orig	2016-03-16 10:38:34.000000000 +0000
 +++ configure.in
 @@ -34,14 +34,15 @@ AC_DISABLE_STATIC
  # Checks for programs.
@@ -22,19 +22,28 @@ paths.
  
  # Checks for required header files.
  AC_CHECK_HEADERS(pthread.h,, [AC_MSG_ERROR([cannot find pthread-devel support], 7)])
-@@ -333,29 +334,29 @@ else
+@@ -267,7 +268,7 @@ AC_ARG_ENABLE(apparmor_build,
+   [  --enable-apparmor_build    enable apparmor build (default=no)],
+   apparmor_build=$enableval, apparmor_build=no)
+ if test "$apparmor_build" = "yes"; then
+-   if test -d /etc/apparmor.d/; then
++   if test -d $sysconfdir/apparmor.d/; then
+       AC_MSG_RESULT(yes)
+    else
+       AC_MSG_ERROR([cannot find apparmor support])
+@@ -333,37 +334,37 @@ else
  fi
  AM_CONDITIONAL(LIBUSB01_BUILD, test x$libusb01_build = xyes)
  
 -AC_ARG_WITH(cupsbackenddir, AC_HELP_STRING([--with-cupsbackenddir=DIR], [set cups backend install directory [default=/usr/lib/cups/backend]]),
 -   cupsbackenddir=$withval, cupsbackenddir="/usr/lib/cups/backend")
-+AC_ARG_WITH(cupsbackenddir, AC_HELP_STRING([--with-cupsbackenddir=DIR], [set cups backend install directory [default=libdir/cups/backend]]),
-+   cupsbackenddir=$withval, cupsbackenddir="$libdir/cups/backend")
++AC_ARG_WITH(cupsbackenddir, AC_HELP_STRING([--with-cupsbackenddir=DIR], [set cups backend install directory [default=libdir/lib/cups/backend]]),
++   cupsbackenddir=$withval, cupsbackenddir="$libdir/lib/cups/backend")
  
 -AC_ARG_WITH(cupsfilterdir, AC_HELP_STRING([--with-cupsfilterdir=DIR], [set cups filter install directory [default=/usr/lib/cups/filter]]),
 -   cupsfilterdir=$withval, cupsfilterdir="/usr/lib/cups/filter")
-+AC_ARG_WITH(cupsfilterdir, AC_HELP_STRING([--with-cupsfilterdir=DIR], [set cups filter install directory [default=libdir/cups/filter]]),
-+   cupsfilterdir=$withval, cupsfilterdir="$libdir/cups/filter")
++AC_ARG_WITH(cupsfilterdir, AC_HELP_STRING([--with-cupsfilterdir=DIR], [set cups filter install directory [default=libdir/lib/cups/filter]]),
++   cupsfilterdir=$withval, cupsfilterdir="$libdir/lib/cups/filter")
  
 -AC_ARG_WITH(icondir, AC_HELP_STRING([--with-icondir=DIR], [set hplip.desktop install directory [default=/usr/share/applications]]),
 -   icondir=$withval, icondir="/usr/share/applications")
@@ -55,9 +64,9 @@ paths.
 +AC_ARG_WITH(apparmordir, AC_HELP_STRING([--with-apparmordir=DIR], [set apparmor profile install directory [default=sysconfdir/apparmor.d]]),
 +   apparmordir=$withval, apparmordir="$sysconfdir/apparmor.d")
  
--if test -f "/usr/share/cups/mime/mime.types"; then 
+-if test -f "/usr/share/cups/mime/mime.types"; then
 -   abs_mimedir="/usr/share/cups/mime/"
-+if test -f "$datadir/cups/mime/mime.types"; then 
++if test -f "$datadir/cups/mime/mime.types"; then
 +   abs_mimedir="$datadir/cups/mime/"
  else
 -   abs_mimedir="/etc/cups/"
@@ -65,6 +74,16 @@ paths.
  fi
  AC_ARG_WITH(mimedir, AC_HELP_STRING([--with-mimedir=DIR], [set cups mime.types location [default=abs_mimedir]]),
     mimedir=$withval, mimedir="$abs_mimedir")
+ 
+-AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=DIR], [set hplip documentation directory [default=datadir/doc]]),
++AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=DIR], [set hplip documentation directory [default=datadir/doc/hplip-VERSION]]),
+    hpdocdir=$withval, hpdocdir="$datadir/doc/hplip-$VERSION")
+ 
+-AC_ARG_WITH(htmldir, AC_HELP_STRING([--with-htmldir=DIR], [set hplip html documentation directory [default=datadir/doc]]),
++AC_ARG_WITH(htmldir, AC_HELP_STRING([--with-htmldir=DIR], [set hplip html documentation directory [default=datadir/doc/hplip-VERSION]]),
+    hphtmldir=$withval, hphtmldir="$datadir/doc/hplip-$VERSION")
+ 
+ AC_MSG_CHECKING([for foomatic ppd install])
 @@ -488,12 +489,12 @@ AM_CONDITIONAL(POLICYKIT_INSTALL, test x
  
  # Determine where the PolicyKit policy file goes