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, 11 insertions, 17 deletions

diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index 14c2d3d5af4..40e752d04ea 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:50 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/01 20:08:00 jlam Exp $
 #
 
 DISTNAME=	glchess-0.4.7
@@ -10,14 +10,15 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://glchess.sourceforge.net/
 COMMENT=	3D chess interface
 
+USE_TOOLS+=	automake
 GNU_CONFIGURE=	YES
 INSTALL_DIRS=	${WRKSRC}/src ${WRKSRC}/man ${WRKSRC}/textures
 
 pre-configure:
 		cd ${WRKSRC} &&						\
-		${ACLOCAL} &&						\
-		${AUTOMAKE} --add-missing &&				\
-		${AUTOCONF} &&						\
+		aclocal &&						\
+		automake --add-missing &&				\
+		autoconf &&						\
 		${CP} glchessrc glchessrc.dist &&			\
 		${SED}	-e 's|/usr/local/share/games|${PREFIX}/share|g'	\
 			 < glchessrc.dist > glchessrc &&		\
@@ -34,5 +35,4 @@ post-install:
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../x11/gtkglarea/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index cc9f8f497fb..b4098af4546 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:04 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/06/01 20:08:00 jlam Exp $
 
 DISTNAME=		xpuyopuyo-0.9.1
 PKGREVISION=		5
@@ -10,9 +10,8 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://chaos2.org/xpuyopuyo/
 COMMENT=		Tetris-like puzzle game
 
-AUTOMAKE_REQD=		1.4
 USE_DIRS+=		gnome1-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		automake14 gmake
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
@@ -24,8 +23,7 @@ CONFIGURE_ENV+=		ac_cv_path_GNOME_CONFIG="${GNOME_CONFIG}"
 GNOME_CONFIG=		${WRKDIR}/gnome-config
 
 pre-configure:
-	cd ${WRKSRC} && ${AUTOHEADER} && ${AUTOMAKE} --gnu && \
-		${AUTORECONF} --force
+	cd ${WRKSRC} && autoheader && automake --gnu && autoreconf --force
 	${SED} -e "s,@PREFIX@,${PREFIX},g" ${FILESDIR}/gnome-config \
 		> ${GNOME_CONFIG}
 	${CHMOD} +x ${GNOME_CONFIG}
@@ -33,5 +31,4 @@ pre-configure:
 .include "../../audio/libmikmod/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index 0e8d04a3d10..95b1ce95aef 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:53 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2005/06/01 20:08:00 jlam Exp $
 #
 
 DISTNAME=		xracer-0.96.9
@@ -12,17 +12,15 @@ COMMENT=		XRacer is a clone of the popular Psygnosis game Wipeout
 
 BUILD_USES_MSGFMT=	# defined
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		automake14 gmake
 USE_PERL5=		# defined
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/XRacer/.packlist
 
 USE_LIBTOOL=		# defined
-
 GNU_CONFIGURE=		# defined
-AUTOMAKE_REQD=		1.4
 
 pre-configure:
-	cd ${WRKSRC} && ${AUTOMAKE} --gnu && ${AUTOCONF}
+	cd ${WRKSRC} && automake --gnu && autoconf
 
 pre-patch:
 .for perlfile in blender2track/xracer-blender2track.pl \
@@ -41,5 +39,4 @@ pre-patch:
 .include "../../graphics/Mesa/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"