Rename PLATFORM_TOOLS.* to TOOLS_PLATFORM.* to bring the variable names

under the same namespace as the other parts of the new tools framework.

14 files changed, 691 insertions, 691 deletions

diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index dca49a6f72a..7a3d2d55814 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -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_VARNAME.yacc=	YACC
 
 # _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 @@ ${_TOOLS_VARNAME.yacc}=		${TOOLS_REAL_CMD.yacc} ${TOOLS_ARGS.yacc}
 
 # 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 @@ ${_TOOLS_VARNAME.yacc}=		${TOOLS_REAL_CMD.yacc} ${TOOLS_ARGS.yacc}
 .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 --git a/mk/tools/tools.AIX.mk b/mk/tools/tools.AIX.mk
index a14db0258bd..24ac163ebcd 100644
--- a/mk/tools/tools.AIX.mk
+++ b/mk/tools/tools.AIX.mk
@@ -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 --git a/mk/tools/tools.BSDOS.mk b/mk/tools/tools.BSDOS.mk
index a64ca041689..facdbe80c1b 100644
--- a/mk/tools/tools.BSDOS.mk
+++ b/mk/tools/tools.BSDOS.mk
@@ -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 --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk
index cb8fc28ff3c..30c56434dde 100644
--- a/mk/tools/tools.Darwin.mk
+++ b/mk/tools/tools.Darwin.mk
@@ -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
-PLATFORM_TOOL.m4?=		/usr/bin/m4
-PLATFORM_TOOL.mkdir?=		/bin/mkdir -p
-PLATFORM_TOOL.mtree?=		/usr/sbin/mtree
-PLATFORM_TOOL.mv?=		/bin/mv
-PLATFORM_TOOL.nice?=		/usr/bin/nice
-PLATFORM_TOOL.patch?=		/usr/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/sh
-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?=		/usr/bin/egrep
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/bin/expr
+TOOLS_PLATFORM.false?=		false			# shell builtin
+TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
+TOOLS_PLATFORM.gmake?=		/usr/bin/gnumake
+TOOLS_PLATFORM.grep?=		/usr/bin/grep
+TOOLS_PLATFORM.gtar?=		/usr/bin/gnutar
+TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
+TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
+TOOLS_PLATFORM.gzip?=		/usr/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.mtree?=		/usr/sbin/mtree
+TOOLS_PLATFORM.mv?=		/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.patch?=		/usr/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/sh
+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 --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk
index b7bce7ded35..955f33316f0 100644
--- a/mk/tools/tools.DragonFly.mk
+++ b/mk/tools/tools.DragonFly.mk
@@ -1,59 +1,59 @@
-# $NetBSD: tools.DragonFly.mk,v 1.2 2005/04/27 15:59:25 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.3 2005/04/27 16:52:28 jlam Exp $
 #
 # System-supplied tools for the DragonFly 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?=		/usr/bin/false
-PLATFORM_TOOL.fgrep?=		/usr/bin/fgrep
-PLATFORM_TOOL.file?=		/usr/bin/file
-PLATFORM_TOOL.find?=		/usr/bin/find
-PLATFORM_TOOL.grep?=		/usr/bin/grep
-PLATFORM_TOOL.gtar?=		/usr/bin/tar
-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.lex?=		/usr/bin/lex
-PLATFORM_TOOL.ln?=		/bin/ln
-PLATFORM_TOOL.ls?=		/bin/ls
-PLATFORM_TOOL.m4?=		/usr/bin/m4
-PLATFORM_TOOL.mkdir?=		/bin/mkdir -p
-PLATFORM_TOOL.mtree?=		/usr/sbin/mtree
-PLATFORM_TOOL.mv?=		/bin/mv
-PLATFORM_TOOL.nice?=		/usr/bin/nice
-PLATFORM_TOOL.patch?=		/usr/bin/patch
-PLATFORM_TOOL.pax?=		/bin/pax
-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.tbl?=		/usr/bin/tbl
-PLATFORM_TOOL.tee?=		/usr/bin/tee
-PLATFORM_TOOL.test?=		/bin/test
-PLATFORM_TOOL.touch?=		/usr/bin/touch
-PLATFORM_TOOL.tr?=		/usr/bin/tr
-PLATFORM_TOOL.true?=		/usr/bin/true
-PLATFORM_TOOL.tsort?=		/usr/bin/tsort
-PLATFORM_TOOL.wc?=		/usr/bin/wc
-PLATFORM_TOOL.xargs?=		/usr/bin/xargs
-PLATFORM_TOOL.yacc?=		/usr/bin/yacc
+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?=		/usr/bin/egrep
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/bin/expr
+TOOLS_PLATFORM.false?=		/usr/bin/false
+TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
+TOOLS_PLATFORM.grep?=		/usr/bin/grep
+TOOLS_PLATFORM.gtar?=		/usr/bin/tar
+TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
+TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
+TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.head?=		/usr/bin/head
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+TOOLS_PLATFORM.id?=		/usr/bin/id
+TOOLS_PLATFORM.lex?=		/usr/bin/lex
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
+TOOLS_PLATFORM.mv?=		/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.patch?=		/usr/bin/patch
+TOOLS_PLATFORM.pax?=		/bin/pax
+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.tbl?=		/usr/bin/tbl
+TOOLS_PLATFORM.tee?=		/usr/bin/tee
+TOOLS_PLATFORM.test?=		/bin/test
+TOOLS_PLATFORM.touch?=		/usr/bin/touch
+TOOLS_PLATFORM.tr?=		/usr/bin/tr
+TOOLS_PLATFORM.true?=		/usr/bin/true
+TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
+TOOLS_PLATFORM.wc?=		/usr/bin/wc
+TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
+TOOLS_PLATFORM.yacc?=		/usr/bin/yacc
diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk
index 87f4ce783a0..3c3bebe1a91 100644
--- a/mk/tools/tools.FreeBSD.mk
+++ b/mk/tools/tools.FreeBSD.mk
@@ -1,59 +1,59 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.2 2005/04/27 15:59:25 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.3 2005/04/27 16:52:28 jlam Exp $
 #
 # System-supplied tools for the FreeBSD 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.grep?=		/usr/bin/grep
