MFH: r421531 r421645

www/firefox: update to 49.0 (rc2)

Bump PORTREVISION to account for slightly different behavior in other
gecko@ ports and to get a discrete regression window.

Changes:	https://www.mozilla.org/firefox/49.0/releasenotes/
PR:		211792
Submitted by:	Jochen Neumeister <joneum@bsdproject.de> (based on)
Security:	2c57c47e-8bb3-4694-83c8-9fc3abad3964
Approved by:	ports-secteam (feld)

20 files changed, 447 insertions, 357 deletions

diff --git a/Mk/Uses/gecko.mk b/Mk/Uses/gecko.mk
index 4f0388ad2042..b5c7387ffb80 100644
--- a/Mk/Uses/gecko.mk
+++ b/Mk/Uses/gecko.mk
@@ -37,12 +37,12 @@ RUN_DEPENDS+=	libxul>=45:www/libxul
 .elif ${gecko_ARGS:Mfirefox}
 
 _GECKO_DEFAULT_VERSION=	45
-_GECKO_VERSIONS=		45 47
+_GECKO_VERSIONS=		45 49
 _GECKO_TYPE=	firefox
 
 # Dependence lines for different Firefox versions
 45_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
-47_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox
+49_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox
 
 .if exists(${LOCALBASE}/bin/firefox)
 _GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 1476aacb1ab1..28e0537938bd 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -95,12 +95,18 @@ USE_XORG=	x11 xcomposite xdamage xext xfixes xrender xt
 BUNDLE_LIBS=	yes
 .endif
 
+# call to implicitly-deleted copy constructor of 'mozilla::WidevineVideoFrame'
+. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000019 && ${MOZILLA_VER:R:R} >= 49
+# XXX USES=compiler:c++11-lib cannot be used due to ports/208538
+USE_GCC=	5+
+.endif
+
 MOZILLA_SUFX?=	none
 MOZSRC?=	${WRKSRC}
 WRKSRC?=	${WRKDIR}/mozilla
 PLISTF?=	${WRKDIR}/plist_files
 
-MOZ_OBJDIR?=	${WRKSRC}/obj-${CONFIGURE_TARGET}
+MOZ_OBJDIR?=	${WRKSRC}/obj-${ARCH:C/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL}
 
 MOZ_PIS_DIR?=		lib/${MOZILLA}/init.d
 
@@ -119,10 +125,9 @@ MOZ_PKGCONFIG_FILES?=	${MOZILLA}-gtkmozembed ${MOZILLA}-js \
 
 ALL_TARGET?=	build
 
-CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
 MOZ_EXPORT+=	${CONFIGURE_ENV} \
 				PERL="${PERL}"
-MOZ_OPTIONS+=	${CONFIGURE_TARGET} --prefix="${PREFIX}"
+MOZ_OPTIONS+=	--prefix="${PREFIX}"
 MOZ_MK_OPTIONS+=MOZ_OBJDIR="${MOZ_OBJDIR}"
 
 CPPFLAGS+=		-isystem${LOCALBASE}/include
@@ -138,7 +143,11 @@ MOZ_EXPORT+=	MOZ_JEMALLOC3=1 MOZ_JEMALLOC4=1
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-bug1125514
 . endif
 .elif ${OPSYS} != FreeBSD || ${OSVERSION} < 1000012 || ${MOZILLA_VER:R:R} >= 37
+. if ${MOZILLA_VER:R:R} >= 48
+MOZ_OPTIONS+=	--enable-jemalloc=4
+.else
 MOZ_OPTIONS+=	--enable-jemalloc
+. endif
 .endif
 .endif # !DragonFly
 
@@ -265,14 +274,7 @@ MOZ_OPTIONS+=	--enable-necko-protocols=${MOZ_PROTOCOLS}
 # others
 MOZ_OPTIONS+=	--with-system-zlib		\
 		--with-system-bz2		\
-		--enable-unified-compilation	\
-		--disable-debug-symbols		\
-		--disable-glibtest		\
-		--disable-gtktest		\
-		--disable-freetypetest		\
-		--disable-installer		\
-		--disable-updater		\
-		--disable-pedantic
+		--disable-debug-symbols
 
 # API keys from www/chromium 
 # http://www.chromium.org/developers/how-tos/api-keys
@@ -308,10 +310,6 @@ CFLAGS+=		-O3
 MOZ_EXPORT+=	MOZ_OPTIMIZE_FLAGS="${CFLAGS:M-O*}"
 MOZ_OPTIONS+=	--enable-optimize
 .else
-. if ${MOZILLA_VER:R:R} >= 45 && ${ARCH} == i386 && \
-  (${OSVERSION} >= 1000000 && ${OSVERSION} < 1003501)
-USES:=			compiler:c++14-lang ${USES:Ncompiler*c++11*} # XXX ports/207837
-. endif
 MOZ_OPTIONS+=	--disable-optimize
 .endif
 
@@ -326,7 +324,7 @@ LIB_DEPENDS+=	libdbus-1.so:devel/dbus \
 				libstartup-notification-1.so:x11/startup-notification
 MOZ_OPTIONS+=	--enable-startup-notification
 .else
-MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
+MOZ_OPTIONS+=	--disable-dbus
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
@@ -338,7 +336,7 @@ RUN_DEPENDS+=	ffmpeg>=0.8,1:multimedia/ffmpeg
 RUN_DEPENDS+=	gstreamer1-libav>=1.2.4_1:multimedia/gstreamer1-libav
 USE_GSTREAMER1?=good libav
 MOZ_OPTIONS+=	--enable-gstreamer=1.0
-.else
+.elif ${MOZILLA_VER:R:R} < 46
 MOZ_OPTIONS+=	--disable-gstreamer
 .endif
 
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 0d5e93bc60ed..33effae16a45 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	45.3.0
+PORTREVISION=	1
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 8a31001e8af1..53c508adcb5b 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	firefox
 DISTVERSION=	45.3.0
 DISTVERSIONSUFFIX=esr.source
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile
index 75dca0d5db1e..6907638840a8 100644
--- a/www/firefox-i18n/Makefile
+++ b/www/firefox-i18n/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	firefox-i18n
-PORTVERSION=	47.0.1
+PORTVERSION=	49.0
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \
-		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi
+		MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-i686/xpi
 PKGNAMEPREFIX=
 DISTFILES=	${FIREFOX_I18N_:S/$/.xpi/}
 DIST_SUBDIR=	xpi/${DISTNAME}
@@ -15,7 +15,7 @@ COMMENT=	Localized interface for Firefox
 
 EXTRACT_DEPENDS=	zip:archivers/zip
 
-USES=		zip:infozip gecko:firefox,47,build
+USES=		zip:infozip gecko:firefox,49,build
 USE_XPI=	firefox
 
 NO_ARCH=	yes
