Remove USE_GNU_TOOLS and replace with the correct USE_TOOLS definitions:

	USE_GNU_TOOLS	-> USE_TOOLS
	awk		-> gawk
	m4		-> gm4
	make		-> gmake
	sed		-> gsed
	yacc		-> bison

13 files changed, 26 insertions, 27 deletions

diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile
index ad0d1516a1b..1716f1e9992 100644
--- a/fonts/Xft2/Makefile
+++ b/fonts/Xft2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/04/11 21:45:47 tv Exp $
+# $NetBSD: Makefile,v 1.35 2005/05/22 20:07:59 jlam Exp $
 
 DISTNAME=	libXft-2.1.6
 PKGNAME=	Xft2-2.1.6
@@ -15,9 +15,8 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_GNU_TOOLS+=		make
 USE_X11=		YES
-USE_GNU_TOOLS+=		awk
+USE_TOOLS+=		gawk gmake
 
 PKGCONFIG_OVERRIDE=	xft.pc.in
 MAKE_ENV+=		EGREP="${EGREP}"
diff --git a/fonts/chkfontpath/Makefile b/fonts/chkfontpath/Makefile
index 4e19a12bfe8..0c58d7ebc23 100644
--- a/fonts/chkfontpath/Makefile
+++ b/fonts/chkfontpath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/16 01:15:31 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:59 jlam Exp $
 #
 
 DISTNAME=	chkfontpath-1.9.7
@@ -13,7 +13,7 @@ COMMENT=	Command line tool to manage X server's font path
 BUILD_DEPENDS+=	rpm2cpio>=1.1:../../converters/rpm2cpio
 
 MAKE_ENV+=	VERSION=${PKGVERSION}
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 PKGSRC_USE_TOOLS+=	gtar
 
diff --git a/fonts/ec-fonts-mftraced/Makefile b/fonts/ec-fonts-mftraced/Makefile
index 123875e52c1..2823495c5c1 100644
--- a/fonts/ec-fonts-mftraced/Makefile
+++ b/fonts/ec-fonts-mftraced/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:47 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:59 jlam Exp $
 #
 
 DISTNAME=		ec-fonts-mftraced-1.0.8
@@ -13,7 +13,7 @@ DEPENDS+=		teTeX>=2.0.2:../../print/teTeX
 
 USE_PKGLOCALEDIR=	yes
 HAS_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 MAKEFILE=		GNUmakefile
 
 post-install:
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index 74c15dd255b..8518b928b56 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/04/12 12:38:40 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.42 2005/05/22 20:07:59 jlam Exp $
 #
 
 DISTNAME=	fontconfig-2.3.1
@@ -19,7 +19,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 PKGCONFIG_OVERRIDE=	fontconfig.pc.in
 
diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index fc4a807ba7b..7a551dff652 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:47 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:59 jlam Exp $
 
 DISTNAME=	fontforge_full-${VERSION}
 PKGNAME=	fontforge-${VERSION}
@@ -12,7 +12,7 @@ COMMENT=	Postscript font editor
 
 VERSION=	20050310
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index aa65956e938..955a5f5be11 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:45:47 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:07:59 jlam Exp $
 #
 
 DISTNAME=	gucharmap-1.4.3
@@ -13,7 +13,7 @@ COMMENT=	Unicode/ISO10646 character map and font viewer
 BUILD_USES_MSGFMT=	yes
 
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_X11=		yes
diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile
index 82c7d875950..78bd964e281 100644
--- a/fonts/ja-elisau/Makefile
+++ b/fonts/ja-elisau/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/15 22:02:27 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:07:59 jlam Exp $
 
 DISTNAME=		elisau10
 PKGNAME=		ja-elisau-1.0
@@ -18,7 +18,7 @@ SITES_elisau10${EXTRACT_SUFX}=	\
 SITES_clR5x8.bdf=	ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/
 
 WRKSRC=			${WRKDIR}
-USE_GNU_TOOLS+=		patch
+USE_TOOLS+=		patch
 PKGSRC_USE_TOOLS+=	gzip
 USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/elisau
