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.

17 files changed, 40 insertions, 69 deletions

diff --git a/print/cups15/options.mk b/print/cups15/options.mk
index c9b9dd768fa..f19d112e502 100644
--- a/print/cups15/options.mk
+++ b/print/cups15/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/06/17 13:17:12 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2015/11/25 12:53:09 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cups
 PKG_OPTIONS_REQUIRED_GROUPS=	pdftops
@@ -76,11 +76,9 @@ MESSAGE_SRC=		${.CURDIR}/MESSAGE
 .endif
 
 .if !empty(PKG_OPTIONS:Mpoppler)
-FIND_PREFIX:=	POPPLERDIR=poppler-utils
-.include "../../mk/find-prefix.mk"
 DEPENDS+=	poppler-utils-[0-9]*:../../print/poppler-utils
 CONFIGURE_ARGS+=	--with-pdftops=pdftops
-CONFIGURE_ENV+=		ac_cv_path_CUPS_PDFTOPS=${POPPLERDIR}/bin/pdftops
+CONFIGURE_ENV+=		ac_cv_path_CUPS_PDFTOPS=${LOCALBASE}/bin/pdftops
 .endif
 
 .if !empty(PKG_OPTIONS:Mslp)
diff --git a/print/dvipsk/Makefile b/print/dvipsk/Makefile
index 98c67957242..a77b114e406 100644
--- a/print/dvipsk/Makefile
+++ b/print/dvipsk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/06/14 12:50:00 markd Exp $
+# $NetBSD: Makefile,v 1.14 2015/11/25 12:53:09 jperkin Exp $
 
 DISTNAME=	texlive-20150521-source
 PKGNAME=	dvipsk-5.995
@@ -41,22 +41,18 @@ INSTALLATION_DIRS+=	share/examples/dvipsk
 TEX_TEXMF_DIRS+=	${PKG_SYSCONFDIR}
 TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf-dist
 
-FIND_PREFIX:=	TEX_DVIPS_PREFIX=tex-dvips \
-		TEXCONFIG_PREFIX=tex-texconfig
-.include "../../mk/find-prefix.mk"
-
 BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
 .include "../../print/kpathsea/buildlink3.mk"
 .include "../../print/kpathsea/texmf.mk"
 
 post-build:
 	${MKDIR} -p ${WRKSRC}/texk/dvipsk/texmf-dist/dvips/config
-	${CP} ${TEX_DVIPS_PREFIX}/share/texmf-dist/dvips/config/config.ps \
+	${CP} ${LOCALBASE}/share/texmf-dist/dvips/config/config.ps \
 		${WRKSRC}/texk/dvipsk/texmf-dist/dvips/config
-	env TEXMFCONFIG=${TEX_DVIPS_PREFIX}/share/texmf-dist \
+	env TEXMFCONFIG=${LOCALBASE}/share/texmf-dist \
 		TFC_TEXMFCONFIG=${WRKSRC}/texk/dvipsk/texmf \
 		configPsFile=${WRKSRC}/texk/dvipsk/texmf-dist/dvips/config/config.ps \
-		${TEXCONFIG_PREFIX}/bin/texconfig dvips paper ${LOWER_PAPERSIZE}
+		${LOCALBASE}/bin/texconfig dvips paper ${LOWER_PAPERSIZE}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/texk/dvipsk/texmf-dist/dvips/config/config.ps \
diff --git a/print/foomatic-filters-cups/Makefile b/print/foomatic-filters-cups/Makefile
index c4242779cc2..009412f1351 100644
--- a/print/foomatic-filters-cups/Makefile
+++ b/print/foomatic-filters-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/06/18 09:28:17 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2015/11/25 12:53:09 jperkin Exp $
 
 META_PACKAGE=	yes
 
@@ -15,8 +15,7 @@ DEPENDS+=	foomatic-filters-${FOOMATIC_FILTERS_VERSION}{,nb[0-9]*}:../../print/fo
 
 WRKSRC=		${WRKDIR}
 
