replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make.

77 files changed, 155 insertions, 157 deletions

diff --git a/lang/cilk/Makefile b/lang/cilk/Makefile
index 9f89bae8c82..d10cc40c595 100644
--- a/lang/cilk/Makefile
+++ b/lang/cilk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/08/09 10:59:06 seb Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/24 13:51:13 grant Exp $
 
 DISTNAME=		cilk-5.3.1
 PKGREVISION=		2
@@ -14,7 +14,7 @@ ONLY_FOR_PLATFORM=	*-*-alpha *-*-i386 -*-*mipse[bl] *-*-powerpc *-*-sparc
 
 GNU_CONFIGURE=		# defined
 USE_BUILDLINK2=	 	# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 USE_PERL5=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE= 	${WRKSRC}/libtool
diff --git a/lang/coq/Makefile b/lang/coq/Makefile
index f8d29c436af..c233e2d6bad 100644
--- a/lang/coq/Makefile
+++ b/lang/coq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/06/23 20:36:13 jtb Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 13:51:14 grant Exp $
 #
 
 DISTNAME=	coq-7.4
@@ -10,7 +10,7 @@ MAINTAINER=	richards+netbsd@CS.Princeton.EDU
 HOMEPAGE=	http://coq.inria.fr/
 COMMENT=	Theorem prover which extracts programs from proofs
 
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_BUILDLINK2=	YES
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS+=	-prefix ${PREFIX}
diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index baed018c7c6..3b3bb6bcc55 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/20 12:19:16 agc Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/24 13:51:14 grant Exp $
 #
 
 DISTNAME=		plt.src.x
@@ -20,7 +20,7 @@ CONFLICTS+=		mzscheme-[0-9]*:../../lang/mzscheme
 WRKSRC=                 ${WRKDIR}/plt/src
 USE_BUILDLINK2=		yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PERL5=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/lang/dylan-interpreter/Makefile.common b/lang/dylan-interpreter/Makefile.common
index 160d23fdfbc..ee5e31feb1c 100644
--- a/lang/dylan-interpreter/Makefile.common
+++ b/lang/dylan-interpreter/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2003/12/09 01:04:23 reed Exp $
+# $NetBSD: Makefile.common,v 1.12 2004/01/24 13:51:14 grant Exp $
 #
 
 DISTNAME=		gwydion-dylan-${DYLAN_VERSION}
@@ -18,7 +18,7 @@ HOMEPAGE=		http://www.gwydiondylan.org/
 COMMENT=		Functional language
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 MAKEFILE=		GNUmakefile
 ALL_TARGET=		default
 
diff --git a/lang/eieio/Makefile b/lang/eieio/Makefile
index 353546b64fc..72437f5f030 100644
--- a/lang/eieio/Makefile
+++ b/lang/eieio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/08/09 10:59:07 seb Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 13:51:14 grant Exp $
 #
 
 DISTNAME=	eieio-0.17
@@ -19,7 +19,7 @@ DEPENDS+=	xemacs-packages:../../editors/xemacs-packages
 MAKEFLAGS+=	EMACS=${EMACS_BIN}
 
 NO_CONFIGURE=	# set
-USE_GMAKE=	# set
+USE_GNU_TOOLS+=	make
 
 INFO_FILES=	eieio.info
 
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 448b5afa663..bb581440d25 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/11/12 03:39:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 13:51:14 grant Exp $
 
 DISTNAME=		otp_src_R9C-0
 PKGNAME=		erlang-9.2
@@ -16,7 +16,7 @@ USE_BUILDLINK2=		yes
 USE_X11=		yes
 USE_PERL5=		yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_JAVA=		yes
 USE_JAVA2=		yes
 
diff --git a/lang/ezm3/Makefile b/lang/ezm3/Makefile
index bd4a6b8bdad..8f996ea1bf6 100644
--- a/lang/ezm3/Makefile
+++ b/lang/ezm3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/13 22:02:20 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 13:51:14 grant Exp $
 
 DISTNAME=	ezm3-1.1
 CATEGORIES=	lang
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.polstra.com/projects/freeware/ezm3/
 COMMENT=	Easier, more portable Modula-3 distribution for building CVSup
 
 DIST_SUBDIR=		ezm3
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 NO_BUILD=		yes
 INSTALL_TARGET=		all
 MAKE_ARGS+=		M3OPTIONS="-DBUILD_ALL -DSHIP_ALL"
diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index 914f16764cf..b002401679b 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/01/02 19:22:14 cjep Exp $
+# $NetBSD: Makefile,v 1.31 2004/01/24 13:51:14 grant Exp $
 
 DISTNAME=		gcc-2.95.3
 PKGNAME=		gcc-ssp-2.95.3.13
@@ -30,7 +30,7 @@ GCC_FILESDIR=		${.CURDIR}/../gcc/files
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	${WRKSRC}/configure
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 9b953274942..e1d5bc15d15 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2003/12/18 15:44:24 ben Exp $
+# $NetBSD: Makefile,v 1.74 2004/01/24 13:51:14 grant Exp $
 
 DISTNAME=		gcc-2.95.3
 PKGREVISION=		5
