pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/tools Rename TOOLS_ARGS.* to TOOLS_REAL_ARGS.* to f...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ea706e1ff8f2
branches: trunk
changeset: 493533:ea706e1ff8f2
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon May 09 00:13:03 2005 +0000
description:
Rename TOOLS_ARGS.* to TOOLS_REAL_ARGS.* to follow naming convention for
other TOOLS_* variables relating to the real command executed.
diffstat:
mk/tools/bsd.tools.mk | 34 +++++++++++++---------------------
mk/tools/imake.mk | 14 +++++++-------
mk/tools/replace.mk | 40 ++++++++++++++++++++--------------------
mk/tools/rpcgen.mk | 6 +++---
4 files changed, 43 insertions(+), 51 deletions(-)
diffs (249 lines):
diff -r b2e88dd287a2 -r ea706e1ff8f2 mk/tools/bsd.tools.mk
--- a/mk/tools/bsd.tools.mk Sun May 08 17:49:05 2005 +0000
+++ b/mk/tools/bsd.tools.mk Mon May 09 00:13:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.13 2005/05/02 04:35:59 jlam Exp $
+# $NetBSD: bsd.tools.mk,v 1.14 2005/05/09 00:13:03 jlam Exp $
#
# This Makefile fragment creates tools under ${TOOLS_DIR} that are
# found before similarly-named tools in the system path.
@@ -29,14 +29,14 @@
# The following variables specify further details of each <tool> and
# are used only by tools listed in TOOLS_WRAP:
#
-# TOOLS_ARGS.<tool> additional arguments that are passed to the real
-# command ahead of any command-line arguments. This variable is
-# optional.
+# TOOLS_REAL_ARGS.<tool> additional arguments that are passed to the
+# real command ahead of any command-line arguments. This variable
+# is optional.
#
# TOOLS_REAL_CMDLINE.<tool> specifies the full command-line to invoke
# in the wrapper script when <tool> is called. This variable is
# optional, and if left unspecified, then this is built up from
-# TOOLS_REAL_CMD.<tool> and TOOLS_ARGS.<tool> by default.
+# TOOLS_REAL_CMD.<tool> and TOOLS_REAL_ARGS.<tool> by default.
#
# The following variables provide shortcuts for creating certain classes
# of tools:
@@ -120,26 +120,18 @@
######################################################################
-# The default wrapper script will invoke the real command, followed by
-# any arguments specified in TOOLS_ARGS.*, followed by any command-line
-# arguments passed to the wrapper script. By default, the wrapper in
-# ${TOOLS_DIR} will be in the "bin" directory and will be called <tool>.
+# The default wrapper script will invoke the real command, followed
+# by any arguments specified in TOOLS_REAL_ARGS.*, followed by any
+# command-line arguments passed to the wrapper script. By default,
+# the wrapper in ${TOOLS_DIR} will be in the "bin" directory and will
+# be called <tool>.
#
.for _t_ in ${TOOLS_WRAP}
TOOLS_REAL_CMD.${_t_}?= ${FALSE}
-TOOLS_ARGS.${_t_}?= # empty
-TOOLS_REAL_CMDLINE.${_t_}?= ${TOOLS_REAL_CMD.${_t_}} ${TOOLS_ARGS.${_t_}} "$$@"
+TOOLS_REAL_ARGS.${_t_}?= # empty
+TOOLS_REAL_CMDLINE.${_t_}?= ${TOOLS_REAL_CMD.${_t_}} ${TOOLS_REAL_ARGS.${_t_}} "$$@"
TOOLS_CMD.${_t_}?= ${TOOLS_DIR}/bin/${_t_}
-# Small optimization: exec the command if it points to a real command
-# (specified by a full path).
-#
-. if !empty(TOOLS_REAL_CMDLINE.${_t_}:C/^/_asdf_/1:M_asdf_/*)
-_TOOLS_EXEC.${_t_}= exec
-. else
-_TOOLS_EXEC.${_t_}= # empty
-. endif
-
. if !empty(TOOLS_CMD.${_t_}:M${TOOLS_DIR}/*) && \
!target(${TOOLS_CMD.${_t_}})
override-tools: ${TOOLS_CMD.${_t_}}
@@ -150,7 +142,7 @@
${ECHO} 'wrapperlog="$${TOOLS_WRAPPER_LOG-'${_TOOLS_WRAP_LOG:Q}'}"'; \
${ECHO} '${ECHO} "[*] "'${TOOLS_CMD.${_t_}:Q}'" $$*" >> $$wrapperlog'; \
${ECHO} '${ECHO} "<.> "'${TOOLS_REAL_CMDLINE.${_t_}:Q}' >> $$wrapperlog'; \
- ${ECHO} ${_TOOLS_EXEC.${_t_}:Q} ${TOOLS_REAL_CMDLINE.${_t_}:Q}; \
+ ${ECHO} ${TOOLS_REAL_CMDLINE.${_t_}:Q}; \
) > ${.TARGET}
${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
. endif
diff -r b2e88dd287a2 -r ea706e1ff8f2 mk/tools/imake.mk
--- a/mk/tools/imake.mk Sun May 08 17:49:05 2005 +0000
+++ b/mk/tools/imake.mk Mon May 09 00:13:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: imake.mk,v 1.2 2005/05/04 06:25:59 jlam Exp $
+# $NetBSD: imake.mk,v 1.3 2005/05/09 00:13:03 jlam Exp $
#
# This Makefile fragment handles packages that need imake and xmkmf
# to build X11-related packages. The correct imake and xmkmf tools
@@ -70,8 +70,8 @@
TOOLS_REAL_CMD.imake= ${X11BASE}/bin/imake
TOOLS_REAL_CMD.xmkmf= ${X11BASE}/bin/xmkmf
. endif
-TOOLS_ARGS.imake= ${IMAKEOPTS}
-TOOLS_ARGS.xmkmf= ${XMKMF_FLAGS}
+TOOLS_REAL_ARGS.imake= ${IMAKEOPTS}
+TOOLS_REAL_ARGS.xmkmf= ${XMKMF_FLAGS}
#
# Add any extra tools that may be required when using imake, e.g. gmake.
#
@@ -80,18 +80,18 @@
# Define IMAKE and XMKMF_CMD and create wrappers/symlinks corresponding
# to imake and xmkmf.
#
-. if !empty(TOOLS_ARGS.imake)
+. if !empty(TOOLS_REAL_ARGS.imake)
TOOLS_WRAP+= imake
. else
TOOLS_SYMLINK+= imake
. endif
-. if !empty(TOOLS_ARGS.xmkmf)
+. if !empty(TOOLS_REAL_ARGS.xmkmf)
TOOLS_WRAP+= xmkmf
. else
TOOLS_SYMLINK+= xmkmf
. endif
-${_TOOLS_VARNAME.imake}= ${TOOLS_REAL_CMD.imake} ${TOOLS_ARGS.imake}
-${_TOOLS_VARNAME.xmkmf}= ${TOOLS_REAL_CMD.xmkmf} ${TOOLS_ARGS.xmkmf}
+${_TOOLS_VARNAME.imake}= ${TOOLS_REAL_CMD.imake} ${TOOLS_REAL_ARGS.imake}
+${_TOOLS_VARNAME.xmkmf}= ${TOOLS_REAL_CMD.xmkmf} ${TOOLS_REAL_ARGS.xmkmf}
XMKMF= ${${_TOOLS_VARNAME.xmkmf}} -a
. endif
.endif
diff -r b2e88dd287a2 -r ea706e1ff8f2 mk/tools/replace.mk
--- a/mk/tools/replace.mk Sun May 08 17:49:05 2005 +0000
+++ b/mk/tools/replace.mk Mon May 09 00:13:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.62 2005/05/04 04:46:48 jlam Exp $
+# $NetBSD: replace.mk,v 1.63 2005/05/09 00:13:03 jlam Exp $
#
# This Makefile fragment handles "replacements" of system-supplied
# tools with pkgsrc versions. The replacements are placed under
@@ -127,8 +127,8 @@
TOOLS_DEPENDS.bison?= bison>=1.0:../../devel/bison
TOOLS_WRAP+= bison
TOOLS_REAL_CMD.bison= ${LOCALBASE}/bin/bison
-TOOLS_ARGS.bison= -y
-${_TOOLS_VARNAME.bison}= ${TOOLS_REAL_CMD.bison} ${TOOLS_ARGS.bison}
+TOOLS_REAL_ARGS.bison= -y
+${_TOOLS_VARNAME.bison}= ${TOOLS_REAL_CMD.bison} ${TOOLS_REAL_ARGS.bison}
. endif
TOOLS_CMD.bison= ${TOOLS_DIR}/bin/yacc
.endif
@@ -412,8 +412,8 @@
TOOLS_DEPENDS.gunzip?= gzip-base>=1.2.4b:../../archivers/gzip-base
TOOLS_WRAP+= gunzip
TOOLS_REAL_CMD.gunzip= ${LOCALBASE}/bin/gunzip
-TOOLS_ARGS.gunzip= -f
-${_TOOLS_VARNAME.gunzip}= ${TOOLS_REAL_CMD.gunzip} ${TOOLS_ARGS.gunzip}
+TOOLS_REAL_ARGS.gunzip= -f
+${_TOOLS_VARNAME.gunzip}= ${TOOLS_REAL_CMD.gunzip} ${TOOLS_REAL_ARGS.gunzip}
. endif
.endif
@@ -435,8 +435,8 @@
TOOLS_DEPENDS.gzip?= gzip-base>=1.2.4b:../../archivers/gzip-base
TOOLS_WRAP+= gzip
TOOLS_REAL_CMD.gzip= ${LOCALBASE}/bin/gzip
-TOOLS_ARGS.gzip= -nf ${GZIP}
-${_TOOLS_VARNAME.gzip}= ${TOOLS_REAL_CMD.gzip} ${TOOLS_ARGS.gzip}
+TOOLS_REAL_ARGS.gzip= -nf ${GZIP}
+${_TOOLS_VARNAME.gzip}= ${TOOLS_REAL_CMD.gzip} ${TOOLS_REAL_ARGS.gzip}
. endif
.endif
@@ -547,8 +547,8 @@
TOOLS_DEPENDS.mkdir?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_WRAP+= mkdir
TOOLS_REAL_CMD.mkdir= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}mkdir
-TOOLS_ARGS.mkdir= -p
-${_TOOLS_VARNAME.mkdir}= ${TOOLS_REAL_CMD.mkdir} ${TOOLS_ARGS.mkdir}
+TOOLS_REAL_ARGS.mkdir= -p
+${_TOOLS_VARNAME.mkdir}= ${TOOLS_REAL_CMD.mkdir} ${TOOLS_REAL_ARGS.mkdir}
. endif
.endif
@@ -799,8 +799,8 @@
TOOLS_DEPENDS.xargs?= findutils>=4.1:../../sysutils/findutils
TOOLS_WRAP+= xargs
TOOLS_REAL_CMD.xargs= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}xargs
-TOOLS_ARGS.xargs= -r # don't run command if stdin is empty
-${_TOOLS_VARNAME.xargs}= ${TOOLS_REAL_CMD.xargs} ${TOOLS_ARGS.xargs}
+TOOLS_REAL_ARGS.xargs= -r # don't run command if stdin is empty
+${_TOOLS_VARNAME.xargs}= ${TOOLS_REAL_CMD.xargs} ${TOOLS_REAL_ARGS.xargs}
. endif
.endif
@@ -811,8 +811,8 @@
TOOLS_DEPENDS.yacc?= bison>=1.0:../../devel/bison
TOOLS_WRAP+= yacc
TOOLS_REAL_CMD.yacc= ${LOCALBASE}/bin/bison
-TOOLS_ARGS.yacc= -y
-${_TOOLS_VARNAME.yacc}= ${TOOLS_REAL_CMD.yacc} ${TOOLS_ARGS.yacc}
+TOOLS_REAL_ARGS.yacc= -y
+${_TOOLS_VARNAME.yacc}= ${TOOLS_REAL_CMD.yacc} ${TOOLS_REAL_ARGS.yacc}
. endif
.endif
@@ -831,10 +831,10 @@
# using the system-supplied tool. Here, we first check to see if
# TOOLS_PLATFORM.<tool> is defined. If it is, then use that as the
# path to the real command and extract any arguments into
-# TOOLS_ARGS.<tool>. We also create either a wrapper or a symlink
-# depending on whether # there are any arguments or not. Lastly,
-# always set the TOOL name for each tool to point to the real command,
-# e.g., TBL, YACC, etc., provided that "TOOL" has been associated with
+# TOOLS_REAL_ARGS.<tool>. We also create either a wrapper or a symlink
+# depending on whether there are any arguments or not. Lastly, always
+# set the TOOL name for each tool to point to the real command, e.g.,
+# TBL, YACC, etc., provided that "TOOL" has been associated with
# <tool>.
#
.for _t_ in ${_USE_TOOLS}
@@ -843,19 +843,19 @@
. if defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
TOOLS_REAL_CMD.${_t_}?= \
${TOOLS_PLATFORM.${_t_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
-TOOLS_ARGS.${_t_}?= \
+TOOLS_REAL_ARGS.${_t_}?= \
${TOOLS_PLATFORM.${_t_}:C/^/_asdf_/1:N_asdf_*}
. if defined(_TOOLS_VARNAME.${_t_})
${_TOOLS_VARNAME.${_t_}}= ${TOOLS_PLATFORM.${_t_}}
. endif
-. if empty(TOOLS_REAL_CMD.${_t_}:M/*) || !empty(TOOLS_ARGS.${_t_})
+. if empty(TOOLS_REAL_CMD.${_t_}:M/*) || !empty(TOOLS_REAL_ARGS.${_t_})
TOOLS_WRAP+= ${_t_}
. else
TOOLS_SYMLINK+= ${_t_}
. endif
. elif defined(_TOOLS_VARNAME.${_t_})
. if defined(TOOLS_REAL_CMD.${_t_})
-${_TOOLS_VARNAME.${_t_}}= ${TOOLS_REAL_CMD.${_t_}} ${TOOLS_ARGS.${_t_}}
+${_TOOLS_VARNAME.${_t_}}= ${TOOLS_REAL_CMD.${_t_}} ${TOOLS_REAL_ARGS.${_t_}}
. else
${_TOOLS_VARNAME.${_t_}}= ${_TOOLS_VARNAME.${_t_}}_not_defined_
. endif
diff -r b2e88dd287a2 -r ea706e1ff8f2 mk/tools/rpcgen.mk
--- a/mk/tools/rpcgen.mk Sun May 08 17:49:05 2005 +0000
+++ b/mk/tools/rpcgen.mk Mon May 09 00:13:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rpcgen.mk,v 1.2 2005/04/24 04:34:34 jlam Exp $
+# $NetBSD: rpcgen.mk,v 1.3 2005/05/09 00:13:03 jlam Exp $
# Create an rpcgen script that correctly sets the CPP environment
# variable to a stat(2)able path to a C preprocessor, then invokes
@@ -17,10 +17,10 @@
.endif
TOOLS_CMD.rpcgen= ${TOOLS_DIR}/bin/rpcgen
.if ${OPSYS} == "NetBSD"
-TOOLS_ARGS.rpcgen?= -b
+TOOLS_REAL_ARGS.rpcgen?= -b
.endif
TOOLS_REAL_CMDLINE.rpcgen= \
- CPP=${WRAPPER_BINDIR:Q}/cpp ${TOOLS_REAL_CMD.rpcgen} ${TOOLS_ARGS.rpcgen}
+ CPP=${WRAPPER_BINDIR:Q}/cpp ${TOOLS_REAL_CMD.rpcgen} ${TOOLS_REAL_ARGS.rpcgen}
# Make ${RPCGEN} call the "rpcgen" through the PATH, which should find
# the rpcgen tool wrapper.
Home |
Main Index |
Thread Index |
Old Index