- update to 3.12.4.5

- reach over to xulrunner, track the stable gecko release
- use external sqlite3
- cleanup
- take maintainership

This is the second part of PR pkg/42277.

16 files changed, 43 insertions, 385 deletions

diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 86709107d18..9c1f5edf805 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,28 +1,18 @@
-# $NetBSD: Makefile,v 1.33 2009/08/19 15:01:21 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2010/01/16 14:41:25 tnn Exp $
 
-DISTNAME=		nss-3.11.5
+.include "../../devel/xulrunner/dist.mk"
+PKGNAME=		${DISTNAME:S/firefox-3.5/nss-${NSS_RELEASE}/:S/.source//}
+NSS_RELEASE=		3.12.4.5
 CATEGORIES=		security
-MASTER_SITES=		${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_3_11_5_RTM/src/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		tnn@NetBSD.org
 HOMEPAGE=		http://www.mozilla.org/projects/security/pki/nss/
 COMMENT=		Libraries to support development of security-enabled applications
 
-BUILD_DEPENDS+=		zip>=2.3:../../archivers/zip
-
 PKG_DESTDIR_SUPPORT=	user-destdir
+CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
 
-BUILD_DIRS=		mozilla/security/nss
-
-USE_TOOLS+=		awk gmake pax perl
-DIST=			${WRKSRC}/mozilla/dist
-BUILD_TARGET=		nss_build_all
-MAKE_ENV+=		LD_LIBS="-L${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/nss"
-MAKE_ENV+=		LIBRUNPATH=${PREFIX}/lib BUILD_OPT=1
-
-INSTALLATION_DIRS=	include/nss lib/nss lib/pkgconfig
-
-MAKE_JOBS_SAFE=		no
+USE_TOOLS+=		gmake perl pax
 
 .include		"../../mk/bsd.prefs.mk"
 
@@ -36,18 +26,36 @@ SO_SUFFIX=		so.1.0
 PLIST_SUBST+=		SO_SUFFIX=${SO_SUFFIX:Q}
 
 .if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc)
-MAKEFLAGS+=	NS_USE_GCC=YES
+MAKE_ENV+=	NS_USE_GCC=YES
 .endif
 
-.if ${OPSYS} == "Linux"
-.  if defined(ABI) && ${ABI} == "64"
-MAKE_FLAGS+=		USE_64=1
+.for platform in ${LP64PLATFORMS}
+.  if ${MACHINE_PLATFORM:M${platform}}
+MAKE_ENV+=	USE_64=1
 .  endif
-.endif
+.endfor
+
+MAKE_ENV+=	BUILD_OPT=1
+#MAKE_ENV+=	OPTIMIZER=${CFLAGS:Q}
+MAKE_ENV+=	INCLUDES=-I${BUILDLINK_PREFIX.nspr}/include/nspr
+MAKE_ENV+=	NSS_USE_SYSTEM_SQLITE=1
+MAKE_ENV+=	EXTRA_SHARED_LIBS="-Wl,-R${BUILDLINK_PREFIX.nspr}/lib/nspr -Wl,-R,${PREFIX}/lib/nss -L${BUILDLINK_PREFIX.nspr}/lib/nspr -lplc4 -lplds4 -lnspr4"
 
 pre-configure:
-	${CP} ${FILESDIR}/DragonFly.mk \
-		${WRKSRC}/mozilla/security/coreconf/
+# sanity check: make sure the nss release is what we think it is.
+	@set -e; if [ '"${NSS_RELEASE}"' !=			\
+	  "`${AWK} '/NSS_VERSION/ {print $$3}' <		\
+	  ${WRKSRC}/security//nss/lib/nss/nss.h`" ]; then	\
+	  ${ECHO} "package is out of date";			\
+	  exit 1;						\
+	fi
+
+do-build:
+	cd ${WRKSRC}/security/nss && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
+	  build_coreconf build_dbm all
+
+INSTALLATION_DIRS=	include/nss lib/nss lib/pkgconfig
+DIST=	${WRKSRC}/dist
 
 do-install:
 	(cd ${DIST}/public && pax -Lrwpe . ${DESTDIR}${PREFIX}/include/nss/ )
@@ -57,34 +65,14 @@ do-install:
 	{ ${ECHO} "Name: NSS"; \
 	  ${ECHO} "Description: Mozilla Network Security Services"; \
 	  ${ECHO} "Version: ${PKGVERSION}"; \
-	  ${ECHO} "Cflags: -I${PREFIX}/include/nss"; \
+	  ${ECHO} "Requires: nspr >= 4.8.2"; \
+	  ${ECHO} "Cflags: -I${PREFIX}/include/nss/nss -I${PREFIX}/include/nss"; \
 	  ${ECHO} "Libs: -L${PREFIX}/lib/nss" \
 	      "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nss" \
 	      "-lnss3 -lsmime3 -lssl3 -lsoftokn3 "${BUILDLINK_LIBS.pthread:Q}; \
 	} >${DESTDIR}${PREFIX}/lib/pkgconfig/nss.pc
 
-# The exact set of libfreebl* libs built and installed depends on the
-# operating system and platform.  For example, on solaris/sparc you might
-# get
-#  libfreebl_32fpu_3.so
-#  libfreebl_32int_3.so
-#  libfreebl_32int64_3.so
-# and on others
-#  libfreebl3.so
-# Since this has been a continual problem in many mozilla packages, just
-# do that part dynamically rather than trying to always keep our conditionals
-# up to date.
-PLIST_SRC=	${WRKDIR}/PLIST
-post-install:
-	${AWK} '/@comment libfreebl/ {exit} {print}' ${.CURDIR}/PLIST > ${PLIST_SRC}
-	ls ${DESTDIR}${PREFIX}/lib/nss/libfreebl*.${SO_SUFFIX} | ${SORT} | \
-		${SED} 's;${DESTDIR}${PREFIX}/;;g' >> ${PLIST_SRC}
-	${AWK} 'ok == 1 {print} /@comment libfreebl/ {ok=1}' ${.CURDIR}/PLIST >> ${PLIST_SRC}
-	cd ${DESTDIR}${PREFIX}/include/nss && \
-		${CHMOD} ${SHAREMODE} nss/*.h dbm/*.h nss/*.api
-
-BUILDLINK_API_DEPENDS.nspr+=	nspr>=4.4.1nb2
-
 .include "../../devel/nspr/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/nss/PLIST b/devel/nss/PLIST
index 5c766785c1f..9cd100c4acc 100644
--- a/devel/nss/PLIST
+++ b/devel/nss/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:49:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2010/01/16 14:41:25 tnn Exp $
 include/nss/dbm/cdefs.h
 include/nss/dbm/mcom_db.h
 include/nss/dbm/ncompat.h
@@ -47,6 +47,7 @@ include/nss/nss/nssilock.h
 include/nss/nss/nsslocks.h
 include/nss/nss/nssrwlk.h
 include/nss/nss/nssrwlkt.h
+include/nss/nss/nssutil.h
 include/nss/nss/ocsp.h
 include/nss/nss/ocspt.h
 include/nss/nss/p12.h
@@ -92,10 +93,12 @@ include/nss/nss/ssl.h
 include/nss/nss/sslerr.h
 include/nss/nss/sslproto.h
 include/nss/nss/sslt.h
-include/nss/nss/watcomfx.h
-@comment libfreebl
+include/nss/nss/utilrename.h
+lib/nss/libfreebl3.${SO_SUFFIX}
 lib/nss/libnss3.${SO_SUFFIX}
 lib/nss/libnssckbi.${SO_SUFFIX}
+lib/nss/libnssdbm3.${SO_SUFFIX}
+lib/nss/libnssutil3.${SO_SUFFIX}
 lib/nss/libsmime3.${SO_SUFFIX}
 lib/nss/libsoftokn3.${SO_SUFFIX}
 lib/nss/libssl3.${SO_SUFFIX}
diff --git a/devel/nss/buildlink3.mk b/devel/nss/buildlink3.mk
index 3b8b52c79c2..5530f2ce308 100644
--- a/devel/nss/buildlink3.mk
+++ b/devel/nss/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:25 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2010/01/16 14:41:25 tnn Exp $
 
 BUILDLINK_TREE+=	nss
 
 .if !defined(NSS_BUILDLINK3_MK)
 NSS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.nss+=		nss>=3.9.2nb1
-BUILDLINK_ABI_DEPENDS.nss+=	nss>=3.9.2nb4
+BUILDLINK_API_DEPENDS.nss+=	nss>=3.12.4.5
 BUILDLINK_PKGSRCDIR.nss?=	../../devel/nss
 
-BUILDLINK_FILES.nss+=		lib/nss/*
-BUILDLINK_FILES.nss+=		include/nss/*
-
-BUILDLINK_INCDIRS.nss+=		include/nss
-BUILDLINK_LIBDIRS.nss+=		lib/nss
-BUILDLINK_RPATHDIRS.nss+=	lib/nss
-
 .include "../../devel/nspr/buildlink3.mk"
 .endif # NSS_BUILDLINK3_MK
 
diff --git a/devel/nss/distinfo b/devel/nss/distinfo
deleted file mode 100644
index fe8f81fd9dd..00000000000
--- a/devel/nss/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.19 2009/10/11 07:51:48 sno Exp $
-
-SHA1 (nss-3.11.5.tar.gz) = 2cde010908ab41777e43fda83be0a925010c4a09
-RMD160 (nss-3.11.5.tar.gz) = fe49128857bbc645d6ee8824c96e9ff0461438c0
-Size (nss-3.11.5.tar.gz) = 3696893 bytes
-SHA1 (patch-aa) = 25b1442791326ba3b4c5cfa299c7a453c77e457e
-SHA1 (patch-ab) = 371e04afd51d4182a1324cbd04c1d93bdbb8949a
-SHA1 (patch-ae) = 71c90bac798706a38634a2883bd1541d76d01861
-SHA1 (patch-af) = c0e5a68911eb6503224c569552a5e94cfa036364
-SHA1 (patch-ag) = ead4d79ac6ebe718230ce47fb3e296b2b4f7584b
-SHA1 (patch-ah) = fa302e20163db73a1453b4e360f7f55377b7bea2
-SHA1 (patch-ai) = 80a18536703d7f01b28448e503f49da50b07304e
-SHA1 (patch-ak) = 371eb96e2874ef8ec841dc886a70f2b5215f701d
-SHA1 (patch-an) = c9d8f350488cc383a0e9bd25b69b270f678c4736
-SHA1 (patch-as) = 5d1c7f7bfc3f167052985c2714099f82ad8f4e25
-SHA1 (patch-at) = 3c963ca8a6a2ad8c6591d2ec37c431435cd6704a
diff --git a/devel/nss/files/DragonFly.mk b/devel/nss/files/DragonFly.mk
deleted file mode 100644
index 69354a95af3..00000000000
--- a/devel/nss/files/DragonFly.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# 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 $(BSD_LDOPTS)
-DSO_LDOPTS		+= -pthread $(BSD_LDOPTS)
-endif
-
-ARCH			= freebsd
-
-MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-
-ifeq ($(MOZ_OBJFORMAT),elf)
-DLL_SUFFIX		= so
-else
-DLL_SUFFIX		= so.1.0
-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 $@
-
-INCLUDES		+= -I/usr/X11R6/include
diff --git a/devel/nss/patches/patch-aa b/devel/nss/patches/patch-aa
deleted file mode 100644
index 8fada7fcd55..00000000000
--- a/devel/nss/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/01/20 18:55:09 wiz Exp $
-
---- mozilla/security/nss/Makefile.orig	2006-04-14 22:48:17.000000000 +0000
-+++ mozilla/security/nss/Makefile
-@@ -78,7 +78,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
- # (7) Execute "local" rules. (OPTIONAL).                              #
- #######################################################################
- 
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf build_dbm all
- 
- nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
- 
diff --git a/devel/nss/patches/patch-ab b/devel/nss/patches/patch-ab
deleted file mode 100644
index a8af03230c9..00000000000
--- a/devel/nss/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/07/12 16:30:03 rillig Exp $
-
---- mozilla/security/coreconf/command.mk.orig	2005-10-11 01:46:12.000000000 +0200
-+++ mozilla/security/coreconf/command.mk	2006-07-12 17:44:52.000000000 +0200
-@@ -45,7 +45,7 @@ ASFLAGS      += $(CFLAGS)
- CCF           = $(CC) $(CFLAGS)
- LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
- LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
--CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
-+CFLAGS       += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
- 		$(XCFLAGS)
- RANLIB        = echo
- TAR           = /bin/tar
diff --git a/devel/nss/patches/patch-ae b/devel/nss/patches/patch-ae
deleted file mode 100644
index 98b0b8b43a3..00000000000
--- a/devel/nss/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2007/01/20 18:55:09 wiz Exp $
-
---- mozilla/security/nss/cmd/platlibs.mk.orig	2006-11-17 02:13:16.000000000 +0000
-+++ mozilla/security/nss/cmd/platlibs.mk
-@@ -213,7 +213,7 @@ endif
- # If GNU ld is used, we must use the -rpath-link option to tell
- # the linker where to find libsoftokn3.so, an implicit dependency
- # of libnss3.so.
--ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_ARCH)))
-+ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD DragonFly, $(OS_ARCH)))
- EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
- endif
- 
-@@ -236,6 +236,7 @@ EXTRA_SHARED_LIBS += \
- 	-L$(DIST)/lib \
- 	-lssl3 \
- 	-lsmime3 \
-+	-lsoftokn3 \
- 	-lnss3 \
- 	-L$(NSPR_LIB_DIR) \
- 	-lplc4 \
diff --git a/devel/nss/patches/patch-af b/devel/nss/patches/patch-af
deleted file mode 100644
index 761b084e66c..00000000000
--- a/devel/nss/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.6 2006/07/12 16:30:04 rillig Exp $
-
-Fix gcc4 error:
-error: array type has incomplete element type
-
---- mozilla/security/nss/lib/pki1/oiddata.h.orig	2005-03-14 19:02:00.000000000 +0100
-+++ mozilla/security/nss/lib/pki1/oiddata.h	2006-07-12 17:49:52.000000000 +0200
-@@ -46,6 +46,8 @@ static const char OIDDATA_CVS_ID[] = "@(
- #include "nsspki1t.h"
- #endif /* NSSPKI1T_H */
- 
-+#include "pki1t.h"
-+
- extern const NSSOID *NSS_OID_RFC1274_UID;
- extern const NSSOID *NSS_OID_RFC1274_EMAIL;
- extern const NSSOID *NSS_OID_RFC2247_DC;
diff --git a/devel/nss/patches/patch-ag b/devel/nss/patches/patch-ag
deleted file mode 100644
index 9c13cb6bf3e..00000000000
--- a/devel/nss/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2006/11/20 17:06:03 riz Exp $
-
---- mozilla/security/nss/cmd/shlibsign/sign.sh.orig	2005-11-15 18:17:36.000000000 -0800
-+++ mozilla/security/nss/cmd/shlibsign/sign.sh	2006-11-20 00:34:34.000000000 -0800
-@@ -44,9 +44,9 @@
-     export LIBPATH
-     SHLIB_PATH=${1}/lib:${4}:$SHLIB_PATH
-     export SHLIB_PATH
--    LD_LIBRARY_PATH=${1}/lib:${4}:$LD_LIBRARY_PATH
-+    LD_LIBRARY_PATH=${1}/lib:${4}:$PREFIX/lib
-     export LD_LIBRARY_PATH
--    DYLD_LIBRARY_PATH=${1}/lib:${4}:$DYLD_LIBRARY_PATH
-+    DYLD_LIBRARY_PATH=${1}/lib:${4}:$PREFIX/lib/nspr:$DYLD_LIBRARY_PATH
-     export DYLD_LIBRARY_PATH
-     LIBRARY_PATH=${1}/lib:${4}:$LIBRARY_PATH
-     export LIBRARY_PATH
diff --git a/devel/nss/patches/patch-ah b/devel/nss/patches/patch-ah
deleted file mode 100644
index 3a6e26d6f4a..00000000000
--- a/devel/nss/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2007/01/20 18:55:09 wiz Exp $
-
---- mozilla/security/coreconf/config.mk.orig	2006-04-28 03:36:22.000000000 +0000
-+++ mozilla/security/coreconf/config.mk
-@@ -63,7 +63,7 @@ endif
- #######################################################################
- 
- TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
--              OpenVMS AIX
-+              OpenVMS AIX DragonFly
- 
- ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
- include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
diff --git a/devel/nss/patches/patch-ai b/devel/nss/patches/patch-ai
deleted file mode 100644
index f9974f00c6f..00000000000
--- a/devel/nss/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2007/01/20 18:55:09 wiz Exp $
-
---- mozilla/dbm/src/mktemp.c.orig	2003-01-20 23:13:37.000000000 +0000
-+++ mozilla/dbm/src/mktemp.c
-@@ -98,7 +98,7 @@ mktemp(char *path)
- static int 
- _gettemp(char *path, register int *doopen, int extraFlags)
- {    
--#if !defined(_WINDOWS) || defined(_WIN32)
-+#if (!defined(_WINDOWS) || defined(_WIN32)) && !defined(errno)
- 	extern int errno;                    
- #endif
- 	register char *start, *trv;
diff --git a/devel/nss/patches/patch-ak b/devel/nss/patches/patch-ak
deleted file mode 100644
index f44525c51ae..00000000000
--- a/devel/nss/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2007/01/20 18:55:09 wiz Exp $
-
---- mozilla/security/coreconf/arch.mk.orig	2005-07-07 16:50:47.000000000 +0000
-+++ mozilla/security/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 FreeBSD IRIX DragonFly,$(OS_ARCH)))
-     OS_RELEASE := $(shell echo $(OS_RELEASE) | sed 's/-.*//')
- endif
- 
diff --git a/devel/nss/patches/patch-an b/devel/nss/patches/patch-an
deleted file mode 100644
index 1f6484ce715..00000000000
--- a/devel/nss/patches/patch-an
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-an,v 1.3 2007/01/20 18:55:09 wiz Exp $
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=323977
-https://bugzilla.mozilla.org/attachment.cgi?id=209007&action=view
-
-Added DragonFly.
-
-Also, when building on solaris with gcc, be sure to correctly set the
-flags used by the solaris assembler which is explicitly called out in
-the makefile in a couple of places.  This prevents errors when trying to
-assemble files which contain cpu specific instructions.
-
---- mozilla/security/nss/lib/freebl/Makefile.orig	2006-08-23 22:57:26.000000000 +0000
-+++ mozilla/security/nss/lib/freebl/Makefile
-@@ -196,6 +196,17 @@ ifeq (,$(filter-out BSD_OS FreeBSD Linux
-     MKSHLIB += -Wl,-Bsymbolic
- endif
- 
-+# The blapi functions are defined not only in the freebl shared
-+# libraries but also in the shared libraries linked with loader.c
-+# (libsoftokn3.so and libssl3.so).  We need to use GNU ld's
-+# -Bsymbolic option or the equivalent option for other linkers
-+# 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 DragonFly, $(OS_TARGET)))
-+    MKSHLIB += -Wl,-Bsymbolic
-+endif
-+
- ifeq ($(OS_TARGET),SunOS)
- 
- # The -R '$ORIGIN' linker option instructs this library to search for its
diff --git a/devel/nss/patches/patch-as b/devel/nss/patches/patch-as
deleted file mode 100644
index c75fa75e114..00000000000
--- a/devel/nss/patches/patch-as
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-as,v 1.1 2009/10/11 07:51:48 sno Exp $
-
-Apply patches from FreeBSD ports
-
---- mozilla/security/coreconf/FreeBSD.mk.orig	2009-09-27 13:47:48.000000000 +0200
-+++ mozilla/security/coreconf/FreeBSD.mk	2009-09-27 14:01:51.000000000 +0200
-@@ -37,13 +37,25 @@
- 
- include $(CORE_DEPTH)/coreconf/UNIX.mk
- 
--DEFAULT_COMPILER	= gcc
--CC			= gcc
--CCC			= g++
-+DEFAULT_COMPILER	= $(CC)
-+CC			?= gcc
-+CCC			= $(CXX)
- RANLIB			= ranlib
- 
- ifeq ($(OS_TEST),alpha)
- CPU_ARCH		= alpha
-+ifeq ($(OS_TEST),powerpc)
-+CPU_ARCH		= powerpc
-+else
-+ifeq ($(OS_TEST),sparc64)
-+CPU_ARCH		= sparc64
-+USE_64			= 1
-+else
-+ifeq ($(OS_TEST),amd64)
-+USE_64			= 1
-+endif
-+endif
-+endif
- else
- CPU_ARCH		= x86
- endif
-@@ -65,15 +77,15 @@
- 
- ARCH			= freebsd
- 
--MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+#MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+DLL_SUFFIX		= so.1
- 
--ifeq ($(MOZ_OBJFORMAT),elf)
--DLL_SUFFIX		= so
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS)
- else
--DLL_SUFFIX		= so.1.0
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
- endif
- 
--MKSHLIB			= $(CC) $(DSO_LDOPTS)
- ifdef MAPFILE
- 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
- endif
-@@ -83,3 +95,5 @@
- G++INCLUDES		= -I/usr/include/g++
- 
- INCLUDES		+= -I/usr/X11R6/include
-+USE_SYSTEM_ZLIB		= 1
-+ZLIB_LIBS		= -lz
diff --git a/devel/nss/patches/patch-at b/devel/nss/patches/patch-at
deleted file mode 100644
index 0db8c34d602..00000000000
--- a/devel/nss/patches/patch-at
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-at,v 1.1 2009/10/11 07:51:49 sno Exp $
-
-Fix missing *.so.1 links on FreeBSD
-
---- mozilla/security/coreconf/rules.mk.orig	2007-01-06 06:48:54.000000000 +0100
-+++ mozilla/security/coreconf/rules.mk	2009-09-27 14:12:54.000000000 +0200
-@@ -114,6 +114,9 @@
- endif
- ifdef SHARED_LIBRARY
- 	$(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR)
-+ifeq ($(OS_TARGET),FreeBSD)
-+	ln -sf $(notdir $(SHARED_LIBRARY)) $(SOURCE_LIB_DIR)/$(notdir $(SHARED_LIBRARY:.so.1=.so))
-+endif
- ifdef MOZ_DEBUG_SYMBOLS
- ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
- 	$(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR)