replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make.

68 files changed, 136 insertions, 136 deletions

diff --git a/graphics/3DKit/Makefile.common b/graphics/3DKit/Makefile.common
index 259c637fa73..de9d88ad443 100644
--- a/graphics/3DKit/Makefile.common
+++ b/graphics/3DKit/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2003/07/17 21:39:51 grant Exp $
+# $NetBSD: Makefile.common,v 1.5 2004/01/24 15:46:42 grant Exp $
 #
 
 DISTNAME=	3DKit-0.3.1r2
@@ -15,6 +15,6 @@ DESCR_SRC?=	${.CURDIR}/../../graphics/3DKit/DESCR
 
 NO_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_X11=	YES
 MAKEFILE=	GNUmakefile
diff --git a/graphics/ImageViewer/Makefile b/graphics/ImageViewer/Makefile
index 280c4129818..fdb5eb3e16e 100644
--- a/graphics/ImageViewer/Makefile
+++ b/graphics/ImageViewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/23 21:50:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/24 15:46:42 grant Exp $
 #
 
 DISTNAME=	ImageViewer-0.6.0
@@ -13,7 +13,7 @@ COMMENT=	GNUstep image display application
 WRKSRC=		${WRKDIR}/ImageViewer
 NO_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_X11=	YES
 MAKEFILE=	GNUmakefile
 
diff --git a/graphics/Ngraph/Makefile b/graphics/Ngraph/Makefile
index 05d83da6712..9f161dc823c 100644
--- a/graphics/Ngraph/Makefile
+++ b/graphics/Ngraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/11/08 10:13:10 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 15:46:42 grant Exp $
 #
 
 DISTNAME=	Ngraph-6.3.20-src
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_BUILDLINK2=		yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 post-extract:
 	${GTAR} -C ${WRKSRC}/combo -xzf ${DISTDIR}/ileaf-widgets.tar.Z
diff --git a/graphics/alevt/Makefile b/graphics/alevt/Makefile
index 13aa72ae77b..0b4c91bfc81 100644
--- a/graphics/alevt/Makefile
+++ b/graphics/alevt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/03/13 17:37:03 fredb Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 15:46:42 grant Exp $
 
 DISTNAME=	alevt-1.6.0
 PKGREVISION=	1
@@ -16,7 +16,7 @@ ONLY_FOR_PLATFORM=	NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
 			NetBSD-1.5_ALPHA-* NetBSD-1.[5-9]*-*
 
 USE_X11BASE=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index aec9a468a7e..12ecd45ebaa 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:41 reed Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 15:46:42 grant Exp $
 #
 
 DISTNAME=		aqsis-0.6.4
@@ -13,7 +13,7 @@ COMMENT=		Renderman clone
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11=		yes
 
 USE_BUILDLINK2=		yes
diff --git a/graphics/avi-xmms/Makefile b/graphics/avi-xmms/Makefile
index d63286cbebd..b50a2db625a 100644
--- a/graphics/avi-xmms/Makefile
+++ b/graphics/avi-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/08/28 20:05:17 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 15:46:42 grant Exp $
 #
 
 DISTNAME=	avi-xmms-1.2.2
@@ -14,7 +14,7 @@ COMMENT=	Avifile and SDL based video plugin for XMMS
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
diff --git a/graphics/avidemux/Makefile b/graphics/avidemux/Makefile
index 3d06827db11..2442e76e069 100644
--- a/graphics/avidemux/Makefile
+++ b/graphics/avidemux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/23 21:50:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 15:46:42 grant Exp $
 #
 
 DISTNAME=	avidemux-2.0.18
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile
index 58341f03a19..525ee9c005d 100644
--- a/graphics/avifile-devel/Makefile
+++ b/graphics/avifile-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/01/20 12:18:15 agc Exp $
+# $NetBSD: Makefile,v 1.38 2004/01/24 15:46:42 grant Exp $
 #
 
 DISTNAME=	avifile-0.6.20010814
@@ -23,7 +23,7 @@ WRKSRC=			${WRKDIR}/avifile-0.6
 AUTOMAKE_REQD=		1.4
 USE_BUILDLINK2=		YES
 USE_X11=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/graphics/avifile/Makefile b/graphics/avifile/Makefile
