- Update Firefox to 36.0

- Update Firefox ESR to 31.5.0
- Update Thunderbird to 31.5.0
- Update libxul to 31.5.0
- Check if NS_NewNativeLocalFile() succeeds before using [1]
- Remove DTRACE and GIO descriptions after r377838 and r314893
- bsd.gecko.mk: Prune conditionals for files removed 4 months ago

Changes:	https://www.mozilla.org/firefox/36.0/releasenotes/
Obtained from:	PkgSrc [1]
MFH:		2015Q1
X-MFH-With:	r377953, r378253, r379485, r378529
Security:	https://vuxml.freebsd.org/freebsd/99029172-8253-407d-9d8b-2cfeab9abf81.html

9 files changed, 170 insertions, 326 deletions

diff --git a/mail/linux-thunderbird/Makefile b/mail/linux-thunderbird/Makefile
index 8bda5c5eb75..e3b4f7dd70e 100644
--- a/mail/linux-thunderbird/Makefile
+++ b/mail/linux-thunderbird/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	31.4.0
+DISTVERSION=	31.5.0
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US
 
diff --git a/mail/linux-thunderbird/distinfo b/mail/linux-thunderbird/distinfo
index 6e2b3c6f9cd..f2985343f6e 100644
--- a/mail/linux-thunderbird/distinfo
+++ b/mail/linux-thunderbird/distinfo
@@ -1,5 +1,5 @@
-SHA256 (thunderbird-31.4.0.tar.bz2) = e08c0d4d2bd570801a3609133e63abb080f9f825c288fa2f5761639f2f6e4958
-SIZE (thunderbird-31.4.0.tar.bz2) = 36871510
+SHA256 (thunderbird-31.5.0.tar.bz2) = c4a1e9865e756a09383e110f8f81a229e49fcec04012de80856ce454ed6e41f7
+SIZE (thunderbird-31.5.0.tar.bz2) = 36874681
 SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99
 SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908
 SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b
diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile
index f5b9b1ca66f..2b735fb9ea6 100644
--- a/mail/thunderbird-i18n/Makefile
+++ b/mail/thunderbird-i18n/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird-i18n
-PORTVERSION=	31.4.0
+PORTVERSION=	31.5.0
 CATEGORIES=	mail news net-im
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi
 PKGNAMEPREFIX=
