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.

18 files changed, 38 insertions, 43 deletions

diff --git a/fonts/XFree86-fontsEncodings/Makefile.common b/fonts/XFree86-fontsEncodings/Makefile.common
index b2fc9ef7929..6b6abdf9185 100644
--- a/fonts/XFree86-fontsEncodings/Makefile.common
+++ b/fonts/XFree86-fontsEncodings/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2005/05/21 04:10:17 jlam Exp $
+# $NetBSD: Makefile.common,v 1.10 2005/07/15 18:27:49 jlam Exp $
 #
 # Makefile fragment used by XFree86-fonts* packages.
 
@@ -11,7 +11,7 @@ FILESDIR=	${.CURDIR}/../../fonts/XFree86-fontsEncodings/files
 ENCODINGS=	encodings encodings/large
 TOPDIR?=	../../..
 
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar
 
 post-extract:
 .  if defined(FONTS_MISC)
diff --git a/fonts/acroread-font-share/Makefile.common b/fonts/acroread-font-share/Makefile.common
index ddae119f3d3..c3fa3422db4 100644
--- a/fonts/acroread-font-share/Makefile.common
+++ b/fonts/acroread-font-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/06/16 06:57:52 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/07/15 18:27:49 jlam Exp $
 #
 
 PKGNAME=	acroread-${DISTNAME}-4.0
@@ -18,7 +18,7 @@ NO_PATCH=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=		gtar
 INSTALLATION_DIRS=	Acrobat4/Resource
 
 do-install:
diff --git a/fonts/acroread5-font-share/Makefile.common b/fonts/acroread5-font-share/Makefile.common
index f4679385e3b..8ba22d17ebd 100644
--- a/fonts/acroread5-font-share/Makefile.common
+++ b/fonts/acroread5-font-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/06/16 06:57:52 jlam Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/07/15 18:27:49 jlam Exp $
 #
 
 PKGNAME=	acroread5-${DISTNAME}-5.0
@@ -21,7 +21,7 @@ NO_PATCH=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=		gtar
 INSTALLATION_DIRS=	Acrobat5/Resource/Font
 
 do-install:
diff --git a/fonts/arphic-ttf/Makefile b/fonts/arphic-ttf/Makefile
index 97c59991507..764aad05132 100644
--- a/fonts/arphic-ttf/Makefile
+++ b/fonts/arphic-ttf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/15 22:02:26 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:49 jlam Exp $
 #
 
 DISTNAME=	arphic-ttf-2.11
@@ -22,7 +22,7 @@ USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
-PKGSRC_USE_TOOLS+=	gunzip
+USE_TOOLS+=	gunzip
 
 FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TTF
 DOCDIR=		${PREFIX}/share/doc/arphic-ttf
diff --git a/fonts/biznet-iso8859_2/Makefile b/fonts/biznet-iso8859_2/Makefile
index 9dadb3708fd..4be252fae47 100644
--- a/fonts/biznet-iso8859_2/Makefile
+++ b/fonts/biznet-iso8859_2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/15 22:02:26 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:49 jlam Exp $
 #
 
 DISTNAME=	ISO8859-2-pcf
@@ -14,7 +14,7 @@ USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
-PKGSRC_USE_TOOLS+=	gzip
+USE_TOOLS+=	gzip
 
 FONTDIR=	${PREFIX}/lib/X11/fonts/biznet
 OWN_DIRS=	${FONTDIR}
diff --git a/fonts/chkfontpath/Makefile b/fonts/chkfontpath/Makefile
index 12f7c13f45e..ce2e488ca54 100644
--- a/fonts/chkfontpath/Makefile
+++ b/fonts/chkfontpath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:52 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:49 jlam Exp $
 #
 
 DISTNAME=	chkfontpath-1.9.7
@@ -13,9 +13,8 @@ COMMENT=	Command line tool to manage X server's font path
 BUILD_DEPENDS+=	rpm2cpio>=1.1:../../converters/rpm2cpio
 
 MAKE_ENV+=	VERSION=${PKGVERSION}
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake gtar
 
-PKGSRC_USE_TOOLS+=	gtar
 INSTALLATION_DIRS=	bin man/man8
 
 # Might as well make this a general scheme for .src.rpm files... - HF
diff --git a/fonts/cyr-rfx-share/Makefile.common b/fonts/cyr-rfx-share/Makefile.common
index 903a3a0ae27..8e16a6562d3 100644
--- a/fonts/cyr-rfx-share/Makefile.common
+++ b/fonts/cyr-rfx-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/05/16 01:15:31 jlam Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/07/15 18:27:50 jlam Exp $
 
 DISTNAME=	cyr-rfx-${CYR_RFX_ENCODING}-1.1
 CATEGORIES=	fonts x11
