<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/387c95d6c33514b17104888cb2220994717a1dc9">https://github.com/macports/macports-ports/commit/387c95d6c33514b17104888cb2220994717a1dc9</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 387c95d6c33 opam: update to 2.2.0
</span>387c95d6c33 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 387c95d6c33514b17104888cb2220994717a1dc9
</span>Author: Perry E. Metzger <perry@piermont.com>
AuthorDate: Mon Jul 8 10:35:14 2024 -0400

<span style='display:block; white-space:pre;color:#404040;'>    opam: update to 2.2.0
</span>---
 ocaml/opam/Portfile                          | 18 +++++++++++-------
 ocaml/opam/files/patch-makefile.diff         |  8 ++++----
 ocaml/opam/files/patch-stop-fetch-check.diff |  4 ++--
 3 files changed, 17 insertions(+), 13 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 b4cec5d9405..db19e471df4 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;'>@@ -4,10 +4,10 @@ PortSystem          1.0
</span> PortGroup           compiler_blacklist_versions 1.0
 PortGroup           github 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        ocaml opam 2.1.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        ocaml opam 2.2.0
</span> 
 name                opam
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> categories          ocaml sysutils
 license             LGPL-2
 maintainers         {@pmetzger pmetzger} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,11 +19,14 @@ 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;'>-distname            opam-full-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# At the next update, remove the "-2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname            opam-full-${version}-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# At the next update, remove setting "worksrcdir" because it won't be needed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir          opam-full-${version}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  734abf1551d55f29b34a97e2bf64e7cd9cc9fd8b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  d2af5edc85f552e0cf5ec0ddcc949d94f2dc550dc5df595174a06a4eaf8af628 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    11704198
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  4a24738dd460d1ab52edd529de86169dbe46a9b6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  459ed64e6643f05c677563a000e3baa05c76ce528064e9cb9ce6db49fff37c97 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    12775907
</span> 
 depends_build       port:ocaml
 # Opam upgrade uses patch to update the package repository,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +48,8 @@ patchfiles          patch-stop-fetch-check.diff \
</span>                     patch-makefile.diff
 
 use_parallel_build  no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target        lib-ext all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target        all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --with-vendored-deps
</span> 
 # Match OCaml settings:
 compiler.blacklist  *gcc-4.0 *gcc-4.2 {clang < 400}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/opam/files/patch-makefile.diff b/ocaml/opam/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0236d59c69d..61ed7509bb1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/opam/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/opam/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span> --- Makefile.orig
 +++ Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -102,6 +102,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,6 +101,7 @@
</span>  
<span style='display:block; white-space:pre;background:#ffe0e0;'>- OPAMINSTALLER_FLAGS = --prefix "$(DESTDIR)$(prefix)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPAMINSTALLER_FLAGS += --mandir "$(DESTDIR)$(mandir)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OPAMINSTALLER_FLAGS += --docdir "$(DESTDIR)$(prefix)/share/doc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPAMINSTALLER_FLAGS = --prefix "$(call CYGPATH,$(DESTDIR)$(prefix))"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPAMINSTALLER_FLAGS += --mandir "$(call CYGPATH,$(DESTDIR)$(mandir))"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OPAMINSTALLER_FLAGS += --docdir "$(call CYGPATH,$(DESTDIR)$(prefix)/share/doc)"
</span>  
  # With ocamlfind, prefer to install to the standard directory rather
  # than $(prefix) if there are no overrides
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/opam/files/patch-stop-fetch-check.diff b/ocaml/opam/files/patch-stop-fetch-check.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 99cdf130056..73747733497 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/opam/files/patch-stop-fetch-check.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/opam/files/patch-stop-fetch-check.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> --- configure.orig
 +++ configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5712,7 +5712,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6029,7 +6029,7 @@
</span>  elif test x"$FETCH" = x"wget" ; then
    fetch="wget $wget_certificate_check -O \$(2) \$(1)"
  
 -elif test x"${enable_checks}" != x"no" ; then
 +elif false ; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-   if ! ${MAKE:-make} -q -C src_ext has-archives 2>/dev/null ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if ! ${MAKE} -q -C src_ext has-archives 2>/dev/null ; then
</span>      as_fn_error $? "You must have either curl or wget installed." "$LINENO" 5
    fi
</pre><pre style='margin:0'>

</pre>