diff options
| author | jlam <jlam> | 2003-09-13 18:26:15 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-09-13 18:26:15 +0000 |
| commit | 4f4cd9f2849811477437fcaad04531ec23c5826a (patch) | |
| tree | 1f62878147770c304e911fb7cd1c87c9fed38723 /mk/bsd.pkg.mk | |
| parent | 4963932623ae151a131990df53da3f073eb1fe47 (diff) | |
| download | pkgsrc-4f4cd9f2849811477437fcaad04531ec23c5826a.tar.gz | |
Fix cases where we were calling "${PKG_BEST_EXISTS} <pkgbase>". <pkgbase>
isn't actually a pkgpattern; what we really want is <pkgwildcard>. This
should fix breakage with the "update" and "replace" targets introduced in
revisions 1.1275 and 1.1278.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index a112a09621c..5bed64110c5 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1280 2003/09/13 14:40:40 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1281 2003/09/13 18:26:15 jlam Exp $ # # This file is in the public domain. # @@ -1806,7 +1806,7 @@ show-downlevel: ${_PKG_SILENT}${_PKG_DEBUG}${DO_NADA} . else ${_PKG_SILENT}${_PKG_DEBUG} \ - found="`${PKG_BEST_EXISTS} \"${PKGBASE}\" || ${TRUE}`"; \ + found="`${PKG_BEST_EXISTS} \"${PKGWILDCARD}\" || ${TRUE}`"; \ if [ "X$$found" != "X" -a "X$$found" != "X${PKGNAME}" ]; then \ ${ECHO} "${PKGBASE} package: $$found installed, pkgsrc version ${PKGNAME}"; \ if [ "X$$STOP_DOWNLEVEL_AFTER_FIRST" != "X" ]; then \ @@ -1835,12 +1835,13 @@ show-needs-update: ${_PKG_SILENT}${_PKG_DEBUG} \ for i in `${MAKE} show-all-depends-dirs`; do \ cd ${_PKGSRCDIR}/$$i; \ - want=`make show-vars VARNAMES=PKGNAME`; \ - have=`${PKG_BEST_EXISTS} "$${want%-*}" || true`; \ + want=`make show-var VARNAME=PKGNAME`; \ + wild=`make show-var VARNAME=PKGWILDCARD`; \ + have=`${PKG_BEST_EXISTS} "$$wild" || ${TRUE}`; \ if [ -z "$$have" ]; then \ - echo "$$i => (none) => needs install of $$want"; \ + ${ECHO} "$$i => (none) => needs install of $$want"; \ elif [ "$$have" != "$$want" ]; then \ - echo "$$i => $$have => needs update to $$want"; \ + ${ECHO} "$$i => $$have => needs update to $$want"; \ fi; \ done . endif @@ -3441,7 +3442,7 @@ real-su-replace: exit 1; \ fi ${_PKG_SILENT}${_PKG_DEBUG} \ - oldpkgname=`${PKG_BEST_EXISTS} "${PKGBASE}"`; \ + oldpkgname=`${PKG_BEST_EXISTS} "${PKGWILDCARD}"`; \ newpkgname=${PKGNAME}; \ ${ECHO} "$$oldpkgname" > ${WRKDIR}/.replace; \ replace_action="${MAKE} install"; \ |