- Downgrade to 3.0.11 (which was submitted with ports/135984). 3.5 depends on

  linux-dbus-lib, linux-dbus-glib and linux-libcap which are not available yet.
- Bump PORTEPOCH

Pointy hat to:	beat
With hat:	gecko
Discussed with:	miwi

4 files changed, 27 insertions, 228 deletions

diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile
index 1fe5ac4007b5..669b4d06c728 100644
--- a/www/linux-firefox/Makefile
+++ b/www/linux-firefox/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	3.5
+PORTVERSION=	3.0.11
+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 74f2f2c21152..6323bc1bf1b1 100644
--- a/www/linux-firefox/distinfo
+++ b/www/linux-firefox/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-3.5.tar.bz2) = b61ebc6e31cff3f8ad653f31c3bd6b1b
-SHA256 (firefox-3.5.tar.bz2) = 4dcd9794bec2108e01944eea94f3acc59691838b84ee6a8bd336620866d49d8a
-SIZE (firefox-3.5.tar.bz2) = 9908255
+MD5 (firefox-3.0.11.tar.bz2) = fed91fd0d3fdcbceb8e1208fe5d561ab
+SHA256 (firefox-3.0.11.tar.bz2) = ee95095b6bb24ab9729535d898e1e03f6d264e593327f122deea59aa45c96b54
+SIZE (firefox-3.0.11.tar.bz2) = 9139789
diff --git a/www/linux-firefox/files/linux-firefox.desktop.in b/www/linux-firefox/files/linux-firefox.desktop.in
index bd3d13badfd4..f022f2e98178 100644
--- a/www/linux-firefox/files/linux-firefox.desktop.in
+++ b/www/linux-firefox/files/linux-firefox.desktop.in
@@ -189,194 +189,3 @@ Terminal=false
 Type=Application
 Categories=Application;Network;
 MimeType=text/html;text/xml;application/xhtml+xml;
