libuv: remove NetBSD 6 patches.

Remove link to retracted upstream pull request.

5 files changed, 5 insertions, 43 deletions

diff --git a/devel/libuv/distinfo b/devel/libuv/distinfo
index e2bab9f994f..81dfdfef9b1 100644
--- a/devel/libuv/distinfo
+++ b/devel/libuv/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.58 2020/07/06 10:07:17 adam Exp $
+$NetBSD: distinfo,v 1.59 2020/07/29 10:20:56 wiz 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-configure.ac) = 1b215764f1b326df0a89a20cd07e295e55469781
-SHA1 (patch-src_unix_fs.c) = 15b464be3e31c0934732c537c4163b5b96665f63
-SHA1 (patch-src_unix_netbsd.c) = 4bea4eda43c4256b5281bc798a46d29690917d27
-SHA1 (patch-src_unix_thread.c) = 6223ce0aa3595cf7abf1356339bc9be91137a4b6
+SHA1 (patch-src_unix_fs.c) = d5afe699254210d9724bf2d02ea4563a92666d4f
+SHA1 (patch-src_unix_netbsd.c) = 071a2a853f9a73dc72e24d63316aa21b28669469
diff --git a/devel/libuv/patches/patch-configure.ac b/devel/libuv/patches/patch-configure.ac
deleted file mode 100644
index 4749dabc179..00000000000
--- a/devel/libuv/patches/patch-configure.ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.3 2020/05/23 09:27:10 adam Exp $
-
-Add feature-test for pthread_condattr_setclock absent in netbsd-6-0
-https://github.com/libuv/libuv/pull/2436
-
---- configure.ac.orig	2020-05-17 15:34:37.000000000 +0000
-+++ configure.ac
-@@ -43,6 +43,7 @@ AX_PTHREAD([
-     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- ])
- AC_CHECK_LIB([dl], [dlopen])
-+AC_CHECK_LIB([pthread], [pthread_condattr_setclock], AC_DEFINE(HAVE_PTHREAD_CONDATTR_SETCLOCK))
- AC_SEARCH_LIBS([kstat_lookup], [kstat])
- AC_SEARCH_LIBS([gethostbyname], [nsl])
- AC_SEARCH_LIBS([perfstat_cpu], [perfstat])
diff --git a/devel/libuv/patches/patch-src_unix_fs.c b/devel/libuv/patches/patch-src_unix_fs.c
index 75d313460e7..ffc5b026ca2 100644
--- a/devel/libuv/patches/patch-src_unix_fs.c
+++ b/devel/libuv/patches/patch-src_unix_fs.c
@@ -1,7 +1,6 @@
-$NetBSD: patch-src_unix_fs.c,v 1.4 2019/10/21 09:42:06 adam Exp $
+$NetBSD: patch-src_unix_fs.c,v 1.5 2020/07/29 10:20:56 wiz Exp $
 
 Fix portability on NetBSD.
-https://github.com/libuv/libuv/pull/2436
 
 --- src/unix/fs.c.orig	2019-10-19 21:32:27.000000000 +0000
 +++ src/unix/fs.c
diff --git a/devel/libuv/patches/patch-src_unix_netbsd.c b/devel/libuv/patches/patch-src_unix_netbsd.c
index 7f47f4c00d6..ae766e70c8c 100644
--- a/devel/libuv/patches/patch-src_unix_netbsd.c
+++ b/devel/libuv/patches/patch-src_unix_netbsd.c
@@ -1,7 +1,6 @@
-$NetBSD: patch-src_unix_netbsd.c,v 1.2 2019/08/22 10:28:25 wiz Exp $
+$NetBSD: patch-src_unix_netbsd.c,v 1.3 2020/07/29 10:20:56 wiz Exp $
 
 Check for KERN_PROC_PATHNAME before using it, or use fallback implementation.
-https://github.com/libuv/libuv/pull/2436
 
 --- src/unix/netbsd.c.orig	2017-10-02 23:30:27.000000000 +0000
 +++ src/unix/netbsd.c
diff --git a/devel/libuv/patches/patch-src_unix_thread.c b/devel/libuv/patches/patch-src_unix_thread.c
deleted file mode 100644
index 7c037baff00..00000000000
--- a/devel/libuv/patches/patch-src_unix_thread.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_unix_thread.c,v 1.8 2020/07/06 10:07:17 adam Exp $
-
-Use feature test for pthread_condattr_setclock, absent in netbsd-6-0
-https://github.com/libuv/libuv/pull/2436
-
---- src/unix/thread.c.orig	2020-07-03 16:51:27.000000000 +0000
-+++ src/unix/thread.c
-@@ -709,9 +709,11 @@ int uv_cond_init(uv_cond_t* cond) {
-   if (err)
-     return UV__ERR(err);
- 
-+#if defined(HAVE_PTHREAD_CONDATTR_SETCLOCK)
-   err = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);
-   if (err)
-     goto error2;
-+#endif
- 
-   err = pthread_cond_init(cond, &attr);
-   if (err)