replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make.

46 files changed, 92 insertions, 92 deletions

diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index a2deb691111..49753f00a40 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2004/01/22 12:53:48 jlam Exp $
+# $NetBSD: Makefile,v 1.99 2004/01/24 14:50:05 grant Exp $
 #
 
 DISTNAME=		ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
@@ -18,7 +18,7 @@ USE_BUILDLINK3=		YES
 DEPENDS+=		gindent-[0-9]*:../../devel/gindent
 .endif
 
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE+=	${WRKSRC}/libtool
diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile
index c13607be88d..6f7e8437b17 100644
--- a/net/ORBit2/Makefile
+++ b/net/ORBit2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/12/14 19:43:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/24 14:50:05 grant Exp $
 #
 
 DISTNAME=		ORBit2-2.8.2
@@ -12,7 +12,7 @@ COMMENT=		High-performance CORBA ORB with C language support
 
 CONFLICTS=		linc>=1.1
 
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
diff --git a/net/adns/Makefile b/net/adns/Makefile
index 28a88936ec4..d52268d2bc7 100644
--- a/net/adns/Makefile
+++ b/net/adns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/22 12:20:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 14:50:05 grant Exp $
 #
 
 DISTNAME=	adns-1.1
@@ -9,7 +9,7 @@ MAINTAINER=	lukem@NetBSD.org
 HOMEPAGE=	http://www.chiark.greenend.org.uk/~ian/adns/
 COMMENT=	Asynchronous-capable DNS client library and utilities
 
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 
diff --git a/net/amule/Makefile b/net/amule/Makefile
index 1d0fdf9ac02..50af8d7bca0 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/14 21:42:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 14:50:05 grant Exp $
 #
 
 DISTNAME=		aMule-1.2.4
@@ -17,7 +17,7 @@ BUILD_USES_MSGFMT=	yes
 CONFLICTS=		xmule-[0-9]*
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index 8d30a667e5b..f12eaf802c1 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/23 21:50:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/24 14:50:05 grant Exp $
 #
 
 DISTNAME=		bug-buddy-2.4.1.1
@@ -17,7 +17,7 @@ DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 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/net/coda5_server/Makefile.common b/net/coda5_server/Makefile.common
index fbe44a9e359..f002d8cf280 100644
--- a/net/coda5_server/Makefile.common
+++ b/net/coda5_server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2003/08/22 13:17:51 drochner Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/01/24 14:50:05 grant Exp $
 
 DISTNAME?=		coda-${DIST_VERS}
 DIST_VERS?=		5.3.20
@@ -19,7 +19,7 @@ PATCHDIR?=		${.CURDIR}/../../net/coda5_server/patches
 
 USE_BUILDLINK2=		yes
 USE_PERL5=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/net/dc_gui2/Makefile b/net/dc_gui2/Makefile
index 07f5d1f83b0..4d7b6c7ebe5 100644
--- a/net/dc_gui2/Makefile
+++ b/net/dc_gui2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/23 21:50:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 14:50:05 grant Exp $
 #
 
 DISTNAME=	dc_gui2-0.75
@@ -17,7 +17,7 @@ GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 CONFIGURE_ARGS+=	--enable-manual-db-detect
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.db4}/include/db4
 CPPFLAGS+=	-DNO_PRINTF_LOCALE
diff --git a/net/dctc/Makefile b/net/dctc/Makefile
index e6b08cfb7df..049cf6e5671 100644
--- a/net/dctc/Makefile
+++ b/net/dctc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/07/17 22:51:04 grant Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 14:50:05 grant Exp $
 #
 
 DISTNAME=	dctc-0.85.4
@@ -14,7 +14,7 @@ GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
 CONFIGURE_ARGS+=	--enable-manual-db-detect
 USE_PERL5=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.db4}/include/db4
 
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 8bf771cfae0..908e8a75a17 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/23 21:50:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/24 14:50:05 grant Exp $
 #
 
 DISTNAME=	etherape-0.9.0
@@ -10,7 +10,7 @@ MAINTAINER=	damon@NetBSD.org
 HOMEPAGE=	http://etherape.sourceforge.net/
 COMMENT=	Graphical network monitor
 
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
diff --git a/net/flan/Makefile b/net/flan/Makefile
index d5947af6604..a7cb2ca73cd 100644
--- a/net/flan/Makefile
+++ b/net/flan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:22:19 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 14:50:05 grant Exp $
 #
 
 DISTNAME=	Flan
@@ -12,7 +12,7 @@ COMMENT=	Simulator for IP networks writen in Java
 
 WRKSRC=		${WRKDIR}/src
 PKG_JVM=	sun-jdk13
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 post-build:
 	cd ${WRKSRC} ; ${PKG_JAVA_HOME}/bin/jar cf flan.jar flan/ graphic/
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 2e557860fc4..94a6a493533 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/11/03 10:09:50 cube Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 14:50:05 grant Exp $
 
 DISTNAME=	freeradius-0.7
 CATEGORIES=	net
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.freeradius.org/
 COMMENT=	Free RADIUS server implementation
 
 CONFLICTS+=	radiusd-cistron*
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	yes
 USE_BUILDLINK2= YES
 USE_LIBTOOL=	YES
diff --git a/net/gini/Makefile b/net/gini/Makefile
index c27d0e5f2ec..18afb6111e6 100644
--- a/net/gini/Makefile
+++ b/net/gini/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/12/08 14:41:41 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 14:50:05 grant Exp $
 #
 
 DISTNAME=		gini-0.5.1
@@ -13,7 +13,7 @@ COMMENT=		Free streaming media server
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 
 LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
diff --git a/net/gkrellm-ping/Makefile b/net/gkrellm-ping/Makefile
index 79c8b9dd3c0..6defa4b98ef 100644
--- a/net/gkrellm-ping/Makefile
+++ b/net/gkrellm-ping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:22:19 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 14:50:05 grant Exp $
 
 DISTNAME=	gkrellmPing-0.2-3
 PKGNAME=	gkrellm-ping-0.2.3
@@ -12,7 +12,7 @@ COMMENT=	gkrellm ping plugin
 
 WRKSRC=		${WRKDIR}/gkrellmPing
 USE_BUILDLINK2=	# defined
-USE_GMAKE=	# defined
+USE_GNU_TOOLS+=	make
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
diff --git a/net/gkrellm-snmp/Makefile b/net/gkrellm-snmp/Makefile
index fca0c293f54..a5180b92d1a 100644
--- a/net/gkrellm-snmp/Makefile
+++ b/net/gkrellm-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/03 18:49:48 reed Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 14:50:05 grant Exp $
 
 DISTNAME=		gkrellm_snmp-0.18
 PKGNAME=		gkrellm-snmp-0.18
@@ -11,7 +11,7 @@ HOMEPAGE=		http://triq.net/gkrellm.html
 COMMENT=		Simple SNMP monitor for gkrellm
 
 USE_BUILDLINK2=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
diff --git a/net/gkrellm-wireless/Makefile b/net/gkrellm-wireless/Makefile
index 10a51d5ae99..46a1eccf42a 100644
--- a/net/gkrellm-wireless/Makefile
+++ b/net/gkrellm-wireless/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:48 reed Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/24 14:50:05 grant Exp $
 
 DISTNAME=		gkrellmwireless-0.2.2
 PKGNAME=		gkrellm-wireless-0.2.2
@@ -13,7 +13,7 @@ COMMENT=		Wavelan signal strength monitor for gkrellm
 ONLY_FOR_PLATFORM=	*BSD-*-* Linux-*-*
 
 USE_BUILDLINK2=		# defined
-USE_GMAKE=              # defined
+USE_GNU_TOOLS+=		make
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
diff --git a/net/gnapster/Makefile b/net/gnapster/Makefile
index 19ac50a1c62..8eb30371006 100644
--- a/net/gnapster/Makefile
+++ b/net/gnapster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/01/03 18:49:48 reed Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/24 14:50:05 grant Exp $
 
 DISTNAME=	gnapster-1.5.0
 PKGREVISION=	7
@@ -13,7 +13,7 @@ BUILD_USES_MSGFMT=	YES
 
 USE_BUILDLINK2=		YES
 USE_X11=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 
 USE_LIBTOOL=		YES
diff --git a/net/gnubile/Makefile b/net/gnubile/Makefile
index 8ccdfb3ab2d..4dea47dd86f 100644
--- a/net/gnubile/Makefile
+++ b/net/gnubile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:48 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 14:50:05 grant Exp $
 
 DISTNAME=	gnubile-0.20
 PKGREVISION=	4
@@ -10,7 +10,7 @@ HOMEPAGE=	http://gnutella.wego.com/
 COMMENT=	Unix Gnutella client for GNOME
 
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
 CPPFLAGS+=	`xml-config --cflags`
 
diff --git a/net/gopher/Makefile b/net/gopher/Makefile
index b0f6b117f18..9c4cb27ada6 100644
--- a/net/gopher/Makefile
+++ b/net/gopher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:22:19 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 14:50:05 grant Exp $
 #
 
 DISTNAME=	gopher_3.0.6
@@ -12,7 +12,7 @@ COMMENT=	Distributed document delivery client and server
 
 WRKSRC=		${WRKDIR}/gopher
 GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 CONFIGURE_ARGS+= --disable-auth
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index 3b3103d34ca..906aa8627a7 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/01/23 21:50:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/24 14:50:05 grant Exp $
 #
 
 DISTNAME=	gtk-gnutella-0.92
@@ -12,7 +12,7 @@ HOMEPAGE=	http://gtk-gnutella.sourceforge.net/
 COMMENT=	GTK-based gnutella client
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/net/gtk_wicontrol/Makefile b/net/gtk_wicontrol/Makefile
index 092469bc93d..86d24d9fec1 100644
--- a/net/gtk_wicontrol/Makefile
+++ b/net/gtk_wicontrol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 22:51:13 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 14:50:05 grant Exp $
 
 DISTNAME=	gtk_wicontrol-0.17
 PKGREVISION=	2
@@ -15,7 +15,7 @@ USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
diff --git a/net/gtm/Makefile b/net/gtm/Makefile
index 81b1d4ae46a..cd0b4625db4 100644
--- a/net/gtm/Makefile
+++ b/net/gtm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/01/03 18:49:48 reed Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/24 14:50:05 grant Exp $
 #
 
 DISTNAME=	gtm-0.4.12
@@ -15,7 +15,7 @@ DEPENDS+=	wget-[0-9]*:../../net/wget
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 
 .include "../../devel/gettext-lib/buildlink2.mk"
diff --git a/net/iplog/Makefile b/net/iplog/Makefile
index a163fc26e10..cfac7f4f20a 100644
--- a/net/iplog/Makefile
+++ b/net/iplog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/09/19 23:08:28 dent Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 14:50:05 grant Exp $
 #
 
 DISTNAME=	iplog-2.2.3
@@ -11,7 +11,7 @@ HOMEPAGE=	http://ojnk.sourceforge.net/
 COMMENT=	Iplog is a tool using pcap to log ip traffic
 
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/net/ipv6calc/Makefile b/net/ipv6calc/Makefile
index a1f6e60331e..0a46fba649c 100644
--- a/net/ipv6calc/Makefile
+++ b/net/ipv6calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/11/12 03:39:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 14:50:05 grant Exp $
 #
 
 DISTNAME=	ipv6calc-0.46
@@ -15,7 +15,7 @@ COMMENT=	Manipulates IPv6 adresses
 
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 MAKE_ENV+=	root=${PREFIX}
 INSTALL_TARGET=	installonly
diff --git a/net/lopster/Makefile b/net/lopster/Makefile
index d7fab41c18b..9ff62de39ee 100644
--- a/net/lopster/Makefile
+++ b/net/lopster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 22:51:22 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 14:50:05 grant Exp $
 #
 
 DISTNAME=	lopster-1.2.0
@@ -11,7 +11,7 @@ HOMEPAGE=	http://lopster.sourceforge.net/
 COMMENT=	Yet another Gtk+ Napster clone
 
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	# defined
 
 post-extract:
diff --git a/net/md-whois/Makefile b/net/md-whois/Makefile
index babb553303f..6cfe22e949b 100644
--- a/net/md-whois/Makefile
+++ b/net/md-whois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:22:19 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 14:50:06 grant Exp $
 #
 # todo: set location of [md-]whois.conf and fix in man page too
 # todo: build and install the po/ files and add to PLIST
@@ -18,7 +18,7 @@ VERSION=	4.6.9
 
 WRKSRC=		${WRKDIR}/whois-${VERSION}
 USE_PERL5=	build
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/whois ${PREFIX}/bin/md-whois
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index beb7b9c88b2..5f8b93e702b 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/20 12:22:20 agc Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/24 14:50:06 grant Exp $
 #
 
 DISTNAME=	mldonkey-${VER}.sources
@@ -15,7 +15,7 @@ COMMENT=	Free peer-to-peer client with eDonkey support and more
 WRKSRC=			${WRKDIR}/mldonkey-${VER}
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PERL5=		build
 
 MLDONKEY_SUBST=		PREFIX="${PREFIX}"
diff --git a/net/mtr-gtk/Makefile b/net/mtr-gtk/Makefile
index 99f8e4fe58f..9342f88df4c 100644
--- a/net/mtr-gtk/Makefile
+++ b/net/mtr-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/06 07:05:24 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/24 14:50:06 grant Exp $
 #
 
 DISTNAME=	mtr-0.54
@@ -15,7 +15,7 @@ COMMENT=	Traceroute and ping in a single graphical network diagnostic tool
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_BUILDLINK3=	yes
 USE_X11=	yes
 
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index d4f2ffde2ad..220ef27d89d 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/01/06 07:05:24 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2004/01/24 14:50:06 grant Exp $
 #
 
 DISTNAME=	mtr-0.54
@@ -14,7 +14,7 @@ COMMENT=	Traceroute and ping in a single graphical network diagnostic tool
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK3=		YES
 CONFIGURE_ARGS+=	--without-gtk
 INSTALLATION_DIRS=	man/man8 sbin
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 9f31c074d76..ef05686bf64 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2003/09/03 03:16:58 jmc Exp $
+# $NetBSD: Makefile,v 1.28 2004/01/24 14:50:06 grant Exp $
 
 DISTNAME=	netatalk-1.6.2
 CATEGORIES=	net print
@@ -11,7 +11,7 @@ COMMENT=	Netatalk appletalk file and print services
 
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_PERL5=	YES
 
 USE_PKGINSTALL=		YES
diff --git a/net/netsaint-base/Makefile.common b/net/netsaint-base/Makefile.common
index 3f557fa2de2..da5bff74f75 100644
--- a/net/netsaint-base/Makefile.common
+++ b/net/netsaint-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2003/05/01 19:14:12 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/01/24 14:50:06 grant Exp $
 #
 
 CATEGORIES=		net sysutils
@@ -17,7 +17,7 @@ PKG_USERS+=	${NETSTADM_USER}:${NETSTADM_GROUP}::NetSaint\\ Administrator:${PREFI
 
 USE_X11=		YES
 GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 USE_PERL5=		YES
 
diff --git a/net/nprobe/Makefile b/net/nprobe/Makefile
index 4ce774e5485..49c3850bf57 100644
--- a/net/nprobe/Makefile
+++ b/net/nprobe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:22:20 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 14:50:06 grant Exp $
 
 DISTNAME=	nProbe-source-1.3.1
 PKGREVISION=	1
@@ -14,7 +14,7 @@ COMMENT=	Monitor a network interface and generate NetFlow data
 WRKSRC=		${WRKDIR}/nProbe
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 ALL_TARGET=	nprobe
 
 INTERACTIVE_STAGE=	fetch
diff --git a/net/ntop2/Makefile b/net/ntop2/Makefile
index 22589e37091..8fcbfa44aa8 100644
--- a/net/ntop2/Makefile
+++ b/net/ntop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/20 12:22:20 agc Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/24 14:50:06 grant Exp $
 
 DISTNAME=		ntop-2.2
 PKGNAME=		ntop2-2.2
@@ -16,7 +16,7 @@ CONFLICTS=		ntop-[0-9]*
 WRKSRC=                 ${WRKDIR}/${DISTNAME}/ntop
 USE_X11=		yes
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=          yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 9bf015ad711..f269691f1b0 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/20 12:22:20 agc Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/24 14:50:06 grant Exp $
 #
 
 DISTNAME=	openh323_1.10.4
@@ -21,7 +21,7 @@ MAKE_ENV+=	PWLIBDIR=${PREFIX} OPENH323DIR=${WRKSRC}
 WRKSRC=		${WRKDIR}/openh323
 USE_BUILDLINK2=	yes
 USE_PKGINSTALL=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 ALL_TARGET=	opt
 
diff --git a/net/polsms/Makefile b/net/polsms/Makefile
index 89c5912ebad..9ac80f72945 100644
--- a/net/polsms/Makefile
+++ b/net/polsms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/20 12:22:20 agc Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/24 14:50:06 grant Exp $
 #
 
 DISTNAME=	sms-1.9.2d
@@ -12,7 +12,7 @@ COMMENT=	Send SMS to cellular phones in Poland (Plus, Idea, Era)
 
 WRKSRC=		${WRKDIR}/sms
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sms ${PREFIX}/bin
diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index 5f1c199738f..a0f39f03eb2 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/12/07 13:53:34 martti Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 14:50:06 grant Exp $
 
 PKGNAME=	proftpd-1.2.9
 DISTNAME=	proftpd-1.2.9
@@ -13,7 +13,7 @@ COMMENT=	FTP server with Apache like configuration
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 GNU_CONFIGURE=	# defined
-USE_GMAKE=	# defined
+USE_GNU_TOOLS+=	make
 USE_PKGINSTALL=	YES
 
 CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile
index 4c6bc0b9861..eb791065c65 100644
--- a/net/py-ORBit/Makefile
+++ b/net/py-ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/11/12 01:31:51 salo Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 14:50:06 grant Exp $
 #
 
 DISTNAME=	pyorbit-2.0.0
@@ -14,7 +14,7 @@ COMMENT=	Python bindings for ORBit2
 
 PY_PATCHPLIST=	YES
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/pyorbit-2.pc.in
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 2fa106058a5..0a8d6b919ff 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/12/21 18:53:26 kristerw Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 14:50:06 grant Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
@@ -43,7 +43,7 @@ PLIST_SRC+=		${PKGDIR}/PLIST.vtysh
 CONFIGURE_ARGS+=	--disable-vtysh
 .endif
 
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 
 BUILD_DEFS+=		USE_INET6
 
diff --git a/net/rdesktop10/Makefile b/net/rdesktop10/Makefile
index 1610ea6ac6c..91d6a4bed4e 100644
--- a/net/rdesktop10/Makefile
+++ b/net/rdesktop10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/11/12 03:39:42 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 14:50:06 grant Exp $
 #
 
 DISTNAME=		rdesktop-1.0.0-pl19-8-0
@@ -13,7 +13,7 @@ HOMEPAGE=		http://www.rdesktop.org/
 COMMENT=		Open-source Remote Desktop Protocol client
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11=		yes
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${LOCALBASE}
diff --git a/net/rp-l2tp/Makefile b/net/rp-l2tp/Makefile
index 0da8dd50969..bec6063344b 100644
--- a/net/rp-l2tp/Makefile
+++ b/net/rp-l2tp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 14:50:06 grant Exp $
 #
 
 DISTNAME=	rp-l2tp-0.3
@@ -11,7 +11,7 @@ COMMENT=	User-space implementation of layer 2 tunnelling protocol
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=		make
 
 post-patch:
 	for f in l2tp.conf.5 l2tpd.8; do				\
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index 244d0b19df9..6bd3a01fda5 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/23 21:50:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 14:50:06 grant Exp $
 #
 
 DISTNAME=		tsclient-0.132
@@ -16,7 +16,7 @@ DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_PERL5=		run
 USE_X11=		yes
diff --git a/net/tsocks/Makefile b/net/tsocks/Makefile
index 117f378fed7..d29798ef31a 100644
--- a/net/tsocks/Makefile
+++ b/net/tsocks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 12:57:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/24 14:50:06 grant Exp $
 #
 
 DISTNAME=	tsocks-1.7
@@ -11,7 +11,7 @@ COMMENT=	Transparent SOCKS proxying library
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 CONFIGURE_ARGS+=	--with-conf=${PKG_SYSCONFDIR}/tsocks.conf
 
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 56fd9a5ef9b..1c71dacb1a9 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/20 12:22:22 agc Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 14:50:06 grant Exp $
 
 DISTNAME=	src
 PKGNAME=	unison-2.9.1
@@ -17,7 +17,7 @@ DIST_SUBDIR=	${PKGNAME_NOREV}
 # docs: unison-manual.pdf/html/ps/dvi
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK3=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 MAKE_FLAGS+=	CFLAGS="" UISTYLE=text
 MAKE_ENV+=	HOME=${WRKDIR}
 
diff --git a/net/wol/Makefile b/net/wol/Makefile
index c46b23e0b22..78a3f8957f4 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/08/28 20:05:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 14:50:06 grant Exp $
 #
 
 DISTNAME=	wol-0.6.0
@@ -12,7 +12,7 @@ COMMENT=	Small Wake On Lan client
 
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_GNU_GETTEXT=	YES
 USE_PKGLOCALEDIR=	YES
 INFO_FILES=		wol.info
diff --git a/net/xmftp/Makefile b/net/xmftp/Makefile
index bc87689efea..913c3c42926 100644
--- a/net/xmftp/Makefile
+++ b/net/xmftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:22:22 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 14:50:06 grant Exp $
 #
 
 DISTNAME=	xmftp-1.0.4
@@ -12,7 +12,7 @@ COMMENT=	X/Motif FTP client
 WRKSRC=		${WRKDIR}/xmftp/source
 USE_BUILDLINK2=	yes
 USE_X11BASE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xmftp ${PREFIX}/bin
diff --git a/net/xorp/Makefile b/net/xorp/Makefile
index 9ecf40396ae..dcf2845cb62 100644
--- a/net/xorp/Makefile
+++ b/net/xorp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/12/12 21:35:24 kristerw Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 14:50:06 grant Exp $
 #
 
 DISTNAME=	xorp-0.3
@@ -14,7 +14,7 @@ CONFLICTS+=	ncurses-[0-9]*
 
 HAS_CONFIGURE=	YES
 GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR}
 CONFIG_GUESS_OVERRIDE=	${WRKSRC}/cli/libtecla/config.guess
 CONFIG_SUB_OVERRIDE=	${WRKSRC}/cli/libtecla/config.sub
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 53b9c81ad40..515375f3a48 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2003/12/29 21:59:01 heas Exp $
+# $NetBSD: Makefile,v 1.61 2004/01/24 14:50:06 grant Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
@@ -50,7 +50,7 @@ CONF_FILES+=		${EGDIR}/vtysh.conf.sample ${PKG_SYSCONFDIR}/vtysh.conf
 CONFIGURE_ARGS+=	--disable-vtysh
 .endif
 
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 USE_MAKEINFO=		# defined
 .include "../../devel/readline/buildlink2.mk"