Remove mk/find-prefix.mk usage from the textproc 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/textproc/mecab-ipadic/Makefile b/textproc/mecab-ipadic/Makefile
index 38fdd0ce786..0133036eefb 100644
--- a/textproc/mecab-ipadic/Makefile
+++ b/textproc/mecab-ipadic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/25 06:56:07 asau Exp $
+# $NetBSD: Makefile,v 1.8 2015/11/25 12:53:42 jperkin Exp $
 #
 
 .include "../../textproc/mecab/Makefile.common"
@@ -18,8 +18,6 @@ CONFIGURE_ARGS+=	--with-charset=${MECAB_CHARSET:Q}
 
 BUILD_DEFS+=		MECAB_CHARSET
 
-FIND_PREFIX:=	MECABDIR=mecab-base
-.include "../../mk/find-prefix.mk"
-CONFIGURE_ARGS+=	--with-mecab-config=${MECABDIR}/bin/mecab-config
+CONFIGURE_ARGS+=	--with-mecab-config=${LOCALBASE}/bin/mecab-config
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/mecab-jumandic/Makefile b/textproc/mecab-jumandic/Makefile
index d90fb0db823..73d10a2c3bd 100644
--- a/textproc/mecab-jumandic/Makefile
+++ b/textproc/mecab-jumandic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/10/25 06:56:07 asau Exp $
+# $NetBSD: Makefile,v 1.7 2015/11/25 12:53:42 jperkin Exp $
 #
 
 .include "../../textproc/mecab/Makefile.common"
@@ -20,8 +20,6 @@ BUILD_DEFS+=		MECAB_CHARSET
 
 UNLIMIT_RESOURCES=	datasize
 
-FIND_PREFIX:=	MECABDIR=mecab-base
-.include "../../mk/find-prefix.mk"
-CONFIGURE_ARGS+=	--with-mecab-config=${MECABDIR}/bin/mecab-config
+CONFIGURE_ARGS+=	--with-mecab-config=${LOCALBASE}/bin/mecab-config
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/mecab-naistdic/Makefile b/textproc/mecab-naistdic/Makefile
index ae732be6215..f45b4616bde 100644
--- a/textproc/mecab-naistdic/Makefile
+++ b/textproc/mecab-naistdic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/06/29 11:06:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2015/11/25 12:53:42 jperkin Exp $
 #
 
 DISTNAME=	mecab-naist-jdic-0.6.3-20100801
@@ -22,8 +22,6 @@ BUILD_DEFS+=		MECAB_CHARSET
 
 UNLIMIT_RESOURCES=	datasize
 
-FIND_PREFIX:=	MECABDIR=mecab-base
-.include "../../mk/find-prefix.mk"
-CONFIGURE_ARGS+=	--with-mecab-config=${MECABDIR}/bin/mecab-config
+CONFIGURE_ARGS+=	--with-mecab-config=${LOCALBASE}/bin/mecab-config
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile
index c3cf765c49c..97de5b769be 100644
--- a/textproc/py-enchant/Makefile
+++ b/textproc/py-enchant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/07/22 10:22:39 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2015/11/25 12:53:42 jperkin Exp $
 
 DISTNAME=	pyenchant-1.6.6
 PKGNAME=	${DISTNAME:S/py/${PYPKGPREFIX}-/}
@@ -16,14 +16,11 @@ DEPENDS+=	enchant-[0-9]*:../../textproc/enchant
 
 USE_LANGUAGES=	# empty
 
-FIND_PREFIX:=	ENCHANT_DIR=enchant
-.include "../../mk/find-prefix.mk"
-
 .include "../../mk/bsd.prefs.mk"
 
 DLEXT.dylib=	dylib
 DLEXT=		${DLEXT.${_OPSYS_SHLIB_TYPE}:Uso}
-PYENCHANT_LIBRARY_PATH=	${ENCHANT_DIR}/lib/libenchant.${DLEXT}
+PYENCHANT_LIBRARY_PATH=	${LOCALBASE}/lib/libenchant.${DLEXT}
 
 # fix the path of libenchant with patch-ab.
 SUBST_CLASSES+=		dlpath