diff --git a/mail/thunderbird-i18n/distinfo b/mail/thunderbird-i18n/distinfo
index 3b0619da43d..9b94cee5701 100644
--- a/mail/thunderbird-i18n/distinfo
+++ b/mail/thunderbird-i18n/distinfo
@@ -1,110 +1,110 @@
-SHA256 (xpi/thunderbird-i18n-31.4.0/ar.xpi) = b758c51e79fa7713a6f147d928eec15892f044d2f295ff0ec48f5a76820f812c
-SIZE (xpi/thunderbird-i18n-31.4.0/ar.xpi) = 472812
-SHA256 (xpi/thunderbird-i18n-31.4.0/ast.xpi) = 6376fa259325eeafd71e148fedcf19cf9e3a620fe805e78089a3d68af4a4caef
-SIZE (xpi/thunderbird-i18n-31.4.0/ast.xpi) = 393049
-SHA256 (xpi/thunderbird-i18n-31.4.0/be.xpi) = ac3f330a687ad8cb329a46844e92439dfb069b29369fdec93885c74a6137a35e
-SIZE (xpi/thunderbird-i18n-31.4.0/be.xpi) = 427488
-SHA256 (xpi/thunderbird-i18n-31.4.0/bg.xpi) = 5c1bc813f0f2e5440d6a7f6bbe0cb346de688d47cd241b68834bf398ee35908c
-SIZE (xpi/thunderbird-i18n-31.4.0/bg.xpi) = 493734
-SHA256 (xpi/thunderbird-i18n-31.4.0/bn-BD.xpi) = aafaff2a6dad2220a1e75b8948da60c9eba68f81130fbded5c34e773f4fc46d9
-SIZE (xpi/thunderbird-i18n-31.4.0/bn-BD.xpi) = 555613
-SHA256 (xpi/thunderbird-i18n-31.4.0/br.xpi) = 867200206ee9d6339a2bbfce71f7d3bceca32a0821d5fd4d5ed03585b8f98cdd
-SIZE (xpi/thunderbird-i18n-31.4.0/br.xpi) = 441444
-SHA256 (xpi/thunderbird-i18n-31.4.0/ca.xpi) = 36481e5c6f1c138ca7752cfa4085c4ba9e4bf6ed32c52f6bbf72c105ea59c08c
-SIZE (xpi/thunderbird-i18n-31.4.0/ca.xpi) = 441713
-SHA256 (xpi/thunderbird-i18n-31.4.0/cs.xpi) = 391fe8f7f56270ef3f3e23c4855387053155134d4b2718a40e2a96a8432dec4c
-SIZE (xpi/thunderbird-i18n-31.4.0/cs.xpi) = 444701
-SHA256 (xpi/thunderbird-i18n-31.4.0/da.xpi) = bc46fdba7cb03e1d83fc471b54cfe4bc6734a72871b6f286c66fc63c26142764
-SIZE (xpi/thunderbird-i18n-31.4.0/da.xpi) = 422052
-SHA256 (xpi/thunderbird-i18n-31.4.0/de.xpi) = 060e5bc3c4995ce1d44d8d463d47af785748a3ade78160e4a9c54ad4c6ce982b
-SIZE (xpi/thunderbird-i18n-31.4.0/de.xpi) = 424665
-SHA256 (xpi/thunderbird-i18n-31.4.0/el.xpi) = bef0bdf34e89eb0bb36ea53456d479beff39e3a2fa19cc96a3f082ada84dcc0c
-SIZE (xpi/thunderbird-i18n-31.4.0/el.xpi) = 484855
-SHA256 (xpi/thunderbird-i18n-31.4.0/en-GB.xpi) = bd6815c2cb86ac06cf171d956c28bf29eef10405058c3fba5a7cc34dd90171d7
-SIZE (xpi/thunderbird-i18n-31.4.0/en-GB.xpi) = 412515
-SHA256 (xpi/thunderbird-i18n-31.4.0/en-US.xpi) = c659b3c533e040d1c99d4f0f69dec4a995dc8c437271bcecfae53de4dd6181a1
-SIZE (xpi/thunderbird-i18n-31.4.0/en-US.xpi) = 413660
-SHA256 (xpi/thunderbird-i18n-31.4.0/es-AR.xpi) = cce52ecb2aede4639c4606c860f50abdb90cde00b761319887bad1ecf541f48b
-SIZE (xpi/thunderbird-i18n-31.4.0/es-AR.xpi) = 438531
-SHA256 (xpi/thunderbird-i18n-31.4.0/es-ES.xpi) = 7dcd156460118af201d721b0a48366546cce7ad9f3406371930492fc18b19677
-SIZE (xpi/thunderbird-i18n-31.4.0/es-ES.xpi) = 374979
-SHA256 (xpi/thunderbird-i18n-31.4.0/et.xpi) = 9338e5f57be7b9cb7d594c8177c67a5d27a38d9fd9632c4d2b52276cd3b17170
-SIZE (xpi/thunderbird-i18n-31.4.0/et.xpi) = 434364
-SHA256 (xpi/thunderbird-i18n-31.4.0/eu.xpi) = b00c7af0eba2f57014a69d3b7aff4de21c8a4ce51897d19bfb6d0127a85c6a3e
-SIZE (xpi/thunderbird-i18n-31.4.0/eu.xpi) = 431449
-SHA256 (xpi/thunderbird-i18n-31.4.0/fi.xpi) = 5de0e63d0373ba13e944c7d097b413b02e32cdb36a33e66b3280a82f97e1969c
-SIZE (xpi/thunderbird-i18n-31.4.0/fi.xpi) = 435633
-SHA256 (xpi/thunderbird-i18n-31.4.0/fr.xpi) = 056086aea4ae18784038f01f4911ee540b6140978894ed4e6bb29aac669a6917
-SIZE (xpi/thunderbird-i18n-31.4.0/fr.xpi) = 444144
-SHA256 (xpi/thunderbird-i18n-31.4.0/fy-NL.xpi) = af9a03bc3f80465eca10e23ed77a2df331483493bb461b64792e06a6dd57da29
-SIZE (xpi/thunderbird-i18n-31.4.0/fy-NL.xpi) = 438545
-SHA256 (xpi/thunderbird-i18n-31.4.0/ga-IE.xpi) = 0c36c28fe519fa379cfcc75a8382268c1ef037509d90b9c7018e5317a8067a96
-SIZE (xpi/thunderbird-i18n-31.4.0/ga-IE.xpi) = 449362
-SHA256 (xpi/thunderbird-i18n-31.4.0/gd.xpi) = 0a49f061bd5a908cd6aa40bd7157d8622ecafc1b2039461702a1947ae07b6a23
-SIZE (xpi/thunderbird-i18n-31.4.0/gd.xpi) = 453171
-SHA256 (xpi/thunderbird-i18n-31.4.0/gl.xpi) = 136711c07702118c67aff6e1ced3036acc85fdfd34810d1b31d7beda6e05d7d9
-SIZE (xpi/thunderbird-i18n-31.4.0/gl.xpi) = 446788
-SHA256 (xpi/thunderbird-i18n-31.4.0/he.xpi) = 193c08a611dc42594b544146a060598108a6b810caed7b8f6e4c610ef88f6f63
-SIZE (xpi/thunderbird-i18n-31.4.0/he.xpi) = 476112
-SHA256 (xpi/thunderbird-i18n-31.4.0/hr.xpi) = a35b6b8095950c830a14f507a74a0efece50726d9ba7a2d0fc7d14b53150a8b7
-SIZE (xpi/thunderbird-i18n-31.4.0/hr.xpi) = 436980
-SHA256 (xpi/thunderbird-i18n-31.4.0/hu.xpi) = 31b103b899684391b48c4b7284474efd96b39fd6612ed5b607fa283b05ec1f61
-SIZE (xpi/thunderbird-i18n-31.4.0/hu.xpi) = 454542
-SHA256 (xpi/thunderbird-i18n-31.4.0/hy-AM.xpi) = 44d9e4471a2cfd9938ddf7e617184228d448f9aba94a2eaba88b34650474cf28
-SIZE (xpi/thunderbird-i18n-31.4.0/hy-AM.xpi) = 492766
-SHA256 (xpi/thunderbird-i18n-31.4.0/id.xpi) = 91f7bd26d3939fbf4ce4398215b4a74a252e663217201fc5c606e5f24e28cc79
-SIZE (xpi/thunderbird-i18n-31.4.0/id.xpi) = 475876
-SHA256 (xpi/thunderbird-i18n-31.4.0/is.xpi) = cabb75f91fa2d4592dbf94526bddf2549be1f552d0f943ccfc5a540fc8f5ebaa
-SIZE (xpi/thunderbird-i18n-31.4.0/is.xpi) = 437959
-SHA256 (xpi/thunderbird-i18n-31.4.0/it.xpi) = 688327a8dca03496a2114645ebe9ba43c0b709b0d448a17d76369a8e8fb09373
-SIZE (xpi/thunderbird-i18n-31.4.0/it.xpi) = 368001
-SHA256 (xpi/thunderbird-i18n-31.4.0/ja.xpi) = ba7c5ea060cb8efab96b159516b09aa04d026ace91e80b8eef504280b1ad2bed
-SIZE (xpi/thunderbird-i18n-31.4.0/ja.xpi) = 489267
-SHA256 (xpi/thunderbird-i18n-31.4.0/ko.xpi) = 175928cdec2ad62bdf97a365020bd688f692a4f57e6d9417aa69c9cc67f1a302
-SIZE (xpi/thunderbird-i18n-31.4.0/ko.xpi) = 448920
-SHA256 (xpi/thunderbird-i18n-31.4.0/lt.xpi) = 93655d1035276a89c68425d14879dcadc6eb1e566bf934f9e9589eaec788d15b
-SIZE (xpi/thunderbird-i18n-31.4.0/lt.xpi) = 456352
-SHA256 (xpi/thunderbird-i18n-31.4.0/nb-NO.xpi) = 2d63b4eb3baf322b12526b6a465f165e0fc946c9f86cd973168572f384f35453
-SIZE (xpi/thunderbird-i18n-31.4.0/nb-NO.xpi) = 430941
-SHA256 (xpi/thunderbird-i18n-31.4.0/nl.xpi) = 6bb744c813d8656642845538d2f93d874877ad1d231c699aa16b44452e57bbe5
-SIZE (xpi/thunderbird-i18n-31.4.0/nl.xpi) = 431888
-SHA256 (xpi/thunderbird-i18n-31.4.0/nn-NO.xpi) = 6091e8dd488e704456e8318ee01eb566e738ea9c6a346e5351c590b65c9a35ae
-SIZE (xpi/thunderbird-i18n-31.4.0/nn-NO.xpi) = 433198
-SHA256 (xpi/thunderbird-i18n-31.4.0/pa-IN.xpi) = af33455b4ef8d579595d4e312ae9d53920f49f90a2b436bd0ffb225938e50536
-SIZE (xpi/thunderbird-i18n-31.4.0/pa-IN.xpi) = 525323
-SHA256 (xpi/thunderbird-i18n-31.4.0/pl.xpi) = 7128b31c1293ef7d314aa91334c83846149e0584dac24cb2702c1d4455142b81
-SIZE (xpi/thunderbird-i18n-31.4.0/pl.xpi) = 410872
-SHA256 (xpi/thunderbird-i18n-31.4.0/pt-BR.xpi) = a2a1711be09d3c9c856bfe7ee4cdeb278fc3509e03c2b71990f179ad083dafe6
-SIZE (xpi/thunderbird-i18n-31.4.0/pt-BR.xpi) = 450477
-SHA256 (xpi/thunderbird-i18n-31.4.0/pt-PT.xpi) = d529f227ad665ffd62b00b12d8740b9ac60fcdb22156a1cdfaeac4a1d16d6221
-SIZE (xpi/thunderbird-i18n-31.4.0/pt-PT.xpi) = 439604
-SHA256 (xpi/thunderbird-i18n-31.4.0/rm.xpi) = dbc36dc2dca453e9db62dcf98696df1d5fd3f567bf61b9ac8d82e7655655e0e4
-SIZE (xpi/thunderbird-i18n-31.4.0/rm.xpi) = 439186
-SHA256 (xpi/thunderbird-i18n-31.4.0/ro.xpi) = 97a115649c8d2bdb7440bf1ba382def1e72b9e03e7e379311cbcf0b3281a7fcc
-SIZE (xpi/thunderbird-i18n-31.4.0/ro.xpi) = 479749
-SHA256 (xpi/thunderbird-i18n-31.4.0/ru.xpi) = 4e5067b258ff6f881f2570a0575bd87e3aba780cfd680576419d32a126278a49
-SIZE (xpi/thunderbird-i18n-31.4.0/ru.xpi) = 436156
-SHA256 (xpi/thunderbird-i18n-31.4.0/si.xpi) = 79bbf1f26ef7ce4e9e6b3a6d548d851ef5c4b36157207a21b70d609857a4d7bc
-SIZE (xpi/thunderbird-i18n-31.4.0/si.xpi) = 528812
-SHA256 (xpi/thunderbird-i18n-31.4.0/sk.xpi) = 9b042399be1fdf1d327aaf400a49ef269b39a6afb359e78b79b21473d8d2e5ba
-SIZE (xpi/thunderbird-i18n-31.4.0/sk.xpi) = 452995
-SHA256 (xpi/thunderbird-i18n-31.4.0/sl.xpi) = f3db7ef61fa94c1a5a941bc85bd1dbfe87a76b0227225c6a4c9e9857b25dba35
-SIZE (xpi/thunderbird-i18n-31.4.0/sl.xpi) = 433874
-SHA256 (xpi/thunderbird-i18n-31.4.0/sq.xpi) = e0eef93742c9b9a6c511300733998de104a1c63666fe5d5ab485d872eec381f8
-SIZE (xpi/thunderbird-i18n-31.4.0/sq.xpi) = 454695
-SHA256 (xpi/thunderbird-i18n-31.4.0/sr.xpi) = b5c85dafe1aa73f14c2831670a7766955c0893d74f3e45e5c447e8b007515c11
-SIZE (xpi/thunderbird-i18n-31.4.0/sr.xpi) = 537335
-SHA256 (xpi/thunderbird-i18n-31.4.0/sv-SE.xpi) = 715426ca25f8f7a6fbf0976743cb5c572f1e6b53d1df1ca5ee71a102f172f0ad
-SIZE (xpi/thunderbird-i18n-31.4.0/sv-SE.xpi) = 436106
-SHA256 (xpi/thunderbird-i18n-31.4.0/ta-LK.xpi) = bf294f9942ca6495b6f4196b0955c956792b5651628f9374ad34fc655e91ba5f
-SIZE (xpi/thunderbird-i18n-31.4.0/ta-LK.xpi) = 553509
-SHA256 (xpi/thunderbird-i18n-31.4.0/tr.xpi) = f408ef749ea4a160605961abc37f03322affce56e09ccdb0c824f6de2926ff10
-SIZE (xpi/thunderbird-i18n-31.4.0/tr.xpi) = 457360
-SHA256 (xpi/thunderbird-i18n-31.4.0/uk.xpi) = f7be658507adaaed67fd9bd1a6482a2b49ffc975e991934aad7e319e3f21c843
-SIZE (xpi/thunderbird-i18n-31.4.0/uk.xpi) = 499656
-SHA256 (xpi/thunderbird-i18n-31.4.0/vi.xpi) = 30a49028ea0d54edeb9a06a7d7dcf7e58e6e77ba36ff93353358c7eb23df7f66
-SIZE (xpi/thunderbird-i18n-31.4.0/vi.xpi) = 513835
-SHA256 (xpi/thunderbird-i18n-31.4.0/zh-CN.xpi) = 84a96831d8d781c1641e40ddab8bc1b2ab134c8c695b7de739d6dce51cbba583
-SIZE (xpi/thunderbird-i18n-31.4.0/zh-CN.xpi) = 462668
-SHA256 (xpi/thunderbird-i18n-31.4.0/zh-TW.xpi) = 48ea0c4b0f391a90d887283437c23b2bfc0af6f0b9efb85e72444a0931f905a5
-SIZE (xpi/thunderbird-i18n-31.4.0/zh-TW.xpi) = 463408
+SHA256 (xpi/thunderbird-i18n-31.5.0/ar.xpi) = 80b83ce312ed5616edc61b34604d4991ed1e2179f067336d019b64e32a929530
+SIZE (xpi/thunderbird-i18n-31.5.0/ar.xpi) = 472812
+SHA256 (xpi/thunderbird-i18n-31.5.0/ast.xpi) = 5e04389beb3b7a8fe8d910e52d6683104db2a937746c7db829d6e4ff6c8bab9d
+SIZE (xpi/thunderbird-i18n-31.5.0/ast.xpi) = 393049
+SHA256 (xpi/thunderbird-i18n-31.5.0/be.xpi) = a7db2f7a89632a0e55b650dc08b957bc678445db5fb807b029cc7f330651ff28
+SIZE (xpi/thunderbird-i18n-31.5.0/be.xpi) = 427488
+SHA256 (xpi/thunderbird-i18n-31.5.0/bg.xpi) = 1ea991edf2e89421e1f6de27538610be53c61190fc24d62ae181677e904d25dd
+SIZE (xpi/thunderbird-i18n-31.5.0/bg.xpi) = 493734
+SHA256 (xpi/thunderbird-i18n-31.5.0/bn-BD.xpi) = e0e1249d2a82c5a52f9b11dc5b4c64dd3204c07feacd431db6fcb31678604f93
+SIZE (xpi/thunderbird-i18n-31.5.0/bn-BD.xpi) = 555613
+SHA256 (xpi/thunderbird-i18n-31.5.0/br.xpi) = e62d04221c7352c833da0df59a44ea13aa9bb30654a8d745760b0e1a3f42689a
+SIZE (xpi/thunderbird-i18n-31.5.0/br.xpi) = 441444
+SHA256 (xpi/thunderbird-i18n-31.5.0/ca.xpi) = b3bff4b5595a3427c4ef31ba27fcfef64839bcbddf37b62d2f04f35c31e3889a
+SIZE (xpi/thunderbird-i18n-31.5.0/ca.xpi) = 441713
+SHA256 (xpi/thunderbird-i18n-31.5.0/cs.xpi) = cb84334c881ba9444553b334c6cd6e6541c71bd432c8bff46014603a70e10ec2
+SIZE (xpi/thunderbird-i18n-31.5.0/cs.xpi) = 444701
+SHA256 (xpi/thunderbird-i18n-31.5.0/da.xpi) = 284e99c29e42d02c79638c9483aa0b8cc008b46a53da11865f8da33506c46b6b
+SIZE (xpi/thunderbird-i18n-31.5.0/da.xpi) = 422051
+SHA256 (xpi/thunderbird-i18n-31.5.0/de.xpi) = a55c0d175e08ce74aa94b9f703c89079aa64996e605a34d061dd775fb8d3fea5
+SIZE (xpi/thunderbird-i18n-31.5.0/de.xpi) = 424665
+SHA256 (xpi/thunderbird-i18n-31.5.0/el.xpi) = 46870a4296ad1f1c1871034bbd3afa21f345f32c2970960ffff0f836d847cd69
+SIZE (xpi/thunderbird-i18n-31.5.0/el.xpi) = 484855
+SHA256 (xpi/thunderbird-i18n-31.5.0/en-GB.xpi) = c92104ae4cd34fb8f545d4c3a5a39bc3caea50d4729d3689859b84a49b187c06
+SIZE (xpi/thunderbird-i18n-31.5.0/en-GB.xpi) = 412515
+SHA256 (xpi/thunderbird-i18n-31.5.0/en-US.xpi) = 51564b06ba20565fbe98dfe1047c914c55fcb6f621f9f6fdbfd76d4167a4ebe5
+SIZE (xpi/thunderbird-i18n-31.5.0/en-US.xpi) = 413660
+SHA256 (xpi/thunderbird-i18n-31.5.0/es-AR.xpi) = ef962dfff8cc1f77506e1ac9f852cd314eaf11e017e0a46a8f4ea4de53f9bf21
+SIZE (xpi/thunderbird-i18n-31.5.0/es-AR.xpi) = 438531
+SHA256 (xpi/thunderbird-i18n-31.5.0/es-ES.xpi) = 6dd729d5d718a6b4c5d542b37e3876e3523fdf21953224c9eb39eb9efd5f4b1d
+SIZE (xpi/thunderbird-i18n-31.5.0/es-ES.xpi) = 374979
+SHA256 (xpi/thunderbird-i18n-31.5.0/et.xpi) = 43d89ed6ca9df9e0d008193ff9e40cc95bd95831d64e163f72a81c2efdfa7ad5
+SIZE (xpi/thunderbird-i18n-31.5.0/et.xpi) = 434364
+SHA256 (xpi/thunderbird-i18n-31.5.0/eu.xpi) = a7c6a4c165ad6f2d1f175527d5f875554fa399a6d6889236ffed493077bbc6e0
+SIZE (xpi/thunderbird-i18n-31.5.0/eu.xpi) = 431448
+SHA256 (xpi/thunderbird-i18n-31.5.0/fi.xpi) = b35caace844de02426c23f9e87b8f9651215d80d95f45bb13a2f5002d612204d
+SIZE (xpi/thunderbird-i18n-31.5.0/fi.xpi) = 435632
+SHA256 (xpi/thunderbird-i18n-31.5.0/fr.xpi) = 4712f3ed3edbbc4b14f4dd50e1402be4cb8dfcdd965c67f8d3186c391702e0ae
+SIZE (xpi/thunderbird-i18n-31.5.0/fr.xpi) = 444144
+SHA256 (xpi/thunderbird-i18n-31.5.0/fy-NL.xpi) = bba975b7a3783432d46017fa650cffdff40b2c28229db24f1f4b5d0a73fc0a77
+SIZE (xpi/thunderbird-i18n-31.5.0/fy-NL.xpi) = 438545
+SHA256 (xpi/thunderbird-i18n-31.5.0/ga-IE.xpi) = b115d881b42e94c6c2357e884c9b943574830ff150a75435a5e80130adc77304
+SIZE (xpi/thunderbird-i18n-31.5.0/ga-IE.xpi) = 449362
+SHA256 (xpi/thunderbird-i18n-31.5.0/gd.xpi) = 9943a52c4c3843b1422f9deb566f04357bbba5a7f60c8ce587a6b46f177ac508
+SIZE (xpi/thunderbird-i18n-31.5.0/gd.xpi) = 453171
+SHA256 (xpi/thunderbird-i18n-31.5.0/gl.xpi) = 5e2564106632fa6c978345c59f87c93034061f1d2d8ad3f2558214b6056a37de
+SIZE (xpi/thunderbird-i18n-31.5.0/gl.xpi) = 446788
+SHA256 (xpi/thunderbird-i18n-31.5.0/he.xpi) = 1a6fc4ead76564ecd40dbafe42da5c0cf9ae487160db5da24a45d5cafa86afb1
+SIZE (xpi/thunderbird-i18n-31.5.0/he.xpi) = 476111
+SHA256 (xpi/thunderbird-i18n-31.5.0/hr.xpi) = d9758d7f3866155c29237fce8a59a5ab25ef7372f52a4abf802cdc68e9aa0735
+SIZE (xpi/thunderbird-i18n-31.5.0/hr.xpi) = 436980
+SHA256 (xpi/thunderbird-i18n-31.5.0/hu.xpi) = 95bbeadbfe9eef336ab446272029ec6ee909f590cffd84299b4d7ea8cd215408
+SIZE (xpi/thunderbird-i18n-31.5.0/hu.xpi) = 454542
+SHA256 (xpi/thunderbird-i18n-31.5.0/hy-AM.xpi) = 6f4157eb89931bf75f080791e456c45833ca81f12550bb1c93804be561e309f1
+SIZE (xpi/thunderbird-i18n-31.5.0/hy-AM.xpi) = 492765
+SHA256 (xpi/thunderbird-i18n-31.5.0/id.xpi) = 6e5015d1eb222a70e7aa9f0bca08eec99b81172a216fbba068450e02da681c17
+SIZE (xpi/thunderbird-i18n-31.5.0/id.xpi) = 475876
+SHA256 (xpi/thunderbird-i18n-31.5.0/is.xpi) = ef04dd0a3fe1c0e4edc39a447f561cffb6b962f3dc610ffcd0946c1d26904845
+SIZE (xpi/thunderbird-i18n-31.5.0/is.xpi) = 437959
+SHA256 (xpi/thunderbird-i18n-31.5.0/it.xpi) = 17a0b2c5a2cb1421ec0e73a21040fc18a961ba662508db10a9df19b8476a83ac
+SIZE (xpi/thunderbird-i18n-31.5.0/it.xpi) = 368001
+SHA256 (xpi/thunderbird-i18n-31.5.0/ja.xpi) = 4bb4ce66c270912d005227395c1959579d8bb8f4f8297f3078b3f0d25bcfa0d3
+SIZE (xpi/thunderbird-i18n-31.5.0/ja.xpi) = 489267
+SHA256 (xpi/thunderbird-i18n-31.5.0/ko.xpi) = 7a38503c3a9b8e5400dea6627728ded00a0557ae334e1107384559c42e1dec08
+SIZE (xpi/thunderbird-i18n-31.5.0/ko.xpi) = 448920
+SHA256 (xpi/thunderbird-i18n-31.5.0/lt.xpi) = 2417df06915b561cc020d2819a7025db605e5af46ccc1c143fa4d05ccade392b
+SIZE (xpi/thunderbird-i18n-31.5.0/lt.xpi) = 456351
+SHA256 (xpi/thunderbird-i18n-31.5.0/nb-NO.xpi) = a79569621cb322351152f4dea1607c9b37f50348a14114f9e61007ecae32288b
+SIZE (xpi/thunderbird-i18n-31.5.0/nb-NO.xpi) = 430942
+SHA256 (xpi/thunderbird-i18n-31.5.0/nl.xpi) = 011833942de32f1ddc54c5af9737267c88fd8f540c15cac117b495e056092c10
+SIZE (xpi/thunderbird-i18n-31.5.0/nl.xpi) = 431888
+SHA256 (xpi/thunderbird-i18n-31.5.0/nn-NO.xpi) = cc40effe5cdf84001f7128eb8490e4341dfb896c341bab7487acbfcef38c3747
+SIZE (xpi/thunderbird-i18n-31.5.0/nn-NO.xpi) = 433198
+SHA256 (xpi/thunderbird-i18n-31.5.0/pa-IN.xpi) = 5b5b5fd4429225671a02c6bd81441574013969eb09c82270ba84c6f196a82a03
+SIZE (xpi/thunderbird-i18n-31.5.0/pa-IN.xpi) = 525323
+SHA256 (xpi/thunderbird-i18n-31.5.0/pl.xpi) = f9929f9e7f59e58af8423b66a06577814740c1d25cad445132bbbce00f75ec0a
+SIZE (xpi/thunderbird-i18n-31.5.0/pl.xpi) = 410872
+SHA256 (xpi/thunderbird-i18n-31.5.0/pt-BR.xpi) = 9f3d7078b8e8266583042eb9329f9ac0253a6aa0478b8f61ab40e11414c4d2e1
+SIZE (xpi/thunderbird-i18n-31.5.0/pt-BR.xpi) = 450477
+SHA256 (xpi/thunderbird-i18n-31.5.0/pt-PT.xpi) = 6c77ef803b065be17f2089879d1bacf0e1fd12097ad55748da7d5cd870e2cd70
+SIZE (xpi/thunderbird-i18n-31.5.0/pt-PT.xpi) = 439604
+SHA256 (xpi/thunderbird-i18n-31.5.0/rm.xpi) = ad39f5df1f8038b80e575173f6e97cff72a926f41b974d008011f4b285f88730
+SIZE (xpi/thunderbird-i18n-31.5.0/rm.xpi) = 439185
+SHA256 (xpi/thunderbird-i18n-31.5.0/ro.xpi) = 7964ab86199c2b7d16d025eb4080db630ee9d7221c7637470d1f774279b69c85
+SIZE (xpi/thunderbird-i18n-31.5.0/ro.xpi) = 479749
+SHA256 (xpi/thunderbird-i18n-31.5.0/ru.xpi) = 6a75dea1bc33c492e8ec8b6a6dd783d2ca908f0f94d47474ddd96fd6b6116865
+SIZE (xpi/thunderbird-i18n-31.5.0/ru.xpi) = 436156
+SHA256 (xpi/thunderbird-i18n-31.5.0/si.xpi) = 4295a6f35fef93bd1c1b4b07d315ed45f92109c56e2cd1bfabb98b42b7d0e68b
+SIZE (xpi/thunderbird-i18n-31.5.0/si.xpi) = 528812
+SHA256 (xpi/thunderbird-i18n-31.5.0/sk.xpi) = b91dd4281edb18f64412c7b459df5afebb12acc5de89c0af26c5a453603d9a36
+SIZE (xpi/thunderbird-i18n-31.5.0/sk.xpi) = 452995
+SHA256 (xpi/thunderbird-i18n-31.5.0/sl.xpi) = aec21bd6f7f183dc7446ed24dda5c64ae7362c48f6d32ef3169cfc273ba4c45f
+SIZE (xpi/thunderbird-i18n-31.5.0/sl.xpi) = 433874
+SHA256 (xpi/thunderbird-i18n-31.5.0/sq.xpi) = 40658e0261e2eea88c2561435a721b221634d6d7b50293bec162f5db24ae6fde
+SIZE (xpi/thunderbird-i18n-31.5.0/sq.xpi) = 454694
+SHA256 (xpi/thunderbird-i18n-31.5.0/sr.xpi) = 3e9bd7a41b45a165518bfa773b96ccf56f8f6420d54164e51f3af44e3264ee0e
+SIZE (xpi/thunderbird-i18n-31.5.0/sr.xpi) = 537336
+SHA256 (xpi/thunderbird-i18n-31.5.0/sv-SE.xpi) = 34806febfad1cb915b7489d43e6ec10273aba1458d922b03d38995669f85283f
+SIZE (xpi/thunderbird-i18n-31.5.0/sv-SE.xpi) = 436105
+SHA256 (xpi/thunderbird-i18n-31.5.0/ta-LK.xpi) = d9ecbfde0508d1fe70a541f30edebea6d60f952b3f102c65c235ac9ed2274a28
+SIZE (xpi/thunderbird-i18n-31.5.0/ta-LK.xpi) = 553508
+SHA256 (xpi/thunderbird-i18n-31.5.0/tr.xpi) = 165d89d6c12fc99f2de8f83c4ea39f4866b2b65ded899598fd072b909c9aee22
+SIZE (xpi/thunderbird-i18n-31.5.0/tr.xpi) = 457360
+SHA256 (xpi/thunderbird-i18n-31.5.0/uk.xpi) = 8841b2b381fdd345cd0b19fc2feead78028d5cc118fda6ffb52539b7e6f7c8b3
+SIZE (xpi/thunderbird-i18n-31.5.0/uk.xpi) = 499656
+SHA256 (xpi/thunderbird-i18n-31.5.0/vi.xpi) = 0b4049bbb4ac58833d3ae35750ece29c4893554afcb9622afbe1d64345e6378e
+SIZE (xpi/thunderbird-i18n-31.5.0/vi.xpi) = 513835
+SHA256 (xpi/thunderbird-i18n-31.5.0/zh-CN.xpi) = 38a92f434e1d70abd474be1fa449bbb0c19ccad91ef440a5d8e8803e98bda5d3
+SIZE (xpi/thunderbird-i18n-31.5.0/zh-CN.xpi) = 462668
+SHA256 (xpi/thunderbird-i18n-31.5.0/zh-TW.xpi) = c81b39d164cc196e99ae0526c124647ea6de6574b415e0dcd8299f76c8240c84
+SIZE (xpi/thunderbird-i18n-31.5.0/zh-TW.xpi) = 463408
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index a6ffab6b53a..681e7e1d5e6 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	31.4.0
-PORTREVISION=	2
+DISTVERSION=	31.5.0
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
@@ -33,7 +32,7 @@ BUILD_DEPENDS=	nspr>=4.10.6:${PORTSDIR}/devel/nspr \
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
 EM_VERSION=	1.7.2
