Date: Sun, 2 Oct 2011 15:10:01 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r650 - in branches/experimental/www/seamonkey-beta: . files Message-ID: <201110021510.p92FA18V000131@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Sun Oct 2 15:10:01 2011
New Revision: 650
Log:
- Update to 2.5 Beta 1
Deleted:
branches/experimental/www/seamonkey-beta/files/patch-mozilla_toolkit_xre_glxtest.cpp
Modified:
branches/experimental/www/seamonkey-beta/Makefile
branches/experimental/www/seamonkey-beta/distinfo
branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in
branches/experimental/www/seamonkey-beta/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
Modified: branches/experimental/www/seamonkey-beta/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-beta/Makefile Sun Oct 2 13:22:23 2011 (r649)
+++ branches/experimental/www/seamonkey-beta/Makefile Sun Oct 2 15:10:01 2011 (r650)
@@ -2,11 +2,11 @@
# Date created: 31 Mar 1998
# Whom: eivind/dima/jseger
#
-# $FreeBSD: ports/www/seamonkey/Makefile,v 1.305 2011/08/25 08:35:59 ale Exp $
+# $FreeBSD: ports/www/seamonkey/Makefile,v 1.311 2011/09/30 15:27:01 beat Exp $
#
PORTNAME= seamonkey
-DISTVERSION= 2.4b3
+DISTVERSION= 2.5b1
CATEGORIES?= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source
@@ -15,7 +15,8 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= The open source, standards compliant web browser
-BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr
+BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \
+ ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
event-1.4:${PORTSDIR}/devel/libevent
@@ -32,7 +33,7 @@
MAKE_JOBS_SAFE= yes
MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome
MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/cairo"
+CPPFLAGS+= -I${LOCALBASE}/include/cairo
USE_GCC= 4.2+
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
Modified: branches/experimental/www/seamonkey-beta/distinfo
==============================================================================
--- branches/experimental/www/seamonkey-beta/distinfo Sun Oct 2 13:22:23 2011 (r649)
+++ branches/experimental/www/seamonkey-beta/distinfo Sun Oct 2 15:10:01 2011 (r650)
@@ -1,2 +1,2 @@
-SHA256 (seamonkey-2.4b3.source.tar.bz2) = e3c7b454c78e4f0abb56c52ad2662457f42adb19f6745ac027b2549a0cefdc6e
-SIZE (seamonkey-2.4b3.source.tar.bz2) = 88125333
+SHA256 (seamonkey-2.5b1.source.tar.bz2) = 7e9903340722c7ff3211d0afaa561ba7f0ffefacd351adf6c976887c00122aff
+SIZE (seamonkey-2.5b1.source.tar.bz2) = 89806691
Modified: branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in
==============================================================================
--- branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in Sun Oct 2 13:22:23 2011 (r649)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in Sun Oct 2 15:10:01 2011 (r650)
@@ -19,23 +19,12 @@
endif
ifeq (arm, $(TARGET_CPU))
#CPPSRCS += only_on_arm.cpp
-@@ -739,7 +742,7 @@
- # to reliably get limit macros defined, we'd always have to define the
- # one below before including any header, but that's obscure and
- # fragile, so we do it here.
--DEFINES += -D__STDC_LIMIT_MACROS
-+DEFINES += -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS
-
- 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)
ifdef USE_N32
-
Modified: branches/experimental/www/seamonkey-beta/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
==============================================================================
--- branches/experimental/www/seamonkey-beta/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Sun Oct 2 13:22:23 2011 (r649)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Sun Oct 2 15:10:01 2011 (r650)
@@ -1,10 +1,11 @@
--- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200
+++ ./mozilla/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
Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla_toolkit_xre_glxtest.cpp
==============================================================================
--- branches/experimental/www/seamonkey-beta/files/patch-mozilla_toolkit_xre_glxtest.cpp Sun Oct 2 15:10:01 2011 (r649)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,25 +0,0 @@
---- mozilla/toolkit/xre/glxtest.cpp.orig 2011-08-19 18:57:10.604870746 +0300
-+++ mozilla/toolkit/xre/glxtest.cpp 2011-08-19 18:59:43.620447963 +0300
-@@ -51,6 +51,8 @@
- // which runs the glxtest() static function. This creates a X connection, a GLX context, calls glGetString, and writes that
- // to the 'write' end of the pipe.
-
-+#include <sys/types.h>
-+#include <sys/wait.h>
- #include <cstdio>
- #include <cstdlib>
- #include <unistd.h>
-@@ -224,6 +226,7 @@
- void fire_glxtest_process()
- {
- int pfd[2];
-+ int status;
- if (pipe(pfd) == -1) {
- perror("pipe");
- exit(EXIT_FAILURE);
-@@ -244,4 +247,5 @@
- close(pfd[1]);
- mozilla::widget::glxtest_pipe = pfd[0];
- mozilla::widget::glxtest_pid = pid;
-+ waitpid(pid, &status, 0);
- }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110021510.p92FA18V000131>