[SVN-Commit] r283 - in branches/experimental/www/firefox3-devel: . files

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Wed Mar  3 14:44:39 2010
New Revision: 283

Log:
- Update to 3.7 Alpha 2
- Build on FreeBSD 6.x i386 is currently broken (investigation pending):
  jshashtable.h:696: error: `void js::HashMap<Key, Value, HashPolicy,
  AllocPolicy>::Entry::operator=(const js::HashMap<Key, Value, HashPolicy,
  AllocPolicy>::Entry&) [with Key = jsbytecode*, Value = size_t,
  HashPolicy = js::DefaultHasher<jsbytecode*>,
  AllocPolicy = js::SystemAllocPolicy]' is private

Modified:
   branches/experimental/www/firefox3-devel/Makefile
   branches/experimental/www/firefox3-devel/distinfo
   branches/experimental/www/firefox3-devel/files/patch-js-src-configure.in
   branches/experimental/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk

Modified: branches/experimental/www/firefox3-devel/Makefile
==============================================================================
--- branches/experimental/www/firefox3-devel/Makefile	Mon Mar  1 21:53:26 2010	(r282)
+++ branches/experimental/www/firefox3-devel/Makefile	Wed Mar  3 14:44:39 2010	(r283)
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	3.7a1
+DISTVERSION=	3.7a2
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/devpreview/1.9.3a1/source
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/devpreview/1.9.3a2/source
 DISTNAME=	mozilladeveloperpreview-${DISTVERSION}.source
 
 MAINTAINER=	gecko at FreeBSD.org

Modified: branches/experimental/www/firefox3-devel/distinfo
==============================================================================
--- branches/experimental/www/firefox3-devel/distinfo	Mon Mar  1 21:53:26 2010	(r282)
+++ branches/experimental/www/firefox3-devel/distinfo	Wed Mar  3 14:44:39 2010	(r283)
@@ -1,3 +1,3 @@
-MD5 (mozilladeveloperpreview-3.7a1.source.tar.bz2) = 59c323757b2dcf2c0453af6800e78b60
-SHA256 (mozilladeveloperpreview-3.7a1.source.tar.bz2) = d9c48d06e1296ec46cb760c00c58cbdd7338ca95932361d9d8e5636a208f3d28
-SIZE (mozilladeveloperpreview-3.7a1.source.tar.bz2) = 49275117
+MD5 (mozilladeveloperpreview-3.7a2.source.tar.bz2) = 584f2967b0a842cd46878fb0c962a656
+SHA256 (mozilladeveloperpreview-3.7a2.source.tar.bz2) = c5c708a03cca137998f7c3dd8bc6864da5dcbe6ab59594cfa234c0e1448ded1c
+SIZE (mozilladeveloperpreview-3.7a2.source.tar.bz2) = 49803730

Modified: branches/experimental/www/firefox3-devel/files/patch-js-src-configure.in
==============================================================================
--- branches/experimental/www/firefox3-devel/files/patch-js-src-configure.in	Mon Mar  1 21:53:26 2010	(r282)
+++ branches/experimental/www/firefox3-devel/files/patch-js-src-configure.in	Wed Mar  3 14:44:39 2010	(r283)
@@ -1,13 +1,13 @@
---- js/src/configure.in.orig	2009-09-21 00:26:58.000000000 +0200
-+++ js/src/configure.in	2009-10-08 07:00:27.000000000 +0200
-@@ -2456,10 +2456,6 @@
-     ENABLE_JIT=1
+--- 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
      ;;
 -sparc*-*)
--    ENABLE_JIT=1
+-    ENABLE_TRACEJIT=1
 -    NANOJIT_ARCH=Sparc
 -    ;;
  esac
  
- MOZ_ARG_DISABLE_BOOL(jit,
+ MOZ_ARG_DISABLE_BOOL(tracejit,

Modified: branches/experimental/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk
==============================================================================
--- branches/experimental/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk	Mon Mar  1 21:53:26 2010	(r282)
+++ branches/experimental/www/firefox3-devel/files/patch-security-coreconf-FreeBSD.mk	Wed Mar  3 14:44:39 2010	(r283)
@@ -1,31 +1,29 @@
---- security/coreconf/FreeBSD.mk.orig	2009-11-09 01:34:19.000000000 +0100
-+++ security/coreconf/FreeBSD.mk	2009-11-11 18:15:55.000000000 +0100
-@@ -45,8 +45,24 @@
- ifeq ($(OS_TEST),alpha)
- CPU_ARCH		= alpha
- else
+--- security/coreconf/FreeBSD.mk.orig	2010-02-28 23:30:04.000000000 +0000
++++ 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
-+else 
++endif
 +ifeq ($(OS_TEST),ia64) 
 +CPU_ARCH		= ia64
-+else
++endif
 +ifeq ($(OS_TEST),powerpc)
 +CPU_ARCH		= powerpc
-+else
++endif
 +ifeq ($(OS_TEST),sparc64)
 +CPU_ARCH		= sparc64
-+else
- CPU_ARCH		= x86
  endif
-+endif
-+endif
-+endif
-+endif
  
  OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
- 
-@@ -73,7 +89,7 @@
+@@ -78,7 +90,7 @@
  DLL_SUFFIX		= so.1.0
  endif
  
@@ -34,7 +32,7 @@
  ifdef MAPFILE
  	MKSHLIB += -Wl,--version-script,$(MAPFILE)
  endif
-@@ -82,4 +98,4 @@
+@@ -87,4 +99,4 @@
  
  G++INCLUDES		= -I/usr/include/g++