From nobody Wed Apr 12 15:23:48 2023 X-Original-To: dev-commits-ports-branches@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 4PxRLs135jz44xH9; Wed, 12 Apr 2023 15:23: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 4PxRLr6RSKz4Gph; Wed, 12 Apr 2023 15:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681313028; 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=pK8V5Z8rgvYHJCjvfhLurpiKJnphayWn1gj3+ApQ+hU=; b=KRYiVtCtdRoePyBmuT0bo4noTBiLc19h6C/d7PF0XQbkQQmN/SivfCYaMdyvw/BhyA2dRU CMxo/aha1sLUrQSZNmiliXm/jFIHVS8nPWDPjRCcmHjIwsAKufqYutjnE7CWphVOXmNUOp IrnngJ+kUUngKcxQrQLM//0FJPvuzSddOtHC9YnXjj+Zq12KDVx8YGULCsX3dCRKtFMxxE JTZg7zL/EdSweVirDXuaIYTOnx7VxDtqNdJ5M18z7emPeprMsq9RPt6RR8nrI/GX3060NU PfU/Wxoakq94AEItWGYsnTsbEaoPlwUQOZ7QCwbjRb9ES+E7gSw2VocbU7PZ8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681313028; 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=pK8V5Z8rgvYHJCjvfhLurpiKJnphayWn1gj3+ApQ+hU=; b=mppHdzfeqR/Yk4PbbtGY9H5agkFZY29/wQxjRECot2wGg2uTFKg4zmXZd96rgfvjwRgYmU 3+Z13neXlQjS0rLrHGlWmzg40dkD01mTKXLzv2Q67jXnpGobZn4ignEGta7ChMFSaeI+ud mr5lg6yNQikd2vyjghMTUVvqh4ZOQ9Lo3s2Fc+pM4cpVdT/dlBM1GLjSLoMdsOKOfeLjxo N7nNEJNAgm+bKHm8msdzyIgWTxp/CGsZWXPjB/zsahSxBKI1hhX4HhHL/lY13ZtdCO2GRp 5epnIEcanPq97vB+259AvUeBxxZM0eVq7iH6JEL7CqK9Z59oIZ1gC/m8eRdMrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681313028; a=rsa-sha256; cv=none; b=In77M40nk7ZN4+TX4s8SWfNUs2zhS0JNIXIwdgjxVv1zYxdUeiByhsQ6uACFfLf7bXb6ZQ NHZ8SbzAe/Un2t0H4wgfL1i8yv6HD0O3TVhzFHMgr3Du5fupvf6jaGMirCvxlKA8Od+eQx MQZbauo7UTDBOv3MktHtJYWLOdFdKGysd93gSfWRyz9YQ8PdvuR1/fufoY7OIWMpBXwLk/ KN3WrP8nTzVIxspbbnbvKZ0VgVPN/49OuYWvse7PNHGMuMiPU3PoYhr9H7+56R3rD3TzOT 0GET9beT0HQWOqofhb5ve4HYnUCBjUkQuVu/ldxfyzwACojH+ZtnhD0cOUnSsg== 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 4PxRLr5G1yz14XC; Wed, 12 Apr 2023 15:23:48 +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 33CFNmnd084739; Wed, 12 Apr 2023 15:23:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CFNmaJ084738; Wed, 12 Apr 2023 15:23:48 GMT (envelope-from git) Date: Wed, 12 Apr 2023 15:23:48 GMT Message-Id: <202304121523.33CFNmaJ084738@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Joseph Mingrone Subject: git: e33e3d31a36c - 2023Q2 - sysutils/cpu-x: flavorize the port (by popular demand) List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: e33e3d31a36ce32d982cd5c380c02fea8947b624 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=e33e3d31a36ce32d982cd5c380c02fea8947b624 commit e33e3d31a36ce32d982cd5c380c02fea8947b624 Author: Alexey Dokuchaev AuthorDate: 2023-04-05 19:02:36 +0000 Commit: Joseph Mingrone CommitDate: 2023-04-12 15:23:04 +0000 sysutils/cpu-x: flavorize the port (by popular demand) CPU-X can be used in graphic mode with GTK+3, or in text-based mode with ncurses, subject to build-time configuration. Previously this was controlled via options, but since graphic mode was the default, users who preferred ncurses (console) version had to reconfigure the port and build their own package, which was inconvenient. Now with flavors, everyone should be happy. Requested by: marck et al. (cherry picked from commit b0a0b0d7211d557fd8242ca38877e5ce4db97306) --- sysutils/cpu-x/Makefile | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/sysutils/cpu-x/Makefile b/sysutils/cpu-x/Makefile index 70041938b6cd..b3ebda4e8be3 100644 --- a/sysutils/cpu-x/Makefile +++ b/sysutils/cpu-x/Makefile @@ -2,6 +2,7 @@ PORTNAME= cpu-x PORTVERSION= 4.5.3 DISTVERSIONPREFIX= v CATEGORIES= sysutils +PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= danfe@FreeBSD.org COMMENT= Gathers information about CPU, motherboard, and more @@ -14,7 +15,7 @@ LIB_DEPENDS= libcpuid.so:sysutils/libcpuid \ libpci.so:devel/libpci \ libstatgrab.so:devel/libstatgrab -USES= cmake ncurses pkgconfig +USES= cmake pkgconfig USE_GITHUB= yes GH_ACCOUNT= TheTumultuousUnicornOfDarkness GH_PROJECT= ${PORTNAME:tu} @@ -22,18 +23,26 @@ CMAKE_OFF= WITH_LIBGLFW WITH_VULKAN WITH_OPENCL PORTDOCS= ChangeLog.md README.md -OPTIONS_DEFINE= DOCS NLS X11 -OPTIONS_DEFAULT= X11 +OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_CMAKE_OFF= -DWITH_GETTEXT:BOOL=OFF -X11_DESC= Build GTK+3 frontend in addition to ncurses one -X11_USES= gnome -X11_USE= GNOME=gtk30 -X11_CMAKE_OFF= -DWITH_GTK:BOOL=OFF -X11_VARS= GLIB_SCHEMAS=org.cpu-x.gschema.xml +FLAVORS= gtk3 ncurses + +CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:S/^/${PORTNAME}-/} + +.if ${FLAVOR:U} == ncurses +USES+= ncurses +CMAKE_ARGS+= -DWITH_GTK:BOOL=OFF +PLIST_SUB+= X11="@comment " +.else +USES+= gnome +USE_GNOME= gtk30 +GLIB_SCHEMAS= org.cpu-x.gschema.xml +PLIST_SUB+= X11="" +.endif post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}