-PLATFORM_TOOL.gtar?=		/usr/bin/tar
-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.lex?=		/usr/bin/lex
-PLATFORM_TOOL.ln?=		/bin/ln
-PLATFORM_TOOL.ls?=		/bin/ls
-PLATFORM_TOOL.m4?=		/usr/bin/m4
-PLATFORM_TOOL.mkdir?=		/bin/mkdir -p
-PLATFORM_TOOL.mtree?=		/usr/sbin/mtree
-PLATFORM_TOOL.mv?=		/bin/mv
-PLATFORM_TOOL.nice?=		/usr/bin/nice
-PLATFORM_TOOL.patch?=		/usr/bin/patch
-PLATFORM_TOOL.pax?=		/bin/pax
-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.tbl?=		/usr/bin/tbl
-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
-PLATFORM_TOOL.yacc?=		/usr/bin/yacc
+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?=		/usr/bin/egrep
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/bin/expr
+TOOLS_PLATFORM.false?=		false			# shell builtin
+TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
+TOOLS_PLATFORM.grep?=		/usr/bin/grep
+TOOLS_PLATFORM.gtar?=		/usr/bin/tar
+TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
+TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
+TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.head?=		/usr/bin/head
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+TOOLS_PLATFORM.id?=		/usr/bin/id
+TOOLS_PLATFORM.lex?=		/usr/bin/lex
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
+TOOLS_PLATFORM.mv?=		/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.patch?=		/usr/bin/patch
+TOOLS_PLATFORM.pax?=		/bin/pax
+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.tbl?=		/usr/bin/tbl
+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
+TOOLS_PLATFORM.yacc?=		/usr/bin/yacc
diff --git a/mk/tools/tools.IRIX.mk b/mk/tools/tools.IRIX.mk
index 69904c028ef..3aad015bfc2 100644
--- a/mk/tools/tools.IRIX.mk
+++ b/mk/tools/tools.IRIX.mk
@@ -1,55 +1,55 @@
-# $NetBSD: tools.IRIX.mk,v 1.1 2005/04/27 15:28:16 jlam Exp $
+# $NetBSD: tools.IRIX.mk,v 1.2 2005/04/27 16:52:28 jlam Exp $
 #
 # System-supplied tools for the IRIX operating system.
 
-PLATFORM_TOOL.awk?=		/usr/bin/nawk
-PLATFORM_TOOL.basename?=	/sbin/basename
-PLATFORM_TOOL.cat?=		/sbin/cat
-PLATFORM_TOOL.chgrp?=		/sbin/chgrp
-PLATFORM_TOOL.chmod?=		/sbin/chmod
-PLATFORM_TOOL.chown?=		/sbin/chown
-PLATFORM_TOOL.cmp?=		/usr/bin/cmp
-PLATFORM_TOOL.cp?=		/sbin/cp
-PLATFORM_TOOL.cut?=		/usr/bin/cut
-PLATFORM_TOOL.date?=		/sbin/date
-PLATFORM_TOOL.dirname?=		/usr/bin/dirname
-PLATFORM_TOOL.echo?=		echo			# shell builtin
-PLATFORM_TOOL.egrep?=		/usr/bin/egrep
-PLATFORM_TOOL.env?=		/sbin/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?=		/sbin/find
-PLATFORM_TOOL.grep?=		/sbin/grep
-PLATFORM_TOOL.gunzip?=		/usr/sbin/gunzip -f
+TOOLS_PLATFORM.awk?=		/usr/bin/nawk
+TOOLS_PLATFORM.basename?=	/sbin/basename
+TOOLS_PLATFORM.cat?=		/sbin/cat
+TOOLS_PLATFORM.chgrp?=		/sbin/chgrp
+TOOLS_PLATFORM.chmod?=		/sbin/chmod
+TOOLS_PLATFORM.chown?=		/sbin/chown
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
+TOOLS_PLATFORM.cp?=		/sbin/cp
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
+TOOLS_PLATFORM.date?=		/sbin/date
+TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
+TOOLS_PLATFORM.echo?=		echo			# shell builtin
+TOOLS_PLATFORM.egrep?=		/usr/bin/egrep
+TOOLS_PLATFORM.env?=		/sbin/env
+TOOLS_PLATFORM.expr?=		/bin/expr
+TOOLS_PLATFORM.false?=		false			# shell builtin
+TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/sbin/find
+TOOLS_PLATFORM.grep?=		/sbin/grep
+TOOLS_PLATFORM.gunzip?=		/usr/sbin/gunzip -f
 .if exists(/usr/sbin/gzcat)
-PLATFORM_TOOL.gzcat?=		/usr/bin/gzcat
+TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
 .elif exists(/usr/bsd/zcat)
-PLATFORM_TOOL.gzcat?=		/usr/bsd/zcat
+TOOLS_PLATFORM.gzcat?=		/usr/bsd/zcat
 .endif
