- Update to 3.6.7.

- Remove NEWTAB option as the preference browser.link.open_external was
  removed in Firefox 3.5. [1]

Reported by:	crsd on EFnet [1]
Security:	http://www.vuxml.org/freebsd/8c2ea875-9499-11df-8e32-000f20797ede.html

6 files changed, 12 insertions, 39 deletions

diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 5bd919cadb9c..08024211d7a5 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	3.6.4
+DISTVERSION=	3.6.7
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -51,10 +51,7 @@ MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/' \
 		--enable-canvas --enable-libxul --disable-necko-wifi \
 		--disable-ipc
 
-SYSTEM_PREFS=		${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js
-
 OPTIONS=	DBUS "Enable D-BUS support" on \
-		NEWTAB "Open external links in a new tab" on \
 		SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
@@ -112,12 +109,6 @@ port-pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
 	${ECHO_CMD} "@dirrmtry share/applications" >> ${PLISTD}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLISTF}
-.if !defined(WITHOUT_NEWTAB)
-	${ECHO_CMD} >> ${SYSTEM_PREFS}
-	${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
-	${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \
-		>> ${SYSTEM_PREFS}
-.endif # !defined(WITHOUT_NEWTAB)
 
 post-install:
 	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index b0b1bb5934be..8e11c0380c55 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-3.6.4.source.tar.bz2) = 66b1610362ed6009d66fe762645679a0
-SHA256 (firefox-3.6.4.source.tar.bz2) = fdea684a717c3eda111060994ead9deb33d0b77a11f0f15da0ebc138ca0b2ec8
-SIZE (firefox-3.6.4.source.tar.bz2) = 51082341
+MD5 (firefox-3.6.7.source.tar.bz2) = e240541898766e44a407e543c70d4949
+SHA256 (firefox-3.6.7.source.tar.bz2) = 0e751c7218c97e8e2d6000b3ac08896c8daeb2ee578975a15e90b38ca5949b4d
+SIZE (firefox-3.6.7.source.tar.bz2) = 51233147
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 5bd919cadb9c..08024211d7a5 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	3.6.4
+DISTVERSION=	3.6.7
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -51,10 +51,7 @@ MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/' \
 		--enable-canvas --enable-libxul --disable-necko-wifi \
 		--disable-ipc
 
-SYSTEM_PREFS=		${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js
-
 OPTIONS=	DBUS "Enable D-BUS support" on \
-		NEWTAB "Open external links in a new tab" on \
 		SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
@@ -112,12 +109,6 @@ port-pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
 	${ECHO_CMD} "@dirrmtry share/applications" >> ${PLISTD}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLISTF}
-.if !defined(WITHOUT_NEWTAB)
-	${ECHO_CMD} >> ${SYSTEM_PREFS}
-	${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
-	${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \
-		>> ${SYSTEM_PREFS}
-.endif # !defined(WITHOUT_NEWTAB)
 
 post-install:
 	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index b0b1bb5934be..8e11c0380c55 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-3.6.4.source.tar.bz2) = 66b1610362ed6009d66fe762645679a0
-SHA256 (firefox-3.6.4.source.tar.bz2) = fdea684a717c3eda111060994ead9deb33d0b77a11f0f15da0ebc138ca0b2ec8
-SIZE (firefox-3.6.4.source.tar.bz2) = 51082341
+MD5 (firefox-3.6.7.source.tar.bz2) = e240541898766e44a407e543c70d4949
+SHA256 (firefox-3.6.7.source.tar.bz2) = 0e751c7218c97e8e2d6000b3ac08896c8daeb2ee578975a15e90b38ca5949b4d
+SIZE (firefox-3.6.7.source.tar.bz2) = 51233147
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index 5bd919cadb9c..08024211d7a5 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	3.6.4
+DISTVERSION=	3.6.7
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -51,10 +51,7 @@ MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/' \
 		--enable-canvas --enable-libxul --disable-necko-wifi \
 		--disable-ipc
 
-SYSTEM_PREFS=		${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js
-
 OPTIONS=	DBUS "Enable D-BUS support" on \
-		NEWTAB "Open external links in a new tab" on \
 		SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
@@ -112,12 +109,6 @@ port-pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
 	${ECHO_CMD} "@dirrmtry share/applications" >> ${PLISTD}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLISTF}
-.if !defined(WITHOUT_NEWTAB)
-	${ECHO_CMD} >> ${SYSTEM_PREFS}
-	${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
-	${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \
-		>> ${SYSTEM_PREFS}
-.endif # !defined(WITHOUT_NEWTAB)
 
 post-install:
 	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
diff --git a/www/firefox36/distinfo b/www/firefox36/distinfo
index b0b1bb5934be..8e11c0380c55 100644
--- a/www/firefox36/distinfo
+++ b/www/firefox36/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-3.6.4.source.tar.bz2) = 66b1610362ed6009d66fe762645679a0
-SHA256 (firefox-3.6.4.source.tar.bz2) = fdea684a717c3eda111060994ead9deb33d0b77a11f0f15da0ebc138ca0b2ec8
-SIZE (firefox-3.6.4.source.tar.bz2) = 51082341
+MD5 (firefox-3.6.7.source.tar.bz2) = e240541898766e44a407e543c70d4949
+SHA256 (firefox-3.6.7.source.tar.bz2) = 0e751c7218c97e8e2d6000b3ac08896c8daeb2ee578975a15e90b38ca5949b4d
+SIZE (firefox-3.6.7.source.tar.bz2) = 51233147