Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Apr 2016 19:39:34 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r413957 - head/print/hplip-plugin
Message-ID:  <201604241939.u3OJdYsV033586@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Sun Apr 24 19:39:34 2016
New Revision: 413957
URL: https://svnweb.freebsd.org/changeset/ports/413957

Log:
  Install plugins with +x because HPLIP thinks the installation is corrupt
  otherwise.
  
  PR:		208142
  Reported by:	coder@tuxfamily.org

Modified:
  head/print/hplip-plugin/Makefile

Modified: head/print/hplip-plugin/Makefile
==============================================================================
--- head/print/hplip-plugin/Makefile	Sun Apr 24 19:35:23 2016	(r413956)
+++ head/print/hplip-plugin/Makefile	Sun Apr 24 19:39:34 2016	(r413957)
@@ -3,7 +3,7 @@
 
 PORTNAME=	hplip-plugin
 PORTVERSION=	3.16.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://hplipopensource.com/hplip-web/plugin/
 DISTNAME=	hplip-${DISTVERSION}-plugin
@@ -33,7 +33,7 @@ PLUGINS=	fax/plugins/fax_marvell \
 
 PLIST_SUB+=	LINARCH="${LINARCH}"
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
 LINARCH=	x86_32
@@ -59,9 +59,10 @@ do-install:
 		${STAGEDIR}${PREFIX}/share/hplip/data/firmware
 	${MKDIR} ${PLUGINS:H:S,^,${STAGEDIR}${PREFIX}/share/hplip/,}
 .for p in ${PLUGINS}
-	${INSTALL_LIB} ${WRKSRC}/${p:T}-${LINARCH}.so \
+# -m 555 because HPLIP checks that the plugins are +x.
+	${INSTALL_LIB} -m 555 ${WRKSRC}/${p:T}-${LINARCH}.so \
 		${STAGEDIR}${PREFIX}/share/hplip/${p}-${LINARCH}.so
-	${INSTALL_LIB} ${WRKSRC}/${p:T}.so \
+	${INSTALL_LIB} -m 555 ${WRKSRC}/${p:T}.so \
 		${STAGEDIR}${PREFIX}/share/hplip/${p}.so
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/plugin.spec ${STAGEDIR}${PREFIX}/share/hplip
@@ -71,4 +72,4 @@ do-install:
 	${ECHO_CMD} 'eula = 1' >> ${STAGEDIR}/var/lib/hp/hplip.state
 	${ECHO_CMD} 'version = ${PORTVERSION}' >> ${STAGEDIR}/var/lib/hp/hplip.state
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604241939.u3OJdYsV033586>