32 files changed, 98 insertions, 224 deletions

diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index 10208f8b6721..6036df4cae30 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	3.1b3
+DISTVERSION=	3.5b4
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
diff --git a/www/firefox3-devel/distinfo b/www/firefox3-devel/distinfo
index 4aefb353296c..25816b6b8b53 100644
--- a/www/firefox3-devel/distinfo
+++ b/www/firefox3-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-3.1b3-source.tar.bz2) = 61cd1a7fc587f6d2a33c564033198e2c
-SHA256 (firefox-3.1b3-source.tar.bz2) = 14c9820a614e62c8103934f3dde7648e5abc753747346da5d02454e4e6fb1337
-SIZE (firefox-3.1b3-source.tar.bz2) = 41856727
+MD5 (firefox-3.5b4-source.tar.bz2) = ff6bf463300cb56bcf750973b2af3d80
+SHA256 (firefox-3.5b4-source.tar.bz2) = b653f2fa8dfdd0a54a6b8c576769719cf9014ca6b09f8e9d351721a51766d95d
+SIZE (firefox-3.5b4-source.tar.bz2) = 45782023
diff --git a/www/firefox3-devel/files/patch-build_unix_run-mozilla.sh b/www/firefox3-devel/files/patch-build_unix_run-mozilla.sh
new file mode 100644
index 000000000000..92777d76a378
--- /dev/null
+++ b/www/firefox3-devel/files/patch-build_unix_run-mozilla.sh
@@ -0,0 +1,12 @@
+--- build/unix/run-mozilla.sh.orig	Tue Feb 14 19:56:54 2006
++++ build/unix/run-mozilla.sh	Fri Dec  8 15:49:48 2006
+@@ -443,6 +443,9 @@
+ export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
+ export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
+ 
++MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox3
++export MOZ_PLUGIN_PATH
++
+ if [ $moz_debug -eq 1 ]
+ then
+ 	moz_debug_program ${1+"$@"}
diff --git a/www/firefox3-devel/files/patch-config-rules.mk b/www/firefox3-devel/files/patch-config-rules.mk
deleted file mode 100644
index 8ab35f5a8326..000000000000
--- a/www/firefox3-devel/files/patch-config-rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- config/rules.mk.orig	Thu Sep 14 14:07:03 2006
-+++ config/rules.mk	Wed Oct 18 11:00:09 2006
-@@ -442,9 +442,7 @@
- endif
- 
- ifeq ($(OS_ARCH),FreeBSD)
--ifdef IS_COMPONENT
--EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
--endif
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
- endif
- 
- ifeq ($(OS_ARCH),NetBSD)
diff --git a/www/firefox3-devel/files/patch-config_autoconf.mk.in b/www/firefox3-devel/files/patch-config_autoconf.mk.in
index b39d9bacf0d7..6fa4f0df5ced 100644
--- a/www/firefox3-devel/files/patch-config_autoconf.mk.in
+++ b/www/firefox3-devel/files/patch-config_autoconf.mk.in
@@ -1,6 +1,6 @@
---- config/autoconf.mk.in.orig	2007-08-28 12:02:43.000000000 -0400
-+++ config/autoconf.mk.in	2007-09-26 14:21:51.000000000 -0400
-@@ -58,14 +58,14 @@
+--- config/autoconf.mk.in.orig	2009-04-28 10:03:50.583691270 +0000
++++ config/autoconf.mk.in	2009-04-28 10:05:25.152703253 +0000
+@@ -57,14 +57,14 @@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
diff --git a/www/firefox3-devel/files/patch-config_mkdepend_Makefile.in b/www/firefox3-devel/files/patch-config_mkdepend_Makefile.in
index bace012a282e..5f341b26d09c 100644
--- a/www/firefox3-devel/files/patch-config_mkdepend_Makefile.in
+++ b/www/firefox3-devel/files/patch-config_mkdepend_Makefile.in
@@ -1,6 +1,6 @@
---- config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
-+++ config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
-@@ -57,6 +57,7 @@
+--- config/mkdepend/Makefile.in.orig	2009-04-28 08:07:48.532396203 +0000
++++ config/mkdepend/Makefile.in	2009-04-28 08:08:07.342398592 +0000
+@@ -73,6 +73,7 @@
  include $(topsrcdir)/config/rules.mk
  
  HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