index c2435c8ab8a..8ae4ca64fbf 100644
--- a/graphics/avifile/Makefile
+++ b/graphics/avifile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/07/26 21:41:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 15:46:42 grant Exp $
 
 DISTNAME=	avifile-0.53.5
 PKGREVISION=	2
@@ -16,7 +16,7 @@ DEPENDS=	win32-codecs>=010122:../../graphics/win32-codecs
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index f8a51b44265..c906bdc8ad4 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/01/10 20:25:10 jschauma Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/24 15:46:43 grant Exp $
 #
 
 DISTNAME=		blender-2.31a
@@ -14,7 +14,7 @@ COMMENT=		Fully integrated 3D graphics creation suite
 
 USE_X11=		YES
 HAS_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index dc9d5a6b797..8397314c8ce 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/08/31 01:24:36 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/24 15:46:43 grant Exp $
 
 DISTNAME=		camlimages-2.11
 CATEGORIES=		graphics
@@ -12,7 +12,7 @@ COMMENT=		Image processing library for Objective Caml
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 PLIST_SRC=	${PKGDIR}/PLIST
 
diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index 868a4156246..88077b56821 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2003/11/30 22:58:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.35 2004/01/24 15:46:43 grant Exp $
 
 DISTNAME=		ClanLib-0.4.4
 PKGREVISION=		5
@@ -11,7 +11,7 @@ COMMENT=		The ClanLib Game SDK
 
 USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
 
diff --git a/graphics/compface/Makefile b/graphics/compface/Makefile
index 59de5c59583..d068b8e47e7 100644
--- a/graphics/compface/Makefile
+++ b/graphics/compface/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/09/21 12:13:17 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 15:46:43 grant Exp $
 
 DISTNAME=	compface-1.4
 CATEGORIES=	graphics
@@ -12,6 +12,6 @@ CONFLICTS=	faces-[0-9]*
 
 USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 938655ec404..b84f8e0ca12 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/01/23 21:50:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/24 15:46:43 grant Exp $
 
 DISTNAME=	dia-0.92.2
 PKGREVISION=	4
@@ -14,7 +14,7 @@ DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 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/graphics/dvdview/Makefile b/graphics/dvdview/Makefile
index 50540741a8f..c0877fbde28 100644
--- a/graphics/dvdview/Makefile
+++ b/graphics/dvdview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:40:21 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/24 15:46:43 grant Exp $
 
 DISTNAME=	dvdview-1.2.2
 PKGREVISION=	1
@@ -10,7 +10,7 @@ HOMEPAGE=	http://rachmaninoff.informatik.uni-mannheim.de/dvdview/
 COMMENT=	Software only MPEG-1/2 video decoder
 
 GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_X11=	YES
 USE_BUILDLINK2=	yes
 
diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile
index 16c7c733739..6e2b05f3463 100644
--- a/graphics/dx/Makefile
+++ b/graphics/dx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/03 18:49:42 reed Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/24 15:46:43 grant Exp $
 
 DISTNAME=	dx-4.2.0
 PKGREVISION=	3
@@ -11,7 +11,7 @@ COMMENT=	Open Visualization Data Explorer
 
 USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-javadx
 CONFIGURE_ENV+=		LEX="flex -l"
diff --git a/graphics/dxsamples/Makefile b/graphics/dxsamples/Makefile
index d8fec4e9638..189d0b50984 100644
--- a/graphics/dxsamples/Makefile
+++ b/graphics/dxsamples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:40:23 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 15:46:43 grant Exp $
 
 DISTNAME=	dxsamples-4.2.0
 CATEGORIES=	graphics
@@ -11,7 +11,7 @@ COMMENT=	Sample data for Open Visualization Data Explorer
 DEPENDS+=	dx-[0-9]*:../../graphics/dx
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_X11BASE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ee/Makefile b/graphics/ee/Makefile
index b146edae77a..7d6f437b783 100644
--- a/graphics/ee/Makefile
+++ b/graphics/ee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2004/01/03 18:49:42 reed Exp $
+# $NetBSD: Makefile,v 1.35 2004/01/24 15:46:43 grant Exp $
 
 DISTNAME=		ee-0.3.12
 PKGREVISION=		8
