pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Change references to M4 & YACC into TOOLS_M4 & TOOLS_Y...
details: https://anonhg.NetBSD.org/pkgsrc/rev/72094e479f3b
branches: trunk
changeset: 493730:72094e479f3b
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri May 13 16:54:12 2005 +0000
description:
Change references to M4 & YACC into TOOLS_M4 & TOOLS_YACC to simplify
transition to new tools framework.
diffstat:
devel/autoconf/Makefile | 5 ++---
devel/autoconf213/Makefile | 5 ++---
devel/automake/Makefile | 4 ++--
devel/buildtool/buildlink3.mk | 6 +++---
devel/libsigc++/Makefile | 4 ++--
devel/libsigc++2/Makefile | 4 ++--
games/falcons-eye/Makefile | 4 ++--
mail/sendmail/Makefile.common | 4 ++--
mail/sendmail812/Makefile.common | 4 ++--
mk/bsd.pkg.mk | 6 ++++--
net/irrd/Makefile | 4 ++--
textproc/hevea/Makefile | 4 ++--
x11/qt3-libs/Makefile.common | 4 ++--
13 files changed, 29 insertions(+), 29 deletions(-)
diffs (244 lines):
diff -r e77ae93539e1 -r 72094e479f3b devel/autoconf/Makefile
--- a/devel/autoconf/Makefile Fri May 13 16:35:02 2005 +0000
+++ b/devel/autoconf/Makefile Fri May 13 16:54:12 2005 +0000
@@ -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 @@
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 -r e77ae93539e1 -r 72094e479f3b devel/autoconf213/Makefile
--- a/devel/autoconf213/Makefile Fri May 13 16:35:02 2005 +0000
+++ b/devel/autoconf213/Makefile Fri May 13 16:54:12 2005 +0000
@@ -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 @@
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 -r e77ae93539e1 -r 72094e479f3b devel/automake/Makefile
--- a/devel/automake/Makefile Fri May 13 16:35:02 2005 +0000
+++ b/devel/automake/Makefile Fri May 13 16:54:12 2005 +0000
@@ -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 @@
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 -r e77ae93539e1 -r 72094e479f3b devel/buildtool/buildlink3.mk
--- a/devel/buildtool/buildlink3.mk Fri May 13 16:35:02 2005 +0000
+++ b/devel/buildtool/buildlink3.mk Fri May 13 16:54:12 2005 +0000
@@ -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_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 -r e77ae93539e1 -r 72094e479f3b devel/libsigc++/Makefile
--- a/devel/libsigc++/Makefile Fri May 13 16:35:02 2005 +0000
+++ b/devel/libsigc++/Makefile Fri May 13 16:54:12 2005 +0000
@@ -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 @@
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 -r e77ae93539e1 -r 72094e479f3b devel/libsigc++2/Makefile
--- a/devel/libsigc++2/Makefile Fri May 13 16:35:02 2005 +0000
+++ b/devel/libsigc++2/Makefile Fri May 13 16:54:12 2005 +0000
@@ -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 @@
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 -r e77ae93539e1 -r 72094e479f3b games/falcons-eye/Makefile
--- a/games/falcons-eye/Makefile Fri May 13 16:35:02 2005 +0000
+++ b/games/falcons-eye/Makefile Fri May 13 16:54:12 2005 +0000
@@ -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 @@
WRKSRC= ${WRKDIR}
USE_GNU_TOOLS+= lex yacc
-MAKE_ENV+= YACC="${YACC}"
+MAKE_ENV+= YACC=${TOOLS_YACC:Q}
USE_X11= yes
LIBS.SunOS+= -lm
diff -r e77ae93539e1 -r 72094e479f3b mail/sendmail/Makefile.common
--- a/mail/sendmail/Makefile.common Fri May 13 16:35:02 2005 +0000
+++ b/mail/sendmail/Makefile.common Fri May 13 16:54:12 2005 +0000
@@ -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 @@
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 -r e77ae93539e1 -r 72094e479f3b mail/sendmail812/Makefile.common
--- a/mail/sendmail812/Makefile.common Fri May 13 16:35:02 2005 +0000
+++ b/mail/sendmail812/Makefile.common Fri May 13 16:54:12 2005 +0000
@@ -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 @@
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 -r e77ae93539e1 -r 72094e479f3b mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Fri May 13 16:35:02 2005 +0000
+++ b/mk/bsd.pkg.mk Fri May 13 16:54:12 2005 +0000
@@ -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 @@
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 -r e77ae93539e1 -r 72094e479f3b net/irrd/Makefile
--- a/net/irrd/Makefile Fri May 13 16:35:02 2005 +0000
+++ b/net/irrd/Makefile Fri May 13 16:54:12 2005 +0000
@@ -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 @@
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 -r e77ae93539e1 -r 72094e479f3b textproc/hevea/Makefile
--- a/textproc/hevea/Makefile Fri May 13 16:35:02 2005 +0000
+++ b/textproc/hevea/Makefile Fri May 13 16:54:12 2005 +0000
@@ -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 @@
BUILD_DEPENDS+= ocaml>=3.07:../../lang/ocaml
-MAKE_ENV+= M4="${M4}"
+MAKE_ENV+= M4=${TOOLS_M4:Q}
.include "../../mk/bsd.prefs.mk"
diff -r e77ae93539e1 -r 72094e479f3b x11/qt3-libs/Makefile.common
--- a/x11/qt3-libs/Makefile.common Fri May 13 16:35:02 2005 +0000
+++ b/x11/qt3-libs/Makefile.common Fri May 13 16:54:12 2005 +0000
@@ -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 @@
-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' \
Home |
Main Index |
Thread Index |
Old Index