diff --git a/www/firefox3-devel/files/patch-content_xslt_public_txDouble.h b/www/firefox3-devel/files/patch-content_xslt_public_txDouble.h
deleted file mode 100644
index 534bccba48be..000000000000
--- a/www/firefox3-devel/files/patch-content_xslt_public_txDouble.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/xslt/public/txDouble.h.orig	Fri Oct 13 00:00:29 2006
-+++ content/xslt/public/txDouble.h	Fri Oct 13 00:00:53 2006
-@@ -41,7 +41,7 @@
- #define __txdouble_h__
- 
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
--#ifdef __FreeBSD__
-+/* #ifdef __FreeBSD__
- #include <ieeefp.h>
- #ifdef __alpha__
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-@@ -50,7 +50,7 @@
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
--
-+*/
- /**
-  * Macros to workaround math-bugs bugs in various platforms
-  */
diff --git a/www/firefox3-devel/files/patch-db_sqlite3_src_Makefile.in b/www/firefox3-devel/files/patch-db_sqlite3_src_Makefile.in
index 71b84da6d4c2..5a32a29685fd 100644
--- a/www/firefox3-devel/files/patch-db_sqlite3_src_Makefile.in
+++ b/www/firefox3-devel/files/patch-db_sqlite3_src_Makefile.in
@@ -1,5 +1,5 @@
---- db/sqlite3/src/Makefile.in.orig	2008-06-19 11:03:17.000000000 -0500
-+++ db/sqlite3/src/Makefile.in	2008-06-19 11:04:15.000000000 -0500
+--- db/sqlite3/src/Makefile.in.orig	2009-04-28 11:12:00.829684825 +0000
++++ db/sqlite3/src/Makefile.in	2009-04-28 11:12:20.628076799 +0000
 @@ -45,6 +45,8 @@
  
  include $(DEPTH)/config/autoconf.mk
