6 files changed, 106 insertions, 131 deletions

diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 5eed29f9a01e..36941241f69c 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -203,7 +203,7 @@ Gecko_Pre_Include=			bsd.gecko.mk
 #                         version is given by the maintainer via the port 
 #                         or by the user via defined variable try to find 
 #                         the highest stable installed version.
-#                         Available values: yes 10+ 31+ 10 31
+#                         Available values: yes 10+ 11+ 31+ 10 11 31
 #                         NOTE:
 #                         default value 10 is used in case of USE_THUNDERBIRD=yes
 #
@@ -383,11 +383,12 @@ _THUNDERBIRD_BUILD_DEPENDS=		yes
 .endif
 
 _THUNDERBIRD_DEFAULT_VERSION=	10
-_THUNDERBIRD_VERSIONS=			10 31
-_THUNDERBIRD_RANGE_VERSIONS=	10+ 31+
+_THUNDERBIRD_VERSIONS=			10 11 31
+_THUNDERBIRD_RANGE_VERSIONS=	10+ 11+ 31+
 
 # For specifying [31, 30, ..]+
-_THUNDERBIRD_31P=	31 ${_THUNDERBIRD_31P}
+_THUNDERBIRD_31P=	31 ${_THUNDERBIRD_11P}
+_THUNDERBIRD_11P=	11 ${_THUNDERBIRD_10P}
 _THUNDERBIRD_10P=	10
 
 # Set the default Thunderbird version and check if USE_THUNDERBIRD=yes was given
