- Update to 2.0a3

- Fix .desktop file so it actually starts firefox-devel instead of firefox
  also change Firefox to Firefox-devel in comments

Release notes:	http://www.mozilla.org/projects/bonecho/releases/2.0a3.html

4 files changed, 70 insertions, 59 deletions

diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index 23f631e0c113..7fa878bd4197 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -7,20 +7,20 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	2.0a1
-PORTREVISION=	3
+DISTVERSION=	2.0a3
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/bonecho/alpha1/source
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/bonecho/alpha3/source
 #DISTNAME=	${PORTNAME}-${DISTVERSION}-source
-DISTNAME=	bonecho-alpha1-source
+DISTNAME=	bonecho-alpha3-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 LATEST_LINK=	firefox2
 MOZILLA=	${PORTNAME}${MOZILLA_SUFX}
+MOZILLA_NAME=	Firefox${MOZILLA_SUFX}
 MOZILLA_SUFX=	-devel
 MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/'
 
@@ -65,7 +65,8 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
 .endif
 
 post-extract::
-	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
+	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
+		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
 		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
 
 post-patch:
diff --git a/www/firefox35/distinfo b/www/firefox35/distinfo
index 1e697e3ced6b..060adecf4909 100644
--- a/www/firefox35/distinfo
+++ b/www/firefox35/distinfo
@@ -1,3 +1,3 @@
-MD5 (bonecho-alpha1-source.tar.bz2) = 263d1807b4fa32f7563661c4e232e0ea
-SHA256 (bonecho-alpha1-source.tar.bz2) = 1779d5993bcf07c2c37708a6edabdf45889670e3a981048b507a9f0648f6caae
-SIZE (bonecho-alpha1-source.tar.bz2) = 35630053
+MD5 (bonecho-alpha3-source.tar.bz2) = 50fc7a086d7911d5d1341df7bffe8d56
+SHA256 (bonecho-alpha3-source.tar.bz2) = 3328e8a072404d31dd77dc95caeb830bf3a7b6f65a1aa2a03bcedde234c9613e
+SIZE (bonecho-alpha3-source.tar.bz2) = 36073138
diff --git a/www/firefox35/files/firefox.desktop.in b/www/firefox35/files/firefox.desktop.in
index c1b7a2e59ab9..2a0a3cdca71d 100644
--- a/www/firefox35/files/firefox.desktop.in
+++ b/www/firefox35/files/firefox.desktop.in
@@ -1,66 +1,66 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Firefox Web Browser
+Name=@MOZILLA_NAME@ Web Browser
 Name[am]=
 Name[ar]=
-Name[az]=Firefox Veb Səyyahı
+Name[az]=@MOZILLA_NAME@ Veb Səyyahı
 Name[be]=
-Name[bg]=Интернет браузър Firefox
+Name[bg]=Интернет браузър @MOZILLA_NAME@
 Name[bn]=
-Name[bs]=Firefox web preglednik
-Name[ca]=Navegador web Firefox
-Name[cs]=Prohlížeč WWW Firefox
-Name[cy]=Y Porwr Gwe Firefox
-Name[da]=Firefox - internetsurfning
-Name[de]=Firefox Webbrowser
-Name[el]=Περιηγητής Διαδικτύου Firefox
-Name[en_CA]=Firefox Web Browser
-Name[en_GB]=Firefox Web Browser
-Name[es]=Navegador Web Firefox
-Name[et]=Firefox veebibrauser
-Name[eu]=Firefox web arakatzailea
-Name[fi]=Firefox, WWW-selain
-Name[fr]=Navigateur Web Firefox
-Name[ga]=Brabhsálaí Lín Firefox
+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]=דפדפן Firefox
+Name[he]=דפדפן @MOZILLA_NAME@
 Name[hi]=
