9 files changed, 18 insertions, 15 deletions

diff --git a/cad/elmerfem/Makefile b/cad/elmerfem/Makefile
index 90cd9d962cf1..08e4bfcd00af 100644
--- a/cad/elmerfem/Makefile
+++ b/cad/elmerfem/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	elmerfem
-PORTVERSION=	8.2.20160404
+PORTVERSION=	8.2.20160715
 CATEGORIES=	cad science
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libparpack.so:math/arpack-ng-mpich	\
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ElmerCSC
-GH_TAGNAME=	2f5a55c
+GH_TAGNAME=	e69732a
 
 USES=		blaslapack:netlib cmake fortran gmake tcl
 
diff --git a/cad/elmerfem/distinfo b/cad/elmerfem/distinfo
index ba8651f0002d..0911ede0a786 100644
--- a/cad/elmerfem/distinfo
+++ b/cad/elmerfem/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ElmerCSC-elmerfem-8.2.20160404-2f5a55c_GH0.tar.gz) = 653c94c5052b757427019358653308b7fba175889b2d9bb759e3e28d6c24ec65
-SIZE (ElmerCSC-elmerfem-8.2.20160404-2f5a55c_GH0.tar.gz) = 48681524
+TIMESTAMP = 1469311055
+SHA256 (ElmerCSC-elmerfem-8.2.20160715-e69732a_GH0.tar.gz) = a8622455b961d762342cf912e5099f4463e905cc440b1833e472b18c08a0cdc6
+SIZE (ElmerCSC-elmerfem-8.2.20160715-e69732a_GH0.tar.gz) = 49026399
diff --git a/cad/elmerfem/files/patch-CMakeLists.txt b/cad/elmerfem/files/patch-CMakeLists.txt
index 26f4767c44ce..c7a88a2d56ed 100644
--- a/cad/elmerfem/files/patch-CMakeLists.txt
+++ b/cad/elmerfem/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2015-08-18 12:26:58 UTC
+--- CMakeLists.txt.orig	2016-07-15 11:02:59 UTC
 +++ CMakeLists.txt
-@@ -248,7 +248,7 @@ ADD_SUBDIRECTORY(umfpack)
+@@ -255,7 +255,7 @@ ADD_SUBDIRECTORY(umfpack)
  ADD_SUBDIRECTORY(fhutiter)
  ADD_SUBDIRECTORY(meshgen2d)
  ADD_SUBDIRECTORY(fem)
diff --git a/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt b/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt
index 0731e496afd5..6439cb90a205 100644
--- a/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt
+++ b/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt
@@ -1,4 +1,4 @@
---- elmergrid/src/CMakeLists.txt.orig	2015-08-18 12:26:58 UTC
+--- elmergrid/src/CMakeLists.txt.orig	2016-07-15 11:02:59 UTC
 +++ elmergrid/src/CMakeLists.txt
 @@ -29,7 +29,7 @@ ADD_EXECUTABLE(ElmerGrid ${elmergrid_SRC
  
diff --git a/cad/elmerfem/files/patch-fem_src_CMakeLists.txt b/cad/elmerfem/files/patch-fem_src_CMakeLists.txt
index 8e4ff17a51c0..a24b231fbe8a 100644
--- a/cad/elmerfem/files/patch-fem_src_CMakeLists.txt
+++ b/cad/elmerfem/files/patch-fem_src_CMakeLists.txt
@@ -1,6 +1,6 @@
---- fem/src/CMakeLists.txt.orig	2015-08-18 12:26:58 UTC
+--- fem/src/CMakeLists.txt.orig	2016-07-15 11:02:59 UTC
 +++ fem/src/CMakeLists.txt
-@@ -131,9 +131,9 @@ ENDIF()
+@@ -132,9 +132,9 @@ ENDIF()
  
  
  ADD_EXECUTABLE(Solver_TGT Solver.F90)
@@ -12,7 +12,7 @@
  ENDIF()
  
  IF(NOT(WITH_MPI))
-@@ -229,7 +229,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME
+@@ -235,7 +235,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME
  INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin")
  
  IF(NOT(WIN32))
@@ -21,7 +21,7 @@
  ENDIF()
  
  # GebhardFactors
-@@ -238,7 +238,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${
+@@ -244,7 +244,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${
                                        mpi_stubs elmersolver)
  
  IF(NOT(WIN32))
@@ -30,7 +30,7 @@
  ENDIF()
  
  IF(WITH_Trilinos)
-@@ -282,9 +282,10 @@ INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE
+@@ -288,9 +288,10 @@ INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE
  
  IF(WITH_MPI)
    IF(NOT(WIN32))
diff --git a/cad/elmerfem/files/patch-matc_src_CMakeLists.txt b/cad/elmerfem/files/patch-matc_src_CMakeLists.txt
index cff93bed1a22..3a2d04ff93d1 100644
--- a/cad/elmerfem/files/patch-matc_src_CMakeLists.txt
+++ b/cad/elmerfem/files/patch-matc_src_CMakeLists.txt
@@ -1,4 +1,4 @@
---- matc/src/CMakeLists.txt.orig	2015-08-18 12:26:58 UTC
+--- matc/src/CMakeLists.txt.orig	2016-07-15 11:02:59 UTC
 +++ matc/src/CMakeLists.txt
 @@ -12,7 +12,7 @@ TARGET_LINK_LIBRARIES(Matc_bin matc)
  
diff --git a/cad/elmerfem/files/patch-post-src-elmerpost.h b/cad/elmerfem/files/patch-post-src-elmerpost.h
index ec8dacea2773..9165789411e4 100644
--- a/cad/elmerfem/files/patch-post-src-elmerpost.h
+++ b/cad/elmerfem/files/patch-post-src-elmerpost.h
@@ -1,4 +1,4 @@
---- post/src/elmerpost.h.orig	2015-08-18 12:26:58 UTC
+--- post/src/elmerpost.h.orig	2016-07-15 11:02:59 UTC
 +++ post/src/elmerpost.h
 @@ -62,6 +62,7 @@
  
diff --git a/cad/elmerfem/files/patch-post-src-screensave.c b/cad/elmerfem/files/patch-post-src-screensave.c
index 44c6aca2dbae..7bc8dda9d512 100644
--- a/cad/elmerfem/files/patch-post-src-screensave.c
+++ b/cad/elmerfem/files/patch-post-src-screensave.c
@@ -1,4 +1,4 @@
---- post/src/screensave.c.orig	2015-08-18 12:26:58 UTC
+--- post/src/screensave.c.orig	2016-07-15 11:02:59 UTC
 +++ post/src/screensave.c
 @@ -32,6 +32,7 @@
  #include <GL/glu.h>
diff --git a/cad/elmerfem/pkg-plist b/cad/elmerfem/pkg-plist
index f17654823fd7..4e190495e85b 100644
--- a/cad/elmerfem/pkg-plist
+++ b/cad/elmerfem/pkg-plist
@@ -44,6 +44,7 @@ share/elmersolver/include/gebhardtfactorglobals.mod
 share/elmersolver/include/generalutils.mod
 share/elmersolver/include/globmat.mod
 share/elmersolver/include/globmatc.mod
+share/elmersolver/include/h1elementbasisfunctions.mod
 share/elmersolver/include/harmutils.mod
 share/elmersolver/include/hashtable.mod
 share/elmersolver/include/huti_aux.mod
@@ -63,6 +64,7 @@ share/elmersolver/include/iterativemethods.mod
 share/elmersolver/include/itersolve.mod
 share/elmersolver/include/kinds.mod
 share/elmersolver/include/linearalgebra.mod
+share/elmersolver/include/linearforms.mod
 share/elmersolver/include/listmatrix.mod
 share/elmersolver/include/lists.mod
 share/elmersolver/include/loadmod.mod