@@ -447,7 +448,8 @@ IGNORE=			cannot install: unknown Thunderbird version: thunderbird-${USE_THUNDER
 .endif
 
 # Dependence lines for different Thunderbird versions
-10_DEPENDS=		${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
+10_DEPENDS=		${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird-esr
+11_DEPENDS=		${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
 31_DEPENDS=		${LOCALBASE}/lib/thunderbird3/thunderbird:${PORTSDIR}/mail/thunderbird3
 
 # Add dependencies
diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile
index de69a509b451..4d80f449e4ea 100644
--- a/mail/thunderbird-i18n/Makefile
+++ b/mail/thunderbird-i18n/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	thunderbird-i18n
-PORTVERSION=	10.0.3
-PORTREVISION=	1
+PORTVERSION=	11.0
 CATEGORIES=	mail
-MASTER_SITE_SUBDIR=	thunderbird/releases/${PORTVERSION}esr/linux-i686/xpi
+MASTER_SITE_SUBDIR=	thunderbird/releases/${PORTVERSION}/linux-i686/xpi
 PKGNAMEPREFIX=
 DISTFILES=	${THUNDERBIRD_I18N_:S/$/.xpi/}
 DIST_SUBDIR=	xpi/${DISTNAME}
@@ -28,7 +27,7 @@ RUN_DEPENDS+=	xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-swit
 .endif
 
 NO_BUILD=	yes
-USE_THUNDERBIRD=	10
+USE_THUNDERBIRD=	11
 USE_XPI=	thunderbird linux-thunderbird
 
 THUNDERBIRD_I18N_ALL=	ar br ca cs da de en-GB en-US es-AR es-ES et eu fi fr \
diff --git a/mail/thunderbird-i18n/distinfo b/mail/thunderbird-i18n/distinfo
index 776c84502dfc..93f69c0bb542 100644
--- a/mail/thunderbird-i18n/distinfo
+++ b/mail/thunderbird-i18n/distinfo
@@ -1,84 +1,84 @@
-SHA256 (xpi/thunderbird-i18n-10.0.3/ar.xpi) = 35cb4a50b24558d44a9473b0a247e7228e9e06c77ccd59398a09bd4e2aa4bcf2
-SIZE (xpi/thunderbird-i18n-10.0.3/ar.xpi) = 441462
-SHA256 (xpi/thunderbird-i18n-10.0.3/br.xpi) = 90986fed08d865c1228565b431a52a144c6ee691f9e84ef791f2a0e06435b4cc
-SIZE (xpi/thunderbird-i18n-10.0.3/br.xpi) = 415523
-SHA256 (xpi/thunderbird-i18n-10.0.3/ca.xpi) = 40dc4bf050f5f94f6f32a8bde6eec69525dbeca29c6c09803174a974018ddd8b
-SIZE (xpi/thunderbird-i18n-10.0.3/ca.xpi) = 416065
-SHA256 (xpi/thunderbird-i18n-10.0.3/cs.xpi) = 38e3e5a0744e1d2af582742cdc78b0264db653f29285ed9c7357f7cefec80676
-SIZE (xpi/thunderbird-i18n-10.0.3/cs.xpi) = 419415
-SHA256 (xpi/thunderbird-i18n-10.0.3/da.xpi) = dc9e5f1e9fb9c20cb2c0bd0688ad0338add337e787251e6f1303709d0df25b79
-SIZE (xpi/thunderbird-i18n-10.0.3/da.xpi) = 363372
-SHA256 (xpi/thunderbird-i18n-10.0.3/de.xpi) = c00b4dd2d236161a7c3d789b6950c6ae8981a3ca98c7aef02184f5d7be7d53a9
-SIZE (xpi/thunderbird-i18n-10.0.3/de.xpi) = 418263
-SHA256 (xpi/thunderbird-i18n-10.0.3/en-GB.xpi) = e005bc85a3dff4f7f49b948e05e316d593ab6bd2032b35ad53e62cb237aace97
-SIZE (xpi/thunderbird-i18n-10.0.3/en-GB.xpi) = 391739
-SHA256 (xpi/thunderbird-i18n-10.0.3/en-US.xpi) = 240f0cb32acd5295d19e9fc384b3a99765930102dfaed5b1f9310a342c420022
-SIZE (xpi/thunderbird-i18n-10.0.3/en-US.xpi) = 391239
-SHA256 (xpi/thunderbird-i18n-10.0.3/es-AR.xpi) = e825057b315c26a6d3762acf7511408ca4adbbdae9c06b2b1f3f66b1e13cef0e
-SIZE (xpi/thunderbird-i18n-10.0.3/es-AR.xpi) = 410723
-SHA256 (xpi/thunderbird-i18n-10.0.3/es-ES.xpi) = 39c0057e14359acdd4355f44ca7d4a2fa5d1594a95f8b0367d3dfbeaedd51c03
-SIZE (xpi/thunderbird-i18n-10.0.3/es-ES.xpi) = 355140
-SHA256 (xpi/thunderbird-i18n-10.0.3/et.xpi) = 22081871d97c4e4017bd7633c8e99c87e89d478d828b8af7ab0fed262be39f65
-SIZE (xpi/thunderbird-i18n-10.0.3/et.xpi) = 410720
-SHA256 (xpi/thunderbird-i18n-10.0.3/eu.xpi) = d184c996c336ecc6ab93c821e8fbc5a69154210e8ee6a44a9824093cf1ec4d6e
-SIZE (xpi/thunderbird-i18n-10.0.3/eu.xpi) = 406383
-SHA256 (xpi/thunderbird-i18n-10.0.3/fi.xpi) = b18c9ee4d136af05a7bc01c47522ba7bf2526859e0475c845d507d76e2f3c160
-SIZE (xpi/thunderbird-i18n-10.0.3/fi.xpi) = 411925
-SHA256 (xpi/thunderbird-i18n-10.0.3/fr.xpi) = 53b23cead071ee75fb9277280ace903a56739ea03ce51a6290f7c24d2c193bd9
-SIZE (xpi/thunderbird-i18n-10.0.3/fr.xpi) = 414745
-SHA256 (xpi/thunderbird-i18n-10.0.3/fy-NL.xpi) = 80e9b13ce9668f9973e3352c692c40175ae931960848a97f4895922d63e35f62
-SIZE (xpi/thunderbird-i18n-10.0.3/fy-NL.xpi) = 413981
-SHA256 (xpi/thunderbird-i18n-10.0.3/ga-IE.xpi) = efea50cfed12ec8d5fd744073479156af6b1a7faddd447dd892a052c270b4211
-SIZE (xpi/thunderbird-i18n-10.0.3/ga-IE.xpi) = 423257
-SHA256 (xpi/thunderbird-i18n-10.0.3/gd.xpi) = 47e67ad2c85b9f018b65d1d1d08f609fcef39d61a287f2e5a4cc8d9e49716c32
-SIZE (xpi/thunderbird-i18n-10.0.3/gd.xpi) = 425871
-SHA256 (xpi/thunderbird-i18n-10.0.3/gl.xpi) = 1851262d60689f70d272cafdaa75d6fa0a34e1c694c0d391f3b420ef232ddfa5
-SIZE (xpi/thunderbird-i18n-10.0.3/gl.xpi) = 409226
-SHA256 (xpi/thunderbird-i18n-10.0.3/he.xpi) = de0f654e12f9576b614b0ed64117fa28f7b7c2f707870308036012683ffd1925
-SIZE (xpi/thunderbird-i18n-10.0.3/he.xpi) = 439203
-SHA256 (xpi/thunderbird-i18n-10.0.3/hu.xpi) = 572807030037168bba5f9d2ac857d303c683105f1fa2ccaf3487f3e4e8d5c950
-SIZE (xpi/thunderbird-i18n-10.0.3/hu.xpi) = 426354
-SHA256 (xpi/thunderbird-i18n-10.0.3/is.xpi) = f5137a07f033cdca54acc326020d2d372196cd79b147986081a09eef32645c82
-SIZE (xpi/thunderbird-i18n-10.0.3/is.xpi) = 412631
-SHA256 (xpi/thunderbird-i18n-10.0.3/it.xpi) = 403b69429ad951529bc46d0beae23ef0724815f3c39290db59d128cd5dd47804
-SIZE (xpi/thunderbird-i18n-10.0.3/it.xpi) = 347630
-SHA256 (xpi/thunderbird-i18n-10.0.3/ja.xpi) = f0300add69719084fdca5112068fbf208b1b570f366b7e22159aa8b3bea58926
-SIZE (xpi/thunderbird-i18n-10.0.3/ja.xpi) = 459027
-SHA256 (xpi/thunderbird-i18n-10.0.3/ko.xpi) = 802fb0df904c074e436de03e0b1418feab512995b4310c8d8391f3c7257f1815
-SIZE (xpi/thunderbird-i18n-10.0.3/ko.xpi) = 372009
-SHA256 (xpi/thunderbird-i18n-10.0.3/lt.xpi) = a76b1b20c92b22d0a8fa63f7ac8a890283d3861b17a75f910f58f91e9e71f93c
-SIZE (xpi/thunderbird-i18n-10.0.3/lt.xpi) = 531018
-SHA256 (xpi/thunderbird-i18n-10.0.3/nb-NO.xpi) = 98256461574f7aa06199500afd48a0700e5dd76072d0f175d5346f763dfd329b
-SIZE (xpi/thunderbird-i18n-10.0.3/nb-NO.xpi) = 407726
-SHA256 (xpi/thunderbird-i18n-10.0.3/nl.xpi) = 81cf4c679fda285400ba2ed8043a546132acd50b82863de15312a66eb72b2d6e
-SIZE (xpi/thunderbird-i18n-10.0.3/nl.xpi) = 407981
-SHA256 (xpi/thunderbird-i18n-10.0.3/nn-NO.xpi) = dd4ccb6e3a3660e9ef3e331a953ca2e96ff12ade94d7ddff024595b3a2702d2f
-SIZE (xpi/thunderbird-i18n-10.0.3/nn-NO.xpi) = 409455
-SHA256 (xpi/thunderbird-i18n-10.0.3/pl.xpi) = 07810903b8aa75d0378f8a3a790b6fe8097952a2b0e239b9033e58fccc2b68d3
-SIZE (xpi/thunderbird-i18n-10.0.3/pl.xpi) = 393574
-SHA256 (xpi/thunderbird-i18n-10.0.3/pt-BR.xpi) = 781061abb5bb55ed5b49b6b659c560830d191f36eeb052420b91287d1cc77e64
-SIZE (xpi/thunderbird-i18n-10.0.3/pt-BR.xpi) = 417225
-SHA256 (xpi/thunderbird-i18n-10.0.3/pt-PT.xpi) = aa0425c45464ecfc94c5912a5020760e37f235c5ff8657c0375087c6232054ce
-SIZE (xpi/thunderbird-i18n-10.0.3/pt-PT.xpi) = 414262
-SHA256 (xpi/thunderbird-i18n-10.0.3/rm.xpi) = 1ba0594b7029d4c9b2b239cc52d6bc3b861cf5c20d02dd2d17046b924d647fee
-SIZE (xpi/thunderbird-i18n-10.0.3/rm.xpi) = 414704
-SHA256 (xpi/thunderbird-i18n-10.0.3/ru.xpi) = ec610eac0811a68b0dbc1014915ffe2f2eef6db1ac1680683c1e2a6b5127ac59
-SIZE (xpi/thunderbird-i18n-10.0.3/ru.xpi) = 411631
-SHA256 (xpi/thunderbird-i18n-10.0.3/si.xpi) = 0e0bfa36032aefd3a391d0388e1f90eddc14957112189132045b476ec5dcb58d
-SIZE (xpi/thunderbird-i18n-10.0.3/si.xpi) = 456604
-SHA256 (xpi/thunderbird-i18n-10.0.3/sk.xpi) = 4ead646b5aead9d4478c7340c6daf49ffcf82a8b134dbf7286e131e9297a0cca
-SIZE (xpi/thunderbird-i18n-10.0.3/sk.xpi) = 425026
-SHA256 (xpi/thunderbird-i18n-10.0.3/sl.xpi) = a32141c4df379da4ba6f408d05e384590088f5d51e3bd5a092a246663a1aa0cd
-SIZE (xpi/thunderbird-i18n-10.0.3/sl.xpi) = 410428
-SHA256 (xpi/thunderbird-i18n-10.0.3/sq.xpi) = a74763ebaf9572e8916ef4251540fc9626a9c29b4269b9cfa61e9b13fca02194
-SIZE (xpi/thunderbird-i18n-10.0.3/sq.xpi) = 360476
-SHA256 (xpi/thunderbird-i18n-10.0.3/sv-SE.xpi) = 6665a49e1d1fce0676f1d9b68d13c2db10457c7e1b73fa8b9f2f729ddb9d175e
-SIZE (xpi/thunderbird-i18n-10.0.3/sv-SE.xpi) = 478278
-SHA256 (xpi/thunderbird-i18n-10.0.3/ta-LK.xpi) = 2ed073ee939f6f85fcccf064d7d71a4838b713dc5fe3b54254369e797c4e495d
-SIZE (xpi/thunderbird-i18n-10.0.3/ta-LK.xpi) = 475715
-SHA256 (xpi/thunderbird-i18n-10.0.3/tr.xpi) = 96ed93aea3ea42ad1aeef8fc30f3b54a5b2efb4b219a35959864231e510e64cb
-SIZE (xpi/thunderbird-i18n-10.0.3/tr.xpi) = 418206
-SHA256 (xpi/thunderbird-i18n-10.0.3/uk.xpi) = 8ab1d49cc57f3f367e94852e4ef78fdb08471dad89bcc59e005a6ba1cba9dcaf
-SIZE (xpi/thunderbird-i18n-10.0.3/uk.xpi) = 463922
-SHA256 (xpi/thunderbird-i18n-10.0.3/zh-TW.xpi) = bc6f06aa0bedf72f326a9f525f17c0828fb7569ccf45d891487f189c4d1d5a8e
-SIZE (xpi/thunderbird-i18n-10.0.3/zh-TW.xpi) = 431824
+SHA256 (xpi/thunderbird-i18n-11.0/ar.xpi) = 30fa17d2c6237d22670466dc21c7b1c01370fe98e9a48c385affc87c168110a6
+SIZE (xpi/thunderbird-i18n-11.0/ar.xpi) = 441216
+SHA256 (xpi/thunderbird-i18n-11.0/br.xpi) = 0cf0ed995520a60a36e6fa8117836d89de25340dff8d1bbc9477df946078fa69
+SIZE (xpi/thunderbird-i18n-11.0/br.xpi) = 414897
+SHA256 (xpi/thunderbird-i18n-11.0/ca.xpi) = 2951e0e8cd2c1251528089e95c85b2972e550be161cbfce434b08d753c4a4386
+SIZE (xpi/thunderbird-i18n-11.0/ca.xpi) = 415451
+SHA256 (xpi/thunderbird-i18n-11.0/cs.xpi) = 79615e66683b4a048c7c5bf4520b9e8b85a432f40101f5f05daa051fae4439ea
+SIZE (xpi/thunderbird-i18n-11.0/cs.xpi) = 418864
+SHA256 (xpi/thunderbird-i18n-11.0/da.xpi) = 0ae1f7c84f6ba471bab6129652eff2c8ae78de122f2ab9292ce52270449b9e39
+SIZE (xpi/thunderbird-i18n-11.0/da.xpi) = 362834
+SHA256 (xpi/thunderbird-i18n-11.0/de.xpi) = 759760e6db3eca027683f70fdd8454f72c7ea091ba37a27438809b9368a8d3db
+SIZE (xpi/thunderbird-i18n-11.0/de.xpi) = 417768
+SHA256 (xpi/thunderbird-i18n-11.0/en-GB.xpi) = f43973cc2f806e9f7b5d199d22fe26d5bebdae45c02c92f58d8199d772265a22
+SIZE (xpi/thunderbird-i18n-11.0/en-GB.xpi) = 391086
+SHA256 (xpi/thunderbird-i18n-11.0/en-US.xpi) = 13c11789bcde98a57ac68ee2a6a632ef797e0c5793f92eda313b02118185f0c3
+SIZE (xpi/thunderbird-i18n-11.0/en-US.xpi) = 390610
+SHA256 (xpi/thunderbird-i18n-11.0/es-AR.xpi) = 3879c2e188b9ccd04a302fe1d8ff901c235eb4c885b4766bfd0bcf951df701bd
+SIZE (xpi/thunderbird-i18n-11.0/es-AR.xpi) = 410204
+SHA256 (xpi/thunderbird-i18n-11.0/es-ES.xpi) = 2e0e8a3377b58538804aa98c4159ecad75b4a006c2df6d9bc6d78205b7470a8b
+SIZE (xpi/thunderbird-i18n-11.0/es-ES.xpi) = 354876
+SHA256 (xpi/thunderbird-i18n-11.0/et.xpi) = 61dbefbd6f3dc59dca5639b4b9cb83ece1d3c45769520718adf0b356be0f2133
+SIZE (xpi/thunderbird-i18n-11.0/et.xpi) = 410223
+SHA256 (xpi/thunderbird-i18n-11.0/eu.xpi) = 0272817e7b231c9456ccc94750c37f408e4a89195d38b80dd744517d3e0ff260
+SIZE (xpi/thunderbird-i18n-11.0/eu.xpi) = 405865
+SHA256 (xpi/thunderbird-i18n-11.0/fi.xpi) = 6c8ad91726ff2f545749a1c8a5bce75d918c9b6fa5a293018231dcea735e8739
+SIZE (xpi/thunderbird-i18n-11.0/fi.xpi) = 411324
+SHA256 (xpi/thunderbird-i18n-11.0/fr.xpi) = d07eb1db47b87cd666539010899393f6ff00ac91939ad600b0f1c0f2c3cd4b6f
+SIZE (xpi/thunderbird-i18n-11.0/fr.xpi) = 414191
+SHA256 (xpi/thunderbird-i18n-11.0/fy-NL.xpi) = bcb12c629b1cbbc81db3307cde76c76029a6f03f96ac3aebb7608a6acbe6d698
+SIZE (xpi/thunderbird-i18n-11.0/fy-NL.xpi) = 413332
+SHA256 (xpi/thunderbird-i18n-11.0/ga-IE.xpi) = f858fbb1a58ef828f445660552b9abe142a4885118f1782025f65b538633eead
+SIZE (xpi/thunderbird-i18n-11.0/ga-IE.xpi) = 422574
+SHA256 (xpi/thunderbird-i18n-11.0/gd.xpi) = fcded3e20deb4f21d5d1001a69b5d882ec5e2ee4a21810752a6e5fcb5d88ac25
+SIZE (xpi/thunderbird-i18n-11.0/gd.xpi) = 425357
+SHA256 (xpi/thunderbird-i18n-11.0/gl.xpi) = f12d7e46088619db56568603ec26096432ca689d24934a9763b91e6c486d2aa0
+SIZE (xpi/thunderbird-i18n-11.0/gl.xpi) = 408702
+SHA256 (xpi/thunderbird-i18n-11.0/he.xpi) = 38b38c6322526d5e2d814e05d96efeac779c998e6e1e346debf1801f22c75654
+SIZE (xpi/thunderbird-i18n-11.0/he.xpi) = 439646
+SHA256 (xpi/thunderbird-i18n-11.0/hu.xpi) = 888b6a86cb313212a855b66feb1d85668ea24d446723f093f24079b2faa6d0c6
+SIZE (xpi/thunderbird-i18n-11.0/hu.xpi) = 425843
+SHA256 (xpi/thunderbird-i18n-11.0/is.xpi) = 3eaa4ae210fe7a0fa57fa6884ad7431f9aeaa9f04a35c2e9a8c57245e5d0a4de
+SIZE (xpi/thunderbird-i18n-11.0/is.xpi) = 412048
+SHA256 (xpi/thunderbird-i18n-11.0/it.xpi) = 39f108186b539c9fe67e5a5dce877476270d0fc0749f467fe1b4f0f85f41ce0b
+SIZE (xpi/thunderbird-i18n-11.0/it.xpi) = 347267
+SHA256 (xpi/thunderbird-i18n-11.0/ja.xpi) = a904627857600e4d2b25502908fe136423b915628c52e355bda0db16c859f4d0
+SIZE (xpi/thunderbird-i18n-11.0/ja.xpi) = 458649
+SHA256 (xpi/thunderbird-i18n-11.0/ko.xpi) = 5dc96ffc093abcf760592a80f8aa73b3a001d799576896e4b3c0e14900760912
+SIZE (xpi/thunderbird-i18n-11.0/ko.xpi) = 371463
+SHA256 (xpi/thunderbird-i18n-11.0/lt.xpi) = d48384a87bbca0b3de275cc6c54b0f2624b3e0d1904708a331e0df8e2a609474
+SIZE (xpi/thunderbird-i18n-11.0/lt.xpi) = 520217
+SHA256 (xpi/thunderbird-i18n-11.0/nb-NO.xpi) = e32b9741cdfe4a586f6e23b956d7a127ddedaa88db4aa67bd5b0047006873e87
+SIZE (xpi/thunderbird-i18n-11.0/nb-NO.xpi) = 407148
+SHA256 (xpi/thunderbird-i18n-11.0/nl.xpi) = 4bda863bb5b79979fc1bcc8dc75ad0b2b4b29632b13bc27e1a42e2a80bc8d99d
+SIZE (xpi/thunderbird-i18n-11.0/nl.xpi) = 407421
+SHA256 (xpi/thunderbird-i18n-11.0/nn-NO.xpi) = 629623760abf73ab4bd5272d089ab08517618db316667247393663d47f9323ed
+SIZE (xpi/thunderbird-i18n-11.0/nn-NO.xpi) = 408835
+SHA256 (xpi/thunderbird-i18n-11.0/pl.xpi) = d530bb9a048f71f48f9be322a52dc5f35ba4c233eccfaf31f60ea2f66a48bb14
+SIZE (xpi/thunderbird-i18n-11.0/pl.xpi) = 393412
+SHA256 (xpi/thunderbird-i18n-11.0/pt-BR.xpi) = 078221b6da7fc79bc39a7ade1d31eda6435d0bcc9f8d4ef7033b5df489b69214
+SIZE (xpi/thunderbird-i18n-11.0/pt-BR.xpi) = 416624
+SHA256 (xpi/thunderbird-i18n-11.0/pt-PT.xpi) = a604e5e7f77b209d1af01c74649f6a8390f9e61a7986312659cad5d08646c6be
+SIZE (xpi/thunderbird-i18n-11.0/pt-PT.xpi) = 413732
+SHA256 (xpi/thunderbird-i18n-11.0/rm.xpi) = 9662fec1b1e58eff143d61ef91a1706763373723661c48efad9e1c2972607147
+SIZE (xpi/thunderbird-i18n-11.0/rm.xpi) = 414161
+SHA256 (xpi/thunderbird-i18n-11.0/ru.xpi) = abd06f0beb71a45603ef4321ed4a7393410e047c52c713a63cf1a654ffe147eb
+SIZE (xpi/thunderbird-i18n-11.0/ru.xpi) = 411328
+SHA256 (xpi/thunderbird-i18n-11.0/si.xpi) = afd28b8ca86b7b8fd3796b68932ee5f68aa803916af47633418b5f5385f66123
+SIZE (xpi/thunderbird-i18n-11.0/si.xpi) = 456006
+SHA256 (xpi/thunderbird-i18n-11.0/sk.xpi) = 46caacfc76e96f814251c801cc117d1a43766369e2520c211607fe6fbe13b935
+SIZE (xpi/thunderbird-i18n-11.0/sk.xpi) = 424698
+SHA256 (xpi/thunderbird-i18n-11.0/sl.xpi) = efa367daf15a1d3352629cc656f006412b50c52c4a1f497150addc76197f2c82
+SIZE (xpi/thunderbird-i18n-11.0/sl.xpi) = 409944
+SHA256 (xpi/thunderbird-i18n-11.0/sq.xpi) = 94b7dd81af38e3043e73cb56b821d3df586cad3c2c58a906f4868e72be12e8fe
+SIZE (xpi/thunderbird-i18n-11.0/sq.xpi) = 360001
+SHA256 (xpi/thunderbird-i18n-11.0/sv-SE.xpi) = 7a9a0f7df6a0addabdedd775c69b7296865ac62824cdf53ab33bdd3e1bc6addd
+SIZE (xpi/thunderbird-i18n-11.0/sv-SE.xpi) = 477713
+SHA256 (xpi/thunderbird-i18n-11.0/ta-LK.xpi) = c0870ffd0cdb7e4e61c73362bd04ea39816d89213e2a32b81f7338fef44fc5f4
+SIZE (xpi/thunderbird-i18n-11.0/ta-LK.xpi) = 475122
+SHA256 (xpi/thunderbird-i18n-11.0/tr.xpi) = 87436b9d99af437e4641ad7a72b866c96e727cdef7b8bc560f6526c73c52d1cb
+SIZE (xpi/thunderbird-i18n-11.0/tr.xpi) = 417468
+SHA256 (xpi/thunderbird-i18n-11.0/uk.xpi) = 3794a9203aaf0d0d8560af4ca6660cd161813d1b9f419f6ca6f94bc888bffbd6
+SIZE (xpi/thunderbird-i18n-11.0/uk.xpi) = 463179
+SHA256 (xpi/thunderbird-i18n-11.0/zh-TW.xpi) = 38341b2457744a81a6d31fb727e8d47bee58aca594e27a5d645fadddc76706af
+SIZE (xpi/thunderbird-i18n-11.0/zh-TW.xpi) = 431214
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index f7e26865bc36..b73bd5200437 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	10.0.3
+DISTVERSION=	11.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}esr/source
-DISTNAME=	${PORTNAME}-${DISTVERSION}esr.source
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
+DISTNAME=	${PORTNAME}-${DISTVERSION}.source
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
@@ -25,6 +25,7 @@ CONFLICTS_BUILD=	spidermonkey-*
 
 USE_AUTOTOOLS=	autoconf213
 USE_GECKO=	gecko
+CONFLICTS=	thunderbird-10.*
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
 MOZ_TOOLKIT=	cairo-gtk2
 
@@ -60,7 +61,7 @@ OPTIONS=	LIGHTNING	"Enable calendar extension" off
 
 .include <bsd.port.pre.mk>
 
-WRKSRC=		${WRKDIR}/comm-esr10
+WRKSRC=		${WRKDIR}/comm-release
 MOZSRC:=	${WRKSRC}/mozilla
 
 .if ${ARCH} == powerpc64
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 6d3678e448a8..de03568a2baf 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-10.0.3esr.source.tar.bz2) = 297d8b5992007e2ba112a5796ca4468ea48ec2304930676ae173234035eff134
-SIZE (thunderbird-10.0.3esr.source.tar.bz2) = 97709099
+SHA256 (thunderbird-11.0.source.tar.bz2) = 5a581cd677e718b9917fabeb080ad3488fbb3ba2c085b0530527da119f3d3753
+SIZE (thunderbird-11.0.source.tar.bz2) = 101442328
diff --git a/mail/thunderbird/files/patch-mozilla-js-src-configure.in b/mail/thunderbird/files/patch-mozilla-js-src-configure.in
index 32d7d18a0aa0..75344541bb15 100644
--- a/mail/thunderbird/files/patch-mozilla-js-src-configure.in
+++ b/mail/thunderbird/files/patch-mozilla-js-src-configure.in
@@ -1,6 +1,6 @@
---- mozilla/js/src/configure.in.orig	2012-01-29 15:44:24.000000000 +0100
-+++ mozilla/js/src/configure.in	2012-01-30 23:37:46.541060008 +0100
-@@ -1410,7 +1410,7 @@
+--- mozilla/js/src/configure.in.orig	2012-02-22 17:06:28.000000000 +0100
++++ mozilla/js/src/configure.in	2012-03-07 21:03:11.000000000 +0100
+@@ -1470,7 +1470,7 @@
      CPU_ARCH=sparc
      ;;
  
@@ -9,7 +9,7 @@
      CPU_ARCH="$OS_TEST"
      ;;
  
-@@ -1432,7 +1432,7 @@
+@@ -1492,7 +1492,7 @@
  dnl ===============================================================
  INTEL_ARCHITECTURE=
  case "$OS_TEST" in
@@ -18,7 +18,7 @@
        INTEL_ARCHITECTURE=1
  esac
  
-@@ -2713,6 +2713,16 @@
+@@ -2814,6 +2814,16 @@
      AC_DEFINE(JS_CPU_X86)
      AC_DEFINE(JS_NUNBOX32)
      ;;
@@ -33,32 +33,5 @@
 +    AC_DEFINE(JS_PUNBOX64)
 +    ;;
  x86_64*-*)
-     NANOJIT_ARCH=X64
-     ENABLE_METHODJIT=1
-@@ -2732,6 +2742,7 @@
-     AC_DEFINE(JS_NUNBOX32)
-     ;;
- sparc*-*)
-+    if test ! "$HAVE_64BIT_OS" ; then
-     NANOJIT_ARCH=Sparc
      ENABLE_METHODJIT=1
      ENABLE_MONOIC=1
-@@ -2739,6 +2750,7 @@
-     ENABLE_METHODJIT_TYPED_ARRAY=1
-     AC_DEFINE(JS_CPU_SPARC)
-     AC_DEFINE(JS_NUNBOX32)
-+    fi
-     ;;
- esac
- 
-@@ -2795,6 +2807,10 @@
- i?86-*)
-     AC_DEFINE(AVMPLUS_IA32)
-     ;;
-+amd64*-*)
-+    AC_DEFINE(AVMPLUS_AMD64)
-+    AC_DEFINE(AVMPLUS_64BIT)
-+    ;;
- x86_64*-*)
-     AC_DEFINE(AVMPLUS_AMD64)
-     AC_DEFINE(AVMPLUS_64BIT)