10 files changed, 25 insertions, 19 deletions

diff --git a/cad/elmerfem/Makefile b/cad/elmerfem/Makefile
index 1d1d98d202ca..69fb96f5431b 100644
--- a/cad/elmerfem/Makefile
+++ b/cad/elmerfem/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	elmerfem
 PORTVERSION=	8.3.20170524
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad science
 
 MAINTAINER=	ports@FreeBSD.org
@@ -11,8 +11,8 @@ COMMENT=	ELMER FEM package
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libparpack.so:math/arpack-ng-mpich	\
-		libmpich.so.8:net/mpich2
+LIB_DEPENDS=	libparpack.so:math/arpack-ng-mpich \
+		libmpich.so:net/mpich
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ElmerCSC
diff --git a/math/blocksolve95/Makefile b/math/blocksolve95/Makefile
index 3f1da1cf9142..fada9ad161d6 100644
--- a/math/blocksolve95/Makefile
+++ b/math/blocksolve95/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	blocksolve95
 PORTVERSION=	3.0
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	math parallel
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/BlockSolve95/ \
 		http://ftp.mcs.anl.gov/pub/BlockSolve95/
@@ -19,7 +19,7 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libf2c.so:lang/f2c	\
-		libmpich.so:net/mpich2
+		libmpich.so:net/mpich
 
 USES=		fortran gmake tar:Z
 
diff --git a/math/petiga/Makefile b/math/petiga/Makefile
index aa272a9d4ac6..deb017604a12 100644
--- a/math/petiga/Makefile
+++ b/math/petiga/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	petiga
 DISTVERSION=	g20180518
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math python
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack \
-		libmpich.so:net/mpich2 \
+		libmpich.so:net/mpich \
 		libpetsc.so:science/PETSc
 
 BB_ACCOUNT=	dalcinl
diff --git a/math/py-petsc4py/Makefile b/math/py-petsc4py/Makefile
index 1989333134e2..951368d62187 100644
--- a/math/py-petsc4py/Makefile
+++ b/math/py-petsc4py/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	petsc4py
 DISTVERSION=	3.9.1
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 BUILD_DEPENDS=	${PYNUMPY}
-LIB_DEPENDS=	libmpich.so:net/mpich2 \
+LIB_DEPENDS=	libmpich.so:net/mpich \
 		libpetsc.so:science/PETSc
 RUN_DEPENDS=	${PYNUMPY}
 
diff --git a/math/py-slepc4py/Makefile b/math/py-slepc4py/Makefile
index 2ddc5c4669f4..23965bab071f 100644
--- a/math/py-slepc4py/Makefile
+++ b/math/py-slepc4py/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	slepc4py
 DISTVERSION=	3.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +18,7 @@ LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
 BUILD_DEPENDS=	${PYNUMPY}
-LIB_DEPENDS=	libmpich.so:net/mpich2 \
+LIB_DEPENDS=	libmpich.so:net/mpich \
 		libpetsc.so:science/PETSc \
 		libslepc.so:math/slepc
 RUN_DEPENDS=	${PYNUMPY}
diff --git a/math/slepc/Makefile b/math/slepc/Makefile
index 7b2ecbca6ab8..e7e80a1653a1 100644
--- a/math/slepc/Makefile
+++ b/math/slepc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	slepc
 DISTVERSION=	3.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math devel
 MASTER_SITES=	http://slepc.upv.es/download/distrib/
 
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack \
-		libmpich.so:net/mpich2 \
+		libmpich.so:net/mpich \
 		libpetsc.so:science/PETSc
 
 USES=		gmake fortran python:2.7 shebangfix
diff --git a/math/spooles/Makefile b/math/spooles/Makefile
index 3a1c1f7f3880..16ea640663a4 100644
--- a/math/spooles/Makefile
+++ b/math/spooles/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spooles
 PORTVERSION=	2.2
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	math
 MASTER_SITES=	NETLIB/linalg/spooles
 .ifdef WITH_MPI
@@ -19,7 +19,7 @@ COMMENT=	SParse Object Oriented Linear Equations Solver
 LICENSE=	PD
 
 .if defined(WITH_MPI)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libmpich.a:net/mpich2
+LIB_DEPENDS=	libmpich.so:net/mpich
 .endif
 
 USES=		gmake tar:tgz
