replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make.

67 files changed, 135 insertions, 135 deletions

diff --git a/games/KoboDeluxe/Makefile b/games/KoboDeluxe/Makefile
index 3fa72576a1c..25fe64ac87e 100644
--- a/games/KoboDeluxe/Makefile
+++ b/games/KoboDeluxe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/03 18:49:40 reed Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 13:30:55 grant Exp $
 
 DISTNAME=	KoboDeluxe-0.4pre8
 PKGNAME=	${DISTNAME:S/pre/rc/}
@@ -11,7 +11,7 @@ HOMEPAGE=	http://olofson.net/kobodl/
 COMMENT=	Multi-way scrolling shoot 'em up game for X
 
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/games/abuse/Makefile b/games/abuse/Makefile
index 2a9d96a8d27..fef9f50cec3 100644
--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/03/14 19:37:37 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 13:30:55 grant Exp $
 
 DISTNAME=		abuse_pd
 PKGNAME=		abuse-2.0
@@ -14,7 +14,7 @@ COMMENT=		Full color 320x200 arcade quality platform shooter
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		LDFLAGS="${X11_LDFLAGS}"
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 NOT_FOR_PLATFORM=	NetBSD-*-arm32
 
diff --git a/games/asc/Makefile b/games/asc/Makefile
index 3644949564d..2edf9bd6e82 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:39 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 13:30:55 grant Exp $
 #
 
 DISTNAME=		asc-source-1.13.8.0
@@ -19,7 +19,7 @@ WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		yes
 
diff --git a/games/boson/Makefile b/games/boson/Makefile
index fc52498adbe..b7dd4fa5f97 100644
--- a/games/boson/Makefile
+++ b/games/boson/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/23 21:50:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 13:30:55 grant Exp $
 #
 
 DISTNAME=		boson-all-0.8
@@ -18,7 +18,7 @@ USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 
 CONFIGURE_ARGS+=	--disable-debug
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index b40fc427a6b..53aee57be56 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:39 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/24 13:30:55 grant Exp $
 
 DISTNAME=	bzflag-1.10.20031209
 PKGNAME=	${DISTNAME:S/20031209/0/}
@@ -14,7 +14,7 @@ GNU_CONFIGURE=	yes
 USE_NCURSES=	# resize_term()
 USE_X11=	yes
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/games/cbzone/Makefile b/games/cbzone/Makefile
index fb55b1dc77e..17faad754f6 100644
--- a/games/cbzone/Makefile
+++ b/games/cbzone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:39 agc Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 13:30:55 grant Exp $
 
 DISTNAME=		cbzone-sound
 PKGNAME=		cbzone-2.0c
@@ -9,7 +9,7 @@ MAINTAINER=		root@garbled.net
 COMMENT=		Simple classic game of 3D tank warfare
 
 WRKSRC=			${WRKDIR}/cbzone
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_IMAKE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/clanbomber/Makefile b/games/clanbomber/Makefile
index a0ee2090461..85bf82ea85a 100644
--- a/games/clanbomber/Makefile
+++ b/games/clanbomber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/05/05 16:27:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 13:30:55 grant Exp $
 
 DISTNAME=		clanbomber-1.01
 PKGREVISION=		3
@@ -12,7 +12,7 @@ COMMENT=		Bomberman clone using the ClanLib graphics system
 USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
 
diff --git a/games/copter-commander/Makefile b/games/copter-commander/Makefile
index 6f85a0db585..7596226bfc6 100644
--- a/games/copter-commander/Makefile
+++ b/games/copter-commander/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:40 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 13:30:55 grant Exp $
 #
 
 DISTNAME=	copter-commander-1.8
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.speakeasy.org/~morse/copter-commander/
 COMMENT=	Armor Alley/Rescue Raiders clone
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 MAKE_ENV+=	X11PREFIX=${X11PREFIX}
 MAKE_ENV+=	GTKGLAREADIR=${BUILDLINK_PREFIX.gtkglarea}
 MAKE_ENV+=	OPENGLDIR=${BUILDLINK_PREFIX.MesaLib}
diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index c5fdf1346aa..ec4dfedf299 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 16:49:37 martti Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 13:30:55 grant Exp $
 #
 
 DISTNAME=	corewars-0.9.11
