Index: math/sundials/Makefile
===================================================================
--- math/sundials/Makefile
+++ math/sundials/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	sundials
 DISTVERSION=	3.1.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://computation.llnl.gov/projects/sundials/download/
 
@@ -39,9 +40,9 @@
 
 HYPRE_CMAKE_BOOL=	HYPRE_ENABLE
 HYPRE_CMAKE_ON=		-DHYPRE_INCLUDE_DIR=${LOCALBASE}/include \
-			-DHYPRE_LIBRARY_DIR=${LOCALBASE}/lib \
-			-DMPI_ENABLE:BOOL=ON
+			-DHYPRE_LIBRARY_DIR=${LOCALBASE}/lib
 HYPRE_LIB_DEPENDS=	libHYPRE.so:science/hypre
+HYPRE_IMPLIES=		MPI
 
 LAPACK_USES=		blaslapack:openblas fortran
 LAPACK_CMAKE_BOOL=	LAPACK_ENABLE
@@ -49,12 +50,13 @@
 			-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
 
 PETSC_CMAKE_BOOL=	PETSC_ENABLE
 PETSC_CMAKE_ON=		-DPETSC_INCLUDE_DIR=${LOCALBASE}/include \
-			-DPETSC_LIBRARY_DIR=${LOCALBASE}/lib \
-			-DMPI_ENABLE:BOOL=ON
+			-DPETSC_LIBRARY_DIR=${LOCALBASE}/lib
 PETSC_LIB_DEPENDS=	libpetsc.so:science/PETSc
+PETSC_IMPLIES=		MPI
 
 SUPERLU_CMAKE_BOOL=	SUPERLUMT_ENABLE
 SUPERLU_CMAKE_ON=	-DSUPERLUMT_INCLUDE_DIR=${LOCALBASE}/include/superlu_mt \
@@ -64,18 +66,6 @@
 
 PORTEXAMPLES=	*
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMPI} || ${PORT_OPTIONS:MHYPRE} || ${PORT_OPTIONS:MPETSC}
-LIB_DEPENDS+=	libmpich.so:net/mpich2
-
-PLIST_FILES=	include/nvector/nvector_parallel.h \
-		include/sundials/sundials_mpi_types.h \
-		lib/libsundials_nvecparallel.so \
-		lib/libsundials_nvecparallel.so.${DISTVERSION:R:R} \
-		lib/libsundials_nvecparallel.so.${DISTVERSION}
-.endif
-
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/LICENSE
 
Index: math/sundials/pkg-plist
===================================================================
--- math/sundials/pkg-plist
+++ math/sundials/pkg-plist
@@ -33,6 +33,7 @@
 include/kinsol/kinsol_direct.h
 include/kinsol/kinsol_impl.h
 include/kinsol/kinsol_spils.h
+%%MPI%%include/nvector/nvector_parallel.h
 %%HYPRE%%include/nvector/nvector_parhyp.h
 %%PETSC%%include/nvector/nvector_petsc.h
 include/nvector/nvector_pthreads.h
@@ -48,6 +49,7 @@
 include/sundials/sundials_linearsolver.h
 include/sundials/sundials_math.h
 include/sundials/sundials_matrix.h
+%%MPI%%include/sundials/sundials_mpi_types.h
 include/sundials/sundials_nvector.h
 include/sundials/sundials_pcg.h
 include/sundials/sundials_sparse.h
@@ -87,6 +89,9 @@
 lib/libsundials_kinsol.so
 lib/libsundials_kinsol.so.%%SHL1%%
 lib/libsundials_kinsol.so.%%SHL3%%
+%%MPI%%lib/libsundials_nvecparallel.so
+%%MPI%%lib/libsundials_nvecparallel.so.%%SHL1%%
+%%MPI%%lib/libsundials_nvecparallel.so.%%SHL3%%
 %%HYPRE%%lib/libsundials_nvecparhyp.so
 %%HYPRE%%lib/libsundials_nvecparhyp.so.%%SHL1%%
 %%HYPRE%%lib/libsundials_nvecparhyp.so.%%SHL3%%