@@ -18,7 +18,7 @@ NO_PATCH=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar
 
 do-install:
 	@cd ${PREFIX}/lib/X11/fonts/local && ${GTAR} xzf ${_DISTDIR}/${DISTFILES} ${CYR_RFX_ENCODING}/misc ${CYR_RFX_ENCODING}/75dpi
diff --git a/fonts/efont-unicode/Makefile b/fonts/efont-unicode/Makefile
index 495faf00308..727930d5f0b 100644
--- a/fonts/efont-unicode/Makefile
+++ b/fonts/efont-unicode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/15 22:02:27 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:50 jlam Exp $
 
 DISTNAME=	efont-unicode-bdf-0.4.2
 PKGNAME=	${DISTNAME:S/-bdf//}
@@ -10,8 +10,8 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://openlab.ring.gr.jp/efont/unicode/
 COMMENT=	Free unicode BDF font
 
-USE_X11BASE=		YES
-PKGSRC_USE_TOOLS+=	gzip
+USE_X11BASE=	YES
+USE_TOOLS+=	gzip
 
 MESSAGE_SUBST+=	FONTDIR=${FONTDIR}
 PLIST_SUBST+=	FONTDIR=${FONTDIR}
diff --git a/fonts/freefonts/Makefile b/fonts/freefonts/Makefile
index f3645bd28c2..181a2ed1b0e 100644
--- a/fonts/freefonts/Makefile
+++ b/fonts/freefonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/16 06:57:52 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/15 18:27:50 jlam Exp $
 #
 
 DISTNAME=	freefonts-0.10
@@ -14,7 +14,7 @@ NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
 USE_X11BASE=	yes
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar
 INSTALLATION_DIRS=	lib/X11/fonts
 
 do-install:
diff --git a/fonts/ja-elisat/Makefile b/fonts/ja-elisat/Makefile
index 89851b6b56a..3f5a0f95004 100644
--- a/fonts/ja-elisat/Makefile
+++ b/fonts/ja-elisat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/17 04:49:46 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:50 jlam Exp $
 
 DISTNAME=		elisat10
 PKGNAME=		ja-elisat-1.0
@@ -14,7 +14,7 @@ USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/elisat
 FONTDIR=		${PREFIX}/lib/X11/fonts/local
 #ALIAS=			${WRKDIR}/fonts.alias
-PKGSRC_USE_TOOLS+=	gzip
+USE_TOOLS+=		gzip
 
 LICENSE=		no-commercial-use
 
diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile
index 324c306203d..4ab8ae296e5 100644
--- a/fonts/ja-elisau/Makefile
+++ b/fonts/ja-elisau/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/17 04:49:46 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/15 18:27:50 jlam Exp $
 
 DISTNAME=		elisau10
 PKGNAME=		ja-elisau-1.0
@@ -18,8 +18,7 @@ SITES_elisau10${EXTRACT_SUFX}=	\
 SITES_clR5x8.bdf=	ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/
 
 WRKSRC=			${WRKDIR}
-USE_TOOLS+=		patch
-PKGSRC_USE_TOOLS+=	gzip
+USE_TOOLS+=		gzip patch
 USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/elisau
 FONTDIR=		${PREFIX}/lib/X11/fonts/local
diff --git a/fonts/ja-kaname/Makefile b/fonts/ja-kaname/Makefile
index e3b3a762b2e..d4ede31f72f 100644
--- a/fonts/ja-kaname/Makefile
+++ b/fonts/ja-kaname/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/17 04:49:46 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:50 jlam Exp $
 
 DISTNAME=		kaname_k12_bdf
 PKGNAME=		ja-kaname-0.0.0.20030112
@@ -10,7 +10,7 @@ COMMENT=		12x12 dots X11 bitmap font for JIS X 0208
 
 WRKSRC=			${WRKDIR}
 USE_X11BASE=		YES
-PKGSRC_USE_TOOLS+=	gzip
+USE_TOOLS+=		gzip
 DOCDIR=			${PREFIX}/share/doc/kaname
 FONTDIR=		${PREFIX}/lib/X11/fonts/local
 
diff --git a/fonts/ja-naga10/Makefile b/fonts/ja-naga10/Makefile
index 230a66d5f40..143e1de87c1 100644
--- a/fonts/ja-naga10/Makefile
+++ b/fonts/ja-naga10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/17 04:49:46 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/15 18:27:50 jlam Exp $
 
 DISTNAME=		knj10-1.1
 PKGNAME=		ja-naga10-1.1
@@ -12,7 +12,7 @@ HOMEPAGE=		http://hp.vector.co.jp/authors/VA013391/fonts/#naga10
 COMMENT=		10x10 dots X11 bitmap font for JIS X 0208
 
 USE_X11BASE=		YES
-PKGSRC_USE_TOOLS+=	gzip
+USE_TOOLS+=		gzip
 DOCDIR=			${PREFIX}/share/doc
 FONTDIR=		${PREFIX}/lib/X11/fonts/local
 
diff --git a/fonts/jisx0212fonts/Makefile b/fonts/jisx0212fonts/Makefile
index f4db2af8072..b35cf9eea19 100644
--- a/fonts/jisx0212fonts/Makefile
+++ b/fonts/jisx0212fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/15 22:02:27 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:50 jlam Exp $
 
 DISTNAME=	jisx0212fonts-0.0
 PKGREVISION=	1
@@ -21,7 +21,7 @@ FONTS=		${DISTFILES:C/\.bdf.*$//}
 FONTDIR=	${PREFIX}/lib/X11/fonts/local
 FONTS_X11_DIRS=	${FONTDIR}
 
-PKGSRC_USE_TOOLS+=	gzip gunzip
+USE_TOOLS+=	gzip gunzip
 
 # XXX Can we assume that ${GUNZIP_CMD} can extract .Z files?
 do-extract:
diff --git a/fonts/jisx0213fonts/Makefile b/fonts/jisx0213fonts/Makefile
index 9dee2ded4f4..47dca38b3c9 100644
--- a/fonts/jisx0213fonts/Makefile
+++ b/fonts/jisx0213fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/15 22:02:27 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/15 18:27:50 jlam Exp $
 #
 
 DISTNAME=	jisx0213fonts-0.0
@@ -10,8 +10,8 @@ MAINTAINER=	itojun@itojun.org, uebayasi@NetBSD.org
 HOMEPAGE=	ftp://ftp.m17n.org/pub/character/fonts/imamura/jisx0213/
 COMMENT=	X11 bitmap fonts for JIS X 0213
 
-USE_X11BASE=		yes
-PKGSRC_USE_TOOLS+=	gzip
+USE_X11BASE=	yes
+USE_TOOLS+=	gzip
 
 FONTS=		K14-1 K14-2 jiskan16-2000-1 jiskan16-2000-2
 FONTDIR=	${PREFIX}/lib/X11/fonts/local
diff --git a/fonts/ko-kaist/Makefile b/fonts/ko-kaist/Makefile
index 83e3fedaa2c..381a353342c 100644
--- a/fonts/ko-kaist/Makefile
+++ b/fonts/ko-kaist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/16 18:21:42 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:50 jlam Exp $
 #
 
 DISTNAME=	ko-kaist-20010718
@@ -13,8 +13,7 @@ COMMENT=	X11 fonts for Korean KSC 5601 standard (kaist foundry)
 CONFLICTS+=	ksc5601fonts-[0-9]*
 
 USE_X11BASE=		yes
-PKGSRC_USE_TOOLS+=	gunzip
-USE_TOOLS+=		gzip
+USE_TOOLS+=		gzip gunzip
 EXTRACT_ONLY=		# empty
 
 MAKE_ENV+=	FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}"
diff --git a/fonts/ko-mizi/Makefile b/fonts/ko-mizi/Makefile
index 2349a7a43d6..23ad2b14863 100644
--- a/fonts/ko-mizi/Makefile
+++ b/fonts/ko-mizi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/20 02:07:30 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:50 jlam Exp $
 #
 
 DISTNAME=	xfntmizi-1.1-2.noarch
@@ -15,8 +15,7 @@ BUILD_DEPENDS+=	rpm-[0-9]*:../../misc/rpm
 CONFLICTS+=	ksc5601fonts-[0-9]*
 
 USE_X11BASE=		yes
-PKGSRC_USE_TOOLS+=	gunzip
-USE_TOOLS+=		gzip
+USE_TOOLS+=		gzip gunzip
 
 MAKE_ENV+=	FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}"
 
diff --git a/fonts/sgi-fonts/Makefile b/fonts/sgi-fonts/Makefile
index 1175d644a89..a0bb11a85e1 100644
--- a/fonts/sgi-fonts/Makefile
+++ b/fonts/sgi-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/16 01:15:31 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:50 jlam Exp $
 #
 
 DISTNAME=	sgi-fonts-1.0-457.src
@@ -19,8 +19,7 @@ BUILD_DEPENDS+=	bzip2>=1.0.2:../../archivers/bzip2
 WRKSRC=		${WRKDIR}/sgi-fonts
 
 USE_IMAKE=	YES
-
-PKGSRC_USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar
 
 RPM2PKG=	${LOCALBASE}/sbin/rpm2pkg