@@ -12,7 +12,7 @@ COMMENT=	Programs on a virtual machine, fighting each other
 
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/craft/Makefile b/games/craft/Makefile
index 1af3f84487f..a268660f238 100644
--- a/games/craft/Makefile
+++ b/games/craft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:15:40 agc Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 13:30:55 grant Exp $
 
 DISTNAME=	craftcc35
 PKGNAME=	craft-3.5
@@ -11,7 +11,7 @@ HOMEPAGE=	http://set.gmd.de/~hua/
 COMMENT=	Warcraft-like game for X11
 
 WRKSRC=		${WRKDIR}
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_X11BASE=	yes
 
 post-extract:
diff --git a/games/crimsonfields/Makefile b/games/crimsonfields/Makefile
index a1e5834d448..62e2a542daf 100644
--- a/games/crimsonfields/Makefile
+++ b/games/crimsonfields/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/12/08 14:41:39 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 13:30:55 grant Exp $
 #
 
 DISTNAME=		crimson-0.3.7
@@ -13,7 +13,7 @@ HOMEPAGE=		http://crimson.seul.org/
 COMMENT=		Tactical war game in the tradition of Battle Isle
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index b455dc268fe..1966a2d5594 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:40 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 13:30:55 grant Exp $
 #
 
 DISTNAME=	CriticalMass-0.98
@@ -14,7 +14,7 @@ COMMENT=	SDL/OpenGL space shoot'em up game
 
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_X11=	YES
 
 .include "../../devel/SDL/buildlink2.mk"
diff --git a/games/crossfire-cli/Makefile b/games/crossfire-cli/Makefile
index 2a4e73d0926..bbb89096e68 100644
--- a/games/crossfire-cli/Makefile
+++ b/games/crossfire-cli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/07/13 13:51:43 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/24 13:30:55 grant Exp $
 #
 
 DISTNAME=	crossfire-client-1.0.0
@@ -23,7 +23,7 @@ CF_RAW=		client-0.95.2-raw-sounds.tgz
 USE_BUILDLINK2=	yes
 USE_PERL5=	yes
 USE_X11=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	yes
 SCRIPTS_ENV+=	${SCRIPTSDIR}
 CONFIGURE_ARGS+=	--with-includes=-I${LOCALBASE}/include
diff --git a/games/crossfire-srv/Makefile b/games/crossfire-srv/Makefile
index 7c20bfe6475..f6ce9bb3f87 100644
--- a/games/crossfire-srv/Makefile
+++ b/games/crossfire-srv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/10/21 01:39:05 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/24 13:30:55 grant Exp $
 #
 
 DISTNAME=	crossfire-1.0.0
@@ -19,7 +19,7 @@ CF_MAPS=	crossfire-1.0.0-maps.tar.bz2
 
 USE_BUILDLINK2=	yes
 USE_X11=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 CONFIGURE_ARGS+=	--with-includes=-I${LOCALBASE}/include
diff --git a/games/defendguin/Makefile b/games/defendguin/Makefile
index 9671e197c10..fd3fe2ff7ef 100644
--- a/games/defendguin/Makefile
+++ b/games/defendguin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/12/08 14:41:39 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 13:30:55 grant Exp $
 
 DISTNAME=	defendguin-0.0.10
 PKGREVISION=	2
@@ -12,7 +12,7 @@ COMMENT=	Clone of the arcade game Defender
 USE_X11=	YES
 USE_BUILDLINK2=	YES
 
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 MAKE_ENV+=	PREFIX=${LOCALBASE}
 
 .include "../../audio/SDL_mixer/buildlink2.mk"
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index ffc55ce3bb6..78de5a7e585 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/09/28 09:13:57 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/24 13:30:55 grant Exp $
 
 DISTNAME=		dopewars-1.5.9
 PKGREVISION=		2
