author: Beat Gaetzi <beat@FreeBSD.org> 2010-08-03 20:35:04 +0000
committer: Beat Gaetzi <beat@FreeBSD.org> 2010-08-03 20:35:04 +0000
commit: db20b8b870612dbf1301c70f834c70586bbbf6af (patch)
tree: 25ad1261911879f7d18dc1bf09eb454a2b96b06c /deskutils
parent: 2b03dc0f4df6ad68e8ed235aa148a43042764a95 (diff)
download: ports-db20b8b870612dbf1301c70f834c70586bbbf6af.tar.gz
ports-db20b8b870612dbf1301c70f834c70586bbbf6af.zip
76 files changed, 2506 insertions, 1232 deletions
diff --git a/deskutils/lightning-thunderbird/Makefile b/deskutils/lightning-thunderbird/Makefile
index 6c6cd6b94491..c739addd89fe 100644
--- a/deskutils/lightning-thunderbird/Makefile
+++ b/deskutils/lightning-thunderbird/Makefile
@@ -3,76 +3,117 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/sunbird/Makefile,v 1.19 2006/10/13 04:40:20 ahze Exp $
 #
 
-PORTNAME=	sunbird
-PORTVERSION=	0.9
-PORTREVISION=	3
-PORTEPOCH=	1
+PORTNAME=	lightning
+DISTVERSION=	1.0
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR=	calendar/sunbird/releases/${DISTVERSION}/source
-DISTNAME=	lightning-${PORTNAME}-${DISTVERSION}-source
+MASTER_SITE_SUBDIR=	calendar/${PORTNAME}/releases/${DISTVERSION}b1/source
+DISTNAME=	${PORTNAME}-sunbird-${DISTVERSION}b1.source
 
 MAINTAINER=	gecko@FreeBSD.org
-COMMENT=	Redesign of the Mozilla Calendar with XUL interface
+COMMENT=	An integrated calendar for Thunderbird and SeaMonkey
 
-USE_AUTOTOOLS=	libtool:22
+OPTIONS+=	THUNDERBIRD "Install Thunderbird 3.0" on \
+		SEAMONKEY "Install SeaMonkey 2.0" off
+
+USE_AUTOTOOLS=	autoconf:213 libtool:22
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
+MAKE_ENV=		PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GECKO=	gecko
+MAKE_JOBS_SAFE=	yes
 WANT_GNOME=	yes
 WANT_PERL=	yes
-SUNBIRD=	${PORTNAME}
-SUNBIRD_ICON_SRC=	${PREFIX}/lib/sunbird/chrome/icons/default/default.xpm
-SUNBIRD_ICON=		${PORTNAME}.xpm
+USE_MOZILLA=	-png -dbm -jpeg -xft
+MOZ_TOOLKIT=	cairo-gtk2
 LIBS=		-Wl,-Bsymbolic -lc
 MOZ_PKGCONFIG_FILES=	${PORTNAME}-js ${PORTNAME}-xpcom ${PORTNAME}-plugin
 PKGCONFIG_FILES=	${MOZ_PKG_CONFIG_FILES}
 MOZ_OPTIONS=	--enable-application=calendar \
 		--enable-system-cairo \
-		--with-system-nss \
 		--enable-canvas
 MOZ_MK_OPTIONS=	MOZ_CO_PROJECT=calendar
-
-GECKO_PLIST_PRE_FILES=	lib/sunbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest \
-			lib/sunbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest
+NOGECKO_PLIST=		yes
+NOGECKO_INSTALL=	yes
 
 .include <bsd.init.mk>
 .include <bsd.libnames.mk>
 .include <bsd.port.pre.mk>
 
-.if ${ARCH}=="sparc64"
-BROKEN=		does not build
+.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}-${GECKO}-freebsd${OSVERSION:C/([0-9]).+/\1/}-${ARCH}.xpi
+PLIST_FILES=	%%DATADIR%%/${XPI_FILE}
+PLIST_DIRS=	%%DATADIR%%
+
+WRKSRC=		${WRKDIR}/comm-1.9.1
+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
+
+GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
+
+.if defined(WITHOUT_DBUS)
+MOZ_OPTIONS+=	--disable-dbus
+.else
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 .endif
 
 post-patch:
-	@${SED} -e 's|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \
-		${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+		${MOZSRC}/storage/build/Makefile.in \
+		${MOZSRC}/db/sqlite3/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/security/manager/ssl/src/Makefile.in
+		${MOZSRC}/security/manager/ssl/src/Makefile.in \
+		${MOZSRC}/js/src/config/mkdepend/Makefile.in \
+		${MOZSRC}/js/src/config/config.mk
 	@${REINPLACE_CMD} -e 's|%%LIB_BZ2%%|${LIBBZ2}|' \
-		${WRKSRC}/toolkit/mozapps/update/src/updater/Makefile.in
+		${MOZSRC}/toolkit/mozapps/update/src/updater/Makefile.in
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
+		s|-lpthread|${PTHREAD_LIBS}|g ; \
+		s|echo aout|echo elf|g ; \
+		s|/usr/X11R6|${LOCALBASE}|g' \
+		${MOZSRC}/js/src/configure \
+		${MOZSRC}/configure
 
-post-build:
-	@(cd ${WRKSRC}/xpfe/components/autocomplete/src && ${GMAKE})
+pre-configure:
+	(cd ${WRKSRC} && ${AUTOCONF})
+	(cd ${MOZSRC} && ${AUTOCONF})
+	(cd ${MOZSRC}/js/src/ && ${AUTOCONF})
 
-pre-install:
-	${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST}
-	${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST}
-	${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST}
-	${ECHO_CMD} '@dirrmtry lib/sunbird/plugins' >> ${PLIST}
-	${ECHO_CMD} '@dirrmtry lib/sunbird' >> ${PLIST}
+# 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})
 
 do-install:
