pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/tools Rename the following variables for brevity:
details: https://anonhg.NetBSD.org/pkgsrc/rev/18d740469449
branches: trunk
changeset: 496957:18d740469449
user: jlam <jlam%pkgsrc.org@localhost>
date: Sun Jul 17 21:36:24 2005 +0000
description:
Rename the following variables for brevity:
TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool>
TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool>
TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
diffstat:
mk/tools/autoconf.mk | 28 +-
mk/tools/automake.mk | 10 +-
mk/tools/bsd.tools.mk | 51 +++---
mk/tools/imake.mk | 6 +-
mk/tools/ldconfig.mk | 12 +-
mk/tools/make.mk | 4 +-
mk/tools/replace.mk | 354 +++++++++++++++++++++++++-------------------------
mk/tools/rpcgen.mk | 14 +-
mk/tools/strip.mk | 4 +-
mk/tools/texinfo.mk | 16 +-
10 files changed, 249 insertions(+), 250 deletions(-)
diffs (truncated from 1353 to 300 lines):
diff -r c0ce810bd729 -r 18d740469449 mk/tools/autoconf.mk
--- a/mk/tools/autoconf.mk Sun Jul 17 20:51:04 2005 +0000
+++ b/mk/tools/autoconf.mk Sun Jul 17 21:36:24 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: autoconf.mk,v 1.12 2005/07/15 20:14:04 jlam Exp $
+# $NetBSD: autoconf.mk,v 1.13 2005/07/17 21:36:24 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -104,25 +104,25 @@
EVAL_PREFIX+= _TOOLS_AC_PREFIX=autoconf
_TOOLS_AC_TYPE.autoconf= TOOLS_CREATE
-TOOLS_REAL_CMD.autoconf= ${_TOOLS_AC_PREFIX}/bin/autoconf
+TOOLS_PATH.autoconf= ${_TOOLS_AC_PREFIX}/bin/autoconf
_TOOLS_AC_TYPE.autoheader= TOOLS_CREATE
-TOOLS_REAL_CMD.autoheader= ${_TOOLS_AC_PREFIX}/bin/autoheader
+TOOLS_PATH.autoheader= ${_TOOLS_AC_PREFIX}/bin/autoheader
_TOOLS_AC_TYPE.autom4te= TOOLS_CREATE
-TOOLS_REAL_CMD.autom4te= ${_TOOLS_AC_PREFIX}/bin/autom4te
+TOOLS_PATH.autom4te= ${_TOOLS_AC_PREFIX}/bin/autom4te
_TOOLS_AC_TYPE.autoreconf= TOOLS_CREATE
-TOOLS_REAL_CMD.autoreconf= ${_TOOLS_AC_PREFIX}/bin/autoreconf
+TOOLS_PATH.autoreconf= ${_TOOLS_AC_PREFIX}/bin/autoreconf
_TOOLS_AC_TYPE.autoscan= TOOLS_CREATE
-TOOLS_REAL_CMD.autoscan= ${_TOOLS_AC_PREFIX}/bin/autoscan
+TOOLS_PATH.autoscan= ${_TOOLS_AC_PREFIX}/bin/autoscan
_TOOLS_AC_TYPE.autoupdate= TOOLS_CREATE
-TOOLS_REAL_CMD.autoupdate= ${_TOOLS_AC_PREFIX}/bin/autoupdate
+TOOLS_PATH.autoupdate= ${_TOOLS_AC_PREFIX}/bin/autoupdate
_TOOLS_AC_TYPE.ifnames= TOOLS_CREATE
-TOOLS_REAL_CMD.ifnames= ${_TOOLS_AC_PREFIX}/bin/ifnames
+TOOLS_PATH.ifnames= ${_TOOLS_AC_PREFIX}/bin/ifnames
. endif
.endif
@@ -145,32 +145,32 @@
_TOOLS_AC_TYPE.autoconf-2.13= TOOLS_CREATE
_TOOLS_AC_TYPE.autoconf= # empty
-TOOLS_REAL_CMD.autoconf-2.13= ${_TOOLS_AC_PREFIX}/bin/autoconf-2.13
+TOOLS_PATH.autoconf-2.13= ${_TOOLS_AC_PREFIX}/bin/autoconf-2.13
TOOLS_ALIASES.autoconf-2.13= autoconf
_TOOLS_AC_TYPE.autoheader-2.13= TOOLS_CREATE
_TOOLS_AC_TYPE.autoheader= # empty
-TOOLS_REAL_CMD.autoheader-2.13= ${_TOOLS_AC_PREFIX}/bin/autoheader-2.13
+TOOLS_PATH.autoheader-2.13= ${_TOOLS_AC_PREFIX}/bin/autoheader-2.13
TOOLS_ALIASES.autoheader-2.13= autoheader
_TOOLS_AC_TYPE.autoreconf-2.13= TOOLS_CREATE
_TOOLS_AC_TYPE.autoreconf= # empty
-TOOLS_REAL_CMD.autoreconf-2.13= ${_TOOLS_AC_PREFIX}/bin/autoreconf-2.13
+TOOLS_PATH.autoreconf-2.13= ${_TOOLS_AC_PREFIX}/bin/autoreconf-2.13
TOOLS_ALIASES.autoreconf-2.13= autoreconf
_TOOLS_AC_TYPE.autoscan-2.13= TOOLS_CREATE
_TOOLS_AC_TYPE.autoscan= # empty
-TOOLS_REAL_CMD.autoscan-2.13= ${_TOOLS_AC_PREFIX}/bin/autoscan-2.13
+TOOLS_PATH.autoscan-2.13= ${_TOOLS_AC_PREFIX}/bin/autoscan-2.13
TOOLS_ALIASES.autoscan-2.13= autoscan
_TOOLS_AC_TYPE.autoupdate-2.13= TOOLS_CREATE
_TOOLS_AC_TYPE.autoupdate= # empty
-TOOLS_REAL_CMD.autoupdate-2.13= ${_TOOLS_AC_PREFIX}/bin/autoupdate-2.13
+TOOLS_PATH.autoupdate-2.13= ${_TOOLS_AC_PREFIX}/bin/autoupdate-2.13
TOOLS_ALIASES.autoupdate-2.13= autoupdate
_TOOLS_AC_TYPE.ifnames-2.13= TOOLS_CREATE
_TOOLS_AC_TYPE.ifnames= # empty
-TOOLS_REAL_CMD.ifnames-2.13= ${_TOOLS_AC_PREFIX}/bin/ifnames-2.13
+TOOLS_PATH.ifnames-2.13= ${_TOOLS_AC_PREFIX}/bin/ifnames-2.13
TOOLS_ALIASES.ifnames-2.13= ifnames
. if defined(USE_LIBTOOL)
diff -r c0ce810bd729 -r 18d740469449 mk/tools/automake.mk
--- a/mk/tools/automake.mk Sun Jul 17 20:51:04 2005 +0000
+++ b/mk/tools/automake.mk Sun Jul 17 21:36:24 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.15 2005/07/15 20:14:04 jlam Exp $
+# $NetBSD: automake.mk,v 1.16 2005/07/17 21:36:24 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -123,10 +123,10 @@
EVAL_PREFIX+= _TOOLS_AM_PREFIX=automake
_TOOLS_AM_TYPE.aclocal= TOOLS_CREATE
-TOOLS_REAL_CMD.aclocal= ${_TOOLS_AM_PREFIX}/bin/aclocal
+TOOLS_PATH.aclocal= ${_TOOLS_AM_PREFIX}/bin/aclocal
_TOOLS_AM_TYPE.automake= TOOLS_CREATE
-TOOLS_REAL_CMD.automake= ${_TOOLS_AM_PREFIX}/bin/automake
+TOOLS_PATH.automake= ${_TOOLS_AM_PREFIX}/bin/automake
. endif
.endif
@@ -150,12 +150,12 @@
_TOOLS_AM_TYPE.aclocal-1.4= TOOLS_CREATE
_TOOLS_AM_TYPE.aclocal= # empty
-TOOLS_REAL_CMD.aclocal-1.4= ${_TOOLS_AM_PREFIX}/bin/aclocal-1.4
+TOOLS_PATH.aclocal-1.4= ${_TOOLS_AM_PREFIX}/bin/aclocal-1.4
TOOLS_ALIASES.aclocal-1.4= aclocal
_TOOLS_AM_TYPE.automake-1.4= TOOLS_CREATE
_TOOLS_AM_TYPE.automake= # empty
-TOOLS_REAL_CMD.automake-1.4= ${_TOOLS_AM_PREFIX}/bin/automake-1.4
+TOOLS_PATH.automake-1.4= ${_TOOLS_AM_PREFIX}/bin/automake-1.4
TOOLS_ALIASES.automake-1.4= automake
. endif
.endif
diff -r c0ce810bd729 -r 18d740469449 mk/tools/bsd.tools.mk
--- a/mk/tools/bsd.tools.mk Sun Jul 17 20:51:04 2005 +0000
+++ b/mk/tools/bsd.tools.mk Sun Jul 17 21:36:24 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.29 2005/06/11 05:22:03 jlam Exp $
+# $NetBSD: bsd.tools.mk,v 1.30 2005/07/17 21:36:24 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -53,24 +53,23 @@
# TOOLS_ALIASES.<tool> is a whitespace-separated list of names for
# which <tool> should also be created under ${TOOLS_DIR}.
#
-# TOOLS_REAL_CMD.<tool> is the path to the actual command that is
+# TOOLS_PATH.<tool> is the path to the actual command that is
# invoked when ${TOOLS_CMD.<tool>} is called. If <tool> should
# be a symlink, then this variable is required and should be a
# full path. If <tool> should be a wrapper, then this variable
-# is required unless TOOLS_REAL_CMDLINE.<tool> is defined (see
-# below).
+# is required unless TOOLS_CMDLINE.<tool> is defined (see below).
#
# The following variables specify further details of each <tool> and
# if set, cause a wrapper script to be created.
#
-# TOOLS_REAL_ARGS.<tool> additional arguments that are passed to the
-# real command ahead of any command-line arguments. This variable
-# is optional.
+# TOOLS_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
+# TOOLS_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_REAL_ARGS.<tool> by default.
+# TOOLS_PATH.<tool> and TOOLS_ARGS.<tool> by default.
#
# The following variables provide shortcuts for creating certain classes
# of tools:
@@ -123,18 +122,18 @@
.for _t_ in ${TOOLS_NOOP}
TOOLS_CREATE+= ${_t_}
-TOOLS_REAL_CMDLINE.${_t_}?= exit 0
+TOOLS_CMDLINE.${_t_}?= exit 0
.endfor
.for _t_ in ${TOOLS_BROKEN}
TOOLS_CREATE+= ${_t_}
-TOOLS_REAL_CMDLINE.${_t_}?= exit 1
+TOOLS_CMDLINE.${_t_}?= exit 1
.endfor
.for _t_ in ${TOOLS_GNU_MISSING}
TOOLS_CREATE+= ${_t_}
-TOOLS_REAL_CMD.${_t_}?= ${PKGSRCDIR}/mk/gnu-config/missing
-TOOLS_REAL_CMDLINE.${_t_}?= ${TOOLS_REAL_CMD.${_t_}} ${_t_:T:C/-[0-9].*$//}
+TOOLS_PATH.${_t_}?= ${PKGSRCDIR}/mk/gnu-config/missing
+TOOLS_CMDLINE.${_t_}?= ${TOOLS_PATH.${_t_}} ${_t_:T:C/-[0-9].*$//}
.endfor
######################################################################
@@ -161,14 +160,14 @@
# 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
+# by any arguments specified in TOOLS_ARGS.*, followed by any
# command-line arguments passed to the wrapper script.
#
.for _t_ in ${TOOLS_CREATE}
TOOLS_CMD.${_t_}?= ${TOOLS_DIR}/bin/${_t_}
-TOOLS_REAL_CMD.${_t_}?= ${FALSE}
-TOOLS_REAL_CMDLINE_DFLT.${_t_}= \
- ${TOOLS_REAL_CMD.${_t_}} ${TOOLS_REAL_ARGS.${_t_}} "$$@"
+TOOLS_PATH.${_t_}?= ${FALSE}
+TOOLS_CMDLINE_DFLT.${_t_}= \
+ ${TOOLS_PATH.${_t_}} ${TOOLS_ARGS.${_t_}} "$$@"
override-tools: ${TOOLS_CMD.${_t_}}
@@ -176,18 +175,18 @@
${_PKG_SILENT}${_PKG_DEBUG}${TEST} -d ${.TARGET:H:Q} || \
${MKDIR} ${.TARGET:H:Q}
${_PKG_SILENT}${_PKG_DEBUG} \
- if ${TEST} -n ${TOOLS_REAL_CMDLINE.${_t_}:Q}""; then \
+ if ${TEST} -n ${TOOLS_CMDLINE.${_t_}:Q}""; then \
create=wrapper; \
- cmdline=${TOOLS_REAL_CMDLINE.${_t_}:Q}; \
- elif ${TEST} -n ${TOOLS_REAL_CMD.${_t_}:Q}""; then \
- if ${TEST} -n ${TOOLS_REAL_ARGS.${_t_}:Q}""; then \
+ cmdline=${TOOLS_CMDLINE.${_t_}:Q}; \
+ elif ${TEST} -n ${TOOLS_PATH.${_t_}:Q}""; then \
+ if ${TEST} -n ${TOOLS_ARGS.${_t_}:Q}""; then \
create=wrapper; \
- cmdline=${TOOLS_REAL_CMDLINE_DFLT.${_t_}:Q}; \
+ cmdline=${TOOLS_CMDLINE_DFLT.${_t_}:Q}; \
else \
- case ${TOOLS_REAL_CMD.${_t_}:Q}"" in \
+ case ${TOOLS_PATH.${_t_}:Q}"" in \
/*) create=symlink ;; \
*) create=wrapper; \
- cmdline=${TOOLS_REAL_CMDLINE_DFLT.${_t_}:Q}; \
+ cmdline=${TOOLS_CMDLINE_DFLT.${_t_}:Q}; \
esac; \
fi; \
else \
@@ -204,7 +203,7 @@
${CHMOD} +x ${.TARGET:Q}; \
;; \
*) \
- ${LN} -fs ${TOOLS_REAL_CMD.${_t_}:Q} ${.TARGET:Q}; \
+ ${LN} -fs ${TOOLS_PATH.${_t_}:Q} ${.TARGET:Q}; \
;; \
esac
. for _a_ in ${TOOLS_ALIASES.${_t_}}
diff -r c0ce810bd729 -r 18d740469449 mk/tools/imake.mk
--- a/mk/tools/imake.mk Sun Jul 17 20:51:04 2005 +0000
+++ b/mk/tools/imake.mk Sun Jul 17 21:36:24 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: imake.mk,v 1.16 2005/07/15 18:27:55 jlam Exp $
+# $NetBSD: imake.mk,v 1.17 2005/07/17 21:36:24 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -73,8 +73,8 @@
USE_TOOLS+= ${IMAKE_TOOLS:Nimake}
.endif
-TOOLS_REAL_ARGS.imake?= ${IMAKEOPTS}
-TOOLS_REAL_ARGS.xmkmf?= ${XMKMF_FLAGS}
+TOOLS_ARGS.imake?= ${IMAKEOPTS}
+TOOLS_ARGS.xmkmf?= ${XMKMF_FLAGS}
TOOLS_XMKMF= ${${_TOOLS_VARNAME.xmkmf}} -a
XMKMF= ${${_TOOLS_VARNAME.xmkmf}} -a
diff -r c0ce810bd729 -r 18d740469449 mk/tools/ldconfig.mk
--- a/mk/tools/ldconfig.mk Sun Jul 17 20:51:04 2005 +0000
+++ b/mk/tools/ldconfig.mk Sun Jul 17 21:36:24 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ldconfig.mk,v 1.4 2005/06/24 20:40:53 jlam Exp $
+# $NetBSD: ldconfig.mk,v 1.5 2005/07/17 21:36:24 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -44,12 +44,12 @@
# commands that can be embedded into packages.
#
.if !defined(TOOLS_PLATFORM.ldconfig)
-TOOLS_NOOP+= ldconfig
-TOOLS_LDCONFIG?= ${TRUE}
+TOOLS_NOOP+= ldconfig
+TOOLS_LDCONFIG?= ${TRUE}
.else
-TOOLS_CREATE+= ldconfig
-TOOLS_REAL_CMD.ldconfig= ${TOOLS_PLATFORM.ldconfig}
-TOOLS_LDCONFIG?= ${TOOLS_REAL_CMD.ldconfig}
+TOOLS_CREATE+= ldconfig
+TOOLS_PATH.ldconfig= ${TOOLS_PLATFORM.ldconfig}
+TOOLS_LDCONFIG?= ${TOOLS_PATH.ldconfig}
.endif
LDCONFIG?= ${TOOLS_LDCONFIG}
diff -r c0ce810bd729 -r 18d740469449 mk/tools/make.mk
--- a/mk/tools/make.mk Sun Jul 17 20:51:04 2005 +0000
+++ b/mk/tools/make.mk Sun Jul 17 21:36:24 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: make.mk,v 1.12 2005/06/01 18:14:23 jlam Exp $
+# $NetBSD: make.mk,v 1.13 2005/07/17 21:36:24 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -56,6 +56,6 @@
.endif
TOOLS_CREATE+= make
-TOOLS_REAL_CMD.make= ${MAKE_PROGRAM}
+TOOLS_PATH.make= ${MAKE_PROGRAM}
Home |
Main Index |
Thread Index |
Old Index