update thunderbird to 5.0

37 files changed, 526 insertions, 239 deletions

diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index 64fb062c6962..5b32e07c702b 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	3.1.11
+DISTVERSION=	5.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
@@ -15,11 +15,13 @@ DISTNAME=	${PORTNAME}-${DISTVERSION}.source
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
-BUILD_DEPENDS=	nspr>=4.8:${PORTSDIR}/devel/nspr
+BUILD_DEPENDS=	nspr>=4.8.7:${PORTSDIR}/devel/nspr
+LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
+		event-1.4:${PORTSDIR}/devel/libevent
 
 USE_AUTOTOOLS=	autoconf213
 USE_GECKO=	gecko
-CONFLICTS_INSTALL=	thunderbird-3.0*
+CONFLICTS_INSTALL=	thunderbird-3.1*
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
 MOZ_TOOLKIT=	cairo-gtk2
 
@@ -31,16 +33,19 @@ MAKE_ENV=	PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GL=		gl
 
-MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data
+MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data,wyciwyg
 MOZ_GRAPHICS=	default,-xbm
 MOZ_OPTIONS=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
 	--enable-single-profile --disable-profilesharing \
 	--enable-application=mail --enable-official-branding \
-	--disable-updater --disable-necko-wifi
+	--disable-updater --disable-necko-wifi \
+	--with-system-libevent=${LOCALBASE}
 MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
 MOZ_EXPORT=		MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
-MOZILLA_PLIST_DIRS=	bin lib
+GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
+			lib/${MOZILLA}/include lib/${MOZILLA}/lib
 MOZ_PKGCONFIG_FILES=
 
 PORTNAME_ICON=	${PORTNAME}.png
@@ -53,16 +58,9 @@ OPTIONS=
 
 .include <bsd.port.pre.mk>
 
-WRKSRC=		${WRKDIR}/comm-1.9.2
+WRKSRC=		${WRKDIR}/comm-miramar
 MOZSRC:=	${WRKSRC}/mozilla
 
-.if ${OSVERSION} < 700000
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
-EXTRA_PATCHES=	${FILESDIR}/releng6_pulseaudio
-.else
-EXTRA_PATCHES=	${FILESDIR}/liboggplay_oss
-.endif
-
 .if ${ARCH} == powerpc64
 .if ${OSVERSION} < 900033
 BROKEN=		Needs binutils 2.17.50 to build
@@ -88,13 +86,21 @@ LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		notify.1:${PORTSDIR}/devel/libnotify
 .endif
 
+.if ${ARCH} == amd64 || ${ARCH} == i386
+BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
+.endif
+
 post-extract::
 	${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
 		<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 
 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}/}|' \
 		${MOZSRC}/storage/build/Makefile.in \
+		${MOZSRC}/toolkit/library/Makefile.in \
 		${MOZSRC}/db/sqlite3/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${MOZSRC}/security/manager/ssl/src/Makefile.in \
diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo
index 5a7887b45123..e8291769814f 100644
--- a/mail/thunderbird-esr/distinfo
+++ b/mail/thunderbird-esr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-3.1.11.source.tar.bz2) = 3e78284661b1be1d35753550b7a183d583d7ee68c8bac683283d3931f90fdd1a
-SIZE (thunderbird-3.1.11.source.tar.bz2) = 68716700
+SHA256 (thunderbird-5.0.source.tar.bz2) = bb1858dc44e1e9f92b44a1eaf9456190d55b485cf65435266848300ac2b7c5de
+SIZE (thunderbird-5.0.source.tar.bz2) = 86637589
diff --git a/mail/thunderbird-esr/files/liboggplay_oss b/mail/thunderbird-esr/files/liboggplay_oss
deleted file mode 100644
index e43b0725eea2..000000000000
--- a/mail/thunderbird-esr/files/liboggplay_oss
+++ /dev/null
@@ -1,15 +0,0 @@
---- mozilla/media/libsydneyaudio/src/Makefile.in_orgi	2009-04-10 12:12:45.000000000 +0200
-+++ mozilla/media/libsydneyaudio/src/Makefile.in	2009-04-10 12:13:12.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME	= sydneyaudio
- FORCE_STATIC_LIB= 1
- 
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS		= \
-+		sydney_audio_oss.c \
-+		$(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS		= \
- 		sydney_audio_alsa.c \
diff --git a/mail/thunderbird-esr/files/patch-configure.in b/mail/thunderbird-esr/files/patch-configure.in
index ae9642b9fffd..b63787947e2a 100644
--- a/mail/thunderbird-esr/files/patch-configure.in
+++ b/mail/thunderbird-esr/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	2009-08-14 11:24:58.206076928 +0200
-+++ configure.in	2009-08-14 11:25:29.601293359 +0200
-@@ -5680,7 +5680,7 @@
+--- 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 @@
      CPU_ARCH=sparc
      ;;
  
@@ -8,4 +8,22 @@
 +amd64 | x86_64 | ia64)
      CPU_ARCH="$OS_TEST"
      ;;