-PLATFORM_TOOL.gzip?=		/usr/sbin/gzip -nf ${GZIP}
-PLATFORM_TOOL.head?=		/usr/bsd/head
-PLATFORM_TOOL.hostname?=	/usr/bsd/hostname
-PLATFORM_TOOL.id?=		/usr/bin/id
-PLATFORM_TOOL.ln?=		/sbin/ln
-PLATFORM_TOOL.ls?=		/sbin/ls
-PLATFORM_TOOL.m4?=		/sbin/m4
-PLATFORM_TOOL.mkdir?=		/sbin/mkdir -p
-PLATFORM_TOOL.mv?=		/sbin/mv
-PLATFORM_TOOL.nice?=		/sbin/nice
-PLATFORM_TOOL.pwd?=		/sbin/pwd
-PLATFORM_TOOL.rm?=		/sbin/rm
-PLATFORM_TOOL.rmdir?=		/usr/bin/rmdir
-PLATFORM_TOOL.sed?=		/sbin/sed
-PLATFORM_TOOL.sh?=		/bin/ksh
-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?=		/sbin/wc
-PLATFORM_TOOL.xargs?=		/sbin/xargs
+TOOLS_PLATFORM.gzip?=		/usr/sbin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.head?=		/usr/bsd/head
+TOOLS_PLATFORM.hostname?=	/usr/bsd/hostname
+TOOLS_PLATFORM.id?=		/usr/bin/id
+TOOLS_PLATFORM.ln?=		/sbin/ln
+TOOLS_PLATFORM.ls?=		/sbin/ls
+TOOLS_PLATFORM.m4?=		/sbin/m4
+TOOLS_PLATFORM.mkdir?=		/sbin/mkdir -p
+TOOLS_PLATFORM.mv?=		/sbin/mv
+TOOLS_PLATFORM.nice?=		/sbin/nice
+TOOLS_PLATFORM.pwd?=		/sbin/pwd
+TOOLS_PLATFORM.rm?=		/sbin/rm
+TOOLS_PLATFORM.rmdir?=		/usr/bin/rmdir
+TOOLS_PLATFORM.sed?=		/sbin/sed
+TOOLS_PLATFORM.sh?=		/bin/ksh
+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?=		/sbin/wc
+TOOLS_PLATFORM.xargs?=		/sbin/xargs
diff --git a/mk/tools/tools.Interix.mk b/mk/tools/tools.Interix.mk
index 39acaf3faf8..289aa98285f 100644
--- a/mk/tools/tools.Interix.mk
+++ b/mk/tools/tools.Interix.mk
@@ -1,50 +1,50 @@
-# $NetBSD: tools.Interix.mk,v 1.1 2005/04/27 15:28:16 jlam Exp $
+# $NetBSD: tools.Interix.mk,v 1.2 2005/04/27 16:52:28 jlam Exp $
 #
 # System-supplied tools for the Interix operating system.
 
-PLATFORM_TOOL.awk?=		/usr/contrib/bin/awk
-PLATFORM_TOOL.basename?=	/bin/basename
-PLATFORM_TOOL.cat?=		/bin/cat
-PLATFORM_TOOL.chgrp?=		/bin/chgrp
-PLATFORM_TOOL.chmod?=		/bin/chmod
-PLATFORM_TOOL.chown?=		/bin/chown
-PLATFORM_TOOL.cmp?=		/bin/cmp
-PLATFORM_TOOL.cp?=		/bin/cp
-PLATFORM_TOOL.cut?=		/bin/cut
-PLATFORM_TOOL.date?=		/bin/date
-PLATFORM_TOOL.dirname?=		/bin/dirname
-PLATFORM_TOOL.echo?=		echo			# shell builtin
-PLATFORM_TOOL.egrep?=		/bin/egrep
-PLATFORM_TOOL.env?=		/bin/env
-PLATFORM_TOOL.expr?=		/bin/expr
-PLATFORM_TOOL.false?=		false			# shell builtin
-PLATFORM_TOOL.fgrep?=		/bin/fgrep
-PLATFORM_TOOL.file?=		/bin/file
-PLATFORM_TOOL.find?=		/bin/find
-PLATFORM_TOOL.grep?=		/bin/grep
-PLATFORM_TOOL.gunzip?=		/usr/contrib/bin/gunzip -f
-PLATFORM_TOOL.gzcat?=		/usr/contrib/bin/gunzip -c
-PLATFORM_TOOL.gzip?=		/usr/contrib/bin/gzip -nf ${GZIP}
-PLATFORM_TOOL.head?=		/bin/head
-PLATFORM_TOOL.hostname?=	/bin/hostname
-PLATFORM_TOOL.id?=		/bin/id
-PLATFORM_TOOL.ln?=		/bin/ln
-PLATFORM_TOOL.ls?=		/bin/ls
-PLATFORM_TOOL.m4?=		/bin/m4
-PLATFORM_TOOL.mkdir?=		/bin/mkdir -p
-PLATFORM_TOOL.mv?=		/bin/mv
-PLATFORM_TOOL.nice?=		/bin/nice
-PLATFORM_TOOL.pwd?=		/bin/pwd
-PLATFORM_TOOL.rm?=		/bin/rm
-PLATFORM_TOOL.rmdir?=		/bin/rmdir
-PLATFORM_TOOL.sh?=		/bin/sh
-PLATFORM_TOOL.sort?=		/bin/sort
-PLATFORM_TOOL.tail?=		/bin/tail
-PLATFORM_TOOL.tee?=		/bin/tee
-PLATFORM_TOOL.test?=		/bin/test
-PLATFORM_TOOL.touch?=		/bin/touch
-PLATFORM_TOOL.tr?=		/bin/tr
-PLATFORM_TOOL.true?=		true			# shell builtin
-PLATFORM_TOOL.tsort?=		/bin/tsort
-PLATFORM_TOOL.wc?=		/bin/wc
-PLATFORM_TOOL.xargs?=		/bin/xargs
+TOOLS_PLATFORM.awk?=		/usr/contrib/bin/awk
+TOOLS_PLATFORM.basename?=	/bin/basename
+TOOLS_PLATFORM.cat?=		/bin/cat
+TOOLS_PLATFORM.chgrp?=		/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/bin/chmod
+TOOLS_PLATFORM.chown?=		/bin/chown
+TOOLS_PLATFORM.cmp?=		/bin/cmp
+TOOLS_PLATFORM.cp?=		/bin/cp
+TOOLS_PLATFORM.cut?=		/bin/cut
+TOOLS_PLATFORM.date?=		/bin/date
+TOOLS_PLATFORM.dirname?=	/bin/dirname
+TOOLS_PLATFORM.echo?=		echo			# shell builtin
+TOOLS_PLATFORM.egrep?=		/bin/egrep
+TOOLS_PLATFORM.env?=		/bin/env
+TOOLS_PLATFORM.expr?=		/bin/expr
+TOOLS_PLATFORM.false?=		false			# shell builtin
+TOOLS_PLATFORM.fgrep?=		/bin/fgrep
+TOOLS_PLATFORM.file?=		/bin/file
+TOOLS_PLATFORM.find?=		/bin/find
+TOOLS_PLATFORM.grep?=		/bin/grep
+TOOLS_PLATFORM.gunzip?=		/usr/contrib/bin/gunzip -f
+TOOLS_PLATFORM.gzcat?=		/usr/contrib/bin/gunzip -c
+TOOLS_PLATFORM.gzip?=		/usr/contrib/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.head?=		/bin/head
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+TOOLS_PLATFORM.id?=		/bin/id
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		/bin/m4
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mv?=		/bin/mv
+TOOLS_PLATFORM.nice?=		/bin/nice
+TOOLS_PLATFORM.pwd?=		/bin/pwd
+TOOLS_PLATFORM.rm?=		/bin/rm
+TOOLS_PLATFORM.rmdir?=		/bin/rmdir
+TOOLS_PLATFORM.sh?=		/bin/sh
+TOOLS_PLATFORM.sort?=		/bin/sort
+TOOLS_PLATFORM.tail?=		/bin/tail
+TOOLS_PLATFORM.tee?=		/bin/tee
+TOOLS_PLATFORM.test?=		/bin/test
+TOOLS_PLATFORM.touch?=		/bin/touch
+TOOLS_PLATFORM.tr?=		/bin/tr
+TOOLS_PLATFORM.true?=		true			# shell builtin
+TOOLS_PLATFORM.tsort?=		/bin/tsort
+TOOLS_PLATFORM.wc?=		/bin/wc
+TOOLS_PLATFORM.xargs?=		/bin/xargs
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index 37334696928..89b8b8194ca 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,121 +1,121 @@
-# $NetBSD: tools.Linux.mk,v 1.3 2005/04/27 15:59:57 jlam Exp $
+# $NetBSD: tools.Linux.mk,v 1.4 2005/04/27 16:52:28 jlam Exp $
 #
 # System-supplied tools for the Linux operating system.
 
-PLATFORM_TOOL.awk?=		${PLATFORM_TOOL.gawk}
+TOOLS_PLATFORM.awk?=		${TOOLS_PLATFORM.gawk}
 .if exists(/bin/basename)
-PLATFORM_TOOL.basename?=	/bin/basename
+TOOLS_PLATFORM.basename?=	/bin/basename
 .elif exists(/usr/bin/basename)
-PLATFORM_TOOL.basename?=	/usr/bin/basename
+TOOLS_PLATFORM.basename?=	/usr/bin/basename
 .endif
 .if exists(/usr/bin/bison)
-PLATFORM_TOOL.bison?=		/usr/bin/bison
+TOOLS_PLATFORM.bison?=		/usr/bin/bison
 .endif
-PLATFORM_TOOL.cat?=		/bin/cat
-PLATFORM_TOOL.chgrp?=		/bin/chgrp
-PLATFORM_TOOL.chmod?=		/bin/chmod
-PLATFORM_TOOL.chown?=		/bin/chown
+TOOLS_PLATFORM.cat?=		/bin/cat
+TOOLS_PLATFORM.chgrp?=		/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/bin/chmod
+TOOLS_PLATFORM.chown?=		/bin/chown
 .if exists(/bin/cmp)
-PLATFORM_TOOL.cmp?=		/bin/cmp
+TOOLS_PLATFORM.cmp?=		/bin/cmp
 .elif exists(/usr/bin/cmp)
-PLATFORM_TOOL.cmp?=		/usr/bin/cmp
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
 .endif
-PLATFORM_TOOL.cp?=		/bin/cp
+TOOLS_PLATFORM.cp?=		/bin/cp
 .if exists(/bin/cut)
-PLATFORM_TOOL.cut?=		/bin/cut
+TOOLS_PLATFORM.cut?=		/bin/cut
 .elif exists(/usr/bin/cut)
-PLATFORM_TOOL.cut?=		/usr/bin/cut
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
 .endif
-PLATFORM_TOOL.date?=		/bin/date
-PLATFORM_TOOL.dirname?=		/usr/bin/dirname
-PLATFORM_TOOL.echo?=		echo			# shell builtin
+TOOLS_PLATFORM.date?=		/bin/date
+TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
+TOOLS_PLATFORM.echo?=		echo			# shell builtin
 .if exists(/bin/egrep)
-PLATFORM_TOOL.egrep?=		/bin/egrep
+TOOLS_PLATFORM.egrep?=		/bin/egrep
 .elif exists(/usr/bin/egrep)
-PLATFORM_TOOL.egrep?=		/usr/bin/egrep
+TOOLS_PLATFORM.egrep?=		/usr/bin/egrep
 .endif
-PLATFORM_TOOL.env?=		/usr/bin/env
-PLATFORM_TOOL.expr?=		/usr/bin/expr
-PLATFORM_TOOL.false?=		false			# shell builtin
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/usr/bin/expr
+TOOLS_PLATFORM.false?=		false			# shell builtin
 .if exists(/bin/fgrep)
-PLATFORM_TOOL.fgrep?=		/bin/fgrep
+TOOLS_PLATFORM.fgrep?=		/bin/fgrep
 .elif exists(/usr/bin/fgrep)
