Drop distinction between PKGSRC_USE_TOOLS and USE_TOOLS by making

PKGSRC_USE_TOOLS go away.  There is now only a single USE_TOOLS variable
that specifies all of the tools we need to build/run the package.

3 files changed, 18 insertions, 30 deletions

diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index 550a947e52d..81ea80ef7f4 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.34 2005/06/24 20:59:59 jlam Exp $
+# $NetBSD: defaults.mk,v 1.35 2005/07/15 18:27:55 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -172,13 +172,13 @@ _TOOLS_VARNAME_GNU.yacc=	YACC
 
 ######################################################################
 
-# Set a default value for the TOOL names for each of the tools we claim
-# we'll use in PKGSRC_USE_TOOLS to point to the platform command, e.g.,
+# Set a default value for the TOOL names for each of the tools we
+# claim we'll use in USE_TOOLS to point to the platform command, e.g.,
 # TBL, YACC, etc.  These tools are used in the top-level make(1), not
 # just in the targets, so these must be defined here, and this file be
 # included by bsd.prefs.mk.
 #
-.for _t_ in ${PKGSRC_USE_TOOLS:O:u}
+.for _t_ in ${USE_TOOLS:O:u}
 .  if defined(_TOOLS_VARNAME.${_t_}) && \
       defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
 .    for _v_ in ${_TOOLS_VARNAME.${_t_}}
diff --git a/mk/tools/imake.mk b/mk/tools/imake.mk
index b673ee6535f..2b126c277f4 100644
--- a/mk/tools/imake.mk
+++ b/mk/tools/imake.mk
@@ -1,4 +1,4 @@
-# $NetBSD: imake.mk,v 1.15 2005/07/08 13:43:47 jlam Exp $
+# $NetBSD: imake.mk,v 1.16 2005/07/15 18:27:55 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -56,7 +56,7 @@
 # that use imake.
 #
 # This file needs to be included before replace.mk as it modifies the
-# PKGSRC_USE_TOOLS and USE_TOOLS variables that are used by replace.mk.
+# USE_TOOLS variables that are used by replace.mk.
 #
 
 .if defined(USE_IMAKE)
@@ -64,19 +64,13 @@ USE_TOOLS+=	imake xmkmf
 .endif
 
 # imake and xmkmf imply each other
-.if !empty(PKGSRC_USE_TOOLS:Mimake) || !empty(PKGSRC_USE_TOOLS:Mxmkmf)
-PKGSRC_USE_TOOLS+=	imake xmkmf
-.endif
 .if !empty(USE_TOOLS:Mimake) || !empty(USE_TOOLS:Mxmkmf)
-USE_TOOLS+=		imake xmkmf
+USE_TOOLS+=	imake xmkmf
 .endif
 
 # Add any extra tools that may be required when using imake, e.g. gmake.
-.if !empty(PKGSRC_USE_TOOLS:Mimake)
-PKGSRC_USE_TOOLS+=	${IMAKE_TOOLS:Nimake}
-.endif
 .if !empty(USE_TOOLS:Mimake)
-USE_TOOLS+=		${IMAKE_TOOLS:Nimake}
+USE_TOOLS+=	${IMAKE_TOOLS:Nimake}
 .endif
 
 TOOLS_REAL_ARGS.imake?=	${IMAKEOPTS}
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 39f40a28819..c4b11cf7bd4 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.107 2005/06/24 21:21:31 minskim Exp $
+# $NetBSD: replace.mk,v 1.108 2005/07/15 18:27:55 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -54,14 +54,10 @@
 # The tools that could be replaced with pkgsrc counterparts (usually
 # GNU versions of the tools) that are required by pkgsrc itself, i.e.
 # in targets that are part of pkgsrc infrastructure or part of the
-# package Makefile, should be listed as:
-#
-#	PKGSRC_USE_TOOLS+=	awk sed
-#
-# The tools that are required by the package itself, i.e. within the
+# package Makefile, or by the package itself, i.e. within the
 # software's own build system, should be listed as:
 #
-#	USE_TOOLS+=	gawk gmake lex
+#	USE_TOOLS+=	awk gmake lex sed
 #
 # If a package requires yacc to generate a parser, then the package
 # Makefile should contain one of the following two lines:
@@ -103,13 +99,11 @@ USE_TOOLS+=	bison-yacc
 
 ######################################################################
 
-# Create _USE_TOOLS, a sanitized version of PKGSRC_USE_TOOLS and
-# USE_TOOLS that removes the ones that are overridden by superseding
-# ones.
+# Create _USE_TOOLS, a sanitized version of USE_TOOLS that removes the
+# ones that are overridden by superseding ones.
 #
 .if !defined(_USE_TOOLS)
-_USE_TOOLS:=	${PKGSRC_USE_TOOLS} ${USE_TOOLS}
-_USE_TOOLS:=	${_USE_TOOLS:O:u}
+_USE_TOOLS:=	${USE_TOOLS:O:u}
 .  if !empty(USE_TOOLS:Mbison-yacc)	# bison-yacc > yacc
 _USE_TOOLS:=	${_USE_TOOLS:Nyacc}
 .  endif
@@ -1205,11 +1199,11 @@ ${TOOLS_DEPMETHOD.${_t_}}+=	${_dep_}
 
 ######################################################################
 
-# For each tool that pkgsrc requires, make sure that the "TOOL" name
-# points to the real command, e.g., AWK, SED, etc., provided that
-# "TOOL" has been associated with <tool>.
+# For each tool, make sure that the "TOOL" name points to the real
+# command, e.g., AWK, SED, etc., provided that "TOOL" has been
+# associated with <tool>.
 #
-.for _t_ in ${PKGSRC_USE_TOOLS:O:u}
+.for _t_ in ${_USE_TOOLS}
 _TOOLS_USE_PKGSRC.${_t_}?=	no
 .  if defined(_TOOLS_VARNAME.${_t_})
 .    if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[nN][oO])