diff --git a/www/firefox3-devel/files/patch-gfx_thebes_src_gfxPangoFonts.cpp b/www/firefox3-devel/files/patch-gfx_thebes_src_gfxPangoFonts.cpp
deleted file mode 100644
index bd8271904658..000000000000
--- a/www/firefox3-devel/files/patch-gfx_thebes_src_gfxPangoFonts.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
---- gfx/thebes/src/gfxPangoFonts.cpp.orig	2009-04-17 14:17:44.639661606 +0200
-+++ gfx/thebes/src/gfxPangoFonts.cpp	2009-04-17 14:20:24.044400205 +0200
-@@ -1803,12 +1803,11 @@
- 
- static PangoFcFont *
- gfx_pango_font_map_create_font(PangoFcFontMap *fontmap,
--                               PangoContext *context,
--                               const PangoFontDescription *desc,
--                               FcPattern *pattern)
-+                               PangoFcFontKey *fontkey)
- {
--    return PANGO_FC_FONT(g_object_new(GFX_TYPE_PANGO_FC_FONT,
--                                      "pattern", pattern, NULL));
-+     const FcPattern *p_pattern = pango_fc_font_key_get_pattern(fontkey);
-+     return PANGO_FC_FONT(g_object_new(GFX_TYPE_PANGO_FC_FONT,
-+                                       "pattern", p_pattern, NULL));
- }
- 
- static void
-@@ -1828,9 +1827,8 @@
-     // context_key_* virtual functions are only necessary if we want to
-     // dynamically respond to changes in the screen cairo_font_options_t.
- 
--    // context_substitute and get_font are not likely to be used but
-+    // get_font is not likely to be used but
-     //   implemented because the class makes them available.
--    fcfontmap_class->context_substitute = gfx_pango_font_map_context_substitute;
-     fcfontmap_class->create_font = gfx_pango_font_map_create_font;
- }
- 
diff --git a/www/firefox3-devel/files/patch-js-src-Makefile.in b/www/firefox3-devel/files/patch-js-src-Makefile.in
deleted file mode 100644
index 88064ad34a0f..000000000000
--- a/www/firefox3-devel/files/patch-js-src-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- js/src/Makefile.in.orig	2009-04-21 18:08:09.606270279 +0200
-+++ js/src/Makefile.in	2009-04-21 18:08:19.662470270 +0200
-@@ -116,8 +116,8 @@
- 
- ifeq (sparc,$(findstring sparc,$(OS_TEST)))
- DEFINES += -DAVMPLUS_SPARC
--NANOJIT_ARCH = Sparc
--ENABLE_JIT = 1
-+#NANOJIT_ARCH = Sparc
-+#ENABLE_JIT = 1
- endif
- 
- ifneq (,$(filter Linux Darwin SunOS FreeBSD,$(OS_ARCH)))
diff --git a/www/firefox3-devel/files/patch-js-src-config-mkdepend_Makefile.in b/www/firefox3-devel/files/patch-js-src-config-mkdepend_Makefile.in
index d3a09d9bf4f6..6c25c71ce6c6 100644
--- a/www/firefox3-devel/files/patch-js-src-config-mkdepend_Makefile.in
+++ b/www/firefox3-devel/files/patch-js-src-config-mkdepend_Makefile.in
@@ -1,11 +1,11 @@
---- js/src/config/mkdepend/Makefile.in.orig	2009-03-05 22:31:53.000000000 +0100
-+++ js/src/config/mkdepend/Makefile.in	2009-04-21 14:10:27.000000000 +0200
+--- js/src/config/mkdepend/Makefile.in.orig	2009-04-28 08:17:55.069074748 +0000
++++ js/src/config/mkdepend/Makefile.in	2009-04-28 08:18:44.897081100 +0000
 @@ -72,7 +72,7 @@
  
  include $(topsrcdir)/config/rules.mk
  
 -HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
  
  ifdef GNU_CC
  _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/www/firefox3-devel/files/patch-js-src-config_config.mk b/www/firefox3-devel/files/patch-js-src-config_config.mk
index db448c424635..4120407a7789 100644
--- a/www/firefox3-devel/files/patch-js-src-config_config.mk
+++ b/www/firefox3-devel/files/patch-js-src-config_config.mk
@@ -1,5 +1,5 @@
---- js/src/config/config.mk.orgi	2009-04-21 15:12:51.000000000 +0200
-+++ js/src/config/config.mk	2009-04-21 15:15:37.000000000 +0200
+--- js/src/config/config.mk.orig	2009-04-28 11:14:01.760089946 +0000
++++ js/src/config/config.mk	2009-04-28 11:14:30.311093216 +0000
 @@ -490,7 +490,7 @@
  INCLUDES	= $(LOCAL_INCLUDES) $(REQ_INCLUDES) $(REQ_INCLUDES_SDK) -I$(PUBLIC) $(OS_INCLUDES)
  
diff --git a/www/firefox3-devel/files/patch-js_src_jsnum.cpp b/www/firefox3-devel/files/patch-js_src_jsnum.cpp
index 588d44cd96cd..b4024468f8e9 100644
--- a/www/firefox3-devel/files/patch-js_src_jsnum.cpp
+++ b/www/firefox3-devel/files/patch-js_src_jsnum.cpp
@@ -1,5 +1,5 @@
---- js/src/jsnum.cpp.orig	Sun Nov  5 18:37:07 2006
-+++ js/src/jsnum.cpp	Sun Nov  5 18:42:31 2006
+--- js/src/jsnum.cpp.orig	2009-04-28 11:19:57.888134991 +0000
++++ js/src/jsnum.cpp	2009-04-28 11:21:35.786147448 +0000
 @@ -45,6 +45,9 @@
  #if defined(XP_WIN) || defined(XP_OS2)
  #include <float.h>
