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

5 files changed, 12 insertions, 12 deletions

diff --git a/mk/compiler/ccache.mk b/mk/compiler/ccache.mk
index 91130eda2eb..4f8c586742d 100644
--- a/mk/compiler/ccache.mk
+++ b/mk/compiler/ccache.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ccache.mk,v 1.33 2012/03/06 02:44:54 sbd Exp $
+# $NetBSD: ccache.mk,v 1.34 2013/05/09 23:37:25 riastradh Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -115,7 +115,7 @@ PREPEND_PATH+=	${_CCACHE_DIR}/bin
 
 # Add the dependency on ccache.
 .  if ${CCACHE_BASE} == ${LOCALBASE}
-BUILD_DEPENDS+=	ccache-[0-9]*:../../devel/ccache
+TOOL_DEPENDS+=	ccache-[0-9]*:../../devel/ccache
 .  endif
 
 # Override the compiler-specific hash with the version string for the
diff --git a/mk/compiler/clang.mk b/mk/compiler/clang.mk
index ae0c0aeff96..d3190533d61 100644
--- a/mk/compiler/clang.mk
+++ b/mk/compiler/clang.mk
@@ -1,4 +1,4 @@
-# $NetBSD: clang.mk,v 1.9 2013/05/09 14:01:08 joerg Exp $
+# $NetBSD: clang.mk,v 1.10 2013/05/09 23:37:26 riastradh Exp $
 #
 # This is the compiler definition for the clang compiler.
 #
@@ -13,7 +13,7 @@ COMPILER_CLANG_MK=	defined
 
 # Add the dependency on clang
 # TODO: may be installed already, check for this
-#BUILD_DEPENDS+= clang-[0-9]*:../../lang/clang
+#TOOL_DEPENDS+= clang-[0-9]*:../../lang/clang
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mk/compiler/distcc.mk b/mk/compiler/distcc.mk
index e555cca243f..816cc6dd206 100644
--- a/mk/compiler/distcc.mk
+++ b/mk/compiler/distcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: distcc.mk,v 1.30 2008/02/07 20:59:05 rillig Exp $
+# $NetBSD: distcc.mk,v 1.31 2013/05/09 23:37:26 riastradh Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -93,7 +93,7 @@ PREPEND_PATH+=	${_DISTCC_DIR}/bin
 .  endif
 
 # Add the dependency on distcc.
-BUILD_DEPENDS+=	distcc-[0-9]*:../../devel/distcc
+TOOL_DEPENDS+=	distcc-[0-9]*:../../devel/distcc
 
 .  if defined(DISTCC_HOSTS) && !empty(DISTCC_HOSTS)
 PKGSRC_MAKE_ENV+=	DISTCC_HOSTS=${DISTCC_HOSTS:Q}
diff --git a/mk/compiler/f2c.mk b/mk/compiler/f2c.mk
index 1a17b84a597..b793e5069f0 100644
--- a/mk/compiler/f2c.mk
+++ b/mk/compiler/f2c.mk
@@ -1,4 +1,4 @@
-# $NetBSD: f2c.mk,v 1.15 2010/07/30 07:58:59 asau Exp $
+# $NetBSD: f2c.mk,v 1.16 2013/05/09 23:37:26 riastradh Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -88,9 +88,9 @@ PREPEND_PATH+=	${_F2C_DIR}/bin
 .  endif
 
 # Dependencies:
-BUILD_DEPENDS+=	f2c>=20090411nb2:../../lang/f2c # translator
+TOOL_DEPENDS+=	f2c>=20090411nb2:../../lang/f2c # translator
 
-.if empty(PKGPATH:Mdevel/libtool-base) # See below
+.if empty(PKGPATH:Mdevel/libtool-base) && empty(PKGPATH:Mcross/libtool-base) # See below
 .  include "../../devel/libf2c/buildlink3.mk" # library
 .endif
 
@@ -99,7 +99,7 @@ PKGSRC_MAKE_ENV+=	F2C_DIR=${F2C_DIR:Q}
 .  endif
 
 # libtool-base is special as it only needs f77 to extract linker flags etc.
-.if !empty(PKGPATH:Mdevel/libtool-base)
+.if !empty(PKGPATH:Mdevel/libtool-base) || !empty(PKGPATH:Mcross/libtool-base)
 pre-configure: fake-f2c-libs
 
 _WRAP_EXTRA_ARGS.FC+=	-L${WRKDIR}/.f2c/lib -I${WRKDIR}/.f2c/include
diff --git a/mk/compiler/pcc.mk b/mk/compiler/pcc.mk
index 3ae7d32b3bb..010bfff3bbd 100644
--- a/mk/compiler/pcc.mk
+++ b/mk/compiler/pcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pcc.mk,v 1.5 2010/12/26 14:23:47 asau Exp $
+# $NetBSD: pcc.mk,v 1.6 2013/05/09 23:37:26 riastradh Exp $
 #
 # This is the compiler definition for the PCC compiler.
 #
@@ -14,7 +14,7 @@ COMPILER_PCC_MK=	defined
 # Add the dependency on pcc
 # NOTE: not enabled by default as may be installed already
 # TODO: check for this?
-#BUILD_DEPENDS+= pcc-[0-9]*:../../lang/pcc
+#TOOL_DEPENDS+= pcc-[0-9]*:../../lang/pcc
 
 .include "../../mk/bsd.prefs.mk"