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

29 files changed, 58 insertions, 58 deletions

diff --git a/databases/db/Makefile b/databases/db/Makefile
index a7b1de2b77e..83e38eed572 100644
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:45:11 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:45 jlam Exp $
 
 DISTNAME=	db-2.7.7
 PKGREVISION=	2
@@ -21,7 +21,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS+=	--enable-compat185
 
-USE_GNU_TOOLS+=		awk
+USE_TOOLS+=		gawk
 
 INSTALLATION_DIRS=	bin include/db2 lib share/doc/html
 
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 6ae8ccda649..6acc2e6377d 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:45:11 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:45 jlam Exp $
 
 DISTNAME=	freetds-0.61.2
 PKGREVISION=	1
@@ -11,7 +11,7 @@ COMMENT=	LGPL'd implementation of Sybase's db-lib/ct-lib/ODBC libs
 
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 GNU_CONFIGURE=		yes
 GNU_CONFIGURE_PREFIX=	${PREFIX}/freetds
diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile
index 5b9643692d8..ec406785165 100644
--- a/databases/geneweb/Makefile
+++ b/databases/geneweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/05 11:07:35 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:07:45 jlam Exp $
 #
 
 DISTNAME=	geneweb-4.10
@@ -10,7 +10,7 @@ HOMEPAGE=	http://cristal.inria.fr/~ddr/GeneWeb/
 COMMENT=	GeneWeb is a comprehensive genealogy database application
 
 USE_PKGINSTALL=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 RCD_SCRIPTS=	geneweb
 
diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile
index 8f67fb498a6..b8be5917e70 100644
--- a/databases/gnats/Makefile
+++ b/databases/gnats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:11 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:45 jlam Exp $
 #
 
 DISTNAME=	gnats-4.0.1
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.gnu.org/software/gnats/
 COMMENT=	GNATS bug tracking system
 
 USE_PKGLOCALEDIR=	yes
-USE_GNU_TOOLS+=		m4 make
+USE_TOOLS+=		gm4 gmake
 USE_BISON=		yes
 USE_MAKEINFO=		yes
 TEXINFO_REQD=		4.6
diff --git a/databases/guile-pg/Makefile b/databases/guile-pg/Makefile
index e3ca6c41293..165b146d405 100644
--- a/databases/guile-pg/Makefile
+++ b/databases/guile-pg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:45:11 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:45 jlam Exp $
 #
 
 DISTNAME=	guile-pg-0.23
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.glug.org/people/ttn/software/guile-pg/
 COMMENT=	PostgreSQL interface for Guile
 
 USE_LIBTOOL=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 GNU_CONFIGURE=	YES
 
 TEST_TARGET=	check
diff --git a/databases/jdbc-postgresql/Makefile b/databases/jdbc-postgresql/Makefile
index 7249c2c5e8d..376d6efd439 100644
--- a/databases/jdbc-postgresql/Makefile
+++ b/databases/jdbc-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/10/25 17:40:01 jdolecek Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:07:45 jlam Exp $
 #
 
 DISTNAME=		postgresql-${DIST_VERS}
@@ -24,7 +24,7 @@ BUILD_DEPENDS+=		apache-ant-[0-9]*:../../devel/apache-ant
 EXTRACT_ELEMENTS=	${DISTNAME}/src/interfaces/jdbc
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src/interfaces/jdbc
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 EXAMPLEDIR=		${PREFIX}/share/examples/java/jdbc-postgresql
 DOCDIR=			${PREFIX}/share/doc/java/jdbc-postgresql
diff --git a/databases/jdbc-postgresql74/Makefile b/databases/jdbc-postgresql74/Makefile
index f0e836f8c29..c7fab419ca8 100644
--- a/databases/jdbc-postgresql74/Makefile
+++ b/databases/jdbc-postgresql74/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/10/25 17:12:10 jdolecek Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:45 jlam Exp $
 #
 
 DIST_VERS=		7.4.6
@@ -25,7 +25,7 @@ BUILD_DEPENDS+=		apache-ant-[0-9]*:../../devel/apache-ant
 EXTRACT_ELEMENTS=	${DISTNAME}/src/interfaces/jdbc
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src/interfaces/jdbc
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 EXAMPLEDIR=		${PREFIX}/share/examples/java/jdbc-postgresql
 DOCDIR=			${PREFIX}/share/doc/java/jdbc-postgresql