-L_VERSION=	3.3.4
+L_VERSION=	3.3.5
 
 SSP_UNSAFE=	yes
 USE_GECKO=	gecko
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index f43f6755479..932be436464 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,4 +1,4 @@
-SHA256 (thunderbird-31.4.0.source.tar.bz2) = 3e4b6cb5934b7a8e51a673044e0691eb7cd88a08415494673cd7eadb35cd90c3
-SIZE (thunderbird-31.4.0.source.tar.bz2) = 171045601
+SHA256 (thunderbird-31.5.0.source.tar.bz2) = 17ca8904ac2cc4815b145074b0f2b5729e22e8d3f635c3afe12913b35893e2d9
+SIZE (thunderbird-31.5.0.source.tar.bz2) = 392347898
 SHA256 (enigmail-1.7.2.tar.gz) = 7b3a62e83961bafec1cdac60075aa6c317c8f655a837e31a7d1f3ce6a49fc7d6
 SIZE (enigmail-1.7.2.tar.gz) = 1420346
diff --git a/mail/thunderbird/files/patch-bug1021761 b/mail/thunderbird/files/patch-bug1021761
index 441cf005574..b071d087570 100644
--- a/mail/thunderbird/files/patch-bug1021761
+++ b/mail/thunderbird/files/patch-bug1021761
@@ -2,7 +2,7 @@ diff --git configure.in configure.in
 index 48e60c0..ec08417 100644
 --- mozilla/configure.in
 +++ mozilla/configure.in
