Date: Fri, 8 Jun 2012 14:11:16 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r731 - in branches/experimental: mail/thunderbird-beta/files mail/thunderbird-esr/files mail/thunderbird/files mail/thunderbird3/files www/firefox-beta/files www/firefox-esr/files www/firefox/files www/firefox36/files www/libxul/files www/seamonkey-beta/files www/seamonkey/files Message-ID: <201206081411.q58EBG1Q071313@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Jun 8 14:11:16 2012
New Revision: 731
Log:
- use system zlib in nss
- don't build mozsqlite3 for nss if using system sqlite
- don't try to install nspr libs if using system nspr
Added:
branches/experimental/mail/thunderbird-beta/files/patch-mozilla-browser-installer-package-manifest.in
branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-nss-lib-Makefile
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-browser-installer-package-manifest.in
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-nss-lib-Makefile
branches/experimental/mail/thunderbird/files/patch-mozilla-browser-installer-package-manifest.in
branches/experimental/mail/thunderbird/files/patch-mozilla-security-nss-lib-Makefile
branches/experimental/mail/thunderbird3/files/patch-mozilla-browser-installer-package-manifest.in
branches/experimental/mail/thunderbird3/files/patch-mozilla-security-nss-lib-Makefile
branches/experimental/www/firefox-beta/files/patch-browser-installer-package-manifest.in
branches/experimental/www/firefox-beta/files/patch-security-nss-lib-Makefile
branches/experimental/www/firefox-esr/files/patch-browser-installer-package-manifest.in
branches/experimental/www/firefox-esr/files/patch-security-nss-lib-Makefile
branches/experimental/www/firefox/files/patch-browser-installer-package-manifest.in
branches/experimental/www/firefox/files/patch-security-nss-lib-Makefile
branches/experimental/www/firefox36/files/patch-browser-installer-package-manifest.in
branches/experimental/www/firefox36/files/patch-security-nss-lib-Makefile
branches/experimental/www/libxul/files/patch-browser-installer-package-manifest.in
branches/experimental/www/libxul/files/patch-security-nss-lib-Makefile
branches/experimental/www/seamonkey-beta/files/patch-mozilla-browser-installer-package-manifest.in
branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-nss-lib-Makefile
branches/experimental/www/seamonkey/files/patch-mozilla-browser-installer-package-manifest.in
branches/experimental/www/seamonkey/files/patch-mozilla-security-nss-lib-Makefile
Modified:
branches/experimental/mail/thunderbird-beta/files/patch-configure.in
branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk
branches/experimental/mail/thunderbird-esr/files/patch-configure.in
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk
branches/experimental/mail/thunderbird/files/patch-configure.in
branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk
branches/experimental/mail/thunderbird3/files/patch-configure.in
branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk
branches/experimental/www/firefox-beta/files/patch-configure.in
branches/experimental/www/firefox-beta/files/patch-security-coreconf-FreeBSD.mk
branches/experimental/www/firefox-esr/files/patch-configure.in
branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk
branches/experimental/www/firefox/files/patch-configure.in
branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk
branches/experimental/www/firefox36/files/patch-configure.in
branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk
branches/experimental/www/libxul/files/patch-configure.in
branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk
branches/experimental/www/seamonkey-beta/files/patch-configure.in
branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk
branches/experimental/www/seamonkey/files/patch-configure.in
branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk
Modified: branches/experimental/mail/thunderbird-beta/files/patch-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/patch-configure.in Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/mail/thunderbird-beta/files/patch-configure.in Fri Jun 8 14:11:16 2012 (r731)
@@ -101,6 +101,16 @@
],
[
const char *input = "testing";
+@@ -4218,6 +4218,9 @@ else
+ NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
+ fi
+ fi
++if test -n "$MOZ_NATIVE_NSPR"; then
++ AC_DEFINE(MOZ_NATIVE_NSPR)
++fi
+
+ dnl system libevent Support
+ dnl ========================================================
@@ -4383,7 +4386,7 @@
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-browser-installer-package-manifest.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-browser-installer-package-manifest.in Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,24 @@
+--- mozilla/browser/installer/package-manifest.in~
++++ mozilla/browser/installer/package-manifest.in
+@@ -58,9 +58,11 @@
+ #ifndef MOZ_STATIC_JS
+ @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+ #endif
++#ifndef MOZ_NATIVE_NSPR
+ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
++#endif
+ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ #ifdef XP_MACOSX
+ @BINPATH@/XUL
+@@ -109,7 +111,9 @@
+ #endif
+ @BINPATH@/platform.ini
+ #ifndef XP_OS2
++#ifndef MOZ_NATIVE_SQLITE
+ @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
++#endif
+ #else
+ @BINPATH@/mozsqlt3@DLL_SUFFIX@
+ #endif
Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:11:16 2012 (r731)
@@ -36,9 +36,11 @@
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -87,4 +99,4 @@
+@@ -87,4 +99,6 @@
G++INCLUDES = -I/usr/include/g++
-INCLUDES += -I/usr/X11R6/include
-+#INCLUDES += -I/usr/local/include
++USE_SYSTEM_ZLIB = 1
++ZLIB_LIBS = -lz
++INCLUDES += -I$(LOCALBASE)/include
Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-nss-lib-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-nss-lib-Makefile Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,11 @@
+--- 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
Modified: branches/experimental/mail/thunderbird-esr/files/patch-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-configure.in Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/mail/thunderbird-esr/files/patch-configure.in Fri Jun 8 14:11:16 2012 (r731)
@@ -101,6 +101,16 @@
],
[
const char *input = "testing";
+@@ -4218,6 +4218,9 @@ else
+ NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
+ fi
+ fi
++if test -n "$MOZ_NATIVE_NSPR"; then
++ AC_DEFINE(MOZ_NATIVE_NSPR)
++fi
+
+ dnl system libevent Support
+ dnl ========================================================
@@ -4383,7 +4386,7 @@
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Added: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-browser-installer-package-manifest.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-browser-installer-package-manifest.in Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,26 @@
+--- mozilla/browser/installer/package-manifest.in~
++++ mozilla/browser/installer/package-manifest.in
+@@ -40,10 +40,12 @@
+ #ifndef MOZ_STATIC_JS
+ @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+ #endif
++#ifndef MOZ_NATIVE_NSPR
+ @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
+-@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
++#endif
++@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@
+ #ifdef XP_MACOSX
+@@ -109,7 +111,9 @@
+ #endif
+ @BINPATH@/platform.ini
+ #ifndef XP_OS2
++#ifndef MOZ_NATIVE_SQLITE
+ @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
++#endif
+ #else
+ @BINPATH@/mozsqlt3@DLL_SUFFIX@
+ #endif
Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:11:16 2012 (r731)
@@ -36,9 +36,11 @@
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -87,4 +99,4 @@
+@@ -87,4 +99,6 @@
G++INCLUDES = -I/usr/include/g++
-INCLUDES += -I/usr/X11R6/include
-+#INCLUDES += -I/usr/local/include
++USE_SYSTEM_ZLIB = 1
++ZLIB_LIBS = -lz
++INCLUDES += -I$(LOCALBASE)/include
Added: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-nss-lib-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-security-nss-lib-Makefile Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,11 @@
+--- 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
Modified: branches/experimental/mail/thunderbird/files/patch-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-configure.in Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/mail/thunderbird/files/patch-configure.in Fri Jun 8 14:11:16 2012 (r731)
@@ -101,6 +101,16 @@
],
[
const char *input = "testing";
+@@ -4218,6 +4218,9 @@ else
+ NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
+ fi
+ fi
++if test -n "$MOZ_NATIVE_NSPR"; then
++ AC_DEFINE(MOZ_NATIVE_NSPR)
++fi
+
+ dnl system libevent Support
+ dnl ========================================================
@@ -4383,7 +4386,7 @@
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Added: branches/experimental/mail/thunderbird/files/patch-mozilla-browser-installer-package-manifest.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-browser-installer-package-manifest.in Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,24 @@
+--- mozilla/browser/installer/package-manifest.in~
++++ mozilla/browser/installer/package-manifest.in
+@@ -58,9 +58,11 @@
+ #ifndef MOZ_STATIC_JS
+ @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+ #endif
++#ifndef MOZ_NATIVE_NSPR
+ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
++#endif
+ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ #ifdef XP_MACOSX
+ @BINPATH@/XUL
+@@ -109,7 +111,9 @@
+ #endif
+ @BINPATH@/platform.ini
+ #ifndef XP_OS2
++#ifndef MOZ_NATIVE_SQLITE
+ @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
++#endif
+ #else
+ @BINPATH@/mozsqlt3@DLL_SUFFIX@
+ #endif
Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:11:16 2012 (r731)
@@ -36,9 +36,11 @@
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -87,4 +99,4 @@
+@@ -87,4 +99,6 @@
G++INCLUDES = -I/usr/include/g++
-INCLUDES += -I/usr/X11R6/include
-+#INCLUDES += -I/usr/local/include
++USE_SYSTEM_ZLIB = 1
++ZLIB_LIBS = -lz
++INCLUDES += -I$(LOCALBASE)/include
Added: branches/experimental/mail/thunderbird/files/patch-mozilla-security-nss-lib-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-security-nss-lib-Makefile Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,11 @@
+--- 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
Modified: branches/experimental/mail/thunderbird3/files/patch-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird3/files/patch-configure.in Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/mail/thunderbird3/files/patch-configure.in Fri Jun 8 14:11:16 2012 (r731)
@@ -9,3 +9,13 @@
CPU_ARCH="$OS_TEST"
;;
esac
+@@ -4304,6 +4304,9 @@ else
+ NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
+ fi
+ fi
++if test -n "$MOZ_NATIVE_NSPR"; then
++ AC_DEFINE(MOZ_NATIVE_NSPR)
++fi
+
+ dnl ========================================================
+ dnl = If NSS was not detected in the system,
Added: branches/experimental/mail/thunderbird3/files/patch-mozilla-browser-installer-package-manifest.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird3/files/patch-mozilla-browser-installer-package-manifest.in Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,16 @@
+--- mozilla/browser/installer/package-manifest.in~
++++ mozilla/browser/installer/package-manifest.in
+@@ -46,10 +46,12 @@
+ #else
+ @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+ #endif
++#ifndef MOZ_NATIVE_NSPR
+ @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
+-@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
++#endif
++@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ #ifdef XP_MACOSX
+ @BINPATH@/XUL
+ #else
Modified: branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:11:16 2012 (r731)
@@ -29,9 +29,11 @@
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -87,4 +96,4 @@
+@@ -87,4 +96,6 @@
G++INCLUDES = -I/usr/include/g++
-INCLUDES += -I/usr/X11R6/include
-+#INCLUDES += -I/usr/local/include
++USE_SYSTEM_ZLIB = 1
++ZLIB_LIBS = -lz
++INCLUDES += -I$(LOCALBASE)/include
Added: branches/experimental/mail/thunderbird3/files/patch-mozilla-security-nss-lib-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird3/files/patch-mozilla-security-nss-lib-Makefile Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,11 @@
+--- 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
Added: branches/experimental/www/firefox-beta/files/patch-browser-installer-package-manifest.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-browser-installer-package-manifest.in Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,24 @@
+--- browser/installer/package-manifest.in~
++++ browser/installer/package-manifest.in
+@@ -58,9 +58,11 @@
+ #ifndef MOZ_STATIC_JS
+ @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+ #endif
++#ifndef MOZ_NATIVE_NSPR
+ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
++#endif
+ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ #ifdef XP_MACOSX
+ @BINPATH@/XUL
+@@ -109,7 +111,9 @@
+ #endif
+ @BINPATH@/platform.ini
+ #ifndef XP_OS2
++#ifndef MOZ_NATIVE_SQLITE
+ @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
++#endif
+ #else
+ @BINPATH@/mozsqlt3@DLL_SUFFIX@
+ #endif
Modified: branches/experimental/www/firefox-beta/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-configure.in Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/www/firefox-beta/files/patch-configure.in Fri Jun 8 14:11:16 2012 (r731)
@@ -18,6 +18,16 @@
INTEL_ARCHITECTURE=1
esac
+@@ -4410,6 +4410,9 @@ else
+ NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
+ fi
+ fi
++if test -n "$MOZ_NATIVE_NSPR"; then
++ AC_DEFINE(MOZ_NATIVE_NSPR)
++fi
+
+ dnl system libevent Support
+ dnl ========================================================
@@ -4580,7 +4580,7 @@
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Modified: branches/experimental/www/firefox-beta/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/www/firefox-beta/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 14:11:16 2012 (r731)
@@ -36,9 +36,11 @@
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -87,4 +99,4 @@
+@@ -87,4 +99,6 @@
G++INCLUDES = -I/usr/include/g++
-INCLUDES += -I/usr/X11R6/include
-+#INCLUDES += -I/usr/local/include
++USE_SYSTEM_ZLIB = 1
++ZLIB_LIBS = -lz
++INCLUDES += -I$(LOCALBASE)/include
Added: branches/experimental/www/firefox-beta/files/patch-security-nss-lib-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-security-nss-lib-Makefile Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,11 @@
+--- 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
Added: branches/experimental/www/firefox-esr/files/patch-browser-installer-package-manifest.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-esr/files/patch-browser-installer-package-manifest.in Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,26 @@
+--- browser/installer/package-manifest.in~
++++ browser/installer/package-manifest.in
+@@ -40,10 +40,12 @@
+ #ifndef MOZ_STATIC_JS
+ @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+ #endif
++#ifndef MOZ_NATIVE_NSPR
+ @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
+-@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
++#endif
++@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@
+ #ifdef XP_MACOSX
+@@ -109,7 +111,9 @@
+ #endif
+ @BINPATH@/platform.ini
+ #ifndef XP_OS2
++#ifndef MOZ_NATIVE_SQLITE
+ @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
++#endif
+ #else
+ @BINPATH@/mozsqlt3@DLL_SUFFIX@
+ #endif
Modified: branches/experimental/www/firefox-esr/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-configure.in Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/www/firefox-esr/files/patch-configure.in Fri Jun 8 14:11:16 2012 (r731)
@@ -45,6 +45,16 @@
AC_DEFINE(HAVE_CLOCK_MONOTONIC)
AC_SUBST(HAVE_CLOCK_MONOTONIC)
AC_SUBST(REALTIME_LIBS)
+@@ -4218,6 +4218,9 @@ else
+ NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
+ fi
+ fi
++if test -n "$MOZ_NATIVE_NSPR"; then
++ AC_DEFINE(MOZ_NATIVE_NSPR)
++fi
+
+ dnl system libevent Support
+ dnl ========================================================
@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Modified: branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 14:11:16 2012 (r731)
@@ -36,9 +36,11 @@
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -87,4 +99,4 @@
+@@ -87,4 +99,6 @@
G++INCLUDES = -I/usr/include/g++
-INCLUDES += -I/usr/X11R6/include
-+#INCLUDES += -I/usr/local/include
++USE_SYSTEM_ZLIB = 1
++ZLIB_LIBS = -lz
++INCLUDES += -I$(LOCALBASE)/include
Added: branches/experimental/www/firefox-esr/files/patch-security-nss-lib-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-esr/files/patch-security-nss-lib-Makefile Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,11 @@
+--- 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
Added: branches/experimental/www/firefox/files/patch-browser-installer-package-manifest.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-browser-installer-package-manifest.in Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,24 @@
+--- browser/installer/package-manifest.in~
++++ browser/installer/package-manifest.in
+@@ -58,9 +58,11 @@
+ #ifndef MOZ_STATIC_JS
+ @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+ #endif
++#ifndef MOZ_NATIVE_NSPR
+ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
++#endif
+ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ #ifdef XP_MACOSX
+ @BINPATH@/XUL
+@@ -109,7 +111,9 @@
+ #endif
+ @BINPATH@/platform.ini
+ #ifndef XP_OS2
++#ifndef MOZ_NATIVE_SQLITE
+ @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
++#endif
+ #else
+ @BINPATH@/mozsqlt3@DLL_SUFFIX@
+ #endif
Modified: branches/experimental/www/firefox/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-configure.in Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/www/firefox/files/patch-configure.in Fri Jun 8 14:11:16 2012 (r731)
@@ -45,6 +45,16 @@
AC_DEFINE(HAVE_CLOCK_MONOTONIC)
AC_SUBST(HAVE_CLOCK_MONOTONIC)
AC_SUBST(REALTIME_LIBS)
+@@ -4410,6 +4410,9 @@ else
+ NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
+ fi
+ fi
++if test -n "$MOZ_NATIVE_NSPR"; then
++ AC_DEFINE(MOZ_NATIVE_NSPR)
++fi
+
+ dnl system libevent Support
+ dnl ========================================================
@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Modified: branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/www/firefox/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 14:11:16 2012 (r731)
@@ -36,9 +36,11 @@
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -87,4 +99,4 @@
+@@ -87,4 +99,6 @@
G++INCLUDES = -I/usr/include/g++
-INCLUDES += -I/usr/X11R6/include
-+#INCLUDES += -I/usr/local/include
++USE_SYSTEM_ZLIB = 1
++ZLIB_LIBS = -lz
++INCLUDES += -I$(LOCALBASE)/include
Added: branches/experimental/www/firefox/files/patch-security-nss-lib-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-security-nss-lib-Makefile Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,11 @@
+--- 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
Added: branches/experimental/www/firefox36/files/patch-browser-installer-package-manifest.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox36/files/patch-browser-installer-package-manifest.in Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,16 @@
+--- browser/installer/package-manifest.in~
++++ browser/installer/package-manifest.in
+@@ -46,10 +46,12 @@
+ #else
+ @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+ #endif
++#ifndef MOZ_NATIVE_NSPR
+ @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
+-@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
++#endif
++@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ #ifdef XP_MACOSX
+ @BINPATH@/XUL
+ #else
Modified: branches/experimental/www/firefox36/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox36/files/patch-configure.in Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/www/firefox36/files/patch-configure.in Fri Jun 8 14:11:16 2012 (r731)
@@ -9,3 +9,13 @@
CPU_ARCH="$OS_TEST"
;;
+@@ -4252,6 +4252,9 @@ else
+ NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
+ fi
+ fi
++if test -n "$MOZ_NATIVE_NSPR"; then
++ AC_DEFINE(MOZ_NATIVE_NSPR)
++fi
+
+ dnl system libevent Support
+ dnl ========================================================
Modified: branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/www/firefox36/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 14:11:16 2012 (r731)
@@ -36,9 +36,11 @@
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -87,4 +99,4 @@
+@@ -87,4 +99,6 @@
G++INCLUDES = -I/usr/include/g++
-INCLUDES += -I/usr/X11R6/include
-+#INCLUDES += -I/usr/local/include
++USE_SYSTEM_ZLIB = 1
++ZLIB_LIBS = -lz
++INCLUDES += -I$(LOCALBASE)/include
Added: branches/experimental/www/firefox36/files/patch-security-nss-lib-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox36/files/patch-security-nss-lib-Makefile Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,11 @@
+--- 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
Added: branches/experimental/www/libxul/files/patch-browser-installer-package-manifest.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-browser-installer-package-manifest.in Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,26 @@
+--- browser/installer/package-manifest.in~
++++ browser/installer/package-manifest.in
+@@ -40,10 +40,12 @@
+ #ifndef MOZ_STATIC_JS
+ @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+ #endif
++#ifndef MOZ_NATIVE_NSPR
+ @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
+-@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
++#endif
++@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@
+ #ifdef XP_MACOSX
+@@ -109,7 +111,9 @@
+ #endif
+ @BINPATH@/platform.ini
+ #ifndef XP_OS2
++#ifndef MOZ_NATIVE_SQLITE
+ @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
++#endif
+ #else
+ @BINPATH@/mozsqlt3@DLL_SUFFIX@
+ #endif
Modified: branches/experimental/www/libxul/files/patch-configure.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-configure.in Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/www/libxul/files/patch-configure.in Fri Jun 8 14:11:16 2012 (r731)
@@ -45,6 +45,16 @@
AC_DEFINE(HAVE_CLOCK_MONOTONIC)
AC_SUBST(HAVE_CLOCK_MONOTONIC)
AC_SUBST(REALTIME_LIBS)
+@@ -4218,6 +4218,9 @@ else
+ NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
+ fi
+ fi
++if test -n "$MOZ_NATIVE_NSPR"; then
++ AC_DEFINE(MOZ_NATIVE_NSPR)
++fi
+
+ dnl system libevent Support
+ dnl ========================================================
@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Modified: branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/www/libxul/files/patch-security-coreconf-FreeBSD.mk Fri Jun 8 14:11:16 2012 (r731)
@@ -36,9 +36,11 @@
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -87,4 +99,4 @@
+@@ -87,4 +99,6 @@
G++INCLUDES = -I/usr/include/g++
-INCLUDES += -I/usr/X11R6/include
-+#INCLUDES += -I/usr/local/include
++USE_SYSTEM_ZLIB = 1
++ZLIB_LIBS = -lz
++INCLUDES += -I$(LOCALBASE)/include
Added: branches/experimental/www/libxul/files/patch-security-nss-lib-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-security-nss-lib-Makefile Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,11 @@
+--- 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
Modified: branches/experimental/www/seamonkey-beta/files/patch-configure.in
==============================================================================
--- branches/experimental/www/seamonkey-beta/files/patch-configure.in Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/www/seamonkey-beta/files/patch-configure.in Fri Jun 8 14:11:16 2012 (r731)
@@ -101,6 +101,16 @@
],
[
const char *input = "testing";
+@@ -4218,6 +4218,9 @@ else
+ NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
+ fi
+ fi
++if test -n "$MOZ_NATIVE_NSPR"; then
++ AC_DEFINE(MOZ_NATIVE_NSPR)
++fi
+
+ dnl system libevent Support
+ dnl ========================================================
@@ -4383,7 +4386,7 @@
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-browser-installer-package-manifest.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-browser-installer-package-manifest.in Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,24 @@
+--- mozilla/browser/installer/package-manifest.in~
++++ mozilla/browser/installer/package-manifest.in
+@@ -58,9 +58,11 @@
+ #ifndef MOZ_STATIC_JS
+ @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+ #endif
++#ifndef MOZ_NATIVE_NSPR
+ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
++#endif
+ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ #ifdef XP_MACOSX
+ @BINPATH@/XUL
+@@ -109,7 +111,9 @@
+ #endif
+ @BINPATH@/platform.ini
+ #ifndef XP_OS2
++#ifndef MOZ_NATIVE_SQLITE
+ @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
++#endif
+ #else
+ @BINPATH@/mozsqlt3@DLL_SUFFIX@
+ #endif
Modified: branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:11:16 2012 (r731)
@@ -36,9 +36,11 @@
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -87,4 +99,4 @@
+@@ -87,4 +99,6 @@
G++INCLUDES = -I/usr/include/g++
-INCLUDES += -I/usr/X11R6/include
-+#INCLUDES += -I/usr/local/include
++USE_SYSTEM_ZLIB = 1
++ZLIB_LIBS = -lz
++INCLUDES += -I$(LOCALBASE)/include
Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-nss-lib-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-security-nss-lib-Makefile Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,11 @@
+--- 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
Modified: branches/experimental/www/seamonkey/files/patch-configure.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-configure.in Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/www/seamonkey/files/patch-configure.in Fri Jun 8 14:11:16 2012 (r731)
@@ -101,6 +101,16 @@
],
[
const char *input = "testing";
+@@ -4218,6 +4218,9 @@ else
+ NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
+ fi
+ fi
++if test -n "$MOZ_NATIVE_NSPR"; then
++ AC_DEFINE(MOZ_NATIVE_NSPR)
++fi
+
+ dnl system libevent Support
+ dnl ========================================================
@@ -4383,7 +4386,7 @@
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Added: branches/experimental/www/seamonkey/files/patch-mozilla-browser-installer-package-manifest.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-browser-installer-package-manifest.in Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,24 @@
+--- mozilla/browser/installer/package-manifest.in~
++++ mozilla/browser/installer/package-manifest.in
+@@ -58,9 +58,11 @@
+ #ifndef MOZ_STATIC_JS
+ @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+ #endif
++#ifndef MOZ_NATIVE_NSPR
+ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
++#endif
+ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ #ifdef XP_MACOSX
+ @BINPATH@/XUL
+@@ -109,7 +111,9 @@
+ #endif
+ @BINPATH@/platform.ini
+ #ifndef XP_OS2
++#ifndef MOZ_NATIVE_SQLITE
+ @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
++#endif
+ #else
+ @BINPATH@/mozsqlt3@DLL_SUFFIX@
+ #endif
Modified: branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:07:32 2012 (r730)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk Fri Jun 8 14:11:16 2012 (r731)
@@ -36,9 +36,11 @@
ifdef MAPFILE
MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif
-@@ -87,4 +99,4 @@
+@@ -87,4 +99,6 @@
G++INCLUDES = -I/usr/include/g++
-INCLUDES += -I/usr/X11R6/include
-+#INCLUDES += -I/usr/local/include
++USE_SYSTEM_ZLIB = 1
++ZLIB_LIBS = -lz
++INCLUDES += -I$(LOCALBASE)/include
Added: branches/experimental/www/seamonkey/files/patch-mozilla-security-nss-lib-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-security-nss-lib-Makefile Fri Jun 8 14:11:16 2012 (r731)
@@ -0,0 +1,11 @@
+--- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206081411.q58EBG1Q071313>