nspr: update to 4.32

Remove dragonfly patches.
Report NetBSD patches upstream, add bug report URLs.

Changes:
- implement new socket option PR_SockOpt_DontFrag
- support larger DNS records by increasing the default buffer
  size for DNS queries

16 files changed, 35 insertions, 449 deletions

diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 763248d742b..6a8889782d6 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.113 2021/05/27 06:39:35 wiz Exp $
+# $NetBSD: Makefile,v 1.114 2021/07/01 07:23:00 wiz Exp $
 
 DISTNAME=	nspr-${NSPR_RELEASE:S/.0$//}
-NSPR_RELEASE=	4.31.0
+NSPR_RELEASE=	4.32.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v${NSPR_RELEASE:S/.0$//}/src/}
 
diff --git a/devel/nspr/PLIST b/devel/nspr/PLIST
index 65935903854..fee7bae1896 100644
--- a/devel/nspr/PLIST
+++ b/devel/nspr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2019/12/03 14:28:26 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.17 2021/07/01 07:23:00 wiz Exp $
 bin/compile-et.pl
 bin/nspr-config
 bin/prerr.properties
@@ -6,7 +6,6 @@ include/nspr/md/_aix32.cfg
 include/nspr/md/_aix64.cfg
 include/nspr/md/_bsdi.cfg
 include/nspr/md/_darwin.cfg
-include/nspr/md/_dragonfly.cfg
 include/nspr/md/_freebsd.cfg
 include/nspr/md/_hpux32.cfg
 include/nspr/md/_hpux64.cfg
diff --git a/devel/nspr/distinfo b/devel/nspr/distinfo
index 9b930c63f65..49e89208640 100644
--- a/devel/nspr/distinfo
+++ b/devel/nspr/distinfo
@@ -1,19 +1,12 @@
-$NetBSD: distinfo,v 1.62 2021/05/27 06:39:35 wiz Exp $
+$NetBSD: distinfo,v 1.63 2021/07/01 07:23:00 wiz Exp $
 
-SHA1 (nspr-4.31.tar.gz) = 3001e873da7535e03a91339e7b55aca6f9f83914
-RMD160 (nspr-4.31.tar.gz) = 0e3f74690de98a45d2efc8f6172488667c1c99e8
-SHA512 (nspr-4.31.tar.gz) = 1f37d04721335288dd8a5cf700ead5a56cee73365e619f3da90f6067830b78a050a525950686bcdd14fcf61faffd1141ec46d4180a0dd10375f7e9fef6eac6ed
-Size (nspr-4.31.tar.gz) = 1078163 bytes
-SHA1 (patch-ab) = a24f80c2bab73c12b02d0aad7649da0ce4ca8d4f
-SHA1 (patch-ac) = a3d2cef788393b84e833d9e33bdf40b10d8efbd0
-SHA1 (patch-ae) = 28474b852325a37fb2a30717e9f7ffb77dad5deb
-SHA1 (patch-ag) = 653d4bc8cc4eced8f628cfb738c5d99cc1a6cf24
-SHA1 (patch-ba) = 141b354b9ec0423a9c671d5eaca05cf16daac312
-SHA1 (patch-nspr_pr_include_md___netbsd.cfg) = d859aed2b165d25bfb1f95903ee7725d1d358097
-SHA1 (patch-nspr_pr_include_md___pth.h) = ef97e3a9c2dbde85a7c36152807217f962d2b4fa
-SHA1 (patch-nspr_pr_src_pthreads_ptsynch.c) = 52e0e2bb1d1ddb282f92ce2df2c69684c0634dbe
-SHA1 (patch-nspr_pr_src_pthreads_ptthread.c) = 1aaa1048399cc7a82a67b98ea2368033cb597ac6
-SHA1 (patch-nsprpub_pr_include_md__dragonfly.cfg) = 54d3fbd4c515290395b66f6b9e736a01a8318244
-SHA1 (patch-nsprpub_pr_include_md_prosdep.h) = dd90cda6251aeeb10f02ef594c02484237195155
-SHA1 (patch-nsprpub_pr_src_md_unix_uxrng.c) = 2fda72f511abb003685c9c48413d92c82b63f992
-SHA1 (patch-nsprpub_pr_src_pthreads_ptio.c) = 027da3827c393bfb91842bc4da45196493c17393
+SHA1 (nspr-4.32.tar.gz) = 28e05ef5cbe6e7cde239d3cdcccabf571ec73f69
+RMD160 (nspr-4.32.tar.gz) = e7b4a6903ac891161149b59142fccf29c11eb58f
+SHA512 (nspr-4.32.tar.gz) = da9b65b374783d20a2e589211b411816d899e296e91175d376e59df1919144c1808c155a234d6ceefdf7b8ae8f47cec98d92a5aa3150a579513251860e50dcb7
+Size (nspr-4.32.tar.gz) = 1079004 bytes
+SHA1 (patch-ab) = 008f5b84994ad20e3b1a0de1e0f7a028932d03d2
+SHA1 (patch-ac) = c751b8397744c969e6141f609cb3914db6e699e3
+SHA1 (patch-ba) = 35f7cc7bbe7fa0f72eb7b506094ad1812b754aa5
+SHA1 (patch-nspr_pr_include_md___netbsd.cfg) = a3aba89d02cd61f748862ebb3b76050873ccdd69
+SHA1 (patch-nspr_pr_src_pthreads_ptsynch.c) = 77fc5653bcfaf39f55f26b301992aaeb2ff2401c
+SHA1 (patch-nspr_pr_src_pthreads_ptthread.c) = 187fdad28d0407c440154a614d38d860b71bfad1
diff --git a/devel/nspr/patches/patch-ab b/devel/nspr/patches/patch-ab
index acdca374a48..2e7ee267150 100644
--- a/devel/nspr/patches/patch-ab
+++ b/devel/nspr/patches/patch-ab
@@ -1,4 +1,7 @@
-$NetBSD: patch-ab,v 1.9 2018/05/12 09:01:08 jmcneill Exp $
+$NetBSD: patch-ab,v 1.10 2021/07/01 07:23:00 wiz Exp $
+
+Improve NetBSD support.
+https://bugzilla.mozilla.org/show_bug.cgi?id=1718836
 
 --- nspr/pr/include/md/_netbsd.h.orig	2018-03-05 15:50:28.000000000 +0000
 +++ nspr/pr/include/md/_netbsd.h
diff --git a/devel/nspr/patches/patch-ac b/devel/nspr/patches/patch-ac
index b5a473fc037..c72b2813553 100644
--- a/devel/nspr/patches/patch-ac
+++ b/devel/nspr/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.14 2017/10/04 12:52:43 jperkin Exp $
+$NetBSD: patch-ac,v 1.15 2021/07/01 07:23:00 wiz Exp $
 
 add runpath to Linux caught during check-shlibs-elf
 
---- nspr/configure.in.orig	2017-07-27 12:31:27.000000000 +0000
+--- nspr/configure.in.orig	2021-06-30 21:43:23.000000000 +0000
 +++ nspr/configure.in
 @@ -38,7 +38,7 @@ OBJDIR_NAME=.
  OBJDIR_SUFFIX=OBJ
@@ -13,41 +13,17 @@ add runpath to Linux caught during check-shlibs-elf
  LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)'
  CYGWIN_WRAPPER=
  MACOS_SDK_DIR=
-@@ -1573,6 +1573,33 @@ tools are selected during the Xcode/Deve
+@@ -1486,6 +1486,9 @@ tools are selected during the Xcode/Deve
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
      MDCPUCFG_H=_freebsd.cfg
      PR_MD_CSRCS=freebsd.c
 +    if test "$LIBRUNPATH"; then
 +        DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
 +    fi
-+    ;;
-+
-+*-dragonfly*)
-+    if test -z "$USE_NSPR_THREADS"; then
-+        USE_PTHREADS=1
-+    fi
-+    AC_DEFINE(XP_UNIX)
-+    AC_DEFINE(HAVE_BSD_FLOCK)
-+    AC_DEFINE(HAVE_SOCKLEN_T)
-+    CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+    MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    if test "$MOZ_OBJFORMAT" = "elf"; then
-+        DLL_SUFFIX=so
-+    else
-+        DLL_SUFFIX=so.1.0
-+    fi
-+    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-+    DSO_CFLAGS=-fPIC
-+    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-+    MDCPUCFG_H=_dragonfly.cfg
-+    PR_MD_CSRCS=freebsd.c
-+    if test "$LIBRUNPATH"; then
-+        DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
-+    fi
      ;;
  
  *-hpux*)