diff --git a/math/sundials/Makefile b/math/sundials/Makefile
index 7bd94ae258d5..6a2607e72954 100644
--- a/math/sundials/Makefile
+++ b/math/sundials/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	sundials
 DISTVERSION=	3.1.2
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://computation.llnl.gov/projects/sundials/download/
 
@@ -20,6 +21,7 @@ CMAKE_ARGS=	-DPTHREAD_ENABLE:BOOL=ON \
 PLIST_SUB=	SHL3=${DISTVERSION} SHL1=${DISTVERSION:R:R} SHLX3=1.1.2 SHLX1=1
 
 OPTIONS_DEFINE=		BLAS EXAMPLES LAPACK MPI SUPERLUMT # OPENMP detection is broken in cmake: https://gitlab.kitware.com/cmake/cmake/issues/17474
+OPTIONS_DEFAULT=	LAPACK
 OPTIONS_GROUP=		VECTORS
 OPTIONS_GROUP_VECTORS=	HYPRE PETSC
 VECTORS_DESC=		Alternative vector libraries
@@ -50,7 +52,7 @@ LAPACK_CMAKE_ON=	-DSUNDIALS_INDEX_TYPE:STRING=int32_t \
 			-DFREEBSD_GCC_DIR:STRING=${LOCALBASE}/lib/gcc${GCC_DEFAULT:S/.//} # assumes that fortran:gcc is used
 
 MPI_CMAKE_ON=		-DMPI_ENABLE:BOOL=ON
-MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
+MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 
 PETSC_CMAKE_BOOL=	PETSC_ENABLE
 PETSC_CMAKE_ON=		-DPETSC_INCLUDE_DIR=${LOCALBASE}/include \
diff --git a/science/PETSc/Makefile b/science/PETSc/Makefile
index e00a5a338e56..76d91cb3f5e0 100644
--- a/science/PETSc/Makefile
+++ b/science/PETSc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PETSc
 DISTVERSION=	3.9.4
+PORTREVISION=	1
 CATEGORIES=	science devel
 MASTER_SITES=	http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/
 DISTNAME=	${PORTNAME:tl}-${DISTVERSION}
@@ -18,7 +19,7 @@ BROKEN_armv6=		fails to build: MPI compiler wrappers do not work. See http://www
 BROKEN_armv7=		fails to build: MPI compiler wrappers do not work. See http://www.mcs.anl.gov/petsc/documentation/faq.html#mpi-compilers
 BROKEN_powerpc64=	fails to build: MPI compiler wrappers do not work. See http://www.mcs.anl.gov/petsc/documentation/faq.html#mpi-compilers
 
-LIB_DEPENDS=	libmpich.so:net/mpich2
+LIB_DEPENDS=	libmpich.so:net/mpich
 
 USES=		blaslapack fortran gmake python:2.7 shebangfix
 GNU_CONFIGURE=	yes
@@ -33,6 +34,8 @@ USE_LDCONFIG=	yes
 TEST_TARGET=	test
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
+LDFLAGS+=	${LOCALBASE}/lib/libmpi.so
+
 DATADIR=	${PREFIX}/share/${PORTNAME:tl}
 PLIST_SUB=	SHLIB=${DISTVERSION} SHL=${DISTVERSION:C/\.[0-9]$//}
 
diff --git a/science/triqs/Makefile b/science/triqs/Makefile
index f6fbd555df5c..f8d009f9ab2d 100644
--- a/science/triqs/Makefile
+++ b/science/triqs/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	triqs
 DISTVERSION=	2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -21,14 +21,14 @@ LIB_DEPENDS=	libcpp2py.so:devel/cpp2py \
 		libgmp.so:math/gmp \
 		libhdf5.so:science/hdf5 \
 		libmpi.so:net/openmpi \
-		libopa.so:net/mpich2 \
+		libopa.so:net/mpich \
 		libopenblas.so:math/openblas \
 		libsz.so:science/szip
 RUN_DEPENDS=	${PYNUMPY}
 
 PORTSCOUT=	limit:^[0-9]+\.[0-9].*$$
 
-USES=		cmake:outsource,noninja fortran gettext-runtime python:2.7- # python:2.7- matches that in devel/cpp2py
+USES=		cmake:outsource,noninja fortran gettext-runtime python:2.7 # python:2.7 matches that in devel/cpp2py
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tu}
 USE_LDCONFIG=	yes