[pkgsrc/trunk]: pkgsrc/mk/bulk Replaced a complicated expression with the equ...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c8a505c827b6
branches:  trunk
changeset: 502517:c8a505c827b6
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Nov 05 16:58:34 2005 +0000

description:
Replaced a complicated expression with the equivalent ${PKGWILDCARD}. Added
the :Q operator to all instances of ${PKGWILDCARD}.

diffstat:

 mk/bulk/bsd.bulk-pkg.mk |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r 441d69da8497 -r c8a505c827b6 mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk   Sat Nov 05 16:56:16 2005 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk   Sat Nov 05 16:58:34 2005 +0000
@@ -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@localhost>
@@ -278,7 +278,7 @@
        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 @@
                        ${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 \