- Update Firefox to 7.0

Thanks to:	flo@ for preparing the www/firefox update

3 files changed, 12 insertions, 183 deletions

diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile
index 3a47a0794c3b..ea37d71db2da 100644
--- a/www/linux-firefox/Makefile
+++ b/www/linux-firefox/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	3.6.22
+PORTVERSION=	7.0
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITE_SUBDIR?=	firefox/releases/${PORTVERSION}/linux-i686/en-US
diff --git a/www/linux-firefox/distinfo b/www/linux-firefox/distinfo
index 6d2466a143da..2a12d3a7b51f 100644
--- a/www/linux-firefox/distinfo
+++ b/www/linux-firefox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-3.6.22.tar.bz2) = 0c86e329c3b619215008c6294637399e26bc2049c879792126e10e68373a85ef
-SIZE (firefox-3.6.22.tar.bz2) = 10772079
+SHA256 (firefox-7.0.tar.bz2) = 889f7dcc9b0f120222a94cec7f401d3643e842cc7aa75eaf5bb3edc0ca3aa9c3
+SIZE (firefox-7.0.tar.bz2) = 15254511
diff --git a/www/linux-firefox/pkg-plist b/www/linux-firefox/pkg-plist
index 2bd95b1495eb..6554210fbf89 100644
--- a/www/linux-firefox/pkg-plist
+++ b/www/linux-firefox/pkg-plist
@@ -1,107 +1,23 @@
 bin/%%APP_NAME%%
 share/applications/%%APP_NAME%%.desktop
-lib/%%APP_NAME%%/.autoreg
-lib/%%APP_NAME%%/LICENSE
 lib/%%APP_NAME%%/README.txt
 lib/%%APP_NAME%%/Throbber-small.gif
 lib/%%APP_NAME%%/application.ini
 lib/%%APP_NAME%%/blocklist.xml
-lib/%%APP_NAME%%/browserconfig.properties
-lib/%%APP_NAME%%/chrome/browser.jar
-lib/%%APP_NAME%%/chrome/browser.manifest
-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.manifest
 lib/%%APP_NAME%%/chrome/icons/default/default16.png
 lib/%%APP_NAME%%/chrome/icons/default/default32.png
 lib/%%APP_NAME%%/chrome/icons/default/default48.png
-lib/%%APP_NAME%%/chrome/pippki.jar
-lib/%%APP_NAME%%/chrome/pippki.manifest
-lib/%%APP_NAME%%/chrome/reporter.jar
-lib/%%APP_NAME%%/chrome/reporter.manifest
-lib/%%APP_NAME%%/chrome/toolkit.jar
-lib/%%APP_NAME%%/chrome/toolkit.manifest
-lib/%%APP_NAME%%/components/FeedConverter.js
-lib/%%APP_NAME%%/components/FeedProcessor.js
-lib/%%APP_NAME%%/components/FeedWriter.js
-lib/%%APP_NAME%%/components/GPSDGeolocationProvider.js
-lib/%%APP_NAME%%/components/NetworkGeolocationProvider.js
-lib/%%APP_NAME%%/components/WebContentConverter.js
-lib/%%APP_NAME%%/components/browser.xpt
-lib/%%APP_NAME%%/components/components.list
-lib/%%APP_NAME%%/components/fuelApplication.js
-lib/%%APP_NAME%%/components/jsconsole-clhandler.js
+lib/%%APP_NAME%%/components/binary.manifest
 lib/%%APP_NAME%%/components/libbrowsercomps.so
-lib/%%APP_NAME%%/components/libbrowserdirprovider.so
 lib/%%APP_NAME%%/components/libdbusservice.so
-lib/%%APP_NAME%%/components/libimgicon.so
 lib/%%APP_NAME%%/components/libmozgnome.so
 lib/%%APP_NAME%%/components/libnkgnomevfs.so
-lib/%%APP_NAME%%/components/nsAddonRepository.js
-lib/%%APP_NAME%%/components/nsBadCertHandler.js
-lib/%%APP_NAME%%/components/nsBlocklistService.js
-lib/%%APP_NAME%%/components/nsBrowserContentHandler.js
-lib/%%APP_NAME%%/components/nsBrowserGlue.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/nsLivemarkService.js
-lib/%%APP_NAME%%/components/nsLoginInfo.js
-lib/%%APP_NAME%%/components/nsLoginManager.js
-lib/%%APP_NAME%%/components/nsLoginManagerPrompter.js
-lib/%%APP_NAME%%/components/nsMicrosummaryService.js
-lib/%%APP_NAME%%/components/nsPlacesAutoComplete.js
-lib/%%APP_NAME%%/components/nsPlacesDBFlush.js
-lib/%%APP_NAME%%/components/nsPlacesTransactionsService.js
-lib/%%APP_NAME%%/components/nsPrivateBrowsingService.js
-lib/%%APP_NAME%%/components/nsProxyAutoConfig.js
-lib/%%APP_NAME%%/components/nsSafebrowsingApplication.js
-lib/%%APP_NAME%%/components/nsSearchService.js
-lib/%%APP_NAME%%/components/nsSearchSuggestions.js
-lib/%%APP_NAME%%/components/nsSessionStartup.js
-lib/%%APP_NAME%%/components/nsSessionStore.js
-lib/%%APP_NAME%%/components/nsSetDefaultBrowser.js
-lib/%%APP_NAME%%/components/nsSidebar.js
-lib/%%APP_NAME%%/components/nsTaggingService.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/pluginGlue.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-override.ini
 lib/%%APP_NAME%%/crashreporter.ini
