<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/cdd5e9aefda2161a4a3b9a338d08da40a072dd74">https://github.com/macports/macports-ports/commit/cdd5e9aefda2161a4a3b9a338d08da40a072dd74</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 cdd5e9aefda opam: update to 2.3.0
</span>cdd5e9aefda is described below

<span style='display:block; white-space:pre;color:#808000;'>commit cdd5e9aefda2161a4a3b9a338d08da40a072dd74
</span>Author: Kate <kit-ty-kate@outlook.com>
AuthorDate: Sat Dec 14 12:10:49 2024 +0000

<span style='display:block; white-space:pre;color:#404040;'>    opam: update to 2.3.0
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Co-authored-by: Sergey Fedorov <barracuda@macos-powerpc.org>
</span>---
 ocaml/opam/Portfile                            | 36 +++++++++++++++++---------
 ocaml/opam/files/patch-link-legacysupport.diff | 13 ++++++++++
 2 files changed, 37 insertions(+), 12 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/opam/Portfile b/ocaml/opam/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index db19e471df4..41fe35afb25 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/opam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/opam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,12 @@
</span> PortSystem          1.0
 PortGroup           compiler_blacklist_versions 1.0
 PortGroup           github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           legacysupport 1.1
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        ocaml opam 2.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# faccessat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        ocaml opam 2.3.0
</span> 
 name                opam
 revision            0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,14 +23,11 @@ long_description    OPAM is a source-based package manager for OCaml.\
</span>                     development workflow.
 
 github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# At the next update, remove the "-2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname            opam-full-${version}-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# At the next update, remove setting "worksrcdir" because it won't be needed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir          opam-full-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname            opam-full-${version}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  4a24738dd460d1ab52edd529de86169dbe46a9b6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  459ed64e6643f05c677563a000e3baa05c76ce528064e9cb9ce6db49fff37c97 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    12775907
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  af863ac8afccbdd3e825e3fe1fffcdf66d128993 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  506ba76865dc315b67df9aa89e7abd5c1a897a7f0a92d7b2694974fdc532b346 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    12860518
</span> 
 depends_build       port:ocaml
 # Opam upgrade uses patch to update the package repository,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,9 +63,20 @@ if {[string match *gcc* ${configure.compiler}]} {
</span>                     --without-mccs
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Matching ocaml 1.1 PG setting.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # See: https://github.com/ocaml/dune/issues/8941
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${os.major} < 14} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-link-legacysupport.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/src/core/dune
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Matching ocaml 1.1 PG setting.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # See: https://github.com/ocaml/dune/issues/8941
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        build.env-append \
</span>                     DUNE_CONFIG__COPY_FILE=portable
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/opam/files/patch-link-legacysupport.diff b/ocaml/opam/files/patch-link-legacysupport.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4b6babaaaf2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/opam/files/patch-link-legacysupport.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/core/dune  2024-11-13 21:31:03.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/core/dune  2024-12-15 04:08:08.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,8 +13,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     (names opam_stubs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     (flags :standard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            -DUNICODE -D_UNICODE -DCAML_NAME_SPACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++           -I@PREFIX@/include/LegacySupport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            (:include c-flags.sexp)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   (c_library_flags (:standard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                   -lMacportsLegacySupport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    (:include c-libraries.sexp)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   (wrapped     false))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>