- Update to 7.0

- Remove DEPRECATED and EXPIRATION_DATE

3 files changed, 14 insertions, 235 deletions

diff --git a/mail/linux-thunderbird/Makefile b/mail/linux-thunderbird/Makefile
index e0e75d32e888..8347fc16b713 100644
--- a/mail/linux-thunderbird/Makefile
+++ b/mail/linux-thunderbird/Makefile
@@ -6,16 +6,13 @@
 #
 
 PORTNAME=	thunderbird
-PORTVERSION=	3.1.14
+PORTVERSION=	7.0
 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
 
-DEPRECATED=	Depends on www/seamonkey2, which is FORBIDDEN
-EXPIRATION_DATE=	2011-10-14
-
 USE_BZIP2=	yes
 
 USE_LINUX_APPS=	dbusglib dbuslibs alsalib
diff --git a/mail/linux-thunderbird/distinfo b/mail/linux-thunderbird/distinfo
index 202ef41ed093..85a1dcb944ac 100644
--- a/mail/linux-thunderbird/distinfo
+++ b/mail/linux-thunderbird/distinfo
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-3.1.14.tar.bz2) = d464034c58ee17701c8e9e5a32651106a3ca2ebbdd6a9b8869ac9c671b25f6c5
-SIZE (thunderbird-3.1.14.tar.bz2) = 11591114
+SHA256 (thunderbird-7.0.tar.bz2) = a6faa662633af6073893c3cb334f8d9a9cb49a68f59994e264fcd7bab83ebce7
+SIZE (thunderbird-7.0.tar.bz2) = 16304677
diff --git a/mail/linux-thunderbird/pkg-plist b/mail/linux-thunderbird/pkg-plist
index a0c3f3ba869d..883027b6fe12 100644
--- a/mail/linux-thunderbird/pkg-plist
+++ b/mail/linux-thunderbird/pkg-plist
@@ -4,115 +4,27 @@ lib/%%APP_NAME%%/README.txt
 lib/%%APP_NAME%%/Throbber-small.gif
 lib/%%APP_NAME%%/application.ini
 lib/%%APP_NAME%%/blocklist.xml
-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/gloda.jar
-lib/%%APP_NAME%%/chrome/gloda.manifest
+lib/%%APP_NAME%%/chrome.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
-lib/%%APP_NAME%%/chrome/newsblog.manifest
-lib/%%APP_NAME%%/chrome/pippki.jar
-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/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/jsmimeemitter.js
+lib/%%APP_NAME%%/components/binary.manifest
 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/libxpinstall.so
-lib/%%APP_NAME%%/components/mail.xpt
-lib/%%APP_NAME%%/components/mailContentHandler.js
-lib/%%APP_NAME%%/components/mdn-service.js
-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/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/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/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/nsWebHandlerApp.js
-lib/%%APP_NAME%%/components/offlineStartup.js
-lib/%%APP_NAME%%/components/pluginGlue.js
-lib/%%APP_NAME%%/components/smime-service.js
-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/mailViews.dat
-lib/%%APP_NAME%%/defaults/pref/all-l10n.js
-lib/%%APP_NAME%%/defaults/pref/all-thunderbird.js
 lib/%%APP_NAME%%/defaults/pref/channel-prefs.js
-lib/%%APP_NAME%%/defaults/pref/composer.js
-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/localstore.rdf
-lib/%%APP_NAME%%/defaults/profile/mimeTypes.rdf
-lib/%%APP_NAME%%/defaults/profile/prefs.js
 lib/%%APP_NAME%%/dictionaries/en-US.aff
 lib/%%APP_NAME%%/dictionaries/en-US.dic
+lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
 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%%/hyphenation/hyph_en_US.dic
 lib/%%APP_NAME%%/icons/updater.png
 lib/%%APP_NAME%%/isp/SpamAssassin.sfd
 lib/%%APP_NAME%%/isp/SpamPal.sfd
@@ -122,7 +34,8 @@ lib/%%APP_NAME%%/libfreebl3.chk
 lib/%%APP_NAME%%/libfreebl3.so
 lib/%%APP_NAME%%/libldap60.so
 lib/%%APP_NAME%%/libldif60.so
-lib/%%APP_NAME%%/libmozjs.so
+lib/%%APP_NAME%%/libmozalloc.so
+lib/%%APP_NAME%%/libmozsqlite3.so
 lib/%%APP_NAME%%/libnspr4.so
 lib/%%APP_NAME%%/libnss3.so
 lib/%%APP_NAME%%/libnssckbi.so
@@ -135,136 +48,15 @@ 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_core.so
-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%%/libxul.so
 lib/%%APP_NAME%%/mozilla-xremote-client
+lib/%%APP_NAME%%/omni.jar
 lib/%%APP_NAME%%/platform.ini
+lib/%%APP_NAME%%/plugin-container
+lib/%%APP_NAME%%/precomplete
 lib/%%APP_NAME%%/removed-files
-lib/%%APP_NAME%%/res/EditorOverride.css
-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/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/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
-lib/%%APP_NAME%%/res/table-add-column-before-active.gif
-lib/%%APP_NAME%%/res/table-add-column-before-hover.gif
-lib/%%APP_NAME%%/res/table-add-column-before.gif
-lib/%%APP_NAME%%/res/table-add-row-after-active.gif
-lib/%%APP_NAME%%/res/table-add-row-after-hover.gif
-lib/%%APP_NAME%%/res/table-add-row-after.gif
-lib/%%APP_NAME%%/res/table-add-row-before-active.gif
-lib/%%APP_NAME%%/res/table-add-row-before-hover.gif
-lib/%%APP_NAME%%/res/table-add-row-before.gif
-lib/%%APP_NAME%%/res/table-remove-column-active.gif
-lib/%%APP_NAME%%/res/table-remove-column-hover.gif
-lib/%%APP_NAME%%/res/table-remove-column.gif
-lib/%%APP_NAME%%/res/table-remove-row-active.gif
-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
@@ -275,24 +67,14 @@ lib/%%APP_NAME%%/updater.ini
 @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%%/modules/gloda
-@dirrm lib/%%APP_NAME%%/modules/activity
-@dirrm lib/%%APP_NAME%%/modules
 @dirrm lib/%%APP_NAME%%/isp
 @dirrm lib/%%APP_NAME%%/icons
-@dirrm lib/%%APP_NAME%%/greprefs
+@dirrm lib/%%APP_NAME%%/hyphenation
 @dirrm lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 @dirrm lib/%%APP_NAME%%/extensions
 @dirrm lib/%%APP_NAME%%/dictionaries
-@dirrm lib/%%APP_NAME%%/defaults/profile
 @dirrm lib/%%APP_NAME%%/defaults/pref
 @dirrm lib/%%APP_NAME%%/defaults/messenger
-@dirrm lib/%%APP_NAME%%/defaults/autoconfig
 @dirrm lib/%%APP_NAME%%/defaults
 @dirrm lib/%%APP_NAME%%/components
 @dirrm lib/%%APP_NAME%%/chrome/icons/default