replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make.

64 files changed, 128 insertions, 128 deletions

diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index d7284f65891..03493d57fae 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2002/08/25 21:52:28 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2004/01/24 15:30:32 grant Exp $
 #
 
 DISTNAME=       XmHTML-1.1.7
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.xs4all.nl/~ripley/XmHTML/
 COMMENT=	Motif Widget capable of displaying HTML 3.2 conforming text
 
 USE_X11BASE=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	YES
 USE_BUILDLINK2=	YES
 
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index d917ffd786e..0894e55b5d9 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2004/01/03 18:49:55 reed Exp $
+# $NetBSD: Makefile,v 1.53 2004/01/24 15:30:32 grant Exp $
 
 DISTNAME=		control-center-1.4.0.4
 PKGREVISION=		5
@@ -13,7 +13,7 @@ BUILD_USES_MSGFMT=	YES
 
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	YES
 
 USE_LIBTOOL=		YES
diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile
index a7d95ff403f..d7e38c49537 100644
--- a/x11/ebuilder/Makefile
+++ b/x11/ebuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/20 12:28:26 agc Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 15:30:32 grant Exp $
 #
 
 DISTNAME=	ebuilder-0.56d
@@ -13,7 +13,7 @@ COMMENT=	GUI builder for the Qt library
 WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_BUILDLINK2=	yes
 USE_X11=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 MAKEFILE=	GNUmakefile
 
 MAKE_ENV+=	CXXFLAGS="${CXXFLAGS}"
diff --git a/x11/gnome--/Makefile b/x11/gnome--/Makefile
index 2973357968f..8a4502fa1bd 100644
--- a/x11/gnome--/Makefile
+++ b/x11/gnome--/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/03 18:49:56 reed Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 15:30:32 grant Exp $
 #
 
 DISTNAME=	gnomemm-1.2.4
@@ -13,7 +13,7 @@ COMMENT=	C++ binding for the GNOME libraries
 
 GNU_CONFIGURE=	yes
 USE_PERL5=	build
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 USE_X11BASE=	yes
 USE_BUILDLINK2=	yes
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 7c2240af6a5..028265c5629 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2004/01/03 18:49:56 reed Exp $
+# $NetBSD: Makefile,v 1.35 2004/01/24 15:30:32 grant Exp $
 #
 
 DISTNAME=		gnome-applets-1.4.0.4
@@ -17,7 +17,7 @@ BUILDLINK_DEPENDS.gnome-panel=	gnome-panel<2.0
 
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/x11/gnome-core/Makefile.common b/x11/gnome-core/Makefile.common
index 25cd3059002..a0dcac13589 100644
--- a/x11/gnome-core/Makefile.common
+++ b/x11/gnome-core/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2003/07/17 22:56:26 grant Exp $
+# $NetBSD: Makefile.common,v 1.5 2004/01/24 15:30:32 grant Exp $
 #
 
 DISTNAME=		gnome-core-1.4.2
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	YES
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index b41b2a87f48..41867d84b72 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/23 21:50:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/24 15:30:32 grant Exp $
 #
 
 DISTNAME=		gnome-desktop-2.4.1.1
@@ -17,7 +17,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_PERL5=		yes
 USE_X11=		yes
 
diff --git a/x11/gnome-gkrellm/Makefile b/x11/gnome-gkrellm/Makefile
index 64d4d6fd1ed..697bbb30d47 100644
--- a/x11/gnome-gkrellm/Makefile
+++ b/x11/gnome-gkrellm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:56 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 15:30:32 grant Exp $
 
 DISTNAME=	gkrellm-gnome
 PKGNAME=	gnome-gkrellm-0.1
@@ -11,7 +11,7 @@ HOMEPAGE=	http://web.wt.net/~billw/gkrellm/Plugins.html
 COMMENT=	gkrellm gnome plugin
 
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 0fe51143e71..dbcf92ccef7 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2004/01/22 13:32:32 jlam Exp $
+# $NetBSD: Makefile,v 1.95 2004/01/24 15:30:32 grant Exp $
 
 DISTNAME=		gnome-libs-1.4.2
 PKGREVISION=		1
@@ -13,7 +13,7 @@ DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
 BUILD_USES_MSGFMT=	YES
 
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libart_lgpl/libtool
diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index 22a324c55be..849d2d12edb 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/23 21:50:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 15:30:32 grant Exp $
 #
 
 DISTNAME=		gnome-mag-0.10.4
@@ -14,7 +14,7 @@ COMMENT=		GNOME screen magnifier
 DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_X11=		yes
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 5d3255dcd0e..740ae7e2c11 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/23 21:50:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/24 15:30:32 grant Exp $
 #
 
 DISTNAME=		gnome-panel-2.4.2
@@ -16,7 +16,7 @@ DEPENDS+=		gnome-icon-theme>=1.0.9:../../graphics/gnome-icon-theme
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_PERL5=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
diff --git a/x11/gnome-python/Makefile b/x11/gnome-python/Makefile
index 272dbc857f8..f13b1cfa1ba 100644
--- a/x11/gnome-python/Makefile
+++ b/x11/gnome-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2004/01/03 18:49:56 reed Exp $
+# $NetBSD: Makefile,v 1.39 2004/01/24 15:30:32 grant Exp $
 
 DISTNAME=		gnome-python-1.4.4
 PKGNAME=		${PYPKGPREFIX}-gnome-1.4.4
@@ -18,7 +18,7 @@ CONFLICTS+=		gnome-python-*
 GNU_CONFIGURE=		yes
 USE_X11=		yes
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN}
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index d137428c3c6..c0e572e6c8b 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/01/23 21:50:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/24 15:30:32 grant Exp $
 #
 
 DISTNAME=		gnome-session-2.4.2
@@ -18,7 +18,7 @@ CONFLICTS+=		gnome-core<1.4.2nb4
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11=		yes
 USE_PERL5=		build
 
diff --git a/x11/gnome-themes-extra/Makefile b/x11/gnome-themes-extra/Makefile
index d71fae07ceb..6b601675ace 100644
--- a/x11/gnome-themes-extra/Makefile
+++ b/x11/gnome-themes-extra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/23 21:50:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 15:30:32 grant Exp $
 #
 
 DISTNAME=	gnome-themes-extras-0.5
@@ -18,7 +18,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/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index 93a6e69ab2c..fd3780ab611 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/23 21:50:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/24 15:30:32 grant Exp $
 #
 
 DISTNAME=		gnome-themes-2.4.1
@@ -15,7 +15,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/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index d183c409a7a..b2e7a90c7af 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/23 21:50:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/24 15:30:32 grant Exp $
 #
 
 DISTNAME=		gnome-applets-2.4.2
@@ -17,7 +17,7 @@ BUILD_USES_MSGFMT=	YES
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index bc2cc646153..9376965f247 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/01/23 21:50:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/24 15:30:32 grant Exp $
 #
 
 DISTNAME=	control-center-2.4.0
@@ -19,7 +19,7 @@ GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11=		yes
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index 914581dbfa7..86bcf5a0ee9 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/23 21:50:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 15:30:32 grant Exp $
 #
 
 DISTNAME=		gnome-terminal-2.4.2
@@ -21,7 +21,7 @@ USE_PERL5=		build
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index cd607d13a93..1c60b48e8f6 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/23 21:50:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 15:30:32 grant Exp $
 #
 
 DISTNAME=		gnopernicus-0.7.1
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	yes
 DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_X11=		yes
diff --git a/x11/gnustep-back/Makefile b/x11/gnustep-back/Makefile
index a752c8f88ab..283f61b5b94 100644
--- a/x11/gnustep-back/Makefile
+++ b/x11/gnustep-back/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/23 21:50:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/24 15:30:32 grant Exp $
 #
 
 DISTNAME=	gnustep-back-0.9.0
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.gnustep.org/
 COMMENT=	AppKit backend for GNUstep
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 MAKEFILE=		GNUmakefile
 GNU_CONFIGURE=		YES
diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile
index 5b9086a6575..7100b786937 100644
--- a/x11/gnustep-gui/Makefile
+++ b/x11/gnustep-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/23 21:50:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=	gnustep-gui-0.9.0
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.gnustep.org/
 COMMENT=	GNUstep AppKit Implementation
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 MAKEFILE=		GNUmakefile
 GNU_CONFIGURE=		YES
diff --git a/x11/gnustep-preferences/Makefile b/x11/gnustep-preferences/Makefile
index 316096bad3b..a295dedc179 100644
--- a/x11/gnustep-preferences/Makefile
+++ b/x11/gnustep-preferences/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/23 21:50:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=	Preferences-1.2.0
@@ -14,7 +14,7 @@ COMMENT=	Application for setting preferences for the GNUstep system
 
 NO_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 MAKEFILE=		GNUmakefile
 
diff --git a/x11/gtk+extra/Makefile b/x11/gtk+extra/Makefile
index 2ac0b3d3933..d41f7ac8644 100644
--- a/x11/gtk+extra/Makefile
+++ b/x11/gtk+extra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/21 17:38:28 martti Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=	gtk+extra-0.99.17
@@ -12,7 +12,7 @@ COMMENT=	Useful set of GTK+ widgets for creating GUIs
 
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 
 USE_LIBTOOL=		YES
diff --git a/x11/gtk--/Makefile b/x11/gtk--/Makefile
index ea1c2e4a32e..98f44ca4d85 100644
--- a/x11/gtk--/Makefile
+++ b/x11/gtk--/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2003/07/13 13:54:02 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=		gtkmm-1.2.10
@@ -19,7 +19,7 @@ USE_X11BASE=		YES
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_PERL5=		build
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 CONFIGURE_ARGS=		--enable-static
diff --git a/x11/gtk-thinice-engine/Makefile b/x11/gtk-thinice-engine/Makefile
index b715f48d235..2eac5457071 100644
--- a/x11/gtk-thinice-engine/Makefile
+++ b/x11/gtk-thinice-engine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/03 18:49:57 reed Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=	gtk-thinice-engine-2.0.2
@@ -15,7 +15,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
 GNU_CONFIGURE=		yes
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 6b21e43aeb9..bc55b68f48d 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2004/01/18 01:11:40 jlam Exp $
+# $NetBSD: Makefile,v 1.97 2004/01/24 15:30:33 grant Exp $
 
 DISTNAME=		gtk+-1.2.10
 PKGREVISION=		6
@@ -19,7 +19,7 @@ USE_BUILDLINK3=		yes
 BUILD_USES_MSGFMT=	yes
 USE_PERL5=		build
 USE_X11BASE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/x11/gtk2-theme-switch/Makefile b/x11/gtk2-theme-switch/Makefile
index a4a4a4681d2..569d535eef3 100644
--- a/x11/gtk2-theme-switch/Makefile
+++ b/x11/gtk2-theme-switch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/03 18:49:57 reed Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=		gtk-theme-switch-2.0.0rc2
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.muhri.net/
 COMMENT=		Allows quick & easy switching of GTK+ 2.x themes
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/switch2 \
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 002cb420d99..9cec9dae2ed 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2004/01/22 12:38:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.40 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=		gtk+-2.2.4
@@ -19,7 +19,7 @@ USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 GNU_CONFIGURE=		 yes
 CONFIGURE_ARGS+=	--with-xinput=xfree
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index 09e4af085d1..037d434f97b 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/03 18:49:57 reed Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=	gtkmm-2.2.8
@@ -13,7 +13,7 @@ COMMENT=	C++ interface to Gtk+ v2
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_PERL5=		YES
 USE_X11=		YES
 
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index f732182b1ac..144b939a276 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/23 21:50:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=	gtksourceview-0.7.0
@@ -17,7 +17,7 @@ USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
 USE_PERL5=		build
 USE_PKGLOCALEDIR=	yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	gtksourceview-1.0.pc.in
diff --git a/x11/gtoolkit/Makefile.common b/x11/gtoolkit/Makefile.common
index ab5f64405cd..18d2ca834ba 100644
--- a/x11/gtoolkit/Makefile.common
+++ b/x11/gtoolkit/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2003/07/17 22:56:32 grant Exp $
+# $NetBSD: Makefile.common,v 1.7 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=		gtoolkit-0.9.5
@@ -11,7 +11,7 @@ HOMEPAGE?=		http://www.informatik.uni-osnabrueck.de/elmar/projects/gtoolkit/
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/x11/ion-dock/Makefile b/x11/ion-dock/Makefile
index 7d656e53530..bd8ea936e59 100644
--- a/x11/ion-dock/Makefile
+++ b/x11/ion-dock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/09 23:09:44 cube Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=	ion-devel-dock-20031221
@@ -13,7 +13,7 @@ COMMENT=	Ion module that enables docking
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 
 MAKE_ENV+=		TOPDIR=${BUILDLINK_PREFIX.ion}/include/ion
diff --git a/x11/kde2/Makefile.kde2 b/x11/kde2/Makefile.kde2
index 3343a83def6..42c819bf422 100644
--- a/x11/kde2/Makefile.kde2
+++ b/x11/kde2/Makefile.kde2
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kde2,v 1.8 2003/04/28 07:48:28 skrll Exp $
+# $NetBSD: Makefile.kde2,v 1.9 2004/01/24 15:30:33 grant Exp $
 #
 # This Makefile fragment is included at the top of package Makefiles for
 # KDE2-distributed packages (they all share common configure and build
@@ -13,7 +13,7 @@ EXTRACT_SUFX?=	.tar.bz2
 
 HOMEPAGE?=	http://www.kde.org/
 
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/admin/ltconfig
diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile
index a12400c70ee..a71c09913f4 100644
--- a/x11/keylaunch/Makefile
+++ b/x11/keylaunch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:28:26 agc Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=	keylaunch-1.3.0
@@ -12,7 +12,7 @@ COMMENT=	X utility for binding commands to a hot key
 WRKSRC=		${WRKDIR}/keylaunch
 USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/keylaunch ${PREFIX}/bin
diff --git a/x11/kmessage/Makefile b/x11/kmessage/Makefile
index 8fdf0035abe..daf288c85ef 100644
--- a/x11/kmessage/Makefile
+++ b/x11/kmessage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/23 21:50:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 15:30:33 grant Exp $
 
 DISTNAME=	kmessage-0.1
 PKGREVISION=	3
@@ -10,7 +10,7 @@ HOMEPAGE=	http://soliton.wins.uva.nl/~wijnhout/kmessage/
 COMMENT= 	KMessage is an xmessage clone for KDE
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=              YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=          YES
 
 .include "../../meta-pkgs/kde3/buildlink2.mk"
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index 89e804b073f..f5e347d0984 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:56:35 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/24 15:30:33 grant Exp $
 
 DISTNAME=	lablgtk-1.2.5
 PKGREVISION=	3
@@ -10,7 +10,7 @@ HOMEPAGE=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
 COMMENT=	GTK+ bindings for ocaml
 
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 1e81f41c4a7..8aad118d901 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2003/12/12 10:11:39 adam Exp $
+# $NetBSD: Makefile,v 1.68 2004/01/24 15:30:33 grant Exp $
 
 DISTNAME=	lesstif-0.93.94
 CATEGORIES=	x11
@@ -13,7 +13,7 @@ CONFLICTS+=	openmotif-[0-9]*
 
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 LIBTOOL_OVERRIDE+=	${WRKSRC}/test/libtool
diff --git a/x11/lesstif12/Makefile.common b/x11/lesstif12/Makefile.common
index ac5276c5212..518c3bdda84 100644
--- a/x11/lesstif12/Makefile.common
+++ b/x11/lesstif12/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2003/07/17 22:56:36 grant Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/01/24 15:30:33 grant Exp $
 
 DISTNAME=		lesstif-${LESSTIF_VERSION}
 LESSTIF_VERSION=	0.93.0
@@ -14,7 +14,7 @@ MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://www.lesstif.org/
 
 USE_X11BASE=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		# defined
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 LIBTOOL_OVERRIDE+=	${WRKSRC}/test/libtool
diff --git a/x11/libzvt/Makefile b/x11/libzvt/Makefile
index 53d453f2828..8b813c548d7 100644
--- a/x11/libzvt/Makefile
+++ b/x11/libzvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/03 18:49:59 reed Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=		libzvt-2.0.1
@@ -13,7 +13,7 @@ COMMENT=		Virtual Terminal Widget Library for GNOME2
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index b372f47945e..79a0a3b31bb 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/03 18:49:59 reed Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/24 15:30:33 grant Exp $
 
 DISTNAME=	mlterm-2.7.0
 PKGREVISION=	2
@@ -16,7 +16,7 @@ USE_BUILDLINK2=		yes
 USE_X11=		yes
 
 USE_LIBTOOL=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 LIBTOOL_OVERRIDE+=	${WRKSRC}/mkf/autoconf/libtool
 LIBTOOL_OVERRIDE+=	${WRKSRC}/autoconf/libtool
 LIBTOOL_OVERRIDE+=	${WRKSRC}/kiklib/autoconf/libtool
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index 5b1b7b9a922..ba5a0bc7729 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/03 18:49:59 reed Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/24 15:30:33 grant Exp $
 
 DISTNAME=	multi-gnome-terminal-1.6.1
 PKGREVISION=	4
@@ -11,7 +11,7 @@ COMMENT=	Gnome tabbed terminal emulator
 
 USE_BUILDLINK2=		# defined
 USE_X11BASE=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		# defined
 
 USE_LIBTOOL=		# defined
diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile
index 6b2347a2a51..3233ce3984d 100644
--- a/x11/py-qt3-base/Makefile
+++ b/x11/py-qt3-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/12/24 09:53:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=		PyQt-x11-gpl-3.8
@@ -13,7 +13,7 @@ COMMENT=		Python binding for qt3
 USE_BUILDLINK2=		yes
 USE_X11=		yes
 USE_LIBTOOL=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 BUILDLINK_DEPENDS.qt3-tools=	qt3-tools>=3.1.2nb2
 
 CONFIGURE_ARGS=		-q ${QTDIR} -m ${GMAKE} -p ${SIPBIN} -b ""
diff --git a/x11/py-qt3-modules/Makefile b/x11/py-qt3-modules/Makefile
index 467a37a8fc5..38126bbf1bf 100644
--- a/x11/py-qt3-modules/Makefile
+++ b/x11/py-qt3-modules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/12/24 09:53:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=		PyQt-x11-gpl-3.8
@@ -13,7 +13,7 @@ COMMENT=		Python binding for qt3
 USE_BUILDLINK2=		yes
 USE_X11=		yes
 USE_LIBTOOL=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 CONFIGURE_ARGS=		-q ${QTDIR} -m ${GMAKE} -p ${SIPBIN}
 
diff --git a/x11/py-qt3-qscintilla/Makefile b/x11/py-qt3-qscintilla/Makefile
index a2a82b18b6e..450ea69bf74 100644
--- a/x11/py-qt3-qscintilla/Makefile
+++ b/x11/py-qt3-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/12/24 09:53:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=		PyQt-x11-gpl-3.8
@@ -13,7 +13,7 @@ COMMENT=		Python binding for qt3
 USE_BUILDLINK2=		yes
 USE_X11=		yes
 USE_LIBTOOL=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 CONFIGURE_ARGS=		-q ${QTDIR} -m ${GMAKE} -p ${SIPBIN}
 
diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile
index 3d09b064612..55d9ba6aac0 100644
--- a/x11/py-qt3-sip/Makefile
+++ b/x11/py-qt3-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/08/25 17:31:45 recht Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=	sip-x11-gpl-3.8
@@ -18,7 +18,7 @@ BUILD_DEPENDS+=		qt3-tools-3.*:../../x11/qt3-tools
 USE_BUILDLINK2= 	# defined
 USE_X11=		# defined
 USE_LIBTOOL=		# defined
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=		make
 
 CONFIGURE_ARGS=		-q ${QTDIR} -m ${GMAKE}
 
diff --git a/x11/py-wxWindows/Makefile b/x11/py-wxWindows/Makefile
index 46f5439da65..0e448f15a09 100644
--- a/x11/py-wxWindows/Makefile
+++ b/x11/py-wxWindows/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/01/20 12:28:27 agc Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=	wxPythonSrc-2.4.2.4
@@ -13,7 +13,7 @@ COMMENT=	wxPython: Python bindings for wxWindows
 
 WRKSRC=		${WRKDIR}/wxPythonSrc-2.4.2.4/wxPython
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 # we depend on glib which pulls in threads
 PYTHON_VERSIONS_ACCEPTED=	23pth 22pth 21pth
diff --git a/x11/pygtk/Makefile b/x11/pygtk/Makefile
index 26a703e68a9..b0b5185663d 100644
--- a/x11/pygtk/Makefile
+++ b/x11/pygtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:50:00 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=	pygtk-0.6.9
@@ -14,7 +14,7 @@ COMMENT=	Python Bindings for the GTK Widget Set
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+= --disable-numpy
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
 PY_PATCHPLIST=	yes
diff --git a/x11/qt1/Makefile b/x11/qt1/Makefile
index d086079a041..418a397fc51 100644
--- a/x11/qt1/Makefile
+++ b/x11/qt1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:56:41 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=	qt-1.44
@@ -13,7 +13,7 @@ COMMENT=	C++ X GUI toolkit
 
 USE_BUILDLINK2=	yes
 USE_X11BASE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 
 QTPREFIX=${PREFIX}/qt1
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
index a2b9de505bd..e8b82f7217a 100644
--- a/x11/qt2-libs/Makefile.common
+++ b/x11/qt2-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2004/01/20 12:28:27 agc Exp $
+# $NetBSD: Makefile.common,v 1.21 2004/01/24 15:30:33 grant Exp $
 #
 
 DISTNAME=	qt-x11-${QTVERSION}
@@ -11,7 +11,7 @@ MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
 WRKSRC=			${WRKDIR}/qt-${QTVERSION}
 HAS_CONFIGURE=		yes
 USE_X11BASE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	-static -sm -no-thread \
 			-system-zlib -system-libpng \
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index 6fadf6f28dc..9d5bcf97f05 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2004/01/11 12:27:41 markd Exp $
+# $NetBSD: Makefile.common,v 1.26 2004/01/24 15:30:33 grant Exp $
 #
 DISTNAME=		qt-x11-free-${QTVERSION}
 CATEGORIES=		x11
@@ -14,7 +14,7 @@ PATCHDIR=		${.CURDIR}/../../x11/qt3-libs/patches
 
 HAS_CONFIGURE=		yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_GCC_SHLIB=		yes
 USE_LIBTOOL=		yes
 
diff --git a/x11/qt3-qscintilla/Makefile b/x11/qt3-qscintilla/Makefile
index 01da9dd5bdc..0af7d6cade3 100644
--- a/x11/qt3-qscintilla/Makefile
+++ b/x11/qt3-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/08/23 14:56:32 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 15:30:34 grant Exp $
 #
 
 DISTNAME=		qscintilla-1.54-x11-gpl-1.2
@@ -15,7 +15,7 @@ WRKSRC=			${WRKDIR}/${DISTNAME}/qt
 # needs qmake
 BUILD_DEPENDS+=		qt3-tools-3.*:../../x11/qt3-tools
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
 
diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile
index 5f9b96f3226..a10a6c3c59f 100644
--- a/x11/qtarch/Makefile
+++ b/x11/qtarch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/20 12:28:27 agc Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/24 15:30:34 grant Exp $
 #
 
 DISTNAME=	qtarch-2.1-1
@@ -14,7 +14,7 @@ COMMENT=	Graphical dialog editor for the Qt widget set
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=	yes
 USE_X11=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qtarch ${PREFIX}/bin
diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile
index 2cf247e8cfc..c1f495aa991 100644
--- a/x11/qwspritefield/Makefile
+++ b/x11/qwspritefield/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/20 12:28:27 agc Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/24 15:30:34 grant Exp $
 
 DISTNAME=	QwSpriteField1.6
 PKGNAME=	qwspritefield-1.6
@@ -14,7 +14,7 @@ CONFLICTS=	kdesupport-1.0
 
 WRKSRC=		${WRKDIR}/QwSpriteField
 USE_X11BASE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 
 QW_INCLUDES=	Pix.h QwCluster.h QwPublicList.h QwSpriteField.h
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index 9207b3e4d0c..2380b492f64 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/17 22:56:43 grant Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/24 15:30:34 grant Exp $
 
 DISTNAME=	qwt-0.3.0
 PKGREVISION=	1
@@ -11,7 +11,7 @@ COMMENT=	Qt widget library for technical purposes
 
 USE_BUILDLINK2=	yes
 USE_X11BASE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 
 MAKE_ENV+=	CXXFLAGS="${CXXFLAGS}"
