[pkgsrc/trunk]: pkgsrc/mk Use $FIND with "-print". Noted by Georg Schwarz in ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eee80d726a96
branches:  trunk
changeset: 467207:eee80d726a96
user:      heinz <heinz%pkgsrc.org@localhost>
date:      Mon Jan 26 21:10:31 2004 +0000

description:
Use $FIND with "-print". Noted by Georg Schwarz in PR pkg/24248

diffstat:

 mk/bsd.pkg.mk           |  8 ++++----
 mk/bulk/bsd.bulk-pkg.mk |  4 ++--
 mk/bulk/post-build      |  9 +++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diffs (92 lines):

diff -r 124d0322f48a -r eee80d726a96 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Mon Jan 26 20:02:30 2004 +0000
+++ b/mk/bsd.pkg.mk     Mon Jan 26 21:10:31 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1359 2004/01/25 16:12:40 grant Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1360 2004/01/26 21:10:31 heinz Exp $
 #
 # This file is in the public domain.
 #
@@ -2510,7 +2510,7 @@
 .if !target(delete-package-links)
 delete-package-links:
        ${_PKG_SILENT}${_PKG_DEBUG}\
-       ${FIND} ${PACKAGES} -type l -name ${PKGNAME}${PKG_SUFX} | ${XARGS} ${RM} -f
+       ${FIND} ${PACKAGES} -type l -name ${PKGNAME}${PKG_SUFX} -print | ${XARGS} ${RM} -f
 .endif
 
 .PHONY: delete-package
@@ -4517,7 +4517,7 @@
        "a.out")        genlinks=1 ;;                                   \
        *)              genlinks=0 ;;                                   \
        esac;                                                           \
-       ${FIND} ${PREFIX}/. -xdev -newer ${EXTRACT_COOKIE} \! -type d   \
+       ${FIND} ${PREFIX}/. -xdev -newer ${EXTRACT_COOKIE} \! -type d -print\
         | ${SORT}                                                      \
         | ${AWK} '                                                     \
                { sub("${PREFIX}/\\./", ""); }                          \
@@ -4544,7 +4544,7 @@
                }                                                       \
                { print $$0; }'
        ${_PKG_SILENT}${_PKG_DEBUG}\
-       for i in `${FIND} ${PREFIX}/. -xdev -newer ${EXTRACT_COOKIE} -type d    \
+       for i in `${FIND} ${PREFIX}/. -xdev -newer ${EXTRACT_COOKIE} -type d -print\
                        | ${SORT} -r                                    \
                        | ${AWK} '                                      \
                                /emul\/linux\/proc/ { next; }           \
diff -r 124d0322f48a -r eee80d726a96 mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk   Mon Jan 26 20:02:30 2004 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk   Mon Jan 26 21:10:31 2004 +0000
@@ -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@localhost>
@@ -168,7 +168,7 @@
                        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 -r 124d0322f48a -r eee80d726a96 mk/bulk/post-build
--- a/mk/bulk/post-build        Mon Jan 26 20:02:30 2004 +0000
+++ b/mk/bulk/post-build        Mon Jan 26 21:10:31 2004 +0000
@@ -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($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 @@
        $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 @@
        # 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:
        {