pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/tools Rename PLATFORM_TOOLS.* to TOOLS_PLATFORM.* t...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9df4768009a8
branches:  trunk
changeset: 493115:9df4768009a8
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Apr 27 16:52:28 2005 +0000

description:
Rename PLATFORM_TOOLS.* to TOOLS_PLATFORM.* to bring the variable names
under the same namespace as the other parts of the new tools framework.

diffstat:

 mk/tools/replace.mk         |   18 ++--
 mk/tools/tools.AIX.mk       |   92 ++++++++++++++--------------
 mk/tools/tools.BSDOS.mk     |  102 ++++++++++++++++----------------
 mk/tools/tools.Darwin.mk    |  104 ++++++++++++++++----------------
 mk/tools/tools.DragonFly.mk |  112 +++++++++++++++++-----------------
 mk/tools/tools.FreeBSD.mk   |  112 +++++++++++++++++-----------------
 mk/tools/tools.IRIX.mk      |   98 +++++++++++++++---------------
 mk/tools/tools.Interix.mk   |   94 ++++++++++++++--------------
 mk/tools/tools.Linux.mk     |  140 ++++++++++++++++++++++----------------------
 mk/tools/tools.NetBSD.mk    |  118 ++++++++++++++++++------------------
 mk/tools/tools.OSF1.mk      |   94 ++++++++++++++--------------
 mk/tools/tools.OpenBSD.mk   |  110 +++++++++++++++++-----------------
 mk/tools/tools.SunOS.mk     |   98 +++++++++++++++---------------
 mk/tools/tools.UnixWare.mk  |   88 +++++++++++++-------------
 14 files changed, 690 insertions(+), 690 deletions(-)

diffs (truncated from 1572 to 300 lines):

diff -r 5c23d3217270 -r 9df4768009a8 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Wed Apr 27 16:41:11 2005 +0000
+++ b/mk/tools/replace.mk       Wed Apr 27 16:52:28 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.40 2005/04/27 16:41:11 jlam Exp $
+# $NetBSD: replace.mk,v 1.41 2005/04/27 16:52:28 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.  The replacements are placed under
@@ -93,11 +93,11 @@
 
 # _TOOLS_USE_PKGSRC.<tool> is "yes" or "no" depending on whether we're
 # using a pkgsrc-supplied tool to replace the system-supplied one.  We
-# use the system-supplied one if PLATFORM_TOOL.<tool> is non-empty, or
+# use the system-supplied one if TOOLS_PLATFORM.<tool> is non-empty, or
 # otherwise if this is a particular ${MACHINE_PLATFORM} listed above.
 #
 .for _t_ in ${_TOOLS_REPLACE_LIST}
-.  if defined(PLATFORM_TOOL.${_t_}) && !empty(PLATFORM_TOOL.${_t_})
+.  if defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
 _TOOLS_USE_PKGSRC.${_t_}?=     no
 .  endif
 _TOOLS_USE_PKGSRC.${_t_}?=     yes
@@ -507,10 +507,10 @@
 
 # Set TOOLS_REAL_CMD.<tool> appropriately in the case where we are
 # using the system-supplied tool.  Here, we first check to see if
-# PLATFORM_TOOL.<tool> is defined.  If it is, then use that as the path
+# 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.  If PLATFORM_TOOL.<tool> is undefined
+# there are any arguments or not.  If TOOLS_PLATFORM.<tool> is undefined
 # or empty, then we fall back to checking if TOOL is defined.  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
@@ -519,12 +519,12 @@
 .for _t_ in ${_TOOLS_REPLACE_LIST}
 .  if !defined(TOOLS_IGNORE.${_t_}) && !empty(USE_TOOLS:M${_t_}) && \
       !empty(_TOOLS_USE_PKGSRC.${_t_}:M[nN][oO])
-.    if defined(PLATFORM_TOOL.${_t_}) && !empty(PLATFORM_TOOL.${_t_})
+.    if defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
 TOOLS_REAL_CMD.${_t_}?=                \
