From owner-svn-ports-head@freebsd.org  Sun Apr 24 19:39:36 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0C9A4B1BDB9;
 Sun, 24 Apr 2016 19:39:36 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CE64A1B83;
 Sun, 24 Apr 2016 19:39:35 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OJdYBC033587;
 Sun, 24 Apr 2016 19:39:34 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OJdYsV033586;
 Sun, 24 Apr 2016 19:39:34 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201604241939.u3OJdYsV033586@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tijl set sender to
 tijl@FreeBSD.org using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Sun, 24 Apr 2016 19:39:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r413957 - head/print/hplip-plugin
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Apr 2016 19:39:36 -0000

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>