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/net/irrd/Makefile b/net/irrd/Makefile
index fcf8ad61669..16ef5bf97c6 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/05/22 05:35:33 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/06/01 20:08:01 jlam Exp $
 
 DISTNAME=		irrd2.2.3
 PKGNAME=		irrd-2.2.3
@@ -16,6 +16,7 @@ DEPENDS+=		gnupg-[0-9]*:../../security/gnupg
 DEPENDS+=		wget-[0-9]*:../../net/wget
 
 USE_PERL5=		# defined
+USE_TOOLS+=		automake
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 
@@ -32,10 +33,8 @@ CFLAGS+=		-g
 
 IRRD_CACHER=		irrdcacher ripe2rpsl
 
-.include "../../mk/automake.mk"
-
 pre-configure:
-	cd ${WRKSRC} && ${ACLOCAL} && ${AUTOHEADER} && ${AUTOCONF}
+	cd ${WRKSRC} && aclocal && autoheader && autoconf
 
 post-build:
 	@cd ${WRKSRC}/programs/irrdcacher ; \
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 7cddf0da9fc..b56563611fe 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/05/26 20:14:21 adrianp Exp $
+# $NetBSD: Makefile,v 1.27 2005/06/01 20:08:01 jlam Exp $
 
 DISTNAME=	openslp-1.2.1
 CATEGORIES=	net
@@ -11,7 +11,7 @@ COMMENT=	Open-source implementation of the Service Location Protocol
 # Needs pkgviews-enabled automake
 # PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_TOOLS+=		bison lex
+USE_TOOLS+=		automake bison lex
 USE_PKGINSTALL=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
@@ -31,15 +31,14 @@ CONF_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
 RCD_SCRIPTS=		slpd
 
 .include "../../security/openssl/buildlink3.mk"
-.include "../../mk/automake.mk"
 
 post-extract:
 	@${FIND} ${WRKSRC} -name "CVS" -print | ${XARGS} ${RM} -rf
 	@${RM} -fr ${WRKSRC}/doc/html/UsersGuide/.xvpics
 
 pre-configure:
-	@cd ${WRKSRC} && ${ACLOCAL} && ${AUTOHEADER} && ${AUTOCONF} &&	\
-		${LOCALBASE}/bin/libtoolize && ${AUTOMAKE} --add-missing
+	@cd ${WRKSRC} && aclocal && autoheader && autoconf &&		\
+		${LOCALBASE}/bin/libtoolize && automake --add-missing
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/openslp
diff --git a/net/socket++/Makefile b/net/socket++/Makefile
index 4f8f6c71202..d3a139d786c 100644
--- a/net/socket++/Makefile
+++ b/net/socket++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:26 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/06/01 20:08:01 jlam Exp $
 #
 
 DISTNAME=		socket++-1.12.10
@@ -10,7 +10,7 @@ HOMEPAGE=		http://www.linuxhacker.at/socketxx/
 COMMENT=		C++ class library for UNIX Sockets with exception handling
 
 USE_LIBTOOL=		YES
-AUTOMAKE_REQD=          1.4
+USE_TOOLS+=		automake14
 AUTOCONF_REQD=          2.50
 GNU_CONFIGURE=          YES
 USE_TOOLS+=		gmake
@@ -20,10 +20,9 @@ TEST_TARGET=		check
 pre-configure:
 		cd ${WRKSRC};						\
 		${LOCALBASE}/bin/libtoolize --automake;                 \
-		${ACLOCAL} -I .;                                        \
-		${AUTOHEADER};                                          \
-		${AUTOMAKE} --add-missing;                              \
-		${AUTOCONF};                                            \
+		aclocal -I .;						\
+		autoheader;						\
+		automake --add-missing;					\
+		autoconf
 
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 2cf6431b842..3a1cedbbe00 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2005/05/22 20:08:26 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2005/06/01 20:08:01 jlam Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
@@ -48,7 +48,7 @@ CONF_FILES+=		${EGDIR}/vtysh.conf.sample ${PKG_SYSCONFDIR}/vtysh.conf
 CONFIGURE_ARGS+=	--disable-vtysh
 .endif
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		automake gmake
 USE_MAKEINFO=		# defined
 .include "../../devel/readline/buildlink3.mk"
 
@@ -70,8 +70,8 @@ PLIST_SRC+=		${PKGDIR}/PLIST
 LIBS+=			${LDFLAGS}
 
 pre-configure:
-	cd ${WRKSRC} && ${AUTORECONF} --force
-#	cd ${WRKSRC} && ${AUTOMAKE}
+	cd ${WRKSRC} && autoreconf --force
+#	cd ${WRKSRC} && automake
 
 #post-build:
 #	cd ${WRKSRC}/doc ; \
@@ -81,5 +81,4 @@ pre-configure:
 post-install:
 	@${CHMOD} a+r ${PREFIX}/share/examples/zebra/*
 
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"