print/hplip and print/hplip-plugin: Update to 3.16.8

print/hplip:

- Add LICENSE details
- Changes USE_OPENSSL=yes to USES=ssl
- Create empty directories for pkg-plist @dir entries
- Reformat patches with makepatch (pet portlint)
- Move ${PREFIX}/etc/sane.d/dll.conf to ${PREFIX}/etc/sane.d/dll.d/hpaio
  during post-install, rather than editing ${PREFIX}/etc/sane.d/dll.conf
  during @exec and @unexec during pkg-plist

print/hplip-plugin:

- Re-order LICENSE block (pet portlint)

Changes this release:

http://hplipopensource.com/hplip-web/release_notes.html

Reviewed by:	mat (mentor)
Approved by:	makc (maintainer timeout), adamw (mentor)
Differential Revision:	https://reviews.freebsd.org/D7812

7 files changed, 39 insertions, 16 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 716bc8579073..3d9361ee02e5 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -2,14 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	hplip
-PORTVERSION=	3.16.2
-PORTREVISION=	2
+PORTVERSION=	3.16.8
 CATEGORIES=	print
 MASTER_SITES=	SF
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Drivers and utilities for HP Printers and All-in-One devices
 
+LICENSE=	GPLv2 MIT BSD3CLAUSE
+LICENSE_COMB=	multi
+LICENSE_FILES=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libcupsimage.so:print/cups \
 		libdbus-1.so:devel/dbus
 RUN_DEPENDS=	${LOCALBASE}/libexec/cups/filter/gstoraster:print/cups-filters \
@@ -71,7 +74,7 @@ FAX_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/reportlab/__init__.py:print/py-reportlab2
 FAX_CONFIGURE_ENABLE=	fax-build
 
 SNMP_DESC=	Network/JetDirect support
-SNMP_USE=	OPENSSL=yes
+SNMP_USES=	ssl
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_ENABLE=	network-build
 
@@ -124,5 +127,11 @@ post-patch:
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/etc/hp/hplip.conf \
 		${STAGEDIR}${PREFIX}/etc/hp/hplip.conf.sample
+	${MKDIR} ${STAGEDIR}${DATADIR}/ui4/plugins
+	${MKDIR} ${STAGEDIR}/var/lib/hp
+	${MKDIR} ${STAGEDIR}/var/lib
+post-install-SCAN-on:
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/sane.d/dll.d
+	${MV} ${STAGEDIR}${PREFIX}/etc/sane.d/dll.conf ${STAGEDIR}${PREFIX}/etc/sane.d/dll.d/hpaio
 
 .include <bsd.port.mk>
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index 8fe3a98a769d..a1ecf6fcc8a8 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,2 +1,3 @@
-SHA256 (hplip-3.16.2.tar.gz) = f2c845a9d48a8ba2b74ccae21e29829abc929dc6c74e2b5b19df01ea577ed4d9
-SIZE (hplip-3.16.2.tar.gz) = 22285808
+TIMESTAMP = 1473246182
+SHA256 (hplip-3.16.8.tar.gz) = a9da67ae51c17487a8d725eb9c0bf9c6f0416e1fffa7db6cdff5302b1c556ceb
+SIZE (hplip-3.16.8.tar.gz) = 22942175
diff --git a/print/hplip/files/patch-installer__dcheck.py b/print/hplip/files/patch-installer_dcheck.py
index a8925c2d3454..10a435c16bfd 100644
--- a/print/hplip/files/patch-installer__dcheck.py
+++ b/print/hplip/files/patch-installer_dcheck.py
@@ -1,6 +1,6 @@
---- installer/dcheck.py.orig	2013-02-21 18:40:18.368768559 -0800
-+++ installer/dcheck.py	2013-02-21 18:43:03.116783408 -0800
-@@ -46,7 +46,11 @@
+--- installer/dcheck.py.orig	2016-08-26 10:05:26 UTC
++++ installer/dcheck.py
+@@ -48,7 +48,11 @@ mod_output = ''
  def update_ld_output():
      # For library checks
      global ld_output
@@ -13,7 +13,7 @@
  
      if status != 0:
          log.debug("ldconfig failed.")
-@@ -360,6 +364,8 @@
+@@ -378,6 +382,8 @@ def get_libpthread_version():
      except ImportError:
          return '-'
      else:
