svn commit: r411297 - in head/cad/elmerfem: . files

Thierry Thomas thierry at FreeBSD.org
Thu Mar 17 18:24:40 UTC 2016 

Author: thierry
Date: Thu Mar 17 18:24:38 2016
New Revision: 411297
URL: https://svnweb.freebsd.org/changeset/ports/411297

Log:
  Update to version 8.1-20160311.
  Fix PR ports/201246.
  
  PR:		ports/196577
  Submitted by:	pfg

Modified:
  head/cad/elmerfem/Makefile
  head/cad/elmerfem/distinfo
  head/cad/elmerfem/files/patch-CMakeLists.txt
  head/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt
  head/cad/elmerfem/files/patch-fem_src_CMakeLists.txt
  head/cad/elmerfem/files/patch-matc_src_CMakeLists.txt
  head/cad/elmerfem/files/patch-post-src-elmerpost.h
  head/cad/elmerfem/files/patch-post-src-screensave.c
  head/cad/elmerfem/pkg-plist

Modified: head/cad/elmerfem/Makefile
==============================================================================
--- head/cad/elmerfem/Makefile	Thu Mar 17 17:45:45 2016	(r411296)
+++ head/cad/elmerfem/Makefile	Thu Mar 17 18:24:38 2016	(r411297)
@@ -2,25 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	elmerfem
-PORTVERSION=	7.0.20141202
+PORTVERSION=	8.1.20160311
 CATEGORIES=	cad science
 
-MAINTAINER=	pfg at FreeBSD.org
+MAINTAINER=	ports at FreeBSD.org
 COMMENT=	ELMER FEM package
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	liblapack.so:${PORTSDIR}/math/lapack		\
-		libparpack.so:${PORTSDIR}/math/arpack-ng-mpich	\
+LIB_DEPENDS=	libparpack.so:${PORTSDIR}/math/arpack-ng-mpich	\
 		libmpich.so.8:${PORTSDIR}/net/mpich2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ElmerCSC
-GH_TAGNAME=	0300707
+GH_TAGNAME=	dee8ceb
 
-USES=		cmake fortran gmake tcl
+USES=		blaslapack:netlib cmake fortran gmake tcl
 
-USE_LDCONFIG=	yes
+USE_LDCONFIG=	${PREFIX}/lib/elmersolver
 ALL_TARGET=
 
 .if !defined(MAINTAINER_MODE)

Modified: head/cad/elmerfem/distinfo
==============================================================================
--- head/cad/elmerfem/distinfo	Thu Mar 17 17:45:45 2016	(r411296)
+++ head/cad/elmerfem/distinfo	Thu Mar 17 18:24:38 2016	(r411297)
@@ -1,2 +1,2 @@
-SHA256 (ElmerCSC-elmerfem-7.0.20141202-0300707_GH0.tar.gz) = b361efc406beb17bb5aa5abaf354ad64d842c610b9b66e043ad271b0ce72e380
-SIZE (ElmerCSC-elmerfem-7.0.20141202-0300707_GH0.tar.gz) = 43335735
+SHA256 (ElmerCSC-elmerfem-8.1.20160311-dee8ceb_GH0.tar.gz) = a14f2bae53dba5670297457cc822c6b127a5550b8e84d2ed87d7e6679c6c7a5e
+SIZE (ElmerCSC-elmerfem-8.1.20160311-dee8ceb_GH0.tar.gz) = 48386208

Modified: head/cad/elmerfem/files/patch-CMakeLists.txt
==============================================================================
--- head/cad/elmerfem/files/patch-CMakeLists.txt	Thu Mar 17 17:45:45 2016	(r411296)
+++ head/cad/elmerfem/files/patch-CMakeLists.txt	Thu Mar 17 18:24:38 2016	(r411297)
@@ -1,11 +1,11 @@
---- CMakeLists.txt.orig	2014-09-21 14:50:21.000000000 +0200
-+++ CMakeLists.txt	2014-09-21 14:56:31.000000000 +0200
-@@ -56,7 +56,7 @@
- ADD_SUBDIRECTORY(eio)
- ADD_SUBDIRECTORY(matc)
+--- CMakeLists.txt.orig	2015-08-18 12:26:58 UTC
++++ CMakeLists.txt
+@@ -248,7 +248,7 @@ ADD_SUBDIRECTORY(umfpack)
+ ADD_SUBDIRECTORY(fhutiter)
+ ADD_SUBDIRECTORY(meshgen2d)
  ADD_SUBDIRECTORY(fem)
 -ADD_SUBDIRECTORY(mathlibs)
 +#ADD_SUBDIRECTORY(mathlibs)
  ADD_SUBDIRECTORY(elmergrid)
+ ADD_SUBDIRECTORY(license_texts)
  
- MESSAGE(STATUS "------------------------------------------------")

Modified: head/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt
==============================================================================
--- head/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt	Thu Mar 17 17:45:45 2016	(r411296)
+++ head/cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt	Thu Mar 17 18:24:38 2016	(r411297)
@@ -1,11 +1,11 @@
---- elmergrid/src/CMakeLists.txt.orig	2014-09-25 15:07:43.000000000 +0200
-+++ elmergrid/src/CMakeLists.txt	2014-09-30 22:31:29.000000000 +0200
-@@ -14,7 +14,7 @@
+--- elmergrid/src/CMakeLists.txt.orig	2015-08-18 12:26:58 UTC
++++ elmergrid/src/CMakeLists.txt
+@@ -29,7 +29,7 @@ ADD_EXECUTABLE(ElmerGrid ${elmergrid_SRC
  
- TARGET_LINK_LIBRARIES(ElmerGrid matc metis)
+ TARGET_LINK_LIBRARIES(ElmerGrid metis m)
  IF(NOT(WIN32))
 -  SET_TARGET_PROPERTIES(ElmerGrid PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
 +  SET_TARGET_PROPERTIES(ElmerGrid PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
  ENDIF()
  
- #INSTALL(PROGRAMS ${CMAKE_BINARY_DIR}/elmergrid/src/ElmerGrid DESTINATION "bin")
+ INSTALL(TARGETS ElmerGrid RUNTIME DESTINATION "bin")

Modified: head/cad/elmerfem/files/patch-fem_src_CMakeLists.txt
==============================================================================
--- head/cad/elmerfem/files/patch-fem_src_CMakeLists.txt	Thu Mar 17 17:45:45 2016	(r411296)
+++ head/cad/elmerfem/files/patch-fem_src_CMakeLists.txt	Thu Mar 17 18:24:38 2016	(r411297)
@@ -1,6 +1,6 @@
---- fem/src/CMakeLists.txt.orig	2014-09-25 15:07:43.000000000 +0200
-+++ fem/src/CMakeLists.txt	2014-10-06 23:29:26.000000000 +0200
-@@ -117,9 +117,9 @@
+--- fem/src/CMakeLists.txt.orig	2015-08-18 12:26:58 UTC
++++ fem/src/CMakeLists.txt
+@@ -131,9 +131,9 @@ ENDIF()
  
  
  ADD_EXECUTABLE(Solver_TGT Solver.F90)
@@ -12,7 +12,7 @@
  ENDIF()
  
  IF(NOT(WITH_MPI))
-@@ -214,7 +214,7 @@
+@@ -229,7 +229,7 @@ TARGET_LINK_LIBRARIES(ViewFactors ${ELME
  INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin")
  
  IF(NOT(WIN32))
@@ -21,7 +21,7 @@
  ENDIF()
  
  # GebhardFactors
-@@ -223,7 +223,7 @@
+@@ -238,7 +238,7 @@ TARGET_LINK_LIBRARIES(GebhardtFactors ${
                                        mpi_stubs elmersolver)
  
  IF(NOT(WIN32))
@@ -30,17 +30,17 @@
  ENDIF()
  
  IF(WITH_Trilinos)
-@@ -267,9 +267,10 @@
+@@ -282,9 +282,10 @@ INSTALL(DIRECTORY ${CMAKE_Fortran_MODULE
  
  IF(WITH_MPI)
    IF(NOT(WIN32))
--    INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink
--    \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi
--    \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver)")
-+    # Create symlink after, to repect STAGEDIR
-+    #INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink
-+    #\${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi
-+    #\${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver)")
+-    INSTALL(CODE "
+-    EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver
+-    WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)")
++    # Create symlink after, to respect STAGEDIR
++    #INSTALL(CODE "
++    #EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E create_symlink ElmerSolver_mpi ElmerSolver
++    #WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}/bin)")
    ELSE()
      INSTALL(CODE "EXECUTE_PROCESS(COMMAND \${CMAKE_COMMAND} -E copy
      \${CMAKE_INSTALL_PREFIX}/bin/ElmerSolver_mpi.exe

Modified: head/cad/elmerfem/files/patch-matc_src_CMakeLists.txt
==============================================================================
--- head/cad/elmerfem/files/patch-matc_src_CMakeLists.txt	Thu Mar 17 17:45:45 2016	(r411296)
+++ head/cad/elmerfem/files/patch-matc_src_CMakeLists.txt	Thu Mar 17 18:24:38 2016	(r411297)
@@ -1,6 +1,6 @@
---- matc/src/CMakeLists.txt.orig	2014-09-25 15:07:43.000000000 +0200
-+++ matc/src/CMakeLists.txt	2014-09-30 22:27:34.000000000 +0200
-@@ -12,7 +12,7 @@
+--- matc/src/CMakeLists.txt.orig	2015-08-18 12:26:58 UTC
++++ matc/src/CMakeLists.txt
+@@ -12,7 +12,7 @@ TARGET_LINK_LIBRARIES(Matc_bin matc)
  
  SET_TARGET_PROPERTIES(Matc_bin PROPERTIES OUTPUT_NAME matc)
  IF(NOT(WIN32))

Modified: head/cad/elmerfem/files/patch-post-src-elmerpost.h
==============================================================================
--- head/cad/elmerfem/files/patch-post-src-elmerpost.h	Thu Mar 17 17:45:45 2016	(r411296)
+++ head/cad/elmerfem/files/patch-post-src-elmerpost.h	Thu Mar 17 18:24:38 2016	(r411297)
@@ -1,5 +1,5 @@
---- post/src/elmerpost.h.orig	2014-09-09 15:50:25.000000000 -0500
-+++ post/src/elmerpost.h	2014-09-09 16:25:51.000000000 -0500
+--- post/src/elmerpost.h.orig	2015-08-18 12:26:58 UTC
++++ post/src/elmerpost.h
 @@ -62,6 +62,7 @@
  
  #include <elmer/matc.h>

Modified: head/cad/elmerfem/files/patch-post-src-screensave.c
==============================================================================
--- head/cad/elmerfem/files/patch-post-src-screensave.c	Thu Mar 17 17:45:45 2016	(r411296)
+++ head/cad/elmerfem/files/patch-post-src-screensave.c	Thu Mar 17 18:24:38 2016	(r411297)
@@ -1,5 +1,5 @@
---- post/src/screensave.c.orig	2014-09-09 20:47:35.000000000 -0500
-+++ post/src/screensave.c	2014-09-09 20:50:39.000000000 -0500
+--- post/src/screensave.c.orig	2015-08-18 12:26:58 UTC
++++ post/src/screensave.c
 @@ -32,6 +32,7 @@
  #include <GL/glu.h>
  

Modified: head/cad/elmerfem/pkg-plist
==============================================================================
--- head/cad/elmerfem/pkg-plist	Thu Mar 17 17:45:45 2016	(r411296)
+++ head/cad/elmerfem/pkg-plist	Thu Mar 17 18:24:38 2016	(r411297)
@@ -21,7 +21,11 @@ share/elmersolver/include/bandwidthoptim
 share/elmersolver/include/binio.mod
 share/elmersolver/include/blocksolve.mod
 share/elmersolver/include/blowers.mod
+share/elmersolver/include/circmatinitmod.mod
+share/elmersolver/include/circuitsmod.mod
+share/elmersolver/include/circuitutils.mod
 share/elmersolver/include/clusteringmethods.mod
+share/elmersolver/include/componentutils.mod
 share/elmersolver/include/coordinatesystems.mod
 share/elmersolver/include/crsmatrix.mod
 share/elmersolver/include/defutils.mod
@@ -96,6 +100,7 @@ share/elmersolver/include/stresslocal.mo
 share/elmersolver/include/timeintegrate.mod
 share/elmersolver/include/toroidcurrents.mod
 share/elmersolver/include/types.mod
+share/elmersolver/include/vectorhelmholtzutils.mod
 share/elmersolver/include/viewfactorglobals.mod
 share/elmersolver/include/vtklegacyfile.mod
 share/elmersolver/lib/Acoustics.so
@@ -103,6 +108,7 @@ share/elmersolver/lib/AdvectionDiffusion
 share/elmersolver/lib/AdvectionReaction.so
 share/elmersolver/lib/ArteryOutlet.so
 share/elmersolver/lib/ArtificialCompressibility.so
+share/elmersolver/lib/CircuitsAndDynamics.so
 share/elmersolver/lib/CoilSolver.so
 share/elmersolver/lib/CompressibleNS.so
 share/elmersolver/lib/CoupledNSUpdate.so
@@ -126,6 +132,7 @@ share/elmersolver/lib/FindOptimum.so
 share/elmersolver/lib/FlowSolve.so
 share/elmersolver/lib/FluidicForce.so
 share/elmersolver/lib/FluxSolver.so
+share/elmersolver/lib/FourierLoss.so
 share/elmersolver/lib/FreeSurfaceReduced.so
 share/elmersolver/lib/FreeSurfaceSolver.so
 share/elmersolver/lib/HeatSolve.so
@@ -143,6 +150,7 @@ share/elmersolver/lib/ModelPDE.so
 share/elmersolver/lib/MovingElstatSolver.so
 share/elmersolver/lib/NonphysicalMeshSolve.so
 share/elmersolver/lib/NormalSolver.so
+share/elmersolver/lib/OdeSolver.so
 share/elmersolver/lib/ParStokes.so
 share/elmersolver/lib/ParticleAdvector.so
 share/elmersolver/lib/ParticleDynamics.so
@@ -164,6 +172,7 @@ share/elmersolver/lib/SOLVER.KEYWORDS
 share/elmersolver/lib/SSTKomega.so
 share/elmersolver/lib/SaveData.so
 share/elmersolver/lib/SaveGridData.so
+share/elmersolver/lib/SaveMesh.so
 share/elmersolver/lib/ScalarPotentialSolver.so
 share/elmersolver/lib/ShallowWaterNS.so
 share/elmersolver/lib/ShearrateSolver.so
@@ -187,7 +196,9 @@ share/elmersolver/lib/TransportEquation.
 share/elmersolver/lib/V2FSolver.so
 share/elmersolver/lib/VelocityPrecond.so
 share/elmersolver/lib/ViscousCompressibility.so
+share/elmersolver/lib/VectorHelmholtz.so
 share/elmersolver/lib/VorticitySolver.so
+share/elmersolver/lib/WaveSolver.so
 share/elmersolver/lib/elements.def
 share/elmersolver/license_texts/GPL-2.txt
 share/elmersolver/license_texts/LGPL-2.1.txt

More information about the svn-ports-all mailing list