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

9 files changed, 18 insertions, 18 deletions

diff --git a/cross/COMMON/cross.mk b/cross/COMMON/cross.mk
index 13afbceb440..42ae8d9b2a2 100644
--- a/cross/COMMON/cross.mk
+++ b/cross/COMMON/cross.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: cross.mk,v 1.32 2005/05/19 01:30:48 jlam Exp $
+#	$NetBSD: cross.mk,v 1.33 2005/05/22 20:07:44 jlam Exp $
 
 # Shared definitions for building a cross-compile environment.
 
@@ -157,7 +157,7 @@ PLIST_PRE+=		${COMMON_DIR}/PLIST-egcs
 CROSS_DISTFILES+=	${EGCS_DISTNAME}.tar.gz ${EGCS_PATCHBUNDLE}
 SITES_${EGCS_DISTNAME}.tar.gz=		# no known-good site; fall back to distfiles mirrors
 SITES_${EGCS_PATCHBUNDLE}=		${MASTER_SITE_LOCAL}
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 CC_FOR_TARGET=		${EGCS_WRKSRC}/gcc/xgcc -B${EGCS_WRKSRC}/gcc/ ${CFLAGS_FOR_TARGET}
 CXX_FOR_TARGET=		${CC_FOR_TARGET}
diff --git a/cross/avr-binutils/Makefile b/cross/avr-binutils/Makefile
index 0c0197a993b..b82551ee872 100644
--- a/cross/avr-binutils/Makefile
+++ b/cross/avr-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:10 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:44 jlam Exp $
 
 DISTNAME=		binutils-2.13.2.1
 PKGNAME=		avr-binutils-2.13.2.1
@@ -10,7 +10,7 @@ MAINTAINER=		karlj@mdstud.chalmers.se
 COMMENT=		GNU binutils for Atmel AVR 8-bit RISC microcontrollers
 
 USE_BZIP2=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_MAKEINFO=		YES
diff --git a/cross/avr-gcc/Makefile b/cross/avr-gcc/Makefile
index 40cddc6c28f..52b1243c376 100644
--- a/cross/avr-gcc/Makefile
+++ b/cross/avr-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/16 01:32:22 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:44 jlam Exp $
 
 DISTNAME=		gcc-3.3.2003.05.11
 PKGNAME=		avr-gcc-3.3.2003.05.11
@@ -23,7 +23,7 @@ EXTRACT_ONLY=		gcc-core+g++-3.3.2003.05.11${EXTRACT_SUFX}
 GNU_CONFIGURE=		yes
 USE_PERL5=		build
 USE_BZIP2=		yes
-USE_GNU_TOOLS+=		lex make yacc
+USE_TOOLS+=		bison gmake lex
 PKGSRC_USE_TOOLS+=	tar
 USE_PKGLOCALEDIR=	yes
 
diff --git a/cross/avr-gdb/Makefile b/cross/avr-gdb/Makefile
index 60ab5d39113..763d97db6de 100644
--- a/cross/avr-gdb/Makefile
+++ b/cross/avr-gdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:10 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:44 jlam Exp $
 
 DISTNAME=	gdb-5.3
 PKGNAME=	avr-gdb-5.3
@@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:=gdb/}
 MAINTAINER=	karlj@mdstud.chalmers.se
 COMMENT=	GNU gdb for Atmel AVR 8-bit RISC microcontrollers
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=avr --program-prefix=avr
 
diff --git a/cross/binutils/Makefile b/cross/binutils/Makefile
index 8be8c729cb0..3232e72a012 100644
--- a/cross/binutils/Makefile
+++ b/cross/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/04/11 21:45:10 tv Exp $
+# $NetBSD: Makefile,v 1.42 2005/05/22 20:07:44 jlam Exp $
 #
 # GNU binutils configured to hold `as many targets as the cross system is
 # capable of using'.  Configures and builds everything except gas, which
@@ -15,7 +15,7 @@ HOMEPAGE=		http://www.gnu.org/
 COMMENT=		Unified GNU binutils for cross build environments
 
 USE_CROSSBASE=		yes
-USE_GNU_TOOLS+=		m4
+USE_TOOLS+=		gm4
 USE_LIBTOOL=		yes
 
 GNU_CONFIGURE=		yes
diff --git a/cross/h8300-hms-binutils/Makefile b/cross/h8300-hms-binutils/Makefile
index 4e085db91a6..c16ab021464 100644
--- a/cross/h8300-hms-binutils/Makefile
+++ b/cross/h8300-hms-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:10 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:45 jlam Exp $
 
 DISTNAME=		binutils-2.12.1
 PKGNAME=		cross-h8300-hms-binutils-2.12.1
@@ -13,7 +13,7 @@ COMMENT=		h8300-hms cross utility
 H8300_PREFIX=		${PREFIX}/libexec/cross-h8300-hms
 
 WRKSRC=			${WRKDIR}/objdir
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_MAKEINFO=		yes
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${H8300_PREFIX}
diff --git a/cross/h8300-hms-gcc/Makefile b/cross/h8300-hms-gcc/Makefile
index 9604274bcc0..ac9655f5ca1 100644
--- a/cross/h8300-hms-gcc/Makefile
+++ b/cross/h8300-hms-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:10 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:45 jlam Exp $
 
 DISTNAME=		gcc-core-3.1
 PKGNAME=		cross-h8300-hms-gcc-3.1
@@ -20,7 +20,7 @@ DEPENDS+=	cross-h8300-hms-binutils-[0-9]*:../../cross/h8300-hms-binutils
 H8300_PREFIX=		${LOCALBASE}/libexec/cross-h8300-hms
 
 WRKSRC=			${WRKDIR}/objdir
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${H8300_PREFIX}
 CONFIGURE_ARGS+=	--infodir=${H8300_PREFIX}/gcc
diff --git a/cross/i386-mingw32/Makefile b/cross/i386-mingw32/Makefile
index dd6a9ae3711..d79dd03b70f 100644
--- a/cross/i386-mingw32/Makefile
+++ b/cross/i386-mingw32/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/16 01:32:22 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:07:45 jlam Exp $
 
 DISTNAME=		cross-${TARGET_ARCH}-3.2
 CROSS_DISTFILES=
@@ -26,7 +26,7 @@ CROSS_DISTFILES+=	mingw-runtime-3.2.tar.gz
 MINGW_WRKSRC=		${WRKDIR}/mingw-runtime-3.2
 CROSS_DISTFILES+=	w32api-2.5.tar.gz
 W32_WRKSRC=		${WRKDIR}/w32api-2.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 PKGSRC_USE_TOOLS+=	tar
 USE_PERL5=		build
 
diff --git a/cross/mipsEEel-netbsd/Makefile b/cross/mipsEEel-netbsd/Makefile
index 1d34d7b6e59..741a82dbe34 100644
--- a/cross/mipsEEel-netbsd/Makefile
+++ b/cross/mipsEEel-netbsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/03/02 20:49:04 kristerw Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:45 jlam Exp $
 
 DISTNAME=	cross-${TARGET_ARCH}-${DISTVERSION}
 TARGET_ARCH=	mipsEEel-netbsd
@@ -8,7 +8,7 @@ CATEGORIES+=	cross lang
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Cross-compiler for NetBSD/PlayStation2 kernel
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_MAKEINFO=	yes
 
 .if exists(/usr/bin/bzcat)