+ 
+@@ -1440,7 +1440,7 @@
+ dnl ===============================================================
+ INTEL_ARCHITECTURE=
+ case "$OS_TEST" in
+-    x86_64|i?86)
++    amd64|x86_64|i?86)
+       INTEL_ARCHITECTURE=1
  esac
+ 
+@@ -4388,7 +4388,7 @@
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+ 
+-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
++if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
+     ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
+     ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
+ fi
diff --git a/mail/thunderbird-esr/files/patch-directory_xpcom_base_src_Makefile.in b/mail/thunderbird-esr/files/patch-directory_xpcom_base_src_Makefile.in
deleted file mode 100644
index f56d7b17f104..000000000000
--- a/mail/thunderbird-esr/files/patch-directory_xpcom_base_src_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- directory/xpcom/base/src/Makefile.in.orig	2009-11-22 03:44:31.000000000 +0100
-+++ directory/xpcom/base/src/Makefile.in	2009-11-26 13:06:53.000000000 +0100
-@@ -97,6 +97,10 @@
- 		$(NULL)
- endif
- 
-+ifeq ($(OS_ARCH), FreeBSD)
-+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
-+endif
-+
- EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(LDAP_LIBS)
- 
- include $(topsrcdir)/config/rules.mk
diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc
new file mode 100644
index 000000000000..ffb56ac25100
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc
@@ -0,0 +1,10 @@
+--- mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc~
++++ mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc
+@@ -39,6 +39,7 @@
+  * ***** END LICENSE BLOCK ***** */
+ 
+ #include "base/atomicops.h"
++#include "base/lock.h"
+ 
+ namespace base {
+ namespace subtle {
diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util.h b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util.h
new file mode 100644
index 000000000000..81a4693140a8
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util.h
@@ -0,0 +1,13 @@
+--- mozilla/ipc/chromium/src/base/file_util.h~
++++ mozilla/ipc/chromium/src/base/file_util.h
+@@ -15,8 +15,9 @@
+ #elif defined(ANDROID)
+ #include <sys/stat.h>
+ #elif defined(OS_POSIX) 
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include <fts.h>
+-#include <sys/stat.h>
+ #endif
+ 
+ #include <stdio.h>
diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc
new file mode 100644
index 000000000000..d0cc3b14e68b
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc
@@ -0,0 +1,11 @@
+--- mozilla/ipc/chromium/src/base/file_util_linux.cc~
++++ mozilla/ipc/chromium/src/base/file_util_linux.cc
+@@ -28,7 +28,7 @@ bool GetShmemTempDir(FilePath* path) {
+ #ifdef ANDROID
+   return GetTempDir(path);
+ #else
+-  *path = FilePath("/dev/shm");
++  *path = FilePath("/tmp");
+   return true;
+ #endif
+ }
diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_posix.cc b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_posix.cc
new file mode 100644
index 000000000000..3c722016e77b
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_posix.cc
@@ -0,0 +1,11 @@
+--- mozilla/ipc/chromium/src/base/file_util_posix.cc~
++++ mozilla/ipc/chromium/src/base/file_util_posix.cc
+@@ -30,6 +30,8 @@
+ #include "base/string_util.h"
+ #include "base/time.h"
+ 
++#define stat64 stat
++
+ namespace file_util {
+ 
+ #if defined(GOOGLE_CHROME_BUILD)
diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_file_posix.cc b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_file_posix.cc
new file mode 100644
index 000000000000..14e333ca339b
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_file_posix.cc
@@ -0,0 +1,10 @@
+--- mozilla/ipc/chromium/src/base/platform_file_posix.cc~
++++ mozilla/ipc/chromium/src/base/platform_file_posix.cc
+@@ -9,6 +9,7 @@
+ #ifdef ANDROID
+ #include <linux/stat.h>
+ #endif
++#include <sys/stat.h>
+ 
+ #include "base/logging.h"
+ #include "base/string_util.h"
diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_thread_posix.cc b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_thread_posix.cc
new file mode 100644
index 000000000000..3445b281bc48
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_thread_posix.cc
@@ -0,0 +1,12 @@
+--- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig	2011-04-27 09:34:28.000000000 +0200
++++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc	2011-04-27 19:47:36.344446266 +0200
+@@ -34,7 +33,8 @@
+ #if defined(OS_MACOSX)
+   return mach_thread_self();
+ #elif defined(OS_LINUX)
+-  return syscall(__NR_gettid);
++  // TODO(BSD): find a better thread ID
++  return reinterpret_cast<int64>(pthread_self());
+ #endif
+ }
+ 
diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h
new file mode 100644
index 000000000000..ca7b24fa4860
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h
@@ -0,0 +1,11 @@
+--- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h~
++++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h
+@@ -34,7 +34,7 @@
+ #include "base/third_party/nspr/prcpucfg_win.h"
+ #elif defined(__APPLE__)
+ #include "base/third_party/nspr/prcpucfg_mac.h"
+-#elif defined(__linux__) || defined(ANDROID)
++#elif defined(__FreeBSD__) || defined(ANDROID)
+ #include "base/third_party/nspr/prcpucfg_linux.h"
+ #else
+ #error Provide a prcpucfg.h appropriate for your platform
diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-build-build_config.h b/mail/thunderbird-esr/files/patch-ipc-chromium-src-build-build_config.h
new file mode 100644
index 000000000000..e7540d38eceb
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-ipc-chromium-src-build-build_config.h
@@ -0,0 +1,11 @@
+--- mozilla/ipc/chromium/src/build/build_config.h~
++++ mozilla/ipc/chromium/src/build/build_config.h
+@@ -17,7 +17,7 @@
+ // A set of macros to use for platform detection.
+ #if defined(__APPLE__)
+ #define OS_MACOSX 1
+-#elif defined(__linux__) || defined(ANDROID)
++#elif defined(__FreeBSD__) || defined(ANDROID)
+ #define OS_LINUX 1
+ #elif defined(_WIN32)
+ #define OS_WIN 1
diff --git a/mail/thunderbird-esr/files/patch-directory-sdks-c-sdk-ldap-libraries-libldap-Makefile.in b/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in
index 8a065107cd16..63f7b76052c3 100644
--- a/mail/thunderbird-esr/files/patch-directory-sdks-c-sdk-ldap-libraries-libldap-Makefile.in
+++ b/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in
@@ -1,5 +1,5 @@
---- directory/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig	2009-11-10 09:56:42.000000000 +0100
-+++ directory/sdks/c-sdk/ldap/libraries/libldap/Makefile.in	2009-11-10 09:58:15.000000000 +0100
+--- ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig	2009-11-10 09:56:42.000000000 +0100
++++ ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in	2009-11-10 09:58:15.000000000 +0100
 @@ -254,6 +254,10 @@
  EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe
  endif
diff --git a/mail/thunderbird-esr/files/patch-directory-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in b/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
index ff5e375f156b..df2e10326632 100644
--- a/mail/thunderbird-esr/files/patch-directory-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
+++ b/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
@@ -1,5 +1,5 @@
---- directory/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig	2008-09-11 16:38:35.000000000 +0200
-+++ directory/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in	2009-12-09 08:53:46.000000000 +0100
+--- ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig	2008-09-11 16:38:35.000000000 +0200
++++ ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in	2009-12-09 08:53:46.000000000 +0100
 @@ -147,6 +147,11 @@
  CUSTOM_LIBS=1
  endif
diff --git a/mail/thunderbird-esr/files/patch-mozilla-config-rules.mk b/mail/thunderbird-esr/files/patch-mozilla-config-rules.mk
deleted file mode 100644
index bbe6fec94311..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-config-rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- mozilla/config/rules.mk.orig	Thu Sep 14 14:07:03 2006
-+++ mozilla/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/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in b/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in
index 763f8ebfa6de..2cd507fbf7a8 100644
--- a/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in
+++ b/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in
@@ -19,3 +19,13 @@
  
  DIST		= $(DEPTH)/dist
  LIBXUL_SDK      = @LIBXUL_SDK@
+@@ -275,7 +275,7 @@
+ OS_CPPFLAGS	= @CPPFLAGS@
+ OS_CFLAGS	= $(OS_CPPFLAGS) @CFLAGS@
+ OS_CXXFLAGS	= $(OS_CPPFLAGS) @CXXFLAGS@
+-OS_LDFLAGS	= @LDFLAGS@
++OS_LDFLAGS	= @LDFLAGS@ -lc
+ 
+ OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
+ OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
+
diff --git a/mail/thunderbird-esr/files/patch-mozilla-configure.in b/mail/thunderbird-esr/files/patch-mozilla-configure.in
index f08b95aa5c20..4ccc7bfe5017 100644
--- a/mail/thunderbird-esr/files/patch-mozilla-configure.in
+++ b/mail/thunderbird-esr/files/patch-mozilla-configure.in
@@ -1,6 +1,6 @@
---- mozilla/configure.in.orig	2009-08-14 11:24:58.206076928 +0200
-+++ mozilla/configure.in	2009-08-14 11:25:29.601293359 +0200
-@@ -5680,7 +5680,7 @@
+--- mozilla/configure.in.orig	2010-11-04 21:05:18.000000000 +0100
++++ mozilla/configure.in	2010-11-09 12:59:28.000000000 +0100
+@@ -1549,7 +1549,7 @@
      CPU_ARCH=sparc
      ;;
  
@@ -8,4 +8,79 @@
 +amd64 | x86_64 | ia64)
      CPU_ARCH="$OS_TEST"
      ;;
+ 
+@@ -1567,7 +1567,7 @@ dnl Set INTEL_ARCHITECTURE if we're comp
+ dnl ===============================================================
+ INTEL_ARCHITECTURE=
+ case "$OS_TEST" in
+-    x86_64|i?86)
++    amd64|x86_64|i?86)
+       INTEL_ARCHITECTURE=1
  esac
