diff options
| author | Beat Gaetzi <beat@FreeBSD.org> | 2010-12-10 12:43:26 +0000 |
|---|---|---|
| committer | Beat Gaetzi <beat@FreeBSD.org> | 2010-12-10 12:43:26 +0000 |
| commit | 6db818a950481d9a24f1cb2798d4911572105aa1 (patch) | |
| tree | fcce949cf3865d080187dc53f32743c0e41b9332 /www/firefox | |
| parent | de5e4632409b3cba10bee9ffd50b097e05e30a96 (diff) | |
| download | ports-6db818a950481d9a24f1cb2798d4911572105aa1.tar.gz ports-6db818a950481d9a24f1cb2798d4911572105aa1.zip | |
Notes
Diffstat (limited to 'www/firefox')
| -rw-r--r-- | www/firefox/Makefile | 5 | ||||
| -rw-r--r-- | www/firefox/distinfo | 5 | ||||
| -rw-r--r-- | www/firefox/files/patch-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp | 20 |
3 files changed, 4 insertions, 26 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index d57c99eabc15..bd328eda4498 100644 --- a/www/firefox/Makefile +++ b/www/firefox/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/firefox/distinfo b/www/firefox/distinfo index 0a00b10789c4..182c5d5eaa85 100644 --- a/www/firefox/distinfo +++ b/www/firefox/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/firefox/files/patch-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp b/www/firefox/files/patch-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp deleted file mode 100644 index c0b99dd35861..000000000000 --- a/www/firefox/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; |