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

7 files changed, 15 insertions, 29 deletions

diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 5e5175b2971..fab22652ec7 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2015/05/08 19:35:33 bsiegert Exp $
+# $NetBSD: Makefile,v 1.36 2015/11/25 12:49:46 jperkin Exp $
 
 DISTNAME=	cppcheck-1.69
 CATEGORIES=	devel
@@ -14,13 +14,10 @@ BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 
-FIND_PREFIX:=	DBXSLDIR=docbook-xsl
-.include "../../mk/find-prefix.mk"
-
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
 BUILD_TARGET=		all man
-BUILD_MAKE_FLAGS+=	DB2MAN=${DBXSLDIR}/share/xsl/docbook/manpages/docbook.xsl
+BUILD_MAKE_FLAGS+=	DB2MAN=${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl
 # tell cppcheck where its config is
 MAKE_FLAGS+=		CFGDIR=${PREFIX}/share/cppcheck/cfg
 # rules support (needs pcre)
diff --git a/devel/dconf/database.mk b/devel/dconf/database.mk
index f759c2ff552..073efb3677b 100644
--- a/devel/dconf/database.mk
+++ b/devel/dconf/database.mk
@@ -1,4 +1,4 @@
-# $NetBSD: database.mk,v 1.1 2014/05/25 06:06:00 obache Exp $
+# $NetBSD: database.mk,v 1.2 2015/11/25 12:49:46 jperkin Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # dconf database.  It takes care of update the corresponding databases
@@ -8,9 +8,7 @@
 .if !defined(DCONF_DATABASE_MK)
 DCONF_DATABASE_MK=	# defined
 
-EVAL_PREFIX+=	BUILDLINK_PREFIX.dconf=dconf
-
-DCONF=	${BUILDLINK_PREFIX.dconf}/bin/dconf
+DCONF=			${LOCALBASE}/bin/dconf
 
 FILES_SUBST+=		DCONF=${DCONF:Q}
 INSTALL_TEMPLATES+=	../../devel/dconf/files/database.tmpl
diff --git a/devel/flim/Makefile b/devel/flim/Makefile
index b5dccb86960..ce32449d3c0 100644
--- a/devel/flim/Makefile
+++ b/devel/flim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2013/02/17 19:17:58 dholland Exp $
+# $NetBSD: Makefile,v 1.37 2015/11/25 12:49:46 jperkin Exp $
 
 DISTNAME=	flim-1.14.9
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -20,7 +20,6 @@ BUILD_TARGET=	${BUILD_TARGET.${EMACS_FLAVOR}}
 INSTALL_TARGET=	${INSTALL_TARGET.${EMACS_FLAVOR}}
 MAKEFLAGS=	${MAKEFLAGS.${EMACS_FLAVOR}}
 
-EVAL_PREFIX+=	QKC_PREFIX=qkc
 USE_TOOLS+=	makeinfo
 INFO_FILES=	yes
 TEXINFO_REQD=	4.5
@@ -40,7 +39,7 @@ post-build:
 	@cd ${WRKSRC}; for i in mime-en mime-ja; do			\
 		${RM} -f $${i}.info*;					\
 		${CP} $${i}.texi $${i}.texi.orig;			\
-		${QKC_PREFIX}/bin/qkc -Oeu $${i}.texi.orig >$${i}.texi;	\
+		${LOCALBASE}/bin/qkc -Oeu $${i}.texi.orig >$${i}.texi;	\
 		makeinfo --force --no-validate $${i}.texi;		\
 	done
 
diff --git a/devel/intellij-idea-ce/Makefile b/devel/intellij-idea-ce/Makefile
index 50293b25818..b16c718d0e8 100644
--- a/devel/intellij-idea-ce/Makefile
+++ b/devel/intellij-idea-ce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/09/17 17:13:33 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2015/11/25 12:49:46 jperkin Exp $
 
 VERSION=	13.1.2
 DISTNAME=	ideaIC-${VERSION:S/.0.0//}-src
@@ -22,9 +22,6 @@ USE_TOOLS+=	pax tar
 DEPENDS+=	snappy-java10-[0-9]*:../../devel/snappy-java10
 BUILD_DEPENDS+=	apache-ant-[0-9]*:../../devel/apache-ant
 
-FIND_PREFIX:=	ANTDIR=apache-ant
-.include "../../mk/find-prefix.mk"
-
 SUBST_CLASSES+=		dos_eol
 SUBST_MESSAGE.dos_eol=	Removing DOS line-ends
 SUBST_STAGE.dos_eol=	post-extract
@@ -47,7 +44,7 @@ do-build:
 # Build Java part
 	cd ${WRKSRC} \
 		&& env ${MAKE_ENV} \
-		${ANTDIR}/bin/ant
+		${LOCALBASE}/bin/ant
 # Build fsnotifier native binary
 	cd ${WRKSRC}/native/fsNotifier/linux && \
 		${CC} -Wall -std=c99 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 \
diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index 0da09282ecf..5c48d3efb52 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.135 2015/10/10 01:58:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.136 2015/11/25 12:49:46 jperkin Exp $
 
 DISTNAME=	kdevelop_3.5.5.orig
 PKGNAME=	kdevelop-base-3.5.5
@@ -48,14 +48,11 @@ SUBST_MESSAGE.perlpath=	Fix perl path.
 SUBST_FILES.perlpath=	languages/perl/perlparser.cpp parts/doxygen/config.cpp
 SUBST_SED.perlpath=	-e s:/usr/bin/perl:${PERL5:Q}:
 
-EVAL_PREFIX+=		QT3DIR=qt3
-EVAL_PREFIX+=		KDELIBDIR=kdelibs
-
 CONFIGURE_ARGS+=	--with-db-includedir=${BDBBASE}/include/${BDB_TYPE}
 CONFIGURE_ARGS+=	--with-db-libdir=${BDBBASE}/lib
 CONFIGURE_ARGS+=	--with-db-lib=${BDB_TYPE}
-CONFIGURE_ARGS+=	--with-qtdoc-dir=${QT3DIR}/qt3/doc/html
-CONFIGURE_ARGS+=	--with-kdelibsdoxy-dir=${KDELIBDIR}/share/doc/kde/HTML/en/kdelibs-apidocs
+CONFIGURE_ARGS+=	--with-qtdoc-dir=${LOCALBASE}/qt3/doc/html
+CONFIGURE_ARGS+=	--with-kdelibsdoxy-dir=${LOCALBASE}/share/doc/kde/HTML/en/kdelibs-apidocs
 
 .include "options.mk"
 
diff --git a/devel/nsis/Makefile b/devel/nsis/Makefile
index 659609768aa..65daadf3c8a 100644
--- a/devel/nsis/Makefile
+++ b/devel/nsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/09/19 08:49:20 obache Exp $
+# $NetBSD: Makefile,v 1.17 2015/11/25 12:49:46 jperkin Exp $
 #
 
 DISTNAME=	nsis-${NSIS_VER}
@@ -24,8 +24,7 @@ WRKSRC=		${WRKDIR}/${NSIS_SRC}
 NO_CONFIGURE=	yes
 EXTRACT_OPTS_ZIP=	-qo
 
-EVAL_PREFIX+=	SCONS_PREFIX=scons
-SCONS_BIN=	${SCONS_PREFIX}/bin/scons
+SCONS_BIN=	${LOCALBASE}/bin/scons
 MAKENSIS_BIN=	${PREFIX}/share/nsis/makensis
 
 INSTALLATION_DIRS=	bin share/nsis
diff --git a/devel/semi/Makefile b/devel/semi/Makefile
index aacfdd90fa7..57bf678eb13 100644
--- a/devel/semi/Makefile
+++ b/devel/semi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2013/04/06 20:27:19 rodent Exp $
+# $NetBSD: Makefile,v 1.36 2015/11/25 12:49:46 jperkin Exp $
 #
 
 DISTNAME=	semi-1.14.6
@@ -26,7 +26,6 @@ BUILD_TARGET=	${BUILD_TARGET.${EMACS_FLAVOR}}
 INSTALL_TARGET=	${INSTALL_TARGET.${EMACS_FLAVOR}}
 MAKEFLAGS=	${MAKEFLAGS.${EMACS_FLAVOR}}
 
-EVAL_PREFIX+=	QKC_PREFIX=qkc
 USE_TOOLS+=	makeinfo
 INFO_FILES=	yes
 
@@ -44,7 +43,7 @@ post-build:
 	@cd ${WRKSRC}; for i in mime-ui-en mime-ui-ja; do		\
 		${RM} -f $${i}.info*;					\
 		${CP} $${i}.texi $${i}.texi.orig;			\
-		${QKC_PREFIX}/bin/qkc -Oeu $${i}.texi.orig >$${i}.texi;	\
+		${LOCALBASE}/bin/qkc -Oeu $${i}.texi.orig >$${i}.texi;	\
 		makeinfo --force --no-validate $${i}.texi;		\
 	done