3 files changed, 78 insertions, 52 deletions

diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile
index 7aa73cdde594..ffc84284f709 100644
--- a/www/linux-firefox/Makefile
+++ b/www/linux-firefox/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	3.0.19
+PORTVERSION=	3.6.6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITE_SUBDIR?=	firefox/releases/${PORTVERSION}/linux-i686/en-US
@@ -17,5 +17,7 @@ COMMENT=	Web browser based on the browser portion of Mozilla
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 
+USE_LINUX_APPS=	dbusglib dbuslibs alsalib
+
 .include "${.CURDIR}/../linux-seamonkey/Makefile.common"
 .include <bsd.port.mk>
diff --git a/www/linux-firefox/distinfo b/www/linux-firefox/distinfo
index 9e1ca78d4d27..19a5a0548c8e 100644
--- a/www/linux-firefox/distinfo
+++ b/www/linux-firefox/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-3.0.19.tar.bz2) = 563e56569a8bc1ab4bd864be41403256
-SHA256 (firefox-3.0.19.tar.bz2) = d8c49bddb7de713ea8b537ddb581ecc1eaceab7c71ce2bf82147efa67056e359
-SIZE (firefox-3.0.19.tar.bz2) = 9167549
+MD5 (firefox-3.6.6.tar.bz2) = 310db218fe439fee0d7ba51021b99e0e
+SHA256 (firefox-3.6.6.tar.bz2) = 71236911bc783290799b8eb37dd3bc4c8b06c507d14ea0dd0375f9e66eac548c
+SIZE (firefox-3.6.6.tar.bz2) = 10621895
diff --git a/www/linux-firefox/pkg-plist b/www/linux-firefox/pkg-plist
index c9f407219885..adadbc5ec16a 100644
--- a/www/linux-firefox/pkg-plist
+++ b/www/linux-firefox/pkg-plist
@@ -1,20 +1,12 @@
 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%%/crashreporter
-lib/%%APP_NAME%%/crashreporter.ini
-lib/%%APP_NAME%%/crashreporter-override.ini
-lib/%%APP_NAME%%/libjemalloc.so
-lib/%%APP_NAME%%/libnssdbm3.so
-lib/%%APP_NAME%%/libnssutil3.so
-lib/%%APP_NAME%%/libsqlite3.so
-lib/%%APP_NAME%%/libxul.so
-lib/%%APP_NAME%%/platform.ini
-lib/%%APP_NAME%%/Throbber-small.gif
-lib/%%APP_NAME%%/README.txt
 lib/%%APP_NAME%%/chrome/browser.jar
 lib/%%APP_NAME%%/chrome/browser.manifest
 lib/%%APP_NAME%%/chrome/classic.jar
@@ -35,14 +27,15 @@ 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/aboutRights.js
-lib/%%APP_NAME%%/components/aboutRobots.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/libbrowserdirprovider.so
 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
@@ -58,14 +51,19 @@ 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
@@ -78,12 +76,18 @@ 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
@@ -100,7 +104,9 @@ 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}/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%%/firefox
 lib/%%APP_NAME%%/firefox-bin
 lib/%%APP_NAME%%/greprefs/all.js
@@ -108,38 +114,55 @@ lib/%%APP_NAME%%/greprefs/security-prefs.js
 lib/%%APP_NAME%%/greprefs/xpinstall.js
 lib/%%APP_NAME%%/icons/document.png
 lib/%%APP_NAME%%/icons/mozicon128.png
-lib/%%APP_NAME%%/icons/mozicon16.xpm
-lib/%%APP_NAME%%/icons/mozicon50.xpm
+lib/%%APP_NAME%%/icons/updater.png
 lib/%%APP_NAME%%/libfreebl3.chk
 lib/%%APP_NAME%%/libfreebl3.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%%/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%%/mozilla-xremote-client
-lib/%%APP_NAME%%/old-homepage-default.properties
-lib/%%APP_NAME%%/plugins/libnullplugin.so
-lib/%%APP_NAME%%/removed-files
-lib/%%APP_NAME%%/modules/utils.js
-lib/%%APP_NAME%%/modules/Microformats.js
+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/JSON.jsm
-lib/%%APP_NAME%%/modules/distribution.js
-lib/%%APP_NAME%%/modules/debug.js
+lib/%%APP_NAME%%/modules/SpatialNavigation.js
+lib/%%APP_NAME%%/modules/WindowDraggingUtils.jsm
 lib/%%APP_NAME%%/modules/XPCOMUtils.jsm
-lib/%%APP_NAME%%/modules/DownloadUtils.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%%/platform.ini
+lib/%%APP_NAME%%/plugin-container
+lib/%%APP_NAME%%/plugins/libnullplugin.so
+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.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
@@ -164,7 +187,7 @@ 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.gif
+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
@@ -195,35 +218,36 @@ lib/%%APP_NAME%%/searchplugins/answers.xml
 lib/%%APP_NAME%%/searchplugins/creativecommons.xml
 lib/%%APP_NAME%%/searchplugins/eBay.xml
 lib/%%APP_NAME%%/searchplugins/google.xml
-lib/%%APP_NAME%%/searchplugins/yahoo.xml
 lib/%%APP_NAME%%/searchplugins/wikipedia.xml
+lib/%%APP_NAME%%/searchplugins/yahoo.xml
+lib/%%APP_NAME%%/update.locale
 lib/%%APP_NAME%%/updater
 lib/%%APP_NAME%%/updater.ini
 @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%%/chrome/icons/default
-@dirrm lib/%%APP_NAME%%/chrome/icons
-@dirrm lib/%%APP_NAME%%/chrome
-@dirrm lib/%%APP_NAME%%/components
-@dirrm lib/%%APP_NAME%%/defaults/autoconfig
-@dirrm lib/%%APP_NAME%%/defaults/pref
+@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%%/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%%/dictionaries
-@dirrm lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-@dirrm lib/%%APP_NAME%%/extensions
-@dirrm lib/%%APP_NAME%%/greprefs
-@dirrm lib/%%APP_NAME%%/icons
-@dirrm lib/%%APP_NAME%%/modules
-@dirrm lib/%%APP_NAME%%/plugins
-@dirrm lib/%%APP_NAME%%/res/dtd
-@dirrm lib/%%APP_NAME%%/res/entityTables
-@dirrm lib/%%APP_NAME%%/res/fonts
-@dirrm lib/%%APP_NAME%%/res/html
-@dirrm lib/%%APP_NAME%%/res
-@dirrm lib/%%APP_NAME%%/searchplugins
+@dirrm lib/%%APP_NAME%%/components
+@dirrm lib/%%APP_NAME%%/chrome/icons/default
+@dirrm lib/%%APP_NAME%%/chrome/icons
+@dirrm lib/%%APP_NAME%%/chrome
 @dirrm lib/%%APP_NAME%%
 @dirrmtry share/applications