-lib/%%APP_NAME%%/defaults/autoconfig/platform.js
-lib/%%APP_NAME%%/defaults/autoconfig/prefcalls.js
 lib/%%APP_NAME%%/defaults/pref/browser-prefs.js
 lib/%%APP_NAME%%/defaults/pref/channel-prefs.js
-lib/%%APP_NAME%%/defaults/pref/firefox-branding.js
-lib/%%APP_NAME%%/defaults/pref/firefox-l10n.js
-lib/%%APP_NAME%%/defaults/pref/firefox.js
-lib/%%APP_NAME%%/defaults/pref/reporter.js
-lib/%%APP_NAME%%/defaults/profile/bookmarks.html
-lib/%%APP_NAME%%/defaults/profile/chrome/userChrome-example.css
-lib/%%APP_NAME%%/defaults/profile/chrome/userContent-example.css
-lib/%%APP_NAME%%/defaults/profile/localstore.rdf
-lib/%%APP_NAME%%/defaults/profile/mimeTypes.rdf
-lib/%%APP_NAME%%/defaults/profile/prefs.js
 lib/%%APP_NAME%%/dependentlibs.list
 lib/%%APP_NAME%%/dictionaries/en-US.aff
 lib/%%APP_NAME%%/dictionaries/en-US.dic
@@ -110,15 +26,13 @@ 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%%/firefox
 lib/%%APP_NAME%%/firefox-bin
-lib/%%APP_NAME%%/greprefs/all.js
-lib/%%APP_NAME%%/greprefs/security-prefs.js
-lib/%%APP_NAME%%/greprefs/xpinstall.js
-lib/%%APP_NAME%%/icons/document.png
+lib/%%APP_NAME%%/hyphenation/hyph_en_US.dic
 lib/%%APP_NAME%%/icons/mozicon128.png
 lib/%%APP_NAME%%/icons/updater.png
 lib/%%APP_NAME%%/libfreebl3.chk
 lib/%%APP_NAME%%/libfreebl3.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
@@ -130,93 +44,18 @@ lib/%%APP_NAME%%/libplds4.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%%/libxul.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/ISO8601DateUtils.jsm
-lib/%%APP_NAME%%/modules/LightweightThemeConsumer.jsm
-lib/%%APP_NAME%%/modules/LightweightThemeManager.jsm
-lib/%%APP_NAME%%/modules/Microformats.js
-lib/%%APP_NAME%%/modules/NetUtil.jsm
-lib/%%APP_NAME%%/modules/NetworkPrioritizer.jsm
-lib/%%APP_NAME%%/modules/PlacesDBUtils.jsm
-lib/%%APP_NAME%%/modules/PluralForm.jsm
-lib/%%APP_NAME%%/modules/SpatialNavigation.js
-lib/%%APP_NAME%%/modules/WindowDraggingUtils.jsm
-lib/%%APP_NAME%%/modules/XPCOMUtils.jsm
-lib/%%APP_NAME%%/modules/ctypes.jsm
-lib/%%APP_NAME%%/modules/debug.js
-lib/%%APP_NAME%%/modules/distribution.js
-lib/%%APP_NAME%%/modules/openLocationLastURL.jsm
-lib/%%APP_NAME%%/modules/utils.js
 lib/%%APP_NAME%%/mozilla-xremote-client
+lib/%%APP_NAME%%/omni.jar
 lib/%%APP_NAME%%/platform.ini
 lib/%%APP_NAME%%/plugin-container
-lib/%%APP_NAME%%/plugins/libnullplugin.so
+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%%/searchplugins/amazondotcom.xml
-lib/%%APP_NAME%%/searchplugins/answers.xml
-lib/%%APP_NAME%%/searchplugins/creativecommons.xml
+lib/%%APP_NAME%%/searchplugins/bing.xml
 lib/%%APP_NAME%%/searchplugins/eBay.xml
 lib/%%APP_NAME%%/searchplugins/google.xml
 lib/%%APP_NAME%%/searchplugins/wikipedia.xml
@@ -229,22 +68,12 @@ lib/%%APP_NAME%%/updater.ini
 @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%%/searchplugins
-@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%%/plugins
-@dirrm lib/%%APP_NAME%%/modules
 @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/chrome
-@dirrm lib/%%APP_NAME%%/defaults/profile
 @dirrm lib/%%APP_NAME%%/defaults/pref
-@dirrm lib/%%APP_NAME%%/defaults/autoconfig
 @dirrm lib/%%APP_NAME%%/defaults
 @dirrm lib/%%APP_NAME%%/components
 @dirrm lib/%%APP_NAME%%/chrome/icons/default