Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 12 Jan 2024 17:32:49 GMT
From:      Charlie Li <vishwin@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7e9524e8b8c5 - main - x11/cinnamon: partially revert "Disable DOCS option"
Message-ID:  <202401121732.40CHWnv8065784@gitrepo.freebsd.org>

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

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

commit 7e9524e8b8c592db27cd0d0a5c750c6264d595c8
Author:     Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2024-01-12 17:30:34 +0000
Commit:     Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2024-01-12 17:30:34 +0000

    x11/cinnamon: partially revert "Disable DOCS option"
    
    Instead of commenting out the option, exclude it instead, as it is
    to be exposed again upon future updates given that libxml2 doesn't
    error out. Also remove OPTIONS_DEFAULT as DOCS and NLS are globally
    enabled by default.
    
    This partially reverts commit 3bbf0bae390af1df9a353b235b390d1f979065ef.
---
 x11/cinnamon/Makefile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index 05b4bb0dff64..def73bdd1961 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -64,18 +64,16 @@ SHEBANG_FILES=	files/* src/data-to-c.pl
 USE_LDCONFIG=	yes
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
-PLIST_SUB+=	PORTDOCS="@comment "
-MESON_ARGS=	-Ddocs=false -Ddisable_networkmanager=true
+MESON_ARGS=	-Ddisable_networkmanager=true
 
 GLIB_SCHEMAS=	org.cinnamon.gschema.xml
 
-#OPTIONS_DEFINE=	DOCS NLS
-OPTIONS_DEFINE=		NLS
-OPTIONS_DEFAULT=	NLS
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_EXCLUDE=	DOCS
 OPTIONS_SUB=	yes
 
-#DOCS_BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
-#DOCS_MESON_TRUE=	docs
+DOCS_BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
+DOCS_MESON_TRUE=	docs
 
 NLS_RUN_DEPENDS=	cinnamon-translations>0:misc/cinnamon-translations
 



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