diff options
| author | grant <grant> | 2003-07-11 23:54:32 +0000 |
|---|---|---|
| committer | grant <grant> | 2003-07-11 23:54:32 +0000 |
| commit | e9666b4704cfa868609bdec255fd653b98d4d421 (patch) | |
| tree | 047a2de329bc8436b5e64b881fcb4b44c51898e9 /mk/bulk | |
| parent | ba8102693cacb49abb23147fdc9d14bfed4d7991 (diff) | |
| download | pkgsrc-e9666b4704cfa868609bdec255fd653b98d4d421.tar.gz | |
portability fixes:
quote a shell test, and run ${AWK} -f tflat instead of using
#!/usr/bin/awk.
Diffstat (limited to 'mk/bulk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 8 | ||||
| -rwxr-xr-x | mk/bulk/tflat | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index a39b47a37a1..a072b8c229b 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.44 2003/05/06 17:42:03 jmmv Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.45 2003/07/11 23:54:32 grant Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org> @@ -126,8 +126,8 @@ bulk-cache: @${ECHO_MSG} "BULK> Sorting build order." tsort ${DEPENDSTREEFILE} > ${ORDERFILE} @${ECHO_MSG} "BULK> Generating up and down dependency files." - ${_PKGSRCDIR}/mk/bulk/tflat -u ${DEPENDSTREEFILE} > ${SUPPORTSFILE} - ${_PKGSRCDIR}/mk/bulk/tflat -d ${DEPENDSTREEFILE} > ${DEPENDSFILE} + ${AWK} -f ${_PKGSRCDIR}/mk/bulk/tflat -u ${DEPENDSTREEFILE} > ${SUPPORTSFILE} + ${AWK} -f ${_PKGSRCDIR}/mk/bulk/tflat -d ${DEPENDSTREEFILE} > ${DEPENDSFILE} @${ECHO_MSG} "BULK> Generating package name <=> package directory cross reference file" @${ECHO_MSG} " (this may take a while)." cd ${_PKGSRCDIR} && ${SH} mk/bulk/printindex ${BROKENFILE} > ${INDEXFILE} @@ -167,7 +167,7 @@ bulk-check-uptodate: ${SHCOMMENT} "check against the binary pkg that pkg_add would pick, too:" ; \ ${SHCOMMENT} "(Only one should be returned here, really...)" ; \ pkg=`${PKG_ADMIN} lsbest "${PACKAGES}/All/$$dep"` ; \ - if [ -z $$pkg ]; then \ + if [ -z "$$pkg" ]; then \ ${ECHO_MSG} >&2 "BULK> Required binary package $$dep does not exist, rebuilding... " ; \ uptodate=0 ; \ elif [ "$$pkg" -nt "${REF}" ]; then \ diff --git a/mk/bulk/tflat b/mk/bulk/tflat index 70ec50f89c7..f1fd17424f2 100755 --- a/mk/bulk/tflat +++ b/mk/bulk/tflat @@ -1,5 +1,4 @@ -#!/usr/bin/awk -f -# $NetBSD: tflat,v 1.8 2003/05/06 17:42:04 jmmv Exp $ +# $NetBSD: tflat,v 1.9 2003/07/11 23:54:33 grant Exp $ # # Copyright (c) 2001 The NetBSD Foundation, Inc. # All rights reserved. |