- Update Firefox to 30.0

- Update Firefox ESR to 24.6.0
- Update libxul to 24.6.0
- Update NSS to 3.16.1
- Update NSPR to 4.10.6
- Update Thunderbird to 24.6.0
- Convert USE_BZIP2 to USES
- Backport ff31 fix against crashing DEBUG build on newegg.com [1]
- Add a note in UPDATING to not build audio/soundtouch with
  INTEGER_SAMPLES [2]
- Use arc4random_buf(3) to generate UUIDs (version 4)
- Fix debugger detection used by Telemetry and the slow script dialog
- Add STAGE support [3]

PR:		ports/189991 [1]
PR:		ports/189217 [2]
PR:		ports/189488 [2]
Submitted by:	bapt [3]
Sumbitted by:	Jan Beich
Security:	http://www.vuxml.org/freebsd/888a0262-f0d9-11e3-ba0c-b4b52fce4ce8.html

10 files changed, 343 insertions, 173 deletions

diff --git a/mail/linux-thunderbird/Makefile b/mail/linux-thunderbird/Makefile
index 0da7b19b0793..dd20f6ac571e 100644
--- a/mail/linux-thunderbird/Makefile
+++ b/mail/linux-thunderbird/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	24.5.0
+DISTVERSION=	24.6.0
 CATEGORIES=	mail news net-im ipv6
 DISTNAME=	${PORTNAME}-${DISTVERSION}
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US
@@ -10,7 +10,8 @@ MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
+
 WANT_GTK218=	yes
 
 USE_LINUX_APPS=	dbusglib dbuslibs alsalib alsa-plugins-oss
diff --git a/mail/linux-thunderbird/distinfo b/mail/linux-thunderbird/distinfo
index ad1ca8b67468..8a7dac7a7552 100644
--- a/mail/linux-thunderbird/distinfo
+++ b/mail/linux-thunderbird/distinfo
@@ -1,5 +1,5 @@
-SHA256 (thunderbird-24.5.0.tar.bz2) = 6441f90eda22808c37bca023748efee7735cf9b18b1d21ce75878c10da8baad7
-SIZE (thunderbird-24.5.0.tar.bz2) = 28958353
+SHA256 (thunderbird-24.6.0.tar.bz2) = ba35f578095f79582341e988ce7c5e07f489833f7a309756c80caf4f56367987
+SIZE (thunderbird-24.6.0.tar.bz2) = 28991898
 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 1a9aa4819ada..53c04823340b 100644
