Index: head/www/firefox/Makefile
===================================================================
--- head/www/firefox/Makefile	(revision 463892)
+++ head/www/firefox/Makefile	(revision 463893)
@@ -1,70 +1,70 @@
 # Created by: Alan Eldridge <alane@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	firefox
 DISTVERSION=	59.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	https://hg.mozilla.org/releases/mozilla-release/archive/
 DISTNAME=	${MASTER_SITES:M*hg*:S,/archive/,,:T}-e9128973a480c8aedf3a2e1c67d3e168613fa17c
 DISTFILES=	${DISTNAME:C/.*-//}${EXTRACT_SUFX}
 DIST_SUBDIR=	firefox
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.17:devel/nspr \
 		nss>=3.34.1:security/nss \
 		icu>=59.1,1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		harfbuzz>=1.7.2:print/harfbuzz \
 		graphite2>=1.3.10:graphics/graphite2 \
 		png>=1.6.34:graphics/png \
 		libvorbis>=1.3.5,3:audio/libvorbis \
 		libvpx>=1.5.0:multimedia/libvpx \
 		sqlite3>=3.20.1: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_GECKO=	gecko
 CONFLICTS_INSTALL=	firefox-esr
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-cairo -soundtouch
 
 USE_GL=		gl
 USES=		tar:bz2
 
 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
 
 OPTIONS_EXCLUDE=	BUNDLED_CAIRO
 
 .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/files/patch-bug1444083
===================================================================
--- head/www/firefox/files/patch-bug1444083	(nonexistent)
+++ head/www/firefox/files/patch-bug1444083	(revision 463893)
@@ -0,0 +1,17 @@
+Disable custom styling for <select> and <option> on Tier3 as well
+
+diff --git modules/libpref/init/all.js modules/libpref/init/all.js
+index 322d009da739..06e2fd7f664a 100644
+--- modules/libpref/init/all.js
++++ modules/libpref/init/all.js
+@@ -1359,8 +1359,8 @@ pref("dom.forms.autocomplete.formautofill", false);
+ // Enable search in <select> dropdowns (more than 40 options)
+ pref("dom.forms.selectSearch", false);
+ // Allow for webpages to provide custom styling for <select>
+-// popups. Disabled on Linux due to bug 1338283.
+-#ifdef XP_LINUX
++// popups. Disabled on GTK due to bug 1338283.
++#ifdef MOZ_WIDGET_GTK
+ pref("dom.forms.select.customstyling", false);
+ #else
+ pref("dom.forms.select.customstyling", true);

Property changes on: head/www/firefox/files/patch-bug1444083
___________________________________________________________________
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/Makefile
===================================================================
--- head/www/waterfox/Makefile	(revision 463892)
+++ head/www/waterfox/Makefile	(revision 463893)
@@ -1,75 +1,75 @@
 # $FreeBSD$
 
 PORTNAME=	waterfox
 DISTVERSION=	56.0.4-36
 DISTVERSIONSUFFIX=	-g79492ecca478
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www ipv6
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Distilled fork of Firefox
 
 DEPRECATED=	Temporary experiment
 EXPIRATION_DATE=2018-03-20
 
 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: head/www/waterfox/files/patch-bug1444083
===================================================================
--- head/www/waterfox/files/patch-bug1444083	(nonexistent)
+++ head/www/waterfox/files/patch-bug1444083	(revision 463893)
@@ -0,0 +1,17 @@
+Disable custom styling for <select> and <option> on Tier3 as well
+
+diff --git modules/libpref/init/all.js modules/libpref/init/all.js
+index 322d009da739..06e2fd7f664a 100644
+--- modules/libpref/init/all.js
++++ modules/libpref/init/all.js
+@@ -1359,8 +1359,8 @@ pref("dom.forms.autocomplete.formautofill", false);
+ // Enable search in <select> dropdowns (more than 40 options)
+ pref("dom.forms.selectSearch", false);
+ // Allow for webpages to provide custom styling for <select>
+-// popups. Disabled on Linux due to bug 1338283.
+-#ifdef XP_LINUX
++// popups. Disabled on GTK due to bug 1338283.
++#ifdef MOZ_WIDGET_GTK
+ pref("dom.forms.select.customstyling", false);
+ #else
+ pref("dom.forms.select.customstyling", true);

Property changes on: head/www/waterfox/files/patch-bug1444083
___________________________________________________________________
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