@@ -19,7 +19,7 @@ NOT_FOR_PLATFORM=	Darwin-*-*
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	${WRKSRC}/configure
diff --git a/lang/gcc3-c/Makefile.common b/lang/gcc3-c/Makefile.common
index 82ebeb6916c..e3c5b0e4945 100644
--- a/lang/gcc3-c/Makefile.common
+++ b/lang/gcc3-c/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2003/12/03 11:28:55 drochner Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/01/24 13:51:14 grant Exp $
 #
 
 GCC_VERSION=	3.3.2
@@ -14,7 +14,7 @@ NOT_FOR_PLATFORM=	Darwin-*-*
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 HAS_CONFIGURE=		YES
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/lang/gcc3/Makefile b/lang/gcc3/Makefile
index 449ed97a3b3..367ca4f6550 100644
--- a/lang/gcc3/Makefile
+++ b/lang/gcc3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2004/01/21 10:17:56 abs Exp $
+# $NetBSD: Makefile,v 1.48 2004/01/24 13:51:14 grant Exp $
 #
 
 DISTNAME=		gcc-3.3
@@ -18,7 +18,7 @@ NOT_FOR_PLATFORM=	Darwin-*-*
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 HAS_CONFIGURE=		YES
 
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index a236d0fa8a8..c642eafecd2 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/12/31 17:11:57 kristerw Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/24 13:51:14 grant Exp $
 
 DISTNAME=	ghc-5.04.3
 CATEGORIES=	lang
@@ -19,7 +19,7 @@ USE_BUILDLINK2=	#defined
 
 USE_GNU_READLINE=yes
 USE_PERL5=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 # Note: this package contains a Haskell compiler that is itself
 # written in Haskell. There are basically two ways we can solve the
diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile
index 646384222a0..254f27f4112 100644
--- a/lang/gpc/Makefile
+++ b/lang/gpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/20 12:19:16 agc Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/24 13:51:14 grant Exp $
 
 DISTNAME=		gpc-2.1
 PKGREVISION=		3
@@ -20,7 +20,7 @@ BUILD_DEPENDS+=		gsed-[0-9]*:../../textproc/gsed
 
 WRKSRC=			${WRKDIR}/gcc-2.95.3
 USE_BUILDLINK2=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 USE_NCURSES=		# defined
 PLIST_SRC=		PLIST
 
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 31231be0d52..9da081cf3da 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2003/12/14 17:14:40 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2004/01/24 13:51:14 grant Exp $
 
 DISTNAME=		guile-1.6.4
 CATEGORIES=		lang
@@ -12,7 +12,7 @@ CONFLICTS=		guile14<1.4.1nb1
 
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/lang/guile14/Makefile b/lang/guile14/Makefile
index 8b702b5d3d6..8d89a6ebd14 100644
--- a/lang/guile14/Makefile
+++ b/lang/guile14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/09/28 09:13:57 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/24 13:51:14 grant Exp $
 
 DISTNAME=		guile-1.4.1
 PKGNAME=		guile14-1.4.1
@@ -12,7 +12,7 @@ COMMENT=		GNU's Ubiquitous Intelligent Language for Extension
 
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 NO_MTREE=		YES
 
 USE_LIBTOOL=		YES
diff --git a/lang/inform/Makefile b/lang/inform/Makefile
index 72430fc7bcd..a0cfc1326c7 100644
--- a/lang/inform/Makefile
+++ b/lang/inform/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/09/16 18:55:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 13:51:14 grant Exp $
 
 DISTNAME=	inform-6.21.4
 CATEGORIES=	lang
@@ -11,7 +11,7 @@ COMMENT=	Interactive fiction compiler (creates z-code)
 LICENSE=	no-profit
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 INFO_FILES=	inform
 
diff --git a/lang/japhar/Makefile b/lang/japhar/Makefile
index 896e32283ee..18b8ad3750d 100644
--- a/lang/japhar/Makefile
+++ b/lang/japhar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/08/09 10:59:09 seb Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 13:51:14 grant Exp $
 #
 
 DISTNAME=		japhar-0.08
@@ -13,7 +13,7 @@ ONLY_FOR_PLATFORM=	SunOS-*-*       # untested on NetBSD
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_GCC_SHLIB=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig ${WRKSRC}/lib/libffi/ltconfig
 
diff --git a/lang/jdk-openjit/Makefile.common b/lang/jdk-openjit/Makefile.common
index 7b52bfafda9..6335f194a23 100644
--- a/lang/jdk-openjit/Makefile.common
+++ b/lang/jdk-openjit/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2003/08/23 15:13:59 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/01/24 13:51:14 grant Exp $
 
 OPENJIT_VERSION=1.1.16
 
@@ -12,7 +12,7 @@ COMMENT=	Reflective JIT compiler for Java
 
 GNU_CONFIGURE=	# defined
 USE_BUILDLINK2=	# defined
-USE_GMAKE=	# defined
+USE_GNU_TOOLS+=	make
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/java-vm.mk"
diff --git a/lang/jikes/Makefile b/lang/jikes/Makefile
index 1e06aa87809..c7370ba9142 100644
--- a/lang/jikes/Makefile
+++ b/lang/jikes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/13 23:02:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 13:51:14 grant Exp $
 #
 
 DISTNAME=	jikes-1.18
