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-security-coreconf-FreeBSD.mk | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'www/firefox/files/patch-security-coreconf-FreeBSD.mk')

diff --git a/www/firefox/files/patch-security-coreconf-FreeBSD.mk b/www/firefox/files/patch-security-coreconf-FreeBSD.mk
index 279110fa0321..b1ea1eb209c0 100644
--- a/www/firefox/files/patch-security-coreconf-FreeBSD.mk
+++ b/www/firefox/files/patch-security-coreconf-FreeBSD.mk
@@ -1,6 +1,6 @@
 --- 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,20 @@
+@@ -49,8 +49,24 @@
  ifeq ($(CPU_ARCH),pc98)
  CPU_ARCH		= x86
  endif
@@ -9,12 +9,16 @@
 +ifeq ($(OS_TEST),alpha)
 +CPU_ARCH		= alpha
 +endif
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH		= amd64
++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
@@ -32,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
-- 
cgit v1.2.3