From owner-freebsd-gecko@FreeBSD.ORG Mon Apr 16 11:07:39 2012 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3B58D1065672 for ; Mon, 16 Apr 2012 11:07:39 +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 261988FC16 for ; Mon, 16 Apr 2012 11:07:39 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q3GB7dLk022677 for ; Mon, 16 Apr 2012 11:07:39 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q3GB7cVW022675 for gecko@FreeBSD.org; Mon, 16 Apr 2012 11:07:38 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 16 Apr 2012 11:07:38 GMT Message-Id: <201204161107.q3GB7cVW022675@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, 16 Apr 2012 11:07:39 -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 -------------------------------------------------------------------------------- f ports/165263 gecko mail/thunderbird: core dumping most time when users ar o ports/164919 gecko www/seamonkey fails to build on pre-SSE2 processor o ports/164905 gecko www/seamonkey fails to build with clang [patch] o ports/164687 gecko www/firefox: build fails on check-sync-dirs.py - parti o ports/164239 gecko [PATCH] mail/thunderbird: crash with nss_ldap o ports/164013 gecko www/firefox: Firefox-9 Icons & xpi-addons from ports o ports/163454 gecko [patch] www/firefox-beta: unbreak with libc++ o ports/162939 gecko www/firefox crashes with Zotero add-on o ports/162075 gecko www/firefox >= 7.0.1_2 bug with respect to pentadactyl o ports/161421 gecko [patch] www/firefox: use libevent2 o ports/160933 gecko Bad port interactions between Mozilla projects o ports/160387 gecko security/ca_root_nss: Allow user to trust extra local o ports/160351 gecko www/libxul installs incorrect mozilla-nss.pc o ports/159831 gecko www/firefox is broken 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/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 19 problems total. From owner-freebsd-gecko@FreeBSD.ORG Wed Apr 18 19:01:44 2012 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BDC83106566C; Wed, 18 Apr 2012 19:01:44 +0000 (UTC) (envelope-from ml@netfence.it) Received: from cp-out9.libero.it (cp-out9.libero.it [212.52.84.109]) by mx1.freebsd.org (Postfix) with ESMTP id 474488FC15; Wed, 18 Apr 2012 19:01:44 +0000 (UTC) X-CTCH-Spam: Unknown X-CTCH-RefID: str=0001.0A0B020A.4F8F0EDD.0060,ss=1,re=0.000,fgs=0 X-libjamoibt: 1555 Received: from soth.ventu (151.41.166.231) by cp-out9.libero.it (8.5.133) id 4F6ECC8C039AFCBD; Wed, 18 Apr 2012 20:58:37 +0200 Received: from alamar.ventu (alamar.ventu [10.1.2.18]) by soth.ventu (8.14.4/8.14.4) with ESMTP id q3IIwQWU089340; Wed, 18 Apr 2012 20:58:27 +0200 (CEST) (envelope-from ml@netfence.it) Message-ID: <4F8F0ED2.7050301@netfence.it> Date: Wed, 18 Apr 2012 20:58:26 +0200 From: Andrea Venturoli User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; it-IT; rv:1.9.2.28) Gecko/20120418 Thunderbird/3.1.20 MIME-Version: 1.0 To: freebsd-ports@freebsd.org, gecko@freebsd.org Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.72 on 10.1.2.13 Cc: Subject: ThunderBird 3 and nss_ldap 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: Wed, 18 Apr 2012 19:01:44 -0000 Hello. I see ThunderBird 3 is now deprecated and will soon be removed; I know this decision comes from upstream and I'd be fine with that. Only, this is the last version working with nss_ldap. I've reported this back when TB 5.0 came out and I've seen others asking for help. There's even a patch (ports/164239) laying there for some time, but I tried it today and it doesn't seem to help: I still get a crash on startup and the backtrace still seems to blame some interaction with nss_ldap. So, basically, I won't be able to keep using 3 and I won't be able to run a new version. Of course I'm willing to do any required testing, but I need some guidance with them. If anyone could help, I'd really appreciate it. bye & Thanks av. From owner-freebsd-gecko@FreeBSD.ORG Wed Apr 18 21:09:29 2012 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BF9541065691 for ; Wed, 18 Apr 2012 21:09:29 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (unknown [IPv6:2607:fc50:0:d300:216:3eff:fe54:f1c6]) by mx1.freebsd.org (Postfix) with ESMTP id 835E38FC19 for ; Wed, 18 Apr 2012 21:09:29 +0000 (UTC) Received: from neu.net (neu.net [199.48.129.194]) by mail.neu.net (8.14.5/8.14.5) with ESMTP id q3IL9ICr034672 for ; Wed, 18 Apr 2012 17:09:24 -0400 (EDT) (envelope-from andy@neu.net) Date: Wed, 18 Apr 2012 17:09:18 -0400 (EDT) From: AN To: gecko@FreeBSD.org Message-ID: User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII X-Spam-Status: No, score=-0.0 required=5.0 tests=T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.neu.net Cc: Subject: issue with VP8 and Ogg video 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: Wed, 18 Apr 2012 21:09:29 -0000 Hi: I want to report an issue I have playing HTML5 video in Firefox. - if you pause or stop a video it takes time (10-30 secs) before the sound stops playing - after viewing a video Firefox cpu utilization pegs at 100% and stays there until you exit firefox and restart it. I have seen this problem before with Adobe Flash, it seems that it has been fixed with Flash. Now it happens with VP8, and Ogg. I would like to help to troubleshoot this if I can. I am not a developer, just a lowly user. Here is what I see in "top" after watching HTML5 video on Youtube: PID USERNAME PRI NICE SIZE RES STATE C TIME WCPU COMMAND 27881 root 103 0 1129M 711M CPU2 1 29:06 100.00% firefox-bin{firefox- After restart Firefox shows 0% usage when Firefox is idle with 8 windows and about 15 tabs open. # uname -a FreeBSD FBSD10 10.0-CURRENT FreeBSD 10.0-CURRENT #11 r234399: Tue Apr 17 18:15:12 EDT 2012 root@FBSD10:/usr/obj/usr/src/sys/MYKERNEL amd64 # pkg_info |grep fox firefox-11.0,1 Web browser based on the browser portion of Mozilla # pkg_info |grep vp libvpx-1.0.0 VP8 Codec SDK I played videos from here: http://tinyvid.tv/ in Firefox with the same result as before. PID USERNAME PRI NICE SIZE RES STATE C TIME WCPU COMMAND 77678 root 103 0 1005M 595M CPU2 0 2:21 100.00% firefox-bin{firefox- So, apparently it happens with Ogg also. Let me know if I can provide any more info. From owner-freebsd-gecko@FreeBSD.ORG Thu Apr 19 10:56:50 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 00170106564A for ; Thu, 19 Apr 2012 10:56:49 +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 010A78FC0A for ; Thu, 19 Apr 2012 10:56:48 +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 q3JAugE8077698 for ; Thu, 19 Apr 2012 10:56: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 q3JAuaHh070994 for freebsd-gecko@freebsd.org; Thu, 19 Apr 2012 10:56:36 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 19 Apr 2012 10:56:36 GMT Message-Id: <201204191056.q3JAuaHh070994@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] r709 - branches/experimental/Mk branches/experimental/mail/thunderbird branches/experimental/mail/thunderbird-esr branches/experimental/mail/thunderbird-esr-i18n branches/experimental/mail/thunderbird-i18n branches/experimental/www/firefox branches/experimental/www/firefox-esr branches/experimental/www/firefox-esr-i18n branches/experimental/www/firefox-i18n trunk/Mk trunk/mail/thunderbird trunk/mail/thunderbird-esr trunk/mail/thunderbird-esr-i18n trunk/mail/thunderbird-i18n trunk/mail/thunderbird/files trunk/www/firefox trunk/www/firefox-esr trunk/www/firefox-esr-i18n trunk/www/firefox-i18n trunk/www/firefox/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: Thu, 19 Apr 2012 10:56:50 -0000 Author: beat Date: Thu Apr 19 10:56:36 2012 New Revision: 709 Log: - Sync with ports Added: trunk/mail/thunderbird-esr/ - copied from r708, branches/experimental/mail/thunderbird-esr/ trunk/mail/thunderbird-esr-i18n/ - copied from r708, branches/experimental/mail/thunderbird-esr-i18n/ trunk/www/firefox-esr/ - copied from r708, branches/experimental/www/firefox-esr/ trunk/www/firefox-esr-i18n/ - copied from r708, branches/experimental/www/firefox-esr-i18n/ Deleted: branches/experimental/www/firefox-esr/Makefile.webplugins trunk/www/firefox-esr/Makefile.webplugins Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/mail/thunderbird-esr-i18n/Makefile branches/experimental/mail/thunderbird-esr/Makefile branches/experimental/mail/thunderbird-i18n/Makefile branches/experimental/mail/thunderbird-i18n/distinfo branches/experimental/mail/thunderbird/Makefile branches/experimental/mail/thunderbird/distinfo branches/experimental/www/firefox-esr-i18n/Makefile branches/experimental/www/firefox-esr-i18n/Makefile.lang branches/experimental/www/firefox-esr-i18n/Makefile.option branches/experimental/www/firefox-esr/Makefile branches/experimental/www/firefox-i18n/Makefile branches/experimental/www/firefox/Makefile trunk/Mk/bsd.gecko.mk trunk/mail/thunderbird-esr-i18n/Makefile trunk/mail/thunderbird-esr/Makefile trunk/mail/thunderbird-i18n/Makefile trunk/mail/thunderbird-i18n/distinfo trunk/mail/thunderbird/Makefile trunk/mail/thunderbird/distinfo trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in trunk/www/firefox-esr-i18n/Makefile trunk/www/firefox-esr-i18n/Makefile.lang trunk/www/firefox-esr-i18n/Makefile.option trunk/www/firefox-esr/Makefile trunk/www/firefox-i18n/Makefile trunk/www/firefox-i18n/distinfo trunk/www/firefox/Makefile trunk/www/firefox/distinfo trunk/www/firefox/files/patch-browser-app-Makefile.in trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp trunk/www/firefox/files/patch-js-src-configure.in Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Sat Apr 14 21:22:56 2012 (r708) +++ branches/experimental/Mk/bsd.gecko.mk Thu Apr 19 10:56:36 2012 (r709) @@ -4,7 +4,7 @@ # Date created: 12 Nov 2005 # Whom: Michael Johnson # -# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.52 2012/03/14 15:50:04 beat Exp $ +# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.54 2012/04/18 15:00:14 beat Exp $ # # 4 column tabs prevent hair loss and tooth decay! Modified: branches/experimental/mail/thunderbird-esr-i18n/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr-i18n/Makefile Sat Apr 14 21:22:56 2012 (r708) +++ branches/experimental/mail/thunderbird-esr-i18n/Makefile Thu Apr 19 10:56:36 2012 (r709) @@ -2,7 +2,7 @@ # Date created: 29 May 2006 # Whom: Andrew Pantyukhin # -# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.60 2012/03/22 07:30:27 beat Exp $ +# $FreeBSD: ports/mail/thunderbird-esr-i18n/Makefile,v 1.62 2012/04/18 14:58:03 beat Exp $ # PORTNAME= thunderbird-i18n Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Sat Apr 14 21:22:56 2012 (r708) +++ branches/experimental/mail/thunderbird-esr/Makefile Thu Apr 19 10:56:36 2012 (r709) @@ -2,7 +2,7 @@ # Date created: 4 September 2003 # Whom: Joe Marcus Clarke # -# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.146 2012/03/14 09:49:01 beat Exp $ +# $FreeBSD: ports/mail/thunderbird-esr/Makefile,v 1.148 2012/04/18 14:57:12 beat Exp $ # PORTNAME= thunderbird Modified: branches/experimental/mail/thunderbird-i18n/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-i18n/Makefile Sat Apr 14 21:22:56 2012 (r708) +++ branches/experimental/mail/thunderbird-i18n/Makefile Thu Apr 19 10:56:36 2012 (r709) @@ -2,13 +2,13 @@ # Date created: 29 May 2006 # Whom: Andrew Pantyukhin # -# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.59 2012/03/14 09:49:01 beat Exp $ +# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.62 2012/04/19 05:19:55 beat Exp $ # PORTNAME= thunderbird-i18n -PORTVERSION= 10.0.3 +PORTVERSION= 11.0.1 CATEGORIES= mail -MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}esr/linux-i686/xpi +MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${THUNDERBIRD_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} @@ -27,7 +27,7 @@ .endif NO_BUILD= yes -USE_THUNDERBIRD= 10 +USE_THUNDERBIRD= 11 USE_XPI= thunderbird linux-thunderbird THUNDERBIRD_I18N_ALL= ar br ca cs da de en-GB en-US es-AR es-ES et eu fi fr \ Modified: branches/experimental/mail/thunderbird-i18n/distinfo ============================================================================== --- branches/experimental/mail/thunderbird-i18n/distinfo Sat Apr 14 21:22:56 2012 (r708) +++ branches/experimental/mail/thunderbird-i18n/distinfo Thu Apr 19 10:56:36 2012 (r709) @@ -1,84 +1,84 @@ -SHA256 (xpi/thunderbird-i18n-10.0.3/ar.xpi) = 35cb4a50b24558d44a9473b0a247e7228e9e06c77ccd59398a09bd4e2aa4bcf2 -SIZE (xpi/thunderbird-i18n-10.0.3/ar.xpi) = 441462 -SHA256 (xpi/thunderbird-i18n-10.0.3/br.xpi) = 90986fed08d865c1228565b431a52a144c6ee691f9e84ef791f2a0e06435b4cc -SIZE (xpi/thunderbird-i18n-10.0.3/br.xpi) = 415523 -SHA256 (xpi/thunderbird-i18n-10.0.3/ca.xpi) = 40dc4bf050f5f94f6f32a8bde6eec69525dbeca29c6c09803174a974018ddd8b -SIZE (xpi/thunderbird-i18n-10.0.3/ca.xpi) = 416065 -SHA256 (xpi/thunderbird-i18n-10.0.3/cs.xpi) = 38e3e5a0744e1d2af582742cdc78b0264db653f29285ed9c7357f7cefec80676 -SIZE (xpi/thunderbird-i18n-10.0.3/cs.xpi) = 419415 -SHA256 (xpi/thunderbird-i18n-10.0.3/da.xpi) = dc9e5f1e9fb9c20cb2c0bd0688ad0338add337e787251e6f1303709d0df25b79 -SIZE (xpi/thunderbird-i18n-10.0.3/da.xpi) = 363372 -SHA256 (xpi/thunderbird-i18n-10.0.3/de.xpi) = c00b4dd2d236161a7c3d789b6950c6ae8981a3ca98c7aef02184f5d7be7d53a9 -SIZE (xpi/thunderbird-i18n-10.0.3/de.xpi) = 418263 -SHA256 (xpi/thunderbird-i18n-10.0.3/en-GB.xpi) = e005bc85a3dff4f7f49b948e05e316d593ab6bd2032b35ad53e62cb237aace97 -SIZE (xpi/thunderbird-i18n-10.0.3/en-GB.xpi) = 391739 -SHA256 (xpi/thunderbird-i18n-10.0.3/en-US.xpi) = 240f0cb32acd5295d19e9fc384b3a99765930102dfaed5b1f9310a342c420022 -SIZE (xpi/thunderbird-i18n-10.0.3/en-US.xpi) = 391239 -SHA256 (xpi/thunderbird-i18n-10.0.3/es-AR.xpi) = e825057b315c26a6d3762acf7511408ca4adbbdae9c06b2b1f3f66b1e13cef0e -SIZE (xpi/thunderbird-i18n-10.0.3/es-AR.xpi) = 410723 -SHA256 (xpi/thunderbird-i18n-10.0.3/es-ES.xpi) = 39c0057e14359acdd4355f44ca7d4a2fa5d1594a95f8b0367d3dfbeaedd51c03 -SIZE (xpi/thunderbird-i18n-10.0.3/es-ES.xpi) = 355140 -SHA256 (xpi/thunderbird-i18n-10.0.3/et.xpi) = 22081871d97c4e4017bd7633c8e99c87e89d478d828b8af7ab0fed262be39f65 -SIZE (xpi/thunderbird-i18n-10.0.3/et.xpi) = 410720 -SHA256 (xpi/thunderbird-i18n-10.0.3/eu.xpi) = d184c996c336ecc6ab93c821e8fbc5a69154210e8ee6a44a9824093cf1ec4d6e -SIZE (xpi/thunderbird-i18n-10.0.3/eu.xpi) = 406383 -SHA256 (xpi/thunderbird-i18n-10.0.3/fi.xpi) = b18c9ee4d136af05a7bc01c47522ba7bf2526859e0475c845d507d76e2f3c160 -SIZE (xpi/thunderbird-i18n-10.0.3/fi.xpi) = 411925 -SHA256 (xpi/thunderbird-i18n-10.0.3/fr.xpi) = 53b23cead071ee75fb9277280ace903a56739ea03ce51a6290f7c24d2c193bd9 -SIZE (xpi/thunderbird-i18n-10.0.3/fr.xpi) = 414745 -SHA256 (xpi/thunderbird-i18n-10.0.3/fy-NL.xpi) = 80e9b13ce9668f9973e3352c692c40175ae931960848a97f4895922d63e35f62 -SIZE (xpi/thunderbird-i18n-10.0.3/fy-NL.xpi) = 413981 -SHA256 (xpi/thunderbird-i18n-10.0.3/ga-IE.xpi) = efea50cfed12ec8d5fd744073479156af6b1a7faddd447dd892a052c270b4211 -SIZE (xpi/thunderbird-i18n-10.0.3/ga-IE.xpi) = 423257 -SHA256 (xpi/thunderbird-i18n-10.0.3/gd.xpi) = 47e67ad2c85b9f018b65d1d1d08f609fcef39d61a287f2e5a4cc8d9e49716c32 -SIZE (xpi/thunderbird-i18n-10.0.3/gd.xpi) = 425871 -SHA256 (xpi/thunderbird-i18n-10.0.3/gl.xpi) = 1851262d60689f70d272cafdaa75d6fa0a34e1c694c0d391f3b420ef232ddfa5 -SIZE (xpi/thunderbird-i18n-10.0.3/gl.xpi) = 409226 -SHA256 (xpi/thunderbird-i18n-10.0.3/he.xpi) = de0f654e12f9576b614b0ed64117fa28f7b7c2f707870308036012683ffd1925 -SIZE (xpi/thunderbird-i18n-10.0.3/he.xpi) = 439203 -SHA256 (xpi/thunderbird-i18n-10.0.3/hu.xpi) = 572807030037168bba5f9d2ac857d303c683105f1fa2ccaf3487f3e4e8d5c950 -SIZE (xpi/thunderbird-i18n-10.0.3/hu.xpi) = 426354 -SHA256 (xpi/thunderbird-i18n-10.0.3/is.xpi) = f5137a07f033cdca54acc326020d2d372196cd79b147986081a09eef32645c82 -SIZE (xpi/thunderbird-i18n-10.0.3/is.xpi) = 412631 -SHA256 (xpi/thunderbird-i18n-10.0.3/it.xpi) = 403b69429ad951529bc46d0beae23ef0724815f3c39290db59d128cd5dd47804 -SIZE (xpi/thunderbird-i18n-10.0.3/it.xpi) = 347630 -SHA256 (xpi/thunderbird-i18n-10.0.3/ja.xpi) = f0300add69719084fdca5112068fbf208b1b570f366b7e22159aa8b3bea58926 -SIZE (xpi/thunderbird-i18n-10.0.3/ja.xpi) = 459027 -SHA256 (xpi/thunderbird-i18n-10.0.3/ko.xpi) = 802fb0df904c074e436de03e0b1418feab512995b4310c8d8391f3c7257f1815 -SIZE (xpi/thunderbird-i18n-10.0.3/ko.xpi) = 372009 -SHA256 (xpi/thunderbird-i18n-10.0.3/lt.xpi) = a76b1b20c92b22d0a8fa63f7ac8a890283d3861b17a75f910f58f91e9e71f93c -SIZE (xpi/thunderbird-i18n-10.0.3/lt.xpi) = 531018 -SHA256 (xpi/thunderbird-i18n-10.0.3/nb-NO.xpi) = 98256461574f7aa06199500afd48a0700e5dd76072d0f175d5346f763dfd329b -SIZE (xpi/thunderbird-i18n-10.0.3/nb-NO.xpi) = 407726 -SHA256 (xpi/thunderbird-i18n-10.0.3/nl.xpi) = 81cf4c679fda285400ba2ed8043a546132acd50b82863de15312a66eb72b2d6e -SIZE (xpi/thunderbird-i18n-10.0.3/nl.xpi) = 407981 -SHA256 (xpi/thunderbird-i18n-10.0.3/nn-NO.xpi) = dd4ccb6e3a3660e9ef3e331a953ca2e96ff12ade94d7ddff024595b3a2702d2f -SIZE (xpi/thunderbird-i18n-10.0.3/nn-NO.xpi) = 409455 -SHA256 (xpi/thunderbird-i18n-10.0.3/pl.xpi) = 07810903b8aa75d0378f8a3a790b6fe8097952a2b0e239b9033e58fccc2b68d3 -SIZE (xpi/thunderbird-i18n-10.0.3/pl.xpi) = 393574 -SHA256 (xpi/thunderbird-i18n-10.0.3/pt-BR.xpi) = 781061abb5bb55ed5b49b6b659c560830d191f36eeb052420b91287d1cc77e64 -SIZE (xpi/thunderbird-i18n-10.0.3/pt-BR.xpi) = 417225 -SHA256 (xpi/thunderbird-i18n-10.0.3/pt-PT.xpi) = aa0425c45464ecfc94c5912a5020760e37f235c5ff8657c0375087c6232054ce -SIZE (xpi/thunderbird-i18n-10.0.3/pt-PT.xpi) = 414262 -SHA256 (xpi/thunderbird-i18n-10.0.3/rm.xpi) = 1ba0594b7029d4c9b2b239cc52d6bc3b861cf5c20d02dd2d17046b924d647fee -SIZE (xpi/thunderbird-i18n-10.0.3/rm.xpi) = 414704 -SHA256 (xpi/thunderbird-i18n-10.0.3/ru.xpi) = ec610eac0811a68b0dbc1014915ffe2f2eef6db1ac1680683c1e2a6b5127ac59 -SIZE (xpi/thunderbird-i18n-10.0.3/ru.xpi) = 411631 -SHA256 (xpi/thunderbird-i18n-10.0.3/si.xpi) = 0e0bfa36032aefd3a391d0388e1f90eddc14957112189132045b476ec5dcb58d -SIZE (xpi/thunderbird-i18n-10.0.3/si.xpi) = 456604 -SHA256 (xpi/thunderbird-i18n-10.0.3/sk.xpi) = 4ead646b5aead9d4478c7340c6daf49ffcf82a8b134dbf7286e131e9297a0cca -SIZE (xpi/thunderbird-i18n-10.0.3/sk.xpi) = 425026 -SHA256 (xpi/thunderbird-i18n-10.0.3/sl.xpi) = a32141c4df379da4ba6f408d05e384590088f5d51e3bd5a092a246663a1aa0cd -SIZE (xpi/thunderbird-i18n-10.0.3/sl.xpi) = 410428 -SHA256 (xpi/thunderbird-i18n-10.0.3/sq.xpi) = a74763ebaf9572e8916ef4251540fc9626a9c29b4269b9cfa61e9b13fca02194 -SIZE (xpi/thunderbird-i18n-10.0.3/sq.xpi) = 360476 -SHA256 (xpi/thunderbird-i18n-10.0.3/sv-SE.xpi) = 6665a49e1d1fce0676f1d9b68d13c2db10457c7e1b73fa8b9f2f729ddb9d175e -SIZE (xpi/thunderbird-i18n-10.0.3/sv-SE.xpi) = 478278 -SHA256 (xpi/thunderbird-i18n-10.0.3/ta-LK.xpi) = 2ed073ee939f6f85fcccf064d7d71a4838b713dc5fe3b54254369e797c4e495d -SIZE (xpi/thunderbird-i18n-10.0.3/ta-LK.xpi) = 475715 -SHA256 (xpi/thunderbird-i18n-10.0.3/tr.xpi) = 96ed93aea3ea42ad1aeef8fc30f3b54a5b2efb4b219a35959864231e510e64cb -SIZE (xpi/thunderbird-i18n-10.0.3/tr.xpi) = 418206 -SHA256 (xpi/thunderbird-i18n-10.0.3/uk.xpi) = 8ab1d49cc57f3f367e94852e4ef78fdb08471dad89bcc59e005a6ba1cba9dcaf -SIZE (xpi/thunderbird-i18n-10.0.3/uk.xpi) = 463922 -SHA256 (xpi/thunderbird-i18n-10.0.3/zh-TW.xpi) = bc6f06aa0bedf72f326a9f525f17c0828fb7569ccf45d891487f189c4d1d5a8e -SIZE (xpi/thunderbird-i18n-10.0.3/zh-TW.xpi) = 431824 +SHA256 (xpi/thunderbird-i18n-11.0.1/ar.xpi) = dc33c48ea71c4ed3e182f995804f2097933966aa894f38b09b3c81e6309045a2 +SIZE (xpi/thunderbird-i18n-11.0.1/ar.xpi) = 441218 +SHA256 (xpi/thunderbird-i18n-11.0.1/br.xpi) = b45ed72de9efa9cce4284163734a3a365d4384a38fa408235445ca23f7edabad +SIZE (xpi/thunderbird-i18n-11.0.1/br.xpi) = 414899 +SHA256 (xpi/thunderbird-i18n-11.0.1/ca.xpi) = 37c361b3a124d8a7c7ff6cf13840d29ce13981c59d23dbd06e1aa662b5bde410 +SIZE (xpi/thunderbird-i18n-11.0.1/ca.xpi) = 415452 +SHA256 (xpi/thunderbird-i18n-11.0.1/cs.xpi) = 0a4dc62584652c287f06b3c4765ea83fe02970dd3b5e139771c1dd65435950d8 +SIZE (xpi/thunderbird-i18n-11.0.1/cs.xpi) = 418866 +SHA256 (xpi/thunderbird-i18n-11.0.1/da.xpi) = bd07e4f4b7a8d6c1ca6b6eb2cf0eddda271ab7c59933076acd63118f211533c7 +SIZE (xpi/thunderbird-i18n-11.0.1/da.xpi) = 362836 +SHA256 (xpi/thunderbird-i18n-11.0.1/de.xpi) = 129c80d6405ec0830238f7eac7446428c96f3745e2f374426b7ec044fa78d2ac +SIZE (xpi/thunderbird-i18n-11.0.1/de.xpi) = 417770 +SHA256 (xpi/thunderbird-i18n-11.0.1/en-GB.xpi) = 0099136fa300f2cda1ca849105b8d170fdf785e357f03b0a88ea2059638bc371 +SIZE (xpi/thunderbird-i18n-11.0.1/en-GB.xpi) = 391088 +SHA256 (xpi/thunderbird-i18n-11.0.1/en-US.xpi) = 94c55301469821c85a4d12262ae22e8787898f1de650e37eda27ddf8b8477572 +SIZE (xpi/thunderbird-i18n-11.0.1/en-US.xpi) = 390611 +SHA256 (xpi/thunderbird-i18n-11.0.1/es-AR.xpi) = 507ac78865a1b64bc7df80b1f22a7a7399566295abaf6696cc3626fff24baddd +SIZE (xpi/thunderbird-i18n-11.0.1/es-AR.xpi) = 410206 +SHA256 (xpi/thunderbird-i18n-11.0.1/es-ES.xpi) = 586649925347e65b907193d36e940d6b650e843cd82d9ae8255decc08f4d6732 +SIZE (xpi/thunderbird-i18n-11.0.1/es-ES.xpi) = 354877 +SHA256 (xpi/thunderbird-i18n-11.0.1/et.xpi) = 108656c14050878a7c4cef2a3cbd254d55dbd77160e1f4a091340100b8e5f50a +SIZE (xpi/thunderbird-i18n-11.0.1/et.xpi) = 410225 +SHA256 (xpi/thunderbird-i18n-11.0.1/eu.xpi) = 644367251d9d1e3da1a5e61a8e8728ec22e87b86a85b6b6cadf5c92598658ae7 +SIZE (xpi/thunderbird-i18n-11.0.1/eu.xpi) = 405866 +SHA256 (xpi/thunderbird-i18n-11.0.1/fi.xpi) = 65ea343c2444e424643d2d05ae4f8af128219507343577238f9a91c2606f0b0b +SIZE (xpi/thunderbird-i18n-11.0.1/fi.xpi) = 411326 +SHA256 (xpi/thunderbird-i18n-11.0.1/fr.xpi) = 9b0e27d679c86e79993cba8b9db6f05401813b33f15b3a9c22fbf78c7680753e +SIZE (xpi/thunderbird-i18n-11.0.1/fr.xpi) = 414193 +SHA256 (xpi/thunderbird-i18n-11.0.1/fy-NL.xpi) = 24158315524bba556a32ebc33ee02d0ea08507b80b2e01a4af5f3066f23596c6 +SIZE (xpi/thunderbird-i18n-11.0.1/fy-NL.xpi) = 413334 +SHA256 (xpi/thunderbird-i18n-11.0.1/ga-IE.xpi) = 7090ec3530a6aba4898930448e4bfac958ca7e689edbb10d527ca04afa44039c +SIZE (xpi/thunderbird-i18n-11.0.1/ga-IE.xpi) = 422576 +SHA256 (xpi/thunderbird-i18n-11.0.1/gd.xpi) = f3c9c7fbd44fff3d86cf917cb225f1d2645b4b8c59cc26ae5d77ed682af22a43 +SIZE (xpi/thunderbird-i18n-11.0.1/gd.xpi) = 425359 +SHA256 (xpi/thunderbird-i18n-11.0.1/gl.xpi) = 814bf0cee6b26c313babf3911cd013eca406eeead50d0a97eef12a28722dfdea +SIZE (xpi/thunderbird-i18n-11.0.1/gl.xpi) = 408704 +SHA256 (xpi/thunderbird-i18n-11.0.1/he.xpi) = f8a1e8fc5343abd2f2fa270ef7dbe9cc178c5708d2f3fa2482039752345b4333 +SIZE (xpi/thunderbird-i18n-11.0.1/he.xpi) = 439648 +SHA256 (xpi/thunderbird-i18n-11.0.1/hu.xpi) = 5b2b53331b13b0d586e66859d2355609c8c368df6fc8fdaf2a7e038d064d43d2 +SIZE (xpi/thunderbird-i18n-11.0.1/hu.xpi) = 425845 +SHA256 (xpi/thunderbird-i18n-11.0.1/is.xpi) = 0b90944850f2812fc09d8bc45bd26443461bad34643143930d7c8a862112fe2b +SIZE (xpi/thunderbird-i18n-11.0.1/is.xpi) = 412048 +SHA256 (xpi/thunderbird-i18n-11.0.1/it.xpi) = 7c4fb59d0d5b9c5f56334c7ff91059f01daed7a00fd18ed6e3d0e0034c62ce81 +SIZE (xpi/thunderbird-i18n-11.0.1/it.xpi) = 347268 +SHA256 (xpi/thunderbird-i18n-11.0.1/ja.xpi) = 5b68c6867bec46bd90bedd8924fb01fd05a07f1a18c7febebb1305f1a7f9f8a7 +SIZE (xpi/thunderbird-i18n-11.0.1/ja.xpi) = 458653 +SHA256 (xpi/thunderbird-i18n-11.0.1/ko.xpi) = 8c883b8e3f2ef0a37d9f3b0f0f0c77a6c65eafd13740bbaacacb46c26b7c0ff8 +SIZE (xpi/thunderbird-i18n-11.0.1/ko.xpi) = 371466 +SHA256 (xpi/thunderbird-i18n-11.0.1/lt.xpi) = c417be2722e0067d278394e104ff1ccb609ecf55f78f977ecaa3a09a9a513c8a +SIZE (xpi/thunderbird-i18n-11.0.1/lt.xpi) = 520219 +SHA256 (xpi/thunderbird-i18n-11.0.1/nb-NO.xpi) = 074238822117deb6c27c7b79c13607d4bcc97361bfd778f470d1d1eb6e409633 +SIZE (xpi/thunderbird-i18n-11.0.1/nb-NO.xpi) = 407150 +SHA256 (xpi/thunderbird-i18n-11.0.1/nl.xpi) = 28b6cc42fbd371b2db12d03c60934c0d4e5375c5b76559c9f3738833e7d843f4 +SIZE (xpi/thunderbird-i18n-11.0.1/nl.xpi) = 407423 +SHA256 (xpi/thunderbird-i18n-11.0.1/nn-NO.xpi) = f4eaa66350e548926b2280045f5159774db32afeb64a0961762c74909c126dce +SIZE (xpi/thunderbird-i18n-11.0.1/nn-NO.xpi) = 408836 +SHA256 (xpi/thunderbird-i18n-11.0.1/pl.xpi) = 00b3ad92d44e01c9f96c67d2f4199ebe50e0724f494ddde35dd5787c9829453b +SIZE (xpi/thunderbird-i18n-11.0.1/pl.xpi) = 393414 +SHA256 (xpi/thunderbird-i18n-11.0.1/pt-BR.xpi) = e22bd2a5321edafa1092ee32c63e66b2ea3564585753a0621199285584af133e +SIZE (xpi/thunderbird-i18n-11.0.1/pt-BR.xpi) = 416625 +SHA256 (xpi/thunderbird-i18n-11.0.1/pt-PT.xpi) = 2efc4671caf36f029b4ce334462749ed66618fcb6c9292faceda6d010d9e4184 +SIZE (xpi/thunderbird-i18n-11.0.1/pt-PT.xpi) = 413734 +SHA256 (xpi/thunderbird-i18n-11.0.1/rm.xpi) = 1dab1c383188c6e98aadfed3f41e22c381c074c6f90287ee686ea07b7e2d46a7 +SIZE (xpi/thunderbird-i18n-11.0.1/rm.xpi) = 414164 +SHA256 (xpi/thunderbird-i18n-11.0.1/ru.xpi) = 159b4c75cffd319b5f7fa94d6a3901a660adc5672debbb2ba5640f7295745b9b +SIZE (xpi/thunderbird-i18n-11.0.1/ru.xpi) = 411332 +SHA256 (xpi/thunderbird-i18n-11.0.1/si.xpi) = 448829c55c743140a3c8d833dd7e342af9ded220145b2c9706cf9322f9e0d764 +SIZE (xpi/thunderbird-i18n-11.0.1/si.xpi) = 456008 +SHA256 (xpi/thunderbird-i18n-11.0.1/sk.xpi) = 435b8253906a992c4ed1bd7c55c461bcf7a49af188d63dbdf14e74b37d8bccaf +SIZE (xpi/thunderbird-i18n-11.0.1/sk.xpi) = 424700 +SHA256 (xpi/thunderbird-i18n-11.0.1/sl.xpi) = 0f41d994afac995e2368db51f2520bc4500a22461573920a11e4e0f717fea6fc +SIZE (xpi/thunderbird-i18n-11.0.1/sl.xpi) = 409945 +SHA256 (xpi/thunderbird-i18n-11.0.1/sq.xpi) = 68527e14390e75fa7b9648e8621d556b32a9af35d6007aa8f6c317ecb1272e76 +SIZE (xpi/thunderbird-i18n-11.0.1/sq.xpi) = 360003 +SHA256 (xpi/thunderbird-i18n-11.0.1/sv-SE.xpi) = 8a7f6a3a5b46cc844675713a41d7aae0d28865ea750370f9a6484a1dbf1322d9 +SIZE (xpi/thunderbird-i18n-11.0.1/sv-SE.xpi) = 477715 +SHA256 (xpi/thunderbird-i18n-11.0.1/ta-LK.xpi) = 30668e06ee8f811f4ac1594472093b7c0f69d443c25dd3d7d0868aa37ca17ee0 +SIZE (xpi/thunderbird-i18n-11.0.1/ta-LK.xpi) = 475124 +SHA256 (xpi/thunderbird-i18n-11.0.1/tr.xpi) = 820c0ef9c23cbf78e1a60cedb5f0b3b9ed0432f9856f8edd6949cb1dddae54a5 +SIZE (xpi/thunderbird-i18n-11.0.1/tr.xpi) = 417470 +SHA256 (xpi/thunderbird-i18n-11.0.1/uk.xpi) = 40b5d07fde8ee7a8a74c64c15cbb64dea72e3cef306fc06f68e2ff65087de24a +SIZE (xpi/thunderbird-i18n-11.0.1/uk.xpi) = 463181 +SHA256 (xpi/thunderbird-i18n-11.0.1/zh-TW.xpi) = 0b0bfebe4b7dea23bcc939e5a07d51ee603a4079e62f7b3e5095a945e0af452c +SIZE (xpi/thunderbird-i18n-11.0.1/zh-TW.xpi) = 431216 Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Sat Apr 14 21:22:56 2012 (r708) +++ branches/experimental/mail/thunderbird/Makefile Thu Apr 19 10:56:36 2012 (r709) @@ -2,11 +2,11 @@ # Date created: 4 September 2003 # Whom: Joe Marcus Clarke # -# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.146 2012/03/14 09:49:01 beat Exp $ +# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.148 2012/04/19 05:19:55 beat Exp $ # PORTNAME= thunderbird -DISTVERSION= 11.0 +DISTVERSION= 11.0.1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source Modified: branches/experimental/mail/thunderbird/distinfo ============================================================================== --- branches/experimental/mail/thunderbird/distinfo Sat Apr 14 21:22:56 2012 (r708) +++ branches/experimental/mail/thunderbird/distinfo Thu Apr 19 10:56:36 2012 (r709) @@ -1,2 +1,2 @@ -SHA256 (thunderbird-11.0.source.tar.bz2) = 5a581cd677e718b9917fabeb080ad3488fbb3ba2c085b0530527da119f3d3753 -SIZE (thunderbird-11.0.source.tar.bz2) = 101442328 +SHA256 (thunderbird-11.0.1.source.tar.bz2) = 5a5c35b76ecd38624a12b817909b3dcfe9c378c10cbfce60c9971e18251305a0 +SIZE (thunderbird-11.0.1.source.tar.bz2) = 101480528 Modified: branches/experimental/www/firefox-esr-i18n/Makefile ============================================================================== --- branches/experimental/www/firefox-esr-i18n/Makefile Sat Apr 14 21:22:56 2012 (r708) +++ branches/experimental/www/firefox-esr-i18n/Makefile Thu Apr 19 10:56:36 2012 (r709) @@ -2,7 +2,7 @@ # Date created: 28 May 2006 # Whom: Andrew Pantyukhin # -# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.69 2012/03/22 07:30:27 beat Exp $ +# $FreeBSD: ports/www/firefox-esr-i18n/Makefile,v 1.71 2012/04/18 14:47:46 beat Exp $ # PORTNAME= firefox-i18n Modified: branches/experimental/www/firefox-esr-i18n/Makefile.lang ============================================================================== --- branches/experimental/www/firefox-esr-i18n/Makefile.lang Sat Apr 14 21:22:56 2012 (r708) +++ branches/experimental/www/firefox-esr-i18n/Makefile.lang Thu Apr 19 10:56:36 2012 (r709) @@ -2,7 +2,7 @@ # Date created: 30 Nov 2008 # Whom: Koji Yokota # -# $FreeBSD: ports/www/firefox-i18n/Makefile.lang,v 1.4 2011/06/21 21:12:31 flo Exp $ +# $FreeBSD: ports/www/firefox-esr-i18n/Makefile.lang,v 1.5 2012/04/18 14:43:11 beat Exp $ # # Currently, the following 71 languages are supported. # Modified: branches/experimental/www/firefox-esr-i18n/Makefile.option ============================================================================== --- branches/experimental/www/firefox-esr-i18n/Makefile.option Sat Apr 14 21:22:56 2012 (r708) +++ branches/experimental/www/firefox-esr-i18n/Makefile.option Thu Apr 19 10:56:36 2012 (r709) @@ -2,7 +2,7 @@ # Date created: 30 Nov 2008 # Whom: Koji Yokota # -# $FreeBSD: ports/www/firefox-i18n/Makefile.option,v 1.5 2011/06/27 09:53:31 flo Exp $ +# $FreeBSD: ports/www/firefox-esr-i18n/Makefile.option,v 1.6 2012/04/18 14:43:11 beat Exp $ # OPTIONS= LANG_AF "Africaans" off \ LANG_AK "Akan" off \ Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Sat Apr 14 21:22:56 2012 (r708) +++ branches/experimental/www/firefox-esr/Makefile Thu Apr 19 10:56:36 2012 (r709) @@ -2,7 +2,7 @@ # Date created: 2002/10/21 # Whom: Alan Eldridge # -# $FreeBSD: ports/www/firefox/Makefile,v 1.264 2012/03/14 09:34:46 beat Exp $ +# $FreeBSD: ports/www/firefox-esr/Makefile,v 1.266 2012/04/18 14:46:31 beat Exp $ # PORTNAME= firefox Deleted: branches/experimental/www/firefox-esr/Makefile.webplugins ============================================================================== --- branches/experimental/www/firefox-esr/Makefile.webplugins Thu Apr 19 10:56:36 2012 (r708) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,226 +0,0 @@ -#-*- mode: makefile; tab-width: 4; -* -# ex:ts=4 -# -# New ports collection makefile for: npapi infrastructure -# Date created: 27 June 2006 -# Whom: Andrew Pantyukhin -# -# $FreeBSD: ports/www/firefox/Makefile.webplugins,v 1.1 2009/01/10 02:45:41 mezz Exp $ -# $MCom: ports-stable/www/firefox/Makefile.webplugins,v 1.14 2008/11/12 17:55:09 mezz Exp $ -# - -# MAINTAINER= gnome@FreeBSD.org -# -# Documentation and examples: -# -# Makefile.webplugins will create symlinks automatically for each supported -# applications that supports the webplugins framework. Also, it will remove -# these symlinks when the plug-in port is uninstalled. -# -# USE_WEBPLUGINS - Specify a list of application(s) that this plug-in -# port supports. For each of these applications, a -# symlink will be created in -# lib/browser_plugins/symlinks. See -# WEBPLUGINS_APPS_ALL_* below for the list of -# supported applications. -# Default: USE_WEBPLUGINS=${WEBPLUGINS_APPS_ALL} (all -# applications) -# -# WEBPLUGINS_NAME - If your port installs file(s) in ${WEBPLUGINS_DIR}, -# then you can tweak WEBPLUGINS_NAME to change the -# name of the directory -# (lib/browser_plugins/symlinks/WEBPLUGINS_NAME). -# Default: WEBPLUGINS_NAME=${PKGBASE} -# -# WEBPLUGINS_FILES - The plug-in file(s) that are going to be linked -# in lib/browser_plugins/symlinks/*/. It cannot -# be empty or the port will set IGNORE. -# -# WEBPLUGINS_DIR - The directory where the plug-in file(s) can be -# found. Each plug-in file in WEBPLUGINS_FILES -# must be found in WEBPLUGINS_DIR. If your port -# does not install in WEBPLUGINS_DIR, but in its own -# path. You will need to specify that here or -# symlinks will be created to non-existent files. -# Default: WEBPLUGINS_DIR?=${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME} -# -# -# The USE_WEBPLUGINS supports wildcards, native, and linux; so you can do any -# of the following: -# -# USE_WEBPLUGINS=gecko* (Supports gecko18 and gecko19.) -# USE_WEBPLUGINS=native (Supports gecko*, opera*, and webkit-gtk2) -# USE_WEBPLUGINS=linux (Supports linux-*) -# USE_WEBPLUGINS=opera webkit-gtk2 -# -# Example to add in Makefile and pkg-plist if the plug-in file(s) install in -# WEBPLUGINS_DIR, and if your port does this manually: -# -# Makefile: -# ------------------------------------------------------ -# [...] -# USE_WEBPLUGINS=gecko* -# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi -# -# .include -# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" -# -# post-install: -# ${MKDIR} ${WEBPLUGINS_DIR} -# ${INSTALL_DATA} ${WEBPLUGINS_FILES:S,^,${WRKSRC}/plugins/,} \ -# ${WEBPLUGINS_DIR} -# -# .include -# ------------------------------------------------------ -# -# You do not need to add lib/browser_plugins and lib/browser_plugins/symlinks -# in pkg-plist, because they will be removed automatically. -# -# pkg-plist: -# ------------------------------------------------------ -# [...] -# %%WEBPLUGINS_DIR%%/fooplugin.so -# %%WEBPLUGINS_DIR%%/fooplugin.xpi -# @dirrmtry %%WEBPLUGINS_DIR%% -# ------------------------------------------------------ -# -# Here is what it will look like when it creates the symlinks: -# -# ------------------------------------------------------ -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi -# ------------------------------------------------------ -# -# If your port uses libtool, and installs any *.a and *.la files, do not add -# these files to WEBPLUGINS_FILES. WEBPLUGINS_FILES should be *.so or/and -# *.xpi ONLY. -# -# Example to add in Makefile and pkg-plist if your port installs plug-ins in -# its own directory, and you need to set WEBPLUGINS_DIR. -# -# Makefile: -# ------------------------------------------------------ -# [...] -# USE_WEBPLUGINS=gecko* -# WEBPLUGINS_DIR=#{PREFIX}/lib/application -# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi -# -# .include -# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" -# -# [...] -# -# .include -# ------------------------------------------------------ -# -# As for the pkg-plist, it should only include the actual files your -# port installs: -# -# pkg-plist: -# ------------------------------------------------------ -# [...] -# lib/application/fooplugin.a -# lib/application/fooplugin.la -# lib/application/fooplugin.so -# lib/application/fooplugin.xpi -# @dirrm lib/application -# ------------------------------------------------------ -# -# Here is what it will look like when it creates symlinks: -# -# ------------------------------------------------------ -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi -# ------------------------------------------------------ - -WEBPLUGINS_NAME?= ${PKGBASE} -WEBPLUGINS_FILES?= empty -WEBPLUGINS_APPS_ALL_LINUX= linux-firefox linux-firefox-devel linux-flock \ - linux-flock-devel linux-mozilla \ - linux-nvu linux-opera linux-opera-devel \ - linux-seamonkey linux-seamonkey-devel \ - linux-sunbird linux-sunbird-devel -WEBPLUGINS_APPS_ALL_NATIVE= gecko18 gecko19 opera opera-devel webkit-gtk2 -WEBPLUGINS_APPS_ALL= ${WEBPLUGINS_APPS_ALL_LINUX} \ - ${WEBPLUGINS_APPS_ALL_NATIVE} - -.if !defined(USE_WEBPLUGINS) || ${USE_WEBPLUGINS} == "yes" || \ - ${USE_WEBPLUGINS} == "*" -USE_WEBPLUGINS= ${WEBPLUGINS_APPS_ALL} -.endif - -.if !defined(WEBPLUGINS_FILES) || ${WEBPLUGINS_FILES} == "empty" || \ - ${WEBPLUGINS_FILES} == "" -IGNORE= cannot install: the WEBPLUGINS_FILES is empty, please add plugins file in it and see in www/firefox/Makefile.webplugins for document -.endif - -.for _TEMP_APP__ in ${WEBPLUGINS_APPS_ALL} -_TEMP_APP_=${_TEMP_APP__} -_TEMP_FLAG_=0 -. for _TEMP_USE__ in ${USE_WEBPLUGINS} -_TEMP_USE_=${_TEMP_USE__} -. if !${_TEMP_APP_:C!${_TEMP_USE_:S/*/.*/:S/?/./}!!} || \ - ( ${_TEMP_APP_:Mlinux-*} && ${_TEMP_USE_:Mlinux} ) || \ - ( ${_TEMP_APP_:Nlinux-*} && ${_TEMP_USE_:Mnative} ) -_TEMP_FLAG_=1 -. endif -. endfor -. if ${_TEMP_FLAG_} -USE_WEBPLUGINS_EXP+= ${_TEMP_APP__} -. endif -.endfor - -WEBPLUGINS_APPS= ${USE_WEBPLUGINS_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*:N*gecko*:N*webkit*} -WEBPLUGINS_SLDIRS= ${USE_WEBPLUGINS_EXP:S.^.${WEBPLUGINS_SLDIR}/.} -WEBPLUGINS_LINKFARMS= ${WEBPLUGINS_APPS} ${WEBPLUGINS_SLDIRS} - -WEBPLUGINS_LIBDIR= ${PREFIX}/lib/browser_plugins -WEBPLUGINS_SLDIR= ${WEBPLUGINS_LIBDIR}/symlinks -WEBPLUGINS_DIR?= ${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME} - -PLIST_SUB+= WEBPLUGINS_DIR="${WEBPLUGINS_DIR:S,^${PREFIX}/,,}" - -_LNWF= ${WEBPLUGINS_FILES:S,^,${WEBPLUGINS_DIR}/,} -_Q= 2>/dev/null || true -_WLD= ${WEBPLUGINS_LIBDIR:S,^${PREFIX},%D,} -_WLF= ${WEBPLUGINS_LINKFARMS:S,${PREFIX},%D,} -_WSD= ${WEBPLUGINS_SLDIR:S,^${PREFIX},%D,} - -webplugins-post-install: - @if [ ! -d ${WEBPLUGINS_DIR} ]; then \ - ${ECHO_CMD}; \ - ${ECHO_CMD} "ERROR: The \"${WEBPLUGINS_DIR}\" in WEBPLUGINS_DIR is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \ - ${ECHO_CMD}; \ - else \ - for _f in ${WEBPLUGINS_FILES}; do \ - if [ ! -f ${WEBPLUGINS_DIR}/$${_f} ]; then \ - ${ECHO_CMD}; \ - ${ECHO_CMD} "ERROR: The \"$${_f}\" in WEBPLUGINS_FILES is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \ - ${ECHO_CMD}; \ - fi; \ - done; \ - fi; \ - for _d in ${WEBPLUGINS_LINKFARMS}; do \ - ${INSTALL} -d $${_d}; \ - for _l in ${_LNWF}; do \ - ${LN} -sf $${_l} $${_d}/ ${_Q}; \ - done; \ - done; \ - for _d in ${_WLF}; do \ - ${ECHO_CMD} "@exec ${INSTALL} -d $$_d" >> ${TMPPLIST}; \ - for _l in ${_LNWF}; do \ - ${ECHO_CMD} "@exec ${LN} -sf $$_l $$_d/ ${_Q}" >> ${TMPPLIST}; \ - done; \ - for _f in ${WEBPLUGINS_FILES:S,^,\${_d}/,}; do \ - ${ECHO_CMD} "@unexec ${RM} -f $$_f" >> ${TMPPLIST}; \ - done; \ - ${ECHO_CMD} "@unexec rmdir $$_d ${_Q}" >> ${TMPPLIST}; \ - done - @${ECHO_CMD} "@unexec rmdir ${_WSD} ${_Q}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST} - -post-install: webplugins-post-install Modified: branches/experimental/www/firefox-i18n/Makefile ============================================================================== --- branches/experimental/www/firefox-i18n/Makefile Sat Apr 14 21:22:56 2012 (r708) +++ branches/experimental/www/firefox-i18n/Makefile Thu Apr 19 10:56:36 2012 (r709) @@ -2,7 +2,7 @@ # Date created: 28 May 2006 # Whom: Andrew Pantyukhin # -# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.68 2012/03/14 09:36:57 beat Exp $ +# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.70 2012/04/18 14:50:10 beat Exp $ # PORTNAME= firefox-i18n @@ -18,7 +18,7 @@ EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USE_FIREFOX= 10 +USE_FIREFOX= 11 USE_XPI= firefox linux-firefox USE_SUBMAKE= yes Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Sat Apr 14 21:22:56 2012 (r708) +++ branches/experimental/www/firefox/Makefile Thu Apr 19 10:56:36 2012 (r709) @@ -2,7 +2,7 @@ # Date created: 2002/10/21 # Whom: Alan Eldridge # -# $FreeBSD: ports/www/firefox/Makefile,v 1.264 2012/03/14 09:34:46 beat Exp $ +# $FreeBSD: ports/www/firefox/Makefile,v 1.265 2012/04/18 14:50:09 beat Exp $ # PORTNAME= firefox Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Sat Apr 14 21:22:56 2012 (r708) +++ trunk/Mk/bsd.gecko.mk Thu Apr 19 10:56:36 2012 (r709) @@ -4,7 +4,7 @@ # Date created: 12 Nov 2005 # Whom: Michael Johnson # -# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.52 2012/03/14 15:50:04 beat Exp $ +# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.54 2012/04/18 15:00:14 beat 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 10+ 36+ 10 36 +# Available values: yes 10+ 11+ 36+ 10 11+ 36 # NOTE: # default value 10 is used in case of USE_FIREFOX=yes # @@ -203,7 +203,7 @@ # 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 10+ 31+ 10 31 +# Available values: yes 10+ 11+ 31+ 10 11 31 # NOTE: # default value 10 is used in case of USE_THUNDERBIRD=yes # @@ -223,11 +223,12 @@ .endif _FIREFOX_DEFAULT_VERSION= 10 -_FIREFOX_VERSIONS= 10 36 -_FIREFOX_RANGE_VERSIONS= 10+ 36+ +_FIREFOX_VERSIONS= 10 11 36 +_FIREFOX_RANGE_VERSIONS= 10+ 11+ 36+ # For specifying [36, ..]+ -_FIREFOX_36P= 36 ${_FIREFOX_10P} +_FIREFOX_36P= 36 ${_FIREFOX_11P} +_FIREFOX_11P= 11 ${_FIREFOX_10P} _FIREFOX_10P= 10 # Set the default Firefox version and check if USE_FIREFOX=yes was given @@ -288,7 +289,8 @@ .endif # Dependence lines for different Firefox versions -10_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox +10_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr +11_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox 36_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox36 # Add dependencies @@ -381,11 +383,12 @@ .endif _THUNDERBIRD_DEFAULT_VERSION= 10 -_THUNDERBIRD_VERSIONS= 10 31 -_THUNDERBIRD_RANGE_VERSIONS= 10+ 31+ +_THUNDERBIRD_VERSIONS= 10 11 31 +_THUNDERBIRD_RANGE_VERSIONS= 10+ 11+ 31+ # For specifying [31, 30, ..]+ -_THUNDERBIRD_31P= 31 ${_THUNDERBIRD_31P} +_THUNDERBIRD_31P= 31 ${_THUNDERBIRD_11P} +_THUNDERBIRD_11P= 11 ${_THUNDERBIRD_10P} _THUNDERBIRD_10P= 10 # Set the default Thunderbird version and check if USE_THUNDERBIRD=yes was given @@ -445,7 +448,8 @@ .endif # Dependence lines for different Thunderbird versions -10_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird +10_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird-esr +11_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird 31_DEPENDS= ${LOCALBASE}/lib/thunderbird3/thunderbird:${PORTSDIR}/mail/thunderbird3 # Add dependencies @@ -828,10 +832,14 @@ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${MOZSRC}/build/unix/run-mozilla.sh - @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ - ${MOZSRC}/widget/src/gtk2/nsSound.cpp - @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ - ${MOZSRC}/*/*/*/nsDeviceContextSpecG.cpp + @if [ -f ${MOZSRC}/widget/src/gtk2/nsSound.cpp ] ; then \ + ${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ + ${MOZSRC}/widget/src/gtk2/nsSound.cpp ; \ + fi + @if ! [ -f ${MOZSRC}/widget/gtk2/nsDeviceContextSpecG.cpp ] ; then \ + ${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ + ${MOZSRC}/*/*/*/nsDeviceContextSpecG.cpp ; \ + fi @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \ s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ ${MOZSRC}/xpcom/*/SpecialSystemDirectory.cpp Modified: trunk/mail/thunderbird-esr-i18n/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr-i18n/Makefile Sat Apr 14 21:22:56 2012 (r708) +++ trunk/mail/thunderbird-esr-i18n/Makefile Thu Apr 19 10:56:36 2012 (r709) @@ -2,7 +2,7 @@ # Date created: 29 May 2006 # Whom: Andrew Pantyukhin # -# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.60 2012/03/22 07:30:27 beat Exp $ +# $FreeBSD: ports/mail/thunderbird-esr-i18n/Makefile,v 1.62 2012/04/18 14:58:03 beat Exp $ # PORTNAME= thunderbird-i18n Modified: trunk/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Sat Apr 14 21:22:56 2012 (r708) +++ trunk/mail/thunderbird-esr/Makefile Thu Apr 19 10:56:36 2012 (r709) @@ -2,7 +2,7 @@ # Date created: 4 September 2003 # Whom: Joe Marcus Clarke # -# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.146 2012/03/14 09:49:01 beat Exp $ +# $FreeBSD: ports/mail/thunderbird-esr/Makefile,v 1.148 2012/04/18 14:57:12 beat Exp $ # PORTNAME= thunderbird Modified: trunk/mail/thunderbird-i18n/Makefile ============================================================================== --- trunk/mail/thunderbird-i18n/Makefile Sat Apr 14 21:22:56 2012 (r708) +++ trunk/mail/thunderbird-i18n/Makefile Thu Apr 19 10:56:36 2012 (r709) @@ -2,14 +2,13 @@ # Date created: 29 May 2006 # Whom: Andrew Pantyukhin # -# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.60 2012/03/22 07:30:27 beat Exp $ +# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.62 2012/04/19 05:19:55 beat Exp $ # PORTNAME= thunderbird-i18n -PORTVERSION= 10.0.3 -PORTREVISION= 1 +PORTVERSION= 11.0.1 CATEGORIES= mail -MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}esr/linux-i686/xpi +MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${THUNDERBIRD_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} @@ -28,7 +27,7 @@ .endif NO_BUILD= yes -USE_THUNDERBIRD= 10 +USE_THUNDERBIRD= 11 USE_XPI= thunderbird linux-thunderbird THUNDERBIRD_I18N_ALL= ar br ca cs da de en-GB en-US es-AR es-ES et eu fi fr \ Modified: trunk/mail/thunderbird-i18n/distinfo ============================================================================== --- trunk/mail/thunderbird-i18n/distinfo Sat Apr 14 21:22:56 2012 (r708) +++ trunk/mail/thunderbird-i18n/distinfo Thu Apr 19 10:56:36 2012 (r709) @@ -1,84 +1,84 @@ -SHA256 (xpi/thunderbird-i18n-10.0.3/ar.xpi) = 35cb4a50b24558d44a9473b0a247e7228e9e06c77ccd59398a09bd4e2aa4bcf2 -SIZE (xpi/thunderbird-i18n-10.0.3/ar.xpi) = 441462 -SHA256 (xpi/thunderbird-i18n-10.0.3/br.xpi) = 90986fed08d865c1228565b431a52a144c6ee691f9e84ef791f2a0e06435b4cc -SIZE (xpi/thunderbird-i18n-10.0.3/br.xpi) = 415523 -SHA256 (xpi/thunderbird-i18n-10.0.3/ca.xpi) = 40dc4bf050f5f94f6f32a8bde6eec69525dbeca29c6c09803174a974018ddd8b -SIZE (xpi/thunderbird-i18n-10.0.3/ca.xpi) = 416065 -SHA256 (xpi/thunderbird-i18n-10.0.3/cs.xpi) = 38e3e5a0744e1d2af582742cdc78b0264db653f29285ed9c7357f7cefec80676 -SIZE (xpi/thunderbird-i18n-10.0.3/cs.xpi) = 419415 -SHA256 (xpi/thunderbird-i18n-10.0.3/da.xpi) = dc9e5f1e9fb9c20cb2c0bd0688ad0338add337e787251e6f1303709d0df25b79 -SIZE (xpi/thunderbird-i18n-10.0.3/da.xpi) = 363372 -SHA256 (xpi/thunderbird-i18n-10.0.3/de.xpi) = c00b4dd2d236161a7c3d789b6950c6ae8981a3ca98c7aef02184f5d7be7d53a9 -SIZE (xpi/thunderbird-i18n-10.0.3/de.xpi) = 418263 -SHA256 (xpi/thunderbird-i18n-10.0.3/en-GB.xpi) = e005bc85a3dff4f7f49b948e05e316d593ab6bd2032b35ad53e62cb237aace97 -SIZE (xpi/thunderbird-i18n-10.0.3/en-GB.xpi) = 391739 -SHA256 (xpi/thunderbird-i18n-10.0.3/en-US.xpi) = 240f0cb32acd5295d19e9fc384b3a99765930102dfaed5b1f9310a342c420022 -SIZE (xpi/thunderbird-i18n-10.0.3/en-US.xpi) = 391239 -SHA256 (xpi/thunderbird-i18n-10.0.3/es-AR.xpi) = e825057b315c26a6d3762acf7511408ca4adbbdae9c06b2b1f3f66b1e13cef0e -SIZE (xpi/thunderbird-i18n-10.0.3/es-AR.xpi) = 410723 -SHA256 (xpi/thunderbird-i18n-10.0.3/es-ES.xpi) = 39c0057e14359acdd4355f44ca7d4a2fa5d1594a95f8b0367d3dfbeaedd51c03 -SIZE (xpi/thunderbird-i18n-10.0.3/es-ES.xpi) = 355140 -SHA256 (xpi/thunderbird-i18n-10.0.3/et.xpi) = 22081871d97c4e4017bd7633c8e99c87e89d478d828b8af7ab0fed262be39f65 -SIZE (xpi/thunderbird-i18n-10.0.3/et.xpi) = 410720 -SHA256 (xpi/thunderbird-i18n-10.0.3/eu.xpi) = d184c996c336ecc6ab93c821e8fbc5a69154210e8ee6a44a9824093cf1ec4d6e -SIZE (xpi/thunderbird-i18n-10.0.3/eu.xpi) = 406383 -SHA256 (xpi/thunderbird-i18n-10.0.3/fi.xpi) = b18c9ee4d136af05a7bc01c47522ba7bf2526859e0475c845d507d76e2f3c160 -SIZE (xpi/thunderbird-i18n-10.0.3/fi.xpi) = 411925 -SHA256 (xpi/thunderbird-i18n-10.0.3/fr.xpi) = 53b23cead071ee75fb9277280ace903a56739ea03ce51a6290f7c24d2c193bd9 -SIZE (xpi/thunderbird-i18n-10.0.3/fr.xpi) = 414745 -SHA256 (xpi/thunderbird-i18n-10.0.3/fy-NL.xpi) = 80e9b13ce9668f9973e3352c692c40175ae931960848a97f4895922d63e35f62 -SIZE (xpi/thunderbird-i18n-10.0.3/fy-NL.xpi) = 413981 -SHA256 (xpi/thunderbird-i18n-10.0.3/ga-IE.xpi) = efea50cfed12ec8d5fd744073479156af6b1a7faddd447dd892a052c270b4211 -SIZE (xpi/thunderbird-i18n-10.0.3/ga-IE.xpi) = 423257 -SHA256 (xpi/thunderbird-i18n-10.0.3/gd.xpi) = 47e67ad2c85b9f018b65d1d1d08f609fcef39d61a287f2e5a4cc8d9e49716c32 -SIZE (xpi/thunderbird-i18n-10.0.3/gd.xpi) = 425871 -SHA256 (xpi/thunderbird-i18n-10.0.3/gl.xpi) = 1851262d60689f70d272cafdaa75d6fa0a34e1c694c0d391f3b420ef232ddfa5 -SIZE (xpi/thunderbird-i18n-10.0.3/gl.xpi) = 409226 -SHA256 (xpi/thunderbird-i18n-10.0.3/he.xpi) = de0f654e12f9576b614b0ed64117fa28f7b7c2f707870308036012683ffd1925 -SIZE (xpi/thunderbird-i18n-10.0.3/he.xpi) = 439203 -SHA256 (xpi/thunderbird-i18n-10.0.3/hu.xpi) = 572807030037168bba5f9d2ac857d303c683105f1fa2ccaf3487f3e4e8d5c950 -SIZE (xpi/thunderbird-i18n-10.0.3/hu.xpi) = 426354 -SHA256 (xpi/thunderbird-i18n-10.0.3/is.xpi) = f5137a07f033cdca54acc326020d2d372196cd79b147986081a09eef32645c82 -SIZE (xpi/thunderbird-i18n-10.0.3/is.xpi) = 412631 -SHA256 (xpi/thunderbird-i18n-10.0.3/it.xpi) = 403b69429ad951529bc46d0beae23ef0724815f3c39290db59d128cd5dd47804 -SIZE (xpi/thunderbird-i18n-10.0.3/it.xpi) = 347630 -SHA256 (xpi/thunderbird-i18n-10.0.3/ja.xpi) = f0300add69719084fdca5112068fbf208b1b570f366b7e22159aa8b3bea58926 -SIZE (xpi/thunderbird-i18n-10.0.3/ja.xpi) = 459027 -SHA256 (xpi/thunderbird-i18n-10.0.3/ko.xpi) = 802fb0df904c074e436de03e0b1418feab512995b4310c8d8391f3c7257f1815 -SIZE (xpi/thunderbird-i18n-10.0.3/ko.xpi) = 372009 -SHA256 (xpi/thunderbird-i18n-10.0.3/lt.xpi) = a76b1b20c92b22d0a8fa63f7ac8a890283d3861b17a75f910f58f91e9e71f93c -SIZE (xpi/thunderbird-i18n-10.0.3/lt.xpi) = 531018 -SHA256 (xpi/thunderbird-i18n-10.0.3/nb-NO.xpi) = 98256461574f7aa06199500afd48a0700e5dd76072d0f175d5346f763dfd329b -SIZE (xpi/thunderbird-i18n-10.0.3/nb-NO.xpi) = 407726 -SHA256 (xpi/thunderbird-i18n-10.0.3/nl.xpi) = 81cf4c679fda285400ba2ed8043a546132acd50b82863de15312a66eb72b2d6e -SIZE (xpi/thunderbird-i18n-10.0.3/nl.xpi) = 407981 -SHA256 (xpi/thunderbird-i18n-10.0.3/nn-NO.xpi) = dd4ccb6e3a3660e9ef3e331a953ca2e96ff12ade94d7ddff024595b3a2702d2f -SIZE (xpi/thunderbird-i18n-10.0.3/nn-NO.xpi) = 409455 -SHA256 (xpi/thunderbird-i18n-10.0.3/pl.xpi) = 07810903b8aa75d0378f8a3a790b6fe8097952a2b0e239b9033e58fccc2b68d3 -SIZE (xpi/thunderbird-i18n-10.0.3/pl.xpi) = 393574 -SHA256 (xpi/thunderbird-i18n-10.0.3/pt-BR.xpi) = 781061abb5bb55ed5b49b6b659c560830d191f36eeb052420b91287d1cc77e64 -SIZE (xpi/thunderbird-i18n-10.0.3/pt-BR.xpi) = 417225 -SHA256 (xpi/thunderbird-i18n-10.0.3/pt-PT.xpi) = aa0425c45464ecfc94c5912a5020760e37f235c5ff8657c0375087c6232054ce -SIZE (xpi/thunderbird-i18n-10.0.3/pt-PT.xpi) = 414262 -SHA256 (xpi/thunderbird-i18n-10.0.3/rm.xpi) = 1ba0594b7029d4c9b2b239cc52d6bc3b861cf5c20d02dd2d17046b924d647fee -SIZE (xpi/thunderbird-i18n-10.0.3/rm.xpi) = 414704 -SHA256 (xpi/thunderbird-i18n-10.0.3/ru.xpi) = ec610eac0811a68b0dbc1014915ffe2f2eef6db1ac1680683c1e2a6b5127ac59 -SIZE (xpi/thunderbird-i18n-10.0.3/ru.xpi) = 411631 -SHA256 (xpi/thunderbird-i18n-10.0.3/si.xpi) = 0e0bfa36032aefd3a391d0388e1f90eddc14957112189132045b476ec5dcb58d -SIZE (xpi/thunderbird-i18n-10.0.3/si.xpi) = 456604 -SHA256 (xpi/thunderbird-i18n-10.0.3/sk.xpi) = 4ead646b5aead9d4478c7340c6daf49ffcf82a8b134dbf7286e131e9297a0cca -SIZE (xpi/thunderbird-i18n-10.0.3/sk.xpi) = 425026 -SHA256 (xpi/thunderbird-i18n-10.0.3/sl.xpi) = a32141c4df379da4ba6f408d05e384590088f5d51e3bd5a092a246663a1aa0cd -SIZE (xpi/thunderbird-i18n-10.0.3/sl.xpi) = 410428 -SHA256 (xpi/thunderbird-i18n-10.0.3/sq.xpi) = a74763ebaf9572e8916ef4251540fc9626a9c29b4269b9cfa61e9b13fca02194 -SIZE (xpi/thunderbird-i18n-10.0.3/sq.xpi) = 360476 -SHA256 (xpi/thunderbird-i18n-10.0.3/sv-SE.xpi) = 6665a49e1d1fce0676f1d9b68d13c2db10457c7e1b73fa8b9f2f729ddb9d175e -SIZE (xpi/thunderbird-i18n-10.0.3/sv-SE.xpi) = 478278 -SHA256 (xpi/thunderbird-i18n-10.0.3/ta-LK.xpi) = 2ed073ee939f6f85fcccf064d7d71a4838b713dc5fe3b54254369e797c4e495d -SIZE (xpi/thunderbird-i18n-10.0.3/ta-LK.xpi) = 475715 -SHA256 (xpi/thunderbird-i18n-10.0.3/tr.xpi) = 96ed93aea3ea42ad1aeef8fc30f3b54a5b2efb4b219a35959864231e510e64cb -SIZE (xpi/thunderbird-i18n-10.0.3/tr.xpi) = 418206 -SHA256 (xpi/thunderbird-i18n-10.0.3/uk.xpi) = 8ab1d49cc57f3f367e94852e4ef78fdb08471dad89bcc59e005a6ba1cba9dcaf -SIZE (xpi/thunderbird-i18n-10.0.3/uk.xpi) = 463922 -SHA256 (xpi/thunderbird-i18n-10.0.3/zh-TW.xpi) = bc6f06aa0bedf72f326a9f525f17c0828fb7569ccf45d891487f189c4d1d5a8e -SIZE (xpi/thunderbird-i18n-10.0.3/zh-TW.xpi) = 431824 +SHA256 (xpi/thunderbird-i18n-11.0.1/ar.xpi) = dc33c48ea71c4ed3e182f995804f2097933966aa894f38b09b3c81e6309045a2 +SIZE (xpi/thunderbird-i18n-11.0.1/ar.xpi) = 441218 +SHA256 (xpi/thunderbird-i18n-11.0.1/br.xpi) = b45ed72de9efa9cce4284163734a3a365d4384a38fa408235445ca23f7edabad +SIZE (xpi/thunderbird-i18n-11.0.1/br.xpi) = 414899 +SHA256 (xpi/thunderbird-i18n-11.0.1/ca.xpi) = 37c361b3a124d8a7c7ff6cf13840d29ce13981c59d23dbd06e1aa662b5bde410 +SIZE (xpi/thunderbird-i18n-11.0.1/ca.xpi) = 415452 +SHA256 (xpi/thunderbird-i18n-11.0.1/cs.xpi) = 0a4dc62584652c287f06b3c4765ea83fe02970dd3b5e139771c1dd65435950d8 +SIZE (xpi/thunderbird-i18n-11.0.1/cs.xpi) = 418866 +SHA256 (xpi/thunderbird-i18n-11.0.1/da.xpi) = bd07e4f4b7a8d6c1ca6b6eb2cf0eddda271ab7c59933076acd63118f211533c7 +SIZE (xpi/thunderbird-i18n-11.0.1/da.xpi) = 362836 +SHA256 (xpi/thunderbird-i18n-11.0.1/de.xpi) = 129c80d6405ec0830238f7eac7446428c96f3745e2f374426b7ec044fa78d2ac +SIZE (xpi/thunderbird-i18n-11.0.1/de.xpi) = 417770 +SHA256 (xpi/thunderbird-i18n-11.0.1/en-GB.xpi) = 0099136fa300f2cda1ca849105b8d170fdf785e357f03b0a88ea2059638bc371 +SIZE (xpi/thunderbird-i18n-11.0.1/en-GB.xpi) = 391088 +SHA256 (xpi/thunderbird-i18n-11.0.1/en-US.xpi) = 94c55301469821c85a4d12262ae22e8787898f1de650e37eda27ddf8b8477572 +SIZE (xpi/thunderbird-i18n-11.0.1/en-US.xpi) = 390611 +SHA256 (xpi/thunderbird-i18n-11.0.1/es-AR.xpi) = 507ac78865a1b64bc7df80b1f22a7a7399566295abaf6696cc3626fff24baddd +SIZE (xpi/thunderbird-i18n-11.0.1/es-AR.xpi) = 410206 +SHA256 (xpi/thunderbird-i18n-11.0.1/es-ES.xpi) = 586649925347e65b907193d36e940d6b650e843cd82d9ae8255decc08f4d6732 +SIZE (xpi/thunderbird-i18n-11.0.1/es-ES.xpi) = 354877 +SHA256 (xpi/thunderbird-i18n-11.0.1/et.xpi) = 108656c14050878a7c4cef2a3cbd254d55dbd77160e1f4a091340100b8e5f50a +SIZE (xpi/thunderbird-i18n-11.0.1/et.xpi) = 410225 +SHA256 (xpi/thunderbird-i18n-11.0.1/eu.xpi) = 644367251d9d1e3da1a5e61a8e8728ec22e87b86a85b6b6cadf5c92598658ae7 +SIZE (xpi/thunderbird-i18n-11.0.1/eu.xpi) = 405866 +SHA256 (xpi/thunderbird-i18n-11.0.1/fi.xpi) = 65ea343c2444e424643d2d05ae4f8af128219507343577238f9a91c2606f0b0b +SIZE (xpi/thunderbird-i18n-11.0.1/fi.xpi) = 411326 +SHA256 (xpi/thunderbird-i18n-11.0.1/fr.xpi) = 9b0e27d679c86e79993cba8b9db6f05401813b33f15b3a9c22fbf78c7680753e +SIZE (xpi/thunderbird-i18n-11.0.1/fr.xpi) = 414193 +SHA256 (xpi/thunderbird-i18n-11.0.1/fy-NL.xpi) = 24158315524bba556a32ebc33ee02d0ea08507b80b2e01a4af5f3066f23596c6 +SIZE (xpi/thunderbird-i18n-11.0.1/fy-NL.xpi) = 413334 +SHA256 (xpi/thunderbird-i18n-11.0.1/ga-IE.xpi) = 7090ec3530a6aba4898930448e4bfac958ca7e689edbb10d527ca04afa44039c +SIZE (xpi/thunderbird-i18n-11.0.1/ga-IE.xpi) = 422576 +SHA256 (xpi/thunderbird-i18n-11.0.1/gd.xpi) = f3c9c7fbd44fff3d86cf917cb225f1d2645b4b8c59cc26ae5d77ed682af22a43 +SIZE (xpi/thunderbird-i18n-11.0.1/gd.xpi) = 425359 +SHA256 (xpi/thunderbird-i18n-11.0.1/gl.xpi) = 814bf0cee6b26c313babf3911cd013eca406eeead50d0a97eef12a28722dfdea +SIZE (xpi/thunderbird-i18n-11.0.1/gl.xpi) = 408704 +SHA256 (xpi/thunderbird-i18n-11.0.1/he.xpi) = f8a1e8fc5343abd2f2fa270ef7dbe9cc178c5708d2f3fa2482039752345b4333 +SIZE (xpi/thunderbird-i18n-11.0.1/he.xpi) = 439648 +SHA256 (xpi/thunderbird-i18n-11.0.1/hu.xpi) = 5b2b53331b13b0d586e66859d2355609c8c368df6fc8fdaf2a7e038d064d43d2 +SIZE (xpi/thunderbird-i18n-11.0.1/hu.xpi) = 425845 +SHA256 (xpi/thunderbird-i18n-11.0.1/is.xpi) = 0b90944850f2812fc09d8bc45bd26443461bad34643143930d7c8a862112fe2b +SIZE (xpi/thunderbird-i18n-11.0.1/is.xpi) = 412048 +SHA256 (xpi/thunderbird-i18n-11.0.1/it.xpi) = 7c4fb59d0d5b9c5f56334c7ff91059f01daed7a00fd18ed6e3d0e0034c62ce81 +SIZE (xpi/thunderbird-i18n-11.0.1/it.xpi) = 347268 +SHA256 (xpi/thunderbird-i18n-11.0.1/ja.xpi) = 5b68c6867bec46bd90bedd8924fb01fd05a07f1a18c7febebb1305f1a7f9f8a7 +SIZE (xpi/thunderbird-i18n-11.0.1/ja.xpi) = 458653 +SHA256 (xpi/thunderbird-i18n-11.0.1/ko.xpi) = 8c883b8e3f2ef0a37d9f3b0f0f0c77a6c65eafd13740bbaacacb46c26b7c0ff8 +SIZE (xpi/thunderbird-i18n-11.0.1/ko.xpi) = 371466 +SHA256 (xpi/thunderbird-i18n-11.0.1/lt.xpi) = c417be2722e0067d278394e104ff1ccb609ecf55f78f977ecaa3a09a9a513c8a +SIZE (xpi/thunderbird-i18n-11.0.1/lt.xpi) = 520219 +SHA256 (xpi/thunderbird-i18n-11.0.1/nb-NO.xpi) = 074238822117deb6c27c7b79c13607d4bcc97361bfd778f470d1d1eb6e409633 +SIZE (xpi/thunderbird-i18n-11.0.1/nb-NO.xpi) = 407150 +SHA256 (xpi/thunderbird-i18n-11.0.1/nl.xpi) = 28b6cc42fbd371b2db12d03c60934c0d4e5375c5b76559c9f3738833e7d843f4 +SIZE (xpi/thunderbird-i18n-11.0.1/nl.xpi) = 407423 +SHA256 (xpi/thunderbird-i18n-11.0.1/nn-NO.xpi) = f4eaa66350e548926b2280045f5159774db32afeb64a0961762c74909c126dce +SIZE (xpi/thunderbird-i18n-11.0.1/nn-NO.xpi) = 408836 +SHA256 (xpi/thunderbird-i18n-11.0.1/pl.xpi) = 00b3ad92d44e01c9f96c67d2f4199ebe50e0724f494ddde35dd5787c9829453b +SIZE (xpi/thunderbird-i18n-11.0.1/pl.xpi) = 393414 +SHA256 (xpi/thunderbird-i18n-11.0.1/pt-BR.xpi) = e22bd2a5321edafa1092ee32c63e66b2ea3564585753a0621199285584af133e +SIZE (xpi/thunderbird-i18n-11.0.1/pt-BR.xpi) = 416625 +SHA256 (xpi/thunderbird-i18n-11.0.1/pt-PT.xpi) = 2efc4671caf36f029b4ce334462749ed66618fcb6c9292faceda6d010d9e4184 +SIZE (xpi/thunderbird-i18n-11.0.1/pt-PT.xpi) = 413734 +SHA256 (xpi/thunderbird-i18n-11.0.1/rm.xpi) = 1dab1c383188c6e98aadfed3f41e22c381c074c6f90287ee686ea07b7e2d46a7 +SIZE (xpi/thunderbird-i18n-11.0.1/rm.xpi) = 414164 +SHA256 (xpi/thunderbird-i18n-11.0.1/ru.xpi) = 159b4c75cffd319b5f7fa94d6a3901a660adc5672debbb2ba5640f7295745b9b +SIZE (xpi/thunderbird-i18n-11.0.1/ru.xpi) = 411332 +SHA256 (xpi/thunderbird-i18n-11.0.1/si.xpi) = 448829c55c743140a3c8d833dd7e342af9ded220145b2c9706cf9322f9e0d764 +SIZE (xpi/thunderbird-i18n-11.0.1/si.xpi) = 456008 +SHA256 (xpi/thunderbird-i18n-11.0.1/sk.xpi) = 435b8253906a992c4ed1bd7c55c461bcf7a49af188d63dbdf14e74b37d8bccaf +SIZE (xpi/thunderbird-i18n-11.0.1/sk.xpi) = 424700 +SHA256 (xpi/thunderbird-i18n-11.0.1/sl.xpi) = 0f41d994afac995e2368db51f2520bc4500a22461573920a11e4e0f717fea6fc +SIZE (xpi/thunderbird-i18n-11.0.1/sl.xpi) = 409945 +SHA256 (xpi/thunderbird-i18n-11.0.1/sq.xpi) = 68527e14390e75fa7b9648e8621d556b32a9af35d6007aa8f6c317ecb1272e76 +SIZE (xpi/thunderbird-i18n-11.0.1/sq.xpi) = 360003 +SHA256 (xpi/thunderbird-i18n-11.0.1/sv-SE.xpi) = 8a7f6a3a5b46cc844675713a41d7aae0d28865ea750370f9a6484a1dbf1322d9 +SIZE (xpi/thunderbird-i18n-11.0.1/sv-SE.xpi) = 477715 +SHA256 (xpi/thunderbird-i18n-11.0.1/ta-LK.xpi) = 30668e06ee8f811f4ac1594472093b7c0f69d443c25dd3d7d0868aa37ca17ee0 +SIZE (xpi/thunderbird-i18n-11.0.1/ta-LK.xpi) = 475124 +SHA256 (xpi/thunderbird-i18n-11.0.1/tr.xpi) = 820c0ef9c23cbf78e1a60cedb5f0b3b9ed0432f9856f8edd6949cb1dddae54a5 +SIZE (xpi/thunderbird-i18n-11.0.1/tr.xpi) = 417470 +SHA256 (xpi/thunderbird-i18n-11.0.1/uk.xpi) = 40b5d07fde8ee7a8a74c64c15cbb64dea72e3cef306fc06f68e2ff65087de24a +SIZE (xpi/thunderbird-i18n-11.0.1/uk.xpi) = 463181 +SHA256 (xpi/thunderbird-i18n-11.0.1/zh-TW.xpi) = 0b0bfebe4b7dea23bcc939e5a07d51ee603a4079e62f7b3e5095a945e0af452c +SIZE (xpi/thunderbird-i18n-11.0.1/zh-TW.xpi) = 431216 Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Sat Apr 14 21:22:56 2012 (r708) +++ trunk/mail/thunderbird/Makefile Thu Apr 19 10:56:36 2012 (r709) @@ -2,15 +2,15 @@ # Date created: 4 September 2003 # Whom: Joe Marcus Clarke # -# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.146 2012/03/14 09:49:01 beat Exp $ +# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.148 2012/04/19 05:19:55 beat Exp $ # PORTNAME= thunderbird -DISTVERSION= 10.0.3 +DISTVERSION= 11.0.1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}esr/source -DISTNAME= ${PORTNAME}-${DISTVERSION}esr.source +MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source +DISTNAME= ${PORTNAME}-${DISTVERSION}.source MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above @@ -25,6 +25,7 @@ USE_AUTOTOOLS= autoconf213 USE_GECKO= gecko +CONFLICTS= thunderbird-10.* USE_MOZILLA= -png -nss -dbm -jpeg -xft MOZ_TOOLKIT= cairo-gtk2 @@ -60,7 +61,7 @@ .include -WRKSRC= ${WRKDIR}/comm-esr10 +WRKSRC= ${WRKDIR}/comm-release MOZSRC:= ${WRKSRC}/mozilla .if ${ARCH} == powerpc64 Modified: trunk/mail/thunderbird/distinfo ============================================================================== --- trunk/mail/thunderbird/distinfo Sat Apr 14 21:22:56 2012 (r708) +++ trunk/mail/thunderbird/distinfo Thu Apr 19 10:56:36 2012 (r709) @@ -1,2 +1,2 @@ -SHA256 (thunderbird-10.0.3esr.source.tar.bz2) = 297d8b5992007e2ba112a5796ca4468ea48ec2304930676ae173234035eff134 -SIZE (thunderbird-10.0.3esr.source.tar.bz2) = 97709099 +SHA256 (thunderbird-11.0.1.source.tar.bz2) = 5a5c35b76ecd38624a12b817909b3dcfe9c378c10cbfce60c9971e18251305a0 +SIZE (thunderbird-11.0.1.source.tar.bz2) = 101480528 Modified: trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in Sat Apr 14 21:22:56 2012 (r708) +++ trunk/mail/thunderbird/files/patch-mozilla-js-src-configure.in Thu Apr 19 10:56:36 2012 (r709) @@ -1,6 +1,6 @@ ---- mozilla/js/src/configure.in.orig 2012-01-29 15:44:24.000000000 +0100 -+++ mozilla/js/src/configure.in 2012-01-30 23:37:46.541060008 +0100 -@@ -1410,7 +1410,7 @@ +--- mozilla/js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100 ++++ mozilla/js/src/configure.in 2012-03-07 21:03:11.000000000 +0100 +@@ -1470,7 +1470,7 @@ CPU_ARCH=sparc ;; @@ -9,7 +9,7 @@ CPU_ARCH="$OS_TEST" ;; -@@ -1432,7 +1432,7 @@ +@@ -1492,7 +1492,7 @@ dnl =============================================================== INTEL_ARCHITECTURE= case "$OS_TEST" in @@ -18,7 +18,7 @@ INTEL_ARCHITECTURE=1 esac -@@ -2713,6 +2713,16 @@ +@@ -2814,6 +2814,16 @@ AC_DEFINE(JS_CPU_X86) AC_DEFINE(JS_NUNBOX32) ;; @@ -33,32 +33,5 @@ + AC_DEFINE(JS_PUNBOX64) + ;; x86_64*-*) - NANOJIT_ARCH=X64 - ENABLE_METHODJIT=1 -@@ -2732,6 +2742,7 @@ - AC_DEFINE(JS_NUNBOX32) - ;; - sparc*-*) -+ if test ! "$HAVE_64BIT_OS" ; then - NANOJIT_ARCH=Sparc ENABLE_METHODJIT=1 ENABLE_MONOIC=1 -@@ -2739,6 +2750,7 @@ - ENABLE_METHODJIT_TYPED_ARRAY=1 - AC_DEFINE(JS_CPU_SPARC) - AC_DEFINE(JS_NUNBOX32) -+ fi - ;; - esac - -@@ -2795,6 +2807,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) Modified: trunk/www/firefox-esr-i18n/Makefile ============================================================================== --- branches/experimental/www/firefox-esr-i18n/Makefile Sat Apr 14 21:22:56 2012 (r708) +++ trunk/www/firefox-esr-i18n/Makefile Thu Apr 19 10:56:36 2012 (r709) @@ -2,7 +2,7 @@ # Date created: 28 May 2006 # Whom: Andrew Pantyukhin # -# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.69 2012/03/22 07:30:27 beat Exp $ +# $FreeBSD: ports/www/firefox-esr-i18n/Makefile,v 1.71 2012/04/18 14:47:46 beat Exp $ # PORTNAME= firefox-i18n Modified: trunk/www/firefox-esr-i18n/Makefile.lang ============================================================================== --- branches/experimental/www/firefox-esr-i18n/Makefile.lang Sat Apr 14 21:22:56 2012 (r708) +++ trunk/www/firefox-esr-i18n/Makefile.lang Thu Apr 19 10:56:36 2012 (r709) @@ -2,7 +2,7 @@ # Date created: 30 Nov 2008 # Whom: Koji Yokota # -# $FreeBSD: ports/www/firefox-i18n/Makefile.lang,v 1.4 2011/06/21 21:12:31 flo Exp $ +# $FreeBSD: ports/www/firefox-esr-i18n/Makefile.lang,v 1.5 2012/04/18 14:43:11 beat Exp $ # # Currently, the following 71 languages are supported. # Modified: trunk/www/firefox-esr-i18n/Makefile.option ============================================================================== --- branches/experimental/www/firefox-esr-i18n/Makefile.option Sat Apr 14 21:22:56 2012 (r708) +++ trunk/www/firefox-esr-i18n/Makefile.option Thu Apr 19 10:56:36 2012 (r709) @@ -2,7 +2,7 @@ # Date created: 30 Nov 2008 # Whom: Koji Yokota # -# $FreeBSD: ports/www/firefox-i18n/Makefile.option,v 1.5 2011/06/27 09:53:31 flo Exp $ +# $FreeBSD: ports/www/firefox-esr-i18n/Makefile.option,v 1.6 2012/04/18 14:43:11 beat Exp $ # OPTIONS= LANG_AF "Africaans" off \ LANG_AK "Akan" off \ Modified: trunk/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Sat Apr 14 21:22:56 2012 (r708) +++ trunk/www/firefox-esr/Makefile Thu Apr 19 10:56:36 2012 (r709) @@ -2,7 +2,7 @@ # Date created: 2002/10/21 # Whom: Alan Eldridge # -# $FreeBSD: ports/www/firefox/Makefile,v 1.264 2012/03/14 09:34:46 beat Exp $ +# $FreeBSD: ports/www/firefox-esr/Makefile,v 1.266 2012/04/18 14:46:31 beat Exp $ # PORTNAME= firefox Deleted: branches/experimental/www/firefox-esr/Makefile.webplugins ============================================================================== --- branches/experimental/www/firefox-esr/Makefile.webplugins Thu Apr 19 10:56:36 2012 (r708) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,226 +0,0 @@ -#-*- mode: makefile; tab-width: 4; -* -# ex:ts=4 -# -# New ports collection makefile for: npapi infrastructure -# Date created: 27 June 2006 -# Whom: Andrew Pantyukhin -# -# $FreeBSD: ports/www/firefox/Makefile.webplugins,v 1.1 2009/01/10 02:45:41 mezz Exp $ -# $MCom: ports-stable/www/firefox/Makefile.webplugins,v 1.14 2008/11/12 17:55:09 mezz Exp $ -# - -# MAINTAINER= gnome@FreeBSD.org -# -# Documentation and examples: -# -# Makefile.webplugins will create symlinks automatically for each supported -# applications that supports the webplugins framework. Also, it will remove -# these symlinks when the plug-in port is uninstalled. -# -# USE_WEBPLUGINS - Specify a list of application(s) that this plug-in -# port supports. For each of these applications, a -# symlink will be created in -# lib/browser_plugins/symlinks. See -# WEBPLUGINS_APPS_ALL_* below for the list of -# supported applications. -# Default: USE_WEBPLUGINS=${WEBPLUGINS_APPS_ALL} (all -# applications) -# -# WEBPLUGINS_NAME - If your port installs file(s) in ${WEBPLUGINS_DIR}, -# then you can tweak WEBPLUGINS_NAME to change the -# name of the directory -# (lib/browser_plugins/symlinks/WEBPLUGINS_NAME). -# Default: WEBPLUGINS_NAME=${PKGBASE} -# -# WEBPLUGINS_FILES - The plug-in file(s) that are going to be linked -# in lib/browser_plugins/symlinks/*/. It cannot -# be empty or the port will set IGNORE. -# -# WEBPLUGINS_DIR - The directory where the plug-in file(s) can be -# found. Each plug-in file in WEBPLUGINS_FILES -# must be found in WEBPLUGINS_DIR. If your port -# does not install in WEBPLUGINS_DIR, but in its own -# path. You will need to specify that here or -# symlinks will be created to non-existent files. -# Default: WEBPLUGINS_DIR?=${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME} -# -# -# The USE_WEBPLUGINS supports wildcards, native, and linux; so you can do any -# of the following: -# -# USE_WEBPLUGINS=gecko* (Supports gecko18 and gecko19.) -# USE_WEBPLUGINS=native (Supports gecko*, opera*, and webkit-gtk2) -# USE_WEBPLUGINS=linux (Supports linux-*) -# USE_WEBPLUGINS=opera webkit-gtk2 -# -# Example to add in Makefile and pkg-plist if the plug-in file(s) install in -# WEBPLUGINS_DIR, and if your port does this manually: -# -# Makefile: -# ------------------------------------------------------ -# [...] -# USE_WEBPLUGINS=gecko* -# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi -# -# .include -# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" -# -# post-install: -# ${MKDIR} ${WEBPLUGINS_DIR} -# ${INSTALL_DATA} ${WEBPLUGINS_FILES:S,^,${WRKSRC}/plugins/,} \ -# ${WEBPLUGINS_DIR} -# -# .include -# ------------------------------------------------------ -# -# You do not need to add lib/browser_plugins and lib/browser_plugins/symlinks -# in pkg-plist, because they will be removed automatically. -# -# pkg-plist: -# ------------------------------------------------------ -# [...] -# %%WEBPLUGINS_DIR%%/fooplugin.so -# %%WEBPLUGINS_DIR%%/fooplugin.xpi -# @dirrmtry %%WEBPLUGINS_DIR%% -# ------------------------------------------------------ -# -# Here is what it will look like when it creates the symlinks: -# -# ------------------------------------------------------ -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi -# ------------------------------------------------------ -# -# If your port uses libtool, and installs any *.a and *.la files, do not add -# these files to WEBPLUGINS_FILES. WEBPLUGINS_FILES should be *.so or/and -# *.xpi ONLY. -# -# Example to add in Makefile and pkg-plist if your port installs plug-ins in -# its own directory, and you need to set WEBPLUGINS_DIR. -# -# Makefile: -# ------------------------------------------------------ -# [...] -# USE_WEBPLUGINS=gecko* -# WEBPLUGINS_DIR=#{PREFIX}/lib/application -# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi -# -# .include -# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" -# -# [...] -# -# .include -# ------------------------------------------------------ -# -# As for the pkg-plist, it should only include the actual files your -# port installs: -# -# pkg-plist: -# ------------------------------------------------------ -# [...] -# lib/application/fooplugin.a -# lib/application/fooplugin.la -# lib/application/fooplugin.so -# lib/application/fooplugin.xpi -# @dirrm lib/application -# ------------------------------------------------------ -# -# Here is what it will look like when it creates symlinks: -# -# ------------------------------------------------------ -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi -# ------------------------------------------------------ - -WEBPLUGINS_NAME?= ${PKGBASE} -WEBPLUGINS_FILES?= empty -WEBPLUGINS_APPS_ALL_LINUX= linux-firefox linux-firefox-devel linux-flock \ - linux-flock-devel linux-mozilla \ - linux-nvu linux-opera linux-opera-devel \ - linux-seamonkey linux-seamonkey-devel \ - linux-sunbird linux-sunbird-devel -WEBPLUGINS_APPS_ALL_NATIVE= gecko18 gecko19 opera opera-devel webkit-gtk2 -WEBPLUGINS_APPS_ALL= ${WEBPLUGINS_APPS_ALL_LINUX} \ - ${WEBPLUGINS_APPS_ALL_NATIVE} - -.if !defined(USE_WEBPLUGINS) || ${USE_WEBPLUGINS} == "yes" || \ - ${USE_WEBPLUGINS} == "*" -USE_WEBPLUGINS= ${WEBPLUGINS_APPS_ALL} -.endif - -.if !defined(WEBPLUGINS_FILES) || ${WEBPLUGINS_FILES} == "empty" || \ - ${WEBPLUGINS_FILES} == "" -IGNORE= cannot install: the WEBPLUGINS_FILES is empty, please add plugins file in it and see in www/firefox/Makefile.webplugins for document -.endif - -.for _TEMP_APP__ in ${WEBPLUGINS_APPS_ALL} -_TEMP_APP_=${_TEMP_APP__} -_TEMP_FLAG_=0 -. for _TEMP_USE__ in ${USE_WEBPLUGINS} -_TEMP_USE_=${_TEMP_USE__} -. if !${_TEMP_APP_:C!${_TEMP_USE_:S/*/.*/:S/?/./}!!} || \ - ( ${_TEMP_APP_:Mlinux-*} && ${_TEMP_USE_:Mlinux} ) || \ - ( ${_TEMP_APP_:Nlinux-*} && ${_TEMP_USE_:Mnative} ) -_TEMP_FLAG_=1 -. endif -. endfor -. if ${_TEMP_FLAG_} -USE_WEBPLUGINS_EXP+= ${_TEMP_APP__} -. endif -.endfor - -WEBPLUGINS_APPS= ${USE_WEBPLUGINS_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*:N*gecko*:N*webkit*} -WEBPLUGINS_SLDIRS= ${USE_WEBPLUGINS_EXP:S.^.${WEBPLUGINS_SLDIR}/.} -WEBPLUGINS_LINKFARMS= ${WEBPLUGINS_APPS} ${WEBPLUGINS_SLDIRS} - -WEBPLUGINS_LIBDIR= ${PREFIX}/lib/browser_plugins -WEBPLUGINS_SLDIR= ${WEBPLUGINS_LIBDIR}/symlinks -WEBPLUGINS_DIR?= ${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME} - -PLIST_SUB+= WEBPLUGINS_DIR="${WEBPLUGINS_DIR:S,^${PREFIX}/,,}" - -_LNWF= ${WEBPLUGINS_FILES:S,^,${WEBPLUGINS_DIR}/,} -_Q= 2>/dev/null || true -_WLD= ${WEBPLUGINS_LIBDIR:S,^${PREFIX},%D,} -_WLF= ${WEBPLUGINS_LINKFARMS:S,${PREFIX},%D,} -_WSD= ${WEBPLUGINS_SLDIR:S,^${PREFIX},%D,} - -webplugins-post-install: - @if [ ! -d ${WEBPLUGINS_DIR} ]; then \ - ${ECHO_CMD}; \ - ${ECHO_CMD} "ERROR: The \"${WEBPLUGINS_DIR}\" in WEBPLUGINS_DIR is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \ - ${ECHO_CMD}; \ - else \ - for _f in ${WEBPLUGINS_FILES}; do \ - if [ ! -f ${WEBPLUGINS_DIR}/$${_f} ]; then \ - ${ECHO_CMD}; \ - ${ECHO_CMD} "ERROR: The \"$${_f}\" in WEBPLUGINS_FILES is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \ - ${ECHO_CMD}; \ - fi; \ - done; \ - fi; \ - for _d in ${WEBPLUGINS_LINKFARMS}; do \ - ${INSTALL} -d $${_d}; \ - for _l in ${_LNWF}; do \ - ${LN} -sf $${_l} $${_d}/ ${_Q}; \ - done; \ - done; \ - for _d in ${_WLF}; do \ - ${ECHO_CMD} "@exec ${INSTALL} -d $$_d" >> ${TMPPLIST}; \ - for _l in ${_LNWF}; do \ - ${ECHO_CMD} "@exec ${LN} -sf $$_l $$_d/ ${_Q}" >> ${TMPPLIST}; \ - done; \ - for _f in ${WEBPLUGINS_FILES:S,^,\${_d}/,}; do \ - ${ECHO_CMD} "@unexec ${RM} -f $$_f" >> ${TMPPLIST}; \ - done; \ - ${ECHO_CMD} "@unexec rmdir $$_d ${_Q}" >> ${TMPPLIST}; \ - done - @${ECHO_CMD} "@unexec rmdir ${_WSD} ${_Q}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST} - -post-install: webplugins-post-install Modified: trunk/www/firefox-i18n/Makefile ============================================================================== --- trunk/www/firefox-i18n/Makefile Sat Apr 14 21:22:56 2012 (r708) +++ trunk/www/firefox-i18n/Makefile Thu Apr 19 10:56:36 2012 (r709) @@ -2,14 +2,13 @@ # Date created: 28 May 2006 # Whom: Andrew Pantyukhin # -# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.69 2012/03/22 07:30:27 beat Exp $ +# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.70 2012/04/18 14:50:10 beat Exp $ # PORTNAME= firefox-i18n -PORTVERSION= 10.0.3 -PORTREVISION= 1 +PORTVERSION= 11.0 CATEGORIES= www -MASTER_SITE_SUBDIR= firefox/releases/${PORTVERSION}esr/linux-i686/xpi +MASTER_SITE_SUBDIR= firefox/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} @@ -19,7 +18,7 @@ EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USE_FIREFOX= 10 +USE_FIREFOX= 11 USE_XPI= firefox linux-firefox USE_SUBMAKE= yes @@ -90,7 +89,7 @@ ${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/ # -# $FreeBSD: ports/www/firefox/Makefile,v 1.264 2012/03/14 09:34:46 beat Exp $ +# $FreeBSD: ports/www/firefox/Makefile,v 1.265 2012/04/18 14:50:09 beat Exp $ # PORTNAME= firefox -DISTVERSION= 10.0.3 +DISTVERSION= 11.0 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}esr/source -DISTNAME= ${PORTNAME}-${DISTVERSION}esr.source +MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source +DISTNAME= ${PORTNAME}-${DISTVERSION}.source MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla @@ -26,6 +26,7 @@ USE_AUTOTOOLS= autoconf213 USE_GECKO= gecko +CONFLICTS= firefox-10.* MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -png -nss -dbm -jpeg -xft MOZILLA_NAME= Firefox @@ -57,7 +58,7 @@ .include -WRKSRC:= ${WRKDIR}/mozilla-esr10 +WRKSRC:= ${WRKDIR}/mozilla-release .if ${HAVE_GNOME:Mlibgnomeui}!="" USE_GNOME+= libgnomeui Modified: trunk/www/firefox/distinfo ============================================================================== --- trunk/www/firefox/distinfo Sat Apr 14 21:22:56 2012 (r708) +++ trunk/www/firefox/distinfo Thu Apr 19 10:56:36 2012 (r709) @@ -1,2 +1,2 @@ -SHA256 (firefox-10.0.3esr.source.tar.bz2) = 3a3af286617c56e0f2843a530144aeb87fffe4ea76c254d2604f62ac589c4a01 -SIZE (firefox-10.0.3esr.source.tar.bz2) = 75471818 +SHA256 (firefox-11.0.source.tar.bz2) = 2fda6bcfe455c2449a8a69bc16bf13f6ea6006badb0657dae63107e52f051701 +SIZE (firefox-11.0.source.tar.bz2) = 78548401 Modified: trunk/www/firefox/files/patch-browser-app-Makefile.in ============================================================================== --- trunk/www/firefox/files/patch-browser-app-Makefile.in Sat Apr 14 21:22:56 2012 (r708) +++ trunk/www/firefox/files/patch-browser-app-Makefile.in Thu Apr 19 10:56:36 2012 (r709) @@ -1,6 +1,6 @@ ---- browser/app/Makefile.in 2011-09-28 22:24:36.000000000 +0200 -+++ ../../ff6/mozilla-release/browser/app/Makefile.in 2011-09-02 22:15:19.000000000 +0200 -@@ -92,22 +91,35 @@ +--- browser/app/Makefile.in.orig 2012-02-22 17:06:17.000000000 +0100 ++++ browser/app/Makefile.in 2012-03-07 20:46:17.000000000 +0100 +@@ -66,23 +66,36 @@ else # Build a binary bootstrapping with XRE_main @@ -15,6 +15,7 @@ LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base -LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build + LOCAL_INCLUDES += -I$(DEPTH)/build -DEFINES += -DXPCOM_GLUE -STL_FLAGS= @@ -37,10 +38,10 @@ +LIBS += -ljprof +endif + - ifndef MOZ_WINCONSOLE - ifdef MOZ_DEBUG - MOZ_WINCONSOLE = 1 -@@ -182,9 +194,18 @@ + ifdef MOZ_LINKER + LIBS += $(ZLIB_LIBS) + endif +@@ -157,9 +170,18 @@ ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) Modified: trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp ============================================================================== --- trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp Sat Apr 14 21:22:56 2012 (r708) +++ trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp Thu Apr 19 10:56:36 2012 (r709) @@ -1,18 +1,23 @@ ---- browser/app/nsBrowserApp.cpp 2011-09-28 22:24:36.000000000 +0200 -+++ ../../ff6/mozilla-release/browser/app/nsBrowserApp.cpp 2011-09-02 22:15:19.000000000 +0200 -@@ -36,19 +36,14 @@ +--- browser/app/nsBrowserApp.cpp 2012-03-13 02:36:38.000000000 +0100 ++++ ../../../firefox-esr/work/mozilla-esr10/browser/app/nsBrowserApp.cpp 2012-03-15 10:17:09.000000000 +0100 +@@ -36,23 +36,14 @@ * * ***** END LICENSE BLOCK ***** */ +-#include "application.ini.h" -#include "nsXPCOMGlue.h" - #include "nsXULAppAPI.h" -#if defined(XP_WIN) ++#include "nsXULAppAPI.h" +#ifdef XP_WIN #include #include -#elif defined(XP_UNIX) -#include -#include +-#endif +- +-#ifdef XP_MACOSX +-#include "MacQuirks.h" #endif #include @@ -21,7 +26,7 @@ #include "plstr.h" #include "prprf.h" -@@ -59,16 +54,11 @@ +@@ -63,16 +54,11 @@ #include "nsStringGlue.h" #ifdef XP_WIN @@ -40,7 +45,7 @@ static void Output(const char *fmt, ... ) { -@@ -95,12 +85,12 @@ +@@ -99,12 +85,12 @@ { if (*++arg == '-') ++arg; @@ -54,8 +59,8 @@ + return !PL_strcasecmp(++arg, s); #endif - return PR_FALSE; -@@ -116,48 +106,22 @@ + return false; +@@ -120,35 +106,22 @@ ~ScopedLogging() { NS_LogTerm(); } }; @@ -86,22 +91,13 @@ + ScopedLogging log; + nsCOMPtr appini; --#ifdef XP_WIN -- // exePath comes from mozilla::BinaryPath::Get, which returns a UTF-8 -- // encoded path, so it is safe to convert it -- nsresult rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(exePath), false, -- getter_AddRefs(appini)); --#else -- nsresult rv = NS_NewNativeLocalFile(nsDependentCString(exePath), false, -- getter_AddRefs(appini)); --#endif +- nsresult rv; + nsresult rv = XRE_GetBinaryPath(argv[0], getter_AddRefs(appini)); - if (NS_FAILED(rv)) { ++ if (NS_FAILED(rv)) { + Output("Couldn't calculate the application directory."); - return 255; - } -- - appini->SetNativeLeafName(NS_LITERAL_CSTRING("application.ini")); ++ return 255; ++ } ++ appini->SetNativeLeafName(NS_LITERAL_CSTRING("application.ini")); // Allow firefox.exe to launch XULRunner apps via -app // Note that -app must be the *first* argument. @@ -111,7 +107,7 @@ if (appDataFile && *appDataFile) { rv = XRE_GetFileFromPath(appDataFile, getter_AddRefs(appini)); if (NS_FAILED(rv)) { -@@ -177,12 +141,8 @@ +@@ -168,133 +141,23 @@ return 255; } @@ -126,10 +122,34 @@ argv[2] = argv[0]; argv += 2; argc -= 2; -@@ -197,90 +157,7 @@ + } - int result = XRE_main(argc, argv, appData); - XRE_FreeAppData(appData); +- int result; +- if (appini) { +- nsXREAppData *appData; +- rv = XRE_CreateAppData(appini, &appData); +- if (NS_FAILED(rv)) { +- Output("Couldn't read application.ini"); +- return 255; +- } +- result = XRE_main(argc, argv, appData); +- XRE_FreeAppData(appData); +- } else { +-#ifdef XP_WIN +- // exePath comes from mozilla::BinaryPath::Get, which returns a UTF-8 +- // encoded path, so it is safe to convert it +- rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(exePath), PR_FALSE, +- getter_AddRefs(appini)); +-#else +- rv = NS_NewNativeLocalFile(nsDependentCString(exePath), PR_FALSE, +- getter_AddRefs(appini)); +-#endif +- if (NS_FAILED(rv)) { +- return 255; +- } +- result = XRE_main(argc, argv, &sAppData); +- } +- - return result; -} - @@ -137,6 +157,10 @@ -{ - char exePath[MAXPATHLEN]; - +-#ifdef XP_MACOSX +- TriggerQuirks(); +-#endif +- - nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath); - if (NS_FAILED(rv)) { - Output("Couldn't calculate the application directory.\n"); @@ -173,13 +197,18 @@ - Output("Couldn't load XPCOM.\n"); - return 255; - } +- // Reset exePath so that it is the directory name and not the xpcom dll name +- *lastSlash = 0; - - rv = XPCOMGlueLoadXULFunctions(kXULFuncs); -- if (NS_FAILED(rv)) { ++ nsXREAppData *appData; ++ rv = XRE_CreateAppData(appini, &appData); + if (NS_FAILED(rv)) { - Output("Couldn't load XRE functions.\n"); -- return 255; -- } -- ++ Output("Couldn't read application.ini"); + return 255; + } + -#ifdef XRE_HAS_DLL_BLOCKLIST - XRE_SetupDllBlocklist(); -#endif @@ -215,6 +244,8 @@ - } - - XPCOMGlueShutdown(); ++ int result = XRE_main(argc, argv, appData); ++ XRE_FreeAppData(appData); + if (appEnv) + PR_smprintf_free(appEnv); return result; Modified: trunk/www/firefox/files/patch-js-src-configure.in ============================================================================== --- trunk/www/firefox/files/patch-js-src-configure.in Sat Apr 14 21:22:56 2012 (r708) +++ trunk/www/firefox/files/patch-js-src-configure.in Thu Apr 19 10:56:36 2012 (r709) @@ -1,6 +1,6 @@ ---- js/src/configure.in.orig 2012-01-29 11:24:33.000000000 +0100 -+++ js/src/configure.in 2012-01-30 23:30:02.051087215 +0100 -@@ -1410,7 +1410,7 @@ +--- js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100 ++++ js/src/configure.in 2012-03-07 21:03:11.000000000 +0100 +@@ -1470,7 +1470,7 @@ CPU_ARCH=sparc ;; @@ -9,7 +9,7 @@ CPU_ARCH="$OS_TEST" ;; -@@ -1432,7 +1432,7 @@ +@@ -1492,7 +1492,7 @@ dnl =============================================================== INTEL_ARCHITECTURE= case "$OS_TEST" in @@ -18,7 +18,7 @@ INTEL_ARCHITECTURE=1 esac -@@ -2713,6 +2713,16 @@ +@@ -2814,6 +2814,16 @@ AC_DEFINE(JS_CPU_X86) AC_DEFINE(JS_NUNBOX32) ;; @@ -33,32 +33,5 @@ + AC_DEFINE(JS_PUNBOX64) + ;; x86_64*-*) - NANOJIT_ARCH=X64 - ENABLE_METHODJIT=1 -@@ -2732,6 +2742,7 @@ - AC_DEFINE(JS_NUNBOX32) - ;; - sparc*-*) -+ if test ! "$HAVE_64BIT_OS" ; then - NANOJIT_ARCH=Sparc ENABLE_METHODJIT=1 ENABLE_MONOIC=1 -@@ -2739,6 +2750,7 @@ - ENABLE_METHODJIT_TYPED_ARRAY=1 - AC_DEFINE(JS_CPU_SPARC) - AC_DEFINE(JS_NUNBOX32) -+ fi - ;; - esac - -@@ -2795,6 +2807,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) From owner-freebsd-gecko@FreeBSD.ORG Thu Apr 19 14:42:15 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9839F1065672 for ; Thu, 19 Apr 2012 14:42:15 +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 1E44D8FC08 for ; Thu, 19 Apr 2012 14:42:14 +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 q3JEgDcO031339 for ; Thu, 19 Apr 2012 14:42:13 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q3JEg809030785 for freebsd-gecko@freebsd.org; Thu, 19 Apr 2012 14:42:08 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 19 Apr 2012 14:42:08 GMT Message-Id: <201204191442.q3JEg809030785@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] r710 - 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: Thu, 19 Apr 2012 14:42:15 -0000 Author: beat Date: Thu Apr 19 14:42:08 2012 New Revision: 710 Log: - Update to 12.0b6 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 Apr 19 10:56:36 2012 (r709) +++ branches/experimental/www/firefox-beta/Makefile Thu Apr 19 14:42:08 2012 (r710) @@ -6,7 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 12.0b1 +DISTVERSION= 12.0b6 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} Modified: branches/experimental/www/firefox-beta/distinfo ============================================================================== --- branches/experimental/www/firefox-beta/distinfo Thu Apr 19 10:56:36 2012 (r709) +++ branches/experimental/www/firefox-beta/distinfo Thu Apr 19 14:42:08 2012 (r710) @@ -1,2 +1,2 @@ -SHA256 (firefox-12.0b1.source.tar.bz2) = f58385117810a8d6fedee5d3b4f5cea2099c9a7c5a22066f381c641f0fdd25d8 -SIZE (firefox-12.0b1.source.tar.bz2) = 78992945 +SHA256 (firefox-12.0b6.source.tar.bz2) = 60dcbcb18393a02283c5471c2534cfea33660760a520af0da7daa71a06ded63d +SIZE (firefox-12.0b6.source.tar.bz2) = 78875923 From owner-freebsd-gecko@FreeBSD.ORG Thu Apr 19 14:42:49 2012 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 1B842106564A for ; Thu, 19 Apr 2012 14:42:49 +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 9992E8FC0A for ; Thu, 19 Apr 2012 14:42:48 +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 q3JEglHY032648 for ; Thu, 19 Apr 2012 14:42:47 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q3JEgg88032297 for freebsd-gecko@freebsd.org; Thu, 19 Apr 2012 14:42:42 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 19 Apr 2012 14:42:42 GMT Message-Id: <201204191442.q3JEgg88032297@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] r711 - branches/experimental/mail/thunderbird-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: Thu, 19 Apr 2012 14:42:49 -0000 Author: beat Date: Thu Apr 19 14:42:42 2012 New Revision: 711 Log: - Update to 12.0b4 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 Thu Apr 19 14:42:08 2012 (r710) +++ branches/experimental/mail/thunderbird-beta/Makefile Thu Apr 19 14:42:42 2012 (r711) @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -DISTVERSION= 12.0b1 +DISTVERSION= 12.0b4 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 Thu Apr 19 14:42:08 2012 (r710) +++ branches/experimental/mail/thunderbird-beta/distinfo Thu Apr 19 14:42:42 2012 (r711) @@ -1,2 +1,2 @@ -SHA256 (thunderbird-12.0b1.source.tar.bz2) = 077c0412d81a46a3bac06e9dad4d75ac509de0ea09b1b1120d4c6863cf01551c -SIZE (thunderbird-12.0b1.source.tar.bz2) = 101553292 +SHA256 (thunderbird-12.0b4.source.tar.bz2) = 1f7d75f0f33c2f60f93ca03349953d34dfd9c1a0057050cf2c5e4655f45068df +SIZE (thunderbird-12.0b4.source.tar.bz2) = 101721253 From owner-freebsd-gecko@FreeBSD.ORG Fri Apr 20 15:18:31 2012 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 A302F106564A for ; Fri, 20 Apr 2012 15:18:31 +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 41B618FC0A for ; Fri, 20 Apr 2012 15:18:31 +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 q3KFIOUH001875 for ; Fri, 20 Apr 2012 15:18:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q3KFIJGL099899 for freebsd-gecko@freebsd.org; Fri, 20 Apr 2012 15:18:19 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 20 Apr 2012 15:18:19 GMT Message-Id: <201204201518.q3KFIJGL099899@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] r712 - 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: Fri, 20 Apr 2012 15:18:31 -0000 Author: beat Date: Fri Apr 20 15:18:18 2012 New Revision: 712 Log: - Update to 2.9b3 Added: branches/experimental/www/seamonkey-beta/files/extra-patch-configure.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp (contents, props changed) Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp Modified: branches/experimental/www/seamonkey-beta/Makefile branches/experimental/www/seamonkey-beta/distinfo branches/experimental/www/seamonkey-beta/files/extra-mailnews-patch-bridge-bridge.mk branches/experimental/www/seamonkey-beta/files/patch-ldap-xpcom-src-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-configure.in Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Thu Apr 19 14:42:42 2012 (r711) +++ branches/experimental/www/seamonkey-beta/Makefile Fri Apr 20 15:18:18 2012 (r712) @@ -2,11 +2,11 @@ # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # -# $FreeBSD: ports/www/seamonkey/Makefile,v 1.319 2011/12/23 16:58:05 beat Exp $ +# $FreeBSD: ports/www/seamonkey/Makefile,v 1.323 2012/03/14 15:50:04 beat Exp $ # PORTNAME= seamonkey -DISTVERSION= 2.7 +DISTVERSION= 2.9b3 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -84,7 +84,8 @@ .endif .if defined(WITHOUT_MAILNEWS) -EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk +EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk \ + ${FILESDIR}/extra-patch-configure.in MOZ_OPTIONS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP Modified: branches/experimental/www/seamonkey-beta/distinfo ============================================================================== --- branches/experimental/www/seamonkey-beta/distinfo Thu Apr 19 14:42:42 2012 (r711) +++ branches/experimental/www/seamonkey-beta/distinfo Fri Apr 20 15:18:18 2012 (r712) @@ -1,2 +1,2 @@ -SHA256 (seamonkey-2.7.source.tar.bz2) = 695c3e4767262fac35bcf80f71dcbdfbc1172cdd323338ea530f6680283aea2f -SIZE (seamonkey-2.7.source.tar.bz2) = 98045633 +SHA256 (seamonkey-2.9b3.source.tar.bz2) = 8532d8deeadd6ac6894a0828fbfdfb456b04c08cd1ce6baeaf6d05137023d900 +SIZE (seamonkey-2.9b3.source.tar.bz2) = 102211948 Modified: branches/experimental/www/seamonkey-beta/files/extra-mailnews-patch-bridge-bridge.mk ============================================================================== --- branches/experimental/www/seamonkey-beta/files/extra-mailnews-patch-bridge-bridge.mk Thu Apr 19 14:42:42 2012 (r711) +++ branches/experimental/www/seamonkey-beta/files/extra-mailnews-patch-bridge-bridge.mk Fri Apr 20 15:18:18 2012 (r712) @@ -1,6 +1,6 @@ ---- bridge/bridge.mk.orig 2011-09-29 01:10:49.000000000 +0200 -+++ bridge/bridge.mk 2011-10-26 22:21:47.000000000 +0200 -@@ -38,16 +38,16 @@ +--- bridge/bridge.mk.orig 2012-03-13 06:23:10.000000000 +0100 ++++ bridge/bridge.mk 2012-03-14 12:28:03.000000000 +0100 +@@ -38,17 +38,19 @@ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete @@ -10,13 +10,15 @@ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/ldap/xpcom -#endif +endif - + #ifdef MOZ_MORK APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork #endif - --ifdef MOZ_MAIL_NEWS + +ifdef disabled APP_LIBXUL_DIRS += \ $(DEPTH)$(SUBDIR)/mailnews/base \ $(DEPTH)$(SUBDIR)/mailnews/mime/public \ + $(DEPTH)$(SUBDIR)/mailnews \ + $(NULL) ++endif Added: branches/experimental/www/seamonkey-beta/files/extra-patch-configure.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/extra-patch-configure.in Fri Apr 20 15:18:18 2012 (r712) @@ -0,0 +1,14 @@ +--- configure.in.orig 2012-03-14 14:18:03.000000000 +0100 ++++ configure.in 2012-03-14 14:18:25.000000000 +0100 +@@ -837,11 +837,6 @@ + AC_PROG_CPP + AC_PROG_CXXCPP + +-MAIL_COMPONENT="mail msgsmime import" +-export MAIL_COMPONENT +-MAIL_MODULE="MODULE(nsMailModule) MODULE(nsMsgSMIMEModule) MODULE(nsImportServiceModule)" +-export MAIL_MODULE +- + if test -n "$_WIN32_MSVC"; then + SKIP_PATH_CHECKS=1 + SKIP_COMPILER_CHECKS=1 Modified: branches/experimental/www/seamonkey-beta/files/patch-ldap-xpcom-src-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-ldap-xpcom-src-Makefile.in Thu Apr 19 14:42:42 2012 (r711) +++ branches/experimental/www/seamonkey-beta/files/patch-ldap-xpcom-src-Makefile.in Fri Apr 20 15:18:18 2012 (r712) @@ -1,6 +1,6 @@ ---- 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 @@ +--- ldap/xpcom/src/Makefile.in.orig 2012-03-12 10:25:35.000000000 +0100 ++++ ldap/xpcom/src/Makefile.in 2012-03-12 10:26:09.000000000 +0100 +@@ -89,6 +89,10 @@ $(NULL) endif @@ -8,6 +8,6 @@ +EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread +endif + - EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(LDAP_LIBS) - - include $(topsrcdir)/config/rules.mk + EXTRA_DSO_LDOPTS += $(LDAP_LIBS) + ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE + EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp Fri Apr 20 15:18:18 2012 (r712) @@ -0,0 +1,34 @@ +--- mozilla/gfx/thebes/gfxPlatform.cpp~ 2012-02-07 11:59:39.717184907 +0000 ++++ mozilla/gfx/thebes/gfxPlatform.cpp 2012-02-07 13:06:01.084668445 +0000 +@@ -446,6 +446,7 @@ + static_cast(srcBuffer)->Release(); + } + ++#ifdef MOZ_TREE_CAIRO + void SourceSnapshotDetached(cairo_surface_t *nullSurf) + { + gfxImageSurface* origSurf = +@@ -453,6 +454,7 @@ + + origSurf->SetData(&kSourceSurface, NULL, NULL); + } ++#endif + + RefPtr + gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface) +@@ -522,6 +524,7 @@ + imgSurface->Stride(), + format); + ++ #ifdef MOZ_TREE_CAIRO + cairo_surface_t *nullSurf = + cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); + cairo_surface_set_user_data(nullSurf, +@@ -530,6 +533,7 @@ + NULL); + cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); + cairo_surface_destroy(nullSurf); ++ #endif + } + + srcBuffer->AddRef(); Deleted: branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp Fri Apr 20 15:18:18 2012 (r711) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,36 +0,0 @@ -diff --git a/gfx/thebes/gfxTeeSurface.cpp b/gfx/thebes/gfxTeeSurface.cpp ---- mozilla/gfx/thebes/gfxTeeSurface.cpp -+++ mozilla/gfx/thebes/gfxTeeSurface.cpp -@@ -47,4 +47,5 @@ gfxTeeSurface::gfxTeeSurface(cairo_surfa - gfxTeeSurface::gfxTeeSurface(gfxASurface **aSurfaces, PRInt32 aSurfaceCount) - { -+#ifdef MOZ_TREE_CAIRO - NS_ASSERTION(aSurfaceCount > 0, "Must have a least one surface"); - cairo_surface_t *csurf = cairo_tee_surface_create(aSurfaces[0]->CairoSurface()); -@@ -54,4 +55,5 @@ gfxTeeSurface::gfxTeeSurface(gfxASurface - cairo_tee_surface_add(csurf, aSurfaces[i]->CairoSurface()); - } -+#endif - } - -@@ -59,6 +61,8 @@ const gfxIntSize - gfxTeeSurface::GetSize() const - { -+#ifdef MOZ_TREE_CAIRO - nsRefPtr 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