<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a0dcdc69065a8f53bb170183520aeeb09cffb2dd">https://github.com/macports/macports-ports/commit/a0dcdc69065a8f53bb170183520aeeb09cffb2dd</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 a0dcdc69065 elmerfem: update to 2024.08.04, drop patches
</span>a0dcdc69065 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a0dcdc69065a8f53bb170183520aeeb09cffb2dd
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Mon Aug 5 18:28:09 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> elmerfem: update to 2024.08.04, drop patches
</span>---
science/elmerfem/Portfile | 25 +++++-----------------
.../files/patch-fix-gfortran-with-clang.diff | 15 -------------
.../elmerfem/files/patch-umf4_f77wrapper.c.diff | 10 ---------
3 files changed, 5 insertions(+), 45 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/elmerfem/Portfile b/science/elmerfem/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b95c1a54454..15acaa5a1a9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/elmerfem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/elmerfem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,8 +13,8 @@ legacysupport.newest_darwin_requires_legacy 10
</span>
# Remember to keep qt4 as a fallback until qt5 is available on old systems.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ElmerCSC elmerfem a21b1be9009d210c8839bea8f8724bc5fb529f3b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2024.07.04
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ElmerCSC elmerfem ebd157e6b588a451aff167e3ac2c61fd0334bcef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2024.08.04
</span> revision 0
categories science
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +24,9 @@ long_description {*}${description} making it an ideal tool for multiphysical
</span> It includes models for structural mechanics, fluid dynamics, heat transfer, \
electromagnetics and beyond. Elmer can also be used on massively parallel HPC platforms.
homepage https://www.elmerfem.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 32c56bb0b88c8a1c960f59947ab517f2444431a3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6a12ba531ff95cd10ae8e1832f2faff0048226962b22eccfbea3fbe9d8296de0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 72787611
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0bc0a86ff5a5f09dccd391797412c724d44de356 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c74824eed2563b6e4d77774714c2ada49a2a0f208970421d27f5206cce3a10b6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 70290611
</span> github.tarball_from archive
compilers.choose fc f90
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,18 +34,6 @@ compilers.setup require_fortran
</span> compiler.blacklist-append \
{*gcc-[34].*} {macports-gcc-[56]} {clang < 700}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} > 9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # CMakeLists check for a version of CXX compiler, assuming a coherent build with GCC.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # However since Macports uses Clangs on x86, the check does not do what was intended.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Just remove it for all systems with a default GCC > 9, i.e. everything but 10.4 and 10.5,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # so that the needed Fortran flag is actually used.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-gfortran-with-clang.diff
</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;background:#ffe0e0;'>-# https://github.com/ElmerCSC/elmerfem/issues/471
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-umf4_f77wrapper.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:SuiteSparse_UMFPACK
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,9 +114,6 @@ configure.args-append \
</span> if {[string match macports-gcc* ${configure.compiler}]} {
configure.args-replace \
-DWITH_OpenMP=OFF -DWITH_OpenMP=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wno-error=incompatible-pointer-types
</span> }
if {[string match *clang* ${configure.compiler}]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/elmerfem/files/patch-fix-gfortran-with-clang.diff b/science/elmerfem/files/patch-fix-gfortran-with-clang.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e06f13dc5dd..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/elmerfem/files/patch-fix-gfortran-with-clang.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2023-05-23 22:13:38.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2023-05-26 23:11:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -240,10 +240,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Get rid of the annoying rank mismatch warning
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- IF(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.9)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# IF(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.9)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy")
</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;'>- ENDIF()
</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/elmerfem/files/patch-umf4_f77wrapper.c.diff b/science/elmerfem/files/patch-umf4_f77wrapper.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8212020a66b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/elmerfem/files/patch-umf4_f77wrapper.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- fem/src/umf4_f77wrapper.c 2024-07-01 19:44:15.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fem/src/umf4_f77wrapper.c 2024-07-05 15:31:15.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,6 +79,7 @@
</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;background:#ffe0e0;'>- #include "../config.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "umfpack.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef NULL
</span></pre><pre style='margin:0'>
</pre>