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.

8 files changed, 16 insertions, 16 deletions

diff --git a/www/album_themes/Makefile b/www/album_themes/Makefile
index e0a13510c19..c1b0976c8b1 100644
--- a/www/album_themes/Makefile
+++ b/www/album_themes/Makefile
@@ -16,7 +16,7 @@ NO_CONFIGURE=	# defined
 NO_BUILD=	# defined
 EXTRACT_ONLY=	# defined
 
-PKGSRC_USE_TOOLS+=	tar
+USE_TOOLS+=	tar
 
 A_DATADIR=	share/Album
 A_HTTPDIR=	share/httpd/htdocs/Album
diff --git a/www/ap-iasp/Makefile b/www/ap-iasp/Makefile
index 3ef241497e3..5cbdb387070 100644
--- a/www/ap-iasp/Makefile
+++ b/www/ap-iasp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/16 01:15:34 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:54 jlam Exp $
 
 .include "../iasp/Makefile.common"
 
@@ -13,7 +13,7 @@ WRKSRC=		${WRKDIR}/${IASP_SRCDIR}
 APACHE_MODULE=	# defined
 MESSAGE_SUBST+=	IASP_DESTDIR=${IASP_DESTDIR}
 
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar
 
 post-extract:
 	cd ${WRKDIR}; ${GTAR} -xf ${IASP_TARFILE} ${IASP_SRCDIR}
diff --git a/www/iasp/Makefile b/www/iasp/Makefile
index 33104da0ddd..d322a74c5b8 100644
--- a/www/iasp/Makefile
+++ b/www/iasp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/16 01:15:34 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/15 18:27:54 jlam Exp $
 
 .include "../iasp/Makefile.common"
 
@@ -6,7 +6,7 @@ PKGNAME=	iasp-${IASP_VERSION}
 PKGREVISION=	2
 COMMENT=	Instant ASP: Java implementation of Active Server Pages
 
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar
 
 SCRIPTS_ENV+=	CAT=${CAT:Q}
 SCRIPTS_ENV+=	CHMOD=${CHMOD:Q}
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index cbb47781cdf..a5d8ef05a00 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/16 01:32:23 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:54 jlam Exp $
 
 PKGNAME=	jakarta-tomcat5-${TOMCAT_VERSION}
 DISTNAME=	jakarta-tomcat-${TOMCAT_VERSION}
@@ -23,7 +23,7 @@ CATALINA_DIR=	Catalina/localhost
 EGDIR=		${TOMCAT_LIB}/share/examples/jakarta-tomcat
 EGDIR2=		${EGDIR}/${CATALINA_DIR}
 
-PKGSRC_USE_TOOLS+=	gunzip tar
+USE_TOOLS+=	gunzip tar
 
 # Work around a horrible interaction with the gzip in NetBSD 2.0 (at least RC4)
 # If gzip is used in a pipeline the tarfile fails to extract. PR bin/27228
diff --git a/www/jakarta-tomcat55/Makefile b/www/jakarta-tomcat55/Makefile
index 2f1660d2b6a..1ee0e2e8758 100644
--- a/www/jakarta-tomcat55/Makefile
+++ b/www/jakarta-tomcat55/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/25 13:46:43 abs Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/15 18:27:54 jlam Exp $
 
 DISTNAME=       jakarta-tomcat-${TOMCAT_VERSION}
 PKGREVISION=	1
@@ -22,7 +22,7 @@ CATALINA_DIR=	Catalina/localhost
 EGDIR=		${TOMCAT_LIB}/share/examples/jakarta-tomcat
 EGDIR2=		${EGDIR}/${CATALINA_DIR}
 
-PKGSRC_USE_TOOLS+=	gunzip tar
+USE_TOOLS+=	gunzip tar
 
 # Work around a horrible interaction with the gzip in NetBSD 2.0 (at least RC4)
 # If gzip is used in a pipeline the tarfile fails to extract. PR bin/27228
diff --git a/www/jsdk20/Makefile b/www/jsdk20/Makefile
index 949931218c0..baf46422d3d 100644
--- a/www/jsdk20/Makefile
+++ b/www/jsdk20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/05/16 01:15:34 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/07/15 18:27:54 jlam Exp $
 # STOP!  Don't update this to a later version of this software.
 # The JSDK and Apache Jakarta projects have merged, making the
 # jakarta-tomcat package the current version of this software.
@@ -25,7 +25,7 @@ BUILD_DEFS+=    JSDK_HOME
 NO_CONFIGURE=
 NO_BUILD=
 
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar
 
 RESTRICTED=		"Read license before redistributing the Java(tm) Servlet Development Kit"
 NO_SRC_ON_FTP=		${RESTRICTED}
diff --git a/www/mozilla-bin-nightly/Makefile.common b/www/mozilla-bin-nightly/Makefile.common
index d09d61bf4af..cbd8b2d1c76 100644
--- a/www/mozilla-bin-nightly/Makefile.common
+++ b/www/mozilla-bin-nightly/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/05/16 04:45:40 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/07/15 18:27:54 jlam Exp $
 
 MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/nightly/${MOZ_CONTRIB}latest-trunk/ \
 		ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/nightly/${MOZ_CONTRIB}latest-trunk/
@@ -9,7 +9,7 @@ NO_SRC_ON_FTP=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-PKGSRC_USE_TOOLS+=	date
+USE_TOOLS+=	date
 
 .if !defined(MOZ_VER) || empty(MOZ_VER)
 MOZ_VER!=	${DATE} +%Y%m%d
diff --git a/www/opera/Makefile b/www/opera/Makefile
index 0eae75ff413..c8404f32926 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/06/17 19:06:43 jdolecek Exp $
+# $NetBSD: Makefile,v 1.39 2005/07/15 18:27:54 jlam Exp $
 
 DISTNAME=	opera-${OPERA_PKG_VERSION:S/u/pl/}
 PKGREVISION=	# empty
@@ -110,7 +110,7 @@ post-install: post-install-manpage
 .include "../../emulators/suse_linux/Makefile.application"
 
 .if defined(MANCOMPRESSED) && !empty(MANCOMPRESSED:M[yY][eE][sS])
-PKGSRC_USE_TOOLS+=	gzip
+USE_TOOLS+=	gzip
 .endif
 
 post-install-manpage:
@@ -137,7 +137,7 @@ post-install:
 
 # regenerate distinfo for all ports supported by this package
 opera-distinfo:
-	( echo '$$NetBSD: Makefile,v 1.38 2005/06/17 19:06:43 jdolecek Exp $$'; echo ''; \
+	( echo '$$NetBSD: Makefile,v 1.39 2005/07/15 18:27:54 jlam Exp $$'; echo ''; \
 	_OPERA_OPSYS=NetBSD ${MAKE} distinfo 1>&2; \
 		${GREP} opera distinfo; \
 	_OPERA_OPSYS=FreeBSD ${MAKE} distinfo 1>&2; \