Remove USE_GNU_TOOLS and replace with the correct USE_TOOLS definitions:

	USE_GNU_TOOLS	-> USE_TOOLS
	awk		-> gawk
	m4		-> gm4
	make		-> gmake
	sed		-> gsed
	yacc		-> bison

22 files changed, 44 insertions, 45 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index 7cecd8931a0..2c3aa55a21d 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2005/05/22 05:35:33 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2005/05/22 20:08:13 jlam Exp $
 
 DISTNAME=		R-2.1.0
 CATEGORIES=		math
@@ -17,8 +17,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 TEST_TARGET=		check
 USE_X11=		# defined
 USE_PERL5=		# defined
-USE_GNU_TOOLS+=		make
-USE_TOOLS+=		xmkmf
+USE_TOOLS+=		gmake xmkmf
 USE_GNU_READLINE=	# uses callback interface
 USE_MAKEINFO=		# defined
 TEXINFO_REQD=		4.5
diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index 4ad6750c01c..9c90c229b13 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:28 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:13 jlam Exp $
 
 DISTNAME=		blitz-0.6
 PKGNAME=		blitz++-0.6
@@ -11,7 +11,7 @@ COMMENT=		C++ template class library providing array objects
 
 CONFIGURE_ARGS+=	--with-cxx=gcc
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/blitz
diff --git a/math/capc-calc/Makefile b/math/capc-calc/Makefile
index 05a058b5afb..5064be527db 100644
--- a/math/capc-calc/Makefile
+++ b/math/capc-calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:46:28 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:13 jlam Exp $
 #
 
 DISTNAME=	calc-2.11.10.1
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.isthe.com/chongo/tech/comp/calc/
 COMMENT=	C arbitrary precision calculator
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
diff --git a/math/cln/Makefile b/math/cln/Makefile
index 052900f825d..a57cf183b2a 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:28 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:13 jlam Exp $
 
 DISTNAME=	cln-1.1.9
 CATEGORIES=	math
@@ -11,7 +11,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.ginac.de/CLN/
 COMMENT=	CLN Class Library for Numbers
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index 58d225506e7..16e0ebe8650 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/03/24 21:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:13 jlam Exp $
 
 DISTNAME=	eukleides.1.0.1
 PKGNAME=	eukleides-1.0.1
@@ -13,7 +13,7 @@ BUILD_DEPENDS+= bison>=1.35:../../devel/bison
 DEPENDS+=	pstoedit>=3.31:../../graphics/pstoedit
 
 BUILD_TARGET=	eukleides
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_MAKEINFO=	YES
 INFO_FILES=	eukleides.info
 
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 6d3750c5184..b79acd6383f 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/02/23 04:21:33 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:13 jlam Exp $
 
 .if (${MACHINE_ARCH} == "powerpc")
 DISTNAME=		fftw-3.0.1-fma
@@ -22,7 +22,7 @@ PKGCONFIG_OVERRIDE+=	fftw.pc.in
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--enable-shared
 USE_LANGUAGES=		fortran
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 INFO_FILES=		fftw3.info
 
 TEST_TARGET=		check
diff --git a/math/fftw2/Makefile b/math/fftw2/Makefile
index 1bfdc7d8aeb..28ff7dc9c16 100644
--- a/math/fftw2/Makefile
+++ b/math/fftw2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:29 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:13 jlam Exp $
 
 DISTNAME=		fftw-2.1.5
 PKGNAME=		fftw2-2.1.5
@@ -19,7 +19,7 @@ CONFIGURE_ARGS=		--enable-shared
 CONFIGURE_ARGS+=	--enable-i386-hacks
 .endif
 USE_LANGUAGES=		fortran
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_MAKEINFO=		yes
 INFO_FILES=		fftw.info
 
diff --git a/math/galculator/Makefile b/math/galculator/Makefile
index f44b1297ea9..fe123b25d37 100644
--- a/math/galculator/Makefile
+++ b/math/galculator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/18 15:45:04 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2005/05/22 20:08:13 jlam Exp $
 #
 
 DISTNAME=		galculator-1.2.5
@@ -11,7 +11,7 @@ COMMENT=		Desktop calculator with scientific / RPN modes
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index cd13f7af487..205b973d91c 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/20 15:48:27 drochner Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:13 jlam Exp $
 #
 
 DISTNAME=		gcalctool-5.5.42
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11=		YES
 USE_PKGLOCALEDIR=	yes
 
diff --git a/math/glpk/Makefile b/math/glpk/Makefile
index 1d6e75b1173..8969c39087f 100644
--- a/math/glpk/Makefile
+++ b/math/glpk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/03/30 15:23:53 adam Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:13 jlam Exp $
 
 DISTNAME=	glpk-4.8
 PKGREVISION=	1
@@ -9,7 +9,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/glpk/glpk.html
 COMMENT=	Library for solving linear programming problems
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 49e587e2aa9..b9d63b180d8 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2005/04/26 11:36:55 drochner Exp $
+# $NetBSD: Makefile,v 1.94 2005/05/22 20:08:13 jlam Exp $
 #
 
 DISTNAME=		gnumeric-1.2.13
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	YES
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PERL5=		YES
 USE_LIBTOOL=		YES
 
