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

8 files changed, 17 insertions, 30 deletions

diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index a6eb4b4fff4..98d9f402122 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2015/10/17 10:16:35 adam Exp $
+# $NetBSD: Makefile,v 1.40 2015/11/25 12:54:07 jperkin Exp $
 
 DISTNAME=	httpd-2.4.17
 PKGNAME=	${DISTNAME:S/httpd/apache/}
@@ -51,12 +51,9 @@ APACHE_MODULES?=	${DFLT_APACHE_MODULES}
 
 .include "options.mk"
 
-FIND_PREFIX:=	APRDIR=apr
-.include "../../mk/find-prefix.mk"
-
 # LDAP support
 PLIST_VARS+=		ldap
-.if exists(${APRDIR}/lib/apr-util-1/apr_ldap.la)
+.if exists(${LOCALBASE}/lib/apr-util-1/apr_ldap.la)
 DFLT_APACHE_MODULES+=	ldap authnz_ldap
 PLIST.ldap=		yes
 .endif
@@ -166,7 +163,7 @@ INSTALL_TARGET=		install-conf install
 INSTALL_MAKE_FLAGS+=	sysconfdir="${EGDIR}"
 
 post-install:
-	${LN} -sf ${APRDIR}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build
+	${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build
 	${LN} -sf ${SBINDIR}/envvars-std ${DESTDIR}${SBINDIR}/envvars
 
 	${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/bin
diff --git a/www/emacs-w3m-snapshot/Makefile b/www/emacs-w3m-snapshot/Makefile
index 6fe5c406292..dbd3c3cec39 100644
--- a/www/emacs-w3m-snapshot/Makefile
+++ b/www/emacs-w3m-snapshot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/07/23 12:19:10 mef Exp $
+# $NetBSD: Makefile,v 1.13 2015/11/25 12:54:07 jperkin Exp $
 
 DISTNAME=	w3m-el-snapshot_1.4.554+0.20150609.orig
 PKGNAME=	${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME:S/-el-snapshot_/-/:S/+0//:S/.orig//}
@@ -22,13 +22,11 @@ CONFIGURE_ENV+=		GAMEOWN=${GAMES_USER}
 BUILD_TARGET=
 WRKSRC=			${WRKDIR}/${DISTNAME:S/_/-/}
 
-EVAL_PREFIX+=	W3M_PREFIX=w3m
-
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing paths.
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	w3m.el
-SUBST_SED.paths=	-e 's|@W3M@|${W3M_PREFIX}/bin/w3m|g'
+SUBST_SED.paths=	-e 's|@W3M@|${LOCALBASE}/bin/w3m|g'
 
 BUILD_DEFS+=		VARBASE
 BUILD_DEFS+=		GAMEDATAMODE
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index b4f9b5be9f6..04cd28494c2 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.67 2015/11/08 00:46:22 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.68 2015/11/25 12:54:07 jperkin Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -21,7 +21,7 @@ test:
 .include "../../mk/bsd.prefs.mk"
 # tar(1) of OpenBSD 5.5 has no --exclude command line option.
 .if ${OPSYS} == "OpenBSD"
-TOOLS_PLATFORM.tar=	${TOOLS_PREFIX.bsdtar}/bin/bsdtar
+TOOLS_PLATFORM.tar=	${TOOLS_PATH.bsdtar}
 USE_TOOLS+=		bsdtar
 .endif
 # GCC 4.6 is required to support nullptr.
diff --git a/www/firefox31/mozilla-common.mk b/www/firefox31/mozilla-common.mk
index d5e876453fc..63566b3edd9 100644
--- a/www/firefox31/mozilla-common.mk
+++ b/www/firefox31/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.1 2014/11/03 12:18:31 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.2 2015/11/25 12:54:07 jperkin Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -13,7 +13,7 @@ UNLIMIT_RESOURCES+=	datasize
 .include "../../mk/bsd.prefs.mk"
 # tar(1) of OpenBSD 5.5 has no --exclude command line option.
 .if ${OPSYS} == "OpenBSD"
-TOOLS_PLATFORM.tar=	${TOOLS_PREFIX.bsdtar}/bin/bsdtar
+TOOLS_PLATFORM.tar=	${TOOLS_PATH.bsdtar}
 USE_TOOLS+=		bsdtar
 .endif
 # gcc45-4.5.3 of lang/gcc45 does not generate proper binary,
diff --git a/www/firefox38/mozilla-common.mk b/www/firefox38/mozilla-common.mk
index cce6a254239..a2448b8a000 100644
--- a/www/firefox38/mozilla-common.mk
+++ b/www/firefox38/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.2 2015/10/17 00:31:41 szptvlfn Exp $
+# $NetBSD: mozilla-common.mk,v 1.3 2015/11/25 12:54:07 jperkin Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -17,7 +17,7 @@ test:
 .include "../../mk/bsd.prefs.mk"
 # tar(1) of OpenBSD 5.5 has no --exclude command line option.
 .if ${OPSYS} == "OpenBSD"
-TOOLS_PLATFORM.tar=	${TOOLS_PREFIX.bsdtar}/bin/bsdtar
+TOOLS_PLATFORM.tar=	${TOOLS_PATH.bsdtar}
 USE_TOOLS+=		bsdtar
 .endif
 # GCC 4.6 is required to support nullptr.
diff --git a/www/haskell-cgi/Makefile b/www/haskell-cgi/Makefile
index 8d1eda5933c..30dca3f843a 100644
--- a/www/haskell-cgi/Makefile
+++ b/www/haskell-cgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/10/28 06:30:16 asau Exp $
+# $NetBSD: Makefile,v 1.13 2015/11/25 12:54:07 jperkin Exp $
 
 DISTNAME=	haskell-cgi-20001206
 CATEGORIES=	www
@@ -14,14 +14,11 @@ NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 
 NO_BUILD=	yes
 
-HUGS_PREFIX_DEFAULT=	${LOCALBASE}
-EVAL_PREFIX+=	HUGS_PREFIX=hugs
-
 INSTALLATION_DIRS=	share/hugs/lib
 
 do-configure:
 	@for i in ${WRKSRC}/*; do					  \
-	${SED} -e 's:\/soft\/bin\/runhugs:'${HUGS_PREFIX}'/bin/runhugs:g' \
+	${SED} -e 's:\/soft\/bin\/runhugs:'${LOCALBASE}'/bin/runhugs:g' \
 	$$i > $$i.tmp && ${MV} $$i.tmp $$i;				  \
 	done
 
diff --git a/www/matcha-sns/Makefile b/www/matcha-sns/Makefile
index 192678db367..741fe6b7147 100644
--- a/www/matcha-sns/Makefile
+++ b/www/matcha-sns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/10/12 10:29:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.3 2015/11/25 12:54:07 jperkin Exp $
 #
 
 DISTNAME=	matcha-sns-1.3.7
@@ -42,12 +42,9 @@ FILES_SUBST+=		WWWGRP=${APACHE_GROUP} WWWOWN=${APACHE_USER} \
 
 REPLACE_SH=		cake/console/cake
 
-FIND_PREFIX:=		PHPDIR=php
-.include "../../mk/find-prefix.mk"
-
 REPLACE_INTERPRETER+=	php
 REPLACE.php.old=	/usr/bin/php
-REPLACE.php.new=	${PHPDIR}/bin/php
+REPLACE.php.new=	${LOCALBASE}/bin/php
 REPLACE_FILES.php=	cake/console/cake.php
 
 CONF_FILES_PERMS=	${PREFIX}/share/matcha-sns/app/config/core.php-dist \
diff --git a/www/w3m/options.mk b/www/w3m/options.mk
index dded5be95ae..7747ffb7300 100644
--- a/www/w3m/options.mk
+++ b/www/w3m/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2012/06/12 15:46:04 wiz Exp $
+# $NetBSD: options.mk,v 1.14 2015/11/25 12:54:07 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.w3m
 PKG_SUPPORTED_OPTIONS=	inet6 migemo w3m-lynx-key
@@ -24,9 +24,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
 .if !empty(PKG_OPTIONS:Mmigemo)
 .include "../../lang/ruby/rubyversion.mk"
 DEPENDS+=	${RUBY_PKGPREFIX}-migemo-[0-9]*:../../textproc/migemo
-FIND_PREFIX:=	MIGEMODIR=${RUBY_PKGPREFIX}-migemo
-.include "../../mk/find-prefix.mk"
-CONFIGURE_ARGS+=	--with-migemo="${MIGEMODIR}/bin/migemo -t egrep ${MIGEMODIR}/share/migemo/migemo-dict"
+CONFIGURE_ARGS+=	--with-migemo="${LOCALBASE}/bin/migemo -t egrep ${LOCALBASE}/share/migemo/migemo-dict"
 .else
 CONFIGURE_ARGS+=	--without-migemo
 .endif