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

35 files changed, 70 insertions, 70 deletions

diff --git a/multimedia/alevt/Makefile b/multimedia/alevt/Makefile
index f8c8f7cd9b2..d462dd12da8 100644
--- a/multimedia/alevt/Makefile
+++ b/multimedia/alevt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/03/29 16:10:22 magick Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:18 jlam Exp $
 
 DISTNAME=	alevt-1.6.0
 PKGREVISION=	2
@@ -17,7 +17,7 @@ ONLY_FOR_PLATFORM=	NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
 
 USE_DIRS+=	xdg-1.1
 USE_X11BASE=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index a5c68d87cf9..4111cbe7ae3 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/21 21:43:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:18 jlam Exp $
 #
 
 DISTNAME=	avidemux-2.0.18
@@ -13,7 +13,7 @@ COMMENT=	Graphical video editing program
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 
 CFLAGS+=		-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index f526ba4e84b..7bdcc598189 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:18 jlam Exp $
 
 DISTNAME=		dvdauthor-0.6.10
 PKGREVISION=	2
@@ -10,7 +10,7 @@ HOMEPAGE=		http://dvdauthor.sourceforge.net/
 COMMENT=		Tools to assist DVD authoring
 
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS=		make
+USE_TOOLS=		gmake
 
 .include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 2fbbc30197a..7b1c2653eef 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:18 jlam Exp $
 
 DISTNAME=	ffmpeg-0.4.8
 PKGREVISION=	3
@@ -10,7 +10,7 @@ HOMEPAGE=	http://ffmpeg.sourceforge.net/
 COMMENT=	MPEG decoding, encoding and streaming software
 
 HAS_CONFIGURE=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LIBTOOL=	YES
 USE_PKGINSTALL=	YES
 
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 600109a63a4..6fda0d36354 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:18 jlam Exp $
 
 DISTNAME=	fxtv-1.03
 PKGREVISION=	8
@@ -11,7 +11,7 @@ HOMEPAGE=	http://people.freebsd.org/~rhh/fxtv/
 COMMENT=	TV display application for Brooktree 848 compatible TV cards
 
 USE_X11BASE=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 XAW_TYPE?=	3d
 
 SUBST_CLASSES+=		ossaudio
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 6a1ec25fdfe..ad812ec2bbf 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:18 jlam Exp $
 #
 
 DISTNAME=	gmencoder-0.1.0
@@ -17,7 +17,7 @@ DEPENDS+=       	mplayer>=0.90:../../multimedia/mplayer
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=       	gnome2-1.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index b5d2aed5c75..ac129c532fd 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/02 11:56:53 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:18 jlam Exp $
 
 DISTNAME=		gnome-media-2.10.2
 CATEGORIES=		multimedia gnome
@@ -19,7 +19,7 @@ USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_X11=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PERL5=		build
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
diff --git a/multimedia/gst-plugins/Makefile.common b/multimedia/gst-plugins/Makefile.common
index 7a2aa073ff9..d7897020c22 100644
--- a/multimedia/gst-plugins/Makefile.common
+++ b/multimedia/gst-plugins/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile.common,v 1.18 2005/05/22 20:08:18 jlam Exp $
 #
 
 DISTNAME=		gst-plugins-0.8.8
@@ -18,7 +18,7 @@ PATCHDIR=		${.CURDIR}/../../multimedia/gst-plugins/patches
 BUILD_DEPENDS+=		nasm>=0.98.38:../../devel/nasm
 
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 7e24cddc0b7..fb76e188cfa 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/04 16:27:08 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:18 jlam Exp $
 #
 
 DISTNAME=		gstreamer-0.8.10
@@ -17,7 +17,7 @@ USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_X11=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PERL5=		build
 
 CONFIGURE_ARGS+=	--disable-plugin-builddir
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 80c6625a289..135d10d80ac 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:18 jlam Exp $
 #
 
 DISTNAME=	kmplayer-0.8.4b
