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

36 files changed, 72 insertions, 72 deletions

diff --git a/security/MyPasswordSafe/Makefile b/security/MyPasswordSafe/Makefile
index ec094e9766f..bf8252eda8c 100644
--- a/security/MyPasswordSafe/Makefile
+++ b/security/MyPasswordSafe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:10 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:29 jlam Exp $
 #
 
 DISTNAME=		MyPasswordSafe-20041004.src
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.semanticgap.com/myps/
 COMMENT=		Easy-to-use password manager
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 MAKE_FLAGS+=		QMAKE=${QTDIR:Q}/bin/qmake
 
 .include "../../x11/qt3-libs/buildlink3.mk"
diff --git a/security/PAM/Makefile b/security/PAM/Makefile
index ae546679a09..7539647fb6b 100644
--- a/security/PAM/Makefile
+++ b/security/PAM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/04/11 21:47:10 tv Exp $
+# $NetBSD: Makefile,v 1.33 2005/05/22 20:08:29 jlam Exp $
 #
 
 DISTNAME=	Linux-PAM-0.77
@@ -19,7 +19,7 @@ CONFLICTS+=	openpam-[0-9]*
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_PKGINSTALL=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 
 GNU_CONFIGURE=		yes
diff --git a/security/aide/Makefile b/security/aide/Makefile
index fdbf1c65e64..9ddb1c26704 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/22 19:11:12 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:29 jlam Exp $
 #
 
 DISTNAME=       aide-0.10
@@ -13,7 +13,7 @@ BUILDLINK_DEPENDS.mhash?=	mhash>=0.8.17
 
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	lex make yacc
+USE_TOOLS+=	bison gmake lex
 USE_TOOLS+=	bison
 
 .include "../../security/mhash/buildlink3.mk"
diff --git a/security/aide06/Makefile b/security/aide06/Makefile
index 5b836668e56..5cfa510ec84 100644
--- a/security/aide06/Makefile
+++ b/security/aide06/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/22 19:11:12 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:29 jlam Exp $
 #
 
 DISTNAME=       aide-0.6
@@ -13,7 +13,7 @@ COMMENT=	Older intrusion detection system for checking file integrity
 #BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	yacc lex
+USE_TOOLS+=	bison lex
 USE_TOOLS+=	bison
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/avcheck/Makefile b/security/avcheck/Makefile
index 02bb50b506d..4caff54f8e9 100644
--- a/security/avcheck/Makefile
+++ b/security/avcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:10 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:29 jlam Exp $
 
 DISTNAME=	avcheck-0.9
 CATEGORIES=	security mail
@@ -8,7 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.corpit.ru/avcheck/
 COMMENT=	Mail content filter for SMTP servers
 
-USE_GNU_TOOLS+=	sed
+USE_TOOLS+=	gsed
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/avcheck ${PREFIX}/bin
diff --git a/security/chkrootkit/Makefile b/security/chkrootkit/Makefile
index 60ad2bd9940..7a85558d9fa 100644
--- a/security/chkrootkit/Makefile
+++ b/security/chkrootkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:10 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:29 jlam Exp $
 #
 
 DISTNAME=		chkrootkit-0.44
@@ -11,7 +11,7 @@ COMMENT=		Locally checks for signs of a rootkit
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 NO_CONFIGURE=		yes
 
 PROGRAMS=	chkdirs chklastlog chkproc chkwtmp ifpromisc strings-static
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index a4de7cdb3ab..6d9bd313cf9 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/13 03:26:44 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:29 jlam Exp $
 
 .include "Makefile.common"
 
@@ -16,7 +16,7 @@ CONFLICTS+=	courier-authldap-[0-9]*
 CONFLICTS+=	courier-authmysql-[0-9]*
 CONFLICTS+=	courier-authpgsql-[0-9]*
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 PKG_SYSCONFSUBDIR=	authlib
 
diff --git a/security/crypto++/Makefile b/security/crypto++/Makefile
index 2d325d9ede9..cb6bacc6745 100644
--- a/security/crypto++/Makefile
+++ b/security/crypto++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/03/19 16:48:21 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:29 jlam Exp $
 #
 
 DISTNAME=		cryptopp521
@@ -16,7 +16,7 @@ COMMENT=		Free C++ class library of Cryptographic Primitives
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 MAKEFILE=		GNUmakefile
 WRKSRC=			${WRKDIR}
 USE_LANGUAGES=		c++
diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
index a9d2c387c95..e2a263f5d99 100644
--- a/security/cyrus-sasl2/Makefile.common
+++ b/security/cyrus-sasl2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2005/04/11 21:47:11 tv Exp $
+# $NetBSD: Makefile.common,v 1.28 2005/05/22 20:08:29 jlam Exp $
 #
 # This file is currently included by:
 #
