Remove mk/find-prefix.mk usage from the print category.

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, 10 insertions, 17 deletions

diff --git a/print/tex-tetex/Makefile b/print/tex-tetex/Makefile
index 6b4c6cffa2d..f76056ad365 100644
--- a/print/tex-tetex/Makefile
+++ b/print/tex-tetex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2015/08/09 11:04:54 markd Exp $
+# $NetBSD: Makefile,v 1.25 2015/11/25 12:53:09 jperkin Exp $
 
 DISTNAME=	tetex
 PKGNAME=	tex-${DISTNAME}-3.0.38001
@@ -18,20 +18,16 @@ USE_TOOLS+=	perl:run sh:run
 
 FILES_SUBST+=	UPDMAP_SYS=${PREFIX}/bin/updmap-sys
 
-EVAL_PREFIX+=	DIALOG_PREFIX=dialog
-EVAL_PREFIX+=	KPATHSEA_PREFIX=kpathsea
-EVAL_PREFIX+=	TEXCONFIG_PREFIX=tex-texconfig
-
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Setting paths to commands.
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	bin/fmtutil bin/fmtutil-sys bin/kpsetool bin/kpsewhere \
 			bin/texconfig-dialog bin/texconfig-sys bin/texlinks \
 			bin/updmap bin/updmap-sys
-SUBST_SED.paths+=	-e 's,@DIALOG@,${DIALOG_PREFIX}/bin/dialog,g'
+SUBST_SED.paths+=	-e 's,@DIALOG@,${LOCALBASE}/bin/dialog,g'
 SUBST_SED.paths+=	-e 's,@FMTUTIL@,${PREFIX}/bin/fmtutil,g'
-SUBST_SED.paths+=	-e 's,@KPSEWHICH@,${KPATHSEA_PREFIX}/bin/kpsewhich,g'
-SUBST_SED.paths+=	-e 's,@TEXCONFIG@,${TEXCONFIG_PREFIX}/bin/texconfig,g'
+SUBST_SED.paths+=	-e 's,@KPSEWHICH@,${LOCALBASE}/bin/kpsewhich,g'
+SUBST_SED.paths+=	-e 's,@TEXCONFIG@,${LOCALBASE}/bin/texconfig,g'
 SUBST_SED.paths+=	-e 's,@UPDMAP@,${PREFIX}/bin/updmap,g'
 
 REPLACE_PERL=	bin/updmap bin/fmtutil texmf-dist/scripts/texlive/mktexlsr.pl
diff --git a/print/tex-tetex/format.mk b/print/tex-tetex/format.mk
index 2242a94a153..53b317fbe34 100644
--- a/print/tex-tetex/format.mk
+++ b/print/tex-tetex/format.mk
@@ -1,4 +1,4 @@
-# $NetBSD: format.mk,v 1.1 2012/10/14 21:30:33 minskim Exp $
+# $NetBSD: format.mk,v 1.2 2015/11/25 12:53:09 jperkin Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # install TeX format files.  It creates format files at
@@ -14,8 +14,7 @@ TEX_FORMAT_MK=		# defined
 
 DEPENDS+=		tex-tetex>=3.0.27774:../../print/tex-tetex
 
-EVAL_PREFIX+=		TETEX_PREFIX=tex-tetex
-FILES_SUBST+=		FMTUTIL_SYS=${TETEX_PREFIX:Q}/bin/fmtutil-sys
+FILES_SUBST+=		FMTUTIL_SYS=${LOCALBASE}/bin/fmtutil-sys
 FILES_SUBST+=		FORMATS=${TEX_FORMATS:Q}
 FILES_SUBST+=		PRINTF=${PRINTF:Q}
 INSTALL_TEMPLATES+=	../../print/tex-tetex/files/format-install.tmpl
diff --git a/print/tex-tetex/hyphen.mk b/print/tex-tetex/hyphen.mk
index 863906ba623..674fcd61de7 100644
--- a/print/tex-tetex/hyphen.mk
+++ b/print/tex-tetex/hyphen.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hyphen.mk,v 1.1 2013/11/15 06:08:51 minskim Exp $
+# $NetBSD: hyphen.mk,v 1.2 2015/11/25 12:53:09 jperkin Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # install TeX hyphenation pattens.  It updates format files at
@@ -17,8 +17,7 @@ TEX_HYPHEN_MK=		# defined
 DEPENDS+=		tex-hyphen-base>=2010nb1:../../print/tex-hyphen-base
 DEPENDS+=		tex-tetex>=3.0.27774nb1:../../print/tex-tetex
 
-EVAL_PREFIX+=		TETEX_PREFIX=tex-tetex
-FILES_SUBST+=		FMTUTIL_SYS=${TETEX_PREFIX:Q}/bin/fmtutil-sys
+FILES_SUBST+=		FMTUTIL_SYS=${LOCALBASE}/bin/fmtutil-sys
 FILES_SUBST+=		HYPHEN_DAT=${TEX_HYPHEN_DAT:Q}
 FILES_SUBST+=		HYPHEN_DEF=${TEX_HYPHEN_DEF:Q}
 FILES_SUBST+=		HYPHEN_LUA=${TEX_HYPHEN_LUA:Q}
diff --git a/print/tex-tetex/map.mk b/print/tex-tetex/map.mk
index 00ebb16deb6..d571bbf1aca 100644
--- a/print/tex-tetex/map.mk
+++ b/print/tex-tetex/map.mk
@@ -1,4 +1,4 @@
-# $NetBSD: map.mk,v 1.2 2012/03/04 01:01:43 minskim Exp $
+# $NetBSD: map.mk,v 1.3 2015/11/25 12:53:09 jperkin Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # install font maps for TeX.  It updates font map entries in updmap.cfg
@@ -18,8 +18,7 @@ TEX_MAP_MK=		# defined
 
 DEPENDS+=		tex-tetex>=3.0.25424:../../print/tex-tetex
 
-EVAL_PREFIX+=		TETEX_PREFIX=tex-tetex
-FILES_SUBST+=		UPDMAP_SYS=${TETEX_PREFIX:Q}/bin/updmap-sys
+FILES_SUBST+=		UPDMAP_SYS=${LOCALBASE}/bin/updmap-sys
 FILES_SUBST+=		MAP_FILES=${TEX_MAP_FILES:Q}
 FILES_SUBST+=		MIXEDMAP_FILES=${TEX_MIXEDMAP_FILES:Q}
 FILES_SUBST+=		KANJIMAP_FILES=${TEX_KANJIMAP_FILES:Q}