- 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
author: jbeich <jbeich@FreeBSD.org> 2015-02-27 22:42:51 +0800
committer: jbeich <jbeich@FreeBSD.org> 2015-02-27 22:42:51 +0800
commit: 9d4d23a9f1ac52b5a5e0d199da5184497aa13292 (patch)
tree: 87818ee8a7843c06fbfd36d7cfd6ceb05961d08b
parent: 7cf4036fb6cdcda2652a87eda83e415d0c87e19b (diff)
download: freebsd-ports-gnome-9d4d23a9f1ac52b5a5e0d199da5184497aa13292.tar.gz
freebsd-ports-gnome-9d4d23a9f1ac52b5a5e0d199da5184497aa13292.tar.zst
freebsd-ports-gnome-9d4d23a9f1ac52b5a5e0d199da5184497aa13292.zip
48 files changed, 781 insertions, 1934 deletions
diff --git a/Mk/Uses/gecko.mk b/Mk/Uses/gecko.mk
index 4aed4b369e3d..c18d240625b0 100644
--- a/Mk/Uses/gecko.mk
+++ b/Mk/Uses/gecko.mk
@@ -37,12 +37,12 @@ RUN_DEPENDS+=	libxul>=31:${PORTSDIR}/www/libxul
 .elif ${gecko_ARGS:Mfirefox}
 
 _GECKO_DEFAULT_VERSION=	31
-_GECKO_VERSIONS=		31 35
+_GECKO_VERSIONS=		31 36
 _GECKO_TYPE=	firefox
 
 # Dependence lines for different Firefox versions
 31_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
-35_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
+36_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
 
 .if exists(${LOCALBASE}/bin/firefox)
 _GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null
@@ -51,8 +51,8 @@ _GECKO_INSTALLED_VER:=	${_GECKO_INSTALLED_VER:M[0-9][0-9]*:C/([0-9][0-9]).*/\1/g
 
 .elif ${gecko_ARGS:Mseamonkey}
 
-_GECKO_DEFAULT_VERSION=	32
-_GECKO_VERSIONS=		32
+_GECKO_DEFAULT_VERSION=	33
+_GECKO_VERSIONS=		33
 _GECKO_TYPE=	seamonkey
 
 .if exists(${LOCALBASE}/bin/seamonkey)
@@ -61,7 +61,7 @@ _GECKO_INSTALLED_VER:=	${_GECKO_INSTALLED_VER:M[0-9]*:C/[0-9].([0-9][0-9]).*/\1/
 .endif
 
 # Dependence lines for different Seamonkey versions
-32_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
+33_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
 
 .elif ${gecko_ARGS:Mthunderbird}
 
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 863e4a5edb3f..4519ae5c8407 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -146,7 +146,7 @@ event_MOZ_OPTIONS=	--with-system-libevent
 ffi_LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
 ffi_MOZ_OPTIONS=	--enable-system-ffi
 
-.if exists(${FILESDIR}/patch-bug847568) || exists(${FILESDIR}/patch-z-bug847568)
+.if exists(${FILESDIR}/patch-bug847568)
 graphite_LIB_DEPENDS=	libgraphite2.so:${PORTSDIR}/graphics/graphite2
 graphite_MOZ_OPTIONS=	--with-system-graphite2
 
@@ -172,7 +172,7 @@ nspr_MOZ_OPTIONS=	--with-system-nspr
 nss_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
 nss_MOZ_OPTIONS=	--with-system-nss
 
-.if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422)
+.if exists(${FILESDIR}/patch-z-bug517422)
 opus_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
 opus_MOZ_OPTIONS=	--with-system-opus
 .endif
@@ -183,7 +183,7 @@ pixman_MOZ_OPTIONS=	--enable-system-pixman
 png_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 png_MOZ_OPTIONS=	--with-system-png=${LOCALBASE}
 
-.if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422)
+.if exists(${FILESDIR}/patch-z-bug517422)
 soundtouch_LIB_DEPENDS=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch
 soundtouch_MOZ_OPTIONS=	--with-system-soundtouch
 
@@ -195,7 +195,7 @@ speex_MOZ_OPTIONS=	--with-system-speex
 sqlite_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
 sqlite_MOZ_OPTIONS=	--enable-system-sqlite
 
-.if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422)
+.if exists(${FILESDIR}/patch-z-bug517422)
 # XXX disabled: update to 1.2.x or review backported fixes
 theora_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
 theora_MOZ_OPTIONS=	--with-system-theora
diff --git a/mail/linux-thunderbird/Makefile b/mail/linux-thunderbird/Makefile
index 8bda5c5eb75c..e3b4f7dd70ec 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 6e2b3c6f9cdf..f2985343f6e8 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 f5b9b1ca66fd..2b735fb9ea6e 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 3b0619da43da..9b94cee5701a 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 a6ffab6b53a3..681e7e1d5e67 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 f43f67554798..932be4364649 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 441cf005574b..b071d087570c 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 7cfbf340aebc..000000000000
--- 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 32241fdfe270..06adabf4e833 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;
diff --git a/www/firefox-esr-i18n/Makefile b/www/firefox-esr-i18n/Makefile
index 1876bc066315..e7df5711e580 100644
--- a/www/firefox-esr-i18n/Makefile
+++ b/www/firefox-esr-i18n/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-PORTVERSION=	31.4.0
+PORTVERSION=	31.5.0
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}esr/linux-i686/xpi
 PKGNAMEPREFIX=
