diff options
| author | rillig <rillig> | 2005-11-10 07:19:17 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-11-10 07:19:17 +0000 |
| commit | 87846f9793b0470cd4329c201bcaffb5b4f42175 (patch) | |
| tree | 5b3a18f904a69c1d3d70090cbac4edf21ba753f8 /mk | |
| parent | 34ea69a6207a490d1a5d547cb7e0949db9919bd8 (diff) | |
| download | pkgsrc-87846f9793b0470cd4329c201bcaffb5b4f42175.tar.gz | |
Fixed the remaining instances of code relying on trailing white-space in
the INDEXFILE.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 4 | ||||
| -rw-r--r-- | mk/bulk/build | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index e9a10b7e184..75458890684 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.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> @@ -418,7 +418,7 @@ bulk-package: 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 --git a/mk/bulk/build b/mk/bulk/build index 108734c333c..65f7dd427df 100644 --- a/mk/bulk/build +++ b/mk/bulk/build @@ -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> @@ -384,7 +384,7 @@ echo "Build finished. Removing all installed packages left over from build..." 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)" ; |