diff --git a/www/firefox-i18n/distinfo b/www/firefox-i18n/distinfo
index 4d98542d44e2..eaf35cac6ed5 100644
--- a/www/firefox-i18n/distinfo
+++ b/www/firefox-i18n/distinfo
@@ -1,180 +1,181 @@
-SHA256 (xpi/firefox-i18n-47.0.1/ach.xpi) = 45bc4e91e4e6adf7242aee948158b5afee17c4770dfa5dccc7355d85e531aef8
-SIZE (xpi/firefox-i18n-47.0.1/ach.xpi) = 425998
-SHA256 (xpi/firefox-i18n-47.0.1/af.xpi) = a1e279483c5344db24a4ccfc2c38e8b6efcb424825fd85bc07d16d3277e0e7d8
-SIZE (xpi/firefox-i18n-47.0.1/af.xpi) = 441515
-SHA256 (xpi/firefox-i18n-47.0.1/an.xpi) = 40c1b71ce8fba6a16cd8b3d1ddfaef2fc6cf15502cd0aa567c3d5f3bee698447
-SIZE (xpi/firefox-i18n-47.0.1/an.xpi) = 453260
-SHA256 (xpi/firefox-i18n-47.0.1/ar.xpi) = ce4907b3c63db0f81386d8177f51fefa6713e74a0960eda49178027a61cc2abc
-SIZE (xpi/firefox-i18n-47.0.1/ar.xpi) = 478502
-SHA256 (xpi/firefox-i18n-47.0.1/as.xpi) = 14057de2c80c22337dbb1ed8809a966919645f1dc2a8da42e907c570a969c917
-SIZE (xpi/firefox-i18n-47.0.1/as.xpi) = 484619
-SHA256 (xpi/firefox-i18n-47.0.1/ast.xpi) = e58e044b10c9c7d299866bd2d710d35ce56d43bbe6427c0029ad86bcfd69c4c6
-SIZE (xpi/firefox-i18n-47.0.1/ast.xpi) = 422168
-SHA256 (xpi/firefox-i18n-47.0.1/az.xpi) = 8b60d632ed4271a42d03345f5b6bbd68bf09b4b98263e6281d79e604488e5e39
-SIZE (xpi/firefox-i18n-47.0.1/az.xpi) = 453802
-SHA256 (xpi/firefox-i18n-47.0.1/be.xpi) = 05c89d49ec5c593c5ae98d22b0e435c5f1fb4c6ac97938721d2277f5210c91b7
-SIZE (xpi/firefox-i18n-47.0.1/be.xpi) = 445105
-SHA256 (xpi/firefox-i18n-47.0.1/bg.xpi) = c3b8b4969bb809eba2a0a3d5a940682dd77c2707acb2a9d80231e9237dfaab13
-SIZE (xpi/firefox-i18n-47.0.1/bg.xpi) = 490776
-SHA256 (xpi/firefox-i18n-47.0.1/bn-BD.xpi) = cc6a61c51a212d29251e43938940524ac3859ca2675e56a4cf97f58cee55b5ef
-SIZE (xpi/firefox-i18n-47.0.1/bn-BD.xpi) = 509738
-SHA256 (xpi/firefox-i18n-47.0.1/bn-IN.xpi) = 2f174dcf71804700c17326e5192ed80c43c19c603877a5e571feba1df7a51558
-SIZE (xpi/firefox-i18n-47.0.1/bn-IN.xpi) = 515482
-SHA256 (xpi/firefox-i18n-47.0.1/br.xpi) = 91978b6bea28c3ef2cbd41d75afcb1fe25fc506f9ca5a3caa3b23ccfdefaee0c
-SIZE (xpi/firefox-i18n-47.0.1/br.xpi) = 430467
-SHA256 (xpi/firefox-i18n-47.0.1/bs.xpi) = 09732c9fa433178638fcf44abdb65b4bb81f846deb3a3cd10bbfde3ba594da14
-SIZE (xpi/firefox-i18n-47.0.1/bs.xpi) = 447152
-SHA256 (xpi/firefox-i18n-47.0.1/ca.xpi) = d6f1cbf852d55dc8d5b47f642cd4ac4c889df0662da620d4370077bbad5771c8
-SIZE (xpi/firefox-i18n-47.0.1/ca.xpi) = 438340
-SHA256 (xpi/firefox-i18n-47.0.1/cs.xpi) = 432e0f194cc6513ea9c998ba09032b646a55e5cada4de3512b88436d63622363
-SIZE (xpi/firefox-i18n-47.0.1/cs.xpi) = 438404
-SHA256 (xpi/firefox-i18n-47.0.1/cy.xpi) = 02f69f9ae0c62ce88a747974a357b28622b5b5c162818b12a91a5b5e9dbea419
-SIZE (xpi/firefox-i18n-47.0.1/cy.xpi) = 433790
-SHA256 (xpi/firefox-i18n-47.0.1/da.xpi) = d645b416e27c0376195bf9c8620f77ff9a33dfdd2703b4f02e0d021b411ad54a
-SIZE (xpi/firefox-i18n-47.0.1/da.xpi) = 424569
-SHA256 (xpi/firefox-i18n-47.0.1/de.xpi) = 611080e81b13ac5cfa0cc84ccaacd91f2c102884e36558af73d7d71fad18db0c
-SIZE (xpi/firefox-i18n-47.0.1/de.xpi) = 440551
-SHA256 (xpi/firefox-i18n-47.0.1/dsb.xpi) = be5dd0e172d05143333fd093e4916bdc8f858c0c82e7a4ad8d526baf288b15bb
-SIZE (xpi/firefox-i18n-47.0.1/dsb.xpi) = 458254
-SHA256 (xpi/firefox-i18n-47.0.1/el.xpi) = 5abae91c3dca06d4f9f4ed683f9e1db33461b53442beb37297fe7b0a10fbd055
-SIZE (xpi/firefox-i18n-47.0.1/el.xpi) = 470596
-SHA256 (xpi/firefox-i18n-47.0.1/en-GB.xpi) = 9c15f22d32aeeb2d3f7c7defd6394eb3b07973eb68c96e8cb9add5131ceb695c
-SIZE (xpi/firefox-i18n-47.0.1/en-GB.xpi) = 418329
-SHA256 (xpi/firefox-i18n-47.0.1/en-US.xpi) = e5e37ec169bc609219a721dd43fedf06193f14917f36ea04ba5ae36680ca532c
-SIZE (xpi/firefox-i18n-47.0.1/en-US.xpi) = 426931
-SHA256 (xpi/firefox-i18n-47.0.1/en-ZA.xpi) = 6f51495b1d534226e3c35c87a8dfc2432d44ba57d0aeb46a08e83c799444dc32
-SIZE (xpi/firefox-i18n-47.0.1/en-ZA.xpi) = 407835
-SHA256 (xpi/firefox-i18n-47.0.1/eo.xpi) = dfeba075649beee35415a80858973cb442a6808b602fea9a0110350f1262bab7
-SIZE (xpi/firefox-i18n-47.0.1/eo.xpi) = 434240
-SHA256 (xpi/firefox-i18n-47.0.1/es-AR.xpi) = 76f17a70c23298bc722de3660529f5fe8fa456914cdf719f864fa000433f2f0c
-SIZE (xpi/firefox-i18n-47.0.1/es-AR.xpi) = 435267
-SHA256 (xpi/firefox-i18n-47.0.1/es-CL.xpi) = 5cd683e2a3d3b5763835af82618135a120f448e07eadd20083a38075fa13aec1
-SIZE (xpi/firefox-i18n-47.0.1/es-CL.xpi) = 372784
-SHA256 (xpi/firefox-i18n-47.0.1/es-ES.xpi) = ff1d09566fd7e78bc374c5c83bed768aa87392e49a16e89eab09f3f6eed67e54
-SIZE (xpi/firefox-i18n-47.0.1/es-ES.xpi) = 348231
-SHA256 (xpi/firefox-i18n-47.0.1/es-MX.xpi) = aa2f4868cef504ba087a33cc395e00ddabf2d765491a51f0048ee704a585ac49
-SIZE (xpi/firefox-i18n-47.0.1/es-MX.xpi) = 445766
-SHA256 (xpi/firefox-i18n-47.0.1/et.xpi) = 11a3d3441bef1876736cf828c1c042af607ef426db14185d7cb37cd7b84d32a7
-SIZE (xpi/firefox-i18n-47.0.1/et.xpi) = 434961
-SHA256 (xpi/firefox-i18n-47.0.1/eu.xpi) = 3e66452b8cd01159c0305e863c2ad6bf95a9c95d881381715e49800a54df88c2
-SIZE (xpi/firefox-i18n-47.0.1/eu.xpi) = 435865
-SHA256 (xpi/firefox-i18n-47.0.1/fa.xpi) = ec6ea46b9674719227bb76f6150172aa36e18cacda99e16ad070454592f4ea64
-SIZE (xpi/firefox-i18n-47.0.1/fa.xpi) = 486498
-SHA256 (xpi/firefox-i18n-47.0.1/ff.xpi) = 702f066fc3974ccfa9185daeb14430910bf1a2adae82588f9fcbe4261079021b
-SIZE (xpi/firefox-i18n-47.0.1/ff.xpi) = 443579
-SHA256 (xpi/firefox-i18n-47.0.1/fi.xpi) = ed47d8ca5bfecabcc22c8f568e076fa772a49f125b992eedae1b026580e47591
-SIZE (xpi/firefox-i18n-47.0.1/fi.xpi) = 429551
-SHA256 (xpi/firefox-i18n-47.0.1/fr.xpi) = e8bdc9eada416f728ccdcd46e4d69b0ff743d04e0662c44539be98f223203bc4
-SIZE (xpi/firefox-i18n-47.0.1/fr.xpi) = 450329
-SHA256 (xpi/firefox-i18n-47.0.1/fy-NL.xpi) = 8270d9be627108fa1e6e2e936a55f2ab7a1d36230ea875c261ea69106fce868d
-SIZE (xpi/firefox-i18n-47.0.1/fy-NL.xpi) = 442464
-SHA256 (xpi/firefox-i18n-47.0.1/ga-IE.xpi) = 94b6744107662d06991e86355deb37dfe310e65b3dd394e40bc055d4ab6d2501
-SIZE (xpi/firefox-i18n-47.0.1/ga-IE.xpi) = 454693
-SHA256 (xpi/firefox-i18n-47.0.1/gd.xpi) = 2f93cbafc5548a00907c608eb2193a662e0f72dbe6ed3c4c276601a3f629a9ed
-SIZE (xpi/firefox-i18n-47.0.1/gd.xpi) = 443138
-SHA256 (xpi/firefox-i18n-47.0.1/gl.xpi) = 8b5b5621bc744e8d21dc84bce2668a52f483858997eb9ad4d15fe8dc16dd371d
-SIZE (xpi/firefox-i18n-47.0.1/gl.xpi) = 438909
-SHA256 (xpi/firefox-i18n-47.0.1/gn.xpi) = a8b6effa4189ea1816f89658d7c62ffd3d5cb4ce57e664f9c5dd4377952255b7
-SIZE (xpi/firefox-i18n-47.0.1/gn.xpi) = 464961
-SHA256 (xpi/firefox-i18n-47.0.1/gu-IN.xpi) = 86a5495a14202d68d095cc66c1865daca059a47767c8cf82abb24f38adaec4bb
-SIZE (xpi/firefox-i18n-47.0.1/gu-IN.xpi) = 472819
-SHA256 (xpi/firefox-i18n-47.0.1/he.xpi) = 1131961ba5993d28929fc38602a1ce02761c75488b507540c69d7f7caba039f9
-SIZE (xpi/firefox-i18n-47.0.1/he.xpi) = 449445
-SHA256 (xpi/firefox-i18n-47.0.1/hi-IN.xpi) = d4318c5efba739b519f7c9f5c302dc98ebda40abaa46f3f5dd9d78ec184dabe8
-SIZE (xpi/firefox-i18n-47.0.1/hi-IN.xpi) = 489305
-SHA256 (xpi/firefox-i18n-47.0.1/hr.xpi) = e56f5877d6f66773e44b32cc3ca12d14da6d3c986c312787827145a6a1db834e
-SIZE (xpi/firefox-i18n-47.0.1/hr.xpi) = 443336
-SHA256 (xpi/firefox-i18n-47.0.1/hsb.xpi) = 2515e205390983fd32e0102f0a105896953913f170ed83e3cc167934d7c0020f
-SIZE (xpi/firefox-i18n-47.0.1/hsb.xpi) = 455861
-SHA256 (xpi/firefox-i18n-47.0.1/hu.xpi) = 604068b6f604d505dc6e51a05ff18e857d6b30eadf24c8652683331331bb7185
-SIZE (xpi/firefox-i18n-47.0.1/hu.xpi) = 448454
-SHA256 (xpi/firefox-i18n-47.0.1/hy-AM.xpi) = 115e4f497c799d1bd431c43876d03c0cdbb953c259fa9c2c5f5f5a90fac69e88
-SIZE (xpi/firefox-i18n-47.0.1/hy-AM.xpi) = 494271
-SHA256 (xpi/firefox-i18n-47.0.1/id.xpi) = 358340a6ca043e6daf5fe8d01ba047d9e7f4ff67203f5ab6f75851f14c4ff328
-SIZE (xpi/firefox-i18n-47.0.1/id.xpi) = 420863
-SHA256 (xpi/firefox-i18n-47.0.1/is.xpi) = fc41a1a97c58a2c5f1014685880068d1c5a4290b80bc0ab572992bbfd005d724
-SIZE (xpi/firefox-i18n-47.0.1/is.xpi) = 437344
-SHA256 (xpi/firefox-i18n-47.0.1/it.xpi) = 312edd360fbf24ffdf8a3000dd31fe434806635d94056a11338d4b0e4756017c
-SIZE (xpi/firefox-i18n-47.0.1/it.xpi) = 342328
-SHA256 (xpi/firefox-i18n-47.0.1/ja.xpi) = bc89e620c8f445d4be02f6521c3fa51eb39bdada8a1b14ef3f2f2ca46cede849
-SIZE (xpi/firefox-i18n-47.0.1/ja.xpi) = 485006
-SHA256 (xpi/firefox-i18n-47.0.1/kk.xpi) = 3330a11aa4a7a6585ac1ef41c0f3f5da1005082ddbc8dd4b5e4568cd4bca345f
-SIZE (xpi/firefox-i18n-47.0.1/kk.xpi) = 491494
-SHA256 (xpi/firefox-i18n-47.0.1/km.xpi) = dc94fbe0fa6ace0f4425f6776a29a23d7e24e75fd16a9c9ae341eee032736c6a
-SIZE (xpi/firefox-i18n-47.0.1/km.xpi) = 507775
-SHA256 (xpi/firefox-i18n-47.0.1/kn.xpi) = 82a3cbd086c17e14eb867f40d24ac4f25d96f93c7414f4f8357cc4e06903a84b
-SIZE (xpi/firefox-i18n-47.0.1/kn.xpi) = 512033
-SHA256 (xpi/firefox-i18n-47.0.1/ko.xpi) = cbdb8b25554a37603ed4474896b7d054dea6a2fd9bf87d4154f4b50126ed8109
-SIZE (xpi/firefox-i18n-47.0.1/ko.xpi) = 457472
-SHA256 (xpi/firefox-i18n-47.0.1/lij.xpi) = 9933031b52d5e7b8a50a63e8a7d761a990b0d87fae0c5c1ef4bddbab59bfc2ba
-SIZE (xpi/firefox-i18n-47.0.1/lij.xpi) = 391959
-SHA256 (xpi/firefox-i18n-47.0.1/lt.xpi) = 449d8cf318c277d242b3fdb224e9b72a50975e69f31f041c8b047ff29a795990
-SIZE (xpi/firefox-i18n-47.0.1/lt.xpi) = 449058
-SHA256 (xpi/firefox-i18n-47.0.1/lv.xpi) = f6d990ac44675f0ebfb3f98e3c85e7bdcd0c3b657a2d4c0bfa99071e6eedc101
-SIZE (xpi/firefox-i18n-47.0.1/lv.xpi) = 442457
-SHA256 (xpi/firefox-i18n-47.0.1/mai.xpi) = 6aa5a42e3022cf58e6b016ab7b788eb23e67625e1905a340aad703be3bfc622c
-SIZE (xpi/firefox-i18n-47.0.1/mai.xpi) = 494895
-SHA256 (xpi/firefox-i18n-47.0.1/mk.xpi) = 8a9521bf7962a03e8ad268ac59d3c20d9ab0ec13c2e0137d7d327917da185b80
-SIZE (xpi/firefox-i18n-47.0.1/mk.xpi) = 476189
-SHA256 (xpi/firefox-i18n-47.0.1/ml.xpi) = d864a9265b23dd871521a19b600d5deb1b44fef4b394613a53152dc1d4c45cd6
-SIZE (xpi/firefox-i18n-47.0.1/ml.xpi) = 524949
-SHA256 (xpi/firefox-i18n-47.0.1/mr.xpi) = a2ae1a5fbcecf7b7af2e9a6e590e496733ae1ea7030828d5d39c946a2c803dac
-SIZE (xpi/firefox-i18n-47.0.1/mr.xpi) = 497587
-SHA256 (xpi/firefox-i18n-47.0.1/ms.xpi) = e72517c0cf40317cfc337ee33b43c23e7cd8e44c9e0584c6f777f3ca880383ae
-SIZE (xpi/firefox-i18n-47.0.1/ms.xpi) = 443220
-SHA256 (xpi/firefox-i18n-47.0.1/nb-NO.xpi) = da0f4738e673ce3a7cb7935383945d58fd9f5050ae2086dcfbec43014e4fe5d2
-SIZE (xpi/firefox-i18n-47.0.1/nb-NO.xpi) = 429971
-SHA256 (xpi/firefox-i18n-47.0.1/nl.xpi) = 2eb190d4b6140d13f077e774e11a13bd48250c8cf1198058dbba696bbc77bb28
-SIZE (xpi/firefox-i18n-47.0.1/nl.xpi) = 429576
-SHA256 (xpi/firefox-i18n-47.0.1/nn-NO.xpi) = fd18bc2166d4a03147cce6ed5e3d4fa959d99dfbdbb0048ff7162370fecf8fa0
-SIZE (xpi/firefox-i18n-47.0.1/nn-NO.xpi) = 425797
-SHA256 (xpi/firefox-i18n-47.0.1/or.xpi) = d474a56eba467485488e9d181e981ff12dea18f57a48b397df4affb7c0ff855e
-SIZE (xpi/firefox-i18n-47.0.1/or.xpi) = 497590
-SHA256 (xpi/firefox-i18n-47.0.1/pa-IN.xpi) = ed2907e16280b53c6b16bcb79579ce00e838fa179790160a0463e2579fc52047
-SIZE (xpi/firefox-i18n-47.0.1/pa-IN.xpi) = 492398
-SHA256 (xpi/firefox-i18n-47.0.1/pl.xpi) = 8d6c67251bceae0d3b92463b9ffe8b29c27c8bbb7e7d5ab8bf7077c4e9c17491
-SIZE (xpi/firefox-i18n-47.0.1/pl.xpi) = 371971
-SHA256 (xpi/firefox-i18n-47.0.1/pt-BR.xpi) = e7386ef912551b1daf7b8afbf8189aab579fc241ed085c98d68c16a870471fd5
-SIZE (xpi/firefox-i18n-47.0.1/pt-BR.xpi) = 443876
-SHA256 (xpi/firefox-i18n-47.0.1/pt-PT.xpi) = 3dfb14c2bc860af07da733e457e6f9128dfe3701795b8bfe2a233aa3992fcd0a
-SIZE (xpi/firefox-i18n-47.0.1/pt-PT.xpi) = 431644
-SHA256 (xpi/firefox-i18n-47.0.1/rm.xpi) = 32cc50d8b16f978adc25e7d43fb807c93fbcc2d201b85f8191e6ad17fbfc35bf
-SIZE (xpi/firefox-i18n-47.0.1/rm.xpi) = 431929
-SHA256 (xpi/firefox-i18n-47.0.1/ro.xpi) = 4be70d42a513abd6697e114161aa768d136d72274a7b252c2c337fa260685289
-SIZE (xpi/firefox-i18n-47.0.1/ro.xpi) = 445166
-SHA256 (xpi/firefox-i18n-47.0.1/ru.xpi) = 818dace0bb3e748a336db9fc9db456b2430e8bcbebec7770bfaa36cfde321bc2
-SIZE (xpi/firefox-i18n-47.0.1/ru.xpi) = 392468
-SHA256 (xpi/firefox-i18n-47.0.1/si.xpi) = a2786e505817c65394b7bfa492ef7b0d6719651b8428bf7cf27357387dc13e7e
-SIZE (xpi/firefox-i18n-47.0.1/si.xpi) = 488802
-SHA256 (xpi/firefox-i18n-47.0.1/sk.xpi) = cce9362fbfa295f3de6893150fd0a2d51ffc9718d7383dfc24188cae86a5e418
-SIZE (xpi/firefox-i18n-47.0.1/sk.xpi) = 452877
-SHA256 (xpi/firefox-i18n-47.0.1/sl.xpi) = f198bb1db5e412a3bcb28a8f24144ceff3e827632884a6fe59bd744195757088
-SIZE (xpi/firefox-i18n-47.0.1/sl.xpi) = 429763
-SHA256 (xpi/firefox-i18n-47.0.1/son.xpi) = 493fc303a80b6fa76ab274e005897870333d6a84da63b4152040bf663420a03e
-SIZE (xpi/firefox-i18n-47.0.1/son.xpi) = 441955
-SHA256 (xpi/firefox-i18n-47.0.1/sq.xpi) = 96a7e3c877f8fa5b5bb3be6f1e6892a276db4158a348b8400e3a6368ba82e61f
-SIZE (xpi/firefox-i18n-47.0.1/sq.xpi) = 446757
-SHA256 (xpi/firefox-i18n-47.0.1/sr.xpi) = bf740e40de6018df798ac065e53041fde5459a990b5041e1bd7528307360d46a
-SIZE (xpi/firefox-i18n-47.0.1/sr.xpi) = 462409
-SHA256 (xpi/firefox-i18n-47.0.1/sv-SE.xpi) = ec52f16c0f56cdcbf0a517fa69327fcaeb0aa0cf75557af7f0c9e8038d6c0407
-SIZE (xpi/firefox-i18n-47.0.1/sv-SE.xpi) = 438739
-SHA256 (xpi/firefox-i18n-47.0.1/ta.xpi) = 15eafeadbc45709e6f08c53b44397eb01c87e316ceca2035eacc3ee23b12de7d
-SIZE (xpi/firefox-i18n-47.0.1/ta.xpi) = 485395
-SHA256 (xpi/firefox-i18n-47.0.1/te.xpi) = 6c10823ada3e63bc08bd2e241506ce0550b3b8ea344d5b5ef8ea0cf8435ced04
-SIZE (xpi/firefox-i18n-47.0.1/te.xpi) = 516411
-SHA256 (xpi/firefox-i18n-47.0.1/th.xpi) = a2c784f4adae0c951955f83ea6aeb5e2aae328eea94dd103f43427d308e47e67
-SIZE (xpi/firefox-i18n-47.0.1/th.xpi) = 492437
-SHA256 (xpi/firefox-i18n-47.0.1/tr.xpi) = dc8c04ef72855048b942219125a6114583b36932f9c23e2d7b4aad07c20babda
-SIZE (xpi/firefox-i18n-47.0.1/tr.xpi) = 438667
-SHA256 (xpi/firefox-i18n-47.0.1/uk.xpi) = bb4c29beb636edbacc9e8b8a054ba5a2c6ddbbf4475e4ef2ac00efa8275bddc1
-SIZE (xpi/firefox-i18n-47.0.1/uk.xpi) = 487554
-SHA256 (xpi/firefox-i18n-47.0.1/uz.xpi) = e93a2dd6c3415cff51e53804b6f10f1d09c6d7196841c9ca8581125cee2b550b
-SIZE (xpi/firefox-i18n-47.0.1/uz.xpi) = 446245
-SHA256 (xpi/firefox-i18n-47.0.1/vi.xpi) = 115cb4ffaabae35343a086664d6014e30a311e522010c3b55ccbc7394e8e6b90
-SIZE (xpi/firefox-i18n-47.0.1/vi.xpi) = 454209
-SHA256 (xpi/firefox-i18n-47.0.1/xh.xpi) = 5142bc34da8e31ec27dc89e255a3a6e6357f5f02dcda1739ad875b15396f75c1
-SIZE (xpi/firefox-i18n-47.0.1/xh.xpi) = 435194
-SHA256 (xpi/firefox-i18n-47.0.1/zh-CN.xpi) = d5da058ad1b0a5dbb09575637a81865364ac8b2ee6eaf924889c1765e29a01bc
-SIZE (xpi/firefox-i18n-47.0.1/zh-CN.xpi) = 459553
-SHA256 (xpi/firefox-i18n-47.0.1/zh-TW.xpi) = fb986d5692cd7ab0567912929907744f92b53143b48976ad3949d15027660f4e
-SIZE (xpi/firefox-i18n-47.0.1/zh-TW.xpi) = 467825
+TIMESTAMP = 1473148535
+SHA256 (xpi/firefox-i18n-49.0/ach.xpi) = 74e77ee93d9806f50d3ed4ba4a2e1140dd2043dea21fde04f07f2d861554feac
+SIZE (xpi/firefox-i18n-49.0/ach.xpi) = 427258
+SHA256 (xpi/firefox-i18n-49.0/af.xpi) = d4c11cf1f0b879c7a00c50e54a1fadb6e103cc5f3749bd9b5438eec68414dfcb
+SIZE (xpi/firefox-i18n-49.0/af.xpi) = 436100
+SHA256 (xpi/firefox-i18n-49.0/an.xpi) = 18f91834bdf82d99a35c3615b2f212f425f1ffee980861c9a5ac143c3d64a44d
+SIZE (xpi/firefox-i18n-49.0/an.xpi) = 446086
+SHA256 (xpi/firefox-i18n-49.0/ar.xpi) = 8a6d8c5dd590142c4adcad9416bab9ec1290c77c45adbe1bb67c32eab49a466b
+SIZE (xpi/firefox-i18n-49.0/ar.xpi) = 471934
+SHA256 (xpi/firefox-i18n-49.0/as.xpi) = 20279a1e96b517010bbdcc1f53e8da7522a7ce7a77353b7cd05457c6ee5fc1f8
+SIZE (xpi/firefox-i18n-49.0/as.xpi) = 487353
+SHA256 (xpi/firefox-i18n-49.0/ast.xpi) = 4ee419fa0660c1ce125d4e8c43762ca0356456f793a1da62f5f330a8919a711d
+SIZE (xpi/firefox-i18n-49.0/ast.xpi) = 461422
+SHA256 (xpi/firefox-i18n-49.0/az.xpi) = 41f0bd1f57dffb040812d6348908f8326344241eaca47ef6d43e97f0cb5623ae
+SIZE (xpi/firefox-i18n-49.0/az.xpi) = 453807
+SHA256 (xpi/firefox-i18n-49.0/be.xpi) = d41263ee0feadf39935a0c80903b2774b56d9117393cd299583838f6fd58e0c1
+SIZE (xpi/firefox-i18n-49.0/be.xpi) = 457911
+SHA256 (xpi/firefox-i18n-49.0/bg.xpi) = 2aff7630fe389dd48a8d0e68c6fa4806aec5fc4b6d760fff978cbe2e9ddf5bd6
+SIZE (xpi/firefox-i18n-49.0/bg.xpi) = 485361
+SHA256 (xpi/firefox-i18n-49.0/bn-BD.xpi) = 8b22da03725d6b889bcab67f5fdc92f85fa9c331b9a88b395e7de4c9131ee14a
+SIZE (xpi/firefox-i18n-49.0/bn-BD.xpi) = 511110
+SHA256 (xpi/firefox-i18n-49.0/bn-IN.xpi) = f0d128f08e36819372d269408cef85587234c2cae739c3e15c9edf0d3e11eae5
+SIZE (xpi/firefox-i18n-49.0/bn-IN.xpi) = 508046
+SHA256 (xpi/firefox-i18n-49.0/br.xpi) = 2d17b214774a5bc9872f2e628aef50781331933c641e0e72ac8d7eb8a26cb326
+SIZE (xpi/firefox-i18n-49.0/br.xpi) = 432776
+SHA256 (xpi/firefox-i18n-49.0/bs.xpi) = b99a1bbcf93bad826cb34ce93ecbd356a21a33c64cf6877a7224a87347128ec0
+SIZE (xpi/firefox-i18n-49.0/bs.xpi) = 440114
+SHA256 (xpi/firefox-i18n-49.0/ca.xpi) = 59d4c8249312a1d79f3ecca11523b9abed4023a84ed666aab1365e0b2d164261
+SIZE (xpi/firefox-i18n-49.0/ca.xpi) = 442607
+SHA256 (xpi/firefox-i18n-49.0/cs.xpi) = 450c1eb6c34af705b22d171a0483fd8e847fb40062e3dcf822f3e4db3e423972
+SIZE (xpi/firefox-i18n-49.0/cs.xpi) = 439658
+SHA256 (xpi/firefox-i18n-49.0/cy.xpi) = 3f72e646d51af08c1898662e3c57af872ed99a0210662fe48db91f4275ae2f90
+SIZE (xpi/firefox-i18n-49.0/cy.xpi) = 435867
+SHA256 (xpi/firefox-i18n-49.0/da.xpi) = 5adfa8d47a10a521e6bcaaa54d2ec951ffd95072bf054fa9e274d89017c656d4
+SIZE (xpi/firefox-i18n-49.0/da.xpi) = 423924
+SHA256 (xpi/firefox-i18n-49.0/de.xpi) = c7de9ddccb83903b0feb2122ec6aefbeee89a9a6bd0e6148f17ac24dabbc9fed
+SIZE (xpi/firefox-i18n-49.0/de.xpi) = 441916
+SHA256 (xpi/firefox-i18n-49.0/dsb.xpi) = 040e499646f57440526b91d15ca3859586433341089c3186e50b63eacf252de3
+SIZE (xpi/firefox-i18n-49.0/dsb.xpi) = 459990
+SHA256 (xpi/firefox-i18n-49.0/el.xpi) = 8bafacb3fdd32070d045397c5605bf67ec3e726573952b3424f367460fa9ec40
+SIZE (xpi/firefox-i18n-49.0/el.xpi) = 506678
+SHA256 (xpi/firefox-i18n-49.0/en-GB.xpi) = 9bbde23343491c723a73217da3ef7f53574580d9ac12997c2d754a5b8c33993b
+SIZE (xpi/firefox-i18n-49.0/en-GB.xpi) = 421948
+SHA256 (xpi/firefox-i18n-49.0/en-US.xpi) = 8151c6ee64b776616a16a37cc7e3fb8676da01e002cb63596b24ee63b00dfb31
+SIZE (xpi/firefox-i18n-49.0/en-US.xpi) = 427548
+SHA256 (xpi/firefox-i18n-49.0/en-ZA.xpi) = 2465656bd1116c12e47253385464b7500f6056c7faf8252386832c89cd83cb12
+SIZE (xpi/firefox-i18n-49.0/en-ZA.xpi) = 410563
+SHA256 (xpi/firefox-i18n-49.0/eo.xpi) = 30c9ead203b3eb1c75d1d88d9fe34f4a9b5bec776b5bf83ff54572a25dd99e97
+SIZE (xpi/firefox-i18n-49.0/eo.xpi) = 436591
+SHA256 (xpi/firefox-i18n-49.0/es-AR.xpi) = 7e401463d87ce8073e5a0784fd52474560bfa4cd8d7ce24c466854d3c4e601a4
+SIZE (xpi/firefox-i18n-49.0/es-AR.xpi) = 440335
+SHA256 (xpi/firefox-i18n-49.0/es-CL.xpi) = 88b0e36cef41f84703dbf834f92b076ce3624996fd6d73b48546100131e8f175
+SIZE (xpi/firefox-i18n-49.0/es-CL.xpi) = 441653
+SHA256 (xpi/firefox-i18n-49.0/es-ES.xpi) = 95408c71b561663b4952ef079e9e7754e4f1e10fd625eb38fe80641ad425aecf
+SIZE (xpi/firefox-i18n-49.0/es-ES.xpi) = 347224
+SHA256 (xpi/firefox-i18n-49.0/es-MX.xpi) = 01982bafdf2d5efdd1f0ffc0e94bf96a6a858c1cb05ab84a110deedf566da8dc
+SIZE (xpi/firefox-i18n-49.0/es-MX.xpi) = 447124
+SHA256 (xpi/firefox-i18n-49.0/et.xpi) = dd282ccd4b60c25c5ba8cf6aa18c90c87b9afba4fdaffe5d5a5f4f27f2715a16
+SIZE (xpi/firefox-i18n-49.0/et.xpi) = 424384
+SHA256 (xpi/firefox-i18n-49.0/eu.xpi) = 0f0782c38ac74f9dcdd43a64a27f0b6d3d89232e9fd907fd680d717b5efcf9d3
+SIZE (xpi/firefox-i18n-49.0/eu.xpi) = 439741
+SHA256 (xpi/firefox-i18n-49.0/fa.xpi) = a5382f4f8b4e66de993245cb3caa6310b769f721920cc8d2c4fea38d0c141850
+SIZE (xpi/firefox-i18n-49.0/fa.xpi) = 489884
+SHA256 (xpi/firefox-i18n-49.0/ff.xpi) = 2c5bfd1e397f6a9e04609e51c1a80d98463646847bace47e63f24e18dae7b138
+SIZE (xpi/firefox-i18n-49.0/ff.xpi) = 451262
+SHA256 (xpi/firefox-i18n-49.0/fi.xpi) = b067901b0186f7830c1cf4f0f4dd1f889271ed602da3f5aedef143af8529fc37
+SIZE (xpi/firefox-i18n-49.0/fi.xpi) = 430568
+SHA256 (xpi/firefox-i18n-49.0/fr.xpi) = 1223408b0d7e8d7ccfbb5e8fb5c46b343fdbf7d1ddc35378161600659bcbd932
+SIZE (xpi/firefox-i18n-49.0/fr.xpi) = 451718
+SHA256 (xpi/firefox-i18n-49.0/fy-NL.xpi) = 42d2691944e4d880a6a5513eaf8aabc529546abca9f43edfe4df9106c67f0420
+SIZE (xpi/firefox-i18n-49.0/fy-NL.xpi) = 443874
+SHA256 (xpi/firefox-i18n-49.0/ga-IE.xpi) = 70e375afc1a508e2d3b734d1b70f15089633820f110689ca92039422061c0960
+SIZE (xpi/firefox-i18n-49.0/ga-IE.xpi) = 457586
+SHA256 (xpi/firefox-i18n-49.0/gd.xpi) = 60abcd3288be743dcd94ccc351af5bdcf8383606aae5e7d135953bc17255641d
+SIZE (xpi/firefox-i18n-49.0/gd.xpi) = 444957
+SHA256 (xpi/firefox-i18n-49.0/gl.xpi) = 9e73c4287f63ed9040ed1d09d35f87d3e9a590483bf701af1b6416c91db31665
+SIZE (xpi/firefox-i18n-49.0/gl.xpi) = 448066
+SHA256 (xpi/firefox-i18n-49.0/gn.xpi) = e6a19bb050a03d3d8c938dfbf08418fcfe36ef89ff7632f1881d0159c2828d4f
+SIZE (xpi/firefox-i18n-49.0/gn.xpi) = 455552
+SHA256 (xpi/firefox-i18n-49.0/gu-IN.xpi) = 5d86e2da7e992f631dd0ae4f69a1e24dd60ae1045623fcf15d5a529352287202
+SIZE (xpi/firefox-i18n-49.0/gu-IN.xpi) = 491792
+SHA256 (xpi/firefox-i18n-49.0/he.xpi) = ae29bfd00fb1895a40e711956367938df399123ac8f3404a528c55acb285dbee
+SIZE (xpi/firefox-i18n-49.0/he.xpi) = 460376
+SHA256 (xpi/firefox-i18n-49.0/hi-IN.xpi) = 238736c4020c896619cdd9fe159267a85c021e3d14d0c8b7f6db106e57c4c538
+SIZE (xpi/firefox-i18n-49.0/hi-IN.xpi) = 504513
+SHA256 (xpi/firefox-i18n-49.0/hr.xpi) = a584848452be3e96ec7d9971abdca27f652a5ae2f1283bcfcaeee110fe02d5ce
+SIZE (xpi/firefox-i18n-49.0/hr.xpi) = 447984
+SHA256 (xpi/firefox-i18n-49.0/hsb.xpi) = b72532c3c1ce3a001d468c601f8e056b360487a7cda83801bc85a26380b52d3a
+SIZE (xpi/firefox-i18n-49.0/hsb.xpi) = 457757
+SHA256 (xpi/firefox-i18n-49.0/hu.xpi) = fc2d8cd3d4e2c4958b2f817321f0f1f72c21305a1f63a61fb871415ea50b56be
+SIZE (xpi/firefox-i18n-49.0/hu.xpi) = 450546
+SHA256 (xpi/firefox-i18n-49.0/hy-AM.xpi) = 875c5dd8d61656e9f2f49a84f6c8c57a274fb9a40eff9122f0a568fafa02d509
+SIZE (xpi/firefox-i18n-49.0/hy-AM.xpi) = 493806
+SHA256 (xpi/firefox-i18n-49.0/id.xpi) = b074c8fbce1ccdbc4230fd02aa7242839c47aa05d1eff65b2d2d6f7d4df5c7e5
+SIZE (xpi/firefox-i18n-49.0/id.xpi) = 423401
+SHA256 (xpi/firefox-i18n-49.0/is.xpi) = 86c14a2ae4f5fea840760f17f0e5842124da26d5bb1a6654494efc53be49bfcb
+SIZE (xpi/firefox-i18n-49.0/is.xpi) = 437732
+SHA256 (xpi/firefox-i18n-49.0/it.xpi) = c03c21291bb939b266a5364362c68606881b442d9b5e666d98c75f291d151957
+SIZE (xpi/firefox-i18n-49.0/it.xpi) = 339263
+SHA256 (xpi/firefox-i18n-49.0/ja.xpi) = 166b704cb0cd351c0273126da1985a66adf9ae1b6d090153523e439c6f2386fc
+SIZE (xpi/firefox-i18n-49.0/ja.xpi) = 486516
+SHA256 (xpi/firefox-i18n-49.0/kk.xpi) = 7958060108398ccffada4b0c3cfa729a4215d35460468273146b2e1ccd33c559
+SIZE (xpi/firefox-i18n-49.0/kk.xpi) = 494255
+SHA256 (xpi/firefox-i18n-49.0/km.xpi) = 2123476b1a495f2f0b050260cdbf55581b8e768777f5f4905b66afe6ae4be4be
+SIZE (xpi/firefox-i18n-49.0/km.xpi) = 520082
+SHA256 (xpi/firefox-i18n-49.0/kn.xpi) = 309f7a0c41f3b00f1f057696c393792fe2f6503548b78b1b9d3b2b152af93e63
+SIZE (xpi/firefox-i18n-49.0/kn.xpi) = 518780
+SHA256 (xpi/firefox-i18n-49.0/ko.xpi) = b0e840264f89df71e2054b8ff69814773f20cb0578c2a1ea4ae22b343081dd24
+SIZE (xpi/firefox-i18n-49.0/ko.xpi) = 460894
+SHA256 (xpi/firefox-i18n-49.0/lij.xpi) = 1cc35f6df390a54f1b7f54c4b5dddd5d416256e4bb70170a2e8e2be028226095
+SIZE (xpi/firefox-i18n-49.0/lij.xpi) = 396168
+SHA256 (xpi/firefox-i18n-49.0/lt.xpi) = 293c71b21c8e0933d153a2d82f50979d415e25c6f31c76b4df61dd4de2e6e44f
+SIZE (xpi/firefox-i18n-49.0/lt.xpi) = 451343
+SHA256 (xpi/firefox-i18n-49.0/lv.xpi) = 4ee7a942cfae3ed3ead7c53eab944cc62a97982e14cca27f80132afad6bee197
+SIZE (xpi/firefox-i18n-49.0/lv.xpi) = 445321
+SHA256 (xpi/firefox-i18n-49.0/mai.xpi) = eb890f44e854be962a24b1f4b8ede2b7f96682dbacc886c3e0f5ee595901c0b6
+SIZE (xpi/firefox-i18n-49.0/mai.xpi) = 502477
+SHA256 (xpi/firefox-i18n-49.0/mk.xpi) = 35390ffb43006544435cef05a2c6448dbac33a5f333d656d1bb05d6960261a77
+SIZE (xpi/firefox-i18n-49.0/mk.xpi) = 498489
+SHA256 (xpi/firefox-i18n-49.0/ml.xpi) = 3749b6a3a7ca683dca2b7bd86b66977d38bb8ce1ecbe13173bf671982086aede
+SIZE (xpi/firefox-i18n-49.0/ml.xpi) = 519594
+SHA256 (xpi/firefox-i18n-49.0/mr.xpi) = d6580e2eba53ee39ae37f88e77afeebae87f3664b507cbedca21d92289f279cd
+SIZE (xpi/firefox-i18n-49.0/mr.xpi) = 501072
+SHA256 (xpi/firefox-i18n-49.0/ms.xpi) = ce7952b3e85d57f1e3c0f5315076386a35c389703803822f242ec166e76bdf2f
+SIZE (xpi/firefox-i18n-49.0/ms.xpi) = 439419
+SHA256 (xpi/firefox-i18n-49.0/nb-NO.xpi) = 2616b7425fe4914f69055577ae1836737e2a37fec50b786106028d2d6f820257
+SIZE (xpi/firefox-i18n-49.0/nb-NO.xpi) = 433584
+SHA256 (xpi/firefox-i18n-49.0/nl.xpi) = e7dca01248fbbe82ddeda4b4706f290801d76085e9cb60da45946dd8973ea681
+SIZE (xpi/firefox-i18n-49.0/nl.xpi) = 431241
+SHA256 (xpi/firefox-i18n-49.0/nn-NO.xpi) = ea1d4b8804a09ab421ea343fd1afa81af90163bfbb09feef046ef3cc4e9ebea7
+SIZE (xpi/firefox-i18n-49.0/nn-NO.xpi) = 427584
+SHA256 (xpi/firefox-i18n-49.0/or.xpi) = d872ff462ffc4b7c3c5bdf50da558b0c75dfdc8fb5bcf08de4c3df036279ebf0
+SIZE (xpi/firefox-i18n-49.0/or.xpi) = 499453
+SHA256 (xpi/firefox-i18n-49.0/pa-IN.xpi) = b31faaf8bb81837b084161dc6deab0135824dee7621b91e2a778638e34234ed0
+SIZE (xpi/firefox-i18n-49.0/pa-IN.xpi) = 479085
+SHA256 (xpi/firefox-i18n-49.0/pl.xpi) = a7a129caa15233fe4b85727515d79a2e8a184afcb9940b491482f4ffd23cfc04
+SIZE (xpi/firefox-i18n-49.0/pl.xpi) = 362533
+SHA256 (xpi/firefox-i18n-49.0/pt-BR.xpi) = e75e8fbb3b2d60ca4b459cd531e89914d70f2bee42eabee9e2425a272b1f624c
+SIZE (xpi/firefox-i18n-49.0/pt-BR.xpi) = 446484
+SHA256 (xpi/firefox-i18n-49.0/pt-PT.xpi) = 77c4f4468c59222096eea30091792d9f0feb9fa425ef245e8d20a860a12b8a2c
+SIZE (xpi/firefox-i18n-49.0/pt-PT.xpi) = 433685
+SHA256 (xpi/firefox-i18n-49.0/rm.xpi) = 34f5d339ecffc9a059fe08fd9c11c1487b3c9d3480610c4e85c9091b7fb2f187
+SIZE (xpi/firefox-i18n-49.0/rm.xpi) = 439645
+SHA256 (xpi/firefox-i18n-49.0/ro.xpi) = f898bd1cb618f26e62275d9bfee1966492629c1b30fc88d1cdfb81575628b95a
+SIZE (xpi/firefox-i18n-49.0/ro.xpi) = 447537
+SHA256 (xpi/firefox-i18n-49.0/ru.xpi) = 0efd15d38d73ff52b372150b62c499915e9918e6040485bd17396314c1d58d6c
+SIZE (xpi/firefox-i18n-49.0/ru.xpi) = 391743
+SHA256 (xpi/firefox-i18n-49.0/si.xpi) = 05054561d4a98abb55c0b732a290af7d7f2416c84056e70e122bd42e192da883
+SIZE (xpi/firefox-i18n-49.0/si.xpi) = 492129
+SHA256 (xpi/firefox-i18n-49.0/sk.xpi) = 743da09e1379a4953f1cc74acffa648fd214dc37a5c2504d40042fdad52366c7
+SIZE (xpi/firefox-i18n-49.0/sk.xpi) = 452528
+SHA256 (xpi/firefox-i18n-49.0/sl.xpi) = 466ce533193f90964207d406c470591e5d8e818e46de48864586a4a9a4075787
+SIZE (xpi/firefox-i18n-49.0/sl.xpi) = 430479
+SHA256 (xpi/firefox-i18n-49.0/son.xpi) = ae036066978340cd8eeca8d49aae5dba8afca4eb76c8b7a19d0af54fe3d85e58
+SIZE (xpi/firefox-i18n-49.0/son.xpi) = 437033
+SHA256 (xpi/firefox-i18n-49.0/sq.xpi) = 54018f51755e4fb715cf7dc8f2789747656b649414b4b0a46a7bdaec3658c7f4
+SIZE (xpi/firefox-i18n-49.0/sq.xpi) = 453367
+SHA256 (xpi/firefox-i18n-49.0/sr.xpi) = 6f017079d428836515918c7f32a2c1acc9a07cc67e9afc510488d7ae6ddf9030
+SIZE (xpi/firefox-i18n-49.0/sr.xpi) = 463882
+SHA256 (xpi/firefox-i18n-49.0/sv-SE.xpi) = 76dcd84ba983e48d081faae04df35febad163c639d409000bad39d7758e344ee
+SIZE (xpi/firefox-i18n-49.0/sv-SE.xpi) = 440491
+SHA256 (xpi/firefox-i18n-49.0/ta.xpi) = fcca052aa7d33a03293ea0d52b6e8d2c444453290cd57431b51aaa16595f1ed3
+SIZE (xpi/firefox-i18n-49.0/ta.xpi) = 492433
+SHA256 (xpi/firefox-i18n-49.0/te.xpi) = 3ba228585b296e6d1a6013e49e345ed994dd5a8f375cfa92a84666a5b359e1ae
+SIZE (xpi/firefox-i18n-49.0/te.xpi) = 518144
+SHA256 (xpi/firefox-i18n-49.0/th.xpi) = 4b807f928829a0d1f59f23763b0a302e066b159fda837d024d868bfc82c17809
+SIZE (xpi/firefox-i18n-49.0/th.xpi) = 486983
+SHA256 (xpi/firefox-i18n-49.0/tr.xpi) = 9b1cd82e2ca1617086aabaf8c9c722d24b7794ee5f2588c1002f51b3901ed14c
+SIZE (xpi/firefox-i18n-49.0/tr.xpi) = 440855
+SHA256 (xpi/firefox-i18n-49.0/uk.xpi) = 4417c9b248b1d02170accaa0ba3014eb2765cba7aaf388ddca3696c54ee21019
+SIZE (xpi/firefox-i18n-49.0/uk.xpi) = 491356
+SHA256 (xpi/firefox-i18n-49.0/uz.xpi) = 5571d1b5c42fd5db1b4b75e1a84edf9c2b8138dac635b0461e89023c6b36bb4b
+SIZE (xpi/firefox-i18n-49.0/uz.xpi) = 446443
+SHA256 (xpi/firefox-i18n-49.0/vi.xpi) = 85edf9733bd538268c74519b1aba4bcf79d3cd1983cc256f22565d0521b8eb8b
+SIZE (xpi/firefox-i18n-49.0/vi.xpi) = 448047
+SHA256 (xpi/firefox-i18n-49.0/xh.xpi) = a6844d3412f58347a22e3ae0b242aee6b2dcbd504a949c064c83398a40e47c7c
+SIZE (xpi/firefox-i18n-49.0/xh.xpi) = 439945
+SHA256 (xpi/firefox-i18n-49.0/zh-CN.xpi) = 1f5648cecfeb15503a320cf0c765b097ce220d01f17e4153032ef99fac3f6cf5
+SIZE (xpi/firefox-i18n-49.0/zh-CN.xpi) = 466752
+SHA256 (xpi/firefox-i18n-49.0/zh-TW.xpi) = efe84a997c57c394d1cc1067a1d63fd77719f015e8eb42bfa9fe8225250e8ddc
+SIZE (xpi/firefox-i18n-49.0/zh-TW.xpi) = 469469
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index a99369032a8b..8646a711c2f2 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -2,26 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	47.0.1
+DISTVERSION=	49.0
 DISTVERSIONSUFFIX=.source
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.12:devel/nspr \
-		nss>=3.23:security/nss \
+		nss>=3.25:security/nss \
 		libevent2>=2.0.21_2:devel/libevent2 \
 		soundtouch>=1.9.0:audio/soundtouch \
