Remove the old tools framework and references to _USE_NEW_TOOLS.

29 files changed, 30 insertions, 1730 deletions

diff --git a/cad/fastcap/Makefile b/cad/fastcap/Makefile
index b0567e3f860..f48c84babcd 100644
--- a/cad/fastcap/Makefile
+++ b/cad/fastcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/20 01:57:44 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 19:11:12 jlam Exp $
 #
 
 DISTNAME=	fastcap-2.0-18Sep92
@@ -14,13 +14,7 @@ COMMENT=	Fast 3-D capacitance solver
 BUILD_DEPENDS+=	teTeX>=1.0.7:../../print/teTeX
 EXTRACT_USING=	gtar	# cannot be extracted with pax as tar
 
-.include "../../mk/bsd.prefs.mk"
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-BUILD_DEPENDS+= gtar-base-[0-9]*:../../archivers/gtar-base
-GTAR=           ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}tar
-.endif
-
-WRKSRC=		${WRKDIR}
+WRKSRC=			${WRKDIR}
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./config
 CONFIGURE_ARGS=		4
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index 41c2a7f15a9..07e061bb71d 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2005/05/22 05:35:32 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2005/05/22 19:11:12 jlam Exp $
 
 ###########################################################################
 ###########################################################################
@@ -66,9 +66,7 @@ BUILD_SHLIBTOOL?=	YES
 USE_LANGUAGES=		c c++ fortran
 CONFIGURE_ARGS+=	--with-tags=CXX,F77,GCJ
 
-.if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 USE_TOOLS+=		echo
-.endif
 
 .PHONY: fix-libtool
 fix-libtool:
diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index 275eee1112e..56fc6a3b39f 100644
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/05/16 20:04:12 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 19:11:12 jlam Exp $
 #
 
 DISTNAME=	patch-2.5.4
@@ -51,10 +51,3 @@ post-install:
 .endif
 
 .include "../../mk/bsd.pkg.mk"
-
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-# Needed for bootstrapping pkgsrc!
-.if !exists(${GTAR})
-GTAR=		/usr/bin/tar		# Solaris
-.endif
-.endif
diff --git a/lang/nawk/Makefile b/lang/nawk/Makefile
index daba0769c96..f87813ea15f 100644
--- a/lang/nawk/Makefile
+++ b/lang/nawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/19 19:45:45 dillo Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 19:11:12 jlam Exp $
 #
 
 DISTNAME=       awk
@@ -18,13 +18,7 @@ COMMENT=	Brian Kernighan's pattern-directed scanning and processing language
 DIST_SUBDIR=	${PKGNAME}
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-.include "../../mk/bsd.prefs.mk"
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-USE_GNU_TOOLS+=	yacc
-.else
 USE_TOOLS+=	yacc
-.endif
-
 WRKSRC=		${WRKDIR}
 CFLAGS+=	${CPPFLAGS}
 MAKE_FLAGS+=	CC=${CC:Q} YACC=${YACC:Q} CFLAGS=${CFLAGS:Q}
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index 23c5c505da0..fafd7d4863d 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2005/05/19 05:01:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2005/05/22 19:11:12 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PERL5_BUILDLINK3_MK:=	${PERL5_BUILDLINK3_MK}+
@@ -13,12 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nperl}
 BUILDLINK_PACKAGES+=	perl
 
 .if !empty(PERL5_BUILDLINK3_MK:M+)
-.  if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-USE_PERL5?=	run
-PERL5_REQD+=	5.0
-.  endif
-USE_TOOLS+=	perl
-
+USE_TOOLS+=			perl
 TOOLS_DEPENDS.perl=		# buildlink3 will handle the dependency
 BUILDLINK_DEPENDS.perl+=	{perl>=${PERL5_REQD},perl-thread>=${PERL5_REQD}}
 BUILDLINK_RECOMMENDED.perl+=	perl>=5.8.5nb6
diff --git a/mk/autoconf.mk b/mk/autoconf.mk
index 76d9a202d26..a0010d2b4e6 100644
--- a/mk/autoconf.mk
+++ b/mk/autoconf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: autoconf.mk,v 1.7 2005/05/11 22:17:26 jlam Exp $
+# $NetBSD: autoconf.mk,v 1.8 2005/05/22 19:11:12 jlam Exp $
 #
 # makefile fragment for packages that use autoconf
 # AUTOCONF_REQD can be set to the minimum version required.
