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.

5 files changed, 14 insertions, 27 deletions

diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index 6a5fb6b3c24..ec61dc14fa1 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.28 2005/06/01 20:08:00 jlam Exp $
 #
 
 DISTNAME=		latestCDK
@@ -16,12 +16,12 @@ WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_NCURSES=		# uses ncurses internals
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-AUTOCONF_REQD=		2.13
+USE_TOOLS+=		autoconf213
 
 BUILD_TARGET=		default
 
 pre-configure:
-	cd ${WRKSRC}; ${AUTOCONF}
+	cd ${WRKSRC}; autoconf
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cdk
@@ -30,5 +30,4 @@ post-install:
 	done
 
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/florist/Makefile b/devel/florist/Makefile
index 30ab951c737..ee91d375d28 100644
--- a/devel/florist/Makefile
+++ b/devel/florist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/22 20:07:51 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/01 20:08:00 jlam Exp $
 #
 
 DISTNAME=		florist-3.15p-src
@@ -15,8 +15,7 @@ COMMENT=		FSU implementation of POSIX.5 (Ada binding)
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_AUTOCONF=		yes
-AUTOCONF_REQD=		2.12
-USE_TOOLS+=		gmake
+USE_TOOLS+=		autoconf213 gmake
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -36,7 +35,7 @@ pre-configure:
 .else
 .  include "../../lang/gcc34-ada/preconfigure.mk"
 .endif
-	cd ${WRKSRC}; ${AUTOCONF}
+	cd ${WRKSRC}; autoconf
 
 do-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/lib/florist
@@ -51,5 +50,4 @@ do-install:
 .  include "../../lang/gcc34-ada/buildlink3.mk"
 .endif
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile
index cd27fc00e91..bca6d7731aa 100644
--- a/devel/gdb6/Makefile
+++ b/devel/gdb6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:51 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/01 20:08:00 jlam Exp $
 #
 
 DISTNAME=		gdb-6.2.1
@@ -13,12 +13,11 @@ COMMENT=		The GNU Project Debugger
 
 BUILD_USES_MSGFMT=	yes
 
-USE_TOOLS=		gmake
+USE_TOOLS=		autoconf213 gmake
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-AUTOCONF_REQD=		2.13
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/gdb6
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/gdb6
 CONFIGURE_ARGS+=	--enable-libada
@@ -34,9 +33,7 @@ pre-patch:
 	${CP} ${FILESDIR}/nbsd-nat.c ${WRKSRC}/gdb
 
 pre-configure:
-	cd ${WRKSRC}/gdb;                                           \
-	${AUTOHEADER};                                          \
-	${AUTOCONF}
+	cd ${WRKSRC}/gdb; autoheader; autoconf
 
 do-test:
 	if `${PKG_INFO} -qe dejagnu` ;then		\
@@ -46,5 +43,4 @@ do-test:
 	fi
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 2e7217e06a8..2f91f4ad541 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:54 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 20:08:00 jlam Exp $
 
 DISTNAME=		nspr-4.4.1
 PKGREVISION=		1
@@ -11,13 +11,11 @@ COMMENT=		Platform-neutral API for system level and libc like functions
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/mozilla/nsprpub/build
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		autoconf213 gmake
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ARGS+=	--disable-debug
 
-AUTOCONF_REQD=		2.13
-
 MAKE_ENV=		DIST=${WRKSRC}/dist
 CONFIGURE_SCRIPT=	../configure
 CONFIGURE_ENV=		LIBRUNPATH=${PREFIX}/lib/nspr
@@ -34,7 +32,7 @@ SO_SUFFIX=		so.1.0
 PLIST_SUBST+=		SO_SUFFIX=${SO_SUFFIX}
 
 pre-configure:
-	cd ${WRKSRC}/.. && ${AUTOCONF}
+	cd ${WRKSRC}/.. && autoconf
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/nspr
@@ -52,6 +50,4 @@ CONFIGURE_ARGS+=	--without-pthreads
 CONFIGURE_ARGS+=	--with-pthreads
 .endif
 
-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/devel/prc-tools/Makefile b/devel/prc-tools/Makefile
index 5c563c268b5..5ac34f9a60c 100644
--- a/devel/prc-tools/Makefile
+++ b/devel/prc-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:54 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/06/01 20:08:00 jlam Exp $
 #
 
 DISTNAME=	prc-tools-2.2
@@ -32,9 +32,8 @@ CONFLICTS+=	prc-tools-binutils-[0-9]*
 CONFLICTS+=	prc-tools-gcc-[0-9]*
 CONFLICTS+=	prc-tools-gdb-[0-9]*
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	autoconf gmake
 GNU_CONFIGURE=	YES
-AUTOCONF_REQD=	2.50
 USE_MAKEINFO=	YES
 INFO_FILES=	prc-tools.info
 
@@ -67,6 +66,5 @@ pre-patch:
 	cd ${WRKDIR} \
 		&& ${PATCH} --quiet -p0 < ${WRKSRC}/${DIST_GDB}.palmos.diff
 
-.include "../../mk/autoconf.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"