-PLATFORM_TOOL.fgrep?=		/usr/bin/fgrep
+TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
 .endif
-PLATFORM_TOOL.file?=		/usr/bin/file
-PLATFORM_TOOL.find?=		/usr/bin/find
-PLATFORM_TOOL.gawk?=		/usr/bin/awk
-PLATFORM_TOOL.gm4?=		/usr/bin/m4
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
+TOOLS_PLATFORM.gawk?=		/usr/bin/awk
+TOOLS_PLATFORM.gm4?=		/usr/bin/m4
 .if exists(/usr/bin/make)
-PLATFORM_TOOL.gmake?=		/usr/bin/make
+TOOLS_PLATFORM.gmake?=		/usr/bin/make
 .endif
 .if exists(/bin/grep)
-PLATFORM_TOOL.grep?=		/bin/grep
+TOOLS_PLATFORM.grep?=		/bin/grep
 .elif exists(/bin/grep)
-PLATFORM_TOOL.grep?=		/usr/bin/grep
+TOOLS_PLATFORM.grep?=		/usr/bin/grep
 .endif
 .if exists(/bin/sed)
-PLATFORM_TOOL.gsed?=		/bin/sed
+TOOLS_PLATFORM.gsed?=		/bin/sed
 .elif exists(/usr/bin/sed)
-PLATFORM_TOOL.gsed?=		/usr/bin/sed
+TOOLS_PLATFORM.gsed?=		/usr/bin/sed
 .endif
-PLATFORM_TOOL.gtar?=		/bin/tar
+TOOLS_PLATFORM.gtar?=		/bin/tar
 .if exists(/bin/gunzip)
-PLATFORM_TOOL.gunzip?=		/bin/gunzip -f
+TOOLS_PLATFORM.gunzip?=		/bin/gunzip -f
 .elif exists(/usr/bin/gunzip)
-PLATFORM_TOOL.gunzip?=		/usr/bin/gunzip -f
+TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
 .endif
-PLATFORM_TOOL.gzcat?=		/bin/zcat
+TOOLS_PLATFORM.gzcat?=		/bin/zcat
 .if exists(/bin/gzip)
-PLATFORM_TOOL.gzip?=		/usr/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
 .elif exists(/usr/bin/gzip)
-PLATFORM_TOOL.gzip?=		/usr/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
 .endif
 .if exists(/bin/head)
-PLATFORM_TOOL.head?=		/bin/head
+TOOLS_PLATFORM.head?=		/bin/head
 .elif exists(/usr/bin/head)
-PLATFORM_TOOL.head?=		/usr/bin/head
+TOOLS_PLATFORM.head?=		/usr/bin/head
 .endif
-PLATFORM_TOOL.hostname?=	/bin/hostname
+TOOLS_PLATFORM.hostname?=	/bin/hostname
 .if exists(/bin/id)
-PLATFORM_TOOL.id?=		/bin/id
+TOOLS_PLATFORM.id?=		/bin/id
 .elif exists(/usr/bin/id)
-PLATFORM_TOOL.id?=		/usr/bin/id
+TOOLS_PLATFORM.id?=		/usr/bin/id
 .endif
 .if exists(/usr/bin/lex)
-PLATFORM_TOOL.lex?=		/usr/bin/lex
+TOOLS_PLATFORM.lex?=		/usr/bin/lex
 .endif
-PLATFORM_TOOL.ln?=		/bin/ln
-PLATFORM_TOOL.ls?=		/bin/ls
-PLATFORM_TOOL.m4?=		${PLATFORM_TOOL.gm4}
-PLATFORM_TOOL.mkdir?=		/bin/mkdir -p
-PLATFORM_TOOL.mv?=		/bin/mv
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		${TOOLS_PLATFORM.gm4}
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mv?=		/bin/mv
 .if exists(/bin/nice)
-PLATFORM_TOOL.nice?=		/bin/nice
+TOOLS_PLATFORM.nice?=		/bin/nice
 .if exists(/usr/bin/nice)
-PLATFORM_TOOL.nice?=		/usr/bin/nice
-.endif
-PLATFORM_TOOL.patch?=		/usr/bin/patch
-PLATFORM_TOOL.pwd?=		/bin/pwd
-PLATFORM_TOOL.rm?=		/bin/rm
-PLATFORM_TOOL.rmdir?=		/bin/rmdir
-PLATFORM_TOOL.sed?=		${PLATFORM_TOOL.gsed}
-PLATFORM_TOOL.sh?=		/bin/sh
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+.endif
+TOOLS_PLATFORM.patch?=		/usr/bin/patch
+TOOLS_PLATFORM.pwd?=		/bin/pwd
+TOOLS_PLATFORM.rm?=		/bin/rm
+TOOLS_PLATFORM.rmdir?=		/bin/rmdir
+TOOLS_PLATFORM.sed?=		${TOOLS_PLATFORM.gsed}
+TOOLS_PLATFORM.sh?=		/bin/sh
 .if exists(/bin/sort)
-PLATFORM_TOOL.sort?=		/bin/sort
+TOOLS_PLATFORM.sort?=		/bin/sort
 .elif exists(/usr/bin/sort)
-PLATFORM_TOOL.sort?=		/usr/bin/sort
+TOOLS_PLATFORM.sort?=		/usr/bin/sort
 .endif
-PLATFORM_TOOL.tail?=		/usr/bin/tail
-PLATFORM_TOOL.tee?=		/usr/bin/tee
-PLATFORM_TOOL.test?=		test			# shell builtin
+TOOLS_PLATFORM.tail?=		/usr/bin/tail
+TOOLS_PLATFORM.tee?=		/usr/bin/tee
+TOOLS_PLATFORM.test?=		test			# shell builtin
 .if exists(/bin/touch)
-PLATFORM_TOOL.touch?=		/bin/touch
+TOOLS_PLATFORM.touch?=		/bin/touch
 .elif exists(/usr/bin/touch)
-PLATFORM_TOOL.touch?=		/usr/bin/touch
+TOOLS_PLATFORM.touch?=		/usr/bin/touch
 .endif
-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.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 --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index 4101ca67e84..070c1dd2247 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,67 +1,67 @@
-# $NetBSD: tools.NetBSD.mk,v 1.2 2005/04/27 15:59:25 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.3 2005/04/27 16:52:28 jlam Exp $
 #
 # System-supplied tools for the NetBSD 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
+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?=		/usr/bin/egrep
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/bin/expr
+TOOLS_PLATFORM.false?=		false			# shell builtin
+TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
 .if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-6]*-*)
-PLATFORM_TOOL.gawk?=		${PLATFORM_TOOL.awk}
+TOOLS_PLATFORM.gawk?=		${TOOLS_PLATFORM.awk}
 .endif
-PLATFORM_TOOL.grep?=		/usr/bin/grep
-PLATFORM_TOOL.gsed?=		${PLATFORM_TOOL.sed}	# GNUish
+TOOLS_PLATFORM.grep?=		/usr/bin/grep
+TOOLS_PLATFORM.gsed?=		${TOOLS_PLATFORM.sed}	# GNUish
 .if exists(/bin/tar)
-PLATFORM_TOOL.gtar?=		/bin/tar
+TOOLS_PLATFORM.gtar?=		/bin/tar
 .elif exists(/usr/bin/tar)
-PLATFORM_TOOL.gtar?=		/usr/bin/tar
+TOOLS_PLATFORM.gtar?=		/usr/bin/tar
 .endif
-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.lex?=		/usr/bin/lex
-PLATFORM_TOOL.ln?=		/bin/ln
-PLATFORM_TOOL.ls?=		/bin/ls
-PLATFORM_TOOL.m4?=		/usr/bin/m4
-PLATFORM_TOOL.mkdir?=		/bin/mkdir -p
-PLATFORM_TOOL.mtree?=		/usr/sbin/mtree
-PLATFORM_TOOL.mv?=		/bin/mv
-PLATFORM_TOOL.nice?=		/usr/bin/nice
-PLATFORM_TOOL.patch?=		/usr/bin/patch
-PLATFORM_TOOL.pax?=		/bin/pax
-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.tbl?=		/usr/bin/tbl
-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
-PLATFORM_TOOL.yacc?=		/usr/bin/yacc
+TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
+TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
+TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.head?=		/usr/bin/head
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+TOOLS_PLATFORM.id?=		/usr/bin/id
+TOOLS_PLATFORM.lex?=		/usr/bin/lex
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
+TOOLS_PLATFORM.mv?=		/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.patch?=		/usr/bin/patch
+TOOLS_PLATFORM.pax?=		/bin/pax
+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.tbl?=		/usr/bin/tbl
+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
+TOOLS_PLATFORM.yacc?=		/usr/bin/yacc
diff --git a/mk/tools/tools.OSF1.mk b/mk/tools/tools.OSF1.mk
index 6b288d07493..a48d13f806e 100644
--- a/mk/tools/tools.OSF1.mk
+++ b/mk/tools/tools.OSF1.mk
@@ -1,50 +1,50 @@
-# $NetBSD: tools.OSF1.mk,v 1.1 2005/04/27 15:28:16 jlam Exp $
+# $NetBSD: tools.OSF1.mk,v 1.2 2005/04/27 16:52:28 jlam Exp $
 #
 # System-supplied tools for the OSF/1 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?=		/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?=		/usr/bin/echo
-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.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
-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.sh?=		/bin/ksh
-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?=		/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?=		/usr/bin/echo
+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.gunzip?=		/usr/bin/gunzip -f
+TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
+TOOLS_PLATFORM.gzip?=		/usr/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.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.pwd?=		/bin/pwd
+TOOLS_PLATFORM.rm?=		/bin/rm
+TOOLS_PLATFORM.rmdir?=		/bin/rmdir
+TOOLS_PLATFORM.sh?=		/bin/ksh
+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 --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk
index 552019e3d24..05fac7ad4d1 100644
--- a/mk/tools/tools.OpenBSD.mk
+++ b/mk/tools/tools.OpenBSD.mk
@@ -1,61 +1,61 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.2 2005/04/27 15:59:25 jlam Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.3 2005/04/27 16:52:28 jlam Exp $
 #
 # System-supplied tools for the OpenBSD 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.grep?=		/usr/bin/grep
+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?=		/usr/bin/egrep
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/bin/expr
+TOOLS_PLATFORM.false?=		false			# shell builtin
+TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
+TOOLS_PLATFORM.grep?=		/usr/bin/grep
 .if exists(/bin/tar)
-PLATFORM_TOOL.gtar?=		/bin/tar
+TOOLS_PLATFORM.gtar?=		/bin/tar
 .elif exists(/usr/bin/tar)
-PLATFORM_TOOL.gtar?=		/usr/bin/tar
+TOOLS_PLATFORM.gtar?=		/usr/bin/tar
 .endif