-Name[hr]=Firefox Web preglednik
-Name[hu]=Firefox webböngésző
-Name[id]=Web Browser Firefox
-Name[it]=Browser web Firefox
-Name[ja]=Firefox ウェブ・ブラウザ
-Name[ko]=Firefox 웹 브라우저
-Name[li]=Firefox Web Browser
-Name[lt]=Firefox web naršyklė
-Name[mk]=Firefox веб прелистувач
+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]=Firefox веб хөтөч
-Name[ms]=Pelungsur Web Firefox
-Name[nb]=Firefox nettleser
-Name[nl]=Firefox Webbrowser
-Name[nn]=Firefox nettlesar
-Name[no]=Firefox nettleser
+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 Firefox
-Name[pt]=Navegador Web Firefox
-Name[pt_BR]=Navegador Web Firefox
-Name[ro]=Navigatorul Firefox
-Name[ru]=Веб-браузер Firefox
+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 Firefox
-Name[sq]=Firefox - Shfletuesi Web
+Name[sl]=Spletni brskalnik @MOZILLA_NAME@
+Name[sq]=@MOZILLA_NAME@ - Shfletuesi Web
 Name[sr]=
 Name[sr@Latn]=Veb čitač Spoznaja
-Name[sv]=Webbläsaren Firefox
+Name[sv]=Webbläsaren @MOZILLA_NAME@
 Name[ta]=எபிபனி வலை உலாவி
-Name[tk]=Firefox Web Ahtarçisi
-Name[tr]=Firefox Web Tarayıcı
-Name[uk]=Переглядач web Firefox
-Name[vi]=Trình Duyệt Web Firefox
+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]=Firefox Web 浏览器
-Name[zh_TW]=Firefox 網頁瀏覽器
+Name[zh_CN]=@MOZILLA_NAME@ Web 浏览器
+Name[zh_TW]=@MOZILLA_NAME@ 網頁瀏覽器
 GenericName=Web Browser
 GenericName[ar]=متصفّح الانترنت
 GenericName[az]=Veb Səyyahı
@@ -80,7 +80,7 @@ GenericName[es]=Navegador web
 GenericName[et]=Veebilehitseja
 GenericName[eu]=Web arakatzailea
 GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur Web Firefox
+GenericName[fr]=Navigateur Web @MOZILLA_NAME@
 GenericName[ga]=Brabhsálaí Lín
 GenericName[gu]=વેબ બ્રાઉઝર
 GenericName[he]=דפדפן אינטרנט
@@ -174,7 +174,7 @@ Comment[sr]=Прегледај веб
 Comment[sr@Latn]=Pregledaj veb
 Comment[sv]=Surfa på nätet
 Comment[ta]=வலையில் உலாவு
-Comment[th]=ใช้งานเว็บบราวเซอร์ Firefox
+Comment[th]=ใช้งานเว็บบราวเซอร์ @MOZILLA_NAME@
 Comment[tk]=Webi Ahtar
 Comment[tr]=Web'e Gözat
 Comment[uk]=Програма перегляду web-сторінок
@@ -182,7 +182,7 @@ Comment[vi]=Duyệt web
 Comment[wa]=Naivyî avå les waibes
 Comment[zh_CN]=浏览 Web
 Comment[zh_TW]=瀏覽網頁
-Exec=firefox %U
+Exec=@MOZILLA@ %U
 Icon=@FIREFOX_ICON@
 StartupNotify=false
 Terminal=false
diff --git a/www/firefox35/files/patch-security_manager_ssl_src_nsNSSComponent.cpp b/www/firefox35/files/patch-security_manager_ssl_src_nsNSSComponent.cpp
new file mode 100644
index 000000000000..f30d12229ccd
--- /dev/null
+++ b/www/firefox35/files/patch-security_manager_ssl_src_nsNSSComponent.cpp
@@ -0,0 +1,10 @@
+--- security/manager/ssl/src/nsNSSComponent.cpp.orig	Mon May 29 23:10:54 2006
++++ security/manager/ssl/src/nsNSSComponent.cpp	Mon May 29 23:12:22 2006
+@@ -110,6 +110,7 @@
+ #include "nss.h"
+ #include "pk11func.h"
+ #include "ssl.h"
++#define NSS_ENABLE_ECC 1
+ #include "sslproto.h"
+ #include "secmod.h"
+ #include "sechash.h"