Re-import previous version of Firefox, because firefox-4.0 won't

work for some users (sparc64 support, for example, is busted and
won't appear again until firefox-5.0).

6 files changed, 356 insertions, 0 deletions

diff --git a/www/firefox36/DESCR b/www/firefox36/DESCR
new file mode 100644
index 00000000000..16857791703
--- /dev/null
+++ b/www/firefox36/DESCR
@@ -0,0 +1,10 @@
+Mozilla Firefox is a free, open-source and cross-platform web browser
+for Windows, Linux, MacOS X and many other operating systems.
+
+It is fast and easy to use, and offers many advantages over other web
+browsers, such as tabbed browsing and the ability to block pop-up
+windows.
+
+Firefox also offers excellent bookmark and history management, and it
+can be extended by developers using industry standards such as XML,
+CSS, JavaScript, C++, etc. Many extensions are available.
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
new file mode 100644
index 00000000000..207194068ca
--- /dev/null
+++ b/www/firefox36/Makefile
@@ -0,0 +1,63 @@
+# $NetBSD: Makefile,v 1.1.1.1 2011/04/19 13:16:10 tnn Exp $
+
+.include "../../devel/xulrunner192/dist.mk"
+PKGNAME=	firefox-${FIREFOX_VER}
+PKGREVISION=	1
+CATEGORIES=	www
+
+MAINTAINER=	tnn@NetBSD.org
+HOMEPAGE=	http://www.mozilla.com/en-US/firefox/
+COMMENT=	Web browser with support for extensions
+LICENSE=	mpl-1.1
+
+MOZILLA_DIR=	# empty
+
+CONFIGURE_ARGS+=	--enable-application=browser
+CONFIGURE_ARGS+=	--with-libxul-sdk=${PREFIX}/lib/xulrunner-sdk
+CONFIGURE_ARGS+=	--with-system-libxul
+
+ALL_ENV+=		MOZILLA_PKG_NAME=firefox
+
+.include "../../devel/xulrunner/mozilla-common.mk"
+.include "options.mk"
+
+MOZILLA=firefox
+.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
+MOZILLA_NAME=	Firefox 3.6
+MOZILLA_ICON=	${WRKSRC}/other-licenses/branding/firefox/default48.png
+.else
+MOZILLA_NAME=	Browser 3.6
+MOZILLA_ICON=	${WRKSRC}/browser/branding/unofficial/default48.png
+.endif
+
+pre-configure:
+	cd ${WRKSRC} && autoconf
+
+post-build:
+	${SED} -e 's|@MOZILLA@|${MOZILLA}|g'				\
+	  -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g'			\
+	  -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g'			\
+	  < ${FILESDIR}/desktop.in					\
+	  > ${WRKDIR}/desktop
+	${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${FILESDIR}/firefox.sh.in	\
+	  > ${WRKDIR}/firefox
+
+INSTALLATION_DIRS+=	share/applications share/pixmaps
+post-install:
+	${INSTALL_DATA} ${WRKDIR}/desktop				\
+	  ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
+	${INSTALL_DATA} ${MOZILLA_ICON}					\
+	  ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
+	rm -f ${DESTDIR}${PREFIX}/bin/firefox
+	${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin
+
+BUILDLINK_API_DEPENDS.xulrunner+=	xulrunner>=${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
+BUILD_DEPENDS+=				xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}{,nb*}:../../devel/xulrunner192
+.include "../../devel/xulrunner192/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome)
+CONFIGURE_ARGS+=	--enable-gnomevfs --enable-dbus --enable-gnomeui
+.else
+CONFIGURE_ARGS+=	--disable-gnomevfs --disable-dbus --disable-gnomeui
+.endif
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox36/PLIST b/www/firefox36/PLIST
new file mode 100644
index 00000000000..8ed8e0bc4b5
--- /dev/null
+++ b/www/firefox36/PLIST
@@ -0,0 +1,69 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2011/04/19 13:16:10 tnn Exp $
+bin/firefox
+lib/firefox/.autoreg
+lib/firefox/LICENSE
+lib/firefox/README.txt
+lib/firefox/application.ini
+lib/firefox/blocklist.xml
+lib/firefox/browserconfig.properties
+lib/firefox/chrome/browser.jar
+lib/firefox/chrome/browser.manifest
+lib/firefox/chrome/classic.jar
+lib/firefox/chrome/classic.manifest
+lib/firefox/chrome/en-US.jar
+lib/firefox/chrome/en-US.manifest
+lib/firefox/chrome/icons/default/default16.png
+lib/firefox/chrome/icons/default/default32.png
+lib/firefox/chrome/icons/default/default48.png
+lib/firefox/chrome/reporter.jar
+lib/firefox/chrome/reporter.manifest
+lib/firefox/components/FeedConverter.js
+lib/firefox/components/FeedWriter.js
+lib/firefox/components/WebContentConverter.js
+lib/firefox/components/browser.xpt
+lib/firefox/components/components.list
+lib/firefox/components/fuelApplication.js
+lib/firefox/components/libbrowsercomps.so
+lib/firefox/components/libbrowserdirprovider.so
+lib/firefox/components/nsBrowserContentHandler.js
+lib/firefox/components/nsBrowserGlue.js
+lib/firefox/components/nsMicrosummaryService.js
+lib/firefox/components/nsPlacesTransactionsService.js
+lib/firefox/components/nsPrivateBrowsingService.js
+lib/firefox/components/nsSafebrowsingApplication.js
+lib/firefox/components/nsSessionStartup.js
+lib/firefox/components/nsSessionStore.js
+lib/firefox/components/nsSetDefaultBrowser.js
+lib/firefox/components/nsSidebar.js
+lib/firefox/defaults/preferences/channel-prefs.js
+lib/firefox/defaults/preferences/firefox-branding.js
+lib/firefox/defaults/preferences/firefox-l10n.js
+lib/firefox/defaults/preferences/firefox.js
+lib/firefox/defaults/preferences/reporter.js
+lib/firefox/defaults/profile/bookmarks.html
+lib/firefox/defaults/profile/chrome/userChrome-example.css
+lib/firefox/defaults/profile/chrome/userContent-example.css
+lib/firefox/defaults/profile/localstore.rdf
+lib/firefox/defaults/profile/mimeTypes.rdf
+lib/firefox/defaults/profile/prefs.js
+lib/firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+lib/firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+lib/firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
+lib/firefox/firefox
+lib/firefox/icons/document.png
+lib/firefox/icons/mozicon128.png
+lib/firefox/modules/NetworkPrioritizer.jsm
+lib/firefox/modules/distribution.js
+lib/firefox/modules/openLocationLastURL.jsm
+lib/firefox/removed-files
+lib/firefox/run-mozilla.sh
+lib/firefox/searchplugins/amazondotcom.xml
+lib/firefox/searchplugins/answers.xml
+lib/firefox/searchplugins/creativecommons.xml
+lib/firefox/searchplugins/eBay.xml
+lib/firefox/searchplugins/google.xml
+lib/firefox/searchplugins/wikipedia.xml
+lib/firefox/searchplugins/yahoo.xml
+lib/firefox/updater.ini
+share/applications/firefox.desktop
+share/pixmaps/firefox.png
diff --git a/www/firefox36/files/desktop.in b/www/firefox36/files/desktop.in
new file mode 100644
index 00000000000..d72090e1aab
--- /dev/null
+++ b/www/firefox36/files/desktop.in
@@ -0,0 +1,191 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=@MOZILLA_NAME@ Web Browser
+Name[am]=
+Name[ar]=
+Name[az]=@MOZILLA_NAME@ Veb Səyyahı
+Name[be]=
+Name[bg]=Интернет браузър @MOZILLA_NAME@
+Name[bn]=
+Name[bs]=@MOZILLA_NAME@ web preglednik
+Name[ca]=Navegador web @MOZILLA_NAME@
+Name[cs]=Prohlížeč WWW @MOZILLA_NAME@
+Name[cy]=Y Porwr Gwe @MOZILLA_NAME@
+Name[da]=@MOZILLA_NAME@ - internetsurfning
+Name[de]=@MOZILLA_NAME@ Webbrowser
+Name[el]=Περιηγητής Διαδικτύου @MOZILLA_NAME@
+Name[en_CA]=@MOZILLA_NAME@ Web Browser
+Name[en_GB]=@MOZILLA_NAME@ Web Browser
+Name[es]=Navegador Web @MOZILLA_NAME@
+Name[et]=@MOZILLA_NAME@ veebibrauser
+Name[eu]=@MOZILLA_NAME@ web arakatzailea
+Name[fi]=@MOZILLA_NAME@, WWW-selain
+Name[fr]=Navigateur Web @MOZILLA_NAME@
+Name[ga]=Brabhsálaí Lín @MOZILLA_NAME@
+Name[gu]=એપીફની વૅબ બ્રાઉઝર
+Name[he]=דפדפן @MOZILLA_NAME@
+Name[hi]=
+Name[hr]=@MOZILLA_NAME@ Web preglednik
+Name[hu]=@MOZILLA_NAME@ webböngésző
+Name[id]=Web Browser @MOZILLA_NAME@
+Name[it]=Browser web @MOZILLA_NAME@
+Name[ja]=@MOZILLA_NAME@ ウェブ・ブラウザ
+Name[ko]=@MOZILLA_NAME@ 웹 브라우저
+Name[li]=@MOZILLA_NAME@ Web Browser
+Name[lt]=@MOZILLA_NAME@ web naršyklė
+Name[mk]=@MOZILLA_NAME@ веб прелистувач
+Name[ml]=എപ്പിഫാനി വെബ്ബ് ബ്രൌസ‌ര്
+Name[mn]=@MOZILLA_NAME@ веб хөтөч
+Name[ms]=Pelungsur Web @MOZILLA_NAME@
+Name[nb]=@MOZILLA_NAME@ nettleser
+Name[nl]=@MOZILLA_NAME@ Webbrowser
+Name[nn]=@MOZILLA_NAME@ nettlesar
+Name[no]=@MOZILLA_NAME@ nettleser
+Name[pa]=ਏਪੀਫਾਨੀ ਵੈੱਬ ਬਰਾਊਜ਼ਰ
+Name[pl]=Przeglądarka WWW @MOZILLA_NAME@
+Name[pt]=Navegador Web @MOZILLA_NAME@
+Name[pt_BR]=Navegador Web @MOZILLA_NAME@
+Name[ro]=Navigatorul @MOZILLA_NAME@
+Name[ru]=Веб-браузер @MOZILLA_NAME@
+Name[sk]=
+Name[sl]=Spletni brskalnik @MOZILLA_NAME@
+Name[sq]=@MOZILLA_NAME@ - Shfletuesi Web
+Name[sr]=
+Name[sr@Latn]=Veb čitač Spoznaja
+Name[sv]=Webbläsaren @MOZILLA_NAME@
+Name[ta]=எபிபனி வலை உலாவி
+Name[tk]=@MOZILLA_NAME@ Web Ahtarçisi
+Name[tr]=@MOZILLA_NAME@ Web Tarayıcı
+Name[uk]=Переглядач web @MOZILLA_NAME@
+Name[vi]=Trình Duyệt Web @MOZILLA_NAME@
+Name[wa]=Betchteu waibe epiphany
+Name[zh_CN]=@MOZILLA_NAME@ Web 浏览器
+Name[zh_TW]=@MOZILLA_NAME@ 網頁瀏覽器
+GenericName=Web Browser
+GenericName[ar]=متصفّح الانترنت
+GenericName[az]=Veb Səyyahı
+GenericName[be]=Вандроўнік па павуціньню
+GenericName[bg]=Браузър
+GenericName[bn]=ওয়েব ব্রাউজার
+GenericName[bs]=Web preglednik
+GenericName[ca]=Navegador web
+GenericName[cs]=Prohlížeč WWW
+GenericName[cy]=Porwr Gwe
+GenericName[da]=Internetsurfning
+GenericName[de]=Webbrowser
+GenericName[el]=Περιηγητής Ιστοσελίδων
+GenericName[en_CA]=Web Browser
+GenericName[en_GB]=Web Browser
+GenericName[es]=Navegador web
+GenericName[et]=Veebilehitseja
+GenericName[eu]=Web arakatzailea
+GenericName[fi]=WWW-selain
+GenericName[fr]=Navigateur Web @MOZILLA_NAME@
+GenericName[ga]=Brabhsálaí Lín
+GenericName[gu]=વેબ બ્રાઉઝર
+GenericName[he]=דפדפן אינטרנט
+GenericName[hi]=वेब ब्राउज़र
+GenericName[hr]=Web preglednik
+GenericName[hu]=Webböngésző
+GenericName[id]=Browser Web
+GenericName[it]=Browser web
+GenericName[ja]=GNOME ウェブ・ブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[li]=Wèb Browser
+GenericName[lt]=Web naršyklė
+GenericName[mk]=Веб прелистувач
+GenericName[mn]=Веб хөтөч
+GenericName[ms]=Pelungsur Web
+GenericName[nb]=Nettleser
+GenericName[nl]=Web-browser
+GenericName[nn]=Nettlesar
+GenericName[no]=Nettleser
+GenericName[pa]=ਵੈਬ ਬਰਾਊਜ਼
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[ro]=Navigator Internet
+GenericName[ru]=Веб-браузер
+GenericName[sk]=WWW prehliadač
+GenericName[sl]=Spletni brskalnik
+GenericName[sq]=Shfletuesi Web
+GenericName[sr]=Веб читач
+GenericName[sr@Latn]=Veb čitač
+GenericName[sv]=Webbläsare
+GenericName[ta]=வலை உலாவி
+GenericName[th]=เว็บบราวเซอร์
+GenericName[tk]=Web Ahtarçysy
+GenericName[tr]=Web Tarayıcı
+GenericName[uk]=Переглядач web-сторінок
+GenericName[vi]=Trình duyệt Web
+GenericName[wa]=Betchteu waibe
+GenericName[zh_CN]=Web 浏览器
+GenericName[zh_TW]=網頁瀏覽器
+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]=ใช้งานเว็บบราวเซอร์ @MOZILLA_NAME@
+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=@MOZILLA@ %u
+Icon=@FIREFOX_ICON@
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Application;Network;
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;
diff --git a/www/firefox36/files/firefox.sh.in b/www/firefox36/files/firefox.sh.in
new file mode 100644
index 00000000000..a6f2b673bb3
--- /dev/null
+++ b/www/firefox36/files/firefox.sh.in
@@ -0,0 +1,9 @@
+#! /bin/sh
+#
+# $NetBSD: firefox.sh.in,v 1.1.1.1 2011/04/19 13:16:10 tnn Exp $
+#
+# We currently overwrite the nsXULStub launcher with this wrapper script.
+# The stub causes problems like HTTPS protocol not working.
+# XXX to be investigated
+
+exec @PREFIX@/lib/xulrunner/xulrunner-bin @PREFIX@/lib/firefox/application.ini "$@"
diff --git a/www/firefox36/options.mk b/www/firefox36/options.mk
new file mode 100644
index 00000000000..3fc363b5ae5
--- /dev/null
+++ b/www/firefox36/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1.1.1 2011/04/19 13:16:10 tnn Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.firefox
+PKG_SUPPORTED_OPTIONS=	official-mozilla-branding
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
+CONFIGURE_ARGS+=	--enable-official-branding
+LICENSE=		mozilla-trademark-license
+RESTRICTED=		Trademark holder prohibits distribution of modified versions.
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+.endif