-		harfbuzz>=1.2.2:print/harfbuzz \
+		harfbuzz>=1.2.6:print/harfbuzz \
 		graphite2>=1.3.8:graphics/graphite2 \
 		png>=1.6.21:graphics/png \
 		libvorbis>=1.3.5,3:audio/libvorbis \
 		libvpx>=1.5.0:multimedia/libvpx \
-		sqlite3>=3.11.0:databases/sqlite3 \
+		sqlite3>=3.13:databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf-2.13:devel/autoconf213 \
@@ -44,8 +44,7 @@ USES=		tar:xz
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
-MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/' \
-		--enable-application=browser \
+MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding
 
 OPTIONS_EXCLUDE=	GSTREAMER LOGGING
@@ -62,6 +61,9 @@ OPTIONS_DEFAULT_FreeBSD_11_i386=	RUST
 OPTIONS_SINGLE+=	TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
 
+TEST_BROKEN=		No rule to make target '../../../dist/bin/libnspr4.so', needed by \
+			'../../../_tests/xpcshell/modules/libmar/tests/unit/libnspr4.so'
+
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 WRKSRC:=	${WRKDIR}/${PORTNAME}-${DISTVERSION}
diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options
index 926a192d8798..5470ad32f4c2 100644
--- a/www/firefox/Makefile.options
+++ b/www/firefox/Makefile.options
@@ -16,9 +16,9 @@ OPTIONS_MULTI_AUDIO=	ALSA PULSEAUDIO
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
-# dtrace(1) crashes during build
-OPTIONS_EXCLUDE_FreeBSD_9_i386+=	DTRACE
-OPTIONS_EXCLUDE+=	${OPTIONS_EXCLUDE_${OPSYS}_${OSREL:R}_${ARCH}}
+# dtrace(1) crashes during build or fails to allocate space for probe
+OPTIONS_EXCLUDE_FreeBSD_9+=	DTRACE
+OPTIONS_EXCLUDE+=	${OPTIONS_EXCLUDE_${OPSYS}_${OSREL:R}}
 
 BUNDLED_CAIRO_DESC?=	Use bundled fork of cairo-1.9.5
 CANBERRA_DESC?=		Sound theme alerts
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 81439b3f609e..7ccd4a74576f 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,2 +1,3 @@
-SHA256 (firefox-47.0.1.source.tar.xz) = 5ac36c3481dde80ef2e36237badef6cb8ec5fe7e3b5ac1728839477de0cc034c
-SIZE (firefox-47.0.1.source.tar.xz) = 188695532
+TIMESTAMP = 1473148535
+SHA256 (firefox-49.0.source.tar.xz) = feaded1735a270a0e66ea93262d28e210c6e348ee3af62d93da9d615ea9063b1
+SIZE (firefox-49.0.source.tar.xz) = 189545372
diff --git a/www/firefox/files/patch-bug1013882 b/www/firefox/files/patch-bug1013882
index 80f45c011c67..b3e86c5f5c6e 100644
--- a/www/firefox/files/patch-bug1013882
+++ b/www/firefox/files/patch-bug1013882
@@ -11,8 +11,8 @@ index 754312a..c69904c 100644
 +endif
 +
  DEFINES += -DMOZ_ICU_VERSION=$(MOZ_ICU_VERSION)