+ 
+@@ -3803,19 +3803,21 @@
+ AC_CHECK_FUNCS(localtime_r strtok_r)
+ 
+ dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt
+-_SAVE_LDFLAGS=$LDFLAGS
+-LDFLAGS="$LDFLAGS -lrt"
+-AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt,
++_SAVE_LIBS=$LIBS
++AC_SEARCH_LIBS(clock_gettime, rt)
++AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
+                ac_cv_have_clock_monotonic,
+                [AC_TRY_LINK([#include <time.h>],
+                             [ struct timespec ts;
+                               clock_gettime(CLOCK_MONOTONIC, &ts); ],
+                             ac_cv_have_clock_monotonic=yes,
+                             ac_cv_have_clock_monotonic=no)])
+-LDFLAGS=$_SAVE_LDFLAGS
++LIBS=$_SAVE_LIBS
+ if test "$ac_cv_have_clock_monotonic" = "yes"; then
+     HAVE_CLOCK_MONOTONIC=1
+-    REALTIME_LIBS=-lrt
++    if test "$ac_cv_search_clock_gettime" != "none required"; then
++        REALTIME_LIBS=$ac_cv_search_clock_gettime
++    fi
+     AC_DEFINE(HAVE_CLOCK_MONOTONIC)
+     AC_SUBST(HAVE_CLOCK_MONOTONIC)
+     AC_SUBST(REALTIME_LIBS)
+@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
+ LDFLAGS=$_SAVE_LDFLAGS
+ LIBS=$_SAVE_LIBS
+ 
+-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
++if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
+     ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
+     ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
+ fi
+@@ -6022,6 +6024,14 @@
+       VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+       VPX_X86_ASM=1
+     ;;
++    FreeBSD:i386)
++      VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
++      VPX_X86_ASM=1
++    ;;
++    FreeBSD:amd64)
++      VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
++      VPX_X86_ASM=1
++    ;;
+     SunOS:x86)
+       VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+       VPX_X86_ASM=1
+@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
+     LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
+     LIBJPEG_TURBO_X64_ASM=1
+   ;;
++  FreeBSD:i386)
++    LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
++    LIBJPEG_TURBO_X86_ASM=1
++  ;;
++  FreeBSD:amd64)
++    LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
++    LIBJPEG_TURBO_X64_ASM=1
++  ;;
+   SunOS:i?86)
+     LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
+     LIBJPEG_TURBO_X86_ASM=1
diff --git a/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-Makefile.in
new file mode 100644
index 000000000000..bad2cf563256
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-Makefile.in
@@ -0,0 +1,14 @@
+--- mozilla/gfx/qcms/Makefile.in.orig	2010-11-25 20:10:32.000000000 +0100
++++ mozilla/gfx/qcms/Makefile.in	2010-11-25 20:10:06.000000000 +0100
+@@ -44,6 +44,11 @@
+ endif
+ endif
+ endif
++ifeq ($(OS_TEST),amd64)
++	CSRCS += transform-sse2.c transform-sse1.c
++	SSE1_FLAGS=-msse
++	SSE2_FLAGS=-msse2
++endif
+ 
+ FORCE_STATIC_LIB = 1
+ # This library is used by other shared libs
diff --git a/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h b/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h
new file mode 100644
index 000000000000..7a23c9dd3820
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h
@@ -0,0 +1,11 @@
+--- mozilla/gfx/qcms/qcmstypes.h.orig	2010-11-22 12:01:36.000000000 +0100
++++ mozilla/gfx/qcms/qcmstypes.h	2010-11-22 12:02:42.000000000 +0100
+@@ -25,7 +25,7 @@
+ #ifdef __OS2__
+ /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
+ #include <stdlib.h>
+-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
++#elif !defined(__intptr_t_defined) && !defined(_INTPTR_T_DECLARED) 
+ typedef PRUptrdiff uintptr_t;
+ #endif
+ #endif
diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-ctypes-libffi-configure b/mail/thunderbird-esr/files/patch-mozilla-js-ctypes-libffi-configure
deleted file mode 100644
index 6a86c5e6fc39..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-js-ctypes-libffi-configure
+++ /dev/null
@@ -1,14 +0,0 @@
-B
---- mozilla/js/ctypes/libffi/configure.orig	2011-02-26 21:17:36.000000000 +0100
-+++ mozilla/js/ctypes/libffi/configure	2011-02-26 21:18:35.000000000 +0100
-@@ -21036,6 +21036,9 @@
- 
-   powerpc-*-freebsd*)
-	TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
- 	;;
-+  powerpc64-*-freebsd*)
-+	TARGET=POWERPC; TARGETDIR=powerpc
-+	;;
-   powerpc*-*-rtems*)
- 	TARGET=POWERPC; TARGETDIR=powerpc
- 	;;
diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in
new file mode 100644
index 000000000000..6aab1acfd935
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in
@@ -0,0 +1,22 @@
+--- 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 @@
+ # 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.
+-DEFINES		+= -D__STDC_LIMIT_MACROS
++DEFINES		+= -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS
+ 
+ INCLUDES	+= -I$(srcdir)
+ 
+@@ -666,7 +666,8 @@
+ endif # WINNT
+ 
+ ifeq ($(OS_ARCH),FreeBSD)
+-EXTRA_LIBS	+= -pthread
++DEFINES		+= -DFREEBSD
++EXTRA_LIBS	+= -pthread -lc
+ endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32
+
diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-build-autoconf-config.sub b/mail/thunderbird-esr/files/patch-mozilla-js-src-build-autoconf-config.sub
deleted file mode 100644
index 2cb48a88c0e9..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-js-src-build-autoconf-config.sub
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla/js/src/build/autoconf/config.sub.orig	2010-01-08 09:52:25.000000000 +0100
-+++ mozilla/js/src/build/autoconf/config.sub	2010-01-08 09:52:33.000000000 +0100
-@@ -403,9 +403,6 @@
- 	amd64)
- 		basic_machine=x86_64-pc
- 		;;
--	amd64-*)
--		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
--		;;
- 	amdahl)
- 		basic_machine=580-amdahl
- 		os=-sysv
diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-config_config.mk b/mail/thunderbird-esr/files/patch-mozilla-js-src-config_config.mk
new file mode 100644
index 000000000000..c5b42ad3457c
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-mozilla-js-src-config_config.mk
@@ -0,0 +1,10 @@
+--- mozilla/js/src/config/config.mk.orig	2009-08-07 00:49:23.000000000 +0200
++++ mozilla/js/src/config/config.mk	2009-08-09 20:50:05.000000000 +0200
+@@ -506,6 +506,7 @@
+   -I$(srcdir) \
+   -I. \
+   -I$(DIST)/include -I$(DIST)/include/nsprpub \
++  -I%%LOCALBASE%%/include \
+   $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
+   $(OS_INCLUDES) \
+   $(NULL) 
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 fe78e75474bb..331c5ba47267 100644
--- a/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in
+++ b/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in
@@ -1,22 +1,33 @@
---- mozilla/js/src/configure.in.orig	2010-05-12 21:05:58.000000000 +0200
-+++ mozilla/js/src/configure.in	2010-06-22 16:17:20.000000000 +0200
-@@ -1218,7 +1218,7 @@
-     CPU_ARCH=sparc
+--- 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 @@
+     AC_DEFINE(JS_CPU_X86)
+     AC_DEFINE(JS_NUNBOX32)
      ;;
