- Update to 3.1

Feature safe:	yes

3 files changed, 164 insertions, 214 deletions

diff --git a/mail/linux-thunderbird/Makefile b/mail/linux-thunderbird/Makefile
index ee7f28c0387b..8feae339ac3c 100644
--- a/mail/linux-thunderbird/Makefile
+++ b/mail/linux-thunderbird/Makefile
@@ -6,13 +6,16 @@
 #
 
 PORTNAME=	thunderbird
-PORTVERSION=	2.0.0.24
-PORTREVISION=	1
+PORTVERSION=	3.1
 CATEGORIES=	mail
 MASTER_SITE_SUBDIR?=	${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
+USE_BZIP2=	yes
+
+USE_LINUX_APPS=	dbusglib dbuslibs alsalib
+
 .include "${.CURDIR}/../../www/linux-seamonkey/Makefile.common"
 .include <bsd.port.mk>
diff --git a/mail/linux-thunderbird/distinfo b/mail/linux-thunderbird/distinfo
index e2a71904db5a..49c4d366b8f8 100644
--- a/mail/linux-thunderbird/distinfo
+++ b/mail/linux-thunderbird/distinfo
@@ -1,3 +1,3 @@
-MD5 (thunderbird-2.0.0.24.tar.gz) = 39f58f71a0bfa820367b580e3d2f4b1e
-SHA256 (thunderbird-2.0.0.24.tar.gz) = 7878672b499526598c8f2d97f19f49e0b1ac25caa50be385a8006e90f071cd6f
-SIZE (thunderbird-2.0.0.24.tar.gz) = 11807027
+MD5 (thunderbird-3.1.tar.bz2) = 0baeb769f74cde972b7f22b09a453fbe
+SHA256 (thunderbird-3.1.tar.bz2) = 7e146da089b47fd3401605d7e081662106202042e39743469ab46b30778fc6d2
+SIZE (thunderbird-3.1.tar.bz2) = 11446854
diff --git a/mail/linux-thunderbird/pkg-plist b/mail/linux-thunderbird/pkg-plist
index 8fade23aa7ee..9ab0902aa0be 100644
--- a/mail/linux-thunderbird/pkg-plist
+++ b/mail/linux-thunderbird/pkg-plist
@@ -1,27 +1,22 @@
 bin/%%APP_NAME%%
 share/applications/%%APP_NAME%%.desktop
-lib/%%APP_NAME%%/libnssdbm3.so
-lib/%%APP_NAME%%/libnssutil3.so
-lib/%%APP_NAME%%/libsqlite3.so
-lib/%%APP_NAME%%/LICENSE.txt
 lib/%%APP_NAME%%/README.txt
-lib/%%APP_NAME%%/chrome/US.jar
+lib/%%APP_NAME%%/Throbber-small.gif
+lib/%%APP_NAME%%/application.ini
 lib/%%APP_NAME%%/chrome/classic.jar
 lib/%%APP_NAME%%/chrome/classic.manifest
 lib/%%APP_NAME%%/chrome/comm.jar
 lib/%%APP_NAME%%/chrome/comm.manifest
 lib/%%APP_NAME%%/chrome/en-US.jar
 lib/%%APP_NAME%%/chrome/en-US.manifest
-lib/%%APP_NAME%%/chrome/icons/default/abcardWindow.xpm
-lib/%%APP_NAME%%/chrome/icons/default/abcardWindow16.xpm
-lib/%%APP_NAME%%/chrome/icons/default/addressbookWindow.xpm
-lib/%%APP_NAME%%/chrome/icons/default/addressbookWindow16.xpm
-lib/%%APP_NAME%%/chrome/icons/default/default.xpm
-lib/%%APP_NAME%%/chrome/icons/default/messengerWindow.xpm
-lib/%%APP_NAME%%/chrome/icons/default/messengerWindow16.xpm
-lib/%%APP_NAME%%/chrome/icons/default/msgcomposeWindow.xpm
-lib/%%APP_NAME%%/chrome/icons/default/msgcomposeWindow16.xpm
-lib/%%APP_NAME%%/chrome/installed-chrome.txt
+lib/%%APP_NAME%%/chrome/gloda.jar
+lib/%%APP_NAME%%/chrome/gloda.manifest
+lib/%%APP_NAME%%/chrome/icons/default/default16.png
+lib/%%APP_NAME%%/chrome/icons/default/default22.png
+lib/%%APP_NAME%%/chrome/icons/default/default24.png
+lib/%%APP_NAME%%/chrome/icons/default/default256.png
+lib/%%APP_NAME%%/chrome/icons/default/default32.png
+lib/%%APP_NAME%%/chrome/icons/default/default48.png
 lib/%%APP_NAME%%/chrome/messenger.jar
 lib/%%APP_NAME%%/chrome/messenger.manifest
 lib/%%APP_NAME%%/chrome/newsblog.jar
@@ -31,182 +26,72 @@ lib/%%APP_NAME%%/chrome/pippki.manifest
 lib/%%APP_NAME%%/chrome/toolkit.jar
 lib/%%APP_NAME%%/chrome/toolkit.manifest
 lib/%%APP_NAME%%/components/FeedProcessor.js
-lib/%%APP_NAME%%/components/accessibility-atk.xpt
-lib/%%APP_NAME%%/components/accessibility.xpt
-lib/%%APP_NAME%%/components/addrbook.xpt
-lib/%%APP_NAME%%/components/alerts.xpt
-lib/%%APP_NAME%%/components/appshell.xpt
-lib/%%APP_NAME%%/components/appstartup.xpt
-lib/%%APP_NAME%%/components/autocomplete.xpt
-lib/%%APP_NAME%%/components/autoconfig.xpt
-lib/%%APP_NAME%%/components/bookmarks.xpt
-lib/%%APP_NAME%%/components/caps.xpt
-lib/%%APP_NAME%%/components/chardet.xpt
-lib/%%APP_NAME%%/components/chrome.xpt
-lib/%%APP_NAME%%/components/commandhandler.xpt
-lib/%%APP_NAME%%/components/commandlines.xpt
-lib/%%APP_NAME%%/components/composer.xpt
-lib/%%APP_NAME%%/components/content_base.xpt
-lib/%%APP_NAME%%/components/content_html.xpt
-lib/%%APP_NAME%%/components/content_htmldoc.xpt
-lib/%%APP_NAME%%/components/content_xmldoc.xpt
-lib/%%APP_NAME%%/components/content_xslt.xpt
-lib/%%APP_NAME%%/components/content_xtf.xpt
-lib/%%APP_NAME%%/components/docshell.xpt
-lib/%%APP_NAME%%/components/dom.xpt
-lib/%%APP_NAME%%/components/dom_base.xpt
-lib/%%APP_NAME%%/components/dom_canvas.xpt
-lib/%%APP_NAME%%/components/dom_core.xpt
-lib/%%APP_NAME%%/components/dom_css.xpt
-lib/%%APP_NAME%%/components/dom_events.xpt
-lib/%%APP_NAME%%/components/dom_html.xpt
-lib/%%APP_NAME%%/components/dom_loadsave.xpt
-lib/%%APP_NAME%%/components/dom_range.xpt
-lib/%%APP_NAME%%/components/dom_sidebar.xpt
-lib/%%APP_NAME%%/components/dom_storage.xpt
-lib/%%APP_NAME%%/components/dom_stylesheets.xpt
-lib/%%APP_NAME%%/components/dom_traversal.xpt
-lib/%%APP_NAME%%/components/dom_views.xpt
-lib/%%APP_NAME%%/components/dom_xbl.xpt
-lib/%%APP_NAME%%/components/dom_xpath.xpt
-lib/%%APP_NAME%%/components/dom_xul.xpt
-lib/%%APP_NAME%%/components/downloads.xpt
-lib/%%APP_NAME%%/components/editor.xpt
-lib/%%APP_NAME%%/components/embed_base.xpt
-lib/%%APP_NAME%%/components/extensions.xpt
-lib/%%APP_NAME%%/components/exthandler.xpt
-lib/%%APP_NAME%%/components/fastfind.xpt
-lib/%%APP_NAME%%/components/feeds.xpt
-lib/%%APP_NAME%%/components/filepicker.xpt
-lib/%%APP_NAME%%/components/find.xpt
-lib/%%APP_NAME%%/components/gfx.xpt
-lib/%%APP_NAME%%/components/history.xpt
-lib/%%APP_NAME%%/components/htmlparser.xpt
-lib/%%APP_NAME%%/components/imglib2.xpt
-lib/%%APP_NAME%%/components/impComm4xMail.xpt
-lib/%%APP_NAME%%/components/import.xpt
-lib/%%APP_NAME%%/components/inspector.xpt
-lib/%%APP_NAME%%/components/intl.xpt
-lib/%%APP_NAME%%/components/jar.xpt
+lib/%%APP_NAME%%/components/GPSDGeolocationProvider.js
+lib/%%APP_NAME%%/components/NetworkGeolocationProvider.js
+lib/%%APP_NAME%%/components/aboutRights.js
+lib/%%APP_NAME%%/components/components.list
+lib/%%APP_NAME%%/components/glautocomp.js
 lib/%%APP_NAME%%/components/jsconsole-clhandler.js
-lib/%%APP_NAME%%/components/jsconsole.xpt
-lib/%%APP_NAME%%/components/jsdservice.xpt
-lib/%%APP_NAME%%/components/layout_base.xpt
-lib/%%APP_NAME%%/components/layout_printing.xpt
-lib/%%APP_NAME%%/components/layout_xul.xpt
-lib/%%APP_NAME%%/components/layout_xul_tree.xpt
-lib/%%APP_NAME%%/components/libjar50.so
+lib/%%APP_NAME%%/components/jsmimeemitter.js
+lib/%%APP_NAME%%/components/libdbusservice.so
+lib/%%APP_NAME%%/components/libimgicon.so
 lib/%%APP_NAME%%/components/libjsd.so
 lib/%%APP_NAME%%/components/libmozgnome.so
-lib/%%APP_NAME%%/components/libmyspell.so
-lib/%%APP_NAME%%/components/libspellchecker.so
 lib/%%APP_NAME%%/components/libxpinstall.so
-lib/%%APP_NAME%%/components/locale.xpt
-lib/%%APP_NAME%%/components/lwbrk.xpt
-lib/%%APP_NAME%%/components/mailnews.xpt
-lib/%%APP_NAME%%/components/mailprofilemigration.xpt
-lib/%%APP_NAME%%/components/mailview.xpt
+lib/%%APP_NAME%%/components/mail.xpt
+lib/%%APP_NAME%%/components/mailContentHandler.js
 lib/%%APP_NAME%%/components/mdn-service.js
-lib/%%APP_NAME%%/components/mime.xpt
-lib/%%APP_NAME%%/components/mimetype.xpt
-lib/%%APP_NAME%%/components/mozbrwsr.xpt
-lib/%%APP_NAME%%/components/mozfind.xpt
-lib/%%APP_NAME%%/components/mozgnome.xpt
-lib/%%APP_NAME%%/components/mozldap.xpt
-lib/%%APP_NAME%%/components/msgbase.xpt
-lib/%%APP_NAME%%/components/msgcompose.xpt
-lib/%%APP_NAME%%/components/msgdb.xpt
-lib/%%APP_NAME%%/components/msgimap.xpt
-lib/%%APP_NAME%%/components/msglocal.xpt
-lib/%%APP_NAME%%/components/msgnews.xpt
-lib/%%APP_NAME%%/components/msgsearch.xpt
-lib/%%APP_NAME%%/components/msgsmime.xpt
-lib/%%APP_NAME%%/components/necko.xpt
-lib/%%APP_NAME%%/components/necko_about.xpt
-lib/%%APP_NAME%%/components/necko_cache.xpt
-lib/%%APP_NAME%%/components/necko_cookie.xpt
-lib/%%APP_NAME%%/components/necko_data.xpt
-lib/%%APP_NAME%%/components/necko_dns.xpt
-lib/%%APP_NAME%%/components/necko_file.xpt
-lib/%%APP_NAME%%/components/necko_ftp.xpt
-lib/%%APP_NAME%%/components/necko_http.xpt
-lib/%%APP_NAME%%/components/necko_res.xpt
-lib/%%APP_NAME%%/components/necko_socket.xpt
-lib/%%APP_NAME%%/components/necko_strconv.xpt
-lib/%%APP_NAME%%/components/necko_viewsource.xpt
+lib/%%APP_NAME%%/components/msgAsyncPrompter.js
 lib/%%APP_NAME%%/components/newsblog.js
+lib/%%APP_NAME%%/components/nsAbAutoCompleteMyDomain.js
+lib/%%APP_NAME%%/components/nsAbAutoCompleteSearch.js
 lib/%%APP_NAME%%/components/nsAbLDAPAttributeMap.js
-lib/%%APP_NAME%%/components/nsCloseAllWindows.js
-lib/%%APP_NAME%%/components/nsComposerCmdLineHandler.js
+lib/%%APP_NAME%%/components/nsActivity.js
+lib/%%APP_NAME%%/components/nsActivityManager.js
+lib/%%APP_NAME%%/components/nsActivityManagerUI.js
+lib/%%APP_NAME%%/components/nsAddonRepository.js
+lib/%%APP_NAME%%/components/nsBadCertHandler.js
+lib/%%APP_NAME%%/components/nsBlocklistService.js
+lib/%%APP_NAME%%/components/nsContentDispatchChooser.js
+lib/%%APP_NAME%%/components/nsContentPrefService.js
 lib/%%APP_NAME%%/components/nsDefaultCLH.js
+lib/%%APP_NAME%%/components/nsDownloadManagerUI.js
 lib/%%APP_NAME%%/components/nsExtensionManager.js
 lib/%%APP_NAME%%/components/nsFilePicker.js
+lib/%%APP_NAME%%/components/nsFormAutoComplete.js
+lib/%%APP_NAME%%/components/nsHandlerService.js
 lib/%%APP_NAME%%/components/nsHelperAppDlg.js
-lib/%%APP_NAME%%/components/nsInterfaceInfoToIDL.js
-lib/%%APP_NAME%%/components/nsLDAPPrefsService.js
+lib/%%APP_NAME%%/components/nsINIProcessor.js
+lib/%%APP_NAME%%/components/nsLDAPProtocolHandler.js
+lib/%%APP_NAME%%/components/nsLoginInfo.js
+lib/%%APP_NAME%%/components/nsLoginManager.js
+lib/%%APP_NAME%%/components/nsLoginManagerPrompter.js
 lib/%%APP_NAME%%/components/nsMailDefaultHandler.js
+lib/%%APP_NAME%%/components/nsMailNewsCommandLineHandler.js
+lib/%%APP_NAME%%/components/nsMsgTraitService.js
 lib/%%APP_NAME%%/components/nsPhishingProtectionApplication.js
-lib/%%APP_NAME%%/components/nsProgressDialog.js
 lib/%%APP_NAME%%/components/nsProxyAutoConfig.js
+lib/%%APP_NAME%%/components/nsSMTPProtocolHandler.js
 lib/%%APP_NAME%%/components/nsSetDefaultMail.js
+lib/%%APP_NAME%%/components/nsTryToClose.js
 lib/%%APP_NAME%%/components/nsURLFormatter.js
 lib/%%APP_NAME%%/components/nsUpdateService.js
+lib/%%APP_NAME%%/components/nsUpdateServiceStub.js
+lib/%%APP_NAME%%/components/nsUpdateTimerManager.js
 lib/%%APP_NAME%%/components/nsUrlClassifierLib.js
 lib/%%APP_NAME%%/components/nsUrlClassifierListManager.js
-lib/%%APP_NAME%%/components/nsUrlClassifierTable.js
+lib/%%APP_NAME%%/components/nsWebHandlerApp.js
 lib/%%APP_NAME%%/components/offlineStartup.js
-lib/%%APP_NAME%%/components/pipboot.xpt
-lib/%%APP_NAME%%/components/pipnss.xpt
-lib/%%APP_NAME%%/components/pippki.xpt
-lib/%%APP_NAME%%/components/pref.xpt
-lib/%%APP_NAME%%/components/prefetch.xpt
-lib/%%APP_NAME%%/components/profile.xpt
-lib/%%APP_NAME%%/components/progressDlg.xpt
-lib/%%APP_NAME%%/components/proxyObjInst.xpt
-lib/%%APP_NAME%%/components/rdf.xpt
-lib/%%APP_NAME%%/components/saxparser.xpt
-lib/%%APP_NAME%%/components/shellservice.xpt
-lib/%%APP_NAME%%/components/shistory.xpt
-lib/%%APP_NAME%%/components/signonviewer.xpt
+lib/%%APP_NAME%%/components/pluginGlue.js
 lib/%%APP_NAME%%/components/smime-service.js
-lib/%%APP_NAME%%/components/spellchecker.xpt
-lib/%%APP_NAME%%/components/storage.xpt
-lib/%%APP_NAME%%/components/toolkitprofile.xpt
-lib/%%APP_NAME%%/components/toolkitremote.xpt
-lib/%%APP_NAME%%/components/txmgr.xpt
-lib/%%APP_NAME%%/components/txtsvc.xpt
-lib/%%APP_NAME%%/components/uconv.xpt
-lib/%%APP_NAME%%/components/unicharutil.xpt
-lib/%%APP_NAME%%/components/update.xpt
-lib/%%APP_NAME%%/components/uriloader.xpt
-lib/%%APP_NAME%%/components/url-classifier.xpt
-lib/%%APP_NAME%%/components/urlformatter.xpt
-lib/%%APP_NAME%%/components/wallet.xpt
-lib/%%APP_NAME%%/components/walleteditor.xpt
-lib/%%APP_NAME%%/components/walletpreview.xpt
-lib/%%APP_NAME%%/components/webBrowser_core.xpt
-lib/%%APP_NAME%%/components/webbrowserpersist.xpt
-lib/%%APP_NAME%%/components/webshell_idls.xpt
-lib/%%APP_NAME%%/components/websrvcs.xpt
-lib/%%APP_NAME%%/components/widget.xpt
-lib/%%APP_NAME%%/components/windowds.xpt
-lib/%%APP_NAME%%/components/windowwatcher.xpt
-lib/%%APP_NAME%%/components/xpautocomplete.xpt
-lib/%%APP_NAME%%/components/xpcom_base.xpt
-lib/%%APP_NAME%%/components/xpcom_components.xpt
-lib/%%APP_NAME%%/components/xpcom_ds.xpt
-lib/%%APP_NAME%%/components/xpcom_io.xpt
-lib/%%APP_NAME%%/components/xpcom_obsolete.xpt
-lib/%%APP_NAME%%/components/xpcom_threads.xpt
-lib/%%APP_NAME%%/components/xpcom_xpti.xpt
-lib/%%APP_NAME%%/components/xpconnect.xpt
-lib/%%APP_NAME%%/components/xpinstall.xpt
-lib/%%APP_NAME%%/components/xulapp.xpt
-lib/%%APP_NAME%%/components/xuldoc.xpt
-lib/%%APP_NAME%%/components/xultmpl.xpt
+lib/%%APP_NAME%%/components/steelApplication.js
+lib/%%APP_NAME%%/components/storage-Legacy.js
+lib/%%APP_NAME%%/components/storage-mozStorage.js
+lib/%%APP_NAME%%/components/txEXSLTRegExFunctions.js
+lib/%%APP_NAME%%/crashreporter
+lib/%%APP_NAME%%/crashreporter.ini
 lib/%%APP_NAME%%/defaults/autoconfig/platform.js
 lib/%%APP_NAME%%/defaults/autoconfig/prefcalls.js
-lib/%%APP_NAME%%/defaults/messenger/US/mailViews.dat
 lib/%%APP_NAME%%/defaults/messenger/mailViews.dat
 lib/%%APP_NAME%%/defaults/pref/all-l10n.js
 lib/%%APP_NAME%%/defaults/pref/all-thunderbird.js
@@ -216,83 +101,148 @@ lib/%%APP_NAME%%/defaults/pref/mailnews.js
 lib/%%APP_NAME%%/defaults/pref/mdn.js
 lib/%%APP_NAME%%/defaults/pref/smime.js
 lib/%%APP_NAME%%/defaults/pref/thunderbird-branding.js
-lib/%%APP_NAME%%/defaults/profile/US/localstore.rdf
-lib/%%APP_NAME%%/defaults/profile/US/mimeTypes.rdf
 lib/%%APP_NAME%%/defaults/profile/localstore.rdf
 lib/%%APP_NAME%%/defaults/profile/mimeTypes.rdf
 lib/%%APP_NAME%%/defaults/profile/prefs.js
-lib/%%APP_NAME%%/defaults/wallet/DistinguishedSchema.tbl
-lib/%%APP_NAME%%/defaults/wallet/FieldSchema.tbl
-lib/%%APP_NAME%%/defaults/wallet/PositionalSchema.tbl
-lib/%%APP_NAME%%/defaults/wallet/SchemaConcat.tbl
-lib/%%APP_NAME%%/defaults/wallet/SchemaStrings.tbl
-lib/%%APP_NAME%%/defaults/wallet/StateSchema.tbl
-lib/%%APP_NAME%%/defaults/wallet/VcardSchema.tbl
-lib/%%APP_NAME%%/dependentlibs.list
 lib/%%APP_NAME%%/dictionaries/en-US.aff
 lib/%%APP_NAME%%/dictionaries/en-US.dic
-lib/%%APP_NAME%%/extensions/talkback@mozilla.org/chrome.manifest
-lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/libqfaservices.so
-lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/qfaservices.xpt
-lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/talkback/XTalkback.ad
-lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/talkback/master.ini
-lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/talkback/talkback
-lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/talkback/talkback.so
-lib/%%APP_NAME%%/extensions/talkback@mozilla.org/install.rdf
+lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
 lib/%%APP_NAME%%/greprefs/all.js
 lib/%%APP_NAME%%/greprefs/security-prefs.js
 lib/%%APP_NAME%%/greprefs/xpinstall.js
-lib/%%APP_NAME%%/icons/mozicon16.xpm
-lib/%%APP_NAME%%/icons/mozicon50.xpm
-lib/%%APP_NAME%%/init.d/README
+lib/%%APP_NAME%%/icons/updater.png
 lib/%%APP_NAME%%/isp/SpamAssassin.sfd
 lib/%%APP_NAME%%/isp/SpamPal.sfd
-lib/%%APP_NAME%%/isp/en-US/gmail.rdf
 lib/%%APP_NAME%%/isp/movemail.rdf
 lib/%%APP_NAME%%/isp/rss.rdf
 lib/%%APP_NAME%%/libfreebl3.chk
 lib/%%APP_NAME%%/libfreebl3.so
-lib/%%APP_NAME%%/libldap50.so
+lib/%%APP_NAME%%/libldap60.so
+lib/%%APP_NAME%%/libldif60.so
 lib/%%APP_NAME%%/libmozjs.so
 lib/%%APP_NAME%%/libnspr4.so
 lib/%%APP_NAME%%/libnss3.so
 lib/%%APP_NAME%%/libnssckbi.so
+lib/%%APP_NAME%%/libnssdbm3.chk
+lib/%%APP_NAME%%/libnssdbm3.so
+lib/%%APP_NAME%%/libnssutil3.so
 lib/%%APP_NAME%%/libplc4.so
 lib/%%APP_NAME%%/libplds4.so
-lib/%%APP_NAME%%/libprldap50.so
+lib/%%APP_NAME%%/libprldap60.so
 lib/%%APP_NAME%%/libsmime3.so
 lib/%%APP_NAME%%/libsoftokn3.chk
 lib/%%APP_NAME%%/libsoftokn3.so
+lib/%%APP_NAME%%/libsqlite3.so
 lib/%%APP_NAME%%/libssl3.so
 lib/%%APP_NAME%%/libxpcom.so
-lib/%%APP_NAME%%/libxpcom_compat.so
 lib/%%APP_NAME%%/libxpcom_core.so
-lib/%%APP_NAME%%/libxpistub.so
-lib/%%APP_NAME%%/license.html
-lib/%%APP_NAME%%/mozilla-installer-bin
+lib/%%APP_NAME%%/modules/CertUtils.jsm
+lib/%%APP_NAME%%/modules/CrashSubmit.jsm
+lib/%%APP_NAME%%/modules/DownloadLastDir.jsm
+lib/%%APP_NAME%%/modules/DownloadUtils.jsm
+lib/%%APP_NAME%%/modules/FileUtils.jsm
+lib/%%APP_NAME%%/modules/IOUtils.js
+lib/%%APP_NAME%%/modules/ISO8601DateUtils.jsm
+lib/%%APP_NAME%%/modules/LightweightThemeConsumer.jsm
+lib/%%APP_NAME%%/modules/LightweightThemeManager.jsm
+lib/%%APP_NAME%%/modules/MailConsts.js
+lib/%%APP_NAME%%/modules/MailUtils.js
+lib/%%APP_NAME%%/modules/Microformats.js
+lib/%%APP_NAME%%/modules/MsgHdrSyntheticView.js
+lib/%%APP_NAME%%/modules/NetUtil.jsm
+lib/%%APP_NAME%%/modules/PluralForm.jsm
+lib/%%APP_NAME%%/modules/SearchIntegration.js
+lib/%%APP_NAME%%/modules/SpatialNavigation.js
+lib/%%APP_NAME%%/modules/StringBundle.js
+lib/%%APP_NAME%%/modules/WindowDraggingUtils.jsm
+lib/%%APP_NAME%%/modules/XPCOMUtils.jsm
+lib/%%APP_NAME%%/modules/activity/activityModules.js
+lib/%%APP_NAME%%/modules/activity/alertHook.js
+lib/%%APP_NAME%%/modules/activity/autosync.js
+lib/%%APP_NAME%%/modules/activity/glodaIndexer.js
+lib/%%APP_NAME%%/modules/activity/moveCopy.js
+lib/%%APP_NAME%%/modules/activity/pop3Download.js
+lib/%%APP_NAME%%/modules/activity/sendLater.js
+lib/%%APP_NAME%%/modules/appIdleManager.js
+lib/%%APP_NAME%%/modules/attachmentChecker.js
+lib/%%APP_NAME%%/modules/ctypes.jsm
+lib/%%APP_NAME%%/modules/dbViewWrapper.js
+lib/%%APP_NAME%%/modules/debug.js
+lib/%%APP_NAME%%/modules/errUtils.js
+lib/%%APP_NAME%%/modules/folderUtils.jsm
+lib/%%APP_NAME%%/modules/gloda/collection.js
+lib/%%APP_NAME%%/modules/gloda/connotent.js
+lib/%%APP_NAME%%/modules/gloda/databind.js
+lib/%%APP_NAME%%/modules/gloda/datamodel.js
+lib/%%APP_NAME%%/modules/gloda/datastore.js
+lib/%%APP_NAME%%/modules/gloda/dbview.js
+lib/%%APP_NAME%%/modules/gloda/everybody.js
+lib/%%APP_NAME%%/modules/gloda/explattr.js
+lib/%%APP_NAME%%/modules/gloda/facet.js
+lib/%%APP_NAME%%/modules/gloda/fundattr.js
+lib/%%APP_NAME%%/modules/gloda/gloda.js
+lib/%%APP_NAME%%/modules/gloda/index_ab.js
+lib/%%APP_NAME%%/modules/gloda/index_msg.js
+lib/%%APP_NAME%%/modules/gloda/indexer.js
+lib/%%APP_NAME%%/modules/gloda/log4moz.js
+lib/%%APP_NAME%%/modules/gloda/mimeTypeCategories.js
+lib/%%APP_NAME%%/modules/gloda/mimemsg.js
+lib/%%APP_NAME%%/modules/gloda/msg_search.js
+lib/%%APP_NAME%%/modules/gloda/noun_freetag.js
+lib/%%APP_NAME%%/modules/gloda/noun_mimetype.js
+lib/%%APP_NAME%%/modules/gloda/noun_tag.js
+lib/%%APP_NAME%%/modules/gloda/public.js
+lib/%%APP_NAME%%/modules/gloda/query.js
+lib/%%APP_NAME%%/modules/gloda/suffixtree.js
+lib/%%APP_NAME%%/modules/gloda/utils.js
+lib/%%APP_NAME%%/modules/iteratorUtils.jsm
+lib/%%APP_NAME%%/modules/jsTreeSelection.js
+lib/%%APP_NAME%%/modules/mailMigrator.js
+lib/%%APP_NAME%%/modules/mailViewManager.js
+lib/%%APP_NAME%%/modules/mailnewsMigrator.js
+lib/%%APP_NAME%%/modules/quickFilterManager.js
+lib/%%APP_NAME%%/modules/searchSpec.js
+lib/%%APP_NAME%%/modules/sessionStoreManager.js
+lib/%%APP_NAME%%/modules/templateUtils.js
+lib/%%APP_NAME%%/modules/traceHelper.js
+lib/%%APP_NAME%%/modules/virtualFolderWrapper.js
 lib/%%APP_NAME%%/mozilla-xremote-client
+lib/%%APP_NAME%%/platform.ini
 lib/%%APP_NAME%%/removed-files
 lib/%%APP_NAME%%/res/EditorOverride.css
-lib/%%APP_NAME%%/res/broken-image.gif
+lib/%%APP_NAME%%/res/arrow.gif
+lib/%%APP_NAME%%/res/arrowd.gif
+lib/%%APP_NAME%%/res/broken-image.png
 lib/%%APP_NAME%%/res/charsetData.properties
 lib/%%APP_NAME%%/res/charsetalias.properties
+lib/%%APP_NAME%%/res/contenteditable.css
+lib/%%APP_NAME%%/res/designmode.css
+lib/%%APP_NAME%%/res/dtd/mathml.dtd
 lib/%%APP_NAME%%/res/dtd/xhtml11.dtd
 lib/%%APP_NAME%%/res/entityTables/html40Latin1.properties
 lib/%%APP_NAME%%/res/entityTables/html40Special.properties
 lib/%%APP_NAME%%/res/entityTables/html40Symbols.properties
 lib/%%APP_NAME%%/res/entityTables/htmlEntityVersions.properties
+lib/%%APP_NAME%%/res/entityTables/mathml20.properties
 lib/%%APP_NAME%%/res/entityTables/transliterate.properties
-lib/%%APP_NAME%%/res/fonts/fontEncoding.properties
-lib/%%APP_NAME%%/res/fonts/pangoFontEncoding.properties
+lib/%%APP_NAME%%/res/fonts/mathfont.properties
+lib/%%APP_NAME%%/res/fonts/mathfontSTIXNonUnicode.properties
+lib/%%APP_NAME%%/res/fonts/mathfontSTIXSize1.properties
+lib/%%APP_NAME%%/res/fonts/mathfontStandardSymbolsL.properties
+lib/%%APP_NAME%%/res/fonts/mathfontUnicode.properties
 lib/%%APP_NAME%%/res/forms.css
 lib/%%APP_NAME%%/res/grabber.gif
 lib/%%APP_NAME%%/res/hiddenWindow.html
 lib/%%APP_NAME%%/res/html.css
+lib/%%APP_NAME%%/res/html/folder.png
 lib/%%APP_NAME%%/res/langGroups.properties
 lib/%%APP_NAME%%/res/language.properties
+lib/%%APP_NAME%%/res/loading-image.png
+lib/%%APP_NAME%%/res/mathml.css
 lib/%%APP_NAME%%/res/quirk.css
-lib/%%APP_NAME%%/res/sample.unixpsfonts.properties
+lib/%%APP_NAME%%/res/svg.css
 lib/%%APP_NAME%%/res/table-add-column-after-active.gif
 lib/%%APP_NAME%%/res/table-add-column-after-hover.gif
 lib/%%APP_NAME%%/res/table-add-column-after.gif
@@ -313,36 +263,33 @@ lib/%%APP_NAME%%/res/table-remove-row-hover.gif
 lib/%%APP_NAME%%/res/table-remove-row.gif
 lib/%%APP_NAME%%/res/ua.css
 lib/%%APP_NAME%%/res/unixcharset.properties
+lib/%%APP_NAME%%/res/viewsource.css
 lib/%%APP_NAME%%/run-mozilla.sh
 lib/%%APP_NAME%%/thunderbird
 lib/%%APP_NAME%%/thunderbird-bin
+lib/%%APP_NAME%%/update.locale
 lib/%%APP_NAME%%/updater
 lib/%%APP_NAME%%/updater.ini
-lib/%%APP_NAME%%/xpicleanup
 @exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true
 @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true
 @unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/  -depth 1 -type l -delete 2>/dev/null || true
 @unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/  -depth 1 -type l -delete 2>/dev/null || true
+@dirrm lib/%%APP_NAME%%/res/html
 @dirrm lib/%%APP_NAME%%/res/fonts
 @dirrm lib/%%APP_NAME%%/res/entityTables
 @dirrm lib/%%APP_NAME%%/res/dtd
 @dirrm lib/%%APP_NAME%%/res
-@dirrm lib/%%APP_NAME%%/isp/en-US
+@dirrm lib/%%APP_NAME%%/modules/gloda
+@dirrm lib/%%APP_NAME%%/modules/activity
+@dirrm lib/%%APP_NAME%%/modules
 @dirrm lib/%%APP_NAME%%/isp
-@dirrm lib/%%APP_NAME%%/init.d
 @dirrm lib/%%APP_NAME%%/icons
 @dirrm lib/%%APP_NAME%%/greprefs
 @dirrm lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-@dirrm lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/talkback
-@dirrm lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components
-@dirrm lib/%%APP_NAME%%/extensions/talkback@mozilla.org
 @dirrm lib/%%APP_NAME%%/extensions
 @dirrm lib/%%APP_NAME%%/dictionaries
-@dirrm lib/%%APP_NAME%%/defaults/wallet
-@dirrm lib/%%APP_NAME%%/defaults/profile/US
 @dirrm lib/%%APP_NAME%%/defaults/profile
 @dirrm lib/%%APP_NAME%%/defaults/pref
-@dirrm lib/%%APP_NAME%%/defaults/messenger/US
 @dirrm lib/%%APP_NAME%%/defaults/messenger
 @dirrm lib/%%APP_NAME%%/defaults/autoconfig
 @dirrm lib/%%APP_NAME%%/defaults