@@ -14,7 +14,7 @@ DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
 USE_BUILDLINK2=		# defined
 USE_PKGLOCALEDIR=	# defined
 USE_X11BASE=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index a67fbf9e1f5..76f9773b0a5 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/12 00:14:10 epg Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/24 15:46:43 grant Exp $
 
 DISTNAME=		eog-0.6
 PKGREVISION=		6
@@ -11,7 +11,7 @@ COMMENT=		Eye of GNOME: an image viewing and cataloging program
 
 GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 1b9736916ef..3d156c93cb7 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/01/23 21:50:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/24 15:46:43 grant Exp $
 #
 
 DISTNAME=	eog-2.5.1
@@ -16,7 +16,7 @@ DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		YES
 USE_X11=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 
diff --git a/graphics/ffmpeg/Makefile b/graphics/ffmpeg/Makefile
index a12cc3e0672..b38930bb6a5 100644
--- a/graphics/ffmpeg/Makefile
+++ b/graphics/ffmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:18:15 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/24 15:46:43 grant Exp $
 
 DISTNAME=	ffmpeg-0.4.5
 PKGREVISION=	2
@@ -14,7 +14,7 @@ BUILD_DEPENDS+=	nasm>=0.98:../../devel/nasm
 WRKSRC=		${WRKDIR}/ffmpeg
 HAS_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	YES
 MAKE_ENV+=	EXTRA_LIBS="${LIBGETOPT}" \
 		FFSERVER_CONF=${PKG_SYSCONFDIR}/ffserver.conf \
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index 6be89d74c1c..dd34a8a55d8 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/01/05 11:54:07 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/24 15:46:43 grant Exp $
 #
 
 DISTNAME=	freetype-2.1.5
@@ -20,7 +20,7 @@ COMMENT=	Font rendering engine and library API
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 CONFIGURE_DIRS=		${WRKSRC}/builds/unix
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include
diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile
index 16a39e1b9de..0f2a0fb2bc7 100644
--- a/graphics/fxtv/Makefile
+++ b/graphics/fxtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/01/03 18:49:42 reed Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/24 15:46:43 grant Exp $
 
 DISTNAME=	fxtv-1.03
 PKGREVISION=	4
@@ -15,7 +15,7 @@ COMMENT=	TV display application for Brooktree 848 compatible TV cards
 
 USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 XAW_TYPE?=	3d
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/graphics/g3d/Makefile b/graphics/g3d/Makefile
index 0a947cc383d..b0352db5375 100644
--- a/graphics/g3d/Makefile
+++ b/graphics/g3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/20 12:18:15 agc Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/24 15:46:43 grant Exp $
 #
 
 DISTNAME=	g3d-0.0.2
@@ -12,7 +12,7 @@ COMMENT=	3D modeller with a view of 3D modelling
 
 WRKSRC=		${WRKDIR}/g3d
 USE_LIBTOOL=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	yes
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index bd7373df802..d2f74049e44 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2003/07/17 21:40:44 grant Exp $
+# $NetBSD: Makefile.common,v 1.34 2004/01/24 15:46:43 grant Exp $
 #
 
 DISTNAME=		gdk-pixbuf-${VER}.0
@@ -13,7 +13,7 @@ HOMEPAGE=		http://www.gnome.org/
 VER=			0.22
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index fa1e57312ba..e8c2f1439d9 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/01/23 21:50:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/24 15:46:43 grant Exp $
 
 DISTNAME=	gimageview-0.2.24
 PKGREVISION=	9
@@ -15,7 +15,7 @@ USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/graphics/gimp-base/Makefile b/graphics/gimp-base/Makefile
index 9a22ccc3060..52f7f4f1b62 100644
--- a/graphics/gimp-base/Makefile
+++ b/graphics/gimp-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/01/20 22:08:32 snj Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/24 15:46:43 grant Exp $
 #
 
 DISTNAME=		gimp-1.2.5
