svn commit: r511273 - in head: Mk mail/thunderbird www/firefox www/firefox-esr

[Jan Beich]

Author: jbeich
Date: Thu Sep  5 23:35:51 2019
New Revision: 511273
URL: https://svnweb.freebsd.org/changeset/ports/511273

Log:
  gecko: drop remnants of WAYLAND option after r509969

Modified:
  head/Mk/bsd.gecko.mk   (contents, props changed)
  head/mail/thunderbird/Makefile   (contents, props changed)
  head/www/firefox-esr/Makefile   (contents, props changed)
  head/www/firefox/Makefile   (contents, props changed)
  head/www/firefox/Makefile.options   (contents, props changed)

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Thu Sep  5 23:30:43 2019	(r511272)
+++ head/Mk/bsd.gecko.mk	Thu Sep  5 23:35:51 2019	(r511273)
@@ -199,7 +199,6 @@ BUILD_DEPENDS+=	${-${dep}_BUILD_DEPENDS}
 
 # Standard options
 MOZ_OPTIONS+=	\
-		--enable-default-toolkit=cairo-gtk3${PORT_OPTIONS:MWAYLAND:tl:C/.+/-&/} \
 		--enable-update-channel=${PKGNAMESUFFIX:Urelease:S/^-//} \
 		--disable-updater \
 		--with-system-zlib \
@@ -410,17 +409,6 @@ gecko-post-patch:
 .if ${MOZILLA_VER:R:R} < 61
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${MOZSRC}/extensions/spellcheck/hunspell/*/mozHunspell.cpp
-.endif
-
-pre-configure: gecko-pre-configure
-
-gecko-pre-configure:
-.if ${PORT_OPTIONS:MWAYLAND}
-# .if !exists() evaluates too early before gtk3 has a chance to be installed
-	@if ! pkg-config --exists gtk+-wayland-3.0; then \
-		${ECHO_MSG} "${PKGNAME}: Needs gtk3 with WAYLAND support enabled."; \
-		${FALSE}; \
-	fi
 .endif
 
 post-install-script: gecko-create-plist

Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile	Thu Sep  5 23:30:43 2019	(r511272)
+++ head/mail/thunderbird/Makefile	Thu Sep  5 23:35:51 2019	(r511273)
@@ -44,7 +44,6 @@ SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}/defaults/pref
 
 OPTIONS_DEFINE=	LIGHTNING
 OPTIONS_DEFAULT=CANBERRA LIGHTNING
-OPTIONS_EXCLUDE=WAYLAND
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.pre.mk>

Modified: head/www/firefox-esr/Makefile
==============================================================================
--- head/www/firefox-esr/Makefile	Thu Sep  5 23:30:43 2019	(r511272)
+++ head/www/firefox-esr/Makefile	Thu Sep  5 23:35:51 2019	(r511273)
@@ -42,8 +42,6 @@ FIREFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/${MOZILL
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding
 
-OPTIONS_EXCLUDE=	WAYLAND
-
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 post-patch:

Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile	Thu Sep  5 23:30:43 2019	(r511272)
+++ head/www/firefox/Makefile	Thu Sep  5 23:35:51 2019	(r511273)
@@ -40,8 +40,6 @@ FIREFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/${MOZILL
 MOZ_OPTIONS=	--enable-application=browser \
 		--enable-official-branding
 
-OPTIONS_EXCLUDE=	WAYLAND
-
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 
 post-patch:

Modified: head/www/firefox/Makefile.options
==============================================================================
--- head/www/firefox/Makefile.options	Thu Sep  5 23:30:43 2019	(r511272)
+++ head/www/firefox/Makefile.options	Thu Sep  5 23:35:51 2019	(r511273)
@@ -1,9 +1,9 @@
 # -*- makefile-bsdmake -*-
 
 OPTIONS_DEFINE+= 	CANBERRA DBUS DEBUG FFMPEG GCONF \
-			LIBPROXY OPTIMIZED_CFLAGS PROFILE TEST WAYLAND
+			LIBPROXY OPTIMIZED_CFLAGS PROFILE TEST
 
-OPTIONS_DEFAULT+=	DBUS FFMPEG GCONF OPTIMIZED_CFLAGS PROFILE WAYLAND \
+OPTIONS_DEFAULT+=	DBUS FFMPEG GCONF OPTIMIZED_CFLAGS PROFILE \
 			${OPTIONS_MULTI_AUDIO:NSNDIO}
 
 OPTIONS_MULTI+=		AUDIO