@@ -15,7 +15,7 @@ USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_PKGLOCALEDIR=	YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-ncurses
diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile
index 4306d9154ff..8602e2efb20 100644
--- a/games/fkiss/Makefile
+++ b/games/fkiss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/12/30 16:53:48 cjep Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=		fkiss-0.33
@@ -18,7 +18,7 @@ DEPENDS+=		lha-[0-9]*:../../archivers/lha
 
 USE_BUILDLINK2=		yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 CFLAGS+=		-DUSE_STDARG -DHAVE_STDARG_H
 CFLAGS+=		-DDEV_SOUND=\"\\\"${DEVOSSSOUND}\\\"\"
diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile
index e97a8316ac6..7e4c2d54fe3 100644
--- a/games/foobillard/Makefile
+++ b/games/foobillard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/25 04:41:39 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=	foobillard-2.8
@@ -10,7 +10,7 @@ HOMEPAGE=	http://foobillard.sunsite.dk/
 COMMENT=	Free OpenGL-billard game
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/games/frozen-bubble/Makefile b/games/frozen-bubble/Makefile
index 888024013b6..b2c120158fa 100644
--- a/games/frozen-bubble/Makefile
+++ b/games/frozen-bubble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/12/08 14:41:39 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=	frozen-bubble-1.0.0
@@ -15,7 +15,7 @@ DEPENDS+=	p5-SDL>=1.19.2:../../devel/p5-SDL
 
 USE_PERL5=	run
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 MAKE_ENV+=	PERL5="${PERL5}" CP="${CP}"
 
diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile
index a49aadb0ce2..4d190d1358b 100644
--- a/games/gnocatan/Makefile
+++ b/games/gnocatan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/23 21:50:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=	gnocatan-0.8.0.0
@@ -12,7 +12,7 @@ COMMENT=	GNOME version of the Settlers of Catan board game
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_PKGLOCALEDIR=	YES
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 5ea295e017a..1a8e46ce936 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2004/01/03 18:49:40 reed Exp $
+# $NetBSD: Makefile,v 1.59 2004/01/24 13:30:56 grant Exp $
 
 DISTNAME=		gnome-games-1.4.0.4
 PKGREVISION=		9
@@ -22,7 +22,7 @@ CONFLICTS=		xbill-[0-9]*
 AUTOMAKE_REQD=		1.4
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
 USE_CONFIG_WRAPPER=	YES
 USE_LIBTOOL=		YES
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index 65bccecc866..9bef7d002a9 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/23 21:50:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/24 13:30:56 grant Exp $
 
 DISTNAME=		gnome-games-2.4.1.1
 PKGREVISION=		2
@@ -16,7 +16,7 @@ CONFLICTS=		xbill-[0-9]*
 
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11=		yes
 USE_CONFIG_WRAPPER=	yes
 USE_LIBTOOL=		yes
diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile
index 352a74ac54b..62652049fbc 100644
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/20 12:15:40 agc Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 13:30:56 grant Exp $
 # FreeBSD Id: Makefile,v 1.6 1999/01/27 07:41:12 fenner Exp
 #
 
@@ -18,7 +18,7 @@ COMMENT=	GNU chess engine
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 ALL_TARGET=	gnuchess
 
 BOOKDIR=	${PREFIX}/lib/gnuchess
diff --git a/games/gnugo/Makefile b/games/gnugo/Makefile
index 4821232faca..dfbc307edf1 100644
--- a/games/gnugo/Makefile
+++ b/games/gnugo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/08/09 10:51:12 seb Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/24 13:30:56 grant Exp $
 
 DISTNAME=	gnugo-3.4
 CATEGORIES=	games
@@ -9,7 +9,7 @@ HOMEPAGE=	http://www.gnu.org/software/gnugo/
 COMMENT=	Go playing program
 
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		yes
 
 INFO_FILES=	gnugo.info
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 496df8b8c09..cff19dc552d 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/23 21:50:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=	gtetrinet-0.7.1
@@ -15,7 +15,7 @@ DEPENDS+=		gnome2-dirs>=1.1:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	YES
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index ebfecf37573..1f553ee979d 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:40 reed Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=	gtkballs-3.0.1
@@ -14,7 +14,7 @@ COMMENT=	GTK+ clone of "Color Lines"
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 CONFIGURE_ARGS+=	--without-included-gettext
 
 post-install:
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 6eb7713307e..127ed7b28ea 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/23 21:50:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=		gturing-0.1.1
@@ -17,7 +17,7 @@ GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile
index e3da3fee4ae..4dc83c99486 100644
--- a/games/icebreaker/Makefile
+++ b/games/icebreaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/12/08 14:41:39 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=	icebreaker-1.9.7
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.mattdm.org/icebreaker/
 COMMENT=	Penguin capturing simulation
 
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_X11=	yes
 MAKE_ENV+=	mandir="${PREFIX}/man" highscoredir="/var/games"
 MAKE_ENV+=	prefix="${PREFIX}"
