Tue Jun 21 12:23:01 2016 UTC ()
Disable maintainer mode for libarchive.


(joerg)
diff -r1.5 -r1.6 pkgsrc/archivers/libarchive/Makefile.common
diff -r1.217 -r1.218 pkgsrc/pkgtools/pkg_install/Makefile

cvs diff -r1.5 -r1.6 pkgsrc/archivers/libarchive/Makefile.common (expand / switch to unified diff)

--- pkgsrc/archivers/libarchive/Makefile.common 2016/06/20 17:28:33 1.5
+++ pkgsrc/archivers/libarchive/Makefile.common 2016/06/21 12:23:01 1.6
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile.common,v 1.5 2016/06/20 17:28:33 joerg Exp $ 1# $NetBSD: Makefile.common,v 1.6 2016/06/21 12:23:01 joerg Exp $
2# used by archivers/bsdtar/Makefile 2# used by archivers/bsdtar/Makefile
3# used by archivers/libarchive/Makefile 3# used by archivers/libarchive/Makefile
4 4
5DISTNAME= libarchive-3.2.1 5DISTNAME= libarchive-3.2.1
6CATEGORIES= archivers 6CATEGORIES= archivers
7MASTER_SITES= http://www.libarchive.org/downloads/ 7MASTER_SITES= http://www.libarchive.org/downloads/
8DISTFILES= # empty 8DISTFILES= # empty
9 9
10MAINTAINER?= joerg@NetBSD.org 10MAINTAINER?= joerg@NetBSD.org
11HOMEPAGE= http://www.libarchive.org/ 11HOMEPAGE= http://www.libarchive.org/
12LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
13 13
14TEST_TARGET= check 14TEST_TARGET= check
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16CONFIGURE_ARGS+= --without-expat 16CONFIGURE_ARGS+= --without-expat
17CONFIGURE_ARGS+= --without-lzo2 17CONFIGURE_ARGS+= --without-lzo2
18CONFIGURE_ARGS+= --without-nettle 18CONFIGURE_ARGS+= --without-nettle
19CONFIGURE_ARGS+= --without-xml2 19CONFIGURE_ARGS+= --without-xml2
 20CONFIGURE_ARGS+= --disable-maintainer-mode

cvs diff -r1.217 -r1.218 pkgsrc/pkgtools/pkg_install/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/Makefile 2016/03/05 11:29:15 1.217
+++ pkgsrc/pkgtools/pkg_install/Makefile 2016/06/21 12:23:01 1.218
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.217 2016/03/05 11:29:15 jperkin Exp $ 1# $NetBSD: Makefile,v 1.218 2016/06/21 12:23:01 joerg Exp $
2 2
3# Notes to package maintainers: 3# Notes to package maintainers:
4# 4#
5# Updating this package does not automatically necessitate bumping 5# Updating this package does not automatically necessitate bumping
6# PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical 6# PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical
7# change in the pkg_* tools that pkgsrc relies on for proper operation. 7# change in the pkg_* tools that pkgsrc relies on for proper operation.
8 8
9PKGNAME= pkg_install-${VERSION} 9PKGNAME= pkg_install-${VERSION}
10PKGREVISION= 1 10PKGREVISION= 1
11CATEGORIES= pkgtools 11CATEGORIES= pkgtools
12 12
13MAINTAINER= agc@NetBSD.org 13MAINTAINER= agc@NetBSD.org
14HOMEPAGE= http://www.pkgsrc.org/ 14HOMEPAGE= http://www.pkgsrc.org/
@@ -203,26 +203,27 @@ do-extract: @@ -203,26 +203,27 @@ do-extract:
203 203
204pre-configure: 204pre-configure:
205.if empty(USE_BUILTIN.bzip2:M[yY][eE][sS]) 205.if empty(USE_BUILTIN.bzip2:M[yY][eE][sS])
206 cd ${WRKDIR}/bzip2 && ${BUILD_MAKE_CMD} libbz2.a 206 cd ${WRKDIR}/bzip2 && ${BUILD_MAKE_CMD} libbz2.a
207.endif 207.endif
208.if empty(USE_BUILTIN.zlib:M[yY][eE][sS]) 208.if empty(USE_BUILTIN.zlib:M[yY][eE][sS])
209 cd ${WRKDIR}/zlib && ${BUILD_MAKE_CMD} libz.a 209 cd ${WRKDIR}/zlib && ${BUILD_MAKE_CMD} libz.a
210.endif 210.endif
211.if empty(USE_BUILTIN.libarchive:M[yY][eE][sS]) 211.if empty(USE_BUILTIN.libarchive:M[yY][eE][sS])
212 cd ${WRKDIR}/libarchive && ${SETENV} ${_CONFIGURE_SCRIPT_ENV} \ 212 cd ${WRKDIR}/libarchive && ${SETENV} ${_CONFIGURE_SCRIPT_ENV} \
213 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} ./configure \ 213 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} ./configure \
214 --disable-bsdcpio --disable-bsdtar --disable-shared \ 214 --disable-bsdcpio --disable-bsdtar --disable-shared \
215 --disable-dependency-tracking --without-expat \ 215 --disable-dependency-tracking --without-expat \
 216 --disable-maintainer-mode \
216 --without-iconv --without-lzo2 --without-nettle \ 217 --without-iconv --without-lzo2 --without-nettle \
217 --without-xml2 \ 218 --without-xml2 \
218 ${LIBARCHIVE_CONFIGURE_ARGS} 219 ${LIBARCHIVE_CONFIGURE_ARGS}
219 cd ${WRKDIR}/libarchive && ${BUILD_MAKE_CMD} 220 cd ${WRKDIR}/libarchive && ${BUILD_MAKE_CMD}
220.endif 221.endif
221 cd ${WRKDIR}/libfetch && ${TOUCH} fetch.cat3 && \ 222 cd ${WRKDIR}/libfetch && ${TOUCH} fetch.cat3 && \
222 ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} \ 223 ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} \
223 ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \ 224 ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \
224 -f ${MAKE_FILE} depend all 225 -f ${MAKE_FILE} depend all
225 cd ${WRKDIR}/netpgpverify && \ 226 cd ${WRKDIR}/netpgpverify && \
226 ${SED} -e '/zlib/d' Makefile.lib.in >Makefile.in && \ 227 ${SED} -e '/zlib/d' Makefile.lib.in >Makefile.in && \
227 ${RM} -f bzlib.h zlib.h && \ 228 ${RM} -f bzlib.h zlib.h && \
228 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} ./configure && \ 229 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} ./configure && \