diff --git a/www/firefox-esr-i18n/distinfo b/www/firefox-esr-i18n/distinfo
index a8f347b14a65..0fdf1b2098ad 100644
--- a/www/firefox-esr-i18n/distinfo
+++ b/www/firefox-esr-i18n/distinfo
@@ -1,178 +1,178 @@
-SHA256 (xpi/firefox-31.4.0/ach.xpi) = eaf510e73f33ad3fd49721d0719af7af12ce2c6a098c73acb1f2e93c5c121245
-SIZE (xpi/firefox-31.4.0/ach.xpi) = 445326
-SHA256 (xpi/firefox-31.4.0/af.xpi) = 34a5f759cd26ccb76cb1031dbdeec3b515d8ce2da9222eae38b0c661bc074db5
-SIZE (xpi/firefox-31.4.0/af.xpi) = 431089
-SHA256 (xpi/firefox-31.4.0/an.xpi) = fbd7d57eca4a3d4e9b72308e80968b1a10f918b3a700d4f090e8695ff5e7af2f
-SIZE (xpi/firefox-31.4.0/an.xpi) = 407150
-SHA256 (xpi/firefox-31.4.0/ar.xpi) = 2b5485dc797ac8fb1c32f507a75320250ab6b75a9eb49cb921d2f25b33a62e19
-SIZE (xpi/firefox-31.4.0/ar.xpi) = 459824
-SHA256 (xpi/firefox-31.4.0/as.xpi) = 82e3ab2e0e1757122918d8791f1f047c89b926f0a5cf83630bc968d5fce0478e
-SIZE (xpi/firefox-31.4.0/as.xpi) = 448568
-SHA256 (xpi/firefox-31.4.0/ast.xpi) = 9c664b96c48a3e6f81332fc5ea48d924385ff62625f1c919202190dc1ef10b0f
-SIZE (xpi/firefox-31.4.0/ast.xpi) = 352341
-SHA256 (xpi/firefox-31.4.0/be.xpi) = 333fc40ffe93242e0b95d12189a92909357255cf8e219d533427b811e2eb486b
-SIZE (xpi/firefox-31.4.0/be.xpi) = 378668
-SHA256 (xpi/firefox-31.4.0/bg.xpi) = bcd996534b770549fd63eb3dbf2095f6bd529089f14a63b6122dcc79b182ccad
-SIZE (xpi/firefox-31.4.0/bg.xpi) = 438060
-SHA256 (xpi/firefox-31.4.0/bn-BD.xpi) = 32917acf9307d65b36812c8eeea6d37bf57410a99bae9a0d7493b71796cf60e2
-SIZE (xpi/firefox-31.4.0/bn-BD.xpi) = 472626
-SHA256 (xpi/firefox-31.4.0/bn-IN.xpi) = ba061044a27ec45abe9d758ef0b2ef9bb2ec9235129312e5cf87af8b9e3a4caf
-SIZE (xpi/firefox-31.4.0/bn-IN.xpi) = 462593
-SHA256 (xpi/firefox-31.4.0/br.xpi) = 06eec86c4d63ab6c24f7b9d4d60737c47f44196140eb4abeae819101db4a3d63
-SIZE (xpi/firefox-31.4.0/br.xpi) = 389704
-SHA256 (xpi/firefox-31.4.0/bs.xpi) = ba1e18761c4bd7345ed6123e5294c5a989a0d3038583197387e2751a08f8af4f
-SIZE (xpi/firefox-31.4.0/bs.xpi) = 429014
-SHA256 (xpi/firefox-31.4.0/ca.xpi) = 8bf21f315464405dc1637bcf242039c58e699920ae5f7b0381ff7408d65578c5
-SIZE (xpi/firefox-31.4.0/ca.xpi) = 403575
-SHA256 (xpi/firefox-31.4.0/cs.xpi) = c6169462993492a9241a29ce7cf540be7eb1bbb3673e3a5aec4b9864941571e8
-SIZE (xpi/firefox-31.4.0/cs.xpi) = 390978
-SHA256 (xpi/firefox-31.4.0/csb.xpi) = a953c8819c530cae9e6da1e9dd92df2b98e9a750a2eb09edce0f807ff960fa54
-SIZE (xpi/firefox-31.4.0/csb.xpi) = 383695
-SHA256 (xpi/firefox-31.4.0/cy.xpi) = 1f7989a40d0188a09828c6a555437b54a511d187dba68a92b0b72f8566117437
-SIZE (xpi/firefox-31.4.0/cy.xpi) = 390727
-SHA256 (xpi/firefox-31.4.0/da.xpi) = 9cd79d770c885189f412bd7baf10e9bd4d6701aae7b88635b085b14ef05d6603
-SIZE (xpi/firefox-31.4.0/da.xpi) = 397746
-SHA256 (xpi/firefox-31.4.0/de.xpi) = e665b67984419485d1cba9a9107004202fd2d9982cefc3dff9b462cdc003fc0e
-SIZE (xpi/firefox-31.4.0/de.xpi) = 395164
-SHA256 (xpi/firefox-31.4.0/el.xpi) = 860ba409522d5d4b4b143970111792f44cc93b8fcd27c02b91cae319ef08cc8f
-SIZE (xpi/firefox-31.4.0/el.xpi) = 442982
-SHA256 (xpi/firefox-31.4.0/en-GB.xpi) = e25f6614fee9063bf579da05dd09be43f1d5bc7fa0909e90e1547515cd7a767f
-SIZE (xpi/firefox-31.4.0/en-GB.xpi) = 390118
-SHA256 (xpi/firefox-31.4.0/en-US.xpi) = 5f0e3e05ae6e1775b84a6132df791e7802063d4500c550207506bce76bc585fb
-SIZE (xpi/firefox-31.4.0/en-US.xpi) = 422787
-SHA256 (xpi/firefox-31.4.0/en-ZA.xpi) = 7ac9fa92955e8a2eaf75df49c746f39503a803497d238115e821cf2ac01470bc
-SIZE (xpi/firefox-31.4.0/en-ZA.xpi) = 388528
-SHA256 (xpi/firefox-31.4.0/eo.xpi) = 140a9f23ed9b16c635c425784b0d2841389595ce04d46e720991dcb782eeacd2
-SIZE (xpi/firefox-31.4.0/eo.xpi) = 431831
-SHA256 (xpi/firefox-31.4.0/es-AR.xpi) = 7a56a6511bb7376e69517acd4756433a94810e7bc8aa29a437b1a30e06a0196e
-SIZE (xpi/firefox-31.4.0/es-AR.xpi) = 399937
-SHA256 (xpi/firefox-31.4.0/es-CL.xpi) = 2f35d2f6dc142b17c0a4dbdcbc25306987e1c96b414552ffa4dea5cd9e889f18
-SIZE (xpi/firefox-31.4.0/es-CL.xpi) = 342807
-SHA256 (xpi/firefox-31.4.0/es-ES.xpi) = 874cc019780ed64f6fe26f4a4610c7bfabce00d34828086f5a432b00009be76d
-SIZE (xpi/firefox-31.4.0/es-ES.xpi) = 335880
-SHA256 (xpi/firefox-31.4.0/es-MX.xpi) = ed7048153c6d29758a7d2babd4ce35acf6b294b44f4965fa702311f3877b4f35
-SIZE (xpi/firefox-31.4.0/es-MX.xpi) = 402672
-SHA256 (xpi/firefox-31.4.0/et.xpi) = 17b4970b804ff9197f7bbca7e0b2635e5ecabee36c683f1f47e83e60fcc37dae
-SIZE (xpi/firefox-31.4.0/et.xpi) = 390360
-SHA256 (xpi/firefox-31.4.0/eu.xpi) = 3e887cc4f1a6c738c44fcdb24333d5c8e24bf8db15b6cfa45cfc8cce1cb6dd7c
-SIZE (xpi/firefox-31.4.0/eu.xpi) = 412999
-SHA256 (xpi/firefox-31.4.0/fa.xpi) = 5ba57b2765304f4131a9ec5e4bfa6251ddd5457d548faae629506e3a1ee04f3b
-SIZE (xpi/firefox-31.4.0/fa.xpi) = 460857
-SHA256 (xpi/firefox-31.4.0/ff.xpi) = c1b9a05135b5146f72b48bafdd75c990fd127713d6ee2ca084993a3794524484
-SIZE (xpi/firefox-31.4.0/ff.xpi) = 400143
-SHA256 (xpi/firefox-31.4.0/fi.xpi) = 3abceaefeca0740fdd6f4d491ad526d66d33ee2f77fe357b85a140281a58c86e
-SIZE (xpi/firefox-31.4.0/fi.xpi) = 392739
-SHA256 (xpi/firefox-31.4.0/fr.xpi) = 5f97738be7748ee58bb7cd89dd1a4383980942a75f5c81a0f5c8aef7a17cb977
-SIZE (xpi/firefox-31.4.0/fr.xpi) = 406462
-SHA256 (xpi/firefox-31.4.0/fy-NL.xpi) = 21d35be7f279d49a140f810661bc6ef9527d79af8aee2fe2c9913fe3444e92e7
-SIZE (xpi/firefox-31.4.0/fy-NL.xpi) = 401930
-SHA256 (xpi/firefox-31.4.0/ga-IE.xpi) = 5c4c1c8531cba4c8e8962a0d3a892cc8fcd5d0005454d066dba6061bac5c04cc
-SIZE (xpi/firefox-31.4.0/ga-IE.xpi) = 410077
-SHA256 (xpi/firefox-31.4.0/gd.xpi) = 307042204493f3410c4e06bc7e3df3502601b6c231ce1d690ae7c6c7cd822518
-SIZE (xpi/firefox-31.4.0/gd.xpi) = 403013
-SHA256 (xpi/firefox-31.4.0/gl.xpi) = b7ec758f0f7bb41d4aa4d99a5cec824a2cc6e9b5670993776fb54b658ee4367e
-SIZE (xpi/firefox-31.4.0/gl.xpi) = 390599
-SHA256 (xpi/firefox-31.4.0/gu-IN.xpi) = 2700cb21e08d9e5202f865cd3862aec4ea1d7e0b0eeeef4fc0704d1b16212fe2
-SIZE (xpi/firefox-31.4.0/gu-IN.xpi) = 423503
-SHA256 (xpi/firefox-31.4.0/he.xpi) = f79e2044152c07d89b3ea5ac6af5f3b945c013abf5d06d260afe78b6a5dfa982
-SIZE (xpi/firefox-31.4.0/he.xpi) = 427629
-SHA256 (xpi/firefox-31.4.0/hi-IN.xpi) = d31ced4c55ef36dc2c95289672e3be51c6f355fd01cb397ab7a1ad077ab924ed
-SIZE (xpi/firefox-31.4.0/hi-IN.xpi) = 441402
-SHA256 (xpi/firefox-31.4.0/hr.xpi) = 2d9e8788031f34820f2f14732d120f7394696be7e32de2fd9a3f51f7e59e277b
-SIZE (xpi/firefox-31.4.0/hr.xpi) = 424371
-SHA256 (xpi/firefox-31.4.0/hsb.xpi) = 64114e8edc46d8bb6ef198b864fa5d09dcc2b308b330f1d9f735af04a66733c6
-SIZE (xpi/firefox-31.4.0/hsb.xpi) = 413076
-SHA256 (xpi/firefox-31.4.0/hu.xpi) = 6e0383b7f7ec4d347e500dcb2471e8eb0a46e957899748df67c9580c18eaa0c5
-SIZE (xpi/firefox-31.4.0/hu.xpi) = 398644
-SHA256 (xpi/firefox-31.4.0/hy-AM.xpi) = 5b552c09afda8cf41863651f5807d002b13862d4970dd0fe3d4f0d550c52d771
-SIZE (xpi/firefox-31.4.0/hy-AM.xpi) = 478743
-SHA256 (xpi/firefox-31.4.0/id.xpi) = 3bdad0e38016f00b2077cffb88106f9c4d335b59b3042e2a5fa48bbfb3725710
-SIZE (xpi/firefox-31.4.0/id.xpi) = 378301
-SHA256 (xpi/firefox-31.4.0/is.xpi) = c1ed7c67f4eb9042d521e6a505debf2dc9abf849053762bb98a232bf56e6caa4
-SIZE (xpi/firefox-31.4.0/is.xpi) = 427327
-SHA256 (xpi/firefox-31.4.0/it.xpi) = a3173fd2f42dcb584206d8cfe04b3441feaa97f0dad4c5c42a1c2408ebc4ef97
-SIZE (xpi/firefox-31.4.0/it.xpi) = 330905
-SHA256 (xpi/firefox-31.4.0/ja.xpi) = 1d6012d6ae351215634a5b39314817b3c9ce0f9a1fd1eb8ed0a437cc08c07945
-SIZE (xpi/firefox-31.4.0/ja.xpi) = 421665
-SHA256 (xpi/firefox-31.4.0/kk.xpi) = 04a6cf1a1f6b2ed64a32477f47b4a7c110ec7c4dbb32c085553d95976a4fc580
-SIZE (xpi/firefox-31.4.0/kk.xpi) = 439116
-SHA256 (xpi/firefox-31.4.0/km.xpi) = 352dfc8dc592dc251f29e0717aae7cac1e924a86a705462f5121e2cbaac91223
-SIZE (xpi/firefox-31.4.0/km.xpi) = 506476
-SHA256 (xpi/firefox-31.4.0/kn.xpi) = c781c7ee43b1c0a6b2a6dd39a12cfc2b4f75c40fd59caf809491c5452a97c11f
-SIZE (xpi/firefox-31.4.0/kn.xpi) = 458890
-SHA256 (xpi/firefox-31.4.0/ko.xpi) = 9734356ee4dca8ae385f4018f8746740408108b0ccd33154dd6d1dab58fcab97
-SIZE (xpi/firefox-31.4.0/ko.xpi) = 402815
-SHA256 (xpi/firefox-31.4.0/ku.xpi) = 08303c5f66ae6abdc4bf5d2b292bddfa3f03389fdc8ba69ccb47969cf84e982a
-SIZE (xpi/firefox-31.4.0/ku.xpi) = 420263
-SHA256 (xpi/firefox-31.4.0/lij.xpi) = 0c7c5a7362f2b331cbc94a1b7236cf5c3cc6f91240df19f8aa22cd4d49df5183
-SIZE (xpi/firefox-31.4.0/lij.xpi) = 385867
-SHA256 (xpi/firefox-31.4.0/lt.xpi) = dc22c989978418d9507879c29c7799948472ff759ea09c3ebb743b5c4e372980
-SIZE (xpi/firefox-31.4.0/lt.xpi) = 435431
-SHA256 (xpi/firefox-31.4.0/lv.xpi) = c2837a25ce4a7439edad27e1731ed93edcd82c6048720252e730e0b8c6be3c9e
-SIZE (xpi/firefox-31.4.0/lv.xpi) = 398576
-SHA256 (xpi/firefox-31.4.0/mai.xpi) = 48d5da0525a87d2f19e5f93e7b11eda3f5670e2d809d81df5f827e26c06a663d
-SIZE (xpi/firefox-31.4.0/mai.xpi) = 444885
-SHA256 (xpi/firefox-31.4.0/mk.xpi) = 5023557cbe6163c3682242bf18cb5a2db3c3ad26b95b5a0e286bbcbb2e3d5a39
-SIZE (xpi/firefox-31.4.0/mk.xpi) = 475483
-SHA256 (xpi/firefox-31.4.0/ml.xpi) = c89ccdbec76470196ef0bd51bbc9c983b0d84fbfe975bd71a4687265d6e706ed
-SIZE (xpi/firefox-31.4.0/ml.xpi) = 466254
-SHA256 (xpi/firefox-31.4.0/mr.xpi) = 2bb0951c07dda8d41170f49596c30087d5c183879369fe9519d7856b5a0f74dd
-SIZE (xpi/firefox-31.4.0/mr.xpi) = 451291
-SHA256 (xpi/firefox-31.4.0/ms.xpi) = f5aba922e5f338f86794621a235f99efdffe23f11dfd0d0723f1a1fb78d6905a
-SIZE (xpi/firefox-31.4.0/ms.xpi) = 436230
-SHA256 (xpi/firefox-31.4.0/nb-NO.xpi) = 27ef5afaf0963935f04640c0080e1ad5fc25141cb952186416418208f3474ebe
-SIZE (xpi/firefox-31.4.0/nb-NO.xpi) = 392005
-SHA256 (xpi/firefox-31.4.0/nl.xpi) = 3b63800651c2b04b98d792cfcf602d0fe5b975732548dacb741ad810d4e8053c
-SIZE (xpi/firefox-31.4.0/nl.xpi) = 390885
-SHA256 (xpi/firefox-31.4.0/nn-NO.xpi) = 2b473f58363066d97d2c7e3fcc29b80a1c62e3a9d45f4976c161f04f5e869e6e
-SIZE (xpi/firefox-31.4.0/nn-NO.xpi) = 386281
-SHA256 (xpi/firefox-31.4.0/or.xpi) = 70fc92f01226409b3400d6d8c52d8c89aee87a0b5ff5867f1930d5986a951f0b
-SIZE (xpi/firefox-31.4.0/or.xpi) = 464749
-SHA256 (xpi/firefox-31.4.0/pa-IN.xpi) = d562cafe45680ce2580fee8b4ffea35bacc26358317e4c873fc2bd8fa781b9c4
-SIZE (xpi/firefox-31.4.0/pa-IN.xpi) = 439326
-SHA256 (xpi/firefox-31.4.0/pl.xpi) = 9eb18afba43725b57e71fe4c2d69c454561786dfa914e3bf153415585646f115
-SIZE (xpi/firefox-31.4.0/pl.xpi) = 374747
-SHA256 (xpi/firefox-31.4.0/pt-BR.xpi) = d156484914f929a8cc2acaa76bb0714cd302ed8f9f677b12176470715142a294
-SIZE (xpi/firefox-31.4.0/pt-BR.xpi) = 405565
-SHA256 (xpi/firefox-31.4.0/pt-PT.xpi) = 74408f5c2a7e7d097274501b1bc1c0f4da67455191dbbf6d5e8fc28eab47b155
-SIZE (xpi/firefox-31.4.0/pt-PT.xpi) = 386344
-SHA256 (xpi/firefox-31.4.0/rm.xpi) = 056579048789796082bb1412bf627c6f4b395a8369b26bf9d5d13a33349fe0ea
-SIZE (xpi/firefox-31.4.0/rm.xpi) = 399285
-SHA256 (xpi/firefox-31.4.0/ro.xpi) = 21258fecd09254fff0b0410fb1152a0ca84a6095bae6e7f828e6de585bf795ac
-SIZE (xpi/firefox-31.4.0/ro.xpi) = 439387
-SHA256 (xpi/firefox-31.4.0/ru.xpi) = a9bdb4ba53972476d6a556af977ad05b9f2b650c63a49e74009cf76c43d55993
-SIZE (xpi/firefox-31.4.0/ru.xpi) = 367898
-SHA256 (xpi/firefox-31.4.0/si.xpi) = 13b0725e8c837f770b4099b61d8618e5287ab7a6008ff5bde5cff7fb41a51b81
-SIZE (xpi/firefox-31.4.0/si.xpi) = 463223
-SHA256 (xpi/firefox-31.4.0/sk.xpi) = a6f1883319357a76df8516a446e2e952033e50e4ffe8097c723efeeeaba78d8c
-SIZE (xpi/firefox-31.4.0/sk.xpi) = 413802
-SHA256 (xpi/firefox-31.4.0/sl.xpi) = a531e61e52de28b107fe869083e2b9b6da7c2fe625e4b630784317401c6010ef
-SIZE (xpi/firefox-31.4.0/sl.xpi) = 387134
-SHA256 (xpi/firefox-31.4.0/son.xpi) = 63975c7e789feb3d2340796cc321cd50337527dd730226a0b2d32026a0bfddf9
-SIZE (xpi/firefox-31.4.0/son.xpi) = 395143
-SHA256 (xpi/firefox-31.4.0/sq.xpi) = fdfda585f433b3c23139918480d32379a1c5723794c61448e4d530889108d0de
-SIZE (xpi/firefox-31.4.0/sq.xpi) = 431136
-SHA256 (xpi/firefox-31.4.0/sr.xpi) = d564522188b570c9214744bcbf51c8357a6796a03f4e3cab195672fa5c5c5eff
-SIZE (xpi/firefox-31.4.0/sr.xpi) = 425902
-SHA256 (xpi/firefox-31.4.0/sv-SE.xpi) = 3b175344594b94d110ec34eb04b9c6f3cfc135acc658aa76141415959b7b7c86
-SIZE (xpi/firefox-31.4.0/sv-SE.xpi) = 399026
-SHA256 (xpi/firefox-31.4.0/ta.xpi) = b2753f3f79464a36ae59ab74340123b55990485baca34737e837135f649889e3
-SIZE (xpi/firefox-31.4.0/ta.xpi) = 447685
-SHA256 (xpi/firefox-31.4.0/te.xpi) = 3f59b97750297c3db28b6207886e71e01c3ad19aa79c99211b3b40068576e34c
-SIZE (xpi/firefox-31.4.0/te.xpi) = 462591
-SHA256 (xpi/firefox-31.4.0/th.xpi) = 693c09e4ca32fda0881b10a4463cd988819265f0717045f5f88c9dc0289d6cc2
-SIZE (xpi/firefox-31.4.0/th.xpi) = 478126
-SHA256 (xpi/firefox-31.4.0/tr.xpi) = c1409656574e67fdb932355086e03034d2778d7cdc5df3c9a8d96b226dffc850
-SIZE (xpi/firefox-31.4.0/tr.xpi) = 417370
-SHA256 (xpi/firefox-31.4.0/uk.xpi) = 6cd816e4e376e4ddc5bfd85d256c0adeeb8a714079322b92153063d0daacf3a4
-SIZE (xpi/firefox-31.4.0/uk.xpi) = 428002
-SHA256 (xpi/firefox-31.4.0/vi.xpi) = d3bd923639008d8fe12a6da6b586440443124bc91b9dd4574afa43f370a142e3
-SIZE (xpi/firefox-31.4.0/vi.xpi) = 413374
-SHA256 (xpi/firefox-31.4.0/xh.xpi) = cb82450d18c1f0b46fd036f08bbd18e534a2d0a4c7925f91b88d85206d5770c1
-SIZE (xpi/firefox-31.4.0/xh.xpi) = 397876
-SHA256 (xpi/firefox-31.4.0/zh-CN.xpi) = 68e5448ae679e9f82feb260c8c96ce9fe07a86528b9bb926f20f5692507a9c82
-SIZE (xpi/firefox-31.4.0/zh-CN.xpi) = 419629
-SHA256 (xpi/firefox-31.4.0/zh-TW.xpi) = 6a34241237e8252aa087c5a8d665086d1638f437bea4061bd26ac3bfcee3e6f6
-SIZE (xpi/firefox-31.4.0/zh-TW.xpi) = 412520
-SHA256 (xpi/firefox-31.4.0/zu.xpi) = 7277fd8f5c8491ccf9a895c7534b2cf86fb0672a5c88bfa71948d19cd4e2ea24
-SIZE (xpi/firefox-31.4.0/zu.xpi) = 433215
+SHA256 (xpi/firefox-31.5.0/ach.xpi) = bb108dcfd450711eac124a0a208dbd9b0233becbe8f452465f187cd45db19eb2
+SIZE (xpi/firefox-31.5.0/ach.xpi) = 445326
+SHA256 (xpi/firefox-31.5.0/af.xpi) = 5d13a0a807adead46287bfee0ce51ecc0291f403d4bb162e0e8258af63281cb7
+SIZE (xpi/firefox-31.5.0/af.xpi) = 431090
+SHA256 (xpi/firefox-31.5.0/an.xpi) = ac2df1c3df8899f713688dda5b12afbf48b226b402c4260bf2ecf6685bcb163a
+SIZE (xpi/firefox-31.5.0/an.xpi) = 407151
+SHA256 (xpi/firefox-31.5.0/ar.xpi) = 4deefc0cf5ab90e8e012100275ba52312ba7c343c5a7801a7b54a203ca0e12a5
+SIZE (xpi/firefox-31.5.0/ar.xpi) = 459824
+SHA256 (xpi/firefox-31.5.0/as.xpi) = 39780a44a154a1d32485187e1a1ab3cf49acd8c5e1a3822f1c858a756d4bc260
+SIZE (xpi/firefox-31.5.0/as.xpi) = 448569
+SHA256 (xpi/firefox-31.5.0/ast.xpi) = d23a9f445754ba33bb824428269c161fdc7c6a81d50fe85bdeac9f2b260f9d02
+SIZE (xpi/firefox-31.5.0/ast.xpi) = 352341
+SHA256 (xpi/firefox-31.5.0/be.xpi) = 9d28c4dded235338bf5deabea755ccd777c1f808ea42d4bed1a7bdf2c15261f5
+SIZE (xpi/firefox-31.5.0/be.xpi) = 378668
+SHA256 (xpi/firefox-31.5.0/bg.xpi) = a081bf35b8698f16613e43dc04e0b635dc6dded553b6c821233d93cf698422eb
+SIZE (xpi/firefox-31.5.0/bg.xpi) = 438061
+SHA256 (xpi/firefox-31.5.0/bn-BD.xpi) = d47f2a963273a63205c961b5c61a7ded439c2e5368a0d4d7fb367332e3714b92
+SIZE (xpi/firefox-31.5.0/bn-BD.xpi) = 472626
+SHA256 (xpi/firefox-31.5.0/bn-IN.xpi) = 04bc2735ef83319bf80f73c57d843ce142a3ba6464ed923110bd661f30913ec7
+SIZE (xpi/firefox-31.5.0/bn-IN.xpi) = 462593
+SHA256 (xpi/firefox-31.5.0/br.xpi) = e236e2e5296726958ca4bd269c7efe5b1a21bf6a64045779fdd947bda2b03b2b
+SIZE (xpi/firefox-31.5.0/br.xpi) = 389704
+SHA256 (xpi/firefox-31.5.0/bs.xpi) = 61e626f2d52e435b783bbb725dda2a676db04c1b7f86c25f149b00e9b8aa7678
+SIZE (xpi/firefox-31.5.0/bs.xpi) = 429014
+SHA256 (xpi/firefox-31.5.0/ca.xpi) = 74e748eba11a0a0bf173fa141b2e0fdb542fb5a5240e54e8d758dfca46345cd2
+SIZE (xpi/firefox-31.5.0/ca.xpi) = 403575
+SHA256 (xpi/firefox-31.5.0/cs.xpi) = e4ceaf7e2cbf4a49f62060ebf2748984dcb2391a9be113164099bed81c40f64e
+SIZE (xpi/firefox-31.5.0/cs.xpi) = 390979
+SHA256 (xpi/firefox-31.5.0/csb.xpi) = 22ad1bc902f2bedffc2b032340329e88e6ce06ee78b41aaf14d4d00795fc1363
+SIZE (xpi/firefox-31.5.0/csb.xpi) = 383695
+SHA256 (xpi/firefox-31.5.0/cy.xpi) = a8f504501340ec111d34bba386100a13aebdbfe6639808437b2ed3040cc2e232
+SIZE (xpi/firefox-31.5.0/cy.xpi) = 390727
+SHA256 (xpi/firefox-31.5.0/da.xpi) = 2c06911b5b26bf0c9d3726767982d342c8eb7035af38968650e3f0f0278c956c
+SIZE (xpi/firefox-31.5.0/da.xpi) = 397747
+SHA256 (xpi/firefox-31.5.0/de.xpi) = 145539d062ab10f10887ff3da2f52b0a9bcc54370e96a28821832a14107caabd
+SIZE (xpi/firefox-31.5.0/de.xpi) = 395164
+SHA256 (xpi/firefox-31.5.0/el.xpi) = edc0d38a9716d8dc49359f40d8496ecf901d188b179a7b7ab31fba06c5cb934c
+SIZE (xpi/firefox-31.5.0/el.xpi) = 442982
+SHA256 (xpi/firefox-31.5.0/en-GB.xpi) = 12c790bbdead3064d79e608a60a33e9f5347fe2ab29e54291763e7a8f7e165c4
+SIZE (xpi/firefox-31.5.0/en-GB.xpi) = 390118
+SHA256 (xpi/firefox-31.5.0/en-US.xpi) = 26e7c22992638d6108eafd0262021b1433ac52536e1f0d260f474c397aea9e50
+SIZE (xpi/firefox-31.5.0/en-US.xpi) = 422788
+SHA256 (xpi/firefox-31.5.0/en-ZA.xpi) = f9176710ce19f03d6b96d10e90da740f3aa78c84377fdf645ab24a169b0c34a7
+SIZE (xpi/firefox-31.5.0/en-ZA.xpi) = 388528
+SHA256 (xpi/firefox-31.5.0/eo.xpi) = d022de2cd3425cf0874dd2601c766c3a0822dc05263e5bc6813efdcae83d350a
+SIZE (xpi/firefox-31.5.0/eo.xpi) = 431831
+SHA256 (xpi/firefox-31.5.0/es-AR.xpi) = cd4e5d7dc39297bd083654db6885947b9f2aca30a6566eb1f8647128105ae740
+SIZE (xpi/firefox-31.5.0/es-AR.xpi) = 399937
+SHA256 (xpi/firefox-31.5.0/es-CL.xpi) = 70652d65a852fb78491a932259698e75fdec48eea78ecad44e72d4f6e9f82128
+SIZE (xpi/firefox-31.5.0/es-CL.xpi) = 342808
+SHA256 (xpi/firefox-31.5.0/es-ES.xpi) = 5cb4781d1afaa3d9e3a4e19b50c130c6fc129462ec5c611659a44e5dc45831f5
+SIZE (xpi/firefox-31.5.0/es-ES.xpi) = 335880
+SHA256 (xpi/firefox-31.5.0/es-MX.xpi) = 71b9c761410e757b4027b347f69b929275fbf9d968b8e79643437703960adb48
+SIZE (xpi/firefox-31.5.0/es-MX.xpi) = 402672
+SHA256 (xpi/firefox-31.5.0/et.xpi) = 4481acf3d797e2b9d1e08cf73f6fcad77f3653ee64affa407fd06d8385bc3cd8
+SIZE (xpi/firefox-31.5.0/et.xpi) = 390361
+SHA256 (xpi/firefox-31.5.0/eu.xpi) = 77e6f45dc8dd6fa7c5d147b47408785064a8241b84f71d82536f97c8e8f4dc07
+SIZE (xpi/firefox-31.5.0/eu.xpi) = 413000
+SHA256 (xpi/firefox-31.5.0/fa.xpi) = a1af11200849e06214fd5ca29e4664eb46e27f6725a9fe1aaff42a4289940c73
+SIZE (xpi/firefox-31.5.0/fa.xpi) = 460857
+SHA256 (xpi/firefox-31.5.0/ff.xpi) = 1766d28cbaf862f4eb8d3ad8233dd8585812108e1bc93ade3c012c7f6fc3a84b
+SIZE (xpi/firefox-31.5.0/ff.xpi) = 400143
+SHA256 (xpi/firefox-31.5.0/fi.xpi) = 63f83660ddb1a93915b7d41d691762066921d2ad36e5cd8d5c7d0acfb8e8a18f
+SIZE (xpi/firefox-31.5.0/fi.xpi) = 392740
+SHA256 (xpi/firefox-31.5.0/fr.xpi) = 0223279d4f63f1d4831f3c8a9913cdc4559f806e748954746bc35931ea152f9a
+SIZE (xpi/firefox-31.5.0/fr.xpi) = 406462
+SHA256 (xpi/firefox-31.5.0/fy-NL.xpi) = 19c3ef9199e33a4898a2981961dadb96f3f5bd862c569bc29539a9896c551329
+SIZE (xpi/firefox-31.5.0/fy-NL.xpi) = 401931
+SHA256 (xpi/firefox-31.5.0/ga-IE.xpi) = 628442c3cb960d61ec82a342b59cd4b3e042a61532071faa3f2a62d107b384dd
+SIZE (xpi/firefox-31.5.0/ga-IE.xpi) = 410077
+SHA256 (xpi/firefox-31.5.0/gd.xpi) = c49aab9e23aa7aafac25633def65ca695aed0c548c3f14614495feafe71d9c9d
+SIZE (xpi/firefox-31.5.0/gd.xpi) = 403014
+SHA256 (xpi/firefox-31.5.0/gl.xpi) = 359fb88f385273190219a15c89cd51fa17c27c81fda86a519a1936d94a8e92a9
+SIZE (xpi/firefox-31.5.0/gl.xpi) = 390599
+SHA256 (xpi/firefox-31.5.0/gu-IN.xpi) = ce4548df745f2985a647fde9a1a104dbce8b3898e0cd9de2971653ff69329965
+SIZE (xpi/firefox-31.5.0/gu-IN.xpi) = 423502
+SHA256 (xpi/firefox-31.5.0/he.xpi) = 4e670f68c59b7fccb1dcfddf065e6537f8acd411f5ec494188455595b89568e2
+SIZE (xpi/firefox-31.5.0/he.xpi) = 427631
+SHA256 (xpi/firefox-31.5.0/hi-IN.xpi) = bd9c0a81812d5f185cdd67edf4f16f4a16c9022d00ab3f6639dac83dce09e529
+SIZE (xpi/firefox-31.5.0/hi-IN.xpi) = 441402
+SHA256 (xpi/firefox-31.5.0/hr.xpi) = 280caa72b76aac6e04d04077be71c5309c4388a23017d35d370f9cfe5dbbbac8
+SIZE (xpi/firefox-31.5.0/hr.xpi) = 424371
+SHA256 (xpi/firefox-31.5.0/hsb.xpi) = 48381ad58a7b8ef0e40d71ba34039b6c8fb9f173445ec7edae40a47ba13c83ca
+SIZE (xpi/firefox-31.5.0/hsb.xpi) = 413076
+SHA256 (xpi/firefox-31.5.0/hu.xpi) = 513b4cb557119e9b48ece493392df142defc84cdaa374f6f46ca57cc42f617ea
+SIZE (xpi/firefox-31.5.0/hu.xpi) = 398644
+SHA256 (xpi/firefox-31.5.0/hy-AM.xpi) = 8c2a450df1f8633c103db47b5cf886a8f9d3ca10f6f9daa4aa5ec616530c2a10
+SIZE (xpi/firefox-31.5.0/hy-AM.xpi) = 478743
+SHA256 (xpi/firefox-31.5.0/id.xpi) = 1194be5d192d32b677b63679d45832e6c9492fce5e548d7b955025647ed2d46c
+SIZE (xpi/firefox-31.5.0/id.xpi) = 378301
+SHA256 (xpi/firefox-31.5.0/is.xpi) = fb6f3f6013ffb82f9444d8c713d7aef5b995961ce78627bb1f5030bb0097d39a
+SIZE (xpi/firefox-31.5.0/is.xpi) = 427327
+SHA256 (xpi/firefox-31.5.0/it.xpi) = 0fe3e274cb85236e051f18da49ad6e56f5ef879b7d795036c1abacdf0fff5156
+SIZE (xpi/firefox-31.5.0/it.xpi) = 330906
+SHA256 (xpi/firefox-31.5.0/ja.xpi) = df9c521908c1e788e9632de04b27598440d479544049172d3a447a5130ec3874
+SIZE (xpi/firefox-31.5.0/ja.xpi) = 421665
+SHA256 (xpi/firefox-31.5.0/kk.xpi) = 819ca9fc93441058c4a8a882681ed9e93d1d32085dd051429584d0fb5b68fb8e
+SIZE (xpi/firefox-31.5.0/kk.xpi) = 439117
+SHA256 (xpi/firefox-31.5.0/km.xpi) = 657f070de51d7e0207207db926947ecb0c11e30b17b3f0af2b63e6a743435bfc
+SIZE (xpi/firefox-31.5.0/km.xpi) = 506477
+SHA256 (xpi/firefox-31.5.0/kn.xpi) = 2498a01800a2fef21e1dca7b4e72b49907c6d4773ef55b18a60996385e561121
+SIZE (xpi/firefox-31.5.0/kn.xpi) = 458891
+SHA256 (xpi/firefox-31.5.0/ko.xpi) = b2a58ae3da8f233e181d8b8aaad041984a1e3db3c31e454a4c495a4d0c00e677
+SIZE (xpi/firefox-31.5.0/ko.xpi) = 402815
+SHA256 (xpi/firefox-31.5.0/ku.xpi) = bc3fba36baee298981e7ddd2ef1e0ec83c478e34c4c9835bcce2ff1500bb8348
+SIZE (xpi/firefox-31.5.0/ku.xpi) = 420260
+SHA256 (xpi/firefox-31.5.0/lij.xpi) = e6d8307fa3d84f411577ca7025c8e33273f43b2d55498e8cde260e5e5c314f33
+SIZE (xpi/firefox-31.5.0/lij.xpi) = 385864
+SHA256 (xpi/firefox-31.5.0/lt.xpi) = 7948c823d4d4052c7c1dc87bc64fd32e47ba04be224104263aa955c4e46e07a3
+SIZE (xpi/firefox-31.5.0/lt.xpi) = 435431
+SHA256 (xpi/firefox-31.5.0/lv.xpi) = 679ef0e9a2e4e554cebcc849f2467b92d5d959e204d53a1cb490b87c763d828c
+SIZE (xpi/firefox-31.5.0/lv.xpi) = 398577
+SHA256 (xpi/firefox-31.5.0/mai.xpi) = 78d51231b6cd8c577a20145232cf6e8a669fd98a11ea40e3ba0bf2ad3d8c9d54
+SIZE (xpi/firefox-31.5.0/mai.xpi) = 444885
+SHA256 (xpi/firefox-31.5.0/mk.xpi) = 27ea862beef51325820211e740f678a0112dc5eb18bd4b414d9a945f0b1840c6
+SIZE (xpi/firefox-31.5.0/mk.xpi) = 475483
+SHA256 (xpi/firefox-31.5.0/ml.xpi) = ece5b4d3b3b816a857e5aecf167630019a63608acd21eb9eacf31d48fb66fdc5
+SIZE (xpi/firefox-31.5.0/ml.xpi) = 466255
+SHA256 (xpi/firefox-31.5.0/mr.xpi) = 4fca29cb24665f4f30425fc2aed9f9169f864eb3c1a9d0b897cc26464a0948d0
+SIZE (xpi/firefox-31.5.0/mr.xpi) = 451292
+SHA256 (xpi/firefox-31.5.0/ms.xpi) = e035a3d5a75b407daae11e0d566af2576e643a278fef836e5525aa187617b76d
+SIZE (xpi/firefox-31.5.0/ms.xpi) = 436230
+SHA256 (xpi/firefox-31.5.0/nb-NO.xpi) = b3a7625fd15013b2b4cd0554870f1d8f33705915a43e5b021737e815d7eeb067
+SIZE (xpi/firefox-31.5.0/nb-NO.xpi) = 392006
+SHA256 (xpi/firefox-31.5.0/nl.xpi) = a6c0e019c45e5141e28b5585b5cc8a148260c16ebcf22ffd168d6543ef7b60d3
+SIZE (xpi/firefox-31.5.0/nl.xpi) = 390886
+SHA256 (xpi/firefox-31.5.0/nn-NO.xpi) = 73f823115a674b29906c860253112cd7ee2aececaae7f7fccbe868eb81da2ec8
+SIZE (xpi/firefox-31.5.0/nn-NO.xpi) = 386282
+SHA256 (xpi/firefox-31.5.0/or.xpi) = 0f7232c40f43f9aed1b3f7a050852d1607f9e3d0d9aefbab496f58645b77a85f
+SIZE (xpi/firefox-31.5.0/or.xpi) = 464750
+SHA256 (xpi/firefox-31.5.0/pa-IN.xpi) = 2467b7f77c827e1ff00ff399b74dfcde1809662cdcb66b38de33a45fdb2c3104
+SIZE (xpi/firefox-31.5.0/pa-IN.xpi) = 439326
+SHA256 (xpi/firefox-31.5.0/pl.xpi) = 91e676c995e24068fc70a0ab5385318de78e684ace59a0472595469baf874b03
+SIZE (xpi/firefox-31.5.0/pl.xpi) = 374747
+SHA256 (xpi/firefox-31.5.0/pt-BR.xpi) = b67647be890454ceef7472e7862fe851b7d2d82fe2775e5f8f1492f57a129ab4
+SIZE (xpi/firefox-31.5.0/pt-BR.xpi) = 405565
+SHA256 (xpi/firefox-31.5.0/pt-PT.xpi) = 22718cbd2a11712cdd9ca762c6d258a4e3841002e1a68daa3354ddcdab6dba90
+SIZE (xpi/firefox-31.5.0/pt-PT.xpi) = 386345
+SHA256 (xpi/firefox-31.5.0/rm.xpi) = e1b3c4799a87ff021bc3a67f1c803124dd7c9f7cebeef98d3b927bc4ee542fdf
+SIZE (xpi/firefox-31.5.0/rm.xpi) = 399286
+SHA256 (xpi/firefox-31.5.0/ro.xpi) = 426a6abc8ca1dc7b3e1c0062a5752e69c4c7a29f6de7a6384b1fc71b7e9ccb7f
+SIZE (xpi/firefox-31.5.0/ro.xpi) = 439387
+SHA256 (xpi/firefox-31.5.0/ru.xpi) = 8a36e66e6792fbaedc09495a4dfd803aa49d9841415026fc8798adc0991bf165
+SIZE (xpi/firefox-31.5.0/ru.xpi) = 367898
+SHA256 (xpi/firefox-31.5.0/si.xpi) = 97819f8637b5229b6240bf0d6629200d6ca212a50494aef242ba897816898984
+SIZE (xpi/firefox-31.5.0/si.xpi) = 463224
+SHA256 (xpi/firefox-31.5.0/sk.xpi) = bea9e31c409fafc05bbe8cc34ef11ad8f4b3af2f453b83777283f4042d8bb8de
+SIZE (xpi/firefox-31.5.0/sk.xpi) = 413802
+SHA256 (xpi/firefox-31.5.0/sl.xpi) = 0cc5005e810a9284943ea4caacbaf8a9da739fb822cc54be1e0226d0196d4791
+SIZE (xpi/firefox-31.5.0/sl.xpi) = 387134
+SHA256 (xpi/firefox-31.5.0/son.xpi) = 621496ed489eaced375484f8be7230d10e43baa607c85897e2453d4fe3cfd5d6
+SIZE (xpi/firefox-31.5.0/son.xpi) = 395144
+SHA256 (xpi/firefox-31.5.0/sq.xpi) = 9420c20e33cbe1261bb257b4cb047519c03826d8089a80e69bb9cd6a5d6833f7
+SIZE (xpi/firefox-31.5.0/sq.xpi) = 431137
+SHA256 (xpi/firefox-31.5.0/sr.xpi) = 3c02ebadb66948074d0b6b6b91979662933abb11956400dcec50da0ea39b6a57
+SIZE (xpi/firefox-31.5.0/sr.xpi) = 425902
+SHA256 (xpi/firefox-31.5.0/sv-SE.xpi) = 979e24eac0fd4c28dc85e5e866ed5202b48b1e09acaf8227a9490b2a32b2fdf4
+SIZE (xpi/firefox-31.5.0/sv-SE.xpi) = 399026
+SHA256 (xpi/firefox-31.5.0/ta.xpi) = 87cd38aed291b6fd561c6122da262d507cb1595dd3cb70fc3c63af1cdd0dd24d
+SIZE (xpi/firefox-31.5.0/ta.xpi) = 447686
+SHA256 (xpi/firefox-31.5.0/te.xpi) = 857d88a0457b5b82e37711424434f11d7e1413983422ef8304c9c5c5fcbccbd2
+SIZE (xpi/firefox-31.5.0/te.xpi) = 462591
+SHA256 (xpi/firefox-31.5.0/th.xpi) = 481021438068e00adfb59a31919039caff64b70c797cbde8b332f7bf47936bea
+SIZE (xpi/firefox-31.5.0/th.xpi) = 478127
+SHA256 (xpi/firefox-31.5.0/tr.xpi) = c0f199a09e5b2ac5f0a550703304968c50b3463df2f3685c7d6aedfed443d417
+SIZE (xpi/firefox-31.5.0/tr.xpi) = 417370
+SHA256 (xpi/firefox-31.5.0/uk.xpi) = d04d5593e3afb1546f30f26389482a82819a34887e42e968f2fa04e749b2a124
+SIZE (xpi/firefox-31.5.0/uk.xpi) = 428002
+SHA256 (xpi/firefox-31.5.0/vi.xpi) = 6cb20afb87746943c88cdd339d3ff40a0f7980d42741139b578514964ba7784f
+SIZE (xpi/firefox-31.5.0/vi.xpi) = 413374
+SHA256 (xpi/firefox-31.5.0/xh.xpi) = 6c638f61ca36358bdd8aac4d94cbb3041c6eeda17d220c158718cfac8198b2a6
+SIZE (xpi/firefox-31.5.0/xh.xpi) = 397876
+SHA256 (xpi/firefox-31.5.0/zh-CN.xpi) = 94cdfb6df0ebf1882403fb9a8fec7e9a15eeebc07b977746378dc0b22b78e28a
+SIZE (xpi/firefox-31.5.0/zh-CN.xpi) = 419630
+SHA256 (xpi/firefox-31.5.0/zh-TW.xpi) = 8a31a36199af4c7f7f37dfd2a3d1db834ae6fb1e470c7bdff9d6ed716ba07e29
+SIZE (xpi/firefox-31.5.0/zh-TW.xpi) = 412521
+SHA256 (xpi/firefox-31.5.0/zu.xpi) = 79505f0655ba69bf6e4f4357bdb1e5a4721fa745efc1533bfdd085f9ae92b39a
+SIZE (xpi/firefox-31.5.0/zu.xpi) = 433216
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 8d0de5c2a62b..f50aaa1db271 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	31.4.0
+DISTVERSION=	31.5.0
 DISTVERSIONSUFFIX=esr.source
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index 7fd1418d0164..5a4686dd6cf6 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-31.4.0esr.source.tar.bz2) = c5ad8b588fb1e7690be5da04f627335f6440277dac4bccd46e6687fcf2fbc23b
-SIZE (firefox-31.4.0esr.source.tar.bz2) = 147935703
+SHA256 (firefox-31.5.0esr.source.tar.bz2) = d4243bf74a4421b590f5580f71486f8608a1a483d4779b44ab0e39d6bbf64b6a
+SIZE (firefox-31.5.0esr.source.tar.bz2) = 147757474
diff --git a/www/firefox-esr/files/patch-bug1021761 b/www/firefox-esr/files/patch-bug1021761
index bd0a689f12c7..1d0cde369c34 100644
--- a/www/firefox-esr/files/patch-bug1021761
+++ b/www/firefox-esr/files/patch-bug1021761
@@ -2,7 +2,7 @@ diff --git configure.in configure.in
 index 48e60c0..ec08417 100644
 --- configure.in
 +++ 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
 --- media/libcubeb/AUTHORS
