diff options
| author | rillig <rillig@pkgsrc.org> | 2005-11-05 16:58:34 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-11-05 16:58:34 +0000 |
| commit | bb69925cfa27b6be6e9677aa298e3dedc557afb9 (patch) | |
| tree | 31d76d6a065511a7c4d3e3dca920df227b804eb6 /mk | |
| parent | 78617c42a287c072d78dabaf434c2ca9f72455b9 (diff) | |
| download | pkgsrc-bb69925cfa27b6be6e9677aa298e3dedc557afb9.tar.gz | |
Replaced a complicated expression with the equivalent ${PKGWILDCARD}. Added
the :Q operator to all instances of ${PKGWILDCARD}.
Diffstat (limited to 'mk')
| -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 5150786f95a..61caa47f04a 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.89 2005/11/05 15:02:28 kristerw Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.90 2005/11/05 16:58:34 rillig Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -278,7 +278,7 @@ bulk-package: fi \ ) 2>&1 | ${TEE} -a ${BUILDLOG} @uptodate=`${MAKE} ${MAKEFLAGS} bulk-check-uptodate REF=${PKGFILE}` ; \ - if ${PKG_INFO} -qe "${PKGNAME:C/-[^-]*$/-[0-9]*/}" ; then \ + if ${PKG_INFO} -qe ${PKGWILDCARD:Q} ; then \ installed=1; \ else \ installed=0; \ @@ -295,9 +295,9 @@ bulk-package: ${ECHO_MSG} "BULK> Removing outdated (installed) package ${PKGNAME} first." ; \ ${ECHO_MSG} ${MAKE} deinstall ; \ ${DO} ${MAKE} deinstall ; \ - if ${PKG_INFO} -qe ${PKGWILDCARD} ; then \ - ${ECHO_MSG} ${PKG_DELETE} -r ${PKGWILDCARD} ;\ - ${DO} ${PKG_DELETE} -r ${PKGWILDCARD} ;\ + if ${PKG_INFO} -qe ${PKGWILDCARD:Q} ; then \ + ${ECHO_MSG} ${PKG_DELETE} -r ${PKGWILDCARD:Q} ;\ + ${DO} ${PKG_DELETE} -r ${PKGWILDCARD:Q} ;\ fi ;\ fi ; \ if [ -f ${PKGFILE} ]; then \ |