-@@ -1848,6 +1875,9 @@ tools are selected during the Xcode/Deve
+@@ -1662,6 +1665,9 @@ tools are selected during the Xcode/Deve
      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
      DSO_CFLAGS=-fPIC
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
@@ -57,7 +33,7 @@ add runpath to Linux caught during check-shlibs-elf
      _OPTIMIZE_FLAGS=-O2
      _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
                                     # combo is not yet good at debugging inlined
-@@ -2173,7 +2203,7 @@ tools are selected during the Xcode/Deve
+@@ -1991,7 +1997,7 @@ tools are selected during the Xcode/Deve
      AC_DEFINE(HAVE_POINTER_LOCALTIME_R)
      CFLAGS="$CFLAGS -ansi -Wall"
      CXXFLAGS="$CXXFLAGS -ansi -Wall"
@@ -66,7 +42,7 @@ add runpath to Linux caught during check-shlibs-elf
      DSO_CFLAGS=-fPIC
      MDCPUCFG_H=_openbsd.cfg
      PR_MD_CSRCS=openbsd.c
-@@ -2293,7 +2323,7 @@ tools are selected during the Xcode/Deve
+@@ -2070,7 +2076,7 @@ tools are selected during the Xcode/Deve
          if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
              GCC_USE_GNU_LD=1
          fi
