From owner-freebsd-gecko@FreeBSD.ORG Wed Sep 28 16:08:45 2011 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9888A1065674 for ; Wed, 28 Sep 2011 16:08:45 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 3DC378FC1C for ; Wed, 28 Sep 2011 16:08:44 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id p8SG8hhS013537 for ; Wed, 28 Sep 2011 16:08:43 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p8SG8cW8011696 for freebsd-gecko@freebsd.org; Wed, 28 Sep 2011 16:08:38 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 28 Sep 2011 16:08:38 GMT Message-Id: <201109281608.p8SG8cW8011696@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r640 - branches/experimental/www/firefox branches/experimental/www/firefox/files trunk/www/firefox trunk/www/firefox/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Sep 2011 16:08:45 -0000 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 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 # -# $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 # -# $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