--- a/mail/thunderbird-i18n/Makefile
+++ b/mail/thunderbird-i18n/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird-i18n
-PORTVERSION=	24.5.0
+PORTVERSION=	24.6.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 d404ffe8fa8b..19eaefc1061d 100644
--- a/mail/thunderbird-i18n/distinfo
+++ b/mail/thunderbird-i18n/distinfo
@@ -1,110 +1,110 @@
-SHA256 (xpi/thunderbird-i18n-24.5.0/ar.xpi) = 61c387758c281431653c0d2a40f9779dea513358129fca8838b7568bfcb2f046
-SIZE (xpi/thunderbird-i18n-24.5.0/ar.xpi) = 457862
-SHA256 (xpi/thunderbird-i18n-24.5.0/ast.xpi) = a24e106915b718563a6b59e43d0152c027ac8f851192ca9c26135eaf2d0bf5f4
-SIZE (xpi/thunderbird-i18n-24.5.0/ast.xpi) = 373831
-SHA256 (xpi/thunderbird-i18n-24.5.0/be.xpi) = 46f2f6a22fc8eaa40793be47e7f3351297182cc7ddfb8116b00da965d6ef4a20
-SIZE (xpi/thunderbird-i18n-24.5.0/be.xpi) = 416882
-SHA256 (xpi/thunderbird-i18n-24.5.0/bg.xpi) = e36c78b5dc1667c2a66000a94d4858fd315637b2072491abd5678739c3745f88
-SIZE (xpi/thunderbird-i18n-24.5.0/bg.xpi) = 485023
-SHA256 (xpi/thunderbird-i18n-24.5.0/bn-BD.xpi) = 84b0646dc6ab24c3d366dcb93f30c0e93a53215f2d837acfbfe6757d36cf8b2a
-SIZE (xpi/thunderbird-i18n-24.5.0/bn-BD.xpi) = 537258
-SHA256 (xpi/thunderbird-i18n-24.5.0/br.xpi) = 735a7dcf944090ded122ac7fd94ca081599018091b6b948629281b2dd053ea11
-SIZE (xpi/thunderbird-i18n-24.5.0/br.xpi) = 427679
-SHA256 (xpi/thunderbird-i18n-24.5.0/ca.xpi) = b44c121db7370a79569b8309658dcff73df319f19ce446695964a8913dfffa6d
-SIZE (xpi/thunderbird-i18n-24.5.0/ca.xpi) = 429746
-SHA256 (xpi/thunderbird-i18n-24.5.0/cs.xpi) = 500809375921ab12902f81c0d700c6b66ec2c3bd3a0d03cd58fd94bc59e61040
-SIZE (xpi/thunderbird-i18n-24.5.0/cs.xpi) = 431476
-SHA256 (xpi/thunderbird-i18n-24.5.0/da.xpi) = d9c3e799b534164318262e936b9a5b50016ffea58276d67a6f6cca3c8fad6a83
-SIZE (xpi/thunderbird-i18n-24.5.0/da.xpi) = 409626
-SHA256 (xpi/thunderbird-i18n-24.5.0/de.xpi) = e03fa8c3a32b66955c7b95ccb0651d555e73f62411ed55aa2a44237dbc27b624
-SIZE (xpi/thunderbird-i18n-24.5.0/de.xpi) = 408674
-SHA256 (xpi/thunderbird-i18n-24.5.0/el.xpi) = 490f21edef433189cbcb0e16acb87ebc6e4047bce5c53ae35073782ac2539ea5
-SIZE (xpi/thunderbird-i18n-24.5.0/el.xpi) = 464552
-SHA256 (xpi/thunderbird-i18n-24.5.0/en-GB.xpi) = df6884048a7cc4579cf8d01b9846f4a4fada50c35486a5ef753b92c9e6e9eca4
-SIZE (xpi/thunderbird-i18n-24.5.0/en-GB.xpi) = 400962
-SHA256 (xpi/thunderbird-i18n-24.5.0/en-US.xpi) = 7b6c84303047b2cd7b8def5050978852d5133837f2b805b445da553b7c61ad26
-SIZE (xpi/thunderbird-i18n-24.5.0/en-US.xpi) = 402144
-SHA256 (xpi/thunderbird-i18n-24.5.0/es-AR.xpi) = 1f89c991a958a89913c4ce7d398d3727505f1c5ea18188691f2503d4fc4808f0
-SIZE (xpi/thunderbird-i18n-24.5.0/es-AR.xpi) = 425656
-SHA256 (xpi/thunderbird-i18n-24.5.0/es-ES.xpi) = f4793deb6ddbe8be6af31fe809ba2e6b1a85c16c42fc023d9c798b2a48ed1aab
-SIZE (xpi/thunderbird-i18n-24.5.0/es-ES.xpi) = 366308
-SHA256 (xpi/thunderbird-i18n-24.5.0/et.xpi) = 96a8367da63bbb573386ef2301089a676b963e5000a7638dd616cf66f0fefc06
-SIZE (xpi/thunderbird-i18n-24.5.0/et.xpi) = 422893
-SHA256 (xpi/thunderbird-i18n-24.5.0/eu.xpi) = b3617b39f949ad5e2cc06ad96de92eb76240fb5299fc9ef65479365a390ba2f3
-SIZE (xpi/thunderbird-i18n-24.5.0/eu.xpi) = 418497
-SHA256 (xpi/thunderbird-i18n-24.5.0/fi.xpi) = 3732e9d56156d836dbe69cac9e0d17e2b9e65b3436d54337f01bad07ca79ad86
-SIZE (xpi/thunderbird-i18n-24.5.0/fi.xpi) = 424264
-SHA256 (xpi/thunderbird-i18n-24.5.0/fr.xpi) = 4f6749e30cd43d41d3ad963e09e891c5455f4afba5d659482c945bf2d3ffa041
-SIZE (xpi/thunderbird-i18n-24.5.0/fr.xpi) = 431289
-SHA256 (xpi/thunderbird-i18n-24.5.0/fy-NL.xpi) = 5fd8a7748cb741587e6f8f5608edd1b930adfd597d7c41572ef938acabf5527d
-SIZE (xpi/thunderbird-i18n-24.5.0/fy-NL.xpi) = 426098
-SHA256 (xpi/thunderbird-i18n-24.5.0/ga-IE.xpi) = 5c680e902636dbbdb0850afd8c52016716d2a45bee15661626f8e66dc40d7f3c
-SIZE (xpi/thunderbird-i18n-24.5.0/ga-IE.xpi) = 437114
-SHA256 (xpi/thunderbird-i18n-24.5.0/gd.xpi) = 49941bbc298c4ca251dc799280236e3f687a75a1650bf47ece9da7a6390f1c76
-SIZE (xpi/thunderbird-i18n-24.5.0/gd.xpi) = 440091
-SHA256 (xpi/thunderbird-i18n-24.5.0/gl.xpi) = 2498b883e3cd6d7a81c02824afdaede981228dde6f0a9c13217a34e6d6dfa7c1
-SIZE (xpi/thunderbird-i18n-24.5.0/gl.xpi) = 427543
-SHA256 (xpi/thunderbird-i18n-24.5.0/he.xpi) = a5546f26a205db3a0196c5032c8e69314affecd2174f7880f5ae517af73785f9
-SIZE (xpi/thunderbird-i18n-24.5.0/he.xpi) = 457065
-SHA256 (xpi/thunderbird-i18n-24.5.0/hr.xpi) = b225e5428b4ec30eb618fcac0de66557e2f7bfdc88957dc739ec142d7968a3b2
-SIZE (xpi/thunderbird-i18n-24.5.0/hr.xpi) = 422387
-SHA256 (xpi/thunderbird-i18n-24.5.0/hu.xpi) = a24e6b47bb40a6b71319b5a4f7638574e3eede2163238da059bf0876cf7ec3fa
-SIZE (xpi/thunderbird-i18n-24.5.0/hu.xpi) = 441511
-SHA256 (xpi/thunderbird-i18n-24.5.0/hy-AM.xpi) = a8021d93dc1f3d372ee94d4c7eaacae2f30df06e2bd6cfc37a1ab564c90b6fb4
-SIZE (xpi/thunderbird-i18n-24.5.0/hy-AM.xpi) = 477923
-SHA256 (xpi/thunderbird-i18n-24.5.0/id.xpi) = 41222ef78db07a5da8b388485cd3536184caf8eb7264830e410026c279972454
-SIZE (xpi/thunderbird-i18n-24.5.0/id.xpi) = 457499
-SHA256 (xpi/thunderbird-i18n-24.5.0/is.xpi) = 3fdd5a7f5692ba2103bec6037d77bf848f78cb02eb1644d46641e89fe52cae2c
-SIZE (xpi/thunderbird-i18n-24.5.0/is.xpi) = 425710
-SHA256 (xpi/thunderbird-i18n-24.5.0/it.xpi) = 7c9a296019584d63c44ec03dda76200b83f07f50dcbafbe7c3b69af8f894f5cd
-SIZE (xpi/thunderbird-i18n-24.5.0/it.xpi) = 357933
-SHA256 (xpi/thunderbird-i18n-24.5.0/ja.xpi) = 624bf5f383fbcaf6eff9164232b72395733ae01a3a1f5e10d4a3e6fda10de1b8
-SIZE (xpi/thunderbird-i18n-24.5.0/ja.xpi) = 475559
-SHA256 (xpi/thunderbird-i18n-24.5.0/ko.xpi) = 830f3245b7f246e2269a758b7cc9186d7aadbf519ee72fa33b3d2325e285a291
-SIZE (xpi/thunderbird-i18n-24.5.0/ko.xpi) = 428071
-SHA256 (xpi/thunderbird-i18n-24.5.0/lt.xpi) = dff8b84bcfbb8c07d76d415b6ef378d6024bd81f0655ca438927572b85f4e37c
-SIZE (xpi/thunderbird-i18n-24.5.0/lt.xpi) = 443259
-SHA256 (xpi/thunderbird-i18n-24.5.0/nb-NO.xpi) = 2ae8f6c1a61d6f17cfb4f86d5d9926688fb8a403ab64fe1950c89a8997bcdd55
-SIZE (xpi/thunderbird-i18n-24.5.0/nb-NO.xpi) = 418922
-SHA256 (xpi/thunderbird-i18n-24.5.0/nl.xpi) = da2532d21fb594927f59979d4c022297b0ee5f0c29cdf2209d7e4f9296931cd9
-SIZE (xpi/thunderbird-i18n-24.5.0/nl.xpi) = 418764
-SHA256 (xpi/thunderbird-i18n-24.5.0/nn-NO.xpi) = 2a52857fca772239f14207755946dbdd36ba1c0209f8c09f30cfe6cdc94a5892
-SIZE (xpi/thunderbird-i18n-24.5.0/nn-NO.xpi) = 421134
-SHA256 (xpi/thunderbird-i18n-24.5.0/pa-IN.xpi) = f817ef8578af107efe45cc2406be7568440c1b4e020c3764afbec774b3b17a4b
-SIZE (xpi/thunderbird-i18n-24.5.0/pa-IN.xpi) = 508272
-SHA256 (xpi/thunderbird-i18n-24.5.0/pl.xpi) = 13fd347b116e6d5e1c0b168f020270cc179f32b1e056e333cc3a86a8406f901a
-SIZE (xpi/thunderbird-i18n-24.5.0/pl.xpi) = 401752
-SHA256 (xpi/thunderbird-i18n-24.5.0/pt-BR.xpi) = 57f7c85aa5ff76cd01387ff1752a63e8d2b26749765dd7daf7137de4a06eb6fe
-SIZE (xpi/thunderbird-i18n-24.5.0/pt-BR.xpi) = 430909
-SHA256 (xpi/thunderbird-i18n-24.5.0/pt-PT.xpi) = 828f0920581519070aa58c366f603d964638a60b2de74ad49fcf9397db169145
-SIZE (xpi/thunderbird-i18n-24.5.0/pt-PT.xpi) = 425025
-SHA256 (xpi/thunderbird-i18n-24.5.0/rm.xpi) = b5ad4b75ba5670223b6f16686830f2eed904a764c72a61c88e054d9574518d44
-SIZE (xpi/thunderbird-i18n-24.5.0/rm.xpi) = 432384
-SHA256 (xpi/thunderbird-i18n-24.5.0/ro.xpi) = a5a8215d718a6be1c576059168c9913c55d557b26bed500a4e39a888e0f18c4b
-SIZE (xpi/thunderbird-i18n-24.5.0/ro.xpi) = 497491
-SHA256 (xpi/thunderbird-i18n-24.5.0/ru.xpi) = 53277de17e52ed168368153902b498ea478eed06e00fc9a3f6b880cfbcb48c1f
-SIZE (xpi/thunderbird-i18n-24.5.0/ru.xpi) = 425097
-SHA256 (xpi/thunderbird-i18n-24.5.0/si.xpi) = aca1ede31da89a6ab476aad09696306f61522cdd878c5e1dabd37ba7f5b28713
-SIZE (xpi/thunderbird-i18n-24.5.0/si.xpi) = 511166
-SHA256 (xpi/thunderbird-i18n-24.5.0/sk.xpi) = a64b7290e92579b75a6cf34ba1baed18bb086265c8452c08ddb0228c714b5ed5
-SIZE (xpi/thunderbird-i18n-24.5.0/sk.xpi) = 440106
-SHA256 (xpi/thunderbird-i18n-24.5.0/sl.xpi) = ebab16114f3fe94cd15c9993a94693412afa121ce8975afadf54bf06d9a5fbab
-SIZE (xpi/thunderbird-i18n-24.5.0/sl.xpi) = 421706
-SHA256 (xpi/thunderbird-i18n-24.5.0/sq.xpi) = 5f933fa1e66e16c15d6237099cf65f5f3300ff423d3352f6e5aa3b2d207c7f0a
-SIZE (xpi/thunderbird-i18n-24.5.0/sq.xpi) = 435215
-SHA256 (xpi/thunderbird-i18n-24.5.0/sr.xpi) = 21ee6b0854e5e0052ef4eacca593c0ff41ea000dd0dc75f1d7b647b34591ad49
-SIZE (xpi/thunderbird-i18n-24.5.0/sr.xpi) = 518889
-SHA256 (xpi/thunderbird-i18n-24.5.0/sv-SE.xpi) = 17e752fbcf6e24203b6d27bce06df39766a7878fced1db516b96e2f9ec7e7426
-SIZE (xpi/thunderbird-i18n-24.5.0/sv-SE.xpi) = 423815
-SHA256 (xpi/thunderbird-i18n-24.5.0/ta-LK.xpi) = 55b10f60dea2abc565c69c841988110b989e69e7ce880500f9990af1b7e7437a
-SIZE (xpi/thunderbird-i18n-24.5.0/ta-LK.xpi) = 534922
-SHA256 (xpi/thunderbird-i18n-24.5.0/tr.xpi) = 25b1be7c836addc60bfa36e6c759dcd2b12c73c468351bc830f125080489dd92
-SIZE (xpi/thunderbird-i18n-24.5.0/tr.xpi) = 438066
-SHA256 (xpi/thunderbird-i18n-24.5.0/uk.xpi) = 331ed11d6d4b873db63e33db707a205d98eb0f4b6201a75921431b2e7e4e0755
-SIZE (xpi/thunderbird-i18n-24.5.0/uk.xpi) = 480949
-SHA256 (xpi/thunderbird-i18n-24.5.0/vi.xpi) = 993eb8b5869166b51dab725fea1126445cc132cafadab1b5096f6850f2aaadd3
-SIZE (xpi/thunderbird-i18n-24.5.0/vi.xpi) = 495558
-SHA256 (xpi/thunderbird-i18n-24.5.0/zh-CN.xpi) = e587849f5bae5bbb65bc68087fb9bbe672162e5bca69a7e99f0ca7e4559d5354
-SIZE (xpi/thunderbird-i18n-24.5.0/zh-CN.xpi) = 449181
-SHA256 (xpi/thunderbird-i18n-24.5.0/zh-TW.xpi) = ace0e695c8112ba1754f16603ee14418303ae053b97f8af0b23272a308c4f066
-SIZE (xpi/thunderbird-i18n-24.5.0/zh-TW.xpi) = 450000
+SHA256 (xpi/thunderbird-i18n-24.6.0/ar.xpi) = 6aa3c326c9757751fe655242e446ae4d906a91ee86cc061a3dca1024fc57e88a
+SIZE (xpi/thunderbird-i18n-24.6.0/ar.xpi) = 457862
+SHA256 (xpi/thunderbird-i18n-24.6.0/ast.xpi) = e583f909925f6ecb4f72949bd99340f5a8524c21f2628594dee474c9307e1617
+SIZE (xpi/thunderbird-i18n-24.6.0/ast.xpi) = 373831
+SHA256 (xpi/thunderbird-i18n-24.6.0/be.xpi) = 1fb28fd586a69e277ed01b6d6d636e95c7157bb5327e50662f1faadf524d18d3
+SIZE (xpi/thunderbird-i18n-24.6.0/be.xpi) = 416882
+SHA256 (xpi/thunderbird-i18n-24.6.0/bg.xpi) = 9b3839d5d0b700d1b5258b47dd2cae555845e34c4dd3bc0a2c602dc0a4ff3503
+SIZE (xpi/thunderbird-i18n-24.6.0/bg.xpi) = 485024
+SHA256 (xpi/thunderbird-i18n-24.6.0/bn-BD.xpi) = 4fa1d881044ebc9b129e7f54b65278e5faa730ed5efc2f354f2ceaa6975398c1
+SIZE (xpi/thunderbird-i18n-24.6.0/bn-BD.xpi) = 537258
+SHA256 (xpi/thunderbird-i18n-24.6.0/br.xpi) = 31723061e78c394a75f2977a80378c6ceec8fbec7d980becd50dfc93c14e573a
+SIZE (xpi/thunderbird-i18n-24.6.0/br.xpi) = 427680
+SHA256 (xpi/thunderbird-i18n-24.6.0/ca.xpi) = e7fa72f56d0a3ab90dd3df581aab4154552be12f71408e04701e4d3aec2b9e94
+SIZE (xpi/thunderbird-i18n-24.6.0/ca.xpi) = 429746
+SHA256 (xpi/thunderbird-i18n-24.6.0/cs.xpi) = 360e5cb9097c16ac9fd626917777b491c7c00a95b2e1879ae0fad1b7bed2d870
+SIZE (xpi/thunderbird-i18n-24.6.0/cs.xpi) = 431476
+SHA256 (xpi/thunderbird-i18n-24.6.0/da.xpi) = ded61b233f3598f69352d92dc05a7ee9d0bd8852073e2835e0c3b05001f920a8
+SIZE (xpi/thunderbird-i18n-24.6.0/da.xpi) = 409627
+SHA256 (xpi/thunderbird-i18n-24.6.0/de.xpi) = aca6d21ea4176af021b27c67fd21707b0280cf0f1bf6ac34b03b6abf40d50e7e
+SIZE (xpi/thunderbird-i18n-24.6.0/de.xpi) = 408674
+SHA256 (xpi/thunderbird-i18n-24.6.0/el.xpi) = 63080f452b54b7275bfc09b8aa73fd202739c0afd00a1413729b384e86649525
+SIZE (xpi/thunderbird-i18n-24.6.0/el.xpi) = 464553
+SHA256 (xpi/thunderbird-i18n-24.6.0/en-GB.xpi) = dfdb57b440d21ea9e140fc528f25e6ab2a1966b3865fc87390362995d7c48067
+SIZE (xpi/thunderbird-i18n-24.6.0/en-GB.xpi) = 400962
+SHA256 (xpi/thunderbird-i18n-24.6.0/en-US.xpi) = 977732840ff02afdaa0c19c98faf088e799f1f97bb8d70c5e8240fcad862bc5f
+SIZE (xpi/thunderbird-i18n-24.6.0/en-US.xpi) = 402144
+SHA256 (xpi/thunderbird-i18n-24.6.0/es-AR.xpi) = 3ec3c00f39e98f81c045f6cd41c68bc50ea908c91d295ebd9fa9b18722b83080
+SIZE (xpi/thunderbird-i18n-24.6.0/es-AR.xpi) = 425657
+SHA256 (xpi/thunderbird-i18n-24.6.0/es-ES.xpi) = 14086fa0e85857aa6430bdbfdd5f1f333a14b846126fba2ebfa65d954b68b609
+SIZE (xpi/thunderbird-i18n-24.6.0/es-ES.xpi) = 366308
+SHA256 (xpi/thunderbird-i18n-24.6.0/et.xpi) = 01505e5154f27bea956f17bf1f8ae3ecac21857b9cc631750aaccb2ae3ed3438
+SIZE (xpi/thunderbird-i18n-24.6.0/et.xpi) = 422893
+SHA256 (xpi/thunderbird-i18n-24.6.0/eu.xpi) = 0277449af802ad6fac63b28e7b0383baf2c978ef15bc15a1dd373200762c3d8a
+SIZE (xpi/thunderbird-i18n-24.6.0/eu.xpi) = 418497
+SHA256 (xpi/thunderbird-i18n-24.6.0/fi.xpi) = 9999cf22d0baa8c5c35f560560e1a6ee86fdc37147c433c662f53ed062b251ea
+SIZE (xpi/thunderbird-i18n-24.6.0/fi.xpi) = 424265
+SHA256 (xpi/thunderbird-i18n-24.6.0/fr.xpi) = d053f8f6da0b1d5417342e160824fc0472fd15556b29b2d4a01f043efebbfcac
+SIZE (xpi/thunderbird-i18n-24.6.0/fr.xpi) = 431289
+SHA256 (xpi/thunderbird-i18n-24.6.0/fy-NL.xpi) = 39492e2d8c4d0783b0d3cbc4bdc2067805850041a3e159e7d2f87842e932c155
+SIZE (xpi/thunderbird-i18n-24.6.0/fy-NL.xpi) = 426098
+SHA256 (xpi/thunderbird-i18n-24.6.0/ga-IE.xpi) = 78223fedce58b23f0974b0795d90527778bda0ac07cc523345c471d724cc9d1e
+SIZE (xpi/thunderbird-i18n-24.6.0/ga-IE.xpi) = 437114
+SHA256 (xpi/thunderbird-i18n-24.6.0/gd.xpi) = cfb9655e0423bea9a7b9afe67fc0f38824f859b0bafeb6cacfa346a9e1f9f7db
+SIZE (xpi/thunderbird-i18n-24.6.0/gd.xpi) = 440092
+SHA256 (xpi/thunderbird-i18n-24.6.0/gl.xpi) = 41a888063bf5fc08f46280bb1d4e926b0162357bc2f76903d95272bf4d385683
+SIZE (xpi/thunderbird-i18n-24.6.0/gl.xpi) = 427543
+SHA256 (xpi/thunderbird-i18n-24.6.0/he.xpi) = bdc5f8002eeb770daac280431dcfd837e7e2d6e4b250b37b70dba658dba72437
+SIZE (xpi/thunderbird-i18n-24.6.0/he.xpi) = 457066
+SHA256 (xpi/thunderbird-i18n-24.6.0/hr.xpi) = 1e4cfebe1f3cb0e219e24e9ce2cfdf799a7df046dd4dec81b14f4b1c77104a85
+SIZE (xpi/thunderbird-i18n-24.6.0/hr.xpi) = 422387
+SHA256 (xpi/thunderbird-i18n-24.6.0/hu.xpi) = f374db7d1f05bf2bedb8da02ae4ba37b2cdacffbcbced929be2113525d16a971
+SIZE (xpi/thunderbird-i18n-24.6.0/hu.xpi) = 441512
+SHA256 (xpi/thunderbird-i18n-24.6.0/hy-AM.xpi) = c2c76a69dc3cb32a2009024d70ba25300bca706c72883f44e4894a679ecb5823
+SIZE (xpi/thunderbird-i18n-24.6.0/hy-AM.xpi) = 477923
+SHA256 (xpi/thunderbird-i18n-24.6.0/id.xpi) = d25be8b5e37035220e02b07f774d821290ec21d1802973a637abb5af878af690
+SIZE (xpi/thunderbird-i18n-24.6.0/id.xpi) = 457499
+SHA256 (xpi/thunderbird-i18n-24.6.0/is.xpi) = b87e04aa6d35bbb41692c72f9f9cb19246e49a54d4edc3e29fddca5db651a3c0
+SIZE (xpi/thunderbird-i18n-24.6.0/is.xpi) = 425710
+SHA256 (xpi/thunderbird-i18n-24.6.0/it.xpi) = fea724ca6ec33c7462fd4781390a0b310fb3a023aaa99771db83399b65f581fe
+SIZE (xpi/thunderbird-i18n-24.6.0/it.xpi) = 357933
+SHA256 (xpi/thunderbird-i18n-24.6.0/ja.xpi) = 0c2113e085d920d748a0424f89641f92901d9e97ae9c06cfdb561e980a276c99
+SIZE (xpi/thunderbird-i18n-24.6.0/ja.xpi) = 475559
+SHA256 (xpi/thunderbird-i18n-24.6.0/ko.xpi) = cbaa57d1df226fb6f921d90c3b7d93ee47d73b2bb4f7bf3c748171a1c7af2aac
+SIZE (xpi/thunderbird-i18n-24.6.0/ko.xpi) = 428071
+SHA256 (xpi/thunderbird-i18n-24.6.0/lt.xpi) = 6db3fa6fe593292d717b7077142381a038039365e8f14de74f74edbef64950e7
+SIZE (xpi/thunderbird-i18n-24.6.0/lt.xpi) = 443260
+SHA256 (xpi/thunderbird-i18n-24.6.0/nb-NO.xpi) = 1a773698c405c78a947d5bc2a276f770aa885fad724c9f2b8c04025215c0e994
+SIZE (xpi/thunderbird-i18n-24.6.0/nb-NO.xpi) = 418922
+SHA256 (xpi/thunderbird-i18n-24.6.0/nl.xpi) = 0761a699166bdcead5330af9691bb8437545dd24d3ce2cd1e642f1a48ecc7180
+SIZE (xpi/thunderbird-i18n-24.6.0/nl.xpi) = 418764
+SHA256 (xpi/thunderbird-i18n-24.6.0/nn-NO.xpi) = 4e1951dbdfdcf06dee95a6884d1e9e7b4cf141d95e078fa1fc5fb79feefe873e
+SIZE (xpi/thunderbird-i18n-24.6.0/nn-NO.xpi) = 421134
+SHA256 (xpi/thunderbird-i18n-24.6.0/pa-IN.xpi) = 8bfa8109aac418ac6650c8419f946250e569d8101f587f9d6f001a6a59b30385
+SIZE (xpi/thunderbird-i18n-24.6.0/pa-IN.xpi) = 508272
+SHA256 (xpi/thunderbird-i18n-24.6.0/pl.xpi) = e3514ebf5207fd6ae6caeb01c624ad015ffdb6e06aae3ffe39feade0bdbcdcce
+SIZE (xpi/thunderbird-i18n-24.6.0/pl.xpi) = 401753
+SHA256 (xpi/thunderbird-i18n-24.6.0/pt-BR.xpi) = 2bc7c139195fa661fbe0721df4cbb80e56cd193cd7807e8b16a7855d453b66e1
+SIZE (xpi/thunderbird-i18n-24.6.0/pt-BR.xpi) = 430909
+SHA256 (xpi/thunderbird-i18n-24.6.0/pt-PT.xpi) = 19c86db424f83dda485d655d80830d242850da1008cf2644e0e214d4bf56c745
+SIZE (xpi/thunderbird-i18n-24.6.0/pt-PT.xpi) = 425026
+SHA256 (xpi/thunderbird-i18n-24.6.0/rm.xpi) = 779d52491bfbc449ba87fc4ea11f5190021cb72a45d7167cdbcb8fc10cdbbdeb
+SIZE (xpi/thunderbird-i18n-24.6.0/rm.xpi) = 432384
+SHA256 (xpi/thunderbird-i18n-24.6.0/ro.xpi) = 6b1e81e6df2f2ee752aab0fe1b9290e6c287da4ca498df330601de2bc9f8086e
+SIZE (xpi/thunderbird-i18n-24.6.0/ro.xpi) = 497491
+SHA256 (xpi/thunderbird-i18n-24.6.0/ru.xpi) = 2c4b38d8d1581614ae481efbe1fb1d74e75e374c4360df2dcc5eef335627cab2
+SIZE (xpi/thunderbird-i18n-24.6.0/ru.xpi) = 425098
+SHA256 (xpi/thunderbird-i18n-24.6.0/si.xpi) = 7a5bac3f61891229cb933f82b8b5a196313951db10d157ea70688c69c0a4cf06
+SIZE (xpi/thunderbird-i18n-24.6.0/si.xpi) = 511167
+SHA256 (xpi/thunderbird-i18n-24.6.0/sk.xpi) = 3899a09c9b4f6269830217e5d8ebd26a78619cc95c0a81898ab84a246def5cd8
+SIZE (xpi/thunderbird-i18n-24.6.0/sk.xpi) = 440106
+SHA256 (xpi/thunderbird-i18n-24.6.0/sl.xpi) = 22d81c886d7a775e9b1464550c326c6d2adc32ed87c47fbc47e953ac5d4a388e
+SIZE (xpi/thunderbird-i18n-24.6.0/sl.xpi) = 421706
+SHA256 (xpi/thunderbird-i18n-24.6.0/sq.xpi) = 08a4bf603c50b67e28841e76d1cdb23ec250e52c9afbc04b35059c8ced37120a
+SIZE (xpi/thunderbird-i18n-24.6.0/sq.xpi) = 435215
+SHA256 (xpi/thunderbird-i18n-24.6.0/sr.xpi) = 7e8eb7dd6dd9846bbb704d80dd757086f6da1b38070716cad12e2d6e87a99311
+SIZE (xpi/thunderbird-i18n-24.6.0/sr.xpi) = 518890
+SHA256 (xpi/thunderbird-i18n-24.6.0/sv-SE.xpi) = 4b920e494be9abf2784dc8b8b282b0c022601458e1bdac5ca21b92157f1a0fa6
+SIZE (xpi/thunderbird-i18n-24.6.0/sv-SE.xpi) = 423816
+SHA256 (xpi/thunderbird-i18n-24.6.0/ta-LK.xpi) = 23ca919444d43bc104e282fb3dbaf5c71ebbbfacd80a5c8a1c72ece41971394c
+SIZE (xpi/thunderbird-i18n-24.6.0/ta-LK.xpi) = 534923
+SHA256 (xpi/thunderbird-i18n-24.6.0/tr.xpi) = e6d8de6e52b3bc0bd706d46a25f25e1fe8c5d37608d7d5c251b43008c5397fa6
+SIZE (xpi/thunderbird-i18n-24.6.0/tr.xpi) = 438067
+SHA256 (xpi/thunderbird-i18n-24.6.0/uk.xpi) = 650bbcb5e1879d756953cbe990e78730afbf6b93b4b4fceef6119d3618c00522
+SIZE (xpi/thunderbird-i18n-24.6.0/uk.xpi) = 480949
+SHA256 (xpi/thunderbird-i18n-24.6.0/vi.xpi) = 7c927599de8066f45e07ff338167b9dba1c9b7f179bb8f6c93cdc9b0fa6b4624
+SIZE (xpi/thunderbird-i18n-24.6.0/vi.xpi) = 495559
+SHA256 (xpi/thunderbird-i18n-24.6.0/zh-CN.xpi) = 63b2f4bfb24ad36d32529a79151a8b73195d4beb35eba9ef4a3e4cf8a2020139
+SIZE (xpi/thunderbird-i18n-24.6.0/zh-CN.xpi) = 449182
+SHA256 (xpi/thunderbird-i18n-24.6.0/zh-TW.xpi) = 0f99b8c4680ab081629535e79898081c568d3f57c01d7149c69118d4be125e55
+SIZE (xpi/thunderbird-i18n-24.6.0/zh-TW.xpi) = 450001
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 84a7346dbd04..3d77f2691c4d 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	24.5.0
-PORTREVISION=	1
+DISTVERSION=	24.6.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/
+		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source/
 DISTFILES=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 
