<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cd4b7f578ecea9f5e59586593a7fda8658f62ed8">https://github.com/macports/macports-ports/commit/cd4b7f578ecea9f5e59586593a7fda8658f62ed8</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new cd4b7f5 gmsh: update version 4.1.5->4.2.2; add PETSc variant
</span>cd4b7f5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cd4b7f578ecea9f5e59586593a7fda8658f62ed8
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Mar 16 07:33:05 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> gmsh: update version 4.1.5->4.2.2; add PETSc variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Support for PETSc linear solvers and SLEPc eigensolvers are no longer
</span><span style='display:block; white-space:pre;color:#404040;'> the default, so make them a (non-default) variant.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/58178
</span>---
science/gmsh/Portfile | 26 ++++++++++++++++----------
science/gmsh/files/patch-CMakeLists.txt.diff | 4 ++--
2 files changed, 18 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmsh/Portfile b/science/gmsh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 310bed7..4a60a71 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup linear_algebra 1.0
</span> PortGroup muniversal 1.0
name gmsh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.1.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.2.2
</span> categories science
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +26,9 @@ master_sites http://gmsh.info/src/
</span> distname gmsh-${version}-source
extract.suffix .tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 56297719a03c7e390328c32fe4409a27511e7d50 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 654d38203f76035a281006b77dcb838987a44fd549287f11c53a1e9cdf598f46 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12707303
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bd9ed1c95a3f307836a81674335d4f0432468800 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e9ee9f5c606bbec5f2adbb8c3d6023c4e2577f487fa4e4ecfcfc94a241cc8dcc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12736612
</span>
patchfiles patch-CMakeLists.txt.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +42,6 @@ depends_lib-append \
</span> port:jpeg \
port:gmm \
path:lib/pkgconfig/cairo.pc:cairo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:petsc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:slepc \
</span> port:libANN \
port:cgnslib \
port:metis \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,10 +76,6 @@ configure.args-append \
</span> -DENABLE_MMG3D=OFF \
-DENABLE_GETDP=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPETSC_DIR=${prefix}/lib/petsc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DSLEPC_DIR=${prefix}/lib/slepc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.env-append \
CASROOT=${prefix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,6 +100,18 @@ variant getdp description {Enable GetDP solver} {
</span> configure.args-delete -DENABLE_GETDP=OFF
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant petsc description {Enable PETSc linear solvers and SLEPc eigensolvers} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:petsc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:slepc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_PETSC=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_SLEPC=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPETSC_DIR=${prefix}/lib/petsc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSLEPC_DIR=${prefix}/lib/slepc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant openmp description {enable support for OpenMP} {
configure.args-append \
-DENABLE_OPENMP=ON
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmsh/files/patch-CMakeLists.txt.diff b/science/gmsh/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b1676e7..b2b08ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmsh/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmsh/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ Do not attempt to use MacPorts OpenMP.
</span> Do not install libraries a second time.
--- CMakeLists.txt.orig 2019-02-06 05:24:33.000000000 -0700
+++ CMakeLists.txt 2019-02-15 05:23:25.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -291,14 +291,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -292,14 +292,6 @@
</span> set_config_option(HAVE_OPENMP "OpenMP")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ Do not install libraries a second time.
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1783,8 +1775,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ 1817,8 +1809,6 @@
</span> endif()
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
</pre><pre style='margin:0'>
</pre>