-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.lex?=		/usr/bin/lex
-PLATFORM_TOOL.ln?=		/bin/ln
-PLATFORM_TOOL.ls?=		/bin/ls
-PLATFORM_TOOL.m4?=		/usr/bin/m4
-PLATFORM_TOOL.mkdir?=		/bin/mkdir -p
-PLATFORM_TOOL.mtree?=		/usr/sbin/mtree
-PLATFORM_TOOL.mv?=		/bin/mv
-PLATFORM_TOOL.nice?=		/usr/bin/nice
-PLATFORM_TOOL.patch?=		/usr/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/sh
-PLATFORM_TOOL.sort?=		/usr/bin/sort
-PLATFORM_TOOL.tail?=		/usr/bin/tail
-PLATFORM_TOOL.tbl?=		/usr/bin/tbl
-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
-PLATFORM_TOOL.yacc?=		/usr/bin/yacc
+TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
+TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
+TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.head?=		/usr/bin/head
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+TOOLS_PLATFORM.id?=		/usr/bin/id
+TOOLS_PLATFORM.lex?=		/usr/bin/lex
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
+TOOLS_PLATFORM.mv?=		/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.patch?=		/usr/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/sh
+TOOLS_PLATFORM.sort?=		/usr/bin/sort
+TOOLS_PLATFORM.tail?=		/usr/bin/tail
+TOOLS_PLATFORM.tbl?=		/usr/bin/tbl
+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
+TOOLS_PLATFORM.yacc?=		/usr/bin/yacc
diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk
index 9554c2f9942..aef791713f5 100644
--- a/mk/tools/tools.SunOS.mk
+++ b/mk/tools/tools.SunOS.mk
@@ -1,59 +1,59 @@
-# $NetBSD: tools.SunOS.mk,v 1.2 2005/04/27 15:58:18 jlam Exp $
+# $NetBSD: tools.SunOS.mk,v 1.3 2005/04/27 16:52:28 jlam Exp $
 #
 # System-supplied tools for the Solaris operating system.
 
-PLATFORM_TOOL.awk?=		/usr/bin/nawk
-PLATFORM_TOOL.basename?=	/usr/bin/basename
-PLATFORM_TOOL.cat?=		/usr/bin/cat
-PLATFORM_TOOL.chgrp?=		/usr/bin/chgrp
-PLATFORM_TOOL.chmod?=		/usr/bin/chmod
-PLATFORM_TOOL.chown?=		/usr/bin/chown
+TOOLS_PLATFORM.awk?=		/usr/bin/nawk
+TOOLS_PLATFORM.basename?=	/usr/bin/basename
+TOOLS_PLATFORM.cat?=		/usr/bin/cat
+TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/usr/bin/chmod
+TOOLS_PLATFORM.chown?=		/usr/bin/chown
 .if exists(/bin/cmp).
-PLATFORM_TOOL.cmp?=		/bin/cmp
+TOOLS_PLATFORM.cmp?=		/bin/cmp
 .elif exists(/bin/cmp)
-PLATFORM_TOOL.cmp?=		/usr/bin/cmp
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
 .endif
-PLATFORM_TOOL.cp?=		/bin/cp
-PLATFORM_TOOL.cut?=		/usr/bin/cut
-PLATFORM_TOOL.date?=		/usr/xpg4/bin/date
-PLATFORM_TOOL.dirname?=		/usr/bin/dirname
-PLATFORM_TOOL.echo?=		/usr/ucb/echo
-PLATFORM_TOOL.egrep?=		/usr/xpg4/bin/grep -E
-PLATFORM_TOOL.env?=		/usr/bin/env
-PLATFORM_TOOL.expr?=		/usr/xpg4/bin/expr
-PLATFORM_TOOL.false?=		/usr/bin/false
-PLATFORM_TOOL.fgrep?=		/usr/xpg4/bin/fgrep
-PLATFORM_TOOL.file?=		/usr/bin/file
-PLATFORM_TOOL.find?=		/usr/bin/find
-PLATFORM_TOOL.grep?=		/usr/xpg4/bin/grep
+TOOLS_PLATFORM.cp?=		/bin/cp
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
+TOOLS_PLATFORM.date?=		/usr/xpg4/bin/date
+TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
+TOOLS_PLATFORM.echo?=		/usr/ucb/echo
+TOOLS_PLATFORM.egrep?=		/usr/xpg4/bin/grep -E
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/usr/xpg4/bin/expr
+TOOLS_PLATFORM.false?=		/usr/bin/false
+TOOLS_PLATFORM.fgrep?=		/usr/xpg4/bin/fgrep
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
+TOOLS_PLATFORM.grep?=		/usr/xpg4/bin/grep
 .if exists(/usr/bin/gzip)
-PLATFORM_TOOL.gunzip?=		/usr/bin/gzip -df
-PLATFORM_TOOL.gzcat?=		/usr/bin/gzip -cd
-PLATFORM_TOOL.gzip?=		/usr/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.gunzip?=		/usr/bin/gzip -df
+TOOLS_PLATFORM.gzcat?=		/usr/bin/gzip -cd
+TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
 .endif
-PLATFORM_TOOL.head?=		/usr/bin/head
-PLATFORM_TOOL.hostname?=	/bin/hostname
-PLATFORM_TOOL.id?=		/usr/xpg4/bin/id
-PLATFORM_TOOL.ln?=		/usr/bin/ln
-PLATFORM_TOOL.ls?=		/usr/bin/ls
-PLATFORM_TOOL.m4?=		/usr/ccs/bin/m4
-PLATFORM_TOOL.mkdir?=		/usr/bin/mkdir -p
-PLATFORM_TOOL.mv?=		/usr/bin/mv
-PLATFORM_TOOL.nice?=		/usr/xpg4/bin/nice
+TOOLS_PLATFORM.head?=		/usr/bin/head
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+TOOLS_PLATFORM.id?=		/usr/xpg4/bin/id
+TOOLS_PLATFORM.ln?=		/usr/bin/ln
+TOOLS_PLATFORM.ls?=		/usr/bin/ls
+TOOLS_PLATFORM.m4?=		/usr/ccs/bin/m4
+TOOLS_PLATFORM.mkdir?=		/usr/bin/mkdir -p
+TOOLS_PLATFORM.mv?=		/usr/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/xpg4/bin/nice
 .if exists(/usr/bin/gpatch)
-PLATFORM_TOOL.patch?=		/usr/bin/gpatch
+TOOLS_PLATFORM.patch?=		/usr/bin/gpatch
 .endif