- ifdef MOZ_NATIVE_ICU
- DEFINES += -DMOZ_NATIVE_ICU
+ ifdef MOZ_SYSTEM_ICU
+ DEFINES += -DMOZ_SYSTEM_ICU
 diff --git b2g/installer/package-manifest.in b2g/installer/package-manifest.in
 index 17d433c..0416187 100644
 --- b2g/installer/package-manifest.in
diff --git a/www/firefox/files/patch-bug1021761 b/www/firefox/files/patch-bug1021761
index 3d1cd0cfb0e9..64852e42e62d 100644
--- a/www/firefox/files/patch-bug1021761
+++ b/www/firefox/files/patch-bug1021761
@@ -1,3 +1,15 @@
+diff --git build/moz.configure/old.configure build/moz.configure/old.configure
+index b95dd2b..4cbefd5 100644
+--- build/moz.configure/old.configure
++++ build/moz.configure/old.configure
+@@ -305,6 +305,7 @@ def old_configure_options(*options):
+     '--with-nspr-prefix',
+     '--with-nss-exec-prefix',
+     '--with-nss-prefix',
++    '--with-oss',
+     '--with-pthreads',
+     '--with-qemu-exe',
+     '--with-servo',
 diff --git old-configure.in configure.in
 index 48e60c0..ec08417 100644
 --- old-configure.in
