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

40 files changed, 80 insertions, 80 deletions

diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile
index 108a2b352f5..7e4c9fe69f8 100644
--- a/emulators/BasiliskII/Makefile
+++ b/emulators/BasiliskII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:07:57 jlam Exp $
 
 DISTNAME=	BasiliskII_src_14032003
 PKGNAME=	BasiliskII-1.0.20030314
@@ -14,7 +14,7 @@ NOT_FOR_PLATFORM+=	Darwin-*-*
 
 WRKSRC=		${WRKDIR}/BasiliskII-1.0/src/Unix
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 USE_X11=	yes
 
diff --git a/emulators/DatLib/Makefile b/emulators/DatLib/Makefile
index 0b408924268..3b5f0a2e146 100644
--- a/emulators/DatLib/Makefile
+++ b/emulators/DatLib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/20 15:30:18 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:57 jlam Exp $
 #
 
 DISTNAME=		datlib25
@@ -11,7 +11,7 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.logiqx.com/Tools/DatLib/DatLib.shtml
 COMMENT=		Data file library for some emulation tools
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 BUILD_TARGET=		datlib
diff --git a/emulators/DatUtil/Makefile b/emulators/DatUtil/Makefile
index e919994dfb2..7ac122e538c 100644
--- a/emulators/DatUtil/Makefile
+++ b/emulators/DatUtil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/20 15:30:29 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:57 jlam Exp $
 #
 
 DISTNAME=		dutil217
@@ -11,7 +11,7 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.logiqx.com/Tools/DatUtil/DatUtil.shtml
 COMMENT=		Create and convert emulator rom checksum files
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 BUILD_TARGET=		datutil
diff --git a/emulators/MAMEDiff/Makefile b/emulators/MAMEDiff/Makefile
index 630aad3f9ea..6a882bf3d6a 100644
--- a/emulators/MAMEDiff/Makefile
+++ b/emulators/MAMEDiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:57 jlam Exp $
 #
 
 DISTNAME=		mdiff216
@@ -11,7 +11,7 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.logiqx.com/Tools/MAMEDiff/MAMEDiff.shtml
 COMMENT=		Compare MAME rom sets of different releases
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 BUILD_TARGET=		mamediff
diff --git a/emulators/ROMBuild/Makefile b/emulators/ROMBuild/Makefile
index d7991f3aa79..96bfdd69c10 100644
--- a/emulators/ROMBuild/Makefile
+++ b/emulators/ROMBuild/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:57 jlam Exp $
 #
 
 DISTNAME=		rbuild26
@@ -11,7 +11,7 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.logiqx.com/Tools/ROMBuild/ROMBuild.shtml
 COMMENT=		Arcade ROM manipulation tool
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 BUILD_TARGET=		rombuild
diff --git a/emulators/ROMInfo/Makefile b/emulators/ROMInfo/Makefile
index ab439b75454..cdb3c636ea3 100644
--- a/emulators/ROMInfo/Makefile
+++ b/emulators/ROMInfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:57 jlam Exp $
 #
 
 DISTNAME=		rinfo23
@@ -11,7 +11,7 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.logiqx.com/Tools/ROMInfo/ROMInfo.shtml
 COMMENT=		Identify arcade ROM sets
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 BUILD_TARGET=		rominfo
diff --git a/emulators/ZIPIdent/Makefile b/emulators/ZIPIdent/Makefile
index 8c4435eb6d6..00bc902d4f7 100644
--- a/emulators/ZIPIdent/Makefile
+++ b/emulators/ZIPIdent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:57 jlam Exp $
 #
 
 DISTNAME=		zident24
@@ -11,7 +11,7 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.logiqx.com/Tools/ZIPIdent/ZIPIdent.shtml
 COMMENT=		Identify arcade ROM sets
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile
 BUILD_TARGET=		zipident
diff --git a/emulators/aranym/Makefile b/emulators/aranym/Makefile
index a9d4fad3bca..e9a338d2182 100644
--- a/emulators/aranym/Makefile
+++ b/emulators/aranym/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/20 02:04:35 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:57 jlam Exp $
 #
 
 DISTNAME=		aranym-0.8.9beta
@@ -10,7 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://aranym.sourceforge.net/
 COMMENT=		Atari Running on Any Machine
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/emulators/arcem/Makefile b/emulators/arcem/Makefile
index 64de6414a1b..d2ceb11d003 100644
--- a/emulators/arcem/Makefile
+++ b/emulators/arcem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:57 jlam Exp $
 #
 
 DISTNAME=	arcem-1.00-src
