<pre style='margin:0'>
Takeshi Enomoto (tenomoto) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7e862173719d85628ceecff6941cebaaae7f2ffa">https://github.com/macports/macports-ports/commit/7e862173719d85628ceecff6941cebaaae7f2ffa</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 7e862173719 esmf: update to 8.4
</span>7e862173719 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7e862173719d85628ceecff6941cebaaae7f2ffa
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Wed Nov 16 15:19:32 2022 +0900
<span style='display:block; white-space:pre;color:#404040;'> esmf: update to 8.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/66255
</span>---
science/esmf/Portfile | 27 ++++++++++++++++++++++-----
science/esmf/files/install_name.patch | 28 +++++++++++++++++-----------
2 files changed, 39 insertions(+), 16 deletions(-)
<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 07b0f5f1e37..31b354207e2 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;'>@@ -12,16 +12,16 @@ compilers.allow_arguments_mismatch \
</span> mpi.setup
mpi.enforce_variant netcdf-fortran
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup esmf-org esmf 8_2_0 ESMF_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup esmf-org esmf 8.4.0 v
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 02dfccd24971fc5e89a5d0be874cf74abd8c2cec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3693987aba2c8ae8af67a0e222bea4099a48afe09b8d3d334106f9d7fc311485 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10814914
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 23fa1d62bd36d51f5e99a7ae487777e2fa99e32f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 28531810bf1ae78646cda6494a53d455d194400f19dccd13d6361871de42ed0f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13969876
</span>
version [string map {_ .} ${github.version}]
categories science devel
license NCSA
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {takeshi @tenomoto}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {takeshi @tenomoto} openmaintainers
</span> 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 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,9 +173,26 @@ post-destroot {
</span> reinplace "s|${destroot}||g" ${destroot}${prefix}/lib/esmf.mk
reinplace "s|-L${worksrcpath}/lib||g" ${destroot}${prefix}/lib/esmf.mk
reinplace "s|-I${worksrcpath}/src/Infrastructure/stubs|-I${prefix}/share/esmf/src/Infrastructure/stubs|g" ${destroot}${prefix}/lib/esmf.mk
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|${worksrcpath}|${prefix}/share/esmf|g" ${destroot}${prefix}/lib/esmf.mk
</span> xinstall -d ${destroot}${prefix}/share/${name}
file copy ${worksrcpath}/src ${destroot}${prefix}/share/${name}
system -W ${destroot}${prefix}/lib "ranlib libesmf.a"
system -W ${destroot}${prefix}/lib "ranlib libesmftrace_static.a"
file delete ${destroot}${prefix}/lib/preload.sh
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Adhoc fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f {ESMF_PrintInfo ESMF_Regrid ESMF_Scrip2Unstruct \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_PrintInfoC ESMF_RegridWeightGen ESMF_WebServController} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${destroot}${prefix}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "install_name_tool -change ${destroot}${prefix}/lib/libesmf.dylib ${prefix}/lib/libesmf.dylib ${f}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach l {gfortran.5 quadmath.0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${destroot}${prefix}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "install_name_tool -change @rpath/lib${l}.dylib ${prefix}/lib/libgcc/lib${l}.dylib ${f}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f {esmf esmftrace_preload esmf_fullylinked} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${destroot}${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "install_name_tool -change @rpath/libgfortran.5.dylib ${prefix}/lib/libgcc/libgfortran.5.dylib lib${f}.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${destroot}${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "install_name_tool -change ${worksrcpath}/lib${f}.dylib ${prefix}/lib/lib${f}.dylib lib${f}.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/esmf/files/install_name.patch b/science/esmf/files/install_name.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index f00e4c3bb6a..cf755a82985 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/esmf/files/install_name.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/esmf/files/install_name.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,9 +12,9 @@ work for several reasons:
</span> would contain the dest dir too
3. The wrong install names were baked into the executables when they
were built and there was no makefile code to rewrite them
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/common.mk.orig 2021-10-26 16:39:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/common.mk 2022-04-25 18:07:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1030,6 +1030,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build/common.mk.orig 2022-10-25 07:04:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build/common.mk 2022-11-13 14:06:42.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1146,6 +1146,7 @@
</span> ESMF_SL_SUFFIX = so
ifeq ($(ESMF_OS),Darwin)
ESMF_SL_SUFFIX = dylib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ work for several reasons:
</span> endif
ifeq ($(ESMF_OS),Cygwin)
ESMF_SL_SUFFIX = dll.a
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3883,12 +3884,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3999,12 +4000,14 @@
</span> do \
if [ -f $$NEXTLIB.$(ESMF_LIB_SUFFIX) ] ; then \
$(ESMF_RM) $$NEXTLIB.$(ESMF_SL_SUFFIX) ; \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,17 +37,23 @@ work for several reasons:
</span> echo Converting $$NEXTLIB.$(ESMF_SL_SUFFIX) to $$NEXTLIB\_fullylinked.$(ESMF_SL_SUFFIX) ;\
echo $(ESMF_SL_LIBLINKER) $(ESMF_SL_LIBOPTS) -o $(ESMF_LDIR)/$$NEXTLIB\_fullylinked.$(ESMF_SL_SUFFIX) *.o $(ESMF_CXXLINKOPTS) $(ESMF_CXXLINKPATHS) $(ESMF_CXXLINKRPATHS) $(ESMF_CXXLINKLIBS) ;\
$(ESMF_SL_LIBLINKER) $(ESMF_SL_LIBOPTS) -o $(ESMF_LDIR)/$$NEXTLIB\_fullylinked.$(ESMF_SL_SUFFIX) *.o $(ESMF_CXXLINKOPTS) $(ESMF_CXXLINKPATHS) $(ESMF_CXXLINKRPATHS) $(ESMF_CXXLINKLIBS) ;\
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- makefile.orig 2021-10-26 16:39:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile 2022-04-25 00:38:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -677,11 +677,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -f $(ESMF_MODDIR)/*.mod $(ESMF_INSTALL_MODDIR_ABSPATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $(ESMF_INSTALL_LIBDIR_ABSPATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -f $(ESMF_LIBDIR)/libesmf*.* $(ESMF_INSTALL_LIBDIR_ABSPATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @for lib in $(wildcard $(ESMF_INSTALL_LIBDIR_ABSPATH)/libesmf*.dylib) foo ; do \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- makefile.orig 2022-10-25 07:04:55.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ makefile 2022-11-13 20:37:08.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -705,17 +705,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(ESMF_PIO),internal)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp -f $(ESMF_LIBDIR)/libpioc.* $(ESMF_INSTALL_LIBDIR_ABSPATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifneq (,$(filter $(ESMF_OS),Darwin DARWIN darwin))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @for lib in $(ESMF_INSTALL_LIBDIR_ABSPATH)/libesmf*.dylib foo ; do \
</span> - if [ $$lib != "foo" ]; then \
- install_name_tool -id "$$lib" $$lib ; \
- fi ; \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ $$lib == "$(ESMF_INSTALL_LIBDIR_ABSPATH)/libesmftrace_preload.dylib" ]; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_name_tool -change "$(ESMF_LIBDIR)/libesmf.dylib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "$(ESMF_INSTALL_LIBDIR_ABSPATH)/libesmf.dylib" $$lib; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi ; \
</span> - done
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span> ifeq ($(ESMF_TRACE_LIB_BUILD),ON)
ifeq ($(ESMF_TRACE_BUILD_SHARED),ON)
$(MAKE) ESMF_PRELOADDIR=$(ESMF_INSTALL_LIBDIR_ABSPATH) build_preload_script
</pre><pre style='margin:0'>
</pre>