Tue Apr 26 12:17:51 2011 UTC ()
net/libfetch is USE_BSD_MAKEFILE, pass ${BSD_MAKE_ENV} additionally for
building libfetch.

Fixes PR#44881, it will be happend with groff from pkgsrc.


(obache)
diff -r1.182 -r1.183 pkgsrc/pkgtools/pkg_install/Makefile
cvs diff -r1.182 -r1.183 pkgsrc/pkgtools/pkg_install/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/Makefile 2011/01/31 07:25:03 1.182
+++ pkgsrc/pkgtools/pkg_install/Makefile 2011/04/26 12:17:51 1.183
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.182 2011/01/31 07:25:03 agc Exp $ 1# $NetBSD: Makefile,v 1.183 2011/04/26 12:17:51 obache 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
9DISTNAME= pkg_install-${VERSION} 9DISTNAME= pkg_install-${VERSION}
10CATEGORIES= pkgtools 10CATEGORIES= pkgtools
11MASTER_SITES= # empty 11MASTER_SITES= # empty
12DISTFILES= # empty 12DISTFILES= # empty
13 13
14MAINTAINER= agc@NetBSD.org 14MAINTAINER= agc@NetBSD.org
@@ -163,27 +163,27 @@ pre-configure: @@ -163,27 +163,27 @@ pre-configure:
163.endif 163.endif
164.if empty(USE_BUILTIN.zlib:M[yY][eE][sS]) 164.if empty(USE_BUILTIN.zlib:M[yY][eE][sS])
165 cd ${WRKDIR}/zlib && ${BUILD_MAKE_CMD} libz.a 165 cd ${WRKDIR}/zlib && ${BUILD_MAKE_CMD} libz.a
166.endif 166.endif
167.if empty(USE_BUILTIN.libarchive:M[yY][eE][sS]) 167.if empty(USE_BUILTIN.libarchive:M[yY][eE][sS])
168 cd ${WRKDIR}/libarchive && \ 168 cd ${WRKDIR}/libarchive && \
169 ${SETENV} ${_CONFIGURE_SCRIPT_ENV} \ 169 ${SETENV} ${_CONFIGURE_SCRIPT_ENV} \
170 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \ 170 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \
171 ./configure --disable-shared --disable-bsdtar \ 171 ./configure --disable-shared --disable-bsdtar \
172 --disable-bsdcpio --without-expat --without-xml2 \ 172 --disable-bsdcpio --without-expat --without-xml2 \
173 --disable-dependency-tracking 173 --disable-dependency-tracking
174 cd ${WRKDIR}/libarchive && ${BUILD_MAKE_CMD} 174 cd ${WRKDIR}/libarchive && ${BUILD_MAKE_CMD}
175.endif 175.endif
176 cd ${WRKDIR}/libfetch && ${SETENV} ${MAKE_ENV} \ 176 cd ${WRKDIR}/libfetch && ${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} \
177 ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \ 177 ${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \
178 -f ${MAKE_FILE} depend all 178 -f ${MAKE_FILE} depend all
179 179
180 180
181# XXX Reverse the order that update does things since 181# XXX Reverse the order that update does things since
182# XXX we need pkg_delete built before we can deinstall. 182# XXX we need pkg_delete built before we can deinstall.
183# XXX This should probably be the default order for all packages. 183# XXX This should probably be the default order for all packages.
184update: 184update:
185 ${MAKE} 185 ${MAKE}
186 ${MAKE} deinstall _UPDATE_RUNNING=YES 186 ${MAKE} deinstall _UPDATE_RUNNING=YES
187 ${MAKE} ${UPDATE_TARGET} 187 ${MAKE} ${UPDATE_TARGET}
188 ${MAKE} clean 188 ${MAKE} clean
189 189