diff --git a/games/iso-pernangband/Makefile b/games/iso-pernangband/Makefile
index 41543ab63c4..c88fa59efe6 100644
--- a/games/iso-pernangband/Makefile
+++ b/games/iso-pernangband/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/20 12:15:40 agc Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=		iso-pern_src-0_2_6
@@ -13,7 +13,7 @@ COMMENT=		Isometric (pseudo 3D) view for Angband
 
 WRKSRC=			${WRKDIR}/iso-pern_src/src
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11=		yes
 
 post-patch:
diff --git a/games/ketm/Makefile b/games/ketm/Makefile
index 592c9477619..a896026641a 100644
--- a/games/ketm/Makefile
+++ b/games/ketm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/26 21:41:18 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=	ketm-0.0.6
@@ -15,7 +15,7 @@ ALL_TARGET=	ketm
 
 USE_BUILDLINK2=	YES
 USE_X11=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 post-patch:
 	cd ${WRKSRC} &&							\
diff --git a/games/knights/Makefile b/games/knights/Makefile
index 92f0f3a4248..b24773cf6f3 100644
--- a/games/knights/Makefile
+++ b/games/knights/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/23 21:50:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/24 13:30:56 grant Exp $
 
 DISTNAME=	knights-0.4.6
 PKGREVISION=	5
@@ -10,7 +10,7 @@ HOMEPAGE=	http://knights.sourceforge.net/
 COMMENT=	Chess interface for KDE
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=              YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=          YES
 USE_LIBTOOL=            YES
 LTCONFIG_OVERRIDE=      ${WRKSRC}/admin/ltconfig
diff --git a/games/mirrormagic-sdl/Makefile b/games/mirrormagic-sdl/Makefile
index d7a2b70f6fe..3d065a30d35 100644
--- a/games/mirrormagic-sdl/Makefile
+++ b/games/mirrormagic-sdl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:41 reed Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=		mirrormagic-2.0.2
@@ -14,7 +14,7 @@ COMMENT=		Nice little puzzle game with color graphics and sound
 CONFLICTS=		mirrormagic-[1-9]*
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 PLIST_SRC=		${WRKDIR}/PLIST PLIST
 
 # if you change SCORE_PATH, don't forget to change patch-aa, too
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index b3039bb8991..eae778e9cd6 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/08/26 15:22:42 adam Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=		mirrormagic-2.0.2
@@ -11,7 +11,7 @@ COMMENT=		Nice little puzzle game with color graphics and sound
 
 CONFLICTS=		mirrormagic-sdl-[1-9]*
 
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 PLIST_SRC=		${WRKDIR}/PLIST PLIST
 
 # if you change SCORE_PATH, don't forget to change patch-aa, too
diff --git a/games/nagi/Makefile b/games/nagi/Makefile
index 717ae1a9344..475591d853d 100644
--- a/games/nagi/Makefile
+++ b/games/nagi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/08/16 15:33:01 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=		nagi_src_-_2002-11-14
@@ -11,8 +11,8 @@ HOMEPAGE=		http://www.agidev.com/projects/nagi/
 COMMENT=		Clone of Sierra's AGI
 
 WRKSRC=		${WRKDIR}/src
-USE_BUILDLINK2=		yes
-USE_GMAKE=	yes
+USE_BUILDLINK2=	yes
+USE_GNU_TOOLS+=	make
 MAKEFILE=	Makefile.linux
 
 NAGILIB=	${PREFIX}/lib/nagi
