From eee29140fb76db024e7268091bc892b667126eda Mon Sep 17 00:00:00 2001
From: makc <makc@FreeBSD.org>
Date: Tue, 10 Feb 2015 12:17:36 +0000
Subject: print/hplip: - Update to 3.14.10 [1] - Fix detection of libusb v1.0
 and build with it now - Enable JetDirect and scanning support by default
 (requested by pkg users) - hplip modifies etc/sane.d/dll.conf witch belongs
 to sane-backends port,   and writes to this file in staging area. Add
 commented entry for it in plist   to pacify staging checks.

print/hplip-plugin:
- Update to 3.14.10
- Add missing entry to plist
- Pass MAKE_ENV for installer to prevent writing to ${HOME}

PR		197245 [1]
Submitted by:	chris@bsdjunk.com
---
 print/hplip-plugin/Makefile  | 10 ++++++----
 print/hplip-plugin/distinfo  |  4 ++--
 print/hplip-plugin/pkg-plist |  1 +
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'print/hplip-plugin')

diff --git a/print/hplip-plugin/Makefile b/print/hplip-plugin/Makefile
index b4c29b03dfdc..0f79df14b040 100644
--- a/print/hplip-plugin/Makefile
+++ b/print/hplip-plugin/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hplip-plugin
-PORTVERSION=	3.14.4
-PORTREVISION=	1
+PORTVERSION=	3.14.10
 CATEGORIES=	print
 MASTER_SITES=	http://hplipopensource.com/hplip-web/plugin/
 DISTNAME=	hplip-${DISTVERSION}-plugin
@@ -67,10 +66,13 @@ do-install:
 	${LN} -sf ${LOCALBASE}/share/hplip/prnt ${HPLIP_FAKEDIR}
 	${CP} -R ${LOCALBASE}/share/hplip/installer ${HPLIP_FAKEDIR}
 	${REINPLACE_CMD} -e 's,HOMEDIR = .*,HOMEDIR = "${STAGEDIR}${PREFIX}/share/hplip",' \
-		${HPLIP_FAKEDIR}/installer/pluginhandler.py
+		-e 's,/var/lib/hp/hplip.state,${STAGEDIR}&,' \
+		${HPLIP_FAKEDIR}/installer/pluginhandler.py \
+		${HPLIP_FAKEDIR}/installer/core_install.py
+	${MKDIR} ${STAGEDIR}/var/lib/hp
 # install hplip-plugin
 	${MKDIR} ${PLUGIN_DIRS:S,^,${STAGEDIR}${PREFIX}/share/hplip/,}
-	(cd ${WRKSRC} && ${PYTHON_CMD} -B plugin_install.py)
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} -B plugin_install.py)
 .for i in ${PLUGIN_LINKS}
 	${LN} -sf ${i:T}-${LINARCH}.so ${STAGEDIR}${PREFIX}/share/hplip/${i}.so
 .endfor
diff --git a/print/hplip-plugin/distinfo b/print/hplip-plugin/distinfo
index b812c540bfba..ab253a923377 100644
--- a/print/hplip-plugin/distinfo
+++ b/print/hplip-plugin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hplip-3.14.4-plugin.run) = e42094e7f10df48fb4a3de0a71b442d93f09305cac915dd8a86ba9757cbd3b4c
-SIZE (hplip-3.14.4-plugin.run) = 1869315
+SHA256 (hplip-3.14.10-plugin.run) = b395b480ad86b9f27b6a2f63b6ecb00beb78e762a6137efb81dc1104837f9b81
+SIZE (hplip-3.14.10-plugin.run) = 1869038
diff --git a/print/hplip-plugin/pkg-plist b/print/hplip-plugin/pkg-plist
index 39e6aca3258a..46a229796c2e 100644
--- a/print/hplip-plugin/pkg-plist
+++ b/print/hplip-plugin/pkg-plist
@@ -25,3 +25,4 @@ share/hplip/scan/plugins/bb_soap-%%LINARCH%%.so
 share/hplip/scan/plugins/bb_soap.so
 share/hplip/scan/plugins/bb_soapht-%%LINARCH%%.so
 share/hplip/scan/plugins/bb_soapht.so
+/var/lib/hp/hplip.state
-- 
cgit