Mozilla upgrades:

- Update nspr to 4.10.7
- Update ca_root_nss to 3.17 (mark as NO_ARCH while here)
- Update firefox to 32.0
- Update thunderbird to 31.1.0
- Add net-im/linux-instantbird
- Update firefox-est to 31.1.0
- Update libxul to 24.8.0
- Update seamonkey to 2.29

Submitted by:	Jan Beich for gecko@

9 files changed, 150 insertions, 139 deletions

diff --git a/mail/linux-thunderbird/Makefile b/mail/linux-thunderbird/Makefile
index bea08052ede5..a284fcd050a8 100644
--- a/mail/linux-thunderbird/Makefile
+++ b/mail/linux-thunderbird/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	31.0
+DISTVERSION=	31.1.0
 CATEGORIES=	mail news net-im ipv6
-DISTNAME=	${PORTNAME}-${DISTVERSION}
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US
 
 MAINTAINER=	gecko@FreeBSD.org
@@ -14,7 +13,5 @@ USES=		tar:bzip2
 
 WANT_GTK218=	yes
 
-USE_LINUX_APPS=	dbusglib dbuslibs alsalib alsa-plugins-oss
-
 .include "${.CURDIR}/../../www/linux-seamonkey/Makefile.common"
 .include <bsd.port.mk>
diff --git a/mail/linux-thunderbird/distinfo b/mail/linux-thunderbird/distinfo
index 68289d1df3bf..109f26922b14 100644
--- a/mail/linux-thunderbird/distinfo
+++ b/mail/linux-thunderbird/distinfo
@@ -1,5 +1,5 @@
-SHA256 (thunderbird-31.0.tar.bz2) = ee93df33057576bd55bc80b71aeec7c6f487028f0fe52f679614811be5c71bae
-SIZE (thunderbird-31.0.tar.bz2) = 33504321
+SHA256 (thunderbird-31.1.0.tar.bz2) = 234a6e0909880e7114e119e3fec34459652b43b51b307ae1f6e1a14d5f0dbdfc
+SIZE (thunderbird-31.1.0.tar.bz2) = 33438760
 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/linux-thunderbird/files/linux-thunderbird.desktop.in b/mail/linux-thunderbird/files/linux-thunderbird.desktop.in
index 8149d6fd5ab0..fee06fbbcea0 100644
--- a/mail/linux-thunderbird/files/linux-thunderbird.desktop.in
+++ b/mail/linux-thunderbird/files/linux-thunderbird.desktop.in
@@ -4,7 +4,7 @@ Name=Thunderbird (Linux)
 GenericName=Mail Client (Linux)
 Comment=Mail client and News Reader
 Exec=linux-thunderbird %u
-Icon=%%PREFIX%%/lib/%%APP_NAME%%/chrome/icons/default/default.xpm
+Icon=%%PREFIX%%/lib/%%APP_NAME%%/chrome/icons/default/default48.png
 StartupNotify=false
 Terminal=false
 Type=Application
diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile
index aaa7b7b5fa72..b83f1140565e 100644
--- a/mail/thunderbird-i18n/Makefile
+++ b/mail/thunderbird-i18n/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird-i18n
-PORTVERSION=	31.0
+PORTVERSION=	31.1.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 b1fc2b548d1c..a53bdb2dd18c 100644
--- a/mail/thunderbird-i18n/distinfo
+++ b/mail/thunderbird-i18n/distinfo
@@ -1,110 +1,110 @@
-SHA256 (xpi/thunderbird-i18n-31.0/ar.xpi) = 81314f4c47393b18c90f4ca64e71747dfc8005e72feb7b4f6c43f87fb7319521
-SIZE (xpi/thunderbird-i18n-31.0/ar.xpi) = 472809
-SHA256 (xpi/thunderbird-i18n-31.0/ast.xpi) = 3a78c9011c7c9e380ae05553b6fb30c4c8235a9910e979f8b7925cda9e036037
-SIZE (xpi/thunderbird-i18n-31.0/ast.xpi) = 393046
-SHA256 (xpi/thunderbird-i18n-31.0/be.xpi) = 40e22baac6e6714a63830bfc83d5652b9b671090d3296736e2dcd917a1f0ceaf
-SIZE (xpi/thunderbird-i18n-31.0/be.xpi) = 427485
-SHA256 (xpi/thunderbird-i18n-31.0/bg.xpi) = c74870d38573d783c47a2ed25cbf9bffe32a0ab389790cde98ce621154d55086
-SIZE (xpi/thunderbird-i18n-31.0/bg.xpi) = 493731
-SHA256 (xpi/thunderbird-i18n-31.0/bn-BD.xpi) = d8e6ff465fab861b49fb1828983b85d9f5dedd93c38dc7f74a62fc8977fe17a1
-SIZE (xpi/thunderbird-i18n-31.0/bn-BD.xpi) = 555610
-SHA256 (xpi/thunderbird-i18n-31.0/br.xpi) = 20fa4c71abf89888ff19ad87dc97c39f93c395f34690b3714ac38014be221cdd
-SIZE (xpi/thunderbird-i18n-31.0/br.xpi) = 441442
-SHA256 (xpi/thunderbird-i18n-31.0/ca.xpi) = 340b8029f83554beca5256296b0715f569b4ac8f00dde62ba25013bbcd672b13
-SIZE (xpi/thunderbird-i18n-31.0/ca.xpi) = 441711
-SHA256 (xpi/thunderbird-i18n-31.0/cs.xpi) = 5abfb0e1dd0d1b2344373044147ab8211342ec14385280b6d6d66db4cbb5e0a9
-SIZE (xpi/thunderbird-i18n-31.0/cs.xpi) = 444698
-SHA256 (xpi/thunderbird-i18n-31.0/da.xpi) = 412cab5c29ee7cd39f3620fcfce05c6753e6c0c6ce7761d8512ecf19d54a04a5
-SIZE (xpi/thunderbird-i18n-31.0/da.xpi) = 422049
-SHA256 (xpi/thunderbird-i18n-31.0/de.xpi) = e76186c43cbb0965f049bdf4770319d5e7595527a76bf2a0683d5c9bd01ac559
-SIZE (xpi/thunderbird-i18n-31.0/de.xpi) = 424663
-SHA256 (xpi/thunderbird-i18n-31.0/el.xpi) = b6f36094ed24b347eaaa4584f4d1459896a17cf1332713c8a7ef9fe44d63f056
-SIZE (xpi/thunderbird-i18n-31.0/el.xpi) = 484852
-SHA256 (xpi/thunderbird-i18n-31.0/en-GB.xpi) = 30db7504cde1359f4e940cee846481e713d6a66442baab9aa6e30287c52f54bf
-SIZE (xpi/thunderbird-i18n-31.0/en-GB.xpi) = 412513
-SHA256 (xpi/thunderbird-i18n-31.0/en-US.xpi) = 89da465c642d4d1aa6ada8b45333cfa2b01d39be2a83904b77c468cfdc351a46
-SIZE (xpi/thunderbird-i18n-31.0/en-US.xpi) = 413657
-SHA256 (xpi/thunderbird-i18n-31.0/es-AR.xpi) = 6467b60b34d140671737d1af81b88d18b09e427374a73c73daf95f59280af6e9
-SIZE (xpi/thunderbird-i18n-31.0/es-AR.xpi) = 438528
-SHA256 (xpi/thunderbird-i18n-31.0/es-ES.xpi) = 58707f9abfdb36f72b09c78c4469047d7ce43ac538b529d77141fd27b31a8b68
-SIZE (xpi/thunderbird-i18n-31.0/es-ES.xpi) = 374978
-SHA256 (xpi/thunderbird-i18n-31.0/et.xpi) = d1ed0b990d44be0317f150037a115b2652397ac0ca428a92972cfd0f6c0b213a
-SIZE (xpi/thunderbird-i18n-31.0/et.xpi) = 434361
-SHA256 (xpi/thunderbird-i18n-31.0/eu.xpi) = 8a569452945478c8ea436f24ca2d0b0067476094e3d83275f7cafce3dc61e551
-SIZE (xpi/thunderbird-i18n-31.0/eu.xpi) = 431446
-SHA256 (xpi/thunderbird-i18n-31.0/fi.xpi) = 847ab3e6bf668fb27a5b56c248ac506602ddb27054692956ccbfc857aa341358
-SIZE (xpi/thunderbird-i18n-31.0/fi.xpi) = 435630
-SHA256 (xpi/thunderbird-i18n-31.0/fr.xpi) = b6a8df2e7ddd74e4b115c8a507a8b09b79aa721537d77c44cac83b7b053505d7
-SIZE (xpi/thunderbird-i18n-31.0/fr.xpi) = 444141
-SHA256 (xpi/thunderbird-i18n-31.0/fy-NL.xpi) = 67430b6113dc2fa2606009f92580fb727d2827116d759cfb75fe3ae0587a249d
-SIZE (xpi/thunderbird-i18n-31.0/fy-NL.xpi) = 438542
-SHA256 (xpi/thunderbird-i18n-31.0/ga-IE.xpi) = 711efc1e1da56ef0c9e096f8fa1ce47715dd49b9b76b2f13a686b32e55dbc4a1
-SIZE (xpi/thunderbird-i18n-31.0/ga-IE.xpi) = 449359
-SHA256 (xpi/thunderbird-i18n-31.0/gd.xpi) = c375218c658607c40d27593ec75b83f937b361a3d8634557e1772abe32723aee
-SIZE (xpi/thunderbird-i18n-31.0/gd.xpi) = 453169
-SHA256 (xpi/thunderbird-i18n-31.0/gl.xpi) = efadaea55ac283c60f2092e9510c02aece8c9447830f0a648fe1afb2aa008815
-SIZE (xpi/thunderbird-i18n-31.0/gl.xpi) = 446785
-SHA256 (xpi/thunderbird-i18n-31.0/he.xpi) = 55cb02490acbbd34eebdbe05b5db90972c6c870d7c8bd18b2528d4ed2140a9dc
-SIZE (xpi/thunderbird-i18n-31.0/he.xpi) = 476108
-SHA256 (xpi/thunderbird-i18n-31.0/hr.xpi) = adc70cf28f04e0412b98705c457efb2001c1929494c1248c2237b51fac5073ab
-SIZE (xpi/thunderbird-i18n-31.0/hr.xpi) = 436977
-SHA256 (xpi/thunderbird-i18n-31.0/hu.xpi) = b82ed4a17349aaddb6298ec2152538f8ebf89642c222eb5bd8ba52fa0aa6c295
-SIZE (xpi/thunderbird-i18n-31.0/hu.xpi) = 454540
-SHA256 (xpi/thunderbird-i18n-31.0/hy-AM.xpi) = 87b39a9b72a892ce0825ca039b7b34c901ee48a0b8206fa6e64d5caefe182888
-SIZE (xpi/thunderbird-i18n-31.0/hy-AM.xpi) = 492763
-SHA256 (xpi/thunderbird-i18n-31.0/id.xpi) = 1409390f3ab8b3340ed1497fe38033f936fb35fcb99502f626d0da34a4bf6261
-SIZE (xpi/thunderbird-i18n-31.0/id.xpi) = 475874
-SHA256 (xpi/thunderbird-i18n-31.0/is.xpi) = c5bc5957acf8129ffde9ba0fb262ed7c2feddf88c97c1cc8bf49619ecce5dfff
-SIZE (xpi/thunderbird-i18n-31.0/is.xpi) = 437957
-SHA256 (xpi/thunderbird-i18n-31.0/it.xpi) = da5517cd37c21ec73d423a3b4efffe2ee587eb6a1ae1e3f05d2f539d2debc2c7
-SIZE (xpi/thunderbird-i18n-31.0/it.xpi) = 367999
-SHA256 (xpi/thunderbird-i18n-31.0/ja.xpi) = 7f4e51b28a6fe1164da52d0efa16f30db29f92a27f4babc09434b0cb6ca57074
-SIZE (xpi/thunderbird-i18n-31.0/ja.xpi) = 489264
-SHA256 (xpi/thunderbird-i18n-31.0/ko.xpi) = bb770426c776fc076655049c60f24b6e0dc797b04412172739b540e907058496
-SIZE (xpi/thunderbird-i18n-31.0/ko.xpi) = 448916
-SHA256 (xpi/thunderbird-i18n-31.0/lt.xpi) = 34227eeb66f796aeb7b0c55b17fb9705fdfabca9329bf063143f8eb0b836d9c3
-SIZE (xpi/thunderbird-i18n-31.0/lt.xpi) = 457810
-SHA256 (xpi/thunderbird-i18n-31.0/nb-NO.xpi) = d07c357b09adee7477b27720b22ba2840dafce8b10f3909968863e08d5c70043
-SIZE (xpi/thunderbird-i18n-31.0/nb-NO.xpi) = 430939
-SHA256 (xpi/thunderbird-i18n-31.0/nl.xpi) = 2094c7577c4e885f0c030d972947d2ccc3abcac9fcd2f927fc8541b567c8a35d
-SIZE (xpi/thunderbird-i18n-31.0/nl.xpi) = 431885
-SHA256 (xpi/thunderbird-i18n-31.0/nn-NO.xpi) = a35351f6a85807f90fd7c7a93978cd9d78e3c5bdd007d4f06974e457768b7177
-SIZE (xpi/thunderbird-i18n-31.0/nn-NO.xpi) = 433195
-SHA256 (xpi/thunderbird-i18n-31.0/pa-IN.xpi) = ce41c104128925d1b03cd2897997686e1f18d79a53fa4f83a401f413526abcfa
-SIZE (xpi/thunderbird-i18n-31.0/pa-IN.xpi) = 525320
-SHA256 (xpi/thunderbird-i18n-31.0/pl.xpi) = 9d12eec1c898e7f20f40134f6bffac186de015f39a3bf9e8bb3e6d3daca11af7
-SIZE (xpi/thunderbird-i18n-31.0/pl.xpi) = 410870
-SHA256 (xpi/thunderbird-i18n-31.0/pt-BR.xpi) = a678b187ac24ca1cabae53d064e5d748aa00a25ffbcb4c0b489449678561f1a9
-SIZE (xpi/thunderbird-i18n-31.0/pt-BR.xpi) = 450473
-SHA256 (xpi/thunderbird-i18n-31.0/pt-PT.xpi) = 61a1bc548da0e54f11b8bc5eb4440a2f62ca5a6d81e52f488c66588b87247c39
-SIZE (xpi/thunderbird-i18n-31.0/pt-PT.xpi) = 439601
-SHA256 (xpi/thunderbird-i18n-31.0/rm.xpi) = 6522ed5a7524a265b9b8d94c3cd7883b1eb69ace23b4844c6fda2649c92beee2
-SIZE (xpi/thunderbird-i18n-31.0/rm.xpi) = 439183
-SHA256 (xpi/thunderbird-i18n-31.0/ro.xpi) = 98edaf17dc690403a8dc3666e0949a3c2737f5855a81f19fb241078a8ee044be
-SIZE (xpi/thunderbird-i18n-31.0/ro.xpi) = 479744
-SHA256 (xpi/thunderbird-i18n-31.0/ru.xpi) = 3e12ee986ee7e69d44253a3ad93cc3776d3b03700100bcda14c357037139bcd6
-SIZE (xpi/thunderbird-i18n-31.0/ru.xpi) = 436153
-SHA256 (xpi/thunderbird-i18n-31.0/si.xpi) = 39845364164e805b9c9d4c1afa887419216842ac04cf9e0d9447cb0af0db0637
-SIZE (xpi/thunderbird-i18n-31.0/si.xpi) = 528810
-SHA256 (xpi/thunderbird-i18n-31.0/sk.xpi) = 390e494377e4c315941ac2650581ed7aa10afb62f65ac7080b8a3a367d758643
-SIZE (xpi/thunderbird-i18n-31.0/sk.xpi) = 452993
-SHA256 (xpi/thunderbird-i18n-31.0/sl.xpi) = 6bf7e8172f6532e44799517db99c7d2db29c7653dee8990fee4ac8a4c9b4bf6e
-SIZE (xpi/thunderbird-i18n-31.0/sl.xpi) = 433872
-SHA256 (xpi/thunderbird-i18n-31.0/sq.xpi) = 6d838ccf9ad458445724d7daafbe5a119405e00fc3b83ef369b911471fad18d0
-SIZE (xpi/thunderbird-i18n-31.0/sq.xpi) = 454692
-SHA256 (xpi/thunderbird-i18n-31.0/sr.xpi) = 7f3a9254300fc2484014d7337d6a776063cc6eb18fbedd18b918b9c65ab6b0ab
-SIZE (xpi/thunderbird-i18n-31.0/sr.xpi) = 537332
-SHA256 (xpi/thunderbird-i18n-31.0/sv-SE.xpi) = 00ca227318e586b8f0a821957358bc3f4e82dd835d9ebc8d4b6cb7951997fff6
-SIZE (xpi/thunderbird-i18n-31.0/sv-SE.xpi) = 436103
-SHA256 (xpi/thunderbird-i18n-31.0/ta-LK.xpi) = 25ecd571f6d36a210e7618f7a4b9080deebd0a23e4f67afaaea011d7f0106dc1
-SIZE (xpi/thunderbird-i18n-31.0/ta-LK.xpi) = 553506
-SHA256 (xpi/thunderbird-i18n-31.0/tr.xpi) = 41cb40d4080284e96239ff4a994d70dacfa4666b80b2500303a6cb8eb704e952
-SIZE (xpi/thunderbird-i18n-31.0/tr.xpi) = 457357
-SHA256 (xpi/thunderbird-i18n-31.0/uk.xpi) = 474c20ee148f732663b53164990934013b3c2620a26d3e9d320c28f83f8f2de9
-SIZE (xpi/thunderbird-i18n-31.0/uk.xpi) = 499654
-SHA256 (xpi/thunderbird-i18n-31.0/vi.xpi) = 36996d67d9c5f8948f0fae1373c559bb60afbe571865c874a5eeba0a82383ac3
-SIZE (xpi/thunderbird-i18n-31.0/vi.xpi) = 513833
-SHA256 (xpi/thunderbird-i18n-31.0/zh-CN.xpi) = 01310efee05f441f74f3d721bfdb24e94880fe450adf26689dedc31ee6483837
-SIZE (xpi/thunderbird-i18n-31.0/zh-CN.xpi) = 462666
-SHA256 (xpi/thunderbird-i18n-31.0/zh-TW.xpi) = e4b4b6d6b97cd77c6f3395c863042c390b1fa36a2fe012e77dfd5f7e3ddedd15
-SIZE (xpi/thunderbird-i18n-31.0/zh-TW.xpi) = 463406
+SHA256 (xpi/thunderbird-i18n-31.1.0/ar.xpi) = 3bdd4b046604dd43b2d29cf51045e2d37f77dcbf6f8f80072c9dbc41582a4229
+SIZE (xpi/thunderbird-i18n-31.1.0/ar.xpi) = 472810
+SHA256 (xpi/thunderbird-i18n-31.1.0/ast.xpi) = 0c19b6dc4f06069b4d89edb03fc1cf6c43adf3de92b629a22683282a616ada0e
+SIZE (xpi/thunderbird-i18n-31.1.0/ast.xpi) = 393048
+SHA256 (xpi/thunderbird-i18n-31.1.0/be.xpi) = f640832e434fc13c3e4fc86395a5dad8b4281ef5bc008708bbfc239dce558e56
+SIZE (xpi/thunderbird-i18n-31.1.0/be.xpi) = 427487
+SHA256 (xpi/thunderbird-i18n-31.1.0/bg.xpi) = 6f77a52a6d86e109a8555e085c0f917f7dc9c7038e8d1099424d68916341e513
+SIZE (xpi/thunderbird-i18n-31.1.0/bg.xpi) = 493734
+SHA256 (xpi/thunderbird-i18n-31.1.0/bn-BD.xpi) = 3589d16d373d4b8fd4364317bf43ab1b0ce61b4d627bcb85b12e9b0ecd28b1c3
+SIZE (xpi/thunderbird-i18n-31.1.0/bn-BD.xpi) = 555612
+SHA256 (xpi/thunderbird-i18n-31.1.0/br.xpi) = 7c0160a2e9115f11a98f0571f8e85495ed9d9afcf2dc5d30b4b3f557d551a519
+SIZE (xpi/thunderbird-i18n-31.1.0/br.xpi) = 441444
+SHA256 (xpi/thunderbird-i18n-31.1.0/ca.xpi) = e5daa36ddf547a065816c67bae89b1637364fde044a03899a2f1f51bb1bb9161
+SIZE (xpi/thunderbird-i18n-31.1.0/ca.xpi) = 441712
+SHA256 (xpi/thunderbird-i18n-31.1.0/cs.xpi) = 926a631f22534cd475a2ca488a9b6ca9a749d50ae9bc4ec287bc57ca8fb58944
+SIZE (xpi/thunderbird-i18n-31.1.0/cs.xpi) = 444700
+SHA256 (xpi/thunderbird-i18n-31.1.0/da.xpi) = c5bda3505df4de80cef6d5f0269bc1622f8be4c51d74658f37f3ce987381ff62
+SIZE (xpi/thunderbird-i18n-31.1.0/da.xpi) = 422051
+SHA256 (xpi/thunderbird-i18n-31.1.0/de.xpi) = 16ee968e3c6d8d9f5a652a93ede4b5a399c871e2595b135617479cd7d3792315
+SIZE (xpi/thunderbird-i18n-31.1.0/de.xpi) = 424664
+SHA256 (xpi/thunderbird-i18n-31.1.0/el.xpi) = 80e078d8ed6be3481431d698925611391728e303d9a86afb8cecdc918e51b072
+SIZE (xpi/thunderbird-i18n-31.1.0/el.xpi) = 484855
+SHA256 (xpi/thunderbird-i18n-31.1.0/en-GB.xpi) = baa60e58a02c3d3b8ad65839cf1f65332561f3341f7739a9c4d5a77e5387dcfe
+SIZE (xpi/thunderbird-i18n-31.1.0/en-GB.xpi) = 412515
+SHA256 (xpi/thunderbird-i18n-31.1.0/en-US.xpi) = 29443d68c3bd260cf104ba64dfd302687ed272569f5840cc8cdee3cec88d3499
+SIZE (xpi/thunderbird-i18n-31.1.0/en-US.xpi) = 413659
+SHA256 (xpi/thunderbird-i18n-31.1.0/es-AR.xpi) = fa810d84e57445dc842413b4eee41ff2cda0a685c46799a92740436bb72a4d9b
+SIZE (xpi/thunderbird-i18n-31.1.0/es-AR.xpi) = 438530
+SHA256 (xpi/thunderbird-i18n-31.1.0/es-ES.xpi) = 380563fa13b9387fcc48067f9f5a9224e671c6b1a5d6417f93b460a75964a714
+SIZE (xpi/thunderbird-i18n-31.1.0/es-ES.xpi) = 374979
+SHA256 (xpi/thunderbird-i18n-31.1.0/et.xpi) = 3ef7f838cbee111a2031a4acad6dea5077c111860f49bb7f7866827b943de3d3
+SIZE (xpi/thunderbird-i18n-31.1.0/et.xpi) = 434363
+SHA256 (xpi/thunderbird-i18n-31.1.0/eu.xpi) = a0943d85b3255d6bb17fcf92f512d91ad21208ef6251de556012e07819ebba5d
+SIZE (xpi/thunderbird-i18n-31.1.0/eu.xpi) = 431448
+SHA256 (xpi/thunderbird-i18n-31.1.0/fi.xpi) = f03066aa7db8e1efeb40d0fd7b8a22e1ebeef86ea3e2ee349413fdf29381b4a0
+SIZE (xpi/thunderbird-i18n-31.1.0/fi.xpi) = 435631
+SHA256 (xpi/thunderbird-i18n-31.1.0/fr.xpi) = 8649d6923dbd8997be6b7f1736571cfc751b7f2b3f13fabbf7a9dc77c33bb47a
+SIZE (xpi/thunderbird-i18n-31.1.0/fr.xpi) = 444143
+SHA256 (xpi/thunderbird-i18n-31.1.0/fy-NL.xpi) = 0b11553a7795585462f983cf329322bc08665a168c1af8a14bbe563d80225bef
+SIZE (xpi/thunderbird-i18n-31.1.0/fy-NL.xpi) = 438544
+SHA256 (xpi/thunderbird-i18n-31.1.0/ga-IE.xpi) = 948440485b1c97d753d035c1095734db50a224236306d1d9f23e064197ff9f8d
+SIZE (xpi/thunderbird-i18n-31.1.0/ga-IE.xpi) = 449362
+SHA256 (xpi/thunderbird-i18n-31.1.0/gd.xpi) = 0aab77a9ccafa20dae350a173b7d4a9abffedc6d720a0d49855ac193b53db306
+SIZE (xpi/thunderbird-i18n-31.1.0/gd.xpi) = 453171
+SHA256 (xpi/thunderbird-i18n-31.1.0/gl.xpi) = 865a6474c146b29fb0469b3a99b3f5b6492ae594cdcf0b5dd9df081529634f53
+SIZE (xpi/thunderbird-i18n-31.1.0/gl.xpi) = 446787
+SHA256 (xpi/thunderbird-i18n-31.1.0/he.xpi) = 9cbdf3cb6e4a576fece60636bc6d47fc5c1f98521021edfc21fcbe4c50627a4d
+SIZE (xpi/thunderbird-i18n-31.1.0/he.xpi) = 476111
+SHA256 (xpi/thunderbird-i18n-31.1.0/hr.xpi) = a44318d8ecc80da9ac306cdc4bc804185cbf4556bc772c48ff73286f12bf5bca
+SIZE (xpi/thunderbird-i18n-31.1.0/hr.xpi) = 436983
+SHA256 (xpi/thunderbird-i18n-31.1.0/hu.xpi) = 1817ec0921a34b5facbcbdf9eb631aeb08c163cda86d0d570eddf9d36f66d836
+SIZE (xpi/thunderbird-i18n-31.1.0/hu.xpi) = 454541
+SHA256 (xpi/thunderbird-i18n-31.1.0/hy-AM.xpi) = ba15083ecdd2a5b56f45f7c2fee486f006e1d686c0554acae884479457808b56
+SIZE (xpi/thunderbird-i18n-31.1.0/hy-AM.xpi) = 492768
+SHA256 (xpi/thunderbird-i18n-31.1.0/id.xpi) = b7fdef3f352700a889ab7715fb34461567fb8e40b14c1c631aaff42a4693f831
+SIZE (xpi/thunderbird-i18n-31.1.0/id.xpi) = 475875
+SHA256 (xpi/thunderbird-i18n-31.1.0/is.xpi) = 20930236af265efe0826b1f1c2266e60a197812131c9ce659859a15f24149462
+SIZE (xpi/thunderbird-i18n-31.1.0/is.xpi) = 437959
+SHA256 (xpi/thunderbird-i18n-31.1.0/it.xpi) = 69766a4bdd55feab8d73df0ce36a8f5116a7c8c91b6d26e32ca18ca9adee1d42
+SIZE (xpi/thunderbird-i18n-31.1.0/it.xpi) = 368000
+SHA256 (xpi/thunderbird-i18n-31.1.0/ja.xpi) = e1b7633b1691ee36271312ecdbe5e2907ca8b9e2b46fdba26003d54c1daa8b40
+SIZE (xpi/thunderbird-i18n-31.1.0/ja.xpi) = 489266
+SHA256 (xpi/thunderbird-i18n-31.1.0/ko.xpi) = 2225b22692faf76945e9c6ec7e240f8cd7ba76704c1ac9e2f6cef45da6f86ef9
+SIZE (xpi/thunderbird-i18n-31.1.0/ko.xpi) = 448919
+SHA256 (xpi/thunderbird-i18n-31.1.0/lt.xpi) = da100c0594b57277b5ea8084eebeb9faa1dd4e4b23c9977d41422f6e129dcbcf
+SIZE (xpi/thunderbird-i18n-31.1.0/lt.xpi) = 457812
+SHA256 (xpi/thunderbird-i18n-31.1.0/nb-NO.xpi) = 65878db5a493cc3228f2048a9628aeee117282a53db2a30f00fff69ce722e187
+SIZE (xpi/thunderbird-i18n-31.1.0/nb-NO.xpi) = 430941
+SHA256 (xpi/thunderbird-i18n-31.1.0/nl.xpi) = f9ec7b3d25962ea316da43eed789044a6eba41c22595fda0ce71254efff41798
+SIZE (xpi/thunderbird-i18n-31.1.0/nl.xpi) = 431887
+SHA256 (xpi/thunderbird-i18n-31.1.0/nn-NO.xpi) = 55c1fcbeafeedbef2d974924ab19283b9049ae5f2f46b1fcb2903c631f54d028
+SIZE (xpi/thunderbird-i18n-31.1.0/nn-NO.xpi) = 433197
+SHA256 (xpi/thunderbird-i18n-31.1.0/pa-IN.xpi) = 2f01bce3c7a6c2e39d76d5e7ec8757cb805d7e42d9b32deb5d3fa29502686c54
+SIZE (xpi/thunderbird-i18n-31.1.0/pa-IN.xpi) = 525323
+SHA256 (xpi/thunderbird-i18n-31.1.0/pl.xpi) = f5d737033597bd560a503b68cb7e58343a23533a18ac182f1f08a9c56a57aa68
+SIZE (xpi/thunderbird-i18n-31.1.0/pl.xpi) = 410872
+SHA256 (xpi/thunderbird-i18n-31.1.0/pt-BR.xpi) = fdeddd53df5cb650253383e10558d493714dc059ac6a2ab114a552db8f733859
+SIZE (xpi/thunderbird-i18n-31.1.0/pt-BR.xpi) = 450476
+SHA256 (xpi/thunderbird-i18n-31.1.0/pt-PT.xpi) = e93691ec54708ff10fbccb43f766f0a6ef8996c0302046d75966abeabde7341c
+SIZE (xpi/thunderbird-i18n-31.1.0/pt-PT.xpi) = 439603
+SHA256 (xpi/thunderbird-i18n-31.1.0/rm.xpi) = 7672a6fb5d7e68e54463a9778262f3a988aa02d45bda8ce5e295d5b18d5436b6
+SIZE (xpi/thunderbird-i18n-31.1.0/rm.xpi) = 439185
+SHA256 (xpi/thunderbird-i18n-31.1.0/ro.xpi) = 79fd5f430a6946679fb58a3609b10dd8e9119acad1d3cc79370c1b5ef8d1ca1e
+SIZE (xpi/thunderbird-i18n-31.1.0/ro.xpi) = 479746
+SHA256 (xpi/thunderbird-i18n-31.1.0/ru.xpi) = 04f21ff5c10a75cd4f333269b71f3375c7e79894af0784c0940676a6586618f6
+SIZE (xpi/thunderbird-i18n-31.1.0/ru.xpi) = 436155
+SHA256 (xpi/thunderbird-i18n-31.1.0/si.xpi) = 813a638a3d8a9d123887a473aee5775f4389ae5d5bafca69f84ced3ec74391bb
+SIZE (xpi/thunderbird-i18n-31.1.0/si.xpi) = 528811
+SHA256 (xpi/thunderbird-i18n-31.1.0/sk.xpi) = 4eb1d225c047114803c2b2b43d78fecd75eaadcc47e8aebfd824f421cf2ecca5
+SIZE (xpi/thunderbird-i18n-31.1.0/sk.xpi) = 452995
+SHA256 (xpi/thunderbird-i18n-31.1.0/sl.xpi) = 905cb92682a6c3cd62545942699803d70d2fa0280b110565240d1b788757cc39
+SIZE (xpi/thunderbird-i18n-31.1.0/sl.xpi) = 433874
+SHA256 (xpi/thunderbird-i18n-31.1.0/sq.xpi) = 5ecc9feb46824c72a325fe4d6a7591b61b10ee41f2f2f872a74fd6d0ff5caa46
+SIZE (xpi/thunderbird-i18n-31.1.0/sq.xpi) = 454694
+SHA256 (xpi/thunderbird-i18n-31.1.0/sr.xpi) = e58f032465419beb1327e2ab1f4cdd06ad1dec72fca1aa2e521ddd3d8bf5be18
+SIZE (xpi/thunderbird-i18n-31.1.0/sr.xpi) = 537334
+SHA256 (xpi/thunderbird-i18n-31.1.0/sv-SE.xpi) = aa0fe96db9e5aedc2a4f13d8716d47a2f2f982d1c05ad0ed22185d98e3567fee
+SIZE (xpi/thunderbird-i18n-31.1.0/sv-SE.xpi) = 436104
+SHA256 (xpi/thunderbird-i18n-31.1.0/ta-LK.xpi) = b2206f4464d40a0fac5ca583deb0927381acf725a7673ceb0561b7b89f37592c
+SIZE (xpi/thunderbird-i18n-31.1.0/ta-LK.xpi) = 553508
+SHA256 (xpi/thunderbird-i18n-31.1.0/tr.xpi) = 8789a90e44469ecdddbd48b0d5f4e2539a1e1b67d02358b46c2c8f98d834603a
+SIZE (xpi/thunderbird-i18n-31.1.0/tr.xpi) = 457359
+SHA256 (xpi/thunderbird-i18n-31.1.0/uk.xpi) = b082f8232355a147e9350b0f3ec5f4637d2ead8a1a63a0770104a8e054481b97
+SIZE (xpi/thunderbird-i18n-31.1.0/uk.xpi) = 499656
+SHA256 (xpi/thunderbird-i18n-31.1.0/vi.xpi) = 6ea664760588a68d9e3157fe3eea238c107067ab287e122bf63f902a564b9340
+SIZE (xpi/thunderbird-i18n-31.1.0/vi.xpi) = 513835
+SHA256 (xpi/thunderbird-i18n-31.1.0/zh-CN.xpi) = 38e3636d46a8f80245f4ccd07e8e7c5812f8743552fdc5edb2cc5ba3205add3d
+SIZE (xpi/thunderbird-i18n-31.1.0/zh-CN.xpi) = 462667
+SHA256 (xpi/thunderbird-i18n-31.1.0/zh-TW.xpi) = 5b204c71f1453ae9a2a6e793967dc432266b7e498e6c8129ef89c1c99ed0f9d5
+SIZE (xpi/thunderbird-i18n-31.1.0/zh-TW.xpi) = 463407
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index d8d0d001f808..6e7af9b56d36 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	thunderbird
-DISTVERSION=	31.0
+DISTVERSION=	31.1.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}
 