@@ -651,7 +634,7 @@ new file mode 100644
 index 0000000..5e38e27
 --- /dev/null
 +++ 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
+--- media/webrtc/signaling/test/Makefile.in
++++ 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
 --- toolkit/library/libxul.mk
 +++ 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/www/firefox-esr/files/patch-bug1083461 b/www/firefox-esr/files/patch-bug1083461
deleted file mode 100644
index 66989e0e7cf6..000000000000
--- a/www/firefox-esr/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
---- layout/style/nsCSSValue.cpp
-+++ 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
---- layout/style/nsCSSValue.h
-+++ 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
---- layout/style/nsStyleAnimation.cpp
-+++ 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/www/firefox-esr/files/patch-bug991253 b/www/firefox-esr/files/patch-bug991253
index 161feb2ca7b5..73d71610ab03 100644
--- a/www/firefox-esr/files/patch-bug991253
+++ b/www/firefox-esr/files/patch-bug991253
@@ -1,14 +1,16 @@
 --- extensions/spellcheck/hunspell/src/mozHunspell.cpp~
 +++ 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;
diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile
index c4f9a69efde6..a24486b979d4 100644
--- a/www/firefox-i18n/Makefile
+++ b/www/firefox-i18n/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	firefox-i18n
-PORTVERSION=	35.0.1
+PORTVERSION=	36.0
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi
 PKGNAMEPREFIX=
@@ -14,7 +14,7 @@ COMMENT=	Localized interface for Firefox
 
 EXTRACT_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 
-USES=		zip:infozip gecko:firefox,35,build
+USES=		zip:infozip gecko:firefox,36,build
 USE_XPI=	firefox linux-firefox
 
 NO_ARCH=	yes
diff --git a/www/firefox-i18n/distinfo b/www/firefox-i18n/distinfo
index 66fa0e48fe7f..495fea2f9ac6 100644
--- a/www/firefox-i18n/distinfo
+++ b/www/firefox-i18n/distinfo
@@ -1,176 +1,176 @@
-SHA256 (xpi/firefox-i18n-35.0.1/ach.xpi) = 3acc381c637c62cba0e1b3f9e8476e6626bff52f3278d500e8c9b130ff105033
-SIZE (xpi/firefox-i18n-35.0.1/ach.xpi) = 467509
-SHA256 (xpi/firefox-i18n-35.0.1/af.xpi) = 2475f190a5b545bf4c9740ee6052a8d8b283c95ee4e9407efa79e60bdec35890
-SIZE (xpi/firefox-i18n-35.0.1/af.xpi) = 467130
-SHA256 (xpi/firefox-i18n-35.0.1/an.xpi) = 974d7385158b5d0d184c73bec9b1dc2984cef0b9215a838ca332112ae22ff496
-SIZE (xpi/firefox-i18n-35.0.1/an.xpi) = 446091
-SHA256 (xpi/firefox-i18n-35.0.1/ar.xpi) = 7181187b5b2da93036a375c6b4b7def4bf722ffb3f7f161e49edea65422c9cec
-SIZE (xpi/firefox-i18n-35.0.1/ar.xpi) = 499638
-SHA256 (xpi/firefox-i18n-35.0.1/as.xpi) = 4e129c2243b742ee19b61e76bcd22828be95f4b6541459a167c3a5cba4a72032
-SIZE (xpi/firefox-i18n-35.0.1/as.xpi) = 488062
-SHA256 (xpi/firefox-i18n-35.0.1/ast.xpi) = 5ba7a10aefaa2862b40238e6dd76ef346ee67347d33ef726b7443d32d968ace5
-SIZE (xpi/firefox-i18n-35.0.1/ast.xpi) = 372416
-SHA256 (xpi/firefox-i18n-35.0.1/az.xpi) = 3604f68010e4e6161e763d36dff280a2ef208eaad54f770074082947ecc95db4
-SIZE (xpi/firefox-i18n-35.0.1/az.xpi) = 470999
-SHA256 (xpi/firefox-i18n-35.0.1/be.xpi) = b449859d6523d75a844b0d6bf1de59e37ab18026b5f9338608dcf5076ee4eb6e
-SIZE (xpi/firefox-i18n-35.0.1/be.xpi) = 422264
-SHA256 (xpi/firefox-i18n-35.0.1/bg.xpi) = fcc368a9c5ea0cd07c7d93009ffb87f4a77636ea2c616dee714e9507caf579d5
-SIZE (xpi/firefox-i18n-35.0.1/bg.xpi) = 477012
-SHA256 (xpi/firefox-i18n-35.0.1/bn-BD.xpi) = b78ca016e46d1a22db3dc88df90a2d41931fbdc1081080e76bf01854f744bafe
-SIZE (xpi/firefox-i18n-35.0.1/bn-BD.xpi) = 511237
-SHA256 (xpi/firefox-i18n-35.0.1/bn-IN.xpi) = 2dbc1ec7512ea21a7019fecb86e7fca2e7c486e8cb18e82ac087a4f4b8a3f2e5
-SIZE (xpi/firefox-i18n-35.0.1/bn-IN.xpi) = 504192
-SHA256 (xpi/firefox-i18n-35.0.1/br.xpi) = 61ff2fdcc899b7f59f8d27111b05d114c1f55f36955b66867973341f5323cf88
-SIZE (xpi/firefox-i18n-35.0.1/br.xpi) = 427012
-SHA256 (xpi/firefox-i18n-35.0.1/bs.xpi) = c2ef180d5b9b155896a40ed0cc91a82f032d1145a6fbc53da400aa898353dac2
-SIZE (xpi/firefox-i18n-35.0.1/bs.xpi) = 468176
-SHA256 (xpi/firefox-i18n-35.0.1/ca.xpi) = 3f8f4288280820d1173cf967e35ac89329aaed5fa70810f08cba2a289f36c66d
-SIZE (xpi/firefox-i18n-35.0.1/ca.xpi) = 442493
-SHA256 (xpi/firefox-i18n-35.0.1/cs.xpi) = f15705b596e1415a0f502a5cf57f48cd6c176bd85ab09e59b665b189d29746fd
-SIZE (xpi/firefox-i18n-35.0.1/cs.xpi) = 430874
-SHA256 (xpi/firefox-i18n-35.0.1/cy.xpi) = bf471f0e00a86fe8477b1dadd69702df603b62c487207d1098de18a8d45cb102
-SIZE (xpi/firefox-i18n-35.0.1/cy.xpi) = 429176
-SHA256 (xpi/firefox-i18n-35.0.1/da.xpi) = 60ecad8aa0b690f39b492717ff95e2227046c875c87552de8ffe7cbab0110278
-SIZE (xpi/firefox-i18n-35.0.1/da.xpi) = 435995
-SHA256 (xpi/firefox-i18n-35.0.1/de.xpi) = 64369006b8b34512538744565d29dccf514b5455a3ede32980b21734dee6dda9
-SIZE (xpi/firefox-i18n-35.0.1/de.xpi) = 435483
-SHA256 (xpi/firefox-i18n-35.0.1/dsb.xpi) = 02e0703eb39798c03a232f2eee19027e08cda83feedcfcbab7fa3e0560ae4816
-SIZE (xpi/firefox-i18n-35.0.1/dsb.xpi) = 454784
-SHA256 (xpi/firefox-i18n-35.0.1/el.xpi) = dafab4f4383637fd4bc0fe77974536f17760e4ee4901fff5b2668a920107bf06
-SIZE (xpi/firefox-i18n-35.0.1/el.xpi) = 481158
-SHA256 (xpi/firefox-i18n-35.0.1/en-GB.xpi) = 0245fc34ff932eeb4c1b5c25bfe685517617033a54ec406ab72d0aba0de15eb4
-SIZE (xpi/firefox-i18n-35.0.1/en-GB.xpi) = 425596
-SHA256 (xpi/firefox-i18n-35.0.1/en-US.xpi) = ee3bc397656563ac85aca856ed964185bdc64f79dd95c84d5238e22ce5d28860
-SIZE (xpi/firefox-i18n-35.0.1/en-US.xpi) = 455423
-SHA256 (xpi/firefox-i18n-35.0.1/en-ZA.xpi) = be64bc5180e077ecde34508b033e5b550271663850dbabdab02ac3a980a01d71
-SIZE (xpi/firefox-i18n-35.0.1/en-ZA.xpi) = 421565
-SHA256 (xpi/firefox-i18n-35.0.1/eo.xpi) = b4a64a0c9cdfb0d5a257da0d1e2b7852565f8ba5dec5a2976e9b5e6ce6e5c9bb
-SIZE (xpi/firefox-i18n-35.0.1/eo.xpi) = 470276
-SHA256 (xpi/firefox-i18n-35.0.1/es-AR.xpi) = d3298013ec0580c26cbc3298fc68ba334f9f7f514f415851dbc0f438b3a7d1e2
-SIZE (xpi/firefox-i18n-35.0.1/es-AR.xpi) = 438917
-SHA256 (xpi/firefox-i18n-35.0.1/es-CL.xpi) = 4808e96479bc8f179ae1505f40f0e3719f1f0a0e5db34dd4d05c47e9ccb50acc
-SIZE (xpi/firefox-i18n-35.0.1/es-CL.xpi) = 374669
-SHA256 (xpi/firefox-i18n-35.0.1/es-ES.xpi) = 4a71fc57cc3a1e8134b550acc4fff64889c0c2c3eb40558f47f88dd6c3c534a3
-SIZE (xpi/firefox-i18n-35.0.1/es-ES.xpi) = 365066
-SHA256 (xpi/firefox-i18n-35.0.1/es-MX.xpi) = e328a8b9d45f283973fc3c3c10543f1fbf4b71f65ef6720522f3ab5a59324566
-SIZE (xpi/firefox-i18n-35.0.1/es-MX.xpi) = 441443
-SHA256 (xpi/firefox-i18n-35.0.1/et.xpi) = f4476419ef4ca9eb496313acb97270ec3bf80f4de6c3142ddc4545edc1e50767
-SIZE (xpi/firefox-i18n-35.0.1/et.xpi) = 428358
-SHA256 (xpi/firefox-i18n-35.0.1/eu.xpi) = 1a17bea191c0a12741bc124e4b8b6168a5414bc0bd0a053f9ca1837a5a491d58
-SIZE (xpi/firefox-i18n-35.0.1/eu.xpi) = 451385
-SHA256 (xpi/firefox-i18n-35.0.1/fa.xpi) = 3aba9cbcac32d7c48bd8c749b6656c51c62c3e56c43475016c6746cf838fe161
-SIZE (xpi/firefox-i18n-35.0.1/fa.xpi) = 496845
-SHA256 (xpi/firefox-i18n-35.0.1/ff.xpi) = 7c0daf076c98fe33e2123c15ab67cf8f17b2d4d3fad8719d276d70fe1b247866
-SIZE (xpi/firefox-i18n-35.0.1/ff.xpi) = 437965
-SHA256 (xpi/firefox-i18n-35.0.1/fi.xpi) = 54266792cdd9cc1400b441d30f29a82d1e2597f11b0d1015793ab4d92a5f6d58
-SIZE (xpi/firefox-i18n-35.0.1/fi.xpi) = 430182
-SHA256 (xpi/firefox-i18n-35.0.1/fr.xpi) = ef3d7cddeca250d8806a837ab469ac3e4370f11b0f79c68c2f27fd5eb01177fa
-SIZE (xpi/firefox-i18n-35.0.1/fr.xpi) = 445753
-SHA256 (xpi/firefox-i18n-35.0.1/fy-NL.xpi) = abff62c1abe9f1e65d9224899a043e34cbfe5fbc7dd156c0a6c7e47856535de1
-SIZE (xpi/firefox-i18n-35.0.1/fy-NL.xpi) = 440303
-SHA256 (xpi/firefox-i18n-35.0.1/ga-IE.xpi) = cbbc6d4697c0c75c20f1d616a4d46e79696551ae30e2c87a66f3146c4dd0d100
-SIZE (xpi/firefox-i18n-35.0.1/ga-IE.xpi) = 449555
-SHA256 (xpi/firefox-i18n-35.0.1/gd.xpi) = f0ccb7ce40d28bf69977a260c8b7daec1af56ae8334ec89e76e0f85fd7ad8a83
-SIZE (xpi/firefox-i18n-35.0.1/gd.xpi) = 439244
-SHA256 (xpi/firefox-i18n-35.0.1/gl.xpi) = e5e95935b581e9204b8c8ad087cee75c0d11b89679c598bd75d30eae32ffdd6b
-SIZE (xpi/firefox-i18n-35.0.1/gl.xpi) = 430165
-SHA256 (xpi/firefox-i18n-35.0.1/gu-IN.xpi) = e762c277f0d754f00a747cf8620e6d3ddc28f7a50480f9890c0a7f78b9622b23
-SIZE (xpi/firefox-i18n-35.0.1/gu-IN.xpi) = 458572
-SHA256 (xpi/firefox-i18n-35.0.1/he.xpi) = cef8bc677a3d27ec1cde58074f6da507f7a12da4dc880aaa31572246a870f21a
-SIZE (xpi/firefox-i18n-35.0.1/he.xpi) = 468597
-SHA256 (xpi/firefox-i18n-35.0.1/hi-IN.xpi) = 846c4f84bea652f4acfc8b7c20e70a250761a61cd972b9794e9b3c5001d7154a
-SIZE (xpi/firefox-i18n-35.0.1/hi-IN.xpi) = 488755
-SHA256 (xpi/firefox-i18n-35.0.1/hr.xpi) = e96ea6db4376a754979fc3489fee6d8209b596fe8f489d7da242853a36a2f1d8
-SIZE (xpi/firefox-i18n-35.0.1/hr.xpi) = 462800
-SHA256 (xpi/firefox-i18n-35.0.1/hsb.xpi) = c88e1a400c0feef1a1a153fdd6ef4d66bad8b4df7cd23ad1e76753fe9aa1da2d
-SIZE (xpi/firefox-i18n-35.0.1/hsb.xpi) = 452733
-SHA256 (xpi/firefox-i18n-35.0.1/hu.xpi) = 340559b31adf316b911d23d1d5c685f02784bd6980ff652dae0c17bc812201c3
-SIZE (xpi/firefox-i18n-35.0.1/hu.xpi) = 438009
-SHA256 (xpi/firefox-i18n-35.0.1/hy-AM.xpi) = 3fba8b1de7777071f865f677f68fb8bd6551d7a778597ad7ba79ddafff033f8a
-SIZE (xpi/firefox-i18n-35.0.1/hy-AM.xpi) = 518275
-SHA256 (xpi/firefox-i18n-35.0.1/id.xpi) = 6687221ffce5922d00ce44994eb7acb85749625b937fb0f004056523fe547611
-SIZE (xpi/firefox-i18n-35.0.1/id.xpi) = 416385
-SHA256 (xpi/firefox-i18n-35.0.1/is.xpi) = 6d089ebba0e25e314413bdf794301ceaf017fd0c9469bcbeb002d185879e5fb7
-SIZE (xpi/firefox-i18n-35.0.1/is.xpi) = 470064
-SHA256 (xpi/firefox-i18n-35.0.1/it.xpi) = 5866566401aefc3fab966709a4a03619b9a6f2f0c9524b2a0b7fae639611035f
-SIZE (xpi/firefox-i18n-35.0.1/it.xpi) = 359265
-SHA256 (xpi/firefox-i18n-35.0.1/ja.xpi) = c6f8e7b35f660dda0e7d7ab176fe5a93307fdd586646bc64d12972d7ccb018b9
-SIZE (xpi/firefox-i18n-35.0.1/ja.xpi) = 461521
-SHA256 (xpi/firefox-i18n-35.0.1/kk.xpi) = 611ff26f07b59ced4bf70ad43e0d0b16fad120987d2a7b26c3f644717c369030
-SIZE (xpi/firefox-i18n-35.0.1/kk.xpi) = 485879
-SHA256 (xpi/firefox-i18n-35.0.1/km.xpi) = ac3438326e449bec4e3fb8145b1d06fab26977202cbcc566a4037836029f4774
-SIZE (xpi/firefox-i18n-35.0.1/km.xpi) = 546286
-SHA256 (xpi/firefox-i18n-35.0.1/kn.xpi) = 2f5dbb7a8e5027e8de89327a80d10bb5e4d6cddc0cefcc1d2be8abbc0df55e9e
-SIZE (xpi/firefox-i18n-35.0.1/kn.xpi) = 511933
-SHA256 (xpi/firefox-i18n-35.0.1/ko.xpi) = c639be7543588606ac3e60beeb34b3bdf81ec33ca290ceb01cbc7ecca69ba9b1
-SIZE (xpi/firefox-i18n-35.0.1/ko.xpi) = 444350
-SHA256 (xpi/firefox-i18n-35.0.1/lij.xpi) = 436718bc1f3608227619cd60a6f37b74c21a015d04031e0ea2589f93dc6a0f9c
-SIZE (xpi/firefox-i18n-35.0.1/lij.xpi) = 426477
-SHA256 (xpi/firefox-i18n-35.0.1/lt.xpi) = 457faeb4590b7aa3b9f380e5e4f55a96a5e0185436b6d7d15de8e5a38ee7cc31
-SIZE (xpi/firefox-i18n-35.0.1/lt.xpi) = 470365
-SHA256 (xpi/firefox-i18n-35.0.1/lv.xpi) = 561ae1afc35b062fe76ceca7cfb3771ee3d7c5df07132e92dbce85f663792a64
-SIZE (xpi/firefox-i18n-35.0.1/lv.xpi) = 433945
-SHA256 (xpi/firefox-i18n-35.0.1/mai.xpi) = 573f1bc3d69e79c915a825c0270731cd1399875d497c0a01602ed0cb3c5d5a1a
-SIZE (xpi/firefox-i18n-35.0.1/mai.xpi) = 481807
-SHA256 (xpi/firefox-i18n-35.0.1/mk.xpi) = 6792a05b1d135d67815e959d617cbffb36f205f258b123028a5b44f1e47a09c3
-SIZE (xpi/firefox-i18n-35.0.1/mk.xpi) = 512250
-SHA256 (xpi/firefox-i18n-35.0.1/ml.xpi) = dc21bfa33f3b525e579593084761f51131342ecb5bde14c371034dd0ae50e697
-SIZE (xpi/firefox-i18n-35.0.1/ml.xpi) = 510072
-SHA256 (xpi/firefox-i18n-35.0.1/mr.xpi) = e9aac053cf818d3d5920465eee8570ea4cae83f9956ce24c2aaed10aea3b390d
-SIZE (xpi/firefox-i18n-35.0.1/mr.xpi) = 490864
-SHA256 (xpi/firefox-i18n-35.0.1/ms.xpi) = a42a1113aec44c5ebc4956e0a7c7ce914a49133e5f3bb4e5b302e97894c3b0b0
-SIZE (xpi/firefox-i18n-35.0.1/ms.xpi) = 473982
-SHA256 (xpi/firefox-i18n-35.0.1/nb-NO.xpi) = e50d30605491cab9238c568c83f769ece2848750837ffb2a6f8bddd7981285ed
-SIZE (xpi/firefox-i18n-35.0.1/nb-NO.xpi) = 427547
-SHA256 (xpi/firefox-i18n-35.0.1/nl.xpi) = 660343874d41a5e94314756dd46d66ad0f1cb5a92eadcf29ac11b615efd28ba4
-SIZE (xpi/firefox-i18n-35.0.1/nl.xpi) = 428993
-SHA256 (xpi/firefox-i18n-35.0.1/nn-NO.xpi) = 613a3b97f713ad1cedc348d275311c77ec312003e8e8a9ea71a64b4aca87eab3
-SIZE (xpi/firefox-i18n-35.0.1/nn-NO.xpi) = 421944
-SHA256 (xpi/firefox-i18n-35.0.1/or.xpi) = dac4b342b6b288cb3fd80dad7e9a2d43bae7d8deba25b7bab913a7ae56c4b813
-SIZE (xpi/firefox-i18n-35.0.1/or.xpi) = 507036
-SHA256 (xpi/firefox-i18n-35.0.1/pa-IN.xpi) = 32fa08bdfbd725d654ecdf1d3626d3562547c9b8134252401b9523b570997a56
-SIZE (xpi/firefox-i18n-35.0.1/pa-IN.xpi) = 478329
-SHA256 (xpi/firefox-i18n-35.0.1/pl.xpi) = dcf1c6c5343f2e327a61021f2d34eb4b37981114e9676bc9b43a99edbdaccab1
-SIZE (xpi/firefox-i18n-35.0.1/pl.xpi) = 399975
-SHA256 (xpi/firefox-i18n-35.0.1/pt-BR.xpi) = 2ca276a7afb55413ffe5ef573922b01cf8c4f77307dc0d0195bed51b71959028
-SIZE (xpi/firefox-i18n-35.0.1/pt-BR.xpi) = 446522
-SHA256 (xpi/firefox-i18n-35.0.1/pt-PT.xpi) = c620cb874d5c59f058281e4dbae08f9facddf6ded521040f6179d6b72d9c2548
-SIZE (xpi/firefox-i18n-35.0.1/pt-PT.xpi) = 424495
-SHA256 (xpi/firefox-i18n-35.0.1/rm.xpi) = 082a4919e2465f8050da69d62bb23ecfe1f69069886c471f9fdfa76e787dd171
-SIZE (xpi/firefox-i18n-35.0.1/rm.xpi) = 437062
-SHA256 (xpi/firefox-i18n-35.0.1/ro.xpi) = a8cb03c120ef5d5dc4bb25ff7cd6813cc43cddad7dcabdd949be9d00b3f742fa
-SIZE (xpi/firefox-i18n-35.0.1/ro.xpi) = 479195
-SHA256 (xpi/firefox-i18n-35.0.1/ru.xpi) = e05c3e94d0cce52ac1a05391db5683f98fe7441304ef6791da29cf14e9eddd85
-SIZE (xpi/firefox-i18n-35.0.1/ru.xpi) = 403478
-SHA256 (xpi/firefox-i18n-35.0.1/si.xpi) = 4bb6f070dbcbc9e6a83007d7e767d293058ad9507e83be8a5adc519a2f9a204d
-SIZE (xpi/firefox-i18n-35.0.1/si.xpi) = 510075
-SHA256 (xpi/firefox-i18n-35.0.1/sk.xpi) = f4ce68ecdc7e490650fe896e5cd3fbad9d867c516694c3ed90d96635eb380ada
-SIZE (xpi/firefox-i18n-35.0.1/sk.xpi) = 453746
-SHA256 (xpi/firefox-i18n-35.0.1/sl.xpi) = d9b193f950e48778fe4b85f92c2ade2dba32d66ae4b9ce18c9c03ce17110cb7f
-SIZE (xpi/firefox-i18n-35.0.1/sl.xpi) = 426391
-SHA256 (xpi/firefox-i18n-35.0.1/son.xpi) = 5440d8e0f9a8d1f6d7869ed3e80793da59a9243dff824a9ee79738843e084f24
-SIZE (xpi/firefox-i18n-35.0.1/son.xpi) = 433369
-SHA256 (xpi/firefox-i18n-35.0.1/sq.xpi) = 485dd57f6e456ff0174c074dae974624bd7ba17ae30f77cb67920a41db347f66
-SIZE (xpi/firefox-i18n-35.0.1/sq.xpi) = 470748
-SHA256 (xpi/firefox-i18n-35.0.1/sr.xpi) = 46786455739a5f27f9a5599579bfa71145cdb7f58fbe444e21afc396fd467a73
-SIZE (xpi/firefox-i18n-35.0.1/sr.xpi) = 463763
-SHA256 (xpi/firefox-i18n-35.0.1/sv-SE.xpi) = ea001c2598bdf1e9c6e182151caba27a0aa60af8fde4c4c40a1f2b05a11181d4
-SIZE (xpi/firefox-i18n-35.0.1/sv-SE.xpi) = 437320
-SHA256 (xpi/firefox-i18n-35.0.1/ta.xpi) = 9c2503006d250b7c028818755bd5e8272cce8bf21cdb4a44c8c31d72461d7469
-SIZE (xpi/firefox-i18n-35.0.1/ta.xpi) = 487298
-SHA256 (xpi/firefox-i18n-35.0.1/te.xpi) = 2525e90f735ea20d95c06f17b510ff9480c4274d517bf63145620a4753d3a1c3
-SIZE (xpi/firefox-i18n-35.0.1/te.xpi) = 508639
-SHA256 (xpi/firefox-i18n-35.0.1/th.xpi) = 7dfd4aeeb3cfbd7cfc0e78e0aadd127bb7a63c3ddf6a1bd4820ce336001b5512
-SIZE (xpi/firefox-i18n-35.0.1/th.xpi) = 515441
-SHA256 (xpi/firefox-i18n-35.0.1/tr.xpi) = 518e383cb87645475faf5fbfbb26eb282599c1e1c9a50bb83599853d81eea9e6
-SIZE (xpi/firefox-i18n-35.0.1/tr.xpi) = 465759
-SHA256 (xpi/firefox-i18n-35.0.1/uk.xpi) = db0ccc183158a5974655559b1736a0462b4ead630b4528f96e2d9c851d73252f
-SIZE (xpi/firefox-i18n-35.0.1/uk.xpi) = 464399
-SHA256 (xpi/firefox-i18n-35.0.1/vi.xpi) = 786b1ceae1720057361b202a41222de9bb54045b626233bdeb7d185c70654278
-SIZE (xpi/firefox-i18n-35.0.1/vi.xpi) = 450200
-SHA256 (xpi/firefox-i18n-35.0.1/xh.xpi) = 487e7a4cdd4cb711166b553579ffb1f8ac194604a00a4bfc8630f85f306536ea
-SIZE (xpi/firefox-i18n-35.0.1/xh.xpi) = 432689
-SHA256 (xpi/firefox-i18n-35.0.1/zh-CN.xpi) = ed836b386eeda9e7cee1b5ad6608380d7cc2ab57e885968e343da1e003cf27ed
-SIZE (xpi/firefox-i18n-35.0.1/zh-CN.xpi) = 471967
-SHA256 (xpi/firefox-i18n-35.0.1/zh-TW.xpi) = aaada1e8ce0479d6443817fce323f152c607b658340c81c421a6eee655c14373
-SIZE (xpi/firefox-i18n-35.0.1/zh-TW.xpi) = 451738
+SHA256 (xpi/firefox-i18n-36.0/ach.xpi) = cd52762687bb2de6d1fcddad01c4fac89ea2366680e4a6b3e941aae672818cf7
+SIZE (xpi/firefox-i18n-36.0/ach.xpi) = 465661
+SHA256 (xpi/firefox-i18n-36.0/af.xpi) = 46258ddafdae2c89b50b3580df99ab6927df11529989ae5cd25413208281576d
+SIZE (xpi/firefox-i18n-36.0/af.xpi) = 472056
+SHA256 (xpi/firefox-i18n-36.0/an.xpi) = 105473c50622f24752455ad343e724d688c9e839f0fe788ffdaa1723c8db8bab
+SIZE (xpi/firefox-i18n-36.0/an.xpi) = 449536
+SHA256 (xpi/firefox-i18n-36.0/ar.xpi) = 0cde10d1facdf7bc147deb011109eb77d2cbf037c046355e1e0e1bb2679e1db4
+SIZE (xpi/firefox-i18n-36.0/ar.xpi) = 504370
+SHA256 (xpi/firefox-i18n-36.0/as.xpi) = 03bb600ddae2d8bba96ba66b9faf254309919c79058f76758f7b58cceacfd24e
+SIZE (xpi/firefox-i18n-36.0/as.xpi) = 494229
+SHA256 (xpi/firefox-i18n-36.0/ast.xpi) = d7f01d2a59bee2ca0681714e46da95c002d6fd6e5c994de059a1e6fa0cb9ab2b
+SIZE (xpi/firefox-i18n-36.0/ast.xpi) = 377933
+SHA256 (xpi/firefox-i18n-36.0/az.xpi) = 2c73e8bd6fc9b9e4c9385e95251f70a8294f38eadd838a5713ecca6ac1a25b23
+SIZE (xpi/firefox-i18n-36.0/az.xpi) = 475727
+SHA256 (xpi/firefox-i18n-36.0/be.xpi) = 1a1feccbc4e45a54f2a8b3aee4fdb062cc933d31c014af6e3efdc474389a45c1
+SIZE (xpi/firefox-i18n-36.0/be.xpi) = 426958
+SHA256 (xpi/firefox-i18n-36.0/bg.xpi) = 82946bb8a54d6a328e0485a2eaba68a34121e6f9a2eb15249e70e1303d4bfdb3
+SIZE (xpi/firefox-i18n-36.0/bg.xpi) = 481497
+SHA256 (xpi/firefox-i18n-36.0/bn-BD.xpi) = 3f1d483239bb735d633785f2728a4b6809b64cfc3b9010169045663dc137204e
+SIZE (xpi/firefox-i18n-36.0/bn-BD.xpi) = 515519
+SHA256 (xpi/firefox-i18n-36.0/bn-IN.xpi) = ab987b8952c98231920e7dbdd34becd004735195671bbbe7f5bdebcdf37df210
+SIZE (xpi/firefox-i18n-36.0/bn-IN.xpi) = 514349
+SHA256 (xpi/firefox-i18n-36.0/br.xpi) = 2c2103c853413ede8534173d0583e42b91bdb41c4e621d864f734058a4b8c45d
+SIZE (xpi/firefox-i18n-36.0/br.xpi) = 430389
+SHA256 (xpi/firefox-i18n-36.0/bs.xpi) = c9d1b2fc74349945a929aefa06ccafd2e1368da5458ac08fe403c1b2e9b48495
+SIZE (xpi/firefox-i18n-36.0/bs.xpi) = 472356
+SHA256 (xpi/firefox-i18n-36.0/ca.xpi) = 1d4c748ce84454bd3898135afcfed41056204b609511907e0c60786636c5b888
+SIZE (xpi/firefox-i18n-36.0/ca.xpi) = 446099
+SHA256 (xpi/firefox-i18n-36.0/cs.xpi) = 110687a150b08c6c6758e1c03c0448bb9bdbe85068379a36a080a59ca7b99ce4
+SIZE (xpi/firefox-i18n-36.0/cs.xpi) = 434461
+SHA256 (xpi/firefox-i18n-36.0/cy.xpi) = b1c54c1b1670aad831fb0b0de6670b8c9a9e771a1d8068f4f4d283aa9aa25154
+SIZE (xpi/firefox-i18n-36.0/cy.xpi) = 432589
+SHA256 (xpi/firefox-i18n-36.0/da.xpi) = 72ae9559bd446bda73c55a68f2ac303156de922bc556189fc22e14e7f69cca9f
+SIZE (xpi/firefox-i18n-36.0/da.xpi) = 439277
+SHA256 (xpi/firefox-i18n-36.0/de.xpi) = 2a4c1040fd493593e0fce33958911a0c0d3778639698f2bf1ce128260e97ffb0
+SIZE (xpi/firefox-i18n-36.0/de.xpi) = 439186
+SHA256 (xpi/firefox-i18n-36.0/dsb.xpi) = 95777787ad81fff28a4cf6776bfde07d4f05d19bfe074ec6c6931a25cd59eaef
+SIZE (xpi/firefox-i18n-36.0/dsb.xpi) = 458446
+SHA256 (xpi/firefox-i18n-36.0/el.xpi) = 4946146b317784bb9a7c8cdaa18a6984e4ccbd0cd5f49a7a86fbc4c780eadaf1
+SIZE (xpi/firefox-i18n-36.0/el.xpi) = 485456
+SHA256 (xpi/firefox-i18n-36.0/en-GB.xpi) = 1a34efc2cdcaf3bfa280f78bf354868c9bc7c219303a85d5f05e3e0758aa2b1c
+SIZE (xpi/firefox-i18n-36.0/en-GB.xpi) = 429599
+SHA256 (xpi/firefox-i18n-36.0/en-US.xpi) = 3cdf9a797f0f6ad73ba37dc6755873fb9b0c6efed95ace223ea19db8cfd703dc
+SIZE (xpi/firefox-i18n-36.0/en-US.xpi) = 458576
+SHA256 (xpi/firefox-i18n-36.0/en-ZA.xpi) = 176fbf07b20b0d16253840a8bf11988b38d8b4f3f561471cbde6283fa6bd22df
+SIZE (xpi/firefox-i18n-36.0/en-ZA.xpi) = 425587
+SHA256 (xpi/firefox-i18n-36.0/eo.xpi) = 2b5878ede3a3e86f3e43b99ba7ad18c6c524a06f214c4d52cd20ff001ece9b33
+SIZE (xpi/firefox-i18n-36.0/eo.xpi) = 473724
+SHA256 (xpi/firefox-i18n-36.0/es-AR.xpi) = 969db2e6097ba3d42c78950357d47ecf68c4ea79c68717d89caedf9ef3377706
+SIZE (xpi/firefox-i18n-36.0/es-AR.xpi) = 442479
+SHA256 (xpi/firefox-i18n-36.0/es-CL.xpi) = 4203bb8da5c14f000e8ca497bb837df2f293aa4f092517f48308b85a45b23160
+SIZE (xpi/firefox-i18n-36.0/es-CL.xpi) = 377184
+SHA256 (xpi/firefox-i18n-36.0/es-ES.xpi) = 924cbd65e596041a3bce0ffbf6092984667cd9d3a6e3d7ffdaba8bf4dd24d907
+SIZE (xpi/firefox-i18n-36.0/es-ES.xpi) = 366986
+SHA256 (xpi/firefox-i18n-36.0/es-MX.xpi) = 2f775bf2d9789e5d1e442d1ae115d8ad1fa864a6ab90ab66a0ea695f60cf4002
+SIZE (xpi/firefox-i18n-36.0/es-MX.xpi) = 444969
+SHA256 (xpi/firefox-i18n-36.0/et.xpi) = e942c03a1bcf91bbb1f9e7341737e0fa5d650b9f82da6bba819e470786ce016f
+SIZE (xpi/firefox-i18n-36.0/et.xpi) = 431611
+SHA256 (xpi/firefox-i18n-36.0/eu.xpi) = c1a81882e556e006de17fe5f0d4f22b9ba318ab996e3571250bf121f5c2de65d
+SIZE (xpi/firefox-i18n-36.0/eu.xpi) = 454739
+SHA256 (xpi/firefox-i18n-36.0/fa.xpi) = fdf3dc1150d3c617389b45289b54557bd9a07b259d6491cea66bdfa5456e70ef
+SIZE (xpi/firefox-i18n-36.0/fa.xpi) = 500877
+SHA256 (xpi/firefox-i18n-36.0/ff.xpi) = 932423f857ab0f439bd8138df336c05bf32b171bede93ee0fea4770d5f71e4ce
+SIZE (xpi/firefox-i18n-36.0/ff.xpi) = 442341
+SHA256 (xpi/firefox-i18n-36.0/fi.xpi) = d5b713efe726d68c166a49aa67868aaf5715a67f949863fff932c7a627412a39
+SIZE (xpi/firefox-i18n-36.0/fi.xpi) = 433370
+SHA256 (xpi/firefox-i18n-36.0/fr.xpi) = c6bbbf5d2b635ec567db1cc05650b14ac8256d27473b97d423cd70c70d57a1f9
+SIZE (xpi/firefox-i18n-36.0/fr.xpi) = 449176
+SHA256 (xpi/firefox-i18n-36.0/fy-NL.xpi) = e6fc2b29943ff8f6385bb3bd4ca910b95ca209e20d2489ca8aa22fb022026f10
+SIZE (xpi/firefox-i18n-36.0/fy-NL.xpi) = 443804
+SHA256 (xpi/firefox-i18n-36.0/ga-IE.xpi) = 6877683181a84d74b19d0a58fa31c6e4e1c4b4c9b2334ba72f7aee43caa11bdf
+SIZE (xpi/firefox-i18n-36.0/ga-IE.xpi) = 453000
+SHA256 (xpi/firefox-i18n-36.0/gd.xpi) = 4849d0820b282b0cf742d9fc58998b048b84c59ffac769b1f7275feda387820f
+SIZE (xpi/firefox-i18n-36.0/gd.xpi) = 442656
+SHA256 (xpi/firefox-i18n-36.0/gl.xpi) = 2cc9eb858d788467cc163f26c7805d27f23dc2e5c0603b5a35dec0ddc804e723
+SIZE (xpi/firefox-i18n-36.0/gl.xpi) = 433435
+SHA256 (xpi/firefox-i18n-36.0/gu-IN.xpi) = acc3e984a815aa092969e58035814428ee021150f6296d7c92b905f8d570d7f9
+SIZE (xpi/firefox-i18n-36.0/gu-IN.xpi) = 463245
+SHA256 (xpi/firefox-i18n-36.0/he.xpi) = 7428790a185f7d0095f0f03a4037bb68a7cbb11e07a88888ac1ceb5ec6c04f76
+SIZE (xpi/firefox-i18n-36.0/he.xpi) = 473373
+SHA256 (xpi/firefox-i18n-36.0/hi-IN.xpi) = f7455568a3d0ea7aaf6946376acfccdbbfcf4a5e46af80afdeab7893eda39ca0
+SIZE (xpi/firefox-i18n-36.0/hi-IN.xpi) = 493294
+SHA256 (xpi/firefox-i18n-36.0/hr.xpi) = c8d36a29bfae974a5d66c575f879a7c90f35b43d46afb46a766c83ee8d990f41
+SIZE (xpi/firefox-i18n-36.0/hr.xpi) = 466358
+SHA256 (xpi/firefox-i18n-36.0/hsb.xpi) = 3142b835fe8c5c9a418c759d051e8aac8a6bbf57f6585ed178d497b77032935c
+SIZE (xpi/firefox-i18n-36.0/hsb.xpi) = 456351
+SHA256 (xpi/firefox-i18n-36.0/hu.xpi) = 443282070539cdb96b424d2ce477ff3504dbc8ba96fa4829f36a2cf42cb37558
+SIZE (xpi/firefox-i18n-36.0/hu.xpi) = 441328
+SHA256 (xpi/firefox-i18n-36.0/hy-AM.xpi) = 841759da124a761ce98056b4e7f08fc5410679815fbb2b4208692d52ae7e240c
+SIZE (xpi/firefox-i18n-36.0/hy-AM.xpi) = 522155
+SHA256 (xpi/firefox-i18n-36.0/id.xpi) = 49b917ce728d025ea8d7c37c6fb2a08cb1d63cac78d5804ea7efd20ebd827b75
+SIZE (xpi/firefox-i18n-36.0/id.xpi) = 419615
+SHA256 (xpi/firefox-i18n-36.0/is.xpi) = 6c4f2567b7f498c040152afeca9586a5602dafdbbd927f242c7e2980d5d48aa7
+SIZE (xpi/firefox-i18n-36.0/is.xpi) = 473419
+SHA256 (xpi/firefox-i18n-36.0/it.xpi) = b425b23765c451f1514b45c0a0849a3b6b092b1f4835f6d862608e048d58c956
+SIZE (xpi/firefox-i18n-36.0/it.xpi) = 361315
+SHA256 (xpi/firefox-i18n-36.0/ja.xpi) = a88b6e10266962bdcfdb3d3e82c92e390e3cfba1b97e3fa0e3aa857a5d67fbd5
+SIZE (xpi/firefox-i18n-36.0/ja.xpi) = 465475
+SHA256 (xpi/firefox-i18n-36.0/kk.xpi) = c325bd8fa08de23ff056e74afbec7cf8a9cad5850744bfe90661ac64fa8eede0
+SIZE (xpi/firefox-i18n-36.0/kk.xpi) = 490170
+SHA256 (xpi/firefox-i18n-36.0/km.xpi) = 192c31a7695f416a12be2f606bc2b59be2613c545b225aae323a3ed3ffcb7430
+SIZE (xpi/firefox-i18n-36.0/km.xpi) = 550764
+SHA256 (xpi/firefox-i18n-36.0/kn.xpi) = 44d2f08ea69e79dbdb511b623d133b8a3e2891c04143cab06cc7dd0c82f6fd7f
+SIZE (xpi/firefox-i18n-36.0/kn.xpi) = 516616
+SHA256 (xpi/firefox-i18n-36.0/ko.xpi) = 754cbea379d94a868de9a77982da90f519b6ff5491da580d5a95a74886958127
+SIZE (xpi/firefox-i18n-36.0/ko.xpi) = 448220
+SHA256 (xpi/firefox-i18n-36.0/lij.xpi) = 151c2fd633588e12f12fb154ee3fb569a1a7e9e4ec5c16165b1e5ac7854455ba
+SIZE (xpi/firefox-i18n-36.0/lij.xpi) = 430850
+SHA256 (xpi/firefox-i18n-36.0/lt.xpi) = c80b2a0795988f44b6e2d4f9eca3a783546c2a69a41b28989cc9beb41a180d8a
+SIZE (xpi/firefox-i18n-36.0/lt.xpi) = 474005
+SHA256 (xpi/firefox-i18n-36.0/lv.xpi) = 32ba58d5aa0366153f8d40248df0f908d7aa50e64634dbfafd48aaf79dc47fa0
+SIZE (xpi/firefox-i18n-36.0/lv.xpi) = 436231
+SHA256 (xpi/firefox-i18n-36.0/mai.xpi) = 28b87412915594d73c828570508667ebe6d5bd54252149505daf5624df9b6bb9
+SIZE (xpi/firefox-i18n-36.0/mai.xpi) = 485633
+SHA256 (xpi/firefox-i18n-36.0/mk.xpi) = 3c3b68be839f5e1b9e009731d4638c447619c29dbfb1bf5fb415c7a75d59f43e
+SIZE (xpi/firefox-i18n-36.0/mk.xpi) = 516378
+SHA256 (xpi/firefox-i18n-36.0/ml.xpi) = 7065016988d6e5aebf27f61dd751ea1891de2a9f663f9c568bf9a04f66a7e1d2
+SIZE (xpi/firefox-i18n-36.0/ml.xpi) = 514512
+SHA256 (xpi/firefox-i18n-36.0/mr.xpi) = aa0bb5c96f9dc644474bf8ac3fe12c5cb4b238eb71e0574b012ac505c5f0d6b4
+SIZE (xpi/firefox-i18n-36.0/mr.xpi) = 495229
+SHA256 (xpi/firefox-i18n-36.0/ms.xpi) = be324d26387defba52f301e977d25ee851ae775c698f44b28b2bd8ed75454eb7
+SIZE (xpi/firefox-i18n-36.0/ms.xpi) = 478247
+SHA256 (xpi/firefox-i18n-36.0/nb-NO.xpi) = fc4c6a33ad10ec6b2cfee793be6a080c24e20bf6dbcf34d52379c4d787d52e55
+SIZE (xpi/firefox-i18n-36.0/nb-NO.xpi) = 432555
+SHA256 (xpi/firefox-i18n-36.0/nl.xpi) = fe585a4ee308e7551528f6179659d97bc22927d737b9704df1207512d9965c8f
+SIZE (xpi/firefox-i18n-36.0/nl.xpi) = 432347
+SHA256 (xpi/firefox-i18n-36.0/nn-NO.xpi) = 07915e0bcf316176304e3947959669e357d356d883370635e5d9ed20d828facf
+SIZE (xpi/firefox-i18n-36.0/nn-NO.xpi) = 426609
+SHA256 (xpi/firefox-i18n-36.0/or.xpi) = d68be584c618bbb88de313fe7aa79e152d03afaf7b4a310a138cb6946dbd2a14
+SIZE (xpi/firefox-i18n-36.0/or.xpi) = 512011
+SHA256 (xpi/firefox-i18n-36.0/pa-IN.xpi) = d238714ca266ab3229b75f01156dde7805129c75875face9126fb9b3dd0a727f
+SIZE (xpi/firefox-i18n-36.0/pa-IN.xpi) = 481891
+SHA256 (xpi/firefox-i18n-36.0/pl.xpi) = c1f25fc40373e6ba2159e14a490924a98fdd9db9584be0122170de9f9e979d5d
+SIZE (xpi/firefox-i18n-36.0/pl.xpi) = 402048
+SHA256 (xpi/firefox-i18n-36.0/pt-BR.xpi) = 626a9532870a64e47523bf7748b1e4683acc3cab34495834964f6cfffc773a6c
+SIZE (xpi/firefox-i18n-36.0/pt-BR.xpi) = 447670
+SHA256 (xpi/firefox-i18n-36.0/pt-PT.xpi) = f7b27668738a2477a83a5df1b2003203f26ad935baf04350258dd0e50a3179a2
+SIZE (xpi/firefox-i18n-36.0/pt-PT.xpi) = 428706
+SHA256 (xpi/firefox-i18n-36.0/rm.xpi) = 6aa5ca5edce8fd7c8c50fc3619fa1330c24c41860bd7478b52ad22ef72d6b596
+SIZE (xpi/firefox-i18n-36.0/rm.xpi) = 443938
+SHA256 (xpi/firefox-i18n-36.0/ro.xpi) = 610c91311bc3fc4a9f02290e6c4cff84de2c54bd9c0e9d597301c41a9c748728
+SIZE (xpi/firefox-i18n-36.0/ro.xpi) = 483569
+SHA256 (xpi/firefox-i18n-36.0/ru.xpi) = 5a91999701123df52521d52b8d2e1b3867ea7b93d9af834bf1928779653de630
+SIZE (xpi/firefox-i18n-36.0/ru.xpi) = 406023
+SHA256 (xpi/firefox-i18n-36.0/si.xpi) = 85e56491869f3b861f3c778a86fc18a79595427189c029217b7dc4860d1067c9
+SIZE (xpi/firefox-i18n-36.0/si.xpi) = 514744
+SHA256 (xpi/firefox-i18n-36.0/sk.xpi) = 75fbfbae54e2cfd51482c1ffc209907b0e3daa5a2f37fd5d432aecd6b0984755
+SIZE (xpi/firefox-i18n-36.0/sk.xpi) = 457188
+SHA256 (xpi/firefox-i18n-36.0/sl.xpi) = d35efe90a6ee3c5afd9a7032d5851235b0001fb3016da9833b59761755a5205f
+SIZE (xpi/firefox-i18n-36.0/sl.xpi) = 429928
+SHA256 (xpi/firefox-i18n-36.0/son.xpi) = 4d94b8ccf453b8b0fd8f396e98559da0943b4c0e451824155a4b760f385324cd
+SIZE (xpi/firefox-i18n-36.0/son.xpi) = 436770
+SHA256 (xpi/firefox-i18n-36.0/sq.xpi) = 0aebcc7ae2f32589c7ef11fb55df0b796c57332556fecc7468e65daa4905705b
+SIZE (xpi/firefox-i18n-36.0/sq.xpi) = 474053
+SHA256 (xpi/firefox-i18n-36.0/sr.xpi) = 49576b448555aee4601c3af5f68a45016655c7aaf705d7b705541491415f2e5d
+SIZE (xpi/firefox-i18n-36.0/sr.xpi) = 467364
+SHA256 (xpi/firefox-i18n-36.0/sv-SE.xpi) = a08c3659a9cbb07de8e3fd105af433452b704f72306bf801cf8f47824dc5b3a9
+SIZE (xpi/firefox-i18n-36.0/sv-SE.xpi) = 440719
+SHA256 (xpi/firefox-i18n-36.0/ta.xpi) = 81913b1572d6d7ed7495d44ab98d96364a22b5ae61c9375740ad903d3a7eb23c
+SIZE (xpi/firefox-i18n-36.0/ta.xpi) = 493859
+SHA256 (xpi/firefox-i18n-36.0/te.xpi) = c6fdf3b58724cf0c9ec999581bb2f67e0fc64508de6eeae3d08f4e3a1f87b2a2
+SIZE (xpi/firefox-i18n-36.0/te.xpi) = 513695
+SHA256 (xpi/firefox-i18n-36.0/th.xpi) = 4647d4495928b714491c2c2dbb25597084b31beb0eea74cdb26b0e3e8b543185
+SIZE (xpi/firefox-i18n-36.0/th.xpi) = 521630
+SHA256 (xpi/firefox-i18n-36.0/tr.xpi) = 28f84849c106de0bd32d55af483b80c262744694f437130b0209021ecec797b1
+SIZE (xpi/firefox-i18n-36.0/tr.xpi) = 468961
+SHA256 (xpi/firefox-i18n-36.0/uk.xpi) = e31a1863a8789ef65a5fe7fe7d7536928ce88b431689970cf6aee496a8645154
+SIZE (xpi/firefox-i18n-36.0/uk.xpi) = 469172
+SHA256 (xpi/firefox-i18n-36.0/vi.xpi) = 038708d081c6b5199046b456154a55bef4166a89b536f1efd3141c7cdfcb0000
+SIZE (xpi/firefox-i18n-36.0/vi.xpi) = 454446
+SHA256 (xpi/firefox-i18n-36.0/xh.xpi) = 56f2cdd3b6e6fed9afd150a32234de8ffcd55da1ec58d2c5cd4b30dda68a9c73
+SIZE (xpi/firefox-i18n-36.0/xh.xpi) = 436240
+SHA256 (xpi/firefox-i18n-36.0/zh-CN.xpi) = 58016e2f50536c48f2be10f8cbba49c39f2195c92cced4cd27ff8625ed63a127
+SIZE (xpi/firefox-i18n-36.0/zh-CN.xpi) = 475834
+SHA256 (xpi/firefox-i18n-36.0/zh-TW.xpi) = 1b383472774b35333622cf528f2d40ef00796795e876cfda233a86c262aea2fe
+SIZE (xpi/firefox-i18n-36.0/zh-TW.xpi) = 455305
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 28f6017f4257..9b48f2708163 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -2,19 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	35.0.1
+DISTVERSION=	36.0
 DISTVERSIONSUFFIX=.source
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source/
+		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source/
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.10.6:${PORTSDIR}/devel/nspr \
-		nss>=3.17.2:${PORTSDIR}/security/nss \
+		nss>=3.17.4:${PORTSDIR}/security/nss \
 		libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
 		cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \
 		soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