-EVAL_PREFIX+=		CUPS_PREFIX=cups
-CUPS_FILTERDIR=		${CUPS_PREFIX:Q}/libexec/cups/filter
+CUPS_FILTERDIR=		${LOCALBASE}/libexec/cups/filter
 FILES_SUBST+=		CUPS_FILTERDIR=${CUPS_FILTERDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index 92e5a9730ac..0dec88bd40c 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/06/28 13:09:35 gdt Exp $
+# $NetBSD: Makefile,v 1.30 2015/11/25 12:53:09 jperkin Exp $
 
 .include "Makefile.common"
 
@@ -18,9 +18,8 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--disable-file-converter-check
 
-EVAL_PREFIX+=		CUPS_PREFIX=cups
-CUPS_FILTERDIR=		${CUPS_PREFIX:Q}/libexec/cups/filter
-CONFIGURE_ENV+=	CUPS_FILTERS=${CUPS_FILTERDIR}
+CUPS_FILTERDIR=		${LOCALBASE}/libexec/cups/filter
+CONFIGURE_ENV+=		CUPS_FILTERS=${CUPS_FILTERDIR}
 FILES_SUBST+=		CUPS_FILTERDIR=${CUPS_FILTERDIR}
 
 TEXTTOPS_DEPENDS=	{a2ps,enscript,mpage}-[0-9]*
diff --git a/print/foomatic-ppds-cups/Makefile b/print/foomatic-ppds-cups/Makefile
index 78438369647..730fffab74d 100644
--- a/print/foomatic-ppds-cups/Makefile
+++ b/print/foomatic-ppds-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/06/18 09:28:51 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2015/11/25 12:53:09 jperkin Exp $
 
 META_PACKAGE=	yes
 
@@ -15,8 +15,7 @@ DEPENDS+=	foomatic-ppds-${FOOMATIC_PPDS_VERSION}{,nb[0-9]*}:../../print/foomatic
 
 WRKSRC=		${WRKDIR}
 
-EVAL_PREFIX+=		CUPS_PREFIX=cups
-CUPS_DATADIR=		${CUPS_PREFIX:Q}/share/cups/model
+CUPS_DATADIR=		${LOCALBASE}/share/cups/model
 FILES_SUBST+=		CUPS_DATADIR=${CUPS_DATADIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/foomatic4-filters/Makefile b/print/foomatic4-filters/Makefile
index 78428fb5762..d240fe1f503 100644
--- a/print/foomatic4-filters/Makefile
+++ b/print/foomatic4-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2015/06/12 10:50:57 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2015/11/25 12:53:09 jperkin Exp $
 
 DISTNAME=	foomatic-filters-4.0.17
 PKGREVISION=	8
@@ -37,8 +37,7 @@ INSTALL_TARGET=	install-bin install-man
 
 .if !empty(PKG_OPTIONS:Mcups)
 DEPENDS+=	cups>=1.0:../../print/cups15
-EVAL_PREFIX+=	CUPS_PREFIX=cups
-CUPS_FILTERDIR=	${CUPS_PREFIX:Q}/libexec/cups/filter
+CUPS_FILTERDIR=	${LOCALBASE}/libexec/cups/filter
 CONFIGURE_ENV+=	CUPS_FILTERS=${CUPS_FILTERDIR}
 FILES_SUBST+=	CUPS_FILTERDIR=${CUPS_FILTERDIR}
 DEINSTALL_TEMPLATES+=	${.CURDIR}/../../print/foomatic-filters-cups/DEINSTALL
diff --git a/print/kpathsea/texmf.mk b/print/kpathsea/texmf.mk
index 772f5ab5650..abac12023a9 100644
--- a/print/kpathsea/texmf.mk
+++ b/print/kpathsea/texmf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: texmf.mk,v 1.7 2013/11/15 06:08:51 minskim Exp $
+# $NetBSD: texmf.mk,v 1.8 2015/11/25 12:53:09 jperkin Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # install TeX packages.  It rebuilds the ls-R databases at
@@ -27,8 +27,7 @@ TEX_TEXMF_MK=		# defined
 DEPENDS+=		kpathsea>=3.5.7:../../print/kpathsea
 
 TEX_TEXMF_DIRS?=	${PREFIX}/share/texmf-dist
-EVAL_PREFIX+=		KPATHSEA_PREFIX=kpathsea
-FILES_SUBST+=		MKTEXLSR=${KPATHSEA_PREFIX:Q}/bin/mktexlsr
+FILES_SUBST+=		MKTEXLSR=${LOCALBASE}/bin/mktexlsr
 FILES_SUBST+=		TEXMF_DIRS=${TEX_TEXMF_DIRS:Q}
 .if !empty(TEX_TEXMF_DIRS)
 INSTALL_TEMPLATES+=	../../print/kpathsea/files/texmf-install.tmpl
diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile
index 7057da97d7b..7a4a2574886 100644
--- a/print/lgrind/Makefile
+++ b/print/lgrind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2012/10/08 13:45:41 asau Exp $
+# $NetBSD: Makefile,v 1.35 2015/11/25 12:53:09 jperkin Exp $
 
 DISTNAME=	lgrind
 PKGNAME=	lgrind-3.5
@@ -17,7 +17,6 @@ WRKSRC=		${WRKDIR}/lgrind
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 NO_CONFIGURE=	yes
 
-EVAL_PREFIX+=	LATEX_PREFIX=tex-latex-bin
 MAKE_ENV+=	PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:Q}
 
 .include "../../print/kpathsea/texmf.mk"
@@ -32,8 +31,8 @@ pre-patch:
 		${WRKSRC}/source/Makefile
 
 pre-build:
-	(cd ${WRKSRC} && ${LATEX_PREFIX}/bin/latex lgrind.ins)
-	(cd ${WRKSRC} && ${LATEX_PREFIX}/bin/pdflatex lgrind.dtx)
+	(cd ${WRKSRC} && ${LOCALBASE}/bin/latex lgrind.ins)
+	(cd ${WRKSRC} && ${LOCALBASE}/bin/pdflatex lgrind.dtx)
 	${MV} ${WRKSRC}/source/lgrind.1 ${WRKSRC}/source/lgrind.1.bak
 	${MV} ${WRKSRC}/source/lgrindef.5 ${WRKSRC}/source/lgrindef.5.bak
 	${SED} -e 's,@PREFIX@,${PREFIX},g' \
diff --git a/print/tex-foiltex/Makefile b/print/tex-foiltex/Makefile
index 864038dc15e..edd617f2c0d 100644
--- a/print/tex-foiltex/Makefile
+++ b/print/tex-foiltex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/10/08 13:45:47 asau Exp $
+# $NetBSD: Makefile,v 1.13 2015/11/25 12:53:09 jperkin Exp $
 
 DISTNAME=	# empty
 PKGNAME=	tex-foiltex-2.1.4a
@@ -21,8 +21,6 @@ NO_SRC_ON_CDROM=${RESTRICTED}
 
 NO_CONFIGURE=	YES
 
-EVAL_PREFIX+=	LATEX_PREFIX=tex-latex-bin
-
 INSTALLATION_DIRS+=	${PREFIX}/share/texmf-dist/tex/latex/foiltex
 
 .include "../../print/kpathsea/texmf.mk"
@@ -33,7 +31,7 @@ do-extract:
 	done
 
 do-build:
-	cd ${WRKSRC} && ${LATEX_PREFIX}/bin/latex foiltex.ins
+	cd ${WRKSRC} && ${LOCALBASE}/bin/latex foiltex.ins
 
 do-install:
 	cd ${WRKSRC} && for f in foils.* foil*.clo fltfonts.def; do \
diff --git a/print/tex-pdftools/Makefile b/print/tex-pdftools/Makefile
index df99b778036..efc3706b776 100644
--- a/print/tex-pdftools/Makefile
+++ b/print/tex-pdftools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/06/14 12:50:05 markd Exp $
+# $NetBSD: Makefile,v 1.10 2015/11/25 12:53:09 jperkin Exp $
 
 DISTNAME=	pdftools
 PKGNAME=	tex-${DISTNAME}-0.86
@@ -14,7 +14,6 @@ DEPENDS+=	tex-oberdiek>=2011:../../print/tex-oberdiek
 DEPENDS+=	tex-pst-pdf-[0-9]*:../../graphics/tex-pst-pdf
 DEPENDS+=	web2c-[0-9]*:../../print/web2c
 
-EVAL_PREFIX+=	EPSTOPDF_PREFIX=tex-epstopdf
 USE_TOOLS+=	perl:run
 
 REPLACE_PERL+=	bin/e2pall
@@ -23,7 +22,7 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Setting paths to commands.
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	bin/e2pall
-SUBST_SED.paths+=	-e 's,@EPSTOPDF@,${EPSTODPF_PREFIX}/bin/epstopdf,g'
+SUBST_SED.paths+=	-e 's,@EPSTOPDF@,${LOCALBASE}/bin/epstopdf,g'
 
 INSTALLATION_DIRS+=	bin
 TEX_TEXMF_DIRS=		# empty
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}
diff --git a/print/tex-texconfig/Makefile b/print/tex-texconfig/Makefile
index 941db79a4a2..f72157d309f 100644
--- a/print/tex-texconfig/Makefile
+++ b/print/tex-texconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/04/25 04:49:50 markd Exp $
+# $NetBSD: Makefile,v 1.4 2015/11/25 12:53:09 jperkin Exp $
 
 DISTNAME=	texconfig
 PKGNAME=	tex-${DISTNAME}-2014
