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.

16 files changed, 33 insertions, 39 deletions

diff --git a/games/abuse/Makefile b/games/abuse/Makefile
index 4cfdef7ce7e..ec8d144b7ea 100644
--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:49 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/15 18:27:50 jlam Exp $
 
 DISTNAME=		abuse_pd
 PKGNAME=		abuse-2.0
@@ -14,9 +14,8 @@ COMMENT=		Full color 320x200 arcade quality platform shooter
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		LDFLAGS="${X11_LDFLAGS}"
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake gtar
 USE_LANGUAGES+=		c c++
-PKGSRC_USE_TOOLS+=	gtar
 
 NOT_FOR_PLATFORM=	NetBSD-*-arm32
 
diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index 80ab117ef2f..740273c994c 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/06/16 06:57:53 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/07/15 18:27:50 jlam Exp $
 
 DISTNAME=		battalion
 PKGNAME=		battalion-1.4
@@ -15,7 +15,7 @@ NOT_FOR_PLATFORM=	*-*-alpha	# relies on Mesa (gcc)
 
 WRKSRC=			${WRKDIR}/battalionSource
 EXTRACT_ONLY=		battalionSource1.4.tar.Z
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=		gtar
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/games/crossfire-cli/Makefile b/games/crossfire-cli/Makefile
index 2471f2526f3..e75d8ef296d 100644
--- a/games/crossfire-cli/Makefile
+++ b/games/crossfire-cli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/06/17 04:49:46 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/07/15 18:27:50 jlam Exp $
 #
 
 DISTNAME=	crossfire-client-1.0.0
@@ -18,10 +18,9 @@ CF_SND=		client-0.95.2-au-sounds.tgz
 CF_RAW=		client-0.95.2-raw-sounds.tgz
 
 USE_PERL5=	yes
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake gtar
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-sound-dir=${PREFIX}/share/cfclient/sounds
-PKGSRC_USE_TOOLS+=	gtar
 
 REPLACE_PERL=	utils/deftoheader.pl items.pl
 
diff --git a/games/crossfire-srv/Makefile b/games/crossfire-srv/Makefile
index 55133596e85..a9a3e871aa3 100644
--- a/games/crossfire-srv/Makefile
+++ b/games/crossfire-srv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/06/17 04:49:46 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/15 18:27:50 jlam Exp $
 #
 
 DISTNAME=	crossfire-1.0.0
@@ -17,11 +17,10 @@ EXTRACT_ONLY=	${CF_SRC}
 CF_SRC=		crossfire-1.0.0.tar.bz2
 CF_MAPS=	crossfire-1.0.0-maps.tar.bz2
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake gtar
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 CONFIGURE_ARGS+=	--with-includes=-I${LOCALBASE}/include
-PKGSRC_USE_TOOLS+=	gtar
 
 MAKE_ENV+=	EXTRA_INCLUDES=-I${LOCALBASE}/include
 
diff --git a/games/et/Makefile b/games/et/Makefile
index 7d0fd76963e..3fa699212af 100644
--- a/games/et/Makefile
+++ b/games/et/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:54 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:50 jlam Exp $
 #
 
 DISTNAME=       et-linux-2.56-2.x86
@@ -15,7 +15,7 @@ NO_BUILD=	yes
 USE_PKGINSTALL=	yes
 ONLY_FOR_PLATFORM=	FreeBSD-*-i386 Linux-*-i386
 
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar
 ETDIR=		${PREFIX}/lib/lokigames/et
 EXTRACT_CMD=	${TAIL} +356 ${DOWNLOADED_DISTFILE} | ${GTAR} xzf - \
 		-C ${WRKSRC}
diff --git a/games/genecys-data/Makefile b/games/genecys-data/Makefile
index c7a49b91bbd..8de3cfc273b 100644
--- a/games/genecys-data/Makefile
+++ b/games/genecys-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/16 01:15:31 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/15 18:27:50 jlam Exp $
 #
 
 DISTNAME=		genecys-data-0.2
@@ -12,7 +12,7 @@ COMMENT=		Game datafiles for Genecys
 WRKSRC=			${WRKDIR}
 NO_BUILD=		YES
 NO_CONFIGURE=		YES
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=		gtar
 
 do-extract:
 do-install:
diff --git a/games/heretic2-demo/Makefile b/games/heretic2-demo/Makefile
index 1134c2dad21..09c235fd425 100644
--- a/games/heretic2-demo/Makefile
+++ b/games/heretic2-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/16 06:57:54 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/15 18:27:50 jlam Exp $
 #
 
 DISTNAME=	heretic2-demo-x86
@@ -16,7 +16,7 @@ COMMENT=	Heretic2 - first person Quake 3D engine based (linux demo)
 NO_CONFIGURE=	yes
 EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
 								${GTAR} xzf -
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar
 
 ONLY_FOR_PLATFORM=*-*-i386
 
diff --git a/games/majesty-demo/Makefile b/games/majesty-demo/Makefile
index 8129631d814..2006677cb98 100644
--- a/games/majesty-demo/Makefile
+++ b/games/majesty-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:55 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:50 jlam Exp $
 #
 
 DISTNAME=	majesty_demo
@@ -13,7 +13,7 @@ COMMENT=	Fantasy kingdom simulation (demo)
 
 EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
 			${GZCAT} | ${PAX} -O -r
-PKGSRC_USE_TOOLS+=	gzcat pax
+USE_TOOLS+=	gzcat pax
 
 ONLY_FOR_PLATFORM=*-*-i386
 
