Index: www/firefox/Makefile
===================================================================
--- www/firefox/Makefile
+++ www/firefox/Makefile
@@ -2,22 +2,22 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	68.0
-PORTREVISION=	4
+DISTVERSION=	69.0b4
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source
-DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}
+DISTFILES=	${DISTNAME}${PORTVERSION:E}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.21:devel/nspr \
-		nss>=3.44.1:security/nss \
+		nss>=3.45:security/nss \
 		icu>=63.1,1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
-		harfbuzz>=2.4.0:print/harfbuzz \
+		harfbuzz>=2.5.3:print/harfbuzz \
 		graphite2>=1.3.13:graphics/graphite2 \
 		png>=1.6.35:graphics/png \
 		libvpx>=1.5.0:multimedia/libvpx \
Index: www/firefox/distinfo
===================================================================
--- www/firefox/distinfo
+++ www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562377765
-SHA256 (firefox-68.0.source.tar.xz) = f7d61a08820088f1280d27f0808e355152c1dd0c94625fd077ced7319e522565
-SIZE (firefox-68.0.source.tar.xz) = 315855672
+TIMESTAMP = 1562898611
+SHA256 (firefox-69.0b4.source.tar.xz) = e1a317878f4cef64c047255e7bf590bc7249a139bbb60df4aa903a3b15c45cec
+SIZE (firefox-69.0b4.source.tar.xz) = 316800692
Index: www/firefox/files/patch-bug847568
===================================================================
--- www/firefox/files/patch-bug847568
+++ www/firefox/files/patch-bug847568
@@ -249,7 +249,7 @@
 +option('--with-system-harfbuzz',
 +       help="Use system harfbuzz (located with pkgconfig)")
 +
-+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.4.0',
++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.5.3',
 +                                    when='--with-system-harfbuzz')
 +
 +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
Index: www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
===================================================================
--- www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
+++ www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
@@ -12,13 +12,14 @@
  
  namespace mozilla {
  
-@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled()
- {
+@@ -14,6 +15,11 @@ namespace mozilla {
+ bool FlacDecoder::IsEnabled() {
  #ifdef MOZ_FFVPX
-   return StaticPrefs::MediaFlacEnabled();
+   return StaticPrefs::media_flac_enabled();
 +#elif defined(MOZ_FFMPEG)
 +  RefPtr<PDMFactory> platform = new PDMFactory();
-+  return StaticPrefs::MediaFlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
++  return StaticPrefs::media_flac_enabled() &&
++         platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
 +                                    /* DecoderDoctorDiagnostics* */ nullptr);
  #else
    // Until bug 1295886 is fixed.