Remove mk/find-prefix.mk and its usage from the mk infrastructure.

The find-prefix infrastructure was required in a pkgviews world where
packages installed from pkgsrc could have different installation
prefixes, and this was a way for a dependency prefix to be determined.

Now that pkgviews has been removed there is no longer any need for the
overhead of this infrastructure.  Instead we use BUILDLINK_PREFIX.pkg
for dependencies pulled in via buildlink, or LOCALBASE/PREFIX where the
dependency is coming from pkgsrc.

Provides a reasonable performance win due to the reduction of `pkg_info
-qp` calls, some of which were redundant anyway as they were duplicating
the same information provided by BUILDLINK_PREFIX.pkg.

18 files changed, 140 insertions, 311 deletions

diff --git a/mk/alternatives.mk b/mk/alternatives.mk
index 47c1b05a258..baf3fe91350 100644
--- a/mk/alternatives.mk
+++ b/mk/alternatives.mk
@@ -1,4 +1,4 @@
-# $NetBSD: alternatives.mk,v 1.11 2009/06/14 22:58:05 joerg Exp $
+# $NetBSD: alternatives.mk,v 1.12 2015/11/25 13:05:47 jperkin Exp $
 #
 # This Makefile fragment handles the alternatives system, registering a
 # package in the database.
@@ -62,9 +62,7 @@ ${WRKDIR}/.altdeinstall: ${ALTERNATIVES_SRC}
 
 PRINT_PLIST_AWK+=	/^libdata\/alternatives\// { next; }
 
-EVAL_PREFIX+=			PREFIX.pkg_alternatives=pkg_alternatives
-PREFIX.alternatives_DEFAULT=	${LOCALBASE}
-PKG_ALTERNATIVES=		${PREFIX.pkg_alternatives}/sbin/pkg_alternatives
+PKG_ALTERNATIVES=	${LOCALBASE}/sbin/pkg_alternatives
 
 INSTALL_TEMPLATES+=	${WRKDIR}/.altinstall
 DEINSTALL_TEMPLATES+=	${WRKDIR}/.altdeinstall
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index bd9944ead1a..586a83080a6 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.2013 2015/04/29 14:23:23 jperkin Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.2014 2015/11/25 13:05:47 jperkin Exp $
 #
 # This file is in the public domain.
 #
@@ -422,12 +422,6 @@ _BUILD_DEFS+=		USE_ABI_DEPENDS
 .  endif
 .endif
 
-# Find out the PREFIX of dependencies where the PREFIX is needed at build time.
-.if defined(EVAL_PREFIX)
-FIND_PREFIX:=	${EVAL_PREFIX}
-.  include "find-prefix.mk"
-.endif
-
 .if !defined(_PATH_ORIG)
 _PATH_ORIG:=		${PATH}
 MAKEFLAGS+=		_PATH_ORIG=${_PATH_ORIG:Q}
diff --git a/mk/compiler/distcc.mk b/mk/compiler/distcc.mk
index 816cc6dd206..791f137bc47 100644
--- a/mk/compiler/distcc.mk
+++ b/mk/compiler/distcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: distcc.mk,v 1.31 2013/05/09 23:37:26 riastradh Exp $
+# $NetBSD: distcc.mk,v 1.32 2015/11/25 13:05:47 jperkin Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -67,9 +67,6 @@ _USE_DISTCC=	YES
 .endif
 
 .if !empty(_USE_DISTCC:M[yY][eE][sS])
-EVAL_PREFIX+=		_DISTCCBASE=distcc
-_DISTCCBASE_DEFAULT=	${LOCALBASE}
-
 _DISTCC_DIR=	${WRKDIR}/.distcc
 _DISTCC_VARS=	# empty
 .  if !empty(_LANGUAGES.distcc:Mc)
@@ -94,6 +91,7 @@ PREPEND_PATH+=	${_DISTCC_DIR}/bin
 
 # Add the dependency on distcc.
 TOOL_DEPENDS+=	distcc-[0-9]*:../../devel/distcc
+DISTCCBASE?=	${PREFIX}
 
 .  if defined(DISTCC_HOSTS) && !empty(DISTCC_HOSTS)
 PKGSRC_MAKE_ENV+=	DISTCC_HOSTS=${DISTCC_HOSTS:Q}
@@ -112,11 +110,11 @@ override-tools: ${_DISTCC_${_var_}}
 ${_DISTCC_${_var_}}:
 	${RUN}${MKDIR} ${.TARGET:H}
 	${RUN}					\
-	${LN} -fs ${_DISTCCBASE}/bin/distcc ${.TARGET}
+	${LN} -fs ${DISTCCBASE}/bin/distcc ${.TARGET}
 .      for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
 	${RUN}					\
 	if [ ! -x "${_alias_}" ]; then					\
-		${LN} -fs ${_DISTCCBASE}/bin/distcc ${_alias_};		\
+		${LN} -fs ${DISTCCBASE}/bin/distcc ${_alias_};		\
 	fi
 .      endfor
 .    endif
diff --git a/mk/compiler/f2c.mk b/mk/compiler/f2c.mk
index b793e5069f0..4e0dfeb0315 100644
--- a/mk/compiler/f2c.mk
+++ b/mk/compiler/f2c.mk
@@ -1,4 +1,4 @@
-# $NetBSD: f2c.mk,v 1.16 2013/05/09 23:37:26 riastradh Exp $
+# $NetBSD: f2c.mk,v 1.17 2015/11/25 13:05:47 jperkin Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -60,9 +60,6 @@ _USE_F2C=	YES
 .if !empty(_USE_F2C:M[yY][eE][sS])
 USE_LANGUAGES+=		c
 
-EVAL_PREFIX+=		_F2CBASE=f2c
-_F2CBASE_DEFAULT=	${LOCALBASE}
-
 _F2C_DIR=	${WRKDIR}/.f2c
 _F2C_VARS=	# empty
 .  if !empty(_LANGUAGES.f2c:Mfortran) || !empty(_LANGUAGES.f2c:Mfortran77)
@@ -70,7 +67,7 @@ PKG_FC?=	${FC}
 _F2C_VARS+=	FC
 _F2C_FC:=	${_F2C_DIR}/bin/${PKG_FC:T}
 _ALIASES.FC+=	f77 g77 f2c-f77
-FCPATH=		${_F2CBASE}/bin/f2c-f77
+FCPATH=		${LOCALBASE}/bin/f2c-f77
 PKG_FC:=	${_F2C_FC}
 #
 # The f2c-f77 shell script invokes the C compiler, so ensure that it finds
@@ -121,11 +118,11 @@ override-tools: ${_F2C_${_var_}}
 ${_F2C_${_var_}}:
 	${RUN}${MKDIR} ${.TARGET:H}
 	${RUN}					\
-	${LN} -fs ${_F2CBASE}/bin/f2c-f77 ${.TARGET}
+	${LN} -fs ${LOCALBASE}/bin/f2c-f77 ${.TARGET}
 .      for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
 	${RUN}					\
 	if [ ! -x "${_alias_}" ]; then					\
-		${LN} -fs ${_F2CBASE}/bin/f2c-f77 ${_alias_};		\
+		${LN} -fs ${LOCALBASE}/bin/f2c-f77 ${_alias_};		\
 	fi
 .      endfor
 .    endif
diff --git a/mk/compiler/g95.mk b/mk/compiler/g95.mk
index 360873c7802..fd60603bd6e 100644
--- a/mk/compiler/g95.mk
+++ b/mk/compiler/g95.mk
@@ -1,4 +1,4 @@
-# $NetBSD: g95.mk,v 1.4 2012/12/15 21:23:31 markd Exp $
+# $NetBSD: g95.mk,v 1.5 2015/11/25 13:05:47 jperkin Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -68,9 +68,8 @@ _USE_G95=	YES
 .endif
 
 .if !empty(_USE_G95:M[yY][eE][sS])
-EVAL_PREFIX+=		_G95BASE=g95
-_G95BASE_DEFAULT=	${LOCALBASE}
 FC=		g95
+G95BASE?=	${PREFIX}
 
 _G95_DIR=	${WRKDIR}/.g95
 _G95_VARS=	# empty
@@ -80,7 +79,7 @@ PKG_FC?=	${FC}
 _G95_VARS+=	FC
 _G95_FC:=	${_G95_DIR}/bin/${PKG_FC:T}
 _ALIASES.FC+=	f77 g77 g95
-FCPATH=		${_G95BASE}/bin/g95
+FCPATH=		${G95BASE}/bin/g95
 PKG_FC:=	${_G95_FC}
 .  endif
 
@@ -103,11 +102,11 @@ override-tools: ${_G95_${_var_}}
 ${_G95_${_var_}}:
 	${RUN}${MKDIR} ${.TARGET:H}
 	${RUN}					\
-	${LN} -fs ${_G95BASE}/bin/g95 ${.TARGET}
+	${LN} -fs ${G95BASE}/bin/g95 ${.TARGET}
 .      for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
 	${RUN}					\
 	if [ ! -x "${_alias_}" ]; then					\
-		${LN} -fs ${_G95BASE}/bin/g95 ${_alias_};		\
+		${LN} -fs ${G95BASE}/bin/g95 ${_alias_};		\
 	fi
 .      endfor
 .    endif