@@ -22,7 +22,7 @@ USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/graphics/gimp-wideangle/Makefile b/graphics/gimp-wideangle/Makefile
index 4ffcc532242..5937e56e1ad 100644
--- a/graphics/gimp-wideangle/Makefile
+++ b/graphics/gimp-wideangle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:18:16 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 15:46:43 grant Exp $
 #
 
 DISTNAME=	wideangleFeb03
@@ -14,7 +14,7 @@ COMMENT=	GIMP plugin for wideangle lens distortions
 
 WRKSRC=		${WRKDIR}/wideangle
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 ALL_TARGET=	wideangle
 
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 66d3a76c9a0..901f58f4522 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/01/03 18:49:42 reed Exp $
+# $NetBSD: Makefile,v 1.34 2004/01/24 15:46:43 grant Exp $
 #
 
 DISTNAME=	giram-0.3.5
@@ -17,7 +17,7 @@ USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_PKGINSTALL=		YES
 USE_X11=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
diff --git a/graphics/gmencoder/Makefile b/graphics/gmencoder/Makefile
index 7ed68e982da..47c9ddeab7e 100644
--- a/graphics/gmencoder/Makefile
+++ b/graphics/gmencoder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/23 21:50:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/24 15:46:43 grant Exp $
 #
 
 DISTNAME=	gmencoder-0.1.0
@@ -18,7 +18,7 @@ DEPENDS+=       	mplayer>=0.90:../../graphics/mplayer
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
diff --git a/graphics/gnome-icon-theme/Makefile b/graphics/gnome-icon-theme/Makefile
index 3aa96e4c369..1343b27323a 100644
--- a/graphics/gnome-icon-theme/Makefile
+++ b/graphics/gnome-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/12/03 01:52:30 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 15:46:43 grant Exp $
 #
 
 DISTNAME=		gnome-icon-theme-1.0.9
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PERL5=		build
 USE_PKGLOCALEDIR=	yes
 
diff --git a/graphics/gnome-iconedit/Makefile b/graphics/gnome-iconedit/Makefile
index a7dfb096d91..1158be158f3 100644
--- a/graphics/gnome-iconedit/Makefile
+++ b/graphics/gnome-iconedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/03 18:49:43 reed Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/24 15:46:43 grant Exp $
 #
 
 DISTNAME=		gnome-iconedit-1.2.0
@@ -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
 
 post-configure:
diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile
index 2cf1db73da4..0d35142c1a6 100644
--- a/graphics/gpaint/Makefile
+++ b/graphics/gpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/03 18:49:43 reed Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 15:46:43 grant Exp $
 #
 
 DISTNAME=	gpaint-0.2
@@ -12,7 +12,7 @@ COMMENT=	Simple, easy-to-use paint program for GNOME
 
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_GNU_GETTEXT=	YES
 USE_X11BASE=		YES
 
diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile
index a07a1e59829..4ce7de5e258 100644
--- a/graphics/gri/Makefile
+++ b/graphics/gri/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/08/09 10:53:28 seb Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/24 15:46:43 grant Exp $
 
 DISTNAME=		gri-2.12.5
 CATEGORIES=		graphics
@@ -13,7 +13,7 @@ BUILD_DEPENDS+=		ImageMagick-[0-9]*:../../graphics/ImageMagick
 
 GNU_CONFIGURE=		yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=	 	yes
 USE_PERL5=		build
 REPLACE_PERL=		gri_merge gri_unpage
diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile
index 899effd415e..99a812b62e5 100644
--- a/graphics/gtkglext/Makefile
+++ b/graphics/gtkglext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/03 18:49:43 reed Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/24 15:46:43 grant Exp $
 #
 
 DISTNAME=		gtkglext-0.7.1
@@ -14,7 +14,7 @@ COMMENT=		OpenGL extension to GTK
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_PERL5=		build
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_LIBTOOL=		YES
 
diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile
index b48282c09f9..407d656ff4a 100644
--- a/graphics/gtksee/Makefile
+++ b/graphics/gtksee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/03 18:49:43 reed Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 15:46:43 grant Exp $
 #
 
 DISTNAME=		gtksee-0.5.2
@@ -15,7 +15,7 @@ BUILDLINK_DEPENDS.gtk?=	gtk+>=1.2.10
 
 GNU_CONFIGURE=		YES
 USE_X11=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 
