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

20 files changed, 40 insertions, 40 deletions

diff --git a/cad/boolean/Makefile b/cad/boolean/Makefile
index 61d93440ee1..ab9a4dc4443 100644
--- a/cad/boolean/Makefile
+++ b/cad/boolean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:07:40 jlam Exp $
 #
 
 DISTNAME=	boolean
@@ -17,7 +17,7 @@ REL=		6.4
 
 BUILD_DEPENDS+=	cmake>=1.6.6:../../devel/cmake
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 # the zip archive messes up the case of these files which breaks
 # cmake.
diff --git a/cad/covered-current/Makefile b/cad/covered-current/Makefile
index 9b327ba56ed..fc5f33ec573 100644
--- a/cad/covered-current/Makefile
+++ b/cad/covered-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:40 jlam Exp $
 #
 
 DISTNAME=	covered-${SNAPDATE}
@@ -21,7 +21,7 @@ SNAPDATE=	20040325
 USE_PERL5=	YES
 REPLACE_PERL=	diags/verilog/check_test
 GNU_CONFIGURE=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 TEST_DIRS=	${WRKSRC}/diags/regress
 TEST_TARGET=	iverilog
 
diff --git a/cad/covered/Makefile b/cad/covered/Makefile
index 1ec42a19396..3886cbb5155 100644
--- a/cad/covered/Makefile
+++ b/cad/covered/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:40 jlam Exp $
 #
 
 DISTNAME=	covered-0.3
@@ -19,7 +19,7 @@ CONFLICTS+=	covered-current-[0-9]*
 USE_PERL5=	YES
 REPLACE_PERL=	diags/verilog/check_test
 GNU_CONFIGURE=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 TEST_DIRS=	${WRKSRC}/diags/regress
 TEST_TARGET=	iverilog
 
diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index 23470b0e319..f59460fafe6 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.32 2005/05/22 20:07:40 jlam Exp $
 #
 
 DISTNAME=	dinotrace-9.2a
@@ -13,7 +13,7 @@ GNU_CONFIGURE=		YES
 INFO_FILES=		dinotrace.info
 USE_PERL5=		build
 USE_X11=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda-examples/Makefile b/cad/geda-examples/Makefile
index c2e39f9e3c3..e99ab93630e 100644
--- a/cad/geda-examples/Makefile
+++ b/cad/geda-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/16 01:32:22 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:41 jlam Exp $
 #
 
 DISTNAME=	geda-examples-${PKGVERSION}
@@ -13,7 +13,7 @@ CONFLICTS+=	gEDA<19991011
 .include "../../cad/geda/Makefile.common"
 
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 PKGSRC_USE_TOOLS+=	tar
 
 pre-install:
diff --git a/cad/geda-symbols/Makefile b/cad/geda-symbols/Makefile
index 87858d274ba..4b358341f23 100644
--- a/cad/geda-symbols/Makefile
+++ b/cad/geda-symbols/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/01/11 03:16:23 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:41 jlam Exp $
 #
 
 DISTNAME=	geda-symbols-${PKGVERSION}
@@ -13,6 +13,6 @@ CONFLICTS+=	gEDA<19991011
 .include "../../cad/geda/Makefile.common"
 
 GNU_CONFIGURE=	YES
-USE_GNU_TOOLS+=	make sed
+USE_TOOLS+=	gmake gsed
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index d56e66489e5..6a836fd9128 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:07:41 jlam Exp $
 #
 
 DISTNAME=	gerbv-1.0.1
@@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
 
 CONFIGURE_ARGS+=	--enable-exportpng
 GNU_CONFIGURE=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 1efcba771a2..42fd6f27480 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:41 jlam Exp $
 #
 
 DISTNAME=		geda-gnetlist-${PKGVERSION}
@@ -19,7 +19,7 @@ CONFLICTS+=		gEDA<19991011
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 EVAL_PREFIX+=   PCBDIR=pcb
diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index 7a3c4bc6c13..76b0b385b11 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:41 jlam Exp $
 #
 
 DISTNAME=	gnucap-0.34
@@ -14,7 +14,7 @@ COMMENT=	General purpose circuit simulator
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_GNU_READLINE=	YES
 
 do-build:
diff --git a/cad/gsmc/Makefile b/cad/gsmc/Makefile
index aa798806584..7f0a505497d 100644
--- a/cad/gsmc/Makefile
+++ b/cad/gsmc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:41 jlam Exp $
 #
 
 DISTNAME=	gsmc-1.1
@@ -13,7 +13,7 @@ COMMENT=	Smith charting program
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 
 GNU_CONFIGURE=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/cad/ipal-current/Makefile b/cad/ipal-current/Makefile
index abdb9fb07d3..dd52bee7f43 100644
--- a/cad/ipal-current/Makefile
+++ b/cad/ipal-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:07:41 jlam Exp $
 #
 
 DISTNAME=	ipal-20001210
@@ -14,7 +14,7 @@ COMMENT=	Libs and utils for manipulating PAL designs (development version)
 BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
 
 GNU_CONFIGURE=	YES