@@ -23,7 +22,7 @@ BUILD_DEPENDS=	nspr>=4.10.6:${PORTSDIR}/devel/nspr \
 		libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
 		opus>=1.1:${PORTSDIR}/audio/opus \
 		libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
-		sqlite3>=3.8.6:${PORTSDIR}/databases/sqlite3 \
+		sqlite3>=3.8.7.4:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
 		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options
index b353629130e1..a0c4b7ca95d1 100644
--- a/www/firefox/Makefile.options
+++ b/www/firefox/Makefile.options
@@ -7,9 +7,7 @@ OPTIONS_DEFAULT+=	ALSA DBUS GIO GSTREAMER LOGGING OPTIMIZED_CFLAGS
 OPTIONS_MULTI+=		AUDIO
 OPTIONS_MULTI_AUDIO=	ALSA PULSEAUDIO
 
-DTRACE_DESC?=		Build with DTrace probes # move to bsd.options.desc.mk
 ENIGMAIL_DESC?=		Enigmail extension
-GIO_DESC?=		GIO for file I/O # move to bsd.options.desc.mk
 GNOMEUI_DESC?=		libgnomeui support module
 LIBPROXY_DESC?=		Proxy support via libproxy
 LIGHTNING_DESC?=	Calendar extension
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index fb7711d8eff1..dd4c88ed5045 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-35.0.1.source.tar.bz2) = c92b34e08e39e2d482a61194e79255478331a54bf86bf144dc38f3d4bfbc507a
-SIZE (firefox-35.0.1.source.tar.bz2) = 176276361
+SHA256 (firefox-36.0.source.tar.bz2) = 54c8e44b773c0cae885b2be0dc7d2421d2050206cdb0f00d376492d7cf9d5b20
+SIZE (firefox-36.0.source.tar.bz2) = 400388435
diff --git a/www/firefox/files/patch-bug1013882 b/www/firefox/files/patch-bug1013882
index 86dc379fe50f..b3177989a39e 100644
--- a/www/firefox/files/patch-bug1013882
+++ b/www/firefox/files/patch-bug1013882
@@ -30,14 +30,14 @@ diff --git browser/installer/package-manifest.in browser/installer/package-manif
 index b509fd4..195345c 100644
 --- browser/installer/package-manifest.in
 +++ browser/installer/package-manifest.in
