[pkgsrc/trunk]: pkgsrc/mk/tools Reverted the last change. Apparently, it was ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6a63993ff3e9
branches:  trunk
changeset: 533172:6a63993ff3e9
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Sep 10 07:25:14 2007 +0000

description:
Reverted the last change. Apparently, it was committed without testing
it first.

diffstat:

 mk/tools/replace.mk |  56 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 38 insertions(+), 18 deletions(-)

diffs (70 lines):

diff -r 5d119050386b -r 6a63993ff3e9 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Mon Sep 10 07:18:32 2007 +0000
+++ b/mk/tools/replace.mk       Mon Sep 10 07:25:14 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.197 2007/09/10 07:00:37 rillig Exp $
+# $NetBSD: replace.mk,v 1.198 2007/09/10 07:25:14 rillig Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -141,23 +141,43 @@
 _TOOLS_DEPMETHOD.${_t_:C/:.*//}=       DEPENDS
 .endfor
 
-.for pair in \
-       bison-yacc:yacc \
-       flex:lex \
-       gawk:awk \
-       gm4:m4 \
-       gsed:sed \
-       gsoelim:soelim
-.  for first in ${pair:C/:.*//}
-.    for second in ${pair:C/.*://}
-.      if !empty(_USE_TOOLS:M${first})
-.        if (${_TOOLS_DEPMETHOD.${first}} == "BUILD_DEPENDS") && defined(_TOOLS_DEPMETHOD.${second})
-_TOOLS_DEPMETHOD.${first}=     ${_TOOLS_DEPMETHOD.${second}}
-.        endif
-.      endif
-.    endfor
-.  endfor
-.endfor
+.if !empty(_USE_TOOLS:Mbison-yacc)     # bison-yacc > yacc
+.  if defined(_TOOLS_DEPMETHOD.bison-yacc) && \
+      (${_TOOLS_DEPMETHOD.bison-yacc} == "BUILD_DEPENDS") && \
+      defined(_TOOLS_DEPMETHOD.yacc)
+_TOOLS_DEPMETHOD.bison-yacc=   ${_TOOLS_DEPMETHOD.yacc}
+.  endif
+.endif
+.if !empty(_USE_TOOLS:Mflex)           # flex > lex
+.  if (${_TOOLS_DEPMETHOD.flex} == "BUILD_DEPENDS") && \
+      defined(_TOOLS_DEPMETHOD.lex)
+_TOOLS_DEPMETHOD.flex=         ${_TOOLS_DEPMETHOD.lex}
+.  endif
+.endif
+.if !empty(_USE_TOOLS:Mgawk)           # gawk > awk
+.  if (${_TOOLS_DEPMETHOD.gawk} == "BUILD_DEPENDS") && \
+      defined(_TOOLS_DEPMETHOD.awk)
+_TOOLS_DEPMETHOD.gawk=         ${_TOOLS_DEPMETHOD.awk}
+.  endif
+.endif
+.if !empty(_USE_TOOLS:Mgm4)            # gm4 > m4
+.  if (${_TOOLS_DEPMETHOD.gm4} == "BUILD_DEPENDS") && \
+      defined(_TOOLS_DEPMETHOD.m4)
+_TOOLS_DEPMETHOD.gm4=          ${_TOOLS_DEPMETHOD.m4}
+.  endif
+.endif
+.if !empty(_USE_TOOLS:Mgsed)           # gsed > sed
+.  if (${_TOOLS_DEPMETHOD.gsed} == "BUILD_DEPENDS") && \
+      defined(_TOOLS_DEPMETHOD.sed)
+_TOOLS_DEPMETHOD.gsed=         ${_TOOLS_DEPMETHOD.sed}
+.  endif
+.endif
+.if !empty(_USE_TOOLS:Mgsoelim)                # gsoelim > soelim
+.  if (${_TOOLS_DEPMETHOD.gsoelim} == "BUILD_DEPENDS") && \
+      defined(_TOOLS_DEPMETHOD.soelim)
+_TOOLS_DEPMETHOD.gsoelim=      ${_TOOLS_DEPMETHOD.soelim}
+.  endif
+.endif
 
 ######################################################################