diff --git a/databases/lbdb/Makefile b/databases/lbdb/Makefile
index c5b83ea8cd3..d9081d95f6f 100644
--- a/databases/lbdb/Makefile
+++ b/databases/lbdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/03/25 21:39:11 kim Exp $
+# $NetBSD: Makefile,v 1.2 2005/05/22 20:07:45 jlam Exp $
 
 DISTNAME=		${PKGNAME:S/-/_/}
 PKGNAME=		lbdb-0.29
@@ -12,7 +12,7 @@ COMMENT=		The little brother's database
 DEPENDS+=		p5-perl-ldap>=0.20:../../databases/p5-perl-ldap
 
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PERL5=		yes
 USE_PKGINSTALL=		yes
 
diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index b6b30a84a3c..746e3963c50 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2005/05/20 22:09:39 jlam Exp $
+# $NetBSD: Makefile.common,v 1.29 2005/05/22 20:07:45 jlam Exp $
 #
 
 DISTNAME=		libgda-1.2.1
@@ -14,7 +14,7 @@ DISTINFO_FILE=		${.CURDIR}/../../databases/libgda/distinfo
 PATCHDIR=		${.CURDIR}/../../databases/libgda/patches
 
 USE_X11=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 42ad8b15e97..800f1e9ae83 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/18 18:01:48 drochner Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:07:45 jlam Exp $
 #
 
 DISTNAME=		libgnomedb-1.2.1
@@ -13,7 +13,7 @@ COMMENT=		GNOME2 database library
 BUILD_USES_MSGFMT=	yes
 
 USE_X11=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index ebceb27e844..3659c0980cb 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:45:12 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:07:45 jlam Exp $
 #
 
 DISTNAME=		mergeant-0.52
@@ -13,7 +13,7 @@ COMMENT=		GNOME2 GNOME-DB database front-end
 USE_PERL5=              build
 USE_DIRS+=		gnome2-1.5
 USE_X11=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-gtk-doc
diff --git a/databases/myodbc/Makefile b/databases/myodbc/Makefile
index d4042124152..06adbd095c7 100644
--- a/databases/myodbc/Makefile
+++ b/databases/myodbc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:21 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:45 jlam Exp $
 #
 
 DISTNAME=		MyODBC-2.50.36
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--with-odbc-ini=${LOCALBASE}/etc/odbc.ini
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/myodbc
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common
index 08d68454916..e93d2c43f1e 100644
--- a/databases/mysql-client/Makefile.common
+++ b/databases/mysql-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2005/05/18 15:00:35 sketch Exp $
+# $NetBSD: Makefile.common,v 1.43 2005/05/22 20:07:46 jlam Exp $
 
 DISTNAME=		mysql-4.0.24
 CATEGORIES=		databases
@@ -81,7 +81,7 @@ CONFIGURE_ENV+=	ac_cv_func_pthread_attr_setschedparam=no
 .endif
 
 USE_LANGUAGES=		c c++
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PERL5=		yes
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 25fa660fb3f..fe29d6fc7b1 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2005/05/18 15:08:24 sketch Exp $
+# $NetBSD: Makefile.common,v 1.39 2005/05/22 20:07:46 jlam Exp $
 
 DISTNAME=		mysql-4.1.11
 CATEGORIES=		databases
@@ -87,7 +87,7 @@ CONFIGURE_ENV+=	ac_cv_func_pthread_attr_setschedparam=no
 .endif
 
 USE_LANGUAGES=		c c++
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PERL5=		yes
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 
diff --git a/databases/odbc-postgresql/Makefile.common b/databases/odbc-postgresql/Makefile.common
index 87f4e58000b..f58668a3f70 100644
--- a/databases/odbc-postgresql/Makefile.common
+++ b/databases/odbc-postgresql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/04/11 21:45:12 tv Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/05/22 20:07:46 jlam Exp $
 
 DISTNAME=		postgresql-${DIST_VERS}
 CATEGORIES=		databases
@@ -29,7 +29,7 @@ PATCHDIR?=		${.CURDIR}/../odbc-postgresql/patches
 DIST_VERS?=		7.2.3
 BASE_VERS?=		${DIST_VERS}
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 MAKEFILE=		GNUmakefile
 GNU_CONFIGURE=		YES
 