-[Desktop Entry]
-Encoding=UTF-8
-Name=Firefox Web Browser (Linux)
-Name[am]=
-Name[ar]=
-Name[az]=Firefox Veb Səyyahı (Linux)
-Name[be]=
-Name[bg]=Интернет браузър Firefox (Linux)
-Name[bn]=
-Name[bs]=Firefox web preglednik (Linux)
-Name[ca]=Navegador web Firefox (Linux)
-Name[cs]=Prohlížeč WWW Firefox (Linux)
-Name[cy]=Y Porwr Gwe Firefox (Linux)
-Name[da]=Firefox - internetsurfning (Linux)
-Name[de]=Firefox Webbrowser (Linux)
-Name[el]=Περιηγητής Διαδικτύου Firefox (Linux)
-Name[en_CA]=Firefox Web Browser (Linux)
-Name[en_GB]=Firefox Web Browser (Linux)
-Name[es]=Navegador Web Firefox (Linux)
-Name[et]=Firefox veebibrauser (Linux)
-Name[eu]=Firefox web arakatzailea (Linux)
-Name[fi]=Firefox, WWW-selain (Linux)
-Name[fr]=Navigateur Web Firefox (Linux)
-Name[ga]=Brabhsálaí Lín Firefox (Linux)
-Name[gu]=એપીફની વૅબ બ્રાઉઝર (Linux)
-Name[he]=דפדפן Firefox (Linux)
-Name[hi]=
-Name[hr]=Firefox Web preglednik (Linux)
-Name[hu]=Firefox webböngésző (Linux)
-Name[id]=Web Browser Firefox (Linux)
-Name[it]=Browser web Firefox (Linux)
-Name[ja]=Firefox ウェブ・ブラウザ (Linux)
-Name[ko]=Firefox 웹 브라우저 (Linux)
-Name[li]=Firefox Web Browser (Linux)
-Name[lt]=Firefox web naršyklė (Linux)
-Name[mk]=Firefox веб прелистувач (Linux)
-Name[ml]=എപ്പിഫാനി വെബ്ബ് ബ്രൌസ‌ര് (Linux)
-Name[mn]=Firefox веб хөтөч (Linux)
-Name[ms]=Pelungsur Web Firefox (Linux)
-Name[nb]=Firefox nettleser (Linux)
-Name[nl]=Firefox Webbrowser (Linux)
-Name[nn]=Firefox nettlesar (Linux)
-Name[no]=Firefox nettleser (Linux)
-Name[pa]=ਏਪੀਫਾਨੀ ਵੈੱਬ ਬਰਾਊਜ਼ਰ (Linux)
-Name[pl]=Przeglądarka WWW Firefox (Linux)
-Name[pt]=Navegador Web Firefox (Linux)
-Name[pt_BR]=Navegador Web Firefox (Linux)
-Name[ro]=Navigatorul Firefox (Linux)
-Name[ru]=Веб-браузер Firefox (Linux)
-Name[sk]=
-Name[sl]=Spletni brskalnik Firefox (Linux)
-Name[sq]=Firefox - Shfletuesi Web (Linux)
-Name[sr]=
-Name[sr@Latn]=Veb čitač Spoznaja (Linux)
-Name[sv]=Webbläsaren Firefox (Linux)
-Name[ta]=எபிபனி வலை உலாவி (Linux)
-Name[tk]=Firefox Web Ahtarçisi (Linux)
-Name[tr]=Firefox Web Tarayıcı (Linux)
-Name[uk]=Переглядач web Firefox (Linux)
-Name[vi]=Trình Duyệt Web Firefox (Linux)
-Name[wa]=Betchteu waibe epiphany (Linux)
-Name[zh_CN]=Firefox Web 浏览器 (Linux)
-Name[zh_TW]=Firefox 網頁瀏覽器 (Linux)
-GenericName=Web Browser (Linux)
-GenericName[ar]=متصفّح الانترنت (Linux)
-GenericName[az]=Veb Səyyahı (Linux)
-GenericName[be]=Вандроўнік па павуціньню (Linux)
-GenericName[bg]=Браузър (Linux)
-GenericName[bn]=ওয়েব ব্রাউজার (Linux)
-GenericName[bs]=Web preglednik (Linux)
-GenericName[ca]=Navegador web (Linux)
-GenericName[cs]=Prohlížeč WWW (Linux)
-GenericName[cy]=Porwr Gwe (Linux)
-GenericName[da]=Internetsurfning (Linux)
-GenericName[de]=Webbrowser (Linux)
-GenericName[el]=Περιηγητής Ιστοσελίδων (Linux)
-GenericName[en_CA]=Web Browser (Linux)
-GenericName[en_GB]=Web Browser (Linux)
-GenericName[es]=Navegador web (Linux)
-GenericName[et]=Veebilehitseja (Linux)
-GenericName[eu]=Web arakatzailea (Linux)
-GenericName[fi]=WWW-selain (Linux)
-GenericName[fr]=Navigateur Web Firefox (Linux)
-GenericName[ga]=Brabhsálaí Lín (Linux)
-GenericName[gu]=વેબ બ્રાઉઝર (Linux)
-GenericName[he]=דפדפן אינטרנט (Linux)
-GenericName[hi]=वेब ब्राउज़र (Linux)
-GenericName[hr]=Web preglednik (Linux)
-GenericName[hu]=Webböngésző (Linux)
-GenericName[id]=Browser Web (Linux)
-GenericName[it]=Browser web (Linux)
-GenericName[ja]=GNOME ウェブ・ブラウザ (Linux)
-GenericName[ko]=웹 브라우저 (Linux)
-GenericName[li]=Wèb Browser (Linux)
-GenericName[lt]=Web naršyklė (Linux)
-GenericName[mk]=Веб прелистувач (Linux)
-GenericName[mn]=Веб хөтөч (Linux)
-GenericName[ms]=Pelungsur Web (Linux)
-GenericName[nb]=Nettleser (Linux)
-GenericName[nl]=Web-browser (Linux)
-GenericName[nn]=Nettlesar (Linux)
-GenericName[no]=Nettleser (Linux)
-GenericName[pa]=ਵੈਬ ਬਰਾਊਜ਼ (Linux)
-GenericName[pl]=Przeglądarka WWW (Linux)
-GenericName[pt]=Navegador Web (Linux)
-GenericName[pt_BR]=Navegador Web (Linux)
-GenericName[ro]=Navigator Internet (Linux)
-GenericName[ru]=Веб-браузер (Linux)
-GenericName[sk]=WWW prehliadač (Linux)
-GenericName[sl]=Spletni brskalnik (Linux)
-GenericName[sq]=Shfletuesi Web (Linux)
-GenericName[sr]=Веб читач (Linux)
-GenericName[sr@Latn]=Veb čitač (Linux)
-GenericName[sv]=Webbläsare (Linux)
-GenericName[ta]=வலை உலாவி (Linux)
-GenericName[th]=เว็บบราวเซอร์ (Linux)
-GenericName[tk]=Web Ahtarçysy (Linux)
-GenericName[tr]=Web Tarayıcı (Linux)
-GenericName[uk]=Переглядач web-сторінок (Linux)
-GenericName[vi]=Trình duyệt Web (Linux)
-GenericName[wa]=Betchteu waibe (Linux)
-GenericName[zh_CN]=Web 浏览器 (Linux)
-GenericName[zh_TW]=網頁瀏覽器 (Linux)
-Comment=Browse the web
-Comment[ar]=تصفح الانترنت
-Comment[az]=Vebi gəzin
-Comment[be]=Вандраваць па павуціньню
-Comment[bg]=Сърфиране в интернет
-Comment[bn]=ওয়েব ব্রাউজ করুন
-Comment[bs]=Pregledaj na internetu
-Comment[ca]=Navegueu per la web
-Comment[cs]=Prohlížet WWW
-Comment[cy]=Pori'r we
-Comment[da]=Surf på internettet
-Comment[de]=Im Web surfen
-Comment[el]=Περιήγηση στον παγκόσμιο ιστό
-Comment[en_CA]=Browse the web
-Comment[en_GB]=Browse the web
-Comment[es]=Navegar por la web
-Comment[et]=Sirvi veebi
-Comment[eu]=Arakatu web-a
-Comment[fi]=Selaa WWW:tä
-Comment[fr]=Naviguer sur Internet
-Comment[ga]=Brabhsáil an Líon
-Comment[gu]=વેબમાં શોધો
-Comment[he]=גלוש ברשת
-Comment[hi]=वेब ब्राउज़ करें
-Comment[hr]=Pregledaj Web
-Comment[hu]=A világháló böngészése
-Comment[id]=Jelajah web
-Comment[it]=Esplora il web
-Comment[ja]=ウェブを閲覧します
-Comment[ko]=웹을 돌아 다닙니다
-Comment[li]=Blajere op internet
-Comment[lt]=Naršyti internete
-Comment[mk]=Прелистувајте на веб
-Comment[ml]=വലക്കെട്ട് തിരയുക
-Comment[mn]=Веб броузе хийх
-Comment[ms]=Layari web
-Comment[nb]=Surf på nettet
-Comment[nl]=Websurfen
-Comment[nn]=Surf på nettet
-Comment[no]=Surf på nettet
-Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼
-Comment[pl]=Przeglądanie stron WWW
-Comment[pt]=Navegar na web
-Comment[pt_BR]=Navegar na web
-Comment[ro]=Navigare Internet
-Comment[ru]=Веб-браузер
-Comment[sk]=Prehliadať internet
-Comment[sl]=Brskaj po spletu
-Comment[sq]=Eksploro web-in
-Comment[sr]=Прегледај веб
-Comment[sr@Latn]=Pregledaj veb
-Comment[sv]=Surfa på nätet
-Comment[ta]=வலையில் உலாவு
-Comment[th]=ใช้งานเว็บบราวเซอร์ Firefox
-Comment[tk]=Webi Ahtar
-Comment[tr]=Web'e Gözat
-Comment[uk]=Програма перегляду web-сторінок
-Comment[vi]=Duyệt web
-Comment[wa]=Naivyî avå les waibes
-Comment[zh_CN]=浏览 Web
-Comment[zh_TW]=瀏覽網頁
-Exec=linux-firefox %U
-Icon=%%PREFIX%%/lib/%%APP_NAME%%/chrome/icons/default/default.xpm
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Application;Network;
-MimeType=text/html;text/xml;application/xhtml+xml;
diff --git a/www/linux-firefox/pkg-plist b/www/linux-firefox/pkg-plist
index 4211c923323c..c9f407219885 100644
--- a/www/linux-firefox/pkg-plist
+++ b/www/linux-firefox/pkg-plist
@@ -1,11 +1,20 @@
 bin/%%APP_NAME%%
 share/applications/%%APP_NAME%%.desktop
 lib/%%APP_NAME%%/.autoreg
