From nobody Fri Jan 12 17:32:49 2024 X-Original-To: dev-commits-ports-all@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 4TBTBn6lMpz57DM2; Fri, 12 Jan 2024 17:32:49 +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 4TBTBn64Gfz4gfH; Fri, 12 Jan 2024 17:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705080769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JuKs6Met4N8XfIcGdxss7IlsN35tuWlodNGVy9I9tQk=; b=RI1nI5WbQUdnM7Jr5eeLDUvFt7rmwzMAueCoM0C989CumdJYid8atRZ6bfE6LK93qAtYzm dr4J5AoYQQc5km5OJY+QITHgoLvHFNdXO8IkJOLgGPaTLhSf+jWDy54JOFJcHbhSDDgFG4 la2MRelV94OuoJz+kG5iX2Gz57GAFsF54b/DZUCH7tbJJsFB3tySCskQFu3aDqpYAfa/NN GEvkgCPBmAOO073kUt/71y/MvUEP8UrUhqFYssgg4lbh3AeQEeH8HoAOO7au6o4HqVxOIS ae0XLHtI394pWkopUSIRC/iqCinlEeCijortUsTdJ8o9R8QGpiIb0w2TGYZX+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705080769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JuKs6Met4N8XfIcGdxss7IlsN35tuWlodNGVy9I9tQk=; b=tMEVnOvEBcNfTyRPJ6+TSLrdcjdpFD1CxV5bWDz6gZaN95FmCCGluQNgC6g27LYGdA7Hzt SHhLlfD0TGmPw3p6n++xNvCucrUN4wwwomVgldykgrWG3mWPxy9hMr77Dg95wFV7CZhI/N 4zkY0b1WCN2SItACk/F4ExGne5Fsx/dTeN1wmP11RtZDCdA8fSkGioVRhLyyh26IpAR2q1 xFy6AO8mAIVKOJFhIaKhqbgHoglwdGnY/t50VbU0V+nER6W018wy/Un5RxCUhiCseWok9o l0QP066uQjWUqClzNgcav5I59K0TFKClP1hBsZpFyucOYT2Q7mUZ1VhJzAsEIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705080769; a=rsa-sha256; cv=none; b=x+ZuQZlRr0CR+22OiMDq5Mkkke17I0mdtJLUkdPxeF27M2Fk3G6my04Rb/3sw36k33NY4z mTbPvSaJFhJaFJxhZQ7NTVbg2eOfImTfcixNFmjp7ldpOHjOUZtbTyfJZiwW9pZF+CXgSf H9ZbeRc89wem5eD9LXdiSvd/hrkc9o7lK7NyctfQWeshc44bZKUo6ZdBbYUkyxW9NSrlUV GBqX1m0EwoYDxAh/AurVylKcnWq/Q6u8a4GPI/wwJufrP206j3i1lctdA8AUfRB9u58WUu /yt/sbXdJOOex9dmhK17fq+7NRyH0/2+/qeQuBpMw2ZbS/o+PYc7jzKvRCrqbA== 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 4TBTBn56qtz19bL; Fri, 12 Jan 2024 17:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40CHWn16065787; Fri, 12 Jan 2024 17:32:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CHWnv8065784; Fri, 12 Jan 2024 17:32:49 GMT (envelope-from git) Date: Fri, 12 Jan 2024 17:32:49 GMT Message-Id: <202401121732.40CHWnv8065784@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 7e9524e8b8c5 - main - x11/cinnamon: partially revert "Disable DOCS option" List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e9524e8b8c592db27cd0d0a5c750c6264d595c8 Auto-Submitted: auto-generated The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e9524e8b8c592db27cd0d0a5c750c6264d595c8 commit 7e9524e8b8c592db27cd0d0a5c750c6264d595c8 Author: Charlie Li AuthorDate: 2024-01-12 17:30:34 +0000 Commit: Charlie Li 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