Sun Sep 6 18:38:21 2015 UTC ()
Ensure netpgpverify configure is called with CONFIG_SHELL.  Fixes
build on legacy Solaris.


(jperkin)
diff -r1.209 -r1.210 pkgsrc/pkgtools/pkg_install/Makefile
cvs diff -r1.209 -r1.210 pkgsrc/pkgtools/pkg_install/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/Makefile 2015/09/01 12:14:05 1.209
+++ pkgsrc/pkgtools/pkg_install/Makefile 2015/09/06 18:38:21 1.210
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.209 2015/09/01 12:14:05 jperkin Exp $ 1# $NetBSD: Makefile,v 1.210 2015/09/06 18:38:21 jperkin 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}
10CATEGORIES= pkgtools 10CATEGORIES= pkgtools
11 11
12MAINTAINER= agc@NetBSD.org 12MAINTAINER= agc@NetBSD.org
13HOMEPAGE= http://www.pkgsrc.org/ 13HOMEPAGE= http://www.pkgsrc.org/
14COMMENT= Package management and administration tools for pkgsrc 14COMMENT= Package management and administration tools for pkgsrc
@@ -211,29 +211,29 @@ pre-configure: @@ -211,29 +211,29 @@ pre-configure:
211 --disable-bsdcpio --disable-bsdtar --disable-shared \ 211 --disable-bsdcpio --disable-bsdtar --disable-shared \
212 --disable-dependency-tracking --without-expat \ 212 --disable-dependency-tracking --without-expat \
213 --without-iconv --without-lzo2 --without-nettle \ 213 --without-iconv --without-lzo2 --without-nettle \
214 --without-xml2 \ 214 --without-xml2 \
215 ${LIBARCHIVE_CONFIGURE_ARGS} 215 ${LIBARCHIVE_CONFIGURE_ARGS}
216 cd ${WRKDIR}/libarchive && ${BUILD_MAKE_CMD} 216 cd ${WRKDIR}/libarchive && ${BUILD_MAKE_CMD}
217.endif 217.endif
218 cd ${WRKDIR}/libfetch && ${TOUCH} fetch.cat3 && \ 218 cd ${WRKDIR}/libfetch && ${TOUCH} fetch.cat3 && \
219 ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} \ 219 ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} \
220 ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \ 220 ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \
221 -f ${MAKE_FILE} depend all 221 -f ${MAKE_FILE} depend all
222 cd ${WRKDIR}/netpgpverify && \ 222 cd ${WRKDIR}/netpgpverify && \
223 ${SED} -e '/zlib/d' Makefile.lib.in >Makefile.in && \ 223 ${SED} -e '/zlib/d' Makefile.lib.in >Makefile.in && \
224 ./configure && ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} \ 224 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} ./configure && \
225 ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \ 225 ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} ${MAKE_PROGRAM} \
226 -f ${MAKE_FILE} all 226 ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} -f ${MAKE_FILE} all
227 227
228# XXX Reverse the order that update does things since 228# XXX Reverse the order that update does things since
229# XXX we need pkg_delete built before we can deinstall. 229# XXX we need pkg_delete built before we can deinstall.
230# XXX This should probably be the default order for all packages. 230# XXX This should probably be the default order for all packages.
231update: 231update:
232 ${MAKE} 232 ${MAKE}
233 ${MAKE} deinstall _UPDATE_RUNNING=YES 233 ${MAKE} deinstall _UPDATE_RUNNING=YES
234 ${MAKE} ${UPDATE_TARGET} 234 ${MAKE} ${UPDATE_TARGET}
235 ${MAKE} clean 235 ${MAKE} clean
236 236
237update-catpages: 237update-catpages:
238 for f in lib/pkgsrc.7 add/pkg_add.1 admin/pkg_admin.1 \ 238 for f in lib/pkgsrc.7 add/pkg_add.1 admin/pkg_admin.1 \
239 create/pkg_create.1 delete/pkg_delete.1 info/pkg_info.1 \ 239 create/pkg_create.1 delete/pkg_delete.1 info/pkg_info.1 \