Index: head/www/firefox-esr/Makefile
===================================================================
--- head/www/firefox-esr/Makefile	(revision 533408)
+++ head/www/firefox-esr/Makefile	(revision 533409)
@@ -1,62 +1,61 @@
 # Created by: Alan Eldridge <alane@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	firefox
-DISTVERSION=	68.7.0
-PORTREVISION=	3
+DISTVERSION=	68.8.0
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build3/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source
 PKGNAMESUFFIX=	-esr
 DISTFILES=	${DISTNAME}esr.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.3:security/nss \
 		icu>=63.1,1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=2.4.0:print/harfbuzz \
 		graphite2>=1.3.13:graphics/graphite2 \
 		png>=1.6.35:graphics/png \
 		libvpx>=1.5.0:multimedia/libvpx \
 		sqlite3>=3.28.0:databases/sqlite3 \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf-2.13:devel/autoconf213 \
 		nasm:devel/nasm \
 		zip:archivers/zip
 
 USE_GECKO=	gecko
 CPE_PRODUCT=	${PORTNAME}_esr
 CONFLICTS_INSTALL=	firefox
 USE_MOZILLA=	-vpx
 
 USES=		tar:xz
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 FIREFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
 		-e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
 		${FIREFOX_DESKTOP}
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 
 pre-configure:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
 	(cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
 
 post-install:
 	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>
Index: head/www/firefox-esr/distinfo
===================================================================
--- head/www/firefox-esr/distinfo	(revision 533408)
+++ head/www/firefox-esr/distinfo	(revision 533409)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585942230
-SHA256 (firefox-68.7.0esr.source.tar.xz) = ad3ea069c3d23aab360ad04ff4d0f5e556d3538f7dd4eae0690c4e9241537570
-SIZE (firefox-68.7.0esr.source.tar.xz) = 312235932
+TIMESTAMP = 1588197054
+SHA256 (firefox-68.8.0esr.source.tar.xz) = fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842
+SIZE (firefox-68.8.0esr.source.tar.xz) = 312602308
Index: head/www/firefox-esr/files/patch-bug1580963
===================================================================
--- head/www/firefox-esr/files/patch-bug1580963	(revision 533408)
+++ head/www/firefox-esr/files/patch-bug1580963	(nonexistent)
@@ -1,61 +0,0 @@
-From 7617a0e6fe2bb7afab6ffda49fc8cd9eca2f035b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
-Date: Thu, 12 Sep 2019 21:09:27 +0000
-Subject: [PATCH] Bug 1580963 - Cherry-pick some servo changes from a rustc
- upgrade.
-
-This cherry-picks from Servo commit 98e4a53b724.
-
-Differential Revision: https://phabricator.services.mozilla.com/D45738
-
---HG--
-extra : moz-landing-system : lando
----
- .../style/stylesheets/viewport_rule.rs        | 23 +++++++++++++------
- 1 file changed, 16 insertions(+), 7 deletions(-)
-
-diff --git a/servo/components/style/stylesheets/viewport_rule.rs b/servo/components/style/stylesheets/viewport_rule.rs
-index 8cc858f7a7f69..7d0881e3336a9 100644
---- servo/components/style/stylesheets/viewport_rule.rs
-+++ servo/components/style/stylesheets/viewport_rule.rs
-@@ -291,15 +291,18 @@ impl<'a, 'b, 'i> DeclarationParser<'i> for ViewportRuleParser<'a, 'b> {
-     ) -> Result<Vec<ViewportDescriptorDeclaration>, ParseError<'i>> {
-         macro_rules! declaration {
-             ($declaration:ident($parse:expr)) => {
--                declaration!($declaration(value: try!($parse(input)),
--                                          important: input.try(parse_important).is_ok()))
-+                declaration!($declaration {
-+                    value: $parse(input)?,
-+                    important: input.try(parse_important).is_ok(),
-+                })
-             };
--            ($declaration:ident(value: $value:expr, important: $important:expr)) => {
-+            ($declaration:ident { value: $value:expr, important: $important:expr, }) => {
-                 ViewportDescriptorDeclaration::new(
-                     self.context.stylesheet_origin,
-                     ViewportDescriptor::$declaration($value),
--                    $important)
--            }
-+                    $important,
-+                )
-+            };
-         }
- 
-         macro_rules! ok {
-@@ -311,8 +314,14 @@ impl<'a, 'b, 'i> DeclarationParser<'i> for ViewportRuleParser<'a, 'b> {
-                 let important = input.try(parse_important).is_ok();
- 
-                 Ok(vec![
--                    declaration!($min(value: shorthand.0, important: important)),
--                    declaration!($max(value: shorthand.1, important: important)),
-+                    declaration!($min {
-+                        value: shorthand.0,
-+                        important: important,
-+                    }),
-+                    declaration!($max {
-+                        value: shorthand.1,
-+                        important: important,
-+                    }),
-                 ])
-             }};
-         }

Property changes on: head/www/firefox-esr/files/patch-bug1580963
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property