Remove the old tools framework and references to _USE_NEW_TOOLS.

13 files changed, 13 insertions, 1053 deletions

diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index 5ec7e0db990..620523ee341 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.16 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: AIX.mk,v 1.17 2005/05/22 19:11:15 jlam Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -16,106 +16,6 @@ STRIP?=     ${LOCALBASE}/bin/strip
 SU?=		/usr/bin/su
 TYPE?=		type				# Shell builtin
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-AWK?=		/usr/bin/awk
-BASENAME?=	/usr/bin/basename
-CAT?=		/bin/cat
-CHMOD?=		/bin/chmod
-CHOWN?=		/usr/bin/chown
-CHGRP?=		/usr/bin/chgrp
-CMP?=		/usr/bin/cmp
-CP?=		/bin/cp
-CUT?=		/usr/bin/cut
-DATE?=		/bin/date
-DIRNAME?=	/usr/bin/dirname
-ECHO?=		echo				# Shell builtin
-.if exists(${LOCALBASE}/bin/gegrep)
-EGREP?=		${LOCALBASE}/bin/gegrep
-.else
-EGREP?=		/usr/bin/grep -E
-.endif
-EXPR?=		/bin/expr
-FALSE?=		false				# Shell builtin
-FETCH_CMD?= ${LOCALBASE}/bin/ftp
-.if exists(${LOCALBASE}/bin/gfgrep)
-FGREP?=		${LOCALBASE}/bin/gfgrep
-.else
-FGREP?=		/usr/bin/grep -F
-.endif
-FILE_CMD?=	/usr/bin/file
-FIND?=		/usr/bin/find
-GMAKE?=		${LOCALBASE}/bin/gmake
-.if exists(${LOCALBASE}/bin/ggrep)
-GREP?=		${LOCALBASE}/bin/ggrep
-.else
-GREP?=		/usr/bin/grep
-.endif
-.if exists(/bin/tar)
-GTAR?=		/bin/tar
-.else
-.if exists(${LOCALBASE}/bin/tar)
-GTAR?=		${LOCALBASE}/bin/tar
-.else
-GTAR?=		/usr/bin/tar
-.endif
-.endif
-GUNZIP_CMD?=	${LOCALBASE}/bin/gunzip -f
-GZCAT?=		${LOCALBASE}/bin/zcat
-GZIP_CMD?=	${LOCALBASE}/bin/gzip -nf ${GZIP}
-HEAD?=		/usr/bin/head
-HOSTNAME_CMD?=	/bin/hostname
-ID?=		/usr/bin/id
-#.if ${INSTALL} == "install"
-INSTALL=	${LOCALBASE}/bin/install-sh
-#.endif
-LDCONFIG?=	/sbin/ldconfig
-LN?=		/bin/ln
-LS?=		/bin/ls
-M4?=		/usr/bin/m4
-MAIL_CMD?=	/usr/bin/mailx
-MKDIR?=		/bin/mkdir -p
-MTREE?=		${LOCALBASE}/sbin/mtree
-MV?=		/bin/mv
-NICE?=		/usr/bin/nice
-PATCH?=		${LOCALBASE}/bin/gpatch
-.if exists(${LOCALBASE}/bin/pax)
-PAX?=		${LOCALBASE}/bin/pax
-.else
-PAX?=		/bin/pax
-.endif
-.if exists(${LOCALBASE}/bin/perl)
-PERL5?=		${LOCALBASE}/bin/perl
-.else
-PERL5?=		/usr/bin/perl
-.endif
-PWD_CMD?=	/bin/pwd	# needs to print physical path
-RM?=		/bin/rm
-RMDIR?=		/bin/rmdir
-.if exists(${LOCALBASE}/bin/nbsed)
-SED?=		${LOCALBASE}/bin/nbsed
-.else
-SED?=		/usr/bin/sed
-.endif
-SETENV?=	/usr/bin/env
-SH?=		/bin/sh
-SHLOCK=		/usr/bin/shlock
-SORT?=		/usr/bin/sort
-TAIL?=		/usr/bin/tail
-.if exists(${LOCALBASE}/bin/tar)
-TAR?=		${LOCALBASE}/bin/tar
-.else
-TAR?=		/usr/bin/tar
-.endif
-TEE?=		/usr/bin/tee
-TEST?=		test				# Shell builtin
-TOUCH?=		/usr/bin/touch
-TR?=		/usr/bin/tr
-TRUE?=		true				# Shell builtin
-TSORT?=		/usr/bin/tsort
-WC?=		/usr/bin/wc
-XARGS?=		/usr/bin/xargs
-.endif
-
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index 995d93e6483..70c79c8653e 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.10 2005/05/03 18:30:12 jlam Exp $
+# $NetBSD: BSDOS.mk,v 1.11 2005/05/22 19:11:15 jlam Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -17,85 +17,6 @@ SU?=		/usr/bin/su
 # sh doesn't have built-in type
 TYPE?=		which
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-AWK?=		/usr/bin/awk
-BASENAME?=	/usr/bin/basename
-CAT?=		/bin/cat
-CHMOD?=		/bin/chmod
-CHOWN?=		/usr/sbin/chown
-CHGRP?=		/usr/bin/chgrp
-CMP?=		/usr/bin/cmp
-CP?=		/bin/cp
-CUT?=		/usr/bin/cut
-DATE?=		/bin/date
-DIRNAME?=	/usr/bin/dirname
-ECHO?=		echo				# Shell builtin
-EGREP?=		/bin/egrep
-EXPR?=		/bin/expr
-FALSE?=		false				# Shell builtin
-FGREP?=		/bin/fgrep
-FILE_CMD?=	/usr/bin/file
-FIND?=		/usr/bin/find
-.if exists(${LOCALBASE}/bin/gmake)
-GMAKE?=		${LOCALBASE}/bin/gmake
-.else
-GMAKE?=		/usr/contrib/bin/gmake
-.endif
-GREP?=		/bin/grep
-.if exists(${LOCALBASE}/bin/gtar)
-GTAR?=		${LOCALBASE}/bin/gtar
-.else
-GTAR?=		/bin/tar
-.endif
-GUNZIP_CMD?=	/usr/contrib/bin/gunzip -f
-GZCAT?=		/usr/contrib/bin/gzcat
-GZIP_CMD?=	/usr/contrib/bin/gzip -nf ${GZIP}
-HEAD?=		/usr/bin/head
-HOSTNAME_CMD?=	/bin/hostname
-ID?=		/usr/bin/id
-LDCONFIG?=	/sbin/ldconfig
-LN?=		/bin/ln
-LS?=		/bin/ls
-M4?=		/usr/bin/m4
-MAIL_CMD?=	/usr/bin/mail
-MKDIR?=		/bin/mkdir -p
-.if exists(${LOCALBASE}/sbin/mtree)
-MTREE?=	${LOCALBASE}/sbin/mtree
-.else
-MTREE?=		/usr/sbin/mtree
-.endif
-MV?=		/bin/mv
-NICE?=		/usr/bin/nice
-PATCH?=		/usr/contrib/bin/patch
-# native /bin/pax doesn't support -O
-PAX?=		${LOCALBASE}/bin/pax
-PERL5?=		${LOCALBASE}/bin/perl
-PWD_CMD?=	/bin/pwd	# needs to print physical path
-RM?=		/bin/rm
-RMDIR?=		/bin/rmdir
-SED?=		/usr/bin/sed
-SETENV?=	/usr/bin/env
-# native sh and ksh both have problems under BSD/OS 4.3.1
-# /usr/contrib/bin/bash is a symlink to /bin/bash
-SH?=		/bin/bash
-SHLOCK=		${LOCALBASE}/bin/shlock
-SORT?=		/usr/bin/sort
-TAIL?=		/usr/bin/tail
-.if exists(/bin/tar)
-TAR?=		/bin/tar
-.else
-TAR?=		/usr/bin/tar
-.endif
-TEE?=		/usr/bin/tee
-TEST?=		test				# Shell builtin
-TOUCH?=		/usr/bin/touch
-TR?=		/usr/bin/tr
-TRUE?=		true				# Shell builtin
-TSORT?=		/usr/bin/tsort
-WC?=		/usr/bin/wc
-XARGS?=		/usr/bin/xargs
-.endif
-
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
 .if ${OBJECT_FMT} == "ELF"
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 4a6120ba3a8..50e0349535f 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.10 2005/05/03 18:30:12 jlam Exp $
+# $NetBSD: Darwin.mk,v 1.11 2005/05/22 19:11:15 jlam Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -16,75 +16,6 @@ SU?=		/usr/bin/su
 TYPE?=		type				# Shell builtin
 IMAKEOPTS+=	-DBuildHtmlManPages=NO
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-AWK?=		/usr/bin/awk
-BASENAME?=	/usr/bin/basename
-CAT?=		/bin/cat
-CHMOD?=		/bin/chmod
-CHOWN?=		/usr/sbin/chown
-CHGRP?=		/usr/bin/chgrp
-CMP?=		/usr/bin/cmp
-CP?=		/bin/cp
-CUT?=		/usr/bin/cut
-DATE?=		/bin/date
-DIRNAME?=	/usr/bin/dirname
-ECHO?=		echo				# Shell builtin
-EGREP?=		/usr/bin/egrep
-EXPR?=		/bin/expr
-FALSE?=		false				# Shell builtin
-FILE_CMD?=	/usr/bin/file
-FIND?=		/usr/bin/find
-FGREP?=		/usr/bin/fgrep
-GMAKE?=		/usr/bin/gnumake
-GREP?=		/usr/bin/grep
-GTAR?=		/usr/bin/gnutar	
-GUNZIP_CMD?=	/usr/bin/gunzip -f
-GZCAT?=		/usr/bin/gzcat
-GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
-HEAD?=		/usr/bin/head
-HOSTNAME_CMD?=	/bin/hostname
-ID?=		/usr/bin/id
-IMAKE?=		${X11BASE}/bin/imake ${IMAKEOPTS}
-LDCONFIG?=	/sbin/ldconfig
-LN?=		/bin/ln
-LS?=		/bin/ls
-M4?=		/usr/bin/m4 
-MAIL_CMD?=	/usr/bin/mail
-MKDIR?=		/bin/mkdir -p
-MTREE?=		/usr/sbin/mtree
-MV?=		/bin/mv
-NICE?=		/usr/bin/nice
-PATCH?=		/usr/bin/patch
-.if exists(${LOCALBASE}/bin/pax)
-PAX?=		${LOCALBASE}/bin/pax
-.else
-PAX?=		/bin/pax
-.endif
-PERL5?=		${LOCALBASE}/bin/perl
-PWD_CMD?=	/bin/pwd	# needs to print physical path
-RM?=		/bin/rm
-RMDIR?=		/bin/rmdir
-SED?=		/usr/bin/sed
-SETENV?=	/usr/bin/env
-SH?=		/bin/sh
-SHLOCK=		/usr/bin/shlock
-SORT?=		/usr/bin/sort
-TAIL?=		/usr/bin/tail
-.if exists(${LOCALBASE}/bin/tar)
-TAR?=		${LOCALBASE}/bin/tar
-.else
-TAR?=		/usr/bin/tar
-.endif
-TEE?=		/usr/bin/tee
-TEST?=		test				# Shell builtin
-TOUCH?=		/usr/bin/touch
-TR?=		/usr/bin/tr
-TRUE?=		true				# Shell builtin
-TSORT?=		/usr/bin/tsort
-WC?=		/usr/bin/wc
-XARGS?=		/usr/bin/xargs
-.endif
-
 .if !defined(PKGSRC_COMPILER) || !empty(PKGSRC_COMPILER:Mgcc)
 CPP_PRECOMP_FLAGS?=	-no-cpp-precomp	# use the GNU cpp, not the OS X cpp
 .endif
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index 37129ab93f7..c7ff25081c8 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.13 2005/05/03 18:30:12 jlam Exp $
+# $NetBSD: DragonFly.mk,v 1.14 2005/05/22 19:11:15 jlam Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -11,83 +11,6 @@ RSH?=		/usr/bin/rsh
 SU?=		/usr/bin/su
 TYPE?=		type				# Shell builtin
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-AWK?=		/usr/bin/awk
-BASENAME?=	/usr/bin/basename
-CAT?=		/bin/cat
-CHMOD?=		/bin/chmod
-CHOWN?=		/usr/sbin/chown
-CHGRP?=		/usr/bin/chgrp
-CMP?=		/usr/bin/cmp
-CP?=		/bin/cp
-CUT?=		/usr/bin/cut
-DATE?=		/bin/date
-DIRNAME?=	/usr/bin/dirname
-ECHO?=		echo				# Shell builtin
-EGREP?=		/usr/bin/egrep
-EXPR?=		/bin/expr
-FALSE?=		/usr/bin/false
-FGREP?=		/usr/bin/fgrep
-FILE_CMD?=	/usr/bin/file
-FIND?=		/usr/bin/find
-GMAKE?=		${LOCALBASE}/bin/gmake
-GREP?=		/usr/bin/grep
-.if exists(${LOCALBASE}/bin/tar)
-GTAR?=		${LOCALBASE}/bin/tar
-.else
-GTAR?=		/usr/bin/tar
-.endif
-GUNZIP_CMD?=	/usr/bin/gunzip -f
-GZCAT?=		/usr/bin/gzcat
-GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
-HEAD?=		/usr/bin/head
-HOSTNAME_CMD?=	/bin/hostname
-ID?=		/usr/bin/id
-IMAKE?=		${X11BASE}/bin/imake ${IMAKEOPTS}
-LDCONFIG?=	/sbin/ldconfig
-LN?=		/bin/ln
-LS?=		/bin/ls
-M4?=		/usr/bin/m4
-MAIL_CMD?=	/usr/bin/mail
-MKDIR?=		/bin/mkdir -p
-.if exists(${LOCALBASE}/sbin/mtree)
-MTREE?=		${LOCALBASE}/sbin/mtree
-.else
-MTREE?=		/usr/sbin/mtree
-.endif
-MV?=		/bin/mv
-NICE?=		/usr/bin/nice
-PATCH?=		/usr/bin/patch
-.if exists(${LOCALBASE}/bin/pax)
-PAX?=		${LOCALBASE}/bin/pax
-.else
-PAX?=		/bin/pax
-.endif
-PERL5?=		${LOCALBASE}/bin/perl
-PWD_CMD?=	/bin/pwd	# needs to print physical path
-RM?=		/bin/rm
-RMDIR?=		/bin/rmdir
-SED?=		/usr/bin/sed
-SETENV?=	/usr/bin/env
-SH?=		/bin/sh
-SHLOCK=		/usr/bin/shlock
-SORT?=		/usr/bin/sort
-TAIL?=		/usr/bin/tail
-.if exists(${LOCALBASE}/bin/tar)
-TAR?=		${LOCALBASE}/bin/tar
-.else
-TAR?=		/usr/bin/tar
-.endif
-TEE?=		/usr/bin/tee
-TEST?=		/bin/test
-TOUCH?=		/usr/bin/touch
-TR?=		/usr/bin/tr
-TRUE?=		/usr/bin/true
-TSORT?=		/usr/bin/tsort
-WC?=		/usr/bin/wc
-XARGS?=		/usr/bin/xargs
-.endif
-
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
 .if ${OBJECT_FMT} == "ELF"
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index 0829436ec30..ac8d0aca071 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.10 2005/05/03 18:30:12 jlam Exp $
+# $NetBSD: FreeBSD.mk,v 1.11 2005/05/22 19:11:15 jlam Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -10,84 +10,6 @@ RSH?=		/usr/bin/rsh
 SU?=		/usr/bin/su
 TYPE?=		type				# Shell builtin
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-AWK?=		/usr/bin/awk
-BASENAME?=	/usr/bin/basename
-BRANDELF?=	/usr/bin/brandelf		# used by linux compat layer
-CAT?=		/bin/cat
-CHMOD?=		/bin/chmod
-CHOWN?=		/usr/sbin/chown
-CHGRP?=		/usr/bin/chgrp
-CMP?=		/usr/bin/cmp
-CP?=		/bin/cp
-CUT?=		/usr/bin/cut
-DATE?=		/bin/date
-DIRNAME?=	/usr/bin/dirname
-ECHO?=		echo				# Shell builtin
-EGREP?=		/usr/bin/egrep
-EXPR?=		/bin/expr
-FALSE?=		false				# Shell builtin
-FGREP?=		/usr/bin/fgrep
-FILE_CMD?=	/usr/bin/file
-FIND?=		/usr/bin/find
-GMAKE?=		${LOCALBASE}/bin/gmake
-GREP?=		/usr/bin/grep
-.if exists(${LOCALBASE}/bin/tar)
-GTAR?=		${LOCALBASE}/bin/tar
-.else
-GTAR?=		/usr/bin/tar
-.endif
-GUNZIP_CMD?=	/usr/bin/gunzip -f
-GZCAT?=		/usr/bin/gzcat
-GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
-HEAD?=		/usr/bin/head
-HOSTNAME_CMD?=	/bin/hostname
-ID?=		/usr/bin/id
-IMAKE?=		${X11BASE}/bin/imake ${IMAKEOPTS}
-LDCONFIG?=	/sbin/ldconfig
-LN?=		/bin/ln
-LS?=		/bin/ls
-M4?=		/usr/bin/m4
-MAIL_CMD?=	/usr/bin/mail
-MKDIR?=		/bin/mkdir -p
-.if exists(${LOCALBASE}/sbin/mtree)
-MTREE?=		${LOCALBASE}/sbin/mtree
-.else
-MTREE?=		/usr/sbin/mtree
-.endif
-MV?=		/bin/mv
-NICE?=		/usr/bin/nice
-PATCH?=		/usr/bin/patch
-.if exists(${LOCALBASE}/bin/pax)
-PAX?=		${LOCALBASE}/bin/pax
-.else
-PAX?=		/bin/pax
-.endif
-PERL5?=		${LOCALBASE}/bin/perl
-PWD_CMD?=	/bin/pwd	# needs to print physical path
-RM?=		/bin/rm
-RMDIR?=		/bin/rmdir
-SED?=		/usr/bin/sed
-SETENV?=	/usr/bin/env
-SH?=		/bin/sh
-SHLOCK=		/usr/bin/shlock
-SORT?=		/usr/bin/sort
-TAIL?=		/usr/bin/tail
-.if exists(${LOCALBASE}/bin/tar)
-TAR?=		${LOCALBASE}/bin/tar
-.else
-TAR?=		/usr/bin/tar
-.endif
-TEE?=		/usr/bin/tee
-TEST?=		test				# Shell builtin
-TOUCH?=		/usr/bin/touch
-TR?=		/usr/bin/tr
-TRUE?=		true				# Shell builtin
-TSORT?=		/usr/bin/tsort
-WC?=		/usr/bin/wc
-XARGS?=		/usr/bin/xargs
-.endif
-
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
 .if ${OBJECT_FMT} == "ELF"
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index fe7b3b41b3b..2a0253698ec 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.13 2005/05/03 18:30:12 jlam Exp $
+# $NetBSD: IRIX.mk,v 1.14 2005/05/22 19:11:15 jlam Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -11,88 +11,6 @@ RSH?=		/usr/bsd/rsh
 SU?=		/sbin/su
 TYPE?=		/sbin/type
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-AWK?=		/usr/bin/nawk
-BASENAME?=	/sbin/basename
-CAT?=		/sbin/cat
-CHMOD?=		/sbin/chmod
-CHOWN?=		/sbin/chown
-CHGRP?=		/sbin/chgrp
-CMP?=		/usr/bin/cmp
-CP?=		/sbin/cp
-CUT?=		/usr/bin/cut
-DATE?=		/sbin/date
-DIRNAME?=	/usr/bin/dirname
-ECHO?=		echo			# Shell builtin
-EGREP?=		/usr/bin/egrep
-EXPR?=		/bin/expr
-FALSE?=		false			# Shell builtin
-FGREP?=		/usr/bin/fgrep
-FILE_CMD?=	/usr/bin/file
-FIND?=		/sbin/find
-.if exists(${LOCALBASE}/bin/gmake)
-GMAKE?=		${LOCALBASE}/bin/gmake
-.endif
-GREP?=		/sbin/grep
-.if exists(${LOCALBASE}/bin/tar)
-GTAR?=		${LOCALBASE}/bin/tar
-.else
-GTAR?=		/sbin/tar
-.endif
-GUNZIP_CMD?=	/usr/sbin/gunzip -f
-.if exists(/usr/sbin/gzcat)
-GZCAT?=		/usr/sbin/gzcat
-.else
-GZCAT?=		/usr/bsd/zcat
-.endif
-GZIP_CMD?=	/usr/sbin/gzip -nf ${GZIP}
-HEAD?=		/usr/bsd/head
-HOSTNAME_CMD?=	/usr/bsd/hostname
-ID?=		/usr/bin/id
-IMAKE?=		/usr/bin/X11/imake ${IMAKEOPTS}
-LDCONFIG?=	/usr/bin/true
-LN?=		/sbin/ln
-LS?=		/sbin/ls
-M4?=		/sbin/m4
-MAIL_CMD?=	/usr/sbin/mailx
-MKDIR?=		/sbin/mkdir -p
-MTREE?=		${LOCALBASE}/sbin/mtree
-MV?=		/sbin/mv
-NICE?=		/sbin/nice
-.if exists(${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}patch)
-PATCH?=		${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}patch
-_OPSYS_GPATCH_REQD=	YES
-.else
-PATCHV!=	/usr/sbin/patch -v 2>&1 | ${CUT} -d" " -f3
-.  if ${PATCHV} == "2.1"
-_OPSYS_GPATCH_REQD=	YES
-PATCH=		${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}patch
-.  else
-PATCH?=		/usr/sbin/patch -b
-.  endif # PATCHV
-.endif
-PAX?=		${LOCALBASE}/bin/pax
-PERL5?=		${LOCALBASE}/bin/perl
-PWD_CMD?=	/sbin/pwd		# needs to print physical path
-RM?=		/sbin/rm
-RMDIR?=		/usr/bin/rmdir
-SED?=		/sbin/sed
-SETENV?=	/sbin/env
-SH?=		/bin/ksh
-SHLOCK=		${LOCALBASE}/bin/shlock
-SORT?=		/usr/bin/sort
-TAIL?=		/usr/bin/tail
-TAR?=		${LOCALBASE}/bin/tar
-TEE?=		/usr/bin/tee
-TEST?=		test			# Shell builtin
-TOUCH?=		/usr/bin/touch
-TR?=		/usr/bin/tr
-TRUE?=		true			# Shell builtin
-TSORT?=		/usr/bin/tsort
-WC?=		/sbin/wc
-XARGS?=		/sbin/xargs
-.endif
-
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		022
 DEFAULT_SERIAL_DEVICE?=	/dev/null
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index 27d37625831..ae820a1ea49 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.33 2005/05/03 18:30:12 jlam Exp $
+# $NetBSD: Interix.mk,v 1.34 2005/05/22 19:11:15 jlam Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -48,76 +48,6 @@ RSH?=		/usr/bin/rsh
 SU?=		/bin/su
 TYPE?=		type				# Shell builtin
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-
-# Use some pkgsrc versions as "better" replacements, if installed
-.if exists(${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk)
-AWK?=		${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk
-.endif
-.if exists(${LOCALBASE}/bin/gtar)
-GTAR?=		${LOCALBASE}/bin/gtar
-.endif
-
-AWK?=		/usr/contrib/bin/gawk
-BASENAME?=	/bin/basename
-CAT?=		/bin/cat
-CHMOD?=		/bin/chmod
-CHOWN?=		/bin/chown
-CHGRP?=		/bin/chgrp
-CMP?=		/bin/cmp
-CP?=		/bin/cp
-CUT?=		/bin/cut
-DATE?=		/bin/date
-DIRNAME?=	/bin/dirname
-ECHO?=		echo				# Shell builtin
-EGREP?=		/bin/egrep
-EXPR?=		/bin/expr
-FALSE?=		false				# Shell builtin
-FGREP?=		/bin/fgrep
-FILE_CMD?=	/bin/file
-FIND?=		/bin/find
-GMAKE?=		${LOCALBASE}/bin/gmake
-GREP?=		/bin/grep
-GTAR?=		${LOCALBASE}/bin/tar
-GUNZIP_CMD?=	/usr/contrib/bin/gunzip -f
-GZCAT?=		/usr/contrib/bin/gunzip -c
-GZIP_CMD?=	/usr/contrib/bin/gzip -nf ${GZIP}
-HEAD?=		/bin/head
-HOSTNAME_CMD?=	/bin/hostname
-ID?=		/bin/id
-IMAKE?=		${X11BASE}/bin/imake ${IMAKEOPTS}
-LDCONFIG?=	/bin/true
-LN?=		/bin/ln
-LS?=		/bin/ls
-M4?=		/bin/m4
-MAIL_CMD?=	/bin/mail
-MKDIR?=		/bin/mkdir -p
-MTREE?=		${LOCALBASE}/sbin/mtree
-MV?=		/bin/mv
-NICE?=		/bin/nice
-PATCH?=		${LOCALBASE}/bin/gpatch
-PAX?=		${LOCALBASE}/bin/pax
-PERL5?=		${LOCALBASE}/bin/perl
-PWD_CMD?=	/bin/pwd	# needs to print physical path
-RM?=		/bin/rm
-RMDIR?=		/bin/rmdir
-SED?=		${LOCALBASE}/bin/nbsed
-SETENV?=	/bin/env
-SH?=		/bin/sh
-SHLOCK=		${LOCALBASE}/bin/shlock
-SORT?=		/bin/sort
-TAIL?=		/bin/tail
-TAR?=		${LOCALBASE}/bin/tar
-TEE?=		/bin/tee
-TEST?=		/bin/test	# shell builtin has bugs with symlinks
-TOUCH?=		/bin/touch
-TR?=		/bin/tr
-TRUE?=		true				# Shell builtin
-TSORT?=		/bin/tsort
-WC?=		/bin/wc
-XARGS?=		/bin/xargs
-.endif
-
 USERADD?=		${LOCALBASE}/sbin/useradd
 GROUPADD?=		${LOCALBASE}/sbin/groupadd
 _PKG_USER_HOME?=	# empty by default
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index 92c064b61ba..5f721b24b72 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.13 2005/05/03 18:30:12 jlam Exp $
+# $NetBSD: Linux.mk,v 1.14 2005/05/22 19:11:15 jlam Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -12,128 +12,6 @@ RSH?=		/usr/bin/rsh
 SU?=		/bin/su
 TYPE?=		type			# Shell builtin
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-AWK?=		/usr/bin/awk
-.if exists(/bin/basename)
-BASENAME?=	/bin/basename
-.elif exists(/usr/bin/basename)
-BASENAME?=	/usr/bin/basename
-.endif
-CAT?=		/bin/cat
-CHMOD?=		/bin/chmod
-CHOWN?=		/bin/chown
-CHGRP?=		/bin/chgrp
-CMP?=		cmp
-CP?=		/bin/cp
-.if exists(/bin/cut)
-CUT?=		/bin/cut
-.else
-CUT?=		/usr/bin/cut
-.endif
-DATE?=		/bin/date
-DIRNAME?=	/usr/bin/dirname
-ECHO?=		echo				# Shell builtin
-.if exists(/bin/egrep)
-EGREP?=		/bin/egrep
-.elif exists(/usr/bin/egrep)
-EGREP?=		/usr/bin/egrep
-.endif
-EXPR?=		/usr/bin/expr
-FALSE?=		false				# Shell builtin
-.if exists(/bin/fgrep)
-FGREP?=		/bin/fgrep
-.elif exists(/usr/bin/fgrep)
-FGREP?=		/usr/bin/fgrep
-.endif
-FILE_CMD?=	/usr/bin/file
-FIND?=		/usr/bin/find
-.if exists(/usr/bin/make)
-GMAKE?=		/usr/bin/make
-_TOOLS_OPSYS_HAS_GNU.make+=	${MACHINE_PLATFORM}
-.else
-GMAKE?=		${LOCALBASE}/bin/gmake
-.endif
-.if exists(/bin/grep)
-GREP?=		/bin/grep
-.elif exists(/usr/bin/grep)
-GREP?=		/usr/bin/grep
-.endif
-GTAR?=		/bin/tar
-.if exists(/usr/bin/gunzip)
-GUNZIP_CMD?=	/usr/bin/gunzip -f
-.else
-GUNZIP_CMD?=	/bin/gunzip -f
-.endif
-.if exists(/usr/bin/gzip)
-GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
-.else
-GZIP_CMD?=	/bin/gzip -nf ${GZIP}
-.endif
-GZCAT?=		/bin/zcat
-.if exists(/bin/head)
-HEAD?=		/bin/head
-.else
-HEAD?=		/usr/bin/head
-.endif
-HOSTNAME_CMD?=	/bin/hostname
-.if exists(/bin/id)
-ID?=		/bin/id
-.else
-ID?=		/usr/bin/id
-.endif
-IMAKE?=		${X11BASE}/bin/imake ${IMAKEOPTS}
-LDCONFIG?=	/sbin/ldconfig
-LN?=		/bin/ln
-LS?=		/bin/ls
-M4?=		/usr/bin/m4
-.if exists(/bin/mail)
-MAIL_CMD?=	/bin/mail # RH, Mandrake
-.else
-MAIL_CMD?=	/usr/bin/mail # Debian, Slackware, SuSE
-.endif
-MKDIR?=		/bin/mkdir -p
-MTREE?=		${LOCALBASE}/sbin/mtree
-MV?=		/bin/mv
-.if exists(/bin/nice)
-NICE?=		/bin/nice
-.else
-NICE?=		/usr/bin/nice
-.endif
-PATCH?=		/usr/bin/patch
-PAX?=		${LOCALBASE}/bin/pax
-PERL5?=		${LOCALBASE}/bin/perl
-PWD_CMD?=	/bin/pwd	# needs to print physical path
-RM?=		/bin/rm
-RMDIR?=		/bin/rmdir
-.if exists(/bin/sed)
-SED?=		/bin/sed
-.elif exists(/usr/bin/sed)
-SED?=		/usr/bin/sed
-.endif
-SETENV?=	/usr/bin/env
-SH?=		/bin/sh
-SHLOCK=		${LOCALBASE}/bin/shlock
-.if exists(/bin/sort)
-SORT?=		/bin/sort
-.else
-SORT?=		/usr/bin/sort
-.endif
-TAIL?=		/usr/bin/tail
-TAR?=		${LOCALBASE}/bin/tar
-TEE?=		/usr/bin/tee
-TEST?=		test			# Shell builtin
-.if exists(/bin/touch)
-TOUCH?=		/bin/touch
-.else
-TOUCH?=		/usr/bin/touch
-.endif
-TR?=		/usr/bin/tr
-TRUE?=		true			# Shell builtin
-TSORT?=		/usr/bin/tsort
-WC?=		/usr/bin/wc
-XARGS?=		/usr/bin/xargs -r
-.endif
-
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		022
 DEFAULT_SERIAL_DEVICE?=	/dev/null
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index 9dac42b8138..9fb7da07913 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.12 2005/05/03 18:30:12 jlam Exp $
+# $NetBSD: NetBSD.mk,v 1.13 2005/05/22 19:11:15 jlam Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -13,78 +13,6 @@ RSH?=		/usr/bin/rsh
 SU?=		/usr/bin/su
 TYPE?=		type				# Shell builtin
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-AWK?=		/usr/bin/awk
-BASENAME?=	/usr/bin/basename
-CAT?=		/bin/cat
-CHMOD?=		/bin/chmod
-CHOWN?=		/usr/sbin/chown
-CHGRP?=		/usr/bin/chgrp
-CMP?=		/usr/bin/cmp
-CP?=		/bin/cp
-CUT?=		/usr/bin/cut
-DATE?=		/bin/date
-DIRNAME?=	/usr/bin/dirname
-ECHO?=		echo				# Shell builtin
-EGREP?=		/usr/bin/egrep
-EXPR?=		/bin/expr
-FALSE?=		false				# Shell builtin
-FGREP?=		/usr/bin/fgrep
-FILE_CMD?=	/usr/bin/file
-FIND?=		/usr/bin/find
-GMAKE?=		${LOCALBASE}/bin/gmake
-GREP?=		/usr/bin/grep
-.if exists(/bin/tar)
-GTAR?=		/bin/tar
-.else
-GTAR?=		/usr/bin/tar
-.endif
-GUNZIP_CMD?=	/usr/bin/gunzip -f
-GZCAT?=		/usr/bin/gzcat
-GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
-HEAD?=		/usr/bin/head
-HOSTNAME_CMD?=	/bin/hostname
-ID?=		/usr/bin/id
-.if exists(/sbin/ldconfig)
-LDCONFIG?=	/sbin/ldconfig
-.else
-LDCONFIG?=	true
-.endif
-LN?=		/bin/ln
-LS?=		/bin/ls
-M4?=		/usr/bin/m4
-MAIL_CMD?=	/usr/bin/mail
-MKDIR?=		/bin/mkdir -p
-MTREE?=		/usr/sbin/mtree
-MV?=		/bin/mv
-NICE?=		/usr/bin/nice
-PATCH?=		/usr/bin/patch
-PAX?=		/bin/pax
-PERL5?=		${LOCALBASE}/bin/perl
-PWD_CMD?=	/bin/pwd	# needs to print physical path
-RM?=		/bin/rm
-RMDIR?=		/bin/rmdir
-SED?=		/usr/bin/sed
-SETENV?=	/usr/bin/env
-SH?=		/bin/sh
-SHLOCK=		/usr/bin/shlock
-SORT?=		/usr/bin/sort
-TAIL?=		/usr/bin/tail
-.if exists(/bin/tar)
-TAR?=		/bin/tar
-.else
-TAR?=		/usr/bin/tar
-.endif
-TEE?=		/usr/bin/tee
-TEST?=		test				# Shell builtin
-TOUCH?=		/usr/bin/touch
-TR?=		/usr/bin/tr
-TRUE?=		true				# Shell builtin
-TSORT?=		/usr/bin/tsort
-WC?=		/usr/bin/wc
-XARGS?=		/usr/bin/xargs
-.endif
-
 .if exists(/usr/sbin/user)
 USERADD?=	/usr/sbin/useradd
 GROUPADD?=	/usr/sbin/groupadd
diff --git a/mk/platform/OSF1.mk b/mk/platform/OSF1.mk
index 36bfc2ecb8b..80b9b69b1ea 100644
--- a/mk/platform/OSF1.mk
+++ b/mk/platform/OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.mk,v 1.6 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: OSF1.mk,v 1.7 2005/05/22 19:11:15 jlam Exp $
 #
 # Variable definitions for the OSF1 operating system.
 
@@ -18,75 +18,6 @@ STRIP?=		/usr/bin/strip
 SU?=		/usr/bin/su
 TYPE?=		type				# Shell builtin
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-AWK?=		/usr/bin/awk
-BASENAME?=	/usr/bin/basename
-CAT?=		/bin/cat
-CHMOD?=		/bin/chmod
-CHOWN?=		/bin/chown
-CHGRP?=		/usr/bin/chgrp
-CMP?=		/usr/bin/cmp
-CP?=		/bin/cp
-CUT?=		/usr/bin/cut
-DATE?=		/bin/date
-DIRNAME?=	/usr/bin/dirname
-ECHO?=		/usr/bin/echo				
-EGREP?=		/usr/bin/grep -E
-EXPR?=		/bin/expr
-FALSE?=		false				# Shell builtin
-FGREP?=		/usr/bin/grep -F
-FILE_CMD?=	/usr/bin/file
-FIND?=		/usr/bin/find
-GMAKE?=		${LOCALBASE}/bin/gmake
-GREP?=		/usr/bin/grep
-.if exists(${LOCALBASE}/bin/gtar)
-GTAR?=		${LOCALBASE}/bin/gtar
-.else
-GTAR?=/usr/bin/tar
-.endif
-GUNZIP_CMD?=	/usr/bin/gunzip -f
-GZCAT?=		/usr/bin/gzcat
-GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
-HEAD?=		/usr/bin/head
-HOSTNAME_CMD?=	/bin/hostname
-ID?=		/usr/bin/id
-INSTALL=	${LOCALBASE}/bin/install-sh
-LDCONFIG?=	${TRUE}
-LN?=		/bin/ln
-LS?=		/bin/ls
-M4?=		/usr/bin/m4
-MAIL_CMD?=	/usr/bin/mailx
-MKDIR?=		/bin/mkdir -p
-MTREE?=		${LOCALBASE}/sbin/mtree
-MV?=		/bin/mv
-NICE?=		/usr/bin/nice
-PATCH?=		${LOCALBASE}/bin/gpatch
-PAX?=		${LOCALBASE}/bin/pax
-.if exists(${LOCALBASE}/bin/perl)
-PERL5?=		${LOCALBASE}/bin/perl
-.else
-PERL5?=		/usr/bin/perl
-.endif
-PWD_CMD?=	/bin/pwd	# needs to print physical path
-RM?=		/bin/rm
-RMDIR?=		/bin/rmdir
-SED?=		${LOCALBASE}/bin/nbsed
-SETENV?=	/usr/bin/env
-SH?=		/bin/ksh			# recommendend on Tru64
-#SHLOCK=	${LOCALBASE}/bin/shlock		# need to make this work
-SORT?=		/usr/bin/sort
-TAIL?=		/usr/bin/tail
-TAR?=		/usr/bin/tar
-TEE?=		/usr/bin/tee
-TEST?=		test				# Shell builtin
-TOUCH?=		/usr/bin/touch
-TR?=		/usr/bin/tr
-TRUE?=		true				# Shell builtin
-TSORT?=		/usr/bin/tsort
-WC?=		/usr/bin/wc
-XARGS?=		/usr/bin/xargs
-.endif
-
 USERADD?=	/usr/sbin/useradd
 GROUPADD?=	/usr/sbin/groupadd
 
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index 682e4cedde6..35b751b1628 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.14 2005/05/03 18:30:12 jlam Exp $
+# $NetBSD: OpenBSD.mk,v 1.15 2005/05/22 19:11:15 jlam Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -11,74 +11,6 @@ RSH?=		/usr/bin/rsh
 SU?=		/usr/bin/su
 TYPE?=		type				# Shell builtin
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-AWK?=		/usr/bin/awk
-BASENAME?=	/usr/bin/basename
-CAT?=		/bin/cat
-CHMOD?=		/bin/chmod
-CHOWN?=		/usr/sbin/chown
-CHGRP?=		/bin/chgrp
-CMP?=		/usr/bin/cmp
-CP?=		/bin/cp
-CUT?=		/usr/bin/cut
-DATE?=		/bin/date
-DIRNAME?=	/usr/bin/dirname
-ECHO?=		echo				# Shell builtin
-EGREP?=		/usr/bin/egrep
-EXPR?=		/bin/expr
-FGREP?=		/usr/bin/fgrep
-FALSE?=		false				# Shell builtin
-FILE_CMD?=	/usr/bin/file
-FIND?=		/usr/bin/find
-GMAKE?=		${LOCALBASE}/bin/gmake
-GREP?=		/usr/bin/grep
-.if exists(/bin/tar)
-GTAR?=		/bin/tar
-.else
-GTAR?=		/usr/bin/tar
-.endif
-GUNZIP_CMD?=	/usr/bin/gunzip -f
-GZCAT?=		/usr/bin/gzcat
-GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
-HEAD?=		/usr/bin/head
-HOSTNAME_CMD?=	/bin/hostname
-ID?=		/usr/bin/id
-LDCONFIG?=	/sbin/ldconfig
-LN?=		/bin/ln
-LS?=		/bin/ls
-M4?=		/usr/bin/m4
-MAIL_CMD?=	/usr/bin/mail
-MKDIR?=		/bin/mkdir -p
-MTREE?=		/usr/sbin/mtree
-MV?=		/bin/mv
-NICE?=		/usr/bin/nice
-PATCH?=		/usr/bin/patch
-PAX?=		${LOCALBASE}/bin/pax
-PERL5?=		${LOCALBASE}/bin/perl
-PWD_CMD?=	/bin/pwd	# needs to print physical path
-RM?=		/bin/rm
-RMDIR?=		/bin/rmdir
-SED?=		/usr/bin/sed
-SETENV?=	/usr/bin/env
-SH?=		/bin/sh
-SHLOCK=		${LOCALBASE}/bin/shlock
-SORT?=		/usr/bin/sort
-TAIL?=		/usr/bin/tail
-.if exists(/bin/tar)
-TAR?=		/bin/tar
-.else
-TAR?=		/usr/bin/tar
-.endif
-TEE?=		/usr/bin/tee
-TEST?=		test				# Shell builtin
-TOUCH?=		/usr/bin/touch
-TR?=		/usr/bin/tr
-TRUE?=		true				# Shell builtin
-TSORT?=		/usr/bin/tsort
-WC?=		/usr/bin/wc
-XARGS?=		/usr/bin/xargs
-.endif
-
 .if exists(/usr/sbin/user)
 USERADD?=	/usr/sbin/useradd
 GROUPADD?=	/usr/sbin/groupadd
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index ed78770d24f..d04a0474248 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.13 2005/05/03 19:35:24 jlam Exp $
+# $NetBSD: SunOS.mk,v 1.14 2005/05/22 19:11:15 jlam Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -11,85 +11,6 @@ RSH?=		/usr/bin/rsh
 SU?=		/usr/bin/su
 TYPE?=		/usr/bin/type
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-AWK?=		/usr/bin/nawk
-BASENAME?=	/usr/bin/basename
-CAT?=		/usr/bin/cat
-CHMOD?=		/usr/bin/chmod
-CHOWN?=		/usr/bin/chown
-CHGRP?=		/usr/bin/chgrp
-CMP?=		cmp
-CP?=		/usr/bin/cp
-CUT?=		/usr/bin/cut
-DATE?=		/usr/xpg4/bin/date
-DIRNAME?=	/usr/bin/dirname
-ECHO?=		/usr/ucb/echo
-EGREP?=		/usr/xpg4/bin/grep -E
-EXPR?=		/usr/xpg4/bin/expr
-FALSE?=		/usr/bin/false
-FGREP?=		/usr/xpg4/bin/fgrep
-FILE_CMD?=	/usr/bin/file
-FIND?=		/usr/bin/find
-GMAKE?=		${LOCALBASE}/bin/gmake
-GREP?=		/usr/xpg4/bin/grep
-.if exists(${LOCALBASE}/bin/gtar)
-GTAR?=		${LOCALBASE}/bin/gtar
-.else
-GTAR?=		${LOCALBASE}/bin/tar
-.endif
-.if exists(${LOCALBASE}/bin/gzip)
-GUNZIP_CMD?=	${LOCALBASE}/bin/gunzip -f
-GZCAT?=		${LOCALBASE}/bin/zcat
-GZIP_CMD?=	${LOCALBASE}/bin/gzip -nf ${GZIP}
-.elif exists(/usr/bin/gzip)
-GUNZIP_CMD?=	/usr/bin/gzip -df
-GZCAT?=		/usr/bin/gzip -cd
-GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
-.endif
-HEAD?=		/usr/bin/head
-HOSTNAME_CMD?=	/bin/hostname
-ID?=		/usr/xpg4/bin/id
-IMAKE?=		${X11BASE}/bin/imake ${IMAKEOPTS}
-LDCONFIG?=	/usr/bin/true
-LN?=		/usr/bin/ln
-LS?=		/usr/bin/ls
-M4?=		/usr/ccs/bin/m4
-MAIL_CMD?=	/usr/bin/mailx
-MKDIR?=		/usr/bin/mkdir -p
-MTREE?=		${LOCALBASE}/sbin/mtree
-MV?=		/usr/bin/mv
-NICE?=		/usr/xpg4/bin/nice
-.if exists(/usr/bin/gpatch)
-PATCH?=		/usr/bin/gpatch
-.else
-PATCH?=		${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}patch
-.endif
-PAX?=		${LOCALBASE}/bin/pax
-PERL5?=		${LOCALBASE}/bin/perl
-PWD_CMD?=	/bin/pwd	# needs to print physical path
-RM?=		/usr/bin/rm
-RMDIR?=		/usr/bin/rmdir
-.if exists(${LOCALBASE}/bin/nbsed)
-SED?=		${LOCALBASE}/bin/nbsed
-.else
-SED?=		/usr/xpg4/bin/sed
-.endif
-SETENV?=	/usr/bin/env
-SH?=		/bin/ksh
-SHLOCK=		${LOCALBASE}/bin/shlock
-SORT?=		/usr/bin/sort
-TAIL?=		/usr/xpg4/bin/tail
-TAR?=		${LOCALBASE}/bin/tar
-TEE?=		/usr/bin/tee
-TEST?=		test
-TOUCH?=		/usr/bin/touch
-TR?=		/usr/bin/tr
-TRUE?=		/usr/bin/true
-TSORT?=		/usr/ccs/bin/tsort
-WC?=		/usr/bin/wc
-XARGS?=		/usr/bin/xargs
-.endif
-
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		022
 DEFAULT_SERIAL_DEVICE?=	/dev/null
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index 200e0b0f0d7..67979583469 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.11 2005/05/03 19:35:24 jlam Exp $
+# $NetBSD: UnixWare.mk,v 1.12 2005/05/22 19:11:15 jlam Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -11,81 +11,6 @@ RSH?=		/usr/bin/rsh
 SU?=		/usr/bin/su
 TYPE?=		/usr/bin/type
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-AWK?=		/usr/bin/nawk
-BASENAME?=	/usr/bin/basename
-CAT?=		/usr/bin/cat
-CHMOD?=		/usr/bin/chmod
-CHOWN?=		/usr/bin/chown
-CHGRP?=		/usr/bin/chgrp
-CMP?=		/usr/bin/cmp
-CP?=		/usr/bin/cp
-CUT?=		/usr/bin/cut
-DATE?=		/usr/bin/date
-DIRNAME?=	/usr/bin/dirname
-ECHO?=		/usr/ucb/echo
-EGREP?=		/usr/bin/grep -E
-EXPR?=		/usr/bin/expr
-FALSE?=		/usr/bin/false
-FGREP?=		/usr/bin/grep -F
-FILE_CMD?=	/usr/bin/file
-FIND?=		/usr/bin/find
-GMAKE?=		${LOCALBASE}/bin/gmake
-GREP?=		/usr/bin/grep
-.if exists(${LOCALBASE}/bin/gtar)
-GTAR?=		${LOCALBASE}/bin/gtar
-.else
-GTAR?=		${LOCALBASE}/bin/tar
-.endif
-.if exists(${LOCALBASE}/bin/gzip)
-GUNZIP_CMD?=	${LOCALBASE}/bin/gunzip -f
-GZCAT?=		${LOCALBASE}/bin/zcat
-GZIP_CMD?=	${LOCALBASE}/bin/gzip -nf ${GZIP}
-.elif exists(/usr/local/bin/gzip)
-GUNZIP_CMD?=	/usr/local/bin/gzip -df
-GZCAT?=		/usr/local/bin/gzip -cd
-GZIP_CMD?=	/usr/local/bin/gzip -nf ${GZIP}
-.endif
-HEAD?=		/usr/bin/head
-HOSTNAME_CMD?=	/usr/bin/hostname
-ID?=		/usr/bin/id
-IMAKE?=		# XXX only available in the SDK? what about xmkmf?
-LDCONFIG?=	/usr/bin/true
-LN?=		/usr/bin/ln
-LS?=		/usr/bin/ls
-M4?=		/usr/ccs/bin/m4
-MAIL_CMD?=	/usr/bin/mailx
-MKDIR?=		${LOCALBASE}/sbin/mkdir-sh -p
-MTREE?=		${LOCALBASE}/sbin/mtree
-MV?=		/usr/bin/mv
-NICE?=		/usr/bin/nice
-PATCH?=		${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}patch
-PAX?=		${LOCALBASE}/bin/pax
-PERL5?=		${LOCALBASE}/bin/perl
-PWD_CMD?=	/usr/bin/pwd	# needs to print physical path
-RM?=		/usr/bin/rm
-RMDIR?=		/usr/bin/rmdir
-.if exists(${LOCALBASE}/bin/nbsed)
-SED?=		${LOCALBASE}/bin/nbsed
-.else
-SED?=		/usr/bin/sed
-.endif
-SETENV?=	/usr/bin/env
-SH?=		/usr/bin/ksh
-SHLOCK=		${LOCALBASE}/bin/shlock
-SORT?=		/usr/bin/sort
-TAIL?=		/usr/bin/tail
-TAR?=		${LOCALBASE}/bin/tar
-TEE?=		/usr/bin/tee
-TEST?=		test				# Shell builtin
-TOUCH?=		/usr/bin/touch
-TR?=		/usr/bin/tr
-TRUE?=		/usr/bin/true
-TSORT?=		/usr/ccs/bin/tsort
-WC?=		/usr/bin/wc
-XARGS?=		/usr/bin/xargs
-.endif
-
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		022
 DEFAULT_SERIAL_DEVICE?=	/dev/null