diff --git a/games/netris/Makefile b/games/netris/Makefile
index bbfb4617c70..96ca6b0e43f 100644
--- a/games/netris/Makefile
+++ b/games/netris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/08/13 23:46:49 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=		netris-0.52
@@ -14,7 +14,7 @@ MAINTAINER=		uebs@gmx.at
 HOMEPAGE=		http://www.netris.org/
 COMMENT=		Everybody's darling T*tris in a networked version
 
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	./Configure
 
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index 8d5c209161c..4aa3f95b102 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/20 12:15:41 agc Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=		nighthawk-2.1
@@ -16,7 +16,7 @@ COMMENT=		C=64 Paradroid clone
 
 WRKSRC=			${WRKDIR}/nighthawk
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 
 post-build:
diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile
index d83b5e20eb7..09397ae1f7a 100644
--- a/games/openmortal/Makefile
+++ b/games/openmortal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/08 15:24:14 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=	openmortal-0.4
@@ -12,7 +12,7 @@ COMMENT=	Parody of Mortal Kombat with real characters
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PERL5=		yes
 USE_X11=		yes
 
diff --git a/games/pacman/Makefile b/games/pacman/Makefile
index 5697ca41ae7..4a8ad167fa4 100644
--- a/games/pacman/Makefile
+++ b/games/pacman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/05/05 16:27:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/24 13:30:56 grant Exp $
 
 DISTNAME=		Pacman-0.3-CVS-00-11-17
 PKGNAME=		Pacman-0.3
@@ -12,7 +12,7 @@ COMMENT=		Pacman, a small demonstration game for ClanLib
 
 USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 
 # needs a valid X display to compile its datafiles
diff --git a/games/pag/Makefile b/games/pag/Makefile
index bda61301445..a2b66871d1a 100644
--- a/games/pag/Makefile
+++ b/games/pag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/09/28 09:13:57 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=	pag-0.91
@@ -10,7 +10,7 @@ MAINTAINER=	pancake@phreaker.net
 HOMEPAGE=	http://pancake.host.sk/
 COMMENT=	Platform Arcade Game
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_BUILDLINK2=	yes
 USE_NCURSES=	yes # missing function stdscr
 
diff --git a/games/powwow/Makefile b/games/powwow/Makefile
index ea6633fe041..7d62b03777e 100644
--- a/games/powwow/Makefile
+++ b/games/powwow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:39:14 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=	powwow-1.2.4
@@ -10,7 +10,7 @@ MAINTAINER=	jdolecek@NetBSD.org
 HOMEPAGE=	http://Linuz.sns.it/~max/powwow.html
 COMMENT=	Client to play MUDs
 
-USE_GMAKE=	# defined
+USE_GNU_TOOLS+=	make
 POWWOW_DIR=	${PREFIX}/share/powwow
 
 do-build:
diff --git a/games/quake/Makefile b/games/quake/Makefile
index 486b3ce3ae3..90fb89800ef 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/01/20 12:15:41 agc Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/24 13:30:56 grant Exp $
 
 DISTNAME=	q1source
 PKGNAME=	quake-2.30
@@ -18,7 +18,7 @@ ONLY_FOR_PLATFORM=	*-*-i386
 
 WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 MAKE_ENV+=	MAINDIR=${WRKSRC}
 
 USE_X11=	yes
diff --git a/games/quake6/Makefile b/games/quake6/Makefile
index 49535eda137..7a088ba65de 100644
--- a/games/quake6/Makefile
+++ b/games/quake6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/20 12:15:41 agc Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/24 13:30:56 grant Exp $
 
 DISTNAME=	quake-v6-bsd-kame
 PKGNAME=	quake6-0.0
@@ -20,7 +20,7 @@ post-extract:
 	cd ${WRKSRC}; ${FIND} . -name \*.o -exec ${RM} {} \;
 	cd ${WRKSRC}; ${RM} config.cache
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	yes
 
 # This pkg can be built on USE_INET6 platform only
diff --git a/games/rocksndiamonds/Makefile.common b/games/rocksndiamonds/Makefile.common
index 4ba8f5d623d..42000175c0c 100644
--- a/games/rocksndiamonds/Makefile.common
+++ b/games/rocksndiamonds/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2003/12/17 21:30:39 heinz Exp $
+# $NetBSD: Makefile.common,v 1.7 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=	rocksndiamonds-3.0.8
@@ -9,7 +9,7 @@ MAINTAINER=	heinz-rnd@NetBSD.org
 HOMEPAGE=	http://www.artsoft.org/rocksndiamonds/
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_PKGINSTALL=		YES
 
