From nobody Sat Nov 13 20:02:51 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4A4401863305; Sat, 13 Nov 2021 20:02:52 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hs5wX0J4cz3H0d; Sat, 13 Nov 2021 20:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CB36219930; Sat, 13 Nov 2021 20:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1ADK2pEt050356; Sat, 13 Nov 2021 20:02:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ADK2p4s050355; Sat, 13 Nov 2021 20:02:51 GMT (envelope-from git) Date: Sat, 13 Nov 2021 20:02:51 GMT Message-Id: <202111132002.1ADK2p4s050355@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: bf3dd0f6c5f0 - main - deskutils/gnome-contacts: chase Meson options name after 30c5e3bf165c List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf3dd0f6c5f0b9ea88e59d588cd6b1819f6ebeff Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf3dd0f6c5f0b9ea88e59d588cd6b1819f6ebeff commit bf3dd0f6c5f0b9ea88e59d588cd6b1819f6ebeff Author: Jan Beich AuthorDate: 2021-11-13 19:49:55 +0000 Commit: Jan Beich CommitDate: 2021-11-13 20:02:35 +0000 deskutils/gnome-contacts: chase Meson options name after 30c5e3bf165c meson.build:1:0: ERROR: Unknown options: "with-cheese, with-manpage" https://gitlab.gnome.org/GNOME/gnome-contacts/-/commit/f429a775d8de https://gitlab.gnome.org/GNOME/gnome-contacts/-/commit/77fa086cfd82 PR: 259080 Reported by: antoine (via exp-run) Regressed by: https://github.com/mesonbuild/meson/commit/dbf2ace6ca1c --- deskutils/gnome-contacts/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deskutils/gnome-contacts/Makefile b/deskutils/gnome-contacts/Makefile index 05160d03dc2b..76ca8f5aa304 100644 --- a/deskutils/gnome-contacts/Makefile +++ b/deskutils/gnome-contacts/Makefile @@ -51,14 +51,14 @@ OPTIONS_DEFINE_amd64= CHEESE OPTIONS_DEFAULT_i386= CHEESE OPTIONS_DEFAULT_amd64= CHEESE -MANPAGES_MESON_TRUE= with-manpage +MANPAGES_MESON_TRUE= manpage MANPAGES_USE= GNOME=libxslt:build MANPAGES_BUILD_DEPENDS= docbook-xml>=0:textproc/docbook-xml \ docbook-xsl-ns>=0:textproc/docbook-xsl-ns \ docbook-xsl>=0:textproc/docbook-xsl CHEESE_DESC= Cheese webcam support -CHEESE_MESON_YES= with-cheese +CHEESE_MESON_ENABLED= cheese CHEESE_LIB_DEPENDS= libcheese-gtk.so:multimedia/cheese .include