Index: branches/2018Q1/www/waterfox/Makefile
===================================================================
--- branches/2018Q1/www/waterfox/Makefile	(revision 459226)
+++ branches/2018Q1/www/waterfox/Makefile	(revision 459227)
@@ -1,73 +1,74 @@
 # $FreeBSD$
 
 PORTNAME=	waterfox
 DISTVERSION=	56.0.3
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Distilled fork of Firefox
 
 DEPRECATED=	Temporary experiment
 EXPIRATION_DATE=2018-01-30
 
 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/2018Q1/www/waterfox/files/patch-bug1425156
===================================================================
--- branches/2018Q1/www/waterfox/files/patch-bug1425156	(nonexistent)
+++ branches/2018Q1/www/waterfox/files/patch-bug1425156	(revision 459227)
@@ -0,0 +1,78 @@
+commit 38b712aab29c
+Author: Dragana Damjanovic <dd.mozilla@gmail.com>
+Date:   Thu Dec 14 20:22:56 2017 +0100
+
+    Bug 1425156 - Fix bug in the http-auth dialog blocking. r=ckerschb a=gchang
+    
+    --HG--
+    extra : source : e098500c325d3aaddc9cc4166b8695f294b6a246
+---
+ .../protocol/http/nsHttpChannelAuthProvider.cpp    | 28 ++++++++++++----------
+ 1 file changed, 16 insertions(+), 12 deletions(-)
+
+diff --git netwerk/protocol/http/nsHttpChannelAuthProvider.cpp netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
+index c70eb9455adb..d8d604d234ab 100644
+--- netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
++++ netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
+@@ -993,16 +993,19 @@ nsHttpChannelAuthProvider::BlockPrompt()
+     bool nonWebContent = false;
+ 
+     if (loadInfo) {
+-        nsCOMPtr<nsIPrincipal> triggeringPrinc =
+-            loadInfo->TriggeringPrincipal();
+-        if (nsContentUtils::IsSystemPrincipal(triggeringPrinc)) {
+-            nonWebContent = true;
+-        }
+-
+         if (loadInfo->GetExternalContentPolicyType() !=
+             nsIContentPolicy::TYPE_DOCUMENT) {
+             topDoc = false;
+         }
++
++        if (!topDoc) {
++            nsCOMPtr<nsIPrincipal> triggeringPrinc =
++                loadInfo->TriggeringPrincipal();
++            if (nsContentUtils::IsSystemPrincipal(triggeringPrinc)) {
++                nonWebContent = true;
++            }
++        }
++
+         if (loadInfo->GetExternalContentPolicyType() ==
+             nsIContentPolicy::TYPE_XMLHTTPREQUEST) {
+             xhr = true;
+@@ -1027,12 +1030,12 @@ nsHttpChannelAuthProvider::BlockPrompt()
+     }
+ 
+     if (gHttpHandler->IsTelemetryEnabled()) {
+-        if (nonWebContent) {
+-            Telemetry::Accumulate(Telemetry::HTTP_AUTH_DIALOG_STATS_3,
+-                                  HTTP_AUTH_DIALOG_NON_WEB_CONTENT);
+-        } else if (topDoc) {
++        if (topDoc) {
+             Telemetry::Accumulate(Telemetry::HTTP_AUTH_DIALOG_STATS_3,
+                                   HTTP_AUTH_DIALOG_TOP_LEVEL_DOC);
++        } else if (nonWebContent) {
++            Telemetry::Accumulate(Telemetry::HTTP_AUTH_DIALOG_STATS_3,
++                                   HTTP_AUTH_DIALOG_NON_WEB_CONTENT);
+         } else if (!mCrossOrigin) {
+             if (xhr) {
+                 Telemetry::Accumulate(Telemetry::HTTP_AUTH_DIALOG_STATS_3,
+@@ -1047,7 +1050,7 @@ nsHttpChannelAuthProvider::BlockPrompt()
+         }
+     }
+ 
+-    if (!sNonWebContentTriggeredAuthAllow && nonWebContent) {
++    if (!topDoc && !sNonWebContentTriggeredAuthAllow && nonWebContent) {
+         return true;
+     }
+ 
+@@ -1065,7 +1068,8 @@ nsHttpChannelAuthProvider::BlockPrompt()
+         // If pref network.auth.subresource-img-cross-origin-http-auth-allow
+         // is set, http-authentication dialog for image subresources is
+         // blocked.
+-        if (!sImgCrossOriginAuthAllowPref &&
++        if (mCrossOrigin &&
++            !sImgCrossOriginAuthAllowPref &&
+             loadInfo &&
+             ((loadInfo->GetExternalContentPolicyType() == nsIContentPolicy::TYPE_IMAGE) ||
+              (loadInfo->GetExternalContentPolicyType() == nsIContentPolicy::TYPE_IMAGESET))) {

Property changes on: branches/2018Q1/www/waterfox/files/patch-bug1425156
___________________________________________________________________
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/2018Q1
===================================================================
--- branches/2018Q1	(revision 459226)
+++ branches/2018Q1	(revision 459227)

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