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.

4 files changed, 15 insertions, 22 deletions

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