Import of pkgsrc-2015Q3

pkgtools/pkg_install/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.208 2015/04/21 00:28:19 joerg Exp $
+# $NetBSD: Makefile,v 1.211 2015/09/07 09:06:04 jperkin Exp $
 
 # Notes to package maintainers:
 #
@@ -128,6 +128,7 @@ FILESDIR.bzip2?=	${.CURDIR}/../../archivers/bzip2/files
 FILESDIR.libarchive?=	${.CURDIR}/../../archivers/libarchive/files
 FILESDIR.zlib?=		${.CURDIR}/../../devel/zlib/files
 FILESDIR.libfetch?=	${.CURDIR}/../../net/libfetch/files
+FILESDIR.netpgpverify?=	${.CURDIR}/../../security/netpgpverify/files
 
 .if empty(USE_BUILTIN.bzip2:M[yY][eE][sS])
 CPPFLAGS+=	-I${WRKDIR}/bzip2
@@ -176,6 +177,10 @@ pre-configure: config-guess-override config-sub-override
 .endif
 CPPFLAGS+=	-I${WRKDIR}/libfetch
 LDFLAGS+=	-L${WRKDIR}/libfetch
+# Avoid duplicate and conflicting headers, pull in any we need
+# directly with <netpgpgverify/*.h>
+CPPFLAGS+=	-I${WRKDIR}
+LDFLAGS+=	-L${WRKDIR}/netpgpverify
 
 CONFIGURE_ENV+=	LIBS=${LIBS:Q}
 
@@ -191,6 +196,7 @@ do-extract:
 	@${CP} -R ${FILESDIR.libarchive} ${WRKDIR}/libarchive
 .endif
 	@${CP} -R ${FILESDIR.libfetch} ${WRKDIR}/libfetch
+	@${CP} -R ${FILESDIR.netpgpverify} ${WRKDIR}/netpgpverify
 
 pre-configure:
 .if empty(USE_BUILTIN.bzip2:M[yY][eE][sS])
@@ -213,7 +219,12 @@ pre-configure:
 		${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV}			\
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS}	\
 			-f ${MAKE_FILE} depend all
-
+	cd ${WRKDIR}/netpgpverify &&					\
+	${SED} -e '/zlib/d' Makefile.lib.in >Makefile.in &&		\
+	${RM} -f bzlib.h zlib.h &&					\
+	${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} ./configure &&		\
+	${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} ${MAKE_PROGRAM}		\
+		${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} -f ${MAKE_FILE} all
 
 # XXX Reverse the order that update does things since
 # XXX we need pkg_delete built before we can deinstall.