-PLATFORM_TOOL.pwd?=		/bin/pwd
-PLATFORM_TOOL.rm?=		/usr/bin/rm
-PLATFORM_TOOL.rmdir?=		/usr/bin/rmdir
-PLATFORM_TOOL.sh?=		/bin/ksh
-PLATFORM_TOOL.sort?=		/usr/bin/sort
-PLATFORM_TOOL.tail?=		/usr/xpg4/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?=		/usr/bin/true
-PLATFORM_TOOL.tsort?=		/usr/ccs/bin/tsort
-PLATFORM_TOOL.wc?=		/usr/bin/wc
-PLATFORM_TOOL.xargs?=		/usr/bin/xargs
+TOOLS_PLATFORM.pwd?=		/bin/pwd
+TOOLS_PLATFORM.rm?=		/usr/bin/rm
+TOOLS_PLATFORM.rmdir?=		/usr/bin/rmdir
+TOOLS_PLATFORM.sh?=		/bin/ksh
+TOOLS_PLATFORM.sort?=		/usr/bin/sort
+TOOLS_PLATFORM.tail?=		/usr/xpg4/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?=		/usr/bin/true
+TOOLS_PLATFORM.tsort?=		/usr/ccs/bin/tsort
+TOOLS_PLATFORM.wc?=		/usr/bin/wc
+TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
diff --git a/mk/tools/tools.UnixWare.mk b/mk/tools/tools.UnixWare.mk
index bd6220e1ead..11994046765 100644
--- a/mk/tools/tools.UnixWare.mk
+++ b/mk/tools/tools.UnixWare.mk
@@ -1,47 +1,47 @@
-# $NetBSD: tools.UnixWare.mk,v 1.1 2005/04/27 15:28:16 jlam Exp $
+# $NetBSD: tools.UnixWare.mk,v 1.2 2005/04/27 16:52:28 jlam Exp $
 #
 # System-supplied tools for the UnixWare 7 operating system.
 
-PLATFORM_TOOL.awk?=		/usr/bin/nawk
-PLATFORM_TOOL.basename?=	/usr/bin/basename
-PLATFORM_TOOL.cat?=		/usr/bin/cat
-PLATFORM_TOOL.chgrp?=		/usr/bin/chgrp
-PLATFORM_TOOL.chmod?=		/usr/bin/chmod
-PLATFORM_TOOL.chown?=		/usr/bin/chown
-PLATFORM_TOOL.cmp?=		/usr/bin/cmp
-PLATFORM_TOOL.cp?=		/usr/bin/cp
-PLATFORM_TOOL.cut?=		/usr/bin/cut
-PLATFORM_TOOL.date?=		/usr/bin/date
-PLATFORM_TOOL.dirname?=		/usr/bin/dirname
-PLATFORM_TOOL.echo?=		/usr/ucb/echo
-PLATFORM_TOOL.egrep?=		/usr/bin/grep -E
-PLATFORM_TOOL.env?=		/usr/bin/env
-PLATFORM_TOOL.expr?=		/usr/bin/expr
-PLATFORM_TOOL.false?=		/usr/bin/false
-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?=	/usr/bin/hostname
-PLATFORM_TOOL.id?=		/usr/bin/id
-PLATFORM_TOOL.ln?=		/usr/bin/ln
-PLATFORM_TOOL.ls?=		/usr/bin/ls
-PLATFORM_TOOL.m4?=		/usr/ccs/bin/m4
-PLATFORM_TOOL.mv?=		/usr/bin/mv
-PLATFORM_TOOL.nice?=		/usr/bin/nice
-PLATFORM_TOOL.pwd?=		/usr/bin/pwd
-PLATFORM_TOOL.rm?=		/usr/bin/rm
-PLATFORM_TOOL.rmdir?=		/usr/bin/rmdir
-PLATFORM_TOOL.sed?=		/usr/bin/sed
-PLATFORM_TOOL.sh?=		/usr/bin/ksh
-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?=		/usr/bin/true
-PLATFORM_TOOL.tsort?=		/usr/ccs/bin/tsort
-PLATFORM_TOOL.wc?=		/usr/bin/wc
-PLATFORM_TOOL.xargs?=		/usr/bin/xargs
+TOOLS_PLATFORM.awk?=		/usr/bin/nawk
+TOOLS_PLATFORM.basename?=	/usr/bin/basename
+TOOLS_PLATFORM.cat?=		/usr/bin/cat
+TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/usr/bin/chmod
+TOOLS_PLATFORM.chown?=		/usr/bin/chown
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
+TOOLS_PLATFORM.cp?=		/usr/bin/cp
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
+TOOLS_PLATFORM.date?=		/usr/bin/date
+TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
+TOOLS_PLATFORM.echo?=		/usr/ucb/echo
+TOOLS_PLATFORM.egrep?=		/usr/bin/grep -E
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/usr/bin/expr
+TOOLS_PLATFORM.false?=		/usr/bin/false
+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?=	/usr/bin/hostname
+TOOLS_PLATFORM.id?=		/usr/bin/id
+TOOLS_PLATFORM.ln?=		/usr/bin/ln
+TOOLS_PLATFORM.ls?=		/usr/bin/ls
+TOOLS_PLATFORM.m4?=		/usr/ccs/bin/m4
+TOOLS_PLATFORM.mv?=		/usr/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.pwd?=		/usr/bin/pwd
+TOOLS_PLATFORM.rm?=		/usr/bin/rm
+TOOLS_PLATFORM.rmdir?=		/usr/bin/rmdir
+TOOLS_PLATFORM.sed?=		/usr/bin/sed
+TOOLS_PLATFORM.sh?=		/usr/bin/ksh
+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?=		/usr/bin/true
+TOOLS_PLATFORM.tsort?=		/usr/ccs/bin/tsort
+TOOLS_PLATFORM.wc?=		/usr/bin/wc
+TOOLS_PLATFORM.xargs?=		/usr/bin/xargs