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

3 files changed, 9 insertions, 25 deletions

diff --git a/parallel/gridscheduler/Makefile b/parallel/gridscheduler/Makefile
index b50614403d7..3227ddc75df 100644
--- a/parallel/gridscheduler/Makefile
+++ b/parallel/gridscheduler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2015/06/12 10:50:55 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2015/11/25 12:52:26 jperkin Exp $
 
 PKGNAME=	gridscheduler-2011.11
 DISTNAME=	GE2011.11
@@ -36,8 +36,6 @@ PKG_GECOS.${SGE_USER}=	Sun Grid Engine Administrator
 PKG_GROUPS_VARS+=	SGE_GROUP
 PKG_USERS_VARS+=	SGE_USER
 
-EVAL_PREFIX+=	PKGSRC_SSL_PREFIX=openssl
-
 AIMK=	${SETENV} ${MAKE_ENV} tcsh -fb ${WRKSRC}/source/aimk
 
 CONFIG_GUESS_OVERRIDE=	source/3rdparty/qmake/config.guess \
@@ -109,12 +107,12 @@ post-patch:
 		${ECHO} "        `${WRKSRC}/source/dist/util/arch`" ; \
 		${FALSE} ; \
 	fi
-	( ${ECHO} "set OPENSSL_HOME = ${SSL_PREFIX}" ; \
+	( ${ECHO} "set OPENSSL_HOME = ${BUILDLINK_PREFIX.openssl}" ; \
 	${ECHO} "set BERKELEYDB_HOME = ${BUILDLINK_PREFIX.db4}" ; \
 	${ECHO} "set BDB_INCLUDE_SUBDIR = db4" ; \
 	${ECHO} "set BDB_LIB_SUFFIX = 4" ; \
 	${ECHO} "set PERL = ${PERL5}" ) > ${WRKSRC}/source/aimk.private
-	( ${ECHO} "OPENSSLBASE=${SSL_PREFIX}" ; \
+	( ${ECHO} "OPENSSLBASE=${BUILDLINK_PREFIX.openssl}" ; \
 	${ECHO} "BERKELEYDBBASE=${BUILDLINK_PREFIX.db4}" ) > ${WRKSRC}/source/distinst.private
 
 SUBST_CLASSES+=		paths
@@ -147,7 +145,7 @@ do-install:
 	for f in archive checkpoint deadlock dump load printlog recover stat upgrade verify ; do \
 		ln -s ${DESTDIR}${LOCALBASE}/bin/db4_$${f} ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/db_$${f} ; done
 	ln -s ${DESTDIR}${LOCALBASE}/bin/berkeley_db4_svc ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/berkeley_db_svc
-	ln -s ${DESTDIR}${SSL_PREFIX}/bin/openssl ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/openssl
+	ln -s ${DESTDIR}${BUILDLINK_PREFIX.openssl}/bin/openssl ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/openssl
 	cd ${DESTDIR}${SGE_ROOT} && ${SETENV} SGE_ROOT=${SGE_ROOT} DESTDIR=${DESTDIR} ./util/setfileperm.sh -auto \
 		${SGE_ROOT}
 	for f in ${DESTDIR}${SGE_ROOT}/bin/${SGE_ARCH}/q* ; do \
@@ -169,8 +167,3 @@ CHECK_INTERPRETER_SKIP=	sge/hadoop/pestart.sh \
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-.if ${USE_BUILTIN.openssl} == "yes"
-SSL_PREFIX=	/usr
-.else
-SSL_PREFIX=	${PKGSRC_SSL_PREFIX}
-.endif
diff --git a/parallel/mpi-ch/buildlink3.mk b/parallel/mpi-ch/buildlink3.mk
index 542a79f49a8..df9c0788c48 100644
--- a/parallel/mpi-ch/buildlink3.mk
+++ b/parallel/mpi-ch/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2013/04/30 06:59:27 asau Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2015/11/25 12:52:26 jperkin Exp $
 
 BUILDLINK_TREE+=	mpich
 
@@ -9,8 +9,6 @@ BUILDLINK_API_DEPENDS.mpich+=	mpich>=3
 BUILDLINK_PKGSRCDIR.mpich?=	../../parallel/mpi-ch
 
 MPI_PREFIX?=	$(BUILDLINK_PREFIX.mpich)
-FIND_PREFIX:=	BUILDLINK_PREFIX.mpich=mpich
-.include "../../mk/find-prefix.mk"
 
 .include "../../parallel/openpa/buildlink3.mk"
 .endif	# MPICH_BUILDLINK3_MK
diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile
index 1d712bb1de4..1ac70640b9c 100644
--- a/parallel/sge/Makefile
+++ b/parallel/sge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2015/06/12 10:50:55 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2015/11/25 12:52:27 jperkin Exp $
 #
 
 DISTNAME=		sge-8.1.6
@@ -32,8 +32,6 @@ PKG_GECOS.${SGE_USER}=	Sun Grid Engine Administrator
 PKG_GROUPS_VARS+=	SGE_GROUP
 PKG_USERS_VARS+=	SGE_USER
 
-EVAL_PREFIX+=	PKGSRC_SSL_PREFIX=openssl
-
 AIMK=	${SETENV} ${MAKE_ENV} ${CSH} -fb ${WRKSRC}/source/aimk
 
 CONFIG_GUESS_OVERRIDE=	source/3rdparty/qmake/config.guess \
@@ -116,12 +114,12 @@ post-patch:
 		${ECHO} "        `${WRKSRC}/source/dist/util/arch`" ; \
 		${FALSE} ; \
 	fi
-	( ${ECHO} "set OPENSSL_HOME = ${SSL_PREFIX}" ; \
+	( ${ECHO} "set OPENSSL_HOME = ${BUILDLINK_PREFIX.openssl}" ; \
 	${ECHO} "set BERKELEYDB_HOME = ${BUILDLINK_PREFIX.db4}" ; \
 	${ECHO} "set BDB_INCLUDE_SUBDIR = db4" ; \
 	${ECHO} "set BDB_LIB_SUFFIX = 4" ; \
 	${ECHO} "set PERL = ${PERL5}" ) > ${WRKSRC}/source/aimk.private
-	( ${ECHO} "OPENSSLBASE=${SSL_PREFIX}" ; \
+	( ${ECHO} "OPENSSLBASE=${BUILDLINK_PREFIX.openssl}" ; \
 	${ECHO} "BERKELEYDBBASE=${BUILDLINK_PREFIX.db4}" ) > ${WRKSRC}/source/distinst.private
 	rm ${WRKSRC}/source/dist/util/*.orig
 
@@ -168,7 +166,7 @@ do-install:
 	for f in archive checkpoint deadlock dump load printlog recover stat upgrade verify ; do \
 		ln -s ${LOCALBASE}/bin/db4_$${f} ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/db_$${f} ; done
 	ln -s ${LOCALBASE}/bin/berkeley_db4_svc ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/berkeley_db_svc
-	ln -s ${SSL_PREFIX}/bin/openssl ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/openssl
+	ln -s ${BUILDLINK_PREFIX.openssl}/bin/openssl ${DESTDIR}${SGE_ROOT}/utilbin/${SGE_ARCH}/openssl
 	cd ${DESTDIR}${SGE_ROOT} && ${SETENV} SGE_ROOT=${SGE_ROOT} DESTDIR=${DESTDIR} ./util/setfileperm.sh -auto \
 		${SGE_ROOT}
 	for f in ${DESTDIR}${SGE_ROOT}/bin/${SGE_ARCH}/q* ; do \
@@ -186,8 +184,3 @@ PLIST_SUBST+=	SGE_ARCH=${SGE_ARCH}
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-.if ${USE_BUILTIN.openssl} == "yes"
-SSL_PREFIX=	/usr
-.else
-SSL_PREFIX=	${PKGSRC_SSL_PREFIX}
-.endif