Index: head/www/waterfox/Makefile
===================================================================
--- head/www/waterfox/Makefile	(revision 455323)
+++ head/www/waterfox/Makefile	(revision 455324)
@@ -1,73 +1,74 @@
 # $FreeBSD$
 
 PORTNAME=	waterfox
 DISTVERSION=	56.0.s20171130
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Distilled fork of Firefox
 
 DEPRECATED=	Temporary experiment
-EXPIRATION_DATE=2017-12-12
+EXPIRATION_DATE=2017-12-19
 
 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 \
 		zip:archivers/zip
 #		soundtouch>=1.9.0:audio/soundtouch \
 
 LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MrAlex94
 GH_PROJECT=	Waterfox
 GH_TAGNAME=	8c17fb8d3c7f
 
 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_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: head/www/waterfox/files/patch-typos
===================================================================
--- head/www/waterfox/files/patch-typos	(nonexistent)
+++ head/www/waterfox/files/patch-typos	(revision 455324)
@@ -0,0 +1,33 @@
+Mismerges found by comparing changes with Firefox 56
+
+--- dom/base/nsNodeUtils.cpp.orig
++++ dom/base/nsNodeUtils.cpp
+@@ -589,6 +589,7 @@ nsNodeUtils::CloneAndAdopt(nsINode *aNode, bool aClone, bool aDeep,
+           if (wasRegistered) {
+             aNode->OwnerDoc()->UnregisterActivityObserver(aNode->AsElement());
+           }
++          aNode->mNodeInfo.swap(newNodeInfo);
+           if (elem) {
+             elem->NodeInfoChanged(newDoc);
+           }
+--- netwerk/test/unit/test_idn_urls.js.orig
++++ netwerk/test/unit/test_idn_urls.js
+@@ -286,7 +286,7 @@ const testcases = [
+     // Thai (also tests that node with over 63 UTF-8 octets doesn't fail)
+     ["เครื่องทําน้ําทําน้ําแข็ง",
+                  "xn--22cdjb2fanb9fyepcbbb9dwh4a3igze4fdcd",
+-                                                     false, true, true]
++                                                     false, true, true],
+ 
+     // Effect of adding valid or invalid subdomains (bug 1399540)
+     ["䕮䕵䕶䕱.ascii", "xn--google.ascii",                       false, true,  true],
+--- security/nss/lib/softoken/softkver.h.orig
++++ security/nss/lib/softoken/softkver.h
+@@ -26,6 +26,6 @@
+ #define SOFTOKEN_VMINOR 32
+ #define SOFTOKEN_VPATCH 1
+ #define SOFTOKEN_VBUILD 0
+-#define SOFTOKEN_BETA PR_TRUE
++#define SOFTOKEN_BETA PR_FALSE
+ 
+ #endif /* _SOFTKVER_H_ */

Property changes on: head/www/waterfox/files/patch-typos
___________________________________________________________________
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: head/www/waterfox/pkg-descr
===================================================================
--- head/www/waterfox/pkg-descr	(revision 455323)
+++ head/www/waterfox/pkg-descr	(revision 455324)
@@ -1,24 +1,25 @@
 The Waterfox source code is a specialised modification of the Mozilla
 platform, designed for privacy and user choice in mind. You should be
 able to install it and compile Waterfox without any issues. Other
 modifications and patches that are more upstream have been implemented
 as well to fix any compatibility/security issues that Mozilla may lag
 behind in implementing (usually due to not being high priority). High
 request features removed by Mozilla but wanted by users are retained
 (if they aren't removed due to security).
 
 Features:
 
  o Disabled Encrypted Media Extensions (EME)
  o Disabled Web Runtime (deprecated as of 2015)
  o Removed Pocket
  o Removed Telemetry
  o Removed data collection
  o Removed startup profiling
  o Allow running of all 64-Bit NPAPI plugins
  o Allow running of unsigned extensions
  o Removal of Sponsored Tiles on New Tab Page
  o Addition of Duplicate Tab option (toggle with browser.tabs.duplicateTab)
  o Locale selector in about:preferences > General
+ o Cookie Prompt
 
 WWW: https://www.waterfoxproject.org/