diff options
| author | jlam <jlam> | 2003-08-17 04:57:14 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-08-17 04:57:14 +0000 |
| commit | ca0cac709e666ea71473cc4d942aeeda94a7831a (patch) | |
| tree | bcf1b43434420cd6004a016ea5d8ae6f4a4173e4 /mk/bulk | |
| parent | 025e8891b3ca16f4c88c683699ae7779782013b2 (diff) | |
| download | pkgsrc-ca0cac709e666ea71473cc4d942aeeda94a7831a.tar.gz | |
Alter pkgsrc infrastructure to use pkg_install-20030809, and properly
add packages into the correct view when using pkg_add(1) (either
through bin-install or the bulk-build process).
Diffstat (limited to 'mk/bulk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index f9e13d33187..2f81970463b 100644 --- a/mk/bulk/bsd.bulk-pkg.mk +++ b/mk/bulk/bsd.bulk-pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.bulk-pkg.mk,v 1.45.2.4 2003/08/16 21:14:54 jlam Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.45.2.5 2003/08/17 04:57:17 jlam Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org> @@ -289,8 +289,8 @@ bulk-package: pkgfile=${PACKAGES}/All/$${pkgname}.tgz ;\ if ! ${_PKG_INFO} -qe $$pkgname ; then \ if [ -f $$pkgfile ]; then \ - ${ECHO_MSG} "BULK> ${_PKG_ADD} $$pkgfile"; \ - ${DO} ${_PKG_ADD} $$pkgfile || ${ECHO_MSG} "warning: could not add $$pkgfile." ; \ + ${ECHO_MSG} "BULK> ${_PKG_ADD} ${PKG_ARGS_ADD} $$pkgfile"; \ + ${DO} ${_PKG_ADD} ${PKG_ARGS_ADD} $$pkgfile || ${ECHO_MSG} "warning: could not add $$pkgfile." ; \ else \ ${ECHO_MSG} "BULK> warning: $$pkgfile does not exist. It will be rebuilt." ;\ fi ;\ @@ -378,8 +378,8 @@ bulk-install: @if [ `${MAKE} bulk-check-uptodate REF=${PKGFILE}` = 1 ]; then \ if ! ${_PKG_INFO} -qe ${PKGNAME} ; then \ ${DO} ${MAKE} install-depends ; \ - ${ECHO_MSG} "BULK> " ${_PKG_ADD} ${PKGFILE} ; \ - ${DO} ${_PKG_ADD} ${PKGFILE} ; \ + ${ECHO_MSG} "BULK> " ${_PKG_ADD} ${PKG_ARGS_ADD} ${PKGFILE} ; \ + ${DO} ${_PKG_ADD} ${PKG_ARGS_ADD} ${PKGFILE} ; \ fi ; \ else \ ${ECHO_MSG} ${MAKE} bulk-package PRECLEAN=no; \ |