- update firefox to 19.0

- update firefox-esr, thunderbird, linux-firefox, linux-thunderbird to 17.0.3
- update linux-seamonkey to 2.16
- update nspr to 4.9.5
- update nss to 3.14.3
- add DuckDuckGo search plugin to firefox [1]
- mark kompozer deprecated
- clang fixes for www/libxul19 [2]

Security:	http://www.vuxml.org/freebsd/e3f0374a-7ad6-11e2-84cd-d43d7e0c7c02.html
Submitted by:	DuckDuckGo [1], dim [2]
In collaboration with:	Jan Beich <jbeich@tormail.org>

24 files changed, 143 insertions, 682 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index b4dc2bff80f9..7d7f0bee343d 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	18.0.2
+DISTVERSION=	19.0
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${DISTVERSION}.source
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
-BUILD_DEPENDS=	nspr>=4.9.3:${PORTSDIR}/devel/nspr \
+BUILD_DEPENDS=	nspr>=4.9.4:${PORTSDIR}/devel/nspr \
 		nss>=3.14.1:${PORTSDIR}/security/nss \
 		sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
@@ -37,7 +37,6 @@ GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GL=		gl
-USE_DOS2UNIX=	media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp
 NO_MOZPKGINSTALL=yes
 
 FIREFOX_ICON=		${MOZILLA}.png
@@ -69,7 +68,6 @@ CFLAGS+=	-mminimal-toc
 .endif
 
 .if ${PORT_OPTIONS:MPGO}
-BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
 USE_DISPLAY=		yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index ca229a7b9f67..1cbb29b7675e 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-18.0.2.source.tar.bz2) = 6aa2cd33903d612cf569e2824a6168feb6209f09fb3ca730ec10236da49bd236
-SIZE (firefox-18.0.2.source.tar.bz2) = 96487282
+SHA256 (firefox-19.0.source.tar.bz2) = 645eaba5ee9a2728799822f6f79d91bfd4c3dade5141db2e0a606c85eec589f4
+SIZE (firefox-19.0.source.tar.bz2) = 98837382
diff --git a/www/firefox/files/patch-bug685258 b/www/firefox/files/patch-bug685258
index ead2d3858209..cf0cb056d144 100644
--- a/www/firefox/files/patch-bug685258
+++ b/www/firefox/files/patch-bug685258
@@ -3,9 +3,9 @@
 # Parent a2291c212856ad27622416e83c8311b6a33b52f1
 Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf
 
-diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp
---- content/media/nsAudioStream.cpp
-+++ content/media/nsAudioStream.cpp
+diff --git a/content/media/AudioStream.cpp b/content/media/AudioStream.cpp
+--- content/media/AudioStream.cpp
++++ content/media/AudioStream.cpp
 @@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo
    mFormat = aFormat;
  