diff --git a/print/hplip/files/patch-io-hpmud-musb.c b/print/hplip/files/patch-io_hpmud_musb.c
index 8d940aaa92c0..d20b4c2e7d65 100644
--- a/print/hplip/files/patch-io-hpmud-musb.c
+++ b/print/hplip/files/patch-io_hpmud_musb.c
@@ -1,4 +1,4 @@
---- io/hpmud/musb.c.orig	2016-02-08 09:42:51 UTC
+--- io/hpmud/musb.c.orig	2016-08-26 10:05:31 UTC
 +++ io/hpmud/musb.c
 @@ -139,10 +139,16 @@ static int get_string_descriptor(libusb_
                  0x409,
diff --git a/print/hplip/files/patch-prnt__hpcups__ErnieFilter.cpp b/print/hplip/files/patch-prnt_hpcups_ErnieFilter.cpp
index 4fe2710ee42c..df9090bfc370 100644
--- a/print/hplip/files/patch-prnt__hpcups__ErnieFilter.cpp
+++ b/print/hplip/files/patch-prnt_hpcups_ErnieFilter.cpp
@@ -1,5 +1,5 @@
---- ./prnt/hpcups/ErnieFilter.cpp.orig	2010-02-25 02:04:09.000000000 +0300
-+++ ./prnt/hpcups/ErnieFilter.cpp	2010-04-18 10:49:13.471529924 +0400
+--- prnt/hpcups/ErnieFilter.cpp.orig	2016-08-26 10:03:22 UTC
++++ prnt/hpcups/ErnieFilter.cpp
 @@ -50,7 +50,8 @@
  #include "ErnieFilter.h"
  
diff --git a/print/hplip/files/patch-protocol-discovery-mdns.c b/print/hplip/files/patch-protocol_discovery_mdns.c
index 402490b2764b..909ceaa8a2bb 100644
--- a/print/hplip/files/patch-protocol-discovery-mdns.c
+++ b/print/hplip/files/patch-protocol_discovery_mdns.c
@@ -1,4 +1,4 @@
---- protocol/discovery/mdns.c.orig	2016-02-08 09:43:19 UTC
+--- protocol/discovery/mdns.c.orig	2016-08-26 10:04:47 UTC
 +++ protocol/discovery/mdns.c
 @@ -24,7 +24,11 @@
   Author: Sanjay Kumar
diff --git a/print/hplip/pkg-plist b/print/hplip/pkg-plist
index 9fd1e9701727..6ecdb432fbf3 100644
--- a/print/hplip/pkg-plist
+++ b/print/hplip/pkg-plist
@@ -35,7 +35,7 @@ bin/hp-unload
 bin/hp-upgrade
 bin/hp-wificonfig
 @sample etc/hp/hplip.conf.sample
-@comment etc/sane.d/dll.conf
+%%SCAN%%etc/sane.d/dll.d/hpaio
 %%X11%%etc/xdg/autostart/hplip-systray.desktop
 %%SNMP%%lib/libhpdiscovery.so
 %%SNMP%%lib/libhpdiscovery.so.0
@@ -713,6 +713,7 @@ share/ppd/HP/hp-color_laserjet_mfp_m577-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_m680-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_pro_m252-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_pro_mfp_m377-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz
@@ -873,6 +874,8 @@ share/ppd/HP/hp-laserjet_p4010_series-ps.ppd.gz
 share/ppd/HP/hp-laserjet_pro_m201_m202-ps.ppd.gz
 share/ppd/HP/hp-laserjet_pro_m402_m403-ps.ppd.gz
 share/ppd/HP/hp-laserjet_pro_m402_m403d-ps.ppd.gz
+share/ppd/HP/hp-laserjet_pro_m501dn-ps.ppd.gz
+share/ppd/HP/hp-laserjet_pro_m501n-ps.ppd.gz
 share/ppd/HP/hp-laserjet_pro_m701-ps.ppd.gz
 share/ppd/HP/hp-laserjet_pro_m706-ps.ppd.gz
 share/ppd/HP/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz
@@ -889,8 +892,18 @@ share/ppd/HP/hp-officejet_pro_451_series-ps.ppd.gz
 share/ppd/HP/hp-officejet_pro_476_576_series-ps.ppd.gz
 share/ppd/HP/hp-officejet_pro_551_series-ps.ppd.gz
 share/ppd/HP/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz
+share/ppd/HP/hp-officejet_pro_8210-ps.ppd.gz
+share/ppd/HP/hp-officejet_pro_8730-ps.ppd.gz
+share/ppd/HP/hp-officejet_pro_8740-ps.ppd.gz
+share/ppd/HP/hp-pagewide_color_556-ps.ppd.gz
+share/ppd/HP/hp-pagewide_color_flow_mfp_586-ps.ppd.gz
+share/ppd/HP/hp-pagewide_color_mfp_586-ps.ppd.gz
+share/ppd/HP/hp-pagewide_mfp_p57750-ps.ppd.gz
+share/ppd/HP/hp-pagewide_p55250-ps.ppd.gz
+share/ppd/HP/hp-pagewide_pro_452_printer-ps.ppd.gz
+share/ppd/HP/hp-pagewide_pro_477_mfp-ps.ppd.gz
+share/ppd/HP/hp-pagewide_pro_552_printer-ps.ppd.gz
+share/ppd/HP/hp-pagewide_pro_577_mfp-ps.ppd.gz
 %%X11%%@dir %%DATADIR%%/ui4/plugins
 @dir /var/lib/hp
 @dir /var/lib
-%%SCAN%%@exec if ! grep ^hpaio %%LOCALBASE%%/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then echo hpaio >> %%LOCALBASE%%/etc/sane.d/dll.conf; fi
-%%SCAN%%@unexec sed -i "" -e '/^hpaio$/d' %%LOCALBASE%%/etc/sane.d/dll.conf