@@ -7,10 +7,10 @@
 +#if defined(__FreeBSD__)
 +#include <sys/param.h>
 +#endif
- #include <locale.h>
- #include <limits.h>
- #include <math.h>
-@@ -532,7 +535,15 @@ static jsdouble NaN;
+ #ifdef XP_OS2
+ #define _PC_53  PC_53
+ #define _MCW_EM MCW_EM
+@@ -659,8 +662,16 @@
  
  #else
  
@@ -21,8 +21,9 @@
 +#else
 +
  #define FIX_FPU() ((void)0)
-+
-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
  
++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
++
  #endif
  
+ JSBool
diff --git a/www/firefox3-devel/files/patch-layout_generic_Makefile.in b/www/firefox3-devel/files/patch-layout_generic_Makefile.in
index 038b5df63eed..da29a9e18759 100644
--- a/www/firefox3-devel/files/patch-layout_generic_Makefile.in
+++ b/www/firefox3-devel/files/patch-layout_generic_Makefile.in
@@ -1,5 +1,5 @@
---- layout/generic/Makefile.in.orig	2008-06-19 12:29:06.000000000 -0500
-+++ layout/generic/Makefile.in	2008-06-19 12:30:04.000000000 -0500
+--- layout/generic/Makefile.in.orig	2009-04-28 11:16:16.059107000 +0000
++++ layout/generic/Makefile.in	2009-04-28 11:16:41.171110062 +0000
 @@ -188,9 +188,10 @@
  		-I$(srcdir)/../../content/base/src \
  		-I$(srcdir)/../../content/html/content/src \
diff --git a/www/firefox3-devel/files/patch-media_liboggplay_src_liboggplay_std_semaphore.h b/www/firefox3-devel/files/patch-media_liboggplay_src_liboggplay_std_semaphore.h
index d409668b8402..3c597ca853b3 100644
--- a/www/firefox3-devel/files/patch-media_liboggplay_src_liboggplay_std_semaphore.h
+++ b/www/firefox3-devel/files/patch-media_liboggplay_src_liboggplay_std_semaphore.h
@@ -1,9 +1,9 @@
---- media/liboggplay/src/liboggplay/std_semaphore.h.orig	2009-03-05 22:32:15.000000000 +0100
-+++ media/liboggplay/src/liboggplay/std_semaphore.h	2009-04-10 12:31:04.000000000 +0200
-@@ -34,7 +34,7 @@
+--- media/liboggplay/src/liboggplay/std_semaphore.h.orig	2009-04-24 01:46:48.000000000 +0000
++++ media/liboggplay/src/liboggplay/std_semaphore.h	2009-04-28 08:39:25.739957779 +0000
+@@ -74,7 +74,7 @@
+  * @retval non-zero on error 
+  */
  
- #ifndef _STD_SEMAPHORE_H
- #define _STD_SEMAPHORE_H
 -#if defined(linux) || defined(SOLARIS)
 +#if defined(linux) || defined(SOLARIS) || defined(__FreeBSD__)
  #include <semaphore.h>
diff --git a/www/firefox3-devel/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h b/www/firefox3-devel/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h
index 614456a9d747..b4ceef6139a0 100644
--- a/www/firefox3-devel/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h
+++ b/www/firefox3-devel/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h
@@ -1,11 +1,11 @@
---- media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2008-11-24 21:01:48.000000000 +0000
-+++ media/liboggz/include/oggz/oggz_off_t_generated.h	2008-11-24 21:16:57.000000000 +0000
+--- media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2009-04-24 01:46:48.000000000 +0000
++++ media/liboggz/include/oggz/oggz_off_t_generated.h	2009-04-28 08:44:02.369576627 +0000
 @@ -59,7 +59,7 @@
  
  #include <sys/types.h>
  