@@ -25,7 +25,7 @@ COMMENT=	Dave Gilbert's Acorn Archimedes emulator
 
 WRKSRC=		${WRKDIR}/arcem
 USE_X11=	# defined
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 MAKE_ENV+=	SYSTEM=X
 
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 136532da8e8..532459080e5 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/05/17 15:08:57 adam Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:57 jlam Exp $
 
 DISTNAME=	atari800-1.3.6
 CATEGORIES=	emulators
@@ -16,7 +16,7 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 
 .include "options.mk"
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 2134caea4a0..05992b1ee8c 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/05/16 18:22:57 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/05/22 20:07:57 jlam Exp $
 
 DISTNAME=		bochs-2.1.1
 PKGREVISION=		1
@@ -10,7 +10,7 @@ HOMEPAGE=		http://bochs.sourceforge.net/
 COMMENT=		i386 machine emulator capable of running DOS/Windows
 
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_TOOLS+=		gunzip gzip
 USE_LANGUAGES=		c c++
 
diff --git a/emulators/darcnes/Makefile.common b/emulators/darcnes/Makefile.common
index c565f001062..9588b2ac132 100644
--- a/emulators/darcnes/Makefile.common
+++ b/emulators/darcnes/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/05/22 20:07:57 jlam Exp $
 
 DISTNAME=	dn9b0401
 CATEGORIES=	emulators
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.dridus.com/~nyef/darcnes/
 LICENSE=	no-commercial-use
 
 WRKSRC=		${WRKDIR}/darcnes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 PATCHDIR=	${.CURDIR}/../../emulators/darcnes/patches
 DISTINFO_FILE=	${.CURDIR}/../../emulators/darcnes/distinfo
 
diff --git a/emulators/dega/Makefile b/emulators/dega/Makefile
index fa4782b5de6..976d4c7d229 100644
--- a/emulators/dega/Makefile
+++ b/emulators/dega/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:57 jlam 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_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_X11=	yes
 
 # Uses i386 assembly code
diff --git a/emulators/dgen/Makefile b/emulators/dgen/Makefile
index c2d13cef31a..db39b764bae 100644
--- a/emulators/dgen/Makefile
+++ b/emulators/dgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:57 jlam Exp $
 #
 
 DISTNAME=	dgen-sdl-1.23
@@ -14,7 +14,7 @@ COMMENT=	Genesis/Megadrive emulator for Unix platforms
 DEPENDS+=	nasm-[0-9]*:../../devel/nasm
 .endif
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 GNU_CONFIGURE=	yes
 USE_X11=	yes
 
diff --git a/emulators/gcube/Makefile b/emulators/gcube/Makefile
index 6792f2e2fe8..82e42b76c7d 100644
--- a/emulators/gcube/Makefile
+++ b/emulators/gcube/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:57 jlam Exp $
 #
 
 DISTNAME=		gcube-v0.2-src
@@ -14,7 +14,7 @@ COMMENT=		Opensource Nintendo GameCube(TM) emulator
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11=		yes
 WRKSRC=			${WRKDIR}
 
diff --git a/emulators/gens/Makefile b/emulators/gens/Makefile
index b0459681ff8..8a56b156a74 100644
--- a/emulators/gens/Makefile
+++ b/emulators/gens/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:57 jlam Exp $
 #
 
 DISTNAME=		gens-rc3
@@ -18,7 +18,7 @@ ONLY_FOR_PLATFORM=	*-i386
 
 WRKSRC=			${WRKDIR}/GensForLinux
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/emulators/gpsim-devel/Makefile b/emulators/gpsim-devel/Makefile
index f5df976048a..908a4caf582 100644
--- a/emulators/gpsim-devel/Makefile
+++ b/emulators/gpsim-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:58 jlam Exp $
 #
 
 DISTNAME=	gpsim-20040826
@@ -12,7 +12,7 @@ COMMENT=	PIC emulator with X interface
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
 
-USE_GNU_TOOLS+=	make lex yacc
+USE_TOOLS+=	bison gmake lex
 USE_LIBTOOL=	YES
 
 USE_GNU_READLINE=	# rl_callback_read_char, rl_copy_text,
diff --git a/emulators/gpsim/Makefile b/emulators/gpsim/Makefile
index 3b571856d04..c23ba7233be 100644
--- a/emulators/gpsim/Makefile
+++ b/emulators/gpsim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:58 jlam Exp $
 #
 
 DISTNAME=	gpsim-0.21.2
@@ -13,7 +13,7 @@ COMMENT=	PIC emulator with X interface
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LIBTOOL=	YES
 
 USE_GNU_READLINE=	# rl_callback_read_char, rl_copy_text,
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index 1cc0476ca95..b97d134714e 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:58 jlam Exp $
 
 DISTNAME=	hatari-0.60
 PKGREVISION=	1
