Remove mk/autoconf.mk and mk/automake.mk and replace their usage with

USE_TOOLS and any of "autoconf", "autoconf213", "automake" or
"automake14".  Also, we don't need to call the auto* tools via
${ACLOCAL}, ${AUTOCONF}, etc., since the tools framework takes care
to symlink the correct tool to the correct name, so we can just use
aclocal, autoconf, etc.

4 files changed, 17 insertions, 21 deletions

diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
index e2a263f5d99..76285df7977 100644
--- a/security/cyrus-sasl2/Makefile.common
+++ b/security/cyrus-sasl2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2005/05/22 20:08:29 jlam Exp $
+# $NetBSD: Makefile.common,v 1.29 2005/06/01 20:08:01 jlam Exp $
 #
 # This file is currently included by:
 #
@@ -74,15 +74,16 @@ CONFIGURE_ARGS+=	--without-saslauthd
 
 # Left here as reference for patch makers...
 # clean up a bit to help package maintainer produce patch files
+#
+#USE_TOOLS+=	automake
+#
 #post-extract:
 #	${_PKG_SILENT}${_PKG_DEBUG}					\
 #	${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f
 #
 #pre-configure:
 #	cd ${WRKSRC};							\
-#	${ACLOCAL} -I cmulocal -I config;				\
-#	${AUTOHEADER};							\
-#	${AUTOMAKE} -a --gnu -i ;					\
-#	${AUTOCONF}
-#
-#.include "../../mk/automake.mk"
+#	aclocal -I cmulocal -I config;					\
+#	autoheader;							\
+#	automake -a --gnu -i ;						\
+#	autoconf
diff --git a/security/gtk-systrace/Makefile b/security/gtk-systrace/Makefile
index d954dbf6be5..d58da19526c 100644
--- a/security/gtk-systrace/Makefile
+++ b/security/gtk-systrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:12 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/01 20:08:01 jlam Exp $
 #
 
 DISTNAME=	gtk-systrace-2002-12-01
@@ -16,14 +16,10 @@ ONLY_FOR_PLATFORM=	NetBSD-1.6[H-Z]*-* NetBSD-[2-9]*
 WRKSRC=			${WRKDIR}/notification-0.1
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
+USE_TOOLS+=		automake
 
 pre-configure:
-	cd ${WRKSRC} && \
-		${ACLOCAL} && \
-		${AUTOHEADER} && \
-		${AUTOCONF} && \
-		${AUTOMAKE} -acf
+	cd ${WRKSRC} && aclocal && autoheader && autoconf && automake -acf
 
 .include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile
index 70338c6c481..b806e14d8c7 100644
--- a/security/mit-krb5/Makefile
+++ b/security/mit-krb5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/31 11:31:07 dillo Exp $
+# $NetBSD: Makefile,v 1.25 2005/06/01 20:08:01 jlam Exp $
 
 DISTNAME=	krb5-1.4
 PKGNAME=	mit-${DISTNAME:S/-signed$//}
@@ -22,7 +22,7 @@ CONFLICTS+=	heimdal-[0-9]*
 CONFLICTS+=	kth-krb4-[0-9]*
 
 PKGSRC_USE_TOOLS+=	gzcat
-USE_TOOLS+=		yacc
+USE_TOOLS+=		autoconf yacc
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 
@@ -95,7 +95,7 @@ pre-configure:
 	${XARGS} -n 1 ${DIRNAME} |					\
 	while read dir; do						\
 		 ${ECHO} "=> Generating configure in $$dir";		\
-		 (cd $$dir && ${AUTOCONF} -I ${WRKSRC} -f);		\
+		 (cd $$dir && autoconf -I ${WRKSRC} -f);		\
 	done
 
 post-install:
@@ -108,5 +108,4 @@ post-install:
 		done;							\
 	done
 
-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index 5fdb5e049e4..fc9467f1c06 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/05/31 11:24:33 dillo Exp $
+# $NetBSD: Makefile,v 1.24 2005/06/01 20:08:01 jlam Exp $
 
 # NOTE:  This package is modeled on ../openssh, but does not share
 # files with it as that package may update faster than the gssapi
@@ -57,6 +57,7 @@ MANDIR=			man
 PLIST_SUBST+=		MANDIR=${MANDIR}
 
 USE_PKGINSTALL=		yes
+USE_TOOLS+=		autoconf
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${MANDIR}
@@ -147,7 +148,7 @@ MESSAGE_SUBST+=		OPENSSH_GROUP=${OPENSSH_GROUP}
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 pre-configure:
-	cd ${WRKSRC} && ${AUTORECONF}
+	cd ${WRKSRC} && autoreconf
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
@@ -161,6 +162,5 @@ post-install:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
-.include "../../mk/autoconf.mk"
 
 .include "../../mk/bsd.pkg.mk"