@@ -1091,13 +1103,13 @@ index 991f03f..3d99eb5 100644
 +if CONFIG['MOZ_OSS']:
 +    OS_LIBS += CONFIG['MOZ_OSS_LIBS']
  
- if CONFIG['MOZ_NATIVE_JPEG']:
+ if CONFIG['MOZ_SYSTEM_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
-@@ -234,8 +234,8 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
+@@ -234,8 +234,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
  if not CONFIG['MOZ_TREE_PIXMAN']:
      OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
  
diff --git a/www/firefox/files/patch-bug1233275 b/www/firefox/files/patch-bug1233275
deleted file mode 100644
index ac5d9d2cdedb..000000000000
--- a/www/firefox/files/patch-bug1233275
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copy environment for IPC using NSPR to avoid race
-
-diff --git a/ipc/chromium/src/base/process_util_bsd.cc b/ipc/chromium/src/base/process_util_bsd.cc
---- ipc/chromium/src/base/process_util_bsd.cc
-+++ ipc/chromium/src/base/process_util_bsd.cc
-@@ -12,10 +12,9 @@
- 
- #include <string>
- 
-+#include "nspr.h"
- #include "base/eintr_wrapper.h"
- 
--extern "C" char **environ __attribute__((__visibility__("default")));
--
- namespace base {
- 
- void FreeEnvVarsArray(char* array[], int length)
-@@ -66,6 +65,7 @@ bool LaunchApp(const std::vector<std::st
-   // Existing variables are overwritten by env_vars_to_set.
-   int pos = 0;
-   environment_map combined_env_vars = env_vars_to_set;
-+  char **environ = PR_DuplicateEnvironment();
-   while(environ[pos] != NULL) {
-     std::string varString = environ[pos];
-     std::string varName = varString.substr(0, varString.find_first_of('='));
-@@ -73,8 +73,9 @@ bool LaunchApp(const std::vector<std::st
-     if (combined_env_vars.find(varName) == combined_env_vars.end()) {
-       combined_env_vars[varName] = varValue;
-     }
--    pos++;
-+    PR_Free(environ[pos++]);
-   }
-+  PR_Free(environ);
-   int varsLen = combined_env_vars.size() + 1;
- 
-   char** vars = new char*[varsLen];
diff --git a/www/firefox/files/patch-bug1288587 b/www/firefox/files/patch-bug1288587
new file mode 100644
index 000000000000..e10ef8537a4a
--- /dev/null
+++ b/www/firefox/files/patch-bug1288587
@@ -0,0 +1,67 @@
+diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
+index 855214a..1e91d51 100644
+--- build/moz.configure/init.configure
++++ build/moz.configure/init.configure
+@@ -165,16 +165,17 @@ option(env='PYTHON', nargs=1, help='Python interpreter')
+ # ==============================================================
+ @depends('PYTHON', check_build_environment, mozconfig, '--help')
+ @imports('os')
+ @imports('sys')
+ @imports('subprocess')
+ @imports(_from='mozbuild.configure.util', _import='LineIO')
+ @imports(_from='mozbuild.virtualenv', _import='VirtualenvManager')
+ @imports(_from='mozbuild.virtualenv', _import='verify_python_version')
++@imports(_from='__builtin__', _import='KeyError')
+ @imports('distutils.sysconfig')
+ def virtualenv_python(env_python, build_env, mozconfig, help):
+     if help:
+         return
+ 
+     python = env_python[0] if env_python else None
+ 
+     # Ideally we'd rely on the mozconfig injection from mozconfig_options,
+@@ -184,16 +185,22 @@ def virtualenv_python(env_python, build_env, mozconfig, help):
+         if 'PYTHON' in mozconfig['env']['added']:
+             python = mozconfig['env']['added']['PYTHON']
+         elif 'PYTHON' in mozconfig['env']['modified']:
+             python = mozconfig['env']['modified']['PYTHON'][1]
+         elif 'PYTHON' in mozconfig['vars']['added']:
+             python = mozconfig['vars']['added']['PYTHON']
+         elif 'PYTHON' in mozconfig['vars']['modified']:
+             python = mozconfig['vars']['modified']['PYTHON'][1]
++        for i in ('env', 'vars'):
++            for j in ('added', 'modified'):
++                try:
++                    del mozconfig[i][j]['PYTHON']
++                except KeyError:
++                    pass
+ 
+     with LineIO(lambda l: log.error(l)) as out:
+         verify_python_version(out)
+     topsrcdir, topobjdir = build_env.topsrcdir, build_env.topobjdir
+     if topobjdir.endswith('/js/src'):
+         topobjdir = topobjdir[:-7]
+ 
+     with LineIO(lambda l: log.info(l)) as out:
+@@ -219,17 +226,20 @@ def virtualenv_python(env_python, build_env, mozconfig, help):
+         log.info('Creating Python environment')
+         manager.build(python)
+ 
+     python = normsep(manager.python_path)
+ 
+     if python != normsep(sys.executable):
+         log.info('Reexecuting in the virtualenv')
+         if env_python:
+-            del os.environ['PYTHON']
++            try:
++                del os.environ['PYTHON']
++            except KeyError:
++                pass
+         # One would prefer to use os.execl, but that's completely borked on
+         # Windows.
+         sys.exit(subprocess.call([python] + sys.argv))
+ 
+     # We are now in the virtualenv
+     if not distutils.sysconfig.get_python_lib():
+         die('Could not determine python site packages directory')
+ 
diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568
index d6d5373e9609..db4ae1da1fb8 100644
--- a/www/firefox/files/patch-bug847568
+++ b/www/firefox/files/patch-bug847568
@@ -1,15 +1,28 @@
 # Allow building against system-wide graphite2/harfbuzz.
 
+diff --git build/moz.configure/old.configure build/moz.configure/old.configure
+index 4cbefd5..42ab554 100644
+--- build/moz.configure/old.configure
++++ build/moz.configure/old.configure
+@@ -312,6 +312,8 @@ def old_configure_options(*options):
+     '--with-sixgill',
+     '--with-soft-float',
+     '--with-system-bz2',
++    '--with-system-graphite2',
++    '--with-system-harfbuzz',
+     '--with-system-icu',
+     '--with-system-jpeg',
+     '--with-system-libevent',
 diff --git config/Makefile.in config/Makefile.in
 index 14bfc0d..5383399 100644
 --- config/Makefile.in
 +++ config/Makefile.in
 @@ -49,6 +49,8 @@ export:: $(export-preqs)
- 		-DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \
- 		-DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \
- 		-DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
-+		-DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \
-+		-DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \
+ 		-DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \
+ 		-DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \
+ 		-DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
++		-DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \
++		-DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \
  		$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
  	$(INSTALL) system_wrappers $(DIST)
  
@@ -21,11 +34,11 @@ index 18e8703..bdc5f82 100644
  #endif
  libutil.h
  unwind.h
-+#if MOZ_NATIVE_GRAPHITE2==1
++#if MOZ_SYSTEM_GRAPHITE2==1
 +graphite2/Font.h
 +graphite2/Segment.h
 +#endif
-+#if MOZ_NATIVE_HARFBUZZ==1
++#if MOZ_SYSTEM_HARFBUZZ==1
 +harfbuzz/hb-ot.h
 +harfbuzz/hb.h
 +#endif
@@ -42,14 +55,14 @@ index ac38f40..87536b7 100644
 +
 +MOZ_ARG_WITH_BOOL(system-harfbuzz,
 +[  --with-system-harfbuzz  Use system harfbuzz (located with pkgconfig)],
-+MOZ_NATIVE_HARFBUZZ=1,
-+MOZ_NATIVE_HARFBUZZ=)
++MOZ_SYSTEM_HARFBUZZ=1,
++MOZ_SYSTEM_HARFBUZZ=)
 +
-+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
-+    PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 1.2.2)
++if test -n "$MOZ_SYSTEM_HARFBUZZ"; then
++    PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 1.2.6)
 +fi
 +
-+AC_SUBST(MOZ_NATIVE_HARFBUZZ)
++AC_SUBST(MOZ_SYSTEM_HARFBUZZ)
 +
 +dnl ========================================================
 +dnl Check for graphite2
@@ -57,10 +70,10 @@ index ac38f40..87536b7 100644
 +
 +MOZ_ARG_WITH_BOOL(system-graphite2,
 +[  --with-system-graphite2 Use system graphite2 (located with pkgconfig)],
-+MOZ_NATIVE_GRAPHITE2=1,
-+MOZ_NATIVE_GRAPHITE2=)
++MOZ_SYSTEM_GRAPHITE2=1,
++MOZ_SYSTEM_GRAPHITE2=)
 +
