pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Instead of accumulating _ALL_DEPENDS_PKGSRCDIRS, ac...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ee278c9d458
branches:  trunk
changeset: 506882:6ee278c9d458
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jan 23 15:01:39 2006 +0000

description:
Instead of accumulating _ALL_DEPENDS_PKGSRCDIRS, accumulate _ALL_DEPENDS
instead -- this keeps more information around.

diffstat:

 mk/bsd.utils.mk |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 68f4467a88b5 -r 6ee278c9d458 mk/bsd.utils.mk
--- a/mk/bsd.utils.mk   Mon Jan 23 14:43:50 2006 +0000
+++ b/mk/bsd.utils.mk   Mon Jan 23 15:01:39 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.utils.mk,v 1.5 2006/01/19 00:40:00 jlam Exp $
+# $NetBSD: bsd.utils.mk,v 1.6 2006/01/23 15:01:39 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and defines utility
 # and otherwise miscellaneous variables and targets.
@@ -10,11 +10,11 @@
 #
 DEPENDS_TYPE?=  all
 .if !empty(DEPENDS_TYPE:Mbuild) || !empty(DEPENDS_TYPE:Mall)
-_ALL_DEPENDS_PKGSRCDIRS+=      ${BUILD_DEPENDS:C/^[^:]*://}
+_ALL_DEPENDS+= ${BUILD_DEPENDS}
 .endif
 .if !empty(DEPENDS_TYPE:Minstall) || !empty(DEPENDS_TYPE:Mpackage) || \
     !empty(DEPENDS_TYPE:Mall)
-_ALL_DEPENDS_PKGSRCDIRS+=      ${DEPENDS:C/^[^:]*://}
+_ALL_DEPENDS+= ${DEPENDS}
 .endif
 
 # _PKG_PATHS_CMD canonicalizes package paths so that they're relative to
@@ -27,7 +27,7 @@
 
 .PHONY: show-depends-dirs show-depends-pkgpaths
 show-depends-dirs show-depends-pkgpaths:
-       @${_PKG_PATHS_CMD} ${_ALL_DEPENDS_PKGSRCDIRS:O:u}
+       @${_PKG_PATHS_CMD} ${_ALL_DEPENDS:C/^[^:]*://:O:u}
 
 # _DEPENDS_WALK_CMD holds the command (sans arguments) to walk the
 # dependency graph for a package.



Home | Main Index | Thread Index | Old Index