@@ -42,7 +42,7 @@ DEFAULT_VIEW.${PKGBASE}=	${DEFAULT_VIEW.cyrus-sasl}
 
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 USE_LIBTOOL=		yes
 MAKE_ENV+=		SHLIBTOOL=${SHLIBTOOL:Q}
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index cd1f3942a7c..4818a38866c 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/02 22:33:37 shannonjr Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:29 jlam Exp $
 #
 
 DISTNAME=		dirmngr-0.9.1
@@ -19,7 +19,7 @@ PKG_GROUPS=		${DIRMNGR_GROUP}
 PKG_USERS=		${DIRMNGR_USER}:${DIRMNGR_GROUP}::pseudo\\ user:${VARBASE}/dirmngr:
 
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		awk
+USE_TOOLS+=		gawk
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 RCD_SCRIPTS=		dirmngr
diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile
index 2292d083322..ed8d781abcf 100644
--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/29 16:14:41 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:29 jlam Exp $
 
 DISTNAME=	dropbear-0.45
 CATEGORIES=	security
@@ -10,7 +10,7 @@ HOMEPAGE=	http://matt.ucc.asn.au/dropbear/dropbear.html
 COMMENT=	SSH2 server, aimed at embedded market
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 MAKEFLAGS+=	ROOT_USER=${ROOT_USER} ROOT_GROUP=${ROOT_GROUP}
 
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 6d69d36485e..71e8c1d75dc 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:11 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:30 jlam Exp $
 
 DISTNAME=	fwbuilder-2.0.6
 CATEGORIES=	security net
@@ -10,7 +10,7 @@ COMMENT=	Firewall Builder GUI
 
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LANGUAGES=	c++
 UNLIMIT_RESOURCES+=	datasize
 
diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index c8c1f7af9dd..d199d1acca2 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/23 12:38:05 shannonjr Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:30 jlam Exp $
 #
 
 DISTNAME=		gnupg-1.9.16
@@ -18,7 +18,7 @@ COMMENT=		Utility programs that come with GnuPG 1.9 (experimental branch)
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 4dce230f6c2..9b174a6b9cc 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2005/04/11 21:47:11 tv Exp $
+# $NetBSD: Makefile,v 1.76 2005/05/22 20:08:30 jlam Exp $
 
 DISTNAME=	gnupg-1.4.1
 CATEGORIES=	security
@@ -23,7 +23,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 CRYPTO=			yes
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 CONFIGURE_ARGS+=	--with-static-rnd=auto
 CONFIGURE_ARGS+=	--with-mailprog=/usr/sbin/sendmail
 TEST_TARGET=		check
diff --git a/security/gnustep-ssl/Makefile b/security/gnustep-ssl/Makefile
index 942777bd082..d6302a8492b 100644
--- a/security/gnustep-ssl/Makefile
+++ b/security/gnustep-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:11 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:30 jlam Exp $
 #
 
 DISTNAME=		gnustep-base-1.10.1
@@ -17,7 +17,7 @@ PTHREAD_LIBS=		-lpthread
 CONFIGURE_DIRS=		${WRKDIR}/${DISTNAME}
 WRKSRC=			${CONFIGURE_DIRS}/SSL
 MAKEFILE=		GNUmakefile
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 GNU_CONFIGURE_PREFIX=	${PREFIX}/share/GNUstep
 CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}/libexec/GNUstep
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 79293633261..6f69dfd2a20 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/21 14:35:47 lha Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:30 jlam Exp $
 
 DISTNAME=	heimdal-0.6.4
 CATEGORIES=	security
@@ -14,7 +14,7 @@ CONFLICTS+=	mit-krb5-[0-9]*
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LIBTOOL=		yes
-USE_GNU_TOOLS+=		yacc
+USE_TOOLS+=		bison
 
 HEIMDAL_STATEDIR?=	${VARBASE}/heimdal
 
diff --git a/security/jessie/Makefile b/security/jessie/Makefile
index 4a6f9a2dc94..cb93fa08979 100644
--- a/security/jessie/Makefile
+++ b/security/jessie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:12 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:30 jlam Exp $
 #
 
 DISTNAME=		jessie-0.9.7
@@ -11,7 +11,7 @@ COMMENT=		GPL implementation of the Java Secure Sockets Extension
 
 DEPENDS+=		gnu-crypto>=2.0:../../security/gnu-crypto
 
-USE_GNU_TOOLS=		make
+USE_TOOLS=		gmake
 USE_JAVA2=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/security/kssh/Makefile b/security/kssh/Makefile