-@@ -5438,6 +5438,60 @@ fi
+@@ -5591,6 +5591,67 @@ fi
  AC_SUBST(MOZ_WEBM_ENCODER)
  
  dnl ==================================
@@ -16,33 +16,40 @@ index 48e60c0..ec08417 100644
 +    ;;
 +esac
 +
-+MOZ_ARG_DISABLE_BOOL(oss,
-+[  --disable-oss           Disable OpenSoundSystem support],
-+   MOZ_OSS=,
-+   MOZ_OSS=1)
++MOZ_ARG_WITH_STRING(oss,
++[  --with-oss[=PFX]        Enable OpenSoundSystem support [installed at prefix PFX]],
++   OSSPREFIX=$withval)
++
++if test -n "$OSSPREFIX"; then
++    if test "$OSSPREFIX" != "no"; then
++        MOZ_OSS=1
++    else
++        MOZ_OSS=
++    fi
++fi
 +
 +_SAVE_CFLAGS=$CFLAGS
 +_SAVE_LIBS=$LIBS
 +if test -n "$MOZ_OSS"; then
 +    dnl Prefer 4Front implementation
 +    AC_MSG_CHECKING([MOZ_OSS_CFLAGS])
-+    if test -z "$MOZ_OSS_CFLAGS"; then
-+        for oss_conf in /etc/oss.conf /usr/local/etc/oss.conf; do
-+            if test -e "$oss_conf"; then
-+                . "$oss_conf"
-+            fi
-+        done
++    if test "$OSSPREFIX" != "yes"; then
++        oss_conf=${OSSPREFIX%/usr}/etc/oss.conf
++        if test -f "$oss_conf"; then
++            . "$oss_conf"
++        else
++            OSSLIBDIR=$OSSPREFIX/lib/oss
++        fi
 +        if test -d "$OSSLIBDIR"; then
