Index: branches/2018Q2/www/waterfox/Makefile
===================================================================
--- branches/2018Q2/www/waterfox/Makefile	(revision 468165)
+++ branches/2018Q2/www/waterfox/Makefile	(revision 468166)
@@ -1,74 +1,74 @@
 # $FreeBSD$
 
 PORTNAME=	waterfox
 DISTVERSION=	56.1.0
-PORTREVISION=	13
+PORTREVISION=	15
 CATEGORIES=	www ipv6
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Distilled fork of Firefox
 
 DEPRECATED=	Temporary experiment
 EXPIRATION_DATE=2018-05-16
 
 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@${PY_FLAVOR} \
 		v4l_compat>0:multimedia/v4l_compat \
 		autoconf-2.13:devel/autoconf213 \
 		yasm:devel/yasm \
 		zip:archivers/zip
 #		soundtouch>=1.9.0:audio/soundtouch \
 
 LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MrAlex94
 GH_PROJECT=	Waterfox
 
 USE_GECKO=	gecko
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-soundtouch
 MOZILLA_NAME=	Waterfox
 
 USE_GL=		gl
 
 WATERFOX_ICON=		${MOZILLA}.png
 WATERFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default256.png
 WATERFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop
 MOZ_OPTIONS=	--enable-application=browser \
 		--with-app-name=${MOZILLA} \
 		--with-app-basename=${MOZILLA_NAME} \
 		--with-distribution-id=org.${MOZILLA}project
 
 OPTIONS_DEFAULT=	BUNDLED_CAIRO
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
 		-e 's/firefox/${MOZILLA}/' \
 		-e 's/Firefox/${MOZILLA_NAME}/' \
 		${WATERFOX_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} ${WATERFOX_DESKTOP} \
 		${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${LN} -sf ${WATERFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${WATERFOX_ICON}
 
 .include <bsd.port.mk>
Index: branches/2018Q2/www/waterfox/files/patch-bug1448200
===================================================================
--- branches/2018Q2/www/waterfox/files/patch-bug1448200	(nonexistent)
+++ branches/2018Q2/www/waterfox/files/patch-bug1448200	(revision 468166)
@@ -0,0 +1,36 @@
+commit 64e2cd0e1310
+Author: Blake Kaplan <mrbkap@gmail.com>
+Date:   Fri Mar 30 16:15:11 2018 -0700
+
+    Bug 1448200 - Handle the creation of the spellchecker more gracefully. r=Felipe a=lizzard
+    
+    If the user right-clicks on an input field and that click causes us to create
+    a spellchecker, then it won't be initialized in time to show the context menu.
+    Handle that case more gracefully by passing that state up to the parent.
+    
+    MozReview-Commit-ID: 1hjxloq2OLp
+    
+    --HG--
+    extra : source : 8fbafbc46da259a054dd00feb93abc20e3140c56
+    extra : histedit_source : 8f5a1548dad701ac23e34c9a15a59e67b50188c0
+---
+ toolkit/modules/InlineSpellCheckerContent.jsm | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git toolkit/modules/InlineSpellCheckerContent.jsm toolkit/modules/InlineSpellCheckerContent.jsm
+index 5184f1ec7dcb..974fbba879d7 100644
+--- toolkit/modules/InlineSpellCheckerContent.jsm
++++ toolkit/modules/InlineSpellCheckerContent.jsm
+@@ -49,6 +49,12 @@ var InlineSpellCheckerContent = {
+                enableRealTimeSpell: false };
+     }
+ 
++    if (spellChecker.initialSpellCheckPending) {
++      return { canSpellCheck: true,
++               initialSpellCheckPending: true,
++               enableRealTimeSpell: true };
++    }
++
+     let dictionaryList = {};
+     let realSpellChecker = spellChecker.mInlineSpellChecker.spellChecker;
+     realSpellChecker.GetDictionaryList(dictionaryList, {});

Property changes on: branches/2018Q2/www/waterfox/files/patch-bug1448200
___________________________________________________________________
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/2018Q2
===================================================================
--- branches/2018Q2	(revision 468165)
+++ branches/2018Q2	(revision 468166)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r468160