diff --git a/mk/tools/autoconf.mk b/mk/tools/autoconf.mk
index 68699c024241..8c9f0ea4abbf 100644
--- a/mk/tools/autoconf.mk
+++ b/mk/tools/autoconf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: autoconf.mk,v 1.2 2005/04/15 05:30:48 jlam Exp $
+# $NetBSD: autoconf.mk,v 1.3 2005/04/26 15:32:05 jlam Exp $
 #
 # This Makefile fragment handles packages that use GNU autoconf.
 #
@@ -58,31 +58,24 @@ AUTOCONF_REQD?=		2.50
 BUILD_DEPENDS+=		autoconf>=${AUTOCONF_REQD}:../../devel/autoconf
 
 _TOOLS_AUTOCONF_LINKS+=		autoconf
-TOOLS_CMD.autoconf=		${TOOLS_DIR}/bin/autoconf
 TOOLS_REAL_CMD.autoconf=	${LOCALBASE}/bin/autoconf
 
 _TOOLS_AUTOCONF_LINKS+=		autoheader
-TOOLS_CMD.autoheader=		${TOOLS_DIR}/bin/autoheader
 TOOLS_REAL_CMD.autoheader=	${LOCALBASE}/bin/autoheader
 
 _TOOLS_AUTOCONF_LINKS+=		autom4te
-TOOLS_CMD.autom4te=		${TOOLS_DIR}/bin/autom4te
 TOOLS_REAL_CMD.autom4te=	${LOCALBASE}/bin/autom4te
 
 _TOOLS_AUTOCONF_LINKS+=		autoreconf
-TOOLS_CMD.autoreconf=		${TOOLS_DIR}/bin/autoreconf
 TOOLS_REAL_CMD.autoreconf=	${LOCALBASE}/bin/autoreconf
 
 _TOOLS_AUTOCONF_LINKS+=		autoscan
-TOOLS_CMD.autoscan=		${TOOLS_DIR}/bin/autoscan
 TOOLS_REAL_CMD.autoscan=	${LOCALBASE}/bin/autoscan
 
 _TOOLS_AUTOCONF_LINKS+=		autoupdate
-TOOLS_CMD.autoupdate=		${TOOLS_DIR}/bin/autoupdate
 TOOLS_REAL_CMD.autoupdate=	${LOCALBASE}/bin/autoupdate
 
 _TOOLS_AUTOCONF_LINKS+=		ifnames
-TOOLS_CMD.ifnames=		${TOOLS_DIR}/bin/ifnames
 TOOLS_REAL_CMD.ifnames=		${LOCALBASE}/bin/ifnames
 
 # Continue to define the following variables until packages have been
@@ -102,27 +95,21 @@ AUTOCONF_REQD?=		2.13
 BUILD_DEPENDS+=		autoconf213>=${AUTOCONF_REQD}:../../devel/autoconf213
 
 _TOOLS_AUTOCONF_LINKS+=		autoconf
-TOOLS_CMD.autoconf=		${TOOLS_DIR}/bin/autoconf
 TOOLS_REAL_CMD.autoconf=	${LOCALBASE}/bin/autoconf-2.13
 
 _TOOLS_AUTOCONF_LINKS+=		autoheader
-TOOLS_CMD.autoheader=		${TOOLS_DIR}/bin/autoheader
 TOOLS_REAL_CMD.autoheader=	${LOCALBASE}/bin/autoheader-2.13
 
 _TOOLS_AUTOCONF_LINKS+=		autoreconf
-TOOLS_CMD.autoreconf=		${TOOLS_DIR}/bin/autoreconf
 TOOLS_REAL_CMD.autoreconf=	${LOCALBASE}/bin/autoreconf-2.13
 
 _TOOLS_AUTOCONF_LINKS+=		autoscan
-TOOLS_CMD.autoscan=		${TOOLS_DIR}/bin/autoscan
 TOOLS_REAL_CMD.autoscan=	${LOCALBASE}/bin/autoscan-2.13
 
 _TOOLS_AUTOCONF_LINKS+=		autoupdate
-TOOLS_CMD.autoupdate=		${TOOLS_DIR}/bin/autoupdate
 TOOLS_REAL_CMD.autoupdate=	${LOCALBASE}/bin/autoupdate-2.13
 
 _TOOLS_AUTOCONF_LINKS+=		ifnames
