Index: head/www/firefox/Makefile
===================================================================
--- head/www/firefox/Makefile
+++ head/www/firefox/Makefile
@@ -2,22 +2,21 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	68.0.2
-PORTREVISION=	1
+DISTVERSION=	69.0
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
 DISTFILES=	${DISTNAME}.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: head/www/firefox/distinfo
===================================================================
--- head/www/firefox/distinfo
+++ head/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565719693
-SHA256 (firefox-68.0.2.source.tar.xz) = 9b3e6d8f99819f9eda9ebba403b644a2b96d19450b42cae422bbf4386902a840
-SIZE (firefox-68.0.2.source.tar.xz) = 311257408
+TIMESTAMP = 1566865858
+SHA256 (firefox-69.0.source.tar.xz) = 5d1e703b91f1c4c9b2a6251b4067f5fed45728c640f257a696f3228a1b6527db
+SIZE (firefox-69.0.source.tar.xz) = 315384680
Index: head/www/firefox/files/patch-bug1575876
===================================================================
--- head/www/firefox/files/patch-bug1575876
+++ head/www/firefox/files/patch-bug1575876
@@ -1,22 +0,0 @@
-commit b588aee56dcb
-Author: Tijl Coosemans <tijl@FreeBSD.org>
-Date:   Wed Aug 21 23:46:52 2019 +0200
-
-    Bug 1575876 - Drop header unused on FreeBSD that breaks with new libc++.
----
- media/mtransport/third_party/nICEr/src/stun/stun.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git media/mtransport/third_party/nICEr/src/stun/stun.h media/mtransport/third_party/nICEr/src/stun/stun.h
-index 0d55b63a94c1a..a32751d7950f6 100644
---- media/mtransport/third_party/nICEr/src/stun/stun.h
-+++ media/mtransport/third_party/nICEr/src/stun/stun.h
-@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <sys/socket.h>
- #ifndef LINUX
- #include <net/if.h>
--#if !defined(__OpenBSD__) && !defined(__NetBSD__)
-+#ifdef DARWIN
- #include <net/if_var.h>
- #endif
- #include <net/if_dl.h>
Index: head/www/firefox/files/patch-bug847568
===================================================================
--- head/www/firefox/files/patch-bug847568
+++ head/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: head/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
===================================================================
--- head/www/firefox/files/patch-dom_media_flac_FlacDecoder.cpp
+++ head/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.