<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0b2d8e9dc97b9bafca1b0c65091309c05152ad2a">https://github.com/macports/macports-ports/commit/0b2d8e9dc97b9bafca1b0c65091309c05152ad2a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0b2d8e9dc97b9bafca1b0c65091309c05152ad2a
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sun Sep 3 00:41:54 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> cl-libuv: enforce use MacPorts libraries
</span>---
lisp/cl-libuv/Portfile | 13 ++++----
lisp/cl-libuv/files/macports-integration.diff | 47 +++++++++++++++++++++++++++
2 files changed, 54 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lisp/cl-libuv/Portfile b/lisp/cl-libuv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ef6522f995..bf88f93fd97 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lisp/cl-libuv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lisp/cl-libuv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup common_lisp 1.0
</span>
github.setup orthecreedence cl-libuv 2ec76dc8b2ae0e21340a3059bb080e31d87cc043
version 20230616
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
checksums rmd160 c727ddd86a5f402a68192095eb36d08c98142463 \
sha256 6a047528672eed6a73e27fb0f583cbb5b565f85bcedfa5555fd4f79b08013915 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,12 +20,13 @@ description Low-level libuv bindings for Common Lisp.
</span>
long_description {*}${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|libuv.dylib|${prefix}/lib/libuv.dylib|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/lib.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append macports-integration.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/local/include|${prefix}/include|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/grovel.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@@MACPORTS_PREFIX@@|${prefix}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ grovel.lisp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/bindings.i \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scripts/win-error.i
</span> }
depends_lib-append port:cl-alexandria \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lisp/cl-libuv/files/macports-integration.diff b/lisp/cl-libuv/files/macports-integration.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4c3a5c5f396
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lisp/cl-libuv/files/macports-integration.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,47 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git grovel.lisp grovel.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 18582be..3ed21ff 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- grovel.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ grovel.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,7 +2,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cc-flags #+windows "-Ic:/include/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #+windows "-Ic:/include/uv/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #+(or darwin freebsd openbsd) "-I/usr/local/include/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #+(or darwin freebsd openbsd) "-I@@MACPORTS_PREFIX@@/include/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #+homebrew
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #.(concatenate 'string "-I" (uiop:getenv "HOMEBREW_PREFIX") "/include/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lib.lisp lib.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e8452eb..8a25d60 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,6 +8,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/usr/lib/libuv.so"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/usr/local/lib/libuv.so"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; brew's install of libevent on Mac OX X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/usr/local/lib/libuv.dylib"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (:windows (:or "libuv.dll"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; msys2/mingw64's install of libuv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git scripts/bindings.i scripts/bindings.i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b553870..796487c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scripts/bindings.i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scripts/bindings.i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -103,5 +103,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // function is worthless
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %ignore "uv_buf_init";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-%include "/usr/local/include/uv.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++%include "@@MACPORTS_PREFIX@@/include/uv.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git scripts/win-error.i scripts/win-error.i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index aa452b9..9c10f8a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scripts/win-error.i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scripts/win-error.i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,5 +37,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define UV_SIGNAL_PRIVATE_FIELDS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define UV_LOOP_PRIVATE_FIELDS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-%include "/usr/local/include/uv.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++%include "@@MACPORTS_PREFIX@@/include/uv.h"
</span></pre><pre style='margin:0'>
</pre>