-+            MOZ_OSS_CFLAGS="-I$OSSLIBDIR/include"
++            MOZ_OSS_CFLAGS="$MOZ_OSS_CFLAGS -I$OSSLIBDIR/include"
 +        fi
 +    fi
 +    AC_MSG_RESULT([$MOZ_OSS_CFLAGS])
 +
 +    CFLAGS="$CFLAGS $MOZ_OSS_CFLAGS"
-+    MOZ_CHECK_HEADERS(sys/soundcard.h linux/soundcard.h soundcard.h)
++    MOZ_CHECK_HEADERS(sys/soundcard.h soundcard.h)
 +
 +    if test "$ac_cv_header_sys_soundcard_h" != "yes" -a \
-+            "$ac_cv_header_linux_soundcard_h" != "yes" -a \
 +            "$ac_cv_header_soundcard_h" != "yes"; then
 +        AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET.  Disable with --disable-ogg --disable-wave --disable-webm.])
 +    fi
@@ -50,7 +57,7 @@ index 48e60c0..ec08417 100644
 +    dnl Assume NetBSD implementation over SunAudio
 +    AC_CHECK_LIB(ossaudio, _oss_ioctl,
 +        [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound")
-+         MOZ_OSS_LIBS="-lossaudio"])
++         MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"])
 +fi
 +CFLAGS=$_SAVE_CFLAGS
 +LIBS=$_SAVE_LIBS