@@ -17,6 +17,6 @@ GNU_CONFIGURE=		yes
 USE_GCC_SHLIB=		yes
 UNLIMIT_RESOURCES=      datasize
 
-USE_GMAKE=	# uses multi-line comments with \ (naughty hack!)
+USE_GNU_TOOLS+=	make	# uses multi-line comments with \ (naughty hack!)
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index 03990486ba9..ff57c829620 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2003/09/23 20:56:00 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.51 2004/01/24 13:51:14 grant Exp $
 
 DISTNAME=		kaffe-1.1.0
 CATEGORIES=		lang java
@@ -12,7 +12,7 @@ USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
 USE_X11=		yes
 USE_LIBTOOL=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 TEST_TARGET=		check
 
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 8fc81aceb34..da30a48a3b3 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2003/08/09 12:30:51 seb Exp $
+# $NetBSD: Makefile,v 1.32 2004/01/24 13:51:14 grant Exp $
 #
 
 DISTNAME=		librep-${REP_VERS}
@@ -17,7 +17,7 @@ DEPENDS+=		libtool-base>=${LIBTOOL_REQD}:../../devel/libtool-base
 USE_GNU_READLINE=	# uses rl_basic_quote_characters
 
 USE_BUILDLINK2=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		# defined
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 REP_LIBTOOL=		${PREFIX}/libexec/rep/${MACHINE_GNU_PLATFORM}/libtool
diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index d1008a7d58c..e66c065cc24 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/09/28 09:13:57 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/24 13:51:14 grant Exp $
 
 DISTNAME=		mercury-compiler-0.11.0
 PKGNAME=		mercury-0.11.0
@@ -13,7 +13,7 @@ COMMENT=		Modern logic/functional programming language
 
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_GNU_READLINE=	yes	# rl_prep_term_function
 
 INFO_FILES=		mercury.info mercury_faq.info mercury_library.info
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 9d7afac3c13..2ac9f31780a 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/16 06:40:50 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/24 13:51:14 grant Exp $
 #
 
 DISTNAME=	mono-0.29
@@ -19,7 +19,7 @@ NOT_FOR_PLATFORM=	NetBSD-1.[0-5]*-*
 NOT_FOR_PLATFORM+=	NetBSD-1.6-* NetBSD-1.6.*-*
 NOT_FOR_PLATFORM+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[AB]-*
 
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 
diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index bdbcd7d1a7b..833a732547d 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/01/20 12:19:17 agc Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/24 13:51:14 grant Exp $
 
 DISTNAME=		nhc98src-1.16
 PKGNAME=		nhc98-1.16
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--buildwith=gcc --installdir=${PREFIX} \
 # Note that you can also build with ghc (Glasgow Haskell Compiler) or
 # hbc (Chalmers Haskell).
 
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 ALL_TARGET=		default
 
 HARCH=			`${WRKSRC}/script/harch`
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index e55261473b6..26cb7e402cd 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/01/05 11:28:07 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/24 13:51:14 grant Exp $
 #
 
 DISTNAME=	ocaml-3.06
@@ -13,7 +13,7 @@ COMMENT=	The latest implementation of the Caml dialect of ML
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	-prefix ${PREFIX}
 CONFIGURE_ARGS+=	-tkdefs "${OCAML_CPPFLAGS}"
diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile
index e7e30c3d1a1..7bfb093c0e4 100644
--- a/lang/oo2c/Makefile
+++ b/lang/oo2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/12/04 19:48:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 13:51:14 grant Exp $
 
 DISTNAME=		oo2c_${BITS}-2.0.11
 PKGNAME=		oo2c-2.0.11
@@ -22,7 +22,7 @@ BITS=32
 
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 
 EVAL_PREFIX+=		LIBTOOL_PREFIX=libtool-base
diff --git a/lang/openc++/Makefile b/lang/openc++/Makefile
index 330d2085a07..7f93fd193f4 100644
--- a/lang/openc++/Makefile
+++ b/lang/openc++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:19:17 agc Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 13:51:14 grant Exp $
 #
 
 DISTNAME=	opencxx2512
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.csg.is.titech.ac.jp/~chiba/openc++.html
 COMMENT=	OpenC++ is a version of C++ with a Metaobject Protocol
 
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 MAKEFILE=	Makefile.SunOSandBSD
 MAKE_FLAGS+=	CXXFLAGS=-I${PREFIX}/include
 MAKE_FLAGS+=	GCLIBDIR=${BUILDLINK_DIR}
diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index 5ff0fb649aa..85f5b0e7ecf 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/01/23 23:26:25 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2004/01/24 13:51:14 grant Exp $
 
 # The following two variables should have empty values unless we're
 # building a perl snapshot or release candidate.
@@ -99,7 +99,7 @@ CONFIGURE_ARGS+=	-Dcc="${PERL5_CC}"
 # The perl build attempts to work around case-insensitivity problems on
 # HFS filesystems by using GNUmakefiles, so we need to use GNU make.
 #
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 #
 # Perl is _always_ built using shared libraries on Darwin; there's no
 # way to build a statically-linked perl binary.
diff --git a/lang/pforth/Makefile b/lang/pforth/Makefile
index f8a9fc3613d..1a040981882 100644
--- a/lang/pforth/Makefile
+++ b/lang/pforth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:19:17 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 13:51:14 grant Exp $
 
 DISTNAME=		pfthpc21
 PKGNAME=		pforth-21
