[pkgsrc/trunk]: pkgsrc/mk Remove all uses of the following targets from pkgsrc:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/05e900c59996
branches:  trunk
changeset: 516791:05e900c59996
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Jul 27 22:01:28 2006 +0000

description:
Remove all uses of the following targets from pkgsrc:

        show-all-depends-dirs
        show-all-depends-dirs-excl

Replace them with calls to pkgsrc/mk/scripts/depends-depth-first.awk
which does the same thing but without the extra overhead of invoking
a recursive make.

diffstat:

 mk/bsd.pkg.readme.mk     |   9 ++++-----
 mk/bsd.utils.mk          |  16 +---------------
 mk/flavor/pkg/utility.mk |   5 +++--
 3 files changed, 8 insertions(+), 22 deletions(-)

diffs (69 lines):

diff -r c90fd86b7122 -r 05e900c59996 mk/bsd.pkg.readme.mk
--- a/mk/bsd.pkg.readme.mk      Thu Jul 27 21:46:45 2006 +0000
+++ b/mk/bsd.pkg.readme.mk      Thu Jul 27 22:01:28 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.readme.mk,v 1.3 2006/07/27 21:46:45 jlam Exp $
+# $NetBSD: bsd.pkg.readme.mk,v 1.4 2006/07/27 22:01:28 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and encapsulates the
 # code to produce README.html files in each package directory.
@@ -84,10 +84,9 @@
 .PHONY: build-depends-list
 .if !target(build-depends-list)
 build-depends-list:
-       @for dir in `${RECURSIVE_MAKE} ${MAKEFLAGS} show-all-depends-dirs-excl`; \
-       do                                                              \
-               (cd ../../$$dir &&                                      \
-               ${RECURSIVE_MAKE} ${MAKEFLAGS} package-name) \
+       @${_DEPENDS_WALK_CMD} ${PKGPATH} |                              \
+       while read dir; do                                              \
+               ( cd ../../$$dir && ${RECURSIVE_MAKE} ${MAKEFLAGS} package-name) \
        done
 .endif
 
diff -r c90fd86b7122 -r 05e900c59996 mk/bsd.utils.mk
--- a/mk/bsd.utils.mk   Thu Jul 27 21:46:45 2006 +0000
+++ b/mk/bsd.utils.mk   Thu Jul 27 22:01:28 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.utils.mk,v 1.7 2006/07/13 14:02:34 jlam Exp $
+# $NetBSD: bsd.utils.mk,v 1.8 2006/07/27 22:01:28 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and defines utility
 # and otherwise miscellaneous variables and targets.
@@ -38,17 +38,3 @@
                MAKEFLAGS=${_DEPENDS_WALK_MAKEFLAGS:Q}                  \
                PKGSRCDIR=${PKGSRCDIR:Q} TEST=${TOOLS_TEST:Q}           \
        ${AWK} -f ${.CURDIR}/../../mk/scripts/depends-depth-first.awk --
-
-# show-all-depends-dirs prints a list of every dependency, implied and
-# direct", of the current package, and includes the current package.
-#
-.PHONY: show-all-depends-dirs
-show-all-depends-dirs:
-       @${_DEPENDS_WALK_CMD} -r ${PKGPATH}
-
-# show-all-depends-dirs-excl prints a list of every dependency, implied and
-# direct", of the current package.
-#
-.PHONY: show-all-depends-dirs-excl
-show-all-depends-dirs-excl:
-       @${_DEPENDS_WALK_CMD} ${PKGPATH}
diff -r c90fd86b7122 -r 05e900c59996 mk/flavor/pkg/utility.mk
--- a/mk/flavor/pkg/utility.mk  Thu Jul 27 21:46:45 2006 +0000
+++ b/mk/flavor/pkg/utility.mk  Thu Jul 27 22:01:28 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: utility.mk,v 1.2 2006/07/27 21:46:46 jlam Exp $
+# $NetBSD: utility.mk,v 1.3 2006/07/27 22:01:28 jlam Exp $
 
 ######################################################################
 ###
@@ -50,7 +50,8 @@
 show-needs-update:
 .if !empty(DEPENDS)
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       for i in `${RECURSIVE_MAKE} show-all-depends-dirs`; do          \
+       ${_DEPENDS_WALK_CMD} -r ${PKGPATH} |                            \
+       while read i; do                                                \
                cd ${PKGSRCDIR}/$$i;                                    \
                eval `${RECURSIVE_MAKE} show-vars-eval VARS='PKGNAME:want PKGWILDCARD:wild'`; \
                have=`${_PKG_BEST_EXISTS} "$$wild" || ${TRUE}`;         \