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.

6 files changed, 20 insertions, 28 deletions

diff --git a/graphics/cal3d-examples/Makefile b/graphics/cal3d-examples/Makefile
index a35e8000722..d4072b27217 100644
--- a/graphics/cal3d-examples/Makefile
+++ b/graphics/cal3d-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:54 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/01 20:08:00 jlam Exp $
 #
 
 PKGNAME=		cal3d-examples-${CAL3D_VERSION}
@@ -11,6 +11,8 @@ DISTFILES=		TheCallyDemo-0.9.1b.zip \
 
 COMMENT=	        Tools and demos for cal3d library
 
+USE_TOOLS+=		automake
+
 CONFIGURE_ARGS+=	--with-cal3d=${PREFIX}
 CONFIGURE_ARGS+=	--with-glut=${PREFIX}
 CONFIGURE_DIRS=		${WRKSRC}/examples/cally \
@@ -50,6 +52,4 @@ post-install:
 .include "../../graphics/Mesa/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 
-.include "../../mk/automake.mk"
-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile
index d6d9c4b3c78..0d75addadf6 100644
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:00 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/06/01 20:08:00 jlam Exp $
 #
 
 PKGNAME=		cal3d-${CAL3D_VERSION}
@@ -8,12 +8,11 @@ PKGREVISION=	1
 
 COMMENT=	        Skeletal based 3d character animation library in C++
 
+USE_TOOLS+=		automake
 
 pre-configure:
 	cd ${WRKSRC} && ./autogen.sh
 
 .include "../../graphics/Mesa/buildlink3.mk"
 
-.include "../../mk/automake.mk"
-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cal3d/Makefile.common b/graphics/cal3d/Makefile.common
index d89a5e495da..30e69a0b474 100644
--- a/graphics/cal3d/Makefile.common
+++ b/graphics/cal3d/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/04/11 21:46:00 tv Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/06/01 20:08:00 jlam Exp $
 #
 
 DISTNAME=		cal3d-${CAL3D_VERSION}
@@ -13,8 +13,5 @@ COMMENT=	        Skeletal based 3d character animation library in C++
 
 EXTRACT_SUFX=		.tar.bz2
 USE_LIBTOOL=		yes
+USE_TOOLS+=		automake
 GNU_CONFIGURE=		yes
-#AUTOMAKE_OVERRIDE=	NO
-
-.include "../../mk/autoconf.mk"
-.include "../../mk/automake.mk"
diff --git a/graphics/compface/Makefile b/graphics/compface/Makefile
index a4ee2626e97..287fde933c5 100644
--- a/graphics/compface/Makefile
+++ b/graphics/compface/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:04 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/01 20:08:00 jlam Exp $
 
 DISTNAME=	compface-1.5.1
 CATEGORIES=	graphics
@@ -10,7 +10,7 @@ COMMENT=	48x48x1 image compression and decompression (X-face utility)
 
 CONFLICTS=	faces-[0-9]*
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		autoconf gmake
 GNU_CONFIGURE=		yes
 
 SUBST_CLASSES+=		perlpath
@@ -20,10 +20,9 @@ SUBST_FILES.perlpath=	xbm2xface.pl
 SUBST_SED.perlpath=	-e 's|
||' -e 's|/usr/bin|${PREFIX}/bin|g'
 
 pre-configure:
-	cd ${WRKSRC}; ${AUTOCONF}
+	cd ${WRKSRC}; autoconf
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/xbm2xface.pl ${PREFIX}/bin
 
-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile
index 5a20fb40968..ce9e1153242 100644
--- a/graphics/libgdiplus/Makefile
+++ b/graphics/libgdiplus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:56 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/06/01 20:08:00 jlam Exp $
 #
 
 DISTNAME=	libgdiplus-1.1.5
@@ -10,16 +10,14 @@ HOMEPAGE=	http://www.mono-project.com/
 COMMENT=	Implementation of the GDI+ API
 
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		autoconf gmake
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	libgdiplus.pc.in
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-glitz
 
 pre-configure:
-	cd ${WRKSRC};			\
-	${AUTOHEADER};			\
-	${AUTOCONF}
+	cd ${WRKSRC}; autoheader; autoconf
 
 BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.1.5
 BUILDLINK_DEPENDS.Xft2+=	Xft2>=2.1.2
@@ -37,5 +35,4 @@ BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
 .include "../../x11/Xrender/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mng/Makefile b/graphics/mng/Makefile
index f228834ee52..8f0e29603be 100644
--- a/graphics/mng/Makefile
+++ b/graphics/mng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:06 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/06/01 20:08:00 jlam Exp $
 
 DISTNAME=	lm1009
 PKGNAME=	mng-1.0.9
@@ -18,6 +18,7 @@ COMMENT=	Multiple-image Network Graphics (MNG) reference library
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
+USE_TOOLS+=		automake
 
 # only needed as long as we use the zip distfile
 EXTRACT_CMD_OPTS.zip?=  -aqo
@@ -32,13 +33,13 @@ DOCDIR=			${PREFIX}/share/doc/mng
 INSTALLATION_DIRS=	man/man3 man/man5
 
 pre-configure:
-	cd ${WRKSRC};				\
+	cd ${WRKSRC};							\
 	${RM} -f configure.in && ${LN} -sf makefiles/configure.in .;	\
 	${RM} -f Makefile.am && ${LN} -sf makefiles/Makefile.am .;	\
-	${SETENV} AUTOM4TE=${LOCALBASE}/bin/autom4te ${ACLOCAL};	\
-	${LOCALBASE}/bin/libtoolize --automake;	\
-	${SETENV} AUTOCONF=${AUTOCONF} ${AUTOMAKE} -a --foreign -i;	\
-	${AUTOCONF}
+	aclocal;							\
+	${LOCALBASE}/bin/libtoolize --automake;				\
+	automake -a --foreign -i;					\
+	autoconf
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
@@ -53,5 +54,4 @@ post-install:
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"