<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/94a9ee09dd2a9592347fd0bc8534bb642305973e">https://github.com/macports/macports-ports/commit/94a9ee09dd2a9592347fd0bc8534bb642305973e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 94a9ee09dd2a9592347fd0bc8534bb642305973e
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Jan 16 13:11:08 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> ngsolve: update version 6.2.2004->6.2.2301
</span>---
math/ngsolve/Portfile | 64 ++++++++++++++-----------------
math/ngsolve/files/patch-clapack.h.diff | 12 +++---
math/ngsolve/files/patch-find-lapack.diff | 13 ++++---
math/ngsolve/files/patch-interface.diff | 14 +++++++
math/ngsolve/files/pybind11-stubgen | 3 --
5 files changed, 56 insertions(+), 50 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/ngsolve/Portfile b/math/ngsolve/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e379aa4f27..786f65c8e0c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/ngsolve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/ngsolve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,9 +7,8 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup NGSolve ngsolve 6.2.2004 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup NGSolve ngsolve 6.2.2301 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories math
license LGPL-2
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +20,9 @@ long_description NGSolve is a general purpose Finite Element Library \
</span> particular application classes.
homepage https://ngsolve.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 282f5888ebc7be0379c60654a5df7a9b0a13aeb2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 01b78d47b616a685cde7adca54ca7932bc7d278ebe6a06bc074f8977560f0505 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 15180583
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4694b5f9240deb6da828a57ef50e002aebbbaaa7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 74d052483c906a7cd8c6675f148a8d4ba00d34ca67559cf15b238932ad6ebeeb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17549018
</span>
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +30,9 @@ compilers.choose cc cxx
</span> compilers.setup
# avoid conflict with atlas
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-clapack.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoid adding -linterface to link flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-clapack.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-interface.diff
</span> post-extract {
move ${worksrcpath}/basiclinalg/clapack.h \
${worksrcpath}/basiclinalg/ng_clapack.h
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +52,9 @@ depends_lib-append port:SuiteSparse_AMD \
</span>
configure.args-append -DNETGEN_DIR=${prefix} \
-DBUILD_UMFPACK=NO \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUSE_NATIVE_ARCH=NO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_NATIVE_ARCH=NO \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_PYTHON=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_SUPERBUILD=OFF
</span>
# avoid depends_lib-append port:bash
configure.args-append -DBASH=/bin/bash
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +64,7 @@ pre-configure {
</span> configure.args-append ${cmake_linalglib}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythonversions {3.7 3.8 3.9}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythonversions {3.7 3.8 3.9 3.10 3.11}
</span> set any_python no
foreach pdv ${pythonversions} {
set pv [join [lrange [split ${pdv} .] 0 1] ""]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,50 +81,35 @@ foreach pdv ${pythonversions} {
</span> }
}
if {!${any_python}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python311
</span> }
set any_python no
foreach pdv ${pythonversions} {
set pv [join [lrange [split ${pdv} .] 0 1] ""]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # settings that depend on loop variables must be set in an appropriate if, not in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # variant declaration scope.
</span> if {[variant_isset python${pv}]} {
depends_lib-append port:python${pv}
depends_build-append port:pybind11 \
port:py${pv}-pybind11-stubgen
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DUSE_PYTHON=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_PYTHON=ON
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # during destroot, must find pybind11-stubgen binary, ngsolve Python module, and NGSolve library, so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # must modify PATH, PYTHONPATH, and DYLD_LIBRARY_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # however, DYLD environment variables are not inherited by subprocesses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://lists.macports.org/pipermail/macports-dev/2021-April/043222.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${cmake.build_dir}/macports_bin/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${filespath}/pybind11-stubgen ${cmake.build_dir}/macports_bin/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__MACPORTS_PYTHONPATH__|${destroot}${prefix}/lib/python${pdv}/site-packages/|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${cmake.build_dir}/macports_bin/bin/pybind11-stubgen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__MACPORTS_DYLD_LIBRARY_PATH__|${destroot}${prefix}/lib|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${cmake.build_dir}/macports_bin/bin/pybind11-stubgen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__MACPORTS_PYTHON_BIN__|${frameworks_dir}/Python.framework/Versions/${pdv}/bin|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${cmake.build_dir}/macports_bin/bin/pybind11-stubgen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PATH=${cmake.build_dir}/macports_bin/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append PATH=${cmake.build_dir}/macports_bin/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for reasons that are not entirely clear, stub files break the build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://ngsolve.org/forum/ngspy-forum/1655-ngsolve-stubs-cmake-error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DBUILD_STUB_FILES=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-append DYLD_LIBRARY_PATH=${destroot}${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHONPATH=${destroot}${prefix}/lib/python${pdv}/site-packages
</span>
set any_python yes
require_active_variants netgen python${pv}
post-destroot {
xinstall -d -m 0755 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${frameworks_dir}/Python.framework/Versions/${pdv}/lib/python${pdv}/site-packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib/python${pdv}/site-packages/ngsolve \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${frameworks_dir}/Python.framework/Versions/${pdv}/lib/python${pdv}/site-packages/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/Python.framework/Versions/${pdv}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/lib/python${pdv} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/Python.framework/Versions/${pdv}/lib
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> break
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,6 +122,10 @@ if {!${any_python}} {
</span>
post-destroot {
delete ${destroot}${prefix}/Netgen.icns
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${destroot}${prefix}/bin/pde_tester]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if no Python variant exists, extra binary is installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/bin/pde_tester
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant tests description {Enable tests} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/ngsolve/files/patch-clapack.h.diff b/math/ngsolve/files/patch-clapack.h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ae7fb25c095..3914af1645e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/ngsolve/files/patch-clapack.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/ngsolve/files/patch-clapack.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- basiclinalg/ng_lapack.hpp.orig 2018-08-30 23:18:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ basiclinalg/ng_lapack.hpp 2018-09-17 04:05:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- basiclinalg/ng_lapack.hpp.orig 2023-01-10 10:30:53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ basiclinalg/ng_lapack.hpp 2023-01-15 11:27:06
</span> @@ -39,7 +39,7 @@
typedef int L_fp; // ?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,14 +9,14 @@
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- basiclinalg/CMakeLists.txt.orig 2018-08-30 23:18:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ basiclinalg/CMakeLists.txt 2018-09-17 04:06:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- basiclinalg/CMakeLists.txt.orig 2023-01-10 10:30:53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ basiclinalg/CMakeLists.txt 2023-01-15 11:28:11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,7 +32,7 @@
</span>
install( FILES
bandmatrix.hpp cholesky.hpp matrix.hpp ng_lapack.hpp
- vector.hpp bla.hpp expr.hpp symmetricmatrix.hpp arch.hpp clapack.h
+ vector.hpp bla.hpp expr.hpp symmetricmatrix.hpp arch.hpp ng_clapack.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>- tensor.hpp cuda_bla.hpp avector.hpp ngblas.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tensor.hpp triangular.hpp householder.hpp avector.hpp ngblas.hpp
</span> DESTINATION ${NGSOLVE_INSTALL_DIR_INCLUDE}
COMPONENT ngsolve_devel
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/ngsolve/files/patch-find-lapack.diff b/math/ngsolve/files/patch-find-lapack.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e1697b0929b..8457e1a1db5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/ngsolve/files/patch-find-lapack.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/ngsolve/files/patch-find-lapack.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/SuperBuild.cmake.orig 2020-03-02 10:08:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/SuperBuild.cmake 2020-03-03 05:23:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -148,11 +148,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/SuperBuild.cmake.orig 2023-01-10 10:30:53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/SuperBuild.cmake 2023-01-15 11:29:51
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,11 +186,11 @@
</span> set(LAPACK_LIBRARIES ${CMAKE_INSTALL_PREFIX}/lib/BLAS.lib)
list(APPEND LAPACK_PROJECTS win_download_lapack)
else(WIN32)
- if(APPLE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(LAPACK_LIBRARIES /System/Library/Frameworks/Accelerate.framework )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(FALSE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(LAPACK_LIBRARIES /System/Library/Frameworks/Accelerate.framework )
</span> - else(APPLE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(LAPACK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else(FALSE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(LAPACK REQUIRED)
</span> - endif(APPLE)
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif(FALSE)
</span> endif(WIN32)
endif()
set_vars(NGSOLVE_CMAKE_ARGS LAPACK_LIBRARIES)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/ngsolve/files/patch-interface.diff b/math/ngsolve/files/patch-interface.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ffea7fb195b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/ngsolve/files/patch-interface.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/CMakeLists.txt.orig 2023-01-10 10:30:53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/CMakeLists.txt 2023-01-16 09:13:35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,9 +14,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable( pde_tester pde_tester.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install( TARGETS pde_tester DESTINATION ${NGSOLVE_INSTALL_DIR_BIN} COMPONENT ngsolve )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NETGEN_USE_GUI)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_link_libraries(pde_tester solve interface gui netgen_python ${LAPACK_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(pde_tester solve nggui netgen_python ${LAPACK_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_link_libraries(pde_tester solve interface netgen_python ${LAPACK_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(pde_tester solve netgen_python ${LAPACK_LIBRARIES})
</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;color:#808080;'>diff --git a/math/ngsolve/files/pybind11-stubgen b/math/ngsolve/files/pybind11-stubgen
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5f48d3aa553..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/ngsolve/files/pybind11-stubgen
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/bash
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-exec env PYTHONPATH='__MACPORTS_PYTHONPATH__' DYLD_LIBRARY_PATH='__MACPORTS_DYLD_LIBRARY_PATH__' __MACPORTS_PYTHON_BIN__/pybind11-stubgen "$@"
</span></pre><pre style='margin:0'>
</pre>