8 files changed, 28 insertions, 53 deletions

diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index f571c74d6f7a..e550d934b089 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	6.0.2
+DISTVERSION=	7.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
@@ -55,7 +55,7 @@ PORTNAME_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
 MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 
-OPTIONS=	LIGHTNING       "Enable calendar extension" off
+OPTIONS=	LIGHTNING	"Enable calendar extension" off
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo
index 5c2901479da8..6233a6575f33 100644
--- a/mail/thunderbird-esr/distinfo
+++ b/mail/thunderbird-esr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-6.0.2.source.tar.bz2) = 4f2ae705033224e65bfd769dc012279c1236b50d173310d9fa37c88a74fc4387
-SIZE (thunderbird-6.0.2.source.tar.bz2) = 86083204
+SHA256 (thunderbird-7.0.source.tar.bz2) = 7f15243d65b124d3f24f278a3350d393e32193a0ca4fa9eb9d6e05606281a6c4
+SIZE (thunderbird-7.0.source.tar.bz2) = 87249420
diff --git a/mail/thunderbird-esr/files/patch-calendar-base-src-calDateTime.cpp b/mail/thunderbird-esr/files/patch-calendar-base-src-calDateTime.cpp
deleted file mode 100644
index edc56d333edc..000000000000
--- a/mail/thunderbird-esr/files/patch-calendar-base-src-calDateTime.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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-calendar-lightning-install.rdf b/mail/thunderbird-esr/files/patch-calendar-lightning-install.rdf
deleted file mode 100644
index 04273940f064..000000000000
--- a/mail/thunderbird-esr/files/patch-calendar-lightning-install.rdf
+++ /dev/null
@@ -1,11 +0,0 @@
---- calendar/lightning/install.rdf.orig	2011-08-18 14:35:19.000000000 +0200
-+++ calendar/lightning/install.rdf	2011-08-18 14:35:46.000000000 +0200
-@@ -12,7 +12,7 @@
-         <!-- thunderbird -->
-         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-         <em:minVersion>5.0b1</em:minVersion>
--        <em:maxVersion>5.*</em:maxVersion>
-+        <em:maxVersion>@THUNDERBIRD_VERSION@</em:maxVersion>
-       </Description>
-     </em:targetApplication>
- 
diff --git a/mail/thunderbird-esr/files/patch-mozilla-content-xslt-public-txDouble.h b/mail/thunderbird-esr/files/patch-mozilla-content-xslt-public-txDouble.h
deleted file mode 100644
index c53f725c80ed..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-content-xslt-public-txDouble.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- mozilla/content/xslt/public/txDouble.h.orig	Fri Oct 13 00:00:29 2006
-+++ mozilla/content/xslt/public/txDouble.h	Fri Oct 13 00:00:53 2006
-@@ -41,7 +41,7 @@
- #define __txdouble_h__
- 
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
--#ifdef __FreeBSD__
-+/* #ifdef __FreeBSD__
- #include <ieeefp.h>
- #ifdef __alpha__
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-@@ -50,7 +50,7 @@
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
--
-+*/
- /**
-  * Macros to workaround math-bugs bugs in various platforms
-  */
diff --git a/mail/thunderbird-esr/files/patch-mozilla-storage-build-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-storage-build-Makefile.in
deleted file mode 100644
index 44ed0d3e7318..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-storage-build-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/storage/build/Makefile.in.orig	Tue Feb 21 11:18:56 2006
-+++ mozilla/storage/build/Makefile.in	Sun Nov  5 16:16:06 2006
-@@ -77,6 +77,7 @@
- 	$(EXTRA_DSO_LIBS) \
- 	$(MOZ_COMPONENT_LIBS) \
- 	$(MOZ_JS_LIBS) \
-+	%%PTHREAD_LIBS%% \
- 	$(NULL)
- 
- include $(topsrcdir)/config/rules.mk
diff --git a/mail/thunderbird-esr/files/patch-mozilla__content__base__public__nsContentUtils.h b/mail/thunderbird-esr/files/patch-mozilla__content__base__public__nsContentUtils.h
new file mode 100644
index 000000000000..358d40c1f988
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-mozilla__content__base__public__nsContentUtils.h
@@ -0,0 +1,11 @@
+--- mozilla/content/base/public/nsContentUtils.h.orig	2011-07-07 10:44:49.000000000 +0200
++++ mozilla/content/base/public/nsContentUtils.h	2011-07-07 10:46:12.000000000 +0200
+@@ -54,7 +54,7 @@
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
+ #include <ieeefp.h>
+-#ifdef __alpha__
++#if !defined(__amd64__) && !defined(__i386__)
+ static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
+ #else
+ static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
diff --git a/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp b/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
new file mode 100644
index 000000000000..87b80a114ed1
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
@@ -0,0 +1,13 @@
+--- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig	2011-08-25 02:37:45.000000000 +0200
++++ ./mozilla/xpcom/threads/nsThreadManager.cpp	2011-08-28 17:14:14.000000000 +0200
+@@ -89,6 +89,10 @@
+ nsresult
+ nsThreadManager::Init()
+ {
++#ifdef NS_TLS
++  if (!gTLSThreadID)
++    gTLSThreadID = mozilla::threads::Generic;
++#endif
+   if (!mThreadsByPRThread.Init())
+     return NS_ERROR_OUT_OF_MEMORY;
+