index 42deff4f0ad..5ce1152947d 100644
--- a/security/kssh/Makefile
+++ b/security/kssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:47:12 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:30 jlam Exp $
 #
 
 DISTNAME=	kssh-0.7
@@ -10,7 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://kssh.sourceforge.net/
 COMMENT=	KDE Front-end to SSH
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index f8352c1a9ec..835f187a21f 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:13 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:30 jlam Exp $
 
 DISTNAME=	libfwbuilder-2.0.6
 CATEGORIES=	security net
@@ -10,7 +10,7 @@ COMMENT=	Firewall Builder API
 
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LANGUAGES=	c++
 
 post-install:
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index 73300eaf2ef..d7c709d1daf 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/15 22:22:48 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:30 jlam Exp $
 #
 
 DISTNAME=	libgpg-error-1.0
@@ -19,7 +19,7 @@ USE_PKGLOCALEDIR=	YES
 
 # XXX See HACKS
 .if ${OPSYS} != IRIX
-USE_GNU_TOOLS+=		awk
+USE_TOOLS+=		gawk
 .endif
 
 MAKE_ENV+=		LC_ALL="C"
diff --git a/security/lsh/Makefile b/security/lsh/Makefile
index 76df29bca41..ad0b94369ba 100644
--- a/security/lsh/Makefile
+++ b/security/lsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/30 12:23:42 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:30 jlam Exp $
 #
 
 DISTNAME=		lsh-1.4.3
@@ -11,7 +11,7 @@ HOMEPAGE=		http://www.lysator.liu.se/~nisse/lsh/
 COMMENT=		ssh2 client/server
 
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/liboop/buildlink3.mk"
diff --git a/security/lsh2/Makefile b/security/lsh2/Makefile
index 7419a2cd6bb..7965fcdeac7 100644
--- a/security/lsh2/Makefile
+++ b/security/lsh2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/05/02 11:10:38 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:30 jlam Exp $
 #
 
 DISTNAME=		lsh-2.0.1
@@ -10,7 +10,7 @@ HOMEPAGE=		http://www.lysator.liu.se/~nisse/lsh/
 COMMENT=		SSH2 client/server
 
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 CONFIGURE_ARGS+=	--disable-openssl --disable-pam
 
 # man/man8/sftp-server.8
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index 284abefda9f..60f5e55af32 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:13 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:30 jlam Exp $
 
 DISTNAME=	mhash-0.9.2
 CATEGORIES=	security devel
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://mhash.sourceforge.net/
 COMMENT=	Hash algorithms library
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PERL5=		build
 GNU_CONFIGURE=		yes
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 77e61d37352..63589735257 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2005/04/11 21:47:14 tv Exp $
+# $NetBSD: Makefile,v 1.104 2005/05/22 20:08:30 jlam Exp $
 
 OPENSSL_SNAPSHOT?=	# empty
 OPENSSL_STABLE?=	# empty
@@ -41,7 +41,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_PERL5=		build	# perl is used throughout the build
 USE_PKGINSTALL=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 TEST_TARGET=		tests
 
 HAS_CONFIGURE=		yes
diff --git a/security/otpcalc/Makefile b/security/otpcalc/Makefile
index 6ff764bc312..374f81ae695 100644
--- a/security/otpcalc/Makefile
+++ b/security/otpcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:14 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:30 jlam Exp $
 #
 
 DISTNAME=		otpCalc-0.96
@@ -11,7 +11,7 @@ HOMEPAGE=		http://original.killa.net/infosec/otpCalc/
 COMMENT=		OTP and S/Key calculator for X
 
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 BUILD_TARGET=		otpCalc otpCalc.1
 
diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile
index 2c2902b10b0..5617d2722e0 100644
--- a/security/pam-ldap/Makefile
+++ b/security/pam-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:47:17 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:30 jlam Exp $
 #
 
 DISTNAME=	pam_ldap-176
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.padl.com/pam_ldap.html
 COMMENT=	Pluggable authentication module for LDAP directories
 
 USE_LIBTOOL=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ldap-lib=openldap
 CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap}
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 8ee0e9be2a5..23e565f8156 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:17 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:30 jlam Exp $
 #
 
 DISTNAME=		pinentry-0.7.1
@@ -31,7 +31,7 @@ PLIST_SUBST+=		USE_GTK='@comment '
 .endif
 
 .if !empty(PKG_OPTIONS:Mqt)
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 PLIST_SUBST+=		USE_QT=
 .  include "../../x11/qt3-libs/buildlink3.mk"
 .else