--#ifdef __APPLE__
-+#if defined(__APPLE__) || defined (__FreeBSD__)
+-#if defined(__APPLE__) || defined(SOLARIS)
++#if defined(__APPLE__) || defined(SOLARIS) || defined (__FreeBSD__)
  typedef off_t oggz_off_t;
  #else
  typedef loff_t oggz_off_t;
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index 10208f8b6721..6036df4cae30 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	3.1b3
+DISTVERSION=	3.5b4
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
diff --git a/www/firefox35/distinfo b/www/firefox35/distinfo
index 4aefb353296c..25816b6b8b53 100644
--- a/www/firefox35/distinfo
+++ b/www/firefox35/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-3.1b3-source.tar.bz2) = 61cd1a7fc587f6d2a33c564033198e2c
-SHA256 (firefox-3.1b3-source.tar.bz2) = 14c9820a614e62c8103934f3dde7648e5abc753747346da5d02454e4e6fb1337
-SIZE (firefox-3.1b3-source.tar.bz2) = 41856727
+MD5 (firefox-3.5b4-source.tar.bz2) = ff6bf463300cb56bcf750973b2af3d80
+SHA256 (firefox-3.5b4-source.tar.bz2) = b653f2fa8dfdd0a54a6b8c576769719cf9014ca6b09f8e9d351721a51766d95d
+SIZE (firefox-3.5b4-source.tar.bz2) = 45782023
diff --git a/www/firefox35/files/patch-build_unix_run-mozilla.sh b/www/firefox35/files/patch-build_unix_run-mozilla.sh
new file mode 100644
index 000000000000..92777d76a378
--- /dev/null
+++ b/www/firefox35/files/patch-build_unix_run-mozilla.sh
@@ -0,0 +1,12 @@
+--- build/unix/run-mozilla.sh.orig	Tue Feb 14 19:56:54 2006
++++ build/unix/run-mozilla.sh	Fri Dec  8 15:49:48 2006
+@@ -443,6 +443,9 @@
+ export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
+ export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
+ 
++MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox3
++export MOZ_PLUGIN_PATH
++
+ if [ $moz_debug -eq 1 ]
+ then
+ 	moz_debug_program ${1+"$@"}
diff --git a/www/firefox35/files/patch-config-rules.mk b/www/firefox35/files/patch-config-rules.mk
deleted file mode 100644
index 8ab35f5a8326..000000000000
--- a/www/firefox35/files/patch-config-rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- config/rules.mk.orig	Thu Sep 14 14:07:03 2006
-+++ config/rules.mk	Wed Oct 18 11:00:09 2006
-@@ -442,9 +442,7 @@
- endif
- 
- ifeq ($(OS_ARCH),FreeBSD)
--ifdef IS_COMPONENT
--EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
--endif
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
- endif
- 
- ifeq ($(OS_ARCH),NetBSD)
diff --git a/www/firefox35/files/patch-config_autoconf.mk.in b/www/firefox35/files/patch-config_autoconf.mk.in
index b39d9bacf0d7..6fa4f0df5ced 100644
--- a/www/firefox35/files/patch-config_autoconf.mk.in
+++ b/www/firefox35/files/patch-config_autoconf.mk.in
@@ -1,6 +1,6 @@
---- config/autoconf.mk.in.orig	2007-08-28 12:02:43.000000000 -0400
-+++ config/autoconf.mk.in	2007-09-26 14:21:51.000000000 -0400
-@@ -58,14 +58,14 @@
+--- config/autoconf.mk.in.orig	2009-04-28 10:03:50.583691270 +0000
++++ config/autoconf.mk.in	2009-04-28 10:05:25.152703253 +0000
+@@ -57,14 +57,14 @@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
diff --git a/www/firefox35/files/patch-config_mkdepend_Makefile.in b/www/firefox35/files/patch-config_mkdepend_Makefile.in
index bace012a282e..5f341b26d09c 100644
--- a/www/firefox35/files/patch-config_mkdepend_Makefile.in
+++ b/www/firefox35/files/patch-config_mkdepend_Makefile.in
@@ -1,6 +1,6 @@
---- config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
-+++ config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
-@@ -57,6 +57,7 @@
+--- config/mkdepend/Makefile.in.orig	2009-04-28 08:07:48.532396203 +0000
++++ config/mkdepend/Makefile.in	2009-04-28 08:08:07.342398592 +0000
+@@ -73,6 +73,7 @@
  include $(topsrcdir)/config/rules.mk
  
  HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
