[SVN-Commit] r640 - branches/experimental/www/firefox branches/experimental/www/firefox/files trunk/www/firefox trunk/www/firefox/files

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Wed Sep 28 16:08:38 2011
New Revision: 640

Log:
- Check for affected FreeBSD versions in
  patch-xpcom__threads__nsThreadManager.cpp.
- Restore r1.4 of patch-js-src-Makefile.in which was accidentally reverted
  with the last update.
- Bump PORTREVISION.

Submitted by:	h h <aakuusta AT gmail.com>

Modified:
   branches/experimental/www/firefox/Makefile
   branches/experimental/www/firefox/files/patch-js-src-Makefile.in
   branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp
   trunk/www/firefox/Makefile
   trunk/www/firefox/files/patch-js-src-Makefile.in
   trunk/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp

Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile	Wed Sep 28 02:59:20 2011	(r639)
+++ branches/experimental/www/firefox/Makefile	Wed Sep 28 16:08:38 2011	(r640)
@@ -2,11 +2,12 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane at FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox/Makefile,v 1.246 2011/08/24 23:34:00 flo Exp $
+# $FreeBSD: ports/www/firefox/Makefile,v 1.249 2011/09/27 18:44:33 beat Exp $
 #
 
 PORTNAME=	firefox
 DISTVERSION=	7.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}

Modified: branches/experimental/www/firefox/files/patch-js-src-Makefile.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-js-src-Makefile.in	Wed Sep 28 02:59:20 2011	(r639)
+++ branches/experimental/www/firefox/files/patch-js-src-Makefile.in	Wed Sep 28 16:08:38 2011	(r640)
@@ -28,14 +28,12 @@
  
  INCLUDES	+= -I$(srcdir)
  
-
--@@ -793,7 +796,8 @@
-+@@ -793,7 +796,7 @@
-  endif # WINNT
-  
-  ifeq ($(OS_ARCH),FreeBSD)
- -EXTRA_LIBS += -pthread
--+DEFINES           += -DFREEBSD
- +EXTRA_LIBS       += -pthread -lc
-  endif
-  ifeq ($(OS_ARCH),IRIX)
+@@ -793,7 +796,7 @@
+ endif # WINNT
+ 
+ ifeq ($(OS_ARCH),FreeBSD)
+-EXTRA_LIBS	+= -pthread
++EXTRA_LIBS	+= -pthread -lc
+ endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32

Modified: branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp	Wed Sep 28 02:59:20 2011	(r639)
+++ branches/experimental/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp	Wed Sep 28 16:08:38 2011	(r640)
@@ -1,10 +1,11 @@
 --- ./xpcom/threads/nsThreadManager.cpp.orig	2011-08-25 02:37:45.000000000 +0200
 +++ ./xpcom/threads/nsThreadManager.cpp	2011-08-28 17:14:14.000000000 +0200
-@@ -89,6 +89,10 @@
+@@ -89,6 +89,11 @@
  nsresult
  nsThreadManager::Init()
  {
-+#ifdef NS_TLS
++#ifdef NS_TLS && (__FreeBSD_version < 802513 \
++  || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
 +  if (!gTLSThreadID)
 +    gTLSThreadID = mozilla::threads::Generic;
 +#endif

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Wed Sep 28 02:59:20 2011	(r639)
+++ trunk/www/firefox/Makefile	Wed Sep 28 16:08:38 2011	(r640)
@@ -2,11 +2,12 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane at FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox/Makefile,v 1.246 2011/08/24 23:34:00 flo Exp $
+# $FreeBSD: ports/www/firefox/Makefile,v 1.249 2011/09/27 18:44:33 beat Exp $
 #
 
 PORTNAME=	firefox
 DISTVERSION=	7.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}

Modified: trunk/www/firefox/files/patch-js-src-Makefile.in
==============================================================================
--- trunk/www/firefox/files/patch-js-src-Makefile.in	Wed Sep 28 02:59:20 2011	(r639)
+++ trunk/www/firefox/files/patch-js-src-Makefile.in	Wed Sep 28 16:08:38 2011	(r640)
@@ -28,14 +28,12 @@
  
  INCLUDES	+= -I$(srcdir)
  
-
--@@ -793,7 +796,8 @@
-+@@ -793,7 +796,7 @@
-  endif # WINNT
-  
-  ifeq ($(OS_ARCH),FreeBSD)
- -EXTRA_LIBS += -pthread
--+DEFINES           += -DFREEBSD
- +EXTRA_LIBS       += -pthread -lc
-  endif
-  ifeq ($(OS_ARCH),IRIX)
+@@ -793,7 +796,7 @@
+ endif # WINNT
+ 
+ ifeq ($(OS_ARCH),FreeBSD)
+-EXTRA_LIBS	+= -pthread
++EXTRA_LIBS	+= -pthread -lc
+ endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32

Modified: trunk/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp
==============================================================================
--- trunk/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp	Wed Sep 28 02:59:20 2011	(r639)
+++ trunk/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp	Wed Sep 28 16:08:38 2011	(r640)
@@ -1,10 +1,11 @@
 --- ./xpcom/threads/nsThreadManager.cpp.orig	2011-08-25 02:37:45.000000000 +0200
 +++ ./xpcom/threads/nsThreadManager.cpp	2011-08-28 17:14:14.000000000 +0200
-@@ -89,6 +89,10 @@
+@@ -89,6 +89,11 @@
  nsresult
  nsThreadManager::Init()
  {
-+#ifdef NS_TLS
++#ifdef NS_TLS && (__FreeBSD_version < 802513 \
++  || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
 +  if (!gTLSThreadID)
 +    gTLSThreadID = mozilla::threads::Generic;
 +#endif