diff --git a/graphics/hermes/Makefile b/graphics/hermes/Makefile
index a57bfcdd815..11fd8a07cf5 100644
--- a/graphics/hermes/Makefile
+++ b/graphics/hermes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/20 12:18:16 agc Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/24 15:46:43 grant Exp $
 
 DISTNAME=		Hermes-1.3.3
 CATEGORIES=		graphics
@@ -17,6 +17,6 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		yes
 CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
 CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index a4a6221589f..661004ba13a 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2004/01/22 11:04:59 jlam Exp $
+# $NetBSD: Makefile,v 1.82 2004/01/24 15:46:43 grant Exp $
 #
 
 DISTNAME=		imlib-1.9.14
@@ -17,7 +17,7 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/imlib.pc.in
 GNU_CONFIGURE=		yes
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 UNLIMIT_RESOURCES=	datasize
 
 CPPFLAGS+=		-DENABLE_NLS
diff --git a/graphics/kmplayer/Makefile b/graphics/kmplayer/Makefile
index 30b511790f8..4d657183008 100644
--- a/graphics/kmplayer/Makefile
+++ b/graphics/kmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/23 21:50:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 15:46:43 grant Exp $
 #
 
 DISTNAME=	kmplayer-0.8.2rc5
@@ -19,7 +19,7 @@ DEPENDS+=		xine-arts>=1rc0a:../../audio/xine-arts
 WRKSRC=			${WRKDIR}/kmplayer
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PERL5=		build
 
diff --git a/graphics/libdvbpsi/Makefile b/graphics/libdvbpsi/Makefile
index 04665ab11d0..35b0c9ec891 100644
--- a/graphics/libdvbpsi/Makefile
+++ b/graphics/libdvbpsi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 15:46:43 grant Exp $
 
 DISTNAME=	libdvbpsi-0.1.3
 CATEGORIES=	misc
@@ -9,7 +9,7 @@ HOMEPAGE=	http://www.videolan.org/
 COMMENT=	PSI decoder and generator library for MPEG2 and DVB streams
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 12fd8f50658..4783c188f5e 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/23 21:50:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 15:46:44 grant Exp $
 #
 
 DISTNAME=		libgnomecanvas-2.4.0
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT=	yes
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11=		yes
 
 USE_LIBTOOL=		yes
diff --git a/graphics/libmpeg2/Makefile b/graphics/libmpeg2/Makefile
index 65277c68bce..71c56fd8131 100644
--- a/graphics/libmpeg2/Makefile
+++ b/graphics/libmpeg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 21:47:15 snj Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:46:44 grant Exp $
 
 DISTNAME=	mpeg2dec-0.4.0
 PKGNAME=	libmpeg2-0.4.0
@@ -10,7 +10,7 @@ HOMEPAGE=	http://libmpeg2.sourceforge.net/
 COMMENT=	library for decoding mpeg-2 and mpeg-1 video streams
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 USE_BUILDLINK2=	yes
 
diff --git a/graphics/mgl/Makefile b/graphics/mgl/Makefile
index 282302d05c0..bb26995591a 100644
--- a/graphics/mgl/Makefile
+++ b/graphics/mgl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/10/14 16:22:21 salo Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/24 15:46:44 grant Exp $
 #
 
 DISTNAME=       mgl2-alpha-020
@@ -13,7 +13,7 @@ COMMENT=	Graphics library for NEC Mobilegear/PocketBSD, NetBSD/hpcmips
 
 DEPENDS+=	mglfonts>=0.1:../../fonts/mglfonts
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_BUILDLINK2=	yes
 USE_X11=	yes
 
diff --git a/graphics/mjpegtools/Makefile b/graphics/mjpegtools/Makefile
index a677528a365..0ca02ba90ea 100644
--- a/graphics/mjpegtools/Makefile
+++ b/graphics/mjpegtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/24 10:54:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/24 15:46:44 grant Exp $
 
 DISTNAME=	mjpegtools-1.6.1.93
 CATEGORIES=	graphics
@@ -12,7 +12,7 @@ DEPENDS+=		toolame>=02l:../../audio/toolame
 BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/graphics/mpeg_encode/Makefile b/graphics/mpeg_encode/Makefile
index 05c87100af2..602be4c9ea7 100644
--- a/graphics/mpeg_encode/Makefile
+++ b/graphics/mpeg_encode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:18:16 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 15:46:44 grant Exp $
 #
 
 DISTNAME=	mpeg_encode-1.5b-src
@@ -13,7 +13,7 @@ COMMENT=	The Parallel Berkeley MPEG Encoder
 
 WRKSRC=			${WRKDIR}/mpeg_encode
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 post-build:
 	@cd ${WRKSRC}/convert && \
diff --git a/graphics/mplayer-share/Makefile.common b/graphics/mplayer-share/Makefile.common
index 99029a0eb78..60c326dc0a8 100644
--- a/graphics/mplayer-share/Makefile.common
+++ b/graphics/mplayer-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.48 2003/12/12 22:09:02 wiz Exp $
+# $NetBSD: Makefile.common,v 1.49 2004/01/24 15:46:44 grant Exp $
 #
 
 MPLAYER_DIST_VERSION=	1.0pre3
@@ -25,7 +25,7 @@ NO_BIN_ON_FTP=		"a dependency is restricted"
 NO_SRC_ON_FTP=		"prohibited by USAs DMCA"
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 HAS_CONFIGURE=		YES
 
 PTHREAD_OPTS+=		require
diff --git a/graphics/mplex/Makefile b/graphics/mplex/Makefile
index c37599cf6ee..cd387901325 100644
--- a/graphics/mplex/Makefile
+++ b/graphics/mplex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/12/30 17:27:31 cjep Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 15:46:44 grant Exp $
 
 DISTNAME=	mjpegtools-1.6.0
 PKGNAME=	mplex-1.6.0
@@ -11,7 +11,7 @@ COMMENT=	Multiplexes MPEG component streams into system layers
 
 BUILD_DEPENDS+=	nasm>=0.98:../../devel/nasm
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_GCC_SHLIB=	yes
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 64672f622fa..ec315c98de2 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2004/01/24 12:59:50 kristerw Exp $
+# $NetBSD: Makefile,v 1.86 2004/01/24 15:46:44 grant Exp $
 
 DISTNAME=	netpbm-10.11.8
 PKGREVISION=	1
@@ -13,7 +13,7 @@ COMMENT=	Toolkit for conversion of images between different formats
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_PERL5=	yes
 
 INSTALL_TARGET=	install-dev install-run
diff --git a/graphics/ogle/Makefile b/graphics/ogle/Makefile
index 429bd49a744..f8f7ea14f25 100644
--- a/graphics/ogle/Makefile
+++ b/graphics/ogle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/01/23 21:50:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2004/01/24 15:46:44 grant Exp $
 
 DISTNAME=	ogle-0.9.2
 PKGREVISION=	1
@@ -17,7 +17,7 @@ ONLY_FOR_PLATFORM+=	NetBSD-1.6Z*-alpha NetBSD-[2-9]*-alpha
 
 USE_BUILDLINK2=		yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
diff --git a/graphics/ogle_gui/Makefile b/graphics/ogle_gui/Makefile
index 2b862247ef7..872fe26fe5c 100644
--- a/graphics/ogle_gui/Makefile
+++ b/graphics/ogle_gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/01/23 21:50:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/24 15:46:44 grant Exp $
 
 DISTNAME=	ogle_gui-0.9.2
 PKGREVISION=	2
@@ -12,7 +12,7 @@ COMMENT=	GUI for the Ogle DVD player
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--bindir=${PREFIX}/lib/ogle
diff --git a/graphics/openptc/Makefile b/graphics/openptc/Makefile
index 3a97e852429..7832414759c 100644
--- a/graphics/openptc/Makefile
+++ b/graphics/openptc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:18:16 agc Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 15:46:44 grant Exp $
 
 DISTNAME=		OpenPTC-x11-1.0.0-2
 PKGNAME=		OpenPTC-X11-1.0.02