diff --git a/games/sarien/Makefile b/games/sarien/Makefile
index de4800c8bc3..76418136fff 100644
--- a/games/sarien/Makefile
+++ b/games/sarien/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/26 21:41:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=	sarien-0.7.0
@@ -13,7 +13,7 @@ COMMENT=	Adventure Game Interpreter (AGI) for Sierra On-Line Titles
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 CONFIGURE_ARGS=		--with-sdl
 
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 29eedef13d6..9317542c3ec 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/12/08 14:41:40 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/24 13:30:56 grant Exp $
 
 DISTNAME=	scummvm-0.5.1
 PKGREVISION=	2
@@ -11,7 +11,7 @@ HOMEPAGE=	http://scummvm.sourceforge.net/
 COMMENT=	LucasArts Script Creation Utility for Maniac Mansion
 
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_X11=	yes
 HAS_CONFIGURE=	yes
 
diff --git a/games/sirius/Makefile b/games/sirius/Makefile
index c1b2e90dc3e..65c5ce49c58 100644
--- a/games/sirius/Makefile
+++ b/games/sirius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/23 21:50:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 13:30:56 grant Exp $
 #
 
 DISTNAME=	sirius-0.7.0
@@ -15,7 +15,7 @@ DEPENDS=		gnome2-dirs>=1.1:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
diff --git a/games/tileworld/Makefile b/games/tileworld/Makefile
index 75a04acb5bf..217665fb132 100644
--- a/games/tileworld/Makefile
+++ b/games/tileworld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:41 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/24 13:30:57 grant Exp $
 #
 
 DISTNAME=	tworld-1.0
@@ -13,7 +13,7 @@ COMMENT=	"Game based on Chip's Challenge"
 
 WRKSRC=		${WRKDIR}/tworld-1.0
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/games/tuxmath/Makefile b/games/tuxmath/Makefile
index cdfff84ea31..6d5677b8241 100644
--- a/games/tuxmath/Makefile
+++ b/games/tuxmath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:15:41 agc Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 13:30:57 grant Exp $
 #
 
 DISTNAME=	tuxmath-2001.09.07-0102
@@ -13,7 +13,7 @@ COMMENT=	Educational math arcade game
 
 WRKSRC=		${WRKDIR}/tuxmath
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 NO_CONFIGURE=	# defined
 
 pre-install:
diff --git a/games/wormz/Makefile b/games/wormz/Makefile
index 8744a0a9a57..000cd1a70cc 100644
--- a/games/wormz/Makefile
+++ b/games/wormz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:41 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 13:30:57 grant Exp $
 #
 
 DISTNAME=		Wormz-1.0b5
@@ -13,7 +13,7 @@ COMMENT=		Networked game for X11
 WRKSRC=			${WRKDIR}/Wormz
 USE_BUILDLINK2=		yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 post-extract:
 	${MKDIR} ${WRKSRC}/NetBSD
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index e9ed7c51772..fef0295c317 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/12/20 01:51:34 hubertf Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/24 13:30:57 grant Exp $
 #
 
 DISTNAME=	xarchon-0.60
@@ -11,7 +11,7 @@ HOMEPAGE=	http://xarchon.seul.org/
 COMMENT=	Chess-like strategy game with battle options
 
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
 USE_X11=	YES
 USE_GCC_SHLIB=	YES
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 8d6351f8a92..1f01798ccf3 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/08/09 10:51:13 seb Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/24 13:30:57 grant Exp $
 
 DISTNAME=		xconq-7.4.1
 CATEGORIES=		games x11
