diff options
| author | Beat Gaetzi <beat@FreeBSD.org> | 2010-12-10 14:51:59 +0000 |
|---|---|---|
| committer | Beat Gaetzi <beat@FreeBSD.org> | 2010-12-10 14:51:59 +0000 |
| commit | 5067484c50333f07fe6c09bfdb7888cb38c9c21e (patch) | |
| tree | 98c71bba24e60ce761e3c5877cd11bbb4cb45b86 /mail | |
| parent | - Update to 3.0.11 (diff) | |
- Update to 3.1.7
- Drop MD5 checksum
- Replace CONFLICTS with CONFLICTS_INSTALL
Security: http://www.vuxml.org/freebsd/1d8ff4a2-0445-11e0-8e32-000f20797ede.html
Notes
Notes:
svn path=/head/; revision=265982
Diffstat (limited to 'mail')
6 files changed, 8 insertions, 56 deletions
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile index 10bb529dfbcb..99db2d545c1b 100644 --- a/mail/thunderbird-esr/Makefile +++ b/mail/thunderbird-esr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -DISTVERSION= 3.1.6 +DISTVERSION= 3.1.7 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -19,7 +19,7 @@ BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr USE_AUTOTOOLS= autoconf213 USE_GECKO= gecko -CONFLICTS= thunderbird-3.0* +CONFLICTS_INSTALL= thunderbird-3.0* USE_MOZILLA= -png -nss -dbm -jpeg -xft MOZ_TOOLKIT= cairo-gtk2 diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo index e1e5e5d25d12..c6ebbd83cb2a 100644 --- a/mail/thunderbird-esr/distinfo +++ b/mail/thunderbird-esr/distinfo @@ -1,3 +1,2 @@ -MD5 (thunderbird-3.1.6.source.tar.bz2) = d126a68e6610d8e3675909e0ba606b42 -SHA256 (thunderbird-3.1.6.source.tar.bz2) = 9a27e3acfe14a0f17d2197d75192a005930347d89a88917c468096e527019ef8 -SIZE (thunderbird-3.1.6.source.tar.bz2) = 65850094 +SHA256 (thunderbird-3.1.7.source.tar.bz2) = 800fe263b3889d4e602ff48889036ad56e940fc792894aca10fa07db28b6e662 +SIZE (thunderbird-3.1.7.source.tar.bz2) = 65948060 diff --git a/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp b/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp deleted file mode 100644 index a053edec7521..000000000000 --- a/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp.orig -+++ mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp -@@ -629,16 +629,17 @@ IndexOfDirectoryOfFile(nsISupportsArray* aSearchPath, nsILocalFile* aFile) - NS_ASSERTION(count, "broken search path! bad count"); - for(PRUint32 i = 0; i < count; i++) - { -- nsCOMPtr<nsIFile> current; -+ nsCOMPtr<nsIFile> current, normalized; - aSearchPath->QueryElementAt(i, NS_GET_IID(nsIFile), - getter_AddRefs(current)); - NS_ASSERTION(current, "broken search path! bad element"); - // nsIFile::Equals basically compares path strings so normalize - // before the comparison. - parent->Normalize(); -- current->Normalize(); -+ current->Clone(getter_AddRefs(normalized)); -+ normalized->Normalize(); - PRBool same; -- if (NS_SUCCEEDED(parent->Equals(current, &same)) && same) -+ if (NS_SUCCEEDED(parent->Equals(normalized, &same)) && same) - return (int) i; - } - } diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 10bb529dfbcb..99db2d545c1b 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -DISTVERSION= 3.1.6 +DISTVERSION= 3.1.7 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -19,7 +19,7 @@ BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr USE_AUTOTOOLS= autoconf213 USE_GECKO= gecko -CONFLICTS= thunderbird-3.0* +CONFLICTS_INSTALL= thunderbird-3.0* USE_MOZILLA= -png -nss -dbm -jpeg -xft MOZ_TOOLKIT= cairo-gtk2 diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index e1e5e5d25d12..c6ebbd83cb2a 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,3 +1,2 @@ -MD5 (thunderbird-3.1.6.source.tar.bz2) = d126a68e6610d8e3675909e0ba606b42 -SHA256 (thunderbird-3.1.6.source.tar.bz2) = 9a27e3acfe14a0f17d2197d75192a005930347d89a88917c468096e527019ef8 -SIZE (thunderbird-3.1.6.source.tar.bz2) = 65850094 +SHA256 (thunderbird-3.1.7.source.tar.bz2) = 800fe263b3889d4e602ff48889036ad56e940fc792894aca10fa07db28b6e662 +SIZE (thunderbird-3.1.7.source.tar.bz2) = 65948060 diff --git a/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp b/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp deleted file mode 100644 index a053edec7521..000000000000 --- a/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp.orig -+++ mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp -@@ -629,16 +629,17 @@ IndexOfDirectoryOfFile(nsISupportsArray* aSearchPath, nsILocalFile* aFile) - NS_ASSERTION(count, "broken search path! bad count"); - for(PRUint32 i = 0; i < count; i++) - { -- nsCOMPtr<nsIFile> current; -+ nsCOMPtr<nsIFile> current, normalized; - aSearchPath->QueryElementAt(i, NS_GET_IID(nsIFile), - getter_AddRefs(current)); - NS_ASSERTION(current, "broken search path! bad element"); - // nsIFile::Equals basically compares path strings so normalize - // before the comparison. - parent->Normalize(); -- current->Normalize(); -+ current->Clone(getter_AddRefs(normalized)); -+ normalized->Normalize(); - PRBool same; -- if (NS_SUCCEEDED(parent->Equals(current, &same)) && same) -+ if (NS_SUCCEEDED(parent->Equals(normalized, &same)) && same) - return (int) i; - } - } |