From owner-freebsd-gecko@FreeBSD.ORG Thu Aug 9 06:40:32 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2404A106564A for ; Thu, 9 Aug 2012 06:40:32 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 4FF4D8FC0A for ; Thu, 9 Aug 2012 06:40:31 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q796eUlh089548 for ; Thu, 9 Aug 2012 06:40:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q796eOYg083334 for freebsd-gecko@freebsd.org; Thu, 9 Aug 2012 06:40:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 9 Aug 2012 06:40:24 GMT Message-Id: <201208090640.q796eOYg083334@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r914 - in branches/experimental: Mk mail/thunderbird-esr/files mail/thunderbird/files mail/thunderbird3/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/firefox36/files www/libxul/files www/libxul19/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Aug 2012 06:40:32 -0000 Author: jbeich Date: Thu Aug 9 06:40:24 2012 New Revision: 914 Log: nuke patches for bundled nss Let's maintain only one place - security/nss port. There patches are in better shape, more up to date and try to push some upstream. Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-nss-lib-Makefile branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/mail/thunderbird/files/patch-mozilla-security-nss-lib-Makefile branches/experimental/mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/mail/thunderbird3/files/patch-mozilla-security-nss-lib-Makefile branches/experimental/mail/thunderbird3/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/firefox-esr/files/patch-security-nss-lib-Makefile branches/experimental/www/firefox-esr/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c branches/experimental/www/firefox-nightly/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-Makefile branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/firefox/files/patch-security-nss-lib-Makefile branches/experimental/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/firefox36/files/patch-security-nss-lib-Makefile branches/experimental/www/firefox36/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk branches/experimental/www/libxul/files/patch-security-nss-lib-Makefile branches/experimental/www/libxul/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c branches/experimental/www/libxul19/files/patch-security-nss-lib-Makefile branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk branches/experimental/www/libxul19/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/www/seamonkey/files/patch-mozilla-security-nss-lib-Makefile Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Thu Aug 9 06:40:10 2012 (r913) +++ branches/experimental/Mk/bsd.gecko.mk Thu Aug 9 06:40:24 2012 (r914) @@ -575,7 +575,8 @@ nss_LIB_DEPENDS= nss3:${PORTSDIR}/security/nss nss_MOZ_OPTIONS= --with-system-nss -#nss_EXTRACT_AFTER_ARGS= --exclude mozilla*/security/nss +nss_EXTRACT_AFTER_ARGS= --exclude mozilla*/security/coreconf \ + --exclude mozilla*/security/nss nss_CPPFLAGS+= -I${LOCALBASE}/include/nss -I${LOCALBASE}/include/nss/nss nss_LDFLAGS+= -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- mozilla/security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 -+++ mozilla/security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-nss-lib-Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/security/nss/lib/Makefile~ -+++ mozilla/security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,43 +0,0 @@ ---- mozilla/security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 23:13:08.000000000 +0100 -+++ mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 23:18:46.000000000 +0100 -@@ -733,6 +733,32 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +812,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- mozilla/security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 -+++ mozilla/security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-security-nss-lib-Makefile ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/security/nss/lib/Makefile~ -+++ mozilla/security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,43 +0,0 @@ ---- mozilla/security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 23:13:08.000000000 +0100 -+++ mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 23:18:46.000000000 +0100 -@@ -733,6 +733,32 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +812,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,39 +0,0 @@ ---- mozilla/security/coreconf/FreeBSD.mk.orig 2010-04-30 19:44:32.000000000 +0000 -+++ mozilla/security/coreconf/FreeBSD.mk 2010-05-10 13:04:45.000000000 +0000 -@@ -52,6 +52,19 @@ - ifeq ($(CPU_ARCH),amd64) - CPU_ARCH = x86_64 - endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -78,7 +87,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +96,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/mail/thunderbird3/files/patch-mozilla-security-nss-lib-Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-mozilla-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/security/nss/lib/Makefile~ -+++ mozilla/security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/mail/thunderbird3/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,43 +0,0 @@ ---- mozilla/security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 23:13:08.000000000 +0100 -+++ mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 23:18:46.000000000 +0100 -@@ -733,6 +733,32 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +812,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 -+++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/www/firefox-esr/files/patch-security-nss-lib-Makefile ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- security/nss/lib/Makefile~ -+++ security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/www/firefox-esr/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,45 +0,0 @@ ---- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-27 20:08:16.000000000 +0100 -+++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-27 20:09:24.000000000 +0100 -@@ -733,6 +733,34 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ -+ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +814,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/www/firefox-nightly/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 -+++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- security/nss/lib/Makefile~ -+++ security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,45 +0,0 @@ ---- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-27 20:08:16.000000000 +0100 -+++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-27 20:09:24.000000000 +0100 -@@ -733,6 +733,34 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ -+ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +814,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 -+++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/www/firefox/files/patch-security-nss-lib-Makefile ============================================================================== --- branches/experimental/www/firefox/files/patch-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- security/nss/lib/Makefile~ -+++ security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c ============================================================================== --- branches/experimental/www/firefox/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,45 +0,0 @@ ---- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-27 20:08:16.000000000 +0100 -+++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-27 20:09:24.000000000 +0100 -@@ -733,6 +733,34 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ -+ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +814,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig 2010-03-16 09:57:06.000000000 +0000 -+++ security/coreconf/FreeBSD.mk 2010-03-20 17:40:12.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/www/firefox36/files/patch-security-nss-lib-Makefile ============================================================================== --- branches/experimental/www/firefox36/files/patch-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- security/nss/lib/Makefile~ -+++ security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/www/firefox36/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c ============================================================================== --- branches/experimental/www/firefox36/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,44 +0,0 @@ ---- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 18:44:42.000000000 +0100 -+++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 18:46:41.000000000 +0100 -@@ -733,6 +733,33 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +813,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 -+++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/www/libxul/files/patch-security-nss-lib-Makefile ============================================================================== --- branches/experimental/www/libxul/files/patch-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- security/nss/lib/Makefile~ -+++ security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/www/libxul/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c ============================================================================== --- branches/experimental/www/libxul/files/patch-security-nss-lib-freebl-mpi-mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,45 +0,0 @@ ---- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-27 20:08:16.000000000 +0100 -+++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-27 20:09:24.000000000 +0100 -@@ -733,6 +733,34 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ -+ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +814,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/www/libxul19/files/patch-security-nss-lib-Makefile ============================================================================== --- branches/experimental/www/libxul19/files/patch-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- security/nss/lib/Makefile~ -+++ security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif Deleted: branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk ============================================================================== --- branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig 2010-03-16 09:57:06.000000000 +0000 -+++ security/coreconf/FreeBSD.mk 2010-03-20 17:40:12.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/www/libxul19/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c ============================================================================== --- branches/experimental/www/libxul19/files/patch-security_nss_lib_freebl_mpi_mpcpucache.c Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,44 +0,0 @@ ---- security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 18:44:42.000000000 +0100 -+++ security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 18:46:41.000000000 +0100 -@@ -733,6 +733,33 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +813,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,46 +0,0 @@ ---- mozilla/security/coreconf/FreeBSD.mk.orig 2010-03-16 09:57:06.000000000 +0000 -+++ mozilla/security/coreconf/FreeBSD.mk 2010-03-20 17:40:12.000000000 +0000 -@@ -49,8 +49,24 @@ - ifeq ($(CPU_ARCH),pc98) - CPU_ARCH = x86 - endif --ifeq ($(CPU_ARCH),amd64) --CPU_ARCH = x86_64 -+ifeq ($(OS_TEST),alpha) -+CPU_ARCH = alpha -+endif -+ifeq ($(OS_TEST),x86_64) -+CPU_ARCH = x86_64 -+endif -+ifeq ($(OS_TEST),ia64) -+CPU_ARCH = ia64 -+endif -+ifeq ($(OS_TEST),powerpc64) -+CPU_ARCH = powerpc -+USE_64 = 1 -+endif -+ifeq ($(OS_TEST),powerpc) -+CPU_ARCH = powerpc -+endif -+ifeq ($(OS_TEST),sparc64) -+CPU_ARCH = sparc64 - endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -78,7 +90,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif -@@ -87,4 +99,6 @@ - - G++INCLUDES = -I/usr/include/g++ - --INCLUDES += -I/usr/X11R6/include -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+INCLUDES += -I$(LOCALBASE)/include Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-security-nss-lib-Makefile ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-security-nss-lib-Makefile Thu Aug 9 06:40:24 2012 (r913) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/security/nss/lib/Makefile~ -+++ mozilla/security/nss/lib/Makefile -@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc - endif - - ifndef MOZILLA_CLIENT --ifndef NSS_USE_SYSTEM_SQLITE -+ifndef MOZ_NATIVE_SQLITE - SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. - endif - endif