@@ -11,7 +11,7 @@ COMMENT=		Xconq is a general strategy game system
 
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-alternate-scoresdir=/var/games/xconq/scores
 CONFIGURE_ARGS+=	--with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib"
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 6419d3f872d..c95a2e29ae0 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/20 12:15:41 agc Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/24 13:30:57 grant Exp $
 
 DISTNAME=	linuxdoom-1.10
 PKGNAME=	xdoom-1.10
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	doomsrc.zip
 EXTRACT_CMD=	unzip -qo ${DISTDIR}/${EXTRACT_ONLY}
 USE_X11BASE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 MAKE_ENV+=	X11BASE=${X11BASE} INSTALL_PREFIX=${X11PREFIX}
 
 post-extract:
diff --git a/games/xfreecell/Makefile b/games/xfreecell/Makefile
index aa827361369..39be6b5cb20 100644
--- a/games/xfreecell/Makefile
+++ b/games/xfreecell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:15:42 agc Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 13:30:57 grant Exp $
 
 DISTNAME=	xfreecell-1.0.5b
 CATEGORIES=	games
@@ -10,7 +10,7 @@ HOMEPAGE= 	http://www2.giganet.net/~nakayama/
 COMMENT=	Popular freecell card game for X
 
 USE_X11BASE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 MAKEFILE=	makefile
 
 WRKSRC=		${WRKDIR}/xfreecell
diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index 3322014cd15..01b122fcd16 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:15:42 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 13:30:57 grant Exp $
 #
 
 DISTNAME=	xfrisk-1.2
@@ -12,7 +12,7 @@ COMMENT=	X11 version of the classic Risk board game
 
 WRKSRC=		${WRKDIR}/XFrisk
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_X11=	yes
 
 RESTRICTED=	"Possible trademark infringement"
diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile
index 808a4401712..d87c8589292 100644
--- a/games/xnibbles/Makefile
+++ b/games/xnibbles/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:42 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 13:30:57 grant Exp $
 #
 
 DISTNAME=		xnibbles-1.0BETA4
@@ -14,7 +14,7 @@ COMMENT=		Winding snakes game for X11
 WRKSRC=			${WRKDIR}/xnibbles
 USE_BUILDLINK2=		YES
 USE_X11=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 ALL_TARGET=		netbsd
 
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index ae46dd2499b..a83a54881d7 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/07/17 21:39:40 grant Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/24 13:30:57 grant Exp $
 
 DISTNAME=		xpuyopuyo-0.9.1
 PKGREVISION=		3
@@ -14,7 +14,7 @@ DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
 
 AUTOMAKE_REQD=		1.4
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index 9b975d0b739..cd89f20a0c2 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2003/07/13 13:51:54 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2004/01/24 13:30:57 grant Exp $
 #
 
 DISTNAME=		xracer-0.96.9
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	# defined
 
 USE_BUILDLINK2=		# defined
 USE_X11=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 USE_PERL5=		# defined
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XRacer/.packlist
 
diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index 4fc53913b72..e68cea4edae 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/26 21:41:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 13:30:57 grant Exp $
 #
 
 DISTNAME=	xrick-021212
@@ -17,7 +17,7 @@ NO_SRC_ON_CDROM=    ${RESTRICTED}
 NO_BIN_ON_FTP=	    ${RESTRICTED}
 NO_SRC_ON_FTP=	    ${RESTRICTED}
 
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 
diff --git a/games/xtux/Makefile b/games/xtux/Makefile
index 26b7e040528..7c8dea4056c 100644
--- a/games/xtux/Makefile
+++ b/games/xtux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:15:42 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 13:30:57 grant Exp $
 
 DISTNAME=	xtux-arena-src-nov-15
 PKGNAME=	xtux-0.2000.11.15
@@ -12,7 +12,7 @@ COMMENT=	2D multi-player shootout using images from the Open Software scene
 
 WRKSRC=		${WRKDIR}/xtux
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_X11=	YES
 
 do-install:
diff --git a/games/zoom/Makefile b/games/zoom/Makefile
index fb621720944..bc618981d8b 100644
--- a/games/zoom/Makefile
+++ b/games/zoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/12/24 09:53:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 13:30:57 grant Exp $
 #
 
 DISTNAME=		zoom-1.0.1
@@ -20,7 +20,7 @@ USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PERL5=		build
 
 .if ${MACHINE_ARCH} == "alpha"
