replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make.

35 files changed, 70 insertions, 70 deletions

diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile
index 9044f50db51..03fe1072347 100644
--- a/emulators/BasiliskII/Makefile
+++ b/emulators/BasiliskII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/20 12:14:40 agc Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/22 08:36:03 grant Exp $
 
 DISTNAME=	BasiliskII_src_14032003
 PKGNAME=	BasiliskII-1.0.20030314
@@ -13,7 +13,7 @@ COMMENT=	Open Source 68k Macintosh emulator
 WRKSRC=		${WRKDIR}/BasiliskII-1.0/src/Unix
 USE_BUILDLINK2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_X11=	yes
 CONFIGURE_ARGS+=--without-gtk --without-esd --disable-fbdev-dga --without-mon
 
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 385e3ffad09..db11ffa1cb7 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/20 12:14:40 agc Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/22 08:36:03 grant Exp $
 #
 
 DISTNAME=	atari800-1.3.2
@@ -18,7 +18,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--target=x11
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index b225ac8a1ab..1e4be96c5ab 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2003/11/06 18:26:46 gavan Exp $
+# $NetBSD: Makefile,v 1.31 2004/01/22 08:36:03 grant Exp $
 
 DISTNAME=		bochs-2.0.2
 CATEGORIES=		emulators
@@ -11,7 +11,7 @@ COMMENT=		i386 machine emulator capable of running DOS/Windows
 GNU_CONFIGURE=		yes
 CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
 CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_GCC_SHLIB=		yes
 # These options are not enabled by default because they can adversely impact
 # performance. The number of processors can be either 1 (default), 2, or 4.
diff --git a/emulators/darcnes/Makefile.common b/emulators/darcnes/Makefile.common
index 405524264f4..48d23e09288 100644
--- a/emulators/darcnes/Makefile.common
+++ b/emulators/darcnes/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/01/20 12:14:40 agc Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/01/22 08:36:03 grant Exp $
 
 DISTNAME=	dn9b0401
 CATEGORIES=	emulators
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.dridus.com/~nyef/darcnes/
 LICENSE=	no-commercial-use
 
 WRKSRC=		${WRKDIR}/darcnes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_BUILDLINK2=	yes
 PATCHDIR=	${.CURDIR}/../../emulators/darcnes/patches
 DISTINFO_FILE=	${.CURDIR}/../../emulators/darcnes/distinfo
diff --git a/emulators/dega/Makefile b/emulators/dega/Makefile
index b0815cadca0..83d1a352083 100644
--- a/emulators/dega/Makefile
+++ b/emulators/dega/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/09/29 09:29:18 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/22 08:36:03 grant Exp $
 #
 
 DISTNAME=	dega-1.07
@@ -12,7 +12,7 @@ COMMENT=	Sega Game Gear, Sega Mark III and Sega Master System emulator
 BUILD_DEPENDS=	nasm>=0.98:../../devel/nasm
 
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_X11=	yes
 
 # Uses i386 assembly code
diff --git a/emulators/dgen/Makefile b/emulators/dgen/Makefile
index 25f7843033b..9115647a967 100644
--- a/emulators/dgen/Makefile
+++ b/emulators/dgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/25 04:53:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/22 08:36:04 grant Exp $
 #
 
 DISTNAME=	dgen-sdl-1.23
@@ -13,7 +13,7 @@ COMMENT=	Genesis/Megadrive emulator for Unix platforms
 DEPENDS+=	nasm-[0-9]*:../../devel/nasm
 .endif
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	yes
 USE_X11=	yes
 USE_BUILDLINK2=	yes
diff --git a/emulators/gpsim/Makefile b/emulators/gpsim/Makefile
index ae461fee8fb..517075f936b 100644
--- a/emulators/gpsim/Makefile
+++ b/emulators/gpsim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/11/28 11:53:13 bouyer Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/22 08:36:04 grant Exp $
 #
 
 DISTNAME=	gpsim-0.20.7
@@ -14,7 +14,7 @@ USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--with-exdbm=${BUILDLINK_PREFIX.eXdbm}
 
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index db69d2d5303..513fcba7222 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:14:41 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/22 08:36:04 grant Exp $
 #
 
 DISTNAME=	hatari-0.45