- 
--x86_64 | ia64)
-+amd64 | x86_64 | ia64)
-     CPU_ARCH="$OS_TEST"
-     ;;
- esac
-@@ -2466,10 +2466,6 @@
-     ENABLE_JIT=1
-     NANOJIT_ARCH=ARM
+-x86_64*-*)
++x86_64*-*|amd64*-*)
+     ENABLE_TRACEJIT=1
+     NANOJIT_ARCH=X64
+     ENABLE_METHODJIT=1
+@@ -2638,11 +2638,6 @@
+     AC_DEFINE(JS_CPU_ARM)
+     AC_DEFINE(JS_NUNBOX32)
      ;;
 -sparc*-*)
--    ENABLE_JIT=1
+-    ENABLE_TRACEJIT=1
 -    NANOJIT_ARCH=Sparc
+-    AC_DEFINE(JS_CPU_SPARC)
 -    ;;
  esac
  
- MOZ_ARG_DISABLE_BOOL(jit,
+ MOZ_ARG_DISABLE_BOOL(methodjit,
+@@ -2693,7 +2688,7 @@
+ i?86-*)
+     AC_DEFINE(AVMPLUS_IA32)
+     ;;
+-x86_64*-*)
++x86_64*-*|amd64*-*)
+     AC_DEFINE(AVMPLUS_AMD64)
+     AC_DEFINE(AVMPLUS_64BIT)
+     ;;
+
diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-jslock.cpp b/mail/thunderbird-esr/files/patch-mozilla-js-src-jslock.cpp
deleted file mode 100644
index 03f5c60cccf8..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-js-src-jslock.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- mozilla/js/src/jslock.cpp.orig	2010-01-23 20:35:45.000000000 +0100
-+++ mozilla/js/src/jslock.cpp	2010-01-23 20:37:35.000000000 +0100
-@@ -160,8 +160,13 @@
-     unsigned int res;
- 
-     __asm__ __volatile__ (
--                  "stbar\n"
--                  "cas [%1],%2,%3\n"
-+                  "membar #StoreLoad | #LoadLoad\n"
-+#                 if defined (__sparc64__)
-+                    "casx [%1],%2,%3\n"
-+#                 else
-+                    "cas [%1],%2,%3\n" /* 32-bit version */
-+#                 endif
-+                  "membar #StoreLoad | #LoadLoad\n"
-                   "cmp %2,%3\n"
-                   "be,a 1f\n"
-                   "mov 1,%0\n"
diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnativestack.cpp b/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnativestack.cpp
new file mode 100644
index 000000000000..97bf06c41be0
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnativestack.cpp
@@ -0,0 +1,11 @@
+--- 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 afdc6fd8ae0f..c406d410a4da 100644
--- a/mail/thunderbird-esr/files/patch-mozilla-layout-generic-Makefile.in
+++ b/mail/thunderbird-esr/files/patch-mozilla-layout-generic-Makefile.in
@@ -1,9 +1,9 @@
---- mozilla/layout/generic/Makefile.in.orig	2010-01-20 18:57:00.000000000 +0100
-+++ mozilla/layout/generic/Makefile.in	2010-01-20 18:57:48.000000000 +0100
-@@ -191,9 +191,10 @@
- 		-I$(srcdir)/../../content/base/src \
+--- 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 @@
  		-I$(srcdir)/../../content/html/content/src \
  		-I$(srcdir)/../../dom/base \
+ 		-I$(srcdir)/../../modules/plugin/base/src \
 -		$(MOZ_CAIRO_CFLAGS) \
  		$(NULL)
  
diff --git a/mail/thunderbird-esr/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h b/mail/thunderbird-esr/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h
deleted file mode 100644
index 726dc875e37f..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2010-09-06 11:33:54.000000000 +0200
-+++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h	2010-09-06 11:34:16.000000000 +0200
-@@ -59,7 +59,7 @@
- 
- #include <sys/types.h>
- 
--#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX)
-+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) || defined (__FreeBSD__)
- typedef off_t oggz_off_t;
- #else
- typedef loff_t oggz_off_t;
diff --git a/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.c b/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.c
new file mode 100644
index 000000000000..b97d147914fe
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.c
@@ -0,0 +1,16 @@
+--- mozilla/media/libvpx/vpx_config_c.c~
++++ mozilla/media/libvpx/vpx_config_c.c
+@@ -12,11 +12,11 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.c"
+ 
+-#elif defined(__linux__) && defined(__i386__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__)
+ /* 32 bit Linux. */
+ #include "vpx_config_x86-linux-gcc.c"
+ 
+-#elif defined(__linux__) && defined(__x86_64__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__)
+ /* 64 bit Linux. */
+ #include "vpx_config_x86_64-linux-gcc.c"
+
diff --git a/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.h b/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.h
new file mode 100644
index 000000000000..b4ba5cd8986a
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.h
@@ -0,0 +1,16 @@
+--- mozilla/media/libvpx/vpx_config.h~
++++ mozilla/media/libvpx/vpx_config.h
+@@ -12,11 +12,11 @@
+ /* 32 bit MacOS. */
+ #include "vpx_config_x86-darwin9-gcc.h"
+ 
+-#elif defined(__linux__) && defined(__i386__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__)
+ /* 32 bit Linux. */
+ #include "vpx_config_x86-linux-gcc.h"
+ 
+-#elif defined(__linux__) && defined(__x86_64__)
++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__)
+ /* 64 bit Linux. */
+ #include "vpx_config_x86_64-linux-gcc.h"
+
diff --git a/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk b/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk
index 39272d788b83..dc4e96c7c439 100644
--- a/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk
+++ b/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk
@@ -1,22 +1,29 @@
---- mozilla/security/coreconf/FreeBSD.mk.orig	2010-04-30 19:44:32.000000000 +0000
-+++ mozilla/security/coreconf/FreeBSD.mk	2010-05-10 13:04:45.000000000 +0000
-@@ -52,6 +52,15 @@
- ifeq ($(CPU_ARCH),amd64)
- CPU_ARCH		= x86_64
+--- mozilla/security/coreconf/FreeBSD.mk.orig	2010-02-28 23:30:04.000000000 +0000
++++ mozilla/security/coreconf/FreeBSD.mk	2010-03-03 02:05:22.000000000 +0000
+@@ -49,8 +49,20 @@
+ ifeq ($(CPU_ARCH),pc98)
+ CPU_ARCH		= x86
  endif
