From owner-freebsd-gecko@FreeBSD.ORG Fri Jul 22 19:38:52 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 A6F85106564A for ; Fri, 22 Jul 2011 19:38:52 +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 3D6AD8FC14 for ; Fri, 22 Jul 2011 19:38:51 +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 p6MJcoim093991 for ; Fri, 22 Jul 2011 19:38:50 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p6MJcj9k092537 for freebsd-gecko@freebsd.org; Fri, 22 Jul 2011 19:38:45 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 22 Jul 2011 19:38:45 GMT Message-Id: <201107221938.p6MJcj9k092537@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] r590 - in branches/experimental/mail/thunderbird-beta: . 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: Fri, 22 Jul 2011 19:38:52 -0000 Author: flo Date: Fri Jul 22 19:38:45 2011 New Revision: 590 Log: update to 6.0b1 Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-jsnativestack.cpp Modified: branches/experimental/mail/thunderbird-beta/Makefile branches/experimental/mail/thunderbird-beta/distinfo branches/experimental/mail/thunderbird-beta/files/patch-configure.in 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-layout-generic-Makefile.in Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Tue Jul 19 17:43:13 2011 (r589) +++ branches/experimental/mail/thunderbird-beta/Makefile Fri Jul 22 19:38:45 2011 (r590) @@ -2,11 +2,11 @@ # Date created: 4 September 2003 # Whom: Joe Marcus Clarke # -# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.114 2010/08/03 20:55:28 beat Exp $ +# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.128 2011/07/04 21:27:06 flo Exp $ # PORTNAME= thunderbird -DISTVERSION= 5.0b2 +DISTVERSION= 6.0b1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -21,7 +21,7 @@ USE_AUTOTOOLS= autoconf213 USE_GECKO= gecko -CONFLICTS_INSTALL= thunderbird-3.0* thunderbird-3.1* +CONFLICTS_INSTALL= thunderbird-3.1* USE_MOZILLA= -png -nss -dbm -jpeg -xft MOZ_TOOLKIT= cairo-gtk2 @@ -35,7 +35,7 @@ USE_GMAKE= yes USE_GL= gl -MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data,wyciwyg +MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data,wyciwyg,websocket MOZ_GRAPHICS= default,-xbm MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-single-profile --disable-profilesharing \ @@ -54,13 +54,22 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS= +OPTIONS= LIGHTNING "Enable calendar extension" off .include -WRKSRC= ${WRKDIR}/comm-miramar +WRKSRC= ${WRKDIR}/comm-beta MOZSRC:= ${WRKSRC}/mozilla +.if ${ARCH} == powerpc64 +.if ${OSVERSION} < 900033 +BROKEN= Needs binutils 2.17.50 to build +.else +CONFIGURE_ENV+= UNAME_m="powerpc64" +CFLAGS+= -mminimal-toc +.endif +.endif + GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} .if ${HAVE_GNOME:Mlibgnomeui}!="" @@ -81,6 +90,16 @@ BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .endif +.if defined(WITH_LIGHTNING) +MOZ_OPTIONS+= --enable-calendar +MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar +LIGHTNING_DIR= share/lightning +SUB_FILES+= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message +.else +MOZ_OPTIONS+= --disable-calendar +.endif + post-extract:: ${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop @@ -115,10 +134,19 @@ @${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} @${ECHO_CMD} 'share/pixmaps/${PORTNAME_ICON}' >> ${PLIST} @${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST} +.if defined(WITH_LIGHTNING) + @${PRINTF} '%s/lightning-${PORTNAME}.xpi\n@dirrmtry %s\n' \ + ${LIGHTNING_DIR} ${LIGHTNING_DIR} >> ${PLIST} +.endif post-install: ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications ${LN} -sf ${PORTNAME_ICON_SRC} ${PREFIX}/share/pixmaps/${PORTNAME_ICON} +.if defined(WITH_LIGHTNING) + ${MKDIR} ${PREFIX}/${LIGHTNING_DIR} + ${INSTALL_DATA} ${MOZSRC}/dist/xpi-stage/lightning.xpi ${PREFIX}/${LIGHTNING_DIR}/lightning-${PORTNAME}.xpi + @${CAT} ${PKGMESSAGE} +.endif .include Modified: branches/experimental/mail/thunderbird-beta/distinfo ============================================================================== --- branches/experimental/mail/thunderbird-beta/distinfo Tue Jul 19 17:43:13 2011 (r589) +++ branches/experimental/mail/thunderbird-beta/distinfo Fri Jul 22 19:38:45 2011 (r590) @@ -1,2 +1,2 @@ -SHA256 (thunderbird-5.0b2.source.tar.bz2) = 22a5276ed6df4dc01041ea1dcbe40b21163f8c2655b26f9d7e0d5d1b5f74660f -SIZE (thunderbird-5.0b2.source.tar.bz2) = 86830590 +SHA256 (thunderbird-6.0b1.source.tar.bz2) = 0110c6901ee4be743c8cd1733ae825b849cc4e50fe2fb014e149d1a8c4db459f +SIZE (thunderbird-6.0b1.source.tar.bz2) = 86056605 Modified: branches/experimental/mail/thunderbird-beta/files/patch-configure.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-configure.in Tue Jul 19 17:43:13 2011 (r589) +++ branches/experimental/mail/thunderbird-beta/files/patch-configure.in Fri Jul 22 19:38:45 2011 (r590) @@ -1,6 +1,6 @@ ---- configure.in.orig 2011-03-14 14:50:16.000000000 +0100 -+++ configure.in 2011-04-22 12:52:35.061444423 +0200 -@@ -1420,7 +1420,7 @@ +--- configure.in.orig 2011-07-15 07:42:33.000000000 +0200 ++++ configure.in 2011-07-22 13:43:44.000000000 +0200 +@@ -1438,7 +1438,7 @@ CPU_ARCH=sparc ;; @@ -9,7 +9,7 @@ CPU_ARCH="$OS_TEST" ;; -@@ -1440,7 +1440,7 @@ +@@ -1458,7 +1458,7 @@ dnl =============================================================== INTEL_ARCHITECTURE= case "$OS_TEST" in @@ -18,7 +18,90 @@ INTEL_ARCHITECTURE=1 esac -@@ -4388,7 +4388,7 @@ +@@ -1781,7 +1781,7 @@ + esac + + case "${host_cpu}" in +- x86_64) ++ amd64 | x86_64) + HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_" + ;; + esac +@@ -2437,6 +2437,9 @@ + x86_64-*) + AC_DEFINE(_AMD64_) + ;; ++ amd64*) ++ AC_DEFINE(_AMD64_) ++ ;; + *) + AC_DEFINE(_CPU_ARCH_NOT_DEFINED) + ;; +@@ -2508,7 +2511,7 @@ + else + DLL_SUFFIX=".so.1.0" + fi +- MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/X11R6)/lib' ++ MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/local)/lib' + DSO_CFLAGS='' + DSO_PIC_CFLAGS='-fPIC' + DSO_LDOPTS='-shared -fPIC' +@@ -3326,11 +3329,11 @@ + ;; + *) + MOZ_CHECK_PTHREADS(pthreads, +- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads", ++ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthreads", + MOZ_CHECK_PTHREADS(pthread, +- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread", ++ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread", + MOZ_CHECK_PTHREADS(c_r, +- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r", ++ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread", + MOZ_CHECK_PTHREADS(c, + USE_PTHREADS=1 + ) +@@ -3405,18 +3408,18 @@ + *-*-freebsd*) + AC_DEFINE(_REENTRANT) + AC_DEFINE(_THREAD_SAFE) +- dnl -pthread links in -lc_r, so don't specify it explicitly. ++ dnl -pthread links in -pthread, so don't specify it explicitly. + if test "$ac_cv_have_dash_pthread" = "yes"; then + _PTHREAD_LDFLAGS="-pthread" + else +- _PTHREAD_LDFLAGS="-lc_r" ++ _PTHREAD_LDFLAGS="-pthread" + fi + ;; + + *-*-openbsd*|*-*-bsdi*) + AC_DEFINE(_REENTRANT) + AC_DEFINE(_THREAD_SAFE) +- dnl -pthread links in -lc_r, so don't specify it explicitly. ++ dnl -pthread links in -pthread, so don't specify it explicitly. + if test "$ac_cv_have_dash_pthread" = "yes"; then + _PTHREAD_LDFLAGS="-pthread" + fi +@@ -3591,7 +3594,7 @@ + ac_cv_func_iconv, + [AC_TRY_LINK([ + #include +- #include ++ #include "/usr/local/include/iconv.h" + ], + [ + iconv_t h = iconv_open("", ""); +@@ -3612,7 +3615,7 @@ + ac_cv_func_const_iconv, + [AC_TRY_COMPILE([ + #include +- #include ++ #include "/usr/local/include/iconv.h" + ], + [ + const char *input = "testing"; +@@ -4409,7 +4412,7 @@ LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS @@ -27,3 +110,12 @@ ZLIB_CFLAGS="-I${ZLIB_DIR}/include" ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" fi +@@ -5966,7 +5969,7 @@ + i*86) + MOZ_CRT_CPU_ARCH=intel + ;; +- x86_64) ++ amd64 | x86_64) + MOZ_CRT_CPU_ARCH=amd64 + ;; + *) 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 Tue Jul 19 17:43:13 2011 (r589) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-Makefile.in Fri Jul 22 19:38:45 2011 (r590) @@ -1,6 +1,25 @@ ---- mozilla/js/src/Makefile.in.orig 2011-03-17 18:51:39.000000000 +0100 -+++ mozilla/js/src/Makefile.in 2011-03-18 19:41:09.000000000 +0100 -@@ -612,7 +612,7 @@ +--- mozilla/js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200 ++++ mozilla/js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200 +@@ -416,7 +416,7 @@ + # END enclude sources for V8 dtoa + ############################################# + +-ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU))) ++ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU))) + + VPATH += $(srcdir)/assembler \ + $(srcdir)/assembler/wtf \ +@@ -469,6 +469,9 @@ + else + #CPPSRCS += only_on_x86.cpp + endif ++ifeq (amd64, $(TARGET_CPU)) ++#CPPSRCS += only_on_x86_64.cpp ++endif + 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. @@ -9,7 +28,7 @@ INCLUDES += -I$(srcdir) -@@ -666,7 +666,8 @@ +@@ -793,7 +796,8 @@ endif # WINNT ifeq ($(OS_ARCH),FreeBSD) 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 Tue Jul 19 17:43:13 2011 (r589) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-configure.in Fri Jul 22 19:38:45 2011 (r590) @@ -1,33 +1,72 @@ ---- mozilla/js/src/configure.in.orig 2010-11-04 21:05:48.000000000 +0100 -+++ mozilla/js/src/configure.in 2010-11-22 21:30:24.000000000 +0100 -@@ -2621,7 +2621,7 @@ +--- 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 @@ + CPU_ARCH=sparc + ;; + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" + ;; + +@@ -1495,7 +1495,7 @@ + dnl =============================================================== + INTEL_ARCHITECTURE= + case "$OS_TEST" in +- x86_64|i?86) ++ amd64|x86_64|i?86) + INTEL_ARCHITECTURE=1 + esac + +@@ -2713,7 +2713,7 @@ AC_DEFINE(JS_CPU_X86) AC_DEFINE(JS_NUNBOX32) ;; -x86_64*-*) -+x86_64*-*|amd64*-*) ++amd64*-*) ENABLE_TRACEJIT=1 NANOJIT_ARCH=X64 ENABLE_METHODJIT=1 -@@ -2638,11 +2638,6 @@ - AC_DEFINE(JS_CPU_ARM) - AC_DEFINE(JS_NUNBOX32) +@@ -2723,23 +2723,23 @@ + AC_DEFINE(JS_CPU_X64) + AC_DEFINE(JS_PUNBOX64) + ;; +-arm*-*) ++x86_64*-*) + ENABLE_TRACEJIT=1 +- NANOJIT_ARCH=ARM ++ NANOJIT_ARCH=X64 + ENABLE_METHODJIT=1 + ENABLE_MONOIC=1 + ENABLE_POLYIC=1 +- AC_DEFINE(JS_CPU_ARM) +- AC_DEFINE(JS_NUNBOX32) ++ ENABLE_POLYIC_TYPED_ARRAY=1 ++ AC_DEFINE(JS_CPU_X64) ++ AC_DEFINE(JS_PUNBOX64) ;; -sparc*-*) -- ENABLE_TRACEJIT=1 ++arm*-*) + 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 - - MOZ_ARG_DISABLE_BOOL(methodjit, -@@ -2693,7 +2688,7 @@ +@@ -2796,6 +2796,10 @@ i?86-*) AC_DEFINE(AVMPLUS_IA32) ;; --x86_64*-*) -+x86_64*-*|amd64*-*) ++amd64*-*) ++ AC_DEFINE(AVMPLUS_AMD64) ++ AC_DEFINE(AVMPLUS_64BIT) ++ ;; + x86_64*-*) AC_DEFINE(AVMPLUS_AMD64) AC_DEFINE(AVMPLUS_64BIT) - ;; - Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-jsnativestack.cpp ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-jsnativestack.cpp Fri Jul 22 19:38:45 2011 (r589) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/js/src/jsnativestack.cpp~ -+++ mozilla/js/src/jsnativestack.cpp -@@ -50,7 +50,8 @@ - #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX) - # include - --# if defined(__FreeBSD__) -+# if defined(FREEBSD) -+# include - # include - # endif Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-layout-generic-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-layout-generic-Makefile.in Tue Jul 19 17:43:13 2011 (r589) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-layout-generic-Makefile.in Fri Jul 22 19:38:45 2011 (r590) @@ -1,14 +1,15 @@ ---- mozilla/layout/generic/Makefile.in.orig 2011-05-28 15:25:03.000000000 +0200 -+++ mozilla/layout/generic/Makefile.in 2011-06-03 08:21:03.853676671 +0200 -@@ -160,9 +160,10 @@ +--- mozilla/layout/generic/Makefile.in.orig 2011-07-06 05:09:28.000000000 +0200 ++++ mozilla/layout/generic/Makefile.in 2011-07-06 21:49:25.105659269 +0200 +@@ -159,9 +159,10 @@ -I$(srcdir)/../../content/html/content/src \ -I$(srcdir)/../../dom/base \ - -I$(srcdir)/../../modules/plugin/base/src \ + -I$(srcdir)/../../dom/plugins/base \ - $(MOZ_CAIRO_CFLAGS) \ $(NULL) -+CXXFLAGS += $(MOZ_CAIRO_CFLAGS) ++ CXXFLAGS += $(MOZ_CAIRO_CFLAGS) + ifdef MOZ_ENABLE_GTK2 CXXFLAGS += $(MOZ_GTK2_CFLAGS) endif + Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c Fri Jul 22 19:38:45 2011 (r590) @@ -0,0 +1,43 @@ +--- mozilla/security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 23:13:08.000000000 +0100 ++++ mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 23:18:46.000000000 +0100 +@@ -733,6 +733,32 @@ + #endif + + #if defined(__ppc64__) ++#if defined(__FreeBSD__) ++#include ++#include ++ ++#include ++#include ++ ++unsigned long ++s_mpi_getProcessorLineSize() ++{ ++ static int cacheline_size = 0; ++ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; ++ int clen; ++ ++ if (cacheline_size > 0) ++ return cacheline_size; ++ ++ clen = sizeof(cacheline_size); ++ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), ++ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) ++ return 128; /* guess */ ++ ++ return cacheline_size; ++} ++#else /* __FreeBSD__ */ ++ + /* + * Sigh, The PPC has some really nice features to help us determine cache + * size, since it had lots of direct control functions to do so. The POWER +@@ -786,6 +812,7 @@ + return 0; + } + ++#endif /* __FreeBSD__ */ + #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 + #endif +