Remove mk/find-prefix.mk usage from the graphics 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.

14 files changed, 42 insertions, 78 deletions

diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 2448c2921e9..d85aac752e2 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2015/10/06 16:50:31 adam Exp $
+# $NetBSD: Makefile,v 1.72 2015/11/25 12:50:43 jperkin Exp $
 
 .include "Makefile.common"
 
@@ -16,7 +16,7 @@ USE_FEATURES=		vsnprintf	# optional but recommended for security
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--with-modules=yes
-CONFIGURE_ARGS+=	--with-gs-font-dir=${URW_FONTS_DIR}/share/fonts/urw
+CONFIGURE_ARGS+=	--with-gs-font-dir=${LOCALBASE}/share/fonts/urw
 CONFIGURE_ARGS+=	--with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
 CONFIGURE_ARGS+=	--with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
 CONFIGURE_ARGS+=	--without-perl
@@ -27,9 +27,6 @@ PKGCONFIG_OVERRIDE+=	Magick++/lib/GraphicsMagick++.pc.in
 
 TEST_TARGET=	check
 
-FIND_PREFIX:=	URW_FONTS_DIR=urw-fonts
-.include "../../mk/find-prefix.mk"
-
 .include "options.mk"
 
 .include "../../devel/libltdl/buildlink3.mk"
diff --git a/graphics/adwaita-icon-theme/Makefile b/graphics/adwaita-icon-theme/Makefile
index d39bb164833..63301b03f15 100644
--- a/graphics/adwaita-icon-theme/Makefile
+++ b/graphics/adwaita-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/06/14 22:19:00 prlw1 Exp $
+# $NetBSD: Makefile,v 1.5 2015/11/25 12:50:43 jperkin Exp $
 
 DISTNAME=		adwaita-icon-theme-3.16.2.1
 CATEGORIES=		graphics gnome
@@ -26,17 +26,15 @@ PKGCONFIG_OVERRIDE+=	adwaita-icon-theme.pc.in
 # but isn't
 INSTALLATION_DIRS+=	share/icons/Adwaita/96x96/places
 
-EVAL_PREFIX+=		PREFIX.svg=librsvg
-EVAL_PREFIX+=		PREFIX.gtk3=gtk3+
-FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${PREFIX.gtk3}/bin/gtk-update-icon-cache"
-FILES_SUBST+=		ICON_THEME_DIR="${PREFIX}/share/icons/Adwaita"
+FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${LOCALBASE}/bin/gtk-update-icon-cache"
+FILES_SUBST+=		ICON_THEME_DIR="${LOCALBASE}/share/icons/Adwaita"
 INSTALL_TEMPLATES+=	../../graphics/adwaita-icon-theme/files/icon-cache.tmpl
 DEINSTALL_TEMPLATES+=	../../graphics/adwaita-icon-theme/files/icon-cache.tmpl
 PRINT_PLIST_AWK+=	/^share\/icons\/gnome\/icon-theme.cache$$/ { next; }
 
 post-install:
 .for s in 16 22 24 32 48 96 256
-	 ${PREFIX.svg}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg \
+	 ${LOCALBASE}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg \
 	 -w ${s} -h ${s} -o \
 	 ${DESTDIR}${PREFIX}/share/icons/Adwaita/${s}x${s}/places/start-here.png
 .endfor
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 58eac8ca91b..3c6437230f7 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2015/04/25 14:23:07 tnn Exp $
+# $NetBSD: Makefile,v 1.114 2015/11/25 12:50:43 jperkin Exp $
 
 DISTNAME=	blender-2.71
 PKGREVISION=	6
@@ -19,9 +19,6 @@ PYTHON_VERSIONS_ACCEPTED=	34 33
 
 BUILD_DEPENDS+=		scons-[0-9]*:../../devel/scons
 
-FIND_PREFIX:=		SCONSDIR=scons
-.include "../../mk/find-prefix.mk"
-
 .include "options.mk"
 
 INSTALLATION_DIRS=	bin share/blender
