From nobody Fri Mar 24 08:58:37 2023 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 4Pjbj96jQTz41JS7; Fri, 24 Mar 2023 08:58:37 +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 4Pjbj94cJDz3H74; Fri, 24 Mar 2023 08:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679648317; 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=tkUtdOvmUi7lc+xF4ciVKiErpnQqOCTYrpHQtK7ylNo=; b=QVOO+U+bTlCqWQr98pbAIJcvl8OtrQ45BXsbyyLJ8fzoOOsdJvevbGbn5ONxr9estI0IhV J3T8KGM5QUpzJrYfH9yb9oBF85chNF6fCyz/d3IcJc9jD/yvYX66xwW7ZAiLlK9vezZWLz AEGR3Lwu2Qr2rfLQMsdtyRjTzu8BE5jCC4cbuLHlxe+6roby+RxfB3TqRZRVqV5d9sGmGe e6DwNnd0aUA6ViDLbKdWYlOjrhkNTFufCn6pM2Y3EljjJzMa+//Bm4KnI9lfWpp6oK7Yuw h6wHqx4HjqTMpLwt2MQsiczigy6NAbSCLbnwFUWBYQuBslInuM3b1uTuW4eLBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679648317; 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=tkUtdOvmUi7lc+xF4ciVKiErpnQqOCTYrpHQtK7ylNo=; b=S0nX6zMF0EVlCIfUVJDRPaRPUA3IF0mJnkmeVdeSa5tbTSiKY5V1E1taZcTxq8izQQL63S XVp13S5yY/KriwZ+tQ3zJ3q8sx9vhecdM+mO2cQbwK4Gq4T8tyLP5gDOShdI6KwHBALjeo PYZTgthkTCktvEema6nfLHKPviqltycqP7RIrxFs7HnHLGau8mVXAfOq2W7NDuT5gOZjlH 2L/ed0kKPJsryDmaLX+DB7p4he9wFaW8C2KuExKEfKgvzxgq6N3Aj4SXEev2+OSWfJfi2D KzYbcqoAbbkfi+LseRNOM9Nm90gCRpMD7YlkjTasbvu2m2C+rg5GmDG1uMpeRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679648317; a=rsa-sha256; cv=none; b=UqW5klqGnmLa6S3YO0NNwSE4FX6tp234FX20Oh25mP5RuBGZkYovRaf68yVZB3u2DMnFgw tj+h0R1GBAB6lKhRRffNhNHsZjO0gXWVonx11+Yn+BNU+gQ3xb3Cc2rqQ4Uv51TuZg+O55 FHZC6Ca6Q7LWaaauVQD2RgCifBXP90LibrKefgN1oU6sCcaX0ZwRMIZQurrWDR/f/dO2H3 uFx6bIW1gk9BeKj9UZGhGGtG4NzvDPK8jzTwV53asTZZ0lWhgd4duWNiKB+MQsEp+IeB2p 5PMfZiwW3exFIXZiVzh/Nac2dr3DTaxaC8J5rrAVclUGs/mxcxJpzMARDfSb+Q== 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 4Pjbj93C4bz1BSF; Fri, 24 Mar 2023 08:58:37 +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 32O8wbGK003799; Fri, 24 Mar 2023 08:58:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32O8wbQ6003798; Fri, 24 Mar 2023 08:58:37 GMT (envelope-from git) Date: Fri, 24 Mar 2023 08:58:37 GMT Message-Id: <202303240858.32O8wbQ6003798@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: 3eeb03bdd42b - main - sysutils/powermon: report modern CPU models (via sysutils/libcpuid) 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3eeb03bdd42b88a8b366bba07afa567db6722922 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=3eeb03bdd42b88a8b366bba07afa567db6722922 commit 3eeb03bdd42b88a8b366bba07afa567db6722922 Author: Alexey Dokuchaev AuthorDate: 2023-03-24 08:57:52 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-03-24 08:57:52 +0000 sysutils/powermon: report modern CPU models (via sysutils/libcpuid) This program had not seen updates since 2017 and thus cannot report newer CPU models (the list of known ones is hardcoded). Use simple library call instead of manually decoding the CPU code name. While here, simplify the installation recipe in `do-install' target and append to our default {C,LD}FLAGS rather than overwriting them. Requested by: Dmitry Lukhtionov --- sysutils/powermon/Makefile | 16 +++++++-------- sysutils/powermon/files/patch-Makefile | 15 ++++++++++++++ sysutils/powermon/files/patch-src_cpuid.c | 34 +++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 8 deletions(-) diff --git a/sysutils/powermon/Makefile b/sysutils/powermon/Makefile index 6b5de4c0a31c..b688dfca82bc 100644 --- a/sysutils/powermon/Makefile +++ b/sysutils/powermon/Makefile @@ -1,6 +1,7 @@ PORTNAME= powermon PORTVERSION= 1.0.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= yamagi@yamagi.org @@ -13,20 +14,19 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= specific to recent x86 processors -USE_GITHUB= yes -GH_ACCOUNT= yamagi +LIB_DEPENDS= libcpuid.so:sysutils/libcpuid USES= gmake ncurses +USE_GITHUB= yes +GH_ACCOUNT= yamagi +MAKE_ENV= NCURSESLIBS="${NCURSESLIBS}" VERBOSE=1 PLIST_FILES= man/man8/powermon.8.gz sbin/powermon -post-patch: - ${REINPLACE_CMD} 's/-lcursesw/${NCURSESLIBS}/g' ${WRKSRC}/Makefile - do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/release/powermon \ - ${STAGEDIR}${PREFIX}/sbin/powermon - ${INSTALL_MAN} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/misc/powermon.8 \ + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/release/powermon \ + ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${INSTALL_WRKSRC}/misc/powermon.8 \ ${STAGEDIR}${MANPREFIX}/man/man8 .include diff --git a/sysutils/powermon/files/patch-Makefile b/sysutils/powermon/files/patch-Makefile new file mode 100644 index 000000000000..2a1c69684ac5 --- /dev/null +++ b/sysutils/powermon/files/patch-Makefile @@ -0,0 +1,15 @@ +--- Makefile.orig 2017-07-03 16:04:31 UTC ++++ Makefile +@@ -1,9 +1,9 @@ + # Base CFLAGS +-CFLAGS := -O2 -fomit-frame-pointer -std=c99 \ +- -pedantic -Wall -Wextra -MMD -pipe ++CFLAGS += -std=c99 -pedantic -Wall -Wextra -MMD \ ++ -I$(LOCALBASE)/include -DUSE_LIBCPUID + + # Base LDFLAGS +-LDFLAGS := -lcursesw -lm ++LDFLAGS += $(NCURSESLIBS) -lm -L$(LOCALBASE)/lib -lcpuid + + # ----------- + diff --git a/sysutils/powermon/files/patch-src_cpuid.c b/sysutils/powermon/files/patch-src_cpuid.c new file mode 100644 index 000000000000..8b5dfa2ba38c --- /dev/null +++ b/sysutils/powermon/files/patch-src_cpuid.c @@ -0,0 +1,34 @@ +--- src/cpuid.c.orig 2017-07-03 16:04:31 UTC ++++ src/cpuid.c +@@ -32,6 +32,9 @@ + #include + #include + #include ++#ifdef USE_LIBCPUID ++#include ++#endif + + #include "cpuid.h" + +@@ -176,6 +179,13 @@ void getcpuvendor(char *vendor, size_t vendor_len) { + * Returns the CPU family. + */ + const char *getcpufamily(void) { ++#ifdef USE_LIBCPUID ++ struct cpu_raw_data_t raw; ++ static struct cpu_id_t id; ++ ++ return (cpuid_get_raw_data(&raw) == 0 && cpu_identify(&raw, &id) == 0) ++ ? id.cpu_codename : "Unknown"; ++#else + cpuctl_cpuid_count_args_t cpuid; + + cpuid.level = 0x1; +@@ -240,6 +250,7 @@ const char *getcpufamily(void) { + return "Unknown"; + break; + } ++#endif + } + +