Attachment 158228 Details for Bug 196577 – elmerfem - Update to 8.0.20150625

[patch] elmerfem - Update to 8.0.20150625

cad-elmerfem.diff (text/plain), 5.69 KB, created by Pedro F. Giffuni on 2015-07-01 16:41:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2015-07-01 16:41:47 UTC

Size: 5.69 KB

patch

obsolete

>Index: cad/elmerfem/Makefile
>===================================================================
>--- cad/elmerfem/Makefile	(revision 390589)
>+++ cad/elmerfem/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	elmerfem
>-PORTVERSION=	7.0.20141202
>+PORTVERSION=	8.0.20150625
> CATEGORIES=	cad science
> 
> MAINTAINER=	pfg@FreeBSD.org
>@@ -10,19 +10,19 @@
> 
> 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=	a71505a
> 
>-USES=		cmake fortran gmake tcl
>+USES=		cmake fortran gmake tcl blaslapack:netlib
> 
> USE_LDCONFIG=	yes
> ALL_TARGET=
> 
>+#ELMER_SLIBS=	huti matc mpi_stubs
> .if !defined(MAINTAINER_MODE)
> CMAKE_ARGS+=	-Wno-dev
> .endif
>@@ -41,6 +41,8 @@
> post-install:
> 	cd  ${STAGEDIR}${PREFIX}/bin	\
> 	&& ${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver
>+	cd  ${STAGEDIR}${PREFIX}/lib/elmersolver/	\
>+	&& ${LN} -sf libmatc.so ${STAGEDIR}${PREFIX}/lib/libmatc.so
> 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid
> 
> .if defined(MAINTAINER_MODE)
>Index: cad/elmerfem/distinfo
>===================================================================
>--- cad/elmerfem/distinfo	(revision 390589)
>+++ cad/elmerfem/distinfo	(working copy)
>@@ -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.0.20150625-a71505a_GH0.tar.gz) = 3fbbe6c60ecad8fc1edf9289f50b354a50e0868d36c9c1df119df4096313b924
>+SIZE (ElmerCSC-elmerfem-8.0.20150625-a71505a_GH0.tar.gz) = 45110337
>Index: cad/elmerfem/files/patch-fem_src_CMakeLists.txt
>===================================================================
>--- cad/elmerfem/files/patch-fem_src_CMakeLists.txt	(revision 390589)
>+++ cad/elmerfem/files/patch-fem_src_CMakeLists.txt	(working copy)
>@@ -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	2014-12-18 03:11:20.000000000 -0500
>++++ fem/src/CMakeLists.txt	2015-01-06 15:46:33.994140478 -0500
>+@@ -119,9 +119,9 @@
>  
>  
>  ADD_EXECUTABLE(Solver_TGT Solver.F90)
>@@ -12,7 +12,7 @@
>  ENDIF()
>  
>  IF(NOT(WITH_MPI))
>-@@ -214,7 +214,7 @@
>+@@ -216,7 +216,7 @@
>  INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin")
>  
>  IF(NOT(WIN32))
>@@ -21,7 +21,7 @@
>  ENDIF()
>  
>  # GebhardFactors
>-@@ -223,7 +223,7 @@
>+@@ -225,7 +225,7 @@
>                                        mpi_stubs elmersolver)
>  
>  IF(NOT(WIN32))
>@@ -30,17 +30,17 @@
>  ENDIF()
>  
>  IF(WITH_Trilinos)
>-@@ -267,9 +267,10 @@
>+@@ -269,9 +269,10 @@
>  
>  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
>Index: cad/elmerfem/pkg-plist
>===================================================================
>--- cad/elmerfem/pkg-plist	(revision 390589)
>+++ cad/elmerfem/pkg-plist	(working copy)
>@@ -7,6 +7,7 @@
> bin/elmerf90
> bin/elmerld
> bin/matc
>+lib/libmatc.so
> lib/elmersolver/libamd.a
> lib/elmersolver/libamdf77.a
> lib/elmersolver/libelmersolver.so
>@@ -96,6 +97,7 @@
> 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
>@@ -126,6 +128,7 @@
> 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 +146,7 @@
> 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 +168,7 @@
> 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 +192,9 @@
> 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

Actions: View | Diff

Attachments on bug 196577: 151433 | 153869 | 156227 | 156517 | 157814 | 157815 | 158228 | 158232 | 160223 | 160880 | 165133 | 168047