diff --git a/www/firefox/files/patch-bug732340 b/www/firefox/files/patch-bug732340
deleted file mode 100644
index 95756678bd0f..000000000000
--- a/www/firefox/files/patch-bug732340
+++ /dev/null
@@ -1,13 +0,0 @@
---- gfx/harfbuzz/src/hb-ot-layout.cc.orig	2012-06-24 22:14:46.463741874 -0400
-+++ gfx/harfbuzz/src/hb-ot-layout.cc	2012-06-24 22:15:06.784770042 -0400
-@@ -537,4 +537,10 @@ hb_ot_layout_position_finish (hb_face_t 
-   GPOS::position_finish (buffer);
- }
- 
-+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
-+template int SortedArrayOf<Record<LangSys> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<Record<Script> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<IntType<unsigned short> >::search<unsigned int>(unsigned int const &) const;
-+template int SortedArrayOf<RangeRecord>::search<unsigned int>(unsigned int const &) const;
-+#endif
- 
diff --git a/www/firefox/files/patch-bug778078 b/www/firefox/files/patch-bug778078
deleted file mode 100644
index f7bedeb8053c..000000000000
--- a/www/firefox/files/patch-bug778078
+++ /dev/null
@@ -1,11 +0,0 @@
---- toolkit/xre/nsAppRunner.cpp~
-+++ toolkit/xre/nsAppRunner.cpp
-@@ -3833,7 +3833,7 @@ XREMain::XRE_main(int argc, char* argv[]
-   ScopedLogging log;
- 
- #if defined(MOZ_WIDGET_GTK)
--#ifdef MOZ_MEMORY
-+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
-   // Disable the slice allocator, since jemalloc already uses similar layout
-   // algorithms, and using a sub-allocator tends to increase fragmentation.
-   // This must be done before g_thread_init() is called.
diff --git a/www/firefox/files/patch-bug781457 b/www/firefox/files/patch-bug781457
deleted file mode 100644
index 8a790ccf84a9..000000000000
--- a/www/firefox/files/patch-bug781457
+++ /dev/null
@@ -1,10 +0,0 @@
---- xpcom/base/nsStackWalk.cpp.orig	2012-05-29 00:57:31.000000000 +0200
-+++ xpcom/base/nsStackWalk.cpp	2012-06-03 12:33:40.000000000 +0200
-@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb
- 
- #elif defined(HAVE__UNWIND_BACKTRACE)
- 
-+#define _GNU_SOURCE
- // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0
- #include <unwind.h>
- 
diff --git a/www/firefox/files/patch-bug783505 b/www/firefox/files/patch-bug783505
deleted file mode 100644
index ab4ebe941457..000000000000
--- a/www/firefox/files/patch-bug783505
+++ /dev/null
@@ -1,52 +0,0 @@
-commit b5f97ee
-Author: Rafael Ávila de Espíndola <respindola@mozilla.com>
-Date:   Mon Aug 20 10:28:08 2012 -0400
-
-    Bug 783505 - OS X gcc builds failing. r=jorendorff.
-    This patch adds a workaround for
-    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39608
----
- js/src/jstypedarray.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git js/src/jstypedarray.cpp js/src/jstypedarray.cpp
-index 1eaeea0..1957086 100644
---- js/src/jstypedarray.cpp
-+++ js/src/jstypedarray.cpp
-@@ -1423,8 +1423,14 @@ class TypedArrayTemplate
-     Getter(JSContext *cx, unsigned argc, Value *vp)
-     {
-         CallArgs args = CallArgsFromVp(argc, vp);
-+        // FIXME: Hack to keep us building with gcc 4.2. Remove this once we
-+        // drop support for gcc 4.2. See bug 783505 for the details.
-+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2
-+        return CallNonGenericMethod(cx, IsThisClass, GetterImpl<ValueGetter>, args);
-+#else
-         return CallNonGenericMethod<ThisTypeArray::IsThisClass,
-                                     ThisTypeArray::GetterImpl<ValueGetter> >(cx, args);
-+#endif
-     }
- 
-     // Define an accessor for a read-only property that invokes a native getter
---- build/autoconf/gcc-pr39608.m4~
-+++ build/autoconf/gcc-pr39608.m4
-@@ -31,7 +31,6 @@ AC_LANG_RESTORE
- 
- AC_MSG_RESULT($ac_have_gcc_pr39608)
- if test "$ac_have_gcc_pr39608" = "yes"; then
--   echo This compiler would fail to build firefox, plase upgrade.
--   exit 1
-+   echo This compiler may fail to build firefox, plase upgrade.
- fi
- ])
---- js/src/build/autoconf/gcc-pr39608.m4~
-+++ js/src/build/autoconf/gcc-pr39608.m4
-@@ -31,7 +31,6 @@ AC_LANG_RESTORE
- 
- AC_MSG_RESULT($ac_have_gcc_pr39608)
- if test "$ac_have_gcc_pr39608" = "yes"; then
--   echo This compiler would fail to build firefox, plase upgrade.
--   exit 1
-+   echo This compiler may fail to build firefox, plase upgrade.
- fi
- ])
diff --git a/www/firefox/files/patch-bug788955 b/www/firefox/files/patch-bug788955
deleted file mode 100644
index 57c5f12d7ed4..000000000000
--- a/www/firefox/files/patch-bug788955
+++ /dev/null
@@ -1,299 +0,0 @@
-diff --git Makefile.in Makefile.in
-index e341462..f75bd55 100644
---- Makefile.in
-+++ Makefile.in
-@@ -48,8 +48,10 @@ endif
- ifdef MOZ_MEMORY
- tier_base_dirs += memory/mozjemalloc
- ifdef MOZ_JEMALLOC
-+ifndef MOZ_NATIVE_JEMALLOC
- tier_base_dirs += memory/jemalloc
- endif
-+endif
- tier_base_dirs += memory/build
- endif
- ifndef MOZ_NATIVE_ZLIB
-diff --git allmakefiles.sh allmakefiles.sh
-index 6a9be4b..d2e49e3 100755
---- allmakefiles.sh
-+++ allmakefiles.sh
-@@ -59,7 +59,7 @@ if [ ! "$LIBXUL_SDK" ]; then
-     mozglue/Makefile
-     mozglue/build/Makefile
-   "
--  if [ "$MOZ_JEMALLOC" ]; then
-+  if [ "$MOZ_JEMALLOC" -a -z "$MOZ_NATIVE_JEMALLOC" ]; then
-     add_makefiles "
-       memory/jemalloc/Makefile
-     "
-diff --git configure.in configure.in
-index bb05782..2f32516 100644
---- configure.in
-+++ configure.in
-@@ -3711,21 +3711,22 @@ fi
- 
- dnl Check for the existence of various allocation headers/functions
- 
-+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h"
- MALLOC_H=
--MOZ_CHECK_HEADER(malloc.h,        [MALLOC_H=malloc.h])
--if test "$MALLOC_H" = ""; then
--  MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h])
--  if test "$MALLOC_H" = ""; then
--    MOZ_CHECK_HEADER(sys/malloc.h,    [MALLOC_H=sys/malloc.h])
-+
-+for file in $MALLOC_HEADERS; do
-+  MOZ_CHECK_HEADER($file, [MALLOC_H=$file])
-+  if test "$MALLOC_H" != ""; then
-+    AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>)
-+    break
-   fi
--fi
--if test "$MALLOC_H" != ""; then
--   AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>)
--fi
-+done
- 
- MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc"
- AC_CHECK_FUNCS(strndup posix_memalign memalign valloc)
- 
-+AC_CHECK_FUNCS(malloc_usable_size)
-+
- dnl See if compiler supports some gcc-style attributes
- 
- AC_CACHE_CHECK(for __attribute__((always_inline)),
-@@ -6939,6 +6940,18 @@ else
- fi
- 
- if test -z "$MOZ_MEMORY"; then
-+  if test -n "$MOZ_JEMALLOC"; then
-+    MOZ_NATIVE_JEMALLOC=1
-+    AC_CHECK_FUNCS(mallctl nallocm,,
-+      [MOZ_NATIVE_JEMALLOC=
-+       break])
-+    if test -n "$MOZ_NATIVE_JEMALLOC"; then
-+      MOZ_MEMORY=1
-+      AC_DEFINE(MOZ_MEMORY)
-+      AC_DEFINE(MOZ_JEMALLOC)
-+      AC_DEFINE(MOZ_NATIVE_JEMALLOC)
-+    fi
-+  fi
-   case "${target}" in
-     *-mingw*)
-       if test -z "$WIN32_REDIST_DIR" -a -z "$MOZ_DEBUG"; then
-@@ -7033,6 +7046,7 @@ else
- fi # MOZ_MEMORY
- AC_SUBST(MOZ_MEMORY)
- AC_SUBST(MOZ_JEMALLOC)
-+AC_SUBST(MOZ_NATIVE_JEMALLOC)
- AC_SUBST(MOZ_GLUE_LDFLAGS)
- AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS)
- AC_SUBST(WIN32_CRT_LIBS)
-@@ -8820,10 +8834,22 @@ fi
- 
- # Run jemalloc configure script
- 
--if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then
-+if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_JEMALLOC" -a "$MOZ_MEMORY" ; then
-   ac_configure_args="$_SUBDIR_CONFIG_ARGS --build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_"
--  if test "$OS_ARCH" = "Linux"; then
--    MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size"
-+  case "$OS_ARCH" in
-+    Linux|DragonFly|FreeBSD|NetBSD|OpenBSD)
-+      MANGLE="malloc calloc valloc free realloc posix_memalign"
-+      case "$OS_ARCH" in
-+        Linux)
-+          MANGLE="$MANGLE memalign malloc_usable_size"
-+          ;;
-+        FreeBSD)
-+          MANGLE="$MANGLE malloc_usable_size"
-+          ;;
-+      esac
-+      ;;
-+  esac
-+  if test -n "$MANGLE"; then
-     MANGLED=
-     JEMALLOC_WRAPPER=
-     if test -n "$_WRAP_MALLOC"; then
-diff --git memory/build/Makefile.in memory/build/Makefile.in
-index dca0f48..af93ee0 100644
---- memory/build/Makefile.in
-+++ memory/build/Makefile.in
-@@ -22,7 +22,9 @@ CSRCS = extraMallocFuncs.c
- 
- ifdef MOZ_JEMALLOC
- CSRCS += mozjemalloc_compat.c
-+ifndef MOZ_NATIVE_JEMALLOC
- SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
-+endif
- else
- SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc)
- endif
-diff --git memory/build/extraMallocFuncs.c memory/build/extraMallocFuncs.c
-index 9d87629..03c8320 100644
---- memory/build/extraMallocFuncs.c
-+++ memory/build/extraMallocFuncs.c
-@@ -94,8 +94,16 @@ wrap(wcsdup)(const wchar_t *src)
- #endif
- 
- #ifdef MOZ_JEMALLOC
-+
-+#undef wrap
-+#if defined(MOZ_NATIVE_JEMALLOC)
-+#define wrap(a) a
-+#else
-+#define wrap(a) je_ ## a
-+#endif
-+
- /* Override some jemalloc defaults */
--const char *je_malloc_conf = "narenas:1,lg_chunk:20";
-+MOZ_EXPORT_DATA(const char *) wrap(malloc_conf) = "narenas:1,lg_chunk:20";
- 
- #ifdef ANDROID
- #include <android/log.h>
-diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c
-index 10a845a..94ad96e 100644
---- memory/build/mozjemalloc_compat.c
-+++ memory/build/mozjemalloc_compat.c
-@@ -5,14 +5,21 @@
- #include "mozilla/Types.h"
- #include "jemalloc_types.h"
- 
--extern int je_mallctl(const char*, void*, size_t*, void*, size_t);
-+#if defined(MOZ_NATIVE_JEMALLOC)
-+#define wrap(a) a
-+#else
-+#define wrap(a) je_ ## a
-+#endif
- 
--MOZ_EXPORT_API (void)
-+extern MOZ_IMPORT_API(int)
-+wrap(mallctl)(const char*, void*, size_t*, void*, size_t);
-+
-+MOZ_EXPORT_API(void)
- jemalloc_stats(jemalloc_stats_t *stats)
- {
-   size_t size = sizeof(stats->mapped);
--  je_mallctl("stats.mapped", &stats->mapped, &size, NULL, 0);
--  je_mallctl("stats.allocated", &stats->allocated, &size, NULL, 0);
-+  wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0);
-+  wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0);
-   stats->committed = -1;
-   stats->dirty = -1;
- }
-diff --git memory/jemalloc/src/src/mutex.c memory/jemalloc/src/src/mutex.c
-index 37a843e..55e18c2 100644
---- memory/jemalloc/src/src/mutex.c
-+++ memory/jemalloc/src/src/mutex.c
-@@ -64,7 +64,7 @@ pthread_create(pthread_t *__restrict thread,
- /******************************************************************************/
- 
- #ifdef JEMALLOC_MUTEX_INIT_CB
--int	_pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex,
-+JEMALLOC_EXPORT int	_pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex,
-     void *(calloc_cb)(size_t, size_t));
- #endif
- 
-diff --git memory/mozalloc/mozalloc.cpp memory/mozalloc/mozalloc.cpp
-index 5b61050b..5b3399a 100644
---- memory/mozalloc/mozalloc.cpp
-+++ memory/mozalloc/mozalloc.cpp
-@@ -12,16 +12,13 @@
- #include <sys/types.h>
- 
- #if defined(MALLOC_H)
--#  include MALLOC_H             // for memalign, valloc where available
-+#  include MALLOC_H             // for memalign, valloc, malloc_size, malloc_usable_size
- #endif // if defined(MALLOC_H)
- #include <stddef.h>             // for size_t
- #include <stdlib.h>             // for malloc, free
- #if defined(XP_UNIX)
- #  include <unistd.h>           // for valloc on *BSD
- #endif //if defined(XP_UNIX)
--#if defined(__FreeBSD__)
--#  include <malloc_np.h>        // for malloc_usable_size
--#endif // if defined(__FreeBSD__)
- 
- #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
- #  define MOZALLOC_EXPORT __declspec(dllexport)
-@@ -213,8 +210,7 @@ moz_malloc_usable_size(void *ptr)
- 
- #if defined(XP_MACOSX)
-     return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
--    // Android bionic libc doesn't have malloc_usable_size.
-+#elif defined(HAVE_MALLOC_USABLE_SIZE) || defined(MOZ_MEMORY)
-     return malloc_usable_size(ptr);
- #elif defined(XP_WIN)
-     return _msize(ptr);
-diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h
-index f0e0878..2486e83 100644
---- memory/mozjemalloc/jemalloc.h
-+++ memory/mozjemalloc/jemalloc.h
-@@ -37,22 +37,29 @@
- #endif
- #include "jemalloc_types.h"
- 
-+#if defined(MOZ_NATIVE_JEMALLOC)
-+#define wrap(a) a
-+#else
-+#define wrap(a) je_ ## a
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
--#if defined(MOZ_MEMORY_LINUX)
-+#if defined(MOZ_NATIVE_JEMALLOC) \
-+  || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
- __attribute__((weak))
- #endif
- void	jemalloc_stats(jemalloc_stats_t *stats);
- 
- /* Computes the usable size in advance. */
- #if !defined(MOZ_MEMORY_DARWIN)
--#if defined(MOZ_MEMORY_LINUX)
-+#if defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
- __attribute__((weak))
- #endif
- #if defined(MOZ_JEMALLOC)
--int je_nallocm(size_t *rsize, size_t size, int flags);
-+MOZ_IMPORT_API(int) wrap(nallocm)(size_t *rsize, size_t size, int flags);
- #else
- size_t je_malloc_good_size(size_t size);
- #endif
-@@ -62,11 +69,11 @@ static inline size_t je_malloc_usable_size_in_advance(size_t size) {
- #if defined(MOZ_MEMORY_DARWIN)
-   return malloc_good_size(size);
- #elif defined(MOZ_JEMALLOC)
--  if (je_nallocm) {
-+  if (wrap(nallocm)) {
-     size_t ret;
-     if (size == 0)
-       size = 1;
--    if (!je_nallocm(&ret, size, 0))
-+    if (!wrap(nallocm)(&ret, size, 0))
-       return ret;
-   }
-   return size;
-@@ -113,4 +120,6 @@ void    jemalloc_purge_freed_pages();
- } /* extern "C" */
- #endif
- 
-+#undef wrap
-+
- #endif /* _JEMALLOC_H_ */
-diff --git mozglue/build/Makefile.in mozglue/build/Makefile.in
-index c333647..15ba505 100644
---- mozglue/build/Makefile.in
-+++ mozglue/build/Makefile.in
-@@ -23,7 +23,7 @@ FORCE_STATIC_LIB = 1
- endif
- 
- # Keep jemalloc separated when mozglue is statically linked
--ifeq (1_1,$(MOZ_MEMORY)_$(FORCE_SHARED_LIB))
-+ifeq (1_1,$(MOZ_MEMORY)_$(or $(MOZ_NATIVE_JEMALLOC),$(FORCE_SHARED_LIB)))
- SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,memory,$(DEPTH)/memory/build)
- else
- # Temporary, until bug 662814 lands
diff --git a/www/firefox/files/patch-bug798354 b/www/firefox/files/patch-bug798354
deleted file mode 100644
index 09ee2bfbead9..000000000000
--- a/www/firefox/files/patch-bug798354
+++ /dev/null
@@ -1,15 +0,0 @@
---- ipc/chromium/src/chrome/common/ipc_channel_posix.cc~
-+++ ipc/chromium/src/chrome/common/ipc_channel_posix.cc
-@@ -133,7 +133,12 @@ int ChannelNameToClientFD(const std::string& channel_id) {
- }
- 
- //------------------------------------------------------------------------------
-+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2
-+sockaddr_un sizecheck;
-+const size_t kMaxPipeNameLength = sizeof(sizecheck.sun_path);
-+#else
- const size_t kMaxPipeNameLength = sizeof(sockaddr_un::sun_path);
-+#endif
- 
- // Creates a Fifo with the specified name ready to listen on.
- bool CreateServerFifo(const std::string& pipe_name, int* server_listen_fd) {
diff --git a/www/firefox/files/patch-bug800401 b/www/firefox/files/patch-bug800401
deleted file mode 100644
index 97e430a9a95f..000000000000
--- a/www/firefox/files/patch-bug800401
+++ /dev/null
@@ -1,91 +0,0 @@
-commit a564d64
-Author: Ehsan Akhgari <ehsan@mozilla.com>
-Date:   Thu Oct 11 13:42:12 2012 -0400
-
-    Bug 800401 - Make sure that the WebRTC build system does not impose the -Werror flag on all Linux/Mac builds; r=jesup
-    
-    In the future, we need to hook these up to the FAIL_ON_WARNINGS machinery.
----
- media/mtransport/third_party/nICEr/nicer.gyp       | 2 --
- media/mtransport/third_party/nrappkit/nrappkit.gyp | 2 --
- media/webrtc/signaling/signaling.gyp               | 6 ------
- 3 files changed, 10 deletions(-)
-
-diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp
-index 26ec0c5..0e1f8b4 100644
---- media/mtransport/third_party/nICEr/nicer.gyp
-+++ media/mtransport/third_party/nICEr/nicer.gyp
-@@ -132,7 +132,6 @@
-               ## Mac
-               [ 'OS == "mac"', {
-                 'cflags_mozilla': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-@@ -183,7 +182,6 @@
-               ## Linux
-               [ 'OS == "linux"', {
-                 'cflags': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp
-index f9a5c19..3cc8e1c 100644
---- media/mtransport/third_party/nrappkit/nrappkit.gyp
-+++ media/mtransport/third_party/nrappkit/nrappkit.gyp
-@@ -150,7 +150,6 @@
-               ## Mac
-               [ 'OS == "mac"', {
-                 'cflags_mozilla': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-@@ -200,7 +199,6 @@
-               ## Linux
-               [ 'OS == "linux"', {
-                 'cflags': [
--                    '-Werror',
-                     '-Wall',
-                     '-Wno-parentheses',
-                     '-Wno-strict-prototypes',
-diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp
-index 1ec0ee2..175996f 100644
---- media/webrtc/signaling/signaling.gyp
-+++ media/webrtc/signaling/signaling.gyp
-@@ -184,7 +184,6 @@
-           ],
-           
-           'cflags_mozilla': [
--            '-Werror',
-           ],
-         }],
-         ['OS=="win"', {
-@@ -212,8 +211,6 @@
-           ],
-           
-           'cflags_mozilla': [
--            '-Werror',
--            '-Wno-error=conversion'
-           ],
-         }],
-       ],
-@@ -633,7 +630,6 @@
-           ],
- 
-           'cflags_mozilla': [
--            '-Werror',
-           ],
-         }],
-         ['OS=="win"', {
-@@ -752,8 +748,6 @@
-           ],
-           
-           'cflags_mozilla': [
--            '-Werror',
--            '-Wno-error=conversion'
-           ],
-         }],
-       ],
diff --git a/www/firefox/files/patch-bug806139 b/www/firefox/files/patch-bug806139
deleted file mode 100644
index e4bd1ba30ce1..000000000000
--- a/www/firefox/files/patch-bug806139
+++ /dev/null
@@ -1,29 +0,0 @@
---- content/html/content/public/nsHTMLMediaElement.h~
-+++ content/html/content/public/nsHTMLMediaElement.h
-@@ -311,7 +311,7 @@ public:
-   static bool IsH264Enabled();
-   static bool IsH264Type(const nsACString& aType);
-   static const char gH264Types[3][16];
--  static char const *const gH264Codecs[7];
-+  static char const *const gH264Codecs[9];
- #endif
- 
- #ifdef MOZ_MEDIA_PLUGINS
---- content/html/content/src/nsHTMLMediaElement.cpp~
-+++ content/html/content/src/nsHTMLMediaElement.cpp
-@@ -2135,12 +2135,14 @@ nsHTMLMediaElement::IsWebMType(const nsA
- #endif
- 
- #if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK)
--char const *const nsHTMLMediaElement::gH264Codecs[7] = {
-+char const *const nsHTMLMediaElement::gH264Codecs[9] = {
-   "avc1.42E01E",
-   "avc1.42001E",
-   "avc1.58A01E",
-   "avc1.4D401E",
-   "avc1.64001E",
-+  "avc1.64001F",
-+  "mp4v.20.3",
-   "mp4a.40.2",
-   nullptr
- };
diff --git a/www/firefox/files/patch-bug807492 b/www/firefox/files/patch-bug807492
index 061b9df4e8e3..4d51306d44ba 100644
--- a/www/firefox/files/patch-bug807492
+++ b/www/firefox/files/patch-bug807492
@@ -81,11 +81,11 @@ index c167461..8346c11 100644
  if test -n "$MOZ_WEBRTC"; then
     AC_MSG_RESULT("generating WebRTC Makefiles...")
  
+ dnl Any --include files must also appear in -D FORCED_INCLUDE_FILE= entries
+ dnl so that regeneration via dependencies works correctly
     WEBRTC_CONFIG="-D build_with_mozilla=1 --include ${srcdir}/media/webrtc/webrtc_config.gypi -D FORCED_INCLUDE_FILE=${srcdir}/media/webrtc/webrtc_config.gypi"
  
     GYP_WEBRTC_OPTIONS="--format=mozmake ${WEBRTC_CONFIG} ${EXTRA_GYP_DEFINES} --depth=${srcdir}/media/webrtc/trunk --toplevel-dir=${srcdir} -G OBJDIR=${_objdir}"
- 
-    $PYTHON ${srcdir}/media/webrtc/trunk/build/gyp_chromium \
 diff --git js/src/config/system-headers js/src/config/system-headers
 index 9bd1efa..1095a01 100644
 --- js/src/config/system-headers
@@ -289,7 +289,7 @@ index cc260b7..66af2d7 100644
 +
 +#ifdef __FreeBSD__
 +#include <osreldate.h>
-+# if __FreeBSD_version > 900044
++# if __FreeBSD_version > 900505
 +#  define HAVE_XLOCALE
 +# endif
 +#endif
@@ -446,7 +446,13 @@ diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/qu
 index bcb1ec0..bb73591 100644
 --- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
 +++ media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-@@ -33,5 +33,5 @@
+@@ -28,17 +28,17 @@
+  *
+  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
+  * $FreeBSD$
+  */
+ 
+ #ifndef _SYS_QUEUE_H_
  #define	_SYS_QUEUE_H_
  
 -#ifndef DARWIN
@@ -455,6 +461,10 @@ index bcb1ec0..bb73591 100644
  #define __offsetof offsetof
  #endif
  
+ #define STAILQ_FOREACH_SAFE(var, head, field, tvar)                     \
+          for ((var) = STAILQ_FIRST((head));                              \
+              (var) && ((tvar) = STAILQ_NEXT((var), field), 1);           \
+              (var) = (tvar))
 diff --git media/mtransport/third_party/nrappkit/src/util/util.c media/mtransport/third_party/nrappkit/src/util/util.c
 index 3aced8b..be020bb 100644
 --- media/mtransport/third_party/nrappkit/src/util/util.c
@@ -581,10 +591,10 @@ diff --git media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c media/we
 index a7c47e1..4f191de 100644
 --- media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
 +++ media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c
-@@ -352,21 +352,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, b
+@@ -317,21 +317,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData)
  {
      static const char fname[] = "cprGetMessage";
- 	
+ 
      void *buffer = 0;
      cpr_msg_queue_t *msgq;
      cpr_msgq_node_t *node;
@@ -599,12 +609,12 @@ index a7c47e1..4f191de 100644
  		int     tz_dsttime;     /* type of dst correction to apply */
  	} tz;
 +#endif
- 	
+ 
      /* Initialize ppUserData */
      if (ppUserData) {
          *ppUserData = NULL;
      }
- 	
+ 
      msgq = (cpr_msg_queue_t *) msgQueue;
      if (msgq == NULL) {
 diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
@@ -1268,7 +1278,6 @@ index 12df1b3..424ea0a 100644
 +#include <linux/videodev2.h>
 +#endif
 +
- #include <iostream>
  #include <new>
  
  #include "ref_count.h"
@@ -1276,6 +1285,7 @@ index 12df1b3..424ea0a 100644
  #include "thread_wrapper.h"
  #include "critical_section_wrapper.h"
  #include "video_capture_linux.h"
+ 
 diff --git media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
 index e3f7bb5..882cede 100644
 --- media/webrtc/trunk/src/modules/video_capture/main/source/device_info_impl.cc
diff --git a/www/firefox/files/patch-bug815025 b/www/firefox/files/patch-bug815025
deleted file mode 100644
index 8207a72f8695..000000000000
--- a/www/firefox/files/patch-bug815025
+++ /dev/null
@@ -1,27 +0,0 @@
---- mfbt/SHA1.h~
-+++ mfbt/SHA1.h
-@@ -27,6 +27,11 @@
- #include "mozilla/StandardInteger.h"
- #include "mozilla/Types.h"
- 
-+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
-+/* c++/36107: mark SHA1Sum constructor as weak manually */
-+__asm__(".weak _ZN7mozilla7SHA1SumC1Ev");
-+#endif
-+
- namespace mozilla {
- class SHA1Sum {
-   union {
-@@ -39,7 +43,12 @@ class SHA1Sum {
- 
- public:
-   static const unsigned int HashSize = 20;
-+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
-+  /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */
-+  MOZ_IMPORT_API() SHA1Sum();
-+#else
-   MFBT_API() SHA1Sum();
-+#endif
-   MFBT_API(void) update(const void* dataIn, uint32_t len);
-   MFBT_API(void) finish(uint8_t hashout[20]);
- };
diff --git a/www/firefox/files/patch-bug817267 b/www/firefox/files/patch-bug817267
new file mode 100644
index 000000000000..84c77f9e8ac5
--- /dev/null
+++ b/www/firefox/files/patch-bug817267
@@ -0,0 +1,36 @@
+commit faafeb1
+Author: Jan Beich <jbeich@tormail.org>
+Date:   Sat Dec 1 21:25:24 2012 -0500
+
+    Bug 817267 - dirfd() is a macro on some BSDs, fix build there. r=yoric
+---
+ dom/system/OSFileConstants.cpp | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git dom/system/OSFileConstants.cpp dom/system/OSFileConstants.cpp
+index 75a41dc..63fc6b1 100644
+--- dom/system/OSFileConstants.cpp
++++ dom/system/OSFileConstants.cpp
+@@ -41,6 +41,11 @@
+ #include "OSFileConstants.h"
+ #include "nsIOSFileConstantsService.h"
+ 
++#if defined(__DragonFly__) || defined(__FreeBSD__) \
++  || defined(__NetBSD__) || defined(__OpenBSD__)
++#define __dd_fd dd_fd
++#endif
++
+ /**
+  * This module defines the basic libc constants (error numbers, open modes,
+  * etc.) used by OS.File and possibly other OS-bound JavaScript libraries.
+@@ -383,8 +388,8 @@ static dom::ConstantSpec gLibcProperties[] =
+   { "OSFILE_OFFSETOF_DIRENT_D_TYPE", INT_TO_JSVAL(offsetof (struct dirent, d_type)) },
+ #endif // defined(DT_UNKNOWN)
+ 
+-  // Under MacOS X, |dirfd| is a macro rather than a function, so we
+-  // need a little help to get it to work
++  // Under MacOS X and BSDs, |dirfd| is a macro rather than a
++  // function, so we need a little help to get it to work
+ #if defined(dirfd)
+   { "OSFILE_SIZEOF_DIR", INT_TO_JSVAL(sizeof (DIR)) },
+ 
diff --git a/www/firefox/files/patch-bug828003 b/www/firefox/files/patch-bug828003
index f30c317d81ee..3ec412894f74 100644
--- a/www/firefox/files/patch-bug828003
+++ b/www/firefox/files/patch-bug828003
@@ -4,13 +4,13 @@
  #include "mozilla/StandardInteger.h"
  
  /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
-+/* stdint.h defines int*_t and uintptr_t */
++/* StandardInteger.h defines int*_t and uintptr_t */
  
 -#if defined (__SVR4) && defined (__sun)
 -/* int_types.h gets included somehow, so avoid redefining the types differently */
 -#include <sys/int_types.h>
 -#elif defined (_AIX)
-+#if defined (_AIX)
++#if defined(_AIX)
  #include <sys/types.h>
 -#elif defined(__OpenBSD__)
 -#include <inttypes.h>
@@ -26,7 +26,7 @@
 -
 -#ifdef __OS2__
 -/* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
-+#elif __OS2__
++#elif defined(__OS2__)
  #include <stdlib.h>
 -#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
 -typedef unsigned long uintptr_t;
diff --git a/www/firefox/files/patch-content-base-src-nsTextFragmentImpl.h b/www/firefox/files/patch-content-base-src-nsTextFragmentImpl.h
deleted file mode 100644
index 2ab569ee0b56..000000000000
--- a/www/firefox/files/patch-content-base-src-nsTextFragmentImpl.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- content/base/src/nsTextFragmentImpl.h.orig	2013-01-05 00:44:29.000000000 +0100
-+++ content/base/src/nsTextFragmentImpl.h	2013-01-10 13:02:12.291088273 +0100
-@@ -16,7 +16,11 @@
- };
- 
- template<> struct Non8BitParameters<8> {
-+#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 2
-+  static inline size_t mask() { return 0xff00ff00ff00ff00ULL; }
-+#else
-   static inline size_t mask() { return 0xff00ff00ff00ff00; }
-+#endif
-   static inline uint32_t alignMask() { return 0x7; }
-   static inline uint32_t numUnicharsPerWord() { return 4; }
- };
diff --git a/www/firefox/files/patch-content-media-nsAudioStream.cpp b/www/firefox/files/patch-content-media-AudioStream.cpp
index f65a6678b05a..cfb10e53f2a8 100644
--- a/www/firefox/files/patch-content-media-nsAudioStream.cpp
+++ b/www/firefox/files/patch-content-media-AudioStream.cpp
@@ -1,5 +1,5 @@
---- content/media/nsAudioStream.cpp~
-+++ content/media/nsAudioStream.cpp
+--- content/media/AudioStream.cpp~
++++ content/media/AudioStream.cpp
 @@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure)
        gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nullptr));
      }
diff --git a/www/firefox/files/patch-duckduckgo b/www/firefox/files/patch-duckduckgo
new file mode 100644
index 000000000000..7481cabc99ca
--- /dev/null
+++ b/www/firefox/files/patch-duckduckgo
@@ -0,0 +1,56 @@
+diff -r f2fa4ae74ee1 browser/locales/en-US/chrome/browser-region/region.properties
+--- browser/locales/en-US/chrome/browser-region/region.properties	Mon Oct 24 22:54:18 2011 +0300
++++ browser/locales/en-US/chrome/browser-region/region.properties	Tue Oct 25 21:13:40 2011 -0400
+@@ -1,15 +1,16 @@
+ # Default search engine
+ browser.search.defaultenginename=Google
+ 
+ # Search engine order (order displayed in the search bar dropdown)s
+ browser.search.order.1=Google
+ browser.search.order.2=Yahoo
+ browser.search.order.3=Bing
++browser.search.order.4=DuckDuckGo
+ 
+ # This is the default set of web based feed handlers shown in the reader
+ # selection UI
+ browser.contentHandlers.types.0.title=Google
+ browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
+ browser.contentHandlers.types.1.title=My Yahoo!
+ browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
+ 
+--- /dev/null	2013-02-09 00:33:00.000000000 +0100
++++ browser/locales/en-US/searchplugins/duckduckgo.xml	2013-02-09 00:40:19.000000000 +0100
+@@ -0,0 +1,11 @@
++<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
++<ShortName>DuckDuckGo</ShortName>
++<Description>We believe in better search and not tracking.</Description>
++<InputEncoding>UTF-8</InputEncoding>
++<Image height="16" width="16" type="image/x-icon">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</Image>
++<Url type="text/html" method="GET" template="https://duckduckgo.com/">
++<Param name="q" value="{searchTerms}"/>
++<Param name="t" value="freebsd"/>
++</Url>
++<SearchForm>https://duckduckgo.com/</SearchForm>
++</SearchPlugin>
+diff -r f2fa4ae74ee1 browser/locales/en-US/searchplugins/list.txt
+--- browser/locales/en-US/searchplugins/list.txt	Mon Oct 24 22:54:18 2011 +0300
++++ browser/locales/en-US/searchplugins/list.txt	Tue Oct 25 21:13:40 2011 -0400
+@@ -1,7 +1,8 @@
+ amazondotcom
+ bing
++duckduckgo
+ eBay
+ google
+ twitter
+ wikipedia
+ yahoo
+--- browser/app/profile/firefox.js.orig	2013-02-09 12:26:02.000000000 +0100
++++ browser/app/profile/firefox.js	2013-02-09 12:26:19.000000000 +0100
+@@ -341,6 +341,7 @@
+ pref("browser.search.order.1",                "chrome://browser-region/locale/region.properties");
+ pref("browser.search.order.2",                "chrome://browser-region/locale/region.properties");
+ pref("browser.search.order.3",                "chrome://browser-region/locale/region.properties");
++pref("browser.search.order.4",                "chrome://browser-region/locale/region.properties");
+ 
+ // search bar results always open in a new tab
+ pref("browser.search.openintab", false);
diff --git a/www/firefox/files/patch-gfx-ots-include-opentype-sanitiser.h b/www/firefox/files/patch-gfx-ots-include-opentype-sanitiser.h
new file mode 100644
index 000000000000..306756daa7e0
--- /dev/null
+++ b/www/firefox/files/patch-gfx-ots-include-opentype-sanitiser.h
@@ -0,0 +1,18 @@
+diff --git gfx/ots/include/opentype-sanitiser.h gfx/ots/include/opentype-sanitiser.h
+index f42822e..1a5a699 100644
+--- gfx/ots/include/opentype-sanitiser.h
++++ gfx/ots/include/opentype-sanitiser.h
+@@ -44,6 +44,13 @@ typedef unsigned __int64 uint64_t;
+ #include <stdint.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++# include <osreldate.h>
++# if __FreeBSD_version < 800067
++#  include <sys/types.h> // for off_t
++# endif
++#endif
++
+ #include <algorithm>  // for std::min
+ #include <cassert>
+ #include <cstddef>
diff --git a/www/firefox/files/patch-ipc-chromium-Makefile.in b/www/firefox/files/patch-ipc-chromium-Makefile.in
index b660c3662bb0..0e20edf2ee37 100644
--- a/www/firefox/files/patch-ipc-chromium-Makefile.in
+++ b/www/firefox/files/patch-ipc-chromium-Makefile.in
@@ -1,20 +1,5 @@
 --- ipc/chromium/Makefile.in~
 +++ ipc/chromium/Makefile.in
-@@ -43,6 +43,14 @@ include $(DEPTH)/config/autoconf.mk
- 
- OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS))
- 
-+# workaround IPC hang with libevent2
-+ifndef MOZ_DEBUG
-+ifneq (,$(filter 4.2.%, $(CXX_VERSION)))
-+MOZ_OPTIMIZE_FLAGS = -O1
-+OS_CXXFLAGS += $(MOZ_OPTIMIZE_FLAGS)
-+endif
-+endif
-+
- LIBRARY_NAME = chromium_s
- FORCE_STATIC_LIB = 1
- LIBXUL_LIBRARY = 1
 @@ -55,9 +60,7 @@ vpath %.c \
    $(srcdir)/src/third_party/libevent \
    $(NULL)
diff --git a/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc b/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
index 7d4dc959eedf..02b6a5e90eca 100644
--- a/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
+++ b/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc
@@ -1,9 +1,9 @@
 --- ipc/chromium/src/base/message_pump_libevent.cc~
 +++ ipc/chromium/src/base/message_pump_libevent.cc
-@@ -15,7 +15,7 @@
- #include "base/scoped_nsautorelease_pool.h"
+@@ -16,7 +16,7 @@
  #include "base/scoped_ptr.h"
  #include "base/time.h"
+ #include "nsDependentSubstring.h"
 -#include "third_party/libevent/event.h"
 +#include "event.h"
  
diff --git a/www/firefox/files/patch-xpcom-base-AvailableMemoryTracker.cpp b/www/firefox/files/patch-xpcom-base-AvailableMemoryTracker.cpp
deleted file mode 100644
index 5499f4fbe9e3..000000000000
--- a/www/firefox/files/patch-xpcom-base-AvailableMemoryTracker.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- xpcom/base/AvailableMemoryTracker.cpp~
-+++ xpcom/base/AvailableMemoryTracker.cpp
-@@ -499,6 +499,6 @@ nsJemallocFreeDirtyPagesRunnable::Run()
-   MOZ_ASSERT(NS_IsMainThread());
- 
- #if defined(MOZ_JEMALLOC)
--  mallctl("arenas.purge", nullptr, 0, nullptr, 0);
-+//  mallctl("arenas.purge", nullptr, 0, nullptr, 0);
- #elif defined(MOZ_MEMORY)
-   jemalloc_free_dirty_pages();
diff --git a/www/firefox/files/patch-z-bug762445 b/www/firefox/files/patch-z-bug762445
deleted file mode 100644
index fd42fea9cab2..000000000000
--- a/www/firefox/files/patch-z-bug762445
+++ /dev/null
@@ -1,70 +0,0 @@
-commit b44dc8e
-Author: Jan Beich <jbeich@tormail.org>
-Date:   Fri Oct 12 18:49:59 2012 +0000
-
-    Bug 762445 - Add jemalloc3 glue for heap-committed, heap-dirty in about:memory.
----
- memory/build/mozjemalloc_compat.c | 34 ++++++++++++++++++++++++++++------
- 1 file changed, 28 insertions(+), 6 deletions(-)
-
-diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c
-index 94ad96e..7adfef5 100644
---- memory/build/mozjemalloc_compat.c
-+++ memory/build/mozjemalloc_compat.c
-@@ -11,15 +11,50 @@
- #define wrap(a) je_ ## a
- #endif
- 
--extern MOZ_IMPORT_API(int)
-+/*
-+ *  CTL_* macros are from memory/jemalloc/src/src/stats.c with changes:
-+ *  - drop `t' argument to avoid redundancy in calculating type size
-+ *  - require `i' argument for arena number explicitly
-+ */
-+
-+#define	CTL_GET(n, v) do {						\
-+	size_t sz = sizeof(v);						\
-+	wrap(mallctl)(n, &v, &sz, NULL, 0);				\
-+} while (0)
-+
-+#define	CTL_I_GET(n, v, i) do {						\
-+	size_t mib[6];							\
-+	size_t miblen = sizeof(mib) / sizeof(mib[0]);			\
-+	size_t sz = sizeof(v);						\
-+	wrap(mallctlnametomib)(n, mib, &miblen);			\
-+	mib[2] = i;							\
-+	wrap(mallctlbymib)(mib, miblen, &v, &sz, NULL, 0);		\
-+} while (0)
-+
-+MOZ_IMPORT_API(int)
- wrap(mallctl)(const char*, void*, size_t*, void*, size_t);
-+MOZ_IMPORT_API(int)
-+wrap(mallctlnametomib)(const char *name, size_t *mibp, size_t *miblenp);
-+MOZ_IMPORT_API(int)
-+wrap(mallctlbymib)(const size_t *mib, size_t miblen, void *oldp, size_t *oldlenp, void *newp, size_t newlen);
- 
- MOZ_EXPORT_API(void)
- jemalloc_stats(jemalloc_stats_t *stats)
- {
--  size_t size = sizeof(stats->mapped);
--  wrap(mallctl)("stats.mapped", &stats->mapped, &size, NULL, 0);
--  wrap(mallctl)("stats.allocated", &stats->allocated, &size, NULL, 0);
--  stats->committed = -1;
--  stats->dirty = -1;
-+  unsigned narenas;
-+  size_t active, allocated, mapped, page, pdirty;
-+
-+  CTL_GET("arenas.narenas", narenas);
-+  CTL_GET("arenas.page", page);
-+  CTL_GET("stats.active", active);
-+  CTL_GET("stats.allocated", allocated);
-+  CTL_GET("stats.mapped", mapped);
-+
-+  /* get the summation for all arenas, i == narenas */
-+  CTL_I_GET("stats.arenas.0.pdirty", pdirty, narenas);
-+
-+  stats->allocated = allocated;
-+  stats->mapped = mapped;
-+  stats->dirty = pdirty * page;
-+  stats->committed = active + stats->dirty;
- }
diff --git a/www/firefox/files/pkg-install.in b/www/firefox/files/pkg-install.in
index b2c8186701c4..9feab2225a78 100644
--- a/www/firefox/files/pkg-install.in
+++ b/www/firefox/files/pkg-install.in
@@ -17,7 +17,6 @@ MOZBIN=${MOZDIR}/%%MOZILLA_BIN%%
 REGXPCOM=${MOZDIR}/regxpcom
 REGCHROME=${MOZDIR}/regchrome
 
-echo "===> Building Chrome's registry..."
 rm -rf ${MOZDIR}/chrome/overlayinfo
 rm -f ${MOZDIR}/chrome/*.rdf
 mkdir -p ${MOZDIR}/chrome/overlayinfo