[pkgsrc/trunk]: pkgsrc/mk/tools We only need to loop over the tools that we s...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c22499e9e88d
branches:  trunk
changeset: 493152:c22499e9e88d
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Apr 28 15:51:10 2005 +0000

description:
We only need to loop over the tools that we say we're going to use.

diffstat:

 mk/tools/replace.mk |  15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diffs (50 lines):

diff -r ba0f93259774 -r c22499e9e88d mk/tools/replace.mk
--- a/mk/tools/replace.mk       Thu Apr 28 15:47:43 2005 +0000
+++ b/mk/tools/replace.mk       Thu Apr 28 15:51:10 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.48 2005/04/28 15:47:43 jlam Exp $
+# $NetBSD: replace.mk,v 1.49 2005/04/28 15:51:10 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.  The replacements are placed under
@@ -110,7 +110,7 @@
 # use the system-supplied one if TOOLS_PLATFORM.<tool> is non-empty, or
 # otherwise if this is a particular ${MACHINE_PLATFORM} listed above.
 #
-.for _t_ in ${_TOOLS_REPLACE_LIST}
+.for _t_ in ${_USE_TOOLS}
 .  if defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
 _TOOLS_USE_PKGSRC.${_t_}?=     no
 .  endif
@@ -119,7 +119,7 @@
 .undef _t_
 
 # TOOLS_DEPMETHOD.<tool> defaults to BUILD_DEPENDS.
-.for _t_ in ${_TOOLS_REPLACE_LIST}
+.for _t_ in ${_USE_TOOLS}
 TOOLS_DEPMETHOD.${_t_}?=       BUILD_DEPENDS
 .endfor
 .undef _t_
@@ -505,9 +505,8 @@
 .endif
 
 # Add the dependencies for each pkgsrc-supplied tool.
-.for _t_ in ${_TOOLS_REPLACE_LIST}
-.  if defined(TOOLS_DEPMETHOD.${_t_}) && defined(TOOLS_DEPENDS.${_t_}) && \
-      !empty(_USE_TOOLS:M${_t_})
+.for _t_ in ${_USE_TOOLS}
+.  if defined(TOOLS_DEPMETHOD.${_t_}) && defined(TOOLS_DEPENDS.${_t_})
 .    if empty(${TOOLS_DEPMETHOD.${_t_}}:M${TOOLS_DEPENDS.${_t_}})
 ${TOOLS_DEPMETHOD.${_t_}}+=    ${TOOLS_DEPENDS.${_t_}}
 .    endif
@@ -527,8 +526,8 @@
 # e.g., TBL, YACC, etc., provided that "TOOL" has been associated with
 # <tool>.
 #
-.for _t_ in ${_TOOLS_REPLACE_LIST}
-.  if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) && \
+.for _t_ in ${_USE_TOOLS}
+.  if !defined(TOOLS_IGNORE.${_t_}) && \
       !empty(_TOOLS_USE_PKGSRC.${_t_}:M[nN][oO])
 .    if defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
 TOOLS_REAL_CMD.${_t_}?=                \