-TOOLS_CMD.ifnames=		${TOOLS_DIR}/bin/ifnames
 TOOLS_REAL_CMD.ifnames=		${LOCALBASE}/bin/ifnames-2.13
 
 # Continue to define the following variables until packages have been
diff --git a/mk/tools/automake.mk b/mk/tools/automake.mk
index b32e7387a00c..2fee99c19590 100644
--- a/mk/tools/automake.mk
+++ b/mk/tools/automake.mk
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.2 2005/04/15 05:30:48 jlam Exp $
+# $NetBSD: automake.mk,v 1.3 2005/04/26 15:32:05 jlam Exp $
 #
 # This Makefile fragment handles packages that use GNU automake.
 #
@@ -77,11 +77,9 @@ USE_TOOLS+=		autoconf
 AUTOCONF_REQD?=		2.58
 
 _TOOLS_AUTOMAKE_LINKS+=		aclocal
-TOOLS_CMD.aclocal=		${TOOLS_DIR}/bin/aclocal
 TOOLS_REAL_CMD.aclocal=		${LOCALBASE}/bin/aclocal
 
 _TOOLS_AUTOMAKE_LINKS+=		automake
-TOOLS_CMD.automake=		${TOOLS_DIR}/bin/automake
 TOOLS_REAL_CMD.automake=	${LOCALBASE}/bin/automake
 
 # Continue to define the following variables until packages have been
@@ -102,11 +100,9 @@ USE_TOOLS+=		autoconf213
 AUTOCONF_REQD?=		2.13
 
 _TOOLS_AUTOMAKE_LINKS+=		aclocal
-TOOLS_CMD.aclocal=		${TOOLS_DIR}/bin/aclocal
 TOOLS_REAL_CMD.aclocal=		${LOCALBASE}/bin/aclocal-1.4
 
 _TOOLS_AUTOMAKE_LINKS+=		automake
-TOOLS_CMD.automake=		${TOOLS_DIR}/bin/automake
 TOOLS_REAL_CMD.automake=	${LOCALBASE}/bin/automake-1.4
 
 # Continue to define the following variables until packages have been
diff --git a/mk/tools/coreutils.mk b/mk/tools/coreutils.mk
index e56340786688..66282d5d2260 100644
--- a/mk/tools/coreutils.mk
+++ b/mk/tools/coreutils.mk
@@ -1,4 +1,4 @@
-# $NetBSD: coreutils.mk,v 1.1 2005/04/15 07:33:43 jlam Exp $
+# $NetBSD: coreutils.mk,v 1.2 2005/04/26 15:32:05 jlam Exp $
 #
 # This Makefile fragment unconditionally replaces the system-supplied
 # "core" utilities with the ones from the GNU coreutils package when