-       ${PLATFORM_TOOL.${_t_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
+       ${TOOLS_PLATFORM.${_t_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
 TOOLS_ARGS.${_t_}?=            \
-       ${PLATFORM_TOOL.${_t_}:C/^/_asdf_/1:N_asdf_*}
-${_TOOLS_VARNAME.${_t_}}=      ${PLATFORM_TOOL.${_t_}}
+       ${TOOLS_PLATFORM.${_t_}:C/^/_asdf_/1:N_asdf_*}
+${_TOOLS_VARNAME.${_t_}}=      ${TOOLS_PLATFORM.${_t_}}
 .      if !empty(TOOLS_ARGS.${_t_})
 TOOLS_WRAP+=                   ${_t_}
 .      else
diff -r 5c23d3217270 -r 9df4768009a8 mk/tools/tools.AIX.mk
--- a/mk/tools/tools.AIX.mk     Wed Apr 27 16:41:11 2005 +0000
+++ b/mk/tools/tools.AIX.mk     Wed Apr 27 16:52:28 2005 +0000
@@ -1,49 +1,49 @@
-# $NetBSD: tools.AIX.mk,v 1.1 2005/04/27 15:28:16 jlam Exp $
+# $NetBSD: tools.AIX.mk,v 1.2 2005/04/27 16:52:28 jlam Exp $
 #
 # System-supplied tools for the AIX operating system.
 
-PLATFORM_TOOL.awk?=            /usr/bin/awk
-PLATFORM_TOOL.basename?=       /usr/bin/basename
-PLATFORM_TOOL.cat?=            /bin/cat
-PLATFORM_TOOL.chgrp?=          /usr/bin/chgrp
-PLATFORM_TOOL.chmod?=          /bin/chmod
-PLATFORM_TOOL.chown?=          /usr/bin/chown
-PLATFORM_TOOL.cmp?=            /usr/bin/cmp
-PLATFORM_TOOL.cp?=             /bin/cp
-PLATFORM_TOOL.cut?=            /usr/bin/cut
-PLATFORM_TOOL.date?=           /bin/date
-PLATFORM_TOOL.dirname?=                /usr/bin/dirname
-PLATFORM_TOOL.echo?=           echo                    # shell builtin
-PLATFORM_TOOL.egrep?=          /usr/bin/grep -E
-PLATFORM_TOOL.env?=            /usr/bin/env
-PLATFORM_TOOL.expr?=           /bin/expr
-PLATFORM_TOOL.false?=          false                   # shell builtin
-PLATFORM_TOOL.fgrep?=          /usr/bin/grep -F
-PLATFORM_TOOL.file?=           /usr/bin/file
-PLATFORM_TOOL.find?=           /usr/bin/find
-PLATFORM_TOOL.grep?=           /usr/bin/grep
-PLATFORM_TOOL.head?=           /usr/bin/head
-PLATFORM_TOOL.hostname?=       /bin/hostname
-PLATFORM_TOOL.id?=             /usr/bin/id
-PLATFORM_TOOL.ln?=             /bin/ln
-PLATFORM_TOOL.ls?=             /bin/ls
-PLATFORM_TOOL.m4?=             /usr/bin/m4
-PLATFORM_TOOL.mkdir?=          /bin/mkdir -p
-PLATFORM_TOOL.mv?=             /bin/mv
-PLATFORM_TOOL.nice?=           /usr/bin/nice
-PLATFORM_TOOL.pwd?=            /bin/pwd
-PLATFORM_TOOL.rm?=             /bin/rm
-PLATFORM_TOOL.rmdir?=          /bin/rmdir
-PLATFORM_TOOL.sed?=            /usr/bin/sed
-PLATFORM_TOOL.sh?=             /bin/sh
-PLATFORM_TOOL.shlock?=         /usr/bin/shlock
-PLATFORM_TOOL.sort?=           /usr/bin/sort
-PLATFORM_TOOL.tail?=           /usr/bin/tail
-PLATFORM_TOOL.tee?=            /usr/bin/tee
-PLATFORM_TOOL.test?=           test                    # shell builtin
-PLATFORM_TOOL.touch?=          /usr/bin/touch
-PLATFORM_TOOL.tr?=             /usr/bin/tr
-PLATFORM_TOOL.true?=           true                    # shell builtin
-PLATFORM_TOOL.tsort?=          /usr/bin/tsort
-PLATFORM_TOOL.wc?=             /usr/bin/wc
-PLATFORM_TOOL.xargs?=          /usr/bin/xargs
+TOOLS_PLATFORM.awk?=           /usr/bin/awk
+TOOLS_PLATFORM.basename?=      /usr/bin/basename
+TOOLS_PLATFORM.cat?=           /bin/cat
+TOOLS_PLATFORM.chgrp?=         /usr/bin/chgrp
+TOOLS_PLATFORM.chmod?=         /bin/chmod
+TOOLS_PLATFORM.chown?=         /usr/bin/chown
+TOOLS_PLATFORM.cmp?=           /usr/bin/cmp
+TOOLS_PLATFORM.cp?=            /bin/cp
+TOOLS_PLATFORM.cut?=           /usr/bin/cut
+TOOLS_PLATFORM.date?=          /bin/date
+TOOLS_PLATFORM.dirname?=       /usr/bin/dirname
+TOOLS_PLATFORM.echo?=          echo                    # shell builtin
+TOOLS_PLATFORM.egrep?=         /usr/bin/grep -E
+TOOLS_PLATFORM.env?=           /usr/bin/env
+TOOLS_PLATFORM.expr?=          /bin/expr
+TOOLS_PLATFORM.false?=         false                   # shell builtin
+TOOLS_PLATFORM.fgrep?=         /usr/bin/grep -F
+TOOLS_PLATFORM.file?=          /usr/bin/file
+TOOLS_PLATFORM.find?=          /usr/bin/find
+TOOLS_PLATFORM.grep?=          /usr/bin/grep
+TOOLS_PLATFORM.head?=          /usr/bin/head
+TOOLS_PLATFORM.hostname?=      /bin/hostname
+TOOLS_PLATFORM.id?=            /usr/bin/id
+TOOLS_PLATFORM.ln?=            /bin/ln
+TOOLS_PLATFORM.ls?=            /bin/ls
+TOOLS_PLATFORM.m4?=            /usr/bin/m4
+TOOLS_PLATFORM.mkdir?=         /bin/mkdir -p
+TOOLS_PLATFORM.mv?=            /bin/mv
+TOOLS_PLATFORM.nice?=          /usr/bin/nice
+TOOLS_PLATFORM.pwd?=           /bin/pwd
+TOOLS_PLATFORM.rm?=            /bin/rm
+TOOLS_PLATFORM.rmdir?=         /bin/rmdir
+TOOLS_PLATFORM.sed?=           /usr/bin/sed
+TOOLS_PLATFORM.sh?=            /bin/sh
+TOOLS_PLATFORM.shlock?=                /usr/bin/shlock
+TOOLS_PLATFORM.sort?=          /usr/bin/sort
+TOOLS_PLATFORM.tail?=          /usr/bin/tail
+TOOLS_PLATFORM.tee?=           /usr/bin/tee
+TOOLS_PLATFORM.test?=          test                    # shell builtin
+TOOLS_PLATFORM.touch?=         /usr/bin/touch
+TOOLS_PLATFORM.tr?=            /usr/bin/tr
+TOOLS_PLATFORM.true?=          true                    # shell builtin
+TOOLS_PLATFORM.tsort?=         /usr/bin/tsort
+TOOLS_PLATFORM.wc?=            /usr/bin/wc
+TOOLS_PLATFORM.xargs?=         /usr/bin/xargs
diff -r 5c23d3217270 -r 9df4768009a8 mk/tools/tools.BSDOS.mk
--- a/mk/tools/tools.BSDOS.mk   Wed Apr 27 16:41:11 2005 +0000
+++ b/mk/tools/tools.BSDOS.mk   Wed Apr 27 16:52:28 2005 +0000
@@ -1,54 +1,54 @@
-# $NetBSD: tools.BSDOS.mk,v 1.2 2005/04/27 16:00:14 jlam Exp $
+# $NetBSD: tools.BSDOS.mk,v 1.3 2005/04/27 16:52:28 jlam Exp $
 #
 # System-supplied tools for the BSD/OS operating system.
 
-PLATFORM_TOOL.awk?=            /usr/bin/awk
-PLATFORM_TOOL.basename?=       /usr/bin/basename
-PLATFORM_TOOL.cat?=            /bin/cat
-PLATFORM_TOOL.chgrp?=          /usr/bin/chgrp
-PLATFORM_TOOL.chmod?=          /bin/chmod
-PLATFORM_TOOL.chown?=          /usr/sbin/chown
-PLATFORM_TOOL.cmp?=            /usr/bin/cmp
-PLATFORM_TOOL.cp?=             /bin/cp
-PLATFORM_TOOL.cut?=            /usr/bin/cut
-PLATFORM_TOOL.date?=           /bin/date
-PLATFORM_TOOL.dirname?=                /usr/bin/dirname
-PLATFORM_TOOL.echo?=           echo                    # shell builtin
-PLATFORM_TOOL.egrep?=          /bin/egrep
-PLATFORM_TOOL.env?=            /usr/bin/env
-PLATFORM_TOOL.expr?=           /bin/expr
-PLATFORM_TOOL.false?=          false                   # shell builtin
-PLATFORM_TOOL.fgrep?=          /bin/fgrep
-PLATFORM_TOOL.file?=           /usr/bin/file
-PLATFORM_TOOL.find?=           /usr/bin/find
-PLATFORM_TOOL.grep?=           /bin/grep
-PLATFORM_TOOL.gtar?=           /bin/tar
-PLATFORM_TOOL.gunzip?=         /usr/contrib/bin/gunzip -f
-PLATFORM_TOOL.gzcat?=          /usr/contrib/bin/gzcat
-PLATFORM_TOOL.gzip?=           /usr/contrib/bin/gzip -nf ${GZIP}
-PLATFORM_TOOL.head?=           /usr/bin/head
-PLATFORM_TOOL.hostname?=       /bin/hostname
-PLATFORM_TOOL.id?=             /usr/bin/id
-PLATFORM_TOOL.ln?=             /bin/ln
-PLATFORM_TOOL.ls?=             /bin/ls
-PLATFORM_TOOL.m4?=             /usr/bin/m4
-PLATFORM_TOOL.mkdir?=          /bin/mkdir -p
-PLATFORM_TOOL.mv?=             /bin/mv
-PLATFORM_TOOL.mtree?=          /usr/sbin/mtree
-PLATFORM_TOOL.nice?=           /usr/bin/nice
-PLATFORM_TOOL.patch?=          /usr/contrib/bin/patch
-PLATFORM_TOOL.pwd?=            /bin/pwd
-PLATFORM_TOOL.rm?=             /bin/rm
-PLATFORM_TOOL.rmdir?=          /bin/rmdir
-PLATFORM_TOOL.sed?=            /usr/bin/sed
-PLATFORM_TOOL.sh?=             /bin/bash
-PLATFORM_TOOL.sort?=           /usr/bin/sort
-PLATFORM_TOOL.tail?=           /usr/bin/tail
-PLATFORM_TOOL.tee?=            /usr/bin/tee
-PLATFORM_TOOL.test?=           test                    # shell builtin
-PLATFORM_TOOL.touch?=          /usr/bin/touch
-PLATFORM_TOOL.tr?=             /usr/bin/tr
-PLATFORM_TOOL.true?=           true                    # shell builtin
-PLATFORM_TOOL.tsort?=          /usr/bin/tsort
-PLATFORM_TOOL.wc?=             /usr/bin/wc
-PLATFORM_TOOL.xargs?=          /usr/bin/xargs
+TOOLS_PLATFORM.awk?=           /usr/bin/awk
+TOOLS_PLATFORM.basename?=      /usr/bin/basename
+TOOLS_PLATFORM.cat?=           /bin/cat
+TOOLS_PLATFORM.chgrp?=         /usr/bin/chgrp
+TOOLS_PLATFORM.chmod?=         /bin/chmod
+TOOLS_PLATFORM.chown?=         /usr/sbin/chown
+TOOLS_PLATFORM.cmp?=           /usr/bin/cmp
+TOOLS_PLATFORM.cp?=            /bin/cp
+TOOLS_PLATFORM.cut?=           /usr/bin/cut
+TOOLS_PLATFORM.date?=          /bin/date
+TOOLS_PLATFORM.dirname?=       /usr/bin/dirname
+TOOLS_PLATFORM.echo?=          echo                    # shell builtin
+TOOLS_PLATFORM.egrep?=         /bin/egrep
+TOOLS_PLATFORM.env?=           /usr/bin/env
+TOOLS_PLATFORM.expr?=          /bin/expr
+TOOLS_PLATFORM.false?=         false                   # shell builtin
+TOOLS_PLATFORM.fgrep?=         /bin/fgrep
+TOOLS_PLATFORM.file?=          /usr/bin/file
+TOOLS_PLATFORM.find?=          /usr/bin/find
+TOOLS_PLATFORM.grep?=          /bin/grep
+TOOLS_PLATFORM.gtar?=          /bin/tar
+TOOLS_PLATFORM.gunzip?=                /usr/contrib/bin/gunzip -f
+TOOLS_PLATFORM.gzcat?=         /usr/contrib/bin/gzcat
+TOOLS_PLATFORM.gzip?=          /usr/contrib/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.head?=          /usr/bin/head
+TOOLS_PLATFORM.hostname?=      /bin/hostname
+TOOLS_PLATFORM.id?=            /usr/bin/id
+TOOLS_PLATFORM.ln?=            /bin/ln
+TOOLS_PLATFORM.ls?=            /bin/ls
+TOOLS_PLATFORM.m4?=            /usr/bin/m4
+TOOLS_PLATFORM.mkdir?=         /bin/mkdir -p
+TOOLS_PLATFORM.mv?=            /bin/mv
+TOOLS_PLATFORM.mtree?=         /usr/sbin/mtree
+TOOLS_PLATFORM.nice?=          /usr/bin/nice
+TOOLS_PLATFORM.patch?=         /usr/contrib/bin/patch
+TOOLS_PLATFORM.pwd?=           /bin/pwd
+TOOLS_PLATFORM.rm?=            /bin/rm
+TOOLS_PLATFORM.rmdir?=         /bin/rmdir
+TOOLS_PLATFORM.sed?=           /usr/bin/sed
+TOOLS_PLATFORM.sh?=            /bin/bash
+TOOLS_PLATFORM.sort?=          /usr/bin/sort
+TOOLS_PLATFORM.tail?=          /usr/bin/tail
+TOOLS_PLATFORM.tee?=           /usr/bin/tee
+TOOLS_PLATFORM.test?=          test                    # shell builtin
+TOOLS_PLATFORM.touch?=         /usr/bin/touch
+TOOLS_PLATFORM.tr?=            /usr/bin/tr
+TOOLS_PLATFORM.true?=          true                    # shell builtin
+TOOLS_PLATFORM.tsort?=         /usr/bin/tsort
+TOOLS_PLATFORM.wc?=            /usr/bin/wc
+TOOLS_PLATFORM.xargs?=         /usr/bin/xargs
diff -r 5c23d3217270 -r 9df4768009a8 mk/tools/tools.Darwin.mk
--- a/mk/tools/tools.Darwin.mk  Wed Apr 27 16:41:11 2005 +0000
+++ b/mk/tools/tools.Darwin.mk  Wed Apr 27 16:52:28 2005 +0000
@@ -1,55 +1,55 @@
-# $NetBSD: tools.Darwin.mk,v 1.1 2005/04/27 15:28:16 jlam Exp $
+# $NetBSD: tools.Darwin.mk,v 1.2 2005/04/27 16:52:28 jlam Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
-PLATFORM_TOOL.awk?=            /usr/bin/awk
-PLATFORM_TOOL.basename?=       /usr/bin/basename
-PLATFORM_TOOL.cat?=            /bin/cat
-PLATFORM_TOOL.chgrp?=          /usr/bin/chgrp
-PLATFORM_TOOL.chmod?=          /bin/chmod
-PLATFORM_TOOL.chown?=          /usr/sbin/chown
-PLATFORM_TOOL.cmp?=            /usr/bin/cmp
-PLATFORM_TOOL.cp?=             /bin/cp
-PLATFORM_TOOL.cut?=            /usr/bin/cut
-PLATFORM_TOOL.date?=           /bin/date
-PLATFORM_TOOL.dirname?=                /usr/bin/dirname
-PLATFORM_TOOL.echo?=           echo                    # shell builtin
-PLATFORM_TOOL.egrep?=          /usr/bin/egrep
-PLATFORM_TOOL.env?=            /usr/bin/env
-PLATFORM_TOOL.expr?=           /bin/expr
-PLATFORM_TOOL.false?=          false                   # shell builtin
-PLATFORM_TOOL.fgrep?=          /usr/bin/fgrep
-PLATFORM_TOOL.file?=           /usr/bin/file
-PLATFORM_TOOL.find?=           /usr/bin/find
-PLATFORM_TOOL.gmake?=          /usr/bin/gnumake
-PLATFORM_TOOL.grep?=           /usr/bin/grep
-PLATFORM_TOOL.gtar?=           /usr/bin/gnutar
-PLATFORM_TOOL.gunzip?=         /usr/bin/gunzip -f
-PLATFORM_TOOL.gzcat?=          /usr/bin/gzcat
-PLATFORM_TOOL.gzip?=           /usr/bin/gzip -nf ${GZIP}
-PLATFORM_TOOL.head?=           /usr/bin/head
-PLATFORM_TOOL.hostname?=       /bin/hostname
-PLATFORM_TOOL.id?=             /usr/bin/id
-PLATFORM_TOOL.ln?=             /bin/ln
-PLATFORM_TOOL.ls?=             /bin/ls



Home | Main Index | Thread Index | Old Index