-+if test -n "$MOZ_NATIVE_GRAPHITE2"; then
++if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
 +    PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2)
 +
 +    dnl graphite2.pc has bogus version, check manually
@@ -77,7 +90,7 @@ index ac38f40..87536b7 100644
 +                   [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])])
 +fi
 +
-+AC_SUBST(MOZ_NATIVE_GRAPHITE2)
++AC_SUBST(MOZ_SYSTEM_GRAPHITE2)
 +
 +dnl ========================================================
  dnl Check for pixman and cairo
@@ -91,7 +104,7 @@ index a660ba4..6b2f602 100644
      SOURCES += ['nsTextFragmentSSE2.cpp']
      SOURCES['nsTextFragmentSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
  
-+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    SOURCES['nsContentUtils.cpp'].flags += CONFIG['MOZ_HARFBUZZ_CFLAGS']
 +
  EXTRA_COMPONENTS += [
@@ -148,10 +161,10 @@ index 519aa46..6929751 100644
  if CONFIG['MOZ_TREE_CAIRO']:
      DIRS += ['cairo']
  
-+if not CONFIG['MOZ_NATIVE_GRAPHITE2']:
++if not CONFIG['MOZ_SYSTEM_GRAPHITE2']:
 +    DIRS += ['graphite2/src' ]
 +
-+if not CONFIG['MOZ_NATIVE_HARFBUZZ']:
++if not CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    DIRS += ['harfbuzz/src']
 +
  DIRS += [
@@ -174,7 +187,7 @@ index 28fa6b5..240dced 100755
          '-Wno-unused-private-field',
      ]
  
-+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
 +
  if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
@@ -188,7 +201,7 @@ index 1d0c2f9..adb8941 100644
          '-Wno-unused-private-field',
      ]
  
-+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
 +
  if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
@@ -203,10 +216,10 @@ index d5852fa..aeeab25 100644
  LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
  
 -DEFINES['GRAPHITE2_STATIC'] = True
-+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
 +
-+if CONFIG['MOZ_NATIVE_GRAPHITE2']:
++if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
 +    CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']
 +else:
 +    DEFINES['GRAPHITE2_STATIC'] = True
@@ -220,7 +233,7 @@ index d736943..41a931f 100644
      LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
      USE_LIBS += ['icu']
  
-+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
 +
  DIST_INSTALL = True
@@ -232,7 +245,7 @@ index 0b0717a..2e665c9 100644
      '/netwerk/base',
  ]
  