@@ -18,55 +18,9 @@ AUTOCONF_REQD?= 2.50
 .include "../../mk/bsd.prefs.mk"
 
 .if empty(AUTOCONF_REQD:M2.1[0-9]*)
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 USE_TOOLS+=		autoconf
-.  else
-BUILD_DEPENDS+=		autoconf>=${AUTOCONF_REQD}:../../devel/autoconf
-AUTOCONF=		${LOCALBASE}/bin/autoconf
-AUTORECONF=		${LOCALBASE}/bin/autoreconf
-AUTOHEADER=		${LOCALBASE}/bin/autoheader
-.  endif
 .else
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 USE_TOOLS+=		autoconf213
-.  else
-BUILD_DEPENDS+=		autoconf213>=${AUTOCONF_REQD}:../../devel/autoconf213
-AUTOCONF=		${LOCALBASE}/bin/autoconf-2.13
-AUTORECONF=		${LOCALBASE}/bin/autoreconf-2.13
-AUTOHEADER=		${LOCALBASE}/bin/autoheader-2.13
-.    if defined(USE_LIBTOOL)
-pre-configure: do-libtool-m4-override
-.    endif
-.  endif
-.endif
-
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-# LIBTOOL_M4_OVERRIDE lists the locations where the libtool.m4 symlink
-# will be created.  The libtool.m4 is only created if a GNU configure
-# script exists at that location.
-#
-LIBTOOL_M4_OVERRIDE?=	libtool.m4 */libtool.m4 */*/libtool.m4
-
-# Symlink the libtool-1.4.m4 file into any directory in which there's a
-# configure script under ${WRKSRC}.  The  symlink is called "libtool.m4",
-# which is the name expected by the autoconf tools.  The symlinking is
-# only done if ${AUTOCONF_REQD} == 2.13 and USE_LIBTOOL is defined.  This
-# allows autoconf-2.13, autoreconf-2.13 and aclocal-2.13 to use the older
-# libtool.m4 file when regenerating files.  This is okay, because we later
-# override the generated libtool file anyway.
-#
-.PHONY: do-libtool-m4-override
-do-libtool-m4-override:
-.for _pattern_ in ${LIBTOOL_M4_OVERRIDE}
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC};			\
-	for cfile in ${_pattern_:S/libtool.m4$/configure/}; do		\
-		if [ -f "$$cfile" ]; then				\
-			libtool_m4=`${DIRNAME} $$cfile`/libtool.m4;	\
-			${LN} -sf ${PKGSRCDIR}/mk/gnu-config/libtool-1.4.m4 \
-				$$libtool_m4;				\
-		fi;							\
-	done
-.endfor
 .endif
 
 .endif # AUTOCONF_MK
diff --git a/mk/automake.mk b/mk/automake.mk
index ceb66e8b092..b08872a521c 100644
--- a/mk/automake.mk
+++ b/mk/automake.mk
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.9 2005/05/11 22:17:26 jlam Exp $
+# $NetBSD: automake.mk,v 1.10 2005/05/22 19:11:12 jlam Exp $
 #
 # makefile fragment for packages that use automake
 # AUTOMAKE_REQD can be set to the minimum version required.
@@ -19,31 +19,9 @@ AUTOMAKE_REQD?= 1.9
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(AUTOMAKE_REQD:M1.4*)
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 USE_TOOLS+=		automake14
-.  else
-BUILD_DEPENDS+=		automake14>=${AUTOMAKE_REQD}:../../devel/automake14
-_AUTOMAKE_API_VERSION=	1.4
-AUTOCONF_REQD?=		2.13
-.  endif
 .else
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 USE_TOOLS+=		automake
-.  else
-BUILD_DEPENDS+=		automake>=${AUTOMAKE_REQD}:../../devel/automake
-_AUTOMAKE_API_VERSION=	1.9
-AUTOCONF_REQD?=		2.58
-.  endif
 .endif
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-AUTOMAKE=		${LOCALBASE}/bin/automake-${_AUTOMAKE_API_VERSION}
-ACLOCAL=		${LOCALBASE}/bin/aclocal-${_AUTOMAKE_API_VERSION}
-
-.if defined(BUILD_USES_GETTEXT_M4)
-BUILD_DEPENDS+=		{gettext-0.10.35nb1,gettext-m4-[0-9]*}:../../devel/gettext-m4
-.endif
-
-.include "../mk/autoconf.mk"
-.endif
 .endif # AUTOMAKE_MK
diff --git a/mk/bsd.pkg.extract.mk b/mk/bsd.pkg.extract.mk
index 8bffd10c7a8..d9f82ee4d67 100644
--- a/mk/bsd.pkg.extract.mk
+++ b/mk/bsd.pkg.extract.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.extract.mk,v 1.8 2005/05/17 22:11:14 jlam Exp $
+# $NetBSD: bsd.pkg.extract.mk,v 1.9 2005/05/22 19:11:12 jlam Exp $
 #
 # This Makefile fragment is included to bsd.pkg.mk and defines the
 # relevant variables and targets for the "extract" phase.
@@ -64,57 +64,25 @@ PKGSRC_USE_TOOLS+=	pax
 .endif
 .if !empty(EXTRACT_ONLY:M*.bz2) || !empty(EXTRACT_ONLY:M*.tbz) || \
     !empty(EXTRACT_SUFX:M*.bz2) || !empty(EXTRACT_SUFX:M*.tbz)
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 PKGSRC_USE_TOOLS+=	bzcat
-.  elif exists(/usr/bin/bzcat)
-BZCAT=			/usr/bin/bzcat <
-.  else
-BUILD_DEPENDS+=		bzip2>=0.9.0b:../../archivers/bzip2
-BZCAT=			${LOCALBASE}/bin/bzcat
-.  endif
 .endif
 .if !empty(EXTRACT_ONLY:M*.zip) || !empty(EXTRACT_SUFX:M*.zip)
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 PKGSRC_USE_TOOLS+=	unzip
-.  else
-BUILD_DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
-UNZIP=			${LOCALBASE}/bin/unzip
-.  endif
 .endif
 .if !empty(EXTRACT_ONLY:M*.lzh) || !empty(EXTRACT_ONLY:M*.lha) || \
     !empty(EXTRACT_SUFX:M*.lzh) || !empty(EXTRACT_SUFX:M*.lha)
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 PKGSRC_USE_TOOLS+=	lha
-.  else
-BUILD_DEPENDS+=		lha>=114.9:../../archivers/lha
-LHA=			${LOCALBASE}/bin/lha
-.  endif
 .endif
 .if !empty(EXTRACT_ONLY:M*.gz) || !empty(EXTRACT_ONLY:M*.tgz) || \
     !empty(EXTRACT_SUFX:M*.gz) || !empty(EXTRACT_SUFX:M*.tgz) || \
     !empty(EXTRACT_ONLY:M*.Z) || !empty(EXTRACT_SUFX:M*.Z)
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 PKGSRC_USE_TOOLS+=	gzcat
-.  elif !defined(GZCAT)
-BUILD_DEPENDS+=         gzip-base>=1.2.4b:../../archivers/gzip-base
-GZCAT=                  ${LOCALBASE}/bin/zcat
-.  endif
 .endif
 .if !empty(EXTRACT_ONLY:M*.zoo) || !empty(EXTRACT_SUFX:M*.zoo)
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 PKGSRC_USE_TOOLS+=	unzoo
-.  else
-BUILD_DEPENDS+=		unzoo-[0-9]*:../../archivers/unzoo
-UNZOO=			${LOCALBASE}/bin/unzoo
-.  endif
 .endif
 .if !empty(EXTRACT_ONLY:M*.rar) || !empty(EXTRACT_SUFX:M*.rar)
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 PKGSRC_USE_TOOLS+=	unrar
-.  else
-BUILD_DEPENDS+=		unrar>=3.3.4:../../archivers/unrar
-UNRAR=			${LOCALBASE}/bin/unrar
-.  endif
 .endif
 
 DECOMPRESS_CMD.tar.gz?=		${GZCAT}
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 6255539e723..32048af72a1 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1675 2005/05/22 15:31:03 rillig Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1676 2005/05/22 19:11:12 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -382,23 +382,6 @@ _PLIST_IGNORE_FILES+=	${PLIST_IGNORE_FILES}
 .endif
 BUILD_DEFS+=		_PLIST_IGNORE_FILES
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-.if !empty(USE_GNU_TOOLS:Mmake)
-_USE_GMAKE=		yes
-.endif
-.if defined(_USE_GMAKE)
-MAKE_PROGRAM=		${GMAKE}
-.elif defined(USE_IMAKE)
-.  if ${_IMAKE_MAKE} == ${GMAKE}
-USE_GNU_TOOLS+=		make
-.  endif
-MAKE_PROGRAM=		${_IMAKE_MAKE}
-.else
-MAKE_PROGRAM=		${MAKE}
-.endif
-CONFIGURE_ENV+=		MAKE=${MAKE_PROGRAM:T:Q}
-.endif
-
 # Automatically increase process limit where necessary for building.
 _ULIMIT_CMD=
 .if defined(UNLIMIT_RESOURCES)
diff --git a/mk/bsd.pkg.patch.mk b/mk/bsd.pkg.patch.mk
index 03be1718940..1bfa3f8a3af 100644
--- a/mk/bsd.pkg.patch.mk
+++ b/mk/bsd.pkg.patch.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.patch.mk,v 1.10 2005/05/21 21:40:45 jlam Exp $
+# $NetBSD: bsd.pkg.patch.mk,v 1.11 2005/05/22 19:11:12 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and defines the
 # relevant variables and targets for the "patch" phase.
@@ -63,11 +63,7 @@
 .if (defined(PATCHFILES) && !empty(PATCHFILES)) || \
     (defined(PATCHDIR) && exists(${PATCHDIR})) || \
     (defined(LOCALPATCHES) && exists(${LOCALPATCHES}/${PKGPATH}))
-.  if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-USE_GNU_TOOLS+=		patch
-.  else
 PKGSRC_USE_TOOLS+=	patch
-.  endif
 .endif
 
 # These tools are used to output the contents of the distribution patches
@@ -79,14 +75,7 @@ PKGSRC_USE_TOOLS+=	cat
 PKGSRC_USE_TOOLS+=	gzcat
 .  endif
 .  if !empty(PATCHFILES:M*.bz2)
-.    if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 PKGSRC_USE_TOOLS+=	bzcat
-.    elif exists(/usr/bin/bzcat)
-BZCAT=			/usr/bin/bzcat
-.    else
-BZCAT=			${LOCALBASE}/bin/bzcat
-BUILD_DEPENDS+=		bzip2>=0.9.0b:../../archivers/bzip2
-.    endif
 .  endif
 .endif
 
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index 70ee3a2bb76..65d466b7c33 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.14 2005/05/18 22:42:07 jlam Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.15 2005/05/22 19:11:12 jlam Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -107,32 +107,6 @@ USE_MAKEINFO?=		no
 .  include "../../mk/texinfo.mk"
 .endif
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-###
-### USE_PERL5
-###
-.include "../../lang/perl5/version.mk"
-#
-# Convert USE_PERL5 to be two-valued: either "build" or "run" to denote
-# whether we want a build-time or run-time dependency on perl.
-#
-.if defined(USE_PERL5)
-.  if (${USE_PERL5} == "build")
-_PERL5_DEPMETHOD=	BUILD_DEPENDS
-.  else
-USE_PERL5:=		run
-_PERL5_DEPMETHOD=	DEPENDS
-.  endif
-_PERL5_DEPENDS=		{perl>=${PERL5_REQD},perl-thread>=${PERL5_REQD}}
-PERL5_PKGSRCDIR?=	../../lang/perl58
-.  if !defined(BUILDLINK_DEPENDS.perl)
-${_PERL5_DEPMETHOD}+=	${_PERL5_DEPENDS}:${PERL5_PKGSRCDIR}
-.  endif
-CONFIGURE_ENV+=		PERL=${PERL5:Q}
-.  include "../../lang/perl5/vars.mk"
-.endif
-.endif
-
 ### USE_RMAN
 
 # Check if we got "rman" with XFree86, for packages that need "rman".
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 59e16b9c9ac..cc6f2eb7428 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.192 2005/05/14 01:51:52 rillig Exp $
+# $NetBSD: bsd.prefs.mk,v 1.193 2005/05/22 19:11:12 jlam Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -278,10 +278,7 @@ PKGSRC_USE_TOOLS+=	[ awk dirname echo grep pwd sed test true
 #
 PKGSRC_USE_TOOLS+=	date tr
 
-_USE_NEW_TOOLS?=	yes
-.if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 .include "${_PKGSRC_TOPDIR}/mk/tools/defaults.mk"
-.endif
 
 .if ${OPSYS} == "NetBSD"
 .  if ${OBJECT_FMT} == "ELF" && \
@@ -397,20 +394,10 @@ _XPKGWEDGE_REQD=	1.9
 # The check for the existence of ${X11BASE}/lib/X11/config/xpkgwedge.def
 # is to catch users of xpkgwedge<1.0.
 #
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-XMKMF?=			${XMKMF_CMD} ${XMKMF_FLAGS} -a
-XMKMF_FLAGS?=		# empty
-.endif
 .if !empty(USE_XPKGWEDGE:M[Yy][Ee][Ss]) 
 X11PREFIX=		${LOCALBASE}
-.  if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-XMKMF_CMD?=		${X11PREFIX}/bin/pkgxmkmf
-.  endif
 .else
 X11PREFIX=		${X11BASE}
-.  if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-XMKMF_CMD?=		${X11PREFIX}/bin/xmkmf
-.  endif
 .endif
 
 DEPOT_SUBDIR?=		packages
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
diff --git a/mk/tools.mk b/mk/tools.mk
deleted file mode 100644
index 8b7fdba7e95..00000000000
--- a/mk/tools.mk
+++ /dev/null
@@ -1,450 +0,0 @@
-# $NetBSD: tools.mk,v 1.54 2005/03/24 17:46:01 tv Exp $
-#
-# This Makefile creates a ${TOOLS_DIR} directory and populates the bin
-# subdir with tools that hide the ones outside of ${TOOLS_DIR}.
-
-.if !defined(TOOLS_MK)
-TOOLS_MK=	# defined
-
-.include "../../mk/bsd.prefs.mk"
-
-# Prepend ${TOOLS_DIR}/bin to the PATH so that our scripts are found
-# first when searching for executables.
-#
-TOOLS_DIR=	${WRKDIR}/.tools
-PREPEND_PATH+=	${TOOLS_DIR}/bin
-
-TOOLS_SHELL?=		${SH}
-_TOOLS_WRAP_LOG=	${WRKLOG}
-
-.PHONY: do-tools override-tools
-do-tools: override-tools
-override-tools: .OPTIONAL
-
-# Create shell scripts in ${TOOLS_DIR}/bin that simply return an error
-# status for each of the GNU auto* tools, which should cause GNU configure
-# scripts to think that they can't be found.
-#
-AUTOMAKE_OVERRIDE?=	yes
-_GNU_MISSING=		${.CURDIR}/../../mk/gnu-config/missing
-_HIDE_PROGS.autoconf=	bin/autoconf	bin/autoconf-2.13		\
-			bin/autoheader	bin/autoheader-2.13		\
-			bin/autom4te					\
-			bin/autoreconf	bin/autoreconf-2.13		\
-			bin/autoscan	bin/autoscan-2.13		\
-			bin/autoupdate	bin/autoupdate-2.13		\
-			bin/ifnames	bin/ifnames-2.13
-_HIDE_PROGS.automake=	bin/aclocal	bin/aclocal-1.4			\
-					bin/aclocal-1.5			\
-					bin/aclocal-1.6			\
-					bin/aclocal-1.7			\
-					bin/aclocal-1.8			\
-					bin/aclocal-1.9			\
-			bin/automake	bin/automake-1.4		\
-					bin/automake-1.5		\
-					bin/automake-1.6		\
-					bin/automake-1.7		\
-					bin/automake-1.8		\
-					bin/automake-1.9
-
-.if empty(AUTOMAKE_OVERRIDE:M[nN][oO])
-_CONFIGURE_PREREQ+=	override-autotools
-.PHONY: override-autotools
-.  for _autotool_ in autoconf automake
-.    for _prog_ in ${_HIDE_PROGS.${_autotool_}}
-override-autotools: ${TOOLS_DIR}/${_prog_}
-${TOOLS_DIR}/${_prog_}: ${_GNU_MISSING}
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	( ${ECHO} '#!${TOOLS_SHELL}';				\
-	  ${ECHO} 'exec ${_GNU_MISSING} ${_prog_:T:C/-[0-9].*$//}'	\
-	) > ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
-.    endfor
-.  endfor
-.endif	# AUTOMAKE_OVERRIDE != NO
-
-# Create an install-info script that is a "no operation" command,
-# as registration of info files is handled by the INSTALL script.
-#
-CONFIGURE_ENV+=	INSTALL_INFO="${TOOLS_DIR}/bin/install-info"
-MAKE_ENV+=	INSTALL_INFO="${TOOLS_DIR}/bin/install-info"
-
-override-tools: ${TOOLS_DIR}/bin/install-info
-${TOOLS_DIR}/bin/install-info:
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	( ${ECHO} '#!${TOOLS_SHELL}';				\
-	  ${ECHO} 'wrapperlog="$${TOOLS_WRAPPER_LOG-${_TOOLS_WRAP_LOG}}"'; \
-	  ${ECHO} '${ECHO} "==> No-op install-info $$*" >> $$wrapperlog' \
-	) > ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
-
-# Create a makeinfo script that will invoke the right makeinfo
-# command if USE_MAKEINFO is 'yes' or will exit on error if not.
-#
-CONFIGURE_ENV+=	MAKEINFO="${TOOLS_DIR}/bin/makeinfo"
-MAKE_ENV+=	MAKEINFO="${TOOLS_DIR}/bin/makeinfo"
-
-override-tools: ${TOOLS_DIR}/bin/makeinfo
-.if empty(USE_MAKEINFO:M[nN][oO])
-${TOOLS_DIR}/bin/makeinfo:
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	( ${ECHO} "#!${TOOLS_SHELL}";				\
-	  ${ECHO} 'wrapperlog="$${TOOLS_WRAPPER_LOG-${_TOOLS_WRAP_LOG}}"'; \
-	  ${ECHO} '${ECHO} "${MAKEINFO} $$*" >> $$wrapperlog';		\
-	  ${ECHO} 'exec ${MAKEINFO} "$$@"'				\
-	) > ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
-.else # !USE_MAKEINFO
-${TOOLS_DIR}/bin/makeinfo: ${_GNU_MISSING}
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	( ${ECHO} "#!${TOOLS_SHELL}";				\
-	  ${ECHO} 'wrapperlog="$${TOOLS_WRAPPER_LOG-${_TOOLS_WRAP_LOG}}"'; \
-	  ${ECHO} '${ECHO} "==> Error: makeinfo $$*" >> $$wrapperlog';	\
-	  ${ECHO} 'exit 1'						\
-	) >  ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
-.endif # USE_MAKEINFO
-
-# Handle platforms with broken tools in the base system, e.g. sed, awk.
-#
-# Symlink the suitable versions of tools into ${TOOLS_DIR}/bin (if they
-# exist in the base system) and allow packages to force the use of
-# pkgsrc GNU tools when they are not present in the base system by
-# defining e.g. USE_GNU_TOOLS+="awk sed".  Version numbers are not
-# considered.
-
-_TOOLS=		awk grep lex m4 make patch sed yacc
-
-.if defined(_IGNORE_GNU_TOOL) && defined(USE_GNU_TOOLS)
-.  for _tool_ in ${USE_GNU_TOOLS}
-.    if !defined(_IGNORE_GNU_TOOL.${_tool_})
-_tools+=	${_tool_}
-.    endif
-.  endfor
-USE_GNU_TOOLS=	${_tools}
-.endif
-
-# These platforms already have GNU versions of the tools in the base
-# system, so no need to pull in the pkgsrc versions; we will use these
-# instead.
-#
-#_TOOLS_OPSYS_HAS_GNU.awk+=	Interix-*-* # too old and buggy; use lang/gawk
-_TOOLS_OPSYS_HAS_GNU.awk+=	FreeBSD-*-* Linux-*-* OpenBSD-*-*
-_TOOLS_OPSYS_HAS_GNU.awk+=	NetBSD-1.[0-6]*-* DragonFly-*-*
-_TOOLS_OPSYS_HAS_GNU.grep+=	Darwin-*-* FreeBSD-*-* Linux-*-*
-_TOOLS_OPSYS_HAS_GNU.grep+=	NetBSD-*-* OpenBSD-*-* DragonFly-*-*
-_TOOLS_OPSYS_HAS_GNU.lex+=	FreeBSD-*-* Linux-*-* NetBSD-*-*
-_TOOLS_OPSYS_HAS_GNU.lex+=	OpenBSD-*-* DragonFly-*-*
-_TOOLS_OPSYS_HAS_GNU.m4+=	# empty
-_TOOLS_OPSYS_HAS_GNU.make+=	Darwin-*-*
-_TOOLS_OPSYS_HAS_GNU.patch+=	Darwin-*-* FreeBSD-*-* Linux-*-*
-_TOOLS_OPSYS_HAS_GNU.patch+=	NetBSD-*-* OpenBSD-*-* DragonFly-*-*
-_TOOLS_OPSYS_HAS_GNU.sed+=	FreeBSD-*-* Linux-*-* NetBSD-*-* DragonFly-*-*
-_TOOLS_OPSYS_HAS_GNU.yacc+=	Linux-*-*
-
-# These platforms have GNUish versions of the tools available in the base
-# system, which we already define as ${AWK}, ${SED}, etc. (refer to
-# mk/platform/*.mk for the definitions), so no need to pull in the pkgsrc
-# versions; we will use these instead.
-#
-_TOOLS_REPLACE_OPSYS.awk+=	SunOS-*-* Interix-*-*
-_TOOLS_REPLACE_OPSYS.grep+=	SunOS-*-*
-_TOOLS_REPLACE_OPSYS.lex+=	# empty
-_TOOLS_REPLACE_OPSYS.m4+=	# empty
-_TOOLS_REPLACE_OPSYS.make+=	# empty
-_TOOLS_REPLACE_OPSYS.patch+=	SunOS-*-*
-_TOOLS_REPLACE_OPSYS.sed+=	SunOS-*-* Interix-*-*
-_TOOLS_REPLACE_OPSYS.yacc+=	# empty
-
-# These platforms have completely unusable versions of these tools, and
-# no suitable replacement is available.
-#
-_TOOLS_OPSYS_INCOMPAT.awk+=	IRIX-*-*
-_TOOLS_OPSYS_INCOMPAT.grep+=	# empty
-_TOOLS_OPSYS_INCOMPAT.lex+=	# empty
-_TOOLS_OPSYS_INCOMPAT.m4+=	# empty
-_TOOLS_OPSYS_INCOMPAT.make+=	# empty
-_TOOLS_OPSYS_INCOMPAT.patch+=	# empty
-_TOOLS_OPSYS_INCOMPAT.sed+=	# empty
-_TOOLS_OPSYS_INCOMPAT.yacc+=	# empty
-
-# Default to not requiring GNU tools.
-.for _tool_ in ${_TOOLS}
-_TOOLS_HAS_GNU.${_tool_}?=	NO
-_TOOLS_NEED_GNU.${_tool_}?=	NO
-_TOOLS_REPLACE.${_tool_}?=	NO
-_TOOLS_OVERRIDE.${_tool_}?=	NO
-.endfor
-
-.for _tool_ in ${USE_GNU_TOOLS}
-#
-# What GNU tools did the package or user ask for, and does the base
-# system already have it?
-#
-_TOOLS_NEED_GNU.${_tool_}=	YES
-.  for _pattern_ in ${_TOOLS_OPSYS_HAS_GNU.${_tool_}}
-_TOOLS_HAS_GNU.${_tool_}=	YES
-.    if !empty(MACHINE_PLATFORM:M${_pattern_})
-_TOOLS_NEED_GNU.${_tool_}=	NO
-.    endif
-.  endfor
-#
-# Do we know the base system tool is broken?
-#
-.  for _pattern_ in ${_TOOLS_OPSYS_INCOMPAT.${_tool_}}
-.    if !empty(MACHINE_PLATFORM:M${_pattern_})
-_TOOLS_NEED_GNU.${_tool_}=	YES
-.    endif
-.  endfor
-.endfor	# USE_GNU_TOOLS
-#
-# Are we using a GNUish system tool in place of the needed GNU tool?
-#
-.for _tool_ in ${_TOOLS}
-.  for _pattern_ in ${_TOOLS_REPLACE_OPSYS.${_tool_}}
-.    if !empty(MACHINE_PLATFORM:M${_pattern_})
-_TOOLS_REPLACE.${_tool_}=	YES
-.    endif
-.  endfor
-.endfor	# _TOOLS
-
-.if ${_TOOLS_REPLACE.awk} == "YES"
-_TOOLS_OVERRIDE.awk=	YES
-_TOOLS_PROGNAME.awk=	${AWK}
-.endif
-.if (${_TOOLS_NEED_GNU.awk} == "YES") && empty(PKGPATH:Mlang/gawk)
-BUILD_DEPENDS+=		gawk>=3.1.1:../../lang/gawk
-_TOOLS_OVERRIDE.awk=	YES
-_TOOLS_PROGNAME.awk=	${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk
-.  if exists(${_TOOLS_PROGNAME.awk})
-AWK:=			${_TOOLS_PROGNAME.awk}
-.  endif
-.endif
-.if !empty(PKGPATH:Mlang/gawk)
-_TOOLS_OVERRIDE.awk=	NO
-MAKEFLAGS+=		_IGNORE_GNU_TOOL.awk=
-.endif
-
-.if ${_TOOLS_REPLACE.grep} == "YES"
-_TOOLS_OVERRIDE.grep=	YES
-_TOOLS_PROGNAME.grep=	${GREP}
-.endif
-.if (${_TOOLS_NEED_GNU.grep} == "YES") && empty(PKGPATH:Mtextproc/grep)
-BUILD_DEPENDS+=		grep>=2.5.1:../../textproc/grep
-_TOOLS_OVERRIDE.grep=	YES
-_TOOLS_PROGNAME.grep=	${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}grep
-.  if exists(${_TOOLS_PROGNAME.grep})
-GREP:=			${_TOOLS_PROGNAME.grep}
-.  endif
-.endif
-.if !empty(PKGPATH:Mtextproc/grep)
-_TOOLS_OVERRIDE.grep=	NO
-MAKEFLAGS+=		_IGNORE_GNU_TOOL.grep=
-.endif
-
-.if ${_TOOLS_REPLACE.lex} == "YES"
-_TOOLS_OVERRIDE.lex=	YES
-_TOOLS_PROGNAME.lex=	${LEX}
-.endif
-.if (${_TOOLS_NEED_GNU.lex} == "YES") && empty(PKGPATH:Mdevel/flex)
-.include "../../devel/flex/buildlink3.mk"
-_TOOLS_OVERRIDE.lex=	YES
-_TOOLS_PROGNAME.lex=	${LOCALBASE}/bin/flex
-.  if exists(${_TOOLS_PROGNAME.lex})
-LEX:=			${_TOOLS_PROGNAME.lex}
-.  endif
-.endif
-.if !empty(PKGPATH:Mdevel/flex)
-_TOOLS_OVERRIDE.lex=	NO
-MAKEFLAGS+=		_IGNORE_GNU_TOOL.lex=
-.endif
-
-.if ${_TOOLS_REPLACE.m4} == "YES"
-_TOOLS_OVERRIDE.m4=	YES
-_TOOLS_PROGNAME.m4=	${M4}
-.endif
-.if (${_TOOLS_NEED_GNU.m4} == "YES") && empty(PKGPATH:Mdevel/m4)
-BUILD_DEPENDS+=		m4>=1.4:../../devel/m4
-_TOOLS_OVERRIDE.m4=	YES
-_TOOLS_PROGNAME.m4=	${LOCALBASE}/bin/gm4	# "gm4" always exists
-.  if exists(${_TOOLS_PROGNAME.m4})
-M4:=			${_TOOLS_PROGNAME.m4}
-.  endif
-.endif
-.if !empty(PKGPATH:Mdevel/m4)
-_TOOLS_OVERRIDE.m4=	NO
-MAKEFLAGS+=		_IGNORE_GNU_TOOLS.m4=
-.endif
-
-.if ${_TOOLS_REPLACE.make} == "YES"
-_TOOLS_OVERRIDE.make=	YES
-_TOOLS_PROGNAME.make=	${GMAKE}
-.endif
-.if (${_TOOLS_NEED_GNU.make} == "YES") && empty(PKGPATH:Mdevel/gmake)
-BUILD_DEPENDS+=		gmake>=3.78:../../devel/gmake
-_TOOLS_OVERRIDE.make=	YES
-_TOOLS_PROGNAME.make=	${LOCALBASE}/bin/gmake	# "gmake" always exists
-.  if exists(${_TOOLS_PROGNAME.make})
-GMAKE:=			${_TOOLS_PROGNAME.make}
-.  endif
-.endif
-.if !empty(PKGPATH:Mdevel/gmake)
-_TOOLS_OVERRIDE.make=	NO
-MAKEFLAGS+=		_IGNORE_GNU_TOOL.make=
-.endif
-
-.if ${_TOOLS_REPLACE.patch} == "YES"
-_TOOLS_OVERRIDE.patch=	YES
-_TOOLS_PROGNAME.patch=	${PATCH}
-.endif
-.if (${_TOOLS_NEED_GNU.patch} == "YES") && empty(PKGPATH:Mdevel/patch)
-BUILD_DEPENDS+=		patch>=2.2:../../devel/patch
-_TOOLS_OVERRIDE.patch=	YES
-_TOOLS_PROGNAME.patch=	${LOCALBASE}/bin/gpatch	# "gpatch" always exists
-.  if exists(${_TOOLS_PROGNAME.patch})
-PATCH:=			${_TOOLS_PROGNAME.patch}
-.  endif
-.endif
-.if !empty(PKGPATH:Mdevel/patch)
-_TOOLS_OVERRIDE.patch=	NO
-MAKEFLAGS+=		_IGNORE_GNU_TOOL.patch=
-.endif
-
-.if ${_TOOLS_REPLACE.sed} == "YES"
-_TOOLS_OVERRIDE.sed=	YES
-_TOOLS_PROGNAME.sed=	${SED}
-.endif
-.if (${_TOOLS_NEED_GNU.sed} == "YES") && empty(PKGPATH:Mtextproc/gsed)
-BUILD_DEPENDS+=		gsed>=3.0.2:../../textproc/gsed
-_TOOLS_OVERRIDE.sed=	YES
-_TOOLS_PROGNAME.sed=	${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}sed
-.  if exists(${_TOOLS_PROGNAME.sed})
-SED:=			${_TOOLS_PROGNAME.sed}
-.  endif
-.endif
-.if !empty(PKGPATH:Mtextproc/gsed)
-_TOOLS_OVERRIDE.sed=	NO
-MAKEFLAGS+=		_IGNORE_GNU_TOOL.sed=
-.endif
-
-.if ${_TOOLS_HAS_GNU.yacc} == "YES"
-.  undef YACC
-.endif
-.if ${_TOOLS_REPLACE.yacc} == "YES"
-_TOOLS_OVERRIDE.yacc=	YES
-_TOOLS_PROGNAME.yacc=	${YACC}
-.endif
-.if (${_TOOLS_NEED_GNU.yacc} == "YES") && empty(PKGPATH:Mdevel/bison)
-BUILD_DEPENDS+=		bison>=1.0:../../devel/bison
-_TOOLS_OVERRIDE.yacc=	YES
-_TOOLS_PROGNAME.yacc=	${LOCALBASE}/bin/bison
-.  if exists(${_TOOLS_PROGNAME.yacc})
-YACC:=			${_TOOLS_PROGNAME.yacc} -y
-.  endif
-.endif
-.if !empty(PKGPATH:Mdevel/bison)
-_TOOLS_OVERRIDE.yacc=	NO
-MAKEFLAGS+=		_IGNORE_GNU_TOOL.yacc=
-.endif
-
-# If _TOOLS_OVERRIDE.<tool> is actually set to "YES", then we override
-# the tool with the one specified in _TOOLS_PROGNAME.<tool>.
-#
-.for _tool_ in ${_TOOLS}
-.  if ${_TOOLS_OVERRIDE.${_tool_}} == "YES"
-override-tools: ${TOOLS_DIR}/bin/${_tool_}
-
-${TOOLS_DIR}/bin/${_tool_}:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	src="${_TOOLS_PROGNAME.${_tool_}}";				\
-	if [ -x $$src -a ! -f ${.TARGET} ]; then			\
-		${MKDIR} ${.TARGET:H};					\
-		${LN} -sf $$src ${.TARGET};				\
-	fi
-.  endif
-.endfor
-
-# Always provide a symlink from ${TOOLS_DIR}/bin/make to the "make"
-# used to build the package.  The following only creates the symlink
-# if GNU make isn't required (and already symlinked from above).
-#
-override-tools: ${TOOLS_DIR}/bin/make
-
-.if !target(${TOOLS_DIR}/bin/make)
-${TOOLS_DIR}/bin/make:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	case ${MAKE_PROGRAM} in						\
-	/*)	src="${MAKE_PROGRAM}" ;;				\
-	*)	src=`${TYPE} ${MAKE_PROGRAM} | ${AWK} '{ print $$NF }'` ;; \
-	esac;								\
-	if [ -x $$src -a ! -f ${.TARGET} ]; then			\
-		${MKDIR} ${.TARGET:H};					\
-		${LN} -sf $$src ${.TARGET};				\
-	fi
-.endif
-
-# Create a symlink from ${TOOLS_DIR}/bin/perl to ${PERL5} when USE_PERL5
-# is defined.
-.if defined(USE_PERL5)
-override-tools: ${TOOLS_DIR}/bin/perl
-.  if !target(${TOOLS_DIR}/bin/perl)
-${TOOLS_DIR}/bin/perl:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	src="${PERL5}";							\
-	if [ -x $$src -a ! -f ${.TARGET} ]; then			\
-		${MKDIR} ${.TARGET:H};					\
-		${LN} -sf $$src ${.TARGET};				\
-	fi
-.  endif
-.endif
-
-# Always create a ${TOOLS_DIR}/bin/rpcgen to wrap the real rpcgen.
-# The wrapper will correctly set the CPP environment variable to a
-# stat((2)able path to a C preprocessor, then rely on the PATH to
-# find and invoke the real rpcgen.
-#
-RPCGEN?=		rpcgen
-RPCGEN_ARGS.NetBSD=	-b
-RPCGEN_ARGS?=		${RPCGEN_ARGS.${OPSYS}}
-override-tools: ${TOOLS_DIR}/bin/rpcgen
-.if !target(${TOOLS_DIR}/bin/rpcgen)
-${TOOLS_DIR}/bin/rpcgen:
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	( ${ECHO} '#!${TOOLS_SHELL}';					\
-	  ${ECHO} 'wrapperlog="$${TOOLS_WRAPPER_LOG-${_TOOLS_WRAP_LOG}}"'; \
-	  ${ECHO} 'CPP="${WRAPPER_BINDIR}/cpp"; export CPP';		\
-	  PATH=`${ECHO} "${PATH}" | ${SED} -e "s,.*${.TARGET:H}:,,"`;	\
-	  ${ECHO} "PATH=\"$$PATH\"; export PATH";			\
-	  ${ECHO} '${ECHO} "<.> ${RPCGEN} ${RPCGEN_ARGS} $$*" >> $$wrapperlog'; \
-	  ${ECHO} '${RPCGEN} ${RPCGEN_ARGS} "$$@"';			\
-	) > ${.TARGET}
-	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
-.endif
-
-.if defined(USE_TBL) && !empty(USE_TBL:M[yY][eE][sS])
-.  if exists(/usr/bin/tbl)
-_TOOLS_PROGNAME.tbl=	/usr/bin/tbl
-.  else
-BUILD_DEPENDS+=		groff>=1.19nb4:../../textproc/groff
-_TOOLS_PROGNAME.tbl=	${LOCALBASE}/bin/tbl
-.  endif
-.  if exists(${_TOOLS_PROGNAME.tbl})
-TBL:=			${_TOOLS_PROGNAME.tbl}
-.  endif
-
-override-tools: ${TOOLS_DIR}/bin/tbl
-${TOOLS_DIR}/bin/tbl:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	src="${_TOOLS_PROGNAME.tbl}";					\
-	if [ -x $$src -a ! -f ${.TARGET} ]; then			\
-		${MKDIR} ${.TARGET:H};					\
-		${LN} -sf $$src ${.TARGET};				\
-	fi
-.endif	# USE_TBL
-
-.endif	# TOOLS_MK
diff --git a/security/aide/Makefile b/security/aide/Makefile
index 4ec8eabcc33..fdbf1c65e64 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/15 19:05:54 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 19:11:12 jlam Exp $
 #
 
 DISTNAME=       aide-0.10
@@ -18,8 +18,3 @@ USE_TOOLS+=	bison
 
 .include "../../security/mhash/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-#don't set YACC so configure can correctly find bison
-YACC=
-.endif
diff --git a/security/aide06/Makefile b/security/aide06/Makefile
index 6940e0badbc..5b836668e56 100644
--- a/security/aide06/Makefile
+++ b/security/aide06/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/15 19:05:54 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 19:11:12 jlam Exp $
 #
 
 DISTNAME=       aide-0.6
@@ -17,8 +17,3 @@ USE_GNU_TOOLS+=	yacc lex
 USE_TOOLS+=	bison
 
 .include "../../mk/bsd.pkg.mk"
-
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-#don't set YACC so configure can correctly find bison
-YACC=
-.endif
diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile
index dd63fdee848..c695c91f5c7 100644
--- a/security/mit-krb5/Makefile
+++ b/security/mit-krb5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/05/16 16:32:28 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 19:11:12 jlam Exp $
 
 DISTNAME=	krb5-1.4
 PKGNAME=	mit-${DISTNAME:S/-signed$//}
@@ -21,13 +21,6 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CONFLICTS+=	heimdal-[0-9]*
 CONFLICTS+=	kth-krb4-[0-9]*
 
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-.if !exists(/usr/bin/yacc)
-BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
-YACC=			${LOCALBASE}/bin/bison -y
-.endif
-.endif
-
 PKGSRC_USE_TOOLS+=	gzcat
 USE_TOOLS+=		yacc
 GNU_CONFIGURE=		yes