diff --git a/mk/compiler/gfortran.mk b/mk/compiler/gfortran.mk
index f1c77a17c46..a305c39c95b 100644
--- a/mk/compiler/gfortran.mk
+++ b/mk/compiler/gfortran.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gfortran.mk,v 1.7 2015/09/11 15:23:21 jperkin Exp $
+# $NetBSD: gfortran.mk,v 1.8 2015/11/25 13:05:47 jperkin Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -68,8 +68,7 @@ _USE_GFORTRAN=	YES
 .endif
 
 .if !empty(_USE_GFORTRAN:M[yY][eE][sS])
-EVAL_PREFIX+=		_GFORTRANBASE=gfortran
-_GFORTRANBASE_DEFAULT=	${LOCALBASE}/gcc48
+_GFORTRANBASE=	${LOCALBASE}/gcc48
 FC=		gfortran
 
 _GFORTRAN_DIR=	${WRKDIR}/.gfortran
diff --git a/mk/emulator/pkg-rpm.mk b/mk/emulator/pkg-rpm.mk
index e3d0739ee5a..068c6828ccb 100644
--- a/mk/emulator/pkg-rpm.mk
+++ b/mk/emulator/pkg-rpm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pkg-rpm.mk,v 1.5 2013/05/09 23:37:26 riastradh Exp $
+# $NetBSD: pkg-rpm.mk,v 1.6 2015/11/25 13:05:47 jperkin Exp $
 #
 # RPM package format
 #
@@ -57,8 +57,7 @@
 #
 
 TOOL_DEPENDS+=		rpm2pkg>=3.1.4:../../pkgtools/rpm2pkg
