pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Export a new variable TOOLS_CMDLINE_<TOOL> that holds ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/814eca22e284
branches: trunk
changeset: 496978:814eca22e284
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Jul 18 02:33:27 2005 +0000
description:
Export a new variable TOOLS_CMDLINE_<TOOL> that holds the full command
line (path and arguments) needed to run the real tool.
Modify TOOLS_<TOOL> to hold only the path to the real tool.
Modify falcons-eye/Makefile and qt3-libs/Makefile.common to use
TOOLS_CMDLINE_YACC instead of TOOLS_YACC to that they'll use "bison -y".
diffstat:
games/falcons-eye/Makefile | 4 +-
mk/tools/replace.mk | 193 +++++++++++++-----------------------------
x11/qt3-libs/Makefile.common | 4 +-
3 files changed, 63 insertions(+), 138 deletions(-)
diffs (truncated from 799 to 300 lines):
diff -r 2d690bcbb1fb -r 814eca22e284 games/falcons-eye/Makefile
--- a/games/falcons-eye/Makefile Mon Jul 18 01:31:54 2005 +0000
+++ b/games/falcons-eye/Makefile Mon Jul 18 02:33:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/06/01 18:02:50 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/18 02:33:27 jlam Exp $
#
DISTNAME= nethack_source_331_jtp_193
@@ -19,7 +19,7 @@
WRKSRC= ${WRKDIR}
USE_TOOLS+= bison lex
-MAKE_ENV+= YACC=${TOOLS_YACC:Q}
+MAKE_ENV+= YACC=${TOOLS_CMDLINE_YACC:Q}
LIBS.SunOS+= -lm
diff -r 2d690bcbb1fb -r 814eca22e284 mk/tools/replace.mk
--- a/mk/tools/replace.mk Mon Jul 18 01:31:54 2005 +0000
+++ b/mk/tools/replace.mk Mon Jul 18 02:33:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.116 2005/07/17 22:12:08 jlam Exp $
+# $NetBSD: replace.mk,v 1.117 2005/07/18 02:33:27 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -43,9 +43,13 @@
# appear earlier in the search path when invoked using the bare name
# of the tool.
#
-# "TOOLS_TOOL" variables, e.g. TOOLS_AWK, TOOLS_SED, etc. are set to
-# the full command lines necessary to invoke the real tools on the
-# filesystem, and represent the tools required by the package.
+# "TOOLS_TOOLS" variables, e.g. TOOLS_AWK, TOOLS_SED, etc. are set to
+# the full paths to the real tools on the filesystem, and represent
+# tools required by the package.
+#
+# "TOOLS_CMDLINE_TOOL" variables, e.g. TOOLS_CMDLINE_AWK,
+# TOOLS_CMDLINE_SED, etc. are set to the full command lines (path and
+# arguments) necessary to invoke the real tools on the filesystem
#
# "TOOL" variables, e.g. AWK, SED, etc. are set to the full command
# lines necessary to invoke the real tools on the filesystem, and
@@ -205,7 +209,6 @@
TOOLS_CREATE+= awk
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.awk=nawk
TOOLS_PATH.awk= ${TOOLS_PREFIX.awk}/bin/nawk
-TOOLS_${_TOOLS_VARNAME.awk}= ${TOOLS_PATH.awk}
. endif
.endif
@@ -217,7 +220,6 @@
TOOLS_CREATE+= basename
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.basename=coreutils
TOOLS_PATH.basename= ${TOOLS_PREFIX.basename}/bin/${GNU_PROGRAM_PREFIX}basename
-TOOLS_${_TOOLS_VARNAME.basename}= ${TOOLS_PATH.basename}
. endif
.endif
@@ -229,7 +231,6 @@
TOOLS_CREATE+= bash
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.bash=bash
TOOLS_PATH.bash= ${TOOLS_PREFIX.bash}/bin/bash
-TOOLS_${_TOOLS_VARNAME.bash}= ${TOOLS_PATH.bash}
. endif
.endif
@@ -272,8 +273,6 @@
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.bison-yacc=bison
TOOLS_PATH.bison-yacc= ${TOOLS_PREFIX.bison-yacc}/bin/bison
TOOLS_ARGS.bison-yacc= -y
-TOOLS_${_TOOLS_VARNAME.bison-yacc}= \
- ${TOOLS_PATH.bison-yacc} ${TOOLS_ARGS.bison-yacc}
. endif
TOOLS_CMD.bison-yacc= ${TOOLS_DIR}/bin/yacc
.endif
@@ -286,7 +285,6 @@
TOOLS_CREATE+= bzcat
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.bzcat=bzip2
TOOLS_PATH.bzcat= ${TOOLS_PREFIX.bzcat}/bin/bzcat
-TOOLS_${_TOOLS_VARNAME.bzcat}= ${TOOLS_PATH.bzcat}
. endif
.endif
@@ -298,7 +296,6 @@
TOOLS_CREATE+= cat
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.cat=coreutils
TOOLS_PATH.cat= ${TOOLS_PREFIX.cat}/bin/${GNU_PROGRAM_PREFIX}cat
-TOOLS_${_TOOLS_VARNAME.cat}= ${TOOLS_PATH.cat}
. endif
.endif
@@ -310,7 +307,6 @@
TOOLS_CREATE+= chgrp
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.chgrp=coreutils
TOOLS_PATH.chgrp= ${TOOLS_PREFIX.chgrp}/bin/${GNU_PROGRAM_PREFIX}chgrp
-TOOLS_${_TOOLS_VARNAME.chgrp}= ${TOOLS_PATH.chgrp}
. endif
.endif
@@ -322,7 +318,6 @@
TOOLS_CREATE+= chmod
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.chmod=coreutils
TOOLS_PATH.chmod= ${TOOLS_PREFIX.chmod}/bin/${GNU_PROGRAM_PREFIX}chmod
-TOOLS_${_TOOLS_VARNAME.chmod}= ${TOOLS_PATH.chmod}
. endif
.endif
@@ -334,7 +329,6 @@
TOOLS_CREATE+= chown
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.chown=coreutils
TOOLS_PATH.chown= ${TOOLS_PREFIX.chown}/bin/${GNU_PROGRAM_PREFIX}chown
-TOOLS_${_TOOLS_VARNAME.chown}= ${TOOLS_PATH.chown}
. endif
.endif
@@ -346,7 +340,6 @@
TOOLS_CREATE+= cmp
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.cmp=diffutils
TOOLS_PATH.cmp= ${TOOLS_PREFIX.cmp}/bin/${GNU_PROGRAM_PREFIX}cmp
-TOOLS_${_TOOLS_VARNAME.cmp}= ${TOOLS_PATH.cmp}
. endif
.endif
@@ -358,7 +351,6 @@
TOOLS_CREATE+= cp
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.cp=coreutils
TOOLS_PATH.cp= ${TOOLS_PREFIX.cp}/bin/${GNU_PROGRAM_PREFIX}cp
-TOOLS_${_TOOLS_VARNAME.cp}= ${TOOLS_PATH.cp}
. endif
.endif
@@ -370,7 +362,6 @@
TOOLS_CREATE+= csh
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.csh=tcsh
TOOLS_PATH.csh= ${TOOLS_PREFIX.csh}/bin/tcsh
-TOOLS_${_TOOLS_VARNAME.csh}= ${TOOLS_PATH.csh}
. endif
.endif
@@ -382,7 +373,6 @@
TOOLS_CREATE+= cut
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.cut=coreutils
TOOLS_PATH.cut= ${TOOLS_PREFIX.cut}/bin/${GNU_PROGRAM_PREFIX}cut
-TOOLS_${_TOOLS_VARNAME.cut}= ${TOOLS_PATH.cut}
. endif
.endif
@@ -394,7 +384,6 @@
TOOLS_CREATE+= date
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.date=coreutils
TOOLS_PATH.date= ${TOOLS_PREFIX.date}/bin/${GNU_PROGRAM_PREFIX}date
-TOOLS_${_TOOLS_VARNAME.date}= ${TOOLS_PATH.date}
. endif
.endif
@@ -406,7 +395,6 @@
TOOLS_CREATE+= diff
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.diff=diffutils
TOOLS_PATH.diff= ${TOOLS_PREFIX.diff}/bin/${GNU_PROGRAM_PREFIX}diff
-TOOLS_${_TOOLS_VARNAME.diff}= ${TOOLS_PATH.diff}
. endif
.endif
@@ -418,7 +406,6 @@
TOOLS_CREATE+= dirname
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.dirname=coreutils
TOOLS_PATH.dirname= ${TOOLS_PREFIX.dirname}/bin/${GNU_PROGRAM_PREFIX}dirname
-TOOLS_${_TOOLS_VARNAME.dirname}= ${TOOLS_PATH.dirname}
. endif
.endif
@@ -430,7 +417,6 @@
TOOLS_CREATE+= echo
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.echo=coreutils
TOOLS_PATH.echo= ${TOOLS_PREFIX.echo}/bin/${GNU_PROGRAM_PREFIX}echo
-TOOLS_${_TOOLS_VARNAME.echo}= ${TOOLS_PATH.echo}
. endif
.endif
@@ -442,7 +428,6 @@
TOOLS_CREATE+= egrep
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.egrep=grep
TOOLS_PATH.egrep= ${TOOLS_PREFIX.egrep}/bin/${GNU_PROGRAM_PREFIX}egrep
-TOOLS_${_TOOLS_VARNAME.egrep}= ${TOOLS_PATH.egrep}
. endif
.endif
@@ -454,7 +439,6 @@
TOOLS_CREATE+= env
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.env=coreutilsj
TOOLS_PATH.env= ${TOOLS_PREFIX.env}/bin/${GNU_PROGRAM_PREFIX}env
-TOOLS_${_TOOLS_VARNAME.env}= ${TOOLS_PATH.env}
. endif
.endif
@@ -466,7 +450,6 @@
TOOLS_CREATE+= expr
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.expr=coreutils
TOOLS_PATH.expr= ${TOOLS_PREFIX.expr}/bin/${GNU_PROGRAM_PREFIX}expr
-TOOLS_${_TOOLS_VARNAME.expr}= ${TOOLS_PATH.expr}
. endif
.endif
@@ -478,7 +461,6 @@
TOOLS_CREATE+= false
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.false=coreutils
TOOLS_PATH.false= ${TOOLS_PREFIX.false}/bin/${GNU_PROGRAM_PREFIX}false
-TOOLS_${_TOOLS_VARNAME.false}= ${TOOLS_PATH.false}
. endif
.endif
@@ -490,7 +472,6 @@
TOOLS_CREATE+= fgrep
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.fgrep=grep
TOOLS_PATH.fgrep= ${TOOLS_PREFIX.fgrep}/bin/${GNU_PROGRAM_PREFIX}fgrep
-TOOLS_${_TOOLS_VARNAME.fgrep}= ${TOOLS_PATH.fgrep}
. endif
.endif
@@ -502,7 +483,6 @@
TOOLS_CREATE+= file
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.file=file
TOOLS_PATH.file= ${TOOLS_PREFIX.file}/bin/file
-TOOLS_${_TOOLS_VARNAME.file}= ${TOOLS_PATH.file}
. endif
.endif
@@ -514,7 +494,6 @@
TOOLS_CREATE+= find
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.find=findutils
TOOLS_PATH.find= ${TOOLS_PREFIX.find}/bin/${GNU_PROGRAM_PREFIX}find
-TOOLS_${_TOOLS_VARNAME.find}= ${TOOLS_PATH.find}
. endif
.endif
@@ -531,7 +510,6 @@
TOOLS_CREATE+= flex
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.flex=flex
TOOLS_PATH.flex= ${TOOLS_PREFIX.flex}/bin/flex
-TOOLS_${_TOOLS_VARNAME.flex}= ${TOOLS_PATH.flex}
. endif
TOOLS_ALIASES.flex= lex
.endif
@@ -544,7 +522,6 @@
TOOLS_CREATE+= gawk
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gawk=gawk
TOOLS_PATH.gawk= ${TOOLS_PREFIX.gawk}/bin/${GNU_PROGRAM_PREFIX}awk
-TOOLS_${_TOOLS_VARNAME.gawk}= ${TOOLS_PATH.gawk}
. endif
TOOLS_ALIASES.gawk= awk
.endif
@@ -557,7 +534,6 @@
TOOLS_CREATE+= gm4
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gm4=m4
TOOLS_PATH.gm4= ${TOOLS_PREFIX.gm4}/bin/gm4
-TOOLS_${_TOOLS_VARNAME.gm4}= ${TOOLS_PATH.gm4}
. endif
TOOLS_ALIASES.gm4= m4
.endif
@@ -570,7 +546,6 @@
TOOLS_CREATE+= gmake
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gmake=gmake
TOOLS_PATH.gmake= ${TOOLS_PREFIX.gmake}/bin/gmake
-TOOLS_${_TOOLS_VARNAME.gmake}= ${TOOLS_PATH.gmake}
. endif
.endif
@@ -582,7 +557,6 @@
TOOLS_CREATE+= grep
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.grep=grep
TOOLS_PATH.grep= ${TOOLS_PREFIX.grep}/bin/${GNU_PROGRAM_PREFIX}grep
-TOOLS_${_TOOLS_VARNAME.grep}= ${TOOLS_PATH.grep}
. endif
.endif
@@ -594,7 +568,6 @@
TOOLS_CREATE+= gsed
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gsed=gsed
TOOLS_PATH.gsed= ${TOOLS_PREFIX.gsed}/bin/${GNU_PROGRAM_PREFIX}sed
-TOOLS_${_TOOLS_VARNAME.gsed}= ${TOOLS_PATH.gsed}
. endif
TOOLS_ALIASES.gsed= sed
.endif
@@ -607,7 +580,6 @@
TOOLS_CREATE+= gtar
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gtar=gtar-base
TOOLS_PATH.gtar= ${TOOLS_PREFIX.gtar}/bin/${GNU_PROGRAM_PREFIX}tar
-TOOLS_${_TOOLS_VARNAME.gtar}= ${TOOLS_PATH.gtar}
. endif
.endif
@@ -620,7 +592,6 @@
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gunzip=gzip-base
TOOLS_PATH.gunzip= ${TOOLS_PREFIX.gunzip}/bin/gunzip
TOOLS_ARGS.gunzip= -f
-TOOLS_${_TOOLS_VARNAME.gunzip}= ${TOOLS_PATH.gunzip} ${TOOLS_ARGS.gunzip}
. endif
.endif
Home |
Main Index |
Thread Index |
Old Index