@@ -12,7 +12,7 @@ COMMENT=		Prometheus Truecolour for X11
 WRKSRC=			${WRKDIR}/OpenPTC-x11-1.0.0
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11BASE=		yes
 
 BUILDLINK_DEPENDS.Hermes=	Hermes>=1.3.2nb1
diff --git a/graphics/openquicktime/Makefile b/graphics/openquicktime/Makefile
index 05440ecd67b..8586e7a3adc 100644
--- a/graphics/openquicktime/Makefile
+++ b/graphics/openquicktime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 16:51:48 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 15:46:44 grant Exp $
 #
 
 DISTNAME=		${PKGNAME_NOREV}-src
@@ -14,7 +14,7 @@ COMMENT=		Portable library for handling QuickTime(TM) media files
 
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ENV+=		my_cv_comment=""
diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
index 5daad7f8024..7c995c37038 100644
--- a/graphics/pixieplus/Makefile
+++ b/graphics/pixieplus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/23 21:50:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:46:44 grant Exp $
 #
 
 DISTNAME=	pixieplus-0.5.4
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.mosfet.org/pixie/
 COMMENT=	Free, fast, and feature packed image browser for KDE
 
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=	YES
 USE_X11=	YES
 GNU_CONFIGURE=	YES
diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile
index e858eb8dada..f2984a03e91 100644
--- a/graphics/plplot/Makefile
+++ b/graphics/plplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2003/08/07 10:32:23 seb Exp $
+# $NetBSD: Makefile,v 1.30 2004/01/24 15:46:44 grant Exp $
 
 DISTNAME=		plplot-5.2.1
 CATEGORIES=		graphics
@@ -12,7 +12,7 @@ BUILD_DEPENDS+=		m4>=1.4:../../devel/m4
 
 USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 USE_FORTRAN=		# defined
 USE_X11=		# defined
 USE_PERL5=		build
diff --git a/graphics/py-gdchart/Makefile b/graphics/py-gdchart/Makefile
index ac77d0bf871..bb6558a39e6 100644
--- a/graphics/py-gdchart/Makefile
+++ b/graphics/py-gdchart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:42:30 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/24 15:46:44 grant Exp $
 #
 
 DISTNAME=	gdchart-py-0.6
@@ -12,7 +12,7 @@ HOMEPAGE=	http://athani.pair.com/msteed/software/gdchart/
 COMMENT=	Python interface to GDChart
 
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 MAKE_ENV=	GD_INCLUDE=${LOCALBASE}/include \
 		GDCHART_INCLUDE=${LOCALBASE}/include \
 		PYTHON_INCLUDE=${LOCALBASE}/${PYINC} \
diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index ae8727d42b8..7eb6d41ac25 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:18:17 agc Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 15:46:44 grant Exp $
 #
 
 DISTNAME=	qiv-1.8-src
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.klografx.net/qiv/
 COMMENT=	Quick image viewer
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_BUILDLINK2=	yes
 
 .include "../../graphics/imlib/buildlink2.mk"
diff --git a/graphics/resize_image/Makefile b/graphics/resize_image/Makefile
index eab4d6b3a64..38e95083537 100644
--- a/graphics/resize_image/Makefile
+++ b/graphics/resize_image/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/10 19:08:25 kristerw Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:46:44 grant Exp $
 #
 
 DISTNAME=	resize_image-0.6
@@ -10,7 +10,7 @@ HOMEPAGE=	http://lab.erasme.org/resize_image/
 COMMENT=	Fast image resizing tool
 
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 CFLAGS+=	-DUNIX
 
 do-install:
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index c27dd5afe27..8ea334c01c4 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2003/10/08 07:50:38 tron Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/01/24 15:46:44 grant Exp $
 
 CATEGORIES?=	graphics
 MASTER_SITES?=	ftp://ftp.mostang.com/pub/sane/${DISTNAME}/ \
@@ -22,7 +22,7 @@ CONFLICTS+=	sane<=1.0.3
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 CONFIGURE_ENV+=		ac_cv_path_LATEX="no"
diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile
index 69535342559..7c87c62d0ca 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/03 18:49:44 reed Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/24 15:46:44 grant Exp $
 #
 
 DISTNAME=	scigraphica-0.8.0
