- Update to 3.6.13

- Drop MD5 checksum
- Remove CONFLICTS with Firefox 3.0 which has been removed in June
- Replace CONFLICTS with CONFLICTS_INSTALL

Security:	http://www.vuxml.org/freebsd/1d8ff4a2-0445-11e0-8e32-000f20797ede.html

3 files changed, 4 insertions, 26 deletions

diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index d57c99eabc15..bd328eda4498 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	3.6.12
-PORTREVISION=	1
+DISTVERSION=	3.6.13
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -40,7 +39,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 NO_MOZPKGINSTALL=yes
-CONFLICTS=	firefox-3.[0,5].*
+CONFLICTS_INSTALL=	firefox-3.5.*
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
diff --git a/www/firefox36/distinfo b/www/firefox36/distinfo
index 0a00b10789c4..182c5d5eaa85 100644
--- a/www/firefox36/distinfo
+++ b/www/firefox36/distinfo
@@ -1,3 +1,2 @@
-MD5 (firefox-3.6.12.source.tar.bz2) = 80f4d83f23a7c45fc3f1904964ea2a5a
-SHA256 (firefox-3.6.12.source.tar.bz2) = dd478c653070f451b76befc798cfa1d6b61745d8badf831a3bae453c32e68c2d
-SIZE (firefox-3.6.12.source.tar.bz2) = 51423668
+SHA256 (firefox-3.6.13.source.tar.bz2) = 4b90775c0f29cb7e170a80894311d8c7a2cd794c50e2124b70d1b83011c45f63
+SIZE (firefox-3.6.13.source.tar.bz2) = 51478675
diff --git a/www/firefox36/files/patch-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp b/www/firefox36/files/patch-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp
deleted file mode 100644
index c0b99dd35861..000000000000
--- a/www/firefox36/files/patch-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp.orig
-+++ xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
-@@ -633,10 +633,17 @@ IndexOfDirectoryOfFile(nsISupportsArray*
-             aSearchPath->QueryElementAt(i, NS_GET_IID(nsIFile), 
-                                         getter_AddRefs(current));
-             NS_ASSERTION(current, "broken search path! bad element");
-+#if 0
-+            // XXX #if 0'd because this breaks
-+            //   xptiInterfaceInfoManager::DoFullValidationMergeFromFileList()
-+            // causing ff failing to start when there are symlinks in .xpt
-+            // file paths, like those from addons when /home is a symlink.
-+
-             // nsIFile::Equals basically compares path strings so normalize
-             // before the comparison.
-             parent->Normalize();
-             current->Normalize();
-+#endif
-             PRBool same;
-             if (NS_SUCCEEDED(parent->Equals(current, &same)) && same)
-                 return (int) i;