<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/40fe1438135086e42c12467c1d247705c95d5072">https://github.com/macports/macports-ports/commit/40fe1438135086e42c12467c1d247705c95d5072</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 40fe1438135086e42c12467c1d247705c95d5072
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Thu Jan 4 06:01:59 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> ngsolve: update to 6.2.2307
</span>---
math/ngsolve/Portfile | 32 +++++++++++++++++++++++++-------
math/ngsolve/files/patch-clapack.h.diff | 16 +++++++++-------
math/ngsolve/files/patch-interface.diff | 14 --------------
3 files changed, 34 insertions(+), 28 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 49e331c7375..ef3098445a1 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;'>@@ -2,13 +2,14 @@
</span>
PortSystem 1.0
PortGroup compilers 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span> PortGroup linear_algebra 1.0
PortGroup github 1.0
PortGroup cmake 1.1
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup NGSolve ngsolve 6.2.2301 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup NGSolve ngsolve 6.2.2307 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;'>@@ -20,19 +21,30 @@ 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 4694b5f9240deb6da828a57ef50e002aebbbaaa7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 74d052483c906a7cd8c6675f148a8d4ba00d34ca67559cf15b238932ad6ebeeb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17549018
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5f872b64c2fadbf9e810e35c13de6d55aaf760f1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d67681b341e9c33c409d19303238a72b1da35f3739c6f53693af75b36888af12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 19512935
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Build fails with gcc-13 and Apple clang.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# clang-17 on aarch64 and gcc-12 on powerpc are confirmed to work.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/NGSolve/ngsolve/issues/68
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/NGSolve/ngsolve/issues/69
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {clang}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compilers.choose cc cxx
compilers.setup
# avoid conflict with atlas
# avoid adding -linterface to link flags
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-clapack.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-interface.diff
</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;'>+
</span> post-extract {
move ${worksrcpath}/basiclinalg/clapack.h \
${worksrcpath}/basiclinalg/ng_clapack.h
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,6 +71,12 @@ configure.args-append -DNETGEN_DIR=${prefix} \
</span> # avoid depends_lib-append port:bash
configure.args-append -DBASH=/bin/bash
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc* ${configure.compiler}] && ${configure.build_arch} in [list arm i386 ppc]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/NGSolve/ngsolve/issues/67
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -latomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> veclibfort no
pre-configure {
configure.args-append ${cmake_linalglib}
<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 3914af1645e..b6ce451e5c0 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;'>@@ -10,13 +10,15 @@
</span>
--- basiclinalg/CMakeLists.txt.orig 2023-01-10 10:30:53
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ basiclinalg/CMakeLists.txt 2023-01-15 11:28:11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,7 +32,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ basiclinalg/CMakeLists.txt 2024-01-04 02:45:48.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,8 +39,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install( TARGETS ngbla ${ngs_install_dir} )
</span>
install( FILES
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bandmatrix.hpp cholesky.hpp matrix.hpp ng_lapack.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vector.hpp bla.hpp expr.hpp symmetricmatrix.hpp arch.hpp clapack.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vector.hpp bla.hpp expr.hpp symmetricmatrix.hpp arch.hpp ng_clapack.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tensor.hpp triangular.hpp householder.hpp avector.hpp ngblas.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bandmatrix.hpp cholesky.hpp matrix.hpp ng_lapack.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vector.hpp bla.hpp expr.hpp symmetricmatrix.hpp clapack.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bandmatrix.hpp cholesky.hpp matrix.hpp ng_lapack.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vector.hpp bla.hpp expr.hpp symmetricmatrix.hpp ng_clapack.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tensor.hpp triangular.hpp householder.hpp eigensystem.hpp calcinverse.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ngblas.hpp simd_complex.hpp complex_wrapper.hpp
</span> DESTINATION ${NGSOLVE_INSTALL_DIR_INCLUDE}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- COMPONENT ngsolve_devel
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ffea7fb195b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/ngsolve/files/patch-interface.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tests/CMakeLists.txt.orig 2023-01-10 10:30:53
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tests/CMakeLists.txt 2023-01-16 09:13:35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,9 +14,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_executable( pde_tester pde_tester.cpp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install( TARGETS pde_tester DESTINATION ${NGSOLVE_INSTALL_DIR_BIN} COMPONENT ngsolve )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NETGEN_USE_GUI)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- target_link_libraries(pde_tester solve interface gui netgen_python ${LAPACK_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_link_libraries(pde_tester solve nggui netgen_python ${LAPACK_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- target_link_libraries(pde_tester solve interface netgen_python ${LAPACK_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_link_libraries(pde_tester solve netgen_python ${LAPACK_LIBRARIES})
</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>