@@ -9,7 +9,7 @@ MAINTAINER=	cjep@NetBSD.org
 HOMEPAGE=	http://hatari.sourceforge.net/
 COMMENT=	Atari ST emulator
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11=		YES
 GNU_CONFIGURE=		YES
 
diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
index eaab7d604db..28880c92266 100644
--- a/emulators/hercules/Makefile
+++ b/emulators/hercules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:58 jlam Exp $
 
 DISTNAME=		hercules-2.11
 PKGREVISION=		2
@@ -11,7 +11,7 @@ COMMENT=		S370 emulator
 
 DEPENDS+=		hercules-images-[0-9]*:../../emulators/hercules-images
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 MAKEFILE=		makefile
 MAKE_ENV+=		HOST_ARCH=${MACHINE_ARCH}
 
diff --git a/emulators/ia64sim/Makefile b/emulators/ia64sim/Makefile
index 73661ce2670..3576eb74e56 100644
--- a/emulators/ia64sim/Makefile
+++ b/emulators/ia64sim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/22 08:36:04 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:58 jlam 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_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 DIST_SUBDIR=		${PKGNAME}
 
 MAKEFILE=		makefile.unx
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index fcc1e8d610b..9e556e4b06d 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:44 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:58 jlam Exp $
 #
 
 DISTNAME=		openmsx-0.5.0
@@ -10,7 +10,7 @@ MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://openmsx.sourceforge.net/
 COMMENT=		MSX emulator that aims for perfection
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_X11=		yes
 HAS_CONFIGURE=		yes
diff --git a/emulators/p11/Makefile b/emulators/p11/Makefile
index af20ac09784..0a16cb8dc4e 100644
--- a/emulators/p11/Makefile
+++ b/emulators/p11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/05 11:14:15 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:58 jlam Exp $
 #
 
 DISTNAME=	p11-2.10a
@@ -11,7 +11,7 @@ COMMENT=	PDP11 emulator
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-begemot=${PREFIX}
 USE_LIBTOOL=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 # override MAKEFLAGS in the build and install stages
 do-build:
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
index 049a442d3c8..0c67878c750 100644
--- a/emulators/palmosemulator/Makefile
+++ b/emulators/palmosemulator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:44 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:58 jlam Exp $
 #
 
 DISTNAME=	emulator_src_${POSE_VERSION}
@@ -34,7 +34,7 @@ BUILD_DIRS=	${POSE_BUILD_DIR}
 
 USE_PERL5=	build
 USE_X11=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--with-fltk=${BUILDLINK_PREFIX.fltk}
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 3e12a04156b..5c6f3dd2a34 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/18 13:07:32 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:58 jlam Exp $
 #
 
 DISTNAME=		qemu-0.7.0
@@ -12,7 +12,7 @@ COMMENT=		CPU emulator using dynamic translation
 CONFLICTS+=		qemu-bin-*
 NOT_FOR_PLATFORM=	NetBSD-1.[0-6]*-*
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11=		yes
 HAS_CONFIGURE=		yes
 
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index e0de5a77302..73e899d04f4 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:44 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:58 jlam Exp $
 #
 
 DISTNAME=	raines-0.40.2
@@ -15,7 +15,7 @@ COMMENT=	680x0 Arcade Emulator
 BUILD_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
 
 WRKSRC=		${WRKDIR}/raine
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_X11=	yes
 MAKEFILE=	makefile
 MAKE_ENV+=	OSTYPE=linux
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 6eb403b75ae..2b2e1749282 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:45:44 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:58 jlam Exp $
 
 DISTNAME=		s9xs139
 PKGNAME=		snes9x-1.39
@@ -14,7 +14,7 @@ COMMENT=		Super Nintendo Entertainment System (SNES) emulator
 BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
 WRKSRC=			${WRKDIR}/release
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11=		yes
 PTHREAD_OPTS=		require
 
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index 6eb46bdb2ca..de9cc649a27 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/15 22:02:26 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:58 jlam Exp $
 
 DISTNAME=		spim
 PKGNAME=		spim-6.5
@@ -16,7 +16,7 @@ WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./Configure
 USE_IMAKE=		yes
-USE_GNU_TOOLS+=		lex
+USE_TOOLS+=		lex
 XMKMF=			${X11BASE}/bin/xmkmf # don't specify -a option
 PKGSRC_USE_TOOLS+=	gzip
 
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index e98c14f84dd..538ba1dd3a2 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:45:44 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:58 jlam Exp $
 
 STELLA_VERSION=	1.4.1
 DISTNAME=	stella-${STELLA_VERSION}-src
@@ -16,7 +16,7 @@ DISTINFO_FILE=          ${.CURDIR}/../stella/distinfo
 
 WRKSRC=		${WRKDIR}/stella-${STELLA_VERSION}/src/build
 USE_LANGUAGES=	c c++
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_INSTALL=	YES
 UNLIMIT_RESOURCES=datasize
 
diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile
index 94a801418b4..12fc7a230dd 100644
--- a/emulators/tme/Makefile
+++ b/emulators/tme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:58 jlam Exp $
 #
 
 DISTNAME=		tme-0.2
@@ -13,7 +13,7 @@ COMMENT=		The Machine Emulator
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 CONFIGURE_ARGS+=	--disable-debug
 
diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile
index 22d15e73618..4e969c6551c 100644
--- a/emulators/tuxnes/Makefile
+++ b/emulators/tuxnes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:58 jlam Exp $
 #
 
 DISTNAME=		tuxnes-0.75
@@ -12,7 +12,7 @@ COMMENT=		NES emulator
 
 ONLY_FOR_PLATFORM=	*-*-i386
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index 7a290271b9a..dfc1823ef09 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/02/27 22:30:43 veego Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:58 jlam 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_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11=		yes
 BUILD_TARGET=		depend world
 AUTOCONF_REQD=		2.13
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index a1ae3dad593..bd1c8403435 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.35 2005/05/22 20:07:58 jlam Exp $
 
 DISTNAME=	uae-0.8.22
 PKGREVISION=	2
@@ -12,7 +12,7 @@ COMMENT=	The UAE Amiga Emulator
 
 DEPENDS=	unzip>=5.40:../../archivers/unzip
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index e3865710f18..fa6bf5c3225 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:58 jlam Exp $
 
 DISTNAME=		VisualBoyAdvance-src-1.6a
 PKGNAME=		vba-1.6.0.1
@@ -12,7 +12,7 @@ HOMEPAGE=		http://vboy.emuhq.com/
 COMMENT=		Gameboy advance emulator
 
 WRKSRC=			${WRKDIR}/VisualBoyAdvance-1.6a
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-c-core
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 7fd3f09368b..0bc063d49d2 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.55 2005/05/22 20:07:58 jlam Exp $
 #
 
 DISTNAME=		vice-1.16
@@ -22,7 +22,7 @@ EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LANGUAGES+=		c c++
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-fullscreen
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index e5428d56575..f21642f8057 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.83 2005/05/22 20:07:59 jlam Exp $
 
 DISTNAME=	Wine-20050310
 PKGNAME=	${DISTNAME:S/W/w/}
@@ -22,7 +22,7 @@ ONLY_FOR_PLATFORM=	NetBSD-1.5Z*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
 ONLY_FOR_PLATFORM+=	FreeBSD*-i386 Linux*-i386 SunOS*-i386 Darwin*-i386
 
 WRKSRC=		 	${WRKDIR}/${DISTNAME:S/W/w/}
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/emulators/winelib/Makefile b/emulators/winelib/Makefile
index 9ad410e79e6..ef5b393ea53 100644
--- a/emulators/winelib/Makefile
+++ b/emulators/winelib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:59 jlam Exp $
 #
 
 DISTNAME=	winelib-0.3
@@ -12,7 +12,7 @@ COMMENT=	Library to bind Wine as shared library
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 CONFIGURE_ARGS+=	--with-wine=${BUILDLINK_PREFIX.wine}
 
 .include "../../emulators/wine/buildlink3.mk"
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 80649f9b3fd..2325007e91b 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2005/05/12 22:35:18 kristerw Exp $
+# $NetBSD: Makefile,v 1.129 2005/05/22 20:07:59 jlam Exp $
 #
 
 DISTNAME=		xmame-0.96
@@ -16,7 +16,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 
 USE_PKGINSTALL=		YES
 USE_X11=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 MAKEFILE=		makefile.unix
 TARGET=			${PKGBASE}
 UNLIMIT_RESOURCES=	datasize
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index 945b3ad07a8..f8ebce328c6 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2005/05/12 22:34:53 kristerw Exp $
+# $NetBSD: Makefile,v 1.69 2005/05/22 20:07:59 jlam Exp $
 #
 
 DISTNAME=		xmame-0.96
@@ -17,7 +17,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 
 USE_PKGINSTALL=		YES
 USE_X11=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 MAKEFILE=		makefile.unix
 TARGET=			${PKGBASE}
 UNLIMIT_RESOURCES=	datasize
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 18e292ee510..033ac4f1720 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:07:59 jlam Exp $
 #
 
 DISTNAME=		zsnes142src
@@ -19,7 +19,7 @@ BUILD_TARGET=		zsnes
 
 WRKSRC=			${WRKDIR}/zsnes_1_42/src
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11=		yes
 
 .include "../../devel/SDL/buildlink3.mk"