Here's an update to libuv 1.24.1, needed for newer versions of
moarvm/nqp/rakudo. devel/cmake needs a small adjustment to build with
this (attached), all other dependent ports are fine. Tested on amd64,
i386, arm, aarch64, powerpc, sparc64.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/libuv/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 10 Aug 2018 10:19:18 -0000 1.8
+++ Makefile 23 Dec 2018 20:51:54 -0000
@@ -4,13 +4,12 @@
COMMENT = multi-platform library for asynchronous I/O
-REVISION = 1
-VER = 1.19.1
+VER = 1.24.1
DISTNAME = libuv-v${VER}
PKGNAME = libuv-${VER}
CATEGORIES = devel
-SHARED_LIBS = uv 1.0 # 1.0
+SHARED_LIBS = uv 2.0 # 1.0
HOMEPAGE = http://libuv.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/libuv/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 11 Feb 2018 18:31:35 -0000 1.2
+++ distinfo 23 Dec 2018 20:51:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (libuv-v1.19.1.tar.gz) = Mu2ZRDZOzyXkt1In5e5XCREEI7qApcfX5RI6uJMA6Hg=
-SIZE (libuv-v1.19.1.tar.gz) = 1166759
+SHA256 (libuv-v1.24.1.tar.gz) = PdPut7ACFLAibaVbOImNP5SB0M90TUL6+Cdx4PGfKwo=
+SIZE (libuv-v1.24.1.tar.gz) = 1195550
Index: patches/patch-src_unix_tcp_c
===================================================================
RCS file: patches/patch-src_unix_tcp_c
diff -N patches/patch-src_unix_tcp_c
--- patches/patch-src_unix_tcp_c 11 Feb 2018 18:31:35 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-$OpenBSD: patch-src_unix_tcp_c,v 1.2 2018/02/11 18:31:35 pascal Exp $
-
-- we don't support setting IPV6_V6ONLY to anything but 1
- (no support for IPv4-mapped IPv6 addresses)
-
-Index: src/unix/tcp.c
---- src/unix/tcp.c.orig
-+++ src/unix/tcp.c
-@@ -168,23 +168,6 @@ int uv__tcp_bind(uv_tcp_t* tcp,
- if (setsockopt(tcp->io_watcher.fd, SOL_SOCKET, SO_REUSEADDR, &on,
sizeof(on)))
- return -errno;
-
--#ifdef IPV6_V6ONLY
-- if (addr->sa_family == AF_INET6) {
-- on = (flags & UV_TCP_IPV6ONLY) != 0;
-- if (setsockopt(tcp->io_watcher.fd,
-- IPPROTO_IPV6,
-- IPV6_V6ONLY,
-- &on,
-- sizeof on) == -1) {
--#if defined(__MVS__)
-- if (errno == EOPNOTSUPP)
-- return -EINVAL;
--#endif
-- return -errno;
-- }
-- }
--#endif
--
- errno = 0;
- if (bind(tcp->io_watcher.fd, addr, addrlen) && errno != EADDRINUSE) {
- if (errno == EAFNOSUPPORT)
Index: patches/patch-test_test-fs_c
===================================================================
RCS file: /cvs/ports/devel/libuv/patches/patch-test_test-fs_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-test_test-fs_c
--- patches/patch-test_test-fs_c 11 Feb 2018 18:31:35 -0000 1.2
+++ patches/patch-test_test-fs_c 23 Dec 2018 20:51:54 -0000
@@ -6,7 +6,7 @@ https://github.com/libuv/libuv/issues/12
Index: test/test-fs.c
--- test/test-fs.c.orig
+++ test/test-fs.c
-@@ -1649,7 +1649,7 @@ TEST_IMPL(fs_realpath) {
+@@ -1768,7 +1768,7 @@ TEST_IMPL(fs_realpath) {
uv_fs_t req;
loop = uv_default_loop();
@@ -15,7 +15,7 @@ Index: test/test-fs.c
ASSERT(0 == uv_run(loop, UV_RUN_DEFAULT));
ASSERT(dummy_cb_count == 1);
ASSERT(req.ptr == NULL);
-@@ -1665,7 +1665,7 @@ TEST_IMPL(fs_realpath) {
+@@ -1784,7 +1784,7 @@ TEST_IMPL(fs_realpath) {
ASSERT(req.result == UV_ENOENT);
uv_fs_req_cleanup(&req);
Index: patches/patch-test_test-udp-ipv6_c
===================================================================
RCS file: patches/patch-test_test-udp-ipv6_c
diff -N patches/patch-test_test-udp-ipv6_c
--- patches/patch-test_test-udp-ipv6_c 11 Feb 2018 18:31:35 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-test_test-udp-ipv6_c,v 1.2 2018/02/11 18:31:35 pascal Exp $
-
-- no dual stack support
-
-Index: test/test-udp-ipv6.c
---- test/test-udp-ipv6.c.orig
-+++ test/test-udp-ipv6.c
-@@ -171,10 +171,7 @@ TEST_IMPL(udp_dual_stack) {
- if (!can_ipv6())
- RETURN_SKIP("IPv6 not supported");
-
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-- if (!can_ipv6_ipv4_dual())
- RETURN_SKIP("IPv6-IPv4 dual stack not supported");
--#endif
-
- do_test(ipv6_recv_ok, 0);
-
Index: patches/patch-test_test-udp-multicast-join6_c
===================================================================
RCS file: patches/patch-test_test-udp-multicast-join6_c
diff -N patches/patch-test_test-udp-multicast-join6_c
--- patches/patch-test_test-udp-multicast-join6_c 11 Feb 2018 18:31:35
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-test_test-udp-multicast-join6_c,v 1.2 2018/02/11 18:31:35
pascal Exp $
-Index: test/test-udp-multicast-join6.c
---- test/test-udp-multicast-join6.c.orig
-+++ test/test-udp-multicast-join6.c
-@@ -123,7 +123,8 @@ TEST_IMPL(udp_multicast_join6) {
- defined(_AIX) || \
- defined(__MVS__) || \
- defined(__FreeBSD_kernel__) || \
-- defined(__NetBSD__)
-+ defined(__NetBSD__) || \
-+ defined(__OpenBSD__)
- r = uv_udp_set_membership(&client, "ff02::1", "::1%lo0", UV_JOIN_GROUP);
- #else
- r = uv_udp_set_membership(&client, "ff02::1", NULL, UV_JOIN_GROUP);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/libuv/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 14 Feb 2017 09:37:16 -0000 1.1.1.1
+++ pkg/PLIST 23 Dec 2018 20:51:54 -0000
@@ -1,10 +1,11 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2017/02/14 09:37:16 edd Exp $
-include/uv-bsd.h
-include/uv-errno.h
-include/uv-threadpool.h
-include/uv-unix.h
-include/uv-version.h
+include/uv/
include/uv.h
+include/uv/bsd.h
+include/uv/errno.h
+include/uv/threadpool.h
+include/uv/unix.h
+include/uv/version.h
lib/libuv.a
lib/libuv.la
@lib lib/libuv.so.${LIBuv_VERSION}
Index: patches/patch-Source_Modules_FindLibUV_cmake
===================================================================
RCS file: patches/patch-Source_Modules_FindLibUV_cmake
diff -N patches/patch-Source_Modules_FindLibUV_cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_Modules_FindLibUV_cmake 23 Dec 2018 20:53:07
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: Source/Modules/FindLibUV.cmake
+--- Source/Modules/FindLibUV.cmake.orig
++++ Source/Modules/FindLibUV.cmake
+@@ -63,6 +63,8 @@ mark_as_advanced(LibUV_INCLUDE_DIR)
+ set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[
\t]+[0-9]+")
+ if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
+ file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX
"${_LibUV_H_REGEX}")
++elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")
++ file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX
"${_LibUV_H_REGEX}")
+ elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h")
+ file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
+ else()