@@ -63,30 +70,6 @@ index 48e60c0..ec08417 100644
  dnl = Check alsa availability on Linux
  dnl ==================================
  
-@@ -5451,12 +5505,23 @@ MOZ_ARG_ENABLE_BOOL(alsa,
-    MOZ_ALSA=1,
-    MOZ_ALSA=)
- 
-+MOZ_ARG_DISABLE_BOOL(alsa-dlopen,
-+[  --disable-alsa-dlopen   Disable runtime linking of libasound.so],
-+   DISABLE_LIBASOUND_DLOPEN=1,
-+   DISABLE_LIBASOUND_DLOPEN=)
-+
- if test -n "$MOZ_ALSA"; then
-     PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
-          [echo "$MOZ_ALSA_PKG_ERRORS"
-           AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux.  Disable with --disable-ogg --disable-wave --disable-webm.  (On Ubuntu, you might try installing the package libasound2-dev.)])])
- fi
- 
-+if test -n "$DISABLE_LIBASOUND_DLOPEN"; then
-+    AC_DEFINE(DISABLE_LIBASOUND_DLOPEN)
-+else
-+    MOZ_ALSA_LIBS=
-+fi
-+
- AC_SUBST(MOZ_ALSA)
- 
- dnl ========================================================
 diff --git media/libcubeb/AUTHORS media/libcubeb/AUTHORS
 index b441e8a..950d9e5 100644
 --- mozilla/media/libcubeb/AUTHORS
