<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8f4eab5f8c3b9b6014122e2e26b5705f34aca7f6">https://github.com/macports/macports-ports/commit/8f4eab5f8c3b9b6014122e2e26b5705f34aca7f6</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 8f4eab5f8c3 gmsh: update to 4.9.3, add python variants
</span>8f4eab5f8c3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8f4eab5f8c3b9b6014122e2e26b5705f34aca7f6
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sun Jan 23 06:13:56 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> gmsh: update to 4.9.3, add python variants
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The default install of gmsh does not install the python executable
</span><span style='display:block; white-space:pre;color:#404040;'> in the correct location. Further, python metadata is not generated.
</span><span style='display:block; white-space:pre;color:#404040;'> The latest version of py-pygmsh (7.1.15) requires both to be in
</span><span style='display:block; white-space:pre;color:#404040;'> the appropriate site-packages directory.
</span>---
science/gmsh/Portfile | 48 +++++++++++++---
science/gmsh/files/patch-CMakeLists.txt.diff | 67 ----------------------
science/gmsh/files/patch-gmm.diff | 16 ------
.../files/patch-utils-pypi-setup-wheel.py.in.diff | 13 +++++
4 files changed, 52 insertions(+), 92 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 d3ff0595ce3..1b882d379c0 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;'>@@ -7,8 +7,8 @@ PortGroup linear_algebra 1.0
</span> PortGroup muniversal 1.0
name gmsh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.5.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.9.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories science
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,17 +25,13 @@ master_sites https://gmsh.info/src/
</span> distname gmsh-${version}-source
extract.suffix .tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0474d3ea536588111d1c4a95c5c452ccc7893d4f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 46eaeb0cdee5822fdaa4b15f92d8d160a8cc90c4565593cfa705de90df2a463f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 13528509
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1ccc85a5c496824dd45506168a931eb29cb11e6c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9e06751e9fef59ba5ba8e6feded164d725d7e9bc63e1cb327b083cbc7a993adb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13038257
</span>
compiler.cxx_standard 2011
compiler.c_standard 1999
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://gitlab.onelab.info/gmsh/gmsh/-/issues/849
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-gmm.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> mpi.setup
veclibfort no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,3 +117,37 @@ variant openmp description {enable support for OpenMP} {
</span> if {[variant_isset openmp]} {
compiler.openmp_version 2.5
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python38 python39 python310 description {Use Python 3.7} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python37 python39 python310 description {Use Python 3.8} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python37 python38 python310 description {Use Python 3.9} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 conflicts python37 python38 python39 description {Use Python 3.10} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pv {310 39 38 37} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${pv}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python.version ${pv}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python.branch [string index ${python.version} 0].[string range ${python.version} 1 end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset python37] || [variant_isset python38] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || [variant_isset python39] || [variant_isset python310]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python.prefix ${frameworks_dir}/Python.framework/Versions/${python.branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${python.version}-wheel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-utils-pypi-setup-wheel.py.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${python.prefix}/lib/python${python.branch}/site-packages/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|DESTROOT|${destroot}|" ${workpath}/build/setup-wheel.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|WORKSRCPATH|${worksrcpath}|" ${workpath}/build/setup-wheel.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath}/build/ "${prefix}/bin/python${python.branch} setup-wheel.py bdist_wheel"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/lib/gmsh.py ${destroot}${python.prefix}/lib/python${python.branch}/site-packages/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/lib/gmsh.egg-info/ ${destroot}${python.prefix}/lib/python${python.branch}/site-packages/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 686ac3655ef..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,67 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Do not attempt to use MacPorts OpenMP.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Find MacPorts header and library files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Do not install libraries a second time.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2019-12-22 03:16:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2020-01-03 21:46:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -298,21 +298,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;'>-- elseif(APPLE AND EXISTS "/usr/local/lib/libomp.dylib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set_config_option(HAVE_OPENMP "OpenMP[usr/local]")
</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")
</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")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list(APPEND EXTERNAL_LIBRARIES "-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><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -767,7 +752,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ENABLE_ALGLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(ALGLIB_LIB alglib PATH_SUFFIXES lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_path(ALGLIB_INC "stdafx.h" PATH_SUFFIXES include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_path(ALGLIB_INC "stdafx.h" PATH_SUFFIXES include alglib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ENABLE_SYSTEM_CONTRIB AND ALGLIB_LIB AND ALGLIB_INC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND EXTERNAL_LIBRARIES ${ALGLIB_LIB})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND EXTERNAL_INCLUDES ${ALGLIB_INC})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -916,7 +901,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ENABLE_VOROPP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(VOROPP_LIB voro++ PATH_SUFFIXES lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_path(VOROPP_INC "voro++.hh" PATH_SUFFIXES include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_path(VOROPP_INC "voro++.hh" PATH_SUFFIXES include voro++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ENABLE_SYSTEM_CONTRIB AND VOROPP_LIB AND VOROPP_INC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(STATUS "Using system version of voro++")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND EXTERNAL_LIBRARIES ${VOROPP_LIB})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -951,8 +936,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ENABLE_MMG3D)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_library(MMG3D_LIB mmg3d PATH_SUFFIXES lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_path(MMG3D_INC "libmmg3d.h" PATH_SUFFIXES src include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_library(MMG3D_LIB mmg3d4 PATH_SUFFIXES lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_path(MMG3D_INC "libmmg3d4.h" PATH_SUFFIXES src include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ENABLE_SYSTEM_CONTRIB AND MMG3D_LIB AND MMG3D_INC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND EXTERNAL_LIBRARIES ${MMG3D_LIB})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND EXTERNAL_INCLUDES ${MMG3D_INC})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mesh/meshGRegionMMG3D.cpp.orig 2019-03-14 02:43:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mesh/meshGRegionMMG3D.cpp 2020-01-03 21:46:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Context.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <libmmg3d.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <libmmg3d4.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define M_UNUSED (1 << 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmsh/files/patch-gmm.diff b/science/gmsh/files/patch-gmm.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 68f45cd5217..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmsh/files/patch-gmm.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Solver/linearSystemCSR.cpp.orig 2020-03-28 04:28:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Solver/linearSystemCSR.cpp 2020-05-03 07:27:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -450,11 +450,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gmm::csr_matrix_ref<double *, INDEX_TYPE *, INDEX_TYPE *, 0> ref(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (double *)_a->array, (INDEX_TYPE *)_ai->array, (INDEX_TYPE *)_jptr->array,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _b->size(), _b->size());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gmm::csr_matrix<double, 0> M;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gmm::csr_matrix<double, INDEX_TYPE, 0> M;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- M.init_with(ref);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //gmm::ildltt_precond<gmm::csr_matrix<double, 0> > P(M, 10, 1.e-10);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gmm::ilu_precond<gmm::csr_matrix<double, 0> > P(M);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gmm::ilu_precond<gmm::csr_matrix<double, INDEX_TYPE, 0> > P(M);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gmm::iteration iter(_tol);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- iter.set_noisy(_noisy);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(_method == "gmres")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmsh/files/patch-utils-pypi-setup-wheel.py.in.diff b/science/gmsh/files/patch-utils-pypi-setup-wheel.py.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b3782cefa92
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmsh/files/patch-utils-pypi-setup-wheel.py.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- utils/pypi/setup-wheel.py.in.orig 2022-01-04 08:01:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ utils/pypi/setup-wheel.py.in 2022-01-22 13:25:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,8 +7,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-setupdir = os.environ["GMSH_SETUP_DIR"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-sdkdir = os.environ["GMSH_SDK_DIR"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++setupdir = "WORKSRCPATH/utils/pypi/gmsh/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sdkdir = "DESTROOT/opt/local/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version = '${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>