Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 13 Nov 2021 20:02:51 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: bf3dd0f6c5f0 - main - deskutils/gnome-contacts: chase Meson options name after 30c5e3bf165c
Message-ID:  <202111132002.1ADK2p4s050355@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bf3dd0f6c5f0b9ea88e59d588cd6b1819f6ebeff

commit bf3dd0f6c5f0b9ea88e59d588cd6b1819f6ebeff
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-11-13 19:49:55 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111132002.1ADK2p4s050355>