@@ -29,12 +29,11 @@ BUILD_DEPENDS=	nspr>=4.10.6:${PORTSDIR}/devel/nspr \
 
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
-EM_VERSION=	1.7
-L_VERSION=	3.3
+EM_VERSION=	1.7.2
+L_VERSION=	3.3.1
 
 SSP_UNSAFE=	yes
 USE_AUTOTOOLS=	autoconf213:env
-USE_PYTHON_BUILD=2
 OBJDIR_BUILD=	# in-tree build broken after bug 789837
 USE_GECKO=	gecko
 USE_MOZILLA=	-cairo
@@ -166,7 +165,7 @@ post-configure:
 		${SETENV} ${MAKE_ENV} ./configure
 
 post-build:
-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} all xpi \
+	${DO_MAKE_BUILD:S/${MAKEFILE}/Makefile/} all xpi \
 		-C ${WRKSRC}/mailnews/extensions/enigmail
 .endif
 
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 3a2e5612dd77..b88e3305ebd7 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,4 +1,4 @@
-SHA256 (thunderbird-31.0.source.tar.bz2) = 571f8cca980f077ae81999aea69a78153422a75e9e6c07ab74ec6659fe0d6ef4
-SIZE (thunderbird-31.0.source.tar.bz2) = 170977129
-SHA256 (enigmail-1.7.tar.gz) = cddbf35783194a4e994f9584ad5bee74750e25f690e81727ba9eccc4f814f161
-SIZE (enigmail-1.7.tar.gz) = 1414100
+SHA256 (thunderbird-31.1.0.source.tar.bz2) = f6a8f2fce1958c692dce7351caf5a7d78433c7be30e2a89a414e0ef6727081ea
+SIZE (thunderbird-31.1.0.source.tar.bz2) = 170726889
+SHA256 (enigmail-1.7.2.tar.gz) = 7b3a62e83961bafec1cdac60075aa6c317c8f655a837e31a7d1f3ce6a49fc7d6
+SIZE (enigmail-1.7.2.tar.gz) = 1420346
diff --git a/mail/thunderbird/files/extra-patch-security_manager_Makefile.in b/mail/thunderbird/files/extra-patch-security_manager_Makefile.in
deleted file mode 100644
index c936ae46850d..000000000000
--- a/mail/thunderbird/files/extra-patch-security_manager_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- security/manager/Makefile.in.orig.patched	Thu May 25 10:19:22 2006
-+++ security/manager/Makefile.in	Thu May 25 10:19:22 2006
-@@ -159,8 +159,6 @@
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
- ifeq ($(OS_ARCH),WINNT)
- 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--else
--	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
- endif
- #	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
- ifndef SKIP_CHK
diff --git a/mail/thunderbird/files/patch-bug1046224 b/mail/thunderbird/files/patch-bug1046224
new file mode 100644
index 000000000000..86c675584859
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug1046224
@@ -0,0 +1,26 @@
+diff --git configure.in configure.in
+index 1853029..559bd45 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -2651,7 +2651,7 @@ if test "$ac_cv_sockaddr_sa_len" = true ; then
+   AC_DEFINE(HAVE_SA_LEN)
+ fi
+ 
+-AC_ARG_ENABLE(dtrace,
++MOZ_ARG_ENABLE_BOOL(dtrace,
+               [  --enable-dtrace         build with dtrace support if available (default=no)],
+               [enable_dtrace="yes"],)
+ if test "x$enable_dtrace" = "xyes"; then
+diff --git js/src/configure.in js/src/configure.in
+index 134dfd3..682c1fb 100644
+--- mozilla/js/src/configure.in
++++ mozilla/js/src/configure.in
+@@ -2153,7 +2153,7 @@ dnl Quota support
+ MOZ_CHECK_HEADERS(sys/quota.h)
+ MOZ_CHECK_HEADERS(linux/quota.h)
+ 
+-AC_ARG_ENABLE(dtrace,
++MOZ_ARG_ENABLE_BOOL(dtrace,
+               [  --enable-dtrace         build with dtrace support if available (default=no)],
+               [enable_dtrace="yes"],)
+ if test "x$enable_dtrace" = "xyes"; then