nss: fix interoperability with openssl

For a long time now (at least 15 years), the installed pkg-config
file also linked against libsoftokn3, which is wrong according to
upstream. This library is only intended to be loaded as a module.

Having this library linked added symbols to the namespace that conflict
with openssl symbols. This had caused problems before, and patches
had been added to rename symbols to avoid this conflict.

Instead, fix this correctly by not linking against libsoftokn3.

Switch to using the pkg-config and nss-config files provided in the
distfiles instead of pkgsrc-specific ones.

Remove now unneeded symbol-renaming patches.

Remove DragonFly patches while here.

Bump PKGREVISION.

11 files changed, 34 insertions, 418 deletions

diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 8c8f6b6e9b8..36b3f42e913 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.199 2021/03/30 16:34:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.200 2021/04/09 06:40:59 wiz Exp $
 
 DISTNAME=		nss-${NSS_RELEASE:S/.0$//}
 NSS_RELEASE=		3.63.0
+PKGREVISION=		1
 CATEGORIES=		devel security
 MASTER_SITES=		${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${NSS_DIST_DIR_VERSION:S/_0$//}_RTM/src/}
 
@@ -89,25 +90,34 @@ MAKE_ENV+=	NSS_ENABLE_TLS_1_3=1
 CFLAGS+=	-DNSS_NO_GCC48
 .endif
 
-NSS_MAJOR_VERSION=	${NSS_RELEASE:C/\.[0-9.]*//}
-NSS_MINOR_VERSION=	${NSS_RELEASE:S/3.//:C/\.[0-9]*//}
-NSS_PATCH_VERSION=	${NSS_RELEASE:C/[0-9.]*\.//}
-NSS_DIST_DIR_VERSION=	${NSS_MAJOR_VERSION}_${NSS_MINOR_VERSION}_${NSS_PATCH_VERSION}
+MOD_MAJOR_VERSION=	${NSS_RELEASE:C/\.[0-9.]*//}
+MOD_MINOR_VERSION=	${NSS_RELEASE:S/3.//:C/\.[0-9]*//}
+MOD_PATCH_VERSION=	${NSS_RELEASE:C/[0-9.]*\.//}
+NSS_DIST_DIR_VERSION=	${MOD_MAJOR_VERSION}_${MOD_MINOR_VERSION}_${MOD_PATCH_VERSION}
 
+NSPR_MINIMUM_VERSION=	4.29
+
+PKGCONFIG_OVERRIDE=	nss.pc
 
 SUBST_CLASSES+=		config
-SUBST_VARS.config=	PREFIX
-SUBST_VARS.config+=	NSS_MAJOR_VERSION
-SUBST_VARS.config+=	NSS_MINOR_VERSION
-SUBST_VARS.config+=	NSS_PATCH_VERSION
-SUBST_VARS.config+=	COMPILER_RPATH_FLAG
+# nss.pc
 SUBST_SED.config+=	-e "s,@PTHREAD@,${BUILDLINK_LIBS.pthread:Q},"
+SUBST_SED.config+=	-e "s,%prefix%,${PREFIX},"
+SUBST_SED.config+=	-e "s,%exec_prefix%,${PREFIX},"
+SUBST_SED.config+=	-e "s,%libdir%,${PREFIX}/lib/nss,"
+SUBST_SED.config+=	-e "s,%includedir%,${PREFIX}/include/nss,"
+SUBST_SED.config+=	-e "s,%NSS_VERSION%,${PKGVERSION_NOREV},"
+SUBST_SED.config+=	-e "s,%NSPR_VERSION%,${NSPR_MINIMUM_VERSION},"
+# nss-config
+SUBST_SED.config+=	-e "s,@prefix@,${PREFIX},"
+SUBST_VARS.config+=	MOD_MAJOR_VERSION
+SUBST_VARS.config+=	MOD_MINOR_VERSION
+SUBST_VARS.config+=	MOD_PATCH_VERSION
 SUBST_STAGE.config=	pre-build
 SUBST_MESSAGE.config=	Preparing *-config files.
 SUBST_FILES.config+=	nss.pc nss-config
 
 INSTALLATION_DIRS=	bin include/nss lib/nss lib/pkgconfig
-DIST=	${WRKSRC}/dist
 
 INSTALL_CMDS+=		certutil cmsutil crlutil derdump makepqg \
 			mangle modutil ocspclnt oidcalc p7content p7env p7sign \
@@ -117,25 +127,25 @@ INSTALL_CMDS+=		certutil cmsutil crlutil derdump makepqg \
 post-extract:
 	find ${WRKSRC} -type f | xargs ${CHMOD} 644
 	find ${WRKSRC} -type d | xargs ${CHMOD} 755
-	${CP} ${FILESDIR}/nss.pc.in ${WRKSRC}/nss.pc
-	${CP} ${FILESDIR}/nss-config.in ${WRKSRC}/nss-config
+	${CP} ${WRKSRC}/nss/pkg/pkg-config/nss.pc.in ${WRKSRC}/nss.pc
+	${CP} ${WRKSRC}/nss/pkg/pkg-config/nss-config.in ${WRKSRC}/nss-config
 
 do-install:
-	(cd ${DIST}/public/nss && pax -Lrw . ${DESTDIR}${PREFIX}/include/nss )
-	(cd ${DIST}/*_OPT.OBJ/lib && \
+	(cd ${WRKSRC}/dist/public/nss && pax -Lrw . ${DESTDIR}${PREFIX}/include/nss )
+	(cd ${WRKSRC}/dist/*_OPT.OBJ/lib && \
 		pax -Lrw *.${SO_SUFFIX} ${DESTDIR}${PREFIX}/lib/nss/ )
-	${INSTALL_DATA} ${DIST}/*_OPT.OBJ/lib/libcrmf.a \
+	${INSTALL_DATA} ${WRKSRC}/dist/*_OPT.OBJ/lib/libcrmf.a \
 		${DESTDIR}${PREFIX}/lib/nss/
 	${INSTALL_DATA} ${WRKSRC}/nss.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/nss.pc
 	${INSTALL_SCRIPT} ${WRKSRC}/nss-config ${DESTDIR}${PREFIX}/bin/nss-config
 .for cmd in ${INSTALL_CMDS}
-	${INSTALL_PROGRAM} ${DIST}/*_OPT.OBJ/bin/${cmd} ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/dist/*_OPT.OBJ/bin/${cmd} ${DESTDIR}${PREFIX}/bin
 .endfor
 
 # For consistency of libxul.so link in www/firefox.
 BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.8.4.2
 .include "../../databases/sqlite3/buildlink3.mk"
-BUILDLINK_API_DEPENDS.nspr+=	nspr>=4.29
+BUILDLINK_API_DEPENDS.nspr+=	nspr>=${NSPR_MINIMUM_VERSION}
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/nss/distinfo b/devel/nss/distinfo
index f80e011d0ab..e10ef8378d9 100644
--- a/devel/nss/distinfo
+++ b/devel/nss/distinfo
@@ -1,16 +1,12 @@
-$NetBSD: distinfo,v 1.124 2021/03/30 16:34:05 ryoon Exp $
+$NetBSD: distinfo,v 1.125 2021/04/09 06:40:59 wiz Exp $
 
 SHA1 (nss-3.63.tar.gz) = ecdf1352cb35d43a2bb4e276ece100c30a26a0ec
 RMD160 (nss-3.63.tar.gz) = f2c4c73360c3370276b5cb468139c748ed590b8f
 SHA512 (nss-3.63.tar.gz) = 2f1f75dce7fd049453cbcf53263a3d9d4d9e62ad2cc2fef4dd0d5645fe14dad4ce47ed64aae507a09214d7fccbe83c142844121f55b44783e5a1bcfe24ea671c
 Size (nss-3.63.tar.gz) = 82167087 bytes
-SHA1 (patch-am) = fea682bf03bc8b645049f93ed58554ca45f47aca
-SHA1 (patch-an) = 4ab22f2a575676b5b640bc9a760b83eb05c75e69
 SHA1 (patch-md) = 8547c9414332c02221b96719dea1e09cb741f4d1
-SHA1 (patch-me) = 3b23fb15a1a22204604ebe64345bb30734a131ba
-SHA1 (patch-mf) = 534fe5f711f60dadc3432bc805a6153535f11709
-SHA1 (patch-mg) = 3c878548c98bdea559a3e653e63e0ed22a2a8834
-SHA1 (patch-mj) = 08ca1a37afce99e0292a20348fc6855547f44e8a
+SHA1 (patch-me) = ffb5f119764c158c0bd789bd18fc77c61f2e9d2b
+SHA1 (patch-mf) = 40e58385fb6f944f463bf00b9aad72bc4ea229d0
 SHA1 (patch-mn) = 5b79783e48249044be1a904a6cfd20ba175b5fd4
 SHA1 (patch-nss_cmd_platlibs.mk) = 01f4350de601b29c94e8a791a28daca226866bb6
 SHA1 (patch-nss_cmd_shlibsign_sign.sh) = 7948b7b502a4c148ee185836dde8a84d3aa388af
@@ -19,7 +15,6 @@ SHA1 (patch-nss_coreconf_OpenBSD.mk) = 1a4c3711d5d1f7f9e8d58b36145b15d7e444d754
 SHA1 (patch-nss_coreconf_command.mk) = a7b682d367825b48f8802fa30cee83f10680bb74
 SHA1 (patch-nss_lib_freebl_aes-armv8.c) = aa698f61dd3d66ba707a9b5425bc15d057244ad7
 SHA1 (patch-nss_lib_freebl_gcm-aarch64.c) = 311cfe7ca58e91285052d0ca27bd2df3f325071b
-SHA1 (patch-nss_lib_freebl_md5.c) = 5cbec40695e296f0713895fb85cd37f6df76b85b
 SHA1 (patch-nss_lib_util_utilpars.c) = 5d3000515b01037929730a752b7d7a0f46f06deb
 SHA1 (patch-nss_tests_all.sh) = b328778b538db66f5447f962f23afd6f650f7071
 SHA1 (patch-nss_tests_merge_merge.sh) = 42a4866d226b1076740ba9a5e42c7604f2cb15a7
diff --git a/devel/nss/files/nss-config.in b/devel/nss/files/nss-config.in
deleted file mode 100644
index 6b8c6312037..00000000000
--- a/devel/nss/files/nss-config.in
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/bin/sh
-
-prefix=@PREFIX@
-
-major_version=@NSS_MAJOR_VERSION@
-minor_version=@NSS_MINOR_VERSION@
-patch_version=@NSS_PATCH_VERSION@
-
-usage()
-{
-	cat <<EOF
-Usage: nss-config [OPTIONS] [LIBRARIES]
-Options:
-	[--prefix[=DIR]]
-	[--exec-prefix[=DIR]]
-	[--includedir[=DIR]]
-	[--libdir[=DIR]]
-	[--version]
-	[--libs]
-	[--cflags]
-Dynamic Libraries:
-	nss
-	ssl
-	smime
-	nssutil
-EOF
-	exit $1
-}
-
-if test $# -eq 0; then
-	usage 1 1>&2
-fi
-
-lib_ssl=yes
-lib_smime=yes
-lib_nss=yes
-lib_nssutil=yes
-
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      prefix=$optarg
-      ;;
-    --prefix)
-      echo_prefix=yes
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      ;;
-    --exec-prefix)
-      echo_exec_prefix=yes
-      ;;
-    --includedir=*)
-      includedir=$optarg
-      ;;
-    --includedir)
-      echo_includedir=yes
-      ;;
-    --libdir=*)
-      libdir=$optarg
-      ;;
-    --libdir)
-      echo_libdir=yes
-      ;;
-    --version)
-      echo ${major_version}.${minor_version}.${patch_version}
-      ;;
-    --cflags)
-      echo_cflags=yes
-      ;;
-    --libs)
-      echo_libs=yes
-      ;;
-    ssl)
-      lib_ssl=yes
-      ;;
-    smime)
-      lib_smime=yes
-      ;;
-    nss)
-      lib_nss=yes
-      ;;
-    nssutil)
-      lib_nssutil=yes
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
-  esac
-  shift
-done
-
-# Set variables that may be dependent upon other variables
-if test -z "$exec_prefix"; then
-    exec_prefix=`pkg-config --variable=exec_prefix nss`
-    if test -z "$exec_prefix"; then
-        exec_prefix=`pkg-config --variable=prefix nss`/bin
-    fi
-fi
-if test -z "$includedir"; then
-    includedir=`pkg-config --variable=includedir nss`
-fi
-if test -z "$libdir"; then
-    libdir=`pkg-config --variable=libdir nss`
-fi
-
-if test -z "$cflags"; then
-    cflags=`pkg-config --cflags nss`
-fi
-
-if test -z "$libs"; then
-    libs=`pkg-config --libs nss`
-fi
-
-if test "$echo_prefix" = "yes"; then
-    echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
-    echo $exec_prefix
-fi
-
-if test "$echo_includedir" = "yes"; then
-    echo $includedir
-fi
-
-if test "$echo_libdir" = "yes"; then
-    echo $libdir
-fi
-
-if test "$echo_cflags" = "yes"; then
-    echo $cflags
-fi
-
-if test "$echo_libs" = "yes"; then
-   echo $libs
-fi
diff --git a/devel/nss/files/nss.pc.in b/devel/nss/files/nss.pc.in
deleted file mode 100644
index 945dffb2462..00000000000
--- a/devel/nss/files/nss.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@PREFIX@/bin
-libdir=@PREFIX@/lib/nss
-includedir=@PREFIX@/include/nss
-
-Name: NSS
-Description: Mozilla Network Security Services
-Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
-Requires: nspr >= 4.10.3
-Cflags: -I${includedir}
-Libs: @COMPILER_RPATH_FLAG@${libdir} -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3 -lnssutil3 @PTHREAD@
diff --git a/devel/nss/patches/patch-am b/devel/nss/patches/patch-am
deleted file mode 100644
index dddd48f969c..00000000000
--- a/devel/nss/patches/patch-am
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-am,v 1.6 2019/05/05 22:47:28 ryoon Exp $
-
-SHA1_Update and MD5_Update conflict with openssl which may be dynamically
-loaded at runtime via libcups or libgssapi so causing a crash due to using
-the wrong binding.  So rename here to avoid conflict.
-
---- nss/lib/freebl/blapi.h.orig	2019-03-16 00:25:08.000000000 +0000
-+++ nss/lib/freebl/blapi.h
-@@ -1046,6 +1046,8 @@ extern void MD5_DestroyContext(MD5Contex
- */
- extern void MD5_Begin(MD5Context *cx);
- 
-+#define MD5_Update NSS_MD5_Update
-+
- /*
- ** Update the MD5 hash function with more data.
- **  "cx" the context
-@@ -1211,6 +1213,8 @@ extern void SHA1_DestroyContext(SHA1Cont
- */
- extern void SHA1_Begin(SHA1Context *cx);
- 
-+#define SHA1_Update NSS_SHA1_Update
-+
- /*
- ** Update the SHA-1 hash function with more data.
- **  "cx" the context
diff --git a/devel/nss/patches/patch-an b/devel/nss/patches/patch-an
deleted file mode 100644
index cbecc888cae..00000000000
--- a/devel/nss/patches/patch-an
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-an,v 1.6 2013/07/20 09:28:12 ryoon Exp $
-
-SHA1_Update conflicts with openssl which may be dynamically loaded
-at runtime via libcups or libgssapi so causing a crash due to using
-the wrong binding.  So rename here to avoid conflict.
-
---- nss/lib/freebl/sha-fast-amd64-sun.s.orig	2009-06-29 18:15:14.000000000 +0200
-+++ nss/lib/freebl/sha-fast-amd64-sun.s
-@@ -1712,9 +1712,9 @@ shaCompress:
- .LFE7:
- 	.size	shaCompress, .-shaCompress
- 	.align 16
--.globl SHA1_Update
--	.type	SHA1_Update, @function
--SHA1_Update:
-+.globl NSS_SHA1_Update
-+	.type	NSS_SHA1_Update, @function
-+NSS_SHA1_Update:
- .LFB5:
- 	pushq	%rbp
- .LCFI5:
-@@ -1800,7 +1800,7 @@ SHA1_Update:
- 	call	shaCompress
- 	jmp	.L245
- .LFE5:
--	.size	SHA1_Update, .-SHA1_Update
-+	.size	NSS_SHA1_Update, .-NSS_SHA1_Update
- 	.section	.rodata
- 	.align 32
- 	.type	bulk_pad.0, @object
-@@ -1902,7 +1902,7 @@ SHA1_End:
- 	subl	%r8d, %edx
- 	andl	$63, %edx
- 	incl	%edx
--	call	SHA1_Update@PLT
-+	call	NSS_SHA1_Update@PLT
- 	movq	%rbx, %rdi
- 	movq	%r12, %rsi
- 	shrq	$32, %rdi
-@@ -2018,7 +2018,7 @@ SHA1_HashBuf:
- 	movl	%r12d, %edx
- 	movq	%r13, %rsi
- 	movq	%rbx, %rdi
--	call	SHA1_Update@PLT
-+	call	NSS_SHA1_Update@PLT
- 	leaq	-292(%rbp), %rdx
- 	movq	%r14, %rsi
- 	movq	%rbx, %rdi
diff --git a/devel/nss/patches/patch-me b/devel/nss/patches/patch-me
index b253d7d2881..64700b028c6 100644
--- a/devel/nss/patches/patch-me
+++ b/devel/nss/patches/patch-me
@@ -1,18 +1,9 @@
-$NetBSD: patch-me,v 1.8 2020/04/12 15:13:34 tnn Exp $
+$NetBSD: patch-me,v 1.9 2021/04/09 06:40:59 wiz Exp $
 
-Add DragonFly support.
+clang for SunOS(?)
 
 --- nss/lib/freebl/Makefile.orig	2020-03-06 18:44:20.000000000 +0000
 +++ nss/lib/freebl/Makefile
-@@ -320,7 +320,7 @@ endif
- # to bind the blapi function references in FREEBLVector vector
- # (ldvector.c) to the blapi functions defined in the freebl
- # shared libraries.
--ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
-+ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
-     MKSHLIB += -Wl,-Bsymbolic
- endif
- 
 @@ -472,7 +472,11 @@ else
      ifdef NS_USE_GCC
  	LD = gcc
diff --git a/devel/nss/patches/patch-mf b/devel/nss/patches/patch-mf
index 6bd718d5425..a0f5a7d80fb 100644
--- a/devel/nss/patches/patch-mf
+++ b/devel/nss/patches/patch-mf
@@ -1,19 +1,9 @@
-$NetBSD: patch-mf,v 1.5 2016/04/17 19:27:10 ryoon Exp $
+$NetBSD: patch-mf,v 1.6 2021/04/09 06:40:59 wiz Exp $
 
-Add DragonFly support.
 Make sure nss libraries have a run path defined.
 
 --- nss/coreconf/config.mk.orig	2016-02-26 20:51:11.000000000 +0000
 +++ nss/coreconf/config.mk
-@@ -31,7 +31,7 @@ endif
- #######################################################################
- 
- TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
--              AIX RISCOS WINNT WIN95 Linux Android
-+              AIX RISCOS WINNT WIN95 Linux Android DragonFly
- 
- ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
- include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
 @@ -187,6 +187,7 @@ endif
  DEFINES += -DUSE_UTIL_DIRECTLY
  USE_UTIL_DIRECTLY = 1
diff --git a/devel/nss/patches/patch-mg b/devel/nss/patches/patch-mg
deleted file mode 100644
index 009f422ec7b..00000000000
--- a/devel/nss/patches/patch-mg
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD: patch-mg,v 1.2 2013/07/20 09:28:12 ryoon Exp $
-
-Add DragonFly support.
-
---- nss/coreconf/DragonFly.mk.orig	2009-06-30 22:20:24.000000000 +0200
-+++ nss/coreconf/DragonFly.mk
-@@ -0,0 +1,83 @@
-+#
-+# 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 security libraries.
-+# 
-+# The Initial Developer of the Original Code is Netscape
-+# Communications Corporation.  Portions created by Netscape are 
-+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-+# Rights Reserved.
-+# 
-+# Contributor(s):
-+# 
-+# Alternatively, the contents of this file may be used under the
-+# terms of the GNU General Public License Version 2 or later (the
-+# "GPL"), in which case the provisions of the GPL are applicable 
-+# instead of those above.  If you wish to allow use of your 
-+# version of this file only under the terms of the GPL and not to
-+# allow others to use your version of this file under the MPL,
-+# indicate your decision by deleting the provisions above and
-+# replace them with the notice and other provisions required by
-+# the GPL.  If you do not delete the provisions above, a recipient
-+# may use your version of this file under either the MPL or the
-+# GPL.
-+#
-+# Config stuff for DragonFly
-+#
-+
-+include $(CORE_DEPTH)/coreconf/UNIX.mk
-+
-+DEFAULT_COMPILER	= gcc
-+CC			= gcc
-+CCC			= g++
-+RANLIB			= ranlib
-+
-+ifeq ($(OS_TEST),alpha)
-+CPU_ARCH		= alpha
-+else
-+CPU_ARCH		= x86
-+endif
-+
-+OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+
-+DSO_CFLAGS		= -fPIC
-+DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
-+
-+#
-+# The default implementation strategy for FreeBSD is pthreads.
-+#
-+ifndef CLASSIC_NSPR
-+USE_PTHREADS		= 1
-+DEFINES			+= -D_THREAD_SAFE -D_REENTRANT
-+OS_LIBS			+= -pthread
-+DSO_LDOPTS		+= -pthread
-+endif
-+
-+ARCH			= freebsd
-+
-+MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+
-+DLL_SUFFIX		= so
-+
-+ifdef LIBRUNPATH
-+DSO_LDOPTS		+= -Wl,-R$(LIBRUNPATH)
-+endif
-+
-+MKSHLIB			= $(CC) $(DSO_LDOPTS)
-+ifdef MAPFILE
-+# Add LD options to restrict exported symbols to those in the map file
-+endif
-+# Change PROCESS to put the mapfile in the correct format for this platform
-+PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-+
-+G++INCLUDES		= -I/usr/include/g++
-+
-+INCLUDES		+= -I/usr/X11R6/include
diff --git a/devel/nss/patches/patch-mj b/devel/nss/patches/patch-mj
deleted file mode 100644
index fa4ff8458c4..00000000000
--- a/devel/nss/patches/patch-mj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-mj,v 1.2 2013/07/20 09:28:12 ryoon Exp $
-
-Add DragonFly support.
-
---- nss/coreconf/arch.mk.orig	2009-06-29 18:15:11.000000000 +0200
-+++ nss/coreconf/arch.mk
-@@ -146,7 +146,7 @@ endif
- # IRIX 6.5-ALPHA-1289139620.
- #
- 
--ifeq (,$(filter-out Linux FreeBSD IRIX,$(OS_ARCH)))
-+ifeq (,$(filter-out Linux DragonFly FreeBSD IRIX,$(OS_ARCH)))
-     OS_RELEASE := $(shell echo $(OS_RELEASE) | sed 's/-.*//')
- endif
- 
diff --git a/devel/nss/patches/patch-nss_lib_freebl_md5.c b/devel/nss/patches/patch-nss_lib_freebl_md5.c
deleted file mode 100644
index 57149ea09e9..00000000000
--- a/devel/nss/patches/patch-nss_lib_freebl_md5.c
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-nss_lib_freebl_md5.c,v 1.1 2019/05/05 22:47:28 ryoon Exp $
-
-MD5_Update conflicts with openssl which may be dynamically loaded
-at runtime via libcups or libgssapi so causing a crash due to using
-the wrong binding.  So rename here to avoid conflict.
-
---- nss/lib/freebl/md5.c.orig	2019-03-16 00:25:08.000000000 +0000
-+++ nss/lib/freebl/md5.c
-@@ -205,7 +205,7 @@ MD5_HashBuf(unsigned char *dest, const u
-     MD5Context cx;
- 
-     MD5_Begin(&cx);
--    MD5_Update(&cx, src, src_length);
-+    NSS_MD5_Update(&cx, src, src_length);
-     MD5_End(&cx, dest, &len, MD5_HASH_LEN);
-     memset(&cx, 0, sizeof cx);
-     return SECSuccess;
-@@ -419,7 +419,7 @@ md5_compress(MD5Context *cx, const PRUin
- }
- 
- void
--MD5_Update(MD5Context *cx, const unsigned char *input, unsigned int inputLen)
-+NSS_MD5_Update(MD5Context *cx, const unsigned char *input, unsigned int inputLen)
- {
-     PRUint32 bytesToConsume;
-     PRUint32 inBufIndex = cx->lsbInput & 63;
-@@ -509,9 +509,9 @@ MD5_End(MD5Context *cx, unsigned char *d
-     lowInput <<= 3;
- 
-     if (inBufIndex < MD5_END_BUFFER) {
--        MD5_Update(cx, padbytes, MD5_END_BUFFER - inBufIndex);
-+        NSS_MD5_Update(cx, padbytes, MD5_END_BUFFER - inBufIndex);
-     } else {
--        MD5_Update(cx, padbytes,
-+        NSS_MD5_Update(cx, padbytes,
-                    MD5_END_BUFFER + MD5_BUFFER_SIZE - inBufIndex);
-     }
-