From owner-svn-ports-head@freebsd.org Thu Sep 5 23:35:52 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D5A86D7E3A; Thu, 5 Sep 2019 23:35:52 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46PcWX4zw9z4XjH; Thu, 5 Sep 2019 23:35:52 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9001ABF84; Thu, 5 Sep 2019 23:35:52 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x85NZqnt047472; Thu, 5 Sep 2019 23:35:52 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x85NZppV047467; Thu, 5 Sep 2019 23:35:51 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201909052335.x85NZppV047467@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 5 Sep 2019 23:35:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511273 - in head: Mk mail/thunderbird www/firefox www/firefox-esr X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head: Mk mail/thunderbird www/firefox www/firefox-esr X-SVN-Commit-Revision: 511273 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Sep 2019 23:35:52 -0000 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 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