@@ -12,7 +12,7 @@ COMMENT=	Atari ST emulator
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK2=	YES
 USE_X11=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 ALL_TARGET=	hatari
 MAKE_FLAGS+=	DATADIR="${PREFIX}/share/hatari"
diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
index f4b993e442e..16dbe3e7744 100644
--- a/emulators/hercules/Makefile
+++ b/emulators/hercules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/21 16:45:55 martti Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/22 08:36:04 grant Exp $
 
 DISTNAME=		hercules-2.11
 PKGREVISION=		1
@@ -12,7 +12,7 @@ COMMENT=		S370 emulator
 DEPENDS=		unproven-pthreads>0.17nb1:../../devel/unproven-pthreads
 DEPENDS+=		hercules-images-[0-9]*:../../emulators/hercules-images
 
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 MAKEFILE=		makefile
 MAKE_ENV+=		HOST_ARCH=${MACHINE_ARCH}
 
diff --git a/emulators/ia64sim/Makefile b/emulators/ia64sim/Makefile
index 4eb06d0b685..73661ce2670 100644
--- a/emulators/ia64sim/Makefile
+++ b/emulators/ia64sim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:35:33 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/22 08:36:04 grant Exp $
 
 DISTNAME=		ia64sim
 PKGNAME=		ia64sim-0.3
@@ -10,7 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.glue.umd.edu/~jasonp/
 COMMENT=		IA64 simulator (Intel(R) Architecture 64)
 
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 DIST_SUBDIR=		${PKGNAME}
 
 MAKEFILE=		makefile.unx
diff --git a/emulators/p11/Makefile b/emulators/p11/Makefile
index e0eeb08e166..ca21c4cc431 100644
--- a/emulators/p11/Makefile
+++ b/emulators/p11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:35:40 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/22 08:36:04 grant Exp $
 #
 
 DISTNAME=	p11-2.10a
@@ -15,7 +15,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-begemot=${PREFIX}
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 # override MAKEFLAGS in the build and install stages
 do-build:
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
index 483aebe20c5..51926bf4453 100644
--- a/emulators/palmosemulator/Makefile
+++ b/emulators/palmosemulator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:14:41 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/22 08:36:04 grant Exp $
 #
 
 DISTNAME=	emulator_src_${POSE_VERSION}
@@ -34,7 +34,7 @@ BUILD_DIRS=	${POSE_BUILD_DIR}
 USE_BUILDLINK2=	YES
 USE_PERL5=	build
 USE_X11=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--with-fltk=${BUILDLINK_PREFIX.fltk}
diff --git a/emulators/rewind/Makefile b/emulators/rewind/Makefile
index 7938125d01c..f9d321aa0a6 100644
--- a/emulators/rewind/Makefile
+++ b/emulators/rewind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:40 reed Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/22 08:36:04 grant Exp $
 
 DISTNAME=		rewind-20020420
 PKGREVISION=		4
@@ -16,7 +16,7 @@ ONLY_FOR_PLATFORM=	NetBSD-1.5Z*-i386 NetBSD-1.[6-9]*-i386
 
 USE_BUILDLINK2=		YES
 USE_X11=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-curses
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 489c560d09b..26872f91362 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/20 12:14:41 agc Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/22 08:36:04 grant Exp $
 
 DISTNAME=		s9xs139
 PKGNAME=		snes9x-1.39
@@ -15,7 +15,7 @@ BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
 WRKSRC=			${WRKDIR}/release
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11=		yes
 PTHREAD_OPTS=		require
 
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index e2529e98c4f..db2c47373c9 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:14:41 agc Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/22 08:36:04 grant Exp $
 #
 
 DISTNAME=		twin-src-3.1.14