diff --git a/ham/7plus/Makefile b/ham/7plus/Makefile
index ab2ece811ab..4b2a1f8566b 100644
--- a/ham/7plus/Makefile
+++ b/ham/7plus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:18:36 agc Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 13:40:43 grant Exp $
 #
 
 DISTNAME=	7pl225sr
@@ -16,7 +16,7 @@ LICENSE=        no-commercial-use
 
 WRKSRC=		${WRKDIR}/7plsrc.225
 MAKEFILE=	netbsd.mak
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 post-install:
 		${INSTALL_DATA_DIR} ${PREFIX}/share/doc/7plus && \
diff --git a/ham/cwtext/Makefile b/ham/cwtext/Makefile
index 0d4ef5284a0..ce3e8e0dfda 100644
--- a/ham/cwtext/Makefile
+++ b/ham/cwtext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:43:25 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 13:40:43 grant Exp $
 
 DISTNAME=	cwtext-0.91
 CATEGORIES=	ham
@@ -9,7 +9,7 @@ HOMEPAGE=	http://cwtext.sourceforge.net/
 COMMENT=	Morse Code Generator
 
 MAKEFILE=	makefile
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 ALL_TARGET=	ALL
 
 post-patch:
diff --git a/ham/dpbox/Makefile b/ham/dpbox/Makefile
index 4bd028c1455..85b25767e71 100644
--- a/ham/dpbox/Makefile
+++ b/ham/dpbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:18:36 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 13:40:43 grant Exp $
 #
 
 DISTNAME=	dpbox-60000
@@ -11,7 +11,7 @@ HOMEPAGE=	http://home.snafu.de/wahlm/dl8hbs/dpbox.html
 COMMENT=	Multi-Protocol Amateur Packet Radio BBS
 
 WRKSRC=		${WRKDIR}/dpbox-6.00.00/source
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 MAKEFILE=	Makefile.netbsd
 
 MAKE_ENV+=	prefix="${PREFIX}"
diff --git a/ham/hamlib/Makefile b/ham/hamlib/Makefile
index 57ffb9912f9..ee3b4d34311 100644
--- a/ham/hamlib/Makefile
+++ b/ham/hamlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/24 06:40:54 jmc Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 13:40:43 grant Exp $
 #
 
 DISTNAME=	hamlib-1.1.4
@@ -9,7 +9,7 @@ MAINTAINER=	wulf@NetBSD.org
 HOMEPAGE=	http://hamlib.sourceforge/net/
 COMMENT=	API for digital communications equipment
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 LIBTOOL_OVERRIDE=${WRKSRC}/libtool
diff --git a/ham/tfkiss/Makefile b/ham/tfkiss/Makefile
index e9308cc1627..56d88126cf3 100644
--- a/ham/tfkiss/Makefile
+++ b/ham/tfkiss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/09/09 08:16:22 wulf Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 13:40:43 grant Exp $
 #
 
 DISTNAME=	tfkiss-1.2.4
@@ -9,7 +9,7 @@ MAINTAINER=	wulf@ping.net.au
 HOMEPAGE=	http://www.bfl.at/mayer/ham/
 COMMENT=	Software implementation of TheFirmware for use with TNT
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--enable-xpid --enable-flexnet --enable-axip
diff --git a/ham/tnt/Makefile b/ham/tnt/Makefile
index a2eb8d9570b..a3082eb09c2 100644
--- a/ham/tnt/Makefile
+++ b/ham/tnt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/08/09 10:54:25 seb Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/24 13:40:43 grant Exp $
 #
 
 DISTNAME=	tnt-1.9.1
@@ -12,7 +12,7 @@ COMMENT=	Amateur packet radio terminal program for TNC2, AEA PK232 and PK88
 
 DEPENDS+=	dialog>=0.6z:../../misc/dialog
 
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/ham/xlog/Makefile b/ham/xlog/Makefile
index 0d8b94d2042..b66ef060912 100644
--- a/ham/xlog/Makefile
+++ b/ham/xlog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:43:30 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 13:40:44 grant Exp $
 #
 
 DISTNAME=	xlog-0.8
@@ -11,7 +11,7 @@ HOMEPAGE=	http://people.debian.org/~pa3aba/xlog.html
 COMMENT=	Amateur Radio logging program
 
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--enable-hamlib