diff --git a/games/quake3arena-demo/Makefile b/games/quake3arena-demo/Makefile
index 8087062e3fc..5816e3ef653 100644
--- a/games/quake3arena-demo/Makefile
+++ b/games/quake3arena-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/06/16 06:57:55 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/15 18:27:51 jlam Exp $
 
 DISTNAME=	linuxq3ademo-1_11-6_x86_gz
 PKGREVISION=	2
@@ -28,7 +28,7 @@ DEPENDS+=	suse_glx>=6.4:../../emulators/${SUSE_DIR_PREFIX}_glx
 NO_CONFIGURE=	yes
 EXTRACT_CMD=	${SED} '1,/^END_OF_STUB$$/d' ${DOWNLOADED_DISTFILE} | \
 								${GTAR} xzf -
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar
 
 ONLY_FOR_PLATFORM=*-*-i386
 
diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile
index f4d3253e0cb..90f2dc3bc5c 100644
--- a/games/quake3arena/Makefile
+++ b/games/quake3arena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/06/16 06:57:55 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/07/15 18:27:51 jlam Exp $
 
 DISTNAME=	linuxq3apoint-1.32b.x86
 PKGREVISION=	1
@@ -29,7 +29,7 @@ NO_BIN_ON_FTP=	no
 NO_CONFIGURE=	yes
 CHECK_SHLIBS=	NO
 
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar
 
 EXTRACT_CMD=	${SED} '1,265d' ${DOWNLOADED_DISTFILE} | ${GTAR} xzf -
 
diff --git a/games/quake3server/Makefile b/games/quake3server/Makefile
index e2d4bd4775e..7a45f156694 100644
--- a/games/quake3server/Makefile
+++ b/games/quake3server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/16 01:15:32 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:51 jlam Exp $
 
 DISTNAME=	linuxq3apoint-1.32b.x86
 PKGNAME=	quake3server-1.32b
@@ -14,7 +14,7 @@ COMMENT=	Quake III Arena Dedicated Server for Linux
 .include "../../games/quake3server/Makefile.common"
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=		gtar
 
 EXTRACT_CMD=    ${SED} '1,265d' ${DOWNLOADED_DISTFILE} | ${GTAR} xzf -
 WRKSRC=		${WRKDIR}
diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile
index 39a89f6e3ca..f9c02ff4157 100644
--- a/games/rollemup/Makefile
+++ b/games/rollemup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/06/16 06:57:55 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/15 18:27:51 jlam Exp $
 
 DISTNAME=	Rollemup
 PKGNAME=	rollemup-1.0
@@ -30,7 +30,7 @@ PLIST_SRC=	${WRKDIR}/PLIST.src
 GAMES_DIR=	share/games
 MESSAGE_SUBST+=	GAMES_DIR=${GAMES_DIR}
 
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar
 
 ONLY_FOR_PLATFORM=	*-*-i386
 
diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile
index 17afb597260..b1a1087e9a4 100644
--- a/games/rtcw/Makefile
+++ b/games/rtcw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:52 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/15 18:27:51 jlam Exp $
 
 DISTNAME=	wolf-linux-1.33.x86
 PKGNAME=	rtcw-1.33
@@ -23,7 +23,7 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 EXTRACT_CMD=	${SED} '1,178d' ${DOWNLOADED_DISTFILE} | ${GTAR} xzf - \
 		    -C ${WRKSRC}
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 10362aa0cbf..ad9c3a3d2b6 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/06/17 04:49:46 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/07/15 18:27:51 jlam Exp $
 
 DISTNAME=	linuxdoom-1.10
 PKGNAME=	xdoom-1.10
@@ -20,11 +20,9 @@ WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	doomsrc.zip
 EXTRACT_CMD=	unzip -qo ${DISTDIR}/${EXTRACT_ONLY}
 USE_X11BASE=	yes
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake gtar gunzip
 MAKE_ENV+=	X11BASE=${X11BASE} INSTALL_PREFIX=${PREFIX}
 
-PKGSRC_USE_TOOLS+=	gtar gunzip
-
 .include "../../mk/bsd.prefs.mk"
 
 .ifdef ${OPSYS} == "Linux"
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index 2e389899e10..9f911bd4d01 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/16 16:33:42 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/15 18:27:51 jlam Exp $
 
 DISTNAME=	xjewel-1.6
 PKGREVISION=	1
@@ -9,7 +9,7 @@ EXTRACT_SUFX=	.tar.z
 MAINTAINER=	jdc@NetBSD.org
 COMMENT=	X windows-based dropping jewels game
 
-USE_IMAKE=		yes
-PKGSRC_USE_TOOLS+=	gzcat
+USE_IMAKE=	yes
+USE_TOOLS+=	gzcat
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index c6e4fe6f563..e8cbd2196b1 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/16 06:57:56 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/15 18:27:51 jlam Exp $
 #
 
 DISTNAME=	xrick-021212
@@ -17,8 +17,7 @@ NO_SRC_ON_CDROM=    ${RESTRICTED}
 NO_BIN_ON_FTP=	    ${RESTRICTED}
 NO_SRC_ON_FTP=	    ${RESTRICTED}
 
-USE_TOOLS+=		gmake
-PKGSRC_USE_TOOLS+=	gunzip
+USE_TOOLS+=		gmake gunzip
 
 SUBST_CLASSES+=		data
 SUBST_STAGE.data=	post-patch