-+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
 +
  if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > '19':
@@ -242,14 +255,14 @@ diff --git toolkit/library/moz.build toolkit/library/moz.build
 index 67f0db9..d42137a 100644
 --- toolkit/library/moz.build
 +++ toolkit/library/moz.build
-@@ -231,6 +231,12 @@ if CONFIG['MOZ_NATIVE_LIBVPX']:
+@@ -231,6 +231,12 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
  if not CONFIG['MOZ_TREE_PIXMAN']:
      OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
  
-+if CONFIG['MOZ_NATIVE_GRAPHITE2']:
++if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
 +    OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
 +
-+if CONFIG['MOZ_NATIVE_HARFBUZZ']:
++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
 +
  if CONFIG['MOZ_OSS']:
diff --git a/www/firefox/files/patch-ijg-libjpeg b/www/firefox/files/patch-ijg-libjpeg
index 6129b21bc016..b6788adc0f84 100644
--- a/www/firefox/files/patch-ijg-libjpeg
+++ b/www/firefox/files/patch-ijg-libjpeg
@@ -4,7 +4,7 @@ diff --git old-configure.in configure.in
 index f0aeb5d..1c01010 100644
 --- old-configure.in
 +++ old-configure.in
-@@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+@@ -4027,11 +4027,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
                       #include <jpeglib.h> ],
                     [ #if JPEG_LIB_VERSION < $MOZJPEG
                       #error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -14,7 +14,7 @@ index f0aeb5d..1c01010 100644
 -                     #endif
 -                     ],
 +                     #endif ],
-                    MOZ_NATIVE_JPEG=1,
+                    MOZ_SYSTEM_JPEG=1,
                     AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
  fi
 diff --git image/decoders/nsJPEGDecoder.cpp image/decoders/nsJPEGDecoder.cpp
diff --git a/www/firefox/files/patch-modules-libpref-init-all.js b/www/firefox/files/patch-modules-libpref-init-all.js
index 660b538c62a9..fefec7f3066b 100644
--- a/www/firefox/files/patch-modules-libpref-init-all.js
+++ b/www/firefox/files/patch-modules-libpref-init-all.js
@@ -1,15 +1,14 @@
---- modules/libpref/init/all.js.orig	2015-08-06 22:39:34 UTC
+--- modules/libpref/init/all.js.orig	2016-07-25 20:22:05 UTC
 +++ modules/libpref/init/all.js
-@@ -4052,7 +4052,12 @@ pref("layers.max-active", -1);
+@@ -4453,6 +4453,11 @@ pref("layers.max-active", -1);
+ // if you change the tile size.
  pref("layers.tiles.adjust", true);
  
- // Set the default values, and then override per-platform as needed
-+#ifdef MOZ_TREE_CAIRO
- pref("layers.offmainthreadcomposition.enabled", true);
-+#else
++#ifndef MOZ_TREE_CAIRO
 +// Disable for system cairo on suspicion of causing random crashes
-+pref("layers.offmainthreadcomposition.enabled", false);
++pref("layers.offmainthreadcomposition.force-disabled", true);
 +#endif
++
  // Compositor target frame rate. NOTE: If vsync is enabled the compositor
  // frame rate will still be capped.
  // -1 -> default (match layout.frame_rate or 60 FPS)
diff --git a/www/firefox/files/patch-z-bug517422 b/www/firefox/files/patch-z-bug517422
index ae9385072ae7..5e197e17cda7 100644
--- a/www/firefox/files/patch-z-bug517422
+++ b/www/firefox/files/patch-z-bug517422
@@ -1,18 +1,35 @@
 # Allow more config/external/ libs built against system-wide version.
 
+diff --git build/moz.configure/old.configure build/moz.configure/old.configure
+index 42ab554..c91df3d 100644
+--- build/moz.configure/old.configure
++++ build/moz.configure/old.configure
+@@ -320,7 +320,12 @@ def old_configure_options(*options):
+     '--with-system-libvpx',
+     '--with-system-nspr',
+     '--with-system-nss',
++    '--with-system-ogg',
+     '--with-system-png',
++    '--with-system-soundtouch',
++    '--with-system-theora',
++    '--with-system-tremor',
++    '--with-system-vorbis',
+     '--with-system-zlib',
+     '--with-thumb',
+     '--with-thumb-interwork',
 diff --git config/Makefile.in config/Makefile.in
 index 5383399..0410004 100644
 --- config/Makefile.in
 +++ config/Makefile.in
 @@ -77,6 +77,11 @@ export:: $(export-preqs)
- 		-DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
- 		-DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \
- 		-DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \
-+		-DMOZ_NATIVE_OGG=$(MOZ_NATIVE_OGG) \
-+		-DMOZ_NATIVE_THEORA=$(MOZ_NATIVE_THEORA) \
-+		-DMOZ_NATIVE_VORBIS=$(MOZ_NATIVE_VORBIS) \
-+		-DMOZ_NATIVE_TREMOR=$(MOZ_NATIVE_TREMOR) \
-+		-DMOZ_NATIVE_SOUNDTOUCH=$(MOZ_NATIVE_SOUNDTOUCH) \
+ 		-DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
+ 		-DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \
+ 		-DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \
++		-DMOZ_SYSTEM_OGG=$(MOZ_SYSTEM_OGG) \
++		-DMOZ_SYSTEM_THEORA=$(MOZ_SYSTEM_THEORA) \
++		-DMOZ_SYSTEM_VORBIS=$(MOZ_SYSTEM_VORBIS) \
++		-DMOZ_SYSTEM_TREMOR=$(MOZ_SYSTEM_TREMOR) \
++		-DMOZ_SYSTEM_SOUNDTOUCH=$(MOZ_SYSTEM_SOUNDTOUCH) \
  		$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
  	$(INSTALL) system_wrappers $(DIST)
  
@@ -25,20 +42,20 @@ index f67c5c7..eb909ce 100644
  external_dirs += ['modules/brotli']
  
 -if CONFIG['MOZ_VORBIS']:
-+if not CONFIG['MOZ_NATIVE_OGG']:
++if not CONFIG['MOZ_SYSTEM_OGG']:
 +    external_dirs += ['media/libogg']
 +
-+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_VORBIS']:
++if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_SYSTEM_VORBIS']:
      external_dirs += ['media/libvorbis']
  
 -if CONFIG['MOZ_TREMOR']:
-+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_NATIVE_TREMOR']:
++if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_SYSTEM_TREMOR']:
      external_dirs += ['media/libtremor']
  
-+if not CONFIG['MOZ_NATIVE_THEORA']:
++if not CONFIG['MOZ_SYSTEM_THEORA']:
 +    external_dirs += ['media/libtheora']
 +
-+if not CONFIG['MOZ_NATIVE_SOUNDTOUCH']:
++if not CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
 +    external_dirs += ['media/libsoundtouch']
 +
  if CONFIG['MOZ_WEBM_ENCODER']:
@@ -65,18 +82,18 @@ index bef567c..9807c29 100644
  harfbuzz/hb-ot.h
  harfbuzz/hb.h
  #endif
-+#if MOZ_NATIVE_OGG==1
++#if MOZ_SYSTEM_OGG==1
 +ogg/ogg.h
 +ogg/os_types.h
 +#endif
-+#if MOZ_NATIVE_THEORA==1
++#if MOZ_SYSTEM_THEORA==1
 +theora/theoradec.h
 +#endif
-+#if MOZ_NATIVE_VORBIS==1
++#if MOZ_SYSTEM_VORBIS==1
 +vorbis/codec.h
 +vorbis/vorbisenc.h
 +#endif
-+#if MOZ_NATIVE_TREMOR==1
++#if MOZ_SYSTEM_TREMOR==1
 +tremor/ivorbiscodec.h
 +#endif
 diff --git old-configure.in configure.in
@@ -93,10 +110,10 @@ index 87db361..7947626 100644
 +
 +MOZ_ARG_WITH_BOOL(system-ogg,
 +[  --with-system-ogg       Use system libogg (located with pkgconfig)],
-+MOZ_NATIVE_OGG=1,
-+MOZ_NATIVE_OGG=)
++MOZ_SYSTEM_OGG=1,
++MOZ_SYSTEM_OGG=)
 +
-+if test -n "$MOZ_NATIVE_OGG"; then
++if test -n "$MOZ_SYSTEM_OGG"; then
 +    PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
 +
 +    _SAVE_LIBS=$LIBS
@@ -106,7 +123,7 @@ index 87db361..7947626 100644
 +    LIBS=$_SAVE_LIBS
 +fi
 +
-+AC_SUBST(MOZ_NATIVE_OGG)
++AC_SUBST(MOZ_SYSTEM_OGG)
 +
 +dnl ========================================================
 +dnl Check for libvorbis
@@ -114,14 +131,14 @@ index 87db361..7947626 100644
 +
 +MOZ_ARG_WITH_BOOL(system-vorbis,
 +[  --with-system-vorbis    Use system libvorbis (located with pkgconfig)],
-+MOZ_NATIVE_VORBIS=1,
-+MOZ_NATIVE_VORBIS=)
++MOZ_SYSTEM_VORBIS=1,
++MOZ_SYSTEM_VORBIS=)
 +
