Date: Thu, 6 Oct 2011 11:59:38 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r652 - in branches/experimental/mail/thunderbird-beta: . files Message-ID: <201110061159.p96BxcH8035118@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Thu Oct 6 11:59:38 2011
New Revision: 652
Log:
- Update to 8.0b1
- Sync with mail/thunderbird
Deleted:
branches/experimental/mail/thunderbird-beta/files/patch-mozilla__build__autoconf__mozconfig-find
Modified:
branches/experimental/mail/thunderbird-beta/Makefile
branches/experimental/mail/thunderbird-beta/distinfo
branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-Makefile.in
branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-configure.in
branches/experimental/mail/thunderbird-beta/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
Modified: branches/experimental/mail/thunderbird-beta/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-beta/Makefile Sun Oct 2 15:10:47 2011 (r651)
+++ branches/experimental/mail/thunderbird-beta/Makefile Thu Oct 6 11:59:38 2011 (r652)
@@ -2,11 +2,11 @@
# Date created: 4 September 2003
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
-# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.133 2011/08/25 08:35:58 ale Exp $
+# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.138 2011/10/01 14:27:20 beat Exp $
#
PORTNAME= thunderbird
-DISTVERSION= 7.0b2
+DISTVERSION= 8.0b1
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
@@ -16,10 +16,13 @@
COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \
- cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo
+ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
+ ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
event-1.4:${PORTSDIR}/devel/libevent
+CONFLICTS_BUILD= spidermonkey-*
+
USE_AUTOTOOLS= autoconf213
USE_GECKO= gecko
USE_MOZILLA= -png -nss -dbm -jpeg -xft
@@ -53,7 +56,7 @@
SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
-OPTIONS= LIGHTNING "Enable calendar extension" off
+OPTIONS= LIGHTNING "Enable calendar extension" off
.include <bsd.port.pre.mk>
Modified: branches/experimental/mail/thunderbird-beta/distinfo
==============================================================================
--- branches/experimental/mail/thunderbird-beta/distinfo Sun Oct 2 15:10:47 2011 (r651)
+++ branches/experimental/mail/thunderbird-beta/distinfo Thu Oct 6 11:59:38 2011 (r652)
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-7.0b2.source.tar.bz2) = bb9bd06d1c7a6811bc028d5f5dd4b0f730d1e1712ab3af0b584ae8f88fc8bf44
-SIZE (thunderbird-7.0b2.source.tar.bz2) = 87703202
+SHA256 (thunderbird-8.0b1.source.tar.bz2) = 95ab91f24d50c05207ef4b59871e36830091df6006ed993ee6e203cd15b88948
+SIZE (thunderbird-8.0b1.source.tar.bz2) = 89115893
Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-Makefile.in Sun Oct 2 15:10:47 2011 (r651)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-Makefile.in Thu Oct 6 11:59:38 2011 (r652)
@@ -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/mail/thunderbird-beta/files/patch-mozilla-js-src-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-configure.in Sun Oct 2 15:10:47 2011 (r651)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-configure.in Thu Oct 6 11:59:38 2011 (r652)
@@ -1,6 +1,6 @@
---- mozilla/js/src/configure.in.orig 2011-07-06 05:09:22.000000000 +0200
-+++ mozilla/js/src/configure.in 2011-07-06 22:19:17.584233430 +0200
-@@ -1473,7 +1473,7 @@
+--- mozilla/js/src/configure.in.orig 2011-09-28 14:41:24.000000000 +0200
++++ mozilla/js/src/configure.in 2011-10-01 16:02:43.000000000 +0200
+@@ -1533,7 +1533,7 @@
CPU_ARCH=sparc
;;
@@ -9,7 +9,7 @@
CPU_ARCH="$OS_TEST"
;;
-@@ -1495,7 +1495,7 @@
+@@ -1555,7 +1555,7 @@
dnl ===============================================================
INTEL_ARCHITECTURE=
case "$OS_TEST" in
@@ -18,48 +18,24 @@
INTEL_ARCHITECTURE=1
esac
-@@ -2713,7 +2713,7 @@
+@@ -2743,6 +2743,16 @@
AC_DEFINE(JS_CPU_X86)
AC_DEFINE(JS_NUNBOX32)
;;
--x86_64*-*)
+amd64*-*)
- ENABLE_TRACEJIT=1
- NANOJIT_ARCH=X64
- ENABLE_METHODJIT=1
-@@ -2723,23 +2723,23 @@
- AC_DEFINE(JS_CPU_X64)
- AC_DEFINE(JS_PUNBOX64)
- ;;
--arm*-*)
-+x86_64*-*)
- ENABLE_TRACEJIT=1
-- NANOJIT_ARCH=ARM
++ ENABLE_TRACEJIT=1
+ NANOJIT_ARCH=X64
- ENABLE_METHODJIT=1
- ENABLE_MONOIC=1
- ENABLE_POLYIC=1
-- AC_DEFINE(JS_CPU_ARM)
-- AC_DEFINE(JS_NUNBOX32)
++ ENABLE_METHODJIT=1
++ ENABLE_MONOIC=1
++ ENABLE_POLYIC=1
+ ENABLE_POLYIC_TYPED_ARRAY=1
+ AC_DEFINE(JS_CPU_X64)
+ AC_DEFINE(JS_PUNBOX64)
- ;;
--sparc*-*)
-+arm*-*)
++ ;;
+ x86_64*-*)
ENABLE_TRACEJIT=1
-- NANOJIT_ARCH=Sparc
-+ NANOJIT_ARCH=ARM
- ENABLE_METHODJIT=1
- ENABLE_MONOIC=1
- ENABLE_POLYIC=1
-- ENABLE_POLYIC_TYPED_ARRAY=1
-- AC_DEFINE(JS_CPU_SPARC)
-+ AC_DEFINE(JS_CPU_ARM)
- AC_DEFINE(JS_NUNBOX32)
- ;;
- esac
-@@ -2796,6 +2796,10 @@
+ NANOJIT_ARCH=X64
+@@ -2827,6 +2837,10 @@
i?86-*)
AC_DEFINE(AVMPLUS_IA32)
;;
Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla__build__autoconf__mozconfig-find
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/patch-mozilla__build__autoconf__mozconfig-find Thu Oct 6 11:59:38 2011 (r651)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,58 +0,0 @@
---- mozilla/build/autoconf/mozconfig-find
-+++ mozilla/build/autoconf/mozconfig-find
-@@ -41,16 +41,37 @@
- # command-line. The .mozconfig file is searched for in the
- # order:
- # if $MOZCONFIG is set, use that.
- # Otherwise, use $TOPSRCDIR/.mozconfig
- # Otherwise, use $HOME/.mozconfig
- #
- topsrcdir=$1
-
-+abspath() {
-+ if uname -s | grep -q MINGW; then
-+ # We have no way to figure out whether we're in gmake or pymake right
-+ # now. gmake gives us Unix-style paths while pymake gives us Windows-style
-+ # paths, so attempt to handle both.
-+ regexes='^\([A-Za-z]:\|\\\\\|\/\) ^\/'
-+ else
-+ regexes='^\/'
-+ fi
-+
-+ for regex in $regexes; do
-+ if echo $1 | grep -q $regex; then
-+ echo $1
-+ exit 0
-+ fi
-+ done
-+
-+ # If we're at this point, we have a relative path
-+ echo `pwd`/$1
-+}
-+
- for _config in "$MOZCONFIG" \
- "$MOZ_MYCONFIG"
- do
- if [ -n "$_config" ] && ! [ -f "$_config" ]; then
- echo "Specified MOZCONFIG \"$_config\" does not exist!"
- exit 1
- fi
- done
-@@ -61,12 +82,12 @@ for _config in "$MOZCONFIG" \
- "$topsrcdir/mozconfig" \
- "$topsrcdir/mozconfig.sh" \
- "$topsrcdir/myconfig.sh" \
- "$HOME/.mozconfig" \
- "$HOME/.mozconfig.sh" \
- "$HOME/.mozmyconfig.sh"
- do
- if test -f "$_config"; then
-- echo "$_config";
-+ echo `abspath $_config`
- exit 0
- fi
- done
-
-
-
-
Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Sun Oct 2 15:10:47 2011 (r651)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp Thu Oct 6 11:59:38 2011 (r652)
@@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110061159.p96BxcH8035118>