4 files changed, 18 insertions, 51 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 20b3503a246c..7206909fca52 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	7.0.1
-PORTREVISION=	3
+DISTVERSION=	8.0
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -18,7 +17,8 @@ MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.8.8:${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/www/firefox/distinfo b/www/firefox/distinfo
index 7026e9397537..ded9fdbb205e 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-7.0.1.source.tar.bz2) = 81ecf63fca67186094d49dd5a6fe7f5dbd143a39f872ad126de38f246334fc04
-SIZE (firefox-7.0.1.source.tar.bz2) = 69278554
+SHA256 (firefox-8.0.source.tar.bz2) = d950324ecd5362a648a891a66c3f2dde5e69b09f30ef8470b7759ec007691139
+SIZE (firefox-8.0.source.tar.bz2) = 70377448
diff --git a/www/firefox/files/patch-js-src-Makefile.in b/www/firefox/files/patch-js-src-Makefile.in
index 75b37bf70bfe..b9f4996d371f 100644
--- a/www/firefox/files/patch-js-src-Makefile.in
+++ b/www/firefox/files/patch-js-src-Makefile.in
@@ -19,15 +19,6 @@
  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,7 @@
  endif # WINNT
  
diff --git a/www/firefox/files/patch-js-src-configure.in b/www/firefox/files/patch-js-src-configure.in
index 459ad5b98b81..d6157efdc313 100644
--- a/www/firefox/files/patch-js-src-configure.in
+++ b/www/firefox/files/patch-js-src-configure.in
@@ -1,6 +1,6 @@
---- js/src/configure.in.orig	2011-07-06 05:09:22.000000000 +0200
-+++ js/src/configure.in	2011-07-06 22:19:17.584233430 +0200
-@@ -1473,7 +1473,7 @@
+--- js/src/configure.in.orig	2011-09-28 14:41:24.000000000 +0200
++++ 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)
      ;;