From 30c1a0a7927d6992cbf7baf9e8e1f637b2e4f6d4 Mon Sep 17 00:00:00 2001
From: Florian Smeets <flo@FreeBSD.org>
Date: Thu, 26 Jul 2012 21:49:58 +0000
Subject: - update firefox/thunderbird ESR versions to 10.0.6 - update firefox
 14.0.1 - update thunderbird to 14.0 - update seamonkey to 2.11 - switch to
 new options framework - add experimental rendering via cairo-qt (QT4 option)
 - add audio backend options (ALSA and PulseAudio) - rename SMB option to
 GNOMEVFS2 - turn on LOGGING by default (like upstream linux builds) - improve
 about:memory output - unbreak PGO - use system libs [1] - switch to libevent2
 [2] - fix conflict with devel/libunwind and base gcc [3] - unbreak
 clang/libc++ build [4] - unbreak build with base gcc on >= 9.x [5] - use
 common IPC code with other BSDs[6] - and *miscellaneous improvements*

PR:		ports/146231 [1], ports/161421 [2]
		ports/150631, ports/168369, ports/168637, ports/168793, ports/168978 [3]
		ports/163454, ports/164905, ports/169231 [4]
       		ports/169389, ports/169479 [5]
Obtained from:	pkgsrc via bugzilla #753046 [6]
In collaboration with:	Jan Beich (who did the major part of this work and
			deserves a special thank you!)
---
 www/firefox/files/patch-bug752895 | 71 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 www/firefox/files/patch-bug752895

(limited to 'www/firefox/files/patch-bug752895')

diff --git a/www/firefox/files/patch-bug752895 b/www/firefox/files/patch-bug752895
new file mode 100644
index 000000000000..0942b8b247b8
--- /dev/null
+++ b/www/firefox/files/patch-bug752895
@@ -0,0 +1,71 @@
+commit de14ddd
+Author: Andrew Benton <b3nton@gmail.com>
+Date:   Tue Jun 12 09:10:09 2012 +0200
+
+    Bug 752895 - Don't try to install nspr, nss and sqlite when using system libraries. r=glandium
+---
+ browser/installer/Makefile.in         | 8 ++++++++
+ browser/installer/package-manifest.in | 6 ++++++
+ 2 files changed, 14 insertions(+)
+
+diff --git browser/installer/Makefile.in browser/installer/Makefile.in
+index 975b1f4..c791872 100644
+--- browser/installer/Makefile.in
++++ browser/installer/Makefile.in
+@@ -44,6 +44,14 @@ ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
+ DEFINES += -DMOZ_GTK2=1
+ endif
+ 
++ifdef MOZ_NATIVE_NSPR
++DEFINES += -DMOZ_NATIVE_NSPR=1
++endif
++
++ifdef MOZ_NATIVE_NSS
++DEFINES += -DMOZ_NATIVE_NSS=1
++endif
++
+ ifdef NSS_DISABLE_DBM
+ DEFINES += -DNSS_DISABLE_DBM=1
+ endif
+diff --git browser/installer/package-manifest.in browser/installer/package-manifest.in
+index 2969643..b8fddf0 100644
+--- 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
+@@ -583,6 +587,7 @@
+ ; NSS libraries are signed in the staging directory,
+ ; meaning their .chk files are created there directly.
+ ;
++#ifndef MOZ_NATIVE_NSS
+ @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
+@@ -593,6 +598,7 @@
+ @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
++#endif
+ @BINPATH@/chrome/pippki@JAREXT@
+ @BINPATH@/chrome/pippki.manifest
+ @BINPATH@/components/pipboot.xpt
-- 
cgit v1.2.3