--- cad/elmerfem/Makefile	(revision 442298)
+++ cad/elmerfem/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	elmerfem
-PORTVERSION=	8.3.20170519
+PORTVERSION=	8.3.20170601
 CATEGORIES=	cad science
 
 MAINTAINER=	ports@FreeBSD.org
@@ -10,18 +10,19 @@ 
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libparpack.so:math/arpack-ng-mpich	\
-		libmpich.so.8:net/mpich2
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	ElmerCSC
-GH_TAGNAME=	c30fff2
+GH_TAGNAME=	9eb2346
 
-USES=		blaslapack:netlib cmake fortran gmake tcl
+USES=		blaslapack cmake:outsource fortran gmake tcl
 
 USE_LDCONFIG=	${PREFIX}/lib/elmersolver
 ALL_TARGET=	# empty
 
+OPTIONS_DEFINE= 	MPI
+OPTIONS_DEFAULT=
+OPTIONS_SUB=	yes
+
 .if !defined(MAINTAINER_MODE)
 CMAKE_ARGS+=	-Wno-dev
 .endif
@@ -38,8 +39,22 @@ 
 LDFLAGS+=	-L${LOCALBASE}/lib
 FCPPFLAGS+=	-ansi
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMPI}
+# There are various version of MPICH in the tree: arpack-ng needs mpich2
+LIB_DEPENDS+=	libparpack.so:math/arpack-ng-mpich	\
+		libmpich.so.8:net/mpich2
+CMAKE_ARGS+=    -DWITH_MPI:BOOL=TRUE
+.else
+LIB_DEPENDS+=	libarpack.so:math/arpack
+CMAKE_ARGS+=    -DWITH_MPI:BOOL=FALSE #-DWITH_OpenMP:BOOL=TRUE
+.endif
+
 post-install:
+.if ${PORT_OPTIONS:MMPI}
 	${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver
+.endif
 	@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid
 
 do-test:
--- cad/elmerfem/distinfo	(revision 442298)
+++ cad/elmerfem/distinfo	(working copy)
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1495312420
-SHA256 (ElmerCSC-elmerfem-8.3.20170519-c30fff2_GH0.tar.gz) = 7b9e9b4abaf4801dec383f7b7d8f339c274aaa0c98d8320564ed4616a1115e68
-SIZE (ElmerCSC-elmerfem-8.3.20170519-c30fff2_GH0.tar.gz) = 57920491
+TIMESTAMP = 1496348099
+SHA256 (ElmerCSC-elmerfem-8.3.20170601-9eb2346_GH0.tar.gz) = d2a265631691eaa04f9862e2be0fc74a56924b708cf59207821b796be3bddad3
+SIZE (ElmerCSC-elmerfem-8.3.20170601-9eb2346_GH0.tar.gz) = 57956825
--- cad/elmerfem/files/patch-CMakeLists.txt	(revision 442298)
+++ cad/elmerfem/files/patch-CMakeLists.txt	(working copy)
@@ -1,4 +1,4 @@ 
---- CMakeLists.txt.orig	2017-05-19 12:19:26 UTC
+--- CMakeLists.txt.orig	2017-06-01 12:51:14 UTC
 +++ CMakeLists.txt
 @@ -264,7 +264,7 @@ ADD_SUBDIRECTORY(umfpack)
  ADD_SUBDIRECTORY(fhutiter)
--- cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt	(revision 442298)
+++ cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt	(working copy)
@@ -1,4 +1,4 @@ 
---- elmergrid/src/CMakeLists.txt.orig	2017-05-19 12:19:26 UTC
+--- elmergrid/src/CMakeLists.txt.orig	2017-06-01 12:51:14 UTC
 +++ elmergrid/src/CMakeLists.txt
 @@ -31,7 +31,7 @@ ADD_EXECUTABLE(ElmerGrid ${elmergrid_SRC
  
--- cad/elmerfem/files/patch-fem_src_CMakeLists.txt	(revision 442298)
+++ cad/elmerfem/files/patch-fem_src_CMakeLists.txt	(working copy)
@@ -1,4 +1,4 @@ 
---- fem/src/CMakeLists.txt.orig	2017-05-19 12:19:26 UTC
+--- fem/src/CMakeLists.txt.orig	2017-06-01 12:51:14 UTC
 +++ fem/src/CMakeLists.txt
 @@ -129,11 +129,11 @@ SET(ELMERSOLVER_LIBRARIES matc umfpack 
  
--- cad/elmerfem/files/patch-matc_src_CMakeLists.txt	(revision 442298)
+++ cad/elmerfem/files/patch-matc_src_CMakeLists.txt	(working copy)
@@ -1,4 +1,4 @@ 
---- matc/src/CMakeLists.txt.orig	2017-05-19 12:19:26 UTC
+--- matc/src/CMakeLists.txt.orig	2017-06-01 12:51:14 UTC
 +++ matc/src/CMakeLists.txt
 @@ -12,7 +12,7 @@ TARGET_LINK_LIBRARIES(Matc_bin matc)
  
--- cad/elmerfem/files/patch-post-src-elmerpost.h	(revision 442298)
+++ cad/elmerfem/files/patch-post-src-elmerpost.h	(working copy)
@@ -1,4 +1,4 @@ 
---- post/src/elmerpost.h.orig	2017-05-19 12:19:26 UTC
+--- post/src/elmerpost.h.orig	2017-06-01 12:51:14 UTC
 +++ post/src/elmerpost.h
 @@ -62,6 +62,7 @@
  
--- cad/elmerfem/files/patch-post-src-screensave.c	(revision 442298)
+++ cad/elmerfem/files/patch-post-src-screensave.c	(working copy)
@@ -1,4 +1,4 @@ 
---- post/src/screensave.c.orig	2017-05-19 12:19:26 UTC
+--- post/src/screensave.c.orig	2017-06-01 12:51:14 UTC
 +++ post/src/screensave.c
 @@ -32,6 +32,7 @@
  #include <GL/glu.h>
--- cad/elmerfem/pkg-plist	(revision 442298)
+++ cad/elmerfem/pkg-plist	(working copy)
@@ -1,6 +1,6 @@ 
 bin/ElmerGrid
 bin/ElmerSolver
-bin/ElmerSolver_mpi
+%%MPI%%bin/ElmerSolver_mpi
 bin/GebhardtFactors
 bin/Mesh2D
 bin/ViewFactors
@@ -113,7 +113,6 @@ 
 share/elmersolver/lib/AdvectionReaction.so
 share/elmersolver/lib/ArteryOutlet.so
 share/elmersolver/lib/ArtificialCompressibility.so
-share/elmersolver/lib/CMakeFiles.so
 share/elmersolver/lib/CircuitsAndDynamics.so
 share/elmersolver/lib/CoilSolver.so
 share/elmersolver/lib/CompressibleNS.so