update to 6.0

Security:	http://www.vuxml.org/freebsd/834591a9-c82f-11e0-897d-6c626dd55a41.html

16 files changed, 392 insertions, 100 deletions

diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index 5e158618fd7a..e87b1252ce57 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	5.0
+DISTVERSION=	6.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
@@ -36,7 +36,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GL=		gl
 
-MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data,wyciwyg
+MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data,wyciwyg,websocket
 MOZ_GRAPHICS=	default,-xbm
 MOZ_OPTIONS=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
 	--enable-single-profile --disable-profilesharing \
@@ -59,7 +59,7 @@ OPTIONS=	LIGHTNING       "Enable calendar extension" off
 
 .include <bsd.port.pre.mk>
 
-WRKSRC=		${WRKDIR}/comm-miramar
+WRKSRC=		${WRKDIR}/comm-release
 MOZSRC:=	${WRKSRC}/mozilla
 
 .if ${ARCH} == powerpc64
@@ -71,8 +71,6 @@ CFLAGS+=	-mminimal-toc
 .endif
 .endif
 
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui
@@ -101,7 +99,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 MOZ_OPTIONS+=	--disable-calendar
 .endif
 
-post-extract::
+post-extract:
 	${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
 		<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 
@@ -109,7 +107,7 @@ post-patch:
 	@${GREP} -Flr \"/proc ${MOZSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|/proc/self/fd|/dev/fd|' \
 		-e 's|/proc["/]|/compat/linux&|'
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 		${MOZSRC}/storage/build/Makefile.in \
 		${MOZSRC}/toolkit/library/Makefile.in \
 		${MOZSRC}/db/sqlite3/src/Makefile.in
diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo
index e8291769814f..8029c37cfc49 100644
--- a/mail/thunderbird-esr/distinfo
+++ b/mail/thunderbird-esr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-5.0.source.tar.bz2) = bb1858dc44e1e9f92b44a1eaf9456190d55b485cf65435266848300ac2b7c5de
-SIZE (thunderbird-5.0.source.tar.bz2) = 86637589
+SHA256 (thunderbird-6.0.source.tar.bz2) = 3c56af448ebd4805c7997d8e0e41f4333d110ad2c4ad4873204bd4d68bbd8189
+SIZE (thunderbird-6.0.source.tar.bz2) = 86286245
diff --git a/mail/thunderbird-esr/files/patch-calendar-base-src-calDateTime.cpp b/mail/thunderbird-esr/files/patch-calendar-base-src-calDateTime.cpp
new file mode 100644
index 000000000000..edc56d333edc
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-calendar-base-src-calDateTime.cpp
@@ -0,0 +1,8 @@
+--- calendar/base/src/calDateTime.cpp.orig	2011-08-03 20:08:23.361859978 +0200
++++ calendar/base/src/calDateTime.cpp	2011-08-03 20:08:32.351860948 +0200
+@@ -1,4 +1,4 @@
+-/* ***** BEGIN LICENSE BLOCK *****
++/* ***** BEGIN LICENSE BLOCK *****
+  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+  *
+  * The contents of this file are subject to the Mozilla Public License Version
diff --git a/mail/thunderbird-esr/files/patch-configure.in b/mail/thunderbird-esr/files/patch-configure.in
index b63787947e2a..56c07e868572 100644
--- a/mail/thunderbird-esr/files/patch-configure.in
+++ b/mail/thunderbird-esr/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	2011-03-14 14:50:16.000000000 +0100
-+++ configure.in	2011-04-22 12:52:35.061444423 +0200
-@@ -1420,7 +1420,7 @@
+--- configure.in.orig	2011-07-15 07:42:33.000000000 +0200
++++ configure.in	2011-07-22 13:43:44.000000000 +0200
+@@ -1438,7 +1438,7 @@
      CPU_ARCH=sparc
      ;;
  
@@ -9,7 +9,7 @@
      CPU_ARCH="$OS_TEST"
      ;;
  
-@@ -1440,7 +1440,7 @@
+@@ -1458,7 +1458,7 @@
  dnl ===============================================================
  INTEL_ARCHITECTURE=
  case "$OS_TEST" in
@@ -18,7 +18,90 @@
        INTEL_ARCHITECTURE=1
  esac
  
-@@ -4388,7 +4388,7 @@
+@@ -1781,7 +1781,7 @@
+     esac
+ 
+     case "${host_cpu}" in
+-    x86_64)
++    amd64 | x86_64)
+         HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_"
+         ;;
+     esac
+@@ -2437,6 +2437,9 @@
+     x86_64-*)
+     	AC_DEFINE(_AMD64_)
+ 	;;
++    amd64*)
++    	AC_DEFINE(_AMD64_)
++	;;
+     *)
+     	AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
+ 	;;
+@@ -2508,7 +2511,7 @@
+     else
+         DLL_SUFFIX=".so.1.0"
+     fi
+-    MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/X11R6)/lib'
++    MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/local)/lib'
+     DSO_CFLAGS=''
+     DSO_PIC_CFLAGS='-fPIC'
+     DSO_LDOPTS='-shared -fPIC'
+@@ -3326,11 +3329,11 @@
+     ;;
+ *)
+     MOZ_CHECK_PTHREADS(pthreads,
+-        USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads",
++        USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthreads",
+         MOZ_CHECK_PTHREADS(pthread,
+-            USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread",
++            USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
+             MOZ_CHECK_PTHREADS(c_r,
+-                USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r",
++                USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
+                 MOZ_CHECK_PTHREADS(c,
+                     USE_PTHREADS=1
+                 )
+@@ -3405,18 +3408,18 @@
+ 	    *-*-freebsd*)
+ 			AC_DEFINE(_REENTRANT)
+ 			AC_DEFINE(_THREAD_SAFE)
+-			dnl -pthread links in -lc_r, so don't specify it explicitly.
++			dnl -pthread links in -pthread, so don't specify it explicitly.
+ 			if test "$ac_cv_have_dash_pthread" = "yes"; then
+ 				_PTHREAD_LDFLAGS="-pthread"
+ 			else
+-				_PTHREAD_LDFLAGS="-lc_r"
++				_PTHREAD_LDFLAGS="-pthread"
+ 			fi
+ 			;;
+ 
+ 	    *-*-openbsd*|*-*-bsdi*)
+ 			AC_DEFINE(_REENTRANT)
+ 			AC_DEFINE(_THREAD_SAFE)
+-			dnl -pthread links in -lc_r, so don't specify it explicitly.
++			dnl -pthread links in -pthread, so don't specify it explicitly.
+ 			if test "$ac_cv_have_dash_pthread" = "yes"; then
+                 _PTHREAD_LDFLAGS="-pthread"
+ 			fi
+@@ -3591,7 +3594,7 @@
+     ac_cv_func_iconv,
+     [AC_TRY_LINK([
+         #include <stdlib.h>
+-        #include <iconv.h>
++        #include "/usr/local/include/iconv.h"
+         ],
+         [
+             iconv_t h = iconv_open("", "");
+@@ -3612,7 +3615,7 @@
+         ac_cv_func_const_iconv,
+         [AC_TRY_COMPILE([
+             #include <stdlib.h>
+-            #include <iconv.h>
++            #include "/usr/local/include/iconv.h"
+             ],
+             [
+                 const char *input = "testing";
+@@ -4409,7 +4412,7 @@
  LDFLAGS=$_SAVE_LDFLAGS
  LIBS=$_SAVE_LIBS
  
@@ -27,3 +110,12 @@
      ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
      ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
  fi
+@@ -5966,7 +5969,7 @@
+     i*86)
+       MOZ_CRT_CPU_ARCH=intel
+       ;;
+-    x86_64)
++    amd64 | x86_64)
+       MOZ_CRT_CPU_ARCH=amd64
+       ;;
+     *)
diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in
index 6aab1acfd935..bc9c9b38d9dd 100644
--- a/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in
+++ b/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in
@@ -1,6 +1,25 @@
---- mozilla/js/src/Makefile.in.orig	2011-03-17 18:51:39.000000000 +0100
-+++ mozilla/js/src/Makefile.in	2011-03-18 19:41:09.000000000 +0100
-@@ -612,7 +612,7 @@
+--- mozilla/js/src/Makefile.in.orig	2011-07-06 05:09:22.000000000 +0200
++++ mozilla/js/src/Makefile.in	2011-07-06 22:23:46.363233778 +0200
+@@ -416,7 +416,7 @@
+ # END enclude sources for V8 dtoa
+ #############################################
+ 
+-ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
++ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU)))
+ 
+ VPATH +=	$(srcdir)/assembler \
+ 		$(srcdir)/assembler/wtf \
+@@ -469,6 +469,9 @@
+ else
+ #CPPSRCS		+= only_on_x86.cpp
+ endif
++ifeq (amd64, $(TARGET_CPU))
++#CPPSRCS                += only_on_x86_64.cpp
++endif
+ endif
+ ifeq (arm, $(TARGET_CPU))
+ #CPPSRCS		+= only_on_arm.cpp
+@@ -739,7 +742,7 @@
  # to reliably get limit macros defined, we'd always have to define the
  # one below before including any header, but that's obscure and
  # fragile, so we do it here.
@@ -9,7 +28,7 @@
  
  INCLUDES	+= -I$(srcdir)
  
-@@ -666,7 +666,8 @@
+@@ -793,7 +796,8 @@
  endif # WINNT
  
  ifeq ($(OS_ARCH),FreeBSD)
diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in b/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in
index 331c5ba47267..94c1542b6c00 100644
--- a/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in
+++ b/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in
@@ -1,33 +1,72 @@
---- mozilla/js/src/configure.in.orig	2010-11-04 21:05:48.000000000 +0100
-+++ mozilla/js/src/configure.in	2010-11-22 21:30:24.000000000 +0100
-@@ -2621,7 +2621,7 @@
+--- mozilla/js/src/configure.in.orig	2011-07-06 05:09:22.000000000 +0200
++++ mozilla/js/src/configure.in	2011-07-06 22:19:17.584233430 +0200
+@@ -1473,7 +1473,7 @@
+     CPU_ARCH=sparc
+     ;;
+ 
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+     CPU_ARCH="$OS_TEST"
+     ;;
+ 
+@@ -1495,7 +1495,7 @@
+ dnl ===============================================================
+ INTEL_ARCHITECTURE=
+ case "$OS_TEST" in
+-    x86_64|i?86)
++    amd64|x86_64|i?86)
+       INTEL_ARCHITECTURE=1
+ esac
+ 
+@@ -2713,7 +2713,7 @@
      AC_DEFINE(JS_CPU_X86)
      AC_DEFINE(JS_NUNBOX32)
      ;;
 -x86_64*-*)
-+x86_64*-*|amd64*-*)
++amd64*-*)
      ENABLE_TRACEJIT=1
      NANOJIT_ARCH=X64
      ENABLE_METHODJIT=1
-@@ -2638,11 +2638,6 @@
-     AC_DEFINE(JS_CPU_ARM)
-     AC_DEFINE(JS_NUNBOX32)
+@@ -2723,23 +2723,23 @@
+     AC_DEFINE(JS_CPU_X64)
+     AC_DEFINE(JS_PUNBOX64)
+     ;;
+-arm*-*)
++x86_64*-*)
+     ENABLE_TRACEJIT=1
+-    NANOJIT_ARCH=ARM
++    NANOJIT_ARCH=X64
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+-    AC_DEFINE(JS_CPU_ARM)
+-    AC_DEFINE(JS_NUNBOX32)
++    ENABLE_POLYIC_TYPED_ARRAY=1
++    AC_DEFINE(JS_CPU_X64)
++    AC_DEFINE(JS_PUNBOX64)
      ;;
 -sparc*-*)
--    ENABLE_TRACEJIT=1
++arm*-*)
+     ENABLE_TRACEJIT=1
 -    NANOJIT_ARCH=Sparc
++    NANOJIT_ARCH=ARM
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+-    ENABLE_POLYIC_TYPED_ARRAY=1
 -    AC_DEFINE(JS_CPU_SPARC)
--    ;;
++    AC_DEFINE(JS_CPU_ARM)
+     AC_DEFINE(JS_NUNBOX32)
+     ;;
  esac
- 
- MOZ_ARG_DISABLE_BOOL(methodjit,
-@@ -2693,7 +2688,7 @@
+@@ -2796,6 +2796,10 @@
  i?86-*)
      AC_DEFINE(AVMPLUS_IA32)
      ;;
--x86_64*-*)
-+x86_64*-*|amd64*-*)
++amd64*-*)
++    AC_DEFINE(AVMPLUS_AMD64)
++    AC_DEFINE(AVMPLUS_64BIT)
++    ;;
+ x86_64*-*)
      AC_DEFINE(AVMPLUS_AMD64)
      AC_DEFINE(AVMPLUS_64BIT)
-     ;;
-
diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnativestack.cpp b/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnativestack.cpp
index 97bf06c41be0..e69de29bb2d1 100644
--- a/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnativestack.cpp
+++ b/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnativestack.cpp
@@ -1,11 +0,0 @@
---- mozilla/js/src/jsnativestack.cpp~
-+++ mozilla/js/src/jsnativestack.cpp
-@@ -50,7 +50,8 @@
- #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
- # include <pthread.h>
- 
--# if defined(__FreeBSD__)
-+# if defined(FREEBSD)
-+#  include <cstddef>
- #  include <pthread_np.h>
- # endif
diff --git a/mail/thunderbird-esr/files/patch-mozilla-layout-generic-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-layout-generic-Makefile.in
index c406d410a4da..6356b9f6e9d7 100644
--- a/mail/thunderbird-esr/files/patch-mozilla-layout-generic-Makefile.in
+++ b/mail/thunderbird-esr/files/patch-mozilla-layout-generic-Makefile.in
@@ -1,14 +1,15 @@
---- mozilla/layout/generic/Makefile.in.orig	2011-05-28 15:25:03.000000000 +0200
-+++ mozilla/layout/generic/Makefile.in	2011-06-03 08:21:03.853676671 +0200
-@@ -160,9 +160,10 @@
+--- mozilla/layout/generic/Makefile.in.orig	2011-07-06 05:09:28.000000000 +0200
++++ mozilla/layout/generic/Makefile.in	2011-07-06 21:49:25.105659269 +0200
+@@ -159,9 +159,10 @@
  		-I$(srcdir)/../../content/html/content/src \
  		-I$(srcdir)/../../dom/base \
- 		-I$(srcdir)/../../modules/plugin/base/src \
+ 		-I$(srcdir)/../../dom/plugins/base \
 -		$(MOZ_CAIRO_CFLAGS) \
  		$(NULL)
  
-+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
++ CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
 +
  ifdef MOZ_ENABLE_GTK2
  CXXFLAGS += $(MOZ_GTK2_CFLAGS)
  endif
+
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 5e158618fd7a..e87b1252ce57 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	5.0
+DISTVERSION=	6.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
@@ -36,7 +36,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GL=		gl
 
-MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data,wyciwyg
+MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data,wyciwyg,websocket
 MOZ_GRAPHICS=	default,-xbm
 MOZ_OPTIONS=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
 	--enable-single-profile --disable-profilesharing \
@@ -59,7 +59,7 @@ OPTIONS=	LIGHTNING       "Enable calendar extension" off
 
 .include <bsd.port.pre.mk>
 
-WRKSRC=		${WRKDIR}/comm-miramar
+WRKSRC=		${WRKDIR}/comm-release
 MOZSRC:=	${WRKSRC}/mozilla
 
 .if ${ARCH} == powerpc64
@@ -71,8 +71,6 @@ CFLAGS+=	-mminimal-toc
 .endif
 .endif
 
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 MOZ_OPTIONS+=	--enable-gnomeui
@@ -101,7 +99,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 MOZ_OPTIONS+=	--disable-calendar
 .endif
 
-post-extract::
+post-extract:
 	${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
 		<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 
@@ -109,7 +107,7 @@ post-patch:
 	@${GREP} -Flr \"/proc ${MOZSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|/proc/self/fd|/dev/fd|' \
 		-e 's|/proc["/]|/compat/linux&|'
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 		${MOZSRC}/storage/build/Makefile.in \
 		${MOZSRC}/toolkit/library/Makefile.in \
 		${MOZSRC}/db/sqlite3/src/Makefile.in
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index e8291769814f..8029c37cfc49 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-5.0.source.tar.bz2) = bb1858dc44e1e9f92b44a1eaf9456190d55b485cf65435266848300ac2b7c5de
-SIZE (thunderbird-5.0.source.tar.bz2) = 86637589
+SHA256 (thunderbird-6.0.source.tar.bz2) = 3c56af448ebd4805c7997d8e0e41f4333d110ad2c4ad4873204bd4d68bbd8189
+SIZE (thunderbird-6.0.source.tar.bz2) = 86286245
diff --git a/mail/thunderbird/files/patch-calendar-base-src-calDateTime.cpp b/mail/thunderbird/files/patch-calendar-base-src-calDateTime.cpp
new file mode 100644
index 000000000000..edc56d333edc
--- /dev/null
+++ b/mail/thunderbird/files/patch-calendar-base-src-calDateTime.cpp
@@ -0,0 +1,8 @@
+--- calendar/base/src/calDateTime.cpp.orig	2011-08-03 20:08:23.361859978 +0200
++++ calendar/base/src/calDateTime.cpp	2011-08-03 20:08:32.351860948 +0200
+@@ -1,4 +1,4 @@
+-/* ***** BEGIN LICENSE BLOCK *****
++/* ***** BEGIN LICENSE BLOCK *****
+  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+  *
+  * The contents of this file are subject to the Mozilla Public License Version
diff --git a/mail/thunderbird/files/patch-configure.in b/mail/thunderbird/files/patch-configure.in
index b63787947e2a..56c07e868572 100644
--- a/mail/thunderbird/files/patch-configure.in
+++ b/mail/thunderbird/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	2011-03-14 14:50:16.000000000 +0100
-+++ configure.in	2011-04-22 12:52:35.061444423 +0200
-@@ -1420,7 +1420,7 @@
+--- configure.in.orig	2011-07-15 07:42:33.000000000 +0200
++++ configure.in	2011-07-22 13:43:44.000000000 +0200
+@@ -1438,7 +1438,7 @@
      CPU_ARCH=sparc
      ;;
  
@@ -9,7 +9,7 @@
      CPU_ARCH="$OS_TEST"
      ;;
  
-@@ -1440,7 +1440,7 @@
+@@ -1458,7 +1458,7 @@
  dnl ===============================================================
  INTEL_ARCHITECTURE=
  case "$OS_TEST" in
@@ -18,7 +18,90 @@
        INTEL_ARCHITECTURE=1
  esac
  
-@@ -4388,7 +4388,7 @@
+@@ -1781,7 +1781,7 @@
+     esac
+ 
+     case "${host_cpu}" in
+-    x86_64)
++    amd64 | x86_64)
+         HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_"
+         ;;
+     esac
+@@ -2437,6 +2437,9 @@
+     x86_64-*)
+     	AC_DEFINE(_AMD64_)
+ 	;;
++    amd64*)
++    	AC_DEFINE(_AMD64_)
++	;;
+     *)
+     	AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
+ 	;;
+@@ -2508,7 +2511,7 @@
+     else
+         DLL_SUFFIX=".so.1.0"
+     fi
+-    MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/X11R6)/lib'
++    MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/local)/lib'
+     DSO_CFLAGS=''
+     DSO_PIC_CFLAGS='-fPIC'
+     DSO_LDOPTS='-shared -fPIC'
+@@ -3326,11 +3329,11 @@
+     ;;
+ *)
+     MOZ_CHECK_PTHREADS(pthreads,
+-        USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads",
++        USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthreads",
+         MOZ_CHECK_PTHREADS(pthread,
+-            USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread",
++            USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
+             MOZ_CHECK_PTHREADS(c_r,
+-                USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r",
++                USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
+                 MOZ_CHECK_PTHREADS(c,
+                     USE_PTHREADS=1
+                 )
+@@ -3405,18 +3408,18 @@
+ 	    *-*-freebsd*)
+ 			AC_DEFINE(_REENTRANT)
+ 			AC_DEFINE(_THREAD_SAFE)
+-			dnl -pthread links in -lc_r, so don't specify it explicitly.
++			dnl -pthread links in -pthread, so don't specify it explicitly.
+ 			if test "$ac_cv_have_dash_pthread" = "yes"; then
+ 				_PTHREAD_LDFLAGS="-pthread"
+ 			else
+-				_PTHREAD_LDFLAGS="-lc_r"
++				_PTHREAD_LDFLAGS="-pthread"
+ 			fi
+ 			;;
+ 
+ 	    *-*-openbsd*|*-*-bsdi*)
+ 			AC_DEFINE(_REENTRANT)
+ 			AC_DEFINE(_THREAD_SAFE)
+-			dnl -pthread links in -lc_r, so don't specify it explicitly.
++			dnl -pthread links in -pthread, so don't specify it explicitly.
+ 			if test "$ac_cv_have_dash_pthread" = "yes"; then
+                 _PTHREAD_LDFLAGS="-pthread"
+ 			fi
+@@ -3591,7 +3594,7 @@
+     ac_cv_func_iconv,
+     [AC_TRY_LINK([
+         #include <stdlib.h>
+-        #include <iconv.h>
++        #include "/usr/local/include/iconv.h"
+         ],
+         [
+             iconv_t h = iconv_open("", "");
+@@ -3612,7 +3615,7 @@
+         ac_cv_func_const_iconv,
+         [AC_TRY_COMPILE([
+             #include <stdlib.h>
+-            #include <iconv.h>
++            #include "/usr/local/include/iconv.h"
+             ],
+             [
+                 const char *input = "testing";
+@@ -4409,7 +4412,7 @@
  LDFLAGS=$_SAVE_LDFLAGS
  LIBS=$_SAVE_LIBS
  
@@ -27,3 +110,12 @@
      ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
      ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
  fi
+@@ -5966,7 +5969,7 @@
+     i*86)
+       MOZ_CRT_CPU_ARCH=intel
+       ;;
+-    x86_64)
++    amd64 | x86_64)
+       MOZ_CRT_CPU_ARCH=amd64
+       ;;
+     *)
diff --git a/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in b/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in
index 6aab1acfd935..bc9c9b38d9dd 100644
--- a/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in
+++ b/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in
@@ -1,6 +1,25 @@
---- mozilla/js/src/Makefile.in.orig	2011-03-17 18:51:39.000000000 +0100
-+++ mozilla/js/src/Makefile.in	2011-03-18 19:41:09.000000000 +0100
-@@ -612,7 +612,7 @@
+--- mozilla/js/src/Makefile.in.orig	2011-07-06 05:09:22.000000000 +0200
++++ mozilla/js/src/Makefile.in	2011-07-06 22:23:46.363233778 +0200
+@@ -416,7 +416,7 @@
+ # END enclude sources for V8 dtoa
+ #############################################
+ 
+-ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
++ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU)))
+ 
+ VPATH +=	$(srcdir)/assembler \
+ 		$(srcdir)/assembler/wtf \
+@@ -469,6 +469,9 @@
+ else
+ #CPPSRCS		+= only_on_x86.cpp
+ endif
++ifeq (amd64, $(TARGET_CPU))
++#CPPSRCS                += only_on_x86_64.cpp
++endif
+ endif
+ ifeq (arm, $(TARGET_CPU))
+ #CPPSRCS		+= only_on_arm.cpp
+@@ -739,7 +742,7 @@
  # to reliably get limit macros defined, we'd always have to define the
  # one below before including any header, but that's obscure and
  # fragile, so we do it here.
@@ -9,7 +28,7 @@
  
  INCLUDES	+= -I$(srcdir)
  
-@@ -666,7 +666,8 @@
+@@ -793,7 +796,8 @@
  endif # WINNT
  
  ifeq ($(OS_ARCH),FreeBSD)
diff --git a/mail/thunderbird/files/patch-mozilla-js-src-configure.in b/mail/thunderbird/files/patch-mozilla-js-src-configure.in
index 331c5ba47267..94c1542b6c00 100644
--- a/mail/thunderbird/files/patch-mozilla-js-src-configure.in
+++ b/mail/thunderbird/files/patch-mozilla-js-src-configure.in
@@ -1,33 +1,72 @@
---- mozilla/js/src/configure.in.orig	2010-11-04 21:05:48.000000000 +0100
-+++ mozilla/js/src/configure.in	2010-11-22 21:30:24.000000000 +0100
-@@ -2621,7 +2621,7 @@
+--- mozilla/js/src/configure.in.orig	2011-07-06 05:09:22.000000000 +0200
++++ mozilla/js/src/configure.in	2011-07-06 22:19:17.584233430 +0200
+@@ -1473,7 +1473,7 @@
+     CPU_ARCH=sparc
+     ;;
+ 
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+     CPU_ARCH="$OS_TEST"
+     ;;
+ 
+@@ -1495,7 +1495,7 @@
+ dnl ===============================================================
+ INTEL_ARCHITECTURE=
+ case "$OS_TEST" in
+-    x86_64|i?86)
++    amd64|x86_64|i?86)
+       INTEL_ARCHITECTURE=1
+ esac
+ 
+@@ -2713,7 +2713,7 @@
      AC_DEFINE(JS_CPU_X86)
      AC_DEFINE(JS_NUNBOX32)
      ;;
 -x86_64*-*)
-+x86_64*-*|amd64*-*)
++amd64*-*)
      ENABLE_TRACEJIT=1
      NANOJIT_ARCH=X64
      ENABLE_METHODJIT=1
-@@ -2638,11 +2638,6 @@
-     AC_DEFINE(JS_CPU_ARM)
-     AC_DEFINE(JS_NUNBOX32)
+@@ -2723,23 +2723,23 @@
+     AC_DEFINE(JS_CPU_X64)
+     AC_DEFINE(JS_PUNBOX64)
+     ;;
+-arm*-*)
++x86_64*-*)
+     ENABLE_TRACEJIT=1
+-    NANOJIT_ARCH=ARM
++    NANOJIT_ARCH=X64
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+-    AC_DEFINE(JS_CPU_ARM)
+-    AC_DEFINE(JS_NUNBOX32)
++    ENABLE_POLYIC_TYPED_ARRAY=1
++    AC_DEFINE(JS_CPU_X64)
++    AC_DEFINE(JS_PUNBOX64)
      ;;
 -sparc*-*)
--    ENABLE_TRACEJIT=1
++arm*-*)
+     ENABLE_TRACEJIT=1
 -    NANOJIT_ARCH=Sparc
++    NANOJIT_ARCH=ARM
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+-    ENABLE_POLYIC_TYPED_ARRAY=1
 -    AC_DEFINE(JS_CPU_SPARC)
--    ;;
++    AC_DEFINE(JS_CPU_ARM)
+     AC_DEFINE(JS_NUNBOX32)
+     ;;
  esac
- 
- MOZ_ARG_DISABLE_BOOL(methodjit,
-@@ -2693,7 +2688,7 @@
+@@ -2796,6 +2796,10 @@
  i?86-*)
      AC_DEFINE(AVMPLUS_IA32)
      ;;
--x86_64*-*)
-+x86_64*-*|amd64*-*)
++amd64*-*)
++    AC_DEFINE(AVMPLUS_AMD64)
++    AC_DEFINE(AVMPLUS_64BIT)
++    ;;
+ x86_64*-*)
      AC_DEFINE(AVMPLUS_AMD64)
      AC_DEFINE(AVMPLUS_64BIT)
-     ;;
-
diff --git a/mail/thunderbird/files/patch-mozilla-js-src-jsnativestack.cpp b/mail/thunderbird/files/patch-mozilla-js-src-jsnativestack.cpp
index 97bf06c41be0..e69de29bb2d1 100644
--- a/mail/thunderbird/files/patch-mozilla-js-src-jsnativestack.cpp
+++ b/mail/thunderbird/files/patch-mozilla-js-src-jsnativestack.cpp
@@ -1,11 +0,0 @@
---- mozilla/js/src/jsnativestack.cpp~
-+++ mozilla/js/src/jsnativestack.cpp
-@@ -50,7 +50,8 @@
- #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
- # include <pthread.h>
- 
--# if defined(__FreeBSD__)
-+# if defined(FREEBSD)
-+#  include <cstddef>
- #  include <pthread_np.h>
- # endif
diff --git a/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in b/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in
index c406d410a4da..6356b9f6e9d7 100644
--- a/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in
+++ b/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in
@@ -1,14 +1,15 @@
---- mozilla/layout/generic/Makefile.in.orig	2011-05-28 15:25:03.000000000 +0200
-+++ mozilla/layout/generic/Makefile.in	2011-06-03 08:21:03.853676671 +0200
-@@ -160,9 +160,10 @@
+--- mozilla/layout/generic/Makefile.in.orig	2011-07-06 05:09:28.000000000 +0200
++++ mozilla/layout/generic/Makefile.in	2011-07-06 21:49:25.105659269 +0200
+@@ -159,9 +159,10 @@
  		-I$(srcdir)/../../content/html/content/src \
  		-I$(srcdir)/../../dom/base \
- 		-I$(srcdir)/../../modules/plugin/base/src \
+ 		-I$(srcdir)/../../dom/plugins/base \
 -		$(MOZ_CAIRO_CFLAGS) \
  		$(NULL)
  
-+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
++ CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
 +
  ifdef MOZ_ENABLE_GTK2
  CXXFLAGS += $(MOZ_GTK2_CFLAGS)
  endif
+