-@@ -583,7 +583,7 @@
- @BINPATH@/components/MozKeyboard.js
- @BINPATH@/components/InputMethod.manifest
+@@ -608,7 +608,7 @@
+ @RESPATH@/components/MozKeyboard.js
+ @RESPATH@/components/InputMethod.manifest
  
 -#ifdef MOZ_DEBUG
 +#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
- @BINPATH@/components/TestInterfaceJS.js
- @BINPATH@/components/TestInterfaceJS.manifest
+ @RESPATH@/components/TestInterfaceJS.js
+ @RESPATH@/components/TestInterfaceJS.manifest
  #endif
 diff --git mobile/android/installer/Makefile.in mobile/android/installer/Makefile.in
 index 96dceab..3528ad6 100644
diff --git a/www/firefox/files/patch-bug1021761 b/www/firefox/files/patch-bug1021761
index e8721fa8806f..74a5d7a30f61 100644
--- a/www/firefox/files/patch-bug1021761
+++ b/www/firefox/files/patch-bug1021761
@@ -2,7 +2,7 @@ diff --git configure.in configure.in
 index 48e60c0..ec08417 100644
 --- configure.in
 +++ 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
 --- media/libcubeb/AUTHORS
@@ -660,7 +643,7 @@ new file mode 100644
 index 0000000..5e38e27
 --- /dev/null
 +++ media/libcubeb/src/cubeb_oss.c