@@ -14,7 +14,7 @@ DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
 
 USE_BUILDLINK2=		YES
 USE_X11=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_GNU_READLINE=	YES
 
 GNU_CONFIGURE=		YES
diff --git a/graphics/smpeg-xmms/Makefile b/graphics/smpeg-xmms/Makefile
index 3abf19fbba8..9b3b54135eb 100644
--- a/graphics/smpeg-xmms/Makefile
+++ b/graphics/smpeg-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/08/28 20:05:19 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 15:46:44 grant Exp $
 #
 
 DISTNAME=	smpeg-xmms-0.3.5
@@ -13,7 +13,7 @@ COMMENT=	MPEG video plugin using SDL/smpeg as the backend
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index e0d70ac48e9..2e69306e87b 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/01/23 21:50:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/24 15:46:44 grant Exp $
 #
 
 DISTNAME=	sodipodi-0.33
@@ -15,7 +15,7 @@ DEPENDS+=	gnome2-dirs>=1.0:../../misc/gnome2-dirs
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_X11=		YES
 
diff --git a/graphics/transcode/Makefile b/graphics/transcode/Makefile
index bcdcb0f99b4..7651c2c540e 100644
--- a/graphics/transcode/Makefile
+++ b/graphics/transcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/01/23 21:50:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/24 15:46:44 grant Exp $
 
 DISTNAME=	transcode-0.6.11
 PKGREVISION=	2
@@ -12,7 +12,7 @@ COMMENT=	Command line video-stream processing tool
 BUILD_DEPENDS+=		nasm>=0.98.36:../../devel/nasm
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index 127c47ae5c2..ee0d44808db 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/01/03 18:49:44 reed Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/24 15:46:44 grant Exp $
 #
 
 DISTNAME=	tuxpaint-0.9.12
@@ -13,7 +13,7 @@ COMMENT=	Drawing program for small children
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 MANCOMPRESSED=		YES
 
 LDFLAGS+=		${_BLNK_ICONV_LDFLAGS}
diff --git a/graphics/wmphoto/Makefile b/graphics/wmphoto/Makefile
index b5e47371c6d..99a5641e785 100644
--- a/graphics/wmphoto/Makefile
+++ b/graphics/wmphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:18:17 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/24 15:46:44 grant Exp $
 #
 
 DISTNAME=	wmphoto-0.3a
@@ -12,7 +12,7 @@ COMMENT=	Dock-app that can show you a photo
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/wmphoto
 USE_X11BASE=	YES
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 MAKE_ENV+=	X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
 
 post-install:
diff --git a/graphics/xawtv/Makefile b/graphics/xawtv/Makefile
index e0dc2f92990..6cf14b5c9c6 100644
--- a/graphics/xawtv/Makefile
+++ b/graphics/xawtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/22 16:37:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 15:46:44 grant Exp $
 #
 
 DISTNAME=	xawtv_3.90
@@ -14,7 +14,7 @@ COMMENT=	TV application for Brooktree 848 compatible cards
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 
 CONFIGURE_ARGS+=	--disable-aalib
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index a81d772f3ce..7ee6251771c 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/07/17 21:43:06 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/24 15:46:44 grant Exp $
 # FreeBSD: Makefile,v 1.3 1997/08/26 07:12:20 tg Exp
 #
 
@@ -12,7 +12,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 COMMENT=		View complete directories of X bitmaps and X pixmaps
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_IMAKE=		YES
 
 .include "../../graphics/xpm/buildlink2.mk"
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index d69def1b05a..8c3c832876c 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2004/01/03 18:49:45 reed Exp $
+# $NetBSD: Makefile,v 1.43 2004/01/24 15:46:44 grant Exp $
 
 DISTNAME=	xsane-0.90
 PKGREVISION=	3
@@ -20,7 +20,7 @@ COMMENT=	New improved frontend for SANE
 BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index 0f7307f9d05..7bd8efbc645 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/01/03 18:49:45 reed Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/24 15:46:44 grant Exp $
 
 DISTNAME=	xzgv-0.7
 PKGREVISION=	4
@@ -15,7 +15,7 @@ INFO_FILES=	xzgv
 
 USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xzgv ${PREFIX}/bin