@@ -12,15 +12,13 @@ DEPENDS+=	kpathsea-[0-9]*:../../print/kpathsea
 
 USE_TOOLS+=	sh:run
 
-EVAL_PREFIX+=	KPSEWHICH_PREFIX=kpathsea
-
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Setting paths to commands.
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	bin/texconfig texmf-dist/texconfig/tcfmgr
 SUBST_SED.paths=	-e 's,@FMTUTIL@,${LOCALBASE}/bin/fmtutil,g'
-SUBST_SED.paths+=	-e 's,@KPSEWHICH@,${KPSEWHICH_PREFIX}/bin/kpsewhich,g'
-SUBST_SED.paths+=	-e 's,@MKTEXLSR@,${KPSEWHICH_PREFIX}/bin/mktexlsr,g'
+SUBST_SED.paths+=	-e 's,@KPSEWHICH@,${LOCALBASE}/bin/kpsewhich,g'
+SUBST_SED.paths+=	-e 's,@MKTEXLSR@,${LOCALBASE}/bin/mktexlsr,g'
 SUBST_SED.paths+=	-e 's,@TEXCONF_DIALOG@,${LOCALBASE}/bin/texconfig-dialog,g'
 SUBST_SED.paths+=	-e 's,@TEXLINKS@,${LOCALBASE}/bin/texlnks,g'
 SUBST_SED.paths+=	-e 's,@UPDMAP@,${LOCALBASE}/bin/updmap,g'
diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index 7db77b74466..acd307c4df0 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/10/14 20:17:27 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2015/11/25 12:53:09 jperkin Exp $
 
 DISTNAME=	texlive-20150521-source
 PKGNAME=	xdvik-22.87
@@ -32,9 +32,6 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/texk/xdvik
 CONFIG_GUESS_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.guess
 CONFIG_SUB_OVERRIDE+=	${WRKDIR}/${DISTNAME}/build-aux/config.sub
 
-FIND_PREFIX:=	TEX_XDVI_PREFIX=tex-xdvi
-.include "../../mk/find-prefix.mk"
-
 CONFIGURE_ARGS+=	--with-system-freetype2
 CONFIGURE_ARGS+=	--with-system-kpathsea
 CONFIGURE_ARGS+=	--with-system-zlib \
diff --git a/print/xetex/Makefile b/print/xetex/Makefile
index dbabf963ad0..ea6641b7fe6 100644
--- a/print/xetex/Makefile
+++ b/print/xetex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2015/11/23 10:30:17 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2015/11/25 12:53:09 jperkin Exp $
 
 DISTNAME=	texlive-20150521-source
 PKGNAME=	xetex-0.99992
@@ -49,13 +49,11 @@ CONFIGURE_DIRS+=	libs/harfbuzz
 CONFIGURE_DIRS+=	libs/xpdf
 CONFIGURE_DIRS+=	texk/web2c
 
-EVAL_PREFIX+=	XDVIPDFMX_PREFIX=xdvipdfmx
-
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Setting paths to commands.
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	texk/web2c/xetexdir/XeTeX_ext.c
-SUBST_SED.paths=	-e 's,@XDVIPDFMX@,${XDVIPDFMX_PREFIX}/bin/xdvipdfmx,g'
+SUBST_SED.paths=	-e 's,@XDVIPDFMX@,${LOCALBASE}/bin/xdvipdfmx,g'
 
 INSTALLATION_DIRS+=	bin