libuv: fix build for Dragonfly

3 files changed, 61 insertions, 1 deletions

diff --git a/devel/libuv/distinfo b/devel/libuv/distinfo
index 81dfdfef9b1..a821f5e4c7d 100644
--- a/devel/libuv/distinfo
+++ b/devel/libuv/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.59 2020/07/29 10:20:56 wiz Exp $
+$NetBSD: distinfo,v 1.60 2020/08/07 11:30:53 adam Exp $
 
 SHA1 (libuv-1.38.1.tar.gz) = 08761f4b2a37f56b8ad1449b9d9a6d40bb1a883d
 RMD160 (libuv-1.38.1.tar.gz) = 886be7b4280c358038ed953683cd77c9057f4ef7
 SHA512 (libuv-1.38.1.tar.gz) = 96a52399828b13623bebaa017f401322a5552f596443301d1159ec310112132abe47da0cd39ad3eeae3e8b14d575f2b6bf3d900c2032aac49c0b0260b30f3952
 Size (libuv-1.38.1.tar.gz) = 1262516 bytes
 SHA1 (patch-autogen.sh) = a5f48189bfb17624c545a80626ea311b7755d232
+SHA1 (patch-src_unix_freebsd.c) = 3bf721ff4efa3388a6862e47501427bb051cc67a
 SHA1 (patch-src_unix_fs.c) = d5afe699254210d9724bf2d02ea4563a92666d4f
 SHA1 (patch-src_unix_netbsd.c) = 071a2a853f9a73dc72e24d63316aa21b28669469
+SHA1 (patch-src_unix_udp.c) = bcbdc8875a50d736eba8e330b814c79654860d58
diff --git a/devel/libuv/patches/patch-src_unix_freebsd.c b/devel/libuv/patches/patch-src_unix_freebsd.c
new file mode 100644
index 00000000000..3ce0ab94da8
--- /dev/null
+++ b/devel/libuv/patches/patch-src_unix_freebsd.c
@@ -0,0 +1,34 @@
+$NetBSD: patch-src_unix_freebsd.c,v 1.1 2020/08/07 11:30:53 adam Exp $
+
+Fix DragonFly BSD build, https://github.com/libuv/libuv/pull/2952.
+
+--- src/unix/freebsd.c.orig	2020-08-07 11:24:40.000000000 +0000
++++ src/unix/freebsd.c
+@@ -58,7 +58,8 @@ void uv__platform_loop_delete(uv_loop_t*
+ 
+ 
+ #ifdef __DragonFly__
+-int uv_exepath(char* buffer, size_t* size) {
++/* deprecated long ago, use KERN_PROC_PATHNAME sysctl */
++int uv_exepath_procfs(char* buffer, size_t* size) {
+   char abspath[PATH_MAX * 2 + 1];
+   ssize_t abspath_size;
+ 
+@@ -80,7 +81,8 @@ int uv_exepath(char* buffer, size_t* siz
+ 
+   return 0;
+ }
+-#else
++#endif
++
+ int uv_exepath(char* buffer, size_t* size) {
+   char abspath[PATH_MAX * 2 + 1];
+   int mib[4];
+@@ -110,7 +112,6 @@ int uv_exepath(char* buffer, size_t* siz
+ 
+   return 0;
+ }
+-#endif
+ 
+ uint64_t uv_get_free_memory(void) {
+   int freecount;
diff --git a/devel/libuv/patches/patch-src_unix_udp.c b/devel/libuv/patches/patch-src_unix_udp.c
new file mode 100644
index 00000000000..7b70612c1b3
--- /dev/null
+++ b/devel/libuv/patches/patch-src_unix_udp.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_unix_udp.c,v 1.3 2020/08/07 11:30:53 adam Exp $
+
+Fix DragonFly BSD build, https://github.com/libuv/libuv/pull/2952.
+
+--- src/unix/udp.c.orig	2020-08-07 11:26:14.000000000 +0000
++++ src/unix/udp.c
+@@ -854,7 +854,7 @@ static int uv__udp_set_membership6(uv_ud
+ }
+ 
+ 
+-#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__ANDROID__)
++#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__ANDROID__) && !defined(__DragonFly__)
+ static int uv__udp_set_source_membership4(uv_udp_t* handle,
+                                           const struct sockaddr_in* multicast_addr,
+                                           const char* interface_addr,
+@@ -1031,7 +1031,7 @@ int uv_udp_set_source_membership(uv_udp_
+                                  const char* interface_addr,
+                                  const char* source_addr,
+                                  uv_membership membership) {
+-#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__ANDROID__)
++#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__ANDROID__) && !defined(__DragonFly__)
+   int err;
+   union uv__sockaddr mcast_addr;
+   union uv__sockaddr src_addr;