From nobody Wed Apr 12 15:23:49 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 4PxRLt0hRJz44xhN; Wed, 12 Apr 2023 15:23:50 +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 4PxRLt0DyMz4H0S; Wed, 12 Apr 2023 15:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681313030; 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=2PEBt/eolmgPdWso1SDpLjQdQGSsiAXDePWgKIgsDE4=; b=UmQqqCLrrgA0UodFgMso3uVQFF+3TekmCJ25SPePKZlp8tnVdMd5JNAOixTMZohu0gZinp G96WDxENpyZqby++VIagjF//PrXUfqUFAd8N+HFDHxdhW1m2D9oiYZlM5ImNIgZMaKv5Cc MFGq/iwLuNN4RMrw3M3ApBj+ObTXbAVCR7CbhLaQsO2KB5RU2EZ17uPMEIO62KtCzG5qQJ ZgflcLRAY82dWzw8dtqs4iB5sBFKs9zyY4BFjtKR+ML/HRz/H5wc2bdHj3lPreJc3gZFAz 6jgtPRvP8I2yHkSoRtItaJgQy3EsizTo8DUg8gloTCzc9RCZZ3d4Gk0tJMCtUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681313030; 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=2PEBt/eolmgPdWso1SDpLjQdQGSsiAXDePWgKIgsDE4=; b=PvsthaLOvomgk0mjfjQHbDT+oZJyc3FQJOnDcVII/8EHSHyKeOqQXV+jcgimYSNih2+7Fh G2Vb7PJwObFS8SBfV4FK65Lynd035kYaoqvvogF/V3siXpUY3T+LloaZcBA3lHwwTkXjvb qX/jHZ6rjwsvLbZqPeV4q5QCSbCBlvDkYfYkBjAd/lctxl6bjsUKlb9AL1pYtF/JvC3pY2 xl1j1pQ4kjjCtUapzKxP3Bb4D51oU6GcUaw8vi86KXu4Z6CzHkig39I/GWa72uDFzyhrtd RAf/Q4y0diG3mBQ3VxVokRyhQVrKNJ+Za75k9OJ3saH2AmU/0XTFDunxXWW6vA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681313030; a=rsa-sha256; cv=none; b=QV6jgYUVUcFGtnLrBgJhs4oNl8+ZtSO4UVhcMETXPwTwBEm2cSR01/axyMw/yrHqVbQ0fg 1qYkV47/nkS1QkSk6mvQ4RUIgxibBlSuyx9vW6OrwOfOuwW3MmYB0XpyiebMrpf+xHczr9 AgiLpjc+ksVi26wvmRnU8qYRMgC9XenfBkHjjk1ye4QtFUYMJM//4SwJ6ekypSFbyjU+1x hOf0n0e4R9oQSOoeYtM2oK1gECIwyBnNKupqSLgKmGxBbBnpXa5udNY1BDL147RgE2Ly4t 684pWL0hpo3LRlGqBDL/M9FiWuW02r4uA1XKc3oJUhUhY9yufw/IAZCN05B5zw== 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 4PxRLs6C5Mz14dR; Wed, 12 Apr 2023 15:23:49 +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 33CFNn5L084763; Wed, 12 Apr 2023 15:23:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CFNnhE084762; Wed, 12 Apr 2023 15:23:49 GMT (envelope-from git) Date: Wed, 12 Apr 2023 15:23:49 GMT Message-Id: <202304121523.33CFNnhE084762@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: 2f8328651233 - 2023Q2 - sysutils/cpu-x: try to further improve the port (part one) 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: 2f8328651233b3c95b59b952fadf6b09b9ca3618 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f8328651233b3c95b59b952fadf6b09b9ca3618 commit 2f8328651233b3c95b59b952fadf6b09b9ca3618 Author: Alexey Dokuchaev AuthorDate: 2023-04-07 14:23:10 +0000 Commit: Joseph Mingrone CommitDate: 2023-04-12 15:23:04 +0000 sysutils/cpu-x: try to further improve the port (part one) - Setting PKGNAMESUFFIX=-${FLAVOR} for all flavors was actually misleading: graphic version (GTK+) includes ncurses UI as well, so mark the console-only one as such (`tuionly') while keeping the full package unsuffixed - Assembler is only used to translate two x86 files which belong to the memory bandwidth code, make it conditional based on the ${ARCH} and thus (hopefully) unbreak the build on !x86 PR: 251785 (cherry picked from commit ca9e112b42fdc623acc09e7ec5707249e08fa6ad) --- sysutils/cpu-x/Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sysutils/cpu-x/Makefile b/sysutils/cpu-x/Makefile index b3ebda4e8be3..811747b4be5d 100644 --- a/sysutils/cpu-x/Makefile +++ b/sysutils/cpu-x/Makefile @@ -2,7 +2,6 @@ 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 @@ -10,7 +9,6 @@ WWW= https://thetumultuousunicornofdarkness.github.io/CPU-X/ LICENSE= GPLv3+ -BUILD_DEPENDS= nasm:devel/nasm LIB_DEPENDS= libcpuid.so:sysutils/libcpuid \ libpci.so:devel/libpci \ libstatgrab.so:devel/libstatgrab @@ -34,6 +32,7 @@ FLAVORS= gtk3 ncurses CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:S/^/${PORTNAME}-/} .if ${FLAVOR:U} == ncurses +PKGNAMESUFFIX= -tuionly USES+= ncurses CMAKE_ARGS+= -DWITH_GTK:BOOL=OFF PLIST_SUB+= X11="@comment " @@ -44,8 +43,16 @@ GLIB_SCHEMAS= org.cpu-x.gschema.xml PLIST_SUB+= X11="" .endif +.include + +.if ${ARCH} == i386 || ${ARCH} == amd64 +BUILD_DEPENDS+= nasm:devel/nasm +.else +CMAKE_OFF+= WITH_BANDWIDTH +.endif + post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.include +.include