Split BUILD_DEPENDS into TOOL_DEPENDS and BUILD_DEPENDS in mk/.

Build depends are target packages that are needed at build-time for,
e.g., static libraries to link against, header files to include, &c.
Tool depends are native packages that are needed at build-time for,
e.g., compilers/linkers/&c. to run.

ok agc

4 files changed, 18 insertions, 18 deletions

diff --git a/mk/tools/autoconf.mk b/mk/tools/autoconf.mk
index 60f33ddc236..ab9806c36fc 100644
--- a/mk/tools/autoconf.mk
+++ b/mk/tools/autoconf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: autoconf.mk,v 1.15 2009/03/17 22:13:36 rillig Exp $
+# $NetBSD: autoconf.mk,v 1.16 2013/05/09 23:37:27 riastradh Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -95,7 +95,7 @@ AUTOCONF_REQD?=		2.50
 .    if !empty(USE_TOOLS:Mautoconf\:run)
 _TOOLS_DEPMETHOD.autoconf=	DEPENDS
 .    else
-_TOOLS_DEPMETHOD.autoconf=	BUILD_DEPENDS
+_TOOLS_DEPMETHOD.autoconf=	TOOL_DEPENDS
 .    endif
 TOOLS_DEPENDS.autoconf?=	autoconf>=${AUTOCONF_REQD}:../../devel/autoconf
 .    if empty(${_TOOLS_DEPMETHOD.autoconf}:M${TOOLS_DEPENDS.autoconf})
@@ -135,7 +135,7 @@ AUTOCONF_REQD?=		2.13
 .    if !empty(USE_TOOLS:Mautoconf213\:run)
 _TOOLS_DEPMETHOD.autoconf213=	DEPENDS
 .    else
-_TOOLS_DEPMETHOD.autoconf213=	BUILD_DEPENDS
+_TOOLS_DEPMETHOD.autoconf213=	TOOL_DEPENDS
 .    endif
 TOOLS_DEPENDS.autoconf213?=	autoconf213>=${AUTOCONF_REQD}:../../devel/autoconf213
 .    if empty(${_TOOLS_DEPMETHOD.autoconf213}:M${TOOLS_DEPENDS.autoconf213})
diff --git a/mk/tools/automake.mk b/mk/tools/automake.mk
index 21a8ed0b031..f7b48ac53e5 100644
--- a/mk/tools/automake.mk
+++ b/mk/tools/automake.mk
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.19 2009/06/10 15:31:45 wiz Exp $
+# $NetBSD: automake.mk,v 1.20 2013/05/09 23:37:27 riastradh Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -111,7 +111,7 @@ AUTOCONF_REQD?=		2.58
 .    if !empty(USE_TOOLS:Mautomake\:run)
 _TOOLS_DEPMETHOD.automake=	DEPENDS
 .    else
-_TOOLS_DEPMETHOD.automake=	BUILD_DEPENDS
+_TOOLS_DEPMETHOD.automake=	TOOL_DEPENDS
 .    endif
 TOOLS_DEPENDS.automake?=	automake>=${AUTOMAKE_REQD}:../../devel/automake
 .    if empty(${_TOOLS_DEPMETHOD.automake}:M${TOOLS_DEPENDS.automake})
@@ -137,7 +137,7 @@ AUTOCONF_REQD?=		2.13
 .    if !empty(USE_TOOLS:Mautomake14\:run)
 _TOOLS_DEPMETHOD.automake14=	DEPENDS
 .    else
-_TOOLS_DEPMETHOD.automake14=	BUILD_DEPENDS
+_TOOLS_DEPMETHOD.automake14=	TOOL_DEPENDS
 .    endif
 TOOLS_DEPENDS.automake14?=	automake14>=${AUTOMAKE_REQD}:../../devel/automake14
 .    if empty(${_TOOLS_DEPMETHOD.automake14}:M${TOOLS_DEPENDS.automake14})
@@ -183,5 +183,5 @@ ${_TOOLS_AM_TYPE.${_t_}}+=	${_t_}
 .endif
 
 .if !empty(USE_TOOLS:Mgettext-m4)
