- 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.

11 files changed, 0 insertions, 228 deletions

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)