From owner-dev-commits-ports-main@freebsd.org Wed Aug 4 11:42:48 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0069065C9DC; Wed, 4 Aug 2021 11:42:48 +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 4Gfqc76btcz3l0q; Wed, 4 Aug 2021 11:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 CB405260BA; Wed, 4 Aug 2021 11:42:47 +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 174Bgl3x064601; Wed, 4 Aug 2021 11:42:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 174BglJ5064600; Wed, 4 Aug 2021 11:42:47 GMT (envelope-from git) Date: Wed, 4 Aug 2021 11:42:47 GMT Message-Id: <202108041142.174BglJ5064600@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: bf413125edad - main - sysutils/tmux-mem-cpu-load: Update to 3.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf413125edadefba0a2bddcc5f3f5dd521f22537 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Aug 2021 11:42:48 -0000 The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf413125edadefba0a2bddcc5f3f5dd521f22537 commit bf413125edadefba0a2bddcc5f3f5dd521f22537 Author: Adam Weinberger AuthorDate: 2021-08-04 11:42:31 +0000 Commit: Adam Weinberger CommitDate: 2021-08-04 11:42:43 +0000 sysutils/tmux-mem-cpu-load: Update to 3.5.0 --- sysutils/tmux-mem-cpu-load/Makefile | 3 +-- sysutils/tmux-mem-cpu-load/distinfo | 6 +++--- .../tmux-mem-cpu-load/files/patch-common_cpu.h | 11 ++++++++++ .../files/patch-freebsd_memory.cc | 24 ---------------------- 4 files changed, 15 insertions(+), 29 deletions(-) diff --git a/sysutils/tmux-mem-cpu-load/Makefile b/sysutils/tmux-mem-cpu-load/Makefile index 436b9c02c0dd..30343445a256 100644 --- a/sysutils/tmux-mem-cpu-load/Makefile +++ b/sysutils/tmux-mem-cpu-load/Makefile @@ -1,8 +1,7 @@ # Created by: Adam Weinberger PORTNAME= tmux-mem-cpu-load -PORTVERSION= 3.4.0 -PORTREVISION= 4 +PORTVERSION= 3.5.0 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/tmux-mem-cpu-load/distinfo b/sysutils/tmux-mem-cpu-load/distinfo index fcd821f15979..03fb3a3292ac 100644 --- a/sysutils/tmux-mem-cpu-load/distinfo +++ b/sysutils/tmux-mem-cpu-load/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484523357 -SHA256 (thewtex-tmux-mem-cpu-load-v3.4.0_GH0.tar.gz) = a773994e160812a964abc7fc4e8ec16b7d9833edb0a66e5c67f287c7c5949ecb -SIZE (thewtex-tmux-mem-cpu-load-v3.4.0_GH0.tar.gz) = 19483 +TIMESTAMP = 1628076750 +SHA256 (thewtex-tmux-mem-cpu-load-v3.5.0_GH0.tar.gz) = 555b8fe2dfbedd496e697c86aa0824a4ed3a4ade7e8c007b5cb11c962084b511 +SIZE (thewtex-tmux-mem-cpu-load-v3.5.0_GH0.tar.gz) = 23022 diff --git a/sysutils/tmux-mem-cpu-load/files/patch-common_cpu.h b/sysutils/tmux-mem-cpu-load/files/patch-common_cpu.h new file mode 100644 index 000000000000..42237a044b95 --- /dev/null +++ b/sysutils/tmux-mem-cpu-load/files/patch-common_cpu.h @@ -0,0 +1,11 @@ +--- common/cpu.h.orig 2021-08-04 11:37:18 UTC ++++ common/cpu.h +@@ -45,7 +45,7 @@ + #endif + + float cpu_percentage( unsigned ); +-uint32_t get_cpu_count(); ++uint8_t get_cpu_count(); + + /** CPU percentage output mode. + * diff --git a/sysutils/tmux-mem-cpu-load/files/patch-freebsd_memory.cc b/sysutils/tmux-mem-cpu-load/files/patch-freebsd_memory.cc deleted file mode 100644 index d6c2344c9274..000000000000 --- a/sysutils/tmux-mem-cpu-load/files/patch-freebsd_memory.cc +++ /dev/null @@ -1,24 +0,0 @@ -From e24890652e3674fe4677722aab8644e62da37348 Mon Sep 17 00:00:00 2001 -From: Dima Panov -Date: Fri, 20 Dec 2019 02:47:32 +1000 -Subject: [PATCH] Fix calculate memory usage on FreeBSD - ---- - freebsd/memory.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/freebsd/memory.cc b/freebsd/memory.cc -index 5500032..687a0a8 100644 ---- freebsd/memory.cc -+++ freebsd/memory.cc -@@ -63,8 +63,8 @@ void mem_status( MemoryStatus & status ) - //u_int unused = ( cache + inactive + free ) * page_size; - - // Used memory on FreeBSD is active + wired. -- u_int used = ( active + wired ) * page_size; -+ u_int used = ( active + wired ); - -- status.used_mem = convert_unit( static_cast< float >( used ), MEGABYTES ); -+ status.used_mem = convert_unit( static_cast< float >( used * (page_size >> 10) ), MEGABYTES, KILOBYTES ); - status.total_mem = convert_unit( static_cast< float >( page_count * (page_size >> 10) ), MEGABYTES, KILOBYTES); - }