Index: head/science/hypre/Makefile
===================================================================
--- head/science/hypre/Makefile	(revision 442951)
+++ head/science/hypre/Makefile	(revision 442952)
@@ -1,53 +1,59 @@
 # Created by: Pedro Giffuni
 # $FreeBSD$
 
 PORTNAME=	hypre
 DISTVERSION=	2.11.2
 CATEGORIES=	science
 MASTER_SITES=	https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods/download/
 
 MAINTAINER=	pfg@FreeBSD.org
 COMMENT=	Scalable Linear Solvers and Multigrid Methods
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKDIR}/${DISTNAME}/COPYING.LESSER
 
 USES=		blaslapack fortran localbase
 
 USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
+WRKSRC_SUBDIR=	src
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-blas --with-blas-lib=${BLASLIB} \
 		--with-lapack --with-lapack-lib=${LAPACKLIB} \
 		--enable-shared
-CONFIGURE_ENV=	CC=mpicc CXX=mpicxx
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_SINGLE=	MPI
+OPTIONS_DEFINE=		DOCS
+OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH2 OPENMPI
 OPTIONS_DEFAULT=	MPICH2
 
 MPICH2_LIB_DEPENDS=	libmpich.so.8:net/mpich2
+MPICH2_CONFIGURE_ENV=	CC=${LOCALBASE}/bin/mpicc CXX=${LOCALBASE}/bin/mpicxx
+MPICH2_CONFIGURE_WITH=	MPI-include=${LOCALBASE}/include \
+			MPI-lib-dirs=${LOCALBASE}/lib
 OPENMPI_LIB_DEPENDS=	libmpi.so:net/openmpi
+OPENMPI_CONFIGURE_ENV=	CC=${LOCALBASE}/mpi/openmpi/bin/mpicc \
+			CXX=${LOCALBASE}/mpi/openmpi/bin/mpicxx
+OPENMPI_CONFIGURE_WITH=	MPI-include=${LOCALBASE}/mpi/openmpi/include \
+			MPI-lib-dirs=${LOCALBASE}/mpi/openmpi/lib
 
 .ifdef MAINTAINER_MODE
 TEST_TARGET=	check
 .endif
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/hypre/include/* ${STAGEDIR}${PREFIX}/include
 	${INSTALL_LIB} ${WRKSRC}/hypre/lib/libHYPRE-2.11.2.so	\
 		${STAGEDIR}${PREFIX}/lib/libHYPRE.so.2.11
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libHYPRE.so.2.11 \
 		${STAGEDIR}${PREFIX}/lib/libHYPRE.so.2
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libHYPRE.so.2.11 \
 		${STAGEDIR}${PREFIX}/lib/libHYPRE.so
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/*.pdf \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>