Index: branches/2017Q4/www/firefox/Makefile
===================================================================
--- branches/2017Q4/www/firefox/Makefile	(revision 452929)
+++ branches/2017Q4/www/firefox/Makefile	(revision 452930)
@@ -1,77 +1,77 @@
 # Created by: Alan Eldridge <alane@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	firefox
 DISTVERSION=	56.0.2
 DISTVERSIONSUFFIX=.source
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.16:devel/nspr \
 		nss>=3.32.1:security/nss \
 		icu>=59.1,1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=1.4.7:print/harfbuzz \
 		graphite2>=1.3.10:graphics/graphite2 \
 		png>=1.6.31:graphics/png \
 		libvorbis>=1.3.5,3:audio/libvorbis \
 		libvpx>=1.5.0:multimedia/libvpx \
 		sqlite3>=3.19.3:databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf-2.13:devel/autoconf213 \
 		yasm:devel/yasm \
 		llvm40>0:devel/llvm40 \
 		zip:archivers/zip
 #		soundtouch>=1.9.0:audio/soundtouch \
 
 LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 USE_GECKO=	gecko
 CONFLICTS_INSTALL=	firefox-esr-45.* firefox-esr-3[18].* firefox-esr-24.*
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-soundtouch
 MOZILLA_NAME=	Firefox
 
 USE_GL=		gl
 USES=		tar:xz
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 MOZ_EXPORT=	BINDGEN_CFLAGS="-isystem${LOCALBASE}/include/nspr \
 			-isystem${LOCALBASE}/include/pixman-1" # XXX bug 1341234
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding
 
 OPTIONS_DEFAULT=	BUNDLED_CAIRO
 OPTIONS_EXCLUDE=	GNOMEUI
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 WRKSRC:=	${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
 		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
 
 post-patch:
 	@${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:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>
Index: branches/2017Q4/www/firefox/files/patch-bug1401573
===================================================================
--- branches/2017Q4/www/firefox/files/patch-bug1401573	(nonexistent)
+++ branches/2017Q4/www/firefox/files/patch-bug1401573	(revision 452930)
@@ -0,0 +1,27 @@
+commit d0ed05261f20
+Author: jason laster <jlaster@mozilla.com>
+Date:   Wed Sep 20 10:52:54 2017 -0400
+
+    Bug 1401573 - Fix PoE, Link, and linux issue. r=nchevobbe
+    
+    MozReview-Commit-ID: 35TA6bhW1Wr
+---
+ devtools/client/debugger/new/debugger.js           | 68 +++++++++++++++++-----
+ devtools/client/debugger/new/panel.js              | 27 ++++++++-
+ .../new/test/mochitest/browser_dbg-expressions.js  |  2 +-
+ 3 files changed, 79 insertions(+), 18 deletions(-)
+
+diff --git devtools/client/debugger/new/debugger.js devtools/client/debugger/new/debugger.js
+index f52a3e380ab6..c1213180cb13 100644
+--- devtools/client/debugger/new/debugger.js
++++ devtools/client/debugger/new/debugger.js
+@@ -29493,7 +29493,8 @@ return /******/ (function(modules) { // webpackBootstr
+ 	}
+ 
+ 	function getKeyForOS(os, action) {
+-	  return KEYS[os][action];
++         var osActions = KEYS[os] || KEYS.Linux;
++         return osActions[action];
+ 	}
+ 
+ 	function formatKey(action) {

Property changes on: branches/2017Q4/www/firefox/files/patch-bug1401573
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2017Q4
===================================================================
--- branches/2017Q4	(revision 452929)
+++ branches/2017Q4	(revision 452930)

Property changes on: branches/2017Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r452907