@@ -75,30 +51,3 @@ add runpath to Linux caught during check-shlibs-elf
          if test -n "$USE_B_DIRECT"; then
              DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
          fi
-@@ -2760,7 +2790,7 @@ if test -n "$USE_PTHREADS"; then
- 	if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
- 	    ac_cv_have_dash_pthread=yes
- 		case "$target_os" in
--	    freebsd*)
-+	    freebsd* | dragonfly*)
- # Freebsd doesn't use -pthread for compiles, it uses them for linking
-             ;;
- 	    *)
-@@ -2798,7 +2828,7 @@ if test -n "$USE_PTHREADS"; then
-             _PTHREAD_LDFLAGS=
-         fi
- 	    ;;
--    *-freebsd*)
-+    *-freebsd* | *-dragonfly*)
- 	    AC_DEFINE(_REENTRANT)
- 	    AC_DEFINE(_THREAD_SAFE)
- 	    dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -2879,7 +2909,7 @@ case "$target" in
-         AC_DEFINE(_PR_NEED_PTHREAD_INIT)
-     fi
-     ;;
--*-freebsd*)
-+*-freebsd* | *-dragonfly*)
-     if test -n "$USE_NSPR_THREADS"; then
-         AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-     fi
diff --git a/devel/nspr/patches/patch-ae b/devel/nspr/patches/patch-ae
deleted file mode 100644
index df8b4b3f62f..00000000000
--- a/devel/nspr/patches/patch-ae
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ae,v 1.8 2019/12/03 14:28:26 ryoon Exp $
-
---- nspr/pr/src/misc/prnetdb.c.orig	2019-10-15 14:21:38.000000000 +0000
-+++ nspr/pr/src/misc/prnetdb.c
-@@ -68,7 +68,7 @@ PRLock *_pr_dnsLock = NULL;
- #if defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \
-     || (defined(HPUX10_10) && defined(_REENTRANT)) \
-         || (defined(HPUX10_20) && defined(_REENTRANT)) \
--        || defined(OPENBSD)
-+        || defined(OPENBSD) || defined(NETBSD)
- #define _PR_HAVE_GETPROTO_R
- #define _PR_HAVE_GETPROTO_R_INT
- #endif
-@@ -78,6 +78,11 @@ PRLock *_pr_dnsLock = NULL;
- #define _PR_HAVE_5_ARG_GETPROTO_R
- #endif
- 
-+#if __DragonFly_version >= 200202
-+#define _PR_HAVE_GETPROTO_R
-+#define _PR_HAVE_5_ARG_GETPROTO_R
-+#endif
-+
- /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */
- #if (defined(__GLIBC__) && __GLIBC__ >= 2)
- #define _PR_HAVE_GETPROTO_R
-@@ -304,7 +309,7 @@ _pr_QueryNetIfs(void)
- }
- 
- #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \
--    || defined(NETBSD) || defined(OPENBSD)
-+    || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY)
- 
- /*
-  * Use the BSD getifaddrs function.
-@@ -2163,6 +2168,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
-          */
-         hints.ai_socktype = SOCK_STREAM;
- 
-+/* NetBSD >= 2.99.9 has a thread-safe resolver */
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900
-+        LOCK_DNS();
-+#endif
-+
-         rv = GETADDRINFO(hostname, NULL, &hints, &res);
- #ifdef AI_ADDRCONFIG
-         if (rv == EAI_BADFLAGS && (hints.ai_flags & AI_ADDRCONFIG)) {
diff --git a/devel/nspr/patches/patch-ag b/devel/nspr/patches/patch-ag
deleted file mode 100644
index 9032b301e7c..00000000000
--- a/devel/nspr/patches/patch-ag
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2013/07/20 08:57:20 ryoon Exp $
-
---- nsprpub/pr/include/md/_freebsd.h.orig	2012-03-06 13:13:51.000000000 +0000
-+++ nspr/pr/include/md/_freebsd.h
-@@ -47,7 +47,7 @@
- #define _PR_HAVE_LARGE_OFF_T
- 
- #if defined(_PR_PTHREADS)
--#if __FreeBSD_version >= 400008
-+#if defined(__DragonFly__) || __FreeBSD_version >= 400008
- /*
-  * libc_r before this version of FreeBSD doesn't have poll().
-  * Although libc has poll(), it is not thread-safe so we can't
-@@ -56,7 +56,7 @@
- #define _PR_POLL_AVAILABLE
- #endif
- #else
--#if __FreeBSD_version >= 300000
-+#if defined(__DragonFly__) || __FreeBSD_version >= 300000
- #define _PR_POLL_AVAILABLE
- #define _PR_USE_POLL
- #endif
-@@ -65,7 +65,7 @@
- #define _PR_HAVE_SYSV_SEMAPHORES
- #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
- 
--#if __FreeBSD_version >= 400014
-+#if defined(__DragonFly__) || __FreeBSD_version >= 400014
- #define _PR_INET6
- #define _PR_HAVE_INET_NTOP
- #define _PR_HAVE_GETHOSTBYNAME2
diff --git a/devel/nspr/patches/patch-ba b/devel/nspr/patches/patch-ba
index 64bd3945501..3c759feba13 100644
--- a/devel/nspr/patches/patch-ba
+++ b/devel/nspr/patches/patch-ba
@@ -1,6 +1,7 @@
-$NetBSD: patch-ba,v 1.2 2013/07/20 08:57:20 ryoon Exp $
+$NetBSD: patch-ba,v 1.3 2021/07/01 07:23:00 wiz Exp $
 
 pthread_t may be 64-bit, avoid casting it.
+https://bugzilla.mozilla.org/show_bug.cgi?id=1718835
 
 --- nsprpub/pr/include/private/pprthred.h.orig	2009-11-02 22:43:08.000000000 +0100
 +++ nspr/pr/include/private/pprthred.h
diff --git a/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg b/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg
index 5720e8e8c8c..a92cffe7630 100644
--- a/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg
+++ b/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg
@@ -1,6 +1,7 @@
-$NetBSD: patch-nspr_pr_include_md___netbsd.cfg,v 1.2 2021/04/23 16:03:15 rin Exp $
+$NetBSD: patch-nspr_pr_include_md___netbsd.cfg,v 1.3 2021/07/01 07:23:00 wiz Exp $
 
 Support NetBSD/aarch64{,eb}.
+https://bugzilla.mozilla.org/show_bug.cgi?id=1718836
 
 --- nspr/pr/include/md/_netbsd.cfg.orig	2021-03-16 23:53:01.000000000 +0900
 +++ nspr/pr/include/md/_netbsd.cfg	2021-04-24 00:52:11.369243612 +0900
diff --git a/devel/nspr/patches/patch-nspr_pr_include_md___pth.h b/devel/nspr/patches/patch-nspr_pr_include_md___pth.h
deleted file mode 100644
index 7cfd0bd4052..00000000000
--- a/devel/nspr/patches/patch-nspr_pr_include_md___pth.h
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-nspr_pr_include_md___pth.h,v 1.2 2019/12/03 14:28:26 ryoon Exp $
-
---- nspr/pr/include/md/_pth.h.orig	2019-10-15 14:21:38.000000000 +0000
-+++ nspr/pr/include/md/_pth.h
-@@ -86,7 +86,7 @@
-  */
- #if defined(AIX) || defined(SOLARIS) \
-     || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
--    || defined(HPUX) || defined(FREEBSD) \
-+    || defined(HPUX) || defined(FREEBSD) || defined(__DragonFly__) \
-     || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \
-     || defined(NTO) || defined(DARWIN) \
-     || defined(UNIXWARE) || defined(RISCOS)
-@@ -115,7 +115,7 @@
- #if (defined(AIX) && !defined(AIX4_3_PLUS)) \
-     || defined(LINUX) || defined(__GNU__)|| defined(__GLIBC__) \
-     || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
--    || defined(BSDI) || defined(UNIXWARE) \
-+    || defined(BSDI) || defined(UNIXWARE) || defined(__DragonFly__) \
-     || defined(DARWIN)
- #define PT_NO_SIGTIMEDWAIT
- #endif
-@@ -133,7 +133,7 @@
- #define PT_PRIO_MIN            sched_get_priority_min(SCHED_OTHER)
- #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
- #elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
--    || defined(FREEBSD)
-+    || defined(FREEBSD) || defined(__DragonFly__) 
- #define PT_PRIO_MIN            sched_get_priority_min(SCHED_OTHER)
- #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
- #elif defined(NTO)
-@@ -177,7 +177,7 @@ extern int (*_PT_aix_yield_fcn)();
-     || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-     || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-     || defined(BSDI) || defined(NTO) || defined(DARWIN) \
--    || defined(UNIXWARE) || defined(RISCOS)
-+    || defined(UNIXWARE) || defined(RISCOS) || defined(__DragonFly__)
- #define _PT_PTHREAD_YIELD()             sched_yield()
- #else
- #error "Need to define _PT_PTHREAD_YIELD for this platform"
diff --git a/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptsynch.c b/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptsynch.c
index 96c4fe950c9..5ced9fe8600 100644
--- a/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptsynch.c
+++ b/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptsynch.c
@@ -1,9 +1,11 @@
-$NetBSD: patch-nspr_pr_src_pthreads_ptsynch.c,v 1.1 2020/02/05 03:26:52 ryoon Exp $
+$NetBSD: patch-nspr_pr_src_pthreads_ptsynch.c,v 1.2 2021/07/01 07:23:00 wiz Exp $
 
 * Do not use pthread_equal() for non-valid thread pointers.
   From kamin@ on source-changes-d@NetBSD.org.
   https://mail-index.netbsd.org/source-changes-d/2020/02/03/msg012143.html
 
+https://bugzilla.mozilla.org/show_bug.cgi?id=1718838
+
 --- nspr/pr/src/pthreads/ptsynch.c.orig	2020-01-31 20:37:50.000000000 +0000
 +++ nspr/pr/src/pthreads/ptsynch.c
 @@ -25,6 +25,13 @@ static pthread_condattr_t _pt_cvar_attr;
diff --git a/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c b/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c
index 22e2f0f6e9b..9039e943d72 100644
--- a/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c
+++ b/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c
@@ -1,4 +1,7 @@
-$NetBSD: patch-nspr_pr_src_pthreads_ptthread.c,v 1.1 2018/01/24 16:21:42 ryoon Exp $
+$NetBSD: patch-nspr_pr_src_pthreads_ptthread.c,v 1.2 2021/07/01 07:23:00 wiz Exp $
+
+pthread_t may be 64-bit, avoid casting it.
+https://bugzilla.mozilla.org/show_bug.cgi?id=1718835
 
 --- nspr/pr/src/pthreads/ptthread.c.orig	2018-01-18 12:37:14.000000000 +0000
 +++ nspr/pr/src/pthreads/ptthread.c
diff --git a/devel/nspr/patches/patch-nsprpub_pr_include_md__dragonfly.cfg b/devel/nspr/patches/patch-nsprpub_pr_include_md__dragonfly.cfg
deleted file mode 100644
index d3ce0f2893d..00000000000
--- a/devel/nspr/patches/patch-nsprpub_pr_include_md__dragonfly.cfg
+++ /dev/null
@@ -1,199 +0,0 @@
-$NetBSD: patch-nsprpub_pr_include_md__dragonfly.cfg,v 1.3 2013/07/20 08:57:20 ryoon Exp $
-
---- nsprpub/pr/include/md/_dragonfly.cfg.orig	2012-08-15 01:17:50.000000000 +0000
-+++ nspr/pr/include/md/_dragonfly.cfg
-@@ -0,0 +1,194 @@
-+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is the Netscape Portable Runtime (NSPR).
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998-2000
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#ifndef nspr_cpucfg___
-+#define nspr_cpucfg___
-+
-+#ifndef XP_UNIX
-+#define XP_UNIX
-+#endif
-+
-+#define PR_AF_INET6 28  /* same as AF_INET6 */
-+
-+#ifndef HAVE_LONG_LONG
-+#define HAVE_LONG_LONG
-+#endif
-+
-+#if defined(__i386__)
-+
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#undef	HAVE_ALIGNED_DOUBLES
-+#undef	HAVE_ALIGNED_LONGLONGS
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   4
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   4
-+#define PR_BYTES_PER_DWORD  8
-+#define PR_BYTES_PER_WORD_LOG2   2
-+#define PR_BYTES_PER_DWORD_LOG2  3
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    32
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    32
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   5
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   5
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    4
-+#define PR_ALIGN_OF_INT64   4
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  4
-+#define PR_ALIGN_OF_POINTER 4
-+
-+#elif defined(__amd64__)
-+
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#define	HAVE_ALIGNED_DOUBLES
-+#define	HAVE_ALIGNED_LONGLONGS
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+#define PR_BYTES_PER_WORD_LOG2   3
-+#define PR_BYTES_PER_DWORD_LOG2  3
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    8
-+#define PR_ALIGN_OF_INT64   8
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD    8
-+
-+#else
-+
-+#error "Unknown CPU architecture"
-+
-+#endif
-+
-+#ifndef NO_NSPR_10_SUPPORT
-+
-+#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-+#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-+#define BYTES_PER_INT 		PR_BYTES_PER_INT
-+#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-+#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-+#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-+#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-+#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-+#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-+
-+#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-+#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-+#define BITS_PER_INT		PR_BITS_PER_INT
-+#define BITS_PER_INT64		PR_BITS_PER_INT64
-+#define BITS_PER_LONG		PR_BITS_PER_LONG
-+#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-+#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-+#define BITS_PER_WORD		PR_BITS_PER_WORD
-+
-+#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-+#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-+#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-+#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-+#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-+#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-+#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-+#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-+
-+#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-+#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-+#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-+#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-+#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-+#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-+#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-+#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-+
-+#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-+#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-+#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-+
-+#endif /* NO_NSPR_10_SUPPORT */
-+
-+#endif /* nspr_cpucfg___ */
diff --git a/devel/nspr/patches/patch-nsprpub_pr_include_md_prosdep.h b/devel/nspr/patches/patch-nsprpub_pr_include_md_prosdep.h
deleted file mode 100644
index e3b8288c6a8..00000000000
--- a/devel/nspr/patches/patch-nsprpub_pr_include_md_prosdep.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-nsprpub_pr_include_md_prosdep.h,v 1.3 2013/07/20 08:57:20 ryoon Exp $
-
---- nsprpub/pr/include/md/prosdep.h.orig	2012-03-06 13:13:55.000000000 +0000
-+++ nspr/pr/include/md/prosdep.h
-@@ -34,7 +34,7 @@ PR_BEGIN_EXTERN_C
- #if defined(AIX)
- #include "md/_aix.h"
- 
--#elif defined(FREEBSD)
-+#elif defined(FREEBSD) || defined(__DragonFly__)
- #include "md/_freebsd.h"
- 
- #elif defined(NETBSD)
diff --git a/devel/nspr/patches/patch-nsprpub_pr_src_md_unix_uxrng.c b/devel/nspr/patches/patch-nsprpub_pr_src_md_unix_uxrng.c
deleted file mode 100644
index 59491487a38..00000000000
--- a/devel/nspr/patches/patch-nsprpub_pr_src_md_unix_uxrng.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-nsprpub_pr_src_md_unix_uxrng.c,v 1.4 2019/12/03 14:28:26 ryoon Exp $
-
---- nspr/pr/src/md/unix/uxrng.c.orig	2019-10-15 14:21:38.000000000 +0000
-+++ nspr/pr/src/md/unix/uxrng.c
-@@ -64,7 +64,7 @@ GetHighResClock(void *buf, size_t maxbyt
- 
- #elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \
-     || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD) \
--    || defined(__GNU__))
-+    || defined(__GNU__)) || defined(__DragonFly__)
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
diff --git a/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptio.c b/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptio.c
deleted file mode 100644
index c5117868f0d..00000000000
--- a/devel/nspr/patches/patch-nsprpub_pr_src_pthreads_ptio.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-nsprpub_pr_src_pthreads_ptio.c,v 1.4 2019/12/03 14:28:26 ryoon Exp $
-
---- nspr/pr/src/pthreads/ptio.c.orig	2019-10-15 14:21:38.000000000 +0000
-+++ nspr/pr/src/pthreads/ptio.c
-@@ -183,7 +183,7 @@ static PRBool _pr_ipv6_v6only_on_by_defa
-     || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-     || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-     || defined(BSDI) || defined(NTO) || defined(DARWIN) \
--    || defined(UNIXWARE) || defined(RISCOS)
-+    || defined(UNIXWARE) || defined(RISCOS) || defined(__DragonFly__)
- #define _PRSelectFdSetArg_t fd_set *
- #else
- #error "Cannot determine architecture"
-@@ -3477,7 +3477,8 @@ static PRIOMethods _pr_socketpollfd_meth
-     || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-     || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \
-     || defined(OPENBSD) || defined(BSDI) || defined(NTO) \
--    || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS)
-+    || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS) \
-+    || defined(__DragonFly__)
- #define _PR_FCNTL_FLAGS O_NONBLOCK
- #else
- #error "Can't determine architecture"