Update to 20161026 snapshot

PR:		213816
Submitted by:	pfg

9 files changed, 24 insertions, 19 deletions

diff --git a/cad/elmerfem/Makefile b/cad/elmerfem/Makefile
index 08e4bfcd00af..067b40e18556 100644
--- a/cad/elmerfem/Makefile
+++ b/cad/elmerfem/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	elmerfem
-PORTVERSION=	8.2.20160715
+PORTVERSION=	8.2.20161026
 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=	e69732a
+GH_TAGNAME=	5172e02
 
 USES=		blaslapack:netlib cmake fortran gmake tcl
 
diff --git a/cad/elmerfem/distinfo b/cad/elmerfem/distinfo
index 0911ede0a786..6a75c3d75fea 100644
--- a/cad/elmerfem/distinfo
+++ b/cad/elmerfem/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1469311055
-SHA256 (ElmerCSC-elmerfem-8.2.20160715-e69732a_GH0.tar.gz) = a8622455b961d762342cf912e5099f4463e905cc440b1833e472b18c08a0cdc6
-SIZE (ElmerCSC-elmerfem-8.2.20160715-e69732a_GH0.tar.gz) = 49026399
+TIMESTAMP = 1477492415
+SHA256 (ElmerCSC-elmerfem-8.2.20161026-5172e02_GH0.tar.gz) = dbd095591103b13289aab9b3d622ad309a3e5113beaca8562a70e81ef22d6c9e
+SIZE (ElmerCSC-elmerfem-8.2.20161026-5172e02_GH0.tar.gz) = 49750654
diff --git a/cad/elmerfem/files/patch-CMakeLists.txt b/cad/elmerfem/files/patch-CMakeLists.txt
index c7a88a2d56ed..0a040ed0fb85 100644
--- a/cad/elmerfem/files/patch-CMakeLists.txt
+++ b/cad/elmerfem/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2016-07-15 11:02:59 UTC
+--- CMakeLists.txt.orig	2016-10-26 13:01:22 UTC
 +++ CMakeLists.txt
-@@ -255,7 +255,7 @@ ADD_SUBDIRECTORY(umfpack)
+@@ -265,7 +265,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 6439cb90a205..38670201c8f8 100644
--- a/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt
+++ b/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt
@@ -1,6 +1,6 @@
---- elmergrid/src/CMakeLists.txt.orig	2016-07-15 11:02:59 UTC
+--- elmergrid/src/CMakeLists.txt.orig	2016-10-26 13:01:22 UTC
 +++ elmergrid/src/CMakeLists.txt
-@@ -29,7 +29,7 @@ ADD_EXECUTABLE(ElmerGrid ${elmergrid_SRC
+@@ -31,7 +31,7 @@ ADD_EXECUTABLE(ElmerGrid ${elmergrid_SRC
  
  TARGET_LINK_LIBRARIES(ElmerGrid metis m)
  IF(NOT(WIN32))
diff --git a/cad/elmerfem/files/patch-fem_src_CMakeLists.txt b/cad/elmerfem/files/patch-fem_src_CMakeLists.txt
index a24b231fbe8a..a0ed5013441a 100644
--- a/cad/elmerfem/files/patch-fem_src_CMakeLists.txt
+++ b/cad/elmerfem/files/patch-fem_src_CMakeLists.txt
@@ -1,18 +1,21 @@
---- fem/src/CMakeLists.txt.orig	2016-07-15 11:02:59 UTC
+--- fem/src/CMakeLists.txt.orig	2016-10-26 13:01:22 UTC
 +++ fem/src/CMakeLists.txt
-@@ -132,9 +132,9 @@ ENDIF()
+@@ -137,11 +137,11 @@ ENDIF()
  
  
  ADD_EXECUTABLE(Solver_TGT Solver.F90)
--  SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES OUTPUT_NAME ${ELMERSOLVER_OUTPUT_NAME})
-+  SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES OUTPUT_NAME "${ELMERSOLVER_OUTPUT_NAME}")
+-SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES OUTPUT_NAME ${ELMERSOLVER_OUTPUT_NAME})
++SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES OUTPUT_NAME "${ELMERSOLVER_OUTPUT_NAME}")
+ 
  IF(NOT(WIN32))
 -   SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
+-   SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH ${ELMERLIB_RPATH_STRING})
 +   SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
++   SET_TARGET_PROPERTIES(elmersolver PROPERTIES INSTALL_RPATH "${ELMERLIB_RPATH_STRING}")
  ENDIF()
  
  IF(NOT(WITH_MPI))
-@@ -235,7 +235,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME
+@@ -246,7 +246,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME
  INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin")
  
  IF(NOT(WIN32))
@@ -21,7 +24,7 @@
  ENDIF()
  
  # GebhardFactors
-@@ -244,7 +244,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${
+@@ -255,7 +255,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${
                                        mpi_stubs elmersolver)
  
  IF(NOT(WIN32))
@@ -30,7 +33,7 @@
  ENDIF()
  
  IF(WITH_Trilinos)
-@@ -288,9 +288,10 @@ INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE
+@@ -299,9 +299,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 3a2d04ff93d1..c02a5c628baf 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	2016-07-15 11:02:59 UTC
+--- matc/src/CMakeLists.txt.orig	2016-10-26 13:01:22 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 9165789411e4..82e5a1751fd9 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	2016-07-15 11:02:59 UTC
+--- post/src/elmerpost.h.orig	2016-10-26 13:01:22 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 7bc8dda9d512..e42c4f76a49d 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	2016-07-15 11:02:59 UTC
+--- post/src/screensave.c.orig	2016-10-26 13:01:22 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 4e190495e85b..1d6c22f46036 100644
--- a/cad/elmerfem/pkg-plist
+++ b/cad/elmerfem/pkg-plist
@@ -131,6 +131,7 @@ share/elmersolver/lib/ElasticSolve.so
 share/elmersolver/lib/ElectricForce.so
 share/elmersolver/lib/Electrokinetics.so
 share/elmersolver/lib/ElementSizeSolver.so
+share/elmersolver/lib/ElementStats.so
 share/elmersolver/lib/EliminateDirichlet.so
 share/elmersolver/lib/EliminatePeriodic.so
 share/elmersolver/lib/EnergyRelease.so
@@ -164,6 +165,7 @@ share/elmersolver/lib/OdeSolver.so
 share/elmersolver/lib/ParStokes.so
 share/elmersolver/lib/ParticleAdvector.so
 share/elmersolver/lib/ParticleDynamics.so
+share/elmersolver/lib/PartitionMesh.so
 share/elmersolver/lib/PhaseChangeSolve.so
 share/elmersolver/lib/Poisson.so
 share/elmersolver/lib/PoissonBEM.so