From b3f1e9d41040f2b086851124196e6261e2dad298 Mon Sep 17 00:00:00 2001
From: Dave Allured <dave.allured@noaa.gov>
Date: Sun, 9 Mar 2025 11:57:29 -0600
Subject: [PATCH] esmf: Update 8.5.0 --> 8.8.0

---
 science/esmf/Portfile | 39 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/science/esmf/Portfile b/science/esmf/Portfile
index 193e334dd7c1b..d01c00a64103a 100644
--- a/science/esmf/Portfile
+++ b/science/esmf/Portfile
@@ -7,21 +7,22 @@ PortGroup           github 1.0
 
 compilers.choose    f90 cxx
 compilers.setup     require_fortran -clang
-compilers.allow_arguments_mismatch \
-                    yes
 mpi.setup
 mpi.enforce_variant netcdf-fortran
 
-github.setup        esmf-org esmf 8.5.0 v
-revision            2
-checksums           rmd160  3d1edb514d5b09b46f1f60047e3f5cd3c0bf7b43 \
-                    sha256  acd0b2641587007cc3ca318427f47b9cae5bfd2da8d2a16ea778f637107c29c4 \
-                    size    14091400
+github.setup        esmf-org esmf 8.8.0 v
+revision            0
+checksums           rmd160  f0d6f141700128d15267396caf3a8c963d784c3c \
+                    sha256  f89327428aeef6ad34660b5b78f30d1c55ec67efb8f7df1991fdaa6b1eb3a27c \
+                    size    14256488
 
 version             [string map {_ .} ${github.version}]
 categories          science devel
 license             NCSA
-maintainers         {takeshi @tenomoto} openmaintainer
+maintainers         {takeshi @tenomoto} \
+                    {@Dave-Allured noaa.gov:dave.allured} \
+                    openmaintainer
+
 description         software for building and coupling weather, climate, and related models
 long_description    The ESMF defines an architecture for composing complex, coupled \
                     modeling systems and includes data structures \
@@ -36,6 +37,10 @@ depends_lib         port:netcdf \
                     port:xercesc3 \
                     port:yaml-cpp
 
+# Avoid duplicate LC_RPATH.
+# Discussion in https://github.com/macports/macports-ports/pull/21765
+compilers.add_gcc_rpath_support no
+
 if {${os.platform} eq "darwin" && ${os.major} < 12} {
     known_fail      yes
     pre-fetch {
@@ -44,8 +49,6 @@ if {${os.platform} eq "darwin" && ${os.major} < 12} {
     }
 }
 
-patchfiles          install_name.patch
-
 post-patch {
     if {[variant_isset openmpi]} {
         foreach c {g95 gfortran gfortranclang} {
@@ -179,22 +182,6 @@ post-destroot {
     system -W ${destroot}${prefix}/lib "ranlib libesmf.a"
     system -W ${destroot}${prefix}/lib "ranlib libesmftrace_static.a"
     file delete ${destroot}${prefix}/lib/preload.sh
-# Adhoc fix
-    foreach f {ESMF_PrintInfo ESMF_Regrid ESMF_Scrip2Unstruct \
-            ESMF_PrintInfoC ESMF_RegridWeightGen ESMF_WebServController} {
-        system -W ${destroot}${prefix}/bin \
-                "install_name_tool -change ${destroot}${prefix}/lib/libesmf.dylib ${prefix}/lib/libesmf.dylib ${f}"
-        foreach l {gfortran.5 quadmath.0} {
-            system -W ${destroot}${prefix}/bin \
-                "install_name_tool -change @rpath/lib${l}.dylib ${prefix}/lib/libgcc/lib${l}.dylib ${f}"
-        }
-    }
-    foreach f {esmf esmftrace_preload esmf_fullylinked} {
-        system -W ${destroot}${prefix}/lib \
-                "install_name_tool -change @rpath/libgfortran.5.dylib ${prefix}/lib/libgcc/libgfortran.5.dylib lib${f}.dylib"
-        system -W ${destroot}${prefix}/lib \
-                "install_name_tool -change ${worksrcpath}/lib${f}.dylib ${prefix}/lib/lib${f}.dylib lib${f}.dylib"
-    }
 }
 
 # Exclude pre-release candidates