4 files changed, 19 insertions, 53 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 78580a4698a8..666fcc22a6a0 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	7.0.1
+DISTVERSION=	8.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
@@ -16,7 +16,8 @@ MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
 BUILD_DEPENDS=	nspr>=4.8.7:${PORTSDIR}/devel/nspr \
-		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo
+		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
+		unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
 		event-1.4:${PORTSDIR}/devel/libevent
 
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 4432f795ade9..39f5d2ac7dd1 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-7.0.1.source.tar.bz2) = 83f578bbfa0cb5d0f7faba6214993806050fab3e2039996344a11c9457525242
-SIZE (thunderbird-7.0.1.source.tar.bz2) = 87405591
+SHA256 (thunderbird-8.0.source.tar.bz2) = f728bd2dbc04e6c3a096d79a9ee320740f53794a28be307da8655c8fd90f77f5
+SIZE (thunderbird-8.0.source.tar.bz2) = 89435206
diff --git a/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in b/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in
index bc9c9b38d9dd..f203d1dce232 100644
--- a/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in
+++ b/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in
@@ -19,23 +19,12 @@
  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.
--DEFINES		+= -D__STDC_LIMIT_MACROS
-+DEFINES		+= -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS
- 
- INCLUDES	+= -I$(srcdir)
- 
-@@ -793,7 +796,8 @@
+@@ -793,7 +796,7 @@
  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/files/patch-mozilla-js-src-configure.in b/mail/thunderbird/files/patch-mozilla-js-src-configure.in
index 94c1542b6c00..6600b16b2f46 100644
--- a/mail/thunderbird/files/patch-mozilla-js-src-configure.in
+++ b/mail/thunderbird/files/patch-mozilla-js-src-configure.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- mozilla/js/src/configure.in.orig	2011-09-28 14:41:24.000000000 +0200
++++ mozilla/js/src/configure.in	2011-10-01 16:02:43.000000000 +0200
+@@ -1533,7 +1533,7 @@
      CPU_ARCH=sparc
      ;;
  
@@ -9,7 +9,7 @@
      CPU_ARCH="$OS_TEST"
      ;;
  
-@@ -1495,7 +1495,7 @@
+@@ -1555,7 +1555,7 @@
  dnl ===============================================================
  INTEL_ARCHITECTURE=
  case "$OS_TEST" in
@@ -18,48 +18,24 @@
        INTEL_ARCHITECTURE=1
  esac
  
-@@ -2713,7 +2713,7 @@
+@@ -2743,6 +2743,16 @@
      AC_DEFINE(JS_CPU_X86)
      AC_DEFINE(JS_NUNBOX32)
      ;;
--x86_64*-*)
 +amd64*-*)
-     ENABLE_TRACEJIT=1
-     NANOJIT_ARCH=X64
-     ENABLE_METHODJIT=1
-@@ -2723,23 +2723,23 @@
-     AC_DEFINE(JS_CPU_X64)
-     AC_DEFINE(JS_PUNBOX64)
-     ;;
--arm*-*)
-+x86_64*-*)
-     ENABLE_TRACEJIT=1
--    NANOJIT_ARCH=ARM
++    ENABLE_TRACEJIT=1
 +    NANOJIT_ARCH=X64
-     ENABLE_METHODJIT=1
-     ENABLE_MONOIC=1
-     ENABLE_POLYIC=1
--    AC_DEFINE(JS_CPU_ARM)
--    AC_DEFINE(JS_NUNBOX32)
++    ENABLE_METHODJIT=1
++    ENABLE_MONOIC=1
++    ENABLE_POLYIC=1
 +    ENABLE_POLYIC_TYPED_ARRAY=1
 +    AC_DEFINE(JS_CPU_X64)
 +    AC_DEFINE(JS_PUNBOX64)
-     ;;
--sparc*-*)
-+arm*-*)
++    ;;
+ x86_64*-*)
      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
-@@ -2796,6 +2796,10 @@
+     NANOJIT_ARCH=X64
+@@ -2827,6 +2837,10 @@
  i?86-*)
      AC_DEFINE(AVMPLUS_IA32)
      ;;