diff --git a/textproc/queequeg/Makefile b/textproc/queequeg/Makefile
index d2661a46357..339571afb46 100644
--- a/textproc/queequeg/Makefile
+++ b/textproc/queequeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/05/09 07:37:22 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2015/11/25 12:53:42 jperkin Exp $
 
 DISTNAME=	queequeg-0.91
 PKGREVISION=	1
@@ -26,11 +26,8 @@ SUBST_FILES.fix-python+=	Makefile
 SUBST_SED.fix-python+=		-e 's,/usr/bin/env python,${PYTHONBIN},'
 SUBST_SED.fix-python+=		-e 's,python ,${PYTHONBIN} ,'
 
-FIND_PREFIX:=		WORDNETDIR=WordNet
-.include "../../mk/find-prefix.mk"
-
 BUILD_TARGET=		dict
-BUILD_MAKE_FLAGS=	WORDNETDICT=${WORDNETDIR}/dict
+BUILD_MAKE_FLAGS=	WORDNETDICT=${LOCALBASE}/dict
 
 INSTALLATION_DIRS=	bin ${PYSITELIB} dict
 
diff --git a/textproc/xmlcatmgr/buildlink3.mk b/textproc/xmlcatmgr/buildlink3.mk
index 405d2819381..51b8d59901d 100644
--- a/textproc/xmlcatmgr/buildlink3.mk
+++ b/textproc/xmlcatmgr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/06/14 22:58:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2015/11/25 12:53:42 jperkin Exp $
 #
 # This Makefile fragment is included by packages that use xmlcatmgr.
 #
@@ -21,9 +21,7 @@ BUILDLINK_API_DEPENDS.xmlcatmgr+=		xmlcatmgr>=2.0beta1
 BUILDLINK_PKGSRCDIR.xmlcatmgr?=		../../textproc/xmlcatmgr
 
 # Location of the xmlcatmgr binary program.
-EVAL_PREFIX+=			XMLCATMGR_PREFIX=xmlcatmgr
-XMLCATMGR_PREFIX_DEFAULT=	${LOCALBASE}
-XMLCATMGR=			${XMLCATMGR_PREFIX}/bin/xmlcatmgr
+XMLCATMGR=		${LOCALBASE}/bin/xmlcatmgr
 
 # System-wide configurable catalogs.
 .if defined(PKG_SYSCONFDIR.xmlcatmgr) && !empty(PKG_SYSCONFDIR.xmlcatmgr)
diff --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk
index d04f3fa43d9..1a3da181084 100644
--- a/textproc/xmlcatmgr/catalogs.mk
+++ b/textproc/xmlcatmgr/catalogs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: catalogs.mk,v 1.20 2013/05/10 22:33:55 riastradh Exp $
+# $NetBSD: catalogs.mk,v 1.21 2015/11/25 12:53:42 jperkin Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # catalog files or DTDs.  It takes care of registering them into the right
@@ -48,8 +48,8 @@ XML_ENTRIES+=	nextCatalog ${PREFIX:=${c}} --
 #
 .if !empty(SGML_ENTRIES) || !empty(XML_ENTRIES)
 FILES_SUBST+=	XMLCATMGR=${XMLCATMGR:Q}
-FILES_SUBST+=	SGML_CATALOG="${XMLCATMGR_PREFIX}/share/sgml/catalog"
-FILES_SUBST+=	XML_CATALOG="${XMLCATMGR_PREFIX}/share/xml/catalog"
+FILES_SUBST+=	SGML_CATALOG="${LOCALBASE}/share/sgml/catalog"
+FILES_SUBST+=	XML_CATALOG="${LOCALBASE}/share/xml/catalog"
 FILES_SUBST+=	SGML_ENTRIES=${SGML_ENTRIES:Q}
 FILES_SUBST+=	XML_ENTRIES=${XML_ENTRIES:Q}
 INSTALL_TEMPLATES+=	../../textproc/xmlcatmgr/files/install.tmpl