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

30 files changed, 60 insertions, 61 deletions

diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index f43195fe029..1f5611cbef5 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/05/22 08:29:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.38 2005/05/22 20:08:11 jlam Exp $
 
 DISTNAME=	balsa-2.2.6
 PKGREVISION=	1
@@ -20,7 +20,7 @@ USE_PKGINSTALL=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 CONFIGURE_ARGS=		--with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
 CONFIGURE_ARGS+=	--disable-more-warnings
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 95b02db902a..7a5b1cfe07b 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/05/22 05:35:33 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/05/22 20:08:11 jlam Exp $
 
 DISTNAME=	courier-imap-4.0.2
 PKGBASE=	${DISTNAME:C/-[^-]*$//}
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.courier-mta.org/imap/
 
 DEPENDS+=	courier-maildir>=0.48.2:../../mail/courier-maildir
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PERL5=		build
diff --git a/mail/courier-maildir/Makefile b/mail/courier-maildir/Makefile
index 250bdec25e9..af06995adb0 100644
--- a/mail/courier-maildir/Makefile
+++ b/mail/courier-maildir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:18 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:11 jlam Exp $
 
 DISTNAME=	courier-0.49.0
 PKGNAME=	${DISTNAME:S/-/-maildir-/}
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.courier-mta.org/
 
 CONFLICTS=	courier-maildirmake-[0-9]*
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_PERL5=		yes
 PERL5_REQD+=		5.8.0
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 06b68a6d336..160abaa3c30 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:18 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:11 jlam Exp $
 #
 
 DISTNAME=		dbmail-2.0.1
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.dbmail.org/
 COMMENT=		Store and retrieve mail messages in a database
 
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 606abc8fd1c..711737e2c83 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/21 14:45:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:11 jlam Exp $
 #
 
 DISTNAME=	evolution-data-server-1.2.2
@@ -17,7 +17,7 @@ BUILDLINK_DEPENDS.libsoup-devel+=	libsoup-devel>=2.2.3
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.1
-USE_GNU_TOOLS+=		make yacc
+USE_TOOLS+=		bison gmake
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 YACC=			${LOCALBASE}/bin/bison # XXX
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 43b085ee557..cbc02e373f9 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2005/05/19 21:06:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.81 2005/05/22 20:08:11 jlam Exp $
 
 DISTNAME=		evolution-2.2.2
 CATEGORIES=		mail time gnome
@@ -27,7 +27,7 @@ PKG_FAIL_REASON=	"Kerberos support conflicts with SSL"
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make yacc
+USE_TOOLS+=		bison gmake
 USE_X11=		YES
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/mail/evolution12/Makefile b/mail/evolution12/Makefile
index b3c003ef952..d6a322926d7 100644
--- a/mail/evolution12/Makefile
+++ b/mail/evolution12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:18 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:11 jlam Exp $
 
 DISTNAME=		evolution-1.2.4
 PKGNAME=		${DISTNAME:S/evolution/evolution12/}
@@ -33,7 +33,7 @@ BUILDLINK_DEPENDS.db3=		db3-3.11.2{,nb*}
 BUILDLINK_DEPENDS.libxml=	libxml>=1.8.17
 
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 USE_DIRS+=		gnome1-1.5
diff --git a/mail/evolution14/Makefile b/mail/evolution14/Makefile
index 5a3962a51b6..301d8829f94 100644
--- a/mail/evolution14/Makefile
+++ b/mail/evolution14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:18 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:11 jlam Exp $
 
 DISTNAME=		evolution-1.4.6
 PKGNAME=		${DISTNAME:S/evolution/evolution14/}
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=	--enable-ipv6=no
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make yacc
+USE_TOOLS+=		bison gmake
 USE_X11=		YES
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index 52b89d5ac88..de25f8ac42b 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:19 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:12 jlam Exp $
 #
 
 DISTNAME=	gmime-2.1.9
@@ -11,7 +11,7 @@ COMMENT=	Library for the creation and parsing of MIME messages
 
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
diff --git a/mail/ifile/Makefile b/mail/ifile/Makefile
index 364306d3a29..62ad1bc494d 100644
--- a/mail/ifile/Makefile
+++ b/mail/ifile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:19 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:12 jlam Exp $
 #
 
 DISTNAME=	ifile-1.3.4
@@ -11,6 +11,6 @@ HOMEPAGE=	http://www.nongnu.org/ifile/
 COMMENT=	Intelligent mail filtering system
 
 GNU_CONFIGURE=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 236876b1a38..8858371ffa8 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:12 jlam Exp $
 
 DISTNAME=	kbiff-3.7.1
 PKGREVISION=	1
@@ -10,7 +10,7 @@ MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://www.granroth.org/kbiff/index.html
 COMMENT= 	A new mail notification utility for KDE
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=          yes
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 8c9db6a32eb..7990123ae41 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:12 jlam Exp $
 
 DISTNAME=	libesmtp-1.0.3r1
 PKGNAME=	${DISTNAME:S/r1//}
@@ -13,7 +13,7 @@ MAINTAINER=	dolemite@wuli.nu
 HOMEPAGE=	http://www.stafford.uklinux.net/libesmtp/
 COMMENT=	Library to manage posting of electronic mail
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 916dd4d432c..55b7e703c6f 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:12 jlam Exp $
 #
 
 DISTNAME=	mail-notification-1.0
@@ -12,7 +12,7 @@ COMMENT=	Status icon that provides new mail notifications
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index e4dcfef2149..6c7fb1b180e 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:12 jlam Exp $
 
 DISTNAME=	maildrop-1.8.0
 PKGBASE=	${DISTNAME:C/-[^-]*$//}
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.courier-mta.org/maildrop/
 
 DEPENDS+=	courier-maildir>=0.48.2:../../mail/courier-maildir
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 
diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile
index fd4c197310a..70b07112a0c 100644
--- a/mail/mailsync/Makefile
+++ b/mail/mailsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:12 jlam Exp $
 #
 
 DISTNAME=	mailsync_5.2.1.orig
@@ -11,7 +11,7 @@ HOMEPAGE=	http://mailsync.sourceforge.net/
 COMMENT=	Mailsync is a way of synchronizing a collection of mailboxes
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LANGUAGES+=	c c++
 GNU_CONFIGURE=	yes
 
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 85a164935f4..d9939f21d77 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:22 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:12 jlam Exp $
 #
 
 DISTNAME=	prayer-1.0.12
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/
 COMMENT=	Small, fast, web mail interface
 
 USE_PKGINSTALL=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_PERL5=	build
 PRAYER_USER=	prayer
 PRAYER_GROUP=	prayer
diff --git a/mail/pulsar/Makefile b/mail/pulsar/Makefile
index 029e735f4ce..09711b158bd 100644
--- a/mail/pulsar/Makefile
+++ b/mail/pulsar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:22 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:12 jlam Exp $
 #
 
 DISTNAME=	pulsar-0.1.1
@@ -12,7 +12,7 @@ HOMEPAGE=	http://pulsar.sourceforge.net/
 COMMENT=	Small, secure POP3 daemon, featuring native SSL support
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 MANCOMPRESSED=	yes
 
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index 8cf870e9b7d..da28931d456 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2005/05/19 22:08:55 schmonz Exp $
+# $NetBSD: options.mk,v 1.12 2005/05/22 20:08:12 jlam Exp $
 
 .if ${OPSYS} == "Darwin"
 PKG_DEFAULT_OPTIONS+=	darwin
@@ -103,7 +103,7 @@ SITES_${TLSSASL_PATCH}=	http://shupp.org/patches/
 .  if !empty(PKG_OPTIONS:Mtls)
 CFLAGS+=		-DTLS=20040419			# from the patch
 DJB_INSTALL_TARGETS=	cert tmprsadh
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 PLIST_SRC+=             ${PKGDIR}/PLIST.tls
 .  endif
 .endif
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index 94c30a83b85..f4b60b433c3 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2005/05/13 16:54:13 jlam Exp $
+# $NetBSD: Makefile.common,v 1.28 2005/05/22 20:08:12 jlam Exp $
 #
 # Makefile fragment shared with libmilter
 #
@@ -28,7 +28,7 @@ SITECONFIG=	${WRKSRC}/devtools/Site/site.config.m4
 BUILD_DEFS+=    SMRSH_CMDDIR
 
 WRKSRC=		${WRKDIR}/sendmail-${DIST_VERS}
-USE_GNU_TOOLS+=	m4
+USE_TOOLS+=	gm4
 MAKE_ENV+=	M4=${TOOLS_M4:Q}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/mail/sendmail812/Makefile.common b/mail/sendmail812/Makefile.common
index 59ed6a9498b..11d406bed68 100644
--- a/mail/sendmail812/Makefile.common
+++ b/mail/sendmail812/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/05/13 16:54:13 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/05/22 20:08:12 jlam Exp $
 #
 # Makefile fragment shared with libmilter
 #
@@ -30,7 +30,7 @@ BUILD_DEFS+=    USE_INET6 USE_TCPWRAPPERS USE_OPENLDAP USE_DB2 \
 DESCR_SRC=	${WRKDIR}/.DESCR_SRC
 
 WRKSRC=		${WRKDIR}/sendmail-${DIST_VERS}
-USE_GNU_TOOLS+=	m4
+USE_TOOLS+=	gm4
 MAKE_ENV+=	M4=${TOOLS_M4:Q}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/mail/sigrot/Makefile b/mail/sigrot/Makefile
index 85f0c3cd462..97d5f742563 100644
--- a/mail/sigrot/Makefile
+++ b/mail/sigrot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:27 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:12 jlam Exp $
 
 DISTNAME=	sigrot_1.2-1
 PKGNAME=	sigrot-1.2
@@ -10,7 +10,7 @@ HOMEPAGE=	http://packages.debian.org/stable/mail/sigrot.html
 COMMENT=	Signature file rotation program
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 DOCDIR=		${PREFIX}/share/doc/sigrot
 EGDIR=		${PREFIX}/share/examples/sigrot
diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index 7592967364e..4fac3aafcf5 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:46:27 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:12 jlam Exp $
 #
 
 DISTNAME=       spruce-0.5.17
@@ -12,7 +12,7 @@ COMMENT=	MIME-aware, GNOME-based email program
 
 USE_X11=		yes
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 
 .include "../../x11/gnome-libs/buildlink3.mk"
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index b78712fc778..24bdfdd6ed4 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/05/22 05:35:33 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2005/05/22 20:08:12 jlam Exp $
 
 DISTNAME=	sqwebmail-5.0.1
 PKGBASE=	${DISTNAME:C/-[^-]*$//}
@@ -13,11 +13,10 @@ HOMEPAGE=	http://www.courier-mta.org/sqwebmail/
 DEPENDS+=	courier-maildir>=0.48.2:../../mail/courier-maildir
 DEPENDS+=	maildrop>=1.8.0:../../mail/maildrop
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		env gmake
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PERL5=		yes
-USE_TOOLS+=		env
 
 .include "../../mail/courier-maildir/Makefile.common"
 .include "../../security/courier-authlib/Makefile.common"
diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index 35e9f858020..64c61ca5085 100644
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:27 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:12 jlam Exp $
 #
 # TLS functionality needs testing. Please let me know the result,
 # and preferably info about your system.
@@ -16,7 +16,7 @@ HOMEPAGE=	http://packages.debian.org/testing/mail/ssmtp.html
 COMMENT=	Extremely simple MTA to forward mail to a mail hub
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV:S/.orig$//}
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
diff --git a/mail/sylpheed-claws/Makefile.common b/mail/sylpheed-claws/Makefile.common
index 502c90a2ad2..cd5f5c30154 100644
--- a/mail/sylpheed-claws/Makefile.common
+++ b/mail/sylpheed-claws/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2005/04/11 21:46:27 tv Exp $
+# $NetBSD: Makefile.common,v 1.14 2005/05/22 20:08:12 jlam Exp $
 
 DISTNAME=	sylpheed-claws-${SYLPHEED_VERSION}
 CATEGORIES=	mail news x11
@@ -10,7 +10,7 @@ HOMEPAGE=	http://sylpheed-claws.sourceforge.net/
 DISTINFO_FILE=	${.CURDIR}/../../mail/sylpheed-claws/distinfo
 PATCHDIR=	${.CURDIR}/../../mail/sylpheed-claws/patches
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
diff --git a/mail/sylpheed-devel/Makefile b/mail/sylpheed-devel/Makefile
index d1c80845695..977e96dd49a 100644
--- a/mail/sylpheed-devel/Makefile
+++ b/mail/sylpheed-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/18 22:42:21 chris Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:12 jlam Exp $
 
 DISTNAME=	sylpheed-1.9.11
 CATEGORIES=	mail news x11
@@ -19,7 +19,7 @@ USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=            yes
 USE_X11=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-nls
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 0a0fd5e8a92..34c2c4eabcd 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2005/04/11 21:46:27 tv Exp $
+# $NetBSD: Makefile,v 1.76 2005/05/22 20:08:12 jlam Exp $
 
 DISTNAME=	sylpheed-1.0.4
 CATEGORIES=	mail news x11
@@ -17,7 +17,7 @@ CONFLICTS=		sylpheed-claws-[0-9]* sylpheed-gtk2-[0-9]*
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-nls
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index deae22b01af..a9205a5de82 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:28 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:13 jlam Exp $
 
 DISTNAME=	wmbiff-0.4.25
 PKGREVISION=	1
@@ -11,7 +11,7 @@ COMMENT=	xbuffy like "mail-checker" for WindowMaker
 
 GNU_CONFIGURE=	YES
 USE_X11=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 EX_DIR=		${PREFIX}/share/examples/wmbiff
 
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index f6d06202079..9e4c966ee7a 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/03/30 19:48:14 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:13 jlam Exp $
 
 DISTNAME=	WMMail.app-0.64
 PKGNAME=	wmmail-0.64
@@ -13,7 +13,7 @@ COMMENT=	xbiff like "mail-checker" for WindowMaker
 DEPENDS+=	windowmaker>=0.80.0nb1:../../wm/windowmaker
 
 USE_X11BASE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-PL-incs="-I${LOCALBASE}/include" \
 			--with-PL-libs="-L${LOCALBASE}/lib"
diff --git a/mail/ximian-connector/Makefile b/mail/ximian-connector/Makefile
index 5d8041f93b3..62f6e0350cf 100644
--- a/mail/ximian-connector/Makefile
+++ b/mail/ximian-connector/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/19 21:07:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:13 jlam Exp $
 #
 
 DISTNAME=	ximian-connector-2.2.2
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.novell.com/products/evolution/
 COMMENT=	Adds support for Microsoft Exchange 2000 and 2003 to Evolution
 
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES