1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-02 06:03:50 +00:00

Update to 20161026 snapshot

PR:		213816
Submitted by:	pfg
This commit is contained in:
Thomas Zander 2016-11-05 11:10:33 +00:00
parent 695f8d0c75
commit f43139f3dc
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=425381
9 changed files with 24 additions and 19 deletions

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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))

View File

@ -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))

View File

@ -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)

View File

@ -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 @@

View File

@ -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>

View File

@ -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