[pkgsrc/trunk]: pkgsrc/mk/bulk Fixed the remaining instances of code relying ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/41b9507741fe
branches:  trunk
changeset: 502873:41b9507741fe
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Nov 10 07:19:17 2005 +0000

description:
Fixed the remaining instances of code relying on trailing white-space in
the INDEXFILE.

diffstat:

 mk/bulk/bsd.bulk-pkg.mk |  4 ++--
 mk/bulk/build           |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r ad13cd5786ce -r 41b9507741fe mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk   Thu Nov 10 07:11:37 2005 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk   Thu Nov 10 07:19:17 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.bulk-pkg.mk,v 1.93 2005/11/10 07:11:37 rillig Exp $
+#      $NetBSD: bsd.bulk-pkg.mk,v 1.94 2005/11/10 07:19:17 rillig Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf%NetBSD.org@localhost>
@@ -418,7 +418,7 @@
                                tmp=`${SED} -n -e "/^${_ESCPKGPATH} / s;^[^:]*:[ ]*;;p" ${SUPPORTSFILE}` ; \
                                if test -n "$$tmp" ; then \
                                        for pkgdir in $$tmp ; do \
-                                               pkgname=`${GREP} "^$$pkgdir " ${INDEXFILE} | ${AWK} '{print $$2}'` ;\
+                                               pkgname=`${AWK} '$$1 == "'"$$pkgdir"'" { print $$2; }' ${INDEXFILE}`; \
                                                if [ -z "$$pkgname" ]; then pkgname=unknown ; fi ; \
                                                ${ECHO_MSG} "BULK> marking package that requires ${PKGNAME} as broken: $$pkgname ($$pkgdir)";\
                                                pkgerr='-1'; pkgignore=''; pkgskip=''; \
diff -r ad13cd5786ce -r 41b9507741fe mk/bulk/build
--- a/mk/bulk/build     Thu Nov 10 07:11:37 2005 +0000
+++ b/mk/bulk/build     Thu Nov 10 07:19:17 2005 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: build,v 1.73 2005/11/09 22:12:16 rillig Exp $
+# $NetBSD: build,v 1.74 2005/11/10 07:19:17 rillig Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf%NetBSD.org@localhost>
@@ -384,7 +384,7 @@
 for pkgname in `${PKG_TOOLS_BIN}/pkg_info -e \*`
 do
        if ${PKG_TOOLS_BIN}/pkg_info -qe $pkgname; then
-               pkgdir=`${AWK} "/ $pkgname /"'{print $1}{}' $INDEXFILE`
+               pkgdir=`${AWK} '$2 == "'"$pkgname"'" { print $1; }' "$INDEXFILE"`
                case "${BULK_PREREQ}" in
                        *$pkgdir* )
                                echo "Keeping BULK_PREREQ: $pkgname ($pkgdir)" ;