@@ -11,7 +11,7 @@ HOMEPAGE=		http://www.softsynth.com/pforth/
 COMMENT=		Portable ANS-like Forth
 
 WRKSRC=			${WRKDIR}
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 MAKEFILE=		${WRKSRC}/makefile
 
 NOT_FOR_PLATFORM=	*-*-alpha  #segfaults when running ./pforth during build
diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile
index 5f0dc7f92c3..b576bd099ac 100644
--- a/lang/pgcc/Makefile
+++ b/lang/pgcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/08/09 10:59:11 seb Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/24 13:51:15 grant Exp $
 
 DISTNAME=		gcc-2.95.2
 PKGNAME=		pgcc-2.95.2.1
@@ -21,7 +21,7 @@ ONLY_FOR_PLATFORM=	NetBSD-*-arm NetBSD-*-arm32 NetBSD-*-i386	\
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	${WRKSRC}/configure
diff --git a/lang/pnet/Makefile b/lang/pnet/Makefile
index badc9a6728a..85043b1adfc 100644
--- a/lang/pnet/Makefile
+++ b/lang/pnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/16 06:40:50 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 13:51:15 grant Exp $
 #
 
 DISTNAME=	pnet-0.6.2
@@ -14,7 +14,7 @@ BUILD_DEPENDS=	treecc>=0.2.6:../../devel/treecc
 
 CONFLICTS=	mono-[0-9]*
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_MAKEINFO=	yes
 GNU_CONFIGURE=	yes
 USE_BUILDLINK2=	yes
diff --git a/lang/pnetC/Makefile b/lang/pnetC/Makefile
index da63da50dcf..d99d302c95e 100644
--- a/lang/pnetC/Makefile
+++ b/lang/pnetC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/12 17:25:43 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 13:51:15 grant Exp $
 #
 
 DISTNAME=	pnetC-0.6.0
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.dotgnu.org/
 COMMENT=	C language binding for DotGNU Portable .NET
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_BUILDLINK2=	yes
 
 .include "../../lang/pnet/buildlink2.mk"
diff --git a/lang/pnetlib/Makefile.common b/lang/pnetlib/Makefile.common
index d122314389f..4971cfdd45d 100644
--- a/lang/pnetlib/Makefile.common
+++ b/lang/pnetlib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2004/01/12 17:15:29 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/01/24 13:51:15 grant Exp $
 #
 
 DISTNAME=	pnetlib-0.6.2
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.dotgnu.org/
 COMMENT=	DotGNU Portable .NET C SHARP class libraries
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_BUILDLINK2=	yes
 
 DESCR_SRC=	${.CURDIR}/../pnetlib/DESCR
diff --git a/lang/rexx-regina/Makefile b/lang/rexx-regina/Makefile
index 2ff0bb432c1..0f64f0d741b 100644
--- a/lang/rexx-regina/Makefile
+++ b/lang/rexx-regina/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:19:17 agc Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 13:51:15 grant Exp $
 #
 
 DISTNAME=	regina301
@@ -13,7 +13,7 @@ COMMENT=	Implementation of the REXX language
 
 WRKSRC=		${WRKDIR}
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 CONFLICTS=	rexx-imc-[0-9]*
 
diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index d7631612fa9..198d0dfe106 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/13 20:29:46 kristerw Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/24 13:51:15 grant Exp $
 
 DISTNAME=		sather-1.2.1
 PKGREVISION=		2
@@ -11,7 +11,7 @@ COMMENT=		Compiler for the Sather object oriented programming language
 
 USE_BUILDLINK2=		# defined
 USE_X11=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 
 ALL_TARGET=		full optional
 MAKE_ENV+=		_OPSYS_RPATH_NAME=${_OPSYS_RPATH_NAME}
diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index 3adae16c8b5..28a28649fba 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/10/04 20:31:23 agc Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/24 13:51:15 grant Exp $
 #
 
 DISTNAME=	scm5d8
@@ -13,7 +13,7 @@ COMMENT=	Portable scheme interpreter
 
 DEPENDS+=	slib>=2.4.6:../../devel/slib
 
-USE_GMAKE=	# defined
+USE_GNU_TOOLS+=	make
 USE_X11=	# defined
 
 WRKSRC=		${WRKDIR}/scm
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 777256dc53e..09f64db39c3 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/08/11 18:27:27 jmc Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/24 13:51:15 grant Exp $
 
 DISTNAME=		smalltalk-2.1.4
 CATEGORIES=		lang
@@ -11,7 +11,7 @@ COMMENT=		GNU Smalltalk: A smalltalk-80 implementation
 ONLY_FOR_PLATFORM=	*-*-i386 *-*-sparc *-*-powerpc
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_GNU_READLINE=	YES
 
 USE_LIBTOOL=		YES
diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile
index 150d503fc3f..c12f97880ab 100644
--- a/lang/smlnj/Makefile
+++ b/lang/smlnj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:19:17 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 13:51:15 grant Exp $
 #
 
 DISTNAME=	boot.${BOX}-unix
@@ -37,7 +37,7 @@ SML_VERSION=	110.42
 
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	smlnj-${SML_VERSION}
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 # previous versions of the package had an additional '-'
 CONFLICTS=	sml-nj-[0-9]*