-USE_GNU_TOOLS+=	lex make
+USE_TOOLS+=	gmake lex
 
 CFLAGS+=	-fPIC
 
diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index d3a7e290ddb..7813ab03aef 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:41 jlam Exp $
 #
 
 DISTNAME=	magic-7.1
@@ -10,7 +10,7 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://vlsi.cornell.edu/magic/
 COMMENT=	Integrated circuit layout system
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_X11=	YES
 MAKE_ENV+=	MAGIC_HOME=${PREFIX}
 
diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile
index ebb899b1b1a..498e7f0e44f 100644
--- a/cad/ng-spice/Makefile
+++ b/cad/ng-spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:07:41 jlam Exp $
 #
 
 DISTNAME=	ng-spice-rework-15c
@@ -14,7 +14,7 @@ WRKSRC=			${WRKDIR}/ng-spice-rework-15
 USE_X11=		YES
 USE_LIBTOOL=		YES
 USE_MAKEINFO=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_GNU_READLINE=	uses rl_* interface
 
 GNU_CONFIGURE=		YES
diff --git a/cad/pcb-current/Makefile b/cad/pcb-current/Makefile
index d0377a1b343..e264f58c12c 100644
--- a/cad/pcb-current/Makefile
+++ b/cad/pcb-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:41 jlam Exp $
 #
 
 DISTNAME=	pcb-${SNAPDATE}
@@ -20,7 +20,7 @@ CONFLICTS+=	pcb-[0-9]*
 
 SNAPDATE=	20050315
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	lex make
+USE_TOOLS+=	gmake lex
 USE_X11=	yes
 
 INFO_FILES=	pcb.info
diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile
index e0fe76c8dd0..44754876a09 100644
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:41 jlam Exp $
 #
 
 DISTNAME=	tkgate-1.6i
@@ -15,7 +15,7 @@ BUILD_DEPENDS+=		bison>=1.35:../../devel/bison
 BUILD_DEPENDS+=		libiconv-[0-9]*:../../converters/libiconv
 
 USE_IMAKE=		yes
-USE_GNU_TOOLS+=		m4
+USE_TOOLS+=		gm4
 
 TKGATE_SITENAME=	Earth
 
diff --git a/cad/tnt-mmtl/Makefile b/cad/tnt-mmtl/Makefile
index b2d0a9f7f4e..bcbb50275a1 100644
--- a/cad/tnt-mmtl/Makefile
+++ b/cad/tnt-mmtl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:41 jlam Exp $
 #
 
 DISTNAME=	tnt-1.2.2
@@ -17,7 +17,7 @@ BUILD_DEPENDS+=	teTeX>=1.0.7:../../print/teTeX
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 
 GNU_CONFIGURE=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++ fortran
 
 post-patch:
diff --git a/cad/transcalc/Makefile b/cad/transcalc/Makefile
index fb365580093..cb564fceff4 100644
--- a/cad/transcalc/Makefile
+++ b/cad/transcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:41 jlam Exp $
 #
 
 DISTNAME=	transcalc-0.14
@@ -11,7 +11,7 @@ HOMEPAGE=	http://transcalc.sourceforge.net/
 COMMENT=	Transmission line analysis/synthesis
 
 GNU_CONFIGURE=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/cad/verilog-current/Makefile b/cad/verilog-current/Makefile
index 9a7c47065bc..7ce1e16b607 100644
--- a/cad/verilog-current/Makefile
+++ b/cad/verilog-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.47 2005/05/22 20:07:41 jlam Exp $
 #
 
 DISTNAME=	verilog-${SNAPDATE}
@@ -18,7 +18,7 @@ BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
 
 SNAPDATE=	20041004
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	lex make
+USE_TOOLS+=	gmake lex
 CONFIGURE_ARGS+=	--without-ipal
 YACC=		${LOCALBASE}/bin/bison
 TEST_DIRS=	${WRKSRC}
diff --git a/cad/verilog/Makefile b/cad/verilog/Makefile
index dd9f2a09eba..05782e359c7 100644
--- a/cad/verilog/Makefile
+++ b/cad/verilog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:41 jlam Exp $
 #
 
 DISTNAME=	verilog-0.8.1
@@ -16,7 +16,7 @@ BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 CONFLICTS+=	verilog-current-[0-9]*
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	lex make
+USE_TOOLS+=	gmake lex
 CONFIGURE_ARGS+=	--without-ipal
 YACC=			${LOCALBASE}/bin/bison
 TEST_DIRS=	${WRKSRC}
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index 69cece5fc3d..9c3f9b69975 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.41 2005/05/22 20:07:41 jlam Exp $
 #
 
 DISTNAME=	ViPEC-3.2.0
@@ -10,7 +10,7 @@ HOMEPAGE=	http://vipec.sourceforge.net/
 COMMENT=	Network analyser for electrical networks
 
 USE_X11=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 UNLIMIT_RESOURCES+=	datasize
 
 CONFLICTS+=		vipec-[0-9]*