Attachment 147859 Details for Bug 193531 – Diff to fix you .shar (GitHub version)

[patch] Diff to fix you .shar (GitHub version)

elmerfem-3.diff (text/plain), 8.41 KB, created by Thierry Thomas on 2014-09-30 20:57:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2014-09-30 20:57:03 UTC

Size: 8.41 KB

patch

obsolete

>diff -urN cad/elmerfem.orig/Makefile cad/elmerfem/Makefile
>--- cad/elmerfem.orig/Makefile	2014-09-30 22:48:43.000000000 +0200
>+++ cad/elmerfem/Makefile	2014-09-30 22:47:15.000000000 +0200
>@@ -16,7 +16,6 @@
> 		libmpich.so.8:${PORTSDIR}/net/mpich2
> 
> USE_GITHUB=	yes
>-
> GH_ACCOUNT=	ElmerCSC
> GH_PROJECT=	elmerfem
> GH_TAGNAME=	${GH_COMMIT}
>@@ -24,8 +23,13 @@
> 
> USES=		cmake fortran gmake tcl
> 
>+USE_LDCONFIG=	yes
> ALL_TARGET=
> 
>+.if !defined(MAINTAINER_MODE)
>+CMAKE_ARGS+=	-Wno-dev
>+.endif
>+
> .include <bsd.port.pre.mk>
> 
> .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
>diff -urN cad/elmerfem.orig/files/patch-elmergrid_src_CMakeLists.txt cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt
>--- cad/elmerfem.orig/files/patch-elmergrid_src_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/elmerfem/files/patch-elmergrid_src_CMakeLists.txt	2014-09-30 22:31:57.000000000 +0200
>@@ -0,0 +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 @@
>+ 
>+ TARGET_LINK_LIBRARIES(ElmerGrid matc metis)
>+ 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")
>diff -urN cad/elmerfem.orig/files/patch-fem_src_CMakeLists.txt cad/elmerfem/files/patch-fem_src_CMakeLists.txt
>--- cad/elmerfem.orig/files/patch-fem_src_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/elmerfem/files/patch-fem_src_CMakeLists.txt	2014-09-30 22:30:49.000000000 +0200
>@@ -0,0 +1,32 @@
>+--- fem/src/CMakeLists.txt.orig	2014-09-25 15:07:43.000000000 +0200
>++++ fem/src/CMakeLists.txt	2014-09-30 22:30:14.000000000 +0200
>+@@ -117,9 +117,9 @@
>+ 
>+ 
>+ 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}")
>+ IF(NOT(WIN32))
>+-   SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
>++   SET_TARGET_PROPERTIES(Solver_TGT PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
>+ ENDIF()
>+ 
>+ IF(NOT(WITH_MPI))
>+@@ -214,7 +214,7 @@
>+ INSTALL(TARGETS ViewFactors RUNTIME DESTINATION "bin")
>+ 
>+ IF(NOT(WIN32))
>+-  SET_TARGET_PROPERTIES(ViewFactors PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
>++  SET_TARGET_PROPERTIES(ViewFactors PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
>+ ENDIF()
>+ 
>+ # GebhardFactors
>+@@ -223,7 +223,7 @@
>+                                       mpi_stubs elmersolver)
>+ 
>+ IF(NOT(WIN32))
>+-  SET_TARGET_PROPERTIES(GebhardtFactors PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
>++  SET_TARGET_PROPERTIES(GebhardtFactors PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
>+ ENDIF()
>+ 
>+ IF(WITH_Trilinos)
>diff -urN cad/elmerfem.orig/files/patch-matc_src_CMakeLists.txt cad/elmerfem/files/patch-matc_src_CMakeLists.txt
>--- cad/elmerfem.orig/files/patch-matc_src_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ cad/elmerfem/files/patch-matc_src_CMakeLists.txt	2014-09-30 22:27:57.000000000 +0200
>@@ -0,0 +1,11 @@
>+--- 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 @@
>+ 
>+ SET_TARGET_PROPERTIES(Matc_bin PROPERTIES OUTPUT_NAME matc)
>+ IF(NOT(WIN32))
>+-  SET_TARGET_PROPERTIES(Matc_bin PROPERTIES INSTALL_RPATH ${ELMERSOLVER_RPATH_STRING})
>++  SET_TARGET_PROPERTIES(Matc_bin PROPERTIES INSTALL_RPATH "${ELMERSOLVER_RPATH_STRING}")
>+ ENDIF()
>+ 
>+ INSTALL(TARGETS matc Matc_bin RUNTIME DESTINATION "bin" LIBRARY DESTINATION ${ELMER_INSTALL_LIB_DIR})
>diff -urN cad/elmerfem.orig/pkg-plist cad/elmerfem/pkg-plist
>--- cad/elmerfem.orig/pkg-plist	2014-09-30 22:48:43.000000000 +0200
>+++ cad/elmerfem/pkg-plist	2014-09-30 22:45:12.000000000 +0200
>@@ -1,12 +1,100 @@
> bin/ElmerGrid
> bin/ElmerSolver_mpi
>+bin/GebhardtFactors
>+bin/Mesh2D
>+bin/ViewFactors
> bin/elmerf90
>+bin/elmerld
> bin/matc
>-lib/libamdf77.a
>-lib/libbinio.so
>-lib/libelmersolver.so
>-lib/libhuti.so
>-lib/libmatc.so
>+lib/elmersolver/libamd.a
>+lib/elmersolver/libamdf77.a
>+lib/elmersolver/libelmersolver.so
>+lib/elmersolver/libfhuti.so
>+lib/elmersolver/libmatc.so
>+lib/elmersolver/libmpi_stubs.so
>+lib/elmersolver/libumfpack.a
>+share/elmersolver/include/adaptive.mod
>+share/elmersolver/include/ascbinoutpututils.mod
>+share/elmersolver/include/bandmatrix.mod
>+share/elmersolver/include/bandwidthoptimize.mod
>+share/elmersolver/include/binio.mod
>+share/elmersolver/include/blocksolve.mod
>+share/elmersolver/include/clusteringmethods.mod
>+share/elmersolver/include/coordinatesystems.mod
>+share/elmersolver/include/crsmatrix.mod
>+share/elmersolver/include/defutils.mod
>+share/elmersolver/include/differentials.mod
>+share/elmersolver/include/diffuseconvective.mod
>+share/elmersolver/include/diffuseconvectivegeneral.mod
>+share/elmersolver/include/directsolve.mod
>+share/elmersolver/include/dxfile.mod
>+share/elmersolver/include/eigensolve.mod
>+share/elmersolver/include/elementdescription.mod
>+share/elmersolver/include/elementutils.mod
>+share/elmersolver/include/exchangecorrelations.mod
>+share/elmersolver/include/fetisolve.mod
>+share/elmersolver/include/freesurface.mod
>+share/elmersolver/include/gebhardtfactorglobals.mod
>+share/elmersolver/include/generalutils.mod
>+share/elmersolver/include/globmat.mod
>+share/elmersolver/include/globmatc.mod
>+share/elmersolver/include/hashtable.mod
>+share/elmersolver/include/huti_aux.mod
>+share/elmersolver/include/huti_bicgstab.mod
>+share/elmersolver/include/huti_bicgstab_2.mod
>+share/elmersolver/include/huti_cg.mod
>+share/elmersolver/include/huti_cgs.mod
>+share/elmersolver/include/huti_gmres.mod
>+share/elmersolver/include/huti_interfaces.mod
>+share/elmersolver/include/huti_qmr.mod
>+share/elmersolver/include/huti_sfe.mod
>+share/elmersolver/include/huti_tfqmr.mod
>+share/elmersolver/include/integration.mod
>+share/elmersolver/include/interpolation.mod
>+share/elmersolver/include/iso_varying_string.mod
>+share/elmersolver/include/iterativemethods.mod
>+share/elmersolver/include/itersolve.mod
>+share/elmersolver/include/kinds.mod
>+share/elmersolver/include/linearalgebra.mod
>+share/elmersolver/include/listmatrix.mod
>+share/elmersolver/include/lists.mod
>+share/elmersolver/include/loadmod.mod
>+share/elmersolver/include/ludecomposition.mod
>+share/elmersolver/include/magnetodynamicsutils.mod
>+share/elmersolver/include/mainutils.mod
>+share/elmersolver/include/materialmodels.mod
>+share/elmersolver/include/maxwell.mod
>+share/elmersolver/include/maxwellaxis.mod
>+share/elmersolver/include/maxwellgeneral.mod
>+share/elmersolver/include/meshutils.mod
>+share/elmersolver/include/messages.mod
>+share/elmersolver/include/modeldescription.mod
>+share/elmersolver/include/multigrid.mod
>+share/elmersolver/include/navierstokes.mod
>+share/elmersolver/include/navierstokescylindrical.mod
>+share/elmersolver/include/navierstokesgeneral.mod
>+share/elmersolver/include/paralleleigensolve.mod
>+share/elmersolver/include/parallelutils.mod
>+share/elmersolver/include/particledynamicsstuff.mod
>+share/elmersolver/include/particleutils.mod
>+share/elmersolver/include/pelementbase.mod
>+share/elmersolver/include/pelementmaps.mod
>+share/elmersolver/include/porousmaterials.mod
>+share/elmersolver/include/radiation.mod
>+share/elmersolver/include/radiationfactorglobals.mod
>+share/elmersolver/include/smoothers.mod
>+share/elmersolver/include/solverutils.mod
>+share/elmersolver/include/sparitercomm.mod
>+share/elmersolver/include/spariterglobals.mod
>+share/elmersolver/include/spariterprecond.mod
>+share/elmersolver/include/sparitersolve.mod
>+share/elmersolver/include/statelecboundaryutils.mod
>+share/elmersolver/include/stressgeneral.mod
>+share/elmersolver/include/stresslocal.mod
>+share/elmersolver/include/timeintegrate.mod
>+share/elmersolver/include/types.mod
>+share/elmersolver/include/viewfactorglobals.mod
>+share/elmersolver/include/vtklegacyfile.mod
> share/elmersolver/lib/Acoustics.so
> share/elmersolver/lib/AdvectionDiffusion.so
> share/elmersolver/lib/AdvectionReaction.so
>@@ -98,5 +186,7 @@
> share/elmersolver/lib/ViscousCompressibility.so
> share/elmersolver/lib/VorticitySolver.so
> share/elmersolver/lib/elements.def
>-@dirrm share/elmersolver/lib
>-@dirrm share/elmersolver
>+share/elmersolver/license_texts/GPL-2.txt
>+share/elmersolver/license_texts/LGPL-2.1.txt
>+share/elmersolver/license_texts/LICENSES
>+share/elmersolver/license_texts/fem/LICENSES

Actions: View | Diff

Attachments on bug 193531: 147181 | 147503 | 147525 | 147703 | 147859 | 147865 | 147866 | 148047 | 148049 | 148050