Remove mk/find-prefix.mk usage from the misc 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, 12 insertions, 24 deletions

diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 03206c9717c..5c931de937c 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2015/04/25 14:23:34 tnn Exp $
+# $NetBSD: Makefile,v 1.108 2015/11/25 12:51:54 jperkin Exp $
 
 DISTNAME=	kdeutils-${_KDE_VERSION}
 PKGREVISION=	36
@@ -12,16 +12,13 @@ COMMENT=	Utilities for the KDE integrated X11 desktop
 LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 MAKE_ENV+=		EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
 
-DEPENDS+=	gtar-base>=1.13.25:../../archivers/gtar-base
-
-EVAL_PREFIX+=		PREFIX.gtar=gtar
-PREFIX.gtar_DEFAULT=	${LOCALBASE}
+USE_TOOLS+=		gtar:run
 
 SUBST_CLASSES+=		tarexe
 SUBST_STAGE.tarexe=	pre-configure
 SUBST_MESSAGE.tarexe=	Use GNU tar in ark
 SUBST_FILES.tarexe=	ark/ark.kcfg
-SUBST_SED.tarexe=	-e 's:<default>tar</default>:<default>${PREFIX.gtar}/bin/gtar</default>:'
+SUBST_SED.tarexe=	-e 's:<default>tar</default>:<default>${TOOLS_PATH.gtar}</default>:'
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/misc/libreoffice/options.mk b/misc/libreoffice/options.mk
index 6a44527dcfe..6bffbb518f5 100644
--- a/misc/libreoffice/options.mk
+++ b/misc/libreoffice/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/08/12 00:57:20 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2015/11/25 12:51:54 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libreoffice
 PKG_SUPPORTED_OPTIONS=	java debug kde4 gtk3
@@ -18,13 +18,10 @@ PLIST_VARS+=	java kde4 gtk3
 USE_JAVA=		yes
 USE_JAVA2=		yes
 BUILD_DEPENDS+=	apache-ant-[0-9]*:../../devel/apache-ant
-FIND_PREFIX:=		ANTDIR=apache-ant
-CONFIGURE_ARGS+=	--with-ant-home=${ANTDIR}
+CONFIGURE_ARGS+=	--with-ant-home=${LOCALBASE}
 
 DEPENDS+=	hsqldb18-[0-9]*:../../databases/hsqldb18
-FIND_PREFIX+=		HSQLDB_SYSDIR=hsqldb18
-CONFIGURE_ARGS+=	--with-hsqldb-jar=${HSQLDB_SYSDIR}/lib/java/hsqldb18/hsqldb.jar
-.include "../../mk/find-prefix.mk"
+CONFIGURE_ARGS+=	--with-hsqldb-jar=${LOCALBASE}/lib/java/hsqldb18/hsqldb.jar
 CONFIGURE_ARGS+=	--enable-ext-wiki-publisher \
 			--with-java \
 			--with-jdk-home=${PKG_JAVA_HOME} \
diff --git a/misc/libreoffice4/options.mk b/misc/libreoffice4/options.mk
index 6535c2e0f03..f8d18d0661e 100644
--- a/misc/libreoffice4/options.mk
+++ b/misc/libreoffice4/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2015/07/30 21:56:30 ryoon Exp $
+# $NetBSD: options.mk,v 1.12 2015/11/25 12:51:54 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libreoffice4
 PKG_SUPPORTED_OPTIONS=	java debug kde4 gtk3
@@ -18,13 +18,10 @@ PLIST_VARS+=	java kde4 gtk3
 USE_JAVA=		yes
 USE_JAVA2=		yes
 BUILD_DEPENDS+=	apache-ant-[0-9]*:../../devel/apache-ant
-FIND_PREFIX:=		ANTDIR=apache-ant
-CONFIGURE_ARGS+=	--with-ant-home=${ANTDIR}
+CONFIGURE_ARGS+=	--with-ant-home=${LOCALBASE}
 
 DEPENDS+=	hsqldb18-[0-9]*:../../databases/hsqldb18
-FIND_PREFIX+=		HSQLDB_SYSDIR=hsqldb18
-CONFIGURE_ARGS+=	--with-hsqldb-jar=${HSQLDB_SYSDIR}/lib/java/hsqldb18/hsqldb.jar
-.include "../../mk/find-prefix.mk"
+CONFIGURE_ARGS+=	--with-hsqldb-jar=${LOCALBASE}/lib/java/hsqldb18/hsqldb.jar
 CONFIGURE_ARGS+=	--enable-ext-wiki-publisher \
 			--with-java \
 			--with-jdk-home=${PKG_JAVA_HOME} \
diff --git a/misc/libreoffice43/options.mk b/misc/libreoffice43/options.mk
index aae59096622..e4ee77c736d 100644
--- a/misc/libreoffice43/options.mk
+++ b/misc/libreoffice43/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/08/19 07:11:44 he Exp $
+# $NetBSD: options.mk,v 1.2 2015/11/25 12:51:54 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libreoffice4
 PKG_SUPPORTED_OPTIONS=	java debug kde4 gtk3
@@ -16,13 +16,10 @@ PLIST_VARS+=	java kde4 gtk3
 USE_JAVA=		yes
 USE_JAVA2=		yes
 BUILD_DEPENDS+=	apache-ant-[0-9]*:../../devel/apache-ant
-FIND_PREFIX:=		ANTDIR=apache-ant
-CONFIGURE_ARGS+=	--with-ant-home=${ANTDIR}
+CONFIGURE_ARGS+=	--with-ant-home=${LOCALBASE}
 
 DEPENDS+=	hsqldb18-[0-9]*:../../databases/hsqldb18
-FIND_PREFIX+=		HSQLDB_SYSDIR=hsqldb18
-CONFIGURE_ARGS+=	--with-hsqldb-jar=${HSQLDB_SYSDIR}/lib/java/hsqldb18/hsqldb.jar
-.include "../../mk/find-prefix.mk"
+CONFIGURE_ARGS+=	--with-hsqldb-jar=${LOCALBASE}/lib/java/hsqldb18/hsqldb.jar
 CONFIGURE_ARGS+=	--enable-ext-wiki-publisher \
 			--with-java \
 			--with-jdk-home=${PKG_JAVA_HOME} \