diff --git a/security/putty/Makefile b/security/putty/Makefile
index d54d2849f3e..2e8583d6bb9 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/13 16:45:46 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:30 jlam Exp $
 #
 
 DISTNAME=	putty-0.58
@@ -9,7 +9,7 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.chiark.greenend.org.uk/~sgtatham/putty/
 COMMENT=	Free implementation of Telnet and SSH for Win32 and Unix platforms
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_X11=	yes
 BUILD_DIRS=	${WRKSRC}/unix
 
diff --git a/security/py-crack/Makefile b/security/py-crack/Makefile
index ae90a11f65c..3aabab8bfd3 100644
--- a/security/py-crack/Makefile
+++ b/security/py-crack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:18 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:30 jlam Exp $
 #
 
 DISTNAME=	pycrack-0.01
@@ -14,7 +14,7 @@ DEPENDS+=			crack>=5.0:../../security/crack
 
 MAKE_ENV+=			MANDIR=${LOCALBASE}/man
 MAKE_ENV+=			BINDIR=${LOCALBASE}/bin
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 PYDISTUTILSPKG=	yes
 PYBINMODULE=	yes
diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile
index 8fc8ba58b7f..7041f8f915b 100644
--- a/security/qca-tls/Makefile
+++ b/security/qca-tls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:18 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:31 jlam Exp $
 
 DISTNAME=	qca-tls-1.0
 PKGREVISION=	# empty
@@ -10,7 +10,7 @@ MAINTAINER=	jdolecek@NetBSD.org
 HOMEPAGE=	http://delta.affinix.com/qca/
 COMMENT=	Cross-platform crypto API for QT - TLS plugin
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
 USE_X11=	yes
 HAS_CONFIGURE=	yes
diff --git a/security/qca/Makefile b/security/qca/Makefile
index 3f84c0a1391..d2325185e12 100644
--- a/security/qca/Makefile
+++ b/security/qca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:18 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:31 jlam Exp $
 
 DISTNAME=	qca-1.0
 PKGREVISION=	# empty
@@ -10,7 +10,7 @@ MAINTAINER=	jdolecek@NetBSD.org
 HOMEPAGE=	http://delta.affinix.com/qca/
 COMMENT=	Cross-platform crypto API for QT
 
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
 USE_LIBTOOL=	yes
 USE_X11=	yes
 HAS_CONFIGURE=	yes
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 8f12a144469..3caed767863 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/05/19 21:14:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.37 2005/05/22 20:08:31 jlam Exp $
 
 DISTNAME=	seahorse-0.7.8
 CATEGORIES=	security
@@ -14,7 +14,7 @@ DEPENDS+=		gnupg>=1.2.1:../../security/gnupg
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
diff --git a/security/sign/Makefile b/security/sign/Makefile
index ad0e22f58dc..6c76f5e8538 100644
--- a/security/sign/Makefile
+++ b/security/sign/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:19 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:31 jlam Exp $
 #
 
 DISTNAME=	sign-1.0.4
@@ -10,7 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://swapped.cc/sign/
 COMMENT=	File signing and signature verification utility
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/sign ${PREFIX}/bin
diff --git a/security/skey/Makefile b/security/skey/Makefile
index 186ca8f8b0a..d6d4498f1a7 100644
--- a/security/skey/Makefile
+++ b/security/skey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/27 20:48:32 hira Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:31 jlam Exp $
 #
 
 DISTNAME=		skey-1.1.5
@@ -11,7 +11,7 @@ HOMEPAGE=		${MASTER_SITES}
 COMMENT=		Port of OpenBSD s/key implementation
 
 USE_PERL5=		build
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
diff --git a/security/ssldump/Makefile b/security/ssldump/Makefile
index a9d3a901eef..382f535dd33 100644
--- a/security/ssldump/Makefile
+++ b/security/ssldump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:20 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:31 jlam Exp $
 #
 
 DISTNAME=	ssldump-0.9b3
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.rtfm.com/ssldump/
 COMMENT=	SSLv3/TLS network protocol analyzer
 
 GNU_CONFIGURE=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 CONFIGURE_ARGS+=--with-pcap-inc=${BUILDLINK_PREFIX.libpcap}/include \
 		--with-pcap-lib=${BUILDLINK_PREFIX.libpcap}/lib \
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 83f1cb3b2e6..2002582a532 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:47:21 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:31 jlam Exp $
 
 DISTNAME=	zebedee-2.5.2
 CATEGORIES=	security
@@ -10,7 +10,7 @@ COMMENT=	Simple tunneling program for TCP or UDP with encryption
 
 DEPENDS+=	tcl-[0-9]*:../../lang/tcl
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PERL5=		build
 
 MAKE_ENV+=		PERL5=${PERL5}