Import of pkgsrc-2016Q3

pkgtools/pkg_install/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.211 2015/09/07 09:06:04 jperkin Exp $
+# $NetBSD: Makefile,v 1.218 2016/06/21 12:23:01 joerg Exp $
 
 # Notes to package maintainers:
 #
@@ -7,6 +7,7 @@
 # change in the pkg_* tools that pkgsrc relies on for proper operation.
 
 PKGNAME=		pkg_install-${VERSION}
+PKGREVISION=		1
 CATEGORIES=		pkgtools
 
 MAINTAINER=		agc@NetBSD.org
@@ -76,7 +77,7 @@ CPPFLAGS+=		-D_FILE_OFFSET_BITS=64
 
 CPPFLAGS+=		-DDEF_UMASK=${DEF_UMASK}
 
-MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
+MAKE_ENV+=		PKGSRC_MACHINE_ARCH=${MACHINE_ARCH}
 MAKE_ENV+=		OPSYS=${OPSYS}
 MAKE_ENV+=		CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q}
 MAKE_ENV+=		MANINSTALL=${MANINSTALL:Q}
@@ -107,6 +108,7 @@ VERSION!=		${AWK} '/PKGTOOLS_VERSION/ {print $$3}' \
 BUILDLINK_API_DEPENDS.libarchive+=	libarchive>=2.8.0
 
 .include "../../archivers/bzip2/builtin.mk"
+.include "../../archivers/xz/builtin.mk"
 .include "../../archivers/libarchive/builtin.mk"
 .include "../../devel/zlib/builtin.mk"
 .include "../../security/openssl/builtin.mk"
@@ -145,7 +147,14 @@ LDFLAGS+=	-L${WRKDIR}/libarchive/.libs
 # Until we support pkgsrc openssl at bootstrap time, disable it completely
 # if asked to avoid the builtin.
 .  if empty(USE_BUILTIN.openssl:M[Yy][Ee][Ss])
-LIBARCHIVE_CONFIGURE_ARGS=	--without-openssl
+LIBARCHIVE_CONFIGURE_ARGS+=	--without-openssl
+.  endif
+
+# Only use XZ if we actually have builtin support for it. Some systems
+# install the header, but without usable library or prefer to not use
+# the system version, so give them some control.
+.  if empty(USE_BUILTIN.xz:M[Yy][Ee][Ss])
+LIBARCHIVE_CONFIGURE_ARGS+=	--without-lzma
 .  endif
 
 LIBARCHIVE_LIBS=	${SED} -n -e 's/^Libs.private://p' \
@@ -157,20 +166,14 @@ CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/libarchive/build/autoconf/config.guess \
 CONFIG_SUB_OVERRIDE+=	${WRKDIR}/libarchive/build/autoconf/config.sub \
 			${WRKSRC}/config.sub
 
-.  if ${OPSYS} == "Cygwin"
-CPPFLAGS+=	-DLIBARCHIVE_STATIC
-.  endif
+CPPFLAGS.Cygwin+=	-DLIBARCHIVE_STATIC
 
-.  if ${OPSYS} == "Darwin"
 # Make sure that the linker used our static library instead of the
 # (outdated) dynamic library "/usr/lib/libarchive.dylib".
-LDFLAGS+=	-Wl,-search_paths_first
-.  endif
+LDFLAGS.Darwin+=	-Wl,-search_paths_first
 
-.  if ${OPSYS} == "SunOS"
 # workaround for pkg/45491
-CONFIGURE_ENV+=	ac_cv_header_ext2fs_ext2_fs_h=no
-.  endif
+CONFIGURE_ENV.SunOS+=	ac_cv_header_ext2fs_ext2_fs_h=no
 
 # Hack to make sure that the libarchive version is replaced
 pre-configure: config-guess-override config-sub-override
@@ -210,6 +213,7 @@ pre-configure:
 		${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} ./configure	\
 		--disable-bsdcpio --disable-bsdtar --disable-shared	\
 		--disable-dependency-tracking --without-expat		\
+		--disable-maintainer-mode \
 		--without-iconv --without-lzo2 --without-nettle		\
 		--without-xml2	\
 		${LIBARCHIVE_CONFIGURE_ARGS}