diff --git a/lang/vscm/Makefile b/lang/vscm/Makefile
index fb7f4041ee0..559f5593d8d 100644
--- a/lang/vscm/Makefile
+++ b/lang/vscm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:45:37 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 13:51:15 grant Exp $
 
 DISTNAME=	vscmV0r4
 PKGNAME=	vscm-0.4
@@ -13,7 +13,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.cs.princeton.edu/~blume/vscm/
 COMMENT=	Portable scheme implementation
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 post-patch:
 	${SED} -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/path.h >${WRKSRC}/path.h
diff --git a/mail/GNUMail/Makefile b/mail/GNUMail/Makefile
index a6b9dade2f4..0d4f4b30c9a 100644
--- a/mail/GNUMail/Makefile
+++ b/mail/GNUMail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/23 21:50:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 13:55:30 grant Exp $
 #
 
 DISTNAME=	GNUMail-1.1.1
@@ -12,7 +12,7 @@ COMMENT=	GNUstep clone of NeXT's Mail.app application
 
 WRKSRC=			${WRKDIR}/GNUMail
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 NO_CONFIGURE=		YES
 MAKEFILE=		GNUmakefile
diff --git a/mail/Pantomime/Makefile b/mail/Pantomime/Makefile
index cc552d50590..38d06f5eb51 100644
--- a/mail/Pantomime/Makefile
+++ b/mail/Pantomime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/23 21:50:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/24 13:55:30 grant Exp $
 #
 
 DISTNAME=	Pantomime-1.1.1
@@ -13,7 +13,7 @@ COMMENT=	Objective-C mail system class library
 WRKSRC=			${WRKDIR}/Pantomime
 NO_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 MAKEFILE=		GNUmakefile
 MAKE_ENV+=		ADDITIONAL_CPPFLAGS=-DMKDIR
diff --git a/mail/courier-auth/Makefile.common b/mail/courier-auth/Makefile.common
index 53afb6f7b66..34f0ee7a921 100644
--- a/mail/courier-auth/Makefile.common
+++ b/mail/courier-auth/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2003/07/17 21:45:46 grant Exp $
+# $NetBSD: Makefile.common,v 1.7 2004/01/24 13:55:30 grant Exp $
 
 DISTNAME?=	courier-${DIST_VERS}
 CATEGORIES+=	mail
@@ -15,7 +15,7 @@ HOMEPAGE?=	http://www.courier-mta.org/
 DIST_VERS=	0.37.1
 BASE_VERS=	${DIST_VERS}
 
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 PKG_SYSCONFSUBDIR?=	courier
 DATADIR=		${PREFIX}/share/courier
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index f514629cc28..2ced138980d 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2004/01/23 21:50:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.50 2004/01/24 13:55:30 grant Exp $
 
 DISTNAME=		evolution-1.4.5
 PKGREVISION=		3
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=	--enable-ipv6=no
 .endif
 
 GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool ${WRKSRC}/libical/libtool
diff --git a/mail/evolution12/Makefile b/mail/evolution12/Makefile
index 57690c47d08..35d1f5d1673 100644
--- a/mail/evolution12/Makefile
+++ b/mail/evolution12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/04 21:39:50 rh Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/24 13:55:30 grant Exp $
 
 DISTNAME=		evolution-1.2.4
 PKGREVISION=		6
@@ -31,7 +31,7 @@ BUILDLINK_DEPENDS.db3=		db3-3.11.2{,nb*}
 BUILDLINK_DEPENDS.libxml=	libxml>=1.8.17
 
 GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool ${WRKSRC}/libical/libtool
diff --git a/mail/ifile/Makefile b/mail/ifile/Makefile
index e302aff2ed8..bb10db43f5d 100644
--- a/mail/ifile/Makefile
+++ b/mail/ifile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/25 15:25:12 salo Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 13:55:30 grant Exp $
 #
 
 DISTNAME=	ifile-1.3.2
@@ -10,6 +10,6 @@ HOMEPAGE=	http://www.nongnu.org/ifile/
 COMMENT=	Intelligent mail filtering system
 
 GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index ffc8404b507..81d4fbfeab3 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/23 21:50:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 13:55:30 grant Exp $
 
 DISTNAME=	kbiff-3.6.3
 PKGREVISION=	6
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.granroth.org/kbiff/index.html
 COMMENT= 	A new mail notification utility for KDE
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=              yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=          yes
 
 .include "../../meta-pkgs/kde3/buildlink2.mk"
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index b025e04ecad..6e4b0f3498f 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/11/12 03:39:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 13:55:30 grant Exp $
 
 DISTNAME=	libesmtp-1.0.1
 PKGREVISION=	1
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.stafford.uklinux.net/libesmtp/
 COMMENT=	Library to manage posting of electronic mail
 
 USE_BUILDLINK2=	yes
-USE_GMAKE=      yes
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile
index 8de63312d28..774aea31fb3 100644
--- a/mail/mailsync/Makefile
+++ b/mail/mailsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:19:43 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 13:55:30 grant Exp $
 #
 
 DISTNAME=	mailsync_4.3-2
