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.

3 files changed, 10 insertions, 15 deletions

diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index ba511646634..803497293ca 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.56 2005/06/01 18:03:26 jlam Exp $
+# $NetBSD: Makefile.common,v 1.57 2005/06/01 20:08:01 jlam Exp $
 
 MOZ_DIST_VER?=	${MOZ_VER}
 DISTNAME?=	mozilla-${MOZ_DIST_VER}-source
@@ -16,7 +16,7 @@ BUILD_DEPENDS+=	zip>=2.3:../../archivers/zip
 WRKSRC=		${WRKDIR}/mozilla
 USE_LANGUAGES=	c c++
 USE_PERL5=	build
-USE_TOOLS+=	gmake
+USE_TOOLS+=	autoconf213 gmake
 GNU_CONFIGURE=	yes
 
 CONFIG_GUESS_OVERRIDE=	build/autoconf/config.guess
@@ -49,8 +49,6 @@ CONFIGURE_ARGS+= --disable-tests \
 SHAREMODE?=	644
 BUILD_TARGET=	# empty
 
-AUTOCONF_REQD= 2.13
-
 UNLIMIT_RESOURCES=	datasize memorysize stacksize
 
 .include	"../../graphics/freetype2/buildlink3.mk"
@@ -165,8 +163,8 @@ post-extract:
 .endfor
 
 pre-configure:
-	cd ${WRKSRC} && ${AUTOCONF}
-	cd ${WRKSRC}/nsprpub && ${AUTOCONF}
+	cd ${WRKSRC} && autoconf
+	cd ${WRKSRC}/nsprpub && autoconf
 
 post-build:
 	${ECHO} skin,install,select,classic/1.0 >> \
@@ -200,5 +198,4 @@ SUBST_SED.pc=		-e "s|%includedir%|${PREFIX}/include/${MOZILLA}|g" \
 			-e "s|%libdir%|${PREFIX}/lib/${MOZILLA}|g"
 SUBST_MESSAGE.pc=	"Fixing pkgconfig files."
 
-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index 078ff9848e5..ccfa833b624 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:46 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/01 20:08:01 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV}-stable-src
@@ -26,12 +26,11 @@ PKG_USERS=		${PRIVOXY_USER}:${PRIVOXY_GROUP}::Privoxy\\ user
 
 EGDIR=			${PREFIX}/share/examples/privoxy
 
-AUTOCONF_REQD=		2.13
 CPPFLAGS+=		-Dunix
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}-stable
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		autoconf213 gmake
 MAKEFILE=		GNUmakefile
 
 USE_PERL5=		build
@@ -62,7 +61,7 @@ FILES_SUBST+=		PRIVOXY_USER=${PRIVOXY_USER}
 
 pre-configure:
 	@cd ${WRKSRC} &&					\
-	(   ${AUTOHEADER} && ${AUTOCONF} ;			\
+	(   autoheader && autoconf ;				\
 	    ${MV} config config.bak &&				\
 	    ${SED} ${FILES_SUBST_SED} <config.bak >config &&	\
 	    ${RM} -f config.bak					\
@@ -74,5 +73,4 @@ post-install:
 
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/wml/Makefile b/www/wml/Makefile
index 527122bceac..539d64d2264 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/05/03 14:21:43 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/06/01 20:08:01 jlam Exp $
 #
 
 DISTNAME=	wml-2.0.9
@@ -17,6 +17,7 @@ DEPENDS+=	p5-Term-ReadKey>=2.11:../../devel/p5-Term-ReadKey
 
 .include "../../mk/bsd.prefs.mk"
 
+USE_TOOLS+=	automake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-perl=${PERL5} \
 		--with-openworld \
@@ -39,7 +40,7 @@ pre-configure:
 	    wml_common/gd \
 	    ; \
 	do \
-	    cd ${WRKSRC}/$$i && ${AUTORECONF} --force || exit 1; \
+	    cd ${WRKSRC}/$$i && autoreconf --force || exit 1; \
 	done
 
 post-install:
@@ -58,5 +59,4 @@ post-install:
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"