@@ -16,7 +16,7 @@ DEPENDS+=		mencoder>=1.0rc3:../../multimedia/mencoder
 DEPENDS+=		xine-arts>=1rc0a:../../audio/xine-arts
 
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PERL5=		build
diff --git a/multimedia/libassetml/Makefile b/multimedia/libassetml/Makefile
index 33ec72746ae..ce4412c6ba3 100644
--- a/multimedia/libassetml/Makefile
+++ b/multimedia/libassetml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:18 jlam Exp $
 #
 
 DISTNAME=		libassetml-1.2.1
@@ -12,7 +12,7 @@ COMMENT=		Library for sharing image and audio files between projects
 BUILD_DEPENDS+=	texi2html-[0-9]*:../../textproc/texi2html
 
 USE_DIRS+=		gnome2-1.5	# share/gnome/help
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/multimedia/libdvbpsi/Makefile b/multimedia/libdvbpsi/Makefile
index a5661ba7c3f..7444dc6e4d5 100644
--- a/multimedia/libdvbpsi/Makefile
+++ b/multimedia/libdvbpsi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:20 jlam Exp $
 
 DISTNAME=	libdvbpsi-0.1.3
 PKGREVISION=	1
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.videolan.org/
 COMMENT=	PSI decoder and generator library for MPEG2 and DVB streams
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdvdplay/Makefile b/multimedia/libdvdplay/Makefile
index 092f4b27866..323b6752a8e 100644
--- a/multimedia/libdvdplay/Makefile
+++ b/multimedia/libdvdplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:20 jlam Exp $
 
 DISTNAME=	libdvdplay-1.0.1
 PKGREVISION=	2
@@ -10,7 +10,7 @@ HOMEPAGE=	http://developers.videolan.org/libdvdplay/
 COMMENT=	Simple API library designed for DVD navigation
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
 
 .include "../../multimedia/libdvdread/buildlink3.mk"
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index d6f3425f254..431c141322b 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:20 jlam Exp $
 
 DISTNAME=	libdvdread-0.9.4
 PKGREVISION=	1
@@ -12,7 +12,7 @@ COMMENT=	DVD access library, primarily used in Ogle
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
 
 MESSAGE_SUBST+=	PKGBASE=${PKGBASE}
diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile
index b77ca2115b1..49ef42801df 100644
--- a/multimedia/libmatroska/Makefile
+++ b/multimedia/libmatroska/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/18 00:57:21 salo Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:20 jlam Exp $
 #
 
 DISTNAME=	libmatroska-0.7.6
@@ -12,7 +12,7 @@ COMMENT=	Extensible open standard Audio/Video container format
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LANGUAGES=	c++
 
 NO_CONFIGURE=	yes
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index 3ec655edae4..6e92d3b9fd8 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:21 jlam Exp $
 
 DISTNAME=	mpeg2dec-0.4.0b
 PKGNAME=	libmpeg2-0.4.0b
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 WRKSRC=		${WRKDIR}/mpeg2dec-0.4.0
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
 
 PKGCONFIG_OVERRIDE+=    libmpeg2/convert/libmpeg2convert.pc.in
diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile
index 5fb5da39607..0266247ab52 100644
--- a/multimedia/libmpeg3/Makefile
+++ b/multimedia/libmpeg3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:21 jlam Exp $
 #
 
 DISTNAME=	libmpeg3-1.3
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+= --no-mmx --no-css
 .endif
 
 HAS_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 ONLY_FOR_COMPILER=	gcc
 
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 4e84c582faf..8e9e0b70d82 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:21 jlam Exp $
 
 DISTNAME=	mjpegtools-1.6.2
 PKGREVISION=	3
@@ -12,7 +12,7 @@ COMMENT=	Programs for compressing video streams
 DEPENDS+=		toolame>=02l:../../audio/toolame
 BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE=	libtool
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index e1da3a975e8..74f1e8eb976 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:22 jlam Exp $
 #
 
 .include "../../multimedia/mkvtoolnix/Makefile.dist"