@@ -651,7 +634,7 @@ new file mode 100644
 index 0000000..5e38e27
 --- /dev/null
 +++ mozilla/media/libcubeb/src/cubeb_oss.c
-@@ -0,0 +1,399 @@
+@@ -0,0 +1,397 @@
 +/*
 + * Copyright © 2014 Mozilla Foundation
 + *
@@ -660,8 +643,6 @@ index 0000000..5e38e27
 + */
 +#if defined(HAVE_SYS_SOUNDCARD_H)
 +#include <sys/soundcard.h>
-+#elif defined(HAVE_LINUX_SOUNDCARD_H)
-+#include <linux/soundcard.h>
 +#else
 +#include <soundcard.h>
 +#endif
@@ -1075,18 +1056,36 @@ index 8b7a0dd..31212ce 100644
 +CFLAGS += CONFIG['MOZ_OSS_CFLAGS']
  CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
  CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS']
+diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
+index 991f03f..3d99eb5 100644
+--- mozilla/media/webrtc/signaling/test/Makefile.in
++++ mozilla/media/webrtc/signaling/test/Makefile.in
+@@ -26,9 +26,9 @@ ifdef JS_SHARED_LIBRARY
+ LIBS += $(MOZ_JS_LIBS)
+ endif
+ 
+-ifdef MOZ_ALSA
++ifdef MOZ_OSS
+ LIBS += \
+-  $(MOZ_ALSA_LIBS) \
++  $(MOZ_OSS_LIBS) \
+   $(NULL)
+ endif
+ 
 diff --git toolkit/library/libxul.mk toolkit/library/libxul.mk
 index e191f13..4fb268a 100644
 --- mozilla/toolkit/library/libxul.mk
 +++ mozilla/toolkit/library/libxul.mk
