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.

5 files changed, 10 insertions, 11 deletions

diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common
index b231defa683..a5d143d8434 100644
--- a/lang/blackdown-jre13/Makefile.common
+++ b/lang/blackdown-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2005/05/15 22:02:27 jlam Exp $
+# $NetBSD: Makefile.common,v 1.20 2005/07/15 18:27:51 jlam Exp $
 #
 
 RELVERSION=	1.3.1
@@ -44,7 +44,7 @@ CHECK_SHLIBS=	NO	# This would use NetBSD ldd on Linux shlibs.
 .include "../../mk/bsd.prefs.mk"
 
 JVM_HOME=		${PREFIX}/java/blackdown-${RELVERSION}
-PKGSRC_USE_TOOLS+=	gunzip
+USE_TOOLS+=		gunzip
 
 PLIST_SUBST+=		BLACKDOWN_ARCH=${BLACKDOWN_ARCH}
 
diff --git a/lang/brandybasic/Makefile b/lang/brandybasic/Makefile
index 1d531a90897..5d42585abc5 100644
--- a/lang/brandybasic/Makefile
+++ b/lang/brandybasic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:59 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:51 jlam Exp $
 #
 
 DISTNAME=	b116
@@ -16,7 +16,7 @@ DOCDIR=		${PREFIX}/share/doc/brandy
 EXAMPLEDIR=	${PREFIX}/share/examples/brandy
 BUILD_TARGET=	nodebug
 
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=		gtar
 INSTALLATION_DIRS=	bin
 
 do-install:
diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index b3f3a7c127c..947a8ec218c 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/05/15 22:02:27 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2005/07/15 18:27:51 jlam Exp $
 
 DISTNAME=	f2c-20001205
 PKGREVISION=	8
@@ -33,8 +33,7 @@ MAKE_ENV+=	ECHO=${ECHO}
 
 WRKSRC=		${WRKDIR}/f2c
 USE_LIBTOOL=	yes
-
-PKGSRC_USE_TOOLS+=	gunzip
+USE_TOOLS+=	gunzip
 
 post-extract:
 	@${RM} ${WRKSRC}/index.html
diff --git a/lang/jbuilder-jit/Makefile b/lang/jbuilder-jit/Makefile
index 5559cf37878..56d3e92b327 100644
--- a/lang/jbuilder-jit/Makefile
+++ b/lang/jbuilder-jit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/06/16 06:58:00 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/07/15 18:27:51 jlam Exp $
 #
 
 DISTNAME=	unix_jb35foundation
@@ -27,7 +27,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=		gtar
 
 NO_BUILD=		yes
 
diff --git a/lang/snobol/Makefile b/lang/snobol/Makefile
index 0e109c815b0..a46eb470202 100644
--- a/lang/snobol/Makefile
+++ b/lang/snobol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:58:01 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/15 18:27:51 jlam Exp $
 #
 
 DISTNAME=	snobol-0.99.4
@@ -19,7 +19,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 BUILD_TARGET=	it
 
 USE_CONFIGURE=		NO
-PKGSRC_USE_TOOLS+=	gzip
+USE_TOOLS+=		gzip
 INSTALLATION_DIRS=	bin man/man1
 
 do-install: