From nobody Fri Apr 07 14:23:43 2023 X-Original-To: dev-commits-ports-main@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 4PtLFq40zVz44hdH; Fri, 7 Apr 2023 14:23:43 +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 4PtLFq2hBzz3rjK; Fri, 7 Apr 2023 14:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680877423; 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=QTA7pr5YatRTNl8L9kGZQo5MpQZW9GSTHlDBsNjqBHc=; b=g+XFQWMg0UTe0Oa3T1w2hpPoPNLIUGdzZ82vAzXVqZ0fn1WiAQcpfwdDNlQjVt1ac9Hk/2 h1ltKWjm9ZH937juvdoUd+O8fG6bdN3AydaY11Qkd5umMBGgviXSKbPJW8bxSxiCi6/adE 3e8BqG9oU1iiMyyfXDsIJbz4T3ICotuHLQfW51ML31NnzUQ7E7T8YK4LOE6d7TAVstt6Hh Ygtn9BtnpZCEuPBCwiSZBeB4ny/ZWlbNh1EsMarg5w72SBF9QcKwPdaWTK517ppWNBmEzJ Q1OotOCBWGvX0FbquNlhybAIOLv9L80e59plnY1RJ9mSN7jRJwiI77mE31nNUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680877423; 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=QTA7pr5YatRTNl8L9kGZQo5MpQZW9GSTHlDBsNjqBHc=; b=y0lqwcNPmqSjQYA12cCr0M9ECD+JVM4h7tCmiQ/zp11Ft3B+9laIYgGXd0jbgmSrqbYKH6 f956faeQ3vagkKWz0l9xW7g+Kna/YJ5VUAAY8L/Y9yPzw2EGI6S6nHzZrP4GUvkQLxvxH4 soFOwLrtrOjtiBDNg94emtXBgdU6gGPQ4HjGrzgCDxjfNI4ZH1nKcNmDYjdT8BPY8UP6Uv gNopOFLv/1RxBXS8/Ssmc5trdWLlYxzoLXvqHgCdLeleAP9isvB0H2XI3qZOeqS8RnwZRP SW6rVqtWH8BkaR5xKumAoFOjZK8mW4605BoTNf7qiXO6+yZyV26Est48pMxKhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680877423; a=rsa-sha256; cv=none; b=TumZslhioOFp+Xk8+gJaOBESdbVftRDN4gY02iEMUxPIcjH1beU7bKfLtrnLl2Nbtuyy12 ktS9UvPGec+LYtg1nMT0w7lsmRiWZ6WJpXNjlZHgkuqfJU7Y9AnHsNqLYj8Jib7KEjv8FM 5ZCl9MkAUpbXTRNFoNphQiE2rZxhUJBk3d+0WssWVVOJE43y9WNpJE3s8d2kSqfwMuRYcz 4NFcRSOomuur280ZZyfpEUoyfM1cZczbc/WYb6jzFLn0saDpYsRNa+IVzpQC/+db46FvSF EKuXnBNb8cQ1u/Q4beSsM2qVA7qZAEczVc6bWYTeMChvXzj157qhP73VctnIDA== 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 4PtLFq1kkGzpD9; Fri, 7 Apr 2023 14:23:43 +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 337ENhn0014057; Fri, 7 Apr 2023 14:23:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 337ENhCa014056; Fri, 7 Apr 2023 14:23:43 GMT (envelope-from git) Date: Fri, 7 Apr 2023 14:23:43 GMT Message-Id: <202304071423.337ENhCa014056@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: ca9e112b42fd - main - sysutils/cpu-x: try to further improve the port (part one) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca9e112b42fdc623acc09e7ec5707249e08fa6ad Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca9e112b42fdc623acc09e7ec5707249e08fa6ad commit ca9e112b42fdc623acc09e7ec5707249e08fa6ad Author: Alexey Dokuchaev AuthorDate: 2023-04-07 14:23:10 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-04-07 14:23:10 +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 --- 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