diff --git a/www/firefox35/files/patch-content_xslt_public_txDouble.h b/www/firefox35/files/patch-content_xslt_public_txDouble.h
deleted file mode 100644
index 534bccba48be..000000000000
--- a/www/firefox35/files/patch-content_xslt_public_txDouble.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/xslt/public/txDouble.h.orig	Fri Oct 13 00:00:29 2006
-+++ content/xslt/public/txDouble.h	Fri Oct 13 00:00:53 2006
-@@ -41,7 +41,7 @@
- #define __txdouble_h__
- 
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
--#ifdef __FreeBSD__
-+/* #ifdef __FreeBSD__
- #include <ieeefp.h>
- #ifdef __alpha__
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-@@ -50,7 +50,7 @@
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
--
-+*/
- /**
-  * Macros to workaround math-bugs bugs in various platforms
-  */
diff --git a/www/firefox35/files/patch-db_sqlite3_src_Makefile.in b/www/firefox35/files/patch-db_sqlite3_src_Makefile.in
index 71b84da6d4c2..5a32a29685fd 100644
--- a/www/firefox35/files/patch-db_sqlite3_src_Makefile.in
+++ b/www/firefox35/files/patch-db_sqlite3_src_Makefile.in
@@ -1,5 +1,5 @@
---- db/sqlite3/src/Makefile.in.orig	2008-06-19 11:03:17.000000000 -0500
-+++ db/sqlite3/src/Makefile.in	2008-06-19 11:04:15.000000000 -0500
+--- db/sqlite3/src/Makefile.in.orig	2009-04-28 11:12:00.829684825 +0000
++++ db/sqlite3/src/Makefile.in	2009-04-28 11:12:20.628076799 +0000
 @@ -45,6 +45,8 @@
  
  include $(DEPTH)/config/autoconf.mk
