Temporarily roll firefox back to 1.5.0.8 so that we can tag this security

fix release for 6.2.

Approved by:	secteam
		portmgr

9 files changed, 216 insertions, 210 deletions

diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index d2b3177e1fc5..40f7241f2df1 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -3,33 +3,27 @@
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/www/firefox/Makefile,v 1.21 2006/10/25 01:20:12 ahze Exp $
+#   $MCom: ports/www/firefox/Makefile,v 1.36 2006/10/05 21:37:18 mezz Exp $
 
 PORTNAME=	firefox
-DISTVERSION=	2.0
-PORTREVISION=	2
+DISTVERSION=	1.5.0.8
 PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
+MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
 DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
-BUILD_DEPENDS=	nss>=3.11.2:${PORTSDIR}/security/nss
-
-MOZILLA_NAME=	Firefox
-MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/'
-
 WANT_GNOME=	yes
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-EXTRA_CFLAGS=	-O2
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GCC=	3.4+
+
 GECKO_PLIST_PRE_FILES=	lib/${MOZILLA}/chrome/icons/default/default.xpm
 GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons
 
@@ -38,8 +32,7 @@ FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/icons/default.xpm
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-system-cairo	\
 		--enable-official-branding \
-		--enable-canvas	\
-		--with-system-nss
+		--enable-canvas
 
 SYSTEM_PREFS=		${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js
 MOZ_PIS_SCRIPTS=	moz_pis_S50cleanhome
@@ -49,10 +42,12 @@ OPTIONS=	NEWTAB "Open external links in a new tab" on \
 
 .include <bsd.port.pre.mk>
 
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
+.if ${ARCH}=="alpha" && ${OSVERSION} < 500035
+IGNORE=	core dumps on ${ARCH}
+.endif
 
-.if ${OSVERSION} < 500000
-BROKEN=	does not build
+.if ${ARCH}=="sparc64" && ${OSVERSION} < 601101
+IGNORE=	core dumps on ${ARCH}, kern.osreldate>=601101 needed
 .endif
 
 .if ${OSVERSION} >= 600000
@@ -64,15 +59,10 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
 .endif
 
 post-extract::
-	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
-		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
+	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
 		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${GECKO_PTHREAD_LIBS}|' \
-		${WRKSRC}/storage/build/Makefile.in
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/security/manager/ssl/src/Makefile.in
 .for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
 	embedding/minimo
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
diff --git a/www/firefox36/distinfo b/www/firefox36/distinfo
index 5877ac04a057..891a20ea2b8e 100644
--- a/www/firefox36/distinfo
+++ b/www/firefox36/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-2.0-source.tar.bz2) = 03709c15cba0e0375ff5336d538f77e7
-SHA256 (firefox-2.0-source.tar.bz2) = dba581583ef390fab90c39c9a667bf1a5bfbeaec75e6fbb2a9cedcc857d26800
-SIZE (firefox-2.0-source.tar.bz2) = 36922776
+MD5 (firefox-1.5.0.8-source.tar.bz2) = 86f98df1586efb419225a2988a217951
+SHA256 (firefox-1.5.0.8-source.tar.bz2) = 988d916568c7ddd2c790b190437cd54833b9c5ff1db9a43736771369426a6060
+SIZE (firefox-1.5.0.8-source.tar.bz2) = 35588049
diff --git a/www/firefox36/files/firefox.desktop.in b/www/firefox36/files/firefox.desktop.in
index d72090e1aabf..c1b7a2e59ab9 100644
--- a/www/firefox36/files/firefox.desktop.in
+++ b/www/firefox36/files/firefox.desktop.in
@@ -1,66 +1,66 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=@MOZILLA_NAME@ Web Browser
+Name=Firefox Web Browser
 Name[am]=
 Name[ar]=
-Name[az]=@MOZILLA_NAME@ Veb Səyyahı
+Name[az]=Firefox Veb Səyyahı
 Name[be]=
-Name[bg]=Интернет браузър @MOZILLA_NAME@
+Name[bg]=Интернет браузър Firefox
 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[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[gu]=એપીફની વૅબ બ્રાઉઝર
-Name[he]=דפדפן @MOZILLA_NAME@
+Name[he]=דפדפן Firefox
 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[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[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[mn]=Firefox веб хөтөч
+Name[ms]=Pelungsur Web Firefox
+Name[nb]=Firefox nettleser
+Name[nl]=Firefox Webbrowser
+Name[nn]=Firefox nettlesar
+Name[no]=Firefox 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[pl]=Przeglądarka WWW Firefox
+Name[pt]=Navegador Web Firefox
+Name[pt_BR]=Navegador Web Firefox
+Name[ro]=Navigatorul Firefox
+Name[ru]=Веб-браузер Firefox
 Name[sk]=
-Name[sl]=Spletni brskalnik @MOZILLA_NAME@
-Name[sq]=@MOZILLA_NAME@ - Shfletuesi Web
+Name[sl]=Spletni brskalnik Firefox
+Name[sq]=Firefox - Shfletuesi Web
 Name[sr]=
 Name[sr@Latn]=Veb čitač Spoznaja
-Name[sv]=Webbläsaren @MOZILLA_NAME@
+Name[sv]=Webbläsaren Firefox
 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[tk]=Firefox Web Ahtarçisi
+Name[tr]=Firefox Web Tarayıcı
+Name[uk]=Переглядач web Firefox
+Name[vi]=Trình Duyệt Web Firefox
 Name[wa]=Betchteu waibe epiphany
-Name[zh_CN]=@MOZILLA_NAME@ Web 浏览器
-Name[zh_TW]=@MOZILLA_NAME@ 網頁瀏覽器
+Name[zh_CN]=Firefox Web 浏览器
+Name[zh_TW]=Firefox 網頁瀏覽器
 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 @MOZILLA_NAME@
+GenericName[fr]=Navigateur Web Firefox
 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]=ใช้งานเว็บบราวเซอร์ @MOZILLA_NAME@
+Comment[th]=ใช้งานเว็บบราวเซอร์ Firefox
 Comment[tk]=Webi Ahtar
 Comment[tr]=Web'e Gözat
 Comment[uk]=Програма перегляду web-сторінок
@@ -182,10 +182,10 @@ Comment[vi]=Duyệt web
 Comment[wa]=Naivyî avå les waibes
 Comment[zh_CN]=浏览 Web
 Comment[zh_TW]=瀏覽網頁
-Exec=@MOZILLA@ %u
+Exec=firefox %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;
+MimeType=text/html;text/xml;application/xhtml+xml;
diff --git a/www/firefox36/files/patch-config-rules.mk b/www/firefox36/files/patch-config-rules.mk
index 8ab35f5a8326..ecc3c8194dcc 100644
--- a/www/firefox36/files/patch-config-rules.mk
+++ b/www/firefox36/files/patch-config-rules.mk
@@ -1,13 +1,14 @@
---- config/rules.mk.orig	Thu Sep 14 14:07:03 2006
-+++ config/rules.mk	Wed Oct 18 11:00:09 2006
-@@ -442,9 +442,7 @@
- endif
+--- config/rules.mk.orig	Tue Aug 26 13:28:47 2003
++++ config/rules.mk	Sun Feb  1 15:11:41 2004
+@@ -444,7 +444,11 @@
  
  ifeq ($(OS_ARCH),FreeBSD)
--ifdef IS_COMPONENT
--EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
--endif
+ ifdef IS_COMPONENT
++ifneq (,$(filter alpha ia64,$(OS_TEST)))
 +EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
++else
+ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
++endif
+ endif
  endif
  
- ifeq ($(OS_ARCH),NetBSD)
diff --git a/www/firefox36/files/patch-configure b/www/firefox36/files/patch-configure
index ee6087d2d948..923cf5065f18 100644
--- a/www/firefox36/files/patch-configure
+++ b/www/firefox36/files/patch-configure
@@ -1,24 +1,15 @@
---- configure.orig	Tue Aug  8 13:59:01 2006
-+++ configure	Tue Sep 19 07:52:08 2006
-@@ -1047,7 +1047,7 @@
- 
- MOZJPEG=62
- MOZPNG=10207
--MOZZLIB=1.2.3
-+MOZZLIB=1.2.2
- NSPR_VERSION=4
- NSS_VERSION=3
- 
-@@ -10267,7 +10267,7 @@
+--- configure.orig	Tue Oct  4 02:01:48 2005
++++ configure	Wed Nov 23 11:07:17 2005
+@@ -10016,7 +10016,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liconv  $LIBS"
 +LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 10273 "configure"
+ #line 10022 "configure"
  #include "confdefs.h"
-@@ -10298,7 +10298,7 @@
+@@ -10047,7 +10047,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -27,16 +18,16 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-@@ -10308,7 +10308,7 @@
+@@ -10057,7 +10057,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liconv  $LIBS"
 +LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 10314 "configure"
+ #line 10063 "configure"
  #include "confdefs.h"
-@@ -10339,7 +10339,7 @@
+@@ -10088,7 +10088,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
diff --git a/www/firefox36/files/patch-libm b/www/firefox36/files/patch-libm
index d9295c9068d4..7de64b2a5068 100644
--- a/www/firefox36/files/patch-libm
+++ b/www/firefox36/files/patch-libm
@@ -1,3 +1,19 @@
+--- js/src/Makefile.in	Thu Aug  4 22:26:52 2005
++++ js/src/Makefile.in	Thu Aug  4 23:02:32 2005
+@@ -148,5 +148,4 @@
+ endif
+ 
+-FDLIBM_LIBRARY	= fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
+ JSMATH_PRELINK	= jsmathtemp.o
+ JS_SAFE_ARENA	= 1
+@@ -320,7 +319,4 @@
+ endif
+ 	@$(RM) -f $(JSMATH_PRELINK)
+-else
+-# Create dependency so we build fdlibm
+-jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
+ endif
+ 
 --- js/Makefile.in	Sun Mar 23 14:36:00 2003
 +++ js/Makefile.in	Thu Aug  4 23:08:06 2005
 @@ -46,5 +46,5 @@
diff --git a/www/firefox36/files/patch-security-coreconf-FreeBSD.mk b/www/firefox36/files/patch-security-coreconf-FreeBSD.mk
index 0f7a04a0279f..3e0e14acaaf2 100644
--- a/www/firefox36/files/patch-security-coreconf-FreeBSD.mk
+++ b/www/firefox36/files/patch-security-coreconf-FreeBSD.mk
@@ -1,6 +1,6 @@
---- security/coreconf/FreeBSD.mk.orig	Mon Sep 25 18:26:23 2006
-+++ security/coreconf/FreeBSD.mk	Mon Sep 25 18:27:03 2006
-@@ -45,8 +45,12 @@
+--- security/coreconf/FreeBSD.mk.orig	Wed Mar 26 20:17:25 2003
++++ security/coreconf/FreeBSD.mk	Sun Nov 21 22:59:49 2004
+@@ -43,8 +43,12 @@
  ifeq ($(OS_TEST),alpha)
  CPU_ARCH		= alpha
  else
@@ -13,12 +13,16 @@
  
  OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
  
-@@ -73,7 +77,7 @@
+@@ -71,7 +75,11 @@
  DLL_SUFFIX		= so.1.0
  endif
  
 -MKSHLIB			= $(CC) $(DSO_LDOPTS)
++ifneq (,$(filter alpha ia64,$(OS_TEST)))
 +MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
++else
++MKSHLIB			= $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
++endif
  ifdef MAPFILE
- 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
+ # Add LD options to restrict exported symbols to those in the map file
  endif
diff --git a/www/firefox36/files/patch-sysnss b/www/firefox36/files/patch-sysnss
index d69df4045ea9..d854cabc053a 100644
--- a/www/firefox36/files/patch-sysnss
+++ b/www/firefox36/files/patch-sysnss
@@ -7,34 +7,27 @@
 -
  ifndef MOZ_NATIVE_JPEG
  tier_1_dirs	+= jpeg
---- security/manager/Makefile.in.orig	Tue Mar 28 14:36:54 2006
-+++ security/manager/Makefile.in	Tue Mar 28 14:40:29 2006
-@@ -54,22 +54,13 @@
- 	SSL3_LIB \
+--- security/manager/Makefile.in	Mon Mar 28 19:56:36 2005
++++ security/manager/Makefile.in	Tue Aug  2 09:02:50 2005
+@@ -37,16 +37,7 @@
  	SOFTOKEN3_LIB \
  	SOFTOKEN3_CHK \
 -	LOADABLE_ROOT_MODULE \
- 	HAVE_FREEBL_LIBS \
- 	HAVE_FREEBL_LIBS_32 \
- 	HAVE_FREEBL_LIBS_32INT64 \
- 	HAVE_FREEBL_LIBS_64 \
+ 	HAVE_FREEBL_MODULES \
  	$(NULL)
--
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
- endif
  
+-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+-
 -NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
 -SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
 -SSL3_LIB =  $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
 -SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
 -SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
 -
- # Default
- HAVE_FREEBL_LIBS = 1
- 
-@@ -217,11 +208,6 @@
+ ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
+ ifeq (,$(filter i86pc ia64,$(OS_TEST)))
+@@ -132,9 +123,4 @@
  .nss.cleaned: .nss.checkout
- ifndef MOZ_NATIVE_NSS
  	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
 -	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
 -ifndef SKIP_CHK
@@ -42,17 +35,35 @@
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
 -endif
  	touch $@
- endif
  
-@@ -248,47 +234,6 @@
- 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
- endif
- ifndef MOZ_NATIVE_NSS
+@@ -153,43 +139,4 @@
+ ifeq ($(OS_ARCH),WINNT)
+ 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+-else
+-	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+-endif
 -	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
 -ifndef SKIP_CHK
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
 -endif
+-ifndef DISABLE_DIST_GRE
+-	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
+-ifndef SKIP_CHK
+-	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
+-endif
+-	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
+-	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
+-	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
+-	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
+-ifdef HAVE_FREEBL_MODULES
+-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
+-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
+-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
+-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
+-endif
+-endif
+-ifndef _SKIP_OLD_GRE_INSTALL
 -	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
 -ifndef SKIP_CHK
 -	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
@@ -61,41 +72,17 @@
 -	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
 -	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
 -	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
--ifdef HAVE_FREEBL_LIBS
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_32
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_32INT64
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_64
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
+-ifdef HAVE_FREEBL_MODULES
+-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
+-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
+-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
+-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
 -endif
  endif
  	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
-@@ -299,42 +244,6 @@
+@@ -200,18 +147,4 @@
  
  install::
- ifndef MOZ_NATIVE_NSS
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
 -ifndef SKIP_CHK
 -	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
@@ -104,71 +91,88 @@
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
--ifdef HAVE_FREEBL_LIBS
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
--endif
--ifdef HAVE_FREEBL_LIBS_32
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
--endif
--ifdef HAVE_FREEBL_LIBS_32INT64
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
+-ifdef HAVE_FREEBL_MODULES
+-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
 -endif
--ifdef HAVE_FREEBL_LIBS_64
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
--endif
- endif
  	$(MAKE) -C boot $@
  	$(MAKE) -C ssl $@
-@@ -351,12 +260,6 @@
- 	$(MAKE) -C pki $@
+@@ -227,9 +160,4 @@
  endif
- ifndef MOZ_NATIVE_NSS
--	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+ 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
 -	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
 -ifndef SKIP_CHK
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
 -endif
- endif
  
  echo-requires-recursive::
---- security/manager/ssl/src/Makefile.in.orig	Mon Aug 14 19:22:52 2006
-+++ security/manager/ssl/src/Makefile.in	Thu Aug 31 15:17:20 2006
-@@ -124,19 +124,19 @@
- 		  pipboot \
- 		  $(NULL)
+--- security/manager/ssl/src/Makefile.in	Wed Jan  7 08:36:51 2004
++++ security/manager/ssl/src/Makefile.in	Tue Aug  2 09:13:07 2005
+@@ -117,5 +117,5 @@
+ # Use local includes because they are inserted before INCLUDES
+ # so that Mozilla's nss.h is used, not glibc's
+-LOCAL_INCLUDES += -I$(DIST)/public/nss \
++LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
+                   $(NULL)
  
--EXTRA_DEPS = $(NSS_DEP_LIBS)
+--- config/config.mk	Tue Oct 12 00:11:11 2004
++++ config/config.mk	Tue Aug  2 09:19:18 2005
+@@ -170,5 +170,4 @@
+ NSS_LIBS	= \
+ 	$(LIBS_DIR) \
+-	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+ 	-lsmime3 \
+ 	-lssl3 \
+@@ -189,11 +188,5 @@
+ endif
  
- DEFINES += -DNSS_ENABLE_ECC
+-NSS_DEP_LIBS	= \
+-	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+-	$(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
+-	$(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
+-	$(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
+-	$(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
+-	$(NULL)
++NSS_DEP_LIBS	=
  
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += $(NSS_CFLAGS)
-+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss
+ MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
+--- security/manager/ssl/src/nsNSSComponent.cpp	Thu Apr 22 15:48:30 2004
++++ security/manager/ssl/src/nsNSSComponent.cpp	Thu Aug  4 16:44:27 2005
+@@ -88,4 +88,8 @@
+ }
  
- EXTRA_DSO_LDOPTS += \
- 		$(MOZ_UNICHARUTIL_LIBS) \
- 		$(MOZ_COMPONENT_LIBS) \
- 		$(MOZ_JS_LIBS) \
- 		$(NSS_LIBS) \
-+		$(LOCAL_INCLUDES) \
- 		$(NULL)
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <errno.h>
++
+ #ifdef PR_LOGGING
+ PRLogModuleInfo* gPIPNSSLog = nsnull;
+@@ -406,4 +410,5 @@
+     const char *possible_ckbi_locations[] = {
+       NS_GRE_DIR,
++      NS_UNIX_LIB_DIR,
+       NS_XPCOM_CURRENT_PROCESS_DIR
+     };
+@@ -419,5 +424,5 @@
+       }
  
- include $(topsrcdir)/config/rules.mk
+-      char *fullModuleName = nsnull;
++      char *fullModuleName;
+ #ifdef XP_MAC
+       nsCAutoString nativePath;
+@@ -431,4 +436,12 @@
+       fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
+ #endif
++      if (fullModuleName == nsnull)
++        continue;
++      struct stat sb;
++      if (stat(fullModuleName, &sb)) {
++        if (errno != ENOENT)
++          perror(fullModuleName);
++        continue;
++      }
+       /* If a module exists with the same name, delete it. */
+       NS_ConvertUCS2toUTF8 modNameUTF8(modName);
diff --git a/www/firefox36/pkg-descr b/www/firefox36/pkg-descr
index 166df46a0e53..4f5cfbf2caa9 100644
--- a/www/firefox36/pkg-descr
+++ b/www/firefox36/pkg-descr
@@ -9,4 +9,4 @@ offers many advanced features:
  o FastFind
  o Improved Security
 
-WWW: http://www.mozilla.com/firefox
+WWW: http://www.mozilla.com/firefox/