<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/92269c8d17147b66525dd09f02e094a6ff7d55b1">https://github.com/macports/macports-ports/commit/92269c8d17147b66525dd09f02e094a6ff7d55b1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 92269c8d17147b66525dd09f02e094a6ff7d55b1
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Feb 15 07:23:50 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> gmsh: update version 4.1.4->4.1.5
</span>---
science/gmsh/Portfile | 10 ++++-----
science/gmsh/files/patch-CMakeLists.txt.diff | 27 +++++++++++++++++++-----
science/gmsh/files/patch-no_macports_openmp.diff | 17 ---------------
3 files changed, 26 insertions(+), 28 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 15da958..e421ffa 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;'>@@ -9,7 +9,7 @@ PortGroup muniversal 1.0
</span>
name gmsh
conflicts gmsh-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.1.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.1.5
</span> categories science
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +27,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 1187f0db42b70236f162aac9d9effe6c43f3408d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9a67092b878f88ff68d7bc563c4fdacfbd2aa66a5d55ea175233f464bd4b37c0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12695449
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 56297719a03c7e390328c32fe4409a27511e7d50 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 654d38203f76035a281006b77dcb838987a44fd549287f11c53a1e9cdf598f46 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12707303
</span>
patchfiles patch-CMakeLists.txt.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,8 +117,6 @@ subport gmsh-devel {
</span> version 4.1.5
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-prepend patch-no_macports_openmp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regexm
livecheck.url https://gitlab.onelab.info/gmsh/gmsh
livecheck.version ${git.branch}
<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 e33ca9b..b1676e7 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;'>@@ -1,11 +1,28 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2018-10-19 08:04:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2018-11-11 06:12:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1769,7 +1769,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not attempt to use MacPorts OpenMP.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not install libraries a second time.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2019-02-06 05:24:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2019-02-15 05:23:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -291,14 +291,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_config_option(HAVE_OPENMP "OpenMP")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif(APPLE AND EXISTS "/opt/local/lib/libomp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # just for testing the official Apple compiler with macports' libomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_config_option(HAVE_OPENMP "OpenMP[MacPorts]")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_C_FLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${CMAKE_C_FLAGS} -Xpreprocessor -fopenmp -I/opt/local/include/libomp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_CXX_FLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp -I/opt/local/include/libomp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND EXTERNAL_LIBRARIES "-L/opt/local/lib/libomp -lomp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1783,8 +1775,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span> if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # FIXME once we cleanup the installation of the python module
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # FIXME once we cleanup the installation of the python module
</span> - install(TARGETS shared DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/api OPTIONAL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #install(TARGETS shared DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/api OPTIONAL)
</span> endif()
if(ENABLE_ONELAB)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmsh/files/patch-no_macports_openmp.diff b/science/gmsh/files/patch-no_macports_openmp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cae9457..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmsh/files/patch-no_macports_openmp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2019-02-09 08:13:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2019-02-09 08:14:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -291,14 +291,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_config_option(HAVE_OPENMP "OpenMP")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elseif(APPLE AND EXISTS "/opt/local/lib/libomp")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # just for testing the official Apple compiler with macports' libomp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set_config_option(HAVE_OPENMP "OpenMP[MacPorts]")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_C_FLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${CMAKE_C_FLAGS} -Xpreprocessor -fopenmp -I/opt/local/include/libomp")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_FLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp -I/opt/local/include/libomp")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list(APPEND EXTERNAL_LIBRARIES "-L/opt/local/lib/libomp -lomp")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>