diff --git a/databases/postgresql73/Makefile.common b/databases/postgresql73/Makefile.common
index 3fd9d369c0e..6ab332ec62c 100644
--- a/databases/postgresql73/Makefile.common
+++ b/databases/postgresql73/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/02/07 04:27:27 dan Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/05/22 20:07:46 jlam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -39,7 +39,7 @@ BASE_VERS?=		${DIST_VERS}
 BUILDLINK_DEPENDS.postgresql73-lib?=	postgresql73-lib>=${BASE_VERS}
 BUILDLINK_DEPENDS.tcl-postgresql73?=	tcl-postgresql73>=${BASE_VERS}
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		YES
 PKG_SYSCONFSUBDIR=	postgresql
 
diff --git a/databases/postgresql74/Makefile.common b/databases/postgresql74/Makefile.common
index a0acab788d8..849bce12d7d 100644
--- a/databases/postgresql74/Makefile.common
+++ b/databases/postgresql74/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2005/04/11 21:45:14 tv Exp $
+# $NetBSD: Makefile.common,v 1.23 2005/05/22 20:07:46 jlam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -44,7 +44,7 @@ BUILDLINK_DEPENDS.postgresql74-lib?=	postgresql74-lib>=${BASE_VERS}
 
 GNU_CONFIGURE=		yes
 BUILD_USES_MSGFMT=	yes
-USE_GNU_TOOLS+=		lex make yacc
+USE_TOOLS+=		bison gmake lex
 PKG_SYSCONFSUBDIR=	postgresql
 
 # in 7.4.2, this is done by autoconf stuff which has leading whitespace
diff --git a/databases/postgresql80/Makefile.common b/databases/postgresql80/Makefile.common
index 63cf119887d..e560b7e71e6 100644
--- a/databases/postgresql80/Makefile.common
+++ b/databases/postgresql80/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/05/15 12:31:57 recht Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:07:46 jlam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -43,7 +43,7 @@ BUILDLINK_DEPENDS.postgresql80-client?=	postgresql80-client>=${BASE_VERS}
 
 GNU_CONFIGURE=		yes
 BUILD_USES_MSGFMT=	yes
-USE_GNU_TOOLS+=		lex make yacc
+USE_TOOLS+=		bison gmake lex
 PKG_SYSCONFSUBDIR=	postgresql
 
 # in 7.4.x/8.0.x, this is done by autoconf stuff which has leading whitespace
diff --git a/databases/pxtools/Makefile b/databases/pxtools/Makefile
index 69858fdc957..ed54dd1263d 100644
--- a/databases/pxtools/Makefile
+++ b/databases/pxtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:15 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:46 jlam Exp $
 #
 
 DISTNAME=		pxtools-0.0.20
@@ -11,7 +11,7 @@ HOMEPAGE=		http://jan.kneschke.de/projects/pxtools/
 COMMENT=		Paradox database export/info utilities
 
 USE_PKGLOCALEDIR=	YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 GNU_CONFIGURE=		YES
 
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index 84cb97c65f3..9060f081b51 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/03/30 19:11:29 darcy Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:46 jlam Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-gdbm-0
@@ -11,7 +11,7 @@ COMMENT=	Python interface to gdbm - GNU database manager
 
 EVAL_PREFIX+=	GDBMDIR=gdbm
 
-USE_GNU_TOOLS+=	patch
+USE_TOOLS+=	patch
 
 EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/gdbmmodule.c
 PYDISTUTILSPKG=	yes
diff --git a/databases/py-pgnotify/Makefile b/databases/py-pgnotify/Makefile
index 0efab4e31c7..b31d8a38abf 100644
--- a/databases/py-pgnotify/Makefile
+++ b/databases/py-pgnotify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:15 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:46 jlam Exp $
 #
 
 DISTNAME=	pgnotify-0.1
@@ -15,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-postgresql-[0-9]*:../../databases/py-postgresql
 
 MAKE_ENV+=		MANDIR=${PREFIX}/man
 MAKE_ENV+=		BINDIR=${PREFIX}/bin
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 PYDISTUTILSPKG=	yes
 PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX}
diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index b76c35ba971..228145b2eea 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/04/11 21:45:15 tv Exp $
+# $NetBSD: Makefile,v 1.41 2005/05/22 20:07:46 jlam Exp $
 
 DISTNAME=		PyGreSQL-3.6.2
 PKGNAME=		${PYPKGPREFIX}-postgresql-3.6.2
@@ -12,7 +12,7 @@ COMMENT=		Python interface to PostgreSQL
 
 MAKE_ENV+=		MANDIR=${LOCALBASE}/man
 MAKE_ENV+=		BINDIR=${LOCALBASE}/bin
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 MAKEFILE=		GNUmakefile
 MAKE_ENV+=		INSTALLED_LIBPQ=1
diff --git a/databases/py-table/Makefile b/databases/py-table/Makefile
index e0e7f389553..f3a7ddd53b1 100644
--- a/databases/py-table/Makefile
+++ b/databases/py-table/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:15 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:46 jlam Exp $
 #
 
 DISTNAME=	pytable-0.8.3a
@@ -14,7 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-basicproperty-[0-9]*:../../lang/py-basicproperty
 
 MAKE_ENV+=		MANDIR=${PREFIX}/man
 MAKE_ENV+=		BINDIR=${PREFIX}/bin
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 PYDISTUTILSPKG=	yes
 PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX}
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 236ae21ca2a..321c5230a4a 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/05/22 05:35:32 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/05/22 20:07:46 jlam Exp $
 #
 
 DISTNAME=	rrdtool-1.0.40
@@ -15,7 +15,7 @@ NOT_FOR_PLATFORM=	NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \
 			NetBSD-1.5.*-alpha NetBSD-1.5[A-U]-alpha
 
 USE_LIBTOOL=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS= --enable-shared
diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile
index b32ca894bb6..2d480191575 100644
--- a/databases/sqlite/Makefile
+++ b/databases/sqlite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/04/11 21:45:16 tv Exp $
+# $NetBSD: Makefile,v 1.32 2005/05/22 20:07:46 jlam Exp $
 
 DISTNAME=		sqlite-2.8.16
 CATEGORIES=		databases
@@ -10,7 +10,7 @@ HOMEPAGE=		http://www.hwaci.com/sw/sqlite/
 COMMENT=		SQL Database Engine in a C Library
 
 WRKSRC=			${WRKDIR}/sqlite-build
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 
 GNU_CONFIGURE=		yes
diff --git a/databases/sqlite3/Makefile.common b/databases/sqlite3/Makefile.common
index 7a03b94ac87..6dab28d40b3 100644
--- a/databases/sqlite3/Makefile.common
+++ b/databases/sqlite3/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/04/14 05:45:51 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/05/22 20:07:46 jlam Exp $
 
 DISTNAME=	sqlite-3.2.1
 PKGNAME=	${DISTNAME:S/-/3-/}
@@ -14,7 +14,7 @@ DISTINFO_FILE=	${.CURDIR}/../../databases/sqlite3/distinfo
 PATCHDIR=	${.CURDIR}/../../databases/sqlite3/patches
 
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 
 PKGCONFIG_OVERRIDE=	sqlite3.pc.in
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index bd251ee074d..c16793bd66d 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:16 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:46 jlam Exp $
 
 DISTNAME=		sqlrelay-0.33.1
 PKGREVISION=		1
@@ -11,7 +11,7 @@ COMMENT=		Enables pooling and sharing of database connections
 
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 
 #SQLRELAY_DATABASES+=	mysql postgresql
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index 96e5b4b4a2d..937b13ee42a 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/15 11:45:16 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:46 jlam Exp $
 #
 
 DISTNAME=	tdb-1.0.6
@@ -14,7 +14,7 @@ COMMENT=	Small database system which uses files to store data
 CONFLICTS+=	samba-[0-9]*
 
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/xsqlmenu/Makefile b/databases/xsqlmenu/Makefile
index b400c69d1e6..6ee19bf3ddf 100644
--- a/databases/xsqlmenu/Makefile
+++ b/databases/xsqlmenu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:16 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:47 jlam Exp $
 #
 
 DISTNAME=	xsqlmenu-2.10
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.jlab.org/~saw/xsqlmenu/
 COMMENT=	X based GUI for MySQL
 
 USE_X11=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 MAKE_ENV+=	MAKE=${MAKE_PROGRAM}
 
 do-install: