<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/0ac244545666f67e1510edc7bc535c0dcedef802">https://github.com/macports/macports-ports/commit/0ac244545666f67e1510edc7bc535c0dcedef802</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 0ac24454566 elmerfem: update to upstream, drop now unneeded patches
</span>0ac24454566 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0ac244545666f67e1510edc7bc535c0dcedef802
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Mon Jun 5 20:49:02 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> elmerfem: update to upstream, drop now unneeded patches
</span>---
science/elmerfem/Portfile | 15 ++++++---------
science/elmerfem/files/patch-ElmerGUI.diff | 21 ---------------------
.../elmerfem/files/patch-use-right-compiler.diff | 15 ---------------
3 files changed, 6 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 3a4e42b1e12..67319f4028f 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;'>@@ -12,9 +12,9 @@ PortGroup qt4 1.0
</span> # _strnlen, getline
legacysupport.newest_darwin_requires_legacy 10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ElmerCSC elmerfem 0d2f040f4a49ea0c994c27ddf85b88924676cdfa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2023.05.23
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ElmerCSC elmerfem 5b4143dc6574186a483c996b5a43c5cd660dd973
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2023.06.05
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories science
license GPL-2
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,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 d04c615626a7157ac12c8306adfc497e5da2c277 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c174ba79f0bb4f01b6651cacc7e4d99dc26756986b29a10f6f2cb3ff7ed9db98 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 70961371
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9f095bea4ec55ac2eada97f13a8201a2f84c2cf1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c42d7ce962e5d2bef0319afa47a3efecf0858d842e5a95dd78878b17f7a52bd9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 71119446
</span>
depends_lib-append port:qwt61
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,9 +34,6 @@ compilers.setup require_fortran
</span> compiler.blacklist-append \
{*gcc-[34].*} {macports-gcc-[56]} {clang < 500}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-use-right-compiler.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ElmerGUI.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${os.platform} eq "darwin" && ${os.major} > 9} {
# CMakeLists check for a version of CXX compiler, assuming a coherent build with GCC.
# However since Macports uses Clangs on x86, the check does not do what was intended.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/elmerfem/files/patch-ElmerGUI.diff b/science/elmerfem/files/patch-ElmerGUI.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 88e0e8231aa..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/elmerfem/files/patch-ElmerGUI.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ElmerGUI/Application/src/sifgenerator.cpp.orig 2023-05-23 22:13:38.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ElmerGUI/Application/src/sifgenerator.cpp 2023-05-24 14:54:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1229,14 +1229,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Adjust array parameters, i.e.:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // eliminate the first '=' in "Save Coordinates = (2,3) = 1.2 2.3 3.4 4.5 5.6 6.7"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QRegularExpression qre("^\\s*\\(\\s*[1-9]+[0-9]*\\s*(,\\s*[1-9]+[0-9]*\\s*)*\\)\\s*=");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QRegularExpressionMatch match = qre.match(value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(match.hasMatch()){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QRegExp qre("^\\s*\\(\\s*[1-9]+[0-9]*\\s*(,\\s*[1-9]+[0-9]*\\s*)*\\)\\s*=");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (qre.exactMatch(value)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- addSifLine(" " + name, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cout << " [SifGenerator] array parameter adjusted: '"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << name.toLatin1().constData() << " = " << value.toLatin1().constData() << "' to '"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << name.toLatin1().constData() << value.toLatin1().constData() << "'" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }else{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- addSifLine(" " + name + " = ", value);
</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;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/elmerfem/files/patch-use-right-compiler.diff b/science/elmerfem/files/patch-use-right-compiler.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 38cdd10789d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/elmerfem/files/patch-use-right-compiler.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-24 07:42:04.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,9 +14,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # message("you need to have gcc-gfrotran installed using HomeBrew")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # set(CMAKE_C_COMPILER "/usr/bin/gcc")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # set(CMAKE_CXX_COMPILER "/usr/bin/g++")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_C_COMPILER "/usr/local/bin/gcc-10")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_COMPILER "/usr/local/bin/g++-10")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_Fortran_COMPILER "/usr/local/bin/gfortran")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_C_COMPILER @CC@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_CXX_COMPILER @CXX@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_Fortran_COMPILER @FC@)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # set(BLA_VENDOR "OpenBLAS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # option(HUNTER_ENABLED "Enable Hunter package manager support" OFF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # set (CMAKE_GENERATOR "Unix Makefiles" CACHE INTERNAL "" FORCE)
</span></pre><pre style='margin:0'>
</pre>