Date: Tue, 7 Jun 2011 21:05:21 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r554 - in branches/experimental/mail: thunderbird-beta thunderbird-beta/files thunderbird-devel Message-ID: <201106072105.p57L5Lra013187@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Tue Jun 7 21:05:21 2011 New Revision: 554 Log: - copy thunderbird-devel to thunderbird-beta - remove thunderbird-devel - update thunderbird-beta to 5.0b1 - sync patches with firefox A big thank you to cognet for helping me track down a problem i had been staring at for 2 days. Added: branches/experimental/mail/thunderbird-beta/ - copied from r553, branches/experimental/mail/thunderbird-devel/ branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util.h branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-build-build_config.h branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-library-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-nsprpub-pr-include-md_freebsd.cfg branches/experimental/mail/thunderbird-beta/files/patch-nsprpub-pr-include-md_freebsd.h Deleted: branches/experimental/mail/thunderbird-beta/files/patch-bugzilla-449453 branches/experimental/mail/thunderbird-beta/files/patch-mozilla-config-rules.mk branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-thebes-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-ycbcr-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-intl-uconv-src-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-build-autoconf-config.sub branches/experimental/mail/thunderbird-devel/ Modified: branches/experimental/mail/thunderbird-beta/Makefile branches/experimental/mail/thunderbird-beta/distinfo branches/experimental/mail/thunderbird-beta/files/patch-mozilla-config-mkdepend-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-config_autoconf.mk.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-configure.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-layout-generic-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-devel/Makefile Thu Jun 2 00:12:14 2011 (r553) +++ branches/experimental/mail/thunderbird-beta/Makefile Tue Jun 7 21:05:21 2011 (r554) @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -DISTVERSION= 3.3a3 +DISTVERSION= 5.0b1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -15,10 +15,11 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr +BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr +LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ + event-1.4:${PORTSDIR}/devel/libevent USE_AUTOTOOLS= autoconf213 -LATEST_LINK= thunderbird33 USE_GECKO= gecko CONFLICTS_INSTALL= thunderbird-3.0* thunderbird-3.1* USE_MOZILLA= -png -nss -dbm -jpeg -xft @@ -34,12 +35,13 @@ USE_GMAKE= yes USE_GL= gl -MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data +MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data,wyciwyg MOZ_GRAPHICS= default,-xbm MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-single-profile --disable-profilesharing \ --enable-application=mail --enable-official-branding \ - --disable-updater --disable-necko-wifi + --disable-updater --disable-necko-wifi \ + --with-system-libevent=${LOCALBASE} MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \ @@ -56,7 +58,7 @@ .include <bsd.port.pre.mk> -WRKSRC= ${WRKDIR}/comm-central +WRKSRC= ${WRKDIR}/comm-miramar MOZSRC:= ${WRKSRC}/mozilla GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} @@ -84,8 +86,12 @@ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop post-patch: + @${GREP} -Flr \"/proc ${MOZSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \ + -e 's|/proc/self/fd|/dev/fd|' \ + -e 's|/proc["/]|/compat/linux&|' ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ ${MOZSRC}/storage/build/Makefile.in \ + ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${MOZSRC}/security/manager/ssl/src/Makefile.in \ Modified: branches/experimental/mail/thunderbird-beta/distinfo ============================================================================== --- branches/experimental/mail/thunderbird-devel/distinfo Thu Jun 2 00:12:14 2011 (r553) +++ branches/experimental/mail/thunderbird-beta/distinfo Tue Jun 7 21:05:21 2011 (r554) @@ -1,2 +1,2 @@ -SHA256 (thunderbird-3.3a3.source.tar.bz2) = 7f5487449023a68784d800fdd38c25d30356972b27b0a23c2ba162c149161618 -SIZE (thunderbird-3.3a3.source.tar.bz2) = 83692340 +SHA256 (thunderbird-5.0b1.source.tar.bz2) = 5c45d276ec5c6df1e6cd1fad7fbb5a4fe2c930f085067383f99b053aca1640a7 +SIZE (thunderbird-5.0b1.source.tar.bz2) = 86519368 Deleted: branches/experimental/mail/thunderbird-devel/files/patch-bugzilla-449453 ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-bugzilla-449453 Tue Jun 7 21:05:21 2011 (r553) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,99 +0,0 @@ -Index: mozilla/directory/c-sdk/ldap/include/portable.h -=================================================================== -RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/include/portable.h,v -retrieving revision 5.15 -diff -u -8 -p -r5.15 portable.h ---- ldap/sdks/c-sdk/ldap/include/portable.h 3 Oct 2006 20:43:40 -0000 5.15 -+++ ldap/sdks/c-sdk/ldap/include/portable.h 6 Oct 2010 19:06:58 -0000 -@@ -117,17 +117,17 @@ - #else - #define OPENLOG_OPTIONS ( LOG_PID | LOG_NOWAIT ) - #endif - - /* - * some systems don't have the BSD re_comp and re_exec routines - */ - #ifndef NEED_BSDREGEX --#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) -+#if ( defined( SYSV ) || defined( NETBSD ) || defined( FREEBSD ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) - #define NEED_BSDREGEX - #endif - #endif - - /* - * many systems do not have the setpwfile() library routine... we just - * enable use for those systems we know have it. - */ -Index: mozilla/directory/c-sdk/ldap/include/regex.h -=================================================================== -RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/include/regex.h,v -retrieving revision 5.2 -diff -u -8 -p -r5.2 regex.h ---- ldap/sdks/c-sdk/ldap/include/regex.h 15 Oct 2003 17:26:00 -0000 5.2 -+++ ldap/sdks/c-sdk/ldap/include/regex.h 6 Oct 2010 19:06:59 -0000 -@@ -68,18 +68,18 @@ extern "C" { - #define LDAP_CALL - #endif - #endif - - #ifdef NEEDPROTOS - int re_init( void ); - void re_lock( void ); - int re_unlock( void ); --char * LDAP_CALL re_comp( char *pat ); --int LDAP_CALL re_exec( char *lp ); -+char * LDAP_CALL re_comp( const char *pat ); -+int LDAP_CALL re_exec( const char *lp ); - void LDAP_CALL re_modw( char *s ); - int LDAP_CALL re_subs( char *src, char *dst ); - #else /* NEEDPROTOS */ - int re_init(); - void re_lock(); - int re_unlock(); - char * LDAP_CALL re_comp(); - int LDAP_CALL re_exec(); -Index: mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c -=================================================================== -RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c,v -retrieving revision 5.2 -diff -u -8 -p -r5.2 regex.c ---- ldap/sdks/c-sdk/ldap/libraries/libldap/regex.c 15 Oct 2003 17:26:03 -0000 5.2 -+++ ldap/sdks/c-sdk/ldap/libraries/libldap/regex.c 6 Oct 2010 19:06:59 -0000 -@@ -262,17 +262,17 @@ chset(REGEXCHAR c) - bittab[((c) & (unsigned)BLKIND) >> 3] |= bitarr[(c) & BITIND]; - } - - #define badpat(x) (*nfa = END, x) - #define store(x) *mp++ = x - - char * - LDAP_CALL --re_comp( char *pat ) -+re_comp( const char *pat ) - { - register REGEXCHAR *p; /* pattern pointer */ - register REGEXCHAR *mp=nfa; /* nfa pointer */ - register REGEXCHAR *lp; /* saved pointer.. */ - register REGEXCHAR *sp=nfa; /* another one.. */ - - register int tagi = 0; /* tag stack index */ - register int tagc = 1; /* actual tag count */ -@@ -508,17 +508,17 @@ static REGEXCHAR *pmatch(); - * If a match is found, bopat[0] and eopat[0] are set - * to the beginning and the end of the matched fragment, - * respectively. - * - */ - - int - LDAP_CALL --re_exec( char *lp ) -+re_exec( const char *lp ) - { - register REGEXCHAR c; - register REGEXCHAR *ep = 0; - register REGEXCHAR *ap = nfa; - - bol = (REGEXCHAR*)lp; - - bopat[0] = 0; Added: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc Tue Jun 7 21:05:21 2011 (r554) @@ -0,0 +1,10 @@ +--- mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc~ ++++ mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc +@@ -39,6 +39,7 @@ + * ***** END LICENSE BLOCK ***** */ + + #include "base/atomicops.h" ++#include "base/lock.h" + + namespace base { + namespace subtle { Added: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util.h Tue Jun 7 21:05:21 2011 (r554) @@ -0,0 +1,13 @@ +--- mozilla/ipc/chromium/src/base/file_util.h~ ++++ mozilla/ipc/chromium/src/base/file_util.h +@@ -15,8 +15,9 @@ + #elif defined(ANDROID) + #include <sys/stat.h> + #elif defined(OS_POSIX) ++#include <sys/types.h> ++#include <sys/stat.h> + #include <fts.h> +-#include <sys/stat.h> + #endif + + #include <stdio.h> Added: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc Tue Jun 7 21:05:21 2011 (r554) @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/file_util_linux.cc~ ++++ mozilla/ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +28,7 @@ bool GetShmemTempDir(FilePath* path) { + #ifdef ANDROID + return GetTempDir(path); + #else +- *path = FilePath("/dev/shm"); ++ *path = FilePath("/tmp"); + return true; + #endif + } Added: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc Tue Jun 7 21:05:21 2011 (r554) @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/file_util_posix.cc~ ++++ mozilla/ipc/chromium/src/base/file_util_posix.cc +@@ -30,6 +30,8 @@ + #include "base/string_util.h" + #include "base/time.h" + ++#define stat64 stat ++ + namespace file_util { + + #if defined(GOOGLE_CHROME_BUILD) Added: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc Tue Jun 7 21:05:21 2011 (r554) @@ -0,0 +1,10 @@ +--- mozilla/ipc/chromium/src/base/platform_file_posix.cc~ ++++ mozilla/ipc/chromium/src/base/platform_file_posix.cc +@@ -9,6 +9,7 @@ + #ifdef ANDROID + #include <linux/stat.h> + #endif ++#include <sys/stat.h> + + #include "base/logging.h" + #include "base/string_util.h" Added: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc Tue Jun 7 21:05:21 2011 (r554) @@ -0,0 +1,12 @@ +--- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2011-04-27 09:34:28.000000000 +0200 ++++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc 2011-04-27 19:47:36.344446266 +0200 +@@ -34,7 +33,8 @@ + #if defined(OS_MACOSX) + return mach_thread_self(); + #elif defined(OS_LINUX) +- return syscall(__NR_gettid); ++ // TODO(BSD): find a better thread ID ++ return reinterpret_cast<int64>(pthread_self()); + #endif + } + Added: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h Tue Jun 7 21:05:21 2011 (r554) @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h~ ++++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h +@@ -34,7 +34,7 @@ + #include "base/third_party/nspr/prcpucfg_win.h" + #elif defined(__APPLE__) + #include "base/third_party/nspr/prcpucfg_mac.h" +-#elif defined(__linux__) || defined(ANDROID) ++#elif defined(__FreeBSD__) || defined(ANDROID) + #include "base/third_party/nspr/prcpucfg_linux.h" + #else + #error Provide a prcpucfg.h appropriate for your platform Added: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-build-build_config.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-build-build_config.h Tue Jun 7 21:05:21 2011 (r554) @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/build/build_config.h~ ++++ mozilla/ipc/chromium/src/build/build_config.h +@@ -17,7 +17,7 @@ + // A set of macros to use for platform detection. + #if defined(__APPLE__) + #define OS_MACOSX 1 +-#elif defined(__linux__) || defined(ANDROID) ++#elif defined(__FreeBSD__) || defined(ANDROID) + #define OS_LINUX 1 + #elif defined(_WIN32) + #define OS_WIN 1 Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-config-mkdepend-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-mozilla-config-mkdepend-Makefile.in Thu Jun 2 00:12:14 2011 (r553) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-config-mkdepend-Makefile.in Tue Jun 7 21:05:21 2011 (r554) @@ -4,7 +4,7 @@ include $(topsrcdir)/config/rules.mk HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include ++HOST_CFLAGS += $(XCFLAGS) ifdef GNU_CC _GCCDIR = $(shell $(CC) -print-file-name=include) Deleted: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-config-rules.mk ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-mozilla-config-rules.mk Tue Jun 7 21:05:21 2011 (r553) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- mozilla/config/rules.mk.orig Thu Sep 14 14:07:03 2006 -+++ mozilla/config/rules.mk Wed Oct 18 11:00:09 2006 -@@ -442,9 +442,7 @@ - endif - - ifeq ($(OS_ARCH),FreeBSD) --ifdef IS_COMPONENT --EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic --endif -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc - endif - - ifeq ($(OS_ARCH),NetBSD) Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-config_autoconf.mk.in ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-mozilla-config_autoconf.mk.in Thu Jun 2 00:12:14 2011 (r553) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-config_autoconf.mk.in Tue Jun 7 21:05:21 2011 (r554) @@ -19,3 +19,13 @@ DIST = $(DEPTH)/dist LIBXUL_SDK = @LIBXUL_SDK@ +@@ -275,7 +275,7 @@ + OS_CPPFLAGS = @CPPFLAGS@ + OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ + OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ +-OS_LDFLAGS = @LDFLAGS@ ++OS_LDFLAGS = @LDFLAGS@ -lc + + OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ + OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ + Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-configure.in ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-mozilla-configure.in Thu Jun 2 00:12:14 2011 (r553) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-configure.in Tue Jun 7 21:05:21 2011 (r554) @@ -1,6 +1,6 @@ ---- mozilla/configure.in.orig 2011-03-14 14:57:11.000000000 +0100 -+++ mozilla/configure.in 2011-04-22 12:53:44.608444324 +0200 -@@ -1545,7 +1545,7 @@ +--- mozilla/configure.in.orig 2010-11-04 21:05:18.000000000 +0100 ++++ mozilla/configure.in 2010-11-09 12:59:28.000000000 +0100 +@@ -1549,7 +1549,7 @@ CPU_ARCH=sparc ;; @@ -9,7 +9,52 @@ CPU_ARCH="$OS_TEST" ;; -@@ -6167,6 +6167,14 @@ +@@ -1567,7 +1567,7 @@ dnl Set INTEL_ARCHITECTURE if we're comp + dnl =============================================================== + INTEL_ARCHITECTURE= + case "$OS_TEST" in +- x86_64|i?86) ++ amd64|x86_64|i?86) + INTEL_ARCHITECTURE=1 + esac + +@@ -3803,19 +3803,21 @@ + AC_CHECK_FUNCS(localtime_r strtok_r) + + dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt +-_SAVE_LDFLAGS=$LDFLAGS +-LDFLAGS="$LDFLAGS -lrt" +-AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, ++_SAVE_LIBS=$LIBS ++AC_SEARCH_LIBS(clock_gettime, rt) ++AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), + ac_cv_have_clock_monotonic, + [AC_TRY_LINK([#include <time.h>], + [ struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); ], + ac_cv_have_clock_monotonic=yes, + ac_cv_have_clock_monotonic=no)]) +-LDFLAGS=$_SAVE_LDFLAGS ++LIBS=$_SAVE_LIBS + if test "$ac_cv_have_clock_monotonic" = "yes"; then + HAVE_CLOCK_MONOTONIC=1 +- REALTIME_LIBS=-lrt ++ if test "$ac_cv_search_clock_gettime" != "none required"; then ++ REALTIME_LIBS=$ac_cv_search_clock_gettime ++ fi + AC_DEFINE(HAVE_CLOCK_MONOTONIC) + AC_SUBST(HAVE_CLOCK_MONOTONIC) + AC_SUBST(REALTIME_LIBS) +@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + +-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then ++if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then + ZLIB_CFLAGS="-I${ZLIB_DIR}/include" + ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" + fi +@@ -6022,6 +6024,14 @@ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" VPX_X86_ASM=1 ;; Deleted: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-thebes-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-thebes-Makefile.in Tue Jun 7 21:05:21 2011 (r553) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- mozilla/gfx/thebes/Makefile.in.orig 2011-01-16 00:34:11.000000000 +0100 -+++ mozilla/gfx/thebes/Makefile.in 2011-01-16 00:35:50.000000000 +0100 -@@ -212,6 +212,11 @@ - - endif - -+ifeq ($(OS_TEST),amd64) -+ CPPSRCS += gfxAlphaRecoverySSE2.cpp -+ SSE2_FLAGS=-msse2 -+endif -+ - ifdef MOZ_IPC - CPPSRCS += \ - gfxSharedImageSurface.cpp \ Deleted: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp Tue Jun 7 21:05:21 2011 (r553) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,36 +0,0 @@ -diff --git a/gfx/thebes/gfxTeeSurface.cpp b/gfx/thebes/gfxTeeSurface.cpp ---- mozilla/gfx/thebes/gfxTeeSurface.cpp -+++ mozilla/gfx/thebes/gfxTeeSurface.cpp -@@ -47,4 +47,5 @@ gfxTeeSurface::gfxTeeSurface(cairo_surfa - gfxTeeSurface::gfxTeeSurface(gfxASurface **aSurfaces, PRInt32 aSurfaceCount) - { -+#ifdef MOZ_TREE_CAIRO - NS_ASSERTION(aSurfaceCount > 0, "Must have a least one surface"); - cairo_surface_t *csurf = cairo_tee_surface_create(aSurfaces[0]->CairoSurface()); -@@ -54,4 +55,5 @@ gfxTeeSurface::gfxTeeSurface(gfxASurface - cairo_tee_surface_add(csurf, aSurfaces[i]->CairoSurface()); - } -+#endif - } - -@@ -59,6 +61,8 @@ const gfxIntSize - gfxTeeSurface::GetSize() const - { -+#ifdef MOZ_TREE_CAIRO - nsRefPtr<gfxASurface> master = Wrap(cairo_tee_surface_index(mSurface, 0)); - return master->GetSize(); -+#endif - } - -@@ -66,4 +70,5 @@ void - gfxTeeSurface::GetSurfaces(nsTArray<nsRefPtr<gfxASurface> >* aSurfaces) - { -+#ifdef MOZ_TREE_CAIRO - for (PRInt32 i = 0; ; ++i) { - cairo_surface_t *csurf = cairo_tee_surface_index(mSurface, i); -@@ -75,3 +80,4 @@ gfxTeeSurface::GetSurfaces(nsTArray<nsRe - *elem = Wrap(csurf); - } -+#endif - } - Deleted: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-ycbcr-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-mozilla-gfx-ycbcr-Makefile.in Tue Jun 7 21:05:21 2011 (r553) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- mozilla/gfx/ycbcr/Makefile.in.orig 2011-01-17 12:02:28.000000000 +0100 -+++ mozilla/gfx/ycbcr/Makefile.in 2011-01-17 12:06:41.000000000 +0100 -@@ -41,6 +41,11 @@ - - endif - -+ifeq ($(OS_TEST),amd64) -+ CPPSRCS += yuv_convert_mmx.cpp \ -+ yuv_convert_sse2.cpp -+ SSE2_FLAGS=-msse2 -+endif - - ifdef _MSC_VER - CPPSRCS += yuv_row_win.cpp \ Deleted: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-intl-uconv-src-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-mozilla-intl-uconv-src-Makefile.in Tue Jun 7 21:05:21 2011 (r553) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- mozilla/intl/uconv/src/Makefile.in.orig 2011-01-17 12:42:48.000000000 +0100 -+++ mozilla/intl/uconv/src/Makefile.in 2011-01-17 12:43:59.000000000 +0100 -@@ -93,6 +93,11 @@ - endif - endif - -+ifeq ($(OS_TEST),amd64) -+ CPPSRCS += nsUTF8ToUnicodeSSE2.cpp -+ SSE2_FLAGS=-msse2 -+endif -+ - ifeq ($(MOZ_WIDGET_TOOLKIT),os2) - CPPSRCS += nsOS2Charset.cpp - else Deleted: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-build-autoconf-config.sub ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-build-autoconf-config.sub Tue Jun 7 21:05:21 2011 (r553) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- mozilla/js/src/build/autoconf/config.sub.orig 2010-01-08 09:52:25.000000000 +0100 -+++ mozilla/js/src/build/autoconf/config.sub 2010-01-08 09:52:33.000000000 +0100 -@@ -403,9 +403,6 @@ - amd64) - basic_machine=x86_64-pc - ;; -- amd64-*) -- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; - amdahl) - basic_machine=580-amdahl - os=-sysv Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-layout-generic-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-mozilla-layout-generic-Makefile.in Thu Jun 2 00:12:14 2011 (r553) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-layout-generic-Makefile.in Tue Jun 7 21:05:21 2011 (r554) @@ -1,9 +1,9 @@ ---- mozilla/layout/generic/Makefile.in.orig 2010-01-20 18:57:00.000000000 +0100 -+++ mozilla/layout/generic/Makefile.in 2010-01-20 18:57:48.000000000 +0100 -@@ -191,9 +191,10 @@ - -I$(srcdir)/../../content/base/src \ +--- 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 @@ -I$(srcdir)/../../content/html/content/src \ -I$(srcdir)/../../dom/base \ + -I$(srcdir)/../../modules/plugin/base/src \ - $(MOZ_CAIRO_CFLAGS) \ $(NULL) Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-mozilla-security-coreconf-FreeBSD.mk Thu Jun 2 00:12:14 2011 (r553) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-security-coreconf-FreeBSD.mk Tue Jun 7 21:05:21 2011 (r554) @@ -1,22 +1,29 @@ ---- mozilla/security/coreconf/FreeBSD.mk.orig 2010-04-30 19:44:32.000000000 +0000 -+++ mozilla/security/coreconf/FreeBSD.mk 2010-05-10 13:04:45.000000000 +0000 -@@ -52,6 +52,15 @@ - ifeq ($(CPU_ARCH),amd64) - CPU_ARCH = x86_64 +--- mozilla/security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 ++++ mozilla/security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 +@@ -49,8 +49,20 @@ + ifeq ($(CPU_ARCH),pc98) + CPU_ARCH = x86 endif +-ifeq ($(CPU_ARCH),amd64) +-CPU_ARCH = x86_64 ++ifeq ($(OS_TEST),alpha) ++CPU_ARCH = alpha ++endif +ifeq ($(OS_TEST),amd64) +CPU_ARCH = amd64 +endif ++ifeq ($(OS_TEST),ia64) ++CPU_ARCH = ia64 ++endif +ifeq ($(OS_TEST),powerpc) +CPU_ARCH = powerpc +endif +ifeq ($(OS_TEST),sparc64) +CPU_ARCH = sparc64 -+endif + endif OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -78,7 +87,7 @@ +@@ -78,7 +90,7 @@ DLL_SUFFIX = so.1.0 endif @@ -25,7 +32,7 @@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif -@@ -87,4 +96,4 @@ +@@ -87,4 +99,4 @@ G++INCLUDES = -I/usr/include/g++ Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-library-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-library-Makefile.in Tue Jun 7 21:05:21 2011 (r554) @@ -0,0 +1,12 @@ +--- mozilla/toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500 ++++ mozilla/toolkit/library/Makefile.in 2010-01-11 12:15:05.000000000 -0500 +@@ -181,7 +181,7 @@ + export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS) + $(INSTALL) $^ . + +-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) ++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% + + ifdef MOZ_ENABLE_LIBXUL + include $(srcdir)/libxul-rules.mk + Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Thu Jun 2 00:12:14 2011 (r553) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Tue Jun 7 21:05:21 2011 (r554) @@ -1,16 +1,16 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2009-03-05 22:32:55.000000000 +0100 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2009-04-21 14:15:46.135700268 +0200 -@@ -70,6 +70,9 @@ - ifeq (Darwin,$(OS_ARCH)) - DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-05-28 15:26:21.000000000 +0200 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-06-03 18:39:42.769434047 +0200 +@@ -74,6 +74,9 @@ + # NOTE: MODULE_OPTIMIZE_FLAGS must be set before including config.mk + MODULE_OPTIMIZE_FLAGS=-O3 endif +ifeq (x86_64,$(OS_TEST)) +CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp +endif endif endif - # -@@ -87,7 +90,7 @@ + +@@ -117,7 +120,7 @@ endif endif # IA64 Linux @@ -19,20 +19,20 @@ ifneq (,$(findstring ia64,$(OS_TEST))) CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -100,6 +103,12 @@ +@@ -129,6 +132,12 @@ + ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64) CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp endif - # +# FreeBSD/amd64 +# +ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) +CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp +endif +# - # BeOS/Intel (uses the same unixish_x86 code) # - ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC) -@@ -150,9 +159,15 @@ + # Neutrino/Intel (uses the same unixish_x86 code) + # +@@ -184,9 +193,15 @@ ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s endif # @@ -49,7 +49,7 @@ CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp endif # -@@ -307,7 +322,7 @@ +@@ -341,7 +356,7 @@ # # Linux/PPC # @@ -58,7 +58,7 @@ CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s AS := $(CC) -c -x assembler-with-cpp -@@ -385,6 +400,15 @@ +@@ -419,6 +434,15 @@ ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s endif # Added: branches/experimental/mail/thunderbird-beta/files/patch-nsprpub-pr-include-md_freebsd.cfg ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-nsprpub-pr-include-md_freebsd.cfg Tue Jun 7 21:05:21 2011 (r554) @@ -0,0 +1,100 @@ +--- mozilla/nsprpub/pr/include/md/_freebsd.cfg.orig 2010-12-23 17:34:06.000000000 +0100 ++++ mozilla/nsprpub/pr/include/md/_freebsd.cfg 2010-12-23 17:34:44.000000000 +0100 +@@ -283,6 +283,97 @@ + #define PR_ALIGN_OF_POINTER 8 + #define PR_ALIGN_OF_WORD 8 + ++#elif defined(__powerpc64__) ++ ++#undef IS_LITTLE_ENDIAN ++#define IS_BIG_ENDIAN 1 ++#define IS_64 ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 8 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 8 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 64 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 64 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 6 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 6 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 8 ++#define PR_ALIGN_OF_INT64 8 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 8 ++#define PR_ALIGN_OF_POINTER 8 ++#define PR_ALIGN_OF_WORD 8 ++ ++#define PR_BYTES_PER_WORD_LOG2 3 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ ++#elif defined(__powerpc__) ++ ++#undef IS_LITTLE_ENDIAN ++#define IS_BIG_ENDIAN 1 ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 4 ++#define PR_ALIGN_OF_INT64 8 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 8 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD 4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ + #else + + #error "Unknown CPU architecture" Added: branches/experimental/mail/thunderbird-beta/files/patch-nsprpub-pr-include-md_freebsd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-nsprpub-pr-include-md_freebsd.h Tue Jun 7 21:05:21 2011 (r554) @@ -0,0 +1,30 @@ +--- mozilla/nsprpub/pr/include/md/_freebsd.h.orig 2010-12-23 17:34:13.000000000 +0100 ++++ mozilla/nsprpub/pr/include/md/_freebsd.h 2010-12-23 17:34:46.000000000 +0100 +@@ -57,6 +57,10 @@ + #define _PR_SI_ARCHITECTURE "ia64" + #elif defined(__amd64__) + #define _PR_SI_ARCHITECTURE "amd64" ++#elif defined(__powerpc64__) ++#define _PR_SI_ARCHITECTURE "powerpc64" ++#elif defined(__powerpc__) ++#define _PR_SI_ARCHITECTURE "powerpc" + #else + #error "Unknown CPU architecture" + #endif +@@ -106,6 +110,16 @@ + #define _PR_IPV6_V6ONLY_PROBE + #endif + ++#if (__FreeBSD_version >= 700016) || (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103) ++#if defined(_PR_PTHREADS) ++#define _PR_HAVE_GETPROTO_R ++#define _PR_HAVE_5_ARG_GETPROTO_R ++#define _PR_HAVE_GETHOST_R ++#define _PR_HAVE_GETHOST_R_INT ++#define _PR_HAVE_THREADSAFE_GETHOST ++#endif ++#endif ++ + #define USE_SETJMP + + #ifndef _PR_PTHREADS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106072105.p57L5Lra013187>