Update to 31.2.0

Changelog:
31.2.0:
Fixed
Fixed a case where having a contact and card in an address book with the same name could send to the mailing list (Bug 1008718)

Fixed
Invalid certificate issue with mozilla::pkix (see bug 1042889)

Fixed
Importing an RSA private key fails if p < q (see bug 1049435)

Fixed
Security fixes can be found here

31.1.2:
Fixed
Fixed an issue where anchor links would not work in HTML emails (Bug 974857)

Fixed
Security fixes can be found here

31.1.1:
Fixed
Fixed an issue where mailing lists with spaces in their names couldn't be autocompleted (Bug 1060901)

Fixed
Fixed an occasional startup crash (Bug 1005336)

31.1.0:
Fixed
Security fixes can be found here

Fixed
Improved performance of autocomplete for large address books (Bug 984875)

Fixed
Fixed an issue with IMAP being slow when looking for folders on certain server types (Bug 799821, Bug 859269)

Fixed
Fixed various theme issues relating to titlebars and toolbars (Bug 1007225, Bug 1026608, Bug 1041211, Bug 1046563, Bug 1054260)


# Fixed in Thunderbird 31.2

    2014-81 Inconsistent video sharing within iframe
    2014-79 Use-after-free interacting with text directionality
    2014-77 Out-of-bounds write with WebM video
    2014-76 Web Audio memory corruption issues with custom waveforms
    2014-75 Buffer overflow during CSS manipulation
    2014-74 Miscellaneous memory safety hazards (rv:33.0 / rv:31.2)

# Fixed in Thunderbird 31.1.2

    2014-73 RSA Signature Forgery in NSS

# Fixed in Thunderbird 31.1

    2014-72 Use-after-free setting text directionality
    2014-70 Out-of-bounds read in Web Audio audio timeline
    2014-69 Uninitialized memory use during GIF rendering
    2014-68 Use-after-free during DOM interactions with SVG
    2014-67 Miscellaneous memory safety hazards (rv:32.0 / rv:31.1 / rv:24.8)

4 files changed, 11 insertions, 33 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index e13a9588ed6..076257bb40d 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.140 2014/10/07 16:47:30 adam Exp $
+# $NetBSD: Makefile,v 1.141 2014/11/14 15:27:04 ryoon Exp $
 
 DISTNAME=	# empty
-PKGREVISION=	2
 PKGNAME=	thunderbird-${TB_VER}
-TB_VER=		31.0
+TB_VER=		31.2.0
 #LIGHTNINGVER=	1.9
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
@@ -97,7 +96,7 @@ post-install:
 	   ${DESTDIR}${PREFIX}/lib/${MOZILLA}/extensions/.
 	rm -rf ${WRKDIR}/extensions
 
-.include "../../www/firefox/mozilla-common.mk"
+.include "../../www/firefox31/mozilla-common.mk"
 .include "options.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index 0ae0cc1dc4c..3b25e3c3321 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.52 2014/07/27 20:04:59 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.53 2014/11/14 15:27:04 ryoon Exp $
 bin/thunderbird
 lib/thunderbird/application.ini
 lib/thunderbird/blocklist.xml
@@ -1176,6 +1176,7 @@ lib/thunderbird/chrome/messenger/content/messenger/tabmail.css
 lib/thunderbird/chrome/messenger/content/messenger/tabmail.xml
 lib/thunderbird/chrome/messenger/content/messenger/threadPane.js
 lib/thunderbird/chrome/messenger/content/messenger/threadPaneColumnPicker.xml
+lib/thunderbird/chrome/messenger/content/messenger/toolbarIconColor.js
 lib/thunderbird/chrome/messenger/content/messenger/viewLog.js
 lib/thunderbird/chrome/messenger/content/messenger/viewLog.xul
 lib/thunderbird/chrome/messenger/content/messenger/viewSourceOverlay.xul
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index ca8202c47a9..5f6336fb52a 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.147 2014/10/17 16:47:22 joerg Exp $
+$NetBSD: distinfo,v 1.148 2014/11/14 15:27:04 ryoon Exp $
 
 SHA1 (enigmail-1.7.tar.gz) = 79185762ed502cbbf88e0dbf4704dbfedaf429b5
 RMD160 (enigmail-1.7.tar.gz) = c9321d919da53498839bf265acad2dcff94e422a
 Size (enigmail-1.7.tar.gz) = 1414100 bytes
-SHA1 (thunderbird-31.0.source.tar.bz2) = 0fe6666fddd4db82ec2e389f30c5ea11d4f72be5
-RMD160 (thunderbird-31.0.source.tar.bz2) = d0352e096478331392e87342515197851751c898
-Size (thunderbird-31.0.source.tar.bz2) = 170977129 bytes
-SHA1 (patch-aa) = 6070f8a96a3fb285f2c240bafa60c6ea99fd76e1
+SHA1 (thunderbird-31.2.0.source.tar.bz2) = 87dff89388bd7ec51876e1bdbd82bc3fe60006b6
+RMD160 (thunderbird-31.2.0.source.tar.bz2) = d1b24f40f6acc7c24279f024bf8d27abda17552e
+Size (thunderbird-31.2.0.source.tar.bz2) = 171047372 bytes
+SHA1 (patch-aa) = 764c6e8955d371d0869a9b145211f0a9d8709708
 SHA1 (patch-ak) = b47277baa1137a7610445b7c4dd147b331d5c5e6
 SHA1 (patch-al) = 81a733e9b13a47abfef818ecd10d7ef18a191855
 SHA1 (patch-ao) = aa0f3e336c2d97622f735b79c2b5f9e84bb3674e
diff --git a/mail/thunderbird/patches/patch-aa b/mail/thunderbird/patches/patch-aa
index 54420d26ebd..ca3f29c8e27 100644
--- a/mail/thunderbird/patches/patch-aa
+++ b/mail/thunderbird/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.18 2014/07/27 20:04:59 ryoon Exp $
+$NetBSD: patch-aa,v 1.19 2014/11/14 15:27:05 ryoon Exp $
 
 --- mozilla/configure.in.orig	2014-07-18 00:05:11.000000000 +0000
 +++ mozilla/configure.in
@@ -227,28 +227,6 @@ $NetBSD: patch-aa,v 1.18 2014/07/27 20:04:59 ryoon Exp $
  dnl enable once Signaling lands
      MOZ_WEBRTC_SIGNALING=1
      AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -5130,15 +5043,18 @@ AC_SUBST(MOZ_SRTP)
- 
- dnl Use integers over floats for audio on B2G and Android, because audio
- dnl backends for those platforms don't support floats.
--if test "$OS_TARGET" = "Android"; then
-+case "$OS_TARGET" in
-+Android)
-     MOZ_SAMPLE_TYPE_S16=1
-     AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
-     AC_SUBST(MOZ_SAMPLE_TYPE_S16)
--else
-+    ;;
-+*)
-     MOZ_SAMPLE_TYPE_FLOAT32=1
-     AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32)
-     AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32)
--fi
-+    ;;
-+esac
- 
- dnl ========================================================
- dnl = Disable Speech API code
 @@ -5190,6 +5106,63 @@ if test "${ac_cv_c_attribute_aligned}" !
  fi