+-ifeq ($(CPU_ARCH),amd64)
+-CPU_ARCH		= x86_64
++ifeq ($(OS_TEST),alpha)
++CPU_ARCH		= alpha
++endif
 +ifeq ($(OS_TEST),amd64)
 +CPU_ARCH		= amd64
 +endif
++ifeq ($(OS_TEST),ia64) 
++CPU_ARCH		= ia64
++endif
 +ifeq ($(OS_TEST),powerpc)
 +CPU_ARCH		= powerpc
 +endif
 +ifeq ($(OS_TEST),sparc64)
 +CPU_ARCH		= sparc64
-+endif
+ endif
  
  OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
- 
-@@ -78,7 +87,7 @@
+@@ -78,7 +90,7 @@
  DLL_SUFFIX		= so.1.0
  endif
  
@@ -25,7 +32,7 @@
  ifdef MAPFILE
  	MKSHLIB += -Wl,--version-script,$(MAPFILE)
  endif
-@@ -87,4 +96,4 @@
+@@ -87,4 +99,4 @@
  
  G++INCLUDES		= -I/usr/include/g++
  
diff --git a/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in
new file mode 100644
index 000000000000..f222b6dca9e9
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in
@@ -0,0 +1,12 @@
+--- mozilla/toolkit/library/Makefile.in.orig	2010-01-11 12:13:08.000000000 -0500
++++ mozilla/toolkit/library/Makefile.in	2010-01-11 12:15:05.000000000 -0500
+@@ -181,7 +181,7 @@
+ export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS)
+ 	$(INSTALL) $^ .
+ 
+-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%%
+ 
+ ifdef MOZ_ENABLE_LIBXUL
+ include $(srcdir)/libxul-rules.mk
+
diff --git a/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
index 7dd5b80a1ced..e896cec90613 100644
--- a/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ b/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
@@ -1,8 +1,8 @@
---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2010-12-07 17:36:07.000000000 +0100
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2011-02-26 21:30:36.000000000 +0100
-@@ -73,6 +73,9 @@
- DEFINES		+= -DKEEP_STACK_16_BYTE_ALIGNED
- CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2011-05-28 15:26:21.000000000 +0200
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2011-06-03 18:39:42.769434047 +0200
+@@ -74,6 +74,9 @@
+ # NOTE: MODULE_OPTIMIZE_FLAGS must be set before including config.mk
+ MODULE_OPTIMIZE_FLAGS=-O3
  endif
 +ifeq (x86_64,$(OS_TEST))
 +CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
