<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/574e62615ac29a14e88a3858b7b743c65a801149">https://github.com/macports/macports-ports/commit/574e62615ac29a14e88a3858b7b743c65a801149</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 574e62615ac esmf: fix build on 10.6
</span>574e62615ac is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 574e62615ac29a14e88a3858b7b743c65a801149
</span>Author: Dave Allured <dave.allured@noaa.gov>
AuthorDate: Thu May 8 00:03:02 2025 -0600
<span style='display:block; white-space:pre;color:#404040;'> esmf: fix build on 10.6
</span>---
science/esmf/Portfile | 8 +++
science/esmf/files/patch.FieldEmpty_cppF90.diff | 65 +++++++++++++++++++++++++
2 files changed, 73 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/esmf/Portfile b/science/esmf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7bc55592e28..0e169b42610 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/esmf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/esmf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +42,14 @@ github.tarball_from archive
</span> # Patch copied from upstream patch by @barracuda156.
patchfiles-append patch-task_vm_info_missing.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix builds for 10.6.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Upstream fix after ESMF version 8.8.1 is pending.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove this patch on next release after 8.8.1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fixes "error: missing terminating ' character".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This is actually a preprocessor bug that breaks only in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Clang 11 and other early Clang versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch.FieldEmpty_cppF90.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build bin:ranlib:cctools
depends_lib port:netcdf \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/esmf/files/patch.FieldEmpty_cppF90.diff b/science/esmf/files/patch.FieldEmpty_cppF90.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..27db3e57a05
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/esmf/files/patch.FieldEmpty_cppF90.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,65 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Infrastructure/Field/src/ESMF_FieldEmpty.cppF90.orig 2025-04-17 15:58:54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Infrastructure/Field/src/ESMF_FieldEmpty.cppF90 2025-05-06 15:34:33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4403,14 +4403,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ! Get pointer to internal Field
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ftypep => field%ftypep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ! Get field's current status
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ! Get current status of field
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ currStatus=ftypep%status
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ! Change Field based on current status and new status
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (currStatus == ESMF_FIELDSTATUS_EMPTY) then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (setStatus == ESMF_FIELDSTATUS_EMPTY) then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ! Don't do anything, since no change in status
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ! Do not do anything, since no change in status
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (setStatus == ESMF_FIELDSTATUS_GRIDSET) then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ call ESMF_LogSetError(rcToCheck=ESMF_RC_ARG_WRONG, &
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msg="a Field can't be reset to be more complete than its current status.", &
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4437,11 +4437,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ESMF_LogFoundError(localrc, ESMF_ERR_PASSTHRU, &
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_CONTEXT, rcToReturn=rc)) return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ! Set flag back to it's inital setting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ! Set flag back to its inital setting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ftypep%geomb_internal = .false.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (setStatus == ESMF_FIELDSTATUS_GRIDSET) then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ! Don't do anything, since no change in status
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ! Do not do anything, since no change in status
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (setStatus == ESMF_FIELDSTATUS_COMPLETE) then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ call ESMF_LogSetError(rcToCheck=ESMF_RC_ARG_WRONG, &
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msg="a Field can't be reset to be more complete than its current status.", &
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4463,7 +4463,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ESMF_LogFoundError(localrc, ESMF_ERR_PASSTHRU, &
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_CONTEXT, rcToReturn=rc)) return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ! Set Array internal flag back to it's inital setting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ! Set Array internal flag back to its inital setting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ftypep%array_internal = .false.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ! Destroy Geometry
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4471,7 +4471,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ESMF_LogFoundError(localrc, ESMF_ERR_PASSTHRU, &
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_CONTEXT, rcToReturn=rc)) return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ! Set geom internal flag back to it's inital setting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ! Set geom internal flag back to its inital setting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ftypep%geomb_internal = .false.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (setStatus == ESMF_FIELDSTATUS_GRIDSET) then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4481,11 +4481,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ESMF_LogFoundError(localrc, ESMF_ERR_PASSTHRU, &
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_CONTEXT, rcToReturn=rc)) return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ! Set Array internal flag back to it's inital setting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ! Set Array internal flag back to its inital setting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ftypep%array_internal = .false.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (setStatus == ESMF_FIELDSTATUS_COMPLETE) then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ! Don't do anything, since no change in status
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ! Do not do anything, since no change in status
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ call ESMF_LogSetError(rcToCheck=ESMF_RC_ARG_WRONG, &
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msg="unknown status type", &
</span></pre><pre style='margin:0'>
</pre>