From owner-freebsd-gecko@FreeBSD.ORG Sun Aug 29 14:54:15 2010 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 AE88F10656B2 for ; Sun, 29 Aug 2010 14:54:15 +0000 (UTC) (envelope-from beat@FreeBSD.org) Received: from marvin.chruetertee.ch (marvin.chruetertee.ch [217.150.245.55]) by mx1.freebsd.org (Postfix) with ESMTP id 4A9578FC08 for ; Sun, 29 Aug 2010 14:54:14 +0000 (UTC) Received: from daedalus.network.local (157-132.2-85.cust.bluewin.ch [85.2.132.157]) (authenticated bits=0) by marvin.chruetertee.ch (8.14.3/8.14.3) with ESMTP id o7TEsDbd087574 (version=TLSv1/SSLv3 cipher=DHE-DSS-CAMELLIA256-SHA bits=256 verify=NO); Sun, 29 Aug 2010 14:54:14 GMT (envelope-from beat@FreeBSD.org) Message-ID: <4C7A7521.3020509@FreeBSD.org> Date: Sun, 29 Aug 2010 16:56:33 +0200 From: Beat Gaetzi User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.11) Gecko/20100721 Lightning/1.0b1 Thunderbird/3.0.6 MIME-Version: 1.0 To: Andriy Gapon References: <4C779AE7.40004@icyb.net.ua> <4C77AD98.1070703@FreeBSD.org> <4C77AFD0.2000302@icyb.net.ua> In-Reply-To: <4C77AFD0.2000302@icyb.net.ua> X-Enigmail-Version: 1.0.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: gecko@FreeBSD.org Subject: Re: WITH_GECKO valid values 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, 29 Aug 2010 14:54:15 -0000 On 27.08.2010 14:30, Andriy Gapon wrote: > on 27/08/2010 15:20 Beat Gaetzi said the following: >> On 27.08.2010 13:00, Andriy Gapon wrote: >>> >>> is it correct that currently the only valid value for WITH_GECKO is libxul? >>> It doesn't look like thunderbird or firefox install build infrastructure anymore >>> (like xpidl)? >> >> Yes, libxul is the only supported gecko provider at the moment. We are >> currently working on a gecko cleanup and once this is done all invalid >> gecko providers will be removed from bsd.gecko.mk. > > Thanks a lot for the info! > BTW, I've written up firetray port, should I submit it for review here first or > just send-pr as usual? Just send it by send-pr as patches may get lost on the mailing list. Thanks, Beat From owner-freebsd-gecko@FreeBSD.ORG Mon Aug 30 02:35:49 2010 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 DD5DF1065698 for ; Mon, 30 Aug 2010 02:35:49 +0000 (UTC) (envelope-from tim_katz@excite.com) Received: from outbound002.roc2.bluetie.com (outbound002.roc2.bluetie.com [208.89.132.142]) by mx1.freebsd.org (Postfix) with ESMTP id A0AAB8FC19 for ; Mon, 30 Aug 2010 02:35:49 +0000 (UTC) Received: from web011.roc2.bluetie.com ([10.200.2.8]) by outbound002.roc2.bluetie.com with bizsmtp id 0SNZ1f0020ANDLA01SNZ69; Sun, 29 Aug 2010 22:22:33 -0400 X-CMAE-OUT-Analysis: v=1.1 cv=VnTtgZnHjfBBoBQv7W4t8EdKxj7UKHp90KTkzk7vTKk= c=1 sm=1 a=ZQcaDWkFM70A:10 a=IkcTkHD0fZMA:10 a=0ZS_de5bMS-FYwLDeNsA:9 a=bK2DlKXkkF5ciBJDj_UA:7 a=ic4GuHCeBOAlEeH9Bykhzxz0lIgA:4 a=QEXdDO2ut3YA:10 a=+8qXc097eLrkhNZCekYbQQ==:117 X-CMAE-OUT-Score: 0.00 Received: from web011.roc2.bluetie.com (localhost.localdomain [127.0.0.1]) by web011.roc2.bluetie.com (Postfix) with ESMTP id 9C3663F015F for ; Sun, 29 Aug 2010 22:22:33 -0400 (EDT) Message-ID: <20100829222233.10381@web011.roc2.bluetie.com> X-HTTP-Received: from tim_katz.excite [76.172.223.173] by web011.roc2.bluetie.com (BlueTie WebMail ); Sun, 29 Aug 2010 22:22:33 -0400 X-Mailer: BlueTie MTA Date: Sun, 29 Aug 2010 22:22:33 -0400 To: gecko@freebsd.org From: "Tim Katz" Importance: normal Content-transfer-encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Cc: Subject: Firefox 4 Beta -- plugin folder location? 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, 30 Aug 2010 02:35:49 -0000 Hello, First, I would like to say thanks for porting Firefox 4 b4 to FreeBSD! Now,= on to my question. :) I'm trying to get Flash working with this browser. I installed the same fla= sh plugin that works with Firefox 3.6 on FreeBSD (I'm running 8.1), but it d= oesn't show up in the list of installed plugins. I then went to check that = the appropriate symbolic link had been created, at which point I realized I = have no idea what plugin folder to use as the target of my link. If you could advise me of which folder I should point my symbolic link to fo= r my Flash plugin, I would greatly appreciate it. Thanks, Tim From owner-freebsd-gecko@FreeBSD.ORG Mon Aug 30 11:07:17 2010 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 ECB4D1065695 for ; Mon, 30 Aug 2010 11:07:17 +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 DBFAA8FC08 for ; Mon, 30 Aug 2010 11:07:17 +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 o7UB7H0P087681 for ; Mon, 30 Aug 2010 11:07:17 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o7UB7HQ6087679 for gecko@FreeBSD.org; Mon, 30 Aug 2010 11:07:17 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 30 Aug 2010 11:07:17 GMT Message-Id: <201008301107.o7UB7HQ6087679@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, 30 Aug 2010 11:07:18 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- f ports/150027 gecko Internal error for compiling www/firefox o ports/149638 gecko deskutils/lightning-thunderbird build failure. o ports/149594 gecko /usr/ports/mail/thunderbird no build o ports/148475 gecko [patch] Mk/bsd.gecko.mk: use tar(1) for copying trees o ports/146231 gecko [feature request] [patch] www/firefox: use port libs o ports/144145 gecko www/firefox: Firefox 3.6 does not allow any https-conn o ports/144044 gecko [PATCH] www/firefox: Makefile.webplugins target order o ports/142807 gecko www/firefox35-i18n does not depend on www/firefox35 8 problems total. From owner-freebsd-gecko@FreeBSD.ORG Mon Aug 30 11:30:04 2010 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 7FAD6106566C for ; Mon, 30 Aug 2010 11:30:04 +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 51F3C8FC24 for ; Mon, 30 Aug 2010 11:30:04 +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 o7UBU4cH010276 for ; Mon, 30 Aug 2010 11:30:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o7UBU41m010271; Mon, 30 Aug 2010 11:30:04 GMT (envelope-from gnats) Date: Mon, 30 Aug 2010 11:30:04 GMT Message-Id: <201008301130.o7UBU41m010271@freefall.freebsd.org> To: gecko@FreeBSD.org From: Anonymous Cc: Subject: Re: ports/148475: [patch] Mk/bsd.gecko.mk: use tar(1) for copying trees X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Anonymous List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Aug 2010 11:30:04 -0000 The following reply was made to PR ports/148475; it has been noted by GNATS. From: Anonymous To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/148475: [patch] Mk/bsd.gecko.mk: use tar(1) for copying trees Date: Mon, 30 Aug 2010 15:18:30 +0400 Looks like `-L' behaviour is expected[1]. And the `-R' bug was fixed[2], too. [1] http://docs.freebsd.org/cgi/mid.cgi?AC6D94B5-2401-42ED-B96D-A18873671A46 [2] http://svn.freebsd.org/changeset/base/211054 From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 4 22:09:41 2010 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 A587D1065704; Sat, 4 Sep 2010 22:09:41 +0000 (UTC) (envelope-from glewis@misty.eyesbeyond.com) Received: from misty.eyesbeyond.com (gerbercreations.com [71.39.140.16]) by mx1.freebsd.org (Postfix) with ESMTP id 980B18FC0C; Sat, 4 Sep 2010 22:09:40 +0000 (UTC) Received: from misty.eyesbeyond.com (localhost.eyesbeyond.com [127.0.0.1]) by misty.eyesbeyond.com (8.14.4/8.14.4) with ESMTP id o84LW6Lu015923; Sat, 4 Sep 2010 14:32:06 -0700 (PDT) (envelope-from glewis@misty.eyesbeyond.com) Received: (from glewis@localhost) by misty.eyesbeyond.com (8.14.4/8.14.4/Submit) id o84LW6EN015922; Sat, 4 Sep 2010 14:32:06 -0700 (PDT) (envelope-from glewis) Date: Sat, 4 Sep 2010 14:32:06 -0700 (PDT) Message-Id: <201009042132.o84LW6EN015922@misty.eyesbeyond.com> To: FreeBSD-gnats-submit@freebsd.org From: Greg Lewis X-send-pr-version: 3.113 X-GNATS-Notify: Cc: gecko@freebsd.org Subject: [PATCH] deskutils/lightning: Update to 1.0 beta 2 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: Sat, 04 Sep 2010 22:09:41 -0000 >Submitter-Id: current-users >Originator: Greg Lewis >Organization: >Confidential: no >Synopsis: [PATCH] deskutils/lightning: Update to 1.0 beta 2 >Severity: non-critical >Priority: low >Category: ports >Class: update >Release: FreeBSD 7.3-RELEASE-p2 i386 >Environment: System: FreeBSD misty.eyesbeyond.com 7.3-RELEASE-p2 FreeBSD 7.3-RELEASE-p2 #0: Sun Jul 18 11:33:43 PDT 2010 >Description: . Update to 1.0 beta 2. Only built on FreeBSD/i386 Added file(s): - files/patch-mozilla-toolkit-mozapps-update-src-updater-updater.cpp Removed file(s): - files/patch-bug533070 - files/patch-mozilla-js-src-config-config.mk Port maintainer (gecko@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- lightning-1.0.patch begins here --- Index: Makefile =================================================================== RCS file: /var/fcvs/ports/deskutils/lightning/Makefile,v retrieving revision 1.33 diff -u -r1.33 Makefile --- Makefile 4 Aug 2010 17:56:10 -0000 1.33 +++ Makefile 4 Sep 2010 21:18:21 -0000 @@ -9,8 +9,8 @@ DISTVERSION= 1.0 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} -MASTER_SITE_SUBDIR= calendar/${PORTNAME}/releases/${DISTVERSION}b1/source -DISTNAME= ${PORTNAME}-sunbird-${DISTVERSION}b1.source +MASTER_SITE_SUBDIR= calendar/${PORTNAME}/releases/${DISTVERSION}b2/source +DISTNAME= ${PORTNAME}-${DISTVERSION}b2.source MAINTAINER= gecko@FreeBSD.org COMMENT= An integrated calendar for Thunderbird and SeaMonkey @@ -36,7 +36,8 @@ PKGCONFIG_FILES= ${MOZ_PKG_CONFIG_FILES} MOZ_OPTIONS= --enable-application=calendar \ --enable-system-cairo \ - --enable-canvas + --enable-canvas \ + --disable-necko-wifi MOZ_MK_OPTIONS= MOZ_CO_PROJECT=calendar NOGECKO_PLIST= yes NOGECKO_INSTALL= yes @@ -54,11 +55,11 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/seamonkey/seamonkey-bin:${PORTSDIR}/www/seamonkey2 .endif -XPI_FILE= ${DISTNAME}-${GECKO}-freebsd${OSVERSION:C/([0-9]).+/\1/}-${ARCH}.xpi +XPI_FILE= ${DISTNAME}-freebsd${OSVERSION:C/([0-9]).+/\1/}-${ARCH}.xpi PLIST_FILES= %%DATADIR%%/${XPI_FILE} PLIST_DIRS= %%DATADIR%% -WRKSRC= ${WRKDIR}/comm-1.9.1 +WRKSRC= ${WRKDIR}/comm-1.9.2 MOZSRC:= ${WRKSRC}/mozilla .if ${OSVERSION} < 700000 @@ -98,15 +99,6 @@ (cd ${MOZSRC} && ${AUTOCONF}) (cd ${MOZSRC}/js/src/ && ${AUTOCONF}) -# XXX: Workaround for bug 533070. Should be fixed in next release - ${CP} ${WRKSRC}/calendar/sunbird/app/*.png ${WRKSRC}/calendar/sunbird/branding/nightly/ - ${CP} ${WRKSRC}/calendar/sunbird/app/*.xpm ${WRKSRC}/calendar/sunbird/branding/nightly/ - ${CP} ${WRKSRC}/calendar/sunbird/app/*.ico ${WRKSRC}/calendar/sunbird/branding/nightly/ - ${MKDIR} ${WRKSRC}/calendar/sunbird/branding/nightly/content/ - ${CP} ${WRKSRC}/calendar/sunbird/base/branding/*.png ${WRKSRC}/calendar/sunbird/branding/nightly/content/ - ${MKDIR} ${WRKSRC}/calendar/sunbird/branding/nightly/locales/en-US - ${CP} ${WRKSRC}/calendar/locales/en-US/chrome/branding/brand.* ${WRKSRC}/calendar/sunbird/branding/nightly/locales/en-US/ - post-build: @(cd ${MOZSRC}/xpfe/components/autocomplete/src && ${GMAKE}) Index: distinfo =================================================================== RCS file: /var/fcvs/ports/deskutils/lightning/distinfo,v retrieving revision 1.8 diff -u -r1.8 distinfo --- distinfo 3 Aug 2010 20:35:03 -0000 1.8 +++ distinfo 4 Sep 2010 21:18:21 -0000 @@ -1,3 +1,3 @@ -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 +MD5 (lightning-1.0b2.source.tar.bz2) = 2e2ba2279a4e89f11e50ea67b84dd543 +SHA256 (lightning-1.0b2.source.tar.bz2) = 887f8d49e6dd36478178b8438f28252370169e60a39383628c0862d8881eb9b2 +SIZE (lightning-1.0b2.source.tar.bz2) = 66604225 Index: files/patch-bug533070 =================================================================== RCS file: files/patch-bug533070 diff -N files/patch-bug533070 --- files/patch-bug533070 3 Aug 2010 20:35:03 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,729 +0,0 @@ -diff --git a/calendar/installer/windows/Makefile.in b/calendar/installer/windows/Makefile.in ---- calendar/installer/windows/Makefile.in -+++ calendar/installer/windows/Makefile.in -@@ -147,20 +147,8 @@ uninstaller:: - cat $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/utf16-le-bom.bin - > \ - $(CONFIG_DIR)/defines.nsi - $(PERL) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.pl \ - $(MOZILLA_SRCDIR) $(call EXPAND_LOCALE_SRCDIR,calendar/locales)/installer $(AB_CD) \ - $(CONFIG_DIR) - - include $(topsrcdir)/config/rules.mk - include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/makensis.mk -- --export:: --ifndef MOZ_BRANDING_DIRECTORY -- $(NSINSTALL) -D $(DIST)/branding -- cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp -- cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp -- cp $(srcdir)/nsis/branding.nsi $(DIST)/branding/branding.nsi -- cp $(srcdir)/license.txt $(DIST)/branding/license.txt -- cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp -- cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp -- cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp --endif -diff --git a/calendar/locales/Makefile.in b/calendar/locales/Makefile.in ---- calendar/locales/Makefile.in -+++ calendar/locales/Makefile.in -@@ -49,22 +49,17 @@ ifeq ($(AB_CD),) - DIRS = ../timezones - endif - - include $(topsrcdir)/config/config.mk - - run_for_effects := $(shell if ! test -d $(DIST); then $(NSINSTALL) -D $(DIST); fi; if ! test -d $(DIST)/branding; then $(NSINSTALL) -D $(DIST)/branding; fi) - _ABS_DIST := $(shell cd $(DIST) && pwd) - --ifdef MOZ_BRANDING_DIRECTORY --SUBMAKEFILES += \ -- $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \ -- $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \ -- $(NULL) --endif -+SUBMAKEFILES += $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile - - # This makefile uses variable overrides from the libs-% target to - # build non-default locales to non-default dist/ locations. Be aware! - - AB = $(firstword $(subst -, ,$(AB_CD))) - - ifdef MOZ_SUNBIRD - APP_VERSION = $(SUNBIRD_VERSION) -@@ -82,20 +77,16 @@ DEFINES += \ - -DAB_CD=$(AB_CD) \ - -DMOZ_LANGPACK_EID=langpack-$(AB_CD)@sunbird.mozilla.org \ - -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \ - -DLOCALE_SRCDIR=$(LOCALE_SRCDIR) \ - -DPKG_BASENAME="$(PKG_BASENAME)" \ - -DPKG_INST_BASENAME="$(PKG_INST_BASENAME)" \ - $(NULL) - --ifndef MOZ_BRANDING_DIRECTORY --DEFINES += -DMOZ_USE_GENERIC_BRANDING --endif -- - ifeq (,$(filter-out pref,$(MOZ_EXTENSIONS))) - DEFINES += -DEXTENSION_PREF - endif - - include $(topsrcdir)/config/rules.mk - - tests: - ifdef MOZ_SUNBIRD -diff --git a/calendar/makefiles.sh b/calendar/makefiles.sh ---- calendar/makefiles.sh -+++ calendar/makefiles.sh -@@ -16,17 +16,18 @@ - # - # The Initial Developer of the Original Code is - # Ben Turner - # - # Portions created by the Initial Developer are Copyright (C) 2007 - # the Initial Developer. All Rights Reserved. - # - # Contributor(s): --# - Simon Paquet -+# Simon Paquet -+# Philipp Kewisch - # - # Alternatively, the contents of this file may be used under the terms of - # either the GNU General Public License Version 2 or later (the "GPL"), or - # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - # in which case the provisions of the GPL or the LGPL are applicable instead - # of those above. If you wish to allow use of your version of this file only - # under the terms of either the GPL or the LGPL, and not to allow others to - # use your version of this file under the terms of the MPL, indicate your -@@ -34,25 +35,18 @@ - # and other provisions required by the GPL or the LGPL. If you do not delete - # the provisions above, a recipient may use your version of this file under - # the terms of any one of the MPL, the GPL or the LGPL. - # - # ***** END LICENSE BLOCK ***** - - if [ "$COMM_BUILD" ]; then - --add_makefiles " --calendar/sunbird/Makefile --calendar/sunbird/app/Makefile --calendar/sunbird/base/Makefile --calendar/sunbird/locales/Makefile --" -+ add_makefiles " -+ calendar/sunbird/Makefile -+ calendar/sunbird/app/Makefile -+ calendar/sunbird/base/Makefile -+ calendar/sunbird/locales/Makefile -+ $MOZ_BRANDING_DIRECTORY/Makefile -+ " - --if test -n "$MOZ_BRANDING_DIRECTORY"; then -- add_makefiles " -- $MOZ_BRANDING_DIRECTORY/Makefile -- $MOZ_BRANDING_DIRECTORY/content/Makefile -- $MOZ_BRANDING_DIRECTORY/locales/Makefile -- " -+ . ${srcdir}/calendar/shared_makefiles.sh - fi -- -- . ${srcdir}/calendar/shared_makefiles.sh --fi -diff --git a/calendar/sunbird/Makefile.in b/calendar/sunbird/Makefile.in ---- calendar/sunbird/Makefile.in -+++ calendar/sunbird/Makefile.in -@@ -45,22 +45,17 @@ VPATH = @srcdir@ - include $(DEPTH)/config/autoconf.mk - - DIRS = base locales app - - ifeq ($(OS_ARCH),WINNT) - ifdef MOZ_INSTALLER - DIRS += ../installer/windows - --ifdef MOZ_BRANDING_DIRECTORY --DEFINES += -DOFFICIAL_BRANDING=1 --endif -- - # For Windows build the uninstaller during the application build since the - # uninstaller is included with the application for mar file generation. - libs:: - $(MAKE) -C ../installer/windows uninstaller - - endif - endif - - include $(topsrcdir)/config/rules.mk -- -diff --git a/calendar/sunbird/app/Makefile.in b/calendar/sunbird/app/Makefile.in ---- calendar/sunbird/app/Makefile.in -+++ calendar/sunbird/app/Makefile.in -@@ -275,64 +275,22 @@ libs:: sunbird - install:: sunbird - $(SYSINSTALL) $< $(DESTDIR)$(bindir) - - GARBAGE += sunbird - GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, sunbird.js) - - endif - --ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) --ICON_FILES = \ -- $(DIST)/branding/mozicon128.png \ -- $(DIST)/branding/mozicon50.xpm \ -- $(DIST)/branding/mozicon16.xpm \ -- $(NULL) -- --libs:: $(ICON_FILES) -- $(INSTALL) $^ $(DIST)/bin/icons -+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -+libs:: -+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DIST)/bin/chrome/icons/default - - install:: -- $(SYSINSTALL) $(IFLAGS1) $(ICON_FILES) $(DESTDIR)$(mozappdir)/icons --endif -- --ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) --libs:: -- $(INSTALL) $(DIST)/branding/default.xpm $(DIST)/bin/chrome/icons/default -- --install:: -- $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default.xpm $(DESTDIR)$(mozappdir)/chrome/icons/default --endif -- --export:: --ifndef MOZ_BRANDING_DIRECTORY -- $(NSINSTALL) -D $(DIST)/branding --ifeq ($(OS_ARCH),WINNT) -- cp $(srcdir)/sunbird.ico $(DIST)/branding/sunbird.ico -- cp $(srcdir)/sunbird.ico $(DIST)/branding/app.ico -- cp $(srcdir)/sunbird.ico $(DIST)/branding/document.ico --endif --ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) -- cp $(srcdir)/macbuild/sunbird.icns $(DIST)/branding/sunbird.icns -- cp $(srcdir)/macbuild/sb_ICS.icns $(DIST)/branding/sb_ICS.icns -- cp $(srcdir)/macbuild/dsstore $(DIST)/branding/dsstore -- cp $(srcdir)/macbuild/background.png $(DIST)/branding/background.png -- cp $(srcdir)/macbuild/disk.icns $(DIST)/branding/disk.icns --endif --ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) -- cp $(srcdir)/mozicon128.png $(DIST)/branding/mozicon128.png -- cp $(srcdir)/mozicon50.xpm $(DIST)/branding/mozicon50.xpm -- cp $(srcdir)/mozicon16.xpm $(DIST)/branding/mozicon16.xpm --endif --ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -- cp $(srcdir)/default.xpm $(DIST)/branding/default.xpm --endif --ifeq ($(OS_ARCH),OS2) -- cp $(srcdir)/sunbird-os2.ico $(DIST)/branding/sunbird.ico --endif -+ $(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(mozappdir)/chrome/icons/default - endif - - libs:: - touch $(DIST)/bin/.autoreg - - ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) - - APP_NAME = $(MOZ_APP_DISPLAYNAME) -diff --git a/calendar/sunbird/base/Makefile.in b/calendar/sunbird/base/Makefile.in ---- calendar/sunbird/base/Makefile.in -+++ calendar/sunbird/base/Makefile.in -@@ -58,15 +58,9 @@ DEFINES += \ - -DAPP_VERSION="$(APP_VERSION)" \ - -DTHEME=$(THEME) \ - $(NULL) - - ifdef MOZ_UPDATER - DEFINES += -DMOZ_UPDATER=1 - endif - --include $(topsrcdir)/config/config.mk -- - include $(topsrcdir)/config/rules.mk -- --ifndef MOZ_BRANDING_DIRECTORY --DEFINES += -DMOZ_USE_GENERIC_BRANDING --endif -diff --git a/calendar/sunbird/base/jar.mn b/calendar/sunbird/base/jar.mn ---- calendar/sunbird/base/jar.mn -+++ calendar/sunbird/base/jar.mn -@@ -13,16 +13,8 @@ sunbird.jar: - content/sunbird/calendar-offline.js (content/calendar-offline.js) - content/sunbird/credits.xhtml (content/credits.xhtml) - * content/sunbird/hiddenWindow.xul (content/hiddenWindow.xul) - * content/sunbird/hiddenWindow.js (content/hiddenWindow.js) - % skin sunbird classic/1.0 %skin/sunbird/ - skin/sunbird/calendar.css (themes/@THEME@/calendar.css) - skin/sunbird/toolbar.css (themes/@THEME@/toolbar.css) - skin/sunbird/offline-online.png (themes/@THEME@/offline-online.png) --#ifdef MOZ_USE_GENERIC_BRANDING --% content branding %content/branding/ -- content/branding/about.png (branding/about.png) -- content/branding/aboutCredits.png (branding/aboutCredits.png) -- content/branding/aboutFooter.png (branding/aboutFooter.png) -- content/branding/icon64.png (branding/icon64.png) -- content/branding/icon48.png (branding/icon48.png) --#endif -diff --git a/calendar/installer/windows/Header.bmp b/calendar/sunbird/branding/nightly/Header.bmp -rename from calendar/installer/windows/Header.bmp -rename to calendar/sunbird/branding/nightly/Header.bmp -diff --git a/calendar/sunbird/branding/nightly/Makefile.in b/calendar/sunbird/branding/nightly/Makefile.in -new file mode 100644 ---- /dev/null -+++ calendar/sunbird/branding/nightly/Makefile.in -@@ -0,0 +1,81 @@ -+# ***** BEGIN LICENSE BLOCK ***** -+# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+# -+# The contents of this file are subject to the Mozilla Public License Version -+# 1.1 (the "License"); you may not use this file except in compliance with -+# the License. You may obtain a copy of the License at -+# http://www.mozilla.org/MPL/ -+# -+# Software distributed under the License is distributed on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+# for the specific language governing rights and limitations under the -+# License. -+# -+# The Original Code is Mozilla Calendar code. -+# -+# The Initial Developer of the Original Code is -+# Philipp Kewisch -+# Portions created by the Initial Developer are Copyright (C) 2009 -+# the Initial Developer. All Rights Reserved. -+# -+# Contributor(s): -+# Brian Ryner -+# Matthew Willis -+# Robert Strong -+# -+# Alternatively, the contents of this file may be used under the terms of -+# either the GNU General Public License Version 2 or later (the "GPL"), or -+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+# in which case the provisions of the GPL or the LGPL are applicable instead -+# of those above. If you wish to allow use of your version of this file only -+# under the terms of either the GPL or the LGPL, and not to allow others to -+# use your version of this file under the terms of the MPL, indicate your -+# decision by deleting the provisions above and replace them with the notice -+# and other provisions required by the GPL or the LGPL. If you do not delete -+# the provisions above, a recipient may use your version of this file under -+# the terms of any one of the MPL, the GPL or the LGPL. -+# -+# ***** END LICENSE BLOCK ***** -+ -+DEPTH = ../../../.. -+topsrcdir = @top_srcdir@ -+srcdir = @srcdir@ -+VPATH = @srcdir@ -+relativesrcdir = calendar/sunbird/branding/sunbird/locales -+ -+include $(DEPTH)/config/autoconf.mk -+ -+DEFINES += -DAB_CD=$(AB_CD) -+ -+include $(topsrcdir)/config/rules.mk -+ -+export:: -+ $(NSINSTALL) -D $(DIST)/branding -+ifeq ($(OS_ARCH),WINNT) -+ cp $(srcdir)/sunbird.ico $(DIST)/branding/sunbird.ico -+ cp $(srcdir)/sunbird.ico $(DIST)/branding/app.ico -+ cp $(srcdir)/sunbird.ico $(DIST)/branding/document.ico -+ cp $(srcdir)/branding.nsi $(DIST)/branding/branding.nsi -+ cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp -+ cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp -+ cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp -+ cp $(srcdir)/license.txt $(DIST)/branding/license.txt -+ cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp -+ cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp -+endif -+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) -+ cp $(srcdir)/sunbird.icns $(DIST)/branding/sunbird.icns -+ cp $(srcdir)/sb_ICS.icns $(DIST)/branding/sb_ICS.icns -+ cp $(srcdir)/background.png $(DIST)/branding/background.png -+ cp $(srcdir)/dsstore $(DIST)/branding/dsstore -+ cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns -+endif -+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -+ cp $(srcdir)/mozicon128.png $(DIST)/branding/default128.png -+ cp $(srcdir)/mozicon50.xpm $(DIST)/branding/default50.xpm -+ cp $(srcdir)/mozicon16.xpm $(DIST)/branding/default16.xpm -+ cp $(srcdir)/default.xpm $(DIST)/branding/default.xpm -+endif -+ifeq ($(OS_ARCH),OS2) -+ cp $(srcdir)/sunbird-os2.ico $(DIST)/branding/sunbird.ico -+endif -diff --git a/calendar/installer/windows/Watermrk.bmp b/calendar/sunbird/branding/nightly/Watermrk.bmp -rename from calendar/installer/windows/Watermrk.bmp -rename to calendar/sunbird/branding/nightly/Watermrk.bmp -diff --git a/calendar/sunbird/app/macbuild/background.png b/calendar/sunbird/branding/nightly/background.png -rename from calendar/sunbird/app/macbuild/background.png -rename to calendar/sunbird/branding/nightly/background.png -diff --git a/calendar/installer/windows/nsis/branding.nsi b/calendar/sunbird/branding/nightly/branding.nsi -rename from calendar/installer/windows/nsis/branding.nsi -rename to calendar/sunbird/branding/nightly/branding.nsi -diff --git a/calendar/sunbird/base/branding/about.png b/calendar/sunbird/branding/nightly/content/about.png -rename from calendar/sunbird/base/branding/about.png -rename to calendar/sunbird/branding/nightly/content/about.png -diff --git a/calendar/sunbird/base/branding/aboutCredits.png b/calendar/sunbird/branding/nightly/content/aboutCredits.png -rename from calendar/sunbird/base/branding/aboutCredits.png -rename to calendar/sunbird/branding/nightly/content/aboutCredits.png -diff --git a/calendar/sunbird/base/branding/aboutFooter.png b/calendar/sunbird/branding/nightly/content/aboutFooter.png -rename from calendar/sunbird/base/branding/aboutFooter.png -rename to calendar/sunbird/branding/nightly/content/aboutFooter.png -diff --git a/calendar/sunbird/base/branding/icon48.png b/calendar/sunbird/branding/nightly/content/icon48.png -rename from calendar/sunbird/base/branding/icon48.png -rename to calendar/sunbird/branding/nightly/content/icon48.png -diff --git a/calendar/sunbird/base/branding/icon64.png b/calendar/sunbird/branding/nightly/content/icon64.png -rename from calendar/sunbird/base/branding/icon64.png -rename to calendar/sunbird/branding/nightly/content/icon64.png -diff --git a/calendar/sunbird/app/default.xpm b/calendar/sunbird/branding/nightly/default.xpm -rename from calendar/sunbird/app/default.xpm -rename to calendar/sunbird/branding/nightly/default.xpm -diff --git a/calendar/sunbird/app/macbuild/disk.icns b/calendar/sunbird/branding/nightly/disk.icns -rename from calendar/sunbird/app/macbuild/disk.icns -rename to calendar/sunbird/branding/nightly/disk.icns -diff --git a/calendar/sunbird/app/macbuild/dsstore b/calendar/sunbird/branding/nightly/dsstore -rename from calendar/sunbird/app/macbuild/dsstore -rename to calendar/sunbird/branding/nightly/dsstore -diff --git a/calendar/sunbird/branding/nightly/jar.mn b/calendar/sunbird/branding/nightly/jar.mn -new file mode 100644 ---- /dev/null -+++ calendar/sunbird/branding/nightly/jar.mn -@@ -0,0 +1,15 @@ -+#filter substitution -+ -+sunbird.jar: -+% content branding %content/branding/ -+ content/branding/about.png (content/about.png) -+ content/branding/aboutCredits.png (content/aboutCredits.png) -+ content/branding/aboutFooter.png (content/aboutFooter.png) -+ content/branding/icon64.png (content/icon64.png) -+ content/branding/icon48.png (content/icon48.png) -+ -+@AB_CD@.jar: -+% locale branding @AB_CD@ %locale/branding/ -+# Calendar branding only exists in en-US -+ locale/branding/brand.dtd (locales/en-US/brand.dtd) -+* locale/branding/brand.properties (locales/en-US/brand.properties) -diff --git a/calendar/installer/windows/license.txt b/calendar/sunbird/branding/nightly/license.txt -rename from calendar/installer/windows/license.txt -rename to calendar/sunbird/branding/nightly/license.txt -diff --git a/calendar/locales/en-US/chrome/branding/brand.dtd b/calendar/sunbird/branding/nightly/locales/en-US/brand.dtd -rename from calendar/locales/en-US/chrome/branding/brand.dtd -rename to calendar/sunbird/branding/nightly/locales/en-US/brand.dtd -diff --git a/calendar/locales/en-US/chrome/branding/brand.properties b/calendar/sunbird/branding/nightly/locales/en-US/brand.properties -rename from calendar/locales/en-US/chrome/branding/brand.properties -rename to calendar/sunbird/branding/nightly/locales/en-US/brand.properties -diff --git a/calendar/sunbird/app/mozicon128.png b/calendar/sunbird/branding/nightly/mozicon128.png -rename from calendar/sunbird/app/mozicon128.png -rename to calendar/sunbird/branding/nightly/mozicon128.png -diff --git a/calendar/sunbird/app/mozicon16.xpm b/calendar/sunbird/branding/nightly/mozicon16.xpm -rename from calendar/sunbird/app/mozicon16.xpm -rename to calendar/sunbird/branding/nightly/mozicon16.xpm -diff --git a/calendar/sunbird/app/mozicon50.xpm b/calendar/sunbird/branding/nightly/mozicon50.xpm -rename from calendar/sunbird/app/mozicon50.xpm -rename to calendar/sunbird/branding/nightly/mozicon50.xpm -diff --git a/calendar/sunbird/app/macbuild/sb_ICS.icns b/calendar/sunbird/branding/nightly/sb_ICS.icns -rename from calendar/sunbird/app/macbuild/sb_ICS.icns -rename to calendar/sunbird/branding/nightly/sb_ICS.icns -diff --git a/calendar/sunbird/app/sunbird-os2.ico b/calendar/sunbird/branding/nightly/sunbird-os2.ico -rename from calendar/sunbird/app/sunbird-os2.ico -rename to calendar/sunbird/branding/nightly/sunbird-os2.ico -diff --git a/calendar/sunbird/app/macbuild/sunbird.icns b/calendar/sunbird/branding/nightly/sunbird.icns -rename from calendar/sunbird/app/macbuild/sunbird.icns -rename to calendar/sunbird/branding/nightly/sunbird.icns -diff --git a/calendar/sunbird/app/sunbird.ico b/calendar/sunbird/branding/nightly/sunbird.ico -rename from calendar/sunbird/app/sunbird.ico -rename to calendar/sunbird/branding/nightly/sunbird.ico -diff --git a/calendar/installer/windows/wizHeader.bmp b/calendar/sunbird/branding/nightly/wizHeader.bmp -rename from calendar/installer/windows/wizHeader.bmp -rename to calendar/sunbird/branding/nightly/wizHeader.bmp -diff --git a/calendar/installer/windows/wizHeaderRTL.bmp b/calendar/sunbird/branding/nightly/wizHeaderRTL.bmp -rename from calendar/installer/windows/wizHeaderRTL.bmp -rename to calendar/sunbird/branding/nightly/wizHeaderRTL.bmp -diff --git a/calendar/installer/windows/wizWatermark.bmp b/calendar/sunbird/branding/nightly/wizWatermark.bmp -rename from calendar/installer/windows/wizWatermark.bmp -rename to calendar/sunbird/branding/nightly/wizWatermark.bmp -diff --git a/calendar/sunbird/locales/Makefile.in b/calendar/sunbird/locales/Makefile.in ---- calendar/sunbird/locales/Makefile.in -+++ calendar/sunbird/locales/Makefile.in -@@ -50,20 +50,16 @@ README_FILES= \ - - APP_VERSION = $(SUNBIRD_VERSION) - DEFINES += \ - -DAB_CD="$(AB_CD)" \ - -DLOCALE_SRCDIR=$(LOCALE_SRCDIR) \ - -DAPP_VERSION="$(APP_VERSION)" \ - $(NULL) - --ifndef MOZ_BRANDING_DIRECTORY --DEFINES += -DMOZ_USE_GENERIC_BRANDING --endif -- - include $(topsrcdir)/config/rules.mk - - libs:: $(addprefix $(LOCALE_SRCDIR)/,$(README_FILES)) - ifeq ($(OS_ARCH),WINNT) - $(EXIT_ON_ERROR) \ - for file in $^; do \ - $(PERL) -pe 's/(? $(FINAL_TARGET)/`basename $$file`; \ - done -diff --git a/calendar/sunbird/locales/jar.mn b/calendar/sunbird/locales/jar.mn ---- calendar/sunbird/locales/jar.mn -+++ calendar/sunbird/locales/jar.mn -@@ -1,17 +1,10 @@ - #filter substitution - --#ifdef MOZ_USE_GENERIC_BRANDING --@AB_CD@.jar: --% locale branding @AB_CD@ %locale/branding/ --+ locale/branding/brand.dtd (%chrome/branding/brand.dtd) --+ locale/branding/brand.properties (%chrome/branding/brand.properties) --#endif -- - sunbird-@AB_CD@.jar: - % locale sunbird @AB_CD@ %locale/@AB_CD@/sunbird/ - locale/@AB_CD@/sunbird/aboutDialog.dtd (%chrome/sunbird/aboutDialog.dtd) - locale/@AB_CD@/sunbird/menuOverlay.dtd (%chrome/sunbird/menuOverlay.dtd) - locale/@AB_CD@/sunbird/sunbird.dtd (%chrome/sunbird/sunbird.dtd) - - # Extra l10n files for documentation and such - #includesubst @LOCALE_SRCDIR@/extra-jar.mn -diff --git a/other-licenses/branding/sunbird/Makefile.in b/other-licenses/branding/sunbird/Makefile.in ---- other-licenses/branding/sunbird/Makefile.in -+++ other-licenses/branding/sunbird/Makefile.in -@@ -1,57 +1,84 @@ --# Branding Makefile --# - jars chrome artwork --# - copies artwork to appropriate places in objdir for bundling into app --# resources -+# ***** BEGIN LICENSE BLOCK ***** -+# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+# -+# The contents of this file are subject to the Mozilla Public License Version -+# 1.1 (the "License"); you may not use this file except in compliance with -+# the License. You may obtain a copy of the License at -+# http://www.mozilla.org/MPL/ -+# -+# Software distributed under the License is distributed on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+# for the specific language governing rights and limitations under the -+# License. -+# -+# The Original Code is Mozilla Calendar code. -+# -+# The Initial Developer of the Original Code is -+# Matthew Willis -+# Portions created by the Initial Developer are Copyright (C) 2006 -+# the Initial Developer. All Rights Reserved. -+# -+# Contributor(s): -+# Robert Strong -+# Philipp Kewisch -+# -+# Alternatively, the contents of this file may be used under the terms of -+# either the GNU General Public License Version 2 or later (the "GPL"), or -+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+# in which case the provisions of the GPL or the LGPL are applicable instead -+# of those above. If you wish to allow use of your version of this file only -+# under the terms of either the GPL or the LGPL, and not to allow others to -+# use your version of this file under the terms of the MPL, indicate your -+# decision by deleting the provisions above and replace them with the notice -+# and other provisions required by the GPL or the LGPL. If you do not delete -+# the provisions above, a recipient may use your version of this file under -+# the terms of any one of the MPL, the GPL or the LGPL. -+# -+# ***** END LICENSE BLOCK ***** - - DEPTH = ../../.. - topsrcdir = @top_srcdir@ - srcdir = @srcdir@ - VPATH = @srcdir@ -+relativesrcdir = other-licenses/branding/sunbird/locales - - include $(DEPTH)/config/autoconf.mk - --DIRS = \ -- content \ -- locales \ -- $(NULL) -+DEFINES += -DAB_CD=$(AB_CD) - - include $(topsrcdir)/config/rules.mk - --CALENDAR_APP_FILES = \ -- default.xpm \ -- mozicon128.png \ -- mozicon16.xpm \ -- mozicon50.xpm \ -- sunbird.ico \ -- $(NULL) -- - export:: - $(NSINSTALL) -D $(DIST)/branding -- cp $(addprefix $(srcdir)/, $(CALENDAR_APP_FILES)) $(DIST)/branding/ --ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) -- $(NSINSTALL) -D $(DIST)/install -- cp $(srcdir)/header.png $(DIST)/install/header.png -- cp $(srcdir)/watermark.png $(DIST)/install/watermark.png -+ifeq ($(OS_ARCH),WINNT) -+ cp $(srcdir)/sunbird.ico $(DIST)/branding/sunbird.ico -+ cp $(srcdir)/sunbird.ico $(DIST)/branding/app.ico -+ cp $(srcdir)/branding.nsi $(DIST)/branding/branding.nsi -+ cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp -+ cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp -+ cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp -+ cp $(srcdir)/license.txt $(DIST)/branding/license.txt -+ cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp -+ cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp - endif - ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) -- cp $(srcdir)/sunbird.icns $(DIST)/branding/sunbird.icns -- cp $(srcdir)/sb_ICS.icns $(DIST)/branding/sb_ICS.icns -- cp $(srcdir)/document.icns $(DIST)/branding/document.icns -- cp $(srcdir)/dsstore $(DIST)/branding/dsstore -- cp $(srcdir)/background.png $(DIST)/branding/background.png -- cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns -- cp $(srcdir)/license.r $(DIST)/branding/license.r -+ cp $(srcdir)/sunbird.icns $(DIST)/branding/sunbird.icns -+ cp $(srcdir)/sb_ICS.icns $(DIST)/branding/sb_ICS.icns -+ cp $(srcdir)/document.icns $(DIST)/branding/document.icns -+ cp $(srcdir)/dsstore $(DIST)/branding/dsstore -+ cp $(srcdir)/background.png $(DIST)/branding/background.png -+ cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns -+ cp $(srcdir)/license.r $(DIST)/branding/license.r - endif --ifeq ($(OS_ARCH),WINNT) -- cp $(srcdir)/sunbird.ico $(DIST)/branding/app.ico -- cp $(srcdir)/Header.bmp $(DIST)/branding/Header.bmp -- cp $(srcdir)/Watermrk.bmp $(DIST)/branding/Watermrk.bmp -- cp $(srcdir)/branding.nsi $(DIST)/branding/branding.nsi -- cp $(srcdir)/license.txt $(DIST)/branding/license.txt -- cp $(srcdir)/wizHeader.bmp $(DIST)/branding/wizHeader.bmp -- cp $(srcdir)/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp -- cp $(srcdir)/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp -+ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT))) -+ cp $(srcdir)/mozicon128.png $(DIST)/branding/default128.png -+ cp $(srcdir)/mozicon50.xpm $(DIST)/branding/default50.xpm -+ cp $(srcdir)/mozicon16.xpm $(DIST)/branding/default16.xpm -+ cp $(srcdir)/default.xpm $(DIST)/branding/default.xpm -+ $(NSINSTALL) -D $(DIST)/install -+ cp $(srcdir)/header.png $(DIST)/install/header.png -+ cp $(srcdir)/watermark.png $(DIST)/install/watermark.png - endif - ifeq ($(OS_ARCH),OS2) -- cp $(srcdir)/sunbird-os2.ico $(DIST)/branding/sunbird.ico -+ cp $(srcdir)/sunbird-os2.ico $(DIST)/branding/sunbird.ico - endif -diff --git a/other-licenses/branding/sunbird/content/Makefile.in b/other-licenses/branding/sunbird/content/Makefile.in -deleted file mode 100644 ---- other-licenses/branding/sunbird/content/Makefile.in -+++ /dev/null -@@ -1,11 +0,0 @@ --# Branding Makefile --# - jars chrome artwork -- --DEPTH = ../../../.. --topsrcdir = @top_srcdir@ --srcdir = @srcdir@ --VPATH = @srcdir@ -- --include $(DEPTH)/config/autoconf.mk -- --include $(topsrcdir)/config/rules.mk -diff --git a/other-licenses/branding/sunbird/content/jar.mn b/other-licenses/branding/sunbird/content/jar.mn -deleted file mode 100644 ---- other-licenses/branding/sunbird/content/jar.mn -+++ /dev/null -@@ -1,7 +0,0 @@ --calendar.jar: --% content branding %content/branding/ xpcnativewrappers=yes -- content/branding/about.png (about.png) -- content/branding/aboutCredits.png (aboutCredits.png) -- content/branding/aboutFooter.png (aboutFooter.png) -- content/branding/icon64.png (icon64.png) -- content/branding/icon48.png (icon48.png) -diff --git a/other-licenses/branding/sunbird/jar.mn b/other-licenses/branding/sunbird/jar.mn -new file mode 100644 ---- /dev/null -+++ other-licenses/branding/sunbird/jar.mn -@@ -0,0 +1,14 @@ -+#filter substitution -+ -+calendar.jar: -+% content branding %content/branding/ xpcnativewrappers=yes -+ content/branding/about.png (content/about.png) -+ content/branding/aboutCredits.png (content/aboutCredits.png) -+ content/branding/aboutFooter.png (content/aboutFooter.png) -+ content/branding/icon64.png (content/icon64.png) -+ content/branding/icon48.png (content/icon48.png) -+ -+@AB_CD@.jar: -+% locale branding @AB_CD@ %locale/branding/ -+ locale/branding/brand.dtd (locales/en-US/brand.dtd) -+ locale/branding/brand.properties (locales/en-US/brand.properties) -diff --git a/other-licenses/branding/sunbird/locales/Makefile.in b/other-licenses/branding/sunbird/locales/Makefile.in -deleted file mode 100644 ---- other-licenses/branding/sunbird/locales/Makefile.in -+++ /dev/null -@@ -1,48 +0,0 @@ --# ***** BEGIN LICENSE BLOCK ***** --# Version: MPL 1.1/GPL 2.0/LGPL 2.1 --# --# The contents of this file are subject to the Mozilla Public License Version --# 1.1 (the "License"); you may not use this file except in compliance with --# the License. You may obtain a copy of the License at --# http://www.mozilla.org/MPL/ --# --# Software distributed under the License is distributed on an "AS IS" basis, --# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License --# for the specific language governing rights and limitations under the --# License. --# --# The Original Code is the Mozilla Browser code. --# --# The Initial Developer of the Original Code is --# Benjamin Smedberg --# Portions created by the Initial Developer are Copyright (C) 2004 --# the Initial Developer. All Rights Reserved. --# --# Contributor(s): --# --# Alternatively, the contents of this file may be used under the terms of --# either the GNU General Public License Version 2 or later (the "GPL"), or --# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), --# in which case the provisions of the GPL or the LGPL are applicable instead --# of those above. If you wish to allow use of your version of this file only --# under the terms of either the GPL or the LGPL, and not to allow others to --# use your version of this file under the terms of the MPL, indicate your --# decision by deleting the provisions above and replace them with the notice --# and other provisions required by the GPL or the LGPL. If you do not delete --# the provisions above, a recipient may use your version of this file under --# the terms of any one of the MPL, the GPL or the LGPL. --# --# ***** END LICENSE BLOCK ***** -- --DEPTH = ../../../.. --topsrcdir = @top_srcdir@ --srcdir = @srcdir@ --VPATH = @srcdir@ --relativesrcdir = other-licenses/branding/sunbird/locales -- --include $(DEPTH)/config/autoconf.mk -- --DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID) -- --include $(topsrcdir)/config/rules.mk -- -diff --git a/other-licenses/branding/sunbird/locales/jar.mn b/other-licenses/branding/sunbird/locales/jar.mn -deleted file mode 100644 ---- other-licenses/branding/sunbird/locales/jar.mn -+++ /dev/null -@@ -1,6 +0,0 @@ --#filter substitution -- --@AB_CD@.jar: --% locale branding @AB_CD@ %locale/branding/ -- locale/branding/brand.dtd (%brand.dtd) -- locale/branding/brand.properties (%brand.properties) Index: files/patch-mozilla-js-src-config-config.mk =================================================================== RCS file: files/patch-mozilla-js-src-config-config.mk diff -N files/patch-mozilla-js-src-config-config.mk --- files/patch-mozilla-js-src-config-config.mk 3 Aug 2010 20:35:04 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- mozilla/js/src/config/config.mk.orgi 2009-04-21 15:12:51.000000000 +0200 -+++ mozilla/js/src/config/config.mk 2009-04-21 15:15:37.000000000 +0200 -@@ -490,7 +490,7 @@ - INCLUDES = $(LOCAL_INCLUDES) $(REQ_INCLUDES) $(REQ_INCLUDES_SDK) -I$(PUBLIC) $(OS_INCLUDES) - - ifndef MOZILLA_INTERNAL_API --INCLUDES += -I$(LIBXUL_DIST)/sdk/include -+INCLUDES += -I$(LIBXUL_DIST)/sdk/include -I%%LOCALBASE%%/include - endif - - include $(topsrcdir)/config/static-checking-config.mk Index: files/patch-mozilla-js-src-jslock.cpp =================================================================== RCS file: /var/fcvs/ports/deskutils/lightning/files/patch-mozilla-js-src-jslock.cpp,v retrieving revision 1.1 diff -u -r1.1 patch-mozilla-js-src-jslock.cpp --- files/patch-mozilla-js-src-jslock.cpp 3 Aug 2010 20:35:04 -0000 1.1 +++ files/patch-mozilla-js-src-jslock.cpp 4 Sep 2010 21:18:21 -0000 @@ -1,25 +1,11 @@ --- mozilla/js/src/jslock.cpp.orig 2010-01-23 15:40:12.000000000 +0100 +++ mozilla/js/src/jslock.cpp 2010-01-23 15:45:20.000000000 +0100 -@@ -133,7 +133,7 @@ - return (int)res; - } - --#elif defined(SOLARIS) && defined(sparc) && defined(ULTRA_SPARC) -+#elif defined(__sparc) - - static JS_ALWAYS_INLINE int - NativeCompareAndSwap(jsword *w, jsword ov, jsword nv) -@@ -142,13 +142,18 @@ +@@ -160,8 +160,13 @@ unsigned int res; - JS_ASSERT(ov != nv); - asm volatile ("\ --stbar\n\ --cas [%1],%2,%3\n\ --cmp %2,%3\n\ --be,a 1f\n\ --mov 1,%0\n\ --mov 0,%0\n\ --1:" + + __asm__ __volatile__ ( +- "stbar\n" +- "cas [%1],%2,%3\n" + membar #StoreLoad | #LoadLoad\n" +# if defined (__sparc64__) + "casx [%1],%2,%3\n" @@ -27,11 +13,6 @@ + "cas [%1],%2,%3\n" /* 32-bit version */ +# endif + "membar #StoreLoad | #LoadLoad\n" -+ "cmp %2,%3\n" -+ "be,a 1f\n" -+ "mov 1,%0\n" -+ "mov 0,%0\n" -+ "1:" - : "=r" (res) - : "r" (w), "r" (ov), "r" (nv)); - return (int)res; + "cmp %2,%3\n" + "be,a 1f\n" + "mov 1,%0\n" Index: files/patch-mozilla-toolkit-mozapps-update-src-updater-updater.cpp =================================================================== RCS file: files/patch-mozilla-toolkit-mozapps-update-src-updater-updater.cpp diff -N files/patch-mozilla-toolkit-mozapps-update-src-updater-updater.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-mozilla-toolkit-mozapps-update-src-updater-updater.cpp 4 Sep 2010 21:19:05 -0000 @@ -0,0 +1,22 @@ +$FreeBSD$ + +--- mozilla/toolkit/mozapps/update/src/updater/updater.cpp.orig 2010-09-04 12:40:45.000000000 -0700 ++++ mozilla/toolkit/mozapps/update/src/updater/updater.cpp 2010-09-04 12:42:39.000000000 -0700 +@@ -550,7 +550,7 @@ + struct stat ss; + + AutoFile sfile = NS_tfopen(spath, NS_T("rb")); +- if (sfile == NULL || fstat(fileno(sfile), &ss)) { ++ if (sfile.get() == NULL || fstat(fileno(sfile.get()), &ss)) { + LOG(("copy_file: failed to open or stat: %p," LOG_S ",%d\n", sfile.get(), spath, errno)); + return READ_ERROR; + } +@@ -1792,7 +1792,7 @@ + return READ_ERROR; + + struct stat ms; +- rv = fstat(fileno(mfile), &ms); ++ rv = fstat(fileno(mfile.get()), &ms); + if (rv) + return READ_ERROR; + Index: files/patch-mozilla-xpcom_reflect_xptcall_src_md_unix_Makefile.in =================================================================== RCS file: /var/fcvs/ports/deskutils/lightning/files/patch-mozilla-xpcom_reflect_xptcall_src_md_unix_Makefile.in,v retrieving revision 1.1 diff -u -r1.1 patch-mozilla-xpcom_reflect_xptcall_src_md_unix_Makefile.in --- files/patch-mozilla-xpcom_reflect_xptcall_src_md_unix_Makefile.in 3 Aug 2010 20:35:04 -0000 1.1 +++ files/patch-mozilla-xpcom_reflect_xptcall_src_md_unix_Makefile.in 4 Sep 2010 21:18:21 -0000 @@ -1,16 +1,6 @@ --- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2009-12-03 08:19:56.000000000 +0100 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2010-01-22 10:43:23.000000000 +0100 -@@ -71,6 +71,9 @@ - DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED - endif - endif -+ifeq (x86_64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -87,7 +90,7 @@ +@@ -96,7 +96,7 @@ endif endif # IA64 Linux @@ -19,20 +9,7 @@ ifneq (,$(findstring ia64,$(OS_TEST))) CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -100,6 +103,12 @@ - CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp - endif - # -+# FreeBSD/amd64 -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) -+CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp -+endif -+# - # BeOS/Intel (uses the same unixish_x86 code) - # - ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC) -@@ -150,9 +159,15 @@ +@@ -165,9 +165,15 @@ ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s endif # @@ -49,7 +26,7 @@ CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp endif # -@@ -307,7 +322,7 @@ +@@ -322,7 +328,7 @@ # # Linux/PPC # @@ -58,7 +35,7 @@ CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s AS := $(CC) -c -x assembler-with-cpp -@@ -385,6 +400,15 @@ +@@ -400,6 +406,15 @@ ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s endif # Index: files/patch-security_coreconf_FreeBSD.mk =================================================================== RCS file: /var/fcvs/ports/deskutils/lightning/files/patch-security_coreconf_FreeBSD.mk,v retrieving revision 1.3 diff -u -r1.3 patch-security_coreconf_FreeBSD.mk --- files/patch-security_coreconf_FreeBSD.mk 3 Aug 2010 20:35:04 -0000 1.3 +++ files/patch-security_coreconf_FreeBSD.mk 4 Sep 2010 21:18:21 -0000 @@ -1,6 +1,6 @@ --- mozilla/security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 +++ mozilla/security/coreconf/FreeBSD.mk Thu Jul 8 12:56:24 2004 -@@ -35,16 +35,18 @@ +@@ -37,9 +37,7 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk @@ -10,19 +10,17 @@ +CCC = ${CXX} RANLIB = ranlib - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 -+else + CPU_ARCH = $(OS_TEST) +@@ -50,7 +48,7 @@ CPU_ARCH = x86 endif -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK + ifeq ($(CPU_ARCH),amd64) +-CPU_ARCH = x86_64 ++CPU_ARCH = amd64 + endif -@@ -71,7 +73,11 @@ + OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK +@@ -78,7 +76,11 @@ DLL_SUFFIX = so.1.0 endif @@ -33,5 +31,5 @@ +MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ +endif ifdef MAPFILE - # Add LD options to restrict exported symbols to those in the map file + MKSHLIB += -Wl,--version-script,$(MAPFILE) endif Index: files/patch-sysnss =================================================================== RCS file: /var/fcvs/ports/deskutils/lightning/files/patch-sysnss,v retrieving revision 1.6 diff -u -r1.6 patch-sysnss --- files/patch-sysnss 3 Aug 2010 20:35:04 -0000 1.6 +++ files/patch-sysnss 4 Sep 2010 21:18:21 -0000 @@ -42,41 +42,41 @@ ifndef NSS_DISABLE_DBM NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX) NSSDBM3_CHK = $(DLL_PREFIX)nssdbm3.chk -@@ -255,13 +244,6 @@ +@@ -292,13 +281,6 @@ .nss.cleaned: .nss.checkout ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean +- $(NSSMAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean +- $(NSSMAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean -ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean +- $(NSSMAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean +- $(NSSMAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean -endif - touch $@ endif GARBAGE += .nss.cleaned -@@ -280,78 +262,6 @@ +@@ -317,76 +299,6 @@ endif libs:: -ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) +- $(NSSMAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) -ifndef NSS_DISABLE_DBM -- $(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS) +- $(NSSMAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS) -endif -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) +- $(NSSMAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) -ifdef ENABLE_TESTS - # Need certutil binary for mochitest certificates generation -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/certutil $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/pk12util $(DEFAULT_GMAKE_FLAGS) +- $(NSSMAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) +- $(NSSMAKE) -C $(topsrcdir)/security/nss/cmd/certutil $(DEFAULT_GMAKE_FLAGS) +- $(NSSMAKE) -C $(topsrcdir)/security/nss/cmd/pk12util $(DEFAULT_GMAKE_FLAGS) -endif -ifndef SKIP_CHK -ifndef ENABLE_TESTS # Just avoid secondary compile -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) +- $(NSSMAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -endif -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) +- $(NSSMAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) -endif - $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin -ifndef SKIP_CHK @@ -127,15 +127,13 @@ -# NSS installs headers to dist/public and we want them in dist/include - $(NSINSTALL) -D $(DIST)/include/nss - (cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \ -- (cd $(DIST)/include/nss && tar -xf -) -- (cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \ -- (cd $(DIST)/sdk/include && tar -xf -) +- (cd $(DIST)/include && tar -xf -) -endif - $(MAKE) -C boot $@ $(MAKE) -C ssl $@ $(MAKE) -C locales $@ ifdef MOZ_XUL -@@ -362,50 +272,6 @@ +@@ -397,50 +309,6 @@ $(MAKE) -C ssl $@ install:: @@ -186,15 +184,15 @@ $(MAKE) -C ssl $@ $(MAKE) -C locales $@ ifdef MOZ_XUL -@@ -420,12 +286,6 @@ +@@ -455,12 +323,6 @@ $(MAKE) -C pki $@ endif ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean +- $(NSSMAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean +- $(NSSMAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean -ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean +- $(NSSMAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean +- $(NSSMAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean -endif endif --- lightning-1.0.patch ends here --- From owner-freebsd-gecko@FreeBSD.ORG Sat Sep 4 22:10:17 2010 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 07BF410656C7; Sat, 4 Sep 2010 22:10:17 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D273C8FC08; Sat, 4 Sep 2010 22:10:16 +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 o84MAGa9041508; Sat, 4 Sep 2010 22:10:16 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o84MAGum041500; Sat, 4 Sep 2010 22:10:16 GMT (envelope-from edwin) Date: Sat, 4 Sep 2010 22:10:16 GMT Message-Id: <201009042210.o84MAGum041500@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gecko@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/150288: [PATCH] deskutils/lightning: Update to 1.0 beta 2 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: Sat, 04 Sep 2010 22:10:17 -0000 Synopsis: [PATCH] deskutils/lightning: Update to 1.0 beta 2 Responsible-Changed-From-To: freebsd-ports-bugs->gecko Responsible-Changed-By: edwin Responsible-Changed-When: Sat Sep 4 22:10:16 UTC 2010 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=150288