Date: Tue, 31 May 2011 23:12:59 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r551 - in branches/experimental/www: firefox-aurora firefox-aurora/files firefox-beta firefox-devel Message-ID: <201105312312.p4VNCxdD015580@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: flo
Date: Tue May 31 23:12:58 2011
New Revision: 551
Log:
- move firefox-devel to firefox-aurora and update to 6.0a2 from 20110531
- add firefox-beta (currently 5.0b2)
Discussed with: beat
Added:
branches/experimental/www/firefox-aurora/
- copied from r550, branches/experimental/www/firefox-devel/
branches/experimental/www/firefox-beta/
- copied from r550, branches/experimental/www/firefox-devel/
Deleted:
branches/experimental/www/firefox-devel/
Modified:
branches/experimental/www/firefox-aurora/Makefile
branches/experimental/www/firefox-aurora/distinfo
branches/experimental/www/firefox-aurora/files/patch-js-src-configure.in
branches/experimental/www/firefox-aurora/files/patch-js-src-jsnativestack.cpp
branches/experimental/www/firefox-aurora/files/patch-layout_generic_Makefile.in
branches/experimental/www/firefox-beta/Makefile
branches/experimental/www/firefox-beta/distinfo
Modified: branches/experimental/www/firefox-aurora/Makefile
==============================================================================
--- branches/experimental/www/firefox-devel/Makefile Fri May 27 09:49:16 2011 (r550)
+++ branches/experimental/www/firefox-aurora/Makefile Tue May 31 23:12:58 2011 (r551)
@@ -6,7 +6,7 @@
#
PORTNAME= firefox
-DISTVERSION= 5.0a2-20110428
+DISTVERSION= 6.0a2-20110531
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= http://tb.smeets.im/~flo/ \
@@ -17,7 +17,7 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
-BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr
+BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr
LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
event-1.4:${PORTSDIR}/devel/libevent
@@ -58,7 +58,7 @@
.include <bsd.port.pre.mk>
-WRKSRC:= ${WRKDIR}/firefox-5.0a2
+WRKSRC:= ${WRKDIR}/firefox-6.0a2
GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
Modified: branches/experimental/www/firefox-aurora/distinfo
==============================================================================
--- branches/experimental/www/firefox-devel/distinfo Fri May 27 09:49:16 2011 (r550)
+++ branches/experimental/www/firefox-aurora/distinfo Tue May 31 23:12:58 2011 (r551)
@@ -1,2 +1,2 @@
-SHA256 (firefox-5.0a2-20110428.source.tar.bz2) = 912aca5e56b9aacc2d75599493ab0ec04ef374493652c9b50ab241c3c0d6eb41
-SIZE (firefox-5.0a2-20110428.source.tar.bz2) = 68372158
+SHA256 (firefox-6.0a2-20110531.source.tar.bz2) = a5ff5d89791dd7122fcb154b4fb8315e693359387768bd109220c0b28313b29e
+SIZE (firefox-6.0a2-20110531.source.tar.bz2) = 67933005
Modified: branches/experimental/www/firefox-aurora/files/patch-js-src-configure.in
==============================================================================
--- branches/experimental/www/firefox-devel/files/patch-js-src-configure.in Fri May 27 09:49:16 2011 (r550)
+++ branches/experimental/www/firefox-aurora/files/patch-js-src-configure.in Tue May 31 23:12:58 2011 (r551)
@@ -1,6 +1,6 @@
---- js/src/configure.in.orig 2010-11-04 21:05:48.000000000 +0100
-+++ js/src/configure.in 2010-11-22 21:30:24.000000000 +0100
-@@ -2621,7 +2621,7 @@
+--- js/src/configure.in.orig 2011-06-01 00:33:48.000000000 +0200
++++ js/src/configure.in 2011-06-01 00:53:19.326440014 +0200
+@@ -2713,7 +2713,7 @@
AC_DEFINE(JS_CPU_X86)
AC_DEFINE(JS_NUNBOX32)
;;
@@ -9,19 +9,24 @@
ENABLE_TRACEJIT=1
NANOJIT_ARCH=X64
ENABLE_METHODJIT=1
-@@ -2638,11 +2638,6 @@
+@@ -2732,16 +2732,6 @@
AC_DEFINE(JS_CPU_ARM)
AC_DEFINE(JS_NUNBOX32)
;;
-sparc*-*)
- ENABLE_TRACEJIT=1
- NANOJIT_ARCH=Sparc
+- ENABLE_METHODJIT=1
+- ENABLE_MONOIC=1
+- ENABLE_POLYIC=1
+- ENABLE_POLYIC_TYPED_ARRAY=1
- AC_DEFINE(JS_CPU_SPARC)
+- AC_DEFINE(JS_NUNBOX32)
- ;;
esac
MOZ_ARG_DISABLE_BOOL(methodjit,
-@@ -2693,7 +2688,7 @@
+@@ -2796,7 +2786,7 @@
i?86-*)
AC_DEFINE(AVMPLUS_IA32)
;;
Modified: branches/experimental/www/firefox-aurora/files/patch-js-src-jsnativestack.cpp
==============================================================================
--- branches/experimental/www/firefox-devel/files/patch-js-src-jsnativestack.cpp Fri May 27 09:49:16 2011 (r550)
+++ branches/experimental/www/firefox-aurora/files/patch-js-src-jsnativestack.cpp Tue May 31 23:12:58 2011 (r551)
@@ -1,11 +1,11 @@
---- js/src/jsnativestack.cpp~
-+++ js/src/jsnativestack.cpp
+--- js/src/jsnativestack.cpp.orig 2011-06-01 00:33:48.000000000 +0200
++++ js/src/jsnativestack.cpp 2011-06-01 00:56:21.718439794 +0200
@@ -50,7 +50,8 @@
#elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
# include <pthread.h>
--# if defined(__FreeBSD__)
-+# if defined(FREEBSD)
+-# if defined(__FreeBSD__) || defined(__OpenBSD__)
++# if defined(FREEBSD) || defined(__OpenBSD__)
+# include <cstddef>
# include <pthread_np.h>
# endif
Modified: branches/experimental/www/firefox-aurora/files/patch-layout_generic_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-devel/files/patch-layout_generic_Makefile.in Fri May 27 09:49:16 2011 (r550)
+++ branches/experimental/www/firefox-aurora/files/patch-layout_generic_Makefile.in Tue May 31 23:12:58 2011 (r551)
@@ -1,9 +1,9 @@
---- layout/generic/Makefile.in.orig 2011-04-26 23:21:46.000000000 +0200
-+++ layout/generic/Makefile.in 2011-04-26 23:44:09.096445086 +0200
-@@ -147,9 +147,10 @@
+--- layout/generic/Makefile.in.orig 2011-06-01 00:34:33.000000000 +0200
++++ layout/generic/Makefile.in 2011-06-01 00:59:40.612442830 +0200
+@@ -159,9 +159,10 @@
-I$(srcdir)/../../content/html/content/src \
-I$(srcdir)/../../dom/base \
- -I$(srcdir)/../../modules/plugin/base/src \
+ -I$(srcdir)/../../dom/plugins/base \
- $(MOZ_CAIRO_CFLAGS) \
$(NULL)
Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-devel/Makefile Fri May 27 09:49:16 2011 (r550)
+++ branches/experimental/www/firefox-beta/Makefile Tue May 31 23:12:58 2011 (r551)
@@ -6,12 +6,11 @@
#
PORTNAME= firefox
-DISTVERSION= 5.0a2-20110428
+DISTVERSION= 5.0b2
PORTEPOCH= 1
CATEGORIES= www ipv6
-MASTER_SITES= http://tb.smeets.im/~flo/ \
- http://smeets.im/~flo/
-#MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
+MASTER_SITES= ${MASTER_SITE_MOZILLA}
+MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
DISTNAME= ${PORTNAME}-${DISTVERSION}.source
MAINTAINER= gecko@FreeBSD.org
@@ -58,7 +57,7 @@
.include <bsd.port.pre.mk>
-WRKSRC:= ${WRKDIR}/firefox-5.0a2
+WRKSRC:= ${WRKDIR}/mozilla-beta
GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
Modified: branches/experimental/www/firefox-beta/distinfo
==============================================================================
--- branches/experimental/www/firefox-devel/distinfo Fri May 27 09:49:16 2011 (r550)
+++ branches/experimental/www/firefox-beta/distinfo Tue May 31 23:12:58 2011 (r551)
@@ -1,2 +1,2 @@
-SHA256 (firefox-5.0a2-20110428.source.tar.bz2) = 912aca5e56b9aacc2d75599493ab0ec04ef374493652c9b50ab241c3c0d6eb41
-SIZE (firefox-5.0a2-20110428.source.tar.bz2) = 68372158
+SHA256 (firefox-5.0b2.source.tar.bz2) = 634e963b03ba460617771e19e138ac124894165aebc81afc535c22dbda0766fc
+SIZE (firefox-5.0b2.source.tar.bz2) = 68883059
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105312312.p4VNCxdD015580>