<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/f0d1429b81471aed395d24126298718b21fe6b4a">https://github.com/macports/macports-ports/commit/f0d1429b81471aed395d24126298718b21fe6b4a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f0d1429b81471aed395d24126298718b21fe6b4a
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Aug 11 11:27:06 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> gmsh: use MacPorts libraries
</span>---
science/gmsh/Portfile | 13 ++++-----
science/gmsh/files/patch-CMakeLists.txt.diff | 41 ++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 7 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 a5dd57a..bcf3421 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
version 4.3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories science
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,8 +36,12 @@ patchfiles patch-CMakeLists.txt.diff
</span> mpi.setup
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:alglib \
</span> path:lib/libfltk.dylib:fltk \
port:gmp \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mathex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmed \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mmg3d4 \
</span> port:hdf5 \
port:libpng \
port:jpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +51,7 @@ depends_lib-append \
</span> port:cgnslib \
port:metis \
port:opencascade \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:voroxx \
</span> port:szip \
port:zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,15 +71,9 @@ configure.args-append \
</span> -DENABLE_SYSTEM_CONTRIB=ON
# ACIS is proprietary
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# libmed does not exist in MacPorts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Voro++ does not exist in MacPorts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Gmsh requires mmg version < 5
</span> # avoid circular dependencies
configure.args-append \
-DENABLE_ACIS=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_MED=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_VOROPP=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_MMG3D=OFF \
</span> -DENABLE_GETDP=OFF
configure.env-append \
<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 55b72eb..8d97473 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,4 +1,5 @@
</span> Do not attempt to use MacPorts OpenMP.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+Find MacPorts header and library files.
</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:#e0e0e0;'>@@ -17,6 +18,35 @@ Do not install libraries a second time.
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -738,7 +730,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ENABLE_ALGLIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_library(ALGLIB_LIB alglib PATH_SUFFIXES lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_path(ALGLIB_INC "stdafx.h" PATH_SUFFIXES include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_path(ALGLIB_INC "stdafx.h" PATH_SUFFIXES include alglib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ENABLE_SYSTEM_CONTRIB AND ALGLIB_LIB AND ALGLIB_INC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND EXTERNAL_LIBRARIES ${ALGLIB_LIB})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND EXTERNAL_INCLUDES ${ALGLIB_INC})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -876,7 +868,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ENABLE_VOROPP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_library(VOROPP_LIB voro++ PATH_SUFFIXES lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_path(VOROPP_INC "voro++.hh" PATH_SUFFIXES include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_path(VOROPP_INC "voro++.hh" PATH_SUFFIXES include voro++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ENABLE_SYSTEM_CONTRIB AND VOROPP_LIB AND VOROPP_INC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Using system version of voro++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND EXTERNAL_LIBRARIES ${VOROPP_LIB})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -911,8 +903,8 @@
</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;'>+ if(ENABLE_MMG3D)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(MMG3D_LIB mmg3d PATH_SUFFIXES lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_path(MMG3D_INC "libmmg3d.h" PATH_SUFFIXES src include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_library(MMG3D_LIB mmg3d4 PATH_SUFFIXES lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_path(MMG3D_INC "libmmg3d4.h" PATH_SUFFIXES src include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ENABLE_SYSTEM_CONTRIB AND MMG3D_LIB AND MMG3D_INC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND EXTERNAL_LIBRARIES ${MMG3D_LIB})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND EXTERNAL_INCLUDES ${MMG3D_INC})
</span> @@ -1817,8 +1809,6 @@
endif()
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,3 +56,14 @@ Do not install libraries a second time.
</span> endif()
if(ENABLE_ONELAB)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Mesh/meshGRegionMMG3D.cpp.orig 2019-03-14 02:43:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Mesh/meshGRegionMMG3D.cpp 2019-08-11 10:51:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Context.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern "C" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <libmmg3d.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <libmmg3d4.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define M_UNUSED (1 << 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>