-@@ -0,0 +1,404 @@
+@@ -0,0 +1,402 @@
 +/*
 + * Copyright © 2014 Mozilla Foundation
 + *
@@ -669,8 +652,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
@@ -1089,17 +1070,33 @@ 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/moz.build media/webrtc/signaling/test/moz.build
+index 991f03f..3d99eb5 100644
+--- media/webrtc/signaling/test/moz.build
++++ media/webrtc/signaling/test/moz.build
+@@ -112,8 +112,8 @@ if CONFIG['JS_SHARED_LIBRARY']:
+ OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
+ OS_LIBS += CONFIG['REALTIME_LIBS']
+ 
+-if CONFIG['MOZ_ALSA']:
+-    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
++if CONFIG['MOZ_OSS']:
++    OS_LIBS += CONFIG['MOZ_OSS_LIBS']
+ 
+ if CONFIG['MOZ_NATIVE_JPEG']:
+     OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
 diff --git toolkit/library/moz.build toolkit/library/moz.build
 index e191f13..4fb268a 100644
 --- toolkit/library/moz.build
 +++ toolkit/library/moz.build
-@@ -239,6 +239,9 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
+@@ -234,8 +234,8 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
  if not CONFIG['MOZ_TREE_PIXMAN']:
      OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
  
+-if CONFIG['MOZ_ALSA']:
+-    OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
 +if CONFIG['MOZ_OSS']:
 +    OS_LIBS += CONFIG['MOZ_OSS_LIBS']
-+
- if CONFIG['MOZ_ALSA']:
-     OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
  
+ if CONFIG['HAVE_CLOCK_MONOTONIC']:
+     OS_LIBS += CONFIG['REALTIME_LIBS']
diff --git a/www/firefox/files/patch-bug1041795 b/www/firefox/files/patch-bug1041795
deleted file mode 100644
index 3e92884412fb..000000000000
--- a/www/firefox/files/patch-bug1041795
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git config/rules.mk config/rules.mk
-index 4d67eda..783942f 100644
---- config/rules.mk
-+++ config/rules.mk
-@@ -858,7 +858,7 @@ ifdef DTRACE_PROBE_OBJ
- ifndef DTRACE_LIB_DEPENDENT
- NON_DTRACE_OBJS := $(filter-out $(DTRACE_PROBE_OBJ),$(OBJS))
- $(DTRACE_PROBE_OBJ): $(NON_DTRACE_OBJS)
--	dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS)
-+	dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS)
- endif
- endif
- endif
-@@ -876,7 +876,7 @@ ifndef INCREMENTAL_LINKER
- endif
- ifdef DTRACE_LIB_DEPENDENT
- ifndef XP_MACOSX
--	dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o  $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
-+	dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o  $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
- endif
- 	$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS))
- 	@$(RM) $(DTRACE_PROBE_OBJ)
-diff --git js/src/Makefile.in js/src/Makefile.in
-index 28ca5e8..96793d7 100644
---- js/src/Makefile.in
-+++ js/src/Makefile.in
-@@ -342,7 +342,7 @@ endif
- 
- ifdef HAVE_DTRACE
- $(CURDIR)/javascript-trace.h: $(srcdir)/devtools/javascript-trace.d
--	dtrace -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in
-+	dtrace -x nolibs -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in
- 	sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
- 	    -e '/const/!s/char \*/const char */g' \
- 	    javascript-trace.h.in > javascript-trace.h
-diff --git probes/Makefile.in probes/Makefile.in
-index 6d18f34..deec83f 100644
---- probes/Makefile.in
-+++ probes/Makefile.in
-@@ -7,7 +7,7 @@ export:: $(DIST)/include/mozilla-trace.h
- 
- # Replace _DTRACE_VERSION with INCLUDE_MOZILLA_DTRACE
- $(DIST)/include/mozilla-trace.h: mozilla-trace.d Makefile
--	dtrace -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp
-+	dtrace -x nolibs -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp
- 	sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
- 	    mozilla-trace.h.tmp > $(DIST)/include/mozilla-trace.h
- 	rm mozilla-trace.h.tmp
diff --git a/www/firefox/files/patch-bug1082199 b/www/firefox/files/patch-bug1082199
deleted file mode 100644
index a10356adaa5b..000000000000
--- a/www/firefox/files/patch-bug1082199
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 258ec90
-Author: Guilherme Goncalves <guilherme.p.gonc@gmail.com>
-Date:   Fri Oct 17 15:55:00 2014 +0200
-
-    Bug 1082199 - Recompute stats in jemalloc_stats when using jemalloc3. r=glandium
----
- memory/build/mozjemalloc_compat.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c
-index 78bb13a..70265a7 100644
---- memory/build/mozjemalloc_compat.c
-+++ memory/build/mozjemalloc_compat.c
-@@ -68,6 +68,12 @@ jemalloc_stats_impl(jemalloc_stats_t *stats)
-   size_t active, allocated, mapped, page, pdirty;
-   size_t lg_chunk;
- 
-+  // Refresh jemalloc's stats by updating its epoch, see ctl_refresh in
-+  // src/ctl.c
-+  uint64_t epoch = 0;
-+  size_t esz = sizeof(epoch);
-+  int ret = je_(mallctl)("epoch", &epoch, &esz, &epoch, esz);
-+
-   CTL_GET("arenas.narenas", narenas);
-   CTL_GET("arenas.page", page);
-   CTL_GET("stats.active", active);
diff --git a/www/firefox/files/patch-bug1083461 b/www/firefox/files/patch-bug1083461
deleted file mode 100644
index 4c253cccdef1..000000000000
--- a/www/firefox/files/patch-bug1083461
+++ /dev/null
@@ -1,159 +0,0 @@
-commit 87f367b
-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
-    
-    --HG--
-    extra : transplant_source : %CD%5D%9BE%FE%DE%A4%F2%B8%CF%D7%AE%84%90%3B%E8%A0d%D7%2B
----
- layout/style/StyleAnimationValue.cpp |  6 ++++--
- layout/style/nsCSSValue.cpp          | 28 ++++++++++++++++------------
- layout/style/nsCSSValue.h            | 22 ++++++++++++++++------
- 3 files changed, 36 insertions(+), 20 deletions(-)
-
-diff --git layout/style/StyleAnimationValue.cpp layout/style/StyleAnimationValue.cpp
-index 40bc8bf..1898fe6 100644
---- layout/style/StyleAnimationValue.cpp
-+++ layout/style/StyleAnimationValue.cpp
-@@ -3851,11 +3851,13 @@ StyleAnimationValue::operator==(const StyleAnimationValue& 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 layout/style/nsCSSValue.cpp layout/style/nsCSSValue.cpp
-index dcb8496..fefb4f9 100644
---- layout/style/nsCSSValue.cpp
-+++ layout/style/nsCSSValue.cpp
-@@ -264,13 +264,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;
-@@ -1875,13 +1876,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;
-@@ -1934,8 +1937,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
-@@ -2148,13 +2150,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 8418a2d..f0c4e63 100644
---- layout/style/nsCSSValue.h
-+++ layout/style/nsCSSValue.h
-@@ -871,9 +871,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;
- 
-@@ -886,6 +885,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
-@@ -1264,9 +1269,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;
- 
-@@ -1280,6 +1284,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 a/www/firefox/files/patch-bug1097592 b/www/firefox/files/patch-bug1097592
deleted file mode 100644
index 5c1833b60688..000000000000
--- a/www/firefox/files/patch-bug1097592
+++ /dev/null
@@ -1,41 +0,0 @@
-commit a822f9a
-Author: Martin Stransky <stransky@redhat.com>
-Date:   Fri Nov 14 06:32:00 2014 +0100
-
-    Bug 1097592 - Don't use PR_FindFunctionSymbolAndLibrary to avoid app freeze, r=karlt
----
- widget/gtk/mozgtk/mozgtk.c | 1 +
- widget/gtk/nsWindow.cpp    | 8 +-------
- 2 files changed, 2 insertions(+), 7 deletions(-)
-
-diff --git widget/gtk/mozgtk/mozgtk.c widget/gtk/mozgtk/mozgtk.c
-index 11829d7..3b46759 100644
---- widget/gtk/mozgtk/mozgtk.c
-+++ widget/gtk/mozgtk/mozgtk.c
-@@ -121,6 +121,7 @@ STUB(gdk_x11_lookup_xdisplay)
- STUB(gdk_x11_screen_get_xscreen)
- STUB(gdk_x11_visual_get_xvisual)
- STUB(gdk_x11_window_lookup_for_display)
-+STUB(gdk_x11_window_set_user_time)
- STUB(gdk_x11_xatom_to_atom)
- STUB(gtk_accel_label_new)
- STUB(gtk_alignment_get_type)
-diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp
-index 26c333b..d462f13 100644
---- widget/gtk/nsWindow.cpp
-+++ widget/gtk/nsWindow.cpp
-@@ -1295,13 +1295,7 @@ SetUserTimeAndStartupIDForActivatedWindow(GtkWidget* aWindow)
-     }
- 
-     if (sn_launchee_context_get_id_has_timestamp(ctx)) {
--        PRLibrary* gtkLibrary;
--        SetUserTimeFunc setUserTimeFunc = (SetUserTimeFunc)
--            PR_FindFunctionSymbolAndLibrary("gdk_x11_window_set_user_time", &gtkLibrary);
--        if (setUserTimeFunc) {
--            setUserTimeFunc(gdkWindow, sn_launchee_context_get_timestamp(ctx));
--            PR_UnloadLibrary(gtkLibrary);
--        }
-+        gdk_x11_window_set_user_time(gdkWindow, sn_launchee_context_get_timestamp(ctx));
-     }
- 
-     sn_launchee_context_setup_window(ctx, gdk_x11_window_get_xid(gdkWindow));
diff --git a/www/firefox/files/patch-bug1122547 b/www/firefox/files/patch-bug1122547
new file mode 100644
index 000000000000..ce65ec961912
--- /dev/null
+++ b/www/firefox/files/patch-bug1122547
@@ -0,0 +1,20 @@
+diff --git media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc
+index e68a104..a090241 100644
+--- media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc
++++ media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc
+@@ -159,12 +159,13 @@ VCMEncodedFrame* VCMReceiver::FrameForDecoding(
+   // Assume that render timing errors are due to changes in the video stream.
+   if (next_render_time_ms < 0) {
+     timing_error = true;
+-  } else if (std::abs(next_render_time_ms - now_ms) > max_video_delay_ms_) {
++  } else if (std::abs(static_cast<int>(next_render_time_ms - now_ms)) >
++             max_video_delay_ms_) {
+     WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideoCoding,
+                  VCMId(vcm_id_, receiver_id_),
+                  "This frame is out of our delay bounds, resetting jitter "
+                  "buffer: %d > %d",
+-                 static_cast<int>(std::abs(next_render_time_ms - now_ms)),
++                 std::abs(static_cast<int>(next_render_time_ms - now_ms)),
+                  max_video_delay_ms_);
+     timing_error = true;
+   } else if (static_cast<int>(timing_->TargetVideoDelay()) >
diff --git a/www/firefox/files/patch-bug1122586 b/www/firefox/files/patch-bug1122586
deleted file mode 100644
index 8cb71f14ff03..000000000000
--- a/www/firefox/files/patch-bug1122586
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git content/media/MediaDecoderStateMachine.cpp content/media/MediaDecoderStateMachine.cpp
-index 36a6ccf..96d3bd0 100644
---- content/media/MediaDecoderStateMachine.cpp
-+++ content/media/MediaDecoderStateMachine.cpp
-@@ -18,6 +18,7 @@
- #include "nsTArray.h"
- #include "MediaDecoder.h"
- #include "MediaDecoderReader.h"
-+#include "mozilla/MathAlgorithms.h"
- #include "mozilla/mozalloc.h"
- #include "VideoUtils.h"
- #include "mozilla/dom/TimeRanges.h"
-@@ -165,7 +166,7 @@ static_assert(QUICK_BUFFERING_LOW_DATA_USECS <= AMPLE_AUDIO_USECS,
- // MediaDecoderStateMachine::UpdateEstimatedDuration(); changes of duration
- // less than this are ignored, as they're assumed to be the result of
- // instability in the duration estimation.
--static const int64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
-+static const uint64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
- 
- static TimeDuration UsecsToDuration(int64_t aUsecs) {
-   return TimeDuration::FromMicroseconds(aUsecs);
-@@ -1447,7 +1448,7 @@ void MediaDecoderStateMachine::UpdateEstimatedDuration(int64_t aDuration)
-   AssertCurrentThreadInMonitor();
-   int64_t duration = GetDuration();
-   if (aDuration != duration &&
--      std::abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) {
-+      mozilla::Abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) {
-     SetDuration(aDuration);
-     nsCOMPtr<nsIRunnable> event =
-       NS_NewRunnableMethod(mDecoder, &MediaDecoder::DurationChanged);
diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568
index 698ee2c498fc..2ffb2dbfb5e8 100644
--- a/www/firefox/files/patch-bug847568
+++ b/www/firefox/files/patch-bug847568
@@ -83,10 +83,10 @@ index ac38f40..87536b7 100644
  dnl Check for pixman and cairo
  dnl ========================================================
  
-diff --git content/base/src/moz.build content/base/src/moz.build
+diff --git dom/base/moz.build dom/base/moz.build
 index a660ba4..6b2f602 100644
---- content/base/src/moz.build
-+++ content/base/src/moz.build
+--- dom/base/moz.build
++++ dom/base/moz.build
 @@ -196,6 +196,9 @@ SOURCES += [
      'nsObjectLoadingContent.cpp',
  ]
@@ -237,6 +237,6 @@ index 67f0db9..d42137a 100644
 +if CONFIG['MOZ_NATIVE_HARFBUZZ']:
 +    OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
 +
- if CONFIG['MOZ_ALSA']:
-     OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
+ if CONFIG['MOZ_OSS']:
+     OS_LIBS += CONFIG['MOZ_OSS_LIBS']
  
diff --git a/www/firefox/files/patch-bug858919 b/www/firefox/files/patch-bug858919
deleted file mode 100644
index e1c38b9ec51e..000000000000
--- a/www/firefox/files/patch-bug858919
+++ /dev/null
@@ -1,394 +0,0 @@
-commit a33d4f7
-Author: Martin Stransky <stransky@redhat.com>
-Date:   Fri Nov 14 04:04:00 2014 +0100
-
-    Bug 858919 - Add support for libnotify calls which was removed for new notification API. r=karlt
----
- toolkit/components/alerts/nsAlertsService.cpp  | 10 +--
- toolkit/system/gnome/moz.build                 |  2 +
- toolkit/system/gnome/nsAlertsIconListener.cpp  | 64 ++++++++++++------
- toolkit/system/gnome/nsAlertsIconListener.h    | 89 ++++++++++++++++++++++++++
- toolkit/system/gnome/nsGnomeModule.cpp         |  5 ++
- toolkit/system/gnome/nsSystemAlertsService.cpp | 54 ++++++++++++++++
- toolkit/system/gnome/nsSystemAlertsService.h   | 27 ++++++++
- 7 files changed, 226 insertions(+), 25 deletions(-)
-
-diff --git toolkit/components/alerts/nsAlertsService.cpp toolkit/components/alerts/nsAlertsService.cpp
-index 93f4536..f8b5e07 100644
---- toolkit/components/alerts/nsAlertsService.cpp
-+++ toolkit/components/alerts/nsAlertsService.cpp
-@@ -100,10 +100,12 @@ NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl
-   nsCOMPtr<nsIAlertsService> sysAlerts(do_GetService(NS_SYSTEMALERTSERVICE_CONTRACTID));
-   nsresult rv;
-   if (sysAlerts) {
--    return sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable,
--                                            aAlertCookie, aAlertListener, aAlertName,
--                                            aBidi, aLang, aData,
--                                            IPC::Principal(aPrincipal));
-+    rv = sysAlerts->ShowAlertNotification(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable,
-+                                          aAlertCookie, aAlertListener, aAlertName,
-+                                          aBidi, aLang, aData,
-+                                          IPC::Principal(aPrincipal));
-+    if (NS_SUCCEEDED(rv))
-+      return NS_OK;
-   }
- 
-   if (!ShouldShowAlert()) {
-diff --git toolkit/system/gnome/moz.build toolkit/system/gnome/moz.build
-index c033f8b..9242209 100644
---- toolkit/system/gnome/moz.build
-+++ toolkit/system/gnome/moz.build
-@@ -5,7 +5,9 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- SOURCES += [
-+    'nsAlertsIconListener.cpp',
-     'nsGnomeModule.cpp',
-+    'nsSystemAlertsService.cpp',
- ]
- 
- if CONFIG['MOZ_ENABLE_GCONF']:
-diff --git toolkit/system/gnome/nsAlertsIconListener.cpp toolkit/system/gnome/nsAlertsIconListener.cpp
-index f39335e..55f4356 100644
---- toolkit/system/gnome/nsAlertsIconListener.cpp
-+++ toolkit/system/gnome/nsAlertsIconListener.cpp
-@@ -51,6 +51,21 @@ static void notify_closed_marshal(GClosure* closure,
-   NS_RELEASE(alert);
- }
- 
-+static GdkPixbuf*
-+GetPixbufFromImgRequest(imgIRequest* aRequest)
-+{
-+  nsCOMPtr<imgIContainer> image;
-+  nsresult rv = aRequest->GetImage(getter_AddRefs(image));
-+  if (NS_FAILED(rv)) {
-+    return nullptr;
-+  }
-+
-+  nsCOMPtr<nsIImageToPixbuf> imgToPixbuf =
-+    do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1");
-+
-+  return imgToPixbuf->ConvertImageToPixbuf(image);
-+}
-+
- NS_IMPL_ISUPPORTS(nsAlertsIconListener, imgINotificationObserver,
-                   nsIObserver, nsISupportsWeakReference)
- 
-@@ -106,47 +121,45 @@ nsAlertsIconListener::Notify(imgIRequest *aRequest, int32_t aType, const nsIntRe
- nsresult
- nsAlertsIconListener::OnStopRequest(imgIRequest* aRequest)
- {
-+  NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!");
-+
-   uint32_t imgStatus = imgIRequest::STATUS_ERROR;
-   nsresult rv = aRequest->GetImageStatus(&imgStatus);
-   NS_ENSURE_SUCCESS(rv, rv);
-   if (imgStatus == imgIRequest::STATUS_ERROR && !mLoadedFrame) {
-     // We have an error getting the image. Display the notification with no icon.
-     ShowAlert(nullptr);
--  }
- 
--  if (mIconRequest) {
-+    // Cancel any pending request
-     mIconRequest->Cancel(NS_BINDING_ABORTED);
-     mIconRequest = nullptr;
-   }
-+
-   return NS_OK;
- }
- 
- nsresult
- nsAlertsIconListener::OnStopFrame(imgIRequest* aRequest)
- {
--  if (aRequest != mIconRequest)
--    return NS_ERROR_FAILURE;
-+  NS_ASSERTION(mIconRequest == aRequest, "aRequest does not match!");
- 
-   if (mLoadedFrame)
-     return NS_OK; // only use one frame
- 
--  nsCOMPtr<imgIContainer> image;
--  nsresult rv = aRequest->GetImage(getter_AddRefs(image));
--  if (NS_FAILED(rv))
--    return rv;
--
--  nsCOMPtr<nsIImageToPixbuf> imgToPixbuf =
--    do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1");
--
--  GdkPixbuf* imagePixbuf = imgToPixbuf->ConvertImageToPixbuf(image);
--  if (!imagePixbuf)
--    return NS_ERROR_FAILURE;
-+  GdkPixbuf* imagePixbuf = GetPixbufFromImgRequest(aRequest);
-+  if (!imagePixbuf) {
-+    ShowAlert(nullptr);
-+  } else {
-+    ShowAlert(imagePixbuf);
-+    g_object_unref(imagePixbuf);
-+  }
- 
--  ShowAlert(imagePixbuf);
-+  mLoadedFrame = true;
- 
--  g_object_unref(imagePixbuf);
-+  // Cancel any pending request (multipart image loading/decoding for instance)
-+  mIconRequest->Cancel(NS_BINDING_ABORTED);
-+  mIconRequest = nullptr;
- 
--  mLoadedFrame = true;
-   return NS_OK;
- }
- 
-@@ -180,6 +193,9 @@ nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf)
-   mClosureHandler = g_signal_connect_closure(mNotification, "closed", closure, FALSE);
-   gboolean result = notify_notification_show(mNotification, nullptr);
- 
-+  if (result && mAlertListener)
-+    mAlertListener->Observe(nullptr, "alertshow", mAlertCookie.get());
-+
-   return result ? NS_OK : NS_ERROR_FAILURE;
- }
- 
-@@ -201,9 +217,15 @@ nsAlertsIconListener::StartRequest(const nsAString & aImageUrl)
-   if (!il)
-     return ShowAlert(nullptr);
- 
--  return il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr,
--                            this, nullptr, nsIRequest::LOAD_NORMAL, nullptr,
--                            nullptr, getter_AddRefs(mIconRequest));
-+  nsresult rv = il->LoadImageXPCOM(imageUri, nullptr, nullptr, nullptr, nullptr,
-+                                   this, nullptr, nsIRequest::LOAD_NORMAL, nullptr,
-+                                   0 /* use default */, getter_AddRefs(mIconRequest));
-+  if (NS_FAILED(rv))
-+    return rv;
-+
-+  mIconRequest->StartDecoding();
-+
-+  return NS_OK;
- }
- 
- void
-diff --git toolkit/system/gnome/nsAlertsIconListener.h toolkit/system/gnome/nsAlertsIconListener.h
-new file mode 100644
-index 0000000..ac96db9
---- /dev/null
-+++ toolkit/system/gnome/nsAlertsIconListener.h
-@@ -0,0 +1,89 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#ifndef nsAlertsIconListener_h__
-+#define nsAlertsIconListener_h__
-+
-+#include "nsCOMPtr.h"
-+#include "imgINotificationObserver.h"
-+#include "nsStringAPI.h"
-+#include "nsIObserver.h"
-+#include "nsWeakReference.h"
-+
-+#include <gdk-pixbuf/gdk-pixbuf.h>
-+
-+class imgIRequest;
-+
-+struct NotifyNotification;
-+
-+class nsAlertsIconListener : public imgINotificationObserver,
-+                             public nsIObserver,
-+                             public nsSupportsWeakReference
-+{
-+public:
-+  NS_DECL_ISUPPORTS
-+  NS_DECL_IMGINOTIFICATIONOBSERVER
-+  NS_DECL_NSIOBSERVER
-+
-+  nsAlertsIconListener();
-+
-+  nsresult InitAlertAsync(const nsAString & aImageUrl,
-+                          const nsAString & aAlertTitle, 
-+                          const nsAString & aAlertText,
-+                          bool aAlertTextClickable,
-+                          const nsAString & aAlertCookie,
-+                          nsIObserver * aAlertListener);
-+
-+  void SendCallback();
-+  void SendClosed();
-+
-+protected:
-+  virtual ~nsAlertsIconListener();
-+
-+  nsresult OnStopRequest(imgIRequest* aRequest);
-+  nsresult OnStopFrame(imgIRequest* aRequest);
-+
-+  /**
-+   * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols
-+   * is that notify_notification_new takes three arguments in libnotify.so.4 and
-+   * four in libnotify.so.1.
-+   * Passing the fourth argument as NULL is binary compatible.
-+   */
-+  typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer);
-+  typedef bool (*notify_is_initted_t)(void);
-+  typedef bool (*notify_init_t)(const char*);
-+  typedef GList* (*notify_get_server_caps_t)(void);
-+  typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*);
-+  typedef bool (*notify_notification_show_t)(void*, char*);
-+  typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*);
-+  typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc);
-+
-+  nsCOMPtr<imgIRequest> mIconRequest;
-+  nsCString mAlertTitle;
-+  nsCString mAlertText;
-+
-+  nsCOMPtr<nsIObserver> mAlertListener;
-+  nsString mAlertCookie;
-+
-+  bool mLoadedFrame;
-+  bool mAlertHasAction;
-+
-+  static void* libNotifyHandle;
-+  static bool libNotifyNotAvail;
-+  static notify_is_initted_t notify_is_initted;
-+  static notify_init_t notify_init;
-+  static notify_get_server_caps_t notify_get_server_caps;
-+  static notify_notification_new_t notify_notification_new;
-+  static notify_notification_show_t notify_notification_show;
-+  static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf;
-+  static notify_notification_add_action_t notify_notification_add_action;
-+  NotifyNotification* mNotification;
-+  gulong mClosureHandler;
-+
-+  nsresult StartRequest(const nsAString & aImageUrl);
-+  nsresult ShowAlert(GdkPixbuf* aPixbuf);
-+};
-+
-+#endif
-diff --git toolkit/system/gnome/nsGnomeModule.cpp toolkit/system/gnome/nsGnomeModule.cpp
-index 5ccc8e5..f893893 100644
---- toolkit/system/gnome/nsGnomeModule.cpp
-+++ toolkit/system/gnome/nsGnomeModule.cpp
-@@ -22,6 +22,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService)
- NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init)
- #endif
-+#include "nsSystemAlertsService.h"
-+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init)
- 
- #ifdef MOZ_ENABLE_GCONF
- NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID);
-@@ -33,6 +35,7 @@ NS_DEFINE_NAMED_CID(NS_GNOMEVFSSERVICE_CID);
- NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID);
- NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID);
- #endif
-+NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID);
- 
- static const mozilla::Module::CIDEntry kGnomeCIDs[] = {
- #ifdef MOZ_ENABLE_GCONF
-@@ -45,6 +48,7 @@ static const mozilla::Module::CIDEntry kGnomeCIDs[] = {
-   { &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor },
-   { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor },
- #endif
-+  { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor },
-   { nullptr }
- };
- 
-@@ -59,6 +63,7 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = {
-   { NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID },
-   { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID },
- #endif
-+  { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID },
-   { nullptr }
- };
- 
-diff --git toolkit/system/gnome/nsSystemAlertsService.cpp toolkit/system/gnome/nsSystemAlertsService.cpp
-new file mode 100644
-index 0000000..b91b402
---- /dev/null
-+++ toolkit/system/gnome/nsSystemAlertsService.cpp
-@@ -0,0 +1,54 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#include "nsXULAppAPI.h"
-+#include "nsSystemAlertsService.h"
-+#include "nsAlertsIconListener.h"
-+#include "nsAutoPtr.h"
-+
-+NS_IMPL_ADDREF(nsSystemAlertsService)
-+NS_IMPL_RELEASE(nsSystemAlertsService)
-+
-+NS_INTERFACE_MAP_BEGIN(nsSystemAlertsService)
-+   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService)
-+   NS_INTERFACE_MAP_ENTRY(nsIAlertsService)
-+NS_INTERFACE_MAP_END_THREADSAFE
-+
-+nsSystemAlertsService::nsSystemAlertsService()
-+{
-+}
-+
-+nsSystemAlertsService::~nsSystemAlertsService()
-+{}
-+
-+nsresult
-+nsSystemAlertsService::Init()
-+{
-+  return NS_OK;
-+}
-+
-+NS_IMETHODIMP nsSystemAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, 
-+                                                           const nsAString & aAlertText, bool aAlertTextClickable,
-+                                                           const nsAString & aAlertCookie,
-+                                                           nsIObserver * aAlertListener,
-+                                                           const nsAString & aAlertName,
-+                                                           const nsAString & aBidi,
-+                                                           const nsAString & aLang,
-+                                                           const nsAString & aData,
-+                                                           nsIPrincipal * aPrincipal)
-+{
-+  nsRefPtr<nsAlertsIconListener> alertListener = new nsAlertsIconListener();
-+  if (!alertListener)
-+    return NS_ERROR_OUT_OF_MEMORY;
-+
-+  return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable,
-+                                       aAlertCookie, aAlertListener);
-+}
-+
-+NS_IMETHODIMP nsSystemAlertsService::CloseAlert(const nsAString& aAlertName,
-+                                                nsIPrincipal* aPrincipal)
-+{
-+  return NS_ERROR_NOT_IMPLEMENTED;
-+}
-diff --git toolkit/system/gnome/nsSystemAlertsService.h toolkit/system/gnome/nsSystemAlertsService.h
-new file mode 100644
-index 0000000..b0bd625
---- /dev/null
-+++ toolkit/system/gnome/nsSystemAlertsService.h
-@@ -0,0 +1,27 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#ifndef nsSystemAlertsService_h__
-+#define nsSystemAlertsService_h__
-+
-+#include "nsIAlertsService.h"
-+#include "nsCOMPtr.h"
-+
-+class nsSystemAlertsService : public nsIAlertsService
-+{
-+public:
-+  NS_DECL_NSIALERTSSERVICE
-+  NS_DECL_ISUPPORTS
-+
-+  nsSystemAlertsService();
-+
-+  nsresult Init();
-+
-+protected:
-+  virtual ~nsSystemAlertsService();
-+
-+};
-+
-+#endif /* nsSystemAlertsService_h__ */
diff --git a/www/firefox/files/patch-bug991253 b/www/firefox/files/patch-bug991253
index 161feb2ca7b5..73d71610ab03 100644
--- a/www/firefox/files/patch-bug991253
+++ b/www/firefox/files/patch-bug991253
@@ -1,14 +1,16 @@
 --- extensions/spellcheck/hunspell/src/mozHunspell.cpp~
 +++ 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;
diff --git a/www/firefox/files/patch-ijg-libjpeg b/www/firefox/files/patch-ijg-libjpeg
index 406bb1627d6e..6abfc6eeffd7 100644
--- a/www/firefox/files/patch-ijg-libjpeg
+++ b/www/firefox/files/patch-ijg-libjpeg
@@ -51,26 +51,26 @@ index 8fa8200..1d2a259 100644
  
  static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width);
  
-@@ -324,6 +340,7 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount)
-       case JCS_GRAYSCALE:
-       case JCS_RGB:
-       case JCS_YCbCr:
+@@ -367,6 +382,7 @@ nsJPEGDecoder::WriteInternal(const char*
+         case JCS_GRAYSCALE:
+         case JCS_RGB:
+         case JCS_YCbCr:
 +#ifdef JCS_EXTENSIONS
-         // if we're not color managing we can decode directly to
-         // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB
-         if (mCMSMode != eCMSMode_All) {
-@@ -332,6 +349,9 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount)
-         } else {
-             mInfo.out_color_space = JCS_RGB;
-         }
+           // if we're not color managing we can decode directly to
+           // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB
+           if (mCMSMode != eCMSMode_All) {
+@@ -375,6 +391,9 @@ nsJPEGDecoder::WriteInternal(const char*
+           } else {
+               mInfo.out_color_space = JCS_RGB;
+           }
 +#else
-+        mInfo.out_color_space = JCS_RGB;
++          mInfo.out_color_space = JCS_RGB;
 +#endif
-         break;
-       case JCS_CMYK:
-       case JCS_YCCK:
-@@ -399,6 +419,15 @@ nsJPEGDecoder::WriteInternal(const char *aBuffer, uint32_t aCount)
-       return; /* I/O suspension */
+           break;
+         case JCS_CMYK:
+         case JCS_YCCK:
+@@ -433,6 +452,15 @@ nsJPEGDecoder::WriteInternal(const char*
+       return; // I/O suspension
      }
  
 +#ifndef JCS_EXTENSIONS
@@ -83,10 +83,10 @@ index 8fa8200..1d2a259 100644
 +    }
 +#endif
  
-     /* If this is a progressive JPEG ... */
-     mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL;
-@@ -544,7 +573,11 @@ nsJPEGDecoder::OutputScanlines(bool* suspend)
-       uint32_t *imageRow = ((uint32_t*)mImageData) +
+     // If this is a progressive JPEG ...
+     mState = mInfo.buffered_image ?
+@@ -605,7 +633,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus
+       uint32_t* imageRow = ((uint32_t*)mImageData) +
                             (mInfo.output_scanline * mInfo.output_width);
  
 +#ifdef JCS_EXTENSIONS
@@ -94,10 +94,10 @@ index 8fa8200..1d2a259 100644
 +#else
 +      if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) {
 +#endif
-         /* Special case: scanline will be directly converted into packed ARGB */
+         // Special case: scanline will be directly converted into packed ARGB
          if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) {
-           *suspend = true; /* suspend */
-@@ -854,6 +887,282 @@ term_source (j_decompress_ptr jd)
+           *suspend = true; // suspend
+@@ -920,6 +952,282 @@ term_source (j_decompress_ptr jd)
  } // namespace mozilla
  
  
@@ -377,6 +377,6 @@ index 8fa8200..1d2a259 100644
 +#endif
 +
 +
- /**************** Inverted CMYK -> RGB conversion **************/
- /*
-  * Input is (Inverted) CMYK stored as 4 bytes per pixel.
+ ///*************** Inverted CMYK -> RGB conversion *************************
+ /// Input is (Inverted) CMYK stored as 4 bytes per pixel.
+ /// Output is RGB stored as 3 bytes per pixel.
diff --git a/www/firefox/files/patch-system-openh264 b/www/firefox/files/patch-system-openh264
index 3bbabcebf9f8..5215ddb43475 100644
--- a/www/firefox/files/patch-system-openh264
+++ b/www/firefox/files/patch-system-openh264
@@ -1,9 +1,9 @@
 # Revert bug 1045209 to allow using absolute path
 
-diff --git content/media/gmp/GMPChild.cpp content/media/gmp/GMPChild.cpp
+diff --git dom/media/gmp/GMPChild.cpp dom/media/gmp/GMPChild.cpp
 index 1dde3ac..12c88cf 100644
---- content/media/gmp/GMPChild.cpp
-+++ content/media/gmp/GMPChild.cpp
+--- dom/media/gmp/GMPChild.cpp
++++ dom/media/gmp/GMPChild.cpp
 @@ -76,21 +76,14 @@ GetFileBase(const std::string& aPluginPa
    }
  #endif
@@ -30,10 +30,10 @@ index 1dde3ac..12c88cf 100644
    return true;
  }
  
-diff --git content/media/gmp/GMPParent.cpp content/media/gmp/GMPParent.cpp
+diff --git dom/media/gmp/GMPParent.cpp dom/media/gmp/GMPParent.cpp
 index aa60acf..90878ca 100644
---- content/media/gmp/GMPParent.cpp
-+++ content/media/gmp/GMPParent.cpp
+--- dom/media/gmp/GMPParent.cpp
++++ dom/media/gmp/GMPParent.cpp
 @@ -90,23 +90,16 @@
    mService = aService;
    mDirectory = aPluginDir;
diff --git a/www/firefox/files/patch-z-bug517422 b/www/firefox/files/patch-z-bug517422
index 3ec38afb5a23..13432e8deb4f 100644
--- a/www/firefox/files/patch-z-bug517422
+++ b/www/firefox/files/patch-z-bug517422
@@ -268,10 +268,10 @@ index 87db361..7947626 100644
  dnl = Disable VP8 decoder support
  dnl ========================================================
  MOZ_ARG_DISABLE_BOOL(webm,
-diff --git content/media/AudioStream.h content/media/AudioStream.h
+diff --git dom/media/AudioStream.h dom/media/AudioStream.h
 index 085676d..00c54fb 100644
---- content/media/AudioStream.h
-+++ content/media/AudioStream.h
+--- dom/media/AudioStream.h
++++ dom/media/AudioStream.h
 @@ -17,7 +17,7 @@
  #include "CubebUtils.h"
  
@@ -281,10 +281,10 @@ index 085676d..00c54fb 100644
  }
  
  namespace mozilla {
-diff --git content/media/moz.build content/media/moz.build
+diff --git dom/media/moz.build dom/media/moz.build
 index 7526cff..e0a0ca0 100644
---- content/media/moz.build
-+++ content/media/moz.build
+--- dom/media/moz.build
++++ dom/media/moz.build
 @@ -212,3 +212,24 @@ if CONFIG['ANDROID_VERSION'] > '15':
  
  CFLAGS += CONFIG['GSTREAMER_CFLAGS']
@@ -382,9 +382,9 @@ diff --git media/libtheora/moz.build media/libtheora/moz.build
 index 14265b1..3069e99 100644
 --- media/libtheora/moz.build
 +++ media/libtheora/moz.build
-@@ -6,3 +6,5 @@
- 
- DIRS += ['include', 'lib']
+@@ -93,3 +93,5 @@ if CONFIG['GNU_AS']:
+         if CONFIG['OS_TARGET'] == 'Android':
+             DEFINES['__linux__'] = True
  
 +if CONFIG['MOZ_NATIVE_OGG']:
 +    CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
index 158527a76964..476197cc483e 100644
--- a/www/libxul/Makefile
+++ b/www/libxul/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libxul
-DISTVERSION=	31.4.0
-PORTREVISION=	2
+DISTVERSION=	31.5.0
 CATEGORIES?=	www devel
 MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source
 DISTNAME=	firefox-${DISTVERSION}esr.source
diff --git a/www/libxul/distinfo b/www/libxul/distinfo
index 7fd1418d0164..5a4686dd6cf6 100644
--- a/www/libxul/distinfo
+++ b/www/libxul/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-31.4.0esr.source.tar.bz2) = c5ad8b588fb1e7690be5da04f627335f6440277dac4bccd46e6687fcf2fbc23b
-SIZE (firefox-31.4.0esr.source.tar.bz2) = 147935703
+SHA256 (firefox-31.5.0esr.source.tar.bz2) = d4243bf74a4421b590f5580f71486f8608a1a483d4779b44ab0e39d6bbf64b6a
+SIZE (firefox-31.5.0esr.source.tar.bz2) = 147757474
diff --git a/www/libxul/files/patch-bug1021761 b/www/libxul/files/patch-bug1021761
index bd0a689f12c7..1d0cde369c34 100644
--- a/www/libxul/files/patch-bug1021761
+++ b/www/libxul/files/patch-bug1021761
@@ -2,7 +2,7 @@ diff --git configure.in configure.in
 index 48e60c0..ec08417 100644
 --- configure.in
 +++ 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
 --- media/libcubeb/AUTHORS
@@ -651,7 +634,7 @@ new file mode 100644
 index 0000000..5e38e27
 --- /dev/null
 +++ 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
+--- media/webrtc/signaling/test/Makefile.in
++++ 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
 --- toolkit/library/libxul.mk
 +++ 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/www/libxul/files/patch-bug1083461 b/www/libxul/files/patch-bug1083461
deleted file mode 100644
index 66989e0e7cf6..000000000000
--- a/www/libxul/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
---- layout/style/nsCSSValue.cpp
-+++ 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
---- layout/style/nsCSSValue.h
-+++ 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
---- layout/style/nsStyleAnimation.cpp
-+++ 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/www/libxul/files/patch-bug991253 b/www/libxul/files/patch-bug991253
index 161feb2ca7b5..73d71610ab03 100644
--- a/www/libxul/files/patch-bug991253
+++ b/www/libxul/files/patch-bug991253
@@ -1,14 +1,16 @@
 --- extensions/spellcheck/hunspell/src/mozHunspell.cpp~
 +++ 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;
diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile
index 207b8b2dab01..1f7cd6f4cd71 100644
--- a/www/linux-firefox/Makefile
+++ b/www/linux-firefox/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	35.0
+DISTVERSION=	36.0
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US
diff --git a/www/linux-firefox/distinfo b/www/linux-firefox/distinfo
index 82691a0a471e..958391bf0384 100644
--- a/www/linux-firefox/distinfo
+++ b/www/linux-firefox/distinfo
@@ -1,5 +1,5 @@
-SHA256 (firefox-35.0.tar.bz2) = 1ff41809f88f068fc46770ca518851a5188ae936e4a6d0d11c9b8bdc740298a7
-SIZE (firefox-35.0.tar.bz2) = 47069126
+SHA256 (firefox-36.0.tar.bz2) = 05a6af840f766df81151c82ccb348895db80e1946e150d4e10ca1b4ecf9251ab
+SIZE (firefox-36.0.tar.bz2) = 47838612
 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/www/linux-firefox/pkg-plist b/www/linux-firefox/pkg-plist
index 389c32620c5f..4db6d8502b1e 100644
--- a/www/linux-firefox/pkg-plist
+++ b/www/linux-firefox/pkg-plist
@@ -36,6 +36,8 @@ lib/%%APP_NAME%%/dictionaries/en-US.aff
 lib/%%APP_NAME%%/dictionaries/en-US.dic
 lib/%%APP_NAME%%/firefox
 lib/%%APP_NAME%%/firefox-bin
+lib/%%APP_NAME%%/gmp-clearkey/0.1/clearkey.info
+lib/%%APP_NAME%%/gmp-clearkey/0.1/libclearkey.so
 lib/%%APP_NAME%%/icons/updater.png
 lib/%%APP_NAME%%/libfreebl3.chk
 lib/%%APP_NAME%%/libfreebl3.so
@@ -44,7 +46,6 @@ lib/%%APP_NAME%%/libfreebl3.so
 %%GTK218%%lib/%%APP_NAME%%/libglib-2.0.so.0
 %%GTK218%%lib/%%APP_NAME%%/libgtk-x11-2.0.so.0
 lib/%%APP_NAME%%/libmozalloc.so
-lib/%%APP_NAME%%/libmozsandbox.so
 lib/%%APP_NAME%%/libmozsqlite3.so
 lib/%%APP_NAME%%/libnspr4.so
 lib/%%APP_NAME%%/libnss3.so
@@ -59,7 +60,6 @@ lib/%%APP_NAME%%/libsoftokn3.chk
 lib/%%APP_NAME%%/libsoftokn3.so
 lib/%%APP_NAME%%/libssl3.so
 lib/%%APP_NAME%%/libxul.so
-lib/%%APP_NAME%%/mozilla-xremote-client
 lib/%%APP_NAME%%/omni.ja
 lib/%%APP_NAME%%/platform.ini
 lib/%%APP_NAME%%/plugin-container
diff --git a/www/linux-seamonkey/Makefile b/www/linux-seamonkey/Makefile
index 57e93c5107bc..6c4884ad29ac 100644
--- a/www/linux-seamonkey/Makefile
+++ b/www/linux-seamonkey/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.32.1
+DISTVERSION=	2.33b1
 CATEGORIES=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US
 
diff --git a/www/linux-seamonkey/distinfo b/www/linux-seamonkey/distinfo
index aaeef1d200e8..a2819eea1e26 100644
--- a/www/linux-seamonkey/distinfo
+++ b/www/linux-seamonkey/distinfo
@@ -1,5 +1,5 @@
-SHA256 (seamonkey-2.32.1.tar.bz2) = 64754da6aa431b002e121dfe3f13412aea6b01f509138fc8166e994e85edc052
-SIZE (seamonkey-2.32.1.tar.bz2) = 40802642
+SHA256 (seamonkey-2.33b1.tar.bz2) = 58bec4bc4e0b8990b0fbaff9bb0ea50fb6f7f82f064ae46f365d6c17bd60a5a0
+SIZE (seamonkey-2.33b1.tar.bz2) = 41385948
 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/www/linux-seamonkey/pkg-plist b/www/linux-seamonkey/pkg-plist
index 0ebfb99b5d6b..7d8021a390af 100644
--- a/www/linux-seamonkey/pkg-plist
+++ b/www/linux-seamonkey/pkg-plist
@@ -88,7 +88,6 @@ lib/%%APP_NAME%%/libfreebl3.so
 lib/%%APP_NAME%%/libldap60.so
 lib/%%APP_NAME%%/libldif60.so
 lib/%%APP_NAME%%/libmozalloc.so
-lib/%%APP_NAME%%/libmozsandbox.so
 lib/%%APP_NAME%%/libmozsqlite3.so
 lib/%%APP_NAME%%/libnspr4.so
 lib/%%APP_NAME%%/libnss3.so
@@ -105,7 +104,6 @@ lib/%%APP_NAME%%/libsoftokn3.so
 lib/%%APP_NAME%%/libssl3.so
 lib/%%APP_NAME%%/libxul.so
 lib/%%APP_NAME%%/license.txt
-lib/%%APP_NAME%%/mozilla-xremote-client
 lib/%%APP_NAME%%/omni.ja
 lib/%%APP_NAME%%/platform.ini
 lib/%%APP_NAME%%/plugin-container
@@ -115,7 +113,6 @@ lib/%%APP_NAME%%/removed-files
 lib/%%APP_NAME%%/run-mozilla.sh
 lib/%%APP_NAME%%/seamonkey
 lib/%%APP_NAME%%/seamonkey-bin
-lib/%%APP_NAME%%/searchplugins/creativecommons.xml
 lib/%%APP_NAME%%/searchplugins/duckduckgo.xml
 lib/%%APP_NAME%%/searchplugins/google.xml
 lib/%%APP_NAME%%/searchplugins/wikipedia.xml
author	jbeich <jbeich@FreeBSD.org>	2015-02-27 22:42:51 +0800
committer	jbeich <jbeich@FreeBSD.org>	2015-02-27 22:42:51 +0800
commit	9d4d23a9f1ac52b5a5e0d199da5184497aa13292 (patch)
tree	87818ee8a7843c06fbfd36d7cfd6ceb05961d08b
parent	7cf4036fb6cdcda2652a87eda83e415d0c87e19b (diff)
download	freebsd-ports-gnome-9d4d23a9f1ac52b5a5e0d199da5184497aa13292.tar.gz freebsd-ports-gnome-9d4d23a9f1ac52b5a5e0d199da5184497aa13292.tar.zst freebsd-ports-gnome-9d4d23a9f1ac52b5a5e0d199da5184497aa13292.zip