<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/737a2c6c07c8744c8cd2b8f1ecc5d693581408e5">https://github.com/macports/macports-ports/commit/737a2c6c07c8744c8cd2b8f1ecc5d693581408e5</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 737a2c6c07c opam: update to 2.1.6
</span>737a2c6c07c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 737a2c6c07c8744c8cd2b8f1ecc5d693581408e5
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Wed May 29 07:58:42 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> opam: update to 2.1.6
</span>---
ocaml/opam/Portfile | 20 ++++----------
ocaml/opam/files/fix-bundled-dune.patch | 46 ---------------------------------
2 files changed, 5 insertions(+), 61 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 a451750b20c..5885fd7480e 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;'>@@ -2,13 +2,12 @@
</span>
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup conflicts_build 1.0
</span> PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ocaml opam 2.1.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ocaml opam 2.1.6
</span>
name opam
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</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;'>@@ -22,9 +21,9 @@ long_description OPAM is a source-based package manager for OCaml.\
</span> github.tarball_from releases
distname opam-full-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 82bc333e314439e8cf8a5f83e5b091c3ed275fab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 09f8d9e410b2f5723c2bfedbf7970e3b305f5017895fcd91759f05e753ddcea5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10801367
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 734abf1551d55f29b34a97e2bf64e7cd9cc9fd8b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d2af5edc85f552e0cf5ec0ddcc949d94f2dc550dc5df595174a06a4eaf8af628 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11704198
</span>
depends_build port:ocaml
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,15 +40,6 @@ configure.env-append FETCH=no
</span> patchfiles patch-stop-fetch-check.diff \
patch-makefile.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/ocaml/opam/issues/5770
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${worksrcpath}/src_ext/patches/dune-local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${filespath}/fix-bundled-dune.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src_ext/patches/dune-local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts_build ocaml-dune
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_parallel_build no
build.target lib-ext all
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/opam/files/fix-bundled-dune.patch b/ocaml/opam/files/fix-bundled-dune.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ad57a033e90..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/opam/files/fix-bundled-dune.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,46 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/fsevents/fsevents_stubs.c 2022-10-19 21:58:04
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/fsevents/fsevents_stubs.c 2024-02-21 14:57:28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,7 +7,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <caml/threads.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Availability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreFoundation/CoreFoundation.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreServices/CoreServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,7 +92,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFStringRef cf_path;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFDictionaryRef details = CFArrayGetValueAtIndex(eventPaths, i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cf_path = CFDictionaryGetValue(details, kFSEventStreamEventExtendedDataPathKey);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,7 +158,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const FSEventStreamEventFlags flags =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kFSEventStreamCreateFlagNoDefer |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kFSEventStreamCreateFlagUseExtendedData |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kFSEventStreamCreateFlagUseCFTypes | kFSEventStreamCreateFlagFileEvents;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -331,7 +335,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static char *unavailable_message = "fsevents is only available on macos";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static char *unavailable_message =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "upgrade your macos sdk to enable watch mode";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "fsevents is only available on macos";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CAMLprim value dune_fsevents_stop(value v_t) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- caml_failwith(unavailable_message);
</span></pre><pre style='margin:0'>
</pre>