@@ -74,7 +71,7 @@ do-build:
 # build is done in install phase.
 do-install:
 	cd ${WRKSRC:Q} && ${PKGSRC_SETENV} ${MAKE_ENV}			\
-		${SCONSDIR}/bin/scons ${SCONS_ARGS} ${_MAKE_JOBS}
+		${LOCALBASE}/bin/scons ${SCONS_ARGS} ${_MAKE_JOBS}
 
 CHECK_INTERPRETER_SKIP=	share/blender/${DISTNAME:S/blender-//:C/[a-z]//}/scripts/*.py share/blender/${DISTNAME:S/blender-//:C/[a-z]//}datafiles/*.py \
 			share/blender/${DISTNAME:S/blender-//:C/[a-z]//}/python/lib/python3.3/venv/scripts/posix/pydoc
diff --git a/graphics/elementary-xfce-icon-theme/Makefile b/graphics/elementary-xfce-icon-theme/Makefile
index dfb1ce0f029..b961cdcdf9d 100644
--- a/graphics/elementary-xfce-icon-theme/Makefile
+++ b/graphics/elementary-xfce-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/07/26 14:59:47 youri Exp $
+# $NetBSD: Makefile,v 1.4 2015/11/25 12:50:43 jperkin Exp $
 
 GHCOMMIT=	a0b2b19231c3383f77f106d9cdacb2d148519cfd
 DISTNAME=	${GHCOMMIT}
@@ -17,8 +17,7 @@ USE_TOOLS+=	pax
 
 WRKSRC=		${WRKDIR}/elementary-xfce-${GHCOMMIT}
 
-EVAL_PREFIX+=		PREFIX.gtk2=gtk2+
-FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${PREFIX.gtk2}/bin/gtk-update-icon-cache"
+FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${LOCALBASE}/bin/gtk-update-icon-cache"
 FILES_SUBST+=		ICON_THEME_DIR="${PREFIX}/share/icons"
 INSTALL_TEMPLATES+=	../../graphics/elementary-xfce-icon-theme/files/icon-cache.tmpl
 DEINSTALL_TEMPLATES+=	../../graphics/elementary-xfce-icon-theme/files/icon-cache.tmpl
diff --git a/graphics/gimp-docs-pl/Makefile b/graphics/gimp-docs-pl/Makefile
index 7041d56f1c0..2dd7424f52d 100644
--- a/graphics/gimp-docs-pl/Makefile
+++ b/graphics/gimp-docs-pl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/03/26 16:18:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.5 2015/11/25 12:50:43 jperkin Exp $
 #
 
 HELPLANGUAGE=		pl
@@ -9,11 +9,6 @@ PKGNAME=		gimp-docs-${HELPLANGUAGE}-${DISTNAME:S/gimp-help-//:S/-html-${HELPLANG
 # There is no po/pl/gimp.po in 2.8.1 tarball.
 # Use msgfmt and msginit from devel/gettext-tools.
 _TOOLS_USE_PKGSRC.msgfmt=	yes
-#TOOL_DEPENDS+=		gettext-tools-[0-9]*:../../devel/gettext-tools
-#FIND_PREFIX:=		GETTEXTTOOLSDIR=gettext-tools
-#.include "../../mk/find-prefix.mk"
-#CONFIGURE_ARGS+=	MSGFMT=${GETTEXTTOOLSDIR}/bin/msginit
-#CONFIGURE_ARGS+=	MSGINIT=${GETTEXTTOOLSDIR}/bin/msginit
 
 .include "../../graphics/gimp-docs-en/Makefile.common"
 
diff --git a/graphics/gnome-icon-theme/Makefile b/graphics/gnome-icon-theme/Makefile
index bad9ba0abf3..3cbab879736 100644
--- a/graphics/gnome-icon-theme/Makefile
+++ b/graphics/gnome-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2015/02/27 14:35:01 tnn Exp $
+# $NetBSD: Makefile,v 1.99 2015/11/25 12:50:43 jperkin Exp $
 
 DISTNAME=		gnome-icon-theme-3.12.0
 CATEGORIES=		graphics gnome
@@ -26,23 +26,19 @@ PKGCONFIG_OVERRIDE=	gnome-icon-theme.pc.in
 # the current pkgsrc version.
 BUILDLINK_API_DEPENDS.icon-naming-utils+=	icon-naming-utils>=0.8.90
 
-EVAL_PREFIX+=		PREFIX.gtk2=gtk2+
-FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${PREFIX.gtk2}/bin/gtk-update-icon-cache"
+FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${LOCALBASE}/bin/gtk-update-icon-cache"
 FILES_SUBST+=		ICON_THEME_DIR="${PREFIX}/share/icons/gnome"
 INSTALL_TEMPLATES+=	../../graphics/gnome-icon-theme/files/icon-cache.tmpl
 DEINSTALL_TEMPLATES+=	../../graphics/gnome-icon-theme/files/icon-cache.tmpl
 PRINT_PLIST_AWK+=	/^share\/icons\/gnome\/icon-theme.cache$$/ { next; }
 
-FIND_PREFIX:=	LIBRSVGDIR=librsvg
-.include "../../mk/find-prefix.mk"
-
 post-install:
-	${LIBRSVGDIR}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 16 -h 16 -o ${DESTDIR}${PREFIX}/share/icons/gnome/16x16/places/start-here.png
-	${LIBRSVGDIR}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 22 -h 22 -o ${DESTDIR}${PREFIX}/share/icons/gnome/22x22/places/start-here.png
-	${LIBRSVGDIR}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 24 -h 24 -o ${DESTDIR}${PREFIX}/share/icons/gnome/24x24/places/start-here.png
-	${LIBRSVGDIR}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 32 -h 32 -o ${DESTDIR}${PREFIX}/share/icons/gnome/32x32/places/start-here.png
-	${LIBRSVGDIR}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 48 -h 48 -o ${DESTDIR}${PREFIX}/share/icons/gnome/48x48/places/start-here.png
-	${LIBRSVGDIR}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 256 -h 256 -o ${DESTDIR}${PREFIX}/share/icons/gnome/256x256/places/start-here.png
+	${LOCALBASE}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 16 -h 16 -o ${DESTDIR}${PREFIX}/share/icons/gnome/16x16/places/start-here.png
+	${LOCALBASE}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 22 -h 22 -o ${DESTDIR}${PREFIX}/share/icons/gnome/22x22/places/start-here.png
+	${LOCALBASE}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 24 -h 24 -o ${DESTDIR}${PREFIX}/share/icons/gnome/24x24/places/start-here.png
+	${LOCALBASE}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 32 -h 32 -o ${DESTDIR}${PREFIX}/share/icons/gnome/32x32/places/start-here.png
+	${LOCALBASE}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 48 -h 48 -o ${DESTDIR}${PREFIX}/share/icons/gnome/48x48/places/start-here.png
+	${LOCALBASE}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 256 -h 256 -o ${DESTDIR}${PREFIX}/share/icons/gnome/256x256/places/start-here.png
 
 BUILDLINK_DEPMETHOD.gettext-lib=	build
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/gnome-icon-theme/buildlink3.mk b/graphics/gnome-icon-theme/buildlink3.mk
index 254082271f6..215a40e420d 100644
--- a/graphics/gnome-icon-theme/buildlink3.mk
+++ b/graphics/gnome-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2012/05/07 01:53:34 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2015/11/25 12:50:43 jperkin Exp $
 
 BUILDLINK_TREE+=	gnome-icon-theme
 
@@ -17,8 +17,7 @@ USE_TOOLS+=	perl
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if !defined(GNOME_ICON_THEME_DEPEND_ONLY)
-EVAL_PREFIX+=		PREFIX.gtk2=gtk2+
-FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${PREFIX.gtk2}/bin/gtk-update-icon-cache"
+FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${LOCALBASE}/bin/gtk-update-icon-cache"
 FILES_SUBST+=		ICON_THEME_DIR="${BUILDLINK_PREFIX.gnome-icon-theme}/share/icons/gnome"
 INSTALL_TEMPLATES+=	../../graphics/gnome-icon-theme/files/icon-cache.tmpl
 DEINSTALL_TEMPLATES+=	../../graphics/gnome-icon-theme/files/icon-cache.tmpl
diff --git a/graphics/hicolor-icon-theme/Makefile b/graphics/hicolor-icon-theme/Makefile
index 7b043cfddbe..a00a70bde6a 100644
--- a/graphics/hicolor-icon-theme/Makefile
+++ b/graphics/hicolor-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/10/09 14:06:35 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2015/11/25 12:50:43 jperkin Exp $
 
 DISTNAME=	hicolor-icon-theme-0.13
 CATEGORIES=	graphics
@@ -14,8 +14,7 @@ NO_BUILD=	YES
 USE_LANGUAGES=	# none, not even C
 USE_TOOLS+=	gmake
 
-EVAL_PREFIX+=		PREFIX.gtk2=gtk2+
-FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${PREFIX.gtk2}/bin/gtk-update-icon-cache"
+FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${LOCALBASE}/bin/gtk-update-icon-cache"
 FILES_SUBST+=		ICON_THEME_DIR="${PREFIX}/share/icons/hicolor"
 INSTALL_TEMPLATES+=	../../graphics/hicolor-icon-theme/files/icon-cache.tmpl
 DEINSTALL_TEMPLATES+=	../../graphics/hicolor-icon-theme/files/icon-cache.tmpl
diff --git a/graphics/hicolor-icon-theme/buildlink3.mk b/graphics/hicolor-icon-theme/buildlink3.mk
index fd18500b7ff..5861a036b47 100644
--- a/graphics/hicolor-icon-theme/buildlink3.mk
+++ b/graphics/hicolor-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2010/10/21 12:37:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2015/11/25 12:50:43 jperkin Exp $
 
 BUILDLINK_TREE+=	hicolor-icon-theme
 
@@ -12,8 +12,7 @@ BUILDLINK_PKGSRCDIR.hicolor-icon-theme?=../../graphics/hicolor-icon-theme
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if !defined(HICOLOR_ICON_THEME_DEPEND_ONLY)
-EVAL_PREFIX+=		PREFIX.gtk2=gtk2+
-FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${PREFIX.gtk2}/bin/gtk-update-icon-cache"
+FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${LOCALBASE}/bin/gtk-update-icon-cache"
 FILES_SUBST+=		ICON_THEME_DIR="${BUILDLINK_PREFIX.hicolor-icon-theme}/share/icons/hicolor"
 INSTALL_TEMPLATES+=	../../graphics/hicolor-icon-theme/files/icon-cache.tmpl
 DEINSTALL_TEMPLATES+=	../../graphics/hicolor-icon-theme/files/icon-cache.tmpl
diff --git a/graphics/iGMT/Makefile b/graphics/iGMT/Makefile
index 5a69b090a1c..fef236cbd52 100644
--- a/graphics/iGMT/Makefile
+++ b/graphics/iGMT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2013/04/24 10:06:49 sbd Exp $
+# $NetBSD: Makefile,v 1.35 2015/11/25 12:50:44 jperkin Exp $
 
 DISTNAME=		igmt_v1.2
 PKGNAME=		iGMT-1.2
@@ -20,9 +20,6 @@ WRKSRC=			${WRKDIR}/igmt_1.2
 NO_BUILD=		yes
 
 USE_TOOLS+=		gs:run ksh:run
-GMT_PREFIX_DEFAULT=	${LOCALBASE}
-EVAL_PREFIX+=		GMT_PREFIX=GMT
-EVAL_PREFIX+=		TK_PREFIX=tk
 
 REPLACE_KSH=		igmt igmt_helper* img2latlongrd.batch
 
@@ -31,8 +28,8 @@ INSTALLATION_DIRS=	bin
 do-configure:
 	for i in ${WRKSRC}/igmt ${WRKSRC}/igmt_configure.tcl; do	\
 		${SED} -e 's:@PREFIX@:'${PREFIX}':g'			\
-		       -e 's:@GMT_PREFIX@:'${GMT_PREFIX}':g'		\
-		       -e 's:@TK_PREFIX@:'${TK_PREFIX}':g'		\
+		       -e 's:@GMT_PREFIX@:'${LOCALBASE}':g'		\
+		       -e 's:@TK_PREFIX@:'${LOCALBASE}':g'		\
 		$$i > $$i.tmp && ${MV} -f $$i.tmp $$i;			\
 	done
 
diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index f2c2b90f313..49a84fe977f 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2015/04/25 14:23:17 tnn Exp $
+# $NetBSD: Makefile,v 1.21 2015/11/25 12:50:44 jperkin Exp $
 
 DISTNAME=	mypaint-1.1.0
 PKGREVISION=	1
@@ -21,9 +21,6 @@ USE_TOOLS+=	bash:run msgfmt pkg-config
 PYTHON_VERSIONED_DEPENDENCIES=	cairo
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-gtk2
 
-FIND_PREFIX:=	SCONSDIR=scons
-.include "../../mk/find-prefix.mk"
-
 USE_PKGLOCALEDIR=	yes
 
 SUBST_CLASSES+=			python
@@ -38,12 +35,12 @@ REPLACE_BASH=			brushes/label-brush-mypaint.sh
 do-build:
 	cd ${WRKSRC} && cd ${BUILD_DIRS} && \
 		${SETENV} ${MAKE_ENV} \
-		${SCONSDIR}/bin/scons prefix=${DESTDIR}${PREFIX}
+		${LOCALBASE}/bin/scons prefix=${DESTDIR}${PREFIX}
 
 do-install:
 	cd ${WRKSRC} && cd ${INSTALL_DIRS} && \
 		${SETENV} ${MAKE_ENV} \
-		${SCONSDIR}/bin/scons prefix=${DESTDIR}${PREFIX} install
+		${LOCALBASE}/bin/scons prefix=${DESTDIR}${PREFIX} install
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/graphics/tex-epstopdf/Makefile b/graphics/tex-epstopdf/Makefile
index d44519c1cf4..e9346da50a5 100644
--- a/graphics/tex-epstopdf/Makefile
+++ b/graphics/tex-epstopdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/06/12 10:50:13 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2015/11/25 12:50:44 jperkin Exp $
 
 DISTNAME=	epstopdf
 PKGNAME=	tex-${DISTNAME}-2.23
@@ -10,7 +10,6 @@ COMMENT=	Convert EPS to 'encapsulated' PDF using Ghostscript
 
 CONFLICTS=	texlive-pdftools<2011
 
-EVAL_PREFIX+=	KPSEWHICH_PREFIX=kpathsea
 USE_TOOLS+=	gs:run perl:run
 
 REPLACE_PERL=	bin/epstopdf
@@ -20,7 +19,7 @@ SUBST_MESSAGE.paths=	Setting paths to commands.
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	bin/epstopdf
 SUBST_SED.paths+=	-e 's,@GHOSTSCRIPT@,${TOOLS_PATH.gs},g'
-SUBST_SED.paths+=	-e 's,@KPSEWHICH@,${KPSEWHICH_PREFIX}/bin/kpsewhich,g'
+SUBST_SED.paths+=	-e 's,@KPSEWHICH@,${LOCALBASE}/bin/kpsewhich,g'
 
 INSTALLATION_DIRS=	bin
 TEX_TEXMF_DIRS=		# empty
diff --git a/graphics/tex-pst-pdf/Makefile b/graphics/tex-pst-pdf/Makefile
index 214413eac06..27bc5f9ffe8 100644
--- a/graphics/tex-pst-pdf/Makefile
+++ b/graphics/tex-pst-pdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/04/24 10:16:08 sbd Exp $
+# $NetBSD: Makefile,v 1.4 2015/11/25 12:50:44 jperkin Exp $
 
 DISTNAME=	pst-pdf
 PKGNAME=	tex-${DISTNAME}-1.1v
@@ -20,10 +20,6 @@ DEPENDS+=	tex-pstricks-[0-9]*:../../graphics/tex-pstricks
 
 USE_TOOLS+=	gs:run
 
-EVAL_PREFIX+=	DVIPS_PREFIX=dvipsk
-EVAL_PREFIX+=	PS2PDF_PREFIX=ghostscript
-EVAL_PREFIX+=	LATEX_PREFIX=tex-latex-bin
-EVAL_PREFIX+=	PDFCROP_PREFIX=tex-pdfcrop
 USE_TOOLS+=	sed:run sh:run
 
 REPLACE_SH=	bin/ps4pdf
@@ -32,11 +28,11 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Setting paths to commands.
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	bin/ps4pdf
-SUBST_SED.paths+=	-e 's,@DVIPS@,${DVIPS_PREFIX}/bin/dvips,g'
-SUBST_SED.paths+=	-e 's,@LATEX@,${LATEX_PREFIX}/bin/latex,g'
-SUBST_SED.paths+=	-e 's,@PDFCROP@,${PDFCROP_PREFIX}/bin/pdfcrop,g'
-SUBST_SED.paths+=	-e 's,@PDFLATEX@,${LATEX_PREFIX}/bin/pdflatex,g'
-SUBST_SED.paths+=	-e 's,@PS2PDF@,${PS2PDF_PREFIX}/bin/ps2pdf,g'
+SUBST_SED.paths+=	-e 's,@DVIPS@,${LOCALBASE}/bin/dvips,g'
+SUBST_SED.paths+=	-e 's,@LATEX@,${LOCALBASE}/bin/latex,g'
+SUBST_SED.paths+=	-e 's,@PDFCROP@,${LOCALBASE}/bin/pdfcrop,g'
+SUBST_SED.paths+=	-e 's,@PDFLATEX@,${LOCALBASE}/bin/pdflatex,g'
+SUBST_SED.paths+=	-e 's,@PS2PDF@,${LOCALBASE}/bin/ps2pdf,g'
 SUBST_SED.paths+=	-e 's,@SED@,${TOOLS_PATH.sed},g'
 
 INSTALLATION_DIRS+=	bin
diff --git a/graphics/x11rec/Makefile b/graphics/x11rec/Makefile
index 0092e719c96..67611d0a579 100644
--- a/graphics/x11rec/Makefile
+++ b/graphics/x11rec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2015/03/15 19:51:08 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.22 2015/11/25 12:50:44 jperkin Exp $
 #
 
 DISTNAME=	x11rec-0.3
@@ -13,7 +13,6 @@ COMMENT=	Very ad hoc X11 recorder which create a movie
 LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	gifsicle-[0-9]*:../../graphics/gifsicle
-DEPENDS+=	ImageMagick-[0-9]*:../../graphics/ImageMagick
 
 .include "../../mk/bsd.prefs.mk"
 .if ${X11_TYPE} == "modular"
@@ -38,10 +37,6 @@ do-install:
 .include "../../lang/ruby/replace.mk"
 DEPENDS+=	${RUBY_BASE}-[0-9]*:${RUBY_SRCDIR}
 
-FIND_PREFIX:=	BUILDLINK_PREFIX.ImageMagick=ImageMagick	\
-		BUILDLINK_PREFIX.gifsicle=gifsicle
-.include "../../mk/find-prefix.mk"
-
 SUBST_CLASSES+=		toolpath
 SUBST_STAGE.toolpath=	pre-configure
 SUBST_MESSAGE.toolpath=	Fixing paths.
@@ -49,6 +44,7 @@ SUBST_FILES.toolpath=	x11rec
 SUBST_SED.toolpath=	-e "s|@xwininfo@|${X11BASE}/bin/xwininfo|"
 SUBST_SED.toolpath+=	-e "s|@xwd@|${X11BASE}/bin/xwd|"
 SUBST_SED.toolpath+=	-e "s|@convert@|${BUILDLINK_PREFIX.ImageMagick}/bin/convert|"
-SUBST_SED.toolpath+=	-e "s|@gifsicle@|${BUILDLINK_PREFIX.gifsicle}/bin/gifsicle|"
+SUBST_SED.toolpath+=	-e "s|@gifsicle@|${LOCALBASE}/bin/gifsicle|"
 
+.include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"