@@ -10,7 +10,7 @@
  endif
  endif
  
-@@ -96,7 +99,7 @@
+@@ -117,7 +120,7 @@
  endif
  endif
  # IA64 Linux
@@ -19,20 +19,20 @@
  ifneq (,$(findstring ia64,$(OS_TEST)))
  CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
  ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -115,6 +118,12 @@
- CPPSRCS		:= xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
+@@ -129,6 +132,12 @@
+ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64)
+ CPPSRCS		:= xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
  endif
- #
 +# FreeBSD/amd64
 +#
 +ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64)
 +CPPSRCS         := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
 +endif
 +#
- # BeOS/Intel (uses the same unixish_x86 code)
  #
- ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
-@@ -165,9 +174,15 @@
+ # Neutrino/Intel (uses the same unixish_x86 code)
+ #
+@@ -184,9 +193,15 @@
  ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
  endif
  #
@@ -49,7 +49,7 @@
  CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
  endif
  #
-@@ -322,7 +337,7 @@
+@@ -341,7 +356,7 @@
  #
  # Linux/PPC
  #
@@ -58,16 +58,7 @@
  CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
  ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
  AS		:= $(CC) -c -x assembler-with-cpp
-@@ -331,7 +346,7 @@
- #
- # Linux/PPC64
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
-+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
- ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
- AS             := $(CC) -c -x assembler-with-cpp
-@@ -400,6 +415,15 @@
+@@ -419,6 +434,15 @@
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif
  #
diff --git a/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.cfg b/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.cfg
new file mode 100644
index 000000000000..e98cce3e3d8f
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.cfg
@@ -0,0 +1,100 @@
+--- mozilla/nsprpub/pr/include/md/_freebsd.cfg.orig	2010-12-23 17:34:06.000000000 +0100
++++ mozilla/nsprpub/pr/include/md/_freebsd.cfg	2010-12-23 17:34:44.000000000 +0100
+@@ -283,6 +283,97 @@
+ #define PR_ALIGN_OF_POINTER 8
+ #define PR_ALIGN_OF_WORD    8
+ 
++#elif defined(__powerpc64__)
++
++#undef  IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN    1
++#define IS_64
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   8
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   8
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    64
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    64
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   6 
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   6
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    8
++#define PR_ALIGN_OF_INT64   8
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  8
++#define PR_ALIGN_OF_POINTER 8
++#define PR_ALIGN_OF_WORD    8
++
++#define PR_BYTES_PER_WORD_LOG2   3
++#define PR_BYTES_PER_DWORD_LOG2  3
++
++#elif defined(__powerpc__)
++
++#undef  IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN    1
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   4
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   4
++#define PR_BYTES_PER_DWORD  8
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    32
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    32
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   5
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   5
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    4
++#define PR_ALIGN_OF_INT64   8
++#define PR_ALIGN_OF_FLOAT   4
++#define PR_ALIGN_OF_DOUBLE  8
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD    4
++
++#define PR_BYTES_PER_WORD_LOG2   2
++#define PR_BYTES_PER_DWORD_LOG2  3
++
+ #else
+ 
+ #error "Unknown CPU architecture"
diff --git a/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.h b/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.h
new file mode 100644
index 000000000000..2be831a3ec9c
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.h
@@ -0,0 +1,30 @@
+--- mozilla/nsprpub/pr/include/md/_freebsd.h.orig	2010-12-23 17:34:13.000000000 +0100
++++ mozilla/nsprpub/pr/include/md/_freebsd.h	2010-12-23 17:34:46.000000000 +0100
+@@ -57,6 +57,10 @@
+ #define _PR_SI_ARCHITECTURE "ia64"
+ #elif defined(__amd64__)
+ #define _PR_SI_ARCHITECTURE "amd64"
++#elif defined(__powerpc64__)
++#define _PR_SI_ARCHITECTURE "powerpc64"
++#elif defined(__powerpc__)
++#define _PR_SI_ARCHITECTURE "powerpc"
+ #else
+ #error "Unknown CPU architecture"
+ #endif
+@@ -106,6 +110,16 @@
+ #define _PR_IPV6_V6ONLY_PROBE
+ #endif
+ 
++#if (__FreeBSD_version >= 700016) || (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103)
++#if defined(_PR_PTHREADS)
++#define _PR_HAVE_GETPROTO_R
++#define _PR_HAVE_5_ARG_GETPROTO_R
++#define _PR_HAVE_GETHOST_R
++#define _PR_HAVE_GETHOST_R_INT
++#define _PR_HAVE_THREADSAFE_GETHOST
++#endif
++#endif
++
+ #define USE_SETJMP
+ 
+ #ifndef _PR_PTHREADS
diff --git a/mail/thunderbird-esr/files/releng6_pulseaudio b/mail/thunderbird-esr/files/releng6_pulseaudio
deleted file mode 100644
index 37203b52a5ee..000000000000
--- a/mail/thunderbird-esr/files/releng6_pulseaudio
+++ /dev/null
@@ -1,66 +0,0 @@
---- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2009-08-20 21:43:41.000000000 +0200
-+++ mozilla/media/libsydneyaudio/src/Makefile.in	2009-08-20 21:44:17.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME	= sydneyaudio
- FORCE_STATIC_LIB= 1
- 
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS		= \
-+		sydney_audio_pulseaudio.c \
-+		$(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS		= \
- 		sydney_audio_alsa.c \
---- mozilla/toolkit/library/Makefile.in.orig	2010-01-19 20:28:10.000000000 +0000
-+++ mozilla/toolkit/library/Makefile.in	2010-01-25 09:38:40.000000000 +0000
-@@ -235,12 +235,12 @@
- endif
- 
- ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
- endif
- 
- ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
- endif
- 
---- mozilla/js/src/Makefile.in.orig	2009-08-21 00:34:43.000000000 +0200
-+++ mozilla/js/src/Makefile.in	2009-08-21 00:36:59.000000000 +0200
-@@ -427,7 +427,7 @@
- endif # WINNT
- 
- ifeq ($(OS_ARCH),FreeBSD)
--EXTRA_LIBS	+= -pthread
-+EXTRA_LIBS	+= -pthread -lpulse -lc
- endif
- ifeq ($(OS_ARCH),IRIX)
- ifdef USE_N32
---- config/rules.mk.orig	2009-08-22 15:30:16.000000000 +0200
-+++ config/rules.mk	2009-08-22 15:30:46.000000000 +0200
-@@ -583,6 +583,7 @@
- ifdef IS_COMPONENT
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
- endif
-+EXTRA_LIBS	+= -pthread -lpulse -lc
- endif
- 
- ifeq ($(OS_ARCH),NetBSD)
---- mozilla/layout/build/Makefile.in.orig	2009-08-22 01:00:21.000000000 +0200
-+++ mozilla/layout/build/Makefile.in	2009-08-22 01:00:57.000000000 +0200
-@@ -269,6 +269,10 @@
- endif
- endif
- 
-+ifeq ($(OS_ARCH),FreeBSD)
-+EXTRA_LIBS	+= -lpulse
-+endif
-+
- include $(topsrcdir)/config/rules.mk
- 
- LOCAL_INCLUDES	+= -I$(srcdir)/../base \