diff --git a/fonts/ja-shinonome/Makefile b/fonts/ja-shinonome/Makefile
index 0cd61442049..4cf932756ce 100644
--- a/fonts/ja-shinonome/Makefile
+++ b/fonts/ja-shinonome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/06/15 13:41:53 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:00 jlam Exp $
 #
 
 DISTNAME=		shinonome-0.9.10-src
@@ -15,7 +15,7 @@ COMMENT=		12, 14, 16 dots bitmap fonts for Japanese, iso8859-1
 GNU_CONFIGURE=		YES
 USE_PERL5=		build
 USE_X11BASE=		YES
-USE_GNU_TOOLS+=		awk make
+USE_TOOLS+=		gawk gmake
 FONTDIR=		${PREFIX}/lib/X11/fonts/local
 FOUNDRY=		Misc
 ALIAS_SHINONOME=	${PREFIX}/share/examples/fonts.alias.shinonome
diff --git a/fonts/mftrace/Makefile b/fonts/mftrace/Makefile
index b2fce2ef757..a002b0f3ae3 100644
--- a/fonts/mftrace/Makefile
+++ b/fonts/mftrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/02/02 13:05:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:00 jlam Exp $
 
 DISTNAME=	mftrace-1.1.1
 PKGREVISION=	1
@@ -15,7 +15,7 @@ DEPENDS+=	fontforge>=20041115:../../fonts/fontforge
 DEPENDS+=	t1utils>=1.27:../../fonts/t1utils
 DEPENDS+=	teTeX>=2.0.2:../../print/teTeX
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN}
 MAKEFILE=		GNUmakefile
diff --git a/fonts/oto/Makefile b/fonts/oto/Makefile
index 44f8d5a4f2c..4264a511984 100644
--- a/fonts/oto/Makefile
+++ b/fonts/oto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:47 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:00 jlam Exp $
 #
 
 DISTNAME=	oto-0.4
@@ -11,7 +11,7 @@ HOMEPAGE=	http://sourceforge.net/projects/oto/
 COMMENT=	List and modify OpenType font files
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/oto
diff --git a/fonts/pcf2bdf/Makefile b/fonts/pcf2bdf/Makefile
index 5438546a356..6df9b05b0e8 100644
--- a/fonts/pcf2bdf/Makefile
+++ b/fonts/pcf2bdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/06/15 13:35:02 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:00 jlam Exp $
 #
 
 DISTNAME=	pcf2bdf-1.04
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.tsg.ne.jp/GANA/S/pcf2bdf/
 COMMENT=	Convert X font from PCF to BDF
 
 WRKSRC=		${WRKDIR}
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LANGUAGES=	c++
 MAKEFILE=	Makefile.gcc
 
diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile
index 7ca79196c37..568e4a07386 100644
--- a/fonts/t1lib/Makefile
+++ b/fonts/t1lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:47 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:00 jlam Exp $
 #
 
 DISTNAME=	t1lib-5.0.2
@@ -13,7 +13,7 @@ COMMENT=	Library for generating bitmaps from Adobe Type 1 fonts
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_PKGINSTALL=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_X11=		YES
diff --git a/fonts/ttmkfdir2/Makefile b/fonts/ttmkfdir2/Makefile
index 30312324981..0d14a69bf7c 100644
--- a/fonts/ttmkfdir2/Makefile
+++ b/fonts/ttmkfdir2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/12 14:27:18 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:00 jlam Exp $
 #
 
 DISTNAME=	ttmkfdir2.20021109
@@ -16,7 +16,7 @@ CONFLICTS=	ttmkfdir-[0-9]*
 
 WRKSRC=		${WRKDIR}/${PKGBASE}
 USE_LIBTOOL=	yes
-USE_GNU_TOOLS+=	lex make
+USE_TOOLS+=	gmake lex
 USE_LANGUAGES=	c c++
 
 MAKE_ENV+=	FREETYPE_CONFIG=${FREETYPE_CONFIG}