diff --git a/www/firefox35/files/patch-gfx_thebes_src_gfxPangoFonts.cpp b/www/firefox35/files/patch-gfx_thebes_src_gfxPangoFonts.cpp
deleted file mode 100644
index bd8271904658..000000000000
--- a/www/firefox35/files/patch-gfx_thebes_src_gfxPangoFonts.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
---- gfx/thebes/src/gfxPangoFonts.cpp.orig	2009-04-17 14:17:44.639661606 +0200
-+++ gfx/thebes/src/gfxPangoFonts.cpp	2009-04-17 14:20:24.044400205 +0200
-@@ -1803,12 +1803,11 @@
- 
- static PangoFcFont *
- gfx_pango_font_map_create_font(PangoFcFontMap *fontmap,
--                               PangoContext *context,
--                               const PangoFontDescription *desc,
--                               FcPattern *pattern)
-+                               PangoFcFontKey *fontkey)
- {
--    return PANGO_FC_FONT(g_object_new(GFX_TYPE_PANGO_FC_FONT,
--                                      "pattern", pattern, NULL));
-+     const FcPattern *p_pattern = pango_fc_font_key_get_pattern(fontkey);
-+     return PANGO_FC_FONT(g_object_new(GFX_TYPE_PANGO_FC_FONT,
-+                                       "pattern", p_pattern, NULL));
- }
- 
- static void
-@@ -1828,9 +1827,8 @@
-     // context_key_* virtual functions are only necessary if we want to
-     // dynamically respond to changes in the screen cairo_font_options_t.
- 
--    // context_substitute and get_font are not likely to be used but
-+    // get_font is not likely to be used but
-     //   implemented because the class makes them available.
--    fcfontmap_class->context_substitute = gfx_pango_font_map_context_substitute;
-     fcfontmap_class->create_font = gfx_pango_font_map_create_font;
- }
- 
diff --git a/www/firefox35/files/patch-js-src-Makefile.in b/www/firefox35/files/patch-js-src-Makefile.in
deleted file mode 100644
index 88064ad34a0f..000000000000
--- a/www/firefox35/files/patch-js-src-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- js/src/Makefile.in.orig	2009-04-21 18:08:09.606270279 +0200
-+++ js/src/Makefile.in	2009-04-21 18:08:19.662470270 +0200
-@@ -116,8 +116,8 @@
- 
- ifeq (sparc,$(findstring sparc,$(OS_TEST)))
- DEFINES += -DAVMPLUS_SPARC
--NANOJIT_ARCH = Sparc
--ENABLE_JIT = 1
-+#NANOJIT_ARCH = Sparc
-+#ENABLE_JIT = 1
- endif
- 
- ifneq (,$(filter Linux Darwin SunOS FreeBSD,$(OS_ARCH)))
diff --git a/www/firefox35/files/patch-js-src-config-mkdepend_Makefile.in b/www/firefox35/files/patch-js-src-config-mkdepend_Makefile.in
index d3a09d9bf4f6..6c25c71ce6c6 100644
--- a/www/firefox35/files/patch-js-src-config-mkdepend_Makefile.in
+++ b/www/firefox35/files/patch-js-src-config-mkdepend_Makefile.in
@@ -1,11 +1,11 @@
---- js/src/config/mkdepend/Makefile.in.orig	2009-03-05 22:31:53.000000000 +0100
-+++ js/src/config/mkdepend/Makefile.in	2009-04-21 14:10:27.000000000 +0200
+--- js/src/config/mkdepend/Makefile.in.orig	2009-04-28 08:17:55.069074748 +0000
++++ js/src/config/mkdepend/Makefile.in	2009-04-28 08:18:44.897081100 +0000
 @@ -72,7 +72,7 @@
  
  include $(topsrcdir)/config/rules.mk
  
 -HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
  
  ifdef GNU_CC
  _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/www/firefox35/files/patch-js-src-config_config.mk b/www/firefox35/files/patch-js-src-config_config.mk
index db448c424635..4120407a7789 100644
--- a/www/firefox35/files/patch-js-src-config_config.mk
+++ b/www/firefox35/files/patch-js-src-config_config.mk
@@ -1,5 +1,5 @@
---- js/src/config/config.mk.orgi	2009-04-21 15:12:51.000000000 +0200
-+++ js/src/config/config.mk	2009-04-21 15:15:37.000000000 +0200
+--- js/src/config/config.mk.orig	2009-04-28 11:14:01.760089946 +0000
++++ js/src/config/config.mk	2009-04-28 11:14:30.311093216 +0000
 @@ -490,7 +490,7 @@
  INCLUDES	= $(LOCAL_INCLUDES) $(REQ_INCLUDES) $(REQ_INCLUDES_SDK) -I$(PUBLIC) $(OS_INCLUDES)
  
diff --git a/www/firefox35/files/patch-js_src_jsnum.cpp b/www/firefox35/files/patch-js_src_jsnum.cpp
index 588d44cd96cd..b4024468f8e9 100644
--- a/www/firefox35/files/patch-js_src_jsnum.cpp
+++ b/www/firefox35/files/patch-js_src_jsnum.cpp
@@ -1,5 +1,5 @@
---- js/src/jsnum.cpp.orig	Sun Nov  5 18:37:07 2006
-+++ js/src/jsnum.cpp	Sun Nov  5 18:42:31 2006
+--- js/src/jsnum.cpp.orig	2009-04-28 11:19:57.888134991 +0000
++++ js/src/jsnum.cpp	2009-04-28 11:21:35.786147448 +0000
 @@ -45,6 +45,9 @@
  #if defined(XP_WIN) || defined(XP_OS2)
  #include <float.h>