@@ -42,9 +41,8 @@ WANT_GNOME=	yes
 USE_QT4=	# empty
 QT_NONSTANDARD=	yes
 ALL_TARGET=	default
-USE_BZIP2=	yes
 USE_GL=		gl
-USES=		dos2unix
+USES=		dos2unix tar:bzip2
 DOS2UNIX_FILES=	mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
 
 MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data,wyciwyg,websocket
@@ -69,7 +67,6 @@ OPTIONS_DEFAULT=ENIGMAIL LIGHTNING
 ALL_TARGET=	build
 MAKEFILE=	${WRKSRC}/client.mk
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/GSTREAMER//}
@@ -148,51 +145,28 @@ post-build:
 .endif
 
 port-pre-install:
-	${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
-
-pre-install:
-	@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
-	@${ECHO_CMD} 'share/pixmaps/${PORTNAME_ICON}' >> ${PLIST}
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/defaults
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications
-	${LN} -sf ${PORTNAME_ICON_SRC} ${PREFIX}/share/pixmaps/${PORTNAME_ICON}
+	${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications
+	${LN} -sf ${PORTNAME_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME_ICON}
 .if ${PORT_OPTIONS:MLIGHTNING}
-	@${MKDIR} ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/thunderbird
-	@(cd ${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE})
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${XPI_ID}
-	@${REINPLACE_CMD} -i "" "s/${XPI_ORIG_ID}/${XPI_ID}/" ${XPI_LIBDIR}/${XPI_ID}/install.rdf
-	@${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${XPI_ID}
-	@${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${LOCALBASE}/lib/thunderbird/extensions 2>/dev/null || true
-	@${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/thunderbird 2>/dev/null || true
-	@(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -not -type d) | ${SORT} | \
-		${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST}
-	@${ECHO_CMD} 'lib/xpi/symlinks/thunderbird/${XPI_ID}' >> ${TMPPLIST}
+	@${MKDIR} ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/thunderbird
+	@(cd ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE})
+	@${REINPLACE_CMD} -i "" "s/${XPI_ORIG_ID}/${XPI_ID}/" ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID}/install.rdf
+	@${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID}
+	@${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/thunderbird 2>/dev/null || true
 	@${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${XPI_ID} ${LOCALBASE}/lib/thunderbird/extensions 2>/dev/null || true' >> ${TMPPLIST}
 	@${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/thunderbird/extensions/${XPI_ID}' >> ${TMPPLIST}
-	@(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -type d) | ${SORT} -r | \
-		${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST}
 .endif
 .if ${PORT_OPTIONS:MENIGMAIL}
-	@${MKDIR} ${XPI_LIBDIR}/${EM_ID} ${XPI_LIBDIR}/symlinks/${PORTNAME}
-	@(cd ${XPI_LIBDIR}/${EM_ID}; ${TAR} -xf ${EM_XPI_FILE})
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${EM_ID}
-	@${REINPLACE_CMD} -i "" "s/${EM_ORIG_ID}/${EM_ID}/" ${EM_ID_RFILES}
-	@${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${EM_ID}
-	@${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true
-	@${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${XPI_LIBDIR}/symlinks/${PORTNAME} 2>/dev/null || true
-	@(cd ${XPI_LIBDIR}; ${FIND} ${EM_ID} -not -type d) | ${SORT} | \
-		${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST}
-	@${ECHO_CMD} 'lib/xpi/symlinks/${PORTNAME}/${EM_ID}' >> ${TMPPLIST}
+	@${MKDIR} ${STAGEDIR}${XPI_LIBDIR}/${EM_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/${PORTNAME}
+	@(cd ${STAGEDIR}${XPI_LIBDIR}/${EM_ID}; ${TAR} -xf ${EM_XPI_FILE})
+	@${REINPLACE_CMD} -i "" "s/${EM_ORIG_ID}/${EM_ID}/" ${EM_ID_RFILES:S/^/${STAGEDIR}/}
+	@${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${EM_ID}
+	@${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/${PORTNAME} 2>/dev/null || true
 	@${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true' >> ${TMPPLIST}
 	@${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/${PORTNAME}/extensions/${EM_ID}' >> ${TMPPLIST}
-	@(cd ${XPI_LIBDIR}; ${FIND} ${EM_ID} -type d) | ${SORT} -r | \
-		${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST}
-.endif
-.if ${PORT_OPTIONS:MLIGHTNING} || ${PORT_OPTIONS:MENIGMAIL}
-	@${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/${PORTNAME} 2>/dev/null || true' >> ${TMPPLIST}
-	@${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks 2>/dev/null || true' >> ${TMPPLIST}
-	@${ECHO_CMD} '@unexec rmdir %D/lib/xpi 2>/dev/null || true' >> ${TMPPLIST}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index ce5374633ed3..0e5920fd5c3b 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,4 +1,4 @@
-SHA256 (thunderbird-24.5.0.source.tar.bz2) = 971c48db11328613340ed97a92018403647b8cca6a692b3d6b4145aed124382a
-SIZE (thunderbird-24.5.0.source.tar.bz2) = 140048545
+SHA256 (thunderbird-24.6.0.source.tar.bz2) = ae9a7cbc8dc195bd9f4b7b4edcd33599fa08c5388a0690f77221e6c5566629ea
+SIZE (thunderbird-24.6.0.source.tar.bz2) = 140120461
 SHA256 (enigmail-1.6.tar.gz) = 10d5eb7ba364b9b6e6275aae8bba1d0e4321ed7d55a715337d566ccf2a56ea4d
 SIZE (enigmail-1.6.tar.gz) = 1231111
diff --git a/mail/thunderbird/files/patch-bug1013675 b/mail/thunderbird/files/patch-bug1013675
new file mode 100644
index 000000000000..0632acbf91f5
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug1013675
@@ -0,0 +1,89 @@
+diff --git xpcom/base/nsDebugImpl.cpp xpcom/base/nsDebugImpl.cpp
+index 13a286f..293bd73 100644
+--- mozilla/xpcom/base/nsDebugImpl.cpp
++++ mozilla/xpcom/base/nsDebugImpl.cpp
+@@ -45,13 +45,44 @@
+ #endif
+ #endif
+ 
+-#if defined(XP_MACOSX)
++#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \
++ || defined(__NetBSD__) || defined(__OpenBSD__)
+ #include <stdbool.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <sys/param.h>
+ #include <sys/sysctl.h>
+ #endif
+ 
++#if defined(__OpenBSD__)
++#include <sys/proc.h>
++#endif
++
++#if defined(__DragonFly__) || defined(__FreeBSD__)
++#include <sys/user.h>
++#endif
++
++#if defined(__NetBSD__)
++#undef KERN_PROC
++#define KERN_PROC KERN_PROC2
++#define KINFO_PROC struct kinfo_proc2
++#else
++#define KINFO_PROC struct kinfo_proc
++#endif
++
++#if defined(XP_MACOSX)
++#define KP_FLAGS kp_proc.p_flag
++#elif defined(__DragonFly__)
++#define KP_FLAGS kp_flags
++#elif defined(__FreeBSD__)
++#define KP_FLAGS ki_flag
++#elif defined(__OpenBSD__) && !defined(_P_TRACED)
++#define KP_FLAGS p_psflags
++#define P_TRACED PS_TRACED
++#else
++#define KP_FLAGS p_flag
++#endif
++
+ #include "mozilla/mozalloc_abort.h"
+ 
+ static void
+@@ -144,16 +175,22 @@ nsDebugImpl::GetIsDebuggerAttached(bool* aResult)
+ 
+ #if defined(XP_WIN)
+   *aResult = ::IsDebuggerPresent();
+-#elif defined(XP_MACOSX)
++#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \
++   || defined(__NetBSD__) || defined(__OpenBSD__)
+   // Specify the info we're looking for
+-  int mib[4];
+-  mib[0] = CTL_KERN;
+-  mib[1] = KERN_PROC;
+-  mib[2] = KERN_PROC_PID;
+-  mib[3] = getpid();
++  int mib[] = {
++    CTL_KERN,
++    KERN_PROC,
++    KERN_PROC_PID,
++    getpid(),
++#if defined(__NetBSD__) || defined(__OpenBSD__)
++    sizeof(KINFO_PROC),
++    1,
++#endif
++  };
+   size_t mibSize = sizeof(mib) / sizeof(int);
+ 
+-  struct kinfo_proc info;
++  KINFO_PROC info;
+   size_t infoSize = sizeof(info);
+   memset(&info, 0, infoSize);
+ 
+@@ -163,7 +200,7 @@ nsDebugImpl::GetIsDebuggerAttached(bool* aResult)
+     return NS_OK;
+   }
+ 
+-  if (info.kp_proc.p_flag & P_TRACED) {
++  if (info.KP_FLAGS & P_TRACED) {
+     *aResult = true;
+   }
+ #endif
diff --git a/mail/thunderbird/files/patch-bug1015547 b/mail/thunderbird/files/patch-bug1015547
new file mode 100644
index 000000000000..f3cd7494c301
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug1015547
@@ -0,0 +1,94 @@
+diff --git configure.in configure.in
+index 7bed45f..053de17 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -3166,6 +3166,7 @@ AC_CHECK_FUNCS(random strerror lchown fc
+ AC_CHECK_FUNCS(statvfs64 statvfs statfs64 statfs)
+ AC_CHECK_FUNCS(flockfile getpagesize)
+ AC_CHECK_FUNCS(localtime_r strtok_r)
++AC_CHECK_FUNCS(arc4random arc4random_buf)
+ 
+ dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
+ AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
+diff --git xpcom/base/nsUUIDGenerator.cpp xpcom/base/nsUUIDGenerator.cpp
+index 0687344..ca3ff8b 100644
+--- mozilla/xpcom/base/nsUUIDGenerator.cpp
++++ mozilla/xpcom/base/nsUUIDGenerator.cpp
+@@ -15,6 +15,10 @@
+ 
+ #include "nsUUIDGenerator.h"
+ 
++#ifdef ANDROID
++extern "C" NS_EXPORT void arc4random_buf(void *, size_t);
++#endif
++
+ using namespace mozilla;
+ 
+ NS_IMPL_ISUPPORTS1(nsUUIDGenerator, nsIUUIDGenerator)
+@@ -34,7 +38,7 @@ nsUUIDGenerator::Init()
+     // We're a service, so we're guaranteed that Init() is not going
+     // to be reentered while we're inside Init().
+     
+-#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
++#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
+     /* initialize random number generator using NSPR random noise */
+     unsigned int seed;
+ 
+@@ -67,7 +71,7 @@ nsUUIDGenerator::Init()
+         return NS_ERROR_FAILURE;
+ #endif
+ 
+-#endif /* non XP_WIN and non XP_MACOSX */
++#endif /* non XP_WIN and non XP_MACOSX and non ARC4RANDOM */
+ 
+     return NS_OK;
+ }
+@@ -114,13 +118,16 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
+      * back to it; instead, we use the value returned when we called
+      * initstate, since older glibc's have broken setstate() return values
+      */
+-#ifndef ANDROID
++#ifndef HAVE_ARC4RANDOM
+     setstate(mState);
+ #endif
+ 
++#ifdef HAVE_ARC4RANDOM_BUF
++    arc4random_buf(id, sizeof(nsID));
++#else /* HAVE_ARC4RANDOM_BUF */
+     size_t bytesLeft = sizeof(nsID);
+     while (bytesLeft > 0) {
+-#ifdef ANDROID
++#ifdef HAVE_ARC4RANDOM
+         long rval = arc4random();
+         const size_t mRBytes = 4;
+ #else
+@@ -141,6 +148,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
+ 
+         bytesLeft -= toWrite;
+     }
++#endif /* HAVE_ARC4RANDOM_BUF */
+ 
+     /* Put in the version */
+     id->m2 &= 0x0fff;
+@@ -150,7 +158,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
+     id->m3[0] &= 0x3f;
+     id->m3[0] |= 0x80;
+ 
+-#ifndef ANDROID
++#ifndef HAVE_ARC4RANDOM
+     /* Restore the previous RNG state */
+     setstate(mSavedState);
+ #endif
+diff --git xpcom/base/nsUUIDGenerator.h xpcom/base/nsUUIDGenerator.h
+index 6a24212..68ed6f2 100644
+--- mozilla/xpcom/base/nsUUIDGenerator.h
++++ mozilla/xpcom/base/nsUUIDGenerator.h
+@@ -27,7 +27,7 @@ private:
+ protected:
+ 
+     mozilla::Mutex mLock;
+-#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
++#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
+     char mState[128];
+     char *mSavedState;
+     uint8_t mRBytes;
diff --git a/mail/thunderbird/files/patch-bug916589 b/mail/thunderbird/files/patch-bug916589
index c6aef052c4ce..3c24bf7ef332 100644
--- a/mail/thunderbird/files/patch-bug916589
+++ b/mail/thunderbird/files/patch-bug916589
@@ -2,17 +2,8 @@ diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/qu
 index 5b50785..7cf47d5 100644
 --- mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
 +++ mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
-@@ -31,11 +31,18 @@
-  */
- 
--#ifndef _SYS_QUEUE_H_
-+#if (defined(BSD) && !defined(__OpenBSD__)) || defined(DARWIN)
-+#include_next <sys/queue.h>
-+# if defined(__DragonFly__)
-+#define STAILQ_FOREACH_SAFE STAILQ_FOREACH_MUTABLE
-+#define TAILQ_FOREACH_SAFE TAILQ_FOREACH_MUTABLE
-+# endif
-+#elif !defined(_SYS_QUEUE_H_)
+@@ -33,9 +33,10 @@
+ #ifndef _SYS_QUEUE_H_
  #define	_SYS_QUEUE_H_
  
 -#if !defined(__FreeBSD__) && !defined(DARWIN)
@@ -24,7 +15,7 @@ index 5b50785..7cf47d5 100644
  #endif
  
  #define STAILQ_FOREACH_SAFE(var, head, field, tvar)                     \
-@@ -43,8 +46,6 @@
+@@ -43,8 +44,6 @@
               (var) && ((tvar) = STAILQ_NEXT((var), field), 1);           \
               (var) = (tvar))
  
@@ -33,7 +24,7 @@ index 5b50785..7cf47d5 100644
  /*
   * This file defines four types of data structures: singly-linked lists,
   * singly-linked tail queues, lists and tail queues.
-@@ -285,7 +286,7 @@ struct {								\
+@@ -285,7 +284,7 @@ struct {								\
  	(STAILQ_EMPTY((head)) ?						\
  		NULL :							\
  	        ((struct type *)					\
diff --git a/mail/thunderbird/files/patch-zz-bug517422 b/mail/thunderbird/files/patch-zz-bug517422
index 3922c5b27fad..413a57a17e82 100644
--- a/mail/thunderbird/files/patch-zz-bug517422
+++ b/mail/thunderbird/files/patch-zz-bug517422
@@ -178,7 +178,7 @@ index 87db361..7947626 100644
  dnl = Disable Opus audio codec support
  dnl ========================================================
  MOZ_ARG_DISABLE_BOOL(opus,
-@@ -5219,6 +5274,76 @@ MOZ_ARG_DISABLE_BOOL(opus,
+@@ -5219,6 +5274,97 @@ MOZ_ARG_DISABLE_BOOL(opus,
      MOZ_OPUS=1)
  
  dnl ========================================================
@@ -245,6 +245,27 @@ index 87db361..7947626 100644
 +
 +if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then
 +    PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.7.0)
++
++    AC_LANG_SAVE
++    AC_LANG_CPLUSPLUS
++    _SAVE_CXXFLAGS=$CXXFLAGS
++    CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS"
++    AC_CACHE_CHECK(for soundtouch sample type,
++                   ac_cv_soundtouch_sample_type,
++                   [AC_TRY_COMPILE([#include <SoundTouch.h>
++                                    #ifndef SOUNDTOUCH_INTEGER_SAMPLES
++                                    #error soundtouch expects float samples
++                                    #endif],
++                                   [],
++                                   [ac_cv_soundtouch_sample_type=short],
++                                   [ac_cv_soundtouch_sample_type=float])])
++    CXXFLAGS=$_SAVE_CXXFLAGS
++    AC_LANG_RESTORE
++
++    if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \
++         -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then
++        AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.])
++    fi
 +fi
 +
 +AC_SUBST(MOZ_NATIVE_SOUNDTOUCH)