-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
@@ -26,18 +35,14 @@ 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/NetworkGeolocationProvider.js
 lib/%%APP_NAME%%/components/WebContentConverter.js
-lib/%%APP_NAME%%/components/aboutCertError.js
-lib/%%APP_NAME%%/components/aboutPrivateBrowsing.js
 lib/%%APP_NAME%%/components/aboutRights.js
 lib/%%APP_NAME%%/components/aboutRobots.js
-lib/%%APP_NAME%%/components/aboutSessionRestore.js
 lib/%%APP_NAME%%/components/browser.xpt
 lib/%%APP_NAME%%/components/fuelApplication.js
 lib/%%APP_NAME%%/components/jsconsole-clhandler.js
-lib/%%APP_NAME%%/components/libbrowsercomps.so
 lib/%%APP_NAME%%/components/libbrowserdirprovider.so
+lib/%%APP_NAME%%/components/libbrowsercomps.so
 lib/%%APP_NAME%%/components/libdbusservice.so
 lib/%%APP_NAME%%/components/libimgicon.so
 lib/%%APP_NAME%%/components/libmozgnome.so
@@ -60,9 +65,7 @@ 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/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
@@ -80,11 +83,7 @@ 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
@@ -111,41 +110,32 @@ 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.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%%/libxul.so
-lib/%%APP_NAME%%/modules/DownloadLastDir.jsm
-lib/%%APP_NAME%%/modules/DownloadUtils.jsm
-lib/%%APP_NAME%%/modules/ISO8601DateUtils.jsm
-lib/%%APP_NAME%%/modules/Microformats.js
-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/debug.js
-lib/%%APP_NAME%%/modules/distribution.js
-lib/%%APP_NAME%%/modules/utils.js
 lib/%%APP_NAME%%/mozilla-xremote-client
 lib/%%APP_NAME%%/old-homepage-default.properties
-lib/%%APP_NAME%%/platform.ini
 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%%/modules/ISO8601DateUtils.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/XPCOMUtils.jsm
+lib/%%APP_NAME%%/modules/DownloadUtils.jsm
 lib/%%APP_NAME%%/res/EditorOverride.css
 lib/%%APP_NAME%%/res/arrow.gif
 lib/%%APP_NAME%%/res/arrowd.gif
@@ -205,9 +195,8 @@ 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/wikipedia.xml
 lib/%%APP_NAME%%/searchplugins/yahoo.xml
-lib/%%APP_NAME%%/update.locale
+lib/%%APP_NAME%%/searchplugins/wikipedia.xml
 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