@@ -13,7 +13,7 @@ COMMENT=		Cross-platform implementation of the win32 api
 
 WRKSRC=			${WRKDIR}/twin
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11=		yes
 ALL_TARGET=		depend world
 AUTOCONF_REQD=		2.13
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index 415a603340d..8aee445addd 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2003/09/30 12:25:25 tron Exp $
+# $NetBSD: Makefile,v 1.28 2004/01/22 08:36:04 grant Exp $
 
 DISTNAME=	uae-0.8.22
 PKGNAME=	${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	The UAE Amiga Emulator
 DEPENDS=	unzip>=5.40:../../archivers/unzip
 
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index 8beb019e619..3e8a48799eb 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/20 12:14:41 agc Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/22 08:36:04 grant Exp $
 
 DISTNAME=		VisualBoyAdvance-src-1.6a
 PKGNAME=		vba-1.6.0.1
@@ -11,7 +11,7 @@ HOMEPAGE=		http://vboy.emuhq.com/
 COMMENT=		Gameboy advance emulator
 
 WRKSRC=			${WRKDIR}/VisualBoyAdvance-1.6a
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 6a4f3912085..bba146acc87 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2003/12/04 00:42:04 kristerw Exp $
+# $NetBSD: Makefile,v 1.39 2004/01/22 08:36:04 grant Exp $
 #
 
 DISTNAME=		vice-1.13
@@ -24,7 +24,7 @@ EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 USE_GCC_SHLIB=		YES
 
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 0a643403453..945a879645c 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2004/01/20 12:43:03 abs Exp $
+# $NetBSD: Makefile,v 1.65 2004/01/22 08:36:04 grant Exp $
 #
 
 DISTNAME=	Wine-20031212
@@ -27,7 +27,7 @@ BUILDLINK_DEPENDS.freetype2=	freetype>=2.1.4
 WRKSRC= 		${WRKDIR}/${DISTNAME:S/W/w/}
 USE_BUILDLINK2=		YES
 USE_X11=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 94318757216..880930b48e5 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2004/01/17 17:11:08 kristerw Exp $
+# $NetBSD: Makefile,v 1.103 2004/01/22 08:36:04 grant Exp $
 #
 
 DISTNAME=		xmame-0.78.1
@@ -17,7 +17,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 MAKEFILE=		makefile.unix
 TARGET=			${PKGBASE}
 UNLIMIT_RESOURCES=	datasize
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index cba7b28c9bd..b09ac9796e3 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2004/01/17 17:12:34 kristerw Exp $
+# $NetBSD: Makefile,v 1.44 2004/01/22 08:36:04 grant Exp $
 #
 
 DISTNAME=		xmame-0.78.1
@@ -18,7 +18,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 MAKEFILE=		makefile.unix
 TARGET=			${PKGBASE}
 UNLIMIT_RESOURCES=	datasize
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 951e8a661e7..d030c308df0 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/20 12:14:41 agc Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/22 08:36:04 grant Exp $
 #
 
 DISTNAME=		zsnes136src
@@ -19,7 +19,7 @@ ALL_TARGET=		zsnes
 
 WRKSRC=			${WRKDIR}/zsnes-1.36/src
 GNU_CONFIGURE=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		# defined
 USE_X11=		# defined
 
diff --git a/finance/emma/Makefile b/finance/emma/Makefile
index 5ee5e305dc7..5d808282b9e 100644
--- a/finance/emma/Makefile
+++ b/finance/emma/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/01/03 18:49:40 reed Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/22 08:37:19 grant Exp $
 #
 
 DISTNAME=       emma-0.8.2
@@ -16,7 +16,7 @@ USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 
 CONFIGURE_ENV+=		PYTHONBIN=${PYTHONBIN}
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index a134132886d..c29a5399557 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/03 18:49:40 reed Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/22 08:37:19 grant Exp $
 #
 
 DISTNAME=       gnofin-0.8.4
@@ -16,7 +16,7 @@ USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 5432eaf11ee..1886c85857d 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2004/01/06 18:53:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.56 2004/01/22 08:37:19 grant Exp $
 
 DISTNAME=		gnucash-1.8.8
 PKGREVISION=		2
@@ -18,7 +18,7 @@ BUILDLINK_DEPENDS.guile14+=	guile14<1.5.0:../../lang/guile14
 
 BUILD_DEPENDS+=			bison>=1.28:../../devel/bison
 
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index 59706ea23c3..b7f99c6ebd6 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:40 reed Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/22 08:37:19 grant Exp $
 
 DISTNAME=	kmymoney2-0.5.1
 PKGREVISION=	5
@@ -11,7 +11,7 @@ HOMEPAGE=	http://kmymoney2.sourceforge.net/
 COMMENT=	Personal finance manager for kde3
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=              YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=          YES
 USE_LIBTOOL=            YES
 SHLIBTOOL_OVERRIDE=     ${WRKSRC}/libtool
diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile
index e954fa41768..84ed89ba327 100644
--- a/fonts/Xft2/Makefile
+++ b/fonts/Xft2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/10/04 08:12:02 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/22 08:38:29 grant Exp $
 #
 
 DISTNAME=	xft-2.1.2
@@ -19,7 +19,7 @@ GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 # Uses libtool 1.5 features
 #USE_LIBTOOL=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_GNU_TOOLS+=		awk
 
diff --git a/fonts/chkfontpath/Makefile b/fonts/chkfontpath/Makefile
index dfb8b927a6e..cbcfe54e003 100644
--- a/fonts/chkfontpath/Makefile
+++ b/fonts/chkfontpath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/22 08:38:29 grant Exp $
 #
 
 DISTNAME=	chkfontpath-1.9.7
@@ -14,7 +14,7 @@ BUILD_DEPENDS+=	rpm2cpio>=1.1:../../converters/rpm2cpio
 
 MAKE_ENV+=	VERSION=${PKGVERSION}
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 # Might as well make this a general scheme for .src.rpm files... - HF
 do-extract:
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index 1572a484168..cdfbd959076 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/12/21 16:44:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/22 08:38:29 grant Exp $
 #
 
 DISTNAME=	fontconfig-2.2.1
@@ -18,7 +18,7 @@ GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/fontconfig.pc.in
diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index 66771691171..4b720d899d0 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/03 18:49:40 reed Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/22 08:38:29 grant Exp $
 #
 
 DISTNAME=	gucharmap-1.2.0
@@ -15,7 +15,7 @@ DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_X11=		yes
diff --git a/fonts/ja-shinonome/Makefile b/fonts/ja-shinonome/Makefile
index 9cc1b94e63e..5d1839be74f 100644
--- a/fonts/ja-shinonome/Makefile
+++ b/fonts/ja-shinonome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/08/30 22:51:17 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/22 08:38:29 grant 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_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 FONTDIR=		${PREFIX}/lib/X11/fonts/local
 FOUNDRY=		Misc
 ALIAS_SHINONOME=	${PREFIX}/share/examples/fonts.alias.shinonome
diff --git a/fonts/oto/Makefile b/fonts/oto/Makefile
index a7c8e2c86a4..a62be33fc13 100644
--- a/fonts/oto/Makefile
+++ b/fonts/oto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 16:47:08 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/22 08:38:29 grant Exp $
 #
 
 DISTNAME=	oto-0.4
@@ -12,7 +12,7 @@ COMMENT=	List and modify OpenType font files
 
 GNU_CONFIGURE=	yes
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/oto
diff --git a/fonts/pcf2bdf/Makefile b/fonts/pcf2bdf/Makefile
index bad44b8bdb8..0e7d861f083 100644
--- a/fonts/pcf2bdf/Makefile
+++ b/fonts/pcf2bdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:15:17 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/22 08:38:29 grant 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_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 MAKEFILE=	Makefile.gcc
 
 do-install:
diff --git a/fonts/pfaedit/Makefile b/fonts/pfaedit/Makefile
index a56039cc29e..5fceaf41148 100644
--- a/fonts/pfaedit/Makefile
+++ b/fonts/pfaedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:15:17 agc Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/22 08:38:29 grant Exp $
 #
 
 DISTNAME=	pfaedit_full-${VERSION}
@@ -14,7 +14,7 @@ COMMENT=	Postscript font editor
 VERSION=	040102
 
 WRKSRC=		${WRKDIR}/pfaedit-${VERSION}
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=	YES
diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile
index 5bb51f0dc00..ef5bd922089 100644
--- a/fonts/t1lib/Makefile
+++ b/fonts/t1lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 16:47:09 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/22 08:38:29 grant Exp $
 
 DISTNAME=	t1lib-1.3.1
 CATEGORIES=	fonts devel graphics
@@ -10,7 +10,7 @@ COMMENT=	Library for generating bitmaps from Adobe Type 1 fonts
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_X11=		YES