-@@ -146,6 +146,10 @@ OS_LIBS += $(call EXPAND_LIBNAME,secur32
+@@ -146,9 +146,9 @@ OS_LIBS += $(call EXPAND_LIBNAME,secur32
  endif
  endif
  
+-ifdef MOZ_ALSA
+-EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
+-endif
 +ifdef MOZ_OSS
 +EXTRA_DSO_LDOPTS += $(MOZ_OSS_LIBS)
 +endif
-+
- ifdef MOZ_ALSA
- EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
- endif
+ 
+ ifdef HAVE_CLOCK_MONOTONIC
+ EXTRA_DSO_LDOPTS += $(REALTIME_LIBS)
diff --git a/mail/thunderbird/files/patch-bug1083461 b/mail/thunderbird/files/patch-bug1083461
deleted file mode 100644
index 7cfbf340aeb..00000000000
--- a/mail/thunderbird/files/patch-bug1083461
+++ /dev/null
@@ -1,156 +0,0 @@
-commit c97894b
-Author: L. David Baron <dbaron@dbaron.org>
-Date:   Sun Oct 19 23:31:39 2014 -0400
-
-    Bug 1083461 - Convert nsCSSValue{,Pair}List::operator== back to a static Equal method so that it can be validly called on null pointers.  r=bzbarsky  approval-mozilla-esr31=bkerensa
----
- layout/style/nsCSSValue.cpp       | 28 ++++++++++++++++------------
- layout/style/nsCSSValue.h         | 22 ++++++++++++++++------
- layout/style/nsStyleAnimation.cpp |  6 ++++--
- 3 files changed, 36 insertions(+), 20 deletions(-)
-
-diff --git layout/style/nsCSSValue.cpp layout/style/nsCSSValue.cpp
-index 781ef65..4bbc979 100644
---- mozilla/layout/style/nsCSSValue.cpp
-+++ mozilla/layout/style/nsCSSValue.cpp
-@@ -253,13 +253,14 @@ bool nsCSSValue::operator==(const nsCSSValue& aOther) const
-       return *mValue.mRect == *aOther.mValue.mRect;
-     }
-     else if (eCSSUnit_List == mUnit) {
--      return *mValue.mList == *aOther.mValue.mList;
-+      return nsCSSValueList::Equal(mValue.mList, aOther.mValue.mList);
-     }
-     else if (eCSSUnit_SharedList == mUnit) {
-       return *mValue.mSharedList == *aOther.mValue.mSharedList;
-     }
-     else if (eCSSUnit_PairList == mUnit) {
--      return *mValue.mPairList == *aOther.mValue.mPairList;
-+      return nsCSSValuePairList::Equal(mValue.mPairList,
-+                                       aOther.mValue.mPairList);
-     }
-     else if (eCSSUnit_GridTemplateAreas == mUnit) {
-       return *mValue.mGridTemplateAreas == *aOther.mValue.mGridTemplateAreas;
-@@ -1740,13 +1741,15 @@ nsCSSValueList::AppendToString(nsCSSProperty aProperty, nsAString& aResult,
-   }
- }
- 
--bool
--nsCSSValueList::operator==(const nsCSSValueList& aOther) const
-+/* static */ bool
-+nsCSSValueList::Equal(const nsCSSValueList* aList1,
-+                      const nsCSSValueList* aList2)
- {
--  if (this == &aOther)
-+  if (aList1 == aList2) {
-     return true;
-+  }
- 
--  const nsCSSValueList *p1 = this, *p2 = &aOther;
-+  const nsCSSValueList *p1 = aList1, *p2 = aList2;
-   for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) {
-     if (p1->mValue != p2->mValue)
-       return false;
-@@ -1799,8 +1802,7 @@ nsCSSValueSharedList::AppendToString(nsCSSProperty aProperty, nsAString& aResult
- bool
- nsCSSValueSharedList::operator==(const nsCSSValueSharedList& aOther) const
- {
--  return !mHead == !aOther.mHead &&
--         (!mHead || *mHead == *aOther.mHead);
-+  return nsCSSValueList::Equal(mHead, aOther.mHead);
- }
- 
- size_t
-@@ -2010,13 +2012,15 @@ nsCSSValuePairList::AppendToString(nsCSSProperty aProperty,
-   }
- }
- 
--bool
--nsCSSValuePairList::operator==(const nsCSSValuePairList& aOther) const
-+/* static */ bool
-+nsCSSValuePairList::Equal(const nsCSSValuePairList* aList1,
-+                          const nsCSSValuePairList* aList2)
- {
--  if (this == &aOther)
-+  if (aList1 == aList2) {
-     return true;
-+  }
- 
--  const nsCSSValuePairList *p1 = this, *p2 = &aOther;
-+  const nsCSSValuePairList *p1 = aList1, *p2 = aList2;
-   for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) {
-     if (p1->mXValue != p2->mXValue ||
-         p1->mYValue != p2->mYValue)
-diff --git layout/style/nsCSSValue.h layout/style/nsCSSValue.h
-index 753938c..77eeef0 100644
---- mozilla/layout/style/nsCSSValue.h
-+++ mozilla/layout/style/nsCSSValue.h
-@@ -806,9 +806,8 @@ struct nsCSSValueList {
-   void AppendToString(nsCSSProperty aProperty, nsAString& aResult,
-                       nsCSSValue::Serialization aValueSerialization) const;
- 
--  bool operator==(nsCSSValueList const& aOther) const;
--  bool operator!=(const nsCSSValueList& aOther) const
--  { return !(*this == aOther); }
-+  static bool Equal(const nsCSSValueList* aList1,
-+                    const nsCSSValueList* aList2);
- 
-   size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
- 
-@@ -821,6 +820,12 @@ private:
-   {
-     MOZ_COUNT_CTOR(nsCSSValueList);
-   }
-+
-+  // We don't want operator== or operator!= because they wouldn't be
-+  // null-safe, which is generally what we need.  Use |Equal| method
-+  // above instead.
-+  bool operator==(nsCSSValueList const& aOther) const MOZ_DELETE;
-+  bool operator!=(const nsCSSValueList& aOther) const MOZ_DELETE;
- };
- 
- // nsCSSValueList_heap differs from nsCSSValueList only in being
-@@ -1199,9 +1204,8 @@ struct nsCSSValuePairList {
-   void AppendToString(nsCSSProperty aProperty, nsAString& aResult,
-                       nsCSSValue::Serialization aValueSerialization) const;
- 
--  bool operator==(const nsCSSValuePairList& aOther) const;
--  bool operator!=(const nsCSSValuePairList& aOther) const
--  { return !(*this == aOther); }
-+  static bool Equal(const nsCSSValuePairList* aList1,
-+                    const nsCSSValuePairList* aList2);
- 
-   size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
- 
-@@ -1215,6 +1219,12 @@ private:
-   {
-     MOZ_COUNT_CTOR(nsCSSValuePairList);
-   }
-+
-+  // We don't want operator== or operator!= because they wouldn't be
-+  // null-safe, which is generally what we need.  Use |Equal| method
-+  // above instead.
-+  bool operator==(const nsCSSValuePairList& aOther) const MOZ_DELETE;
-+  bool operator!=(const nsCSSValuePairList& aOther) const MOZ_DELETE;
- };
- 
- // nsCSSValuePairList_heap differs from nsCSSValuePairList only in being
-diff --git layout/style/nsStyleAnimation.cpp layout/style/nsStyleAnimation.cpp
-index 6c2ccb0..8dbe404 100644
---- mozilla/layout/style/nsStyleAnimation.cpp
-+++ mozilla/layout/style/nsStyleAnimation.cpp
-@@ -3816,11 +3816,13 @@ nsStyleAnimation::Value::operator==(const Value& aOther) const
-     case eUnit_Filter:
-     case eUnit_Shadow:
-     case eUnit_BackgroundPosition:
--      return *mValue.mCSSValueList == *aOther.mValue.mCSSValueList;
-+      return nsCSSValueList::Equal(mValue.mCSSValueList,
-+                                   aOther.mValue.mCSSValueList);
-     case eUnit_Transform:
-       return *mValue.mCSSValueSharedList == *aOther.mValue.mCSSValueSharedList;
-     case eUnit_CSSValuePairList:
--      return *mValue.mCSSValuePairList == *aOther.mValue.mCSSValuePairList;
-+      return nsCSSValuePairList::Equal(mValue.mCSSValuePairList,
-+                                       aOther.mValue.mCSSValuePairList);
-     case eUnit_UnparsedString:
-       return (NS_strcmp(GetStringBufferValue(),
-                         aOther.GetStringBufferValue()) == 0);
diff --git a/mail/thunderbird/files/patch-bug991253 b/mail/thunderbird/files/patch-bug991253
index 32241fdfe27..06adabf4e83 100644
--- a/mail/thunderbird/files/patch-bug991253
+++ b/mail/thunderbird/files/patch-bug991253
@@ -1,14 +1,16 @@
 --- mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp~
 +++ mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp
-@@ -400,6 +400,12 @@ mozHunspell::LoadDictionaryList()
+@@ -400,6 +400,14 @@ mozHunspell::LoadDictionaryList(bool aNo
      }
    }
  
 +  // load system hunspell dictionaries
-+  nsIFile* hunDir;
++  nsCOMPtr<nsIFile> hunDir;
 +  NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"),
-+			true, &hunDir);
-+  LoadDictionariesFromDir(hunDir);
++                        true, getter_AddRefs(hunDir));
++  if (hunDir) {
++      LoadDictionariesFromDir(hunDir);
++  }
 +
    // find dictionaries from extensions requiring restart
    nsCOMPtr<nsISimpleEnumerator> dictDirs;