Compute the installation prefix for every tool specified so that the

"TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE,
etc., can be used immediately after bsd.tools.mk is included.

1 files changed, 73 insertions, 69 deletions

diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 6a05091632e..0e466e1f939 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.71 2005/05/13 22:08:20 jlam Exp $
+# $NetBSD: replace.mk,v 1.72 2005/05/14 05:57:43 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.
@@ -118,7 +118,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.[=
 .  elif !empty(_TOOLS_USE_PKGSRC.[:M[yY][eE][sS])
 TOOLS_DEPENDS.[?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			[
-EVAL_PREFIX+=			TOOLS_PREFIX.[=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.[=coreutils
 TOOLS_REAL_CMD.[=		${TOOLS_PREFIX.[}/bin/${GNU_PROGRAM_PREFIX}[
 .  endif
 .endif
@@ -129,7 +129,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.awk=
 .  elif !empty(_TOOLS_USE_PKGSRC.awk:M[yY][eE][sS])
 TOOLS_DEPENDS.awk?=		gawk>=3.1.1:../../lang/gawk
 TOOLS_CREATE+=			awk
-EVAL_PREFIX+=			TOOLS_PREFIX.awk=gawk
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.awk=gawk
 TOOLS_REAL_CMD.awk=		${TOOLS_PREFIX.awk}/bin/${GNU_PROGRAM_PREFIX}awk
 TOOLS_${_TOOLS_VARNAME.awk}=	${TOOLS_REAL_CMD.awk}
 .  endif
@@ -141,7 +141,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.basename=
 .  elif !empty(_TOOLS_USE_PKGSRC.basename:M[yY][eE][sS])
 TOOLS_DEPENDS.basename?=	coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			basename
-EVAL_PREFIX+=			TOOLS_PREFIX.basename=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.basename=coreutils
 TOOLS_REAL_CMD.basename=	${TOOLS_PREFIX.basename}/bin/${GNU_PROGRAM_PREFIX}basename
 TOOLS_${_TOOLS_VARNAME.basename}=	${TOOLS_REAL_CMD.basename}
 .  endif
@@ -153,7 +153,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.bison=
 .  elif !empty(_TOOLS_USE_PKGSRC.bison:M[yY][eE][sS])
 TOOLS_DEPENDS.bison?=		bison>=1.0:../../devel/bison
 TOOLS_CREATE+=			bison
-EVAL_PREFIX+=			TOOLS_PREFIX.bison=bison
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.bison=bison
 TOOLS_REAL_CMD.bison=		${TOOLS_PREFIX.bison}/bin/bison
 TOOLS_REAL_ARGS.bison=		-y
 TOOLS_${_TOOLS_VARNAME.bison}=	${TOOLS_REAL_CMD.bison} ${TOOLS_REAL_ARGS.bison}
@@ -167,7 +167,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.bzcat=
 .  elif !empty(_TOOLS_USE_PKGSRC.bzcat:M[yY][eE][sS])
 TOOLS_DEPENDS.bzcat?=		bzip2>=0.9.0b:../../archivers/bzip2
 TOOLS_CREATE+=			bzcat
-EVAL_PREFIX+=			TOOLS_PREFIX.bzcat=bzip2
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.bzcat=bzip2
 TOOLS_REAL_CMD.bzcat=		${TOOLS_PREFIX.bzcat}/bin/bzcat
 TOOLS_${_TOOLS_VARNAME.bzcat}=	${TOOLS_REAL_CMD.bzcat}
 .  endif
@@ -179,7 +179,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.cat=
 .  elif !empty(_TOOLS_USE_PKGSRC.cat:M[yY][eE][sS])
 TOOLS_DEPENDS.cat?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			cat
-EVAL_PREFIX+=			TOOLS_PREFIX.cat=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.cat=coreutils
 TOOLS_REAL_CMD.cat=		${TOOLS_PREFIX.cat}/bin/${GNU_PROGRAM_PREFIX}cat
 TOOLS_${_TOOLS_VARNAME.cat}=	${TOOLS_REAL_CMD.cat}
 .  endif
@@ -191,7 +191,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.chgrp=
 .  elif !empty(_TOOLS_USE_PKGSRC.chgrp:M[yY][eE][sS])
 TOOLS_DEPENDS.chgrp?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			chgrp
-EVAL_PREFIX+=			TOOLS_PREFIX.chgrp=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.chgrp=coreutils
 TOOLS_REAL_CMD.chgrp=		${TOOLS_PREFIX.chgrp}/bin/${GNU_PROGRAM_PREFIX}chgrp
 TOOLS_${_TOOLS_VARNAME.chgrp}=	${TOOLS_REAL_CMD.chgrp}
 .  endif
@@ -203,7 +203,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.chmod=
 .  elif !empty(_TOOLS_USE_PKGSRC.chmod:M[yY][eE][sS])
 TOOLS_DEPENDS.chmod?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			chmod
-EVAL_PREFIX+=			TOOLS_PREFIX.chmod=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.chmod=coreutils
 TOOLS_REAL_CMD.chmod=		${TOOLS_PREFIX.chmod}/bin/${GNU_PROGRAM_PREFIX}chmod
 TOOLS_${_TOOLS_VARNAME.chmod}=	${TOOLS_REAL_CMD.chmod}
 .  endif
@@ -215,7 +215,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.chown=
 .  elif !empty(_TOOLS_USE_PKGSRC.chown:M[yY][eE][sS])
 TOOLS_DEPENDS.chown?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			chown
-EVAL_PREFIX+=			TOOLS_PREFIX.chown=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.chown=coreutils
 TOOLS_REAL_CMD.chown=		${TOOLS_PREFIX.chown}/bin/${GNU_PROGRAM_PREFIX}chown
 TOOLS_${_TOOLS_VARNAME.chown}=	${TOOLS_REAL_CMD.chown}
 .  endif
@@ -227,7 +227,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.cmp=
 .  elif !empty(_TOOLS_USE_PKGSRC.cmp:M[yY][eE][sS])
 TOOLS_DEPENDS.cmp?=		diffutils>=2.8.1:../../devel/diffutils
 TOOLS_CREATE+=			cmp
-EVAL_PREFIX+=			TOOLS_PREFIX.cmp=diffutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.cmp=diffutils
 TOOLS_REAL_CMD.cmp=		${TOOLS_PREFIX.cmp}/bin/cmp
 TOOLS_${_TOOLS_VARNAME.cmp}=	${TOOLS_REAL_CMD.cmp}
 .  endif
@@ -239,7 +239,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.cp=
 .  elif !empty(_TOOLS_USE_PKGSRC.cp:M[yY][eE][sS])
 TOOLS_DEPENDS.cp?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			cp
-EVAL_PREFIX+=			TOOLS_PREFIX.cp=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.cp=coreutils
 TOOLS_REAL_CMD.cp=		${TOOLS_PREFIX.cp}/bin/${GNU_PROGRAM_PREFIX}cp
 TOOLS_${_TOOLS_VARNAME.cp}=	${TOOLS_REAL_CMD.cp}
 .  endif
@@ -251,7 +251,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.cut=
 .  elif !empty(_TOOLS_USE_PKGSRC.cut:M[yY][eE][sS])
 TOOLS_DEPENDS.cut?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			cut
-EVAL_PREFIX+=			TOOLS_PREFIX.cut=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.cut=coreutils
 TOOLS_REAL_CMD.cut=		${TOOLS_PREFIX.cut}/bin/${GNU_PROGRAM_PREFIX}cut
 TOOLS_${_TOOLS_VARNAME.cut}=	${TOOLS_REAL_CMD.cut}
 .  endif
@@ -263,7 +263,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.date=
 .  elif !empty(_TOOLS_USE_PKGSRC.date:M[yY][eE][sS])
 TOOLS_DEPENDS.date?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			date
-EVAL_PREFIX+=			TOOLS_PREFIX.date=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.date=coreutils
 TOOLS_REAL_CMD.date=		${TOOLS_PREFIX.date}/bin/${GNU_PROGRAM_PREFIX}date
 TOOLS_${_TOOLS_VARNAME.date}=	${TOOLS_REAL_CMD.date}
 .  endif
@@ -275,7 +275,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.dirname=
 .  elif !empty(_TOOLS_USE_PKGSRC.dirname:M[yY][eE][sS])
 TOOLS_DEPENDS.dirname?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			dirname
-EVAL_PREFIX+=			TOOLS_PREFIX.dirname=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.dirname=coreutils
 TOOLS_REAL_CMD.dirname=		${TOOLS_PREFIX.dirname}/bin/${GNU_PROGRAM_PREFIX}dirname
 TOOLS_${_TOOLS_VARNAME.dirname}=	${TOOLS_REAL_CMD.dirname}
 .  endif
@@ -287,7 +287,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.echo=
 .  elif !empty(_TOOLS_USE_PKGSRC.echo:M[yY][eE][sS])
 TOOLS_DEPENDS.echo?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			echo
-EVAL_PREFIX+=			TOOLS_PREFIX.echo=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.echo=coreutils
 TOOLS_REAL_CMD.echo=		${TOOLS_PREFIX.echo}/bin/${GNU_PROGRAM_PREFIX}echo
 TOOLS_${_TOOLS_VARNAME.echo}=	${TOOLS_REAL_CMD.echo}
 .  endif
@@ -299,7 +299,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.egrep=
 .  elif !empty(_TOOLS_USE_PKGSRC.egrep:M[yY][eE][sS])
 TOOLS_DEPENDS.egrep?=		grep>=2.5.1:../../textproc/grep
 TOOLS_CREATE+=			egrep
-EVAL_PREFIX+=			TOOLS_PREFIX.egrep=grep
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.egrep=grep
 TOOLS_REAL_CMD.egrep=		${TOOLS_PREFIX.egrep}/bin/${GNU_PROGRAM_PREFIX}egrep
 TOOLS_${_TOOLS_VARNAME.egrep}=	${TOOLS_REAL_CMD.egrep}
 .  endif
@@ -311,7 +311,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.env=
 .  elif !empty(_TOOLS_USE_PKGSRC.env:M[yY][eE][sS])
 TOOLS_DEPENDS.env?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			env
-EVAL_PREFIX+=			TOOLS_PREFIX.env=coreutilsj
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.env=coreutilsj
 TOOLS_REAL_CMD.env=		${TOOLS_PREFIX.env}/bin/${GNU_PROGRAM_PREFIX}env
 TOOLS_${_TOOLS_VARNAME.env}=	${TOOLS_REAL_CMD.env}
 .  endif
@@ -323,7 +323,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.expr=
 .  elif !empty(_TOOLS_USE_PKGSRC.expr:M[yY][eE][sS])
 TOOLS_DEPENDS.expr?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			expr
-EVAL_PREFIX+=			TOOLS_PREFIX.expr=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.expr=coreutils
 TOOLS_REAL_CMD.expr=		${TOOLS_PREFIX.expr}/bin/${GNU_PROGRAM_PREFIX}expr
 TOOLS_${_TOOLS_VARNAME.expr}=	${TOOLS_REAL_CMD.expr}
 .  endif
@@ -335,7 +335,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.false=
 .  elif !empty(_TOOLS_USE_PKGSRC.false:M[yY][eE][sS])
 TOOLS_DEPENDS.false?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			false
-EVAL_PREFIX+=			TOOLS_PREFIX.false=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.false=coreutils
 TOOLS_REAL_CMD.false=		${TOOLS_PREFIX.false}/bin/${GNU_PROGRAM_PREFIX}false
 TOOLS_${_TOOLS_VARNAME.false}=	${TOOLS_REAL_CMD.false}
 .  endif
@@ -347,7 +347,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.fgrep=
 .  elif !empty(_TOOLS_USE_PKGSRC.fgrep:M[yY][eE][sS])
 TOOLS_DEPENDS.fgrep?=		grep>=2.5.1:../../textproc/grep
 TOOLS_CREATE+=			fgrep
-EVAL_PREFIX+=			TOOLS_PREFIX.fgrep=grep
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.fgrep=grep
 TOOLS_REAL_CMD.fgrep=		${TOOLS_PREFIX.fgrep}/bin/${GNU_PROGRAM_PREFIX}fgrep
 TOOLS_${_TOOLS_VARNAME.fgrep}=	${TOOLS_REAL_CMD.fgrep}
 .  endif
@@ -359,7 +359,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.file=
 .  elif !empty(_TOOLS_USE_PKGSRC.file:M[yY][eE][sS])
 TOOLS_DEPENDS.file?=		file>=4.13:../../sysutils/file
 TOOLS_CREATE+=			file
-EVAL_PREFIX+=			TOOLS_PREFIX.file=file
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.file=file
 TOOLS_REAL_CMD.file=		${TOOLS_PREFIX.file}/bin/file
 TOOLS_${_TOOLS_VARNAME.file}=	${TOOLS_REAL_CMD.file}
 .  endif
@@ -371,7 +371,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.find=
 .  elif !empty(_TOOLS_USE_PKGSRC.find:M[yY][eE][sS])
 TOOLS_DEPENDS.find?=		findutils>=4.1:../../sysutils/findutils
 TOOLS_CREATE+=			find
-EVAL_PREFIX+=			TOOLS_PREFIX.find=findutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.find=findutils
 TOOLS_REAL_CMD.find=		${TOOLS_PREFIX.find}/bin/${GNU_PROGRAM_PREFIX}find
 TOOLS_${_TOOLS_VARNAME.find}=	${TOOLS_REAL_CMD.find}
 .  endif
@@ -383,7 +383,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.gawk=
 .  elif !empty(_TOOLS_USE_PKGSRC.gawk:M[yY][eE][sS])
 TOOLS_DEPENDS.gawk?=		gawk>=3.1.1:../../lang/gawk
 TOOLS_CREATE+=			gawk
-EVAL_PREFIX+=			TOOLS_PREFIX.gawk=gawk
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gawk=gawk
 TOOLS_REAL_CMD.gawk=		${TOOLS_PREFIX.gawk}/bin/${GNU_PROGRAM_PREFIX}awk
 TOOLS_${_TOOLS_VARNAME.gawk}=	${TOOLS_REAL_CMD.gawk}
 .  endif
@@ -396,7 +396,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.gm4=
 .  elif !empty(_TOOLS_USE_PKGSRC.gm4:M[yY][eE][sS])
 TOOLS_DEPENDS.gm4?=		m4>=1.4:../../devel/m4
 TOOLS_CREATE+=			gm4
-EVAL_PREFIX+=			TOOLS_PREFIX.gm4=m4
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gm4=m4
 TOOLS_REAL_CMD.gm4=		${TOOLS_PREFIX.gm4}/bin/gm4
 TOOLS_${_TOOLS_VARNAME.gm4}=	${TOOLS_REAL_CMD.gm4}
 .  endif
@@ -409,7 +409,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.gmake=
 .  elif !empty(_TOOLS_USE_PKGSRC.gmake:M[yY][eE][sS])
 TOOLS_DEPENDS.gmake?=		gmake>=3.78:../../devel/gmake
 TOOLS_CREATE+=			gmake
-EVAL_PREFIX+=			TOOLS_PREFIX.gmake=gmake
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gmake=gmake
 TOOLS_REAL_CMD.gmake=		${TOOLS_PREFIX.gmake}/bin/gmake
 TOOLS_${_TOOLS_VARNAME.gmake}=	${TOOLS_REAL_CMD.gmake}
 .  endif
@@ -421,7 +421,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.grep=
 .  elif !empty(_TOOLS_USE_PKGSRC.grep:M[yY][eE][sS])
 TOOLS_DEPENDS.grep?=		grep>=2.5.1:../../textproc/grep
 TOOLS_CREATE+=			grep
-EVAL_PREFIX+=			TOOLS_PREFIX.grep=grep
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.grep=grep
 TOOLS_REAL_CMD.grep=		${TOOLS_PREFIX.grep}/bin/${GNU_PROGRAM_PREFIX}grep
 TOOLS_${_TOOLS_VARNAME.grep}=	${TOOLS_REAL_CMD.grep}
 .  endif
@@ -433,7 +433,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.gsed=
 .  elif !empty(_TOOLS_USE_PKGSRC.gsed:M[yY][eE][sS])
 TOOLS_DEPENDS.gsed?=		gsed>=3.0.2:../../textproc/gsed
 TOOLS_CREATE+=			gsed
-EVAL_PREFIX+=			TOOLS_PREFIX.gsed=gsed
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gsed=gsed
 TOOLS_REAL_CMD.gsed=		${TOOLS_PREFIX.gsed}/bin/${GNU_PROGRAM_PREFIX}sed
 TOOLS_${_TOOLS_VARNAME.gsed}=	${TOOLS_REAL_CMD.gsed}
 .  endif
@@ -450,7 +450,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.gtar=
 #
 #TOOLS_DEPENDS.gtar?=		pax>=20040802:../../archivers/pax
 TOOLS_CREATE+=			gtar
-EVAL_PREFIX+=			TOOLS_PREFIX.gtar=pax
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gtar=pax
 TOOLS_REAL_CMD.gtar=		${TOOLS_PREFIX.gtar}/bin/tar
 TOOLS_${_TOOLS_VARNAME.gtar}=	${TOOLS_REAL_CMD.gtar}
 .  endif
@@ -463,7 +463,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.gunzip=
 .  elif !empty(_TOOLS_USE_PKGSRC.gunzip:M[yY][eE][sS])
 TOOLS_DEPENDS.gunzip?=		gzip-base>=1.2.4b:../../archivers/gzip-base
 TOOLS_CREATE+=			gunzip
-EVAL_PREFIX+=			TOOLS_PREFIX.gunzip=gzip-base
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gunzip=gzip-base
 TOOLS_REAL_CMD.gunzip=		${TOOLS_PREFIX.gunzip}/bin/gunzip
 TOOLS_REAL_ARGS.gunzip=		-f
 TOOLS_${_TOOLS_VARNAME.gunzip}=	${TOOLS_REAL_CMD.gunzip} ${TOOLS_REAL_ARGS.gunzip}
@@ -476,7 +476,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.gzcat=
 .  elif !empty(_TOOLS_USE_PKGSRC.gzcat:M[yY][eE][sS])
 TOOLS_DEPENDS.gzcat?=		gzip-base>=1.2.4b:../../archivers/gzip-base
 TOOLS_CREATE+=			gzcat
-EVAL_PREFIX+=			TOOLS_PREFIX.gzcat=gzip-base
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gzcat=gzip-base
 TOOLS_REAL_CMD.gzcat=		${TOOLS_PREFIX.gzcat}/bin/gzcat
 TOOLS_${_TOOLS_VARNAME.gzcat}=	${TOOLS_REAL_CMD.gzcat}
 .  endif
@@ -488,7 +488,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.gzip=
 .  elif !empty(_TOOLS_USE_PKGSRC.gzip:M[yY][eE][sS])
 TOOLS_DEPENDS.gzip?=		gzip-base>=1.2.4b:../../archivers/gzip-base
 TOOLS_CREATE+=			gzip
-EVAL_PREFIX+=			TOOLS_PREFIX.gzip=gzip-base
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gzip=gzip-base
 TOOLS_REAL_CMD.gzip=		${TOOLS_PREFIX.gzip}/bin/gzip
 TOOLS_REAL_ARGS.gzip=		-nf ${GZIP}
 TOOLS_${_TOOLS_VARNAME.gzip}=	${TOOLS_REAL_CMD.gzip} ${TOOLS_REAL_ARGS.gzip}
@@ -501,7 +501,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.head=
 .  elif !empty(_TOOLS_USE_PKGSRC.head:M[yY][eE][sS])
 TOOLS_DEPENDS.head?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			head
-EVAL_PREFIX+=			TOOLS_PREFIX.head=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.head=coreutils
 TOOLS_REAL_CMD.head=		${TOOLS_PREFIX.head}/bin/${GNU_PROGRAM_PREFIX}head
 TOOLS_${_TOOLS_VARNAME.head}=	${TOOLS_REAL_CMD.head}
 .  endif
@@ -513,7 +513,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.hostname=
 .  elif !empty(_TOOLS_USE_PKGSRC.hostname:M[yY][eE][sS])
 TOOLS_DEPENDS.hostname?=	coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			hostname
-EVAL_PREFIX+=			TOOLS_PREFIX.hostname=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.hostname=coreutils
 TOOLS_REAL_CMD.hostname=	${TOOLS_PREFIX.hostname}/bin/${GNU_PROGRAM_PREFIX}hostname
 TOOLS_${_TOOLS_VARNAME.hostname}=	${TOOLS_REAL_CMD.hostname}
 .  endif
@@ -525,7 +525,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.id=
 .  elif !empty(_TOOLS_USE_PKGSRC.id:M[yY][eE][sS])
 TOOLS_DEPENDS.id?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			id
-EVAL_PREFIX+=			TOOLS_PREFIX.id=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.id=coreutils
 TOOLS_REAL_CMD.id=		${TOOLS_PREFIX.id}/bin/${GNU_PROGRAM_PREFIX}id
 TOOLS_${_TOOLS_VARNAME.id}=	${TOOLS_REAL_CMD.id}
 .  endif
@@ -537,7 +537,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.install=
 .  elif !empty(_TOOLS_USE_PKGSRC.install:M[yY][eE][sS])
 TOOLS_DEPENDS.install?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			install
-EVAL_PREFIX+=			TOOLS_PREFIX.install=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.install=coreutils
 TOOLS_REAL_CMD.install=		${TOOLS_PREFIX.install}/bin/${GNU_PROGRAM_PREFIX}install
 TOOLS_${_TOOLS_VARNAME.install}=	${TOOLS_REAL_CMD.install}
 .  endif
@@ -550,7 +550,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.lex=
 .    include "../../devel/flex/buildlink3.mk"
 TOOLS_DEPENDS.lex?=	${BUILDLINK_DEPENDS.flex}:${BUILDLINK_PKGSRCDIR.flex}
 TOOLS_CREATE+=			lex
-EVAL_PREFIX+=			TOOLS_PREFIX.lex=flex
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.lex=flex
 TOOLS_REAL_CMD.lex=		${TOOLS_PREFIX.lex}/bin/flex
 TOOLS_${_TOOLS_VARNAME.lex}=	${TOOLS_REAL_CMD.lex}
 .  endif
@@ -562,7 +562,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.lha=
 .  elif !empty(_TOOLS_USE_PKGSRC.lha:M[yY][eE][sS])
 TOOLS_DEPENDS.lha?=		lha>=114.9:../../archivers/lha
 TOOLS_CREATE+=			lha
-EVAL_PREFIX+=			TOOLS_PREFIX.lha=lha
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.lha=lha
 TOOLS_REAL_CMD.lha=		${TOOLS_PREFIX.lha}/bin/lha
 TOOLS_${_TOOLS_VARNAME.lha}=	${TOOLS_REAL_CMD.lha}
 .  endif
@@ -574,7 +574,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.ln=
 .  elif !empty(_TOOLS_USE_PKGSRC.ln:M[yY][eE][sS])
 TOOLS_DEPENDS.ln?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			ln
-EVAL_PREFIX+=			TOOLS_PREFIX.ln=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.ln=coreutils
 TOOLS_REAL_CMD.ln=		${TOOLS_PREFIX.ln}/bin/${GNU_PROGRAM_PREFIX}ln
 TOOLS_${_TOOLS_VARNAME.ln}=	${TOOLS_REAL_CMD.ln}
 .  endif
@@ -586,7 +586,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.ls=
 .  elif !empty(_TOOLS_USE_PKGSRC.ls:M[yY][eE][sS])
 TOOLS_DEPENDS.ls?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			ls
-EVAL_PREFIX+=			TOOLS_PREFIX.ls=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.ls=coreutils
 TOOLS_REAL_CMD.ls=		${TOOLS_PREFIX.ls}/bin/${GNU_PROGRAM_PREFIX}ls
 TOOLS_${_TOOLS_VARNAME.ls}=	${TOOLS_REAL_CMD.ls}
 .  endif
@@ -598,7 +598,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.m4=
 .  elif !empty(_TOOLS_USE_PKGSRC.m4:M[yY][eE][sS])
 TOOLS_DEPENDS.m4?=		m4>=1.4:../../devel/m4
 TOOLS_CREATE+=			m4
-EVAL_PREFIX+=			TOOLS_PREFIX.m4=m4
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.m4=m4
 TOOLS_REAL_CMD.m4=		${TOOLS_PREFIX.m4}/bin/gm4
 TOOLS_${_TOOLS_VARNAME.m4}=	${TOOLS_REAL_CMD.m4}
 .  endif
@@ -610,7 +610,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.mail=
 .  elif !empty(_TOOLS_USE_PKGSRC.mail:M[yY][eE][sS])
 TOOLS_DEPENDS.mail?=		nail>=11.22:../../mail/nail
 TOOLS_CREATE+=			mail
-EVAL_PREFIX+=			TOOLS_PREFIX.mail=nail
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.mail=nail
 TOOLS_REAL_CMD.mail=		${TOOLS_PREFIX.mail}/bin/nail
 TOOLS_${_TOOLS_VARNAME.mail}=	${TOOLS_REAL_CMD.mail}
 .  endif
@@ -622,7 +622,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.mkdir=
 .  elif !empty(_TOOLS_USE_PKGSRC.mkdir:M[yY][eE][sS])
 TOOLS_DEPENDS.mkdir?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			mkdir
-EVAL_PREFIX+=			TOOLS_PREFIX.mkdir=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.mkdir=coreutils
 TOOLS_REAL_CMD.mkdir=		${TOOLS_PREFIX.mkdir}/bin/${GNU_PROGRAM_PREFIX}mkdir
 TOOLS_REAL_ARGS.mkdir=		-p
 TOOLS_${_TOOLS_VARNAME.mkdir}=	${TOOLS_REAL_CMD.mkdir} ${TOOLS_REAL_ARGS.mkdir}
@@ -639,7 +639,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.mtree=
 #
 #TOOLS_DEPENDS.mtree?=		mtree>=20040722:../../pkgtools/mtree
 TOOLS_CREATE+=			mtree
-EVAL_PREFIX+=			TOOLS_PREFIX.mtree=mtree
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.mtree=mtree
 TOOLS_REAL_CMD.mtree=		${TOOLS_PREFIX.mtree}/bin/mtree
 TOOLS_${_TOOLS_VARNAME.mtree}=	${TOOLS_REAL_CMD.mtree}
 .  endif
@@ -651,7 +651,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.mv=
 .  elif !empty(_TOOLS_USE_PKGSRC.mv:M[yY][eE][sS])
 TOOLS_DEPENDS.mv?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			mv
-EVAL_PREFIX+=			TOOLS_PREFIX.mv=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.mv=coreutils
 TOOLS_REAL_CMD.mv=		${TOOLS_PREFIX.mv}/bin/${GNU_PROGRAM_PREFIX}mv
 TOOLS_${_TOOLS_VARNAME.mv}=	${TOOLS_REAL_CMD.mv}
 .  endif
@@ -663,7 +663,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.nice=
 .  elif !empty(_TOOLS_USE_PKGSRC.nice:M[yY][eE][sS])
 TOOLS_DEPENDS.nice?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			nice
-EVAL_PREFIX+=			TOOLS_PREFIX.nice=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.nice=coreutils
 TOOLS_REAL_CMD.nice=		${TOOLS_PREFIX.nice}/bin/${GNU_PROGRAM_PREFIX}nice
 TOOLS_${_TOOLS_VARNAME.nice}=	${TOOLS_REAL_CMD.nice}
 .  endif
@@ -675,7 +675,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.patch=
 .  elif !empty(_TOOLS_USE_PKGSRC.patch:M[yY][eE][sS])
 TOOLS_DEPENDS.patch?=		patch>=2.2:../../devel/patch
 TOOLS_CREATE+=			patch
-EVAL_PREFIX+=			TOOLS_PREFIX.patch=patch
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.patch=patch
 TOOLS_REAL_CMD.patch=		${TOOLS_PREFIX.patch}/bin/gpatch
 TOOLS_${_TOOLS_VARNAME.patch}=	${TOOLS_REAL_CMD.patch}
 .  endif
@@ -691,7 +691,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.pax=
 #
 #TOOLS_DEPENDS.pax?=		pax>=20040802:../../archivers/pax
 TOOLS_CREATE+=			pax
-EVAL_PREFIX+=			TOOLS_PREFIX.pax=pax
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.pax=pax
 TOOLS_REAL_CMD.pax=		${TOOLS_PREFIX.pax}/bin/pax
 TOOLS_${_TOOLS_VARNAME.pax}=	${TOOLS_REAL_CMD.pax}
 .  endif
@@ -703,7 +703,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.pwd=
 .  elif !empty(_TOOLS_USE_PKGSRC.pwd:M[yY][eE][sS])
 TOOLS_DEPENDS.pwd?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			pwd
-EVAL_PREFIX+=			TOOLS_PREFIX.pwd=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.pwd=coreutils
 TOOLS_REAL_CMD.pwd=		${TOOLS_PREFIX.pwd}/bin/${GNU_PROGRAM_PREFIX}pwd
 TOOLS_${_TOOLS_VARNAME.pwd}=	${TOOLS_REAL_CMD.pwd}
 .  endif
@@ -715,7 +715,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.rm=
 .  elif !empty(_TOOLS_USE_PKGSRC.rm:M[yY][eE][sS])
 TOOLS_DEPENDS.rm?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			rm
-EVAL_PREFIX+=			TOOLS_PREFIX.rm=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.rm=coreutils
 TOOLS_REAL_CMD.rm=		${TOOLS_PREFIX.rm}/bin/${GNU_PROGRAM_PREFIX}rm
 TOOLS_${_TOOLS_VARNAME.rm}=	${TOOLS_REAL_CMD.rm}
 .  endif
@@ -727,7 +727,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.rmdir=
 .  elif !empty(_TOOLS_USE_PKGSRC.rmdir:M[yY][eE][sS])
 TOOLS_DEPENDS.rmdir?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			rmdir
-EVAL_PREFIX+=			TOOLS_PREFIX.rmdir=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.rmdir=coreutils
 TOOLS_REAL_CMD.rmdir=		${TOOLS_PREFIX.rmdir}/bin/${GNU_PROGRAM_PREFIX}rmdir
 TOOLS_${_TOOLS_VARNAME.rmdir}=	${TOOLS_REAL_CMD.rmdir}
 .  endif
@@ -739,7 +739,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.sed=
 .  elif !empty(_TOOLS_USE_PKGSRC.sed:M[yY][eE][sS])
 TOOLS_DEPENDS.sed?=		nbsed>=20040821:../../textproc/nbsed
 TOOLS_CREATE+=			sed
-EVAL_PREFIX+=			TOOLS_PREFIX.sed=nbsed
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.sed=nbsed
 TOOLS_REAL_CMD.sed=		${TOOLS_PREFIX.nbsed}/bin/nbsed
 TOOLS_${_TOOLS_VARNAME.sed}=	${TOOLS_REAL_CMD.sed}
 .  endif
@@ -751,7 +751,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.sh=
 .  elif !empty(_TOOLS_USE_PKGSRC.sh:M[yY][eE][sS])
 TOOLS_DEPENDS.sh?=		pdksh>=5.2.14:../../shells/pdksh
 TOOLS_CREATE+=			sh
-EVAL_PREFIX+=			TOOLS_PREFIX.sh=pdksh
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.sh=pdksh
 TOOLS_REAL_CMD.sh=		${TOOLS_PREFIX.sh}/bin/pdksh
 TOOLS_${_TOOLS_VARNAME.sh}=	${TOOLS_REAL_CMD.sh}
 .  endif
@@ -764,7 +764,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.shlock=
 .  elif !empty(_TOOLS_USE_PKGSRC.shlock:M[yY][eE][sS])
 TOOLS_DEPENDS.shlock?=		shlock>=20020114:../../pkgtools/shlock
 TOOLS_CREATE+=			shlock
-EVAL_PREFIX+=			TOOLS_PREFIX.shlock=shlock
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.shlock=shlock
 TOOLS_REAL_CMD.shlock=		${TOOLS_PREFIX.shlock}/bin/shlock
 TOOLS_${_TOOLS_VARNAME.shlock}=	${TOOLS_REAL_CMD.shlock}
 .  endif
@@ -776,7 +776,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.sort=
 .  elif !empty(_TOOLS_USE_PKGSRC.sort:M[yY][eE][sS])
 TOOLS_DEPENDS.sort?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			sort
-EVAL_PREFIX+=			TOOLS_PREFIX.sort=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.sort=coreutils
 TOOLS_REAL_CMD.sort=		${TOOLS_PREFIX.sort}/bin/${GNU_PROGRAM_PREFIX}sort
 TOOLS_${_TOOLS_VARNAME.sort}=	${TOOLS_REAL_CMD.sort}
 .  endif
@@ -788,7 +788,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.tail=
 .  elif !empty(_TOOLS_USE_PKGSRC.tail:M[yY][eE][sS])
 TOOLS_DEPENDS.tail?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			tail
-EVAL_PREFIX+=			TOOLS_PREFIX.tail=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.tail=coreutils
 TOOLS_REAL_CMD.tail=		${TOOLS_PREFIX.tail}/bin/${GNU_PROGRAM_PREFIX}tail
 TOOLS_${_TOOLS_VARNAME.tail}=	${TOOLS_REAL_CMD.tail}
 .  endif
@@ -800,7 +800,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.tbl=
 .  elif !empty(_TOOLS_USE_PKGSRC.tbl:M[yY][eE][sS])
 TOOLS_DEPENDS.tbl?=		groff>=1.19nb4:../../textproc/groff
 TOOLS_CREATE+=			tbl
-EVAL_PREFIX+=			TOOLS_PREFIX.tbl=groff
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.tbl=groff
 TOOLS_REAL_CMD.tbl=		${TOOLS_PREFIX.tbl}/bin/tbl
 TOOLS_${_TOOLS_VARNAME.tbl}=	${TOOLS_REAL_CMD.tbl}
 .  endif
@@ -812,7 +812,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.tee=
 .  elif !empty(_TOOLS_USE_PKGSRC.tee:M[yY][eE][sS])
 TOOLS_DEPENDS.tee?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			tee
-EVAL_PREFIX+=			TOOLS_PREFIX.tee=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.tee=coreutils
 TOOLS_REAL_CMD.tee=		${TOOLS_PREFIX.tee}/bin/${GNU_PROGRAM_PREFIX}tee
 TOOLS_${_TOOLS_VARNAME.tee}=	${TOOLS_REAL_CMD.tee}
 .  endif
@@ -824,7 +824,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.test=
 .  elif !empty(_TOOLS_USE_PKGSRC.test:M[yY][eE][sS])
 TOOLS_DEPENDS.test?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			test
-EVAL_PREFIX+=			TOOLS_PREFIX.test=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.test=coreutils
 TOOLS_REAL_CMD.test=		${TOOLS_PREFIX.test}/bin/${GNU_PROGRAM_PREFIX}test
 TOOLS_${_TOOLS_VARNAME.test}=	${TOOLS_REAL_CMD.test}
 .  endif
@@ -836,7 +836,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.touch=
 .  elif !empty(_TOOLS_USE_PKGSRC.touch:M[yY][eE][sS])
 TOOLS_DEPENDS.touch?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			touch
-EVAL_PREFIX+=			TOOLS_PREFIX.touch=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.touch=coreutils
 TOOLS_REAL_CMD.touch=		${TOOLS_PREFIX.touch}/bin/${GNU_PROGRAM_PREFIX}touch
 TOOLS_${_TOOLS_VARNAME.touch}=	${TOOLS_REAL_CMD.touch}
 .  endif
@@ -848,7 +848,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.tr=
 .  elif !empty(_TOOLS_USE_PKGSRC.tr:M[yY][eE][sS])
 TOOLS_DEPENDS.tr?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			tr
-EVAL_PREFIX+=			TOOLS_PREFIX.tr=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.tr=coreutils
 TOOLS_REAL_CMD.tr=		${TOOLS_PREFIX.tr}/bin/${GNU_PROGRAM_PREFIX}tr
 TOOLS_${_TOOLS_VARNAME.tr}=	${TOOLS_REAL_CMD.tr}
 .  endif
@@ -860,7 +860,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.true=
 .  elif !empty(_TOOLS_USE_PKGSRC.true:M[yY][eE][sS])
 TOOLS_DEPENDS.true?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			true
-EVAL_PREFIX+=			TOOLS_PREFIX.true=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.true=coreutils
 TOOLS_REAL_CMD.true=		${TOOLS_PREFIX.true}/bin/${GNU_PROGRAM_PREFIX}true
 TOOLS_${_TOOLS_VARNAME.true}=	${TOOLS_REAL_CMD.true}
 .  endif
@@ -872,7 +872,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.tsort=
 .  elif !empty(_TOOLS_USE_PKGSRC.tsort:M[yY][eE][sS])
 TOOLS_DEPENDS.tsort?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			tsort
-EVAL_PREFIX+=			TOOLS_PREFIX.tsort=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.tsort=coreutils
 TOOLS_REAL_CMD.tsort=		${TOOLS_PREFIX.tsort}/bin/${GNU_PROGRAM_PREFIX}tsort
 TOOLS_${_TOOLS_VARNAME.tsort}=	${TOOLS_REAL_CMD.tsort}
 .  endif
@@ -884,7 +884,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.unrar=
 .  elif !empty(_TOOLS_USE_PKGSRC.unrar:M[yY][eE][sS])
 TOOLS_DEPENDS.unrar?=		unrar>=3.3.4:../../archivers/unrar
 TOOLS_CREATE+=			unrar
-EVAL_PREFIX+=			TOOLS_PREFIX.unrar=unrar
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.unrar=unrar
 TOOLS_REAL_CMD.unrar=		${TOOLS_PREFIX.unrar}/bin/unrar
 TOOLS_${_TOOLS_VARNAME.unrar}=	${TOOLS_REAL_CMD.unrar}
 .  endif
@@ -896,7 +896,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.unzip=
 .  elif !empty(_TOOLS_USE_PKGSRC.unzip:M[yY][eE][sS])
 TOOLS_DEPENDS.unzip?=		unzip-[0-9]*:../../archivers/unzip
 TOOLS_CREATE+=			unzip
-EVAL_PREFIX+=			TOOLS_PREFIX.unzip=unzip
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.unzip=unzip
 TOOLS_REAL_CMD.unzip=		${TOOLS_PREFIX.unzip}/bin/unzip
 TOOLS_${_TOOLS_VARNAME.unzip}=	${TOOLS_REAL_CMD.unzip}
 .  endif
@@ -908,7 +908,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.unzoo=
 .  elif !empty(_TOOLS_USE_PKGSRC.unzoo:M[yY][eE][sS])
 TOOLS_DEPENDS.unzoo?=		unzoo-[0-9]*:../../archivers/unzoo
 TOOLS_CREATE+=			unzoo
-EVAL_PREFIX+=			TOOLS_PREFIX.unzoo=unzoo
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.unzoo=unzoo
 TOOLS_REAL_CMD.unzoo=		${TOOLS_PREFIX.unzoo}/bin/unzoo
 TOOLS_${_TOOLS_VARNAME.unzoo}=	${TOOLS_REAL_CMD.unzoo}
 .  endif
@@ -920,7 +920,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.wc=
 .  elif !empty(_TOOLS_USE_PKGSRC.wc:M[yY][eE][sS])
 TOOLS_DEPENDS.wc?=		coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=			wc
-EVAL_PREFIX+=			TOOLS_PREFIX.wc=coreutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.wc=coreutils
 TOOLS_REAL_CMD.wc=		${TOOLS_PREFIX.wc}/bin/${GNU_PROGRAM_PREFIX}wc
 TOOLS_${_TOOLS_VARNAME.wc}=	${TOOLS_REAL_CMD.wc}
 .  endif
@@ -932,7 +932,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.xargs=
 .  elif !empty(_TOOLS_USE_PKGSRC.xargs:M[yY][eE][sS])
 TOOLS_DEPENDS.xargs?=		findutils>=4.1:../../sysutils/findutils
 TOOLS_CREATE+=			xargs
-EVAL_PREFIX+=			TOOLS_PREFIX.xargs=findutils
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.xargs=findutils
 TOOLS_REAL_CMD.xargs=		${TOOLS_PREFIX.xargs}/bin/${GNU_PROGRAM_PREFIX}xargs
 TOOLS_REAL_ARGS.xargs=		-r	# don't run command if stdin is empty
 TOOLS_${_TOOLS_VARNAME.xargs}=	${TOOLS_REAL_CMD.xargs} ${TOOLS_REAL_ARGS.xargs}
@@ -945,13 +945,17 @@ MAKEFLAGS+=			TOOLS_IGNORE.yacc=
 .  elif !empty(_TOOLS_USE_PKGSRC.yacc:M[yY][eE][sS])
 TOOLS_DEPENDS.yacc?=		bison>=1.0:../../devel/bison
 TOOLS_CREATE+=			yacc
-EVAL_PREFIX+=			TOOLS_PREFIX.yacc=bison
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.yacc=bison
 TOOLS_REAL_CMD.yacc=		${TOOLS_PREFIX.yacc}/bin/bison
 TOOLS_REAL_ARGS.yacc=		-y
 TOOLS_${_TOOLS_VARNAME.yacc}=	${TOOLS_REAL_CMD.yacc} ${TOOLS_REAL_ARGS.yacc}
 .  endif
 .endif
 
+# Compute the locations of the pkgsrc-supplied tools.
+FIND_PREFIX:=	${TOOLS_FIND_PREFIX}
+.include "../../mk/find-prefix.mk"
+
 ######################################################################
 
 # Add the dependencies for each pkgsrc-supplied tool.