-	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKDIR}/sunbird.desktop ${PREFIX}/share/applications
-	${LN} -sf ${SUNBIRD_ICON_SRC} ${PREFIX}/share/pixmaps/${SUNBIRD_ICON}
-	${TOUCH} ${PREFIX}/lib/sunbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
-	${TOUCH} ${PREFIX}/lib/sunbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${MOZSRC}/dist/xpi-stage/${PORTNAME}.xpi ${DATADIR}/${XPI_FILE}
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/lightning-thunderbird/distinfo b/deskutils/lightning-thunderbird/distinfo
index cc32fcdad0b5..66ec20de8dc2 100644
--- a/deskutils/lightning-thunderbird/distinfo
+++ b/deskutils/lightning-thunderbird/distinfo
@@ -1,3 +1,3 @@
-MD5 (lightning-sunbird-0.9-source.tar.bz2) = 7757ffefd4a30bcc1497b93b3dc6c0ce
-SHA256 (lightning-sunbird-0.9-source.tar.bz2) = 329b256bd463a76527c255cd5b8141ffb6df077ce8d63efdffad6516f0b90f64
-SIZE (lightning-sunbird-0.9-source.tar.bz2) = 43121977
+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
diff --git a/deskutils/lightning-thunderbird/files/liboggplay_oss b/deskutils/lightning-thunderbird/files/liboggplay_oss
new file mode 100644
index 000000000000..e43b0725eea2
--- /dev/null
+++ b/deskutils/lightning-thunderbird/files/liboggplay_oss
@@ -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 \
diff --git a/deskutils/lightning-thunderbird/files/patch-Makefile.in b/deskutils/lightning-thunderbird/files/patch-Makefile.in
deleted file mode 100644
index 5b087403b086..000000000000
--- a/deskutils/lightning-thunderbird/files/patch-Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.in.orig	Mon Jul  2 06:19:35 2007
-+++ Makefile.in	Mon Jul  2 06:19:47 2007
-@@ -91,7 +91,6 @@
- #
- # tier 1 -  3rd party individual libraries
- #
--tier_1_dirs	+= dbm
- 
- ifndef MOZ_NATIVE_JPEG
- tier_1_dirs	+= jpeg
-@@ -107,7 +106,6 @@
- endif
- 
- ifdef MOZ_UPDATER
--tier_1_dirs += modules/libbz2
- tier_1_dirs += modules/libmar
- endif
- 
diff --git a/deskutils/lightning-thunderbird/files/patch-bug533070 b/deskutils/lightning-thunderbird/files/patch-bug533070
new file mode 100644
index 000000000000..8f0e54b78528
--- /dev/null
+++ b/deskutils/lightning-thunderbird/files/patch-bug533070
@@ -0,0 +1,729 @@
+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 <mozilla@songbirdnest.com>
+ #
+ # Portions created by the Initial Developer are Copyright (C) 2007
+ # the Initial Developer. All Rights Reserved.
+ #
+ # Contributor(s):
+-#   - Simon Paquet <bugzilla@babylonsounds.com>
++#   Simon Paquet <bugzilla@babylonsounds.com>
++#   Philipp Kewisch <mozilla@kewis.ch>
+ #
+ # 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 <mozilla@kewis.ch>
++# Portions created by the Initial Developer are Copyright (C) 2009
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#   Brian Ryner <bryner@brianryner.com>
++#   Matthew Willis <lilmatt@mozilla.com>
++#   Robert Strong <robert.bugzilla@gmail.com>
++#
++# 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/(?<!\r)\n/\r\n/g;' < $$file > $(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 <lilmatt@mozilla.com>
++# Portions created by the Initial Developer are Copyright (C) 2006
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#   Robert Strong <robert.bugzilla@gmail.com>
++#   Philipp Kewisch <mozilla@kewis.ch>
++#
++# 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 <benjamin@smedbergs.us>
+-# 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)
diff --git a/deskutils/lightning-thunderbird/files/patch-bugzilla149334 b/deskutils/lightning-thunderbird/files/patch-bugzilla149334
deleted file mode 100644
index 4bdb765228eb..000000000000
--- a/deskutils/lightning-thunderbird/files/patch-bugzilla149334
+++ /dev/null
@@ -1,328 +0,0 @@
-Index: gfx/idl/nsIFreeType2.idl
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v
-retrieving revision 1.10
-diff -u -3 -p -r1.10 nsIFreeType2.idl
---- gfx/idl/nsIFreeType2.idl	15 Apr 2004 23:30:02 -0000	1.10
-+++ gfx/idl/nsIFreeType2.idl	26 May 2004 10:00:54 -0000
-@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer);
- native FT_Sfnt_Tag(FT_Sfnt_Tag);
- native FT_Size(FT_Size);
- 
--[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
-+[ptr] native FTC_ImageType_p(FTC_ImageType);
- native FTC_Face_Requester(FTC_Face_Requester);
- native FTC_Font(FTC_Font);
--native FTC_Image_Cache(FTC_Image_Cache);
-+native FTC_FaceID(FTC_FaceID);
-+native FTC_ImageCache(FTC_ImageCache);
- native FTC_Manager(FTC_Manager);
- 
- // #ifdef MOZ_SVG
-@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports
- 
-     readonly attribute FT_Library library;
-     readonly attribute FTC_Manager FTCacheManager;
--    readonly attribute FTC_Image_Cache ImageCache;
-+    readonly attribute FTC_ImageCache ImageCache;
- 
-     void    doneFace(in FT_Face face);
-     void    doneFreeType(in FT_Library lib);
-@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports
-     void    outlineDecompose(in FT_Outline_p outline,
-                              in const_FT_Outline_Funcs_p funcs, in voidPtr p);
-     void    setCharmap(in FT_Face face, in FT_CharMap charmap);
--    void    imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
-+    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
-                              in FT_UInt gindex, out FT_Glyph glyph);
--    void    managerLookupSize(in FTC_Manager manager, in FTC_Font font,
--                              out FT_Face face, out FT_Size size);
-+    void    managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
-+                              out FT_Face face);
-     void    managerDone(in FTC_Manager manager);
-     void    managerNew(in FT_Library lib, in FT_UInt max_faces,
-                        in FT_UInt max_sizes, in FT_ULong max_bytes,
-                        in FTC_Face_Requester requester, in FT_Pointer req_data,
-                        out FTC_Manager manager);
--    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
-+    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
- /* #ifdef MOZ_SVG */
-     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
-                         in FT_Vector_p delta);
-Index: gfx/src/freetype/nsFreeType.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v
-retrieving revision 1.25
-diff -u -3 -p -r1.25 nsFreeType.cpp
---- gfx/src/freetype/nsFreeType.cpp	17 Apr 2004 21:52:29 -0000	1.25
-+++ gfx/src/freetype/nsFreeType.cpp	26 May 2004 10:00:54 -0000
-@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = {
-   {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
-   {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
-   {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
--  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
--  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
-+  {"FTC_ImageCache_Lookup",   NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
-+  {"FTC_Manager_LookupFace",  NS_FT2_OFFSET(nsFTC_Manager_LookupFace),  PR_TRUE},
-   {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
-   {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
--  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
-+  {"FTC_ImageCache_New",      NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
- // #ifdef MOZ_SVG
-   {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
-   {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
-@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
-+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
-                               FT_UInt glyphID, FT_Glyph *glyph)
- { 
-   // call the FreeType2 function via the function pointer
-@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
--                               FT_Face *face, FT_Size *size)
-+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
-+                               FT_Face *face)
- { 
-   // call the FreeType2 function via the function pointer
--  FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
-+  FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
-   return error ? NS_ERROR_FAILURE : NS_OK;
- } 
-  
-@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
-+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
- { 
-   // call the FreeType2 function via the function pointer
-   FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
-+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
- {
-   *aCache = mImageCache;
-   return NS_OK;
-Index: gfx/src/freetype/nsFreeType.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v
-retrieving revision 1.17
-diff -u -3 -p -r1.17 nsFreeType.h
---- gfx/src/freetype/nsFreeType.h	17 Apr 2004 21:52:29 -0000	1.17
-+++ gfx/src/freetype/nsFreeType.h	26 May 2004 10:00:54 -0000
-@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_
- typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
- typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
- typedef FT_Error (*FTC_Image_Cache_Lookup_t)
--                      (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
--typedef FT_Error (*FTC_Manager_Lookup_Size_t)
--                      (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
-+                      (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
-+typedef FT_Error (*FTC_Manager_LookupFace_t)
-+                      (FTC_Manager, FTC_FaceID, FT_Face*);
- typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
- typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
-                        FTC_Face_Requester, FT_Pointer, FTC_Manager*);
--typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
-+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
- // #ifdef MOZ_SVG
- typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
- typedef FT_Error (*FT_Get_Kerning_t)
-@@ -181,7 +181,7 @@ protected:
-   FT_Outline_Decompose_t    nsFT_Outline_Decompose;
-   FT_Set_Charmap_t          nsFT_Set_Charmap;
-   FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
--  FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
-+  FTC_Manager_LookupFace_t  nsFTC_Manager_LookupFace;
-   FTC_Manager_Done_t        nsFTC_Manager_Done;
-   FTC_Manager_New_t         nsFTC_Manager_New;
-   FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
-@@ -229,7 +229,7 @@ protected:
-   PRLibrary      *mSharedLib;
-   FT_Library      mFreeTypeLibrary;
-   FTC_Manager     mFTCacheManager;
--  FTC_Image_Cache mImageCache;
-+  FTC_ImageCache  mImageCache;
- 
-   static nsHashtable   *sFontFamilies;
-   static nsHashtable   *sRange1CharSetNames;
-Index: gfx/src/ps/nsFontMetricsPS.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v
-retrieving revision 1.43
-diff -u -3 -p -r1.43 nsFontMetricsPS.cpp
---- gfx/src/ps/nsFontMetricsPS.cpp	17 Apr 2004 21:52:31 -0000	1.43
-+++ gfx/src/ps/nsFontMetricsPS.cpp	26 May 2004 10:01:03 -0000
-@@ -1140,10 +1140,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
-   
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
- 
--  mImageDesc.font.face_id    = (void*)mEntry;
--  mImageDesc.font.pix_width  = mPixelSize;
--  mImageDesc.font.pix_height = mPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-+  mImageDesc->width  = mPixelSize;
-+  mImageDesc->height = mPixelSize;
-+  mImageDesc->flags = 0;
- 
-   nsresult rv;
-   mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1189,7 +1189,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache iCache;
-+  FTC_ImageCache iCache;
-   nsresult rv = mFt2->GetImageCache(&iCache);
-   if (NS_FAILED(rv)) {
-     NS_ERROR("Failed to get Image Cache");
-@@ -1227,8 +1227,8 @@ nsFontPSFreeType::getFTFace()
-   
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   NS_ASSERTION(rv==0, "failed to get face/size");
-   if (rv)
-     return nsnull;
-@@ -1621,16 +1621,16 @@ void nsFT2Type8Generator::GeneratePSFont
-   mEntry->GetFamilyName(fontName);
-   mEntry->GetStyleName(styleName);
-   
--  mImageDesc.font.face_id    = (void*)mEntry;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-   // TT glyph has no relation to size
--  mImageDesc.font.pix_width  = 16;
--  mImageDesc.font.pix_height = 16;
--  mImageDesc.image_type = 0;
-+  mImageDesc->width  = 16;
-+  mImageDesc->height = 16;
-+  mImageDesc->flags = 0;
-   FT_Face face = nsnull;
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   if (NS_FAILED(rv))
-     return;
-  
-Index: gfx/src/x11shared/nsFontFreeType.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v
-retrieving revision 1.14
-diff -u -3 -p -r1.14 nsFontFreeType.cpp
---- gfx/src/x11shared/nsFontFreeType.cpp	17 Apr 2004 21:52:34 -0000	1.14
-+++ gfx/src/x11shared/nsFontFreeType.cpp	26 May 2004 10:01:03 -0000
-@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace()
-   FTC_Manager mgr;
-   nsresult rv;
-   mFt2->GetFTCacheManager(&mgr);
--  rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
-+  rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
-   NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
-   if (NS_FAILED(rv))
-     return nsnull;
-@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
-   PRBool embedded_bimap = PR_FALSE;
-   mFaceID = aFaceID;
-   mPixelSize = aPixelSize;
--  mImageDesc.font.face_id    = (void*)mFaceID;
--  mImageDesc.font.pix_width  = aPixelSize;
--  mImageDesc.font.pix_height = aPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mFaceID;
-+  mImageDesc->width  = aPixelSize;
-+  mImageDesc->height = aPixelSize;
-+  mImageDesc->flags = 0;
- 
-   if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
--    mImageDesc.image_type |= ftc_image_mono;
-     anti_alias = PR_FALSE;
-   }
- 
--  if (nsFreeType2::gFreeType2Autohinted)
--    mImageDesc.image_type |= ftc_image_flag_autohinted;
--
--  if (nsFreeType2::gFreeType2Unhinted)
--    mImageDesc.image_type |= ftc_image_flag_unhinted;
--
-   PRUint32  num_embedded_bitmaps, i;
-   PRInt32*  embedded_bitmapheights;
-   mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
-@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
-         if (embedded_bitmapheights[i] == aPixelSize) {
-           embedded_bimap = PR_TRUE;
-           // unhinted must be set for embedded bitmaps to be used
--          mImageDesc.image_type |= ftc_image_flag_unhinted;
-           break;
-         }
-       }
-@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con
-   if (!face)
-     return NS_ERROR_FAILURE;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return NS_ERROR_FAILURE;
-@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
-@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering
-     if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
- #endif
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
-Index: gfx/src/x11shared/nsFontFreeType.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v
-retrieving revision 1.10
-diff -u -3 -p -r1.10 nsFontFreeType.h
---- gfx/src/x11shared/nsFontFreeType.h	17 Apr 2004 21:52:34 -0000	1.10
-+++ gfx/src/x11shared/nsFontFreeType.h	26 May 2004 10:01:03 -0000
-@@ -110,7 +110,7 @@ protected:
-   XImage *GetXImage(PRUint32 width, PRUint32 height);
-   nsITrueTypeFontCatalogEntry *mFaceID;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
-   nsCOMPtr<nsIFreeType2> mFt2;
- };
- 
---- gfx/src/ps/nsFontMetricsPS.h.orig	Fri Mar  4 15:41:55 2005
-+++ gfx/src/ps/nsFontMetricsPS.h	Thu Mar 17 05:16:50 2005
-@@ -492,7 +492,7 @@
- protected:
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
-   nsCOMPtr<nsIFreeType2> mFt2;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
- };
- #endif   // MOZ_ENABLE_FREETYPE2
- #endif   // MOZ_ENABLE_XFT
diff --git a/deskutils/lightning-thunderbird/files/patch-calendar_libical_src_libical_icalrecur.c b/deskutils/lightning-thunderbird/files/patch-calendar_libical_src_libical_icalrecur.c
deleted file mode 100644
index 17812d705942..000000000000
--- a/deskutils/lightning-thunderbird/files/patch-calendar_libical_src_libical_icalrecur.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- calendar/libical/src/libical/icalrecur.c.orig	Thu Mar 17 07:13:54 2005
-+++ calendar/libical/src/libical/icalrecur.c	Thu Mar 17 07:14:30 2005
-@@ -134,9 +134,7 @@
- #include "config.h"
- #endif
- 
--#ifdef HAVE_STDINT_H
--#include <stdint.h>
--#endif
-+#include <inttypes.h>
- 
- #ifndef HAVE_INTPTR_T
- #ifdef WIN32
diff --git a/deskutils/lightning-thunderbird/files/patch-config-mkdepend-imakemdep.h b/deskutils/lightning-thunderbird/files/patch-config-mkdepend-imakemdep.h
index b688e664475d..53e85308a0ab 100644
--- a/deskutils/lightning-thunderbird/files/patch-config-mkdepend-imakemdep.h
+++ b/deskutils/lightning-thunderbird/files/patch-config-mkdepend-imakemdep.h
@@ -1,10 +1,13 @@
---- config/mkdepend/imakemdep.h	Fri Sep  4 21:22:25 1998
-+++ config/mkdepend/imakemdep.h	Thu Oct 16 22:43:25 2003
-@@ -278,4 +278,7 @@
+--- mozilla/config/mkdepend/imakemdep.h.orig	2009-12-05 15:43:09.000000000 +0100
++++ mozilla/config/mkdepend/imakemdep.h	2009-12-05 15:44:00.000000000 +0100
+@@ -277,8 +277,8 @@
+ # ifdef __i386__
  	"-D__i386__",
  # endif
-+# if defined(__amd64__) || defined(__x86_64__)
+-# ifdef __x86_64__
+-	"-D__x86_64__",
++# ifdef defined(__amd64__) || defined(__x86_64__)
 +	"-D__amd64__ -D__x86_64__",
-+# endif
+ # endif
  # ifdef __GNUC__
  	"-traditional",
diff --git a/deskutils/lightning-thunderbird/files/patch-config_autoconf.mk.in b/deskutils/lightning-thunderbird/files/patch-config_autoconf.mk.in
index c4fa0b516d1d..5e1a81d7a25c 100644
--- a/deskutils/lightning-thunderbird/files/patch-config_autoconf.mk.in
+++ b/deskutils/lightning-thunderbird/files/patch-config_autoconf.mk.in
@@ -1,6 +1,6 @@
---- config/autoconf.mk.in.orig	Mon Mar 15 22:56:25 2004
-+++ config/autoconf.mk.in	Fri Mar 19 15:17:50 2004
-@@ -31,13 +31,13 @@
+--- config/autoconf.mk.in.orig	2009-12-03 08:16:42.000000000 +0100
++++ config/autoconf.mk.in	2009-12-05 15:47:48.000000000 +0100
+@@ -62,14 +62,14 @@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
@@ -9,10 +9,12 @@
  libdir		= @libdir@
  datadir		= @datadir@
  mandir		= @mandir@
- idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
  
--mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)/%%MOZILLA%%
- mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir	= $(mredir)/lib
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/%%MOZILLA%%
++sdkdir		= $(libdir)/%%MOZILLA%%
  
+ MOZDEPTH	= $(DEPTH)/mozilla
+ DIST		= $(MOZDEPTH)/dist
diff --git a/deskutils/lightning-thunderbird/files/patch-config_mkdepend_Makefile.in b/deskutils/lightning-thunderbird/files/patch-config_mkdepend_Makefile.in
index 8da7e48ab0df..3b649d0f16b7 100644
--- a/deskutils/lightning-thunderbird/files/patch-config_mkdepend_Makefile.in
+++ b/deskutils/lightning-thunderbird/files/patch-config_mkdepend_Makefile.in
@@ -1,6 +1,6 @@
---- config/mkdepend/Makefile.in.orig	Sun Apr 18 14:17:26 2004
-+++ config/mkdepend/Makefile.in	Sun Dec 12 09:42:11 2004
-@@ -73,6 +73,7 @@
+--- mozilla/config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
++++ mozilla/config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
+@@ -57,6 +57,7 @@
  include $(topsrcdir)/config/rules.mk
  
  HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
diff --git a/deskutils/lightning-thunderbird/files/patch-configure.in b/deskutils/lightning-thunderbird/files/patch-configure.in
new file mode 100644
index 000000000000..ae9642b9fffd
--- /dev/null
+++ b/deskutils/lightning-thunderbird/files/patch-configure.in
@@ -0,0 +1,11 @@
+--- configure.in.orig	2009-08-14 11:24:58.206076928 +0200
++++ configure.in	2009-08-14 11:25:29.601293359 +0200
+@@ -5680,7 +5680,7 @@
+     CPU_ARCH=sparc
+     ;;
+ 
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+     CPU_ARCH="$OS_TEST"
+     ;;
+ esac
diff --git a/deskutils/lightning-thunderbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/deskutils/lightning-thunderbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
deleted file mode 100644
index bc141062f7c6..000000000000
--- a/deskutils/lightning-thunderbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- gfx/src/gtk/nsFontMetricsXft.cpp.orig	Wed Mar 17 02:08:01 2004
-+++ gfx/src/gtk/nsFontMetricsXft.cpp	Wed Mar 17 02:08:15 2004
-@@ -65,7 +65,8 @@
- 
- #include <gdk/gdkx.h>
- #include <freetype/tttables.h>
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- 
- #define FORCE_PR_LOG
- #include "prlog.h"
diff --git a/deskutils/lightning-thunderbird/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp b/deskutils/lightning-thunderbird/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
deleted file mode 100644
index ab9689957cbc..000000000000
--- a/deskutils/lightning-thunderbird/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2010-03-28 13:48:53.000000000 +0200
-+++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig	2010-03-28 13:46:50.000000000 +0200
-@@ -111,9 +111,9 @@
- 
-   // initialize
-   png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
--                                                png_voidp_NULL,
--                                                png_error_ptr_NULL,
--                                                png_error_ptr_NULL);
-+                                                NULL,
-+                                                NULL,
-+                                                NULL);
-   if (! png_ptr)
-     return NS_ERROR_OUT_OF_MEMORY;
-   png_info* info_ptr = png_create_info_struct(png_ptr);
diff --git a/deskutils/lightning-thunderbird/files/patch-mozilla-build-autoconf-config.sub b/deskutils/lightning-thunderbird/files/patch-mozilla-build-autoconf-config.sub
new file mode 100644
index 000000000000..12a704ade44b
--- /dev/null
+++ b/deskutils/lightning-thunderbird/files/patch-mozilla-build-autoconf-config.sub
@@ -0,0 +1,12 @@
+--- mozilla/build/autoconf/config.sub.orig	2010-01-05 12:26:13.000000000 +0100
++++ mozilla/build/autoconf/config.sub	2010-01-05 12:26:46.000000000 +0100
+@@ -403,9 +403,6 @@
+ 	amd64)
+ 		basic_machine=x86_64-pc
+ 		;;
+-	amd64-*)
+-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+-		;;
+ 	amdahl)
+ 		basic_machine=580-amdahl
+ 		os=-sysv
diff --git a/deskutils/lightning-thunderbird/files/patch-mozilla-content-xslt-public-txDouble.h b/deskutils/lightning-thunderbird/files/patch-mozilla-content-xslt-public-txDouble.h
new file mode 100644
index 000000000000..f8b6864677a9
--- /dev/null
+++ b/deskutils/lightning-thunderbird/files/patch-mozilla-content-xslt-public-txDouble.h
@@ -0,0 +1,11 @@
+--- mozilla/content/xslt/public/txDouble.h.orig	2010-01-22 18:50:16.000000000 +0100
++++ mozilla/content/xslt/public/txDouble.h	2010-01-22 18:50:38.000000000 +0100
+@@ -43,7 +43,7 @@
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
+ #include <ieeefp.h>
+-#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;
diff --git a/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-build-autoconf-config.sub b/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-build-autoconf-config.sub
new file mode 100644
index 000000000000..2cb48a88c0e9
--- /dev/null
+++ b/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-build-autoconf-config.sub
@@ -0,0 +1,12 @@
+--- mozilla/js/src/build/autoconf/config.sub.orig	2010-01-08 09:52:25.000000000 +0100
++++ mozilla/js/src/build/autoconf/config.sub	2010-01-08 09:52:33.000000000 +0100
+@@ -403,9 +403,6 @@
+ 	amd64)
+ 		basic_machine=x86_64-pc
+ 		;;
+-	amd64-*)
+-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+-		;;
+ 	amdahl)
+ 		basic_machine=580-amdahl
+ 		os=-sysv
diff --git a/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-config-config.mk b/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-config-config.mk
new file mode 100644
index 000000000000..a7cc0b915aeb
--- /dev/null
+++ b/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-config-config.mk
@@ -0,0 +1,11 @@
+--- 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
diff --git a/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-config-mkdepend-Makefile.in b/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
new file mode 100644
index 000000000000..898c898fdbd9
--- /dev/null
+++ b/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
@@ -0,0 +1,11 @@
+--- mozilla/js/src/config/mkdepend/Makefile.in.orig	2009-03-05 22:31:53.000000000 +0100
++++ mozilla/js/src/config/mkdepend/Makefile.in	2009-04-21 14:10:27.000000000 +0200
+@@ -72,7 +72,7 @@
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+-HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
+ 
+ ifdef GNU_CC
+ _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-configure.in b/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-configure.in
new file mode 100644
index 000000000000..fe78e75474bb
--- /dev/null
+++ b/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-configure.in
@@ -0,0 +1,22 @@
+--- mozilla/js/src/configure.in.orig	2010-05-12 21:05:58.000000000 +0200
++++ mozilla/js/src/configure.in	2010-06-22 16:17:20.000000000 +0200
+@@ -1218,7 +1218,7 @@
+     CPU_ARCH=sparc
+     ;;
+ 
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+     CPU_ARCH="$OS_TEST"
+     ;;
+ esac
+@@ -2466,10 +2466,6 @@
+     ENABLE_JIT=1
+     NANOJIT_ARCH=ARM
+     ;;
+-sparc*-*)
+-    ENABLE_JIT=1
+-    NANOJIT_ARCH=Sparc
+-    ;;
+ esac
+ 
+ MOZ_ARG_DISABLE_BOOL(jit,
diff --git a/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-jslock.cpp b/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-jslock.cpp
new file mode 100644
index 000000000000..c1a29f393d18
--- /dev/null
+++ b/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-jslock.cpp
@@ -0,0 +1,37 @@
+--- 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 @@
+     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:"
++                  membar #StoreLoad | #LoadLoad\n"
++#                 if defined (__sparc64__)
++                    "casx [%1],%2,%3\n"
++#                 else
++                    "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;
diff --git a/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-jsnum.cpp b/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-jsnum.cpp
new file mode 100644
index 000000000000..c52535eaca09
--- /dev/null
+++ b/deskutils/lightning-thunderbird/files/patch-mozilla-js-src-jsnum.cpp
@@ -0,0 +1,28 @@
+--- mozilla/js/src/jsnum.cpp.orig	Sun Nov  5 18:37:07 2006
++++ mozilla/js/src/jsnum.cpp	Sun Nov  5 18:42:31 2006
+@@ -45,6 +45,9 @@
+ #if defined(XP_WIN) || defined(XP_OS2)
+ #include <float.h>
+ #endif
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
+ #include <locale.h>
+ #include <limits.h>
+ #include <math.h>
+@@ -532,7 +535,15 @@ static jsdouble NaN;
+ 
+ #else
+ 
++#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
++#include <fenv.h>
++#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT))
++
++#else
++
+ #define FIX_FPU() ((void)0)
++
++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
+ 
+ #endif
+ 
diff --git a/deskutils/lightning-thunderbird/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h b/deskutils/lightning-thunderbird/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h
new file mode 100644
index 000000000000..63d98af1dfa6
--- /dev/null
+++ b/deskutils/lightning-thunderbird/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h
@@ -0,0 +1,11 @@
+--- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2009-09-16 02:56:44.000000000 +0200
++++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h	2009-09-24 13:04:49.000000000 +0200
+@@ -59,7 +59,7 @@
+ 
+ #include <sys/types.h>
+ 
+-#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
++#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (__FreeBSD__)
+ typedef off_t oggz_off_t;
+ #else
+ typedef loff_t oggz_off_t;
diff --git a/deskutils/lightning-thunderbird/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp b/deskutils/lightning-thunderbird/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp
new file mode 100644
index 000000000000..272a02bdb9e0
--- /dev/null
+++ b/deskutils/lightning-thunderbird/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp
@@ -0,0 +1,10 @@
+--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig	Mon May 29 23:10:54 2006
++++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp	Mon May 29 23:12:22 2006
+@@ -110,6 +110,7 @@
+ #include "nss.h"
+ #include "pk11func.h"
+ #include "ssl.h"
++#define NSS_ENABLE_ECC 1
+ #include "sslproto.h"
+ #include "secmod.h"
+ #include "sechash.h"
diff --git a/deskutils/lightning-thunderbird/files/patch-mozilla-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/deskutils/lightning-thunderbird/files/patch-mozilla-xpcom_reflect_xptcall_src_md_unix_Makefile.in
new file mode 100644
index 000000000000..385aaed120c3
--- /dev/null
+++ b/deskutils/lightning-thunderbird/files/patch-mozilla-xpcom_reflect_xptcall_src_md_unix_Makefile.in
@@ -0,0 +1,76 @@
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	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 @@
+ endif
+ endif
+ # IA64 Linux
+-ifneq (,$(filter Linux,$(OS_ARCH)))
++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
+ ifneq (,$(findstring ia64,$(OS_TEST)))
+ CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
+ ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
+@@ -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 @@
+ ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
+ endif
+ #
++# FreeBSD/Alpha
++#
++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
++CPPSRCS		:= xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
++endif
++#
+ # Linux/Alpha
+ #
+-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
+ CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
+ endif
+ #
+@@ -307,7 +322,7 @@
+ #
+ # Linux/PPC
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
++ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
+ ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
+ AS		:= $(CC) -c -x assembler-with-cpp
+@@ -385,6 +400,15 @@
+ ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
+ endif
+ #
++# FreeBSD/SPARC64
++#
++ifeq ($(OS_ARCH),FreeBSD)
++ifneq (,$(findstring sparc,$(OS_TEST)))
++CPPSRCS		:= xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
++ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
++endif
++endif
++#
+ # OpenBSD/SPARC
+ #
+ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc)
diff --git a/deskutils/lightning-thunderbird/files/patch-nothreads-sqlite b/deskutils/lightning-thunderbird/files/patch-nothreads-sqlite
deleted file mode 100644
index 1b1bbbcbda15..000000000000
--- a/deskutils/lightning-thunderbird/files/patch-nothreads-sqlite
+++ /dev/null
@@ -1,12 +0,0 @@
---- db/sqlite3/src/Makefile.in.orig	Mon Sep 25 18:38:04 2006
-+++ db/sqlite3/src/Makefile.in	Mon Sep 25 18:38:14 2006
-@@ -99,7 +99,8 @@
- # REFEF_IO allows us to override IO functions, which is used in the AsyncIO
- # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we
- # don't have to vacuum to make sure the data is not visible in the file.
--DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -DTHREADSAFE=1
-+DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1
-+# -DTHREADSAFE=1
- 
- ifdef ENABLE_TESTS
- ##LIBS = $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX)
diff --git a/deskutils/lightning-thunderbird/files/patch-security_coreconf_FreeBSD.mk b/deskutils/lightning-thunderbird/files/patch-security_coreconf_FreeBSD.mk
index 5c76b5af5ebf..b32fc5639157 100644
--- a/deskutils/lightning-thunderbird/files/patch-security_coreconf_FreeBSD.mk
+++ b/deskutils/lightning-thunderbird/files/patch-security_coreconf_FreeBSD.mk
@@ -1,5 +1,5 @@
---- security/coreconf/FreeBSD.mk.orig	Wed Mar 26 20:17:25 2003
-+++ security/coreconf/FreeBSD.mk	Thu Jul  8 12:56:24 2004
+--- 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 @@
  
  include $(CORE_DEPTH)/coreconf/UNIX.mk
diff --git a/deskutils/lightning-thunderbird/files/patch-sysnss b/deskutils/lightning-thunderbird/files/patch-sysnss
index 6846244b32a5..a095158255ce 100644
--- a/deskutils/lightning-thunderbird/files/patch-sysnss
+++ b/deskutils/lightning-thunderbird/files/patch-sysnss
@@ -1,5 +1,5 @@
---- security/manager/ssl/src/Makefile.in.orig	Mon Aug 14 19:22:52 2006
-+++ security/manager/ssl/src/Makefile.in	Thu Aug 31 15:17:20 2006
+--- mozilla/security/manager/ssl/src/Makefile.in.orig	Mon Aug 14 19:22:52 2006
++++ mozilla/security/manager/ssl/src/Makefile.in	Thu Aug 31 15:17:20 2006
 @@ -124,19 +124,19 @@
  		  pipboot \
  		  $(NULL)
@@ -22,32 +22,27 @@
  		$(NULL)
  
  include $(topsrcdir)/config/rules.mk
---- security/manager/Makefile.in.orig	2008-11-23 09:08:49.000000000 +1000
-+++ security/manager/Makefile.in	2008-11-23 09:11:24.000000000 +1000
-@@ -54,22 +54,14 @@
- 	SSL3_LIB \
- 	SOFTOKEN3_LIB \
- 	SOFTOKEN3_CHK \
--	LOADABLE_ROOT_MODULE \
- 	HAVE_FREEBL_LIBS \
- 	HAVE_FREEBL_LIBS_32 \
- 	HAVE_FREEBL_LIBS_32INT64 \
- 	HAVE_FREEBL_LIBS_64 \
- 	$(NULL)
+--- mozilla/security/manager/Makefile.in.orig	2009-12-03 08:19:28.000000000 +0100
++++ mozilla/security/manager/Makefile.in	2009-12-05 16:08:10.000000000 +0100
+@@ -45,17 +45,6 @@
  
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
- endif
+ MODULE = psm
  
+-ifndef MOZ_NATIVE_NSS
+-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+-endif
+-
 -NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
+-NSSUTIL3_LIB = $(DLL_PREFIX)nssutil3$(DLL_SUFFIX)
 -SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
 -SSL3_LIB =  $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
 -SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
 -SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
 -
- # Default
- HAVE_FREEBL_LIBS = 1
- 
-@@ -217,13 +209,6 @@
+ ifndef NSS_DISABLE_DBM
+ NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX)
+ NSSDBM3_CHK = $(DLL_PREFIX)nssdbm3.chk
+@@ -255,13 +244,6 @@
  
  .nss.cleaned: .nss.checkout
  ifndef MOZ_NATIVE_NSS
@@ -60,31 +55,27 @@
 -	touch $@
  endif
  
- .nss.checkout:
-@@ -240,113 +225,14 @@
+ GARBAGE += .nss.cleaned
+@@ -280,78 +262,6 @@
  endif
  
  libs::
 -ifndef MOZ_NATIVE_NSS
 -	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
+-ifndef NSS_DISABLE_DBM
+-	$(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS) 
 -endif
--ifeq ($(OS_ARCH),WINNT)
--	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--else
--	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+-	$(MAKE) -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)
 -endif
--ifndef MOZ_NATIVE_NSS
--	$(MAKE) -C $(topsrcdir)/security/nss/lib/util $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib $(DEFAULT_GMAKE_FLAGS) export
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) libs
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/freebl $(DEFAULT_GMAKE_FLAGS) libs
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/softoken $(DEFAULT_GMAKE_FLAGS) libs
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) clean
--	# In NSS 3.11.8-3.11.9, lib/ssl/derive.c includes cmd/lib/secutil.h.
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) export
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) DIRS="util base dev pki pki1 certdb certhigh pk11wrap cryptohi nss ssl pkcs12 pkcs7 smime crmf jar ckfw ckfw/builtins"
 -ifndef SKIP_CHK
+-ifndef ENABLE_TESTS # Just avoid secondary compile
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
+-endif
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
 -endif
 -	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
@@ -92,9 +83,17 @@
 -	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
 -endif
 -	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
+-ifndef NSS_DISABLE_DBM
+-ifndef SKIP_CHK
+-	$(INSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DIST)/bin
+-endif
+-	$(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin
+-endif
 -	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
+-	$(INSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DIST)/bin
 -	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
 -	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
+-	$(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib
 -ifdef HAVE_FREEBL_LIBS
 -ifndef SKIP_CHK
 -	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
@@ -124,12 +123,20 @@
 -	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
 -endif
 -endif
+-ifndef MOZ_NATIVE_NSS
+-# NSS installs headers to dist/public and we want them in dist/include
+-	$(NSINSTALL) -D $(DIST)/include/nss
+-	(cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \
+-	  (cd $(DIST)/include/nss && tar -xf -)
+-	(cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \
+-	  (cd $(DIST)/sdk/include && tar -xf -)
+-endif
 -	$(MAKE) -C boot $@
-	$(MAKE) -C ssl $@
+ 	$(MAKE) -C ssl $@
  	$(MAKE) -C locales $@
  ifdef MOZ_XUL
- 	$(MAKE) -C pki $@
- endif
+@@ -362,50 +272,6 @@
+ 	$(MAKE) -C ssl $@
  
  install::
 -ifndef MOZ_NATIVE_NSS
@@ -138,7 +145,12 @@
 -	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
 -endif
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
+-ifndef SKIP_CHK
+-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DESTDIR)$(mozappdir)
+-endif
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
 -ifdef HAVE_FREEBL_LIBS
@@ -171,11 +183,10 @@
 -endif
 -endif
 -	$(MAKE) -C boot $@
-	$(MAKE) -C ssl $@
+ 	$(MAKE) -C ssl $@
  	$(MAKE) -C locales $@
  ifdef MOZ_XUL
- 	$(MAKE) -C pki $@
-@@ -360,12 +244,6 @@
+@@ -420,12 +286,6 @@
  	$(MAKE) -C pki $@
  endif
  ifndef MOZ_NATIVE_NSS
@@ -188,18 +199,18 @@
  endif
  
  echo-requires-recursive::
---- toolkit/mozapps/update/src/updater/Makefile.in.orig	Mon Jul  2 07:59:59 2007
-+++ toolkit/mozapps/update/src/updater/Makefile.in	Mon Jul  2 08:00:21 2007
-@@ -52,11 +52,11 @@
+--- mozilla/toolkit/mozapps/update/src/updater/Makefile.in.orig	2009-12-03 08:19:47.000000000 +0100
++++ mozilla/toolkit/mozapps/update/src/updater/Makefile.in	2009-12-05 16:10:00.000000000 +0100
+@@ -55,12 +55,11 @@
  
- PROGRAM = updater$(BIN_SUFFIX)
- 
--REQUIRES = libmar libbz2
-+REQUIRES = libmar
+ REQUIRES	= \
+ 		libmar \
+-		$(BZ2_REQUIRES) \
+ 		$(NULL)
  
  LIBS += \
- 	$(DIST)/lib/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
--	$(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \
+ 	$(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
+-	$(BZ2_LIBS) \
 +	%%LIB_BZ2%% \
  	$(NULL)
  
diff --git a/deskutils/lightning-thunderbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/deskutils/lightning-thunderbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
deleted file mode 100644
index 7f8e55f536df..000000000000
--- a/deskutils/lightning-thunderbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig	Fri Dec 24 04:30:00 2004
-+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp	Fri Dec 24 04:34:05 2004
-@@ -143,7 +143,7 @@
-     PR_END_MACRO
- 
-   // Attempt to open libgconf
--  gconfLib = LoadVersionedLibrary("gconf-2", ".4");
-+  gconfLib = PR_LoadLibrary("libgconf-2.so");
-   ENSURE_LIB(gconfLib);
- 
-   GET_LIB_FUNCTION(gconf, gconf_client_get_default);
-@@ -151,7 +151,7 @@
-   GET_LIB_FUNCTION(gconf, gconf_client_get_bool);
- 
-   // Attempt to open libgnome
--  gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
-+  gnomeLib = PR_LoadLibrary("libgnome-2.so");
-   ENSURE_LIB(gnomeLib);
- 
-   GET_LIB_FUNCTION(gnome, gnome_url_show);
-@@ -160,7 +160,7 @@
-   GET_LIB_FUNCTION(gnome, gnome_program_get);
- 
-   // Attempt to open libgnomevfs
--  vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
-+  vfsLib = PR_LoadLibrary("libgnomevfs-2.so");
-   ENSURE_LIB(vfsLib);
- 
-   GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name);
diff --git a/deskutils/lightning-thunderbird/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc b/deskutils/lightning-thunderbird/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc
index ebe5474ca275..1997e6c2d19d 100644
--- a/deskutils/lightning-thunderbird/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc
+++ b/deskutils/lightning-thunderbird/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc
@@ -1,5 +1,5 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Fri Mar 19 15:58:14 2004
+--- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
++++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Fri Mar 19 15:58:14 2004
 @@ -8,7 +8,7 @@
  *  1 is AddRef
  *  2 is Release
diff --git a/deskutils/lightning-thunderbird/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/deskutils/lightning-thunderbird/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
deleted file mode 100644
index dbdc47b6f8e4..000000000000
--- a/deskutils/lightning-thunderbird/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
+++ /dev/null
@@ -1,56 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Aug 14 21:00:23 2003
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Feb  1 14:31:25 2004
-@@ -49,6 +49,9 @@
- ifeq (86,$(findstring 86,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
- endif
-+ifeq (amd64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp
-+endif
- endif
- #
- # New code for Linux, et. al., with gcc
-@@ -59,8 +62,8 @@
- CPPSRCS		:= xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp
- endif
- endif
--# IA64 Linux
--ifneq (,$(filter Linux,$(OS_ARCH)))
-+# IA64 Linux & FreeBSD
-+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
- ifneq (,$(findstring ia64,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
- ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -106,9 +109,15 @@
- ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
- endif
- #
-+# FreeBSD/Alpha
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
-+CPPSRCS		:= xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
-+endif
-+#
- # Linux/Alpha
- #
--ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
-+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
- CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
- endif
- #
-@@ -294,6 +303,15 @@
- ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
- CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
- ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
-+endif
-+#
-+# FreeBSD/SPARC64
-+#
-+ifeq ($(OS_ARCH),FreeBSD)
-+ifneq (,$(findstring sparc,$(OS_TEST)))
-+CPPSRCS		:= xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
-+ASFILES		:= xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
-+endif
- endif
- #
- # Solaris/SPARC
diff --git a/deskutils/lightning-thunderbird/files/patch-xptcall-alpha b/deskutils/lightning-thunderbird/files/patch-xptcall-alpha
index 29631a98e61e..db5ef6438cdb 100644
--- a/deskutils/lightning-thunderbird/files/patch-xptcall-alpha
+++ b/deskutils/lightning-thunderbird/files/patch-xptcall-alpha
@@ -1,5 +1,5 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp	Tue May 27 01:37:00 2003
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp	Tue May 27 01:37:00 2003
 @@ -0,0 +1,184 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@@ -185,8 +185,8 @@
 +    ".end XPTC_InvokeByIndex"
 +    );
 +
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig	Tue May 27 01:37:30 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp	Tue May 27 01:37:04 2003
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig	Tue May 27 01:37:30 2003
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp	Tue May 27 01:37:04 2003
 @@ -0,0 +1,269 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
diff --git a/deskutils/lightning-thunderbird/files/patch-xptcall-amd64 b/deskutils/lightning-thunderbird/files/patch-xptcall-amd64
index 3227cad02182..feb3452a20bc 100644
--- a/deskutils/lightning-thunderbird/files/patch-xptcall-amd64
+++ b/deskutils/lightning-thunderbird/files/patch-xptcall-amd64
@@ -1,5 +1,5 @@
 --- /dev/null	Wed Dec 31 16:00:00 1969
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp	Thu Oct 16 22:59:43 2003
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp	Thu Oct 16 22:59:43 2003
 @@ -0,0 +1,174 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +// Platform specific code to invoke XPCOM methods on native objects
@@ -176,7 +176,7 @@
 +    return result;
 +}
 --- /dev/null	Wed Dec 31 16:00:00 1969
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp	Thu Oct 16 23:01:08 2003
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp	Thu Oct 16 23:01:08 2003
 @@ -0,0 +1,206 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +
diff --git a/deskutils/lightning-thunderbird/files/patch-xptcall-ia64 b/deskutils/lightning-thunderbird/files/patch-xptcall-ia64
index 3e05a5c704b3..07a07b556482 100644
--- a/deskutils/lightning-thunderbird/files/patch-xptcall-ia64
+++ b/deskutils/lightning-thunderbird/files/patch-xptcall-ia64
@@ -1,5 +1,5 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig	Tue May 24 11:30:54 2005
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s	Mon Nov  7 23:10:28 2005
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig	Tue May 24 11:30:54 2005
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s	Mon Nov  7 23:10:28 2005
 @@ -6,6 +6,7 @@
  // Section has executable code
          .section .text, "ax","progbits"
diff --git a/deskutils/lightning-thunderbird/files/patch-xptcall-sparc64 b/deskutils/lightning-thunderbird/files/patch-xptcall-sparc64
index 9599a8a71336..bbf418dd3e2a 100644
--- a/deskutils/lightning-thunderbird/files/patch-xptcall-sparc64
+++ b/deskutils/lightning-thunderbird/files/patch-xptcall-sparc64
@@ -1,5 +1,5 @@
 --- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp	Mon May 26 04:12:55 2003
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp	Mon May 26 04:12:55 2003
 @@ -0,0 +1,123 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 + *
@@ -125,7 +125,7 @@
 +
 +#endif /* sparc || __sparc__ */
 --- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s	Mon May 26 04:06:09 2003
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s	Mon May 26 04:06:09 2003
 @@ -0,0 +1,104 @@
 +/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 + *
@@ -232,7 +232,7 @@
 +
 +        .size    XPTC_InvokeByIndex, .-XPTC_InvokeByIndex
 --- /dev/null	Mon May 26 14:00:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp	Mon May 26 14:00:49 2003
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp	Mon May 26 14:00:49 2003
 @@ -0,0 +1,91 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 + *
diff --git a/deskutils/lightning-thunderbird/files/releng6_pulseaudio b/deskutils/lightning-thunderbird/files/releng6_pulseaudio
new file mode 100644
index 000000000000..2b82f93201ca
--- /dev/null
+++ b/deskutils/lightning-thunderbird/files/releng6_pulseaudio
@@ -0,0 +1,66 @@
+--- 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	2009-08-20 21:45:20.000000000 +0200
++++ mozilla/toolkit/library/Makefile.in	2009-08-20 21:46:25.000000000 +0200
+@@ -228,12 +228,12 @@
+ endif
+ 
+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(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 \
diff --git a/deskutils/lightning-thunderbird/files/sunbird.desktop.in b/deskutils/lightning-thunderbird/files/sunbird.desktop.in
deleted file mode 100644
index e371a93f2cc5..000000000000
--- a/deskutils/lightning-thunderbird/files/sunbird.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Mozilla Calendar
-Comment=Mozilla Sunbird Calendar
-Icon=@SUNBIRD_ICON@
-Exec=sunbird
-Terminal=false
-Type=Application
-Categories=Application;Office;
diff --git a/deskutils/lightning-thunderbird/pkg-descr b/deskutils/lightning-thunderbird/pkg-descr
index f9995c9a993c..86f77f98b396 100644
--- a/deskutils/lightning-thunderbird/pkg-descr
+++ b/deskutils/lightning-thunderbird/pkg-descr
@@ -1,5 +1,6 @@
-The Sunbird Project is a redesign of the Mozilla Calendar component. The goal
-is to produce a cross platform standalone calendar application based on
-Mozilla's XUL user interface language.
+Lightning brings the Sunbird calendar to the popular email client, Mozilla
+Thunderbird and the SeaMonkey  internet application suite. Since it's an
+extension, Lightning is tightly integrated with Thunderbird or SeaMonkey,
+allowing it to easily perform email-related calendaring tasks. 
 
-WWW:	http://www.mozilla.org/projects/calendar/sunbird.html
+WWW:	http://www.mozilla.org/projects/calendar/lightning/
diff --git a/deskutils/lightning-thunderbird/pkg-message b/deskutils/lightning-thunderbird/pkg-message
new file mode 100644
index 000000000000..a0ba0dcc1b95
--- /dev/null
+++ b/deskutils/lightning-thunderbird/pkg-message
@@ -0,0 +1,9 @@
+*****************************************************************************
+In order to activate the Lightning extension, every user should install the 
+XPI file into his own profile via the menu:
+
+Tools -> Add-ons -> Install (for Thunderbird)
+- or -
+Tools -> Add-on Manager -> Install (for Seamonkey)
+
+*****************************************************************************
diff --git a/deskutils/lightning/Makefile b/deskutils/lightning/Makefile
index 6c6cd6b94491..c739addd89fe 100644
--- a/deskutils/lightning/Makefile
+++ b/deskutils/lightning/Makefile
@@ -3,76 +3,117 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/sunbird/Makefile,v 1.19 2006/10/13 04:40:20 ahze Exp $
 #
 
-PORTNAME=	sunbird
-PORTVERSION=	0.9
-PORTREVISION=	3
-PORTEPOCH=	1
+PORTNAME=	lightning
+DISTVERSION=	1.0
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR=	calendar/sunbird/releases/${DISTVERSION}/source
-DISTNAME=	lightning-${PORTNAME}-${DISTVERSION}-source
+MASTER_SITE_SUBDIR=	calendar/${PORTNAME}/releases/${DISTVERSION}b1/source
+DISTNAME=	${PORTNAME}-sunbird-${DISTVERSION}b1.source
 
 MAINTAINER=	gecko@FreeBSD.org
-COMMENT=	Redesign of the Mozilla Calendar with XUL interface
+COMMENT=	An integrated calendar for Thunderbird and SeaMonkey
 
-USE_AUTOTOOLS=	libtool:22
+OPTIONS+=	THUNDERBIRD "Install Thunderbird 3.0" on \
+		SEAMONKEY "Install SeaMonkey 2.0" off
+
+USE_AUTOTOOLS=	autoconf:213 libtool:22
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
+MAKE_ENV=		PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GECKO=	gecko
+MAKE_JOBS_SAFE=	yes
 WANT_GNOME=	yes
 WANT_PERL=	yes
-SUNBIRD=	${PORTNAME}
-SUNBIRD_ICON_SRC=	${PREFIX}/lib/sunbird/chrome/icons/default/default.xpm
-SUNBIRD_ICON=		${PORTNAME}.xpm
+USE_MOZILLA=	-png -dbm -jpeg -xft
+MOZ_TOOLKIT=	cairo-gtk2
 LIBS=		-Wl,-Bsymbolic -lc
 MOZ_PKGCONFIG_FILES=	${PORTNAME}-js ${PORTNAME}-xpcom ${PORTNAME}-plugin
 PKGCONFIG_FILES=	${MOZ_PKG_CONFIG_FILES}
 MOZ_OPTIONS=	--enable-application=calendar \
 		--enable-system-cairo \
-		--with-system-nss \
 		--enable-canvas
 MOZ_MK_OPTIONS=	MOZ_CO_PROJECT=calendar
-
-GECKO_PLIST_PRE_FILES=	lib/sunbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest \
-			lib/sunbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest
+NOGECKO_PLIST=		yes
+NOGECKO_INSTALL=	yes
 
 .include <bsd.init.mk>
 .include <bsd.libnames.mk>
 .include <bsd.port.pre.mk>
 
-.if ${ARCH}=="sparc64"
-BROKEN=		does not build
+.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}-${GECKO}-freebsd${OSVERSION:C/([0-9]).+/\1/}-${ARCH}.xpi
+PLIST_FILES=	%%DATADIR%%/${XPI_FILE}
+PLIST_DIRS=	%%DATADIR%%
+
+WRKSRC=		${WRKDIR}/comm-1.9.1
+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
+
+GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
+
+.if defined(WITHOUT_DBUS)
+MOZ_OPTIONS+=	--disable-dbus
+.else
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 .endif
 
 post-patch:
-	@${SED} -e 's|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \
-		${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+		${MOZSRC}/storage/build/Makefile.in \
+		${MOZSRC}/db/sqlite3/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/security/manager/ssl/src/Makefile.in
+		${MOZSRC}/security/manager/ssl/src/Makefile.in \
+		${MOZSRC}/js/src/config/mkdepend/Makefile.in \
+		${MOZSRC}/js/src/config/config.mk
 	@${REINPLACE_CMD} -e 's|%%LIB_BZ2%%|${LIBBZ2}|' \
-		${WRKSRC}/toolkit/mozapps/update/src/updater/Makefile.in
+		${MOZSRC}/toolkit/mozapps/update/src/updater/Makefile.in
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
+		s|-lpthread|${PTHREAD_LIBS}|g ; \
+		s|echo aout|echo elf|g ; \
+		s|/usr/X11R6|${LOCALBASE}|g' \
+		${MOZSRC}/js/src/configure \
+		${MOZSRC}/configure
 
-post-build:
-	@(cd ${WRKSRC}/xpfe/components/autocomplete/src && ${GMAKE})
+pre-configure:
+	(cd ${WRKSRC} && ${AUTOCONF})
+	(cd ${MOZSRC} && ${AUTOCONF})
+	(cd ${MOZSRC}/js/src/ && ${AUTOCONF})
 
-pre-install:
-	${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST}
-	${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST}
-	${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST}
-	${ECHO_CMD} '@dirrmtry lib/sunbird/plugins' >> ${PLIST}
-	${ECHO_CMD} '@dirrmtry lib/sunbird' >> ${PLIST}
+# 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})
 
 do-install:
-	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKDIR}/sunbird.desktop ${PREFIX}/share/applications
-	${LN} -sf ${SUNBIRD_ICON_SRC} ${PREFIX}/share/pixmaps/${SUNBIRD_ICON}
-	${TOUCH} ${PREFIX}/lib/sunbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
-	${TOUCH} ${PREFIX}/lib/sunbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${MOZSRC}/dist/xpi-stage/${PORTNAME}.xpi ${DATADIR}/${XPI_FILE}
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/lightning/distinfo b/deskutils/lightning/distinfo
index cc32fcdad0b5..66ec20de8dc2 100644
--- a/deskutils/lightning/distinfo
+++ b/deskutils/lightning/distinfo
@@ -1,3 +1,3 @@
-MD5 (lightning-sunbird-0.9-source.tar.bz2) = 7757ffefd4a30bcc1497b93b3dc6c0ce
-SHA256 (lightning-sunbird-0.9-source.tar.bz2) = 329b256bd463a76527c255cd5b8141ffb6df077ce8d63efdffad6516f0b90f64
-SIZE (lightning-sunbird-0.9-source.tar.bz2) = 43121977
+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
diff --git a/deskutils/lightning/files/liboggplay_oss b/deskutils/lightning/files/liboggplay_oss
new file mode 100644
index 000000000000..e43b0725eea2
--- /dev/null
+++ b/deskutils/lightning/files/liboggplay_oss
@@ -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 \
diff --git a/deskutils/lightning/files/patch-Makefile.in b/deskutils/lightning/files/patch-Makefile.in
deleted file mode 100644
index 5b087403b086..000000000000
--- a/deskutils/lightning/files/patch-Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.in.orig	Mon Jul  2 06:19:35 2007
-+++ Makefile.in	Mon Jul  2 06:19:47 2007
-@@ -91,7 +91,6 @@
- #
- # tier 1 -  3rd party individual libraries
- #
--tier_1_dirs	+= dbm
- 
- ifndef MOZ_NATIVE_JPEG
- tier_1_dirs	+= jpeg
-@@ -107,7 +106,6 @@
- endif
- 
- ifdef MOZ_UPDATER
--tier_1_dirs += modules/libbz2
- tier_1_dirs += modules/libmar
- endif
- 
diff --git a/deskutils/lightning/files/patch-bug533070 b/deskutils/lightning/files/patch-bug533070
new file mode 100644
index 000000000000..8f0e54b78528
--- /dev/null
+++ b/deskutils/lightning/files/patch-bug533070
@@ -0,0 +1,729 @@
+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 <mozilla@songbirdnest.com>
+ #
+ # Portions created by the Initial Developer are Copyright (C) 2007
+ # the Initial Developer. All Rights Reserved.
+ #
+ # Contributor(s):
+-#   - Simon Paquet <bugzilla@babylonsounds.com>
++#   Simon Paquet <bugzilla@babylonsounds.com>
++#   Philipp Kewisch <mozilla@kewis.ch>
+ #
+ # 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 <mozilla@kewis.ch>
++# Portions created by the Initial Developer are Copyright (C) 2009
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#   Brian Ryner <bryner@brianryner.com>
++#   Matthew Willis <lilmatt@mozilla.com>
++#   Robert Strong <robert.bugzilla@gmail.com>
++#
++# 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/(?<!\r)\n/\r\n/g;' < $$file > $(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 <lilmatt@mozilla.com>
++# Portions created by the Initial Developer are Copyright (C) 2006
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++#   Robert Strong <robert.bugzilla@gmail.com>
++#   Philipp Kewisch <mozilla@kewis.ch>
++#
++# 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 <benjamin@smedbergs.us>
+-# 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)
diff --git a/deskutils/lightning/files/patch-bugzilla149334 b/deskutils/lightning/files/patch-bugzilla149334
deleted file mode 100644
index 4bdb765228eb..000000000000
--- a/deskutils/lightning/files/patch-bugzilla149334
+++ /dev/null
@@ -1,328 +0,0 @@
-Index: gfx/idl/nsIFreeType2.idl
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v
-retrieving revision 1.10
-diff -u -3 -p -r1.10 nsIFreeType2.idl
---- gfx/idl/nsIFreeType2.idl	15 Apr 2004 23:30:02 -0000	1.10
-+++ gfx/idl/nsIFreeType2.idl	26 May 2004 10:00:54 -0000
-@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer);
- native FT_Sfnt_Tag(FT_Sfnt_Tag);
- native FT_Size(FT_Size);
- 
--[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
-+[ptr] native FTC_ImageType_p(FTC_ImageType);
- native FTC_Face_Requester(FTC_Face_Requester);
- native FTC_Font(FTC_Font);
--native FTC_Image_Cache(FTC_Image_Cache);
-+native FTC_FaceID(FTC_FaceID);
-+native FTC_ImageCache(FTC_ImageCache);
- native FTC_Manager(FTC_Manager);
- 
- // #ifdef MOZ_SVG
-@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports
- 
-     readonly attribute FT_Library library;
-     readonly attribute FTC_Manager FTCacheManager;
--    readonly attribute FTC_Image_Cache ImageCache;
-+    readonly attribute FTC_ImageCache ImageCache;
- 
-     void    doneFace(in FT_Face face);
-     void    doneFreeType(in FT_Library lib);
-@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports
-     void    outlineDecompose(in FT_Outline_p outline,
-                              in const_FT_Outline_Funcs_p funcs, in voidPtr p);
-     void    setCharmap(in FT_Face face, in FT_CharMap charmap);
--    void    imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
-+    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
-                              in FT_UInt gindex, out FT_Glyph glyph);
--    void    managerLookupSize(in FTC_Manager manager, in FTC_Font font,
--                              out FT_Face face, out FT_Size size);
-+    void    managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
-+                              out FT_Face face);
-     void    managerDone(in FTC_Manager manager);
-     void    managerNew(in FT_Library lib, in FT_UInt max_faces,
-                        in FT_UInt max_sizes, in FT_ULong max_bytes,
-                        in FTC_Face_Requester requester, in FT_Pointer req_data,
-                        out FTC_Manager manager);
--    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
-+    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
- /* #ifdef MOZ_SVG */
-     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
-                         in FT_Vector_p delta);
-Index: gfx/src/freetype/nsFreeType.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v
-retrieving revision 1.25
-diff -u -3 -p -r1.25 nsFreeType.cpp
---- gfx/src/freetype/nsFreeType.cpp	17 Apr 2004 21:52:29 -0000	1.25
-+++ gfx/src/freetype/nsFreeType.cpp	26 May 2004 10:00:54 -0000
-@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = {
-   {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
-   {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
-   {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
--  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
--  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
-+  {"FTC_ImageCache_Lookup",   NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
-+  {"FTC_Manager_LookupFace",  NS_FT2_OFFSET(nsFTC_Manager_LookupFace),  PR_TRUE},
-   {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
-   {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
--  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
-+  {"FTC_ImageCache_New",      NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
- // #ifdef MOZ_SVG
-   {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
-   {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
-@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
-+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
-                               FT_UInt glyphID, FT_Glyph *glyph)
- { 
-   // call the FreeType2 function via the function pointer
-@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
--                               FT_Face *face, FT_Size *size)
-+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
-+                               FT_Face *face)
- { 
-   // call the FreeType2 function via the function pointer
--  FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
-+  FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
-   return error ? NS_ERROR_FAILURE : NS_OK;
- } 
-  
-@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
-+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
- { 
-   // call the FreeType2 function via the function pointer
-   FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
-+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
- {
-   *aCache = mImageCache;
-   return NS_OK;
-Index: gfx/src/freetype/nsFreeType.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v
-retrieving revision 1.17
-diff -u -3 -p -r1.17 nsFreeType.h
---- gfx/src/freetype/nsFreeType.h	17 Apr 2004 21:52:29 -0000	1.17
-+++ gfx/src/freetype/nsFreeType.h	26 May 2004 10:00:54 -0000
-@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_
- typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
- typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
- typedef FT_Error (*FTC_Image_Cache_Lookup_t)
--                      (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
--typedef FT_Error (*FTC_Manager_Lookup_Size_t)
--                      (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
-+                      (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
-+typedef FT_Error (*FTC_Manager_LookupFace_t)
-+                      (FTC_Manager, FTC_FaceID, FT_Face*);
- typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
- typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
-                        FTC_Face_Requester, FT_Pointer, FTC_Manager*);
--typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
-+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
- // #ifdef MOZ_SVG
- typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
- typedef FT_Error (*FT_Get_Kerning_t)
-@@ -181,7 +181,7 @@ protected:
-   FT_Outline_Decompose_t    nsFT_Outline_Decompose;
-   FT_Set_Charmap_t          nsFT_Set_Charmap;
-   FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
--  FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
-+  FTC_Manager_LookupFace_t  nsFTC_Manager_LookupFace;
-   FTC_Manager_Done_t        nsFTC_Manager_Done;
-   FTC_Manager_New_t         nsFTC_Manager_New;
-   FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
-@@ -229,7 +229,7 @@ protected:
-   PRLibrary      *mSharedLib;
-   FT_Library      mFreeTypeLibrary;
-   FTC_Manager     mFTCacheManager;
--  FTC_Image_Cache mImageCache;
-+  FTC_ImageCache  mImageCache;
- 
-   static nsHashtable   *sFontFamilies;
-   static nsHashtable   *sRange1CharSetNames;
-Index: gfx/src/ps/nsFontMetricsPS.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v
-retrieving revision 1.43
-diff -u -3 -p -r1.43 nsFontMetricsPS.cpp
---- gfx/src/ps/nsFontMetricsPS.cpp	17 Apr 2004 21:52:31 -0000	1.43
-+++ gfx/src/ps/nsFontMetricsPS.cpp	26 May 2004 10:01:03 -0000
-@@ -1140,10 +1140,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
-   
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
- 
--  mImageDesc.font.face_id    = (void*)mEntry;
--  mImageDesc.font.pix_width  = mPixelSize;
--  mImageDesc.font.pix_height = mPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-+  mImageDesc->width  = mPixelSize;
-+  mImageDesc->height = mPixelSize;
-+  mImageDesc->flags = 0;
- 
-   nsresult rv;
-   mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1189,7 +1189,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache iCache;
-+  FTC_ImageCache iCache;
-   nsresult rv = mFt2->GetImageCache(&iCache);
-   if (NS_FAILED(rv)) {
-     NS_ERROR("Failed to get Image Cache");
-@@ -1227,8 +1227,8 @@ nsFontPSFreeType::getFTFace()
-   
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   NS_ASSERTION(rv==0, "failed to get face/size");
-   if (rv)
-     return nsnull;
-@@ -1621,16 +1621,16 @@ void nsFT2Type8Generator::GeneratePSFont
-   mEntry->GetFamilyName(fontName);
-   mEntry->GetStyleName(styleName);
-   
--  mImageDesc.font.face_id    = (void*)mEntry;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-   // TT glyph has no relation to size
--  mImageDesc.font.pix_width  = 16;
--  mImageDesc.font.pix_height = 16;
--  mImageDesc.image_type = 0;
-+  mImageDesc->width  = 16;
-+  mImageDesc->height = 16;
-+  mImageDesc->flags = 0;
-   FT_Face face = nsnull;
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   if (NS_FAILED(rv))
-     return;
-  
-Index: gfx/src/x11shared/nsFontFreeType.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v
-retrieving revision 1.14
-diff -u -3 -p -r1.14 nsFontFreeType.cpp
---- gfx/src/x11shared/nsFontFreeType.cpp	17 Apr 2004 21:52:34 -0000	1.14
-+++ gfx/src/x11shared/nsFontFreeType.cpp	26 May 2004 10:01:03 -0000
-@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace()
-   FTC_Manager mgr;
-   nsresult rv;
-   mFt2->GetFTCacheManager(&mgr);
--  rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
-+  rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
-   NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
-   if (NS_FAILED(rv))
-     return nsnull;
-@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
-   PRBool embedded_bimap = PR_FALSE;
-   mFaceID = aFaceID;
-   mPixelSize = aPixelSize;
--  mImageDesc.font.face_id    = (void*)mFaceID;
--  mImageDesc.font.pix_width  = aPixelSize;
--  mImageDesc.font.pix_height = aPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mFaceID;
-+  mImageDesc->width  = aPixelSize;
-+  mImageDesc->height = aPixelSize;
-+  mImageDesc->flags = 0;
- 
-   if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
--    mImageDesc.image_type |= ftc_image_mono;
-     anti_alias = PR_FALSE;
-   }
- 
--  if (nsFreeType2::gFreeType2Autohinted)
--    mImageDesc.image_type |= ftc_image_flag_autohinted;
--
--  if (nsFreeType2::gFreeType2Unhinted)
--    mImageDesc.image_type |= ftc_image_flag_unhinted;
--
-   PRUint32  num_embedded_bitmaps, i;
-   PRInt32*  embedded_bitmapheights;
-   mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
-@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
-         if (embedded_bitmapheights[i] == aPixelSize) {
-           embedded_bimap = PR_TRUE;
-           // unhinted must be set for embedded bitmaps to be used
--          mImageDesc.image_type |= ftc_image_flag_unhinted;
-           break;
-         }
-       }
-@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con
-   if (!face)
-     return NS_ERROR_FAILURE;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return NS_ERROR_FAILURE;
-@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
-@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering
-     if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
- #endif
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
-Index: gfx/src/x11shared/nsFontFreeType.h
-===================================================================
-RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v
-retrieving revision 1.10
-diff -u -3 -p -r1.10 nsFontFreeType.h
---- gfx/src/x11shared/nsFontFreeType.h	17 Apr 2004 21:52:34 -0000	1.10
-+++ gfx/src/x11shared/nsFontFreeType.h	26 May 2004 10:01:03 -0000
-@@ -110,7 +110,7 @@ protected:
-   XImage *GetXImage(PRUint32 width, PRUint32 height);
-   nsITrueTypeFontCatalogEntry *mFaceID;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
-   nsCOMPtr<nsIFreeType2> mFt2;
- };
- 
---- gfx/src/ps/nsFontMetricsPS.h.orig	Fri Mar  4 15:41:55 2005
-+++ gfx/src/ps/nsFontMetricsPS.h	Thu Mar 17 05:16:50 2005
-@@ -492,7 +492,7 @@
- protected:
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
-   nsCOMPtr<nsIFreeType2> mFt2;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
- };
- #endif   // MOZ_ENABLE_FREETYPE2
- #endif   // MOZ_ENABLE_XFT
diff --git a/deskutils/lightning/files/patch-calendar_libical_src_libical_icalrecur.c b/deskutils/lightning/files/patch-calendar_libical_src_libical_icalrecur.c
deleted file mode 100644
index 17812d705942..000000000000
--- a/deskutils/lightning/files/patch-calendar_libical_src_libical_icalrecur.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- calendar/libical/src/libical/icalrecur.c.orig	Thu Mar 17 07:13:54 2005
-+++ calendar/libical/src/libical/icalrecur.c	Thu Mar 17 07:14:30 2005
-@@ -134,9 +134,7 @@
- #include "config.h"
- #endif
- 
--#ifdef HAVE_STDINT_H
--#include <stdint.h>
--#endif
-+#include <inttypes.h>
- 
- #ifndef HAVE_INTPTR_T
- #ifdef WIN32
diff --git a/deskutils/lightning/files/patch-config-mkdepend-imakemdep.h b/deskutils/lightning/files/patch-config-mkdepend-imakemdep.h
index b688e664475d..53e85308a0ab 100644
--- a/deskutils/lightning/files/patch-config-mkdepend-imakemdep.h
+++ b/deskutils/lightning/files/patch-config-mkdepend-imakemdep.h
@@ -1,10 +1,13 @@
---- config/mkdepend/imakemdep.h	Fri Sep  4 21:22:25 1998
-+++ config/mkdepend/imakemdep.h	Thu Oct 16 22:43:25 2003
-@@ -278,4 +278,7 @@
+--- mozilla/config/mkdepend/imakemdep.h.orig	2009-12-05 15:43:09.000000000 +0100
++++ mozilla/config/mkdepend/imakemdep.h	2009-12-05 15:44:00.000000000 +0100
+@@ -277,8 +277,8 @@
+ # ifdef __i386__
  	"-D__i386__",
  # endif
-+# if defined(__amd64__) || defined(__x86_64__)
+-# ifdef __x86_64__
+-	"-D__x86_64__",
++# ifdef defined(__amd64__) || defined(__x86_64__)
 +	"-D__amd64__ -D__x86_64__",
-+# endif
+ # endif
  # ifdef __GNUC__
  	"-traditional",
diff --git a/deskutils/lightning/files/patch-config_autoconf.mk.in b/deskutils/lightning/files/patch-config_autoconf.mk.in
index c4fa0b516d1d..5e1a81d7a25c 100644
--- a/deskutils/lightning/files/patch-config_autoconf.mk.in
+++ b/deskutils/lightning/files/patch-config_autoconf.mk.in
@@ -1,6 +1,6 @@
---- config/autoconf.mk.in.orig	Mon Mar 15 22:56:25 2004
-+++ config/autoconf.mk.in	Fri Mar 19 15:17:50 2004
-@@ -31,13 +31,13 @@
+--- config/autoconf.mk.in.orig	2009-12-03 08:16:42.000000000 +0100
++++ config/autoconf.mk.in	2009-12-05 15:47:48.000000000 +0100
+@@ -62,14 +62,14 @@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
@@ -9,10 +9,12 @@
  libdir		= @libdir@
  datadir		= @datadir@
  mandir		= @mandir@
- idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
  
--mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)/%%MOZILLA%%
- mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir	= $(mredir)/lib
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/%%MOZILLA%%
++sdkdir		= $(libdir)/%%MOZILLA%%
  
+ MOZDEPTH	= $(DEPTH)/mozilla
+ DIST		= $(MOZDEPTH)/dist
diff --git a/deskutils/lightning/files/patch-config_mkdepend_Makefile.in b/deskutils/lightning/files/patch-config_mkdepend_Makefile.in
index 8da7e48ab0df..3b649d0f16b7 100644
--- a/deskutils/lightning/files/patch-config_mkdepend_Makefile.in
+++ b/deskutils/lightning/files/patch-config_mkdepend_Makefile.in
@@ -1,6 +1,6 @@
---- config/mkdepend/Makefile.in.orig	Sun Apr 18 14:17:26 2004
-+++ config/mkdepend/Makefile.in	Sun Dec 12 09:42:11 2004
-@@ -73,6 +73,7 @@
+--- mozilla/config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
++++ mozilla/config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
+@@ -57,6 +57,7 @@
  include $(topsrcdir)/config/rules.mk
  
  HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
diff --git a/deskutils/lightning/files/patch-configure.in b/deskutils/lightning/files/patch-configure.in
new file mode 100644
index 000000000000..ae9642b9fffd
--- /dev/null
+++ b/deskutils/lightning/files/patch-configure.in
@@ -0,0 +1,11 @@
+--- configure.in.orig	2009-08-14 11:24:58.206076928 +0200
++++ configure.in	2009-08-14 11:25:29.601293359 +0200
+@@ -5680,7 +5680,7 @@
+     CPU_ARCH=sparc
+     ;;
+ 
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+     CPU_ARCH="$OS_TEST"
+     ;;
+ esac
diff --git a/deskutils/lightning/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/deskutils/lightning/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
deleted file mode 100644
index bc141062f7c6..000000000000
--- a/deskutils/lightning/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- gfx/src/gtk/nsFontMetricsXft.cpp.orig	Wed Mar 17 02:08:01 2004
-+++ gfx/src/gtk/nsFontMetricsXft.cpp	Wed Mar 17 02:08:15 2004
-@@ -65,7 +65,8 @@
- 
- #include <gdk/gdkx.h>
- #include <freetype/tttables.h>
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- 
- #define FORCE_PR_LOG
- #include "prlog.h"
diff --git a/deskutils/lightning/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp b/deskutils/lightning/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
deleted file mode 100644
index ab9689957cbc..000000000000
--- a/deskutils/lightning/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2010-03-28 13:48:53.000000000 +0200
-+++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig	2010-03-28 13:46:50.000000000 +0200
-@@ -111,9 +111,9 @@
- 
-   // initialize
-   png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
--                                                png_voidp_NULL,
--                                                png_error_ptr_NULL,
--                                                png_error_ptr_NULL);
-+                                                NULL,
-+                                                NULL,
-+                                                NULL);
-   if (! png_ptr)
-     return NS_ERROR_OUT_OF_MEMORY;
-   png_info* info_ptr = png_create_info_struct(png_ptr);
diff --git a/deskutils/lightning/files/patch-mozilla-build-autoconf-config.sub b/deskutils/lightning/files/patch-mozilla-build-autoconf-config.sub
new file mode 100644
index 000000000000..12a704ade44b
--- /dev/null
+++ b/deskutils/lightning/files/patch-mozilla-build-autoconf-config.sub
@@ -0,0 +1,12 @@
+--- mozilla/build/autoconf/config.sub.orig	2010-01-05 12:26:13.000000000 +0100
++++ mozilla/build/autoconf/config.sub	2010-01-05 12:26:46.000000000 +0100
+@@ -403,9 +403,6 @@
+ 	amd64)
+ 		basic_machine=x86_64-pc
+ 		;;
+-	amd64-*)
+-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+-		;;
+ 	amdahl)
+ 		basic_machine=580-amdahl
+ 		os=-sysv
diff --git a/deskutils/lightning/files/patch-mozilla-content-xslt-public-txDouble.h b/deskutils/lightning/files/patch-mozilla-content-xslt-public-txDouble.h
new file mode 100644
index 000000000000..f8b6864677a9
--- /dev/null
+++ b/deskutils/lightning/files/patch-mozilla-content-xslt-public-txDouble.h
@@ -0,0 +1,11 @@
+--- mozilla/content/xslt/public/txDouble.h.orig	2010-01-22 18:50:16.000000000 +0100
++++ mozilla/content/xslt/public/txDouble.h	2010-01-22 18:50:38.000000000 +0100
+@@ -43,7 +43,7 @@
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
+ #include <ieeefp.h>
+-#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;
diff --git a/deskutils/lightning/files/patch-mozilla-js-src-build-autoconf-config.sub b/deskutils/lightning/files/patch-mozilla-js-src-build-autoconf-config.sub
new file mode 100644
index 000000000000..2cb48a88c0e9
--- /dev/null
+++ b/deskutils/lightning/files/patch-mozilla-js-src-build-autoconf-config.sub
@@ -0,0 +1,12 @@
+--- mozilla/js/src/build/autoconf/config.sub.orig	2010-01-08 09:52:25.000000000 +0100
++++ mozilla/js/src/build/autoconf/config.sub	2010-01-08 09:52:33.000000000 +0100
+@@ -403,9 +403,6 @@
+ 	amd64)
+ 		basic_machine=x86_64-pc
+ 		;;
+-	amd64-*)
+-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+-		;;
+ 	amdahl)
+ 		basic_machine=580-amdahl
+ 		os=-sysv
diff --git a/deskutils/lightning/files/patch-mozilla-js-src-config-config.mk b/deskutils/lightning/files/patch-mozilla-js-src-config-config.mk
new file mode 100644
index 000000000000..a7cc0b915aeb
--- /dev/null
+++ b/deskutils/lightning/files/patch-mozilla-js-src-config-config.mk
@@ -0,0 +1,11 @@
+--- 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
diff --git a/deskutils/lightning/files/patch-mozilla-js-src-config-mkdepend-Makefile.in b/deskutils/lightning/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
new file mode 100644
index 000000000000..898c898fdbd9
--- /dev/null
+++ b/deskutils/lightning/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
@@ -0,0 +1,11 @@
+--- mozilla/js/src/config/mkdepend/Makefile.in.orig	2009-03-05 22:31:53.000000000 +0100
++++ mozilla/js/src/config/mkdepend/Makefile.in	2009-04-21 14:10:27.000000000 +0200
+@@ -72,7 +72,7 @@
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+-HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
+ 
+ ifdef GNU_CC
+ _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/deskutils/lightning/files/patch-mozilla-js-src-configure.in b/deskutils/lightning/files/patch-mozilla-js-src-configure.in
new file mode 100644
index 000000000000..fe78e75474bb
--- /dev/null
+++ b/deskutils/lightning/files/patch-mozilla-js-src-configure.in
@@ -0,0 +1,22 @@
+--- mozilla/js/src/configure.in.orig	2010-05-12 21:05:58.000000000 +0200
++++ mozilla/js/src/configure.in	2010-06-22 16:17:20.000000000 +0200
+@@ -1218,7 +1218,7 @@
+     CPU_ARCH=sparc
+     ;;
+ 
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+     CPU_ARCH="$OS_TEST"
+     ;;
+ esac
+@@ -2466,10 +2466,6 @@
+     ENABLE_JIT=1
+     NANOJIT_ARCH=ARM
+     ;;
+-sparc*-*)
+-    ENABLE_JIT=1
+-    NANOJIT_ARCH=Sparc
+-    ;;
+ esac
+ 
+ MOZ_ARG_DISABLE_BOOL(jit,
diff --git a/deskutils/lightning/files/patch-mozilla-js-src-jslock.cpp b/deskutils/lightning/files/patch-mozilla-js-src-jslock.cpp
new file mode 100644
index 000000000000..c1a29f393d18
--- /dev/null
+++ b/deskutils/lightning/files/patch-mozilla-js-src-jslock.cpp
@@ -0,0 +1,37 @@
+--- 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 @@
+     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:"
++                  membar #StoreLoad | #LoadLoad\n"
++#                 if defined (__sparc64__)
++                    "casx [%1],%2,%3\n"
++#                 else
++                    "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;
diff --git a/deskutils/lightning/files/patch-mozilla-js-src-jsnum.cpp b/deskutils/lightning/files/patch-mozilla-js-src-jsnum.cpp
new file mode 100644
index 000000000000..c52535eaca09
--- /dev/null
+++ b/deskutils/lightning/files/patch-mozilla-js-src-jsnum.cpp
@@ -0,0 +1,28 @@
+--- mozilla/js/src/jsnum.cpp.orig	Sun Nov  5 18:37:07 2006
++++ mozilla/js/src/jsnum.cpp	Sun Nov  5 18:42:31 2006
+@@ -45,6 +45,9 @@
+ #if defined(XP_WIN) || defined(XP_OS2)
+ #include <float.h>
+ #endif
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
+ #include <locale.h>
+ #include <limits.h>
+ #include <math.h>
+@@ -532,7 +535,15 @@ static jsdouble NaN;
+ 
+ #else
+ 
++#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
++#include <fenv.h>
++#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT))
++
++#else
++
+ #define FIX_FPU() ((void)0)
++
++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
+ 
+ #endif
+ 
diff --git a/deskutils/lightning/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h b/deskutils/lightning/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h
new file mode 100644
index 000000000000..63d98af1dfa6
--- /dev/null
+++ b/deskutils/lightning/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h
@@ -0,0 +1,11 @@
+--- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2009-09-16 02:56:44.000000000 +0200
++++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h	2009-09-24 13:04:49.000000000 +0200
+@@ -59,7 +59,7 @@
+ 
+ #include <sys/types.h>
+ 
+-#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
++#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (__FreeBSD__)
+ typedef off_t oggz_off_t;
+ #else
+ typedef loff_t oggz_off_t;
diff --git a/deskutils/lightning/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp b/deskutils/lightning/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp
new file mode 100644
index 000000000000..272a02bdb9e0
--- /dev/null
+++ b/deskutils/lightning/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp
@@ -0,0 +1,10 @@
+--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig	Mon May 29 23:10:54 2006
++++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp	Mon May 29 23:12:22 2006
+@@ -110,6 +110,7 @@
+ #include "nss.h"
+ #include "pk11func.h"
+ #include "ssl.h"
++#define NSS_ENABLE_ECC 1
+ #include "sslproto.h"
+ #include "secmod.h"
+ #include "sechash.h"
diff --git a/deskutils/lightning/files/patch-mozilla-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/deskutils/lightning/files/patch-mozilla-xpcom_reflect_xptcall_src_md_unix_Makefile.in
new file mode 100644
index 000000000000..385aaed120c3
--- /dev/null
+++ b/deskutils/lightning/files/patch-mozilla-xpcom_reflect_xptcall_src_md_unix_Makefile.in
@@ -0,0 +1,76 @@
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	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 @@
+ endif
+ endif
+ # IA64 Linux
+-ifneq (,$(filter Linux,$(OS_ARCH)))
++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
+ ifneq (,$(findstring ia64,$(OS_TEST)))
+ CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
+ ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
+@@ -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 @@
+ ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
+ endif
+ #
++# FreeBSD/Alpha
++#
++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
++CPPSRCS		:= xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
++endif
++#
+ # Linux/Alpha
+ #
+-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
+ CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
+ endif
+ #
+@@ -307,7 +322,7 @@
+ #
+ # Linux/PPC
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
++ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
+ ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
+ AS		:= $(CC) -c -x assembler-with-cpp
+@@ -385,6 +400,15 @@
+ ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
+ endif
+ #
++# FreeBSD/SPARC64
++#
++ifeq ($(OS_ARCH),FreeBSD)
++ifneq (,$(findstring sparc,$(OS_TEST)))
++CPPSRCS		:= xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
++ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
++endif
++endif
++#
+ # OpenBSD/SPARC
+ #
+ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc)
diff --git a/deskutils/lightning/files/patch-nothreads-sqlite b/deskutils/lightning/files/patch-nothreads-sqlite
deleted file mode 100644
index 1b1bbbcbda15..000000000000
--- a/deskutils/lightning/files/patch-nothreads-sqlite
+++ /dev/null
@@ -1,12 +0,0 @@
---- db/sqlite3/src/Makefile.in.orig	Mon Sep 25 18:38:04 2006
-+++ db/sqlite3/src/Makefile.in	Mon Sep 25 18:38:14 2006
-@@ -99,7 +99,8 @@
- # REFEF_IO allows us to override IO functions, which is used in the AsyncIO
- # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we
- # don't have to vacuum to make sure the data is not visible in the file.
--DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -DTHREADSAFE=1
-+DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1
-+# -DTHREADSAFE=1
- 
- ifdef ENABLE_TESTS
- ##LIBS = $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX)
diff --git a/deskutils/lightning/files/patch-security_coreconf_FreeBSD.mk b/deskutils/lightning/files/patch-security_coreconf_FreeBSD.mk
index 5c76b5af5ebf..b32fc5639157 100644
--- a/deskutils/lightning/files/patch-security_coreconf_FreeBSD.mk
+++ b/deskutils/lightning/files/patch-security_coreconf_FreeBSD.mk
@@ -1,5 +1,5 @@
---- security/coreconf/FreeBSD.mk.orig	Wed Mar 26 20:17:25 2003
-+++ security/coreconf/FreeBSD.mk	Thu Jul  8 12:56:24 2004
+--- 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 @@
  
  include $(CORE_DEPTH)/coreconf/UNIX.mk
diff --git a/deskutils/lightning/files/patch-sysnss b/deskutils/lightning/files/patch-sysnss
index 6846244b32a5..a095158255ce 100644
--- a/deskutils/lightning/files/patch-sysnss
+++ b/deskutils/lightning/files/patch-sysnss
@@ -1,5 +1,5 @@
---- security/manager/ssl/src/Makefile.in.orig	Mon Aug 14 19:22:52 2006
-+++ security/manager/ssl/src/Makefile.in	Thu Aug 31 15:17:20 2006
+--- mozilla/security/manager/ssl/src/Makefile.in.orig	Mon Aug 14 19:22:52 2006
++++ mozilla/security/manager/ssl/src/Makefile.in	Thu Aug 31 15:17:20 2006
 @@ -124,19 +124,19 @@
  		  pipboot \
  		  $(NULL)
@@ -22,32 +22,27 @@
  		$(NULL)
  
  include $(topsrcdir)/config/rules.mk
---- security/manager/Makefile.in.orig	2008-11-23 09:08:49.000000000 +1000
-+++ security/manager/Makefile.in	2008-11-23 09:11:24.000000000 +1000
-@@ -54,22 +54,14 @@
- 	SSL3_LIB \
- 	SOFTOKEN3_LIB \
- 	SOFTOKEN3_CHK \
--	LOADABLE_ROOT_MODULE \
- 	HAVE_FREEBL_LIBS \
- 	HAVE_FREEBL_LIBS_32 \
- 	HAVE_FREEBL_LIBS_32INT64 \
- 	HAVE_FREEBL_LIBS_64 \
- 	$(NULL)
+--- mozilla/security/manager/Makefile.in.orig	2009-12-03 08:19:28.000000000 +0100
++++ mozilla/security/manager/Makefile.in	2009-12-05 16:08:10.000000000 +0100
+@@ -45,17 +45,6 @@
  
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
- endif
+ MODULE = psm
  
+-ifndef MOZ_NATIVE_NSS
+-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+-endif
+-
 -NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
+-NSSUTIL3_LIB = $(DLL_PREFIX)nssutil3$(DLL_SUFFIX)
 -SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
 -SSL3_LIB =  $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
 -SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
 -SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
 -
- # Default
- HAVE_FREEBL_LIBS = 1
- 
-@@ -217,13 +209,6 @@
+ ifndef NSS_DISABLE_DBM
+ NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX)
+ NSSDBM3_CHK = $(DLL_PREFIX)nssdbm3.chk
+@@ -255,13 +244,6 @@
  
  .nss.cleaned: .nss.checkout
  ifndef MOZ_NATIVE_NSS
@@ -60,31 +55,27 @@
 -	touch $@
  endif
  
- .nss.checkout:
-@@ -240,113 +225,14 @@
+ GARBAGE += .nss.cleaned
+@@ -280,78 +262,6 @@
  endif
  
  libs::
 -ifndef MOZ_NATIVE_NSS
 -	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
+-ifndef NSS_DISABLE_DBM
+-	$(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS) 
 -endif
--ifeq ($(OS_ARCH),WINNT)
--	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--else
--	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+-	$(MAKE) -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)
 -endif
--ifndef MOZ_NATIVE_NSS
--	$(MAKE) -C $(topsrcdir)/security/nss/lib/util $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib $(DEFAULT_GMAKE_FLAGS) export
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) libs
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/freebl $(DEFAULT_GMAKE_FLAGS) libs
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/softoken $(DEFAULT_GMAKE_FLAGS) libs
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) clean
--	# In NSS 3.11.8-3.11.9, lib/ssl/derive.c includes cmd/lib/secutil.h.
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) export
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) DIRS="util base dev pki pki1 certdb certhigh pk11wrap cryptohi nss ssl pkcs12 pkcs7 smime crmf jar ckfw ckfw/builtins"
 -ifndef SKIP_CHK
+-ifndef ENABLE_TESTS # Just avoid secondary compile
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
+-endif
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
 -endif
 -	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
@@ -92,9 +83,17 @@
 -	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
 -endif
 -	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
+-ifndef NSS_DISABLE_DBM
+-ifndef SKIP_CHK
+-	$(INSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DIST)/bin
+-endif
+-	$(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin
+-endif
 -	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
+-	$(INSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DIST)/bin
 -	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
 -	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
+-	$(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib
 -ifdef HAVE_FREEBL_LIBS
 -ifndef SKIP_CHK
 -	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
@@ -124,12 +123,20 @@
 -	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
 -endif
 -endif
+-ifndef MOZ_NATIVE_NSS
+-# NSS installs headers to dist/public and we want them in dist/include
+-	$(NSINSTALL) -D $(DIST)/include/nss
+-	(cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \
+-	  (cd $(DIST)/include/nss && tar -xf -)
+-	(cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \
+-	  (cd $(DIST)/sdk/include && tar -xf -)
+-endif
 -	$(MAKE) -C boot $@
-	$(MAKE) -C ssl $@
+ 	$(MAKE) -C ssl $@
  	$(MAKE) -C locales $@
  ifdef MOZ_XUL
- 	$(MAKE) -C pki $@
- endif
+@@ -362,50 +272,6 @@
+ 	$(MAKE) -C ssl $@
  
  install::
 -ifndef MOZ_NATIVE_NSS
@@ -138,7 +145,12 @@
 -	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
 -endif
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
+-ifndef SKIP_CHK
+-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DESTDIR)$(mozappdir)
+-endif
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
 -ifdef HAVE_FREEBL_LIBS
@@ -171,11 +183,10 @@
 -endif
 -endif
 -	$(MAKE) -C boot $@
-	$(MAKE) -C ssl $@
+ 	$(MAKE) -C ssl $@
  	$(MAKE) -C locales $@
  ifdef MOZ_XUL
- 	$(MAKE) -C pki $@
-@@ -360,12 +244,6 @@
+@@ -420,12 +286,6 @@
  	$(MAKE) -C pki $@
  endif
  ifndef MOZ_NATIVE_NSS
@@ -188,18 +199,18 @@
  endif
  
  echo-requires-recursive::
---- toolkit/mozapps/update/src/updater/Makefile.in.orig	Mon Jul  2 07:59:59 2007
-+++ toolkit/mozapps/update/src/updater/Makefile.in	Mon Jul  2 08:00:21 2007
-@@ -52,11 +52,11 @@
+--- mozilla/toolkit/mozapps/update/src/updater/Makefile.in.orig	2009-12-03 08:19:47.000000000 +0100
++++ mozilla/toolkit/mozapps/update/src/updater/Makefile.in	2009-12-05 16:10:00.000000000 +0100
+@@ -55,12 +55,11 @@
  
- PROGRAM = updater$(BIN_SUFFIX)
- 
--REQUIRES = libmar libbz2
-+REQUIRES = libmar
+ REQUIRES	= \
+ 		libmar \
+-		$(BZ2_REQUIRES) \
+ 		$(NULL)
  
  LIBS += \
- 	$(DIST)/lib/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
--	$(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \
+ 	$(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
+-	$(BZ2_LIBS) \
 +	%%LIB_BZ2%% \
  	$(NULL)
  
diff --git a/deskutils/lightning/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/deskutils/lightning/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
deleted file mode 100644
index 7f8e55f536df..000000000000
--- a/deskutils/lightning/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig	Fri Dec 24 04:30:00 2004
-+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp	Fri Dec 24 04:34:05 2004
-@@ -143,7 +143,7 @@
-     PR_END_MACRO
- 
-   // Attempt to open libgconf
--  gconfLib = LoadVersionedLibrary("gconf-2", ".4");
-+  gconfLib = PR_LoadLibrary("libgconf-2.so");
-   ENSURE_LIB(gconfLib);
- 
-   GET_LIB_FUNCTION(gconf, gconf_client_get_default);
-@@ -151,7 +151,7 @@
-   GET_LIB_FUNCTION(gconf, gconf_client_get_bool);
- 
-   // Attempt to open libgnome
--  gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
-+  gnomeLib = PR_LoadLibrary("libgnome-2.so");
-   ENSURE_LIB(gnomeLib);
- 
-   GET_LIB_FUNCTION(gnome, gnome_url_show);
-@@ -160,7 +160,7 @@
-   GET_LIB_FUNCTION(gnome, gnome_program_get);
- 
-   // Attempt to open libgnomevfs
--  vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
-+  vfsLib = PR_LoadLibrary("libgnomevfs-2.so");
-   ENSURE_LIB(vfsLib);
- 
-   GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name);
diff --git a/deskutils/lightning/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc b/deskutils/lightning/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc
index ebe5474ca275..1997e6c2d19d 100644
--- a/deskutils/lightning/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc
+++ b/deskutils/lightning/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc
@@ -1,5 +1,5 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Fri Mar 19 15:58:14 2004
+--- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
++++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Fri Mar 19 15:58:14 2004
 @@ -8,7 +8,7 @@
  *  1 is AddRef
  *  2 is Release
diff --git a/deskutils/lightning/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/deskutils/lightning/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
deleted file mode 100644
index dbdc47b6f8e4..000000000000
--- a/deskutils/lightning/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
+++ /dev/null
@@ -1,56 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Aug 14 21:00:23 2003
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Feb  1 14:31:25 2004
-@@ -49,6 +49,9 @@
- ifeq (86,$(findstring 86,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
- endif
-+ifeq (amd64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp
-+endif
- endif
- #
- # New code for Linux, et. al., with gcc
-@@ -59,8 +62,8 @@
- CPPSRCS		:= xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp
- endif
- endif
--# IA64 Linux
--ifneq (,$(filter Linux,$(OS_ARCH)))
-+# IA64 Linux & FreeBSD
-+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
- ifneq (,$(findstring ia64,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
- ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -106,9 +109,15 @@
- ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
- endif
- #
-+# FreeBSD/Alpha
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
-+CPPSRCS		:= xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
-+endif
-+#
- # Linux/Alpha
- #
--ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
-+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
- CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
- endif
- #
-@@ -294,6 +303,15 @@
- ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
- CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
- ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
-+endif
-+#
-+# FreeBSD/SPARC64
-+#
-+ifeq ($(OS_ARCH),FreeBSD)
-+ifneq (,$(findstring sparc,$(OS_TEST)))
-+CPPSRCS		:= xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
-+ASFILES		:= xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
-+endif
- endif
- #
- # Solaris/SPARC
diff --git a/deskutils/lightning/files/patch-xptcall-alpha b/deskutils/lightning/files/patch-xptcall-alpha
index 29631a98e61e..db5ef6438cdb 100644
--- a/deskutils/lightning/files/patch-xptcall-alpha
+++ b/deskutils/lightning/files/patch-xptcall-alpha
@@ -1,5 +1,5 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp	Tue May 27 01:37:00 2003
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp	Tue May 27 01:37:00 2003
 @@ -0,0 +1,184 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
@@ -185,8 +185,8 @@
 +    ".end XPTC_InvokeByIndex"
 +    );
 +
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig	Tue May 27 01:37:30 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp	Tue May 27 01:37:04 2003
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig	Tue May 27 01:37:30 2003
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp	Tue May 27 01:37:04 2003
 @@ -0,0 +1,269 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
diff --git a/deskutils/lightning/files/patch-xptcall-amd64 b/deskutils/lightning/files/patch-xptcall-amd64
index 3227cad02182..feb3452a20bc 100644
--- a/deskutils/lightning/files/patch-xptcall-amd64
+++ b/deskutils/lightning/files/patch-xptcall-amd64
@@ -1,5 +1,5 @@
 --- /dev/null	Wed Dec 31 16:00:00 1969
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp	Thu Oct 16 22:59:43 2003
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp	Thu Oct 16 22:59:43 2003
 @@ -0,0 +1,174 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +// Platform specific code to invoke XPCOM methods on native objects
@@ -176,7 +176,7 @@
 +    return result;
 +}
 --- /dev/null	Wed Dec 31 16:00:00 1969
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp	Thu Oct 16 23:01:08 2003
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp	Thu Oct 16 23:01:08 2003
 @@ -0,0 +1,206 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +
diff --git a/deskutils/lightning/files/patch-xptcall-ia64 b/deskutils/lightning/files/patch-xptcall-ia64
index 3e05a5c704b3..07a07b556482 100644
--- a/deskutils/lightning/files/patch-xptcall-ia64
+++ b/deskutils/lightning/files/patch-xptcall-ia64
@@ -1,5 +1,5 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig	Tue May 24 11:30:54 2005
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s	Mon Nov  7 23:10:28 2005
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig	Tue May 24 11:30:54 2005
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s	Mon Nov  7 23:10:28 2005
 @@ -6,6 +6,7 @@
  // Section has executable code
          .section .text, "ax","progbits"
diff --git a/deskutils/lightning/files/patch-xptcall-sparc64 b/deskutils/lightning/files/patch-xptcall-sparc64
index 9599a8a71336..bbf418dd3e2a 100644
--- a/deskutils/lightning/files/patch-xptcall-sparc64
+++ b/deskutils/lightning/files/patch-xptcall-sparc64
@@ -1,5 +1,5 @@
 --- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp	Mon May 26 04:12:55 2003
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp	Mon May 26 04:12:55 2003
 @@ -0,0 +1,123 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 + *
@@ -125,7 +125,7 @@
 +
 +#endif /* sparc || __sparc__ */
 --- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s	Mon May 26 04:06:09 2003
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s	Mon May 26 04:06:09 2003
 @@ -0,0 +1,104 @@
 +/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 + *
@@ -232,7 +232,7 @@
 +
 +        .size    XPTC_InvokeByIndex, .-XPTC_InvokeByIndex
 --- /dev/null	Mon May 26 14:00:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp	Mon May 26 14:00:49 2003
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp	Mon May 26 14:00:49 2003
 @@ -0,0 +1,91 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 + *
diff --git a/deskutils/lightning/files/releng6_pulseaudio b/deskutils/lightning/files/releng6_pulseaudio
new file mode 100644
index 000000000000..2b82f93201ca
--- /dev/null
+++ b/deskutils/lightning/files/releng6_pulseaudio
@@ -0,0 +1,66 @@
+--- 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	2009-08-20 21:45:20.000000000 +0200
++++ mozilla/toolkit/library/Makefile.in	2009-08-20 21:46:25.000000000 +0200
+@@ -228,12 +228,12 @@
+ endif
+ 
+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(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 \
diff --git a/deskutils/lightning/files/sunbird.desktop.in b/deskutils/lightning/files/sunbird.desktop.in
deleted file mode 100644
index e371a93f2cc5..000000000000
--- a/deskutils/lightning/files/sunbird.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Mozilla Calendar
-Comment=Mozilla Sunbird Calendar
-Icon=@SUNBIRD_ICON@
-Exec=sunbird
-Terminal=false
-Type=Application
-Categories=Application;Office;
diff --git a/deskutils/lightning/pkg-descr b/deskutils/lightning/pkg-descr
index f9995c9a993c..86f77f98b396 100644
--- a/deskutils/lightning/pkg-descr
+++ b/deskutils/lightning/pkg-descr
@@ -1,5 +1,6 @@
-The Sunbird Project is a redesign of the Mozilla Calendar component. The goal
-is to produce a cross platform standalone calendar application based on
-Mozilla's XUL user interface language.
+Lightning brings the Sunbird calendar to the popular email client, Mozilla
+Thunderbird and the SeaMonkey  internet application suite. Since it's an
+extension, Lightning is tightly integrated with Thunderbird or SeaMonkey,
+allowing it to easily perform email-related calendaring tasks. 
 
-WWW:	http://www.mozilla.org/projects/calendar/sunbird.html
+WWW:	http://www.mozilla.org/projects/calendar/lightning/
diff --git a/deskutils/lightning/pkg-message b/deskutils/lightning/pkg-message
new file mode 100644
index 000000000000..a0ba0dcc1b95
--- /dev/null
+++ b/deskutils/lightning/pkg-message
@@ -0,0 +1,9 @@
+*****************************************************************************
+In order to activate the Lightning extension, every user should install the 
+XPI file into his own profile via the menu:
+
+Tools -> Add-ons -> Install (for Thunderbird)
+- or -
+Tools -> Add-on Manager -> Install (for Seamonkey)
+
+*****************************************************************************
author	Beat Gaetzi <beat@FreeBSD.org>	2010-08-03 20:35:04 +0000
committer	Beat Gaetzi <beat@FreeBSD.org>	2010-08-03 20:35:04 +0000
commit	db20b8b870612dbf1301c70f834c70586bbbf6af (patch)
tree	25ad1261911879f7d18dc1bf09eb454a2b96b06c /deskutils
parent	2b03dc0f4df6ad68e8ed235aa148a43042764a95 (diff)
download	ports-db20b8b870612dbf1301c70f834c70586bbbf6af.tar.gz ports-db20b8b870612dbf1301c70f834c70586bbbf6af.zip