-BUILD_DEPENDS+=	{gettext-0.10.35nb1,gettext-m4-[0-9]*}:../../devel/gettext-m4
+TOOL_DEPENDS+=	{gettext-0.10.35nb1,gettext-m4-[0-9]*}:../../devel/gettext-m4
 .endif
diff --git a/mk/tools/intltool.mk b/mk/tools/intltool.mk
index 5a3352465d6..8ef26ed1547 100644
--- a/mk/tools/intltool.mk
+++ b/mk/tools/intltool.mk
@@ -1,4 +1,4 @@
-# $NetBSD: intltool.mk,v 1.5 2009/03/17 22:13:36 rillig Exp $
+# $NetBSD: intltool.mk,v 1.6 2013/05/09 23:37:27 riastradh Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -50,7 +50,7 @@ TOOLS_DEPENDS.intltool?=	intltool>=0.40.0:../../textproc/intltool
 .    if !empty(USE_TOOLS:Mintltool\:run)
 DEPENDS+=		${TOOLS_DEPENDS.intltool}
 .    else
-BUILD_DEPENDS+=		${TOOLS_DEPENDS.intltool}
+TOOL_DEPENDS+=		${TOOLS_DEPENDS.intltool}
 .    endif
 EVAL_PREFIX+=		TOOLS_PREFIX.intltool=intltool
 .    for _t_ in ${_TOOLS.intltool}
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 825e3992f3c..be57bd0ce56 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.256 2013/04/24 09:55:03 sbd Exp $
+# $NetBSD: replace.mk,v 1.257 2013/05/09 23:37:27 riastradh Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -128,14 +128,14 @@ PKG_FAIL_REASON+=	"\`\`bison'' and \`\`byacc'' conflict in USE_TOOLS."
 # dependency is determined by the modifier specified for each tool:
 #
 #    BOOTSTRAP_DEPENDS:	:bootstrap
-#    BUILD_DEPENDS:	:build (default), :pkgsrc
+#    TOOL_DEPENDS:	:build (default), :pkgsrc
 #    DEPENDS:		:run
 #
 .for _t_ in ${USE_TOOLS:N*\:*} ${USE_TOOLS:M*\:bootstrap}
 _TOOLS_DEPMETHOD.${_t_:C/:.*//}=	BOOTSTRAP_DEPENDS
 .endfor
 .for _t_ in ${USE_TOOLS:N*\:*} ${USE_TOOLS:M*\:build} ${USE_TOOLS:M*\:pkgsrc}
-_TOOLS_DEPMETHOD.${_t_:C/:.*//}=	BUILD_DEPENDS
+_TOOLS_DEPMETHOD.${_t_:C/:.*//}=	TOOL_DEPENDS
 .endfor
 .for _t_ in ${USE_TOOLS:M*\:run}
 _TOOLS_DEPMETHOD.${_t_:C/:.*//}=	DEPENDS
@@ -143,37 +143,37 @@ _TOOLS_DEPMETHOD.${_t_:C/:.*//}=	DEPENDS
 
 .if !empty(_USE_TOOLS:Mbison-yacc)	# bison-yacc > yacc
 .  if defined(_TOOLS_DEPMETHOD.bison-yacc) && \
-      (${_TOOLS_DEPMETHOD.bison-yacc} == "BUILD_DEPENDS") && \
+      (${_TOOLS_DEPMETHOD.bison-yacc} == "TOOL_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") && \
+.  if (${_TOOLS_DEPMETHOD.flex} == "TOOL_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") && \
+.  if (${_TOOLS_DEPMETHOD.gawk} == "TOOL_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") && \
+.  if (${_TOOLS_DEPMETHOD.gm4} == "TOOL_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") && \
+.  if (${_TOOLS_DEPMETHOD.gsed} == "TOOL_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") && \
+.  if (${_TOOLS_DEPMETHOD.gsoelim} == "TOOL_DEPENDS") && \
       defined(_TOOLS_DEPMETHOD.soelim)
 _TOOLS_DEPMETHOD.gsoelim=	${_TOOLS_DEPMETHOD.soelim}
 .  endif