Change references to M4 & YACC into TOOLS_M4 & TOOLS_YACC to simplify

transition to new tools framework.

13 files changed, 29 insertions, 29 deletions

diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 34c607acc24..9c549d835b9 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2005/04/11 21:45:17 tv Exp $
+# $NetBSD: Makefile,v 1.52 2005/05/13 16:54:12 jlam Exp $
 
 DISTNAME=		autoconf-2.59
 PKGREVISION=		1
@@ -21,8 +21,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_LANGUAGES=		# empty
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-lispdir
-CONFIGURE_ENV+=		AWK="${AWK}"
-M4=			${LOCALBASE}/bin/gm4
+TOOLS_M4=		${LOCALBASE}/bin/gm4
 
 INFO_FILES=		autoconf.info standards.info
 
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index 0c3e23af957..aa1720c7fea 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:17 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/13 16:54:12 jlam Exp $
 
 DISTNAME=       autoconf-2.13
 PKGNAME=	autoconf213-2.13
@@ -18,9 +18,8 @@ CONFLICTS=		autoconf<2.50
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ENV+=		AWK="${AWK}"
 CONFIGURE_ARGS+=	--program-transform-name='s/$$/-2.13/'
-M4=			${LOCALBASE}/bin/gm4
+TOOLS_M4=		${LOCALBASE}/bin/gm4
 
 USE_MAKEINFO=		YES
 INFO_FILES=		autoconf213.info
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 9124459ca27..8e23f6d5ae0 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.62 2005/05/13 16:54:12 jlam Exp $
 #
 
 DISTNAME=	automake-1.9.5
@@ -20,7 +20,7 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ENV=		PERL=${PERL5}
 _STRIPFLAG_INSTALL=	# none
 EVAL_PREFIX+=		M4DIR=m4
-M4=			${M4DIR}/bin/${GNU_PROGRAM_PREFIX}m4
+TOOLS_M4=		${M4DIR}/bin/${GNU_PROGRAM_PREFIX}m4
 
 INFO_FILES=		automake.info
 
diff --git a/devel/buildtool/buildlink3.mk b/devel/buildtool/buildlink3.mk
index a59048e5995..2edf26478c6 100644
--- a/devel/buildtool/buildlink3.mk
+++ b/devel/buildtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/05/13 16:35:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/05/13 16:54:12 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BUILDTOOL_BUILDLINK3_MK:=	${BUILDTOOL_BUILDLINK3_MK}+
@@ -23,11 +23,11 @@ CONFIGURE_ENV+=		BT_FLAGS_CC=${CFLAGS:Q}
 CONFIGURE_ENV+=		BT_FLAGS_CPP=${CPPFLAGS:Q}
 CONFIGURE_ENV+=		BT_FLAGS_CXX=${CXXFLAGS:Q}
 CONFIGURE_ENV+=		BT_FLAGS_LD=${LDFLAGS:Q}
-CONFIGURE_ENV+=		BT_PROG_AWK=${AWK:Q}
+CONFIGURE_ENV+=		BT_PROG_AWK=${TOOLS_AWK:Q}
 CONFIGURE_ENV+=		BT_PROG_CC=${CC:Q}
 CONFIGURE_ENV+=		BT_PROG_CXX=${CXX:Q}
 CONFIGURE_ENV+=		BT_PROG_LD=${LD:Q}
-CONFIGURE_ENV+=		BT_PROG_M4=${M4:Q}
+CONFIGURE_ENV+=		BT_PROG_M4=${TOOLS_M4:Q}
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
 .if !target(do-build)
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index a8c2641d95c..b27d0be2345 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/18 17:08:55 drochner Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/13 16:54:12 jlam Exp $
 
 DISTNAME=	libsigc++-1.2.7
 CATEGORIES=	devel
@@ -15,7 +15,7 @@ USE_LANGUAGES=		c c++
 
 PKGCONFIG_OVERRIDE=	sigc++-1.2.pc.in
 
-CONFIGURE_ENV+=		ac_cv_prog_M4=${M4}
+CONFIGURE_ENV+=		ac_cv_prog_M4=${TOOLS_M4:Q}
 
 .include "../../mk/pthread.buildlink3.mk"
 
diff --git a/devel/libsigc++2/Makefile b/devel/libsigc++2/Makefile
index b5a95491e3d..2cb7aa1c027 100644
--- a/devel/libsigc++2/Makefile
+++ b/devel/libsigc++2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/18 17:11:47 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/13 16:54:13 jlam Exp $
 
 DISTNAME=	libsigc++-2.0.11
 PKGNAME=	libsigc++2-2.0.11
@@ -17,7 +17,7 @@ GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE=	sigc++-2.0.pc.in
 
-CONFIGURE_ENV+=		ac_cv_prog_M4=${M4}
+CONFIGURE_ENV+=		ac_cv_prog_M4=${TOOLS_M4:Q}
 
 .include "../../mk/pthread.buildlink3.mk"
 
diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile
index caf569b24ad..0ec31430fdc 100644
--- a/games/falcons-eye/Makefile
+++ b/games/falcons-eye/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:45:49 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/13 16:54:13 jlam Exp $
 #
 
 DISTNAME=		nethack_source_331_jtp_193
@@ -19,7 +19,7 @@ DIST_SUBDIR=		${PKGNAME_NOREV}-20050216-2
 
 WRKSRC=			${WRKDIR}
 USE_GNU_TOOLS+=		lex yacc
-MAKE_ENV+=		YACC="${YACC}"
+MAKE_ENV+=		YACC=${TOOLS_YACC:Q}
 USE_X11=		yes
 
 LIBS.SunOS+=		-lm
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index ea782bedf48..94c30a83b85 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2005/04/27 18:57:54 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.27 2005/05/13 16:54:13 jlam Exp $
 #
 # Makefile fragment shared with libmilter
 #
@@ -29,7 +29,7 @@ BUILD_DEFS+=    SMRSH_CMDDIR
 
 WRKSRC=		${WRKDIR}/sendmail-${DIST_VERS}
 USE_GNU_TOOLS+=	m4
-MAKE_ENV+=	M4="${M4}"
+MAKE_ENV+=	M4=${TOOLS_M4:Q}
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
diff --git a/mail/sendmail812/Makefile.common b/mail/sendmail812/Makefile.common
index f313039410e..59ed6a9498b 100644
--- a/mail/sendmail812/Makefile.common
+++ b/mail/sendmail812/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/04/11 21:46:27 tv Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/05/13 16:54:13 jlam Exp $
 #
 # Makefile fragment shared with libmilter
 #
@@ -31,7 +31,7 @@ DESCR_SRC=	${WRKDIR}/.DESCR_SRC
 
 WRKSRC=		${WRKDIR}/sendmail-${DIST_VERS}
 USE_GNU_TOOLS+=	m4
-MAKE_ENV+=	M4="${M4}"
+MAKE_ENV+=	M4=${TOOLS_M4:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index e173fad64ae..7fee8a1c4cc 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1642 2005/05/12 20:41:10 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1643 2005/05/13 16:54:13 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -448,7 +448,9 @@ SHCOMMENT?=		${ECHO_MSG} >/dev/null '***'
 LIBABISUFFIX?=
 
 .if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-CONFIGURE_ENV+=		M4="${M4}" YACC="${YACC}"
+TOOLS_M4?=		${M4}
+TOOLS_YACC?=		${YACC}
+CONFIGURE_ENV+=		M4=${TOOLS_M4:Q} YACC=${TOOLS_YACC:Q}
 .endif
 
 TOUCH_FLAGS?=		-f
diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index 36878dea888..dce5fde620c 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/04/11 21:46:48 tv Exp $
+# $NetBSD: Makefile,v 1.28 2005/05/13 16:54:13 jlam Exp $
 
 DISTNAME=		irrd2.2.3
 PKGNAME=		irrd-2.2.3
@@ -25,7 +25,7 @@ WRKSRC=			${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-thread
 CONFIGURE_ENV+=		EGREP=${EGREP}
-CONFIGURE_ENV+=		YACC=${YACC}
+CONFIGURE_ENV+=		YACC=${TOOLS_YACC:Q}
 
 BUILD_DEFS+=		USE_INET6
 
diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile
index c532e3b9977..d246ef434f6 100644
--- a/textproc/hevea/Makefile
+++ b/textproc/hevea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/02/04 22:23:23 adrianp Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/13 16:54:13 jlam Exp $
 
 DISTNAME=	hevea-1.07
 CATEGORIES=	textproc
@@ -10,7 +10,7 @@ COMMENT=	LaTeX to HTML translator
 
 BUILD_DEPENDS+=	ocaml>=3.07:../../lang/ocaml
 
-MAKE_ENV+=	M4="${M4}"
+MAKE_ENV+=	M4=${TOOLS_M4:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index 589ce269261..d80257754c5 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.44 2005/04/12 15:11:18 tv Exp $
+# $NetBSD: Makefile.common,v 1.45 2005/05/13 16:54:13 jlam Exp $
 #
 DISTNAME=		qt-x11-free-${QTVERSION}
 CATEGORIES=		x11
@@ -100,7 +100,7 @@ post-patch:
 		-e 's:@CXXFLAGS@:${CXXFLAGS}:g' \
 		-e 's:@SYS_LIBS@:${SYS_LIBS}:g' \
 		-e 's:@LEX@:${LEX}:g' \
-		-e 's:@YACC@:${YACC}:g' \
+		-e 's:@YACC@:${TOOLS_YACC}:g' \
 		-e 's:@AR@:${AR}:g' \
 		-e 's:@MKDIR@:${MKDIR}:g' \
 		-e 's:@LIBQT@:${LIBQT}:g' \