@@ -13,7 +13,7 @@ COMMENT=	Mailsync is a way of synchronizing a collection of mailboxes
 DEPENDS+=	imap-uw-[0-9]*:../../mail/imap-uw
 
 WRKSRC=		${WRKDIR}/mailsync-4.3
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_GCC_SHLIB=	yes
 ALL_TARGET=	default
 
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 597386fd60d..b71f281507e 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/11/12 03:39:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 13:55:30 grant Exp $
 #
 
 DISTNAME=	prayer-1.0.8
@@ -14,7 +14,7 @@ PKG_GROUPS=	prayer
 
 USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_PERL5=	build
 
 MAKE_ENV+=	EGDIR="${EGDIR}"
diff --git a/mail/sigrot/Makefile b/mail/sigrot/Makefile
index 26454408dea..5a0a24be444 100644
--- a/mail/sigrot/Makefile
+++ b/mail/sigrot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:19:44 agc Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 13:55:30 grant Exp $
 
 DISTNAME=	sigrot_1.2-1
 PKGNAME=	sigrot-1.2
@@ -11,7 +11,7 @@ COMMENT=	Signature file rotation program
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 DOCDIR=		${PREFIX}/share/doc/sigrot
 EGDIR=		${PREFIX}/share/examples/sigrot
diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index 57e38c83030..fc42cc0a8c7 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/03 18:49:45 reed Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/24 13:55:30 grant Exp $
 #
 
 DISTNAME=       spruce-0.5.17
@@ -12,7 +12,7 @@ COMMENT=	MIME-aware, GNOME-based email program
 
 USE_X11=		yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 
diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index 322871bb890..0729f4c73f3 100644
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:19:44 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 13:55:30 grant Exp $
 # FreeBSD Id: ports/mail/ssmtp/Makefile,v 1.10 2003/04/14 08:41:04 leeym Exp
 #
 # TLS functionality needs testing. Please let me know the result,
@@ -21,7 +21,7 @@ WRKSRC=			${WRKDIR}/${PKGBASE}-${PKGVERSION:C/([0-9]+.[0-9]+)(.[0-9]+)(nb[0-9]+)
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-ssl --enable-inet6
 
diff --git a/mail/sylpheed-claws/Makefile.common b/mail/sylpheed-claws/Makefile.common
index ef984c9d7e6..21de949374c 100644
--- a/mail/sylpheed-claws/Makefile.common
+++ b/mail/sylpheed-claws/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/01/13 13:03:46 adam Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/01/24 13:55:31 grant Exp $
 #
 
 DISTNAME=	sylpheed-${SYLPHEED_VERSION}claws
@@ -12,7 +12,7 @@ DISTINFO_FILE=	${.CURDIR}/../../mail/sylpheed-claws/distinfo
 PATCHDIR=	${.CURDIR}/../../mail/sylpheed-claws/patches
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
diff --git a/mail/sylpheed-gtk2/Makefile b/mail/sylpheed-gtk2/Makefile
index 45f7177b429..31f3ff722d9 100644
--- a/mail/sylpheed-gtk2/Makefile
+++ b/mail/sylpheed-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/13 22:27:34 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 13:55:31 grant Exp $
 #
 
 DISTNAME=	sylpheed-0.9.8a-gtk2-20040109
@@ -16,7 +16,7 @@ DEPENDS+=		metamail>=2.7:../../mail/metamail
 CONFLICTS=		sylpheed-claws-[0-9]* sylpheed-[0-9]*
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 0624c248e8c..b5aac909eb0 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2004/01/07 01:40:43 xtraeme Exp $
+# $NetBSD: Makefile,v 1.58 2004/01/24 13:55:31 grant Exp $
 
 DISTNAME=	sylpheed-0.9.8a
 PKGREVISION=	1
@@ -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+=	--enable-nls
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index 124f737eeb3..2eb4131a4e8 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/03 18:49:45 reed Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/24 13:55:31 grant Exp $
 
 DISTNAME=	wmbiff-0.4.19
 PKGREVISION=	1
@@ -12,7 +12,7 @@ COMMENT=	xbuffy like "mail-checker" for WindowMaker
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
 USE_X11=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 EX_DIR=		${PREFIX}/share/examples/wmbiff
 
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index cb004dc56ce..933976661a9 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/07/17 21:47:12 grant Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/24 13:55:31 grant Exp $
 
 DISTNAME=	WMMail.app-0.64
 PKGNAME=	wmmail-0.64
@@ -14,7 +14,7 @@ DEPENDS+=	libproplist>=0.10.1:../../devel/libproplist
 DEPENDS+=	windowmaker>=0.80.0nb1:../../wm/windowmaker
 
 USE_X11BASE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-PL-incs="-I${LOCALBASE}/include" \
 			--with-PL-libs="-L${LOCALBASE}/lib"
diff --git a/math/R/Makefile b/math/R/Makefile
index 7d407d2c2b6..96476b90e26 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2004/01/05 12:20:57 markd Exp $
+# $NetBSD: Makefile,v 1.48 2004/01/24 13:58:23 grant Exp $
 
 DISTNAME=		R-1.8.1
 PKGREVISION=		1
@@ -18,7 +18,7 @@ TEST_TARGET=		check
 USE_BUILDLINK2=		# defined
 USE_X11=		# defined
 USE_PERL5=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 USE_GNU_READLINE=	# uses callback interface
 USE_MAKEINFO=		# defined
 TEXINFO_REQD=		4.0
diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index 58baa6089c4..113afb1ad18 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:47:21 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 13:58:23 grant Exp $
 
 DISTNAME=		blitz-0.6
 PKGNAME=		blitz++-0.6
@@ -11,7 +11,7 @@ COMMENT=		C++ template class library providing array objects
 
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 CONFIGURE_ARGS+=	--with-cxx=gcc
 
 post-install:
diff --git a/math/cassowary/Makefile b/math/cassowary/Makefile
index 13c077a449b..94adf7804d3 100644
--- a/math/cassowary/Makefile
+++ b/math/cassowary/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/07/17 21:47:23 grant Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/24 13:58:23 grant Exp $
 #
 
 DISTNAME=		cassowary-0.60
@@ -13,7 +13,7 @@ COMMENT=		Constraint-solving toolkit for linear equalities and inequalities
 BUILD_DEPENDS+=		bison>=1.34:../../devel/bison
 
 USE_BUILDLINK2=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		# defined
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index 4bf12b9ed7e..a2aaf32c5d9 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/08/09 11:11:38 seb Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 13:58:23 grant Exp $
 # FreeBSD Id: ports/math/eukleides/Makefile,v 1.1 2002/06/04 18:40:20 ijliao Exp
 
 DISTNAME=	eukleides.0.9.0
@@ -14,7 +14,7 @@ BUILD_DEPENDS+= bison>=1.35:../../devel/bison
 DEPENDS+=	pstoedit>=3.31:../../graphics/pstoedit
 
 ALL_TARGET=	eukleides
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_MAKEINFO=	YES
 INFO_FILES=	eukleides.info
 
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 0324ae3c416..2468ee59cb8 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/08/09 11:11:30 seb Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/24 13:58:23 grant Exp $
 
 .if (${MACHINE_ARCH} == "powerpc")
 DISTNAME=		fftw-3.0.1-fma
@@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE+=	${WRKSRC}/fftw.pc.in
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--enable-shared
 USE_FORTRAN=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 INFO_FILES=		fftw3.info
 
 TEST_TARGET=		check
diff --git a/math/fftw2/Makefile b/math/fftw2/Makefile
index 0701300006f..07579c59fa6 100644
--- a/math/fftw2/Makefile
+++ b/math/fftw2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/08/09 11:11:40 seb Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 13:58:23 grant Exp $
 
 DISTNAME=		fftw-2.1.5
 PKGNAME=		fftw2-2.1.5
@@ -16,7 +16,7 @@ CONFIGURE_ARGS=		--enable-shared
 CONFIGURE_ARGS+=	--enable-i386-hacks
 .endif
 USE_FORTRAN=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_MAKEINFO=		yes
 INFO_FILES=		fftw.info
 
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index e19014edf1f..c61ab2767fb 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/23 21:50:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/24 13:58:23 grant Exp $
 #
 
 DISTNAME=		gcalctool-4.3.38
@@ -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_X11=		YES
 USE_PKGLOCALEDIR=	yes
 
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 1a783392dbe..c34d5ed30cd 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2004/01/03 18:49:45 reed Exp $
+# $NetBSD: Makefile,v 1.78 2004/01/24 13:58:23 grant Exp $
 #
 
 DISTNAME=		gnumeric-1.0.13
@@ -17,7 +17,7 @@ DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_PERL5=		YES
 
 GNU_CONFIGURE=		YES
diff --git a/math/gnumeric0/Makefile b/math/gnumeric0/Makefile
index c8e3413f463..68adae47b57 100644
--- a/math/gnumeric0/Makefile
+++ b/math/gnumeric0/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/03 18:49:46 reed Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 13:58:23 grant Exp $
 #
 
 DISTNAME=		gnumeric-0.75
@@ -15,7 +15,7 @@ DEPENDS+=		gnome1-dirs>=1.2:../../misc/gnome1-dirs
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_PERL5=		YES
 
 GNU_CONFIGURE=		YES
diff --git a/math/grace/Makefile b/math/grace/Makefile
index ede64993f5a..e26367ebfb2 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/01/03 18:49:46 reed Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/24 13:58:23 grant Exp $
 #
 
 DISTNAME=	grace-5.1.12
@@ -18,7 +18,7 @@ COMMENT=	GRaphing, Advanced Computation and Exploration of data
 
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_FORTRAN=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-grace-home=${PREFIX}/grace
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 17dff72d8d7..a9c9e599c57 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/01/06 18:52:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2004/01/24 13:58:23 grant Exp $
 
 DISTNAME=	Guppi-0.40.3
 PKGNAME=	${DISTNAME:S/G/g/}
@@ -28,7 +28,7 @@ PLIST_SUBST+=		GNUMERIC="@comment "
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 
 USE_LIBTOOL=		YES
diff --git a/math/libffm/Makefile b/math/libffm/Makefile
index 1146e7392e2..9ffcdf0f2fb 100644
--- a/math/libffm/Makefile
+++ b/math/libffm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 16:57:13 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 13:58:23 grant Exp $
 
 DISTNAME=		libffm.0.28
 PKGNAME=		libffm-0.28
@@ -9,7 +9,7 @@ MAINTAINER=		root@garbled.net
 COMMENT=		Fast alpha-optimized replacement for some libm routines
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 ONLY_FOR_PLATFORM=      NetBSD-*-alpha
 
diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index 7183e9b1ef2..4b4fbb02937 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/01/23 13:26:20 adam Exp $
+# $NetBSD: Makefile,v 1.27 2004/01/24 13:58:23 grant Exp $
 #
 
 DISTNAME=	octave-${OCTAVE_VER}
@@ -27,7 +27,7 @@ BROKEN=		Internal compiler error occurs on arm32 (even with gcc-2.95.3)
 
 USE_BUILDLINK2=		YES
 USE_FORTRAN=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_GNU_READLINE=	YES
 USE_MAKEINFO=		YES
 USE_LIBTOOL=		YES
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 119479542a5..5bc47bdbfb9 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2003/12/24 13:02:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.42 2004/01/24 13:58:23 grant Exp $
 # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp
 
 DISTNAME=	octave-2.0.17
@@ -25,7 +25,7 @@ USE_X11=		yes
 GNU_CONFIGURE=		yes
 USE_FORTRAN=		yes
 USE_LIBTOOL=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 CONFIGURE_ENV+=		FFLAGS="${CFLAGS}" OBJECT_FMT="${OBJECT_FMT}"
 CPPFLAGS+=		-I${WRKDIR}/include
 LDFLAGS+=		-Wl,${RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib
diff --git a/math/vista/Makefile b/math/vista/Makefile
index 2732a09e139..7f3cf5f1c6f 100644
--- a/math/vista/Makefile
+++ b/math/vista/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:20:05 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 13:58:23 grant Exp $
 #
 
 DISTNAME=	vista
@@ -14,6 +14,6 @@ DEPENDS+=	xlispstat>=3.52.9:../../math/xlispstat
 
 WRKSRC=		${WRKDIR}/vista-5.0.5
 USE_X11BASE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/xeukleides/Makefile b/math/xeukleides/Makefile
index b795a37f865..2548de2bc71 100644
--- a/math/xeukleides/Makefile
+++ b/math/xeukleides/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/09/04 19:24:13 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 13:58:23 grant Exp $
 # FreeBSD Id: ports/math/eukleides/Makefile,v 1.1 2002/06/04 18:40:20 ijliao Exp
 
 DISTNAME=	xeukleides.0.9.0
@@ -18,7 +18,7 @@ USE_BUILDLINK2=	yes
 USE_MAKEINFO=	yes
 USE_X11BASE=	yes
 ALL_TARGET=	xeukleides
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mbone/mdp/Makefile b/mbone/mdp/Makefile
index b928d874458..80110c1e85a 100644
--- a/mbone/mdp/Makefile
+++ b/mbone/mdp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:20:24 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 14:00:13 grant Exp $
 #
 
 DISTNAME=	src-mdp-1.9a5
@@ -12,7 +12,7 @@ HOMEPAGE=	http://manimac.itd.nrl.navy.mil/MDP/
 COMMENT=	Multicast file transfer
 
 WRKSRC=		${WRKDIR}/mdp/unix
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 ALL_TARGET=	mdp
 
 pre-build:
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index cb602db4569..3550a85104f 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/01/20 12:20:24 agc Exp $
+# $NetBSD: Makefile,v 1.31 2004/01/24 14:00:13 grant Exp $
 #
 
 DISTNAME=		nt.1.5a23
@@ -14,9 +14,9 @@ DEPENDS+=		tk>=8.3.2:../../x11/tk
 
 WRKSRC=			${WRKDIR}
 CRYPTO=			yes
-USE_GMAKE=		yes
-# Pass this on to our child
+USE_GNU_TOOLS+=		make
 
+# Pass this on to our child
 do-configure:
 	cd ${WRKSRC}/netbsd && ${SH} configure
 
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index b063f78f8f7..93e3c5a03cf 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/07/17 21:48:26 grant Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 14:00:13 grant Exp $
 #
 
 DISTNAME=	rat-3.0.28
@@ -12,7 +12,7 @@ COMMENT=	Robust Audio Tool - multicast audioconferencing
 DEPENDS+=	tk>=8.3.2:../../x11/tk
 
 CRYPTO=		yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_X11BASE=	yes
 
 USER=		build
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index e9c6e82d130..4808ff456e3 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2004/01/20 12:20:24 agc Exp $
+# $NetBSD: Makefile,v 1.39 2004/01/24 14:00:13 grant Exp $
 #
 
 DISTNAME=	sdr-3.0
@@ -14,7 +14,7 @@ DEPENDS+=	common-mml>=1.2.0:../common-mml
 
 WRKSRC=		${WRKDIR}/sdr/${SYSDIR}
 CRYPTO=		yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -33,8 +33,6 @@ SYSDIR= solaris
 SYSDIR= freebsd
 .endif
 
-USE_GMAKE=	yes
-
 post-patch:
 	${MV} ${WRKSRC}/../src/sdr.tcl ${WRKSRC}/../src/sdr.tcl.in &&	\
 	${SED} -e 's|@PREFIX@|${PREFIX}|' ${WRKSRC}/../src/sdr.tcl.in >	\