@@ -28,7 +28,6 @@ _TOOLS_COREUTILS+=	[ basename cat chgrp chmod chown cp cut date	\
 # Create symlinks for each of the coreutils under ${TOOLS_DIR}.
 .    for _t_ in ${_TOOLS_COREUTILS}
 TOOLS_SYMLINK+=		${_t_}
-TOOLS_CMD.${_t_}=	${TOOLS_DIR}/bin/${_t_}
 TOOLS_REAL_CMD.${_t_}=	${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}${_t_}
 .    endfor
 .    undef _t_
diff --git a/mk/tools/findutils.mk b/mk/tools/findutils.mk
index 8523059ceb24..9636c8933764 100644
--- a/mk/tools/findutils.mk
+++ b/mk/tools/findutils.mk
@@ -1,4 +1,4 @@
-# $NetBSD: findutils.mk,v 1.1 2005/04/15 07:33:43 jlam Exp $
+# $NetBSD: findutils.mk,v 1.2 2005/04/26 15:32:05 jlam Exp $
 #
 # This Makefile fragment unconditionally replaces the system-supplied
 # "find" utilities with the ones from the GNU findutils package when
@@ -23,7 +23,6 @@ _TOOLS_FINDUTILS+=	find xargs
 # Create symlinks for each of the findutils under ${TOOLS_DIR}.
 .    for _t_ in ${_TOOLS_FINDUTILS}
 TOOLS_SYMLINK+=		${_t_}
-TOOLS_CMD.${_t_}=	${TOOLS_DIR}/bin/${_t_}
 TOOLS_REAL_CMD.${_t_}=	${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}${_t_}
 .    endfor
 .    undef _t_
diff --git a/mk/tools/make.mk b/mk/tools/make.mk
index f2413283910c..b122334aa845 100644
--- a/mk/tools/make.mk
+++ b/mk/tools/make.mk
@@ -1,9 +1,8 @@
-# $NetBSD: make.mk,v 1.2 2005/04/22 04:19:26 jlam Exp $
+# $NetBSD: make.mk,v 1.3 2005/04/26 15:32:05 jlam Exp $
 
 # Always provide a symlink from ${TOOLS_DIR}/bin/make to the "make"
 # used to build the package.  This lets a bare "make" invoke the
 # correct program if called from within a makefile or script.
 #
 TOOLS_SYMLINK+=		make
-TOOLS_CMD.make=		${TOOLS_DIR}/bin/make
 TOOLS_REAL_CMD.make=	${MAKE_PROGRAM}
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 0bfcfbe983d8..a7f01963e690 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.14 2005/04/25 06:16:38 jlam Exp $
+# $NetBSD: replace.mk,v 1.15 2005/04/26 15:32:05 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.  The replacements are placed under
@@ -175,7 +175,6 @@ TOOLS_REAL_CMD.file=		${LOCALBASE}/bin/file
 ${_TOOLS_VARNAME.file}=	${TOOLS_REAL_CMD.file}
 .    endif
 .  endif
-TOOLS_CMD.file=			${TOOLS_DIR}/bin/file
 .endif
 
 .if !defined(TOOLS_IGNORE.gawk) && !empty(USE_TOOLS:Mgawk)
@@ -189,7 +188,6 @@ TOOLS_REAL_CMD.gawk=		${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk
 ${_TOOLS_VARNAME.gawk}=		${TOOLS_REAL_CMD.gawk}
 .    endif
 .  endif
-TOOLS_CMD.gawk=			${TOOLS_DIR}/bin/awk
 .endif
 
 .if !defined(TOOLS_IGNORE.gm4) && !empty(USE_TOOLS:Mgm4)
@@ -203,7 +201,6 @@ TOOLS_REAL_CMD.gm4=		${LOCALBASE}/bin/gm4
 ${_TOOLS_VARNAME.gm4}=		${TOOLS_REAL_CMD.gm4}
 .    endif
 .  endif
-TOOLS_CMD.gm4=			${TOOLS_DIR}/bin/m4
 .endif
 
 .if !defined(TOOLS_IGNORE.gmake) && !empty(USE_TOOLS:Mgmake)
@@ -217,7 +214,6 @@ TOOLS_REAL_CMD.gmake=		${LOCALBASE}/bin/gmake
 ${_TOOLS_VARNAME.gmake}=	${TOOLS_REAL_CMD.gmake}
 .    endif
 .  endif
-TOOLS_CMD.gmake=		${TOOLS_DIR}/bin/gmake
 .endif
 
 .if (!defined(TOOLS_IGNORE.egrep) && !empty(USE_TOOLS:Megrep)) || \
@@ -252,9 +248,6 @@ ${_TOOLS_VARNAME.grep}=		${TOOLS_REAL_CMD.grep}
 .      endif
 .    endif
 .  endif
-TOOLS_CMD.egrep=		${TOOLS_DIR}/bin/egrep
-TOOLS_CMD.fgrep=		${TOOLS_DIR}/bin/fgrep
-TOOLS_CMD.grep=			${TOOLS_DIR}/bin/grep
 .endif
 
 .if (!defined(TOOLS_IGNORE.gunzip) && !empty(USE_TOOLS:Mgunzip)) || \
@@ -289,9 +282,6 @@ ${_TOOLS_VARNAME.gzip}=		${TOOLS_REAL_CMD.gzip}
 .      endif
 .    endif
 .  endif
-TOOLS_CMD.gunzip=		${TOOLS_DIR}/bin/gunzip
-TOOLS_CMD.gzcat=		${TOOLS_DIR}/bin/gzcat
-TOOLS_CMD.gzip=			${TOOLS_DIR}/bin/gzip
 .endif
 
 .if !defined(TOOLS_IGNORE.lex) && !empty(USE_TOOLS:Mlex)
@@ -305,7 +295,6 @@ TOOLS_REAL_CMD.lex=		${LOCALBASE}/bin/flex
 ${_TOOLS_VARNAME.lex}=		${TOOLS_REAL_CMD.lex}
 .    endif
 .  endif
-TOOLS_CMD.lex=			${TOOLS_DIR}/bin/lex
 .endif
 
 .if !defined(TOOLS_IGNORE.patch) && !empty(USE_TOOLS:Mpatch)
@@ -319,7 +308,6 @@ TOOLS_REAL_CMD.patch=		${LOCALBASE}/bin/gpatch
 ${_TOOLS_VARNAME.patch}=	${TOOLS_REAL_CMD.patch}
 .    endif
 .  endif
-TOOLS_CMD.patch=		${TOOLS_DIR}/bin/patch
 .endif
 
 .if !defined(TOOLS_IGNORE.perl) && !empty(USE_TOOLS:Mperl)
@@ -333,7 +321,6 @@ TOOLS_REAL_CMD.perl=		${LOCALBASE}/bin/perl
 ${_TOOLS_VARNAME.perl}=		${TOOLS_REAL_CMD.perl}
 .    endif
 .  endif
-TOOLS_CMD.perl=			${TOOLS_DIR}/bin/perl
 .endif
 
 .if !defined(TOOLS_IGNORE.sed) && !empty(USE_TOOLS:Msed)
@@ -347,7 +334,6 @@ TOOLS_REAL_CMD.sed=		${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}sed
 ${_TOOLS_VARNAME.sed}=		${TOOLS_REAL_CMD.sed}
 .    endif
 .  endif
-TOOLS_CMD.sed=			${TOOLS_DIR}/bin/sed
 .endif
 
 .if !defined(TOOLS_IGNORE.tbl) && !empty(USE_TOOLS:Mtbl)
@@ -361,7 +347,6 @@ TOOLS_REAL_CMD.tbl=		${LOCALBASE}/bin/tbl
 ${_TOOLS_VARNAME.tbl}=		${TOOLS_REAL_CMD.tbl}
 .    endif
 .  endif
-TOOLS_CMD.tbl=			${TOOLS_DIR}/bin/tbl
 .endif
 
 .if !defined(TOOLS_IGNORE.yacc) && !empty(USE_TOOLS:Myacc)
@@ -376,7 +361,6 @@ TOOLS_ARGS.yacc=		-y
 ${_TOOLS_VARNAME.yacc}=		${TOOLS_REAL_CMD.yacc} ${TOOLS_ARGS.yacc}
 .    endif
 .  endif
-TOOLS_CMD.yacc=			${TOOLS_DIR}/bin/yacc
 .endif
 
 ######################################################################
@@ -413,7 +397,6 @@ ${_TOOLS_VARNAME.${_t_}}=	${TOOLS_REAL_CMD.${_t_}} ${TOOLS_ARGS.${_t_}}
 .    else
 ${_TOOLS_VARNAME.${_t_}}=	${_TOOLS_VARNAME.${_t_}}_not_defined_
 .    endif
-TOOLS_CMD.${_t_}?=		${TOOLS_DIR}/bin/${_t_}
 .  endif
 .endfor
 .undef _t_
diff --git a/mk/tools/texinfo.mk b/mk/tools/texinfo.mk
index ebce5916977a..21c80dfbc8e7 100644
--- a/mk/tools/texinfo.mk
+++ b/mk/tools/texinfo.mk
@@ -1,4 +1,4 @@
-# $NetBSD: texinfo.mk,v 1.2 2005/04/24 22:57:23 jlam Exp $
+# $NetBSD: texinfo.mk,v 1.3 2005/04/26 15:32:05 jlam Exp $
 
 # Create an install-info script that is a "no operation" command, as
 # registration of info files is handled by the INSTALL script.
@@ -14,7 +14,6 @@ MAKE_ENV+=		INSTALL_INFO=${TOOLS_CMD.install-info:Q}
 USE_MAKEINFO?=			no
 .if empty(USE_MAKEINFO:M[nN][oO])
 TOOLS_WRAP+=			makeinfo
-TOOLS_CMD.makeinfo=		${TOOLS_DIR}/bin/makeinfo
 TOOLS_REAL_CMDLINE.makeinfo=	${MAKEINFO}
 .else
 TOOLS_BROKEN+=			makeinfo