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

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Fri Oct 16 00:09:19 2009
New Revision: 142

Log:
- Update to 3.6b1

Deleted:
   branches/experimental/www/firefox3-devel/files/patch-media_liboggplay_src_liboggplay_std_semaphore.h
Modified:
   branches/experimental/www/firefox3-devel/Makefile
   branches/experimental/www/firefox3-devel/distinfo
   branches/experimental/www/firefox3-devel/files/patch-js_src_jsnum.cpp

Modified: branches/experimental/www/firefox3-devel/Makefile
==============================================================================
--- branches/experimental/www/firefox3-devel/Makefile	Wed Oct 14 15:29:38 2009	(r141)
+++ branches/experimental/www/firefox3-devel/Makefile	Fri Oct 16 00:09:19 2009	(r142)
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	3.6a2
-PORTREVISION=	1
+DISTVERSION=	3.6b1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/nightly/${DISTVERSION}-candidates/build2/source
+MASTER_SITE_SUBDIR=	${PORTNAME}/nightly/${DISTVERSION}-candidates/build1/source
 DISTNAME=	${PORTNAME}-${DISTVERSION}.source
 
 MAINTAINER=	gecko at FreeBSD.org
@@ -30,8 +29,7 @@
 MOZILLA=	${PORTNAME}${MOZILLA_SUFX}
 MOZ_TOOLKIT=	cairo-gtk2
 GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
-			lib/${MOZILLA}/include lib/${MOZILLA}/lib \
-			lib/${MOZILLA}/sdk/idl lib/${MOZILLA}/sdk/include
+			lib/${MOZILLA}/include lib/${MOZILLA}/lib
 
 MAKE_JOBS_SAFE=	yes
 WANT_GNOME=	yes

Modified: branches/experimental/www/firefox3-devel/distinfo
==============================================================================
--- branches/experimental/www/firefox3-devel/distinfo	Wed Oct 14 15:29:38 2009	(r141)
+++ branches/experimental/www/firefox3-devel/distinfo	Fri Oct 16 00:09:19 2009	(r142)
@@ -1,3 +1,3 @@
-MD5 (firefox-3.6a2.source.tar.bz2) = 3bda192831af077dac080959c08e26e6
-SHA256 (firefox-3.6a2.source.tar.bz2) = ce50e9135520e9e05534f1b86077b346f026ff21cfe1d2cc9e3d00ecea65e4f9
-SIZE (firefox-3.6a2.source.tar.bz2) = 45074652
+MD5 (firefox-3.6b1.source.tar.bz2) = 6582f49cbe97ec60d9ccbe3e0e640ea1
+SHA256 (firefox-3.6b1.source.tar.bz2) = 9b12e5ac1bc077967b44fe0f9c1bd59f3e1b80d2f463483591326d2f67e4f76b
+SIZE (firefox-3.6b1.source.tar.bz2) = 47710612

Modified: branches/experimental/www/firefox3-devel/files/patch-js_src_jsnum.cpp
==============================================================================
--- branches/experimental/www/firefox3-devel/files/patch-js_src_jsnum.cpp	Wed Oct 14 15:29:38 2009	(r141)
+++ branches/experimental/www/firefox3-devel/files/patch-js_src_jsnum.cpp	Fri Oct 16 00:09:19 2009	(r142)
@@ -1,16 +1,16 @@
---- js/src/jsnum.cpp.orig	2009-04-28 11:19:57.888134991 +0000
-+++ js/src/jsnum.cpp	2009-04-28 11:21:35.786147448 +0000
-@@ -45,6 +45,9 @@
- #if defined(XP_WIN) || defined(XP_OS2)
- #include <float.h>
- #endif
+--- js/src/jsnum.cpp.orig	2009-10-14 18:03:30.000000000 +0200
++++ js/src/jsnum.cpp	2009-10-15 21:49:44.000000000 +0200
+@@ -43,6 +43,9 @@
+ /*
+  * JS number type and wrapper class.
+  */
 +#if defined(__FreeBSD__)
 +#include <sys/param.h>
 +#endif
  #ifdef XP_OS2
  #define _PC_53  PC_53
  #define _MCW_EM MCW_EM
-@@ -659,8 +662,16 @@
+@@ -691,8 +694,16 @@
  
  #else
  

Deleted: branches/experimental/www/firefox3-devel/files/patch-media_liboggplay_src_liboggplay_std_semaphore.h
==============================================================================
--- branches/experimental/www/firefox3-devel/files/patch-media_liboggplay_src_liboggplay_std_semaphore.h	Fri Oct 16 00:09:19 2009	(r141)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- media/liboggplay/src/liboggplay/std_semaphore.h.orig	2009-04-24 01:46:48.000000000 +0000
-+++ media/liboggplay/src/liboggplay/std_semaphore.h	2009-04-28 08:39:25.739957779 +0000
-@@ -74,7 +74,7 @@
-  * @retval non-zero on error 
-  */
- 
--#if defined(linux) || defined(SOLARIS)
-+#if defined(linux) || defined(SOLARIS) || defined(__FreeBSD__)
- #include <semaphore.h>
- #define SEM_CREATE(p,s) sem_init(&(p), 1, s)
- #define SEM_SIGNAL(p)   sem_post(&(p))