Remove explicit dependencies on the GNU m4 package with USE_TOOLS+=m4

and appropriate TOOLS_DEPMETHOD.gm4 settings.

6 files changed, 16 insertions, 21 deletions

diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 9c549d835b9..e539590c8d2 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2005/05/13 16:54:12 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2005/05/22 20:51:45 jlam Exp $
 
 DISTNAME=		autoconf-2.59
 PKGREVISION=		1
@@ -10,7 +10,8 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/autoconf/autoconf.html
 COMMENT=		Generates automatic source code configuration scripts
 
-DEPENDS=		m4>=1.4:../../devel/m4
+USE_TOOLS+=		gm4
+TOOLS_DEPMETHOD.gm4=	DEPENDS
 
 # The next line is for conflicts with old versions of this package,
 # which had autoconf-devel as PKGNAME.
@@ -21,7 +22,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_LANGUAGES=		# empty
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-lispdir
-TOOLS_M4=		${LOCALBASE}/bin/gm4
 
 INFO_FILES=		autoconf.info standards.info
 
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index aa1720c7fea..564a1b13a7d 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/05/13 16:54:12 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:51:45 jlam Exp $
 
 DISTNAME=       autoconf-2.13
 PKGNAME=	autoconf213-2.13
@@ -10,7 +10,8 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/autoconf/autoconf.html
 COMMENT=	Generates automatic source code configuration scripts (old version)
 
-DEPENDS=	m4>=1.4:../../devel/m4
+USE_TOOLS+=		gm4
+TOOLS_DEPMETHOD.gm4=	DEPENDS
 
 CONFLICTS=		autoconf-devel-[0-9]*
 CONFLICTS=		autoconf<2.50
@@ -19,7 +20,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--program-transform-name='s/$$/-2.13/'
-TOOLS_M4=		${LOCALBASE}/bin/gm4
 
 USE_MAKEINFO=		YES
 INFO_FILES=		autoconf213.info
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index cfc188143d4..db5adb1cdb9 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2005/05/22 05:35:32 jlam Exp $
+# $NetBSD: Makefile,v 1.64 2005/05/22 20:51:45 jlam Exp $
 #
 
 DISTNAME=	automake-1.9.5
@@ -13,13 +13,14 @@ COMMENT=	GNU Standards-compliant Makefile generator
 
 DEPENDS=	autoconf>=2.58:../../devel/autoconf
 
+USE_TOOLS+=		gm4
+TOOLS_DEPMETHOD.gm4=	DEPENDS
+
 #PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 PLIST_SUBST+=		PKG_DIR_VERSION=1.9
 GNU_CONFIGURE=		YES
 _STRIPFLAG_INSTALL=	# none
-EVAL_PREFIX+=		M4DIR=m4
-TOOLS_M4=		${M4DIR}/bin/${GNU_PROGRAM_PREFIX}m4
 
 INFO_FILES=		automake.info
 
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index a503369407c..d4c87990659 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.53 2005/05/22 20:51:45 jlam Exp $
 
 DISTNAME=		bison-2.0
 CATEGORIES=		devel
@@ -8,14 +8,12 @@ MAINTAINER=		cjep@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/bison/bison.html
 COMMENT=		GNU yacc(1) replacement
 
-DEPENDS+=		m4>=1.4:../../devel/m4
-BUILD_USES_MSGFMT=	yes
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+BUILD_USES_MSGFMT=	yes
 GNU_CONFIGURE=		YES
-
-M4=			${LOCALBASE}/bin/gm4
+USE_TOOLS+=		gm4
+TOOLS_DEPMETHOD.gm4=	DEPENDS
 
 INFO_FILES=		bison.info
 
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index 6ff16e22e28..0b87a68ea97 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:53 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:51:45 jlam Exp $
 
 DISTNAME=	libsigc++-1.2.7
 CATEGORIES=	devel
@@ -15,8 +15,6 @@ USE_LANGUAGES=		c c++
 
 PKGCONFIG_OVERRIDE=	sigc++-1.2.pc.in
 
-CONFIGURE_ENV+=		ac_cv_prog_M4=${TOOLS_M4:Q}
-
 .include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
diff --git a/devel/libsigc++2/Makefile b/devel/libsigc++2/Makefile
index 664f2ac1869..74b60ca65b4 100644
--- a/devel/libsigc++2/Makefile
+++ b/devel/libsigc++2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:53 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:51:45 jlam Exp $
 
 DISTNAME=	libsigc++-2.0.11
 PKGNAME=	libsigc++2-2.0.11
@@ -17,8 +17,6 @@ GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE=	sigc++-2.0.pc.in
 
-CONFIGURE_ENV+=		ac_cv_prog_M4=${TOOLS_M4:Q}
-
 .include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")