diff --git a/x11/rep-gtk/Makefile b/x11/rep-gtk/Makefile
index c939135ae85..35bb5c5a065 100644
--- a/x11/rep-gtk/Makefile
+++ b/x11/rep-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/01/03 18:50:00 reed Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/24 15:30:34 grant Exp $
 #
 
 DISTNAME=		rep-gtk-0.15
@@ -11,7 +11,7 @@ HOMEPAGE=		http://rep-gtk.sourceforge.net/
 COMMENT=		librep bindings for gtk (used by sawmill)
 
 USE_X11=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
 
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index 06aebcd2674..29dfe04daec 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/03 18:50:00 reed Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 15:30:34 grant Exp $
 #
 
 DISTNAME=	vte-0.11.10
@@ -18,7 +18,7 @@ USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11=		yes
 
 CONFIGURE_ARGS+=	--disable-gtk-doc
diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile
index 440ab2ed37b..33f51554745 100644
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/20 12:28:28 agc Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/24 15:30:34 grant Exp $
 #
 
 DISTNAME=	wmweather-2.4.2
@@ -14,7 +14,7 @@ USE_BUILDLINK2=		# defined
 USE_X11=		yes
 
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 USE_PKGINSTALL=		yes
 CONFIGURE_ARGS+=	--with-sysconfdir=${PKG_SYSCONFDIR}
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index 0201ca72c9c..88154967979 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2004/01/03 18:50:00 reed Exp $
+# $NetBSD: Makefile,v 1.40 2004/01/24 15:30:34 grant Exp $
 
 DISTNAME=		xfce-3.8.18
 PKGREVISION=		3
@@ -18,7 +18,7 @@ USE_PKGLOCALEDIR=	# defined
 USE_LIBTOOL=		# defined
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		# defined
 
 .if ${MACHINE_ARCH} == "alpha"
diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile
index 500693a1ea3..4f52e522566 100644
--- a/x11/xfstt/Makefile
+++ b/x11/xfstt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/01 20:06:11 salo Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/24 15:30:34 grant Exp $
 #
 
 DISTNAME=		xfstt-1.6
@@ -11,7 +11,7 @@ COMMENT=		TrueType font server for X11
 
 USE_PKGINSTALL=		YES
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 
 # There isn't really any l10n yet, only some preliminary i18n support.
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index cf830c3c1ba..ec7443c7e51 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/17 22:56:57 grant Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/24 15:30:34 grant Exp $
 #
 
 DISTNAME=	xglobe-0.5
@@ -24,7 +24,7 @@ MAPS=		LE.400.gif Brill.400.gif mggd.gif
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_X11BASE=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 EVAL_PREFIX+=	QT1DIR=qt1
 MAKE_ENV+=	QTDIR=${QT1DIR}/qt1
 
diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index 9dc5eda0e9c..ec91851e3f3 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/03 18:50:01 reed Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:30:34 grant Exp $
 #
 
 DISTNAME=	xpad-1.12
@@ -16,7 +16,7 @@ DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 
diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index bb9ec52ca86..448333860cf 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/03 18:50:01 reed Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/24 15:30:34 grant Exp $
 #
 
 DISTNAME=		xplanet-1.0.1
@@ -13,7 +13,7 @@ COMMENT=		Rotating rendered map of the Earth in X11 root window
 USE_BUILDLINK2=		yes
 USE_GCC_SHLIB=		yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-gl-dir=${BUILDLINK_PREFIX.Mesa}
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 34b5271117e..36d23536005 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/01/23 21:50:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.27 2004/01/24 15:30:34 grant Exp $
 #
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
@@ -10,7 +10,7 @@ CONFLICTS+=	xscreensaver<4.14 xscreensaver-demo-[0-9]*
 .include "../../x11/xscreensaver/Makefile.common"
 
 # so that the screensaver.desktop rule in ``configure'' works
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=		make
 
 CONFIGURE_ARGS+=	--with-gtk=${BUILDLINK_PREFIX.gtk}
 CONFIGURE_ARGS+=	--with-pixbuf=${BUILDLINK_PREFIX.gdk-pixbuf}
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 08cd81cf5af..f791a3ef04c 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/23 21:50:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:30:34 grant Exp $
 #
 
 DISTNAME=	zenity-1.6
@@ -17,7 +17,7 @@ BUILD_USES_MSGFMT=	yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11=		yes
 
 .include "../../devel/GConf2/schemas.mk"