diff options
| author | heinz <heinz@pkgsrc.org> | 2004-01-26 21:10:31 +0000 |
|---|---|---|
| committer | heinz <heinz@pkgsrc.org> | 2004-01-26 21:10:31 +0000 |
| commit | 7b35372e76664c20e1b2a6468adf667272e0aa99 (patch) | |
| tree | 9cd014719581e8f98556f1ebd6ce69df3bc4aed9 /mk/bulk | |
| parent | ce3cd67bfa1d7d584ec271f055c8da811f63068b (diff) | |
| download | pkgsrc-7b35372e76664c20e1b2a6468adf667272e0aa99.tar.gz | |
Use $FIND with "-print". Noted by Georg Schwarz in PR pkg/24248
Diffstat (limited to 'mk/bulk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 4 | ||||
| -rw-r--r-- | mk/bulk/post-build | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index daa3d405192..c77fd407a61 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.54 2004/01/20 09:41:52 grant Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.55 2004/01/26 21:10:32 heinz Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org> @@ -168,7 +168,7 @@ bulk-check-uptodate: if [ -z "$$pkg" ]; then \ ${ECHO_MSG} >&2 "BULK> Required binary package $$dep does not exist, rebuilding... " ; \ uptodate=0 ; \ - elif [ -n "$$(${FIND} $$pkg -prune -newer ${REF})" ]; then \ + elif [ -n "$$(${FIND} $$pkg -prune -newer ${REF} -print)" ]; then \ ${ECHO_MSG} >&2 "BULK> Required binary package $$dep (`basename $$pkg`) is newer, rebuilding... " ; \ uptodate=0 ; \ else \ diff --git a/mk/bulk/post-build b/mk/bulk/post-build index f46de66cf3f..dea113e30d1 100644 --- a/mk/bulk/post-build +++ b/mk/bulk/post-build @@ -1,5 +1,5 @@ #!/usr/pkg/bin/perl -# $NetBSD: post-build,v 1.27 2004/01/20 12:37:08 grant Exp $ +# $NetBSD: post-build,v 1.28 2004/01/26 21:10:32 heinz Exp $ # # Collect stuff after a pkg bulk build # @@ -54,6 +54,7 @@ chomp($ORDERFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VAR chomp($STARTFILE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=STARTFILE )`); chomp($LOCALBASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=LOCALBASE )`); chomp($X11BASE=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=X11BASE )`); +chomp($FIND=`( cd $USR_PKGSRC/pkgtools/pkglint ; $ENV{"BMAKE"} show-var VARNAME=FIND )`); $dtfile=basename($DEPENDSTREEFILE); $depfile=basename($DEPENDSFILE); $supfile=basename($SUPPORTSFILE); @@ -137,7 +138,7 @@ while (<BF>) { $nunpackaged++; } - @idents = `find ${USR_PKGSRC}/${pkg} -type f -print | xargs grep \\\$NetBSD`; + @idents = `${FIND} ${USR_PKGSRC}/${pkg} -type f -print | xargs grep \\\$NetBSD`; $datetime = ""; $who = "nobody"; $file = ""; @@ -253,8 +254,8 @@ close(HTML); # Find files since last build: $leftovers_txt = "leftovers-${arch}.txt"; $leftovers_html = "leftovers-${arch}.html"; - system("find ${LOCALBASE} -newer ${USR_PKGSRC}/${startfile} -type f >>$leftovers_txt"); - system("find ${X11BASE} -newer ${USR_PKGSRC}/${startfile} -type f >>$leftovers_txt"); + system("${FIND} ${LOCALBASE} -newer ${USR_PKGSRC}/${startfile} -type f -print >>$leftovers_txt"); + system("${FIND} ${X11BASE} -newer ${USR_PKGSRC}/${startfile} -type f -print >>$leftovers_txt"); # Strip perl-files: { |