-EVAL_PREFIX+=		_RPM2PKG_PREFIX=rpm2pkg
-RPM2PKG=		${_RPM2PKG_PREFIX}/sbin/rpm2pkg
+RPM2PKG=		${LOCALBASE}/sbin/rpm2pkg
 
 RPMFILES?=		${DISTFILES:M*.rpm:S/^/${_DISTDIR}\//}
 BUILD_DEFS+=		RPMFILES
diff --git a/mk/find-prefix.mk b/mk/find-prefix.mk
deleted file mode 100644
index 7b0966a8ca6..00000000000
--- a/mk/find-prefix.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: find-prefix.mk,v 1.7 2008/02/10 10:30:58 rillig Exp $
-#
-# This is a "subroutine" that can be included to find the installation
-# prefix of an installed package.
-#
-# Parameters:
-#
-# FIND_PREFIX
-#	A list of <VARNAME>=<pattern> pairs, where
-#
-#	* <pattern> is a package wildcard pattern (see pkg_info(8)),
-#	* <VARNAME> is the variable that will be set to the
-#	  installation prefix for the package.
-#
-# Returns:
-#
-# <VARNAME>
-#	The prefix of the corresponding package, or ${LOCALBASE}
-#	if the package is not installed.
-#
-# Example:
-#
-# FIND_PREFIX:=	M4DIR=gm4
-# .include "../../mk/find-prefix.mk"
-# # ${M4DIR} now contains the installation prefix for the "gm4" package.
-#
-
-.for i in ${FIND_PREFIX}
-.  for varname in ${i:C/=.*$//}
-.    for pattern in ${i:C/^[^=]*=//}
-.      if !defined(${varname})
-
-# XXX: Is this *_DEFAULT variable really necessary? The default value
-# can be easily embedded in the shell code. What if VARNAME is set to
-# PKG_APACHE, for example?
-#
-${varname}_DEFAULT?=	${LOCALBASE}
-_${varname}_cmd=		\
-	${PKG_INFO} -qp ${pattern:Q} 2>/dev/null |			\
-	{ read cmd arg;							\
-	  case "$$arg" in						\
-	  "")	${ECHO} ${${varname}_DEFAULT:Q} ;;			\
-	  *)	${ECHO} "$$arg" ;;					\
-	  esac; }
-${varname}=		${_${varname}_cmd:sh}
-.      endif
-MAKEVARS+=	${varname}
-.    endfor
-.  endfor
-.endfor
diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index 8e9c06c6664..1a5714b926b 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.103 2015/08/12 01:06:45 ryoon Exp $
+# $NetBSD: java-vm.mk,v 1.104 2015/11/25 13:05:47 jperkin Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -268,38 +268,32 @@ _JAVA_BASE_CLASSES=	classes.zip
 .if ${_PKG_JVM} == "kaffe"
 _JDK_PKGSRCDIR=		../../lang/kaffe
 _JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/kaffe
+_JAVA_HOME=		${LOCALBASE}/java/kaffe
 .elif ${_PKG_JVM} == "openjdk7"
 _JDK_PKGSRCDIR=		../../lang/openjdk7
 _JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/openjdk7
+_JAVA_HOME=		${LOCALBASE}/java/openjdk7
 .elif ${_PKG_JVM} == "openjdk8"
 _JDK_PKGSRCDIR=		../../lang/openjdk8
 _JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/openjdk8
+_JAVA_HOME=		${LOCALBASE}/java/openjdk8
 .elif ${_PKG_JVM} == "sun-jdk6"
 _JDK_PKGSRCDIR=		../../lang/sun-jdk6
 _JRE_PKGSRCDIR=		../../lang/sun-jre6
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/sun-6
+_JAVA_HOME=		${LOCALBASE}/java/sun-6
 UNLIMIT_RESOURCES+=	datasize
 .elif ${_PKG_JVM} == "sun-jdk7"
 _JDK_PKGSRCDIR=		../../lang/sun-jdk7
 _JRE_PKGSRCDIR=		../../lang/sun-jre7
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/sun-7
+_JAVA_HOME=		${LOCALBASE}/java/sun-7
 UNLIMIT_RESOURCES+=	datasize
 .elif ${_PKG_JVM} == "oracle-jdk8"
 _JDK_PKGSRCDIR=		../../lang/oracle-jdk8
 _JRE_PKGSRCDIR=		../../lang/oracle-jre8
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/oracle-8
+_JAVA_HOME=		${LOCALBASE}/java/oracle-8
 UNLIMIT_RESOURCES+=	datasize
 .endif
 
-.if defined(_JAVA_HOME_DEFAULT)
-_JAVA_HOME=		${_JAVA_HOME_DEFAULT}
-.else
-EVAL_PREFIX+=		_JAVA_HOME=${_JAVA_PKGBASE.${_PKG_JVM}}
-.endif
-
 # If we are not using Java for building, then we need a run-time dependency on
 # the JRE, otherwise, build-time dependency on the JRE.
 .if defined(_JRE_PKGSRCDIR)
diff --git a/mk/tools/autoconf.mk b/mk/tools/autoconf.mk
index 45ad8222ab4..1076bb308ed 100644
--- a/mk/tools/autoconf.mk
+++ b/mk/tools/autoconf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: autoconf.mk,v 1.17 2015/02/11 23:39:35 rillig Exp $
+# $NetBSD: autoconf.mk,v 1.18 2015/11/25 13:05:47 jperkin Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -103,28 +103,27 @@ TOOLS_DEPENDS.autoconf?=	autoconf>=${AUTOCONF_REQD}:../../devel/autoconf
 .    if empty(${_TOOLS_DEPMETHOD.autoconf}:M${TOOLS_DEPENDS.autoconf})
 ${_TOOLS_DEPMETHOD.autoconf}+=	${TOOLS_DEPENDS.autoconf}
 .    endif
-EVAL_PREFIX+=			_TOOLS_AC_PREFIX=autoconf
 
 _TOOLS_AC_TYPE.autoconf=	TOOLS_CREATE
-TOOLS_PATH.autoconf=		${_TOOLS_AC_PREFIX}/bin/autoconf
+TOOLS_PATH.autoconf=		${LOCALBASE}/bin/autoconf
 
 _TOOLS_AC_TYPE.autoheader=	TOOLS_CREATE
-TOOLS_PATH.autoheader=		${_TOOLS_AC_PREFIX}/bin/autoheader
+TOOLS_PATH.autoheader=		${LOCALBASE}/bin/autoheader
 
 _TOOLS_AC_TYPE.autom4te=	TOOLS_CREATE
-TOOLS_PATH.autom4te=		${_TOOLS_AC_PREFIX}/bin/autom4te
+TOOLS_PATH.autom4te=		${LOCALBASE}/bin/autom4te
 
 _TOOLS_AC_TYPE.autoreconf=	TOOLS_CREATE
-TOOLS_PATH.autoreconf=		${_TOOLS_AC_PREFIX}/bin/autoreconf
+TOOLS_PATH.autoreconf=		${LOCALBASE}/bin/autoreconf
 
 _TOOLS_AC_TYPE.autoscan=	TOOLS_CREATE
-TOOLS_PATH.autoscan=		${_TOOLS_AC_PREFIX}/bin/autoscan
+TOOLS_PATH.autoscan=		${LOCALBASE}/bin/autoscan
 
 _TOOLS_AC_TYPE.autoupdate=	TOOLS_CREATE
-TOOLS_PATH.autoupdate=		${_TOOLS_AC_PREFIX}/bin/autoupdate
+TOOLS_PATH.autoupdate=		${LOCALBASE}/bin/autoupdate
 
 _TOOLS_AC_TYPE.ifnames=		TOOLS_CREATE
-TOOLS_PATH.ifnames=		${_TOOLS_AC_PREFIX}/bin/ifnames
+TOOLS_PATH.ifnames=		${LOCALBASE}/bin/ifnames
 .  endif
 .endif
 
@@ -143,36 +142,35 @@ TOOLS_DEPENDS.autoconf213?=	autoconf213>=${AUTOCONF_REQD}:../../devel/autoconf21
 .    if empty(${_TOOLS_DEPMETHOD.autoconf213}:M${TOOLS_DEPENDS.autoconf213})
 ${_TOOLS_DEPMETHOD.autoconf213}+=	${TOOLS_DEPENDS.autoconf213}
 .    endif
-EVAL_PREFIX+=			_TOOLS_AC_PREFIX=autoconf213
 
 _TOOLS_AC_TYPE.autoconf-2.13=	TOOLS_CREATE
 _TOOLS_AC_TYPE.autoconf=	# empty
-TOOLS_PATH.autoconf-2.13=	${_TOOLS_AC_PREFIX}/bin/autoconf-2.13
+TOOLS_PATH.autoconf-2.13=	${LOCALBASE}/bin/autoconf-2.13
 TOOLS_ALIASES.autoconf-2.13=	autoconf
 
 _TOOLS_AC_TYPE.autoheader-2.13=	TOOLS_CREATE
 _TOOLS_AC_TYPE.autoheader=	# empty
-TOOLS_PATH.autoheader-2.13=	${_TOOLS_AC_PREFIX}/bin/autoheader-2.13
+TOOLS_PATH.autoheader-2.13=	${LOCALBASE}/bin/autoheader-2.13
 TOOLS_ALIASES.autoheader-2.13=	autoheader
 
 _TOOLS_AC_TYPE.autoreconf-2.13=	TOOLS_CREATE
 _TOOLS_AC_TYPE.autoreconf=	# empty
-TOOLS_PATH.autoreconf-2.13=	${_TOOLS_AC_PREFIX}/bin/autoreconf-2.13
+TOOLS_PATH.autoreconf-2.13=	${LOCALBASE}/bin/autoreconf-2.13
 TOOLS_ALIASES.autoreconf-2.13=	autoreconf
 
 _TOOLS_AC_TYPE.autoscan-2.13=	TOOLS_CREATE
 _TOOLS_AC_TYPE.autoscan=	# empty
-TOOLS_PATH.autoscan-2.13=	${_TOOLS_AC_PREFIX}/bin/autoscan-2.13
+TOOLS_PATH.autoscan-2.13=	${LOCALBASE}/bin/autoscan-2.13
 TOOLS_ALIASES.autoscan-2.13=	autoscan
 
 _TOOLS_AC_TYPE.autoupdate-2.13=	TOOLS_CREATE
 _TOOLS_AC_TYPE.autoupdate=	# empty
-TOOLS_PATH.autoupdate-2.13=	${_TOOLS_AC_PREFIX}/bin/autoupdate-2.13
+TOOLS_PATH.autoupdate-2.13=	${LOCALBASE}/bin/autoupdate-2.13
 TOOLS_ALIASES.autoupdate-2.13=	autoupdate
 
 _TOOLS_AC_TYPE.ifnames-2.13=	TOOLS_CREATE
 _TOOLS_AC_TYPE.ifnames=		# empty
-TOOLS_PATH.ifnames-2.13=	${_TOOLS_AC_PREFIX}/bin/ifnames-2.13
+TOOLS_PATH.ifnames-2.13=	${LOCALBASE}/bin/ifnames-2.13
 TOOLS_ALIASES.ifnames-2.13=	ifnames
 
 .    if defined(USE_LIBTOOL)
diff --git a/mk/tools/automake.mk b/mk/tools/automake.mk
index 7fafb95aad3..20303678838 100644
--- a/mk/tools/automake.mk
+++ b/mk/tools/automake.mk
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.27 2015/03/11 19:24:44 rillig Exp $
+# $NetBSD: automake.mk,v 1.28 2015/11/25 13:05:47 jperkin Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -127,13 +127,12 @@ TOOLS_DEPENDS.automake?=	automake>=${AUTOMAKE_REQD}:../../devel/automake
 .    if empty(${_TOOLS_DEPMETHOD.automake}:M${TOOLS_DEPENDS.automake})
 ${_TOOLS_DEPMETHOD.automake}+=	${TOOLS_DEPENDS.automake}
 .    endif
-EVAL_PREFIX+=			_TOOLS_AM_PREFIX=automake
 
 _TOOLS_AM_TYPE.aclocal=		TOOLS_CREATE
-TOOLS_PATH.aclocal=		${_TOOLS_AM_PREFIX}/bin/aclocal
+TOOLS_PATH.aclocal=		${LOCALBASE}/bin/aclocal
 
 _TOOLS_AM_TYPE.automake=	TOOLS_CREATE
-TOOLS_PATH.automake=		${_TOOLS_AM_PREFIX}/bin/automake
+TOOLS_PATH.automake=		${LOCALBASE}/bin/automake
 .  endif
 .endif
 
@@ -153,16 +152,15 @@ TOOLS_DEPENDS.automake14?=	automake14>=${AUTOMAKE_REQD}:../../devel/automake14
 .    if empty(${_TOOLS_DEPMETHOD.automake14}:M${TOOLS_DEPENDS.automake14})
 ${_TOOLS_DEPMETHOD.automake14}+=	${TOOLS_DEPENDS.automake14}
 .    endif
-EVAL_PREFIX+=			_TOOLS_AM_PREFIX=automake14
 
 _TOOLS_AM_TYPE.aclocal-1.4=	TOOLS_CREATE
 _TOOLS_AM_TYPE.aclocal=		# empty
-TOOLS_PATH.aclocal-1.4=	${_TOOLS_AM_PREFIX}/bin/aclocal-1.4
+TOOLS_PATH.aclocal-1.4=		${LOCALBASE}/bin/aclocal-1.4
 TOOLS_ALIASES.aclocal-1.4=	aclocal
 
 _TOOLS_AM_TYPE.automake-1.4=	TOOLS_CREATE
 _TOOLS_AM_TYPE.automake=	# empty
-TOOLS_PATH.automake-1.4=	${_TOOLS_AM_PREFIX}/bin/automake-1.4
+TOOLS_PATH.automake-1.4=	${LOCALBASE}/bin/automake-1.4
 TOOLS_ALIASES.automake-1.4=	automake
 .  endif
 .endif
diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk
index 2661500e156..e9ec8211473 100644
--- a/mk/tools/bsd.tools.mk
+++ b/mk/tools/bsd.tools.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.54 2012/01/14 01:52:14 hans Exp $
+# $NetBSD: bsd.tools.mk,v 1.55 2015/11/25 13:05:47 jperkin Exp $
 #
 # Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -181,7 +181,6 @@ _PKG_VARS.tools=	USE_TOOLS TOOLS_BROKEN TOOLS_CREATE \
 	TOOLS_IGNORE \
 	TOOLS_PATH \
 	TOOLS_PLATFORM \
-	TOOLS_PREFIX \
 	TOOLS_SCRIPT \
 	TOOLS_SCRIPT_DFLT \
 	TOOLS_VALUE_GNU \
diff --git a/mk/tools/digest.mk b/mk/tools/digest.mk
index ecbf9c26117..771193c38d3 100644
--- a/mk/tools/digest.mk
+++ b/mk/tools/digest.mk
@@ -1,4 +1,4 @@
-# $NetBSD: digest.mk,v 1.1 2006/07/13 14:02:34 jlam Exp $
+# $NetBSD: digest.mk,v 1.2 2015/11/25 13:05:47 jperkin Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -73,8 +73,7 @@ _TOOLS_USE_PKGSRC.digest=	yes
 .    if !empty(_TOOLS_USE_PKGSRC.digest:M[yY][eE][sS])
 TOOLS_DEPENDS.digest?=	digest>=${DIGEST_REQD}:../../pkgtools/digest
 TOOLS_CREATE+=		digest
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.digest=digest
-TOOLS_PATH.digest=	${TOOLS_PREFIX.digest}/bin/digest
+TOOLS_PATH.digest=	${LOCALBASE}/bin/digest
 .    endif
 .  endif
 .endif
diff --git a/mk/tools/gettext.mk b/mk/tools/gettext.mk
index b8d3b808cdd..2b69ea736ca 100644
--- a/mk/tools/gettext.mk
+++ b/mk/tools/gettext.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gettext.mk,v 1.20 2015/02/16 10:40:40 jperkin Exp $
+# $NetBSD: gettext.mk,v 1.21 2015/11/25 13:05:47 jperkin Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -116,8 +116,7 @@ MAKEVARS+=	_TOOLS_USE_MSGFMT_SH
 .    if !empty(_TOOLS_USE_PKGSRC.msgfmt:M[yY][eE][sS])
 TOOLS_CREATE+=		msgfmt
 TOOLS_DEPENDS.msgfmt?=	${_TOOLS_DEP.gettext-tools}:../../devel/gettext-tools
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.msgfmt=${TOOLS_DEPENDS.msgfmt:C/:.*//}
-TOOLS_PATH.msgfmt=	${TOOLS_PREFIX.msgfmt}/bin/msgfmt
+TOOLS_PATH.msgfmt=	${LOCALBASE}/bin/msgfmt
 .    endif
 
 .    if !empty(_TOOLS_USE_MSGFMT_SH:M[yY][eE][sS])
@@ -146,8 +145,7 @@ MAKEFLAGS+=		TOOLS_IGNORE.${_t_}=
 .    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
 TOOLS_DEPENDS.${_t_}?=	${_TOOLS_DEP.gettext-tools}:../../devel/gettext-tools
 TOOLS_CREATE+=		${_t_}
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=${TOOLS_DEPENDS.${_t_}:C/:.*//}
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/${_t_}
+TOOLS_PATH.${_t_}=	${LOCALBASE}/bin/${_t_}
 .    endif
 .  endif
 .endfor
diff --git a/mk/tools/gmake.mk b/mk/tools/gmake.mk
index d7ef101765c..686ca9bb198 100644
--- a/mk/tools/gmake.mk
+++ b/mk/tools/gmake.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gmake.mk,v 1.4 2014/01/15 06:53:06 ryoon Exp $
+# $NetBSD: gmake.mk,v 1.5 2015/11/25 13:05:47 jperkin Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -66,8 +66,7 @@ MAKEVARS+=	_TOOLS_USE_PKGSRC.gmake
 
 .if defined(_TOOLS_USE_PKGSRC.gmake) && !empty(_TOOLS_USE_PKGSRC.gmake)
 .  if !empty(_TOOLS_USE_PKGSRC.gmake:M[yY][eE][sS])
-TOOLS_FIND_PREFIX+=	GMAKEDIR=gmake
-TOOLS_PLATFORM.gmake=	${GMAKEDIR}/bin/gmake
+TOOLS_PLATFORM.gmake=	${LOCALBASE}/bin/gmake
 .  endif
 .endif
 
diff --git a/mk/tools/intltool.mk b/mk/tools/intltool.mk
index 996906525d9..2da9efa1355 100644
--- a/mk/tools/intltool.mk
+++ b/mk/tools/intltool.mk
@@ -1,4 +1,4 @@
-# $NetBSD: intltool.mk,v 1.7 2014/04/05 03:02:00 obache Exp $
+# $NetBSD: intltool.mk,v 1.8 2015/11/25 13:05:47 jperkin Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -53,12 +53,10 @@ DEPENDS+=		${TOOLS_DEPENDS.intltool}
 .    else
 TOOL_DEPENDS+=		${TOOLS_DEPENDS.intltool}
 .    endif
-EVAL_PREFIX+=		TOOLS_PREFIX.intltool=intltool
 .    for _t_ in ${_TOOLS.intltool}
 TOOLS_DEPENDS.${_t_}=	${TOOLS_DEPENDS.intltool}
 TOOLS_CREATE+=		${_t_}
-TOOLS_PREFIX.${_t_}=	${TOOLS_PREFIX.intltool}
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/${_t_}
+TOOLS_PATH.${_t_}=	${LOCALBASE}/bin/${_t_}
 .    endfor
 .  endif
 .else
diff --git a/mk/tools/perl.mk b/mk/tools/perl.mk
index 56c473000c3..2f398c996d7 100644
--- a/mk/tools/perl.mk
+++ b/mk/tools/perl.mk
@@ -1,4 +1,4 @@
-# $NetBSD: perl.mk,v 1.23 2007/11/19 04:08:58 minskim Exp $
+# $NetBSD: perl.mk,v 1.24 2015/11/25 13:05:47 jperkin Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -44,9 +44,7 @@
 #
 # Define PERL5_* variables that locate the site directories for
 # ${PERL5}.  These variables depend on PERL5 being properly defined
-# and existing on the filesystem.  This needs to be done _after_
-# ${PERL5} is fully resolved, which happens after mk/tools/replace.mk
-# includes find-prefix.mk.
+# and existing on the filesystem.
 #
 .  include "../../lang/perl5/vars.mk"
 .else
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 39359f6403b..22d910669cc 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.276 2015/10/08 18:16:31 richard Exp $
+# $NetBSD: replace.mk,v 1.277 2015/11/25 13:05:47 jperkin Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -211,8 +211,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.7za=
 .  elif !empty(_TOOLS_USE_PKGSRC.7za:M[yY][eE][sS])
 TOOLS_DEPENDS.7za?=		p7zip>=9.04:../../archivers/p7zip
 TOOLS_CREATE+=			7za
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.7za=7za
-TOOLS_PATH.7za=			${TOOLS_PREFIX.7za}/bin/7za
+TOOLS_PATH.7za=			${LOCALBASE}/bin/7za
 .  endif
 .endif
 
@@ -222,8 +221,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.awk=
 .  elif !empty(_TOOLS_USE_PKGSRC.awk:M[yY][eE][sS])
 TOOLS_DEPENDS.awk?=		nawk>=20040207:../../lang/nawk
 TOOLS_CREATE+=			awk
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.awk=nawk
-TOOLS_PATH.awk=			${TOOLS_PREFIX.awk}/bin/nawk
+TOOLS_PATH.awk=			${LOCALBASE}/bin/nawk
 .  endif
 .endif
 
@@ -233,8 +231,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.bash=
 .  elif !empty(_TOOLS_USE_PKGSRC.bash:M[yY][eE][sS])
 TOOLS_DEPENDS.bash?=		bash-[0-9]*:../../shells/bash
 TOOLS_CREATE+=			bash
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.bash=bash
-TOOLS_PATH.bash=		${TOOLS_PREFIX.bash}/bin/bash
+TOOLS_PATH.bash=		${LOCALBASE}/bin/bash
 .  endif
 .endif
 
@@ -244,8 +241,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
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.bison=bison
-TOOLS_PATH.bison=		${TOOLS_PREFIX.bison}/bin/bison
+TOOLS_PATH.bison=		${LOCALBASE}/bin/bison
 .  endif
 .endif
 
@@ -255,8 +251,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.bison-yacc=
 .  elif !empty(_TOOLS_USE_PKGSRC.bison-yacc:M[yY][eE][sS])
 TOOLS_DEPENDS.bison-yacc?=	bison>=1.0:../../devel/bison
 TOOLS_CREATE+=			bison-yacc
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.bison-yacc=bison
-TOOLS_PATH.bison-yacc=		${TOOLS_PREFIX.bison-yacc}/bin/bison
+TOOLS_PATH.bison-yacc=		${LOCALBASE}/bin/bison
 TOOLS_ARGS.bison-yacc=		-y
 .  endif
 TOOLS_CMD.bison-yacc=		${TOOLS_DIR}/bin/yacc
@@ -275,8 +270,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.bsdtar=
 .  elif !empty(_TOOLS_USE_PKGSRC.bsdtar:M[yY][eE][sS])
 TOOLS_DEPENDS.bsdtar?=		bsdtar-[0-9]*:../../archivers/bsdtar
 TOOLS_CREATE+=			bsdtar
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.bsdtar=bsdtar
-TOOLS_PATH.bsdtar=		${TOOLS_PREFIX.bsdtar}/bin/bsdtar
+TOOLS_PATH.bsdtar=		${LOCALBASE}/bin/bsdtar
 .  endif
 .endif
 
@@ -286,8 +280,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.byacc=
 .  elif !empty(_TOOLS_USE_PKGSRC.byacc:M[yY][eE][sS])
 TOOLS_DEPENDS.byacc?=		byacc>=20040328:../../devel/byacc
 TOOLS_CREATE+=			byacc
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.byacc=byacc
-TOOLS_PATH.byacc=		${TOOLS_PREFIX.byacc}/bin/yacc
+TOOLS_PATH.byacc=		${LOCALBASE}/bin/yacc
 TOOLS_CMD.byacc=		${TOOLS_DIR}/bin/yacc
 .  endif
 .endif
@@ -300,8 +293,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.${_t_}=
 .    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
 TOOLS_DEPENDS.${_t_}?=		bzip2>=0.9.0b:../../archivers/bzip2
 TOOLS_CREATE+=			${_t_}
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.${_t_}=bzip2
-TOOLS_PATH.${_t_}=		${TOOLS_PREFIX.${_t_}}/bin/${_t_}
+TOOLS_PATH.${_t_}=		${LOCALBASE}/bin/${_t_}
 .    endif
 .  endif
 .endfor
@@ -312,8 +304,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.chrpath=
 .  elif !empty(_TOOLS_USE_PKGSRC.chrpath:M[yY][eE][sS])
 TOOLS_DEPENDS.chrpath?=		chrpath>=0.13:../../devel/chrpath
 TOOLS_CREATE+=			chrpath
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.chrpath=chrpath
-TOOLS_PATH.chrpath=		${TOOLS_PREFIX.chrpath}/bin/chrpath
+TOOLS_PATH.chrpath=		${LOCALBASE}/bin/chrpath
 .  endif
 .endif
 
@@ -325,8 +316,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.${_t_}=
 .    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
 TOOLS_DEPENDS.${_t_}?=		cmake>=2.8.1nb1:../../devel/cmake
 TOOLS_CREATE+=			${_t_}
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.${_t_}=cmake
-TOOLS_PATH.${_t_}=		${TOOLS_PREFIX.${_t_}}/bin/${_t_}
+TOOLS_PATH.${_t_}=		${LOCALBASE}/bin/${_t_}
 .    endif
 .  endif
 .endfor
@@ -337,8 +327,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.csh=
 .  elif !empty(_TOOLS_USE_PKGSRC.csh:M[yY][eE][sS])
 TOOLS_DEPENDS.csh?=		tcsh-[0-9]*:../../shells/tcsh
 TOOLS_CREATE+=			csh
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.csh=tcsh
-TOOLS_PATH.csh=			${TOOLS_PREFIX.csh}/bin/tcsh
+TOOLS_PATH.csh=			${LOCALBASE}/bin/tcsh
 .  endif
 .endif
 
@@ -347,8 +336,7 @@ TOOLS_PATH.csh=			${TOOLS_PREFIX.csh}/bin/tcsh
 MAKEFLAGS+=			TOOLS_IGNORE.curl=
 .  elif !empty(_TOOLS_USE_PKGSRC.curl:M[yY][eE][sS])
 TOOLS_DEPENDS.curl?=		curl-[0-9]*:../../www/curl
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.curl=curl
-TOOLS_PATH.curl=		${TOOLS_PREFIX.curl}/bin/curl
+TOOLS_PATH.curl=		${LOCALBASE}/bin/curl
 .  endif
 .endif
 
@@ -357,8 +345,7 @@ TOOLS_PATH.curl=		${TOOLS_PREFIX.curl}/bin/curl
 MAKEFLAGS+=			TOOLS_IGNORE.fetch=
 .  elif !empty(_TOOLS_USE_PKGSRC.fetch:M[yY][eE][sS])
 TOOLS_DEPENDS.fetch?=		fetch-[0-9]*:../../net/fetch
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.fetch=fetch
-TOOLS_PATH.fetch=		${TOOLS_PREFIX.fetch}/bin/fetch
+TOOLS_PATH.fetch=		${LOCALBASE}/bin/fetch
 .  endif
 .endif
 
@@ -368,8 +355,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
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.file=file
-TOOLS_PATH.file=		${TOOLS_PREFIX.file}/bin/file
+TOOLS_PATH.file=		${LOCALBASE}/bin/file
 .  endif
 .endif
 
@@ -379,8 +365,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
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.find=findutils
-TOOLS_PATH.find=		${TOOLS_PREFIX.find}/bin/gfind
+TOOLS_PATH.find=		${LOCALBASE}/bin/gfind
 .  endif
 .endif
 
@@ -395,8 +380,7 @@ _TOOLS_DEPENDS.flex+=		${_dep_}:${BUILDLINK_PKGSRCDIR.flex}
 .    endfor
 TOOLS_DEPENDS.flex?=		${_TOOLS_DEPENDS.flex}
 TOOLS_CREATE+=			flex
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.flex=flex
-TOOLS_PATH.flex=		${TOOLS_PREFIX.flex}/bin/flex
+TOOLS_PATH.flex=		${LOCALBASE}/bin/flex
 .  endif
 TOOLS_ALIASES.flex=		lex
 .endif
@@ -406,8 +390,7 @@ TOOLS_ALIASES.flex=		lex
 MAKEFLAGS+=			TOOLS_IGNORE.ftp=
 .  elif !empty(_TOOLS_USE_PKGSRC.ftp:M[yY][eE][sS])
 TOOLS_DEPENDS.ftp?=		tnftp-[0-9]*:../../net/tnftp
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.ftp=ftp
-TOOLS_PATH.ftp=			${TOOLS_PREFIX.ftp}/bin/ftp
+TOOLS_PATH.ftp=			${LOCALBASE}/bin/ftp
 .  endif
 .endif
 
@@ -417,8 +400,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
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gawk=gawk
-TOOLS_PATH.gawk=		${TOOLS_PREFIX.gawk}/bin/gawk
+TOOLS_PATH.gawk=		${LOCALBASE}/bin/gawk
 .  endif
 TOOLS_ALIASES.gawk=		awk
 .endif
@@ -433,8 +415,7 @@ TOOLS_DEPENDS.gem?=		${RUBY_PKGPREFIX}-rubygems-[0-9]*:../../misc/rubygems
 TOOLS_DEPENDS.gem?=		${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 .    endif
 TOOLS_CREATE+=			gem
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gem=gem
-TOOLS_PATH.gem=			${TOOLS_PREFIX.gem}/bin/gem${RUBY_SUFFIX}
+TOOLS_PATH.gem=			${LOCALBASE}/bin/gem${RUBY_SUFFIX}
 .  endif
 .endif
 
@@ -444,8 +425,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
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gm4=m4
-TOOLS_PATH.gm4=			${TOOLS_PREFIX.gm4}/bin/gm4
+TOOLS_PATH.gm4=			${LOCALBASE}/bin/gm4
 .  endif
 TOOLS_ALIASES.gm4=		m4
 .endif
@@ -456,8 +436,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.gmake=
 .  elif !empty(_TOOLS_USE_PKGSRC.gmake:M[yY][eE][sS])
 TOOLS_DEPENDS.gmake?=		gmake>=${GMAKE_REQD}:../../devel/gmake
 TOOLS_CREATE+=			gmake
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gmake=gmake
-TOOLS_PATH.gmake=		${TOOLS_PREFIX.gmake}/bin/gmake
+TOOLS_PATH.gmake=		${LOCALBASE}/bin/gmake
 .  endif
 .endif
 
@@ -467,8 +446,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
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gsed=gsed
-TOOLS_PATH.gsed=		${TOOLS_PREFIX.gsed}/bin/gsed
+TOOLS_PATH.gsed=		${LOCALBASE}/bin/gsed
 .  endif
 TOOLS_ALIASES.gsed=		sed
 .endif
@@ -479,8 +457,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.gtar=
 .  elif !empty(_TOOLS_USE_PKGSRC.gtar:M[yY][eE][sS])
 TOOLS_DEPENDS.gtar?=		gtar-base>=1.13.25:../../archivers/gtar-base
 TOOLS_CREATE+=			gtar
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gtar=gtar-base
-TOOLS_PATH.gtar=		${TOOLS_PREFIX.gtar}/bin/gtar
+TOOLS_PATH.gtar=		${LOCALBASE}/bin/gtar
 .  endif
 .endif
 
@@ -490,8 +467,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.gunzip=
 .  elif !empty(_TOOLS_USE_PKGSRC.gunzip:M[yY][eE][sS])
 TOOLS_DEPENDS.gunzip?=		{gzip>=1.2.4b,gzip-base>=1.2.4b}:../../archivers/gzip
 TOOLS_CREATE+=			gunzip
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gunzip=gzip
-TOOLS_PATH.gunzip=		${TOOLS_PREFIX.gunzip}/bin/gunzip
+TOOLS_PATH.gunzip=		${LOCALBASE}/bin/gunzip
 TOOLS_ARGS.gunzip=		-f
 .  endif
 .endif
@@ -502,8 +478,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.gzcat=
 .  elif !empty(_TOOLS_USE_PKGSRC.gzcat:M[yY][eE][sS])
 TOOLS_DEPENDS.gzcat?=		{gzip>=1.2.4b,gzip-base>=1.2.4b}:../../archivers/gzip
 TOOLS_CREATE+=			gzcat
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gzcat=gzip
-TOOLS_PATH.gzcat=		${TOOLS_PREFIX.gzcat}/bin/zcat
+TOOLS_PATH.gzcat=		${LOCALBASE}/bin/zcat
 .  endif
 .endif
 
@@ -513,8 +488,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.gzip=
 .  elif !empty(_TOOLS_USE_PKGSRC.gzip:M[yY][eE][sS])
 TOOLS_DEPENDS.gzip?=		{gzip>=1.2.4b,gzip-base>=1.2.4b}:../../archivers/gzip
 TOOLS_CREATE+=			gzip
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gzip=gzip
-TOOLS_PATH.gzip=		${TOOLS_PREFIX.gzip}/bin/gzip
+TOOLS_PATH.gzip=		${LOCALBASE}/bin/gzip
 TOOLS_ARGS.gzip=		-nf ${GZIP}
 .  endif
 .endif
@@ -525,8 +499,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.ident=
 .  elif !empty(_TOOLS_USE_PKGSRC.ident:M[yY][eE][sS])
 TOOLS_DEPENDS.ident?=		rcs-[0-9]*:../../devel/rcs
 TOOLS_CREATE+=			ident
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.ident=rcs
-TOOLS_PATH.ident=		${TOOLS_PREFIX.ident}/bin/ident
+TOOLS_PATH.ident=		${LOCALBASE}/bin/ident
 .  endif
 .endif
 
@@ -536,8 +509,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.install-info=
 .  elif !empty(_TOOLS_USE_PKGSRC.install-info:M[yY][eE][sS])
 TOOLS_DEPENDS.install-info?=	pkg_install-info-[0-9]*:../../pkgtools/pkg_install-info
 TOOLS_CREATE+=			install-info
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.install-info=pkg_install-info
-TOOLS_PATH.install-info=	${TOOLS_PREFIX.install-info}/bin/pkg_install-info
+TOOLS_PATH.install-info=	${LOCALBASE}/bin/pkg_install-info
 .  endif
 .endif
 #
@@ -552,8 +524,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.ksh=
 .  elif !empty(_TOOLS_USE_PKGSRC.ksh:M[yY][eE][sS])
 TOOLS_DEPENDS.ksh?=		pdksh>=5.2.14:../../shells/pdksh
 TOOLS_CREATE+=			ksh
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.ksh=pdksh
-TOOLS_PATH.ksh=			${TOOLS_PREFIX.ksh}/bin/pdksh
+TOOLS_PATH.ksh=			${LOCALBASE}/bin/pdksh
 .  endif
 .endif
 
@@ -568,8 +539,7 @@ _TOOLS_DEPENDS.lex+=		${_dep_}:${BUILDLINK_PKGSRCDIR.flex}
 .    endfor
 TOOLS_DEPENDS.lex?=		${_TOOLS_DEPENDS.lex}
 TOOLS_CREATE+=			lex
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.lex=flex
-TOOLS_PATH.lex=			${TOOLS_PREFIX.lex}/bin/flex
+TOOLS_PATH.lex=			${LOCALBASE}/bin/flex
 .  endif
 .endif
 
@@ -579,8 +549,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
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.lha=lha
-TOOLS_PATH.lha=			${TOOLS_PREFIX.lha}/bin/lha
+TOOLS_PATH.lha=			${LOCALBASE}/bin/lha
 .  endif
 .endif
 
@@ -590,8 +559,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.lzip=
 .  elif !empty(_TOOLS_USE_PKGSRC.lzip:M[yY][eE][sS])
 TOOLS_DEPENDS.lzip?=		lzip>=1.14:../../archivers/lzip
 TOOLS_CREATE+=			lzip
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.lzip=lzip
-TOOLS_PATH.lzip=		${TOOLS_PREFIX.lzip}/bin/lzip
+TOOLS_PATH.lzip=		${LOCALBASE}/bin/lzip
 .  endif
 .endif
 
@@ -601,8 +569,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.lzcat=
 .  elif !empty(_TOOLS_USE_PKGSRC.lzcat:M[yY][eE][sS])
 TOOLS_DEPENDS.lzcat?=		xz>=4.999.9betanb1:../../archivers/xz
 TOOLS_CREATE+=			lzcat
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.lzcat=lzcat
-TOOLS_PATH.lzcat=		${TOOLS_PREFIX.lzcat}/bin/lzcat
+TOOLS_PATH.lzcat=		${LOCALBASE}/bin/lzcat
 .  endif
 .endif
 
@@ -612,8 +579,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
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.m4=m4
-TOOLS_PATH.m4=			${TOOLS_PREFIX.m4}/bin/gm4
+TOOLS_PATH.m4=			${LOCALBASE}/bin/gm4
 .  endif
 .endif
 
@@ -623,8 +589,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.mail=
 .  elif !empty(_TOOLS_USE_PKGSRC.mail:M[yY][eE][sS])
 TOOLS_DEPENDS.mail?=		heirloom-mailx-[0-9]*:../../mail/heirloom-mailx
 TOOLS_CREATE+=			mail
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.mail=heirloom-mailx
-TOOLS_PATH.mail=		${TOOLS_PREFIX.mail}/bin/mailx
+TOOLS_PATH.mail=		${LOCALBASE}/bin/mailx
 .  endif
 .endif
 
@@ -634,8 +599,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.makeinfo=
 .  elif !empty(_TOOLS_USE_PKGSRC.makeinfo:M[yY][eE][sS])
 TOOLS_DEPENDS.makeinfo?=	gtexinfo>=${TEXINFO_REQD}:../../devel/gtexinfo
 TOOLS_CREATE+=			makeinfo
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.makeinfo=gtexinfo
-TOOLS_PATH.makeinfo=		${TOOLS_PREFIX.makeinfo}/bin/makeinfo
+TOOLS_PATH.makeinfo=		${LOCALBASE}/bin/makeinfo
 .  endif
 .endif
 
@@ -645,8 +609,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.mktemp=
 .  elif !empty(_TOOLS_USE_PKGSRC.mktemp:M[yY][eE][sS])
 TOOLS_DEPENDS.mktemp?=		mktemp>=1.5:../../sysutils/mktemp
 TOOLS_CREATE+=			mktemp
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.mktemp=mktemp
-TOOLS_PATH.mktemp=		${TOOLS_PREFIX.mktemp}/bin/mktemp
+TOOLS_PATH.mktemp=		${LOCALBASE}/bin/mktemp
 .  endif
 .endif
 
@@ -660,8 +623,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.mtree=
 #
 TOOLS_DEPENDS.mtree?=		mtree>=20040722:../../pkgtools/mtree
 TOOLS_CREATE+=			mtree
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.mtree=mtree
-TOOLS_PATH.mtree=		${TOOLS_PREFIX.mtree}/bin/mtree
+TOOLS_PATH.mtree=		${LOCALBASE}/bin/mtree
 .  endif
 .endif
 
@@ -680,8 +642,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.openssl=
 .  elif !empty(_TOOLS_USE_PKGSRC.openssl:M[yY][eE][sS])
 TOOLS_DEPENDS.openssl?=		openssl>=0.9.6:../../security/openssl
 TOOLS_CREATE+=			openssl
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.openssl=openssl
-TOOLS_PATH.openssl=		${TOOLS_PREFIX.openssl}/bin/openssl
+TOOLS_PATH.openssl=		${LOCALBASE}/bin/openssl
 .  endif
 .endif
 
@@ -691,8 +652,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.patch=
 .  elif !empty(_TOOLS_USE_PKGSRC.patch:M[yY][eE][sS])
 TOOLS_DEPENDS.patch?=		nbpatch-[0-9]*:../../devel/nbpatch
 TOOLS_CREATE+=			patch
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.patch=nbpatch
-TOOLS_PATH.patch=		${TOOLS_PREFIX.patch}/bin/nbpatch
+TOOLS_PATH.patch=		${LOCALBASE}/bin/nbpatch
 _PATCH_CAN_BACKUP=		yes
 _PATCH_BACKUP_ARG=		-V simple -z
 .  endif
@@ -704,8 +664,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.pax=
 .  elif !empty(_TOOLS_USE_PKGSRC.pax:M[yY][eE][sS])
 TOOLS_DEPENDS.pax?=		pax>=20040802:../../archivers/pax
 TOOLS_CREATE+=			pax
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.pax=pax
-TOOLS_PATH.pax=			${TOOLS_PREFIX.pax}/bin/${NBPAX_PROGRAM_PREFIX}pax
+TOOLS_PATH.pax=			${LOCALBASE}/bin/${NBPAX_PROGRAM_PREFIX}pax
 .  endif
 .endif
 
@@ -715,8 +674,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.pkg-config=
 .  elif !empty(_TOOLS_USE_PKGSRC.pkg-config:M[yY][eE][sS])
 TOOLS_DEPENDS.pkg-config?=	pkg-config>=0.25:../../devel/pkg-config
 TOOLS_CREATE+=			pkg-config
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.pkg-config=pkg-config
-TOOLS_PATH.pkg-config=		${TOOLS_PREFIX.pkg-config}/bin/pkg-config
+TOOLS_PATH.pkg-config=		${LOCALBASE}/bin/pkg-config
 .  else
 AUTORECONF_ARGS+=		-I ${TOOLS_PLATFORM.pkg-config:S/\/bin\/pkg-config//}/share/aclocal
 .  endif
@@ -728,8 +686,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.rpm2pkg=
 .  elif !empty(_TOOLS_USE_PKGSRC.rpm2pkg:M[yY][eE][sS])
 TOOLS_DEPENDS.rpm2pkg?=		rpm2pkg>=3.1.4:../../pkgtools/rpm2pkg
 TOOLS_CREATE+=			rpm2pkg
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.rpm2pkg=rpm2pkg
-TOOLS_PATH.rpm2pkg=		${TOOLS_PREFIX.rpm2pkg}/sbin/rpm2pkg
+TOOLS_PATH.rpm2pkg=		${LOCALBASE}/sbin/rpm2pkg
 .  endif
 .endif
 
@@ -739,8 +696,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
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.sed=nbsed
-TOOLS_PATH.sed=			${TOOLS_PREFIX.nbsed}/bin/nbsed
+TOOLS_PATH.sed=			${LOCALBASE}/bin/nbsed
 .  endif
 .endif
 
@@ -750,8 +706,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
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.sh=pdksh
-TOOLS_PATH.sh=			${TOOLS_PREFIX.sh}/bin/pdksh
+TOOLS_PATH.sh=			${LOCALBASE}/bin/pdksh
 .  endif
 TOOLS_CMD.sh=			${TOOLS_DIR}/bin/sh
 .endif
@@ -762,8 +717,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
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.shlock=shlock
-TOOLS_PATH.shlock=		${TOOLS_PREFIX.shlock}/bin/shlock
+TOOLS_PATH.shlock=		${LOCALBASE}/bin/shlock
 .  endif
 .endif
 
@@ -773,8 +727,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.tar=
 .  elif !empty(_TOOLS_USE_PKGSRC.tar:M[yY][eE][sS])
 TOOLS_DEPENDS.tar?=		pax>=20040802:../../archivers/pax
 TOOLS_CREATE+=			tar
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.tar=pax
-TOOLS_PATH.tar=			${TOOLS_PREFIX.tar}/bin/${NBPAX_PROGRAM_PREFIX}tar
+TOOLS_PATH.tar=			${LOCALBASE}/bin/${NBPAX_PROGRAM_PREFIX}tar
 .  endif
 .endif
 
@@ -784,8 +737,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.tclsh=
 .  elif !empty(_TOOLS_USE_PKGSRC.tclsh:M[yY][eE][sS])
 TOOLS_DEPENDS.tclsh?=		tcl>=8.4:../../lang/tcl
 TOOLS_CREATE+=			tclsh
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.tclsh=tcl
-TOOLS_PATH.tclsh=		${TOOLS_PREFIX.tclsh}/bin/tclsh
+TOOLS_PATH.tclsh=		${LOCALBASE}/bin/tclsh
 .  endif
 .endif
 
@@ -795,8 +747,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.texi2html=
 .  elif !empty(_TOOLS_USE_PKGSRC.texi2html:M[yY][eE][sS])
 TOOLS_DEPENDS.texi2html?=	texi2html>=1.76:../../textproc/texi2html
 TOOLS_CREATE+=			texi2html
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.texi2html=texi2html
-TOOLS_PATH.texi2html=		${TOOLS_PREFIX.texi2html}/bin/texi2html
+TOOLS_PATH.texi2html=		${LOCALBASE}/bin/texi2html
 .  endif
 .endif
 
@@ -806,8 +757,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.ttmkfdir=
 .  elif !empty(_TOOLS_USE_PKGSRC.ttmkfdir:M[yY][eE][sS])
 TOOLS_DEPENDS.ttmkfdir?=	ttmkfdir2>=20021109:../../fonts/ttmkfdir2
 TOOLS_CREATE+=			ttmkfdir
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.ttmkfdir=ttmkfdir2
-TOOLS_PATH.ttmkfdir=		${TOOLS_PREFIX.ttmkfdir}/bin/ttmkfdir
+TOOLS_PATH.ttmkfdir=		${LOCALBASE}/bin/ttmkfdir
 .  endif
 .endif
 
@@ -817,8 +767,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.type1inst=
 .  elif !empty(_TOOLS_USE_PKGSRC.type1inst:M[yY][eE][sS])
 TOOLS_DEPENDS.type1inst?=	type1inst>=0.6.1:../../fonts/type1inst
 TOOLS_CREATE+=			type1inst
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.type1inst=type1inst
-TOOLS_PATH.type1inst=		${TOOLS_PREFIX.type1inst}/bin/type1inst
+TOOLS_PATH.type1inst=		${LOCALBASE}/bin/type1inst
 .  endif
 .endif
 
@@ -828,8 +777,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
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.unrar=unrar
-TOOLS_PATH.unrar=		${TOOLS_PREFIX.unrar}/bin/unrar
+TOOLS_PATH.unrar=		${LOCALBASE}/bin/unrar
 .  endif
 .endif
 
@@ -839,8 +787,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
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.unzip=unzip
-TOOLS_PATH.unzip=		${TOOLS_PREFIX.unzip}/bin/unzip
+TOOLS_PATH.unzip=		${LOCALBASE}/bin/unzip
 .  endif
 .endif
 
@@ -850,8 +797,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
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.unzoo=unzoo
-TOOLS_PATH.unzoo=		${TOOLS_PREFIX.unzoo}/bin/unzoo
+TOOLS_PATH.unzoo=		${LOCALBASE}/bin/unzoo
 .  endif
 .endif
 
@@ -860,8 +806,7 @@ TOOLS_PATH.unzoo=		${TOOLS_PREFIX.unzoo}/bin/unzoo
 MAKEFLAGS+=			TOOLS_IGNORE.wget=
 .  elif !empty(_TOOLS_USE_PKGSRC.wget:M[yY][eE][sS])
 TOOLS_DEPENDS.wget?=		wget-[0-9]*:../../net/wget
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.wget=wget
-TOOLS_PATH.wget=		${TOOLS_PREFIX.wget}/bin/wget
+TOOLS_PATH.wget=		${LOCALBASE}/bin/wget
 .  endif
 .endif
 
@@ -871,8 +816,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.wish=
 .  elif !empty(_TOOLS_USE_PKGSRC.wish:M[yY][eE][sS])
 TOOLS_DEPENDS.wish?=		tk>=8.4:../../x11/tk
 TOOLS_CREATE+=			wish
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.wish=tk
-TOOLS_PATH.wish=		${TOOLS_PREFIX.wish}/bin/wish
+TOOLS_PATH.wish=		${LOCALBASE}/bin/wish
 .  endif
 .endif
 
@@ -882,8 +826,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
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.xargs=findutils
-TOOLS_PATH.xargs=		${TOOLS_PREFIX.xargs}/bin/gxargs
+TOOLS_PATH.xargs=		${LOCALBASE}/bin/gxargs
 TOOLS_ARGS.xargs=		-r	# don't run command if stdin is empty
 .  endif
 .endif
@@ -896,8 +839,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.${_t_}=
 .    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
 TOOLS_DEPENDS.${_t_}?=		xz>=4.999.9betanb1:../../archivers/xz
 TOOLS_CREATE+=			${_t_}
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.${_t_}=xz
-TOOLS_PATH.${_t_}=		${TOOLS_PREFIX.${_t_}}/bin/${_t_}
+TOOLS_PATH.${_t_}=		${LOCALBASE}/bin/${_t_}
 .    endif
 .  endif
 .endfor
@@ -908,8 +850,7 @@ 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
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.yacc=bison
-TOOLS_PATH.yacc=		${TOOLS_PREFIX.yacc}/bin/bison
+TOOLS_PATH.yacc=		${LOCALBASE}/bin/bison
 TOOLS_ARGS.yacc=		-y
 #
 # bison/yacc is typically a build tool whose path is not embedded in
@@ -929,8 +870,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.${_t_}=
 .    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
 TOOLS_DEPENDS.${_t_}?=		zip-[0-9]*:../../archivers/zip
 TOOLS_CREATE+=			${_t_}
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.${_t_}=zip
-TOOLS_PATH.${_t_}=		${TOOLS_PREFIX.${_t_}}/bin/${_t_}
+TOOLS_PATH.${_t_}=		${LOCALBASE}/bin/${_t_}
 .    endif
 .  endif
 .endfor
@@ -997,8 +937,7 @@ MAKEFLAGS+=			TOOLS_IGNORE.${_t_}=
 _TOOLS_USE_PKGSRC.perl=		yes
 TOOLS_DEPENDS.${_t_}?=		perl>=${PERL5_REQD}:../../lang/perl5
 TOOLS_CREATE+=			${_t_}
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.${_t_}=perl
-TOOLS_PATH.${_t_}=		${TOOLS_PREFIX.${_t_}}/bin/${_t_}
+TOOLS_PATH.${_t_}=		${LOCALBASE}/bin/${_t_}
 .    endif
 .  endif
 .endfor
@@ -1018,8 +957,7 @@ MAKEFLAGS+=		TOOLS_IGNORE.${_t_}=
 .    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
 TOOLS_DEPENDS.${_t_}?=	coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=		${_t_}
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=coreutils
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/g${_t_}
+TOOLS_PATH.${_t_}=	${LOCALBASE}/bin/g${_t_}
 .    endif
 .  endif
 .endfor
@@ -1033,8 +971,7 @@ MAKEFLAGS+=		TOOLS_IGNORE.[=
 .  elif !empty(_TOOLS_USE_PKGSRC.[:M[yY][eE][sS])
 TOOLS_DEPENDS.[?=	coreutils>=5.2.1:../../sysutils/coreutils
 TOOLS_CREATE+=		[
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.[=coreutils
-TOOLS_PATH.[=		${TOOLS_PREFIX.[}/bin/g[
+TOOLS_PATH.[=		${LOCALBASE}/bin/g[
 .  endif
 .endif
 
@@ -1052,8 +989,7 @@ MAKEFLAGS+=		TOOLS_IGNORE.${_t_}=
 .    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
 TOOLS_DEPENDS.${_t_}?=	grep>=2.5.1:../../textproc/grep
 TOOLS_CREATE+=		${_t_}
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=grep
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/g${_t_}
+TOOLS_PATH.${_t_}=	${LOCALBASE}/bin/g${_t_}
 .    endif
 .  endif
 .endfor
@@ -1073,8 +1009,7 @@ MAKEFLAGS+=		TOOLS_IGNORE.${_t_}=
 .    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
 TOOLS_DEPENDS.${_t_}?=	mdocml>=1.12.0nb3:../../textproc/mdocml
 TOOLS_CREATE+=		${_t_}
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=mdocml
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/mandoc
+TOOLS_PATH.${_t_}=	${LOCALBASE}/bin/mandoc
 .    endif
 .  endif
 .endfor
@@ -1098,12 +1033,11 @@ _TOOLS_USE_PKGSRC.${_t_}= yes
 .      if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
 TOOLS_DEPENDS.${_t_}?=	groff>=1.19.2nb3:../../textproc/groff
 TOOLS_CREATE+=		${_t_}
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=groff
 .        if "${_t_}" != "groff"
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/g${_t_}
+TOOLS_PATH.${_t_}=	${LOCALBASE}/bin/g${_t_}
 TOOLS_ALIASES.${_t_}=	g${_t_}
 .        else
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/${_t_}
+TOOLS_PATH.${_t_}=	${LOCALBASE}/bin/${_t_}
 .        endif
 .      endif
 .    endif
@@ -1118,8 +1052,7 @@ MAKEFLAGS+=		TOOLS_IGNORE.gsoelim=
 .  elif !empty(_TOOLS_USE_PKGSRC.gsoelim:M[yY][eE][sS])
 TOOLS_DEPENDS.gsoelim?=	groff>=1.19nb4:../../textproc/groff
 TOOLS_CREATE+=		gsoelim
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.gsoelim=groff
-TOOLS_PATH.gsoelim=	${TOOLS_PREFIX.gsoelim}/bin/gsoelim
+TOOLS_PATH.gsoelim=	${LOCALBASE}/bin/gsoelim
 .  endif
 TOOLS_ALIASES.gsoelim=	soelim
 .endif
@@ -1138,8 +1071,7 @@ MAKEFLAGS+=		TOOLS_IGNORE.${_t_}=
 .    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
 TOOLS_DEPENDS.${_t_}?=	diffutils>=2.8.1:../../devel/diffutils
 TOOLS_CREATE+=		${_t_}
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=diffutils
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/g${_t_}
+TOOLS_PATH.${_t_}=	${LOCALBASE}/bin/g${_t_}
 .    endif
 .  endif
 .endfor
@@ -1173,8 +1105,7 @@ MAKEFLAGS+=		TOOLS_IGNORE.${_t_}=
 .    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
 TOOLS_DEPENDS.${_t_}?=	${TOOLS_DEPENDS.ghostscript}
 TOOLS_CREATE+=		${_t_}
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=${TOOLS_DEPENDS.ghostscript:C/:.*//}
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/${_t_}
+TOOLS_PATH.${_t_}=	${LOCALBASE}/bin/${_t_}
 .    endif
 .  endif
 .endfor
@@ -1192,8 +1123,7 @@ TOOLS_CREATE+=			iceauth
 TOOLS_PATH.iceauth=	${X11BASE}/bin/iceauth
 .    else
 TOOLS_DEPENDS.iceauth?=		iceauth-[0-9]*:../../x11/iceauth
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.iceauth=iceauth
-TOOLS_PATH.iceauth=		${TOOLS_PREFIX.iceauth}/bin/iceauth
+TOOLS_PATH.iceauth=		${LOCALBASE}/bin/iceauth
 .    endif
 .  endif
 .endif
@@ -1207,8 +1137,7 @@ TOOLS_CREATE+=			mkfontdir
 TOOLS_PATH.mkfontdir=	${X11BASE}/bin/mkfontdir
 .    else
 TOOLS_DEPENDS.mkfontdir?=	mkfontdir-[0-9]*:../../fonts/mkfontdir
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.mkfontdir=mkfontdir
-TOOLS_PATH.mkfontdir=		${TOOLS_PREFIX.mkfontdir}/bin/mkfontdir
+TOOLS_PATH.mkfontdir=		${LOCALBASE}/bin/mkfontdir
 .    endif
 .  endif
 .endif
@@ -1222,8 +1151,7 @@ TOOLS_CREATE+=			mkfontscale
 TOOLS_PATH.mkfontscale=	${X11BASE}/bin/mkfontscale
 .    else
 TOOLS_DEPENDS.mkfontscale?=	mkfontscale-[0-9]*:../../fonts/mkfontscale
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.mkfontscale=mkfontscale
-TOOLS_PATH.mkfontscale=		${TOOLS_PREFIX.mkfontscale}/bin/mkfontscale
+TOOLS_PATH.mkfontscale=		${LOCALBASE}/bin/mkfontscale
 .    endif
 .  endif
 .endif
@@ -1237,8 +1165,7 @@ TOOLS_CREATE+=			bdftopcf
 TOOLS_PATH.bdftopcf=	${X11BASE}/bin/bdftopcf
 .    else
 TOOLS_DEPENDS.bdftopcf?=	bdftopcf-[0-9]*:../../fonts/bdftopcf
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.bdftopcf=bdftopcf
-TOOLS_PATH.bdftopcf=		${TOOLS_PREFIX.bdftopcf}/bin/bdftopcf
+TOOLS_PATH.bdftopcf=		${LOCALBASE}/bin/bdftopcf
 .    endif
 .  endif
 .endif
@@ -1252,8 +1179,7 @@ TOOLS_CREATE+=			ucs2any
 TOOLS_PATH.ucs2any=	${X11BASE}/bin/ucs2any
 .    else
 TOOLS_DEPENDS.ucs2any?=		font-util-[0-9]*:../../fonts/font-util
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.ucs2any=ucs2any
-TOOLS_PATH.ucs2any=		${TOOLS_PREFIX.ucs2any}/bin/ucs2any
+TOOLS_PATH.ucs2any=		${LOCALBASE}/bin/ucs2any
 .    endif
 .  endif
 .endif
@@ -1267,8 +1193,7 @@ TOOLS_CREATE+=			bdftruncate
 TOOLS_PATH.bdftruncate=	${X11BASE}/bin/bdftruncate
 .    else
 TOOLS_DEPENDS.bdftruncate?=	font-util-[0-9]*:../../fonts/font-util
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.bdftruncate=bdftruncate
-TOOLS_PATH.bdftruncate=		${TOOLS_PREFIX.bdftruncate}/bin/bdftruncate
+TOOLS_PATH.bdftruncate=		${LOCALBASE}/bin/bdftruncate
 .    endif
 .  endif
 .endif
@@ -1282,8 +1207,7 @@ TOOLS_CREATE+=			xauth
 TOOLS_PATH.xauth=	${X11BASE}/bin/xauth
 .    else
 TOOLS_DEPENDS.xauth?=		xauth-[0-9]*:../../x11/xauth
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.xauth=xauth
-TOOLS_PATH.xauth=		${TOOLS_PREFIX.xauth}/bin/xauth
+TOOLS_PATH.xauth=		${LOCALBASE}/bin/xauth
 .    endif
 .  endif
 .endif
@@ -1297,8 +1221,7 @@ TOOLS_CREATE+=			xinit
 TOOLS_PATH.xinit=	${X11BASE}/bin/xinit
 .    else
 TOOLS_DEPENDS.xinit?=		xinit-[0-9]*:../../x11/xinit
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.xinit=xinit
-TOOLS_PATH.xinit=		${TOOLS_PREFIX.xinit}/bin/xinit
+TOOLS_PATH.xinit=		${LOCALBASE}/bin/xinit
 .    endif
 .  endif
 .endif
@@ -1312,8 +1235,7 @@ TOOLS_CREATE+=			xmessage
 TOOLS_PATH.xmessage=	${X11BASE}/bin/xmessage
 .    else
 TOOLS_DEPENDS.xmessage?=		xmessage-[0-9]*:../../x11/xmessage
-TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.xmessage=xmessage
-TOOLS_PATH.xmessage=		${TOOLS_PREFIX.xmessage}/bin/xmessage
+TOOLS_PATH.xmessage=		${LOCALBASE}/bin/xmessage
 .    endif
 .  endif
 .endif
@@ -1330,8 +1252,7 @@ _TOOLS.x11-imake=	imake mkdirhier xmkmf
       !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
 TOOLS_CREATE+=		${_t_}
 TOOLS_DEPENDS.${_t_}?=	imake-[0-9]*:../../devel/imake
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=imake
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/${_t_}
+TOOLS_PATH.${_t_}=	${LOCALBASE}/bin/${_t_}
 .  endif
 .endfor
 
@@ -1340,8 +1261,7 @@ TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/${_t_}
 TOOLS_CREATE+=		makedepend
 .  if defined(X11_TYPE) && !empty(X11_TYPE:Mmodular)
 TOOLS_DEPENDS.makedepend?=	makedepend-[0-9]*:../../devel/makedepend
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.makedepend=makedepend
-TOOLS_PATH.makedepend=	${TOOLS_PREFIX.makedepend}/bin/makedepend
+TOOLS_PATH.makedepend=	${LOCALBASE}/bin/makedepend
 .  else # !empty(X11_TYPE:Mnative)
 TOOLS_PATH.makedepend=	${X11BASE}/bin/makedepend
 .  endif
@@ -1349,12 +1269,6 @@ TOOLS_PATH.makedepend=	${X11BASE}/bin/makedepend
 
 ######################################################################
 
-# Compute the locations of the pkgsrc-supplied tools.
-FIND_PREFIX:=	${TOOLS_FIND_PREFIX}
-.include "../find-prefix.mk"
-
-######################################################################
-
 .for _t_ in ${_USE_TOOLS}
 .  if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) && \
       !defined(TOOLS_IGNORE.${_t_})