-+if test -n "$MOZ_NATIVE_VORBIS"; then
++if test -n "$MOZ_SYSTEM_VORBIS"; then
 +    PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5)
 +fi
 +
-+AC_SUBST(MOZ_NATIVE_VORBIS)
++AC_SUBST(MOZ_SYSTEM_VORBIS)
 +
 +dnl ========================================================
 +dnl Check for integer-only libvorbis aka tremor
@@ -129,14 +146,14 @@ index 87db361..7947626 100644
 +
 +MOZ_ARG_WITH_BOOL(system-tremor,
 +[  --with-system-tremor    Use system libtremor (located with pkgconfig)],
-+MOZ_NATIVE_TREMOR=1,
-+MOZ_NATIVE_TREMOR=)
++MOZ_SYSTEM_TREMOR=1,
++MOZ_SYSTEM_TREMOR=)
 +
-+if test -n "$MOZ_NATIVE_TREMOR"; then
++if test -n "$MOZ_SYSTEM_TREMOR"; then
 +    PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1)
 +fi
 +
-+AC_SUBST(MOZ_NATIVE_TREMOR)
++AC_SUBST(MOZ_SYSTEM_TREMOR)
 +
 +dnl ========================================================
 +dnl Check for libtheora
@@ -144,14 +161,14 @@ index 87db361..7947626 100644
 +
 +MOZ_ARG_WITH_BOOL(system-theora,
 +[  --with-system-theora    Use system libtheora (located with pkgconfig)],
-+MOZ_NATIVE_THEORA=1,
-+MOZ_NATIVE_THEORA=)
++MOZ_SYSTEM_THEORA=1,
++MOZ_SYSTEM_THEORA=)
 +
-+if test -n "$MOZ_NATIVE_THEORA"; then
++if test -n "$MOZ_SYSTEM_THEORA"; then
 +    PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2)
 +fi
 +
-+AC_SUBST(MOZ_NATIVE_THEORA)
++AC_SUBST(MOZ_SYSTEM_THEORA)
 +
 +dnl ========================================================
 +dnl Check for libSoundTouch
@@ -159,10 +176,10 @@ index 87db361..7947626 100644
 +
 +MOZ_ARG_WITH_BOOL(system-soundtouch,
 +[  --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)],
-+MOZ_NATIVE_SOUNDTOUCH=1,
-+MOZ_NATIVE_SOUNDTOUCH=)
++MOZ_SYSTEM_SOUNDTOUCH=1,
++MOZ_SYSTEM_SOUNDTOUCH=)
 +
-+if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then
++if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then
 +    PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0)
 +
 +    AC_LANG_SAVE
@@ -187,10 +204,10 @@ index 87db361..7947626 100644
 +    fi
 +fi
 +
-+if test -n "$MOZ_NATIVE_SOUNDTOUCH"; then
-+    AC_DEFINE(MOZ_NATIVE_SOUNDTOUCH)
++if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then
++    AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH)
 +fi
-+AC_SUBST(MOZ_NATIVE_SOUNDTOUCH)
++AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH)
 +
  dnl system libvpx Support
  dnl ========================================================
@@ -199,21 +216,21 @@ diff --git dom/media/AudioStream.cpp dom/media/AudioStream.cpp
 index 2127256..1ec09fe 100644
 --- dom/media/AudioStream.cpp
 +++ dom/media/AudioStream.cpp
-@@ -129,7 +129,9 @@ AudioStream::AudioStream()
+@@ -125,7 +125,9 @@ AudioStream::AudioStream(DataSource& aSo
+   , mOutRate(0)
+   , mChannels(0)
    , mOutChannels(0)
-   , mWritten(0)
-   , mAudioClock(this)
-+#ifndef MOZ_NATIVE_SOUNDTOUCH
++#ifndef MOZ_SYSTEM_SOUNDTOUCH
    , mTimeStretcher(nullptr)
 +#endif
    , mDumpFile(nullptr)
-   , mBytesPerFrame(0)
    , mState(INITIALIZED)
+   , mDataSource(aSource)
 @@ -152,9 +154,11 @@ AudioStream::~AudioStream()
    if (mDumpFile) {
      fclose(mDumpFile);
    }
-+#ifndef MOZ_NATIVE_SOUNDTOUCH
++#ifndef MOZ_SYSTEM_SOUNDTOUCH
    if (mTimeStretcher) {
      soundtouch::destroySoundTouchObj(mTimeStretcher);
    }
@@ -225,7 +242,7 @@ index 2127256..1ec09fe 100644
  {
    mMonitor.AssertCurrentThreadOwns();
    if (!mTimeStretcher) {
-+#ifdef MOZ_NATIVE_SOUNDTOUCH
++#ifdef MOZ_SYSTEM_SOUNDTOUCH
 +    mTimeStretcher = new soundtouch::SoundTouch();
 +#else
      mTimeStretcher = soundtouch::createSoundTouchObj();
@@ -241,7 +258,7 @@ index a552e3e..02b80b1 100644
  #include "mozilla/RefPtr.h"
  #include "mozilla/UniquePtr.h"
  #include "CubebUtils.h"
-+#ifdef MOZ_NATIVE_SOUNDTOUCH
++#ifdef MOZ_SYSTEM_SOUNDTOUCH
 +#include "soundtouch/SoundTouch.h"
 +#else
  #include "soundtouch/SoundTouchFactory.h"
@@ -253,7 +270,7 @@ index a552e3e..02b80b1 100644
    // Number of frames written to the buffers.
    int64_t mWritten;
    AudioClock mAudioClock;
-+#ifdef MOZ_NATIVE_SOUNDTOUCH
++#ifdef MOZ_SYSTEM_SOUNDTOUCH
 +  nsAutoPtr<soundtouch::SoundTouch> mTimeStretcher;
 +#else
    soundtouch::SoundTouch* mTimeStretcher;
@@ -269,19 +286,19 @@ index 7526cff..e0a0ca0 100644
  
  DEFINES['MOZILLA_INTERNAL_API'] = True
  
-+if CONFIG['MOZ_NATIVE_OGG']:
++if CONFIG['MOZ_SYSTEM_OGG']:
 +    CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS']
 +
-+if CONFIG['MOZ_NATIVE_THEORA']:
++if CONFIG['MOZ_SYSTEM_THEORA']:
 +    CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS']
 +
-+if CONFIG['MOZ_NATIVE_VORBIS']:
++if CONFIG['MOZ_SYSTEM_VORBIS']:
 +    CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS']
 +
-+if CONFIG['MOZ_NATIVE_TREMOR']:
++if CONFIG['MOZ_SYSTEM_TREMOR']:
 +    CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS']
 +
-+if CONFIG['MOZ_NATIVE_SOUNDTOUCH']:
++if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
 +    CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']
 +
  if CONFIG['OS_TARGET'] == 'WINNT':
@@ -316,7 +333,7 @@ index 0af2fe6..d80c145 100644
  
  #pragma GCC visibility push(default)
  #include "SoundTouch.h"
-+#ifndef MOZ_NATIVE_SOUNDTOUCH
++#ifndef MOZ_SYSTEM_SOUNDTOUCH
  #include "SoundTouchFactory.h"
 +#endif
  #pragma GCC visibility pop
@@ -341,7 +358,7 @@ index 14265b1..3069e99 100644
  # The encoder is currently not included.
  DEFINES['THEORA_DISABLE_ENCODE'] = True
  
-+if CONFIG['MOZ_NATIVE_OGG']:
++if CONFIG['MOZ_SYSTEM_OGG']:
 +    CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
 +
  # Suppress warnings in third-party code.
@@ -366,7 +383,7 @@ index 31831ba..a03d576 100644
  
  DIRS += ['include/tremor', 'lib']
  
-+if CONFIG['MOZ_NATIVE_OGG']:
++if CONFIG['MOZ_SYSTEM_OGG']:
 +    CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
 diff --git media/libvorbis/README_MOZILLA media/libvorbis/README_MOZILLA
 index 7c7454c..55baedd 100644
@@ -388,32 +405,32 @@ index 919b99e..cc776f7 100644
  if CONFIG['GNU_CC']:
      CFLAGS += ['-Wno-uninitialized']
 +
-+if CONFIG['MOZ_NATIVE_OGG']:
++if CONFIG['MOZ_SYSTEM_OGG']:
 +    CFLAGS += CONFIG['MOZ_OGG_CFLAGS']
 diff --git toolkit/library/moz.build toolkit/library/moz.build
 index d42137a..695e75a8 100644
 --- toolkit/library/moz.build
 +++ toolkit/library/moz.build
-@@ -178,6 +178,21 @@ if CONFIG['MOZ_NATIVE_PNG']:
- if CONFIG['MOZ_NATIVE_HUNSPELL']:
+@@ -178,6 +178,21 @@ if CONFIG['MOZ_SYSTEM_PNG']:
+ if CONFIG['MOZ_SYSTEM_HUNSPELL']:
      OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
  
-+if CONFIG['MOZ_NATIVE_OGG']:
++if CONFIG['MOZ_SYSTEM_OGG']:
 +    OS_LIBS += CONFIG['MOZ_OGG_LIBS']
 +
-+if CONFIG['MOZ_NATIVE_THEORA']:
++if CONFIG['MOZ_SYSTEM_THEORA']:
 +    OS_LIBS += CONFIG['MOZ_THEORA_LIBS']
 +
-+if CONFIG['MOZ_NATIVE_VORBIS']:
++if CONFIG['MOZ_SYSTEM_VORBIS']:
 +    OS_LIBS += CONFIG['MOZ_VORBIS_LIBS']
 +
-+if CONFIG['MOZ_NATIVE_TREMOR']:
++if CONFIG['MOZ_SYSTEM_TREMOR']:
 +    OS_LIBS += CONFIG['MOZ_TREMOR_LIBS']
 +
-+if CONFIG['MOZ_NATIVE_SOUNDTOUCH']:
++if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
 +    OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS']
 +
- if CONFIG['MOZ_NATIVE_LIBEVENT']:
+ if CONFIG['MOZ_SYSTEM_LIBEVENT']:
      OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
  
 diff --git xpcom/build/XPCOMInit.cpp xpcom/build/XPCOMInit.cpp
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
index b15f2b39d737..ce167e8928d8 100644
--- a/www/libxul/Makefile
+++ b/www/libxul/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libxul
 DISTVERSION=	45.3.0
+PORTREVISION=	1
 CATEGORIES?=	www devel
 MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source \
 		MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build2/source
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 1d7360dda747..4174337f0cb7 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	seamonkey
 DISTVERSION=	2.39
 MOZILLA_VER=	42 # above + 3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES?=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
diff --git a/www/seamonkey/files/patch-bug1234033 b/www/seamonkey/files/patch-bug1234033
new file mode 100644
index 000000000000..4e5b8c79041a
--- /dev/null
+++ b/www/seamonkey/files/patch-bug1234033
@@ -0,0 +1,13 @@
+diff --git toolkit/mozapps/update/updater/updater.cpp toolkit/mozapps/update/updater/updater.cpp
+index bb0834c..6ef82a1 100644
+--- mozilla/toolkit/mozapps/update/updater/updater.cpp
++++ mozilla/toolkit/mozapps/update/updater/updater.cpp
+@@ -157,7 +157,7 @@ BOOL PathGetSiblingFilePath(LPWSTR destinationBuffer,
+ // declare it here to avoid including that entire header file.
+ #define BZ2_CRC32TABLE_UNDECLARED
+ 
+-#if MOZ_IS_GCC
++#if MOZ_IS_GCC || defined(__clang__)
+ extern "C"  __attribute__((visibility("default"))) unsigned int BZ2_crc32Table[256];
+ #undef BZ2_CRC32TABLE_UNDECLARED
+ #elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)