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

12 files changed, 28 insertions, 61 deletions

diff --git a/inputmethod/canna-dict/Makefile b/inputmethod/canna-dict/Makefile
index 6e4b348b9dd..131e33dc39b 100644
--- a/inputmethod/canna-dict/Makefile
+++ b/inputmethod/canna-dict/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2015/10/18 03:58:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.16 2015/11/25 12:50:57 jperkin Exp $
 
 CANNA_MODULE=	dict
 
@@ -8,10 +8,9 @@ MAKE_JOBS_SAFE=	no
 
 BUILD_DEPENDS+=	Canna-server>=${CANNA_VERSION}:../../inputmethod/canna-server
 
-EVAL_PREFIX+=	CANNASERVERBINDIR=Canna-server
 .for cmd in MERGE FORCPP FORSORT SPLITWORD MERGEWORD CRXGRAM CRXDIC CRFREQ KPDIC
 CANNA_CMD_SED_SCRIPT+=	\
-	-e 's|\(${cmd} = \).*/\(.*\)|\1${CANNASERVERBINDIR}/bin/\2|'
+	-e 's|\(${cmd} = \).*/\(.*\)|\1${LOCALBASE}/bin/\2|'
 .endfor
 
 DICT_WRKSRC=		${WRKSRC}/dic/ideo
diff --git a/inputmethod/dbskkd-cdb/Makefile b/inputmethod/dbskkd-cdb/Makefile
index 0748164d5d0..742d8bae679 100644
--- a/inputmethod/dbskkd-cdb/Makefile
+++ b/inputmethod/dbskkd-cdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/06 14:25:10 asau Exp $
+# $NetBSD: Makefile,v 1.5 2015/11/25 12:50:57 jperkin Exp $
 #
 
 DISTNAME=	dbskkd-cdb-2.00
@@ -18,13 +18,11 @@ INSTALLATION_DIRS=	libexec \
 
 DEPENDS=	skk-jisyo-cdb-[0-9]*:../../inputmethod/skk-jisyo-cdb
 
-FIND_PREFIX:=	SKKJISYOCDBDIR=skk-jisyo-cdb
-
 SUBST_CLASSES+=			fix-paths
 SUBST_STAGE.fix-paths=		pre-configure
 SUBST_MESSAGE.fix-paths=	fixing pathes
 SUBST_FILES.fix-paths=		dbskkd-cdb.c
-SUBST_SED.fix-paths=		-e 's,/usr/local/share/skk/SKK-JISYO.L.cdb,${SKKJISYOCDBDIR}/share/skk/SKK-JISYO.L.cdb,g'
+SUBST_SED.fix-paths=		-e 's,/usr/local/share/skk/SKK-JISYO.L.cdb,${LOCALBASE}/share/skk/SKK-JISYO.L.cdb,g'
 
 CDBLIB=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.tinycdb}/lib \
 		-L${BUILDLINK_PREFIX.tinycdb}/lib -lcdb
@@ -51,6 +49,5 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${filename} ${DESTDIR}${DOCSDIR}
 .endfor
 
-.include "../../mk/find-prefix.mk"
 .include "../../databases/tinycdb/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/ibus-anthy/Makefile b/inputmethod/ibus-anthy/Makefile
index e26f878f913..79e7bed6b40 100644
--- a/inputmethod/ibus-anthy/Makefile
+++ b/inputmethod/ibus-anthy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/03/15 17:56:15 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.20 2015/11/25 12:50:57 jperkin Exp $
 
 DISTNAME=	ibus-anthy-1.5.6
 CATEGORIES=	inputmethod japanese
@@ -19,12 +19,9 @@ USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c
 USE_TOOLS+=		pkg-config msgfmt gmake intltool
 
-FIND_PREFIX:=	KASUMI_DIR=kasumi
-.include "../../mk/find-prefix.mk"
-
 CONFIGURE_ARGS+=	--localedir=${PREFIX}/${PKGLOCALEDIR}/locale
