[SVN-Commit] r435 - in branches/experimental/www/firefox-devel: . files

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Sun Nov 21 13:36:52 2010
New Revision: 435

Log:
- Update to 4.0 Beta 7

Deleted:
   branches/experimental/www/firefox-devel/files/patch-netwerk-cookie-nsCookieService.cpp
Modified:
   branches/experimental/www/firefox-devel/Makefile
   branches/experimental/www/firefox-devel/distinfo
   branches/experimental/www/firefox-devel/files/patch-configure.in
   branches/experimental/www/firefox-devel/files/patch-js-src-configure.in

Modified: branches/experimental/www/firefox-devel/Makefile
==============================================================================
--- branches/experimental/www/firefox-devel/Makefile	Sun Nov 21 13:36:04 2010	(r434)
+++ branches/experimental/www/firefox-devel/Makefile	Sun Nov 21 13:36:52 2010	(r435)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	4.0b6
+DISTVERSION=	4.0b7
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}

Modified: branches/experimental/www/firefox-devel/distinfo
==============================================================================
--- branches/experimental/www/firefox-devel/distinfo	Sun Nov 21 13:36:04 2010	(r434)
+++ branches/experimental/www/firefox-devel/distinfo	Sun Nov 21 13:36:52 2010	(r435)
@@ -1,3 +1,2 @@
-MD5 (firefox-4.0b6.source.tar.bz2) = 444176a2fd04f20512da121d1afa8abb
-SHA256 (firefox-4.0b6.source.tar.bz2) = e2d7091a1399af885e0bc8b138dec4ee893b935bbef12802706b0e0203594feb
-SIZE (firefox-4.0b6.source.tar.bz2) = 63788403
+SHA256 (firefox-4.0b7.source.tar.bz2) = 02cc466a92af828ff3bc563d4515bd98064cf5f136b5871e072b9408fb4db128
+SIZE (firefox-4.0b7.source.tar.bz2) = 63865025

Modified: branches/experimental/www/firefox-devel/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox-devel/files/patch-configure.in	Sun Nov 21 13:36:04 2010	(r434)
+++ branches/experimental/www/firefox-devel/files/patch-configure.in	Sun Nov 21 13:36:52 2010	(r435)
@@ -1,6 +1,6 @@
---- configure.in.orig	2009-10-03 20:24:11.000000000 +0200
-+++ configure.in	2009-10-03 20:24:43.000000000 +0200
-@@ -1352,7 +1352,7 @@
+--- configure.in.orig	2010-11-04 21:05:18.000000000 +0100
++++ configure.in	2010-11-09 12:59:28.000000000 +0100
+@@ -1549,7 +1549,7 @@
      CPU_ARCH=sparc
      ;;
  
@@ -9,7 +9,7 @@
      CPU_ARCH="$OS_TEST"
      ;;
  
-@@ -3767,19 +3767,21 @@ AC_CHECK_FUNCS(flockfile getpagesize)
+@@ -3803,19 +3803,21 @@
  AC_CHECK_FUNCS(localtime_r strtok_r)
  
  dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt
@@ -45,17 +45,18 @@
      ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
      ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
  fi
-@@ -5938,11 +5938,11 @@ if test -n "$MOZ_WEBM"; then
-       AC_CHECK_PROGS(VPX_AS, $YASM yasm, "")
-       dnl We have YASM, see if we have assembly on this platform.  
-       case "$OS_ARCH:$OS_TEST" in
--      Linux:x86|Linux:i?86)
-+      Linux:x86|Linux:i?86|FreeBSD:i386)
-         VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
-         VPX_X86_ASM=1
-       ;;
--      Linux:x86_64)
-+      Linux:x86_64|FreeBSD:amd64)
-         VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
-         VPX_X86_ASM=1
-       ;;
+@@ -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

Modified: branches/experimental/www/firefox-devel/files/patch-js-src-configure.in
==============================================================================
--- branches/experimental/www/firefox-devel/files/patch-js-src-configure.in	Sun Nov 21 13:36:04 2010	(r434)
+++ branches/experimental/www/firefox-devel/files/patch-js-src-configure.in	Sun Nov 21 13:36:52 2010	(r435)
@@ -1,13 +1,14 @@
---- js/src/configure.in.orig	2010-03-03 01:58:30.000000000 +0000
-+++ js/src/configure.in	2010-03-03 01:59:33.000000000 +0000
-@@ -2507,10 +2507,6 @@
-     ENABLE_TRACEJIT=1
-     NANOJIT_ARCH=ARM
+--- js/src/configure.in.orig	2010-11-09 13:03:31.000000000 +0100
++++ js/src/configure.in	2010-11-09 13:03:46.000000000 +0100
+@@ -2638,11 +2638,6 @@
+     AC_DEFINE(JS_CPU_ARM)
+     AC_DEFINE(JS_NUNBOX32)
      ;;
 -sparc*-*)
 -    ENABLE_TRACEJIT=1
 -    NANOJIT_ARCH=Sparc
+-    AC_DEFINE(JS_CPU_SPARC)
 -    ;;
  esac
  
- MOZ_ARG_DISABLE_BOOL(tracejit,
+ MOZ_ARG_DISABLE_BOOL(methodjit,

Deleted: branches/experimental/www/firefox-devel/files/patch-netwerk-cookie-nsCookieService.cpp
==============================================================================
--- branches/experimental/www/firefox-devel/files/patch-netwerk-cookie-nsCookieService.cpp	Sun Nov 21 13:36:52 2010	(r434)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- netwerk/cookie/nsCookieService.cpp.orig	2010-09-06 20:52:56.000000000 +0200
-+++ netwerk/cookie/nsCookieService.cpp	2010-09-06 20:53:36.000000000 +0200
-@@ -345,7 +345,7 @@
- #else
- #define COOKIE_LOGFAILURE(a, b, c, d)    PR_BEGIN_MACRO /* nothing */ PR_END_MACRO
- #define COOKIE_LOGSUCCESS(a, b, c, d, e) PR_BEGIN_MACRO /* nothing */ PR_END_MACRO
--#define COOKIE_LOGEVICTED(a)             PR_BEGIN_MACRO /* nothing */ PR_END_MACRO
-+#define COOKIE_LOGEVICTED(a, b)          PR_BEGIN_MACRO /* nothing */ PR_END_MACRO
- #define COOKIE_LOGSTRING(a, b)           PR_BEGIN_MACRO /* nothing */ PR_END_MACRO
- #endif
-