From owner-freebsd-gecko@FreeBSD.ORG Sun Jul 3 14:50:13 2011 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D397106567A for ; Sun, 3 Jul 2011 14:50:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id EFA6C8FC1D for ; Sun, 3 Jul 2011 14:50:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p63EoC6q031235 for ; Sun, 3 Jul 2011 14:50:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p63EoCFX031234; Sun, 3 Jul 2011 14:50:12 GMT (envelope-from gnats) Resent-Date: Sun, 3 Jul 2011 14:50:12 GMT Resent-Message-Id: <201107031450.p63EoCFX031234@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: gecko@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pan Tsu Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C55811065677 for ; Sun, 3 Jul 2011 14:49:00 +0000 (UTC) (envelope-from inyaoo@gmail.com) Received: from mail-fx0-f44.google.com (mail-fx0-f44.google.com [209.85.161.44]) by mx1.freebsd.org (Postfix) with ESMTP id 60C6C8FC15 for ; Sun, 3 Jul 2011 14:49:00 +0000 (UTC) Received: by fxe6 with SMTP id 6so3705112fxe.17 for ; Sun, 03 Jul 2011 07:48:59 -0700 (PDT) Received: by 10.223.57.5 with SMTP id a5mr8055707fah.90.1309704539255; Sun, 03 Jul 2011 07:48:59 -0700 (PDT) Received: from localhost (cheburashka.cc [79.172.193.89]) by mx.google.com with ESMTPS id h1sm3831143fag.35.2011.07.03.07.48.56 (version=SSLv3 cipher=OTHER); Sun, 03 Jul 2011 07:48:58 -0700 (PDT) Message-Id: <86y60fv2qy.fsf@gmail.com> Date: Sun, 03 Jul 2011 18:48:53 +0400 From: Pan Tsu To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/158610: [patch] www/firefox: require cairo version with tee support 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: Sun, 03 Jul 2011 14:50:13 -0000 >Number: 158610 >Category: ports >Synopsis: [patch] www/firefox: require cairo version with tee support >Confidential: no >Severity: non-critical >Priority: low >Responsible: gecko >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jul 03 14:50:12 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Pan Tsu >Release: FreeBSD 9.0-CURRENT amd64 >Organization: >Environment: >Description: Fail early if a user didn't follow the right order[1]. It shouldn't happen when installing/updating ports with portmaster et al. With this patch cairo would be queried twice: - Mk/bsd.gecko.mk - USE_MOZILLA - www/firefox/Makefile - BUILD_DEPENDS similar to NSPR. [1] most recent example: http://forums.freebsd.org/showpost.php?p=139370&postcount=4 >How-To-Repeat: 1. csup ports before 02 Mar 2011 2. install firefox 3. csup again to most recent date 4. update firefox by `make all deinstall install' $ make [..] ===> Found cairo-1.10.2,1, but you need to upgrade to cairo>=1.10.2_1,1. *** Error code 1 >Fix: --- a.diff begins here --- Index: www/firefox/Makefile =================================================================== RCS file: /a/.cvsup/ports/www/firefox/Makefile,v retrieving revision 1.241 diff -u -p -r1.241 Makefile --- www/firefox/Makefile 21 Jun 2011 21:12:30 -0000 1.241 +++ www/firefox/Makefile 3 Jul 2011 14:41:15 -0000 @@ -16,7 +16,8 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}.sou MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla -BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr +BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ + cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ event-1.4:${PORTSDIR}/devel/libevent --- a.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 4 11:07:22 2011 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 342A1106564A for ; Mon, 4 Jul 2011 11:07:22 +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 22B768FC21 for ; Mon, 4 Jul 2011 11:07:22 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p64B7MYW040713 for ; Mon, 4 Jul 2011 11:07:22 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p64B7LOJ040711 for gecko@FreeBSD.org; Mon, 4 Jul 2011 11:07:21 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 4 Jul 2011 11:07:21 GMT Message-Id: <201107041107.p64B7LOJ040711@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, 04 Jul 2011 11:07:22 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/158610 gecko [patch] www/firefox: require cairo version with tee su o ports/158348 gecko mail/thunderbird build error o ports/156889 gecko www/firefox36: firefox 3.6.17 eats cpu on current/x64 o ports/156813 gecko [PATCH] deskutils/lightning-thunderbird: Patch to requ o ports/156777 gecko www/firefox and mail/thunderbird menus show corrupt da o ports/156335 gecko www/firefox: Repeatable firefox-4.0_1,1 crash f ports/155949 gecko www/firefox: firefox 4, WITH_PGO, better Text against o ports/155291 gecko reinstalling www/firefox removes www/firefox-sync o ports/153114 gecko www/firefox 3.6.12_1,1 crash: Assertion failure: prop o ports/150631 gecko www/firefox 3.6.9 does not build if you have previousl o ports/146231 gecko [feature request] [patch] www/firefox: use port libs o ports/144044 gecko [PATCH] www/firefox: Makefile.webplugins target order 12 problems total. From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 4 17:28:57 2011 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD80510656E6; Mon, 4 Jul 2011 17:28:57 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 881C48FC14; Mon, 4 Jul 2011 17:28:57 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p64HSvvO091514; Mon, 4 Jul 2011 17:28:57 GMT (envelope-from flo@freefall.freebsd.org) Received: (from flo@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p64HSvuU091510; Mon, 4 Jul 2011 17:28:57 GMT (envelope-from flo) Date: Mon, 4 Jul 2011 17:28:57 GMT Message-Id: <201107041728.p64HSvuU091510@freefall.freebsd.org> To: inyaoo@gmail.com, flo@FreeBSD.org, gecko@FreeBSD.org From: flo@FreeBSD.org Cc: Subject: Re: ports/158610: [patch] www/firefox: require cairo version with tee support 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, 04 Jul 2011 17:28:57 -0000 Synopsis: [patch] www/firefox: require cairo version with tee support State-Changed-From-To: open->closed State-Changed-By: flo State-Changed-When: Mon Jul 4 17:28:57 UTC 2011 State-Changed-Why: Committed. Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=158610 From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 4 17:30:12 2011 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A18CB106566B for ; Mon, 4 Jul 2011 17:30:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 92E478FC16 for ; Mon, 4 Jul 2011 17:30:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p64HUCuF091735 for ; Mon, 4 Jul 2011 17:30:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p64HUCPx091732; Mon, 4 Jul 2011 17:30:12 GMT (envelope-from gnats) Date: Mon, 4 Jul 2011 17:30:12 GMT Message-Id: <201107041730.p64HUCPx091732@freefall.freebsd.org> To: gecko@FreeBSD.org From: dfilter@FreeBSD.ORG (dfilter service) Cc: Subject: Re: ports/158610: commit references a PR X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: dfilter service List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jul 2011 17:30:12 -0000 The following reply was made to PR ports/158610; it has been noted by GNATS. From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/158610: commit references a PR Date: Mon, 4 Jul 2011 17:29:03 +0000 (UTC) flo 2011-07-04 17:28:33 UTC FreeBSD ports repository Modified files: www/firefox Makefile Log: - require cairo>=1.10.2_1,1 to catch build failuers early The cairo dependancy is usually added by bsd.gecko.mk, but for firefox we need a spcific version. PR: ports/158610 Submitted by: Pan Tsu Revision Changes Path 1.242 +2 -1 ports/www/firefox/Makefile _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 4 21:32:38 2011 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9AC41065673; Mon, 4 Jul 2011 21:32:38 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B86528FC0C; Mon, 4 Jul 2011 21:32:38 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p64LWbNV021295; Mon, 4 Jul 2011 21:32:37 GMT (envelope-from flo@FreeBSD.org) Message-ID: <4E123175.9040607@FreeBSD.org> Date: Mon, 04 Jul 2011 23:32:37 +0200 From: Florian Smeets User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:6.0a2) Gecko/20110704 Thunderbird/6.0a2 MIME-Version: 1.0 To: "Mikhail T." References: <4DDDD3EF.9040907@aldan.algebra.com> In-Reply-To: <4DDDD3EF.9040907@aldan.algebra.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: gecko@FreeBSD.org, beat@FreeBSD.org Subject: Re: building lightning as part of thunderbird 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, 04 Jul 2011 21:32:38 -0000 On 26.05.11 06:15, Mikhail T. wrote: > It turns out, Lightning can already be built together with the rest of > thunderbird > > with the simple --enable-calendar configure-option. The attached patch > does that unconditionally, but adding the OPTION (WITH_LIGHTNING?) is > easy too. > > The patch installs the lightning.xpi into the same location, where > deskutils/lightning-thunderbird installs it --- deliberately. With this > addition, the lightning-thunderbird port (which currently rebuilds vast > amounts of C and C++ code for just one shared library) can be removed. > But, of course, the location can changed --- to something underneath > lib/thunderbird, for example... > Hi, i just committed a slightly different version of this patch. Thanks, Florian From owner-freebsd-gecko@FreeBSD.ORG Wed Jul 6 17:04:49 2011 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98892106566B for ; Wed, 6 Jul 2011 17:04:49 +0000 (UTC) (envelope-from yuri@rawbw.com) Received: from shell0.rawbw.com (shell0.rawbw.com [198.144.192.45]) by mx1.freebsd.org (Postfix) with ESMTP id 6FAE48FC15 for ; Wed, 6 Jul 2011 17:04:49 +0000 (UTC) Received: from eagle.yuri.org (stunnel@localhost [127.0.0.1]) (authenticated bits=0) by shell0.rawbw.com (8.14.4/8.14.4) with ESMTP id p66H4maS087134 for ; Wed, 6 Jul 2011 10:04:49 -0700 (PDT) (envelope-from yuri@rawbw.com) Message-ID: <4E1495B0.8030005@rawbw.com> Date: Wed, 06 Jul 2011 10:04:48 -0700 From: Yuri User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:5.0) Gecko/20110701 Thunderbird/5.0 MIME-Version: 1.0 To: gecko@FreeBSD.org Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Subject: FYI: URLs don't trigger the actions when clicked on 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, 06 Jul 2011 17:04:49 -0000 https://bugzilla.mozilla.org/show_bug.cgi?id=668944 From owner-freebsd-gecko@FreeBSD.ORG Wed Jul 6 18:20:20 2011 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F2811065676 for ; Wed, 6 Jul 2011 18:20:20 +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 8AEEC8FC17 for ; Wed, 6 Jul 2011 18:20:19 +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 p66IKHVU070301 for ; Wed, 6 Jul 2011 18:20:17 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p66IK9j5061311 for freebsd-gecko@freebsd.org; Wed, 6 Jul 2011 18:20:09 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 6 Jul 2011 18:20:09 GMT Message-Id: <201107061820.p66IK9j5061311@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] r584 - branches/experimental/deskutils/lightning branches/experimental/deskutils/lightning-thunderbird branches/experimental/mail/thunderbird branches/experimental/mail/thunderbird-i18n branches/experimental/mail/thunderbird/files branches/experimental/mail/thunderbird3 branches/experimental/mail/thunderbird3-i18n branches/experimental/mail/thunderbird3/files branches/experimental/www/firefox branches/experimental/www/firefox-i18n branches/experimental/www/firefox/files branches/experimental/www/firefox35 branches/experimental/www/firefox35-i18n branches/experimental/www/firefox36 branches/experimental/www/firefox36-i18n branches/experimental/www/linux-firefox-devel trunk/deskutils/lightning trunk/deskutils/lightning-thunderbird trunk/mail/thunderbird trunk/mail/thunderbird-i18n trunk/mail/thunderbird/files trunk/mail/thunderbird3 trunk/mail/thunderbird3-i18n trunk/mail/thunderbird3/files trunk/www/firefox trunk/www/firefox-i18n trunk/www/firefox/files ! trunk/www/firefox35 trunk/www/firefox35-i18n trunk/www/firefox36 trunk/www/firefox36-i18n trunk/www/linux-firefox-devel X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jul 2011 18:20:20 -0000 Author: flo Date: Wed Jul 6 18:20:09 2011 New Revision: 584 Log: - sync with ports - remove www/firefox35* Added: branches/experimental/mail/thunderbird/files/pkg-message.in branches/experimental/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-src-Makefile.in branches/experimental/www/firefox/files/patch-bugzilla-535300 trunk/mail/thunderbird/files/pkg-message.in trunk/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-src-Makefile.in trunk/www/firefox/files/patch-bugzilla-535300 Deleted: branches/experimental/mail/thunderbird/files/liboggplay_oss branches/experimental/mail/thunderbird3/files/liboggplay_oss branches/experimental/mail/thunderbird3/files/releng6_pulseaudio branches/experimental/www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc.orig branches/experimental/www/firefox35/ branches/experimental/www/firefox35-i18n/ trunk/mail/thunderbird/files/liboggplay_oss trunk/mail/thunderbird3/files/liboggplay_oss trunk/mail/thunderbird3/files/releng6_pulseaudio trunk/www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc.orig trunk/www/firefox35/ trunk/www/firefox35-i18n/ Modified: branches/experimental/deskutils/lightning-thunderbird/Makefile branches/experimental/deskutils/lightning-thunderbird/distinfo branches/experimental/deskutils/lightning/Makefile branches/experimental/deskutils/lightning/distinfo branches/experimental/mail/thunderbird-i18n/Makefile branches/experimental/mail/thunderbird/Makefile branches/experimental/mail/thunderbird3-i18n/Makefile branches/experimental/mail/thunderbird3/Makefile branches/experimental/www/firefox-i18n/Makefile.option branches/experimental/www/firefox/Makefile branches/experimental/www/firefox/files/patch-configure.in branches/experimental/www/firefox36-i18n/Makefile branches/experimental/www/firefox36-i18n/Makefile.lang branches/experimental/www/firefox36-i18n/Makefile.option branches/experimental/www/firefox36/Makefile branches/experimental/www/linux-firefox-devel/Makefile trunk/deskutils/lightning-thunderbird/Makefile trunk/deskutils/lightning-thunderbird/distinfo trunk/deskutils/lightning/Makefile trunk/deskutils/lightning/distinfo trunk/mail/thunderbird-i18n/Makefile trunk/mail/thunderbird/Makefile trunk/mail/thunderbird3-i18n/Makefile trunk/mail/thunderbird3/Makefile trunk/www/firefox-i18n/Makefile.option trunk/www/firefox/Makefile trunk/www/firefox/files/patch-configure.in trunk/www/firefox36-i18n/Makefile trunk/www/firefox36-i18n/Makefile.lang trunk/www/firefox36-i18n/Makefile.option trunk/www/firefox36/Makefile trunk/www/linux-firefox-devel/Makefile Modified: branches/experimental/deskutils/lightning-thunderbird/Makefile ============================================================================== --- branches/experimental/deskutils/lightning-thunderbird/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ branches/experimental/deskutils/lightning-thunderbird/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,11 +2,12 @@ # Date created: 2005-02-26 # Whom: Michael Johnson # -# $FreeBSD: ports/deskutils/lightning-thunderbird/Makefile,v 1.37 2010/12/04 07:30:57 ade Exp $ +# $FreeBSD: ports/deskutils/lightning-thunderbird/Makefile,v 1.39 2011/07/04 20:47:14 flo Exp $ # PORTNAME= lightning DISTVERSION= 1.0 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= calendar/${PORTNAME}/releases/${DISTVERSION}b2/source @@ -16,7 +17,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= An integrated calendar for Thunderbird 3.1 -RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird +RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird3 CONFLICTS_BUILD= spidermonkey-1.[0-7]* USE_AUTOTOOLS= autoconf213 libtool Modified: branches/experimental/deskutils/lightning-thunderbird/distinfo ============================================================================== --- branches/experimental/deskutils/lightning-thunderbird/distinfo Thu Jun 30 00:02:12 2011 (r583) +++ branches/experimental/deskutils/lightning-thunderbird/distinfo Wed Jul 6 18:20:09 2011 (r584) @@ -1,3 +1,2 @@ -MD5 (lightning-1.0b2.source.tar.bz2) = 2e2ba2279a4e89f11e50ea67b84dd543 SHA256 (lightning-1.0b2.source.tar.bz2) = 887f8d49e6dd36478178b8438f28252370169e60a39383628c0862d8881eb9b2 SIZE (lightning-1.0b2.source.tar.bz2) = 66604225 Modified: branches/experimental/deskutils/lightning/Makefile ============================================================================== --- branches/experimental/deskutils/lightning/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ branches/experimental/deskutils/lightning/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,11 +2,12 @@ # Date created: 2005-02-26 # Whom: Michael Johnson # -# $FreeBSD: ports/deskutils/lightning/Makefile,v 1.35 2010/12/04 07:30:57 ade Exp $ +# $FreeBSD: ports/deskutils/lightning/Makefile,v 1.37 2011/07/04 20:46:09 flo Exp $ # PORTNAME= lightning DISTVERSION= 1.0 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= calendar/${PORTNAME}/releases/${DISTVERSION}b1/source @@ -15,8 +16,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= An integrated calendar for Thunderbird and SeaMonkey -OPTIONS+= THUNDERBIRD "Install Thunderbird 3.0" on \ - SEAMONKEY "Install SeaMonkey 2.0" off +RUN_DEPENDS+= ${LOCALBASE}/lib/seamonkey/seamonkey-bin:${PORTSDIR}/www/seamonkey2 CONFLICTS_BUILD= spidermonkey-1.[0-7]* USE_AUTOTOOLS= autoconf213 libtool @@ -47,14 +47,6 @@ .include .include -.if defined(WITH_THUNDERBIRD) -RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird3 -.endif - -.if defined(WITH_SEAMONKEY) -RUN_DEPENDS+= ${LOCALBASE}/lib/seamonkey/seamonkey-bin:${PORTSDIR}/www/seamonkey2 -.endif - XPI_FILE= ${DISTNAME:C/.source//:C/-sunbird//}-freebsd${OSVERSION:C/([0-9]).+/\1/}-${ARCH}.xpi PLIST_FILES= %%DATADIR%%/${XPI_FILE} PLIST_DIRS= %%DATADIR%% Modified: branches/experimental/deskutils/lightning/distinfo ============================================================================== --- branches/experimental/deskutils/lightning/distinfo Thu Jun 30 00:02:12 2011 (r583) +++ branches/experimental/deskutils/lightning/distinfo Wed Jul 6 18:20:09 2011 (r584) @@ -1,3 +1,2 @@ -MD5 (lightning-sunbird-1.0b1.source.tar.bz2) = 418523969c00725bef35e11ef5b06b9b SHA256 (lightning-sunbird-1.0b1.source.tar.bz2) = 857282e3d148df4ee03ae97d10cf23b2072810817c6a3a1dabe93d0d9b8228fd SIZE (lightning-sunbird-1.0b1.source.tar.bz2) = 60442959 Modified: branches/experimental/mail/thunderbird-i18n/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-i18n/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ branches/experimental/mail/thunderbird-i18n/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 29 May 2006 # Whom: Andrew Pantyukhin # -# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.42 2011/06/21 20:38:00 flo Exp $ +# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.43 2011/06/30 18:19:48 flo Exp $ # PORTNAME= thunderbird-i18n Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ branches/experimental/mail/thunderbird/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 4 September 2003 # Whom: Joe Marcus Clarke # -# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.126 2011/06/21 20:38:00 flo Exp $ +# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.128 2011/07/04 21:27:06 flo Exp $ # PORTNAME= thunderbird @@ -54,7 +54,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS= +OPTIONS= LIGHTNING "Enable calendar extension" off .include @@ -90,6 +90,16 @@ BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .endif +.if defined(WITH_LIGHTNING) +MOZ_OPTIONS+= --enable-calendar +MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar +LIGHTNING_DIR= share/lightning +SUB_FILES+= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message +.else +MOZ_OPTIONS+= --disable-calendar +.endif + post-extract:: ${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop @@ -124,10 +134,19 @@ @${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} @${ECHO_CMD} 'share/pixmaps/${PORTNAME_ICON}' >> ${PLIST} @${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST} +.if defined(WITH_LIGHTNING) + @${PRINTF} '%s/lightning-${PORTNAME}.xpi\n@dirrmtry %s\n' \ + ${LIGHTNING_DIR} ${LIGHTNING_DIR} >> ${PLIST} +.endif post-install: ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications ${LN} -sf ${PORTNAME_ICON_SRC} ${PREFIX}/share/pixmaps/${PORTNAME_ICON} +.if defined(WITH_LIGHTNING) + ${MKDIR} ${PREFIX}/${LIGHTNING_DIR} + ${INSTALL_DATA} ${MOZSRC}/dist/xpi-stage/lightning.xpi ${PREFIX}/${LIGHTNING_DIR}/lightning-${PORTNAME}.xpi + @${CAT} ${PKGMESSAGE} +.endif .include Deleted: branches/experimental/mail/thunderbird/files/liboggplay_oss ============================================================================== --- branches/experimental/mail/thunderbird/files/liboggplay_oss Wed Jul 6 18:20:09 2011 (r583) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- mozilla/media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200 -+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200 -@@ -45,6 +45,12 @@ - LIBRARY_NAME = sydneyaudio - FORCE_STATIC_LIB= 1 - -+ifeq ($(OS_ARCH),FreeBSD) -+CSRCS = \ -+ sydney_audio_oss.c \ -+ $(NULL) -+endif -+ - ifeq ($(OS_ARCH),Linux) - CSRCS = \ - sydney_audio_alsa.c \ Added: branches/experimental/mail/thunderbird/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/pkg-message.in Wed Jul 6 18:20:09 2011 (r584) @@ -0,0 +1,10 @@ +***************************************************************************** +In order to activate the Lightning extension, every user should install the +XPI file into his own profile via the menu: + +Tools -> Add-ons -> Extensions -> Icon left of the search field + -> Install From File + +The XPI file was installed as: +%%PREFIX%%/share/lightning/lightning-thunderbird.xpi +***************************************************************************** Modified: branches/experimental/mail/thunderbird3-i18n/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3-i18n/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ branches/experimental/mail/thunderbird3-i18n/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 29 May 2006 # Whom: Andrew Pantyukhin # -# $FreeBSD: ports/mail/thunderbird3-i18n/Makefile,v 1.45 2011/01/03 15:14:03 beat Exp $ +# $FreeBSD: ports/mail/thunderbird3-i18n/Makefile,v 1.47 2011/07/01 14:45:45 flo Exp $ # PORTNAME= thunderbird-i18n @@ -20,6 +20,8 @@ RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher .endif +LATEST_LINK= thunderbird3-i18n + NO_BUILD= yes USE_THUNDERBIRD= 31 USE_XPI= *thunderbird* Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ branches/experimental/mail/thunderbird3/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 4 September 2003 # Whom: Joe Marcus Clarke # -# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.126 2011/06/21 20:38:00 flo Exp $ +# $FreeBSD: ports/mail/thunderbird3/Makefile,v 1.131 2011/06/30 18:13:18 flo Exp $ # PORTNAME= thunderbird @@ -18,8 +18,9 @@ BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr USE_AUTOTOOLS= autoconf213 +LATEST_LINK= thunderbird3 USE_GECKO= gecko -CONFLICTS_INSTALL= thunderbird-3.0* +CONFLICTS_INSTALL= thunderbird-5.0* USE_MOZILLA= -png -nss -dbm -jpeg -xft MOZ_TOOLKIT= cairo-gtk2 @@ -56,13 +57,6 @@ WRKSRC= ${WRKDIR}/comm-1.9.2 MOZSRC:= ${WRKSRC}/mozilla -.if ${OSVERSION} < 700000 -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio -EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio -.else -EXTRA_PATCHES= ${FILESDIR}/liboggplay_oss -.endif - .if ${ARCH} == powerpc64 .if ${OSVERSION} < 900033 BROKEN= Needs binutils 2.17.50 to build Deleted: branches/experimental/mail/thunderbird3/files/liboggplay_oss ============================================================================== --- branches/experimental/mail/thunderbird3/files/liboggplay_oss Wed Jul 6 18:20:09 2011 (r583) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- mozilla/media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200 -+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200 -@@ -45,6 +45,12 @@ - LIBRARY_NAME = sydneyaudio - FORCE_STATIC_LIB= 1 - -+ifeq ($(OS_ARCH),FreeBSD) -+CSRCS = \ -+ sydney_audio_oss.c \ -+ $(NULL) -+endif -+ - ifeq ($(OS_ARCH),Linux) - CSRCS = \ - sydney_audio_alsa.c \ Added: branches/experimental/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-src-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-src-Makefile.in Wed Jul 6 18:20:09 2011 (r584) @@ -0,0 +1,15 @@ +--- mozilla/media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200 ++++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200 +@@ -45,6 +45,12 @@ + LIBRARY_NAME = sydneyaudio + FORCE_STATIC_LIB= 1 + ++ifeq ($(OS_ARCH),FreeBSD) ++CSRCS = \ ++ sydney_audio_oss.c \ ++ $(NULL) ++endif ++ + ifeq ($(OS_ARCH),Linux) + CSRCS = \ + sydney_audio_alsa.c \ Deleted: branches/experimental/mail/thunderbird3/files/releng6_pulseaudio ============================================================================== --- branches/experimental/mail/thunderbird3/files/releng6_pulseaudio Wed Jul 6 18:20:09 2011 (r583) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,66 +0,0 @@ ---- mozilla/media/libsydneyaudio/src/Makefile.in.orig 2009-08-20 21:43:41.000000000 +0200 -+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-08-20 21:44:17.000000000 +0200 -@@ -45,6 +45,12 @@ - LIBRARY_NAME = sydneyaudio - FORCE_STATIC_LIB= 1 - -+ifeq ($(OS_ARCH),FreeBSD) -+CSRCS = \ -+ sydney_audio_pulseaudio.c \ -+ $(NULL) -+endif -+ - ifeq ($(OS_ARCH),Linux) - CSRCS = \ - sydney_audio_alsa.c \ ---- mozilla/toolkit/library/Makefile.in.orig 2010-01-19 20:28:10.000000000 +0000 -+++ mozilla/toolkit/library/Makefile.in 2010-01-25 09:38:40.000000000 +0000 -@@ -235,12 +235,12 @@ - endif - - ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) --EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc - EXTRA_DSO_LDOPTS += $(FT2_LIBS) - endif - - ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) --EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc - EXTRA_DSO_LDOPTS += $(FT2_LIBS) - endif - ---- mozilla/js/src/Makefile.in.orig 2009-08-21 00:34:43.000000000 +0200 -+++ mozilla/js/src/Makefile.in 2009-08-21 00:36:59.000000000 +0200 -@@ -427,7 +427,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lpulse -lc - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 ---- config/rules.mk.orig 2009-08-22 15:30:16.000000000 +0200 -+++ config/rules.mk 2009-08-22 15:30:46.000000000 +0200 -@@ -583,6 +583,7 @@ - ifdef IS_COMPONENT - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic - endif -+EXTRA_LIBS += -pthread -lpulse -lc - endif - - ifeq ($(OS_ARCH),NetBSD) ---- mozilla/layout/build/Makefile.in.orig 2009-08-22 01:00:21.000000000 +0200 -+++ mozilla/layout/build/Makefile.in 2009-08-22 01:00:57.000000000 +0200 -@@ -269,6 +269,10 @@ - endif - endif - -+ifeq ($(OS_ARCH),FreeBSD) -+EXTRA_LIBS += -lpulse -+endif -+ - include $(topsrcdir)/config/rules.mk - - LOCAL_INCLUDES += -I$(srcdir)/../base \ Modified: branches/experimental/www/firefox-i18n/Makefile.option ============================================================================== --- branches/experimental/www/firefox-i18n/Makefile.option Thu Jun 30 00:02:12 2011 (r583) +++ branches/experimental/www/firefox-i18n/Makefile.option Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 30 Nov 2008 # Whom: Koji Yokota # -# $FreeBSD: ports/www/firefox-i18n/Makefile.option,v 1.4 2011/06/21 21:12:31 flo Exp $ +# $FreeBSD: ports/www/firefox-i18n/Makefile.option,v 1.5 2011/06/27 09:53:31 flo Exp $ # OPTIONS= LANG_AF "Africaans" off \ LANG_AK "Akan" off \ Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ branches/experimental/www/firefox/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 2002/10/21 # Whom: Alan Eldridge # -# $FreeBSD: ports/www/firefox/Makefile,v 1.241 2011/06/21 21:12:30 flo Exp $ +# $FreeBSD: ports/www/firefox/Makefile,v 1.242 2011/07/04 17:28:33 flo Exp $ # PORTNAME= firefox @@ -16,7 +16,8 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla -BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr +BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ + cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ event-1.4:${PORTSDIR}/devel/libevent Added: branches/experimental/www/firefox/files/patch-bugzilla-535300 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-bugzilla-535300 Wed Jul 6 18:20:09 2011 (r584) @@ -0,0 +1,20 @@ +--- ipc/glue/GeckoChildProcessHost.cpp.orig 2011-06-15 23:57:27.000000000 +0200 ++++ ipc/glue/GeckoChildProcessHost.cpp 2011-06-27 23:48:28.799495181 +0200 +@@ -433,7 +433,16 @@ + #ifdef ANDROID + path += "/lib"; + #endif +- newEnvVars["LD_LIBRARY_PATH"] = path.get(); ++ const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH"); ++ nsCString new_ld_lib_path; ++ if (ld_library_path && *ld_library_path) { ++ new_ld_lib_path.Assign(ld_library_path); ++ new_ld_lib_path.AppendLiteral(":"); ++ new_ld_lib_path.Append(path.get()); ++ newEnvVars["LD_LIBRARY_PATH"] = new_ld_lib_path.get(); ++ } else { ++ newEnvVars["LD_LIBRARY_PATH"] = path.get(); ++ } + #elif OS_MACOSX + newEnvVars["DYLD_LIBRARY_PATH"] = path.get(); + #endif Modified: branches/experimental/www/firefox/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox/files/patch-configure.in Thu Jun 30 00:02:12 2011 (r583) +++ branches/experimental/www/firefox/files/patch-configure.in Wed Jul 6 18:20:09 2011 (r584) @@ -69,3 +69,18 @@ SunOS:x86) VPX_ASFLAGS="-f elf32 -rnasm -pnasm" VPX_X86_ASM=1 +@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then + LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" + LIBJPEG_TURBO_X64_ASM=1 + ;; ++ FreeBSD:i386) ++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" ++ LIBJPEG_TURBO_X86_ASM=1 ++ ;; ++ FreeBSD:amd64) ++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" ++ LIBJPEG_TURBO_X64_ASM=1 ++ ;; + SunOS:i?86) + LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" + LIBJPEG_TURBO_X86_ASM=1 Deleted: branches/experimental/www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc.orig ============================================================================== --- branches/experimental/www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc.orig Wed Jul 6 18:20:09 2011 (r583) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- ipc/chromium/src/base/platform_thread_posix.cc.orig 2011-04-27 09:34:28.000000000 +0200 -+++ ipc/chromium/src/base/platform_thread_posix.cc 2011-04-27 19:47:36.344446266 +0200 -@@ -34,7 +33,8 @@ - #if defined(OS_MACOSX) - return mach_thread_self(); - #elif defined(OS_LINUX) -- return syscall(__NR_gettid); -+ // TODO(BSD): find a better thread ID -+ return reinterpret_cast(pthread_self()); - #endif - } - Modified: branches/experimental/www/firefox36-i18n/Makefile ============================================================================== --- branches/experimental/www/firefox36-i18n/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ branches/experimental/www/firefox36-i18n/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 28 May 2006 # Whom: Andrew Pantyukhin # -# $FreeBSD: ports/www/firefox36-i18n/Makefile,v 1.53 2011/04/29 06:32:48 flo Exp $ +# $FreeBSD: ports/www/firefox36-i18n/Makefile,v 1.54 2011/06/21 20:35:48 flo Exp $ # PORTNAME= firefox36-i18n Modified: branches/experimental/www/firefox36-i18n/Makefile.lang ============================================================================== --- branches/experimental/www/firefox36-i18n/Makefile.lang Thu Jun 30 00:02:12 2011 (r583) +++ branches/experimental/www/firefox36-i18n/Makefile.lang Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 30 Nov 2008 # Whom: Koji Yokota # -# $FreeBSD: ports/www/firefox-i18n/Makefile.lang,v 1.2 2010/04/06 08:14:02 beat Exp $ +# $FreeBSD: ports/www/firefox36-i18n/Makefile.lang,v 1.3 2011/03/22 15:20:43 beat Exp $ # # Currently, the following 74 languages are supported. # Modified: branches/experimental/www/firefox36-i18n/Makefile.option ============================================================================== --- branches/experimental/www/firefox36-i18n/Makefile.option Thu Jun 30 00:02:12 2011 (r583) +++ branches/experimental/www/firefox36-i18n/Makefile.option Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 30 Nov 2008 # Whom: Koji Yokota # -# $FreeBSD: ports/www/firefox-i18n/Makefile.option,v 1.2 2010/04/06 08:14:02 beat Exp $ +# $FreeBSD: ports/www/firefox36-i18n/Makefile.option,v 1.3 2011/03/22 15:20:43 beat Exp $ # OPTIONS= LANG_AF "Africaans" off \ LANG_SQ "Albanian" off \ Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ branches/experimental/www/firefox36/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 2002/10/21 # Whom: Alan Eldridge # -# $FreeBSD: ports/www/firefox36/Makefile,v 1.239 2011/03/22 15:19:45 beat Exp $ +# $FreeBSD: ports/www/firefox36/Makefile,v 1.242 2011/06/21 20:35:48 flo Exp $ # PORTNAME= firefox Modified: branches/experimental/www/linux-firefox-devel/Makefile ============================================================================== --- branches/experimental/www/linux-firefox-devel/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ branches/experimental/www/linux-firefox-devel/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 8 May 2006 # Whom: Andrew Pantyukhin # -# $FreeBSD: ports/www/linux-firefox-devel/Makefile,v 1.42 2011/03/01 22:13:35 beat Exp $ +# $FreeBSD: ports/www/linux-firefox-devel/Makefile,v 1.44 2011/04/29 06:36:31 flo Exp $ # PORTNAME= firefox Modified: trunk/deskutils/lightning-thunderbird/Makefile ============================================================================== --- trunk/deskutils/lightning-thunderbird/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ trunk/deskutils/lightning-thunderbird/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,11 +2,12 @@ # Date created: 2005-02-26 # Whom: Michael Johnson # -# $FreeBSD: ports/deskutils/lightning-thunderbird/Makefile,v 1.37 2010/12/04 07:30:57 ade Exp $ +# $FreeBSD: ports/deskutils/lightning-thunderbird/Makefile,v 1.39 2011/07/04 20:47:14 flo Exp $ # PORTNAME= lightning DISTVERSION= 1.0 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= calendar/${PORTNAME}/releases/${DISTVERSION}b2/source @@ -16,7 +17,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= An integrated calendar for Thunderbird 3.1 -RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird +RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird3 CONFLICTS_BUILD= spidermonkey-1.[0-7]* USE_AUTOTOOLS= autoconf213 libtool Modified: trunk/deskutils/lightning-thunderbird/distinfo ============================================================================== --- trunk/deskutils/lightning-thunderbird/distinfo Thu Jun 30 00:02:12 2011 (r583) +++ trunk/deskutils/lightning-thunderbird/distinfo Wed Jul 6 18:20:09 2011 (r584) @@ -1,3 +1,2 @@ -MD5 (lightning-1.0b2.source.tar.bz2) = 2e2ba2279a4e89f11e50ea67b84dd543 SHA256 (lightning-1.0b2.source.tar.bz2) = 887f8d49e6dd36478178b8438f28252370169e60a39383628c0862d8881eb9b2 SIZE (lightning-1.0b2.source.tar.bz2) = 66604225 Modified: trunk/deskutils/lightning/Makefile ============================================================================== --- trunk/deskutils/lightning/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ trunk/deskutils/lightning/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,11 +2,12 @@ # Date created: 2005-02-26 # Whom: Michael Johnson # -# $FreeBSD: ports/deskutils/lightning/Makefile,v 1.35 2010/12/04 07:30:57 ade Exp $ +# $FreeBSD: ports/deskutils/lightning/Makefile,v 1.37 2011/07/04 20:46:09 flo Exp $ # PORTNAME= lightning DISTVERSION= 1.0 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= calendar/${PORTNAME}/releases/${DISTVERSION}b1/source @@ -15,8 +16,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= An integrated calendar for Thunderbird and SeaMonkey -OPTIONS+= THUNDERBIRD "Install Thunderbird 3.0" on \ - SEAMONKEY "Install SeaMonkey 2.0" off +RUN_DEPENDS+= ${LOCALBASE}/lib/seamonkey/seamonkey-bin:${PORTSDIR}/www/seamonkey2 CONFLICTS_BUILD= spidermonkey-1.[0-7]* USE_AUTOTOOLS= autoconf213 libtool @@ -47,14 +47,6 @@ .include .include -.if defined(WITH_THUNDERBIRD) -RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird3 -.endif - -.if defined(WITH_SEAMONKEY) -RUN_DEPENDS+= ${LOCALBASE}/lib/seamonkey/seamonkey-bin:${PORTSDIR}/www/seamonkey2 -.endif - XPI_FILE= ${DISTNAME:C/.source//:C/-sunbird//}-freebsd${OSVERSION:C/([0-9]).+/\1/}-${ARCH}.xpi PLIST_FILES= %%DATADIR%%/${XPI_FILE} PLIST_DIRS= %%DATADIR%% Modified: trunk/deskutils/lightning/distinfo ============================================================================== --- trunk/deskutils/lightning/distinfo Thu Jun 30 00:02:12 2011 (r583) +++ trunk/deskutils/lightning/distinfo Wed Jul 6 18:20:09 2011 (r584) @@ -1,3 +1,2 @@ -MD5 (lightning-sunbird-1.0b1.source.tar.bz2) = 418523969c00725bef35e11ef5b06b9b SHA256 (lightning-sunbird-1.0b1.source.tar.bz2) = 857282e3d148df4ee03ae97d10cf23b2072810817c6a3a1dabe93d0d9b8228fd SIZE (lightning-sunbird-1.0b1.source.tar.bz2) = 60442959 Modified: trunk/mail/thunderbird-i18n/Makefile ============================================================================== --- trunk/mail/thunderbird-i18n/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ trunk/mail/thunderbird-i18n/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 29 May 2006 # Whom: Andrew Pantyukhin # -# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.42 2011/06/21 20:38:00 flo Exp $ +# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.43 2011/06/30 18:19:48 flo Exp $ # PORTNAME= thunderbird-i18n Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ trunk/mail/thunderbird/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 4 September 2003 # Whom: Joe Marcus Clarke # -# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.126 2011/06/21 20:38:00 flo Exp $ +# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.128 2011/07/04 21:27:06 flo Exp $ # PORTNAME= thunderbird @@ -54,7 +54,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS= +OPTIONS= LIGHTNING "Enable calendar extension" off .include @@ -90,6 +90,16 @@ BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .endif +.if defined(WITH_LIGHTNING) +MOZ_OPTIONS+= --enable-calendar +MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar +LIGHTNING_DIR= share/lightning +SUB_FILES+= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message +.else +MOZ_OPTIONS+= --disable-calendar +.endif + post-extract:: ${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop @@ -124,10 +134,19 @@ @${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} @${ECHO_CMD} 'share/pixmaps/${PORTNAME_ICON}' >> ${PLIST} @${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST} +.if defined(WITH_LIGHTNING) + @${PRINTF} '%s/lightning-${PORTNAME}.xpi\n@dirrmtry %s\n' \ + ${LIGHTNING_DIR} ${LIGHTNING_DIR} >> ${PLIST} +.endif post-install: ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications ${LN} -sf ${PORTNAME_ICON_SRC} ${PREFIX}/share/pixmaps/${PORTNAME_ICON} +.if defined(WITH_LIGHTNING) + ${MKDIR} ${PREFIX}/${LIGHTNING_DIR} + ${INSTALL_DATA} ${MOZSRC}/dist/xpi-stage/lightning.xpi ${PREFIX}/${LIGHTNING_DIR}/lightning-${PORTNAME}.xpi + @${CAT} ${PKGMESSAGE} +.endif .include Deleted: trunk/mail/thunderbird/files/liboggplay_oss ============================================================================== --- trunk/mail/thunderbird/files/liboggplay_oss Wed Jul 6 18:20:09 2011 (r583) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- mozilla/media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200 -+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200 -@@ -45,6 +45,12 @@ - LIBRARY_NAME = sydneyaudio - FORCE_STATIC_LIB= 1 - -+ifeq ($(OS_ARCH),FreeBSD) -+CSRCS = \ -+ sydney_audio_oss.c \ -+ $(NULL) -+endif -+ - ifeq ($(OS_ARCH),Linux) - CSRCS = \ - sydney_audio_alsa.c \ Added: trunk/mail/thunderbird/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/pkg-message.in Wed Jul 6 18:20:09 2011 (r584) @@ -0,0 +1,10 @@ +***************************************************************************** +In order to activate the Lightning extension, every user should install the +XPI file into his own profile via the menu: + +Tools -> Add-ons -> Extensions -> Icon left of the search field + -> Install From File + +The XPI file was installed as: +%%PREFIX%%/share/lightning/lightning-thunderbird.xpi +***************************************************************************** Modified: trunk/mail/thunderbird3-i18n/Makefile ============================================================================== --- trunk/mail/thunderbird3-i18n/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ trunk/mail/thunderbird3-i18n/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 29 May 2006 # Whom: Andrew Pantyukhin # -# $FreeBSD: ports/mail/thunderbird3-i18n/Makefile,v 1.45 2011/01/03 15:14:03 beat Exp $ +# $FreeBSD: ports/mail/thunderbird3-i18n/Makefile,v 1.47 2011/07/01 14:45:45 flo Exp $ # PORTNAME= thunderbird-i18n @@ -20,6 +20,8 @@ RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher .endif +LATEST_LINK= thunderbird3-i18n + NO_BUILD= yes USE_THUNDERBIRD= 31 USE_XPI= *thunderbird* Modified: trunk/mail/thunderbird3/Makefile ============================================================================== --- trunk/mail/thunderbird3/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ trunk/mail/thunderbird3/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 4 September 2003 # Whom: Joe Marcus Clarke # -# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.126 2011/06/21 20:38:00 flo Exp $ +# $FreeBSD: ports/mail/thunderbird3/Makefile,v 1.131 2011/06/30 18:13:18 flo Exp $ # PORTNAME= thunderbird @@ -18,8 +18,9 @@ BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr USE_AUTOTOOLS= autoconf213 +LATEST_LINK= thunderbird3 USE_GECKO= gecko -CONFLICTS_INSTALL= thunderbird-3.0* +CONFLICTS_INSTALL= thunderbird-5.0* USE_MOZILLA= -png -nss -dbm -jpeg -xft MOZ_TOOLKIT= cairo-gtk2 @@ -56,13 +57,6 @@ WRKSRC= ${WRKDIR}/comm-1.9.2 MOZSRC:= ${WRKSRC}/mozilla -.if ${OSVERSION} < 700000 -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio -EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio -.else -EXTRA_PATCHES= ${FILESDIR}/liboggplay_oss -.endif - .if ${ARCH} == powerpc64 .if ${OSVERSION} < 900033 BROKEN= Needs binutils 2.17.50 to build Deleted: trunk/mail/thunderbird3/files/liboggplay_oss ============================================================================== --- trunk/mail/thunderbird3/files/liboggplay_oss Wed Jul 6 18:20:09 2011 (r583) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- mozilla/media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200 -+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200 -@@ -45,6 +45,12 @@ - LIBRARY_NAME = sydneyaudio - FORCE_STATIC_LIB= 1 - -+ifeq ($(OS_ARCH),FreeBSD) -+CSRCS = \ -+ sydney_audio_oss.c \ -+ $(NULL) -+endif -+ - ifeq ($(OS_ARCH),Linux) - CSRCS = \ - sydney_audio_alsa.c \ Added: trunk/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-src-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-src-Makefile.in Wed Jul 6 18:20:09 2011 (r584) @@ -0,0 +1,15 @@ +--- mozilla/media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200 ++++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200 +@@ -45,6 +45,12 @@ + LIBRARY_NAME = sydneyaudio + FORCE_STATIC_LIB= 1 + ++ifeq ($(OS_ARCH),FreeBSD) ++CSRCS = \ ++ sydney_audio_oss.c \ ++ $(NULL) ++endif ++ + ifeq ($(OS_ARCH),Linux) + CSRCS = \ + sydney_audio_alsa.c \ Deleted: trunk/mail/thunderbird3/files/releng6_pulseaudio ============================================================================== --- trunk/mail/thunderbird3/files/releng6_pulseaudio Wed Jul 6 18:20:09 2011 (r583) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,66 +0,0 @@ ---- mozilla/media/libsydneyaudio/src/Makefile.in.orig 2009-08-20 21:43:41.000000000 +0200 -+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-08-20 21:44:17.000000000 +0200 -@@ -45,6 +45,12 @@ - LIBRARY_NAME = sydneyaudio - FORCE_STATIC_LIB= 1 - -+ifeq ($(OS_ARCH),FreeBSD) -+CSRCS = \ -+ sydney_audio_pulseaudio.c \ -+ $(NULL) -+endif -+ - ifeq ($(OS_ARCH),Linux) - CSRCS = \ - sydney_audio_alsa.c \ ---- mozilla/toolkit/library/Makefile.in.orig 2010-01-19 20:28:10.000000000 +0000 -+++ mozilla/toolkit/library/Makefile.in 2010-01-25 09:38:40.000000000 +0000 -@@ -235,12 +235,12 @@ - endif - - ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) --EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc - EXTRA_DSO_LDOPTS += $(FT2_LIBS) - endif - - ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) --EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc - EXTRA_DSO_LDOPTS += $(FT2_LIBS) - endif - ---- mozilla/js/src/Makefile.in.orig 2009-08-21 00:34:43.000000000 +0200 -+++ mozilla/js/src/Makefile.in 2009-08-21 00:36:59.000000000 +0200 -@@ -427,7 +427,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lpulse -lc - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 ---- config/rules.mk.orig 2009-08-22 15:30:16.000000000 +0200 -+++ config/rules.mk 2009-08-22 15:30:46.000000000 +0200 -@@ -583,6 +583,7 @@ - ifdef IS_COMPONENT - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic - endif -+EXTRA_LIBS += -pthread -lpulse -lc - endif - - ifeq ($(OS_ARCH),NetBSD) ---- mozilla/layout/build/Makefile.in.orig 2009-08-22 01:00:21.000000000 +0200 -+++ mozilla/layout/build/Makefile.in 2009-08-22 01:00:57.000000000 +0200 -@@ -269,6 +269,10 @@ - endif - endif - -+ifeq ($(OS_ARCH),FreeBSD) -+EXTRA_LIBS += -lpulse -+endif -+ - include $(topsrcdir)/config/rules.mk - - LOCAL_INCLUDES += -I$(srcdir)/../base \ Modified: trunk/www/firefox-i18n/Makefile.option ============================================================================== --- trunk/www/firefox-i18n/Makefile.option Thu Jun 30 00:02:12 2011 (r583) +++ trunk/www/firefox-i18n/Makefile.option Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 30 Nov 2008 # Whom: Koji Yokota # -# $FreeBSD: ports/www/firefox-i18n/Makefile.option,v 1.4 2011/06/21 21:12:31 flo Exp $ +# $FreeBSD: ports/www/firefox-i18n/Makefile.option,v 1.5 2011/06/27 09:53:31 flo Exp $ # OPTIONS= LANG_AF "Africaans" off \ LANG_AK "Akan" off \ Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ trunk/www/firefox/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 2002/10/21 # Whom: Alan Eldridge # -# $FreeBSD: ports/www/firefox/Makefile,v 1.241 2011/06/21 21:12:30 flo Exp $ +# $FreeBSD: ports/www/firefox/Makefile,v 1.242 2011/07/04 17:28:33 flo Exp $ # PORTNAME= firefox @@ -16,7 +16,8 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla -BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr +BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ + cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ event-1.4:${PORTSDIR}/devel/libevent Added: trunk/www/firefox/files/patch-bugzilla-535300 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bugzilla-535300 Wed Jul 6 18:20:09 2011 (r584) @@ -0,0 +1,20 @@ +--- ipc/glue/GeckoChildProcessHost.cpp.orig 2011-06-15 23:57:27.000000000 +0200 ++++ ipc/glue/GeckoChildProcessHost.cpp 2011-06-27 23:48:28.799495181 +0200 +@@ -433,7 +433,16 @@ + #ifdef ANDROID + path += "/lib"; + #endif +- newEnvVars["LD_LIBRARY_PATH"] = path.get(); ++ const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH"); ++ nsCString new_ld_lib_path; ++ if (ld_library_path && *ld_library_path) { ++ new_ld_lib_path.Assign(ld_library_path); ++ new_ld_lib_path.AppendLiteral(":"); ++ new_ld_lib_path.Append(path.get()); ++ newEnvVars["LD_LIBRARY_PATH"] = new_ld_lib_path.get(); ++ } else { ++ newEnvVars["LD_LIBRARY_PATH"] = path.get(); ++ } + #elif OS_MACOSX + newEnvVars["DYLD_LIBRARY_PATH"] = path.get(); + #endif Modified: trunk/www/firefox/files/patch-configure.in ============================================================================== --- trunk/www/firefox/files/patch-configure.in Thu Jun 30 00:02:12 2011 (r583) +++ trunk/www/firefox/files/patch-configure.in Wed Jul 6 18:20:09 2011 (r584) @@ -69,3 +69,18 @@ SunOS:x86) VPX_ASFLAGS="-f elf32 -rnasm -pnasm" VPX_X86_ASM=1 +@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then + LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" + LIBJPEG_TURBO_X64_ASM=1 + ;; ++ FreeBSD:i386) ++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" ++ LIBJPEG_TURBO_X86_ASM=1 ++ ;; ++ FreeBSD:amd64) ++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" ++ LIBJPEG_TURBO_X64_ASM=1 ++ ;; + SunOS:i?86) + LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" + LIBJPEG_TURBO_X86_ASM=1 Deleted: trunk/www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc.orig ============================================================================== --- trunk/www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc.orig Wed Jul 6 18:20:09 2011 (r583) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- ipc/chromium/src/base/platform_thread_posix.cc.orig 2011-04-27 09:34:28.000000000 +0200 -+++ ipc/chromium/src/base/platform_thread_posix.cc 2011-04-27 19:47:36.344446266 +0200 -@@ -34,7 +33,8 @@ - #if defined(OS_MACOSX) - return mach_thread_self(); - #elif defined(OS_LINUX) -- return syscall(__NR_gettid); -+ // TODO(BSD): find a better thread ID -+ return reinterpret_cast(pthread_self()); - #endif - } - Modified: trunk/www/firefox36-i18n/Makefile ============================================================================== --- trunk/www/firefox36-i18n/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ trunk/www/firefox36-i18n/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 28 May 2006 # Whom: Andrew Pantyukhin # -# $FreeBSD: ports/www/firefox36-i18n/Makefile,v 1.53 2011/04/29 06:32:48 flo Exp $ +# $FreeBSD: ports/www/firefox36-i18n/Makefile,v 1.54 2011/06/21 20:35:48 flo Exp $ # PORTNAME= firefox36-i18n Modified: trunk/www/firefox36-i18n/Makefile.lang ============================================================================== --- trunk/www/firefox36-i18n/Makefile.lang Thu Jun 30 00:02:12 2011 (r583) +++ trunk/www/firefox36-i18n/Makefile.lang Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 30 Nov 2008 # Whom: Koji Yokota # -# $FreeBSD: ports/www/firefox-i18n/Makefile.lang,v 1.2 2010/04/06 08:14:02 beat Exp $ +# $FreeBSD: ports/www/firefox36-i18n/Makefile.lang,v 1.3 2011/03/22 15:20:43 beat Exp $ # # Currently, the following 74 languages are supported. # Modified: trunk/www/firefox36-i18n/Makefile.option ============================================================================== --- trunk/www/firefox36-i18n/Makefile.option Thu Jun 30 00:02:12 2011 (r583) +++ trunk/www/firefox36-i18n/Makefile.option Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 30 Nov 2008 # Whom: Koji Yokota # -# $FreeBSD: ports/www/firefox-i18n/Makefile.option,v 1.2 2010/04/06 08:14:02 beat Exp $ +# $FreeBSD: ports/www/firefox36-i18n/Makefile.option,v 1.3 2011/03/22 15:20:43 beat Exp $ # OPTIONS= LANG_AF "Africaans" off \ LANG_SQ "Albanian" off \ Modified: trunk/www/firefox36/Makefile ============================================================================== --- trunk/www/firefox36/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ trunk/www/firefox36/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 2002/10/21 # Whom: Alan Eldridge # -# $FreeBSD: ports/www/firefox36/Makefile,v 1.239 2011/03/22 15:19:45 beat Exp $ +# $FreeBSD: ports/www/firefox36/Makefile,v 1.242 2011/06/21 20:35:48 flo Exp $ # PORTNAME= firefox Modified: trunk/www/linux-firefox-devel/Makefile ============================================================================== --- trunk/www/linux-firefox-devel/Makefile Thu Jun 30 00:02:12 2011 (r583) +++ trunk/www/linux-firefox-devel/Makefile Wed Jul 6 18:20:09 2011 (r584) @@ -2,7 +2,7 @@ # Date created: 8 May 2006 # Whom: Andrew Pantyukhin # -# $FreeBSD: ports/www/linux-firefox-devel/Makefile,v 1.42 2011/03/01 22:13:35 beat Exp $ +# $FreeBSD: ports/www/linux-firefox-devel/Makefile,v 1.44 2011/04/29 06:36:31 flo Exp $ # PORTNAME= firefox From owner-freebsd-gecko@FreeBSD.ORG Wed Jul 6 21:46:18 2011 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 534D31065675 for ; Wed, 6 Jul 2011 21:46:18 +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 CE7A28FC12 for ; Wed, 6 Jul 2011 21:46:17 +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 p66LkG3E077054 for ; Wed, 6 Jul 2011 21:46:16 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p66LkBMB075919 for freebsd-gecko@freebsd.org; Wed, 6 Jul 2011 21:46:11 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 6 Jul 2011 21:46:11 GMT Message-Id: <201107062146.p66LkBMB075919@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] r585 - in branches/experimental/www/firefox-beta: . files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jul 2011 21:46:18 -0000 Author: flo Date: Wed Jul 6 21:46:10 2011 New Revision: 585 Log: - update to 6.0b1 Deleted: branches/experimental/www/firefox-beta/files/patch-js-src-jsnativestack.cpp Modified: branches/experimental/www/firefox-beta/Makefile branches/experimental/www/firefox-beta/distinfo branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in branches/experimental/www/firefox-beta/files/patch-js-src-configure.in branches/experimental/www/firefox-beta/files/patch-layout_generic_Makefile.in Modified: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Wed Jul 6 18:20:09 2011 (r584) +++ branches/experimental/www/firefox-beta/Makefile Wed Jul 6 21:46:10 2011 (r585) @@ -6,7 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 5.0b7 +DISTVERSION= 6.0b1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} Modified: branches/experimental/www/firefox-beta/distinfo ============================================================================== --- branches/experimental/www/firefox-beta/distinfo Wed Jul 6 18:20:09 2011 (r584) +++ branches/experimental/www/firefox-beta/distinfo Wed Jul 6 21:46:10 2011 (r585) @@ -1,2 +1,2 @@ -SHA256 (firefox-5.0b7.source.tar.bz2) = da2d7d71e6ca21c268ae5accc96f25d188e935674cba017021ffdba677ac5975 -SIZE (firefox-5.0b7.source.tar.bz2) = 68710896 +SHA256 (firefox-6.0b1.source.tar.bz2) = 4f363b8071528dd00ebdf65866b25077c986413c7ffeb5d4a5c1934beed18827 +SIZE (firefox-6.0b1.source.tar.bz2) = 67701417 Modified: branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in Wed Jul 6 18:20:09 2011 (r584) +++ branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in Wed Jul 6 21:46:10 2011 (r585) @@ -1,6 +1,25 @@ ---- js/src/Makefile.in.orig 2011-03-17 18:51:39.000000000 +0100 -+++ js/src/Makefile.in 2011-03-18 19:41:09.000000000 +0100 -@@ -612,7 +612,7 @@ +--- js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200 ++++ js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200 +@@ -416,7 +416,7 @@ + # END enclude sources for V8 dtoa + ############################################# + +-ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU))) ++ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU))) + + VPATH += $(srcdir)/assembler \ + $(srcdir)/assembler/wtf \ +@@ -469,6 +469,9 @@ + else + #CPPSRCS += only_on_x86.cpp + endif ++ifeq (amd64, $(TARGET_CPU)) ++#CPPSRCS += only_on_x86_64.cpp ++endif + endif + ifeq (arm, $(TARGET_CPU)) + #CPPSRCS += only_on_arm.cpp +@@ -739,7 +742,7 @@ # to reliably get limit macros defined, we'd always have to define the # one below before including any header, but that's obscure and # fragile, so we do it here. @@ -9,7 +28,7 @@ INCLUDES += -I$(srcdir) -@@ -666,7 +666,8 @@ +@@ -793,7 +796,8 @@ endif # WINNT ifeq ($(OS_ARCH),FreeBSD) Modified: branches/experimental/www/firefox-beta/files/patch-js-src-configure.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-js-src-configure.in Wed Jul 6 18:20:09 2011 (r584) +++ branches/experimental/www/firefox-beta/files/patch-js-src-configure.in Wed Jul 6 21:46:10 2011 (r585) @@ -1,32 +1,72 @@ ---- js/src/configure.in.orig 2010-11-04 21:05:48.000000000 +0100 -+++ js/src/configure.in 2010-11-22 21:30:24.000000000 +0100 -@@ -2621,7 +2621,7 @@ +--- js/src/configure.in.orig 2011-07-06 05:09:22.000000000 +0200 ++++ js/src/configure.in 2011-07-06 22:19:17.584233430 +0200 +@@ -1473,7 +1473,7 @@ + CPU_ARCH=sparc + ;; + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" + ;; + +@@ -1495,7 +1495,7 @@ + dnl =============================================================== + INTEL_ARCHITECTURE= + case "$OS_TEST" in +- x86_64|i?86) ++ amd64|x86_64|i?86) + INTEL_ARCHITECTURE=1 + esac + +@@ -2713,7 +2713,7 @@ AC_DEFINE(JS_CPU_X86) AC_DEFINE(JS_NUNBOX32) ;; -x86_64*-*) -+x86_64*-*|amd64*-*) ++amd64*-*) ENABLE_TRACEJIT=1 NANOJIT_ARCH=X64 ENABLE_METHODJIT=1 -@@ -2638,11 +2638,6 @@ - AC_DEFINE(JS_CPU_ARM) - AC_DEFINE(JS_NUNBOX32) +@@ -2723,23 +2723,23 @@ + AC_DEFINE(JS_CPU_X64) + AC_DEFINE(JS_PUNBOX64) + ;; +-arm*-*) ++x86_64*-*) + ENABLE_TRACEJIT=1 +- NANOJIT_ARCH=ARM ++ NANOJIT_ARCH=X64 + ENABLE_METHODJIT=1 + ENABLE_MONOIC=1 + ENABLE_POLYIC=1 +- AC_DEFINE(JS_CPU_ARM) +- AC_DEFINE(JS_NUNBOX32) ++ ENABLE_POLYIC_TYPED_ARRAY=1 ++ AC_DEFINE(JS_CPU_X64) ++ AC_DEFINE(JS_PUNBOX64) ;; -sparc*-*) -- ENABLE_TRACEJIT=1 ++arm*-*) + ENABLE_TRACEJIT=1 - NANOJIT_ARCH=Sparc ++ NANOJIT_ARCH=ARM + ENABLE_METHODJIT=1 + ENABLE_MONOIC=1 + ENABLE_POLYIC=1 +- ENABLE_POLYIC_TYPED_ARRAY=1 - AC_DEFINE(JS_CPU_SPARC) -- ;; ++ AC_DEFINE(JS_CPU_ARM) + AC_DEFINE(JS_NUNBOX32) + ;; esac - - MOZ_ARG_DISABLE_BOOL(methodjit, -@@ -2693,7 +2688,7 @@ +@@ -2796,6 +2796,10 @@ i?86-*) AC_DEFINE(AVMPLUS_IA32) ;; --x86_64*-*) -+x86_64*-*|amd64*-*) ++amd64*-*) ++ AC_DEFINE(AVMPLUS_AMD64) ++ AC_DEFINE(AVMPLUS_64BIT) ++ ;; + x86_64*-*) AC_DEFINE(AVMPLUS_AMD64) AC_DEFINE(AVMPLUS_64BIT) - ;; Deleted: branches/experimental/www/firefox-beta/files/patch-js-src-jsnativestack.cpp ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-js-src-jsnativestack.cpp Wed Jul 6 21:46:10 2011 (r584) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- js/src/jsnativestack.cpp~ -+++ js/src/jsnativestack.cpp -@@ -50,7 +50,8 @@ - #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX) - # include - --# if defined(__FreeBSD__) -+# if defined(FREEBSD) -+# include - # include - # endif - Modified: branches/experimental/www/firefox-beta/files/patch-layout_generic_Makefile.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-layout_generic_Makefile.in Wed Jul 6 18:20:09 2011 (r584) +++ branches/experimental/www/firefox-beta/files/patch-layout_generic_Makefile.in Wed Jul 6 21:46:10 2011 (r585) @@ -1,13 +1,13 @@ ---- layout/generic/Makefile.in.orig 2011-04-26 23:21:46.000000000 +0200 -+++ layout/generic/Makefile.in 2011-04-26 23:44:09.096445086 +0200 -@@ -147,9 +147,10 @@ +--- layout/generic/Makefile.in.orig 2011-07-06 05:09:28.000000000 +0200 ++++ layout/generic/Makefile.in 2011-07-06 21:49:25.105659269 +0200 +@@ -159,9 +159,10 @@ -I$(srcdir)/../../content/html/content/src \ -I$(srcdir)/../../dom/base \ - -I$(srcdir)/../../modules/plugin/base/src \ + -I$(srcdir)/../../dom/plugins/base \ - $(MOZ_CAIRO_CFLAGS) \ $(NULL) -+CXXFLAGS += $(MOZ_CAIRO_CFLAGS) ++ CXXFLAGS += $(MOZ_CAIRO_CFLAGS) + ifdef MOZ_ENABLE_GTK2 CXXFLAGS += $(MOZ_GTK2_CFLAGS) From owner-freebsd-gecko@FreeBSD.ORG Wed Jul 6 23:07:31 2011 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 341F81065672 for ; Wed, 6 Jul 2011 23:07: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 AAD1D8FC18 for ; Wed, 6 Jul 2011 23:07:30 +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 p66N7T0h076980 for ; Wed, 6 Jul 2011 23:07:29 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p66N7Nnr076081 for freebsd-gecko@freebsd.org; Wed, 6 Jul 2011 23:07:23 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 6 Jul 2011 23:07:23 GMT Message-Id: <201107062307.p66N7Nnr076081@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] r586 - in branches/experimental/www/firefox-aurora: . files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jul 2011 23:07:31 -0000 Author: flo Date: Wed Jul 6 23:07:23 2011 New Revision: 586 Log: - update to 7.0a2 snapshot of today To use this you need bsg.gecko.mk from branches/experimental/Mk Modified: branches/experimental/www/firefox-aurora/Makefile branches/experimental/www/firefox-aurora/distinfo branches/experimental/www/firefox-aurora/files/patch-js-src-Makefile.in branches/experimental/www/firefox-aurora/files/patch-js-src-configure.in branches/experimental/www/firefox-aurora/files/patch-layout_generic_Makefile.in Modified: branches/experimental/www/firefox-aurora/Makefile ============================================================================== --- branches/experimental/www/firefox-aurora/Makefile Wed Jul 6 21:46:10 2011 (r585) +++ branches/experimental/www/firefox-aurora/Makefile Wed Jul 6 23:07:23 2011 (r586) @@ -6,7 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 6.0a2-20110616 +DISTVERSION= 7.0a2-20110706 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= http://tb.smeets.im/~flo/ \ @@ -58,7 +58,7 @@ .include -WRKSRC:= ${WRKDIR}/firefox-6.0a2 +WRKSRC:= ${WRKDIR}/firefox-7.0a2 GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} Modified: branches/experimental/www/firefox-aurora/distinfo ============================================================================== --- branches/experimental/www/firefox-aurora/distinfo Wed Jul 6 21:46:10 2011 (r585) +++ branches/experimental/www/firefox-aurora/distinfo Wed Jul 6 23:07:23 2011 (r586) @@ -1,2 +1,2 @@ -SHA256 (firefox-6.0a2-20110616.source.tar.bz2) = ed3ea8f82775ae9c13857db61f1d634c580c45d3a9003302187c7b25462382ea -SIZE (firefox-6.0a2-20110616.source.tar.bz2) = 67409190 +SHA256 (firefox-7.0a2-20110706.source.tar.bz2) = f4f40dc69dfa213310d9e8922282e640bbc03aba19fad8ef136d58f6fe4bb04c +SIZE (firefox-7.0a2-20110706.source.tar.bz2) = 69516972 Modified: branches/experimental/www/firefox-aurora/files/patch-js-src-Makefile.in ============================================================================== --- branches/experimental/www/firefox-aurora/files/patch-js-src-Makefile.in Wed Jul 6 21:46:10 2011 (r585) +++ branches/experimental/www/firefox-aurora/files/patch-js-src-Makefile.in Wed Jul 6 23:07:23 2011 (r586) @@ -1,24 +1,24 @@ ---- js/src/Makefile.in.orig 2011-06-01 00:33:48.000000000 +0200 -+++ js/src/Makefile.in 2011-06-02 01:36:58.745440491 +0200 +--- js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200 ++++ js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200 @@ -416,7 +416,7 @@ # END enclude sources for V8 dtoa ############################################# -ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU))) -+ifeq (,$(filter amd64 arm% sparc %86 x86_64,$(TARGET_CPU))) ++ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU))) VPATH += $(srcdir)/assembler \ $(srcdir)/assembler/wtf \ -@@ -470,6 +470,9 @@ +@@ -469,6 +469,9 @@ + else #CPPSRCS += only_on_x86.cpp endif - endif +ifeq (amd64, $(TARGET_CPU)) +#CPPSRCS += only_on_x86_64.cpp +endif + endif ifeq (arm, $(TARGET_CPU)) #CPPSRCS += only_on_arm.cpp - endif @@ -739,7 +742,7 @@ # to reliably get limit macros defined, we'd always have to define the # one below before including any header, but that's obscure and Modified: branches/experimental/www/firefox-aurora/files/patch-js-src-configure.in ============================================================================== --- branches/experimental/www/firefox-aurora/files/patch-js-src-configure.in Wed Jul 6 21:46:10 2011 (r585) +++ branches/experimental/www/firefox-aurora/files/patch-js-src-configure.in Wed Jul 6 23:07:23 2011 (r586) @@ -1,5 +1,14 @@ ---- js/src/configure.in.orig 2011-06-01 00:33:48.000000000 +0200 -+++ js/src/configure.in 2011-06-01 09:12:10.225441827 +0200 +--- js/src/configure.in.orig 2011-07-06 05:09:22.000000000 +0200 ++++ js/src/configure.in 2011-07-06 22:19:17.584233430 +0200 +@@ -1473,7 +1473,7 @@ + CPU_ARCH=sparc + ;; + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" + ;; + @@ -1495,7 +1495,7 @@ dnl =============================================================== INTEL_ARCHITECTURE= @@ -14,70 +23,50 @@ AC_DEFINE(JS_NUNBOX32) ;; -x86_64*-*) -+x86_64*-*|amd64*-*) ++amd64*-*) ENABLE_TRACEJIT=1 NANOJIT_ARCH=X64 ENABLE_METHODJIT=1 -@@ -2732,16 +2732,6 @@ - AC_DEFINE(JS_CPU_ARM) - AC_DEFINE(JS_NUNBOX32) +@@ -2723,23 +2723,23 @@ + AC_DEFINE(JS_CPU_X64) + AC_DEFINE(JS_PUNBOX64) + ;; +-arm*-*) ++x86_64*-*) + ENABLE_TRACEJIT=1 +- NANOJIT_ARCH=ARM ++ NANOJIT_ARCH=X64 + ENABLE_METHODJIT=1 + ENABLE_MONOIC=1 + ENABLE_POLYIC=1 +- AC_DEFINE(JS_CPU_ARM) +- AC_DEFINE(JS_NUNBOX32) ++ ENABLE_POLYIC_TYPED_ARRAY=1 ++ AC_DEFINE(JS_CPU_X64) ++ AC_DEFINE(JS_PUNBOX64) ;; -sparc*-*) -- ENABLE_TRACEJIT=1 ++arm*-*) + ENABLE_TRACEJIT=1 - NANOJIT_ARCH=Sparc -- ENABLE_METHODJIT=1 -- ENABLE_MONOIC=1 -- ENABLE_POLYIC=1 ++ NANOJIT_ARCH=ARM + ENABLE_METHODJIT=1 + ENABLE_MONOIC=1 + ENABLE_POLYIC=1 - ENABLE_POLYIC_TYPED_ARRAY=1 - AC_DEFINE(JS_CPU_SPARC) -- AC_DEFINE(JS_NUNBOX32) -- ;; ++ AC_DEFINE(JS_CPU_ARM) + AC_DEFINE(JS_NUNBOX32) + ;; esac - - MOZ_ARG_DISABLE_BOOL(methodjit, -@@ -2796,7 +2786,7 @@ +@@ -2796,6 +2796,10 @@ i?86-*) AC_DEFINE(AVMPLUS_IA32) ;; --x86_64*-*) -+x86_64*-*|amd64*-*) ++amd64*-*) ++ AC_DEFINE(AVMPLUS_AMD64) ++ AC_DEFINE(AVMPLUS_64BIT) ++ ;; + x86_64*-*) AC_DEFINE(AVMPLUS_AMD64) AC_DEFINE(AVMPLUS_64BIT) - ;; -@@ -3367,11 +3357,11 @@ - ;; - *) - MOZ_CHECK_PTHREADS(pthreads, -- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads", -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthreads", - MOZ_CHECK_PTHREADS(pthread, -- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread", -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread", - MOZ_CHECK_PTHREADS(c_r, -- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r", -+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread", - MOZ_CHECK_PTHREADS(c, - USE_PTHREADS=1 - ) -@@ -3446,18 +3436,18 @@ - *-*-freebsd*) - AC_DEFINE(_REENTRANT) - AC_DEFINE(_THREAD_SAFE) -- dnl -pthread links in -lc_r, so don't specify it explicitly. -+ dnl -pthread links in -pthread, so don't specify it explicitly. - if test "$ac_cv_have_dash_pthread" = "yes"; then - _PTHREAD_LDFLAGS="-pthread" - else -- _PTHREAD_LDFLAGS="-lc_r" -+ _PTHREAD_LDFLAGS="-pthread" - fi - ;; - - *-*-openbsd*|*-*-bsdi*) - AC_DEFINE(_REENTRANT) - AC_DEFINE(_THREAD_SAFE) -- dnl -pthread links in -lc_r, so don't specify it explicitly. -+ dnl -pthread links in -pthread, so don't specify it explicitly. - if test "$ac_cv_have_dash_pthread" = "yes"; then - _PTHREAD_LDFLAGS="-pthread" - fi Modified: branches/experimental/www/firefox-aurora/files/patch-layout_generic_Makefile.in ============================================================================== --- branches/experimental/www/firefox-aurora/files/patch-layout_generic_Makefile.in Wed Jul 6 21:46:10 2011 (r585) +++ branches/experimental/www/firefox-aurora/files/patch-layout_generic_Makefile.in Wed Jul 6 23:07:23 2011 (r586) @@ -1,5 +1,5 @@ ---- layout/generic/Makefile.in.orig 2011-06-01 00:34:33.000000000 +0200 -+++ layout/generic/Makefile.in 2011-06-01 00:59:40.612442830 +0200 +--- layout/generic/Makefile.in.orig 2011-07-06 05:09:28.000000000 +0200 ++++ layout/generic/Makefile.in 2011-07-06 21:49:25.105659269 +0200 @@ -159,9 +159,10 @@ -I$(srcdir)/../../content/html/content/src \ -I$(srcdir)/../../dom/base \ @@ -7,7 +7,7 @@ - $(MOZ_CAIRO_CFLAGS) \ $(NULL) -+CXXFLAGS += $(MOZ_CAIRO_CFLAGS) ++ CXXFLAGS += $(MOZ_CAIRO_CFLAGS) + ifdef MOZ_ENABLE_GTK2 CXXFLAGS += $(MOZ_GTK2_CFLAGS) From owner-freebsd-gecko@FreeBSD.ORG Thu Jul 7 08:29:44 2011 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C4E43106566C for ; Thu, 7 Jul 2011 08:29:44 +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 4DBE08FC14 for ; Thu, 7 Jul 2011 08:29:43 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id p678TgMX060383 for ; Thu, 7 Jul 2011 08:29: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 p678TbOf060170 for freebsd-gecko@freebsd.org; Thu, 7 Jul 2011 08:29:37 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 7 Jul 2011 08:29:37 GMT Message-Id: <201107070829.p678TbOf060170@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] r587 - branches/experimental/www/firefox-aurora/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, 07 Jul 2011 08:29:44 -0000 Author: flo Date: Thu Jul 7 08:29:37 2011 New Revision: 587 Log: - forgot to svn rm these 2 files Deleted: branches/experimental/www/firefox-aurora/files/patch-content-xslt-public-txDouble.h branches/experimental/www/firefox-aurora/files/patch-storage_build_Makefile.in Deleted: branches/experimental/www/firefox-aurora/files/patch-content-xslt-public-txDouble.h ============================================================================== --- branches/experimental/www/firefox-aurora/files/patch-content-xslt-public-txDouble.h Thu Jul 7 08:29:37 2011 (r586) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- content/xslt/public/txDouble.h.orig 2009-08-16 21:46:27.000000000 +0200 -+++ content/xslt/public/txDouble.h 2009-08-16 21:49:53.000000000 +0200 -@@ -43,7 +43,7 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include --#ifdef __alpha__ -+#if !defined(__amd64__) && !defined(__i386__) - static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #else - static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; Deleted: branches/experimental/www/firefox-aurora/files/patch-storage_build_Makefile.in ============================================================================== --- branches/experimental/www/firefox-aurora/files/patch-storage_build_Makefile.in Thu Jul 7 08:29:37 2011 (r586) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006 -+++ storage/build/Makefile.in Sun Nov 5 16:16:06 2006 -@@ -77,6 +77,7 @@ - $(EXTRA_DSO_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ -+ %%PTHREAD_LIBS%% \ - $(NULL) - - include $(topsrcdir)/config/rules.mk From owner-freebsd-gecko@FreeBSD.ORG Thu Jul 7 08:39:02 2011 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 620DA1065672 for ; Thu, 7 Jul 2011 08:39:02 +0000 (UTC) (envelope-from inyaoo@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id EA0238FC1E for ; Thu, 7 Jul 2011 08:39:01 +0000 (UTC) Received: by wyg24 with SMTP id 24so652305wyg.13 for ; Thu, 07 Jul 2011 01:39:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version:content-type; bh=CXq5la6dFvVuFR9cVUtCaFf8hVc7qLWc26h/uF34MIA=; b=Ft1ZA+fH3WPPyZvSOWtYzIeT2ZRXS0ho5OS7Nute07hNRP9eIchyji6BtQZ/OHmxg0 kz6O+QJxtkTOkATp5E8aKsF2qBKLaSL52kYaEBV45jWEJdtJmbr1XOnT+WQ8LJkPLF1Z U9NA+C0gl7ILfXJQOoIkPEG6grQpHh4BeuArs= Received: by 10.216.82.6 with SMTP id n6mr1403623wee.63.1310027940652; Thu, 07 Jul 2011 01:39:00 -0700 (PDT) Received: from localhost ([88.80.28.70]) by mx.google.com with ESMTPS id h22sm4639743wes.8.2011.07.07.01.38.57 (version=SSLv3 cipher=OTHER); Thu, 07 Jul 2011 01:38:59 -0700 (PDT) From: Pan Tsu To: freebsd-gecko@freebsd.org References: <201107070829.p678TbOf060170@trillian.chruetertee.ch> Date: Thu, 07 Jul 2011 12:38:42 +0400 In-Reply-To: <201107070829.p678TbOf060170@trillian.chruetertee.ch> (svn-freebsd-gecko@chruetertee.ch's message of "Thu, 7 Jul 2011 08:29:37 GMT") Message-ID: <86mxgqcwod.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [SVN-Commit] r587 - branches/experimental/www/firefox-aurora/files 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: Thu, 07 Jul 2011 08:39:02 -0000 svn-freebsd-gecko@chruetertee.ch writes: > Author: flo > Date: Thu Jul 7 08:29:37 2011 > New Revision: 587 > > Log: > - forgot to svn rm these 2 files [...] > Deleted: branches/experimental/www/firefox-aurora/files/patch-content-xslt-public-txDouble.h > ============================================================================== > --- branches/experimental/www/firefox-aurora/files/patch-content-xslt-public-txDouble.h Thu Jul 7 08:29:37 2011 (r586) > +++ /dev/null 00:00:00 1970 (deleted) > @@ -1,11 +0,0 @@ > ---- content/xslt/public/txDouble.h.orig 2009-08-16 21:46:27.000000000 +0200 > -+++ content/xslt/public/txDouble.h 2009-08-16 21:49:53.000000000 +0200 > -@@ -43,7 +43,7 @@ > - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. > - #ifdef __FreeBSD__ > - #include > --#ifdef __alpha__ > -+#if !defined(__amd64__) && !defined(__i386__) > - static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; > - #else > - static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; Didn't the ifdef move to content/base/public/nsContentUtils.h? https://bugzilla.mozilla.org/show_bug.cgi?id=658363 From owner-freebsd-gecko@FreeBSD.ORG Thu Jul 7 08:54:58 2011 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E60F9106567E for ; Thu, 7 Jul 2011 08:54:58 +0000 (UTC) (envelope-from flo@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B9DA78FC15; Thu, 7 Jul 2011 08:54:58 +0000 (UTC) Received: from bender.solomo.local (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p678svR1006498; Thu, 7 Jul 2011 08:54:58 GMT (envelope-from flo@freebsd.org) Message-ID: <4E157461.5060004@freebsd.org> Date: Thu, 07 Jul 2011 10:54:57 +0200 From: Florian Smeets User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:5.0) Gecko/20110704 Thunderbird/5.0 MIME-Version: 1.0 To: Pan Tsu References: <201107070829.p678TbOf060170@trillian.chruetertee.ch> <86mxgqcwod.fsf@gmail.com> In-Reply-To: <86mxgqcwod.fsf@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-gecko@freebsd.org Subject: Re: [SVN-Commit] r587 - branches/experimental/www/firefox-aurora/files 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: Thu, 07 Jul 2011 08:54:59 -0000 On 07.07.2011 10:38, Pan Tsu wrote: > svn-freebsd-gecko@chruetertee.ch writes: > >> Author: flo >> Date: Thu Jul 7 08:29:37 2011 >> New Revision: 587 >> >> Log: >> - forgot to svn rm these 2 files > [...] > > Didn't the ifdef move to content/base/public/nsContentUtils.h? > > https://bugzilla.mozilla.org/show_bug.cgi?id=658363 Yes, you are right. I'll commit a fix later today. Thanks! Florian From owner-freebsd-gecko@FreeBSD.ORG Thu Jul 7 09:40:06 2011 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A67A106566B for ; Thu, 7 Jul 2011 09:40:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4DCD78FC0A for ; Thu, 7 Jul 2011 09:40:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p679e6jd044249 for ; Thu, 7 Jul 2011 09:40:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p679e6Hv044248; Thu, 7 Jul 2011 09:40:06 GMT (envelope-from gnats) Resent-Date: Thu, 7 Jul 2011 09:40:06 GMT Resent-Message-Id: <201107070940.p679e6Hv044248@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: gecko@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pan Tsu Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A32371065674 for ; Thu, 7 Jul 2011 09:31:18 +0000 (UTC) (envelope-from inyaoo@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id 4038B8FC17 for ; Thu, 7 Jul 2011 09:31:17 +0000 (UTC) Received: by wyg24 with SMTP id 24so688865wyg.13 for ; Thu, 07 Jul 2011 02:31:17 -0700 (PDT) Received: by 10.227.96.140 with SMTP id h12mr486290wbn.95.1310031077037; Thu, 07 Jul 2011 02:31:17 -0700 (PDT) Received: from localhost (politkovskaja.torservers.net [77.247.181.165]) by mx.google.com with ESMTPS id em16sm1499728wbb.16.2011.07.07.02.31.15 (version=SSLv3 cipher=OTHER); Thu, 07 Jul 2011 02:31:16 -0700 (PDT) Message-Id: <861uy2bfof.fsf@gmail.com> Date: Thu, 07 Jul 2011 13:31:12 +0400 From: Pan Tsu To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/158702: [patch] www/firefox-devel: prune -DFREEBSD cruft in js 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: Thu, 07 Jul 2011 09:40:06 -0000 >Number: 158702 >Category: ports >Synopsis: [patch] www/firefox-devel: prune -DFREEBSD cruft in js >Confidential: no >Severity: non-critical >Priority: low >Responsible: gecko >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jul 07 09:40:05 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Pan Tsu >Release: FreeBSD 9.0-CURRENT amd64 >Organization: >Environment: gcc46 >Description: I think the issue[1] with hidden pthread_attr_get_np is gcc specific. pthread_np.h in config/system-headers should be enough to unhide it. [1] http://docs.freebsd.org/cgi/mid.cgi?86mxposuzj.fsf >How-To-Repeat: 1. build with gcc45 and basegcc 2. nm -D /usr/local/lib/firefox/libxul.so | grep 'pthread.*attr' >Fix: --- a.diff begins here --- Index: www/firefox-aurora/files/patch-js-src-jsnativestack.cpp =================================================================== --- www/firefox-aurora/files/patch-js-src-jsnativestack.cpp (revision 587) +++ www/firefox-aurora/files/patch-js-src-jsnativestack.cpp (working copy) @@ -1,12 +0,0 @@ ---- js/src/jsnativestack.cpp.orig 2011-06-01 00:33:48.000000000 +0200 -+++ js/src/jsnativestack.cpp 2011-06-01 00:56:21.718439794 +0200 -@@ -50,7 +50,8 @@ - #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX) - # include - --# if defined(__FreeBSD__) || defined(__OpenBSD__) -+# if defined(FREEBSD) || defined(__OpenBSD__) -+# include - # include - # endif - Index: www/firefox-aurora/files/patch-js-src-Makefile.in =================================================================== --- www/firefox-aurora/files/patch-js-src-Makefile.in (revision 587) +++ www/firefox-aurora/files/patch-js-src-Makefile.in (working copy) @@ -28,12 +28,11 @@ INCLUDES += -I$(srcdir) -@@ -793,7 +796,8 @@ +@@ -793,7 +796,7 @@ endif # WINNT ifeq ($(OS_ARCH),FreeBSD) -EXTRA_LIBS += -pthread -+DEFINES += -DFREEBSD +EXTRA_LIBS += -pthread -lc endif ifeq ($(OS_ARCH),IRIX) --- a.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: From owner-freebsd-gecko@FreeBSD.ORG Fri Jul 8 12:22:47 2011 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5E7F81065678 for ; Fri, 8 Jul 2011 12:22:47 +0000 (UTC) (envelope-from mi+thun@aldan.algebra.com) Received: from smtp03.lnh.mail.rcn.net (smtp03.lnh.mail.rcn.net [207.172.157.103]) by mx1.freebsd.org (Postfix) with ESMTP id 0EB918FC28 for ; Fri, 8 Jul 2011 12:22:46 +0000 (UTC) Received: from mr17.lnh.mail.rcn.net ([207.172.157.37]) by smtp02.lnh.mail.rcn.net with ESMTP; 08 Jul 2011 08:22:46 -0400 Received: from smtp01.lnh.mail.rcn.net (smtp01.lnh.mail.rcn.net [207.172.4.11]) by mr17.lnh.mail.rcn.net (MOS 4.2.3-GA) with ESMTP id AYX79835; Fri, 8 Jul 2011 08:22:45 -0400 Received-SPF: None identity=pra; client-ip=209.6.61.133; receiver=smtp01.lnh.mail.rcn.net; envelope-from="mi+thun@aldan.algebra.com"; x-sender="mi+thun@aldan.algebra.com"; x-conformance=sidf_compatible Received-SPF: None identity=mailfrom; client-ip=209.6.61.133; receiver=smtp01.lnh.mail.rcn.net; envelope-from="mi+thun@aldan.algebra.com"; x-sender="mi+thun@aldan.algebra.com"; x-conformance=sidf_compatible Received-SPF: None identity=helo; client-ip=209.6.61.133; receiver=smtp01.lnh.mail.rcn.net; envelope-from="mi+thun@aldan.algebra.com"; x-sender="postmaster@[192.168.1.8]"; x-conformance=sidf_compatible X-Auth-ID: anat Received: from unknown (HELO [192.168.1.8]) ([209.6.61.133]) by smtp01.lnh.mail.rcn.net with ESMTP; 08 Jul 2011 08:22:40 -0400 Message-ID: <4E16F684.4010303@aldan.algebra.com> Date: Fri, 08 Jul 2011 08:22:28 -0400 From: "Mikhail T." User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:5.0) Gecko/20110706 Thunderbird/5.0 MIME-Version: 1.0 To: gecko@freebsd.org References: <4DDD6807.5090302@aldan.algebra.com> <4E0CCD19.9010605@aldan.algebra.com> In-Reply-To: <4E0CCD19.9010605@aldan.algebra.com> Content-Type: multipart/mixed; boundary="------------020405030400030800060100" X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Subject: Re: sqlite3 and other already-installed components 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: Fri, 08 Jul 2011 12:22:47 -0000 This is a multi-part message in MIME format. --------------020405030400030800060100 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Attached are the patches for Mk/bsd.gecko.mk and firefox and thunderbird ports, which build both applications with all the 3rd-party components coming from other ports. This presumes, the png is built with APNG enabled, which, hopefully, will soon become the default: http://www.freebsd.org/cgi/query-pr.cgi?pr=158716 until then, USE_MOZILLA can be set to -png (rather than yes), but there really is no excuse not to use all other components. I'm sending this letter using the newly-built Thunderbird-5. The new Firefox-5 works nicely too. Please, review the patch -- other ports in your care might need tweaking too, but I doubt it... Thank you! Yours, -mi --------------020405030400030800060100 Content-Type: text/plain; name="mozilla.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="mozilla.diff" Index: Mk/bsd.gecko.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.gecko.mk,v retrieving revision 1.30 diff -U 2 -r1.30 bsd.gecko.mk --- Mk/bsd.gecko.mk 30 Jun 2011 18:19:47 -0000 1.30 +++ Mk/bsd.gecko.mk 8 Jul 2011 12:07:53 -0000 @@ -566,7 +566,11 @@ # Standard depends -_ALL_DEPENDS= cairo dbm jpeg nspr nss png xft zip +_ALL_DEPENDS= cairo dbm jpeg nspr nss png xft zip sqlite3 -cairo_LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo +sqlite3_LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 +sqlite3_MOZ_OPTIONS= --enable-system-sqlite +sqlite3_EXTRACT_AFTER_ARGS= --exclude mozilla/db/sqlite3/src/*.h + +cairo_LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo cairo_MOZ_OPTIONS= --enable-system-cairo cairo_EXTRACT_AFTER_ARGS= --exclude mozilla/gfx/cairo @@ -574,5 +578,5 @@ dbm_EXTRACT_AFTER_ARGS= --exclude mozilla/dbm -jpeg_LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg +jpeg_LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg jpeg_MOZ_OPTIONS= --with-system-jpeg=${LOCALBASE} jpeg_EXTRACT_AFTER_ARGS= --exclude mozilla/jpeg @@ -587,9 +591,8 @@ nss_LDFLAGS+= -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} - -png_LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png +png_LIB_DEPENDS= png:${PORTSDIR}/graphics/png png_MOZ_OPTIONS= --with-system-png=${LOCALBASE} -xft_LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft +xft_LIB_DEPENDS= Xft:${PORTSDIR}/x11-fonts/libXft zip_DEPENDS= zip:${PORTSDIR}/archivers/zip Index: www/firefox/Makefile =================================================================== RCS file: /home/pcvs/ports/www/firefox/Makefile,v retrieving revision 1.242 diff -U 2 -r1.242 Makefile --- www/firefox/Makefile 4 Jul 2011 17:28:33 -0000 1.242 +++ www/firefox/Makefile 8 Jul 2011 12:07:53 -0000 @@ -18,4 +18,5 @@ BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ + nss>=3.12.9:${PORTSDIR}/security/nss \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ @@ -25,5 +26,5 @@ USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -png -nss -dbm -jpeg -xft +USE_MOZILLA= yes MOZILLA_NAME= Firefox MOZ_TOOLKIT= cairo-gtk2 @@ -97,8 +98,8 @@ @${ECHO} "*****************************************************************" @${ECHO} "To build Firefox with PGO support you need a running X server and" - @${ECHO} " build this port with an user who could access the X server! " + @${ECHO} " build this port with as user who could access the X server! " @${ECHO} "" @${ECHO} "During the build a Firefox instance will start and run some test." - @${ECHO} " Do not interrupt or close Firefox during this tests! " + @${ECHO} " Do not interrupt or close Firefox during these tests! " @${ECHO} "*****************************************************************" @sleep 10 Index: www/firefox/files/patch-db_sqlite3_src_Makefile.in =================================================================== RCS file: www/firefox/files/patch-db_sqlite3_src_Makefile.in diff -N www/firefox/files/patch-db_sqlite3_src_Makefile.in --- www/firefox/files/patch-db_sqlite3_src_Makefile.in 7 Feb 2010 21:48:43 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- db/sqlite3/src/Makefile.in.orig 2009-04-28 11:12:00.829684825 +0000 -+++ db/sqlite3/src/Makefile.in 2009-04-28 11:12:20.628076799 +0000 -@@ -45,6 +45,8 @@ - - include $(DEPTH)/config/autoconf.mk - -+OS_CFLAGS = -I../../../dist/include/sqlite3 -+OS_LIBS = %%PTHREAD_LIBS%% -lc - MODULE = sqlite3 - LIBRARY_NAME = sqlite3 - FORCE_SHARED_LIB = 1 Index: mail/thunderbird/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/thunderbird/Makefile,v retrieving revision 1.128 diff -U 2 -r1.128 Makefile --- mail/thunderbird/Makefile 4 Jul 2011 21:27:06 -0000 1.128 +++ mail/thunderbird/Makefile 8 Jul 2011 12:07:53 -0000 @@ -16,5 +16,6 @@ COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr +BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ + sqlite3>=3.7.5:${PORTSDIR}/databases/sqlite3 LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ event-1.4:${PORTSDIR}/devel/libevent @@ -23,5 +24,5 @@ USE_GECKO= gecko CONFLICTS_INSTALL= thunderbird-3.1* -USE_MOZILLA= -png -nss -dbm -jpeg -xft +USE_MOZILLA= yes MOZ_TOOLKIT= cairo-gtk2 @@ -59,4 +60,8 @@ .include +.if exists(${LOCALBASE}/include/jsapi.h) +.error The installed SpiderMonkey headers interfere with the build +.endif + WRKSRC= ${WRKDIR}/comm-miramar MOZSRC:= ${WRKSRC}/mozilla @@ -111,6 +116,5 @@ ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ ${MOZSRC}/storage/build/Makefile.in \ - ${MOZSRC}/toolkit/library/Makefile.in \ - ${MOZSRC}/db/sqlite3/src/Makefile.in + ${MOZSRC}/toolkit/library/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${MOZSRC}/security/manager/ssl/src/Makefile.in \ Index: mail/thunderbird/files/patch-directory-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in =================================================================== RCS file: mail/thunderbird/files/patch-directory-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in diff -N mail/thunderbird/files/patch-directory-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mail/thunderbird/files/patch-directory-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in 8 Jul 2011 12:07:53 -0000 @@ -0,0 +1,12 @@ +--- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in 2011-04-14 14:37:48.000000000 -0400 ++++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in 2011-05-25 13:32:01.000000000 -0400 +@@ -153,4 +154,9 @@ + endif + ++ifeq ($(OS_ARCH), FreeBSD)) ++EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) $(NSSLINK) -lpthread ++CUSTOM_LIBS=1 ++endif ++ + ifeq ($(OS_ARCH), IRIX) + EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) Index: mail/thunderbird/files/patch-mozilla-db-sqlite3-src-Makefile.in =================================================================== RCS file: mail/thunderbird/files/patch-mozilla-db-sqlite3-src-Makefile.in diff -N mail/thunderbird/files/patch-mozilla-db-sqlite3-src-Makefile.in --- mail/thunderbird/files/patch-mozilla-db-sqlite3-src-Makefile.in 3 Aug 2010 20:55:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- mozilla/db/sqlite3/src/Makefile.in.orig 2008-06-19 11:03:17.000000000 -0500 -+++ mozilla/db/sqlite3/src/Makefile.in 2008-06-19 11:04:15.000000000 -0500 -@@ -45,6 +45,8 @@ - - include $(DEPTH)/config/autoconf.mk - -+OS_CFLAGS = -I../../../dist/include/sqlite3 -+OS_LIBS = %%PTHREAD_LIBS%% - MODULE = sqlite3 - LIBRARY_NAME = sqlite3 - FORCE_SHARED_LIB = 1 Index: mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c =================================================================== RCS file: mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c diff -N mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c --- mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c 1 Mar 2011 22:27:20 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,43 +0,0 @@ ---- mozilla/security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 23:13:08.000000000 +0100 -+++ mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 23:18:46.000000000 +0100 -@@ -733,6 +733,32 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +812,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - --------------020405030400030800060100--