-CONFIGURE_ARGS+=	--with-kasumi-exec=${KASUMI_DIR}/bin/kasumi
-CONFIGURE_ARGS+=	--with-kasumi-icon=${KASUMI_DIR}/share/pixmaps/kasumi.png
+CONFIGURE_ARGS+=	--with-kasumi-exec=${LOCALBASE}/bin/kasumi
+CONFIGURE_ARGS+=	--with-kasumi-icon=${LOCALBASE}/share/pixmaps/kasumi.png
 CONFIGURE_ARGS+=	--with-layout=default
 #CONFIGURE_ARGS+=	--enable-pygtk2-anthy
 
diff --git a/inputmethod/ibus-handwrite/Makefile b/inputmethod/ibus-handwrite/Makefile
index 023f460f602..f61beb7b12d 100644
--- a/inputmethod/ibus-handwrite/Makefile
+++ b/inputmethod/ibus-handwrite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2015/04/25 14:23:22 tnn Exp $
+# $NetBSD: Makefile,v 1.34 2015/11/25 12:50:57 jperkin Exp $
 #
 
 DISTNAME=	ibus-handwrite-3.0.0
@@ -14,15 +14,12 @@ LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	zinnia-tomoe-[0-9]*:../../inputmethod/zinnia-tomoe
 
-FIND_PREFIX:=	ZINNIA_TOMOE_DIR=zinnia-tomoe
-.include "../../mk/find-prefix.mk"
-
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config
 
 CONFIGURE_ARGS+=	--enable-zinnia
-CONFIGURE_ARGS+=	--with-zinnia-tomoe=${ZINNIA_TOMOE_DIR}/lib/zinnia/model/tomoe
+CONFIGURE_ARGS+=	--with-zinnia-tomoe=${LOCALBASE}/lib/zinnia/model/tomoe
 
 SUBST_CLASSES+=		locale_dir
 SUBST_STAGE.locale_dir=	pre-configure
diff --git a/inputmethod/ibus-kkc/Makefile b/inputmethod/ibus-kkc/Makefile
index d400755d425..61e76312c02 100644
--- a/inputmethod/ibus-kkc/Makefile
+++ b/inputmethod/ibus-kkc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/04/25 14:23:22 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2015/11/25 12:50:58 jperkin Exp $
 
 DISTNAME=	ibus-kkc-1.5.21
 PKGREVISION=	1
@@ -19,9 +19,7 @@ USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
-FIND_PREFIX:=	SKK_JISYO_DIR=skk-jisyo
-.include "../../mk/find-prefix.mk"
-CONFIGURE_ARGS+=	--with-skkdic=${SKK_JISYO_DIR}/share/skk
+CONFIGURE_ARGS+=	--with-skkdic=${LOCALBASE}/share/skk
 
 .include "../../converters/libkkc/buildlink3.mk"
 .include "../../inputmethod/ibus/buildlink3.mk"
diff --git a/inputmethod/ibus-table-chinese/Makefile b/inputmethod/ibus-table-chinese/Makefile
index 299eba4c87d..6727676f543 100644
--- a/inputmethod/ibus-table-chinese/Makefile
+++ b/inputmethod/ibus-table-chinese/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/08/10 19:27:48 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2015/11/25 12:50:58 jperkin Exp $
 #
 
 DISTNAME=	ibus-table-chinese-1.8.2
@@ -24,10 +24,7 @@ MAKE_JOBS_SAFE=	noo
 # Illegal byte sequence in array30_ExtB.txt
 .if !empty(MACHINE_PLATFORM:MNetBSD-[0-5].*-*)
 BUILD_DEPENDS+=		libiconv-[0-9]*:../../converters/libiconv
-FIND_PREFIX:= ICONV_PREFIX=libiconv
-.include "../../mk/find-prefix.mk"
-
-CMAKE_ARGS+=	-DICONV_CMD:PATH=${ICONV_PREFIX}/bin/iconv
+CMAKE_ARGS+=		-DICONV_CMD:PATH=${LOCALBASE}/bin/iconv
 .endif
 
 .include "../../inputmethod/ibus-table/buildlink3.mk"
diff --git a/inputmethod/mozc-server/Makefile.common b/inputmethod/mozc-server/Makefile.common
index 99411792a59..85e298124e2 100644
--- a/inputmethod/mozc-server/Makefile.common
+++ b/inputmethod/mozc-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2015/10/12 07:24:50 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.22 2015/11/25 12:50:58 jperkin Exp $
 # used by inputmethod/ibus-mozc/Makefile
 # used by inputmethod/mozc-elisp/Makefile
 # used by inputmethod/mozc-server/Makefile
