replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make.

43 files changed, 86 insertions, 86 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 9deeee99f72..d6b28e754f5 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/01/20 12:07:41 agc Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/22 07:14:59 grant Exp $
 
 DISTNAME=	audacity-src-1.0.0-2
 PKGNAME=	audacity-1.0.0.2
@@ -16,7 +16,7 @@ BUILD_DEPENDS+=	zip-[0-9]*:../../archivers/zip
 WRKSRC=		${WRKDIR}/audacity-src-1.0.0
 USE_BUILDLINK2=		# defined
 USE_X11=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--without-xaudio
diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile
index 2bf5f8dd7d9..35cd14a0ac6 100644
--- a/audio/cdparanoia/Makefile
+++ b/audio/cdparanoia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/11/03 22:43:37 kim Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/22 07:14:59 grant Exp $
 #
 
 DISTNAME=	cdparanoia-III-alpha9.8
@@ -13,7 +13,7 @@ COMMENT=	CDDA reading utility with extra data verification features
 
 ONLY_FOR_PLATFORM=	FreeBSD-*-* NetBSD-*-* Linux-*-*
 
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index 2f148d87bd8..b41031996b6 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/20 12:07:41 agc Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/22 07:15:00 grant Exp $
 #
 
 DISTNAME=	cmp3-2.0pre5
@@ -15,7 +15,7 @@ DEPENDS+=	mpg123-[0-9]*:../../audio/mpg123
 
 WRKSRC=		${WRKDIR}/cmp3
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_NCURSES=		# MAX_FORM_COMMAND
 
 do-install:
diff --git a/audio/csound-bath/Makefile b/audio/csound-bath/Makefile
index 88907e0107d..8902c9a6efc 100644
--- a/audio/csound-bath/Makefile
+++ b/audio/csound-bath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/20 12:07:41 agc Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/22 07:15:00 grant Exp $
 #
 
 DISTNAME=		Csound4.23
@@ -18,7 +18,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 WRKSRC=			${WRKDIR}
 DIST_SUBDIR=		csound
 CONFLICTS=		csound-dev-4*
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 pre-patch:
 	 ${CP} ${FILESDIR}/rtNetBSD.c ${FILESDIR}/rtNetBSD.h ${WRKSRC}
diff --git a/audio/csound-dev/Makefile b/audio/csound-dev/Makefile
index 8d407badcad..2a07f3a8757 100644
--- a/audio/csound-dev/Makefile
+++ b/audio/csound-dev/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/22 07:15:00 grant Exp $
 #
 
 DISTNAME=		Csound-4.24.1
@@ -18,7 +18,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NOT_FOR_PLATFORM=	*-*-alpha *-*-sparc64	# many LP64 problems
 
 DIST_SUBDIR=		csound
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		yes
 CONFLICTS=		csound-bath*
 
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index b93e9df2711..e60eb6858a8 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/09 17:23:44 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/22 07:15:00 grant Exp $
 #
 
 DISTNAME=	darkice-0.13.2
@@ -11,7 +11,7 @@ COMMENT=	IceCast, IceCast2 and ShoutCast live audio streamer
 
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGINSTALL=		yes
 
 CONFIGURE_ARGS+=	--with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis}
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 50758336fc9..344d35ebadb 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2003/12/08 14:41:38 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2004/01/22 07:15:00 grant Exp $
 #
 
 DISTNAME=	easytag-0.30
@@ -15,7 +15,7 @@ DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
 BUILD_USES_MSGFMT=	yes	# xgettext, really
 
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11=		yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile
index 3fb2b93b151..dca9bbd3ea1 100644
--- a/audio/faad2/Makefile
+++ b/audio/faad2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:07:41 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/22 07:15:00 grant Exp $
 #
 
 DISTNAME=	faad2-1.1
@@ -16,7 +16,7 @@ NO_BIN_ON_CDROM=${RESTRICTED}
 WRKSRC=		${WRKDIR}/faad2
 USE_BUILDLINK2=		YES
 USE_GCC_SHLIB=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 
 AUTOMAKE_REQD=		1.4
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 0a1c480d81a..74127b2e87c 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/01/20 12:07:41 agc Exp $
+# $NetBSD: Makefile,v 1.30 2004/01/22 07:15:00 grant Exp $
 
 DISTNAME=	festival-1.4.1
 PKGREVISION=	1
@@ -19,7 +19,7 @@ COMMENT=	Festival is an advanced multi-lingual speech synthesis system
 
 WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=		make
 USE_X11=	yes
 
 SPEECHTOOLS=	${WRKSRC}/speech_tools
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 033e79d0f5e..d6235ff9d84 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/20 12:07:42 agc Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/22 07:15:00 grant Exp $
 #
 
 DISTNAME=		flac-1.1.0
@@ -18,7 +18,7 @@ BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		ac_cv_path_XMMS_CONFIG="no"
 
diff --git a/audio/gmodplay/Makefile b/audio/gmodplay/Makefile
index a3528a94f24..863df5b376c 100644
--- a/audio/gmodplay/Makefile
+++ b/audio/gmodplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/22 07:15:00 grant Exp $
 
 DISTNAME=	gmodplay-0.08
 PKGREVISION=	3
@@ -16,7 +16,7 @@ ONLY_FOR_PLATFORM=	*-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \
 			*-*-vax
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 # for libslang and ossaudio
 CFLAGS+=	-DAUDIO_DEV="\"\\\"$(DEVOSSAUDIO)\\\"\""
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index d1716853f98..f9ff49be3e5 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/01/03 18:49:34 reed Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/22 07:15:00 grant Exp $
 
 DISTNAME=		gnome-media-1.2.3
 PKGREVISION=		9
@@ -18,7 +18,7 @@ USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 CONFIGURE_ENV+=	XGETTEXT="${LOCALBASE}/bin/xgettext"
diff --git a/audio/gnome-speech/Makefile b/audio/gnome-speech/Makefile
index bffabb0b863..b6ef35164fe 100644
--- a/audio/gnome-speech/Makefile
+++ b/audio/gnome-speech/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/30 17:53:27 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/22 07:15:00 grant Exp $
 #
 
 DISTNAME=	gnome-speech-0.2.8
@@ -14,7 +14,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/audio/gnome2-media/Makefile b/audio/gnome2-media/Makefile
index 3cc378343d8..82c8306f95a 100644
--- a/audio/gnome2-media/Makefile
+++ b/audio/gnome2-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/03 18:49:34 reed Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/22 07:15:00 grant Exp $
 
 DISTNAME=		gnome-media-2.4.1.1
 PKGREVISION=		1
@@ -17,7 +17,7 @@ USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PERL5=		build
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
diff --git a/audio/gogo/Makefile b/audio/gogo/Makefile
index 7de2506371b..a42d66d14d6 100644
--- a/audio/gogo/Makefile
+++ b/audio/gogo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/11/16 19:04:02 veego Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/22 07:15:00 grant Exp $
 #
 
 DISTNAME=		gogo239b
@@ -15,7 +15,7 @@ BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
 ONLY_FOR_PLATFORM=	*-*-i386
 
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 RESTRICTED=		'Source based on patent protected Fraunhofer code'
 NO_SRC_ON_FTP=	${RESTRICTED}
diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile
index 7c707d96097..7147f9f0eed 100644
--- a/audio/id3ed/Makefile
+++ b/audio/id3ed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/10/29 16:31:46 gavan Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/22 07:15:00 grant Exp $
 #
 
 DISTNAME=	id3ed-1.10.4
@@ -11,7 +11,7 @@ COMMENT=	Edit id3 description tags in mpeg3 files
 
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_GCC_SHLIB=		YES
 
 USE_GNU_READLINE=	# uses rl_startup_hook
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index b45d07af7bf..1f9b1b894e0 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/01/20 15:46:12 adam Exp $
+# $NetBSD: Makefile,v 1.33 2004/01/22 07:15:00 grant Exp $
 #
 
 DISTNAME=	lame-${VERS}
@@ -15,7 +15,7 @@ VERS=		3.95.1
 LICENSE=	fee-based-commercial-use
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 1bc9171e745..6d63b6db84e 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/01/20 12:07:42 agc Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/22 07:15:00 grant Exp $
 
 DISTNAME=		libmikmod_3.1.10
 PKGNAME=		libmikmod-3.1.10
@@ -9,7 +9,7 @@ MAINTAINER=		kuebart@mathematik.uni-ulm.de
 HOMEPAGE=		http://mikmod.raphnet.net/
 COMMENT=		MikMod Sound Library
 
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		# defined
 USE_LIBTOOL=		# defined
 USE_BUILDLINK2=		# defined
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index c0717cd1699..bcf1af0c528 100644
--- a/audio/libsidplay/Makefile
+++ b/audio/libsidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/10/29 16:57:32 gavan Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/22 07:15:00 grant Exp $
 #
 
 DISTNAME=	libsidplay-1.36.57
@@ -13,7 +13,7 @@ COMMENT=	Sidplay Library
 CONFLICTS=	sidplay-1.36.*
 
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		yes
 USE_GCC_SHLIB=		yes
 
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index 56e82553fe4..d9e392de642 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/01/17 19:45:37 kristerw Exp $
+# $NetBSD: Makefile,v 1.33 2004/01/22 07:15:00 grant Exp $
 #
 
 DISTNAME=	mikmod-3.1.6-a
@@ -11,7 +11,7 @@ MAINTAINER=	mycroft@NetBSD.ORG
 HOMEPAGE=	http://mikmod.raphnet.net/
 COMMENT=	MOD player for UNI IT XM S3M MOD MTM STM DSM MED FAR ULT 669 files
 
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index a273cc715a1..760ec96dd7b 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/12/08 14:41:38 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/22 07:15:00 grant Exp $
 
 DISTNAME=	mp3blaster-3.2.0
 PKGREVISION=	1
@@ -11,7 +11,7 @@ COMMENT=	MP3 console curses-based player
 
 PTHREAD_OPTS=	require
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+="--with-cxxflags=${CXXFLAGS}" \
diff --git a/audio/mp3check/Makefile b/audio/mp3check/Makefile
index 824dd9ebb36..04cb868ce50 100644
--- a/audio/mp3check/Makefile
+++ b/audio/mp3check/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:22:54 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/22 07:15:00 grant Exp $
 
 DISTNAME=	mp3check-0.8.0
 CATEGORIES=	audio
@@ -8,7 +8,7 @@ MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://www.0vermann.de/soft/mp3check/mp3check.html
 COMMENT=	Check MP3 files for consistency
 
-#USE_GMAKE=	YES
+#USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
 
 ALL_TARGET=	mp3check
diff --git a/audio/musicbrainz/Makefile b/audio/musicbrainz/Makefile
index 2e06a0803af..d218aef7f91 100644
--- a/audio/musicbrainz/Makefile
+++ b/audio/musicbrainz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 16:30:42 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/22 07:15:00 grant Exp $
 
 DISTNAME=	libmusicbrainz-2.0.0
 PKGNAME=	${DISTNAME:S/lib//}
@@ -9,7 +9,7 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://www.musicbrainz.org/
 COMMENT=	Second generation incarnation of the CD Index
 
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index ec7e882b7c2..2c81b91371f 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:07:43 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/22 07:15:00 grant Exp $
 #
 
 DISTNAME=	openal-20030724
@@ -14,7 +14,7 @@ COMMENT=	3D positional spatialized sound library
 WRKSRC=		${WRKDIR}/${DISTNAME}/linux
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 USE_MAKEINFO=	YES
 INFO_FILES=	openal.info
diff --git a/audio/rio500/Makefile b/audio/rio500/Makefile
index 7aa31b1c237..41e1cd65a80 100644
--- a/audio/rio500/Makefile
+++ b/audio/rio500/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:23:11 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/22 07:15:00 grant Exp $
 #
 
 DISTNAME=	rio500-0.7
@@ -11,7 +11,7 @@ HOMEPAGE=	http://rio500.sourceforge.net/
 COMMENT=	Utilities to manage your Diamond Rio 500 MP3 player
 
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-devicepath=/dev --with-deviceentry=urio0
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index e2aac81c155..b2f1081a9bd 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/10/24 02:01:56 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/22 07:15:00 grant Exp $
 
 DISTNAME=	rosegarden-2.1pl4
 PKGNAME=	rosegarden-2.1.4
@@ -11,7 +11,7 @@ COMMENT=	Notation editor & MIDI sequencer
 
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 MAKE_ENV+=	GCC=yes
 USE_X11BASE=	YES
 
diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile
index 9e9d119d2c0..6d1438cce0d 100644
--- a/audio/sidplay/Makefile
+++ b/audio/sidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/21 16:30:45 martti Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/22 07:15:00 grant Exp $
 #
 
 DISTNAME=	sidplay-base-1.0.9
@@ -13,7 +13,7 @@ COMMENT=	Tools for playing sidtunes
 
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 .include "../../audio/libsidplay/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index ee3dc7b7a90..91b0ae41510 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/22 07:15:00 grant Exp $
 #
 
 DISTNAME=		SpiralLoops-2.0.0
@@ -17,7 +17,7 @@ ONLY_FOR_PLATFORM=	*-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \
 
 USE_BUILDLINK2=		yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 MAKE_ENV+=		CXXFLAGS="${CXXFLAGS}"
 CXXFLAGS+=		-DDEVOSSAUDIO="\"\\\"$(DEVOSSAUDIO)\\\"\""
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index 7787cef0ae7..49811c8824c 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/22 07:15:01 grant Exp $
 #
 
 DISTNAME=		SpiralSynth-0.1.7
@@ -17,7 +17,7 @@ ONLY_FOR_PLATFORM=	*-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \
 
 USE_BUILDLINK2=		yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 MAKE_ENV+=		CXXFLAGS="${CXXFLAGS}"
 CXXFLAGS+=		-DDEVOSSAUDIO="\"\\\"$(DEVOSSAUDIO)\\\"\""
diff --git a/audio/streamtuner-local/Makefile b/audio/streamtuner-local/Makefile
index 495de2deaca..7de44e38da8 100644
--- a/audio/streamtuner-local/Makefile
+++ b/audio/streamtuner-local/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:34 reed Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/22 07:15:01 grant Exp $
 #
 
 DISTNAME=	streamtuner-local-0.2.1
@@ -13,7 +13,7 @@ COMMENT=	Streamtuner plugin providing access to your local MP3 repository
 USE_BUILDLINK2=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_X11=	YES
 
 SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 2438e594d95..f62ad5ab39b 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:34 reed Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/22 07:15:01 grant Exp $
 #
 
 DISTNAME=	streamtuner-${DIST_VER}
@@ -14,7 +14,7 @@ DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index a03e13224f8..866ee3edadf 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/12/08 14:41:38 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/22 07:15:01 grant Exp $
 #
 
 DISTNAME=	sweep-0.8.2
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 
diff --git a/audio/toolame/Makefile b/audio/toolame/Makefile
index e67e6be2dd6..9ee9c74091a 100644
--- a/audio/toolame/Makefile
+++ b/audio/toolame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 16:30:48 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/22 07:15:01 grant Exp $
 #
 
 DISTNAME=	toolame-02l
@@ -13,7 +13,7 @@ COMMENT=	Optimized MPEG 1/2 layer 2 audio encoder
 LICENSE=	fee-based-commercial-use
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 TOOLAME_ARCH?=
 
diff --git a/audio/tremor-tools/Makefile b/audio/tremor-tools/Makefile
index 894877fb572..2f112214e52 100644
--- a/audio/tremor-tools/Makefile
+++ b/audio/tremor-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/12 10:36:49 cjep Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/22 07:15:01 grant Exp $
 
 DISTNAME=	vorbis-tools-1.0
 PKGNAME=	tremor-tools-1.0.0.8
@@ -18,7 +18,7 @@ CONFLICTS=	vorbis-[0-9]*
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 CONFIGURE_ARGS+=	--with-ogg-prefix=${BUILDLINK_PREFIX.libogg}	\
 			--with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \
diff --git a/audio/tremor/Makefile b/audio/tremor/Makefile
index 0636148598f..ab253d23697 100644
--- a/audio/tremor/Makefile
+++ b/audio/tremor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:07:43 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/22 07:15:01 grant Exp $
 
 DISTNAME=	tremor_snapshot_030406
 PKGNAME=	tremor-1.0.2
@@ -14,7 +14,7 @@ COMMENT=	Fixed point decoding library for the Ogg Vorbis audio encoding format
 WRKSRC=         ${WRKDIR}/Tremor
 AUTOMAKE_REQD=		1.4
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 #LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile
index eed4e514c85..c6d56a8d923 100644
--- a/audio/wmusic/Makefile
+++ b/audio/wmusic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/13 13:50:30 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/22 07:15:01 grant Exp $
 
 DISTNAME=	wmusic-1.4.7
 PKGREVISION=	2
@@ -12,7 +12,7 @@ COMMENT=	WindowMaker dockable remote for xmms
 USE_BUILDLINK2=	yes
 USE_X11=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/wmusic ${PREFIX}/bin
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index 482c923d550..141a2ab6e35 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/20 12:07:43 agc Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/22 07:15:01 grant Exp $
 # FreeBSD: ports/audio/xamp/Makefile,v 1.5 1999/08/25 04:36:22 obrien Exp
 #
 
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/xamp-0.8/xamp-0.8g
 DIST_SUBDIR=	xamp
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CXXFLAGS="${CFLAGS}"
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_X11BASE=	yes
 
 EVAL_PREFIX+=	QT1DIR=qt1
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index 5e8c5af0643..0e8efef6574 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/22 07:15:01 grant Exp $
 #
 
 DISTNAME=	flac-1.1.0
@@ -12,7 +12,7 @@ HOMEPAGE=	http://flac.sourceforge.net/
 COMMENT=	FLAC XMMS plugin
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 
 USE_LIBTOOL=		yes
diff --git a/audio/xmms-madspin/Makefile b/audio/xmms-madspin/Makefile
index fde183f8562..42e7c9c5f55 100644
--- a/audio/xmms-madspin/Makefile
+++ b/audio/xmms-madspin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:24:13 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/22 07:15:01 grant Exp $
 #
 
 DISTNAME=	madspin-0.05
@@ -15,7 +15,7 @@ USE_BUILDLINK2=	YES
 USE_LIBTOOL=	YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=	YES
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 .include "../../audio/xmms/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
diff --git a/audio/xmms-neato/Makefile b/audio/xmms-neato/Makefile
index 72794ee444a..3bf67b98795 100644
--- a/audio/xmms-neato/Makefile
+++ b/audio/xmms-neato/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:24:14 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/22 07:15:01 grant Exp $
 #
 
 DISTNAME=	neato
@@ -13,7 +13,7 @@ COMMENT=	Circle effect XMMS plugin
 
 USE_BUILDLINK2=	yes
 USE_X11=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index 1cc31a6a223..5175ace0c4e 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/01/28 22:03:05 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/22 07:15:01 grant Exp $
 # FreeBSD: ports/audio/xmp/Makefile,v 1.5 2000/04/08 21:24:59 mharo Exp
 #
 
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=--disable-alsa \
 		--sysconfdir=${PKG_SYSCONFDIR}
 
 USE_X11=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 EGDIR=		${PREFIX}/share/examples/xmp
 CONF_FILES=	${EGDIR}/xmp-modules.conf ${PKG_SYSCONFDIR}/xmp-modules.conf
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index b461592786f..a97a985e76b 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/01/20 12:07:43 agc Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/22 07:15:01 grant Exp $
 #
 
 DISTNAME=	xsidplay-1_5_4
@@ -19,7 +19,7 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
 
 CONFIGURE_ARGS+=	--with-qt-dir=${QTDIR}
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index c82b1c544cd..59be12c0610 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:34 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/22 07:15:01 grant Exp $
 
 DISTNAME=	yamt-0.5
 PKGREVISION=	4
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11BASE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 
 .include "../../x11/gnome-libs/buildlink2.mk"