From owner-freebsd-gecko@FreeBSD.ORG Mon Aug 1 11:07:27 2011 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E43671065679 for ; Mon, 1 Aug 2011 11:07:27 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 48C268FC26 for ; Mon, 1 Aug 2011 11:07:27 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p71B7RAD014838 for ; Mon, 1 Aug 2011 11:07:27 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p71B7QML014836 for gecko@FreeBSD.org; Mon, 1 Aug 2011 11:07:26 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 1 Aug 2011 11:07:26 GMT Message-Id: <201108011107.p71B7QML014836@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: gecko@FreeBSD.org Cc: Subject: Current problem reports assigned to gecko@FreeBSD.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2011 11:07:28 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/159093 gecko www/seamonkey2 installation failure o ports/158702 gecko [patch] www/firefox-devel: prune -DFREEBSD cruft in js o ports/158348 gecko mail/thunderbird build error o ports/156889 gecko www/firefox36: firefox 3.6.17 eats cpu on current/x64 o ports/156813 gecko [PATCH] deskutils/lightning-thunderbird: Patch to requ o ports/156777 gecko www/firefox and mail/thunderbird menus show corrupt da o ports/156335 gecko www/firefox: Repeatable firefox-4.0_1,1 crash f ports/155949 gecko www/firefox: firefox 4, WITH_PGO, better Text against o ports/155291 gecko reinstalling www/firefox removes www/firefox-sync o ports/153114 gecko www/firefox 3.6.12_1,1 crash: Assertion failure: prop o ports/150631 gecko www/firefox 3.6.9 does not build if you have previousl o ports/146231 gecko [feature request] [patch] www/firefox: use port libs o ports/144044 gecko [PATCH] www/firefox: Makefile.webplugins target order 13 problems total. From owner-freebsd-gecko@FreeBSD.ORG Tue Aug 2 08:28:43 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 392641065672 for ; Tue, 2 Aug 2011 08:28:43 +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 B6C6F8FC14 for ; Tue, 2 Aug 2011 08:28:42 +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 p728SfM6080142 for ; Tue, 2 Aug 2011 08:28:41 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p728SaSk079693 for freebsd-gecko@freebsd.org; Tue, 2 Aug 2011 08:28:36 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 2 Aug 2011 08:28:36 GMT Message-Id: <201108020828.p728SaSk079693@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] r602 - branches/experimental/www/firefox-beta 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: Tue, 02 Aug 2011 08:28:43 -0000 Author: flo Date: Tue Aug 2 08:28:35 2011 New Revision: 602 Log: update to firefox 6 beta 4 Modified: branches/experimental/www/firefox-beta/Makefile branches/experimental/www/firefox-beta/distinfo Modified: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Fri Jul 29 22:37:55 2011 (r601) +++ branches/experimental/www/firefox-beta/Makefile Tue Aug 2 08:28:35 2011 (r602) @@ -6,7 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 6.0b3 +DISTVERSION= 6.0b4 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} Modified: branches/experimental/www/firefox-beta/distinfo ============================================================================== --- branches/experimental/www/firefox-beta/distinfo Fri Jul 29 22:37:55 2011 (r601) +++ branches/experimental/www/firefox-beta/distinfo Tue Aug 2 08:28:35 2011 (r602) @@ -1,2 +1,2 @@ -SHA256 (firefox-6.0b3.source.tar.bz2) = 83d5c4476669277d7c539708c0a65ee748dde279eeab73b6313782ed5785fe8b -SIZE (firefox-6.0b3.source.tar.bz2) = 67696473 +SHA256 (firefox-6.0b4.source.tar.bz2) = 6782d6a6e160dde291c61e51ea79d6bc3c888cf4af392f3f5e99bc5fbb3f24c8 +SIZE (firefox-6.0b4.source.tar.bz2) = 67698779 From owner-freebsd-gecko@FreeBSD.ORG Wed Aug 3 20:51:57 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 19EDF1065673 for ; Wed, 3 Aug 2011 20:51:57 +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 8D1938FC18 for ; Wed, 3 Aug 2011 20:51:56 +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 p73KpsTj045797 for ; Wed, 3 Aug 2011 20:51:54 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p73Kpnwq045326 for freebsd-gecko@freebsd.org; Wed, 3 Aug 2011 20:51:49 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 3 Aug 2011 20:51:49 GMT Message-Id: <201108032051.p73Kpnwq045326@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] r603 - 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: Wed, 03 Aug 2011 20:51:57 -0000 Author: flo Date: Wed Aug 3 20:51:49 2011 New Revision: 603 Log: update to 6b2 patch-calendar-base-src-calDateTime.cpp is needed as a UTF-8 sourcefile snuck into the source, it's fixed in latest comm-central and should be fixed in the next beta Added: branches/experimental/mail/thunderbird-beta/files/patch-calendar-base-src-calDateTime.cpp Modified: branches/experimental/mail/thunderbird-beta/Makefile branches/experimental/mail/thunderbird-beta/distinfo Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Tue Aug 2 08:28:35 2011 (r602) +++ branches/experimental/mail/thunderbird-beta/Makefile Wed Aug 3 20:51:49 2011 (r603) @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -DISTVERSION= 6.0b1 +DISTVERSION= 6.0b2 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source Modified: branches/experimental/mail/thunderbird-beta/distinfo ============================================================================== --- branches/experimental/mail/thunderbird-beta/distinfo Tue Aug 2 08:28:35 2011 (r602) +++ branches/experimental/mail/thunderbird-beta/distinfo Wed Aug 3 20:51:49 2011 (r603) @@ -1,2 +1,2 @@ -SHA256 (thunderbird-6.0b1.source.tar.bz2) = 0110c6901ee4be743c8cd1733ae825b849cc4e50fe2fb014e149d1a8c4db459f -SIZE (thunderbird-6.0b1.source.tar.bz2) = 86056605 +SHA256 (thunderbird-6.0b2.source.tar.bz2) = 6f840530cff24a615b9da7d345195ab976bbf38a5eb94777fe3766c2a55ae481 +SIZE (thunderbird-6.0b2.source.tar.bz2) = 86118617 Added: branches/experimental/mail/thunderbird-beta/files/patch-calendar-base-src-calDateTime.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-calendar-base-src-calDateTime.cpp Wed Aug 3 20:51:49 2011 (r603) @@ -0,0 +1,8 @@ +--- calendar/base/src/calDateTime.cpp.orig 2011-08-03 20:08:23.361859978 +0200 ++++ calendar/base/src/calDateTime.cpp 2011-08-03 20:08:32.351860948 +0200 +@@ -1,4 +1,4 @@ +-/* ***** BEGIN LICENSE BLOCK ***** ++/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version From owner-freebsd-gecko@FreeBSD.ORG Wed Aug 3 20:53:23 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 A0CBD106564A for ; Wed, 3 Aug 2011 20:53:23 +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 D977E8FC15 for ; Wed, 3 Aug 2011 20:53:22 +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 p73KrLDx052352 for ; Wed, 3 Aug 2011 20:53:21 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p73KrGe8047191 for freebsd-gecko@freebsd.org; Wed, 3 Aug 2011 20:53:16 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 3 Aug 2011 20:53:16 GMT Message-Id: <201108032053.p73KrGe8047191@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] r604 - in branches/experimental/www/seamonkey-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: Wed, 03 Aug 2011 20:53:23 -0000 Author: flo Date: Wed Aug 3 20:53:16 2011 New Revision: 604 Log: add seamonkey-beta Added: branches/experimental/www/seamonkey-beta/ - copied from r588, branches/experimental/www/seamonkey/ branches/experimental/www/seamonkey-beta/files/patch-calendar-base-src-calDateTime.cpp branches/experimental/www/seamonkey-beta/files/patch-configure.in - copied, changed from r600, branches/experimental/www/seamonkey/files/patch-configure.in branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util.h - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util.h branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_posix.cc branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_file_posix.cc branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_thread_posix.cc branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-build-build_config.h - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-build-build_config.h branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure.in - copied unchanged from r600, branches/experimental/www/seamonkey/files/patch-mozilla-configure.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-qcms-Makefile.in - copied unchanged from r600, branches/experimental/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.c - copied unchanged from r600, branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.h - copied unchanged from r600, branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h branches/experimental/www/seamonkey-beta/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-library-Makefile.in - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in branches/experimental/www/seamonkey-beta/files/pkg-message.in - copied unchanged from r593, branches/experimental/www/seamonkey/files/pkg-message.in Replaced: branches/experimental/www/seamonkey-beta/Makefile - copied, changed from r601, branches/experimental/www/seamonkey/Makefile branches/experimental/www/seamonkey-beta/distinfo - copied, changed from r593, branches/experimental/www/seamonkey/distinfo branches/experimental/www/seamonkey-beta/files/mozconfig-generic.in - copied unchanged from r599, branches/experimental/www/seamonkey/files/mozconfig-generic.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in - copied unchanged from r593, branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Deleted: branches/experimental/www/seamonkey-beta/files/patch-bugzilla-449453 branches/experimental/www/seamonkey-beta/files/patch-configure branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure branches/experimental/www/seamonkey-beta/files/patch-sysnss branches/experimental/www/seamonkey-beta/files/patch-xptcall-alpha Modified: branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in Copied and modified: branches/experimental/www/seamonkey-beta/Makefile (from r601, branches/experimental/www/seamonkey/Makefile) ============================================================================== --- branches/experimental/www/seamonkey/Makefile Fri Jul 29 22:37:55 2011 (r601, copy source) +++ branches/experimental/www/seamonkey-beta/Makefile Wed Aug 3 20:53:16 2011 (r604) @@ -6,7 +6,7 @@ # PORTNAME= seamonkey -DISTVERSION= 2.2 +DISTVERSION= 2.3b2 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -68,8 +68,8 @@ .include -MOZSRC:= ${WRKDIR}/comm-release/mozilla -WRKSRC= ${WRKDIR}/comm-release +MOZSRC:= ${WRKDIR}/comm-beta/mozilla +WRKSRC= ${WRKDIR}/comm-beta GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} Copied and modified: branches/experimental/www/seamonkey-beta/distinfo (from r593, branches/experimental/www/seamonkey/distinfo) ============================================================================== --- branches/experimental/www/seamonkey/distinfo Sat Jul 23 00:58:09 2011 (r593, copy source) +++ branches/experimental/www/seamonkey-beta/distinfo Wed Aug 3 20:53:16 2011 (r604) @@ -1,2 +1,2 @@ -SHA256 (seamonkey-2.2.source.tar.bz2) = 0b713e2f78a2c5139bf16736bd12e87017cdbc675948d4a8893a3d834bf8c13a -SIZE (seamonkey-2.2.source.tar.bz2) = 87478968 +SHA256 (seamonkey-2.3b2.source.tar.bz2) = 0fb5d5de891397493e67b48089c6f8e47f4f2c9f5f750c24c7225fabf2e3b450 +SIZE (seamonkey-2.3b2.source.tar.bz2) = 86804711 Copied: branches/experimental/www/seamonkey-beta/files/mozconfig-generic.in (from r599, branches/experimental/www/seamonkey/files/mozconfig-generic.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/mozconfig-generic.in Wed Aug 3 20:53:16 2011 (r604, copy of r599, branches/experimental/www/seamonkey/files/mozconfig-generic.in) @@ -0,0 +1,8 @@ +ac_add_options --prefix=@FAKEDIR@ +export CPPFLAGS="@CPPFLAGS@" +export CFLAGS="@CFLAGS@" +export LIBS="@LIBS@" +export LDFLAGS="@LDFLAGS@" +export CONFIG_SH=/bin/sh +export XP_UNIX=1 +export PERL="@PERL@" Deleted: branches/experimental/www/seamonkey/files/patch-bugzilla-449453 ============================================================================== --- branches/experimental/www/seamonkey/files/patch-bugzilla-449453 Wed Aug 3 20:53:16 2011 (r588) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,99 +0,0 @@ -Index: ldap/sdks/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: ldap/sdks/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: ldap/sdks/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/www/seamonkey-beta/files/patch-calendar-base-src-calDateTime.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-calendar-base-src-calDateTime.cpp Wed Aug 3 20:53:16 2011 (r604) @@ -0,0 +1,8 @@ +--- calendar/base/src/calDateTime.cpp.orig 2011-08-03 20:08:23.361859978 +0200 ++++ calendar/base/src/calDateTime.cpp 2011-08-03 20:08:32.351860948 +0200 +@@ -1,4 +1,4 @@ +-/* ***** BEGIN LICENSE BLOCK ***** ++/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version Deleted: branches/experimental/www/seamonkey/files/patch-configure ============================================================================== --- branches/experimental/www/seamonkey/files/patch-configure Wed Aug 3 20:53:16 2011 (r588) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,47 +0,0 @@ ---- configure.orig 2010-05-11 17:47:16.000000000 +0000 -+++ configure 2010-05-11 17:51:00.000000000 +0000 -@@ -5956,7 +5956,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -10972,7 +10972,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -11013,7 +11013,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi Copied and modified: branches/experimental/www/seamonkey-beta/files/patch-configure.in (from r600, branches/experimental/www/seamonkey/files/patch-configure.in) ============================================================================== --- branches/experimental/www/seamonkey/files/patch-configure.in Fri Jul 29 22:32:35 2011 (r600, copy source) +++ branches/experimental/www/seamonkey-beta/files/patch-configure.in Wed Aug 3 20:53:16 2011 (r604) @@ -1,5 +1,5 @@ ---- configure.in.orig 2011-07-28 00:58:59.534861026 +0200 -+++ configure.in 2011-07-28 01:00:05.591863508 +0200 +--- 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 ;; @@ -18,3 +18,104 @@ INTEL_ARCHITECTURE=1 esac +@@ -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 + +-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 +@@ -5966,7 +5969,7 @@ + i*86) + MOZ_CRT_CPU_ARCH=intel + ;; +- x86_64) ++ amd64 | x86_64) + MOZ_CRT_CPU_ARCH=amd64 + ;; + *) Copied: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc (from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc) @@ -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 { Copied: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util.h (from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util.h Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util.h) @@ -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 + #elif defined(OS_POSIX) ++#include ++#include + #include +-#include + #endif + + #include Copied: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc (from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc) @@ -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 + } Copied: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc (from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_posix.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_posix.cc Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_posix.cc) @@ -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) Copied: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc (from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_file_posix.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_file_posix.cc Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_file_posix.cc) @@ -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 + #endif ++#include + + #include "base/logging.h" + #include "base/string_util.h" Copied: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc (from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_thread_posix.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-platform_thread_posix.cc Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-platform_thread_posix.cc) @@ -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(pthread_self()); + #endif + } + Copied: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h (from r593, branches/experimental/www/seamonkey/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/www/seamonkey-beta/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h) @@ -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 Copied: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-build-build_config.h (from r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-build-build_config.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-build-build_config.h Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-build-build_config.h) @@ -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 Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-configure ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-configure Wed Aug 3 20:53:16 2011 (r588) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/configure.orig 2010-01-08 09:53:05.000000000 +0100 -+++ mozilla/configure 2010-01-08 09:53:34.000000000 +0100 -@@ -5502,7 +5502,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - esac Copied: branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure.in (from r600, branches/experimental/www/seamonkey/files/patch-mozilla-configure.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure.in Wed Aug 3 20:53:16 2011 (r604, copy of r600, branches/experimental/www/seamonkey/files/patch-mozilla-configure.in) @@ -0,0 +1,86 @@ +--- 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 + ;; + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" + ;; + +@@ -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 ], + [ 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 + ;; ++ FreeBSD:i386) ++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm" ++ VPX_X86_ASM=1 ++ ;; ++ FreeBSD:amd64) ++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" ++ VPX_X86_ASM=1 ++ ;; + SunOS:x86) + VPX_ASFLAGS="-f elf32 -rnasm -pnasm" + VPX_X86_ASM=1 +@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then + LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" + LIBJPEG_TURBO_X64_ASM=1 + ;; ++ FreeBSD:i386) ++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" ++ LIBJPEG_TURBO_X86_ASM=1 ++ ;; ++ FreeBSD:amd64) ++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" ++ LIBJPEG_TURBO_X64_ASM=1 ++ ;; + SunOS:i?86) + LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" + LIBJPEG_TURBO_X86_ASM=1 Copied: branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-qcms-Makefile.in (from r600, branches/experimental/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-qcms-Makefile.in Wed Aug 3 20:53:16 2011 (r604, copy of r600, branches/experimental/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in) @@ -0,0 +1,11 @@ +--- mozilla/gfx/qcms/Makefile.in.orig 2011-01-22 01:25:38.000000000 +0100 ++++ mozilla/gfx/qcms/Makefile.in 2011-01-27 18:16:39.000000000 +0100 +@@ -15,7 +15,7 @@ + + CSRCS = iccread.c transform.c + +-ifeq (86,$(findstring 86,$(OS_TEST))) ++ifneq (,$(INTEL_ARCHITECTURE)) + CSRCS += transform-sse2.c + ifdef _MSC_VER + ifneq ($(OS_ARCH)_$(OS_TEST),WINNT_x86_64) Modified: branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-js-src-Makefile.in Mon Jul 11 10:15:50 2011 (r588) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in Wed Aug 3 20:53:16 2011 (r604) @@ -1,10 +1,41 @@ ---- mozilla/js/src/Makefile.in.orig 2009-08-25 18:58:30.000000000 +0200 -+++ mozilla/js/src/Makefile.in 2009-08-25 18:58:47.000000000 +0200 -@@ -428,6 +428,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. +-DEFINES += -D__STDC_LIMIT_MACROS ++DEFINES += -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS + + INCLUDES += -I$(srcdir) + +@@ -793,7 +796,8 @@ + endif # WINNT ifeq ($(OS_ARCH),FreeBSD) - EXTRA_LIBS += -pthread -+LDFLAGS += -lc +-EXTRA_LIBS += -pthread ++DEFINES += -DFREEBSD ++EXTRA_LIBS += -pthread -lc endif ifeq ($(OS_ARCH),IRIX) ifdef USE_N32 + Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure Wed Aug 3 20:53:16 2011 (r588) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,26 +0,0 @@ ---- mozilla/js/src/configure.orig 2010-10-08 21:56:36.000000000 +0200 -+++ mozilla/js/src/configure 2010-10-10 21:48:36.000000000 +0200 -@@ -5373,7 +5373,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -7346,14 +7346,6 @@ - EOF - - ;; --sparc*-*) -- ENABLE_TRACEJIT=1 -- NANOJIT_ARCH=Sparc -- cat >> confdefs.h <<\EOF --#define JS_CPU_SPARC 1 --EOF -- -- ;; - esac - - # Check whether --enable-methodjit or --disable-methodjit was given. Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in Wed Aug 3 20:53:16 2011 (r604) @@ -0,0 +1,72 @@ +--- 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*-*) ++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 ++ 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*-*) ++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 +@@ -2796,6 +2796,10 @@ + i?86-*) + AC_DEFINE(AVMPLUS_IA32) + ;; ++amd64*-*) ++ AC_DEFINE(AVMPLUS_AMD64) ++ AC_DEFINE(AVMPLUS_64BIT) ++ ;; + x86_64*-*) + AC_DEFINE(AVMPLUS_AMD64) + AC_DEFINE(AVMPLUS_64BIT) Copied: branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.c (from r600, branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.c Wed Aug 3 20:53:16 2011 (r604, copy of r600, branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c) @@ -0,0 +1,16 @@ +--- mozilla/media/libvpx/vpx_config_c.c~ ++++ mozilla/media/libvpx/vpx_config_c.c +@@ -12,11 +12,11 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.c" + +-#elif defined(__linux__) && defined(__i386__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) + /* 32 bit Linux. */ + #include "vpx_config_x86-linux-gcc.c" + +-#elif defined(__linux__) && defined(__x86_64__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) + /* 64 bit Linux. */ + #include "vpx_config_x86_64-linux-gcc.c" + Copied: branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.h (from r600, branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-media-libvpx-vpx_config.h Wed Aug 3 20:53:16 2011 (r604, copy of r600, branches/experimental/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h) @@ -0,0 +1,16 @@ +--- mozilla/media/libvpx/vpx_config.h~ ++++ mozilla/media/libvpx/vpx_config.h +@@ -12,11 +12,11 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.h" + +-#elif defined(__linux__) && defined(__i386__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) + /* 32 bit Linux. */ + #include "vpx_config_x86-linux-gcc.h" + +-#elif defined(__linux__) && defined(__x86_64__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) + /* 64 bit Linux. */ + #include "vpx_config_x86_64-linux-gcc.h" + Added: branches/experimental/www/seamonkey-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/www/seamonkey-beta/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c Wed Aug 3 20:53:16 2011 (r604) @@ -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 + Copied: branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-library-Makefile.in (from r593, branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-library-Makefile.in Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in) @@ -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 + Copied: branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in (from r593, branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in) @@ -0,0 +1,76 @@ +--- 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 + +@@ -117,7 +120,7 @@ + endif + endif + # IA64 Linux +-ifneq (,$(filter Linux,$(OS_ARCH))) ++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) + ifneq (,$(findstring ia64,$(OS_TEST))) + CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp + ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s +@@ -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 ++# + # + # Neutrino/Intel (uses the same unixish_x86 code) + # +@@ -184,9 +193,15 @@ + ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s + endif + # ++# FreeBSD/Alpha ++# ++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) ++CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp ++endif ++# + # Linux/Alpha + # +-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) ++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp + endif + # +@@ -341,7 +356,7 @@ + # + # Linux/PPC + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) ++ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) + 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 +@@ -419,6 +434,15 @@ + ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s + endif + # ++# FreeBSD/SPARC64 ++# ++ifeq ($(OS_ARCH),FreeBSD) ++ifneq (,$(findstring sparc,$(OS_TEST))) ++CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp ++ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s ++endif ++endif ++# + # OpenBSD/SPARC + # + ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc) Deleted: branches/experimental/www/seamonkey/files/patch-sysnss ============================================================================== --- branches/experimental/www/seamonkey/files/patch-sysnss Wed Aug 3 20:53:16 2011 (r588) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,196 +0,0 @@ ---- mozilla/security/manager/Makefile.in.orig 2011-02-09 21:07:24.000000000 +0100 -+++ mozilla/security/manager/Makefile.in 2011-02-15 23:30:11.000000000 +0100 -@@ -49,16 +49,8 @@ - MODULE = psm - - ifndef MOZ_NATIVE_NSS --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) - endif - --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --NSSUTIL3_LIB = $(DLL_PREFIX)nssutil3$(DLL_SUFFIX) --SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) --SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) --SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) --SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk -- - ifndef NSS_DISABLE_DBM - NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX) - NSSDBM3_CHK = $(DLL_PREFIX)nssdbm3.chk -@@ -68,23 +60,6 @@ - endif - - ifndef MOZ_NATIVE_NSS --ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH))) --SDK_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \ -- $(NULL) --else --SDK_LIBS = \ -- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \ -- $(NULL) --endif - endif - - # Default -@@ -339,74 +314,8 @@ - - libs:: - ifndef MOZ_NATIVE_NSS --ifndef NSS_DISABLE_DBM -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/dbm $(DEFAULT_GMAKE_FLAGS) --endif -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) --ifdef ENABLE_TESTS --# Need certutil binary for mochitest certificates generation -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/certutil $(DEFAULT_GMAKE_FLAGS) -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/pk12util $(DEFAULT_GMAKE_FLAGS) -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/modutil $(DEFAULT_GMAKE_FLAGS) --endif --ifndef SKIP_CHK --ifndef ENABLE_TESTS # Just avoid secondary compile -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) --endif -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin --ifndef NSS_DISABLE_DBM --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin --endif --endif --ifndef MOZ_NATIVE_NSS --# NSS installs headers to dist/public and we want them in dist/include -- $(NSINSTALL) -D $(DIST)/include/nss -- (cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \ -- (cd $(DIST)/include && tar -xf -) - endif -+ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ - $(MAKE) -C locales $@ -@@ -419,47 +328,6 @@ - - install:: - ifndef MOZ_NATIVE_NSS -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) --endif - endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -476,10 +344,4 @@ - $(MAKE) -C pki $@ - endif - ifndef MOZ_NATIVE_NSS -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - endif ---- mozilla/security/manager/ssl/src/Makefile.in.orig 2009-08-26 19:05:39.000000000 +0200 -+++ mozilla/security/manager/ssl/src/Makefile.in 2009-08-26 19:06:17.000000000 +0200 -@@ -138,13 +138,14 @@ - - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += $(NSS_CFLAGS) -+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss - - EXTRA_DSO_LDOPTS += \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ - $(NSS_LIBS) \ -+ $(LOCAL_INCLUDES) \ - $(NULL) - - include $(topsrcdir)/config/rules.mk Deleted: branches/experimental/www/seamonkey/files/patch-xptcall-alpha ============================================================================== --- branches/experimental/www/seamonkey/files/patch-xptcall-alpha Wed Aug 3 20:53:16 2011 (r588) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,459 +0,0 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura */ -+ -+#include -+#include -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ Copied: branches/experimental/www/seamonkey-beta/files/pkg-message.in (from r593, branches/experimental/www/seamonkey/files/pkg-message.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/pkg-message.in Wed Aug 3 20:53:16 2011 (r604, copy of r593, branches/experimental/www/seamonkey/files/pkg-message.in) @@ -0,0 +1,10 @@ +***************************************************************************** +In order to activate the Lightning extension, every user should install the +XPI file into his own profile via the menu: + +Tools -> Add-ons -> Extensions -> Icon left of the search field + -> Install From File + +The XPI file was installed as: +%%PREFIX%%/share/lightning/lightning-seamonkey.xpi +***************************************************************************** From owner-freebsd-gecko@FreeBSD.ORG Wed Aug 3 22:48:55 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 E93341065679 for ; Wed, 3 Aug 2011 22:48:55 +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 6D6018FC16 for ; Wed, 3 Aug 2011 22:48:55 +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 p73MmrfN002287 for ; Wed, 3 Aug 2011 22:48:53 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p73MmmoL001367 for freebsd-gecko@freebsd.org; Wed, 3 Aug 2011 22:48:48 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 3 Aug 2011 22:48:48 GMT Message-Id: <201108032248.p73MmmoL001367@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] r605 - branches/experimental/Mk trunk/Mk 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, 03 Aug 2011 22:48:56 -0000 Author: flo Date: Wed Aug 3 22:48:48 2011 New Revision: 605 Log: sync bsd.gecko.mk with ports Modified: branches/experimental/Mk/bsd.gecko.mk trunk/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Wed Aug 3 20:53:16 2011 (r604) +++ branches/experimental/Mk/bsd.gecko.mk Wed Aug 3 22:48:48 2011 (r605) @@ -4,7 +4,7 @@ # Date created: 12 Nov 2005 # Whom: Michael Johnson # -# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.28 2011/06/21 21:12:30 flo Exp $ +# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.33 2011/08/03 22:33:41 flo Exp $ # # 4 column tabs prevent hair loss and tooth decay! @@ -181,7 +181,7 @@ # is given by the maintainer via the port or by the # user via defined variable try to find the highest # stable installed version. -# Available values: yes 50+ 36+ 35+ 50 36 35 +# Available values: yes 50+ 36+ 50 36 # NOTE: # default value 50 is used in case of USE_FIREFOX=yes # @@ -223,11 +223,10 @@ .endif _FIREFOX_DEFAULT_VERSION= 50 -_FIREFOX_VERSIONS= 50 36 35 -_FIREFOX_RANGE_VERSIONS= 50+ 36+ 35+ +_FIREFOX_VERSIONS= 50 36 +_FIREFOX_RANGE_VERSIONS= 50+ 36+ -# For specifying [36, 35, ..]+ -_FIREFOX_35P= 35 ${_FIREFOX_36P} +# For specifying [36, ..]+ _FIREFOX_36P= 36 ${_FIREFOX_50P} _FIREFOX_50P= 50 @@ -275,7 +274,6 @@ # Dependence lines for different Firefox versions 50_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox 36_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox36 -35_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox35 # Add dependencies .if defined(USE_FIREFOX) @@ -692,7 +690,7 @@ .if defined(WITH_JAVA) && defined(_WITH_JAVA) USE_JAVA= yes -JAVA_VERSION+= 1.4+ +JAVA_VERSION+= 1.5+ JAVA_OS+= native CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}" MOZ_OPTIONS+= --enable-javaxpcom Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Wed Aug 3 20:53:16 2011 (r604) +++ trunk/Mk/bsd.gecko.mk Wed Aug 3 22:48:48 2011 (r605) @@ -4,7 +4,7 @@ # Date created: 12 Nov 2005 # Whom: Michael Johnson # -# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.28 2011/06/21 21:12:30 flo Exp $ +# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.33 2011/08/03 22:33:41 flo Exp $ # # 4 column tabs prevent hair loss and tooth decay! @@ -14,7 +14,7 @@ # WITH_GECKO= libxul # # The valid backends are: -# libxul seamonkey +# libxul # # See below for more details. # ======================= /USERS ================================ @@ -36,8 +36,9 @@ # Users should use the following syntax: # -# WITH_GECKO= libxul seamonkey -# Use libxul whenever a port supports it, falling back on seamonkey. +# WITH_GECKO= libxul libxul-devel +# Use libxul whenever a port supports it, falling back on libxul-devel. +# Note: libxul-devel does not exist at the moment! # WITH_GECKO= libxul # Sets your preferred backend. With this example, libxul will always # be chosen, unless the port doesn't support a libxul backend. In that @@ -47,19 +48,21 @@ # # Ports should use the following: # -# USE_GECKO= libxul seamonkey +# USE_GECKO= libxul libxul-devel # The list of gecko backends that the port supports. Unless the user # overrides it with WITH_GECKO, the first gecko listed in USE_GECKO # will be the default. In the above example, www/libxul will be used -# as a gecko backend unless WITH_GECKO=seamonkey is defined by the user. +# as a gecko backend unless WITH_GECKO=libxul-devel is defined by the +# user. Note: libxul-devel does not exist at the moment! # # USE_GECKO= libxul-devel<->libxul # This will sed -e 's/libxul/libxul-devel/' on Makefile.in's and configure # if ${GECKO}=="libxul-devel" # # Example: -# USE_GECKO= libxul seamonkey -# +# USE_GECKO= libxul libxul-devel +# Note: libxul-devel does not exist at the moment! +# # post-patch: # @${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \ # ${MOZSRC}/configure @@ -68,15 +71,16 @@ # has been chosen. # # Example: -# USE_GECKO= libxul seamonkey +# USE_GECKO= libxul libxul-devel +# Note: libxul-devel does not exist at the moment! # # post-patch: -# .if ${GECKO}=="seamonkey" -# @${REINPLACE_CMD} -e 's|mozilla-|seamonkey-|' \ +# .if ${GECKO}=="libxul-devel" +# @${REINPLACE_CMD} -e 's|mozilla-|libxul-|' \ # ${MOZSRC}/configure # .endif -_GECKO_ALL= seamonkey libxul +_GECKO_ALL= libxul libxul_PLIST= ${LOCALBASE}/lib/libxul/libxul.so @@ -177,7 +181,7 @@ # is given by the maintainer via the port or by the # user via defined variable try to find the highest # stable installed version. -# Available values: yes 50+ 36+ 35+ 50 36 35 +# Available values: yes 50+ 36+ 50 36 # NOTE: # default value 50 is used in case of USE_FIREFOX=yes # @@ -188,9 +192,9 @@ # version is given by the maintainer via the port # or by the user via defined variable try to find # the highest stable installed version. -# Available values: yes 11+ 20+ 11 20 +# Available values: yes 22+ 20+ 22 20 # NOTE: -# default value 20 is used in case of USE_SEAMONKEY=yes +# default value 22 is used in case of USE_SEAMONKEY=yes # # USE_SEAMONKEY_BUILD Add buildtime dependency on SeaMonkey. # Available values: see USE_SEAMONKEY @@ -219,11 +223,10 @@ .endif _FIREFOX_DEFAULT_VERSION= 50 -_FIREFOX_VERSIONS= 50 36 35 -_FIREFOX_RANGE_VERSIONS= 50+ 36+ 35+ +_FIREFOX_VERSIONS= 50 36 +_FIREFOX_RANGE_VERSIONS= 50+ 36+ -# For specifying [36, 35, ..]+ -_FIREFOX_35P= 35 ${_FIREFOX_36P} +# For specifying [36, ..]+ _FIREFOX_36P= 36 ${_FIREFOX_50P} _FIREFOX_50P= 50 @@ -271,7 +274,6 @@ # Dependence lines for different Firefox versions 50_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox 36_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox36 -35_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox35 # Add dependencies .if defined(USE_FIREFOX) @@ -293,12 +295,12 @@ _SEAMONKEY_BUILD_DEPENDS= yes .endif -_SEAMONKEY_DEFAULT_VERSION= 20 -_SEAMONKEY_VERSIONS= 11 20 -_SEAMONKEY_RANGE_VERSIONS= 11+ 20+ +_SEAMONKEY_DEFAULT_VERSION= 22 +_SEAMONKEY_VERSIONS= 22 20 +_SEAMONKEY_RANGE_VERSIONS= 22+ 20+ -# For specifying [20, 11, ..]+ -_SEAMONKEY_11P= 11 ${_SEAMONKEY_20P} +# For specifying [22, 20, ..]+ +_SEAMONKEY_22P= 22 ${_SEAMONKEY_20P} _SEAMONKEY_20P= 20 # Set the default SeaMonkey version and check if USE_SEAMONKEY=yes was given @@ -688,7 +690,7 @@ .if defined(WITH_JAVA) && defined(_WITH_JAVA) USE_JAVA= yes -JAVA_VERSION+= 1.4+ +JAVA_VERSION+= 1.5+ JAVA_OS+= native CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}" MOZ_OPTIONS+= --enable-javaxpcom From owner-freebsd-gecko@FreeBSD.ORG Wed Aug 3 23:00: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 44957106566C for ; Wed, 3 Aug 2011 23:00: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 0F6818FC44 for ; Wed, 3 Aug 2011 23:00:43 +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 p73N0gd0062366 for ; Wed, 3 Aug 2011 23:00:42 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p73N0abn048017 for freebsd-gecko@freebsd.org; Wed, 3 Aug 2011 23:00:36 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 3 Aug 2011 23:00:36 GMT Message-Id: <201108032300.p73N0abn048017@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] r606 - branches/experimental/mail/thunderbird branches/experimental/www/firefox-aurora branches/experimental/www/seamonkey branches/experimental/www/seamonkey-i18n trunk/mail/thunderbird trunk/www/seamonkey trunk/www/seamonkey-i18n trunk/www/seamonkey/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, 03 Aug 2011 23:00:45 -0000 Author: flo Date: Wed Aug 3 23:00:36 2011 New Revision: 606 Log: sync with ports Added: trunk/www/seamonkey-i18n/ trunk/www/seamonkey-i18n/Makefile trunk/www/seamonkey-i18n/Makefile.lang trunk/www/seamonkey-i18n/Makefile.option trunk/www/seamonkey-i18n/distinfo trunk/www/seamonkey-i18n/pkg-descr trunk/www/seamonkey/files/patch-configure.in trunk/www/seamonkey/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc trunk/www/seamonkey/files/patch-ipc-chromium-src-base-file_util.h trunk/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc trunk/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_posix.cc trunk/www/seamonkey/files/patch-ipc-chromium-src-base-platform_file_posix.cc trunk/www/seamonkey/files/patch-ipc-chromium-src-base-platform_thread_posix.cc trunk/www/seamonkey/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h trunk/www/seamonkey/files/patch-ipc-chromium-src-build-build_config.h trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in trunk/www/seamonkey/files/patch-ldap-xpcom-src-Makefile.in trunk/www/seamonkey/files/patch-mozilla-build-autoconf-config.sub trunk/www/seamonkey/files/patch-mozilla-build-unix-run-mozilla.sh trunk/www/seamonkey/files/patch-mozilla-config-autoconf.mk.in trunk/www/seamonkey/files/patch-mozilla-config-gcc-stl-wrapper.template.h trunk/www/seamonkey/files/patch-mozilla-config-mkdepend-Makefile.in trunk/www/seamonkey/files/patch-mozilla-config-mkdepend-imakemdep.h trunk/www/seamonkey/files/patch-mozilla-configure.in trunk/www/seamonkey/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp trunk/www/seamonkey/files/patch-mozilla-content-xslt-public-txDouble.h trunk/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in trunk/www/seamonkey/files/patch-mozilla-gfx-qcms-qcmstypes.h trunk/www/seamonkey/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp trunk/www/seamonkey/files/patch-mozilla-gfx-ycbcr-chromium_types.h trunk/www/seamonkey/files/patch-mozilla-js-src-Makefile.in trunk/www/seamonkey/files/patch-mozilla-js-src-build-autoconf-config.sub trunk/www/seamonkey/files/patch-mozilla-js-src-config-mkdepend-Makefile.in trunk/www/seamonkey/files/patch-mozilla-js-src-configure trunk/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c trunk/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h trunk/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk trunk/www/seamonkey/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp trunk/www/seamonkey/files/patch-mozilla-storage-build-Makefile.in trunk/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in trunk/www/seamonkey/files/patch-mozilla-xpcom-io-nsNativeCharsetUtils.cpp trunk/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc trunk/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in trunk/www/seamonkey/files/pkg-message.in Deleted: trunk/www/seamonkey/files/patch-build_unix_run-mozilla.sh trunk/www/seamonkey/files/patch-config-mkdepend-imakemdep.h trunk/www/seamonkey/files/patch-config_mkdepend_Makefile.in trunk/www/seamonkey/files/patch-configure trunk/www/seamonkey/files/patch-db-sqlite3-src-Makefile.in trunk/www/seamonkey/files/patch-embedding_base_nsEmbedAPI.cpp trunk/www/seamonkey/files/patch-extensions_transformiix_source_base_Double.cpp trunk/www/seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp trunk/www/seamonkey/files/patch-js_src_Makefile.in trunk/www/seamonkey/files/patch-js_src_liveconnect_nsISecureLiveconnect.h trunk/www/seamonkey/files/patch-libm trunk/www/seamonkey/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp trunk/www/seamonkey/files/patch-security-coreconf-FreeBSD.mk trunk/www/seamonkey/files/patch-security_manager_ssl_src_nsNSSComponent.cpp trunk/www/seamonkey/files/patch-storage_build_Makefile.in trunk/www/seamonkey/files/patch-sysnss trunk/www/seamonkey/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp trunk/www/seamonkey/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc trunk/www/seamonkey/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in trunk/www/seamonkey/files/patch-xptcall-alpha Modified: branches/experimental/mail/thunderbird/Makefile branches/experimental/www/firefox-aurora/distinfo branches/experimental/www/seamonkey-i18n/Makefile branches/experimental/www/seamonkey/Makefile trunk/mail/thunderbird/Makefile trunk/www/seamonkey/Makefile trunk/www/seamonkey/distinfo trunk/www/seamonkey/files/patch-config_autoconf.mk.in trunk/www/seamonkey/files/patch-xptcall-amd64 trunk/www/seamonkey/files/patch-xptcall-ia64 trunk/www/seamonkey/files/patch-xptcall-sparc64 trunk/www/seamonkey/files/seamonkey.desktop.in Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Wed Aug 3 22:48:48 2011 (r605) +++ branches/experimental/mail/thunderbird/Makefile Wed Aug 3 23:00:36 2011 (r606) @@ -2,7 +2,7 @@ # Date created: 4 September 2003 # Whom: Joe Marcus Clarke # -# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.128 2011/07/04 21:27:06 flo Exp $ +# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.129 2011/07/15 22:20:11 flo Exp $ # PORTNAME= thunderbird @@ -15,7 +15,8 @@ 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.7:${PORTSDIR}/devel/nspr \ + cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ event-1.4:${PORTSDIR}/devel/libevent Modified: branches/experimental/www/firefox-aurora/distinfo ============================================================================== --- branches/experimental/www/firefox-aurora/distinfo Wed Aug 3 22:48:48 2011 (r605) +++ branches/experimental/www/firefox-aurora/distinfo Wed Aug 3 23:00:36 2011 (r606) @@ -1,2 +1,2 @@ -SHA256 (firefox-7.0a2-20110706.source.tar.bz2) = f4f40dc69dfa213310d9e8922282e640bbc03aba19fad8ef136d58f6fe4bb04c -SIZE (firefox-7.0a2-20110706.source.tar.bz2) = 69516972 +SHA256 (firefox-7.0a2-20110803.source.tar.bz2) = 8ad0100cd07c4e46008355947765e6c2f246a9187878388a52609e7950c284f4 +SIZE (firefox-7.0a2-20110803.source.tar.bz2) = 68965188 Modified: branches/experimental/www/seamonkey-i18n/Makefile ============================================================================== --- branches/experimental/www/seamonkey-i18n/Makefile Wed Aug 3 22:48:48 2011 (r605) +++ branches/experimental/www/seamonkey-i18n/Makefile Wed Aug 3 23:00:36 2011 (r606) @@ -2,7 +2,7 @@ # Date created: 28 May 2006 # Whom: Andrew Pantyukhin # -# $FreeBSD$ +# $FreeBSD: ports/www/seamonkey-i18n/Makefile,v 1.1 2011/08/01 23:43:20 flo Exp $ # PORTNAME= seamonkey-i18n Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Wed Aug 3 22:48:48 2011 (r605) +++ branches/experimental/www/seamonkey/Makefile Wed Aug 3 23:00:36 2011 (r606) @@ -2,7 +2,7 @@ # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # -# $FreeBSD: ports/www/seamonkey/Makefile,v 1.299 2011/03/17 00:11:52 beat Exp $ +# $FreeBSD: ports/www/seamonkey/Makefile,v 1.300 2011/08/01 23:31:53 flo Exp $ # PORTNAME= seamonkey Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Wed Aug 3 22:48:48 2011 (r605) +++ trunk/mail/thunderbird/Makefile Wed Aug 3 23:00:36 2011 (r606) @@ -2,7 +2,7 @@ # Date created: 4 September 2003 # Whom: Joe Marcus Clarke # -# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.128 2011/07/04 21:27:06 flo Exp $ +# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.129 2011/07/15 22:20:11 flo Exp $ # PORTNAME= thunderbird @@ -15,7 +15,8 @@ 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.7:${PORTSDIR}/devel/nspr \ + cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ event-1.4:${PORTSDIR}/devel/libevent Added: trunk/www/seamonkey-i18n/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey-i18n/Makefile Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,86 @@ +# New ports collection makefile for: firefox3-i18n +# Date created: 28 May 2006 +# Whom: Andrew Pantyukhin +# +# $FreeBSD: ports/www/seamonkey-i18n/Makefile,v 1.1 2011/08/01 23:43:20 flo Exp $ +# + +PORTNAME= seamonkey-i18n +PORTVERSION= 2.2 +CATEGORIES= www +MASTER_SITE_SUBDIR= seamonkey/releases/${PORTVERSION}/langpack +PKGNAMEPREFIX= +DISTFILES= ${SEAMONKEY_I18N_:S/$/.langpack.xpi/:S/^/seamonkey-${PORTVERSION}./} +DIST_SUBDIR= xpi/${DISTNAME} + +MAINTAINER= gecko@FreeBSD.org +COMMENT= Localized interface for SeaMonkey 2.2 + +EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip + +USE_SEAMONKEY= yes +USE_XPI= *seamonkey + +USE_SUBMAKE= yes + +WDIR= langpack-*@seamonkey.mozilla.org + +XPI_DISTNAMES= ${SEAMONKEY_I18N_} + +.ifndef WITHOUT_SWITCHER +RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher +.endif + +.include "${.CURDIR}/Makefile.option" +.include +.include "${.CURDIR}/Makefile.lang" + +SEAMONKEY_I18N_?= ${SEAMONKEY_I18N} + +.for dist in ${XPI_DISTNAMES} +XPI_ID_${dist}= langpack-${dist}@seamonkey.mozilla.org +XPI_FILES_${dist}= chrome.manifest install.rdf chrome/${dist}.jar +XPI_DIRS_${dist}= chrome +.endfor + +pre-everything:: + @${ECHO_CMD} + @${ECHO_CMD} "Please define SEAMONKEY_I18N_ALL to install all languages." + @${ECHO_CMD} + @${MKDIR} ${WRKSRC} + +do-extract: + @for lang in ${SEAMONKEY_I18N_}; do \ + if ! (${EXTRACT_CMD} ${_DISTDIR}/seamonkey-${PORTVERSION}.$$lang.langpack.xpi -d ${WRKSRC}/langpack-$$lang@seamonkey.mozilla.org);\ + then \ + exit 1; \ + fi; \ + cd ${WRKSRC}/langpack-$$lang@seamonkey.mozilla.org/chrome; \ + ${LOCALBASE}/bin/zip -r $$lang.jar $$lang; \ + done + +do-install: + @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL} + @${CP} -R ${WRKSRC}/ ${XPI_LIBDIR}/ + @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/ + @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/ + @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; } + @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} + @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ + ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} + @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -fR $$_dir/${WDIR} ; }' ${_A} + + @${ECHO_CMD} '@unexec ${RMDIR} ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} + +post-patch: + ${FIND} ${WRKSRC} -name install.rdf -print0 | \ + ${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/ Added: trunk/www/seamonkey-i18n/Makefile.lang ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey-i18n/Makefile.lang Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,82 @@ +# New ports collection makefile.lang for: firefox3-i18n +# Date created: 30 Nov 2008 +# Whom: Koji Yokota +# +# $FreeBSD: ports/www/seamonkey-i18n/Makefile.lang,v 1.1 2011/08/01 23:43:20 flo Exp $ +# +# Currently, the following 22 languages are supported. +# +SEAMONKEY_I18N_ALL_= ca cs de en-GB en-US es-AR es-ES \ + fi fr hu it ja-JP-mac ja lt nb-NO nl pl \ + pt-PT ru sk sv-SE tr + +.if defined(SEAMONKEY_I18N_ALL) || (defined(PACKAGE_BUILDING) && !exists(${OPTIONSFILE})) || make(makesum) +SEAMONKEY_I18N= ${SEAMONKEY_I18N_ALL_} +.else +.ifndef WITHOUT_LANG_CA +SEAMONKEY_I18N+= ca +.endif +.ifndef WITHOUT_LANG_CS +SEAMONKEY_I18N+= cs +.endif +.ifndef WITHOUT_LANG_DE +SEAMONKEY_I18N+= de +.endif +.ifndef WITHOUT_LANG_GB +SEAMONKEY_I18N+= en-GB +.endif +.ifndef WITHOUT_LANG_US +SEAMONKEY_I18N+= en-US +.endif +.ifndef WITHOUT_LANG_SA +SEAMONKEY_I18N+= es-AR +.endif +.ifndef WITHOUT_LANG_ES +SEAMONKEY_I18N+= es-ES +.endif +.ifndef WITHOUT_LANG_FI +SEAMONKEY_I18N+= fi +.endif +.ifndef WITHOUT_LANG_FR +SEAMONKEY_I18N+= fr +.endif +.ifndef WITHOUT_LANG_HU +SEAMONKEY_I18N+= hu +.endif +.ifndef WITHOUT_LANG_IT +SEAMONKEY_I18N+= it +.endif +.ifndef WITHOUT_LANG_JP +SEAMONKEY_I18N+= ja-JP-mac +.endif +.ifndef WITHOUT_LANG_JA +SEAMONKEY_I18N+= ja +.endif +.ifndef WITHOUT_LANG_LT +SEAMONKEY_I18N+= lt +.endif +.ifndef WITHOUT_LANG_NB +SEAMONKEY_I18N+= nb-NO +.endif +.ifndef WITHOUT_LANG_NL +SEAMONKEY_I18N+= nl +.endif +.ifndef WITHOUT_LANG_PL +SEAMONKEY_I18N+= pl +.endif +.ifndef WITHOUT_LANG_PT +SEAMONKEY_I18N+= pt-PT +.endif +.ifndef WITHOUT_LANG_RU +SEAMONKEY_I18N+= ru +.endif +.ifndef WITHOUT_LANG_SK +SEAMONKEY_I18N+= sk +.endif +.ifndef WITHOUT_LANG_SE +SEAMONKEY_I18N+= sv-SE +.endif +.ifndef WITHOUT_LANG_TR +SEAMONKEY_I18N+= tr +.endif +.endif Added: trunk/www/seamonkey-i18n/Makefile.option ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey-i18n/Makefile.option Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,29 @@ +# New ports collection makefile.option for: firefox3-i18n +# Date created: 30 Nov 2008 +# Whom: Koji Yokota +# +# $FreeBSD: ports/www/seamonkey-i18n/Makefile.option,v 1.1 2011/08/01 23:43:20 flo Exp $ +# + +OPTIONS= LANG_CA "Catalan" off \ + LANG_CS "Czech" off \ + LANG_NL "Dutch" off \ + LANG_DE "German" on \ + LANG_GB "English GB" off \ + LANG_US "English US" off \ + LANG_FI "Finnish" off \ + LANG_FR "French" on \ + LANG_HU "Hungarian" on \ + LANG_IT "Italian" on \ + LANG_JA "Japanese" off \ + LANG_JP "Japanese (ja-JP-mac)" off \ + LANG_LT "Lithuanian" off \ + LANG_NB "Norwegian" off \ + LANG_PL "Polish" off \ + LANG_PT "Portuguese" off \ + LANG_RU "Russian" on \ + LANG_ES "Spanish" on \ + LANG_SA "Spanish (Argentina)" off \ + LANG_SE "Swedish" off \ + LANG_SK "Slovak" off \ + LANG_TR "Turkish" off Added: trunk/www/seamonkey-i18n/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey-i18n/distinfo Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,44 @@ +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ca.langpack.xpi) = 433a6e1dea81a1dbe9fc5f0e360845affb71dec9e3c5a669cc355281f17d70d9 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ca.langpack.xpi) = 811514 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.cs.langpack.xpi) = 666d504cf2d216a7a8de8a13898719da89a42166e4ee1d4c2d2bfcb4c9e39b6e +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.cs.langpack.xpi) = 814944 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.de.langpack.xpi) = 13c3f08bcda947e5c20111a73bee995d5ac8bd97defd8ad235530b61d75de72a +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.de.langpack.xpi) = 857283 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.en-GB.langpack.xpi) = 8133dc83554f01712330682c2b269ccb2917ee3064ef7394ef9f82db26845932 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.en-GB.langpack.xpi) = 787529 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.en-US.langpack.xpi) = 8ac1ce65dc5044deabd9e1b49234f448cff3435b0660e42e091ddb611d219cda +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.en-US.langpack.xpi) = 786992 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.es-AR.langpack.xpi) = 4db1673c306b821dca7de124415b4b92c339a076bc7cd38892ae06927659c982 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.es-AR.langpack.xpi) = 813118 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.es-ES.langpack.xpi) = 08158721a1122ad6a74f688792e5f7e6e33ce078e1118dd8f13386da6eda6bd9 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.es-ES.langpack.xpi) = 785711 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.fi.langpack.xpi) = a1350aa978c30a71f5ea2a7983bf2bb3f27ad46ad2572d355b565664ebe66804 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.fi.langpack.xpi) = 807217 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.fr.langpack.xpi) = fcac0a2c51cf193fa2c712670a6c73e94ed58588ddd8dc0ad3e708b777f81842 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.fr.langpack.xpi) = 896104 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.hu.langpack.xpi) = 95a1e3f685b74a8d655bdeec7bdb7a8ce88699dff9432483b5cadab3bbe10982 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.hu.langpack.xpi) = 827308 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.it.langpack.xpi) = 28e7b90ff8d7596d7fca6c253d8fd2b1fc9464217cb7fe1a86a4ae9b832a1f8c +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.it.langpack.xpi) = 739672 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ja-JP-mac.langpack.xpi) = a83857fdebb8df144e725ccbc399e68447dc887d3539c27be4c2e5dd8ed43796 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ja-JP-mac.langpack.xpi) = 885812 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ja.langpack.xpi) = ad3d03f42747427c3c862a6a30cb4b513a66fb21a8fee778cc56f3f3a013761e +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ja.langpack.xpi) = 861377 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.lt.langpack.xpi) = d129bc0278ca8637df4fe377c29ffcc687d2d20b4de35b7144d83508bfeb6713 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.lt.langpack.xpi) = 959540 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.nb-NO.langpack.xpi) = 15818961fa34bc4610fcce26f8bd8885495f030d2ddf5d3f05fa0ee69aafbf96 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.nb-NO.langpack.xpi) = 805675 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.nl.langpack.xpi) = 34385a5ae09d976b7124366cea2304ce6b4489119c337b175fb9340529324a76 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.nl.langpack.xpi) = 804311 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.pl.langpack.xpi) = 44e0e2883601f7a71c64e8fad1e5653904dab5f25834cc96b479f7d3efa73f01 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.pl.langpack.xpi) = 825438 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.pt-PT.langpack.xpi) = d733234dc5b11ea32b611d54efefea31eea331d21555db91712f9810d1f2493c +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.pt-PT.langpack.xpi) = 842511 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ru.langpack.xpi) = 15700e56b4ead24fb08c8a65b615343a56f364dee311dc5e808f1055c9277c5a +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.ru.langpack.xpi) = 889516 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.sk.langpack.xpi) = a25e78e2c9e682910bd6fcdc7639ac7902d07f99ac9ccb85e567bb28606dcfcd +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.sk.langpack.xpi) = 840212 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.sv-SE.langpack.xpi) = 83b5e7572ed550e299b2813a0826d3760e18fd49b56a3e852f3be32cd133a1fc +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.sv-SE.langpack.xpi) = 869508 +SHA256 (xpi/seamonkey-i18n-2.2/seamonkey-2.2.tr.langpack.xpi) = 0bb342f7845493c35f743b3f8589e9fa0d7ed1c283f400eeb929617c13f26f56 +SIZE (xpi/seamonkey-i18n-2.2/seamonkey-2.2.tr.langpack.xpi) = 805151 Added: trunk/www/seamonkey-i18n/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey-i18n/pkg-descr Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,3 @@ +Language packs for SeaMonkey 2.1 + +WWW: http://www.seamonkey-project.org/releases/#langpacks Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Wed Aug 3 22:48:48 2011 (r605) +++ trunk/www/seamonkey/Makefile Wed Aug 3 23:00:36 2011 (r606) @@ -2,23 +2,26 @@ # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # -# $FreeBSD: ports/www/seamonkey/Makefile,v 1.296 2010/03/17 05:28:26 beat Exp $ -# $MCom: ports-stable/www/seamonkey/Makefile,v 1.9 2009/01/09 23:41:22 mezz Exp $ +# $FreeBSD: ports/www/seamonkey/Makefile,v 1.300 2011/08/01 23:31:53 flo Exp $ # PORTNAME= seamonkey -DISTVERSION= 1.1.19 +DISTVERSION= 2.2 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} -MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION} -DISTNAME= ${PORTNAME}-${DISTVERSION}.source +MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source +DISTNAME= seamonkey-${DISTVERSION}.source MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser -DEPRECATED= Upstream support dropped. Please consider using www/seamonkey2 instead. -FORBIDDEN= several security vulnerabilities -CONFLICTS_INSTALL= seamonkey-2* +BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr +LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ + event-1.4:${PORTSDIR}/devel/libevent + +USE_AUTOTOOLS= autoconf213 +CONFLICTS_BUILD= spidermonkey-1.[0-7]* +CONFLICTS_INSTALL= seamonkey-2.0* USE_BZIP2= yes USE_GMAKE= yes USE_GECKO= gecko @@ -26,24 +29,32 @@ WANT_PERL= yes HAS_CONFIGURE= yes ALL_TARGET= default +USE_GL= gl 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" +USE_GCC= 4.2+ CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/chrome/icons/default/default.xpm - +MOZILLA= ${PORTNAME}-${PORTVERSION} +MOZILLA_EXEC_NAME= ${PORTNAME} MOZ_EXTENSIONS= default MOZ_OPTIONS+= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-svg \ --enable-application=suite \ --enable-svg-renderer=cairo \ --enable-system-cairo \ - --enable-canvas \ - --with-system-nss -MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=suite + --enable-canvas \ + --disable-necko-wifi \ + --disable-updater \ + --with-system-libevent=${LOCALBASE} + +USE_MOZILLA= -png -nss -dbm -jpeg -xft +MOZ_TOOLKIT= cairo-gtk2 +MOZILLA_PLIST_DIRS= bin lib +MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64 @@ -51,12 +62,23 @@ COMPOSER "Enable the HTML Composer module" on \ LDAP "Enable LDAP support for Mailnews" on \ CHATZILLA "Enable the Chatzilla IRC module" on \ - JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off \ + LIGHTNING "Enable calendar extension" off \ + DBUS "Enable D-BUS support" on \ SMB "Enable smb:// URI support using gnomevfs" off .include -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} +MOZSRC:= ${WRKDIR}/comm-release/mozilla +WRKSRC= ${WRKDIR}/comm-release + +GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} + +.if ${HAVE_GNOME:Mlibgnomeui}!="" +USE_GNOME+= libgnomeui +MOZ_OPTIONS+= --enable-gnomeui +.else +MOZ_OPTIONS+= --disable-gnomeui +.endif .if exists(${LOCALBASE}/include/cairo/cairo-glitz.h) # Glitz support can only be enabled if cairo is built with glitz support @@ -64,16 +86,13 @@ LIB_DEPENDS+= glitz.1:${PORTSDIR}/graphics/glitz .endif -.if ${ARCH}=="sparc64" && ${OSVERSION} < 601101 -IGNORE= core dumps on ${ARCH}, need kern.osreldate>=601101 -.endif - .if defined(WITHOUT_MAILNEWS) MOZ_OPTIONS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP .if defined(WITHOUT_LDAP) MOZ_OPTIONS+= --disable-ldap --enable-mailnews +BROKEN= Does not build .else MOZ_OPTIONS+= --enable-ldap --enable-mailnews .endif @@ -81,41 +100,86 @@ .if !defined(WITHOUT_CHATZILLA) MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc .endif -.if defined(WITH_JAVASCRIPT_DEBUGGER) -MOZ_OPTIONS+= --enable-jsd \ - --enable-dtd-debug -.else -MOZ_OPTIONS+= --disable-jsd \ - --disable-dtd-debug -.endif .if defined(WITHOUT_COMPOSER) MOZ_OPTIONS+= --disable-composer .endif +.if defined(WITHOUT_DBUS) +MOZ_OPTIONS+= --disable-dbus --disable-libnotify +.else +LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + notify.1:${PORTSDIR}/devel/libnotify +.endif + +.if ${ARCH} == amd64 || ${ARCH} == i386 +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-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${WRKSRC}/security/manager/ssl/src/Makefile.in + ${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \ + ${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ - ${WRKSRC}/storage/build/Makefile.in + ${MOZSRC}/storage/build/Makefile.in \ + ${MOZSRC}/toolkit/library/Makefile.in \ + ${MOZSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ - ${WRKSRC}/modules/libpref/src/init/all.js + ${WRKSRC}/mozilla/modules/libpref/src/init/all.js @${REINPLACE_CMD} -e 's||\"${LOCALBASE}/include/iconv.h\"|g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ - ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp + ${WRKSRC}/configure.in \ + ${WRKSRC}/mozilla/configure.in \ + ${WRKSRC}/mozilla/xpcom/io/nsNativeCharsetUtils.cpp + @${REINPLACE_CMD} -e 's|libgnome-2.so.0|libgnome-2.so|' \ + ${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \ + ${WRKSRC}/mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp + @${REINPLACE_CMD} -e 's|libgnomeui-2.so.0|libgnomeui-2.so|' \ + ${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \ + ${WRKSRC}/mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp + @${REINPLACE_CMD} -e 's|libgnomevfs-2.so.0|libgnomevfs-2.so|' \ + ${WRKSRC}/mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp + @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ + s|-lpthread|${PTHREAD_LIBS}|g ; \ + s|echo aout|echo elf|g ; \ + s|/usr/X11R6|${LOCALBASE}|g' \ + ${WRKSRC}/mozilla/js/src/configure.in \ + ${WRKSRC}/mozilla/configure.in \ + ${WRKSRC}/configure.in @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \ < ${FILESDIR}/seamonkey.desktop.in > \ ${WRKDIR}/seamonkey.desktop +pre-configure: + (cd ${WRKSRC} && ${AUTOCONF}) + (cd ${MOZSRC} && ${AUTOCONF}) + (cd ${MOZSRC}/js/src/ && ${AUTOCONF}) pre-install: ${ECHO_CMD} share/applications/seamonkey.desktop >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} - ${CP} ${WRKSRC}/suite/branding/icons/gtk/default.xpm \ - ${FAKEDIR}/lib/${MOZILLA}/chrome/icons/default/ +.if defined(WITH_LIGHTNING) + @${PRINTF} '%s/lightning-${PORTNAME}.xpi\n@dirrmtry %s\n' \ + ${LIGHTNING_DIR} ${LIGHTNING_DIR} >> ${PLIST} +.endif do-install: ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/seamonkey.desktop ${PREFIX}/share/applications +post-install: +.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: trunk/www/seamonkey/distinfo ============================================================================== --- trunk/www/seamonkey/distinfo Wed Aug 3 22:48:48 2011 (r605) +++ trunk/www/seamonkey/distinfo Wed Aug 3 23:00:36 2011 (r606) @@ -1,3 +1,2 @@ -MD5 (seamonkey-1.1.19.source.tar.bz2) = cd1680aab7b8732551e6ace97d0f7eb8 -SHA256 (seamonkey-1.1.19.source.tar.bz2) = 665e0998e7af516826b12d943206de9d9ed6d341503660b72251821fccf1932e -SIZE (seamonkey-1.1.19.source.tar.bz2) = 36272561 +SHA256 (seamonkey-2.2.source.tar.bz2) = 0b713e2f78a2c5139bf16736bd12e87017cdbc675948d4a8893a3d834bf8c13a +SIZE (seamonkey-2.2.source.tar.bz2) = 87478968 Deleted: trunk/www/seamonkey/files/patch-build_unix_run-mozilla.sh ============================================================================== --- trunk/www/seamonkey/files/patch-build_unix_run-mozilla.sh Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- build/unix/run-mozilla.sh.orig Sat Oct 1 01:36:47 2005 -+++ build/unix/run-mozilla.sh Thu Dec 22 17:51:10 2005 -@@ -328,7 +328,7 @@ - fi - ## - ## Set LD_LIBRARY_PATH --LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} - if [ -n "$LD_LIBRARYN32_PATH" ] - then - LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} -@@ -415,6 +415,9 @@ - # - export MOZILLA_FIVE_HOME LD_LIBRARY_PATH - export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH -+ -+MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey -+export MOZ_PLUGIN_PATH - - if [ $moz_debug -eq 1 ] - then Deleted: trunk/www/seamonkey/files/patch-config-mkdepend-imakemdep.h ============================================================================== --- trunk/www/seamonkey/files/patch-config-mkdepend-imakemdep.h Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", Modified: trunk/www/seamonkey/files/patch-config_autoconf.mk.in ============================================================================== --- trunk/www/seamonkey/files/patch-config_autoconf.mk.in Wed Aug 3 22:48:48 2011 (r605) +++ trunk/www/seamonkey/files/patch-config_autoconf.mk.in Wed Aug 3 23:00:36 2011 (r606) @@ -1,6 +1,6 @@ ---- config/autoconf.mk.in.orig Mon Mar 15 22:56:25 2004 -+++ config/autoconf.mk.in Fri Mar 19 15:17:50 2004 -@@ -31,13 +31,13 @@ +--- config/autoconf.mk.in.orig 2009-07-17 15:18:04.000000000 +0200 ++++ config/autoconf.mk.in 2009-08-25 01:15:47.000000000 +0200 +@@ -61,7 +61,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ @@ -9,10 +9,3 @@ libdir = @libdir@ datadir = @datadir@ mandir = @mandir@ - idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+mozappdir = $(libdir)/%%MOZILLA%% - mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) - mrelibdir = $(mredir)/lib - Deleted: trunk/www/seamonkey/files/patch-config_mkdepend_Makefile.in ============================================================================== --- trunk/www/seamonkey/files/patch-config_mkdepend_Makefile.in Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- config/mkdepend/Makefile.in.orig Sun Apr 18 14:17:26 2004 -+++ config/mkdepend/Makefile.in Sun Dec 12 09:42:11 2004 -@@ -73,6 +73,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) Deleted: trunk/www/seamonkey/files/patch-configure ============================================================================== --- trunk/www/seamonkey/files/patch-configure Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,56 +0,0 @@ ---- configure.orig 2008-10-30 23:05:30.000000000 +0100 -+++ configure 2009-07-22 15:14:23.000000000 +0200 -@@ -1047,7 +1047,7 @@ - - MOZJPEG=62 - MOZPNG=10217 --MOZZLIB=1.2.3 -+MOZZLIB=1.2.2 - NSPR_VERSION=4 - NSS_VERSION=3 - -@@ -5408,7 +5408,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | sparc | ppc | ia64) -+amd64 | x86_64 | sparc | ppc | ia64) - CPU_ARCH="$OS_TEST" - ;; - esac -@@ -10442,7 +10442,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -10483,7 +10483,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi Added: trunk/www/seamonkey/files/patch-configure.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-configure.in Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,20 @@ +--- configure.in.orig 2011-07-28 00:58:59.534861026 +0200 ++++ configure.in 2011-07-28 01:00:05.591863508 +0200 +@@ -1438,7 +1438,7 @@ + CPU_ARCH=sparc + ;; + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" + ;; + +@@ -1458,7 +1458,7 @@ + dnl =============================================================== + INTEL_ARCHITECTURE= + case "$OS_TEST" in +- x86_64|i?86) ++ amd64|x86_64|i?86) + INTEL_ARCHITECTURE=1 + esac + Deleted: trunk/www/seamonkey/files/patch-db-sqlite3-src-Makefile.in ============================================================================== --- trunk/www/seamonkey/files/patch-db-sqlite3-src-Makefile.in Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- db/sqlite3/src/Makefile.in.orig 2009-08-22 00:49:32.000000000 +0200 -+++ db/sqlite3/src/Makefile.in 2009-08-22 00:51:29.000000000 +0200 -@@ -113,6 +113,10 @@ - ##SIMPLE_PROGRAMS = sqlite-shell - endif - -+ifeq ($(OS_ARCH),FreeBSD) -+EXTRA_LIBS += -lpthread -+endif -+ - include $(topsrcdir)/config/rules.mk - - sqlite-shell.$(OBJ_SUFFIX): shell.c Deleted: trunk/www/seamonkey/files/patch-embedding_base_nsEmbedAPI.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-embedding_base_nsEmbedAPI.cpp Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- embedding/base/nsEmbedAPI.cpp.orig 2007-10-09 20:00:30.000000000 -0400 -+++ embedding/base/nsEmbedAPI.cpp 2007-10-09 20:01:45.000000000 -0400 -@@ -53,7 +53,12 @@ static PRBool sRegistryIniti - static PRUint32 sInitCounter = 0; - - #define HACK_AROUND_THREADING_ISSUES --//#define HACK_AROUND_NONREENTRANT_INITXPCOM -+#ifdef __FreeBSD__ -+#include -+#if __FreeBSD_version < 700042 -+#define HACK_AROUND_NONREENTRANT_INITXPCOM -+#endif -+#endif - - #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM - // XXX hack class to clean up XPCOM when this module is unloaded Deleted: trunk/www/seamonkey/files/patch-extensions_transformiix_source_base_Double.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-extensions_transformiix_source_base_Double.cpp Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,23 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Mon Feb 6 15:40:52 2006 -+++ extensions/transformiix/source/base/Double.cpp Mon Feb 6 15:51:01 2006 -@@ -52,11 +52,16 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#if !defined(FP_X_DNML) -+#define FP_X_DNML 0 - #endif -+#if !defined(FP_X_STK) -+#define FP_X_STK 0 -+#endif -+#if !defined(FP_X_IOV) -+#define FP_X_IOV 0 -+#endif -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV; - fp_except_t oldmask = fpsetmask(~allmask); - #endif - Deleted: trunk/www/seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004 -+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004 -@@ -65,7 +65,8 @@ - - #include - #include --#include -+#include -+#include FT_FREETYPE_H - - #define FORCE_PR_LOG - #include "prlog.h" Added: trunk/www/seamonkey/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc Wed Aug 3 23:00:36 2011 (r606) @@ -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: trunk/www/seamonkey/files/patch-ipc-chromium-src-base-file_util.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-ipc-chromium-src-base-file_util.h Wed Aug 3 23:00:36 2011 (r606) @@ -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 + #elif defined(OS_POSIX) ++#include ++#include + #include +-#include + #endif + + #include Added: trunk/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc Wed Aug 3 23:00:36 2011 (r606) @@ -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: trunk/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_posix.cc Wed Aug 3 23:00:36 2011 (r606) @@ -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: trunk/www/seamonkey/files/patch-ipc-chromium-src-base-platform_file_posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-ipc-chromium-src-base-platform_file_posix.cc Wed Aug 3 23:00:36 2011 (r606) @@ -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 + #endif ++#include + + #include "base/logging.h" + #include "base/string_util.h" Added: trunk/www/seamonkey/files/patch-ipc-chromium-src-base-platform_thread_posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-ipc-chromium-src-base-platform_thread_posix.cc Wed Aug 3 23:00:36 2011 (r606) @@ -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(pthread_self()); + #endif + } + Added: trunk/www/seamonkey/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h Wed Aug 3 23:00:36 2011 (r606) @@ -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: trunk/www/seamonkey/files/patch-ipc-chromium-src-build-build_config.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-ipc-chromium-src-build-build_config.h Wed Aug 3 23:00:36 2011 (r606) @@ -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 Deleted: trunk/www/seamonkey/files/patch-js_src_Makefile.in ============================================================================== --- trunk/www/seamonkey/files/patch-js_src_Makefile.in Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- js/src/Makefile.in.orig Wed Oct 18 09:23:09 2006 -+++ js/src/Makefile.in Wed Oct 18 09:27:27 2006 -@@ -244,6 +244,7 @@ - endif - - LDFLAGS += $(pathsubst -l%,$(NSPR_STATIC_PATH)/%.a,$(NSPR_LIBS)) -+LDFLAGS += -lc - - # BeOS and HP-UX do not require the extra linking of "-lm" - ifeq (,$(filter BeOS HP-UX WINNT WINCE OpenVMS,$(OS_ARCH))) Deleted: trunk/www/seamonkey/files/patch-js_src_liveconnect_nsISecureLiveconnect.h ============================================================================== --- trunk/www/seamonkey/files/patch-js_src_liveconnect_nsISecureLiveconnect.h Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- js/src/liveconnect/nsISecureLiveconnect.h.orig 2007-10-09 20:03:00.000000000 -0400 -+++ js/src/liveconnect/nsISecureLiveconnect.h 2007-10-09 20:03:50.000000000 -0400 -@@ -51,7 +51,11 @@ - #include "nsIFactory.h" - #include "jni.h" - -+#if JS_BYTES_PER_WORD == 8 -+typedef jlong jsobject; -+#else - typedef jint jsobject; -+#endif - - class nsISecureLiveconnect : public nsISupports { - public: Added: trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,13 @@ +--- ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 ++++ ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 +@@ -254,6 +254,10 @@ + EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe + endif + ++ifeq ($(OS_ARCH), FreeBSD) ++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread ++endif ++ + ifeq ($(OS_ARCH), NetBSD) + EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) + endif Added: trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,14 @@ +--- ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 ++++ ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-01 10:18:43.000000000 +0100 +@@ -147,6 +147,11 @@ + CUSTOM_LIBS=1 + endif + ++ifeq ($(OS_ARCH), FreeBSD) ++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread ++CUSTOM_LIBS=1 ++endif ++ + # no extra libs on HP-UX + ifeq ($(OS_ARCH), HP-UX) + CUSTOM_LIBS=1 Added: trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,22 @@ +--- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in.orig 2009-09-10 17:36:39.000000000 +0200 ++++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in 2009-09-10 17:37:28.000000000 +0200 +@@ -42,7 +42,7 @@ + NSPR_LIBS = @NSPR_LIBS@ + NSPR_CFLAGS = @NSPR_CFLAGS@ + NSS_LIBS = @NSS_LIBS@ +-NSS_CFLAGS = @NSS_CFLAGS@ ++NSS_CFLAGS = @NSS_CFLAGS@ -I/usr/local/include/nss/nss + + include $(MOD_DEPTH)/config/autoconf.mk + include $(topsrcdir)/build.mk +@@ -180,6 +180,10 @@ + CUSTOM_LIBS=1 + endif + ++ifeq ($(OS_ARCH), FreeBSD) ++CUSTOM_LIBS=1 ++endif ++ + ifndef CUSTOM_LIBS + EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) -l$(PRLDAP_LIBNAME) + EXTRA_LIBS += $(NSSLINK) Added: trunk/www/seamonkey/files/patch-ldap-xpcom-src-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-ldap-xpcom-src-Makefile.in Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,13 @@ +--- ldap/xpcom/src/Makefile.in.orig 2009-11-22 03:44:31.000000000 +0100 ++++ ldap/xpcom/src/Makefile.in 2009-11-26 13:06:53.000000000 +0100 +@@ -97,6 +97,10 @@ + $(NULL) + endif + ++ifeq ($(OS_ARCH), FreeBSD) ++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread ++endif ++ + EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(LDAP_LIBS) + + include $(topsrcdir)/config/rules.mk Deleted: trunk/www/seamonkey/files/patch-libm ============================================================================== --- trunk/www/seamonkey/files/patch-libm Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,9 +0,0 @@ ---- js/Makefile.in Sun Mar 23 14:36:00 2003 -+++ js/Makefile.in Thu Aug 4 23:08:06 2005 -@@ -46,5 +46,5 @@ - # - --DIRS = src/fdlibm src -+DIRS = src - - include $(topsrcdir)/config/rules.mk Deleted: trunk/www/seamonkey/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-03-28 13:48:53.000000000 +0200 -+++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-03-28 13:46:50.000000000 +0200 -@@ -111,9 +111,9 @@ - - // initialize - png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, -- png_voidp_NULL, -- png_error_ptr_NULL, -- png_error_ptr_NULL); -+ NULL, -+ NULL, -+ NULL); - if (! png_ptr) - return NS_ERROR_OUT_OF_MEMORY; - png_info* info_ptr = png_create_info_struct(png_ptr); Added: trunk/www/seamonkey/files/patch-mozilla-build-autoconf-config.sub ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-build-autoconf-config.sub Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,12 @@ +--- mozilla/build/autoconf/config.sub.orig 2010-01-05 12:26:13.000000000 +0100 ++++ mozilla/build/autoconf/config.sub 2010-01-05 12:26:46.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 Added: trunk/www/seamonkey/files/patch-mozilla-build-unix-run-mozilla.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-build-unix-run-mozilla.sh Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,21 @@ +--- mozilla/build/unix/run-mozilla.sh.orig 2010-10-08 21:51:26.000000000 +0200 ++++ mozilla/build/unix/run-mozilla.sh 2010-10-10 21:45:33.000000000 +0200 +@@ -308,7 +308,7 @@ + } + if moz_should_set_ld_library_path + then +- LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH:+":$LD_LIBRARY_PATH"} ++ LD_LIBRARY_PATH=${MOZ_DIST_BIN}:%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} + fi + + if [ -n "$LD_LIBRARYN32_PATH" ] +@@ -390,6 +390,9 @@ + export MOZILLA_FIVE_HOME LD_LIBRARY_PATH + export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH + ++MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey ++export MOZ_PLUGIN_PATH ++ + if [ $moz_debug -eq 1 ] + then + moz_debug_program ${1+"$@"} Added: trunk/www/seamonkey/files/patch-mozilla-config-autoconf.mk.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-config-autoconf.mk.in Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,11 @@ +--- mozilla/config/autoconf.mk.in.orig 2009-09-17 19:09:10.000000000 +0200 ++++ mozilla/config/autoconf.mk.in 2009-09-17 19:09:26.000000000 +0200 +@@ -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@ Added: trunk/www/seamonkey/files/patch-mozilla-config-gcc-stl-wrapper.template.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-config-gcc-stl-wrapper.template.h Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,11 @@ +--- mozilla/config/gcc-stl-wrapper.template.h.orig 2010-05-12 13:56:18.000000000 +0000 ++++ mozilla/config/gcc-stl-wrapper.template.h 2010-05-12 13:56:52.000000000 +0000 +@@ -89,7 +89,7 @@ + // -fshort-wchar). We don't want that and so define our own inlined + // __throw_*(). + #ifndef mozilla_throw_gcc_h +-# include "mozilla/throw_gcc.h" ++# include "../../memory/mozalloc/throw_gcc.h" + #endif + + #endif // if mozilla_${HEADER}_h Added: trunk/www/seamonkey/files/patch-mozilla-config-mkdepend-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-config-mkdepend-Makefile.in Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,10 @@ +--- mozilla/config/mkdepend/Makefile.in.orig 2009-09-11 19:30:23.000000000 +0200 ++++ mozilla/config/mkdepend/Makefile.in 2009-09-11 19:29:53.000000000 +0200 +@@ -73,6 +73,7 @@ + include $(topsrcdir)/config/rules.mk + + HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" ++HOST_CFLAGS += $(XCFLAGS) + + ifdef GNU_CC + _GCCDIR = $(shell $(CC) -print-file-name=include) Added: trunk/www/seamonkey/files/patch-mozilla-config-mkdepend-imakemdep.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-config-mkdepend-imakemdep.h Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,10 @@ +--- mozilla/config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 ++++ mozilla/config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 +@@ -278,4 +278,7 @@ + "-D__i386__", + # endif ++# if defined(__amd64__) || defined(__x86_64__) ++ "-D__amd64__ -D__x86_64__", ++# endif + # ifdef __GNUC__ + "-traditional", Added: trunk/www/seamonkey/files/patch-mozilla-configure.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-configure.in Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,86 @@ +--- 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 + ;; + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" + ;; + +@@ -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 ], + [ 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 + ;; ++ FreeBSD:i386) ++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm" ++ VPX_X86_ASM=1 ++ ;; ++ FreeBSD:amd64) ++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" ++ VPX_X86_ASM=1 ++ ;; + SunOS:x86) + VPX_ASFLAGS="-f elf32 -rnasm -pnasm" + VPX_X86_ASM=1 +@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then + LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" + LIBJPEG_TURBO_X64_ASM=1 + ;; ++ FreeBSD:i386) ++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" ++ LIBJPEG_TURBO_X86_ASM=1 ++ ;; ++ FreeBSD:amd64) ++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" ++ LIBJPEG_TURBO_X64_ASM=1 ++ ;; + SunOS:i?86) + LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" + LIBJPEG_TURBO_X86_ASM=1 Added: trunk/www/seamonkey/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,15 @@ +--- mozilla/content/svg/content/src/nsSVGElement.cpp.orig 2010-05-12 16:46:09.000000000 +0200 ++++ mozilla/content/svg/content/src/nsSVGElement.cpp 2010-05-12 16:49:33.000000000 +0200 +@@ -102,7 +102,11 @@ + // vararg-list methods in this file: + // nsSVGElement::GetAnimated{Length,Number,Integer}Values + // See bug 547964 for details: +-PR_STATIC_ASSERT(sizeof(void*) == sizeof(nsnull)); ++// I really try to get the details but I'm not allowed to ++// access this bug in bugzilla: ++// You are not authorized to access bug #547964. ++// So disable this ASSERT as it breaks build. ++//PR_STATIC_ASSERT(sizeof(void*) == sizeof(nsnull)); + + + nsSVGEnumMapping nsSVGElement::sSVGUnitTypesMap[] = { Added: trunk/www/seamonkey/files/patch-mozilla-content-xslt-public-txDouble.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-content-xslt-public-txDouble.h Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,23 @@ +--- mozilla/content/xslt/public/txDouble.h.orig 2009-08-25 01:35:47.000000000 +0200 ++++ mozilla/content/xslt/public/txDouble.h 2009-08-25 01:37:41.000000000 +0200 +@@ -43,11 +43,16 @@ + //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. + #ifdef __FreeBSD__ + #include +-#ifdef __alpha__ +-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; +-#else +-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; ++#if !defined(FP_X_DNML) ++#define FP_X_DNML 0 ++#endif ++#if !defined(FP_X_STK) ++#define FP_X_STK 0 ++#endif ++#if !defined(FP_X_IOV) ++#define FP_X_IOV 0 + #endif ++static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV; + static fp_except_t oldmask = fpsetmask(~allmask); + #endif + Added: trunk/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,11 @@ +--- mozilla/gfx/qcms/Makefile.in.orig 2011-01-22 01:25:38.000000000 +0100 ++++ mozilla/gfx/qcms/Makefile.in 2011-01-27 18:16:39.000000000 +0100 +@@ -15,7 +15,7 @@ + + CSRCS = iccread.c transform.c + +-ifeq (86,$(findstring 86,$(OS_TEST))) ++ifneq (,$(INTEL_ARCHITECTURE)) + CSRCS += transform-sse2.c + ifdef _MSC_VER + ifneq ($(OS_ARCH)_$(OS_TEST),WINNT_x86_64) Added: trunk/www/seamonkey/files/patch-mozilla-gfx-qcms-qcmstypes.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-gfx-qcms-qcmstypes.h Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,11 @@ +--- mozilla/gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100 ++++ mozilla/gfx/qcms/qcmstypes.h 2010-11-22 12:02:42.000000000 +0100 +@@ -25,7 +25,7 @@ + #ifdef __OS2__ + /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ + #include +-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED) ++#elif !defined(__intptr_t_defined) && !defined(_INTPTR_T_DECLARED) + typedef PRUptrdiff uintptr_t; + #endif + #endif Added: trunk/www/seamonkey/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,36 @@ +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 master = Wrap(cairo_tee_surface_index(mSurface, 0)); + return master->GetSize(); ++#endif + } + +@@ -66,4 +70,5 @@ void + gfxTeeSurface::GetSurfaces(nsTArray >* 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> confdefs.h <<\EOF +-#define JS_CPU_SPARC 1 +-EOF +- +- ;; + esac + + # Check whether --enable-methodjit or --disable-methodjit was given. Added: trunk/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,16 @@ +--- mozilla/media/libvpx/vpx_config_c.c~ ++++ mozilla/media/libvpx/vpx_config_c.c +@@ -12,11 +12,11 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.c" + +-#elif defined(__linux__) && defined(__i386__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) + /* 32 bit Linux. */ + #include "vpx_config_x86-linux-gcc.c" + +-#elif defined(__linux__) && defined(__x86_64__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) + /* 64 bit Linux. */ + #include "vpx_config_x86_64-linux-gcc.c" + Added: trunk/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,16 @@ +--- mozilla/media/libvpx/vpx_config.h~ ++++ mozilla/media/libvpx/vpx_config.h +@@ -12,11 +12,11 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.h" + +-#elif defined(__linux__) && defined(__i386__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) + /* 32 bit Linux. */ + #include "vpx_config_x86-linux-gcc.h" + +-#elif defined(__linux__) && defined(__x86_64__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) + /* 64 bit Linux. */ + #include "vpx_config_x86_64-linux-gcc.h" + Added: trunk/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,40 @@ +--- mozilla/security/coreconf/FreeBSD.mk.orig 2010-03-16 09:57:06.000000000 +0000 ++++ mozilla/security/coreconf/FreeBSD.mk 2010-03-20 17:40:12.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 + + OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK +@@ -78,7 +90,7 @@ + DLL_SUFFIX = so.1.0 + endif + +-MKSHLIB = $(CC) $(DSO_LDOPTS) ++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ + ifdef MAPFILE + MKSHLIB += -Wl,--version-script,$(MAPFILE) + endif +@@ -87,4 +99,4 @@ + + G++INCLUDES = -I/usr/include/g++ + +-INCLUDES += -I/usr/X11R6/include ++#INCLUDES += -I/usr/local/include Added: trunk/www/seamonkey/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,10 @@ +--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 29 23:10:54 2006 ++++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp Mon May 29 23:12:22 2006 +@@ -110,6 +110,7 @@ + #include "nss.h" + #include "pk11func.h" + #include "ssl.h" ++#define NSS_ENABLE_ECC 1 + #include "sslproto.h" + #include "secmod.h" + #include "sechash.h" Added: trunk/www/seamonkey/files/patch-mozilla-storage-build-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-storage-build-Makefile.in Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,10 @@ +--- mozilla/storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006 ++++ mozilla/storage/build/Makefile.in Sun Nov 5 16:16:06 2006 +@@ -77,6 +77,7 @@ + $(EXTRA_DSO_LIBS) \ + $(MOZ_COMPONENT_LIBS) \ + $(MOZ_JS_LIBS) \ ++ %%PTHREAD_LIBS%% \ + $(NULL) + + include $(topsrcdir)/config/rules.mk Added: trunk/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in Wed Aug 3 23:00:36 2011 (r606) @@ -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 + Added: trunk/www/seamonkey/files/patch-mozilla-xpcom-io-nsNativeCharsetUtils.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-xpcom-io-nsNativeCharsetUtils.cpp Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,18 @@ +--- mozilla/xpcom/io/nsNativeCharsetUtils.cpp.orig 2011-06-16 15:45:54.000000000 +0200 ++++ mozilla/xpcom/io/nsNativeCharsetUtils.cpp 2011-06-16 15:46:49.000000000 +0200 +@@ -96,11 +96,11 @@ + // iconv for all platforms where nltypes.h and nllanginfo.h are present + // along with iconv. + // +-#if defined(HAVE_ICONV) && defined(HAVE_NL_TYPES_H) && defined(HAVE_LANGINFO_CODESET) +-#define USE_ICONV 1 +-#else ++//#if defined(HAVE_ICONV) && defined(HAVE_NL_TYPES_H) && defined(HAVE_LANGINFO_CODESET) ++//#define USE_ICONV 1 ++//#else + #define USE_STDCONV 1 +-#endif ++//#endif + + static void + isolatin1_to_utf16(const char **input, PRUint32 *inputLeft, PRUnichar **output, PRUint32 *outputLeft) Added: trunk/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,11 @@ +--- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 ++++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 +@@ -8,7 +8,7 @@ + * 1 is AddRef + * 2 is Release + */ +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) + NS_IMETHOD Stub3(); + NS_IMETHOD Stub4(); + NS_IMETHOD Stub5(); Added: trunk/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,76 @@ +--- 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 + +@@ -117,7 +120,7 @@ + endif + endif + # IA64 Linux +-ifneq (,$(filter Linux,$(OS_ARCH))) ++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) + ifneq (,$(findstring ia64,$(OS_TEST))) + CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp + ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s +@@ -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 ++# + # + # Neutrino/Intel (uses the same unixish_x86 code) + # +@@ -184,9 +193,15 @@ + ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s + endif + # ++# FreeBSD/Alpha ++# ++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) ++CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp ++endif ++# + # Linux/Alpha + # +-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) ++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp + endif + # +@@ -341,7 +356,7 @@ + # + # Linux/PPC + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) ++ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) + 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 +@@ -419,6 +434,15 @@ + ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s + endif + # ++# FreeBSD/SPARC64 ++# ++ifeq ($(OS_ARCH),FreeBSD) ++ifneq (,$(findstring sparc,$(OS_TEST))) ++CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp ++ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s ++endif ++endif ++# + # OpenBSD/SPARC + # + ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc) Deleted: trunk/www/seamonkey/files/patch-security-coreconf-FreeBSD.mk ============================================================================== --- trunk/www/seamonkey/files/patch-security-coreconf-FreeBSD.mk Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,24 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig Mon Sep 25 18:26:23 2006 -+++ security/coreconf/FreeBSD.mk Mon Sep 25 18:27:03 2006 -@@ -45,8 +45,12 @@ - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 -+else - CPU_ARCH = x86 - endif -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -73,7 +77,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif Deleted: trunk/www/seamonkey/files/patch-security_manager_ssl_src_nsNSSComponent.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-security_manager_ssl_src_nsNSSComponent.cpp Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 29 23:10:54 2006 -+++ security/manager/ssl/src/nsNSSComponent.cpp Mon May 29 23:12:22 2006 -@@ -110,6 +110,7 @@ - #include "nss.h" - #include "pk11func.h" - #include "ssl.h" -+#define NSS_ENABLE_ECC 1 - #include "sslproto.h" - #include "secmod.h" - #include "sechash.h" Deleted: trunk/www/seamonkey/files/patch-storage_build_Makefile.in ============================================================================== --- trunk/www/seamonkey/files/patch-storage_build_Makefile.in Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006 -+++ storage/build/Makefile.in Sun Nov 5 16:16:06 2006 -@@ -77,6 +77,7 @@ - $(EXTRA_DSO_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ -+ %%PTHREAD_LIBS%% \ - $(NULL) - - include $(topsrcdir)/config/rules.mk Deleted: trunk/www/seamonkey/files/patch-sysnss ============================================================================== --- trunk/www/seamonkey/files/patch-sysnss Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,180 +0,0 @@ ---- Makefile.in Tue Sep 14 16:59:40 2004 -+++ Makefile.in Tue Aug 2 08:26:55 2005 -@@ -102,6 +102,4 @@ - # tier 1 - 3rd party individual libraries - # --tier_1_dirs += dbm -- - ifndef MOZ_NATIVE_JPEG - tier_1_dirs += jpeg ---- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006 -+++ security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006 -@@ -124,19 +124,19 @@ - pipboot \ - $(NULL) - --EXTRA_DEPS = $(NSS_DEP_LIBS) - - DEFINES += -DNSS_ENABLE_ECC - - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += $(NSS_CFLAGS) -+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss - - EXTRA_DSO_LDOPTS += \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ - $(NSS_LIBS) \ -+ $(LOCAL_INCLUDES) \ - $(NULL) - - include $(topsrcdir)/config/rules.mk ---- security/manager/Makefile.in.orig 2009-08-07 22:37:51.000000000 +0200 -+++ security/manager/Makefile.in 2009-08-21 10:41:53.000000000 +0200 -@@ -56,24 +56,13 @@ - SOFTOKEN3_LIB \ - SOFTOKEN3_CHK \ - NSSDBM3_LIB \ -- LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_LIBS \ - HAVE_FREEBL_LIBS_32 \ - HAVE_FREEBL_LIBS_32INT64 \ - HAVE_FREEBL_LIBS_64 \ - $(NULL) -- --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) - endif - --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --NSSUTIL3_LIB = $(DLL_PREFIX)nssutil3$(DLL_SUFFIX) --SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) --SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) --SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) --SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk --NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX) -- - # Default - HAVE_FREEBL_LIBS = 1 - -@@ -222,11 +211,6 @@ - .nss.cleaned: .nss.checkout - ifndef MOZ_NATIVE_NSS - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - touch $@ - endif - -@@ -253,49 +237,6 @@ - cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) - endif - ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin --endif - endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -306,44 +247,6 @@ - - install:: - ifndef MOZ_NATIVE_NSS -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) --endif - endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -360,12 +263,6 @@ - $(MAKE) -C pki $@ - endif - ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - endif - - echo-requires-recursive:: Deleted: trunk/www/seamonkey/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,29 +0,0 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 -@@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); -+ gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); -@@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); Deleted: trunk/www/seamonkey/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc ============================================================================== --- trunk/www/seamonkey/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); Deleted: trunk/www/seamonkey/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in ============================================================================== --- trunk/www/seamonkey/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,56 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 14:31:25 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -59,8 +62,8 @@ - CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp - endif - endif --# IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+# IA64 Linux & FreeBSD -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s -+endif -+# -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif - endif - # - # Solaris/SPARC Deleted: trunk/www/seamonkey/files/patch-xptcall-alpha ============================================================================== --- trunk/www/seamonkey/files/patch-xptcall-alpha Wed Aug 3 23:00:36 2011 (r605) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,459 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura */ -+ -+#include -+#include -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ Modified: trunk/www/seamonkey/files/patch-xptcall-amd64 ============================================================================== --- trunk/www/seamonkey/files/patch-xptcall-amd64 Wed Aug 3 22:48:48 2011 (r605) +++ trunk/www/seamonkey/files/patch-xptcall-amd64 Wed Aug 3 23:00:36 2011 (r606) @@ -1,5 +1,5 @@ --- /dev/null Wed Dec 31 16:00:00 1969 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003 @@ -0,0 +1,174 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +// Platform specific code to invoke XPCOM methods on native objects @@ -176,7 +176,7 @@ + return result; +} --- /dev/null Wed Dec 31 16:00:00 1969 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp Thu Oct 16 23:01:08 2003 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp Thu Oct 16 23:01:08 2003 @@ -0,0 +1,206 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + Modified: trunk/www/seamonkey/files/patch-xptcall-ia64 ============================================================================== --- trunk/www/seamonkey/files/patch-xptcall-ia64 Wed Aug 3 22:48:48 2011 (r605) +++ trunk/www/seamonkey/files/patch-xptcall-ia64 Wed Aug 3 23:00:36 2011 (r606) @@ -1,24 +1,24 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 +--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig 2009-08-26 18:47:07.000000000 +0200 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s 2009-08-26 18:49:39.000000000 +0200 @@ -8,6 +8,7 @@ // Section has executable code .section .text, "ax","progbits" - // procedure named 'XPTC_InvokeByIndex' -+ .global XPTC_InvokeByIndex - .proc XPTC_InvokeByIndex + // procedure named 'NS_InvokeByIndex_P' ++ .global XPTC_InvokeByIndex + .proc NS_InvokeByIndex_P // manual bundling .explicit @@ -24,7 +25,7 @@ // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, // PRUint32 paramCount, nsXPTCVariant* params); --XPTC_InvokeByIndex:: -+XPTC_InvokeByIndex: +-NS_InvokeByIndex_P:: ++NS_InvokeByIndex_P: .prologue .save ar.pfs, r37 // allocate 4 input args, 6 local args, and 8 output args ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Tue May 24 11:30:54 2005 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Fri Sep 16 15:50:20 2005 +--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig 2009-08-26 18:47:07.000000000 +0200 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s 2009-08-26 18:47:34.000000000 +0200 @@ -6,6 +6,7 @@ // Section has executable code .section .text, "ax","progbits" Modified: trunk/www/seamonkey/files/patch-xptcall-sparc64 ============================================================================== --- trunk/www/seamonkey/files/patch-xptcall-sparc64 Wed Aug 3 22:48:48 2011 (r605) +++ trunk/www/seamonkey/files/patch-xptcall-sparc64 Wed Aug 3 23:00:36 2011 (r606) @@ -1,5 +1,5 @@ --- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 @@ -0,0 +1,123 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * @@ -125,7 +125,7 @@ + +#endif /* sparc || __sparc__ */ --- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 @@ -0,0 +1,104 @@ +/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * @@ -232,7 +232,7 @@ + + .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex --- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 @@ -0,0 +1,91 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * Added: trunk/www/seamonkey/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/pkg-message.in Wed Aug 3 23:00:36 2011 (r606) @@ -0,0 +1,10 @@ +***************************************************************************** +In order to activate the Lightning extension, every user should install the +XPI file into his own profile via the menu: + +Tools -> Add-ons -> Extensions -> Icon left of the search field + -> Install From File + +The XPI file was installed as: +%%PREFIX%%/share/lightning/lightning-seamonkey.xpi +***************************************************************************** Modified: trunk/www/seamonkey/files/seamonkey.desktop.in ============================================================================== --- trunk/www/seamonkey/files/seamonkey.desktop.in Wed Aug 3 22:48:48 2011 (r605) +++ trunk/www/seamonkey/files/seamonkey.desktop.in Wed Aug 3 23:00:36 2011 (r606) @@ -164,6 +164,6 @@ StartupNotify=true Terminal=false Type=Application -Icon=%%PREFIX%%/lib/seamonkey/chrome/icons/default/default.xpm +Icon=%%PREFIX%%/lib/seamonkey/chrome/icons/default/default48.png Categories=Application;Network; MimeType=text/html;text/xml;application/xhtml+xml; From owner-freebsd-gecko@FreeBSD.ORG Wed Aug 3 23:03:34 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 05C361065672 for ; Wed, 3 Aug 2011 23:03:34 +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 84ECC8FC0A for ; Wed, 3 Aug 2011 23:03:33 +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 p73N3WcH064139 for ; Wed, 3 Aug 2011 23:03:32 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p73N3RQq064006 for freebsd-gecko@freebsd.org; Wed, 3 Aug 2011 23:03:27 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 3 Aug 2011 23:03:27 GMT Message-Id: <201108032303.p73N3RQq064006@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] r607 - branches/experimental/www/firefox-aurora 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, 03 Aug 2011 23:03:34 -0000 Author: flo Date: Wed Aug 3 23:03:27 2011 New Revision: 607 Log: update to 7.0a2-20110803 (non debug builds are still broken) (distinfo was accidentally in the previous commit) Modified: branches/experimental/www/firefox-aurora/Makefile Modified: branches/experimental/www/firefox-aurora/Makefile ============================================================================== --- branches/experimental/www/firefox-aurora/Makefile Wed Aug 3 23:00:36 2011 (r606) +++ branches/experimental/www/firefox-aurora/Makefile Wed Aug 3 23:03:27 2011 (r607) @@ -6,7 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 7.0a2-20110706 +DISTVERSION= 7.0a2-20110803 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= http://tb.smeets.im/~flo/ \ From owner-freebsd-gecko@FreeBSD.ORG Thu Aug 4 18:06:36 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 DCEE9106567E for ; Thu, 4 Aug 2011 18:06:36 +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 795BB8FC1B for ; Thu, 4 Aug 2011 18:06:36 +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 p74I6ZRn083602 for ; Thu, 4 Aug 2011 18:06:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p74I6SX9080925 for freebsd-gecko@freebsd.org; Thu, 4 Aug 2011 18:06:28 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 4 Aug 2011 18:06:28 GMT Message-Id: <201108041806.p74I6SX9080925@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] r608 - in branches/experimental: Mk deskutils/lightning deskutils/lightning-thunderbird mail/thunderbird mail/thunderbird-beta mail/thunderbird3 www/firefox www/firefox-aurora www/firefox-beta www/firefox36 www/kompozer www/libxul www/seamonkey www/seamonkey-beta www/seamonkey2 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: Thu, 04 Aug 2011 18:06:37 -0000 Author: flo Date: Thu Aug 4 18:06:28 2011 New Revision: 608 Log: Get rid of GECKO_PTHREAD_LIBS, just use PTHREAD_LIBS, this will enable us to compile various gecko ports with clang. Right now firefox and thunderbird >= 6 can be compiled using clang Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/deskutils/lightning-thunderbird/Makefile branches/experimental/deskutils/lightning/Makefile branches/experimental/mail/thunderbird-beta/Makefile branches/experimental/mail/thunderbird/Makefile branches/experimental/mail/thunderbird3/Makefile branches/experimental/www/firefox-aurora/Makefile branches/experimental/www/firefox-beta/Makefile branches/experimental/www/firefox/Makefile branches/experimental/www/firefox36/Makefile branches/experimental/www/kompozer/Makefile branches/experimental/www/libxul/Makefile branches/experimental/www/seamonkey-beta/Makefile branches/experimental/www/seamonkey/Makefile branches/experimental/www/seamonkey2/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/Mk/bsd.gecko.mk Thu Aug 4 18:06:28 2011 (r608) @@ -530,7 +530,6 @@ PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in MOZCONFIG?= ${WRKSRC}/.mozconfig MOZILLA_PLIST_DIRS?= bin include lib share/idl -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} PKGINSTALL?= ${WRKDIR}/pkg-install PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall MASTER_MOZDIR?= ${PORTSDIR}/www/seamonkey Modified: branches/experimental/deskutils/lightning-thunderbird/Makefile ============================================================================== --- branches/experimental/deskutils/lightning-thunderbird/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/deskutils/lightning-thunderbird/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -61,8 +61,6 @@ EXTRA_PATCHES= ${FILESDIR}/liboggplay_oss .endif -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if defined(WITHOUT_DBUS) MOZ_OPTIONS+= --disable-dbus --disable-libnotify .else @@ -71,7 +69,7 @@ .endif post-patch: - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ Modified: branches/experimental/deskutils/lightning/Makefile ============================================================================== --- branches/experimental/deskutils/lightning/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/deskutils/lightning/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -61,8 +61,6 @@ EXTRA_PATCHES= ${FILESDIR}/liboggplay_oss .endif -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if defined(WITHOUT_DBUS) MOZ_OPTIONS+= --disable-dbus .else @@ -70,7 +68,7 @@ .endif post-patch: - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/mail/thunderbird-beta/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -70,8 +70,6 @@ .endif .endif -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -108,7 +106,7 @@ @${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}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/mail/thunderbird/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -71,8 +71,6 @@ .endif .endif -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -109,7 +107,7 @@ @${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}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/mail/thunderbird3/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -66,8 +66,6 @@ .endif .endif -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -87,7 +85,7 @@ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop post-patch: - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ Modified: branches/experimental/www/firefox-aurora/Makefile ============================================================================== --- branches/experimental/www/firefox-aurora/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/firefox-aurora/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -60,8 +60,6 @@ WRKSRC:= ${WRKDIR}/firefox-7.0a2 -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -113,7 +111,7 @@ @${GREP} -Flr \"/proc ${WRKSRC}/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}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/storage/build/Makefile.in \ ${WRKSRC}/toolkit/library/Makefile.in \ ${WRKSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/firefox-beta/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -59,8 +59,6 @@ WRKSRC:= ${WRKDIR}/mozilla-beta -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -112,7 +110,7 @@ @${GREP} -Flr \"/proc ${WRKSRC}/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}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/storage/build/Makefile.in \ ${WRKSRC}/toolkit/library/Makefile.in \ ${WRKSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/firefox/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -60,8 +60,6 @@ WRKSRC:= ${WRKDIR}/mozilla-release -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -113,7 +111,7 @@ @${GREP} -Flr \"/proc ${WRKSRC}/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}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/storage/build/Makefile.in \ ${WRKSRC}/toolkit/library/Makefile.in \ ${WRKSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/firefox36/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -75,8 +75,6 @@ WRKSRC:= ${WRKSRC}-1.9.2 -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -97,7 +95,7 @@ <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop post-patch: - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/storage/build/Makefile.in \ ${WRKSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ Modified: branches/experimental/www/kompozer/Makefile ============================================================================== --- branches/experimental/www/kompozer/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/kompozer/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -40,16 +40,11 @@ .include -.if ${ARCH}=="powerpc" -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED -} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} -.endif - pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) post-patch: - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/storage/build/Makefile.in @${RM} -f ${WRKSRC}/config.status ${WRKSRC}/config.cache @${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/Makefile.in Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/libxul/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -51,8 +51,6 @@ .include -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${OSVERSION} < 700000 LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio @@ -77,7 +75,7 @@ .endif post-patch: - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/storage/build/Makefile.in \ ${WRKSRC}/db/sqlite3/src/Makefile.in ${REINPLACE_CMD} -e 's|/usr/local/include|${LOCALBASE}/include|' \ Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/seamonkey-beta/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -71,8 +71,6 @@ MOZSRC:= ${WRKDIR}/comm-beta/mozilla WRKSRC= ${WRKDIR}/comm-beta -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -130,7 +128,7 @@ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \ ${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/seamonkey/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -71,8 +71,6 @@ MOZSRC:= ${WRKDIR}/comm-release/mozilla WRKSRC= ${WRKDIR}/comm-release -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -130,7 +128,7 @@ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \ ${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/www/seamonkey2/Makefile ============================================================================== --- branches/experimental/www/seamonkey2/Makefile Wed Aug 3 23:03:27 2011 (r607) +++ branches/experimental/www/seamonkey2/Makefile Thu Aug 4 18:06:28 2011 (r608) @@ -74,9 +74,6 @@ MOZSRC:= ${WRKDIR}/comm-1.9.1/mozilla WRKSRC= ${WRKDIR}/comm-1.9.1 -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED -} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui MOZ_OPTIONS+= --enable-gnomeui @@ -125,7 +122,7 @@ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \ ${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/mozilla/storage/build/Makefile.in @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ ${WRKSRC}/mozilla/modules/libpref/src/init/all.js From owner-freebsd-gecko@FreeBSD.ORG Fri Aug 5 20:38:03 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 82B291065670 for ; Fri, 5 Aug 2011 20:38:03 +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 1AB8F8FC0C for ; Fri, 5 Aug 2011 20:38:02 +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 p75Kc1cY084578 for ; Fri, 5 Aug 2011 20:38:01 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p75Kbu0D083820 for freebsd-gecko@freebsd.org; Fri, 5 Aug 2011 20:37:56 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 5 Aug 2011 20:37:56 GMT Message-Id: <201108052037.p75Kbu0D083820@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] r609 - branches/experimental/www/firefox-beta 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, 05 Aug 2011 20:38:03 -0000 Author: flo Date: Fri Aug 5 20:37:56 2011 New Revision: 609 Log: update to firefox 6 beta 5 Modified: branches/experimental/www/firefox-beta/Makefile branches/experimental/www/firefox-beta/distinfo Modified: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Thu Aug 4 18:06:28 2011 (r608) +++ branches/experimental/www/firefox-beta/Makefile Fri Aug 5 20:37:56 2011 (r609) @@ -6,7 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 6.0b4 +DISTVERSION= 6.0b5 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} Modified: branches/experimental/www/firefox-beta/distinfo ============================================================================== --- branches/experimental/www/firefox-beta/distinfo Thu Aug 4 18:06:28 2011 (r608) +++ branches/experimental/www/firefox-beta/distinfo Fri Aug 5 20:37:56 2011 (r609) @@ -1,2 +1,2 @@ -SHA256 (firefox-6.0b4.source.tar.bz2) = 6782d6a6e160dde291c61e51ea79d6bc3c888cf4af392f3f5e99bc5fbb3f24c8 -SIZE (firefox-6.0b4.source.tar.bz2) = 67698779 +SHA256 (firefox-6.0b5.source.tar.bz2) = 4ab9503ce183896642e243a7d994cea8faffb82c2acf9a976c26311377eb6987 +SIZE (firefox-6.0b5.source.tar.bz2) = 67714762