@@ -41,10 +41,6 @@ USE_LANGUAGES=	c c++
 
 USE_TOOLS+=	gmake pkg-config
 
-FIND_PREFIX:=	GYPDIR=${PYPKGPREFIX}-gyp
-#FIND_PREFIX:=	NINJADIR=ninja
-.include "../../mk/find-prefix.mk"
-
 OPENSSL_CFLAGS=		-I${BUILDLINK_PREFIX.openssl}/include
 OPENSSL_INC=		-I${BUILDLINK_PREFIX.openssl}/include
 OPENSSL_LDFLAGS=	-L${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto
@@ -85,7 +81,7 @@ do-configure:
 		GYP_DEFINES="use_libprotobuf=1" \
 		${PYTHONBIN} build_mozc.py \
 		gyp \
-		--gypdir=${GYPDIR}/bin
+		--gypdir=${LOCALBASE}/bin
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/protobuf/buildlink3.mk"
diff --git a/inputmethod/multiskkserv/Makefile b/inputmethod/multiskkserv/Makefile
index 25292b6e16f..b908805bf4f 100644
--- a/inputmethod/multiskkserv/Makefile
+++ b/inputmethod/multiskkserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/06 14:25:14 asau Exp $
+# $NetBSD: Makefile,v 1.5 2015/11/25 12:50:58 jperkin Exp $
 #
 
 DISTNAME=	multiskkserv-20100128-ac
@@ -14,8 +14,6 @@ LICENSE=	gnu-gpl-v2
 
 DEPENDS=	skk-jisyo-cdb-[0-9]*:../../inputmethod/skk-jisyo-cdb
 
-FIND_PREFIX:=		SKKJISYOCDBDIR=skk-jisyo-cdb
-
 DOCSDIR=		${PREFIX}/share/doc/${PKGBASE}
 INSTALLATION_DIRS=	${DOCSDIR}
 
@@ -27,8 +25,6 @@ GNU_CONFIGURE=	yes
 
 RCD_SCRIPTS=	multiskkserv
 
-FILES_SUBST=	SKKJISYOCDBDIR=${SKKJISYOCDBDIR}
-
 post-install:
 .for filename in ${INSTALL_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${filename} ${DESTDIR}/${DOCSDIR}
@@ -40,6 +36,5 @@ SUBST_FILES.pthread=	configure
 SUBST_SED.pthread=	-e 's/-D_REENTRANT/${PTHREAD_CFLAGS}/g'
 SUBST_SED.pthread+=	-e 's/-lpthread/${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}/g'
 
-.include "../../mk/find-prefix.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/multiskkserv/files/multiskkserv.sh b/inputmethod/multiskkserv/files/multiskkserv.sh
index c0a83a5b7f4..bdf17f74b91 100644
--- a/inputmethod/multiskkserv/files/multiskkserv.sh
+++ b/inputmethod/multiskkserv/files/multiskkserv.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: multiskkserv.sh,v 1.1.1.1 2010/09/18 11:04:17 obache Exp $
+# $NetBSD: multiskkserv.sh,v 1.2 2015/11/25 12:50:58 jperkin Exp $
 #
 # PROVIDE: multiskkserv
 # REQUIRE: DAEMON
@@ -11,7 +11,7 @@ name="multiskkserv"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
 
-multiskkserv_flags="@SKKJISYOCDBDIR@/share/skk/SKK-JISYO.L.cdb &"
+multiskkserv_flags="@PREFIX@/share/skk/SKK-JISYO.L.cdb &"
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/inputmethod/skk-jisyo-cdb/Makefile b/inputmethod/skk-jisyo-cdb/Makefile
index 591f0e0beda..0e88ffc9cd6 100644
--- a/inputmethod/skk-jisyo-cdb/Makefile
+++ b/inputmethod/skk-jisyo-cdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/03/10 10:42:37 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.7 2015/11/25 12:50:58 jperkin Exp $
 #
 
 DISTNAME=	SKK-JISYO.L.${SKKJISYO_VERS}
@@ -22,9 +22,6 @@ SKKJISYO_VERS=	201212
 
 INSTALLATION_DIRS+=	${PREFIX}/share/skk
 
-FIND_PREFIX:=	CDBDIR=tinycdb
-.include "../../mk/find-prefix.mk"
-
 do-build:
 	LC_ALL=C ${AWK} '/^[^;]/ { \
 			s = substr($$0, index($$0, " ") + 1); \
@@ -34,7 +31,7 @@ do-build:
 			print ""; \
 		}' \
 		< ${WRKDIR}/SKK-JISYO.L.${SKKJISYO_VERS} | \
-	${CDBDIR}/bin/cdb -c -t - \
+	${LOCALBASE}/bin/cdb -c -t - \
 		${WRKDIR}/SKK-JISYO.L.${SKKJISYO_VERS}.cdb
 
 
diff --git a/inputmethod/uim/modules.mk b/inputmethod/uim/modules.mk
index 0e397ab2733..70ea0e4f2c4 100644
--- a/inputmethod/uim/modules.mk
+++ b/inputmethod/uim/modules.mk
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.1 2014/05/31 14:22:38 obache Exp $
+# $NetBSD: modules.mk,v 1.2 2015/11/25 12:50:58 jperkin Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # UIM modules.  It takes care of update the corresponding databases
@@ -12,15 +12,12 @@ UIM_MODULES_MK=	# defined
 
 .if (defined(UIM_MODULES) && !empty(UIM_MODULES)) || defined(_BUILDING_UIM)
 
-.  if defined(_BUILDING_UIM)
-BUILDLINK_PREFIX.uim=	${PREFIX}
-.  else
-EVAL_PREFIX+=	BUILDLINK_PREFIX.uim=uim
-DEPENDS+=	uim-[0-9]*:../../inputmethod/uim
+.  if !defined(_BUILDING_UIM)
+DEPENDS+=		uim-[0-9]*:../../inputmethod/uim
 .  endif
 
-UIM_MODULE_MANAGER=	${BUILDLINK_PREFIX.uim}/bin/uim-module-manager
-UIM_MODULE_LIST_DIR=	${BUILDLINK_PREFIX.uim}/share/uim/pkgsrc
+UIM_MODULE_MANAGER=	${LOCALBASE}/bin/uim-module-manager
+UIM_MODULE_LIST_DIR=	${LOCALBASE}/share/uim/pkgsrc
 
 FILES_SUBST+=		UIM_MODULE_MANAGER=${UIM_MODULE_MANAGER:Q}
 FILES_SUBST+=		UIM_MODULE_LIST_DIR=${UIM_MODULE_LIST_DIR:Q}
@@ -29,7 +26,7 @@ INSTALL_TEMPLATES+=	../../inputmethod/uim/files/modules.tmpl
 DEINSTALL_TEMPLATES+=	../../inputmethod/uim/files/modules.tmpl
 
 GENERATE_PLIST+=	for m in ${UIM_MODULES}; do \
-			echo ${UIM_MODULE_LIST_DIR:S,^${BUILDLINK_PREFIX.uim}/,,}/$${m}; \
+			echo ${UIM_MODULE_LIST_DIR:S,^${LOCALBASE}/,,}/$${m}; \
 			done
 
 post-install: uim-add-module-names
diff --git a/inputmethod/zinnia-tomoe/Makefile b/inputmethod/zinnia-tomoe/Makefile
index 4990c9891c5..315edf087af 100644
--- a/inputmethod/zinnia-tomoe/Makefile
+++ b/inputmethod/zinnia-tomoe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/03/15 19:31:44 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.4 2015/11/25 12:50:58 jperkin Exp $
 #
 
 DISTNAME=	zinnia-tomoe-0.6.0-20080911
@@ -17,9 +17,6 @@ BUILD_DEPENDS+=	zinnia-[0-9]*:../../inputmethod/zinnia
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	# none
 
-FIND_PREFIX:=	ZINNIA_DIR=zinnia
-.include "../../mk/find-prefix.mk"
-
-CONFIGURE_ARGS+=	--with-zinnia-convert=${ZINNIA_DIR}/bin/zinnia_convert
+CONFIGURE_ARGS+=	--with-zinnia-convert=${LOCALBASE}/bin/zinnia_convert
 
 .include "../../mk/bsd.pkg.mk"