@@ -7,10 +7,10 @@
 +#if defined(__FreeBSD__)
 +#include <sys/param.h>
 +#endif
- #include <locale.h>
- #include <limits.h>
- #include <math.h>
-@@ -532,7 +535,15 @@ static jsdouble NaN;
+ #ifdef XP_OS2
+ #define _PC_53  PC_53
+ #define _MCW_EM MCW_EM
+@@ -659,8 +662,16 @@
  
  #else
  
@@ -21,8 +21,9 @@
 +#else
 +
  #define FIX_FPU() ((void)0)
-+
-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
  
++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
++
  #endif
  
+ JSBool
diff --git a/www/firefox35/files/patch-layout_generic_Makefile.in b/www/firefox35/files/patch-layout_generic_Makefile.in
index 038b5df63eed..da29a9e18759 100644
--- a/www/firefox35/files/patch-layout_generic_Makefile.in
+++ b/www/firefox35/files/patch-layout_generic_Makefile.in
@@ -1,5 +1,5 @@
---- layout/generic/Makefile.in.orig	2008-06-19 12:29:06.000000000 -0500
-+++ layout/generic/Makefile.in	2008-06-19 12:30:04.000000000 -0500
+--- layout/generic/Makefile.in.orig	2009-04-28 11:16:16.059107000 +0000
++++ layout/generic/Makefile.in	2009-04-28 11:16:41.171110062 +0000
 @@ -188,9 +188,10 @@
  		-I$(srcdir)/../../content/base/src \
  		-I$(srcdir)/../../content/html/content/src \
diff --git a/www/firefox35/files/patch-media_liboggplay_src_liboggplay_std_semaphore.h b/www/firefox35/files/patch-media_liboggplay_src_liboggplay_std_semaphore.h
index d409668b8402..3c597ca853b3 100644
--- a/www/firefox35/files/patch-media_liboggplay_src_liboggplay_std_semaphore.h
+++ b/www/firefox35/files/patch-media_liboggplay_src_liboggplay_std_semaphore.h
@@ -1,9 +1,9 @@
---- media/liboggplay/src/liboggplay/std_semaphore.h.orig	2009-03-05 22:32:15.000000000 +0100
-+++ media/liboggplay/src/liboggplay/std_semaphore.h	2009-04-10 12:31:04.000000000 +0200
-@@ -34,7 +34,7 @@
+--- media/liboggplay/src/liboggplay/std_semaphore.h.orig	2009-04-24 01:46:48.000000000 +0000
++++ media/liboggplay/src/liboggplay/std_semaphore.h	2009-04-28 08:39:25.739957779 +0000
+@@ -74,7 +74,7 @@
+  * @retval non-zero on error 
+  */
  
- #ifndef _STD_SEMAPHORE_H
- #define _STD_SEMAPHORE_H
 -#if defined(linux) || defined(SOLARIS)
 +#if defined(linux) || defined(SOLARIS) || defined(__FreeBSD__)
  #include <semaphore.h>
diff --git a/www/firefox35/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h b/www/firefox35/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h
index 614456a9d747..b4ceef6139a0 100644
--- a/www/firefox35/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h
+++ b/www/firefox35/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h
@@ -1,11 +1,11 @@
---- media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2008-11-24 21:01:48.000000000 +0000
-+++ media/liboggz/include/oggz/oggz_off_t_generated.h	2008-11-24 21:16:57.000000000 +0000
+--- media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2009-04-24 01:46:48.000000000 +0000
++++ media/liboggz/include/oggz/oggz_off_t_generated.h	2009-04-28 08:44:02.369576627 +0000
 @@ -59,7 +59,7 @@
  
  #include <sys/types.h>
  
--#ifdef __APPLE__
-+#if defined(__APPLE__) || defined (__FreeBSD__)
+-#if defined(__APPLE__) || defined(SOLARIS)
++#if defined(__APPLE__) || defined(SOLARIS) || defined (__FreeBSD__)
  typedef off_t oggz_off_t;
  #else
  typedef loff_t oggz_off_t;