diff --git a/math/gnumeric14/Makefile b/math/gnumeric14/Makefile
index 7b1cb6f6751..a00397370d3 100644
--- a/math/gnumeric14/Makefile
+++ b/math/gnumeric14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/19 17:10:40 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:13 jlam Exp $
 #
 
 DISTNAME=		gnumeric-1.4.3
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	YES
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PERL5=		YES
 USE_LIBTOOL=		YES
 
diff --git a/math/grace/Makefile b/math/grace/Makefile
index 05547c50d40..98d722a796b 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/11 21:46:29 tv Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:13 jlam Exp $
 #
 
 DISTNAME=	grace-5.1.14
@@ -17,7 +17,7 @@ HOMEPAGE=	http://plasma-gate.weizmann.ac.il/Grace/
 COMMENT=	GRaphing, Advanced Computation and Exploration of data
 
 USE_X11BASE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LANGUAGES=		fortran
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-grace-home=${PREFIX}/grace
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 222b287e737..19e73596005 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/04/11 21:46:29 tv Exp $
+# $NetBSD: Makefile,v 1.47 2005/05/22 20:08:13 jlam Exp $
 
 DISTNAME=	Guppi-0.40.3
 PKGNAME=	${DISTNAME:S/G/g/}
@@ -21,7 +21,7 @@ CONFIGURE_ARGS=		--disable-gnumeric
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
diff --git a/math/libffm/Makefile b/math/libffm/Makefile
index 57ec9005b10..3c392cb5375 100644
--- a/math/libffm/Makefile
+++ b/math/libffm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:29 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:13 jlam Exp $
 
 DISTNAME=		libffm.0.28
 PKGNAME=		libffm-0.28
@@ -10,7 +10,7 @@ COMMENT=		Fast alpha-optimized replacement for some libm routines
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 ONLY_FOR_PLATFORM=      NetBSD-*-alpha
 
diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index ec5669d1056..a93f9eba6b9 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/04/27 14:31:05 adam Exp $
+# $NetBSD: Makefile,v 1.48 2005/05/22 20:08:13 jlam Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 PKGNAME=	octave-current-${OCTAVE_VER}
@@ -25,7 +25,7 @@ BROKEN=		Internal compiler error occurs on arm32 (even with gcc-2.95.3)
 .endif
 
 USE_GNU_READLINE=	yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_MAKEINFO=		yes
 USE_PERL5=		build
diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index 0844d3b500f..26fed8af060 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/22 01:42:11 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:14 jlam Exp $
 
 DISTNAME=	octave-forge-2004.11.16
 PKGREVISION=	1
@@ -11,7 +11,7 @@ COMMENT=	Extensions to Octave
 
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/math/octave/Makefile b/math/octave/Makefile
index c4b85d4c770..72e58473f4b 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2005/05/18 15:42:22 adam Exp $
+# $NetBSD: Makefile,v 1.55 2005/05/22 20:08:14 jlam Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 CATEGORIES=	math
@@ -24,7 +24,7 @@ BROKEN=		Internal compiler error occurs on arm32 (even with gcc-2.95.3)
 .endif
 
 USE_GNU_READLINE=	yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_MAKEINFO=		yes
 USE_PERL5=		build
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index e93034849e2..3ca572197e0 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:31 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:14 jlam Exp $
 
 DISTNAME=	qalculate-0.7.2
 CATEGORIES=	math
@@ -11,7 +11,7 @@ COMMENT=	Qalculate is a modern multi-purpose desktop calculator
 DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
 DEPENDS+=	wget>=1.8:../../net/wget
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GNU_READLINE=	yes
diff --git a/math/vista/Makefile b/math/vista/Makefile
index 7f3cf5f1c6f..717e0048d5e 100644
--- a/math/vista/Makefile
+++ b/math/vista/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/24 13:58:23 grant Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:14 jlam Exp $
 #
 
 DISTNAME=	vista
@@ -14,6 +14,6 @@ DEPENDS+=	xlispstat>=3.52.9:../../math/xlispstat
 
 WRKSRC=		${WRKDIR}/vista-5.0.5
 USE_X11BASE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/xeukleides/Makefile b/math/xeukleides/Makefile
index eb76ee70fed..87e2f8cc9e9 100644
--- a/math/xeukleides/Makefile
+++ b/math/xeukleides/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:31 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:14 jlam Exp $
 
 DISTNAME=	xeukleides.1.0.0
 PKGNAME=	xeukleides-1.0.0
@@ -14,7 +14,7 @@ DEPENDS+=	eukleides>=1.0.1:../../math/eukleides
 
 USE_X11BASE=	yes
 BUILD_TARGET=	xeukleides
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index a4d8f374ac3..bf721e96d24 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:31 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:14 jlam Exp $
 #
 
 DISTNAME=	yacas-1.0.57
@@ -11,7 +11,7 @@ COMMENT=	Yet Another Computer Algebra System
 
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LIBTOOL=	YES
 USE_X11=	YES
 USE_PERL5=	build