@@ -8,7 +8,7 @@ HOMEPAGE=	http://www.bunkus.org/videotools/mkvtoolnix/
 COMMENT=	Set of tools to create, alter and inspect Matroska files
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 
 CONFIGURE_ARGS+=	--disable-gui
diff --git a/multimedia/mmg/Makefile b/multimedia/mmg/Makefile
index 39797a41adc..7ff63b8ea0f 100644
--- a/multimedia/mmg/Makefile
+++ b/multimedia/mmg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:22 jlam Exp $
 #
 
 .include "../../multimedia/mkvtoolnix/Makefile.dist"
@@ -11,7 +11,7 @@ COMMENT=        MKVtoolnix mkvmerge GUI
 DEPENDS+=	${DISTNAME}:../../multimedia/mkvtoolnix
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LANGUAGES=	c++
 USE_X11=	yes
 
diff --git a/multimedia/mpeg_encode/Makefile b/multimedia/mpeg_encode/Makefile
index ba5b3300c62..b6420b9b234 100644
--- a/multimedia/mpeg_encode/Makefile
+++ b/multimedia/mpeg_encode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:22 jlam Exp $
 #
 
 DISTNAME=	mpeg_encode-1.5b-src
@@ -12,7 +12,7 @@ HOMEPAGE=	http://bmrc.berkeley.edu/frame/research/mpeg/mpeg_encode.html
 COMMENT=	The Parallel Berkeley MPEG Encoder
 
 WRKSRC=			${WRKDIR}/mpeg_encode
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 post-build:
 	@cd ${WRKSRC}/convert && \
diff --git a/multimedia/mplayer-plugin-firefox/Makefile.common b/multimedia/mplayer-plugin-firefox/Makefile.common
index 229dea927e0..f44af88baf4 100644
--- a/multimedia/mplayer-plugin-firefox/Makefile.common
+++ b/multimedia/mplayer-plugin-firefox/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/04/19 15:12:24 wiz Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:22 jlam Exp $
 #
 
 DISTNAME=		mplayerplug-in-2.70
@@ -14,7 +14,7 @@ DEPENDS+=		mplayer>=0.92:../../multimedia/mplayer
 
 WRKSRC=			${WRKDIR}/mplayerplug-in
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LANGUAGES+=		c++
 USE_PKGINSTALL=		yes
 USE_X11=		yes
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index 5e9b440f0ee..e5d7de6945d 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/04/18 17:49:41 drochner Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/05/22 20:08:22 jlam Exp $
 
 MPLAYER_DIST_VERSION=	1.0pre7
 
@@ -32,7 +32,7 @@ NO_BIN_ON_CD=		"a dependency is restricted"
 NO_BIN_ON_FTP=		"a dependency is restricted"
 NO_SRC_ON_FTP=		"prohibited by USAs DMCA"
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 HAS_CONFIGURE=		YES
 
 PTHREAD_OPTS+=		require
diff --git a/multimedia/mplex/Makefile b/multimedia/mplex/Makefile
index 7661c007cf0..a910d8acf5b 100644
--- a/multimedia/mplex/Makefile
+++ b/multimedia/mplex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:22 jlam Exp $
 
 DISTNAME=	mjpegtools-1.6.2
 PKGNAME=	mplex-1.6.2
@@ -13,7 +13,7 @@ COMMENT=	Multiplexes MPEG component streams into system layers
 BUILD_DEPENDS+=	nasm>=0.98:../../devel/nasm
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index d26992bdc70..3ad1678bbaa 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:22 jlam Exp $
 
 DISTNAME=	ogle-0.9.2
 PKGREVISION=	2
@@ -19,7 +19,7 @@ ONLY_FOR_PLATFORM+=	NetBSD-*-x86_64
 ONLY_FOR_PLATFORM+=	Linux-*-*
 ONLY_FOR_PLATFORM+=	SunOS-*-*
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_X11=		yes
 
diff --git a/multimedia/ogle_gui/Makefile b/multimedia/ogle_gui/Makefile
index c58545fa898..61cb3f8293a 100644
--- a/multimedia/ogle_gui/Makefile
+++ b/multimedia/ogle_gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:22 jlam Exp $
 
 DISTNAME=	ogle_gui-0.9.2
 PKGREVISION=	4
@@ -11,7 +11,7 @@ COMMENT=	GUI for the Ogle DVD player
 
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 
 GNU_CONFIGURE=		yes
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
index 75c4cdcfd5b..be5f7314499 100644
--- a/multimedia/openquicktime/Makefile
+++ b/multimedia/openquicktime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:22 jlam Exp $
 #
 
 DISTNAME=		${PKGNAME_NOREV}-src
@@ -13,7 +13,7 @@ HOMEPAGE=		http://www.openquicktime.org/
 COMMENT=		Portable library for handling QuickTime(TM) media files
 
 USE_PKGLOCALEDIR=	yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ENV+=		my_cv_comment=""
diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile
index 20962848ead..a2af77c4b06 100644
--- a/multimedia/smpeg-xmms/Makefile
+++ b/multimedia/smpeg-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:22 jlam Exp $
 #
 
 DISTNAME=	smpeg-xmms-0.3.5
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.xmms.org/
 COMMENT=	MPEG video plugin using SDL/smpeg as the backend
 
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 
 .include "../../multimedia/smpeg/buildlink3.mk"
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index 021eab5b87c..bb873351564 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:22 jlam Exp $
 #
 
 DISTNAME=	smpeg-0.4.4
@@ -13,7 +13,7 @@ COMMENT=	SDL MPEG Player Library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_X11=	yes
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index fbd38802e83..520ca1602be 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/05/08 15:14:28 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:22 jlam Exp $
 #
 
 DISTNAME=	totem-1.0.2
@@ -15,7 +15,7 @@ PLIST_SRC=	${.CURDIR}/../../multimedia/totem/PLIST
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index a8f21eae153..98341ad2941 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:22 jlam Exp $
 
 DISTNAME=	transcode-0.6.12
 PKGREVISION=	6
@@ -12,7 +12,7 @@ COMMENT=	Command line video-stream processing tool
 
 BUILD_DEPENDS+=		nasm>=0.98.36:../../devel/nasm
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE=	libtool
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 952516421c3..502215ec539 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:23 jlam Exp $
 #
 
 DISTNAME=		vlc-${VLC_VER}
@@ -11,7 +11,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.videolan.org/
 COMMENT=		VideoLAN Client
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/multimedia/vls/Makefile b/multimedia/vls/Makefile
index ddf25579419..86b053e80d6 100644
--- a/multimedia/vls/Makefile
+++ b/multimedia/vls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:23 jlam Exp $
 #
 
 DISTNAME=		vls-0.5.6
@@ -10,7 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.videolan.org/
 COMMENT=		VideoLAN Server
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index e92f8789760..19a0ae78856 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:23 jlam Exp $
 #
 
 DISTNAME=	xawtv_3.90
@@ -13,7 +13,7 @@ COMMENT=	TV application for Brooktree 848 compatible cards
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11=		YES
 USE_PERL5=		build
 
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index d0d65a3300e..26aa6d059b3 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/05/10 00:16:42 reed Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/05/22 20:08:23 jlam Exp $
 #
 
 DISTNAME=		xine-lib-1.0.1
@@ -21,7 +21,7 @@ USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	libtool libtool-nofpic
 PKGCONFIG_OVERRIDE=	misc/libxine.pc.in
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 CONFIGURE_ARGS+=	--with-w32-path='${PREFIX}/lib/win32'
 CONFIGURE_ARGS+=	--without-external-ffmpeg --disable-ffmpegtest