htop-git: Sync with upstream changes.

[Santhosh Raju <fox%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Santhosh Raju <fox%NetBSD.org@localhost>
Pushed By:	fox
Date:		Mon Jan 1 14:05:21 2024 +0100
Changeset:	f462fdc4ed895fa6d7cb4b89be19e8d650172623

Modified Files:
	htop-git/Makefile
	htop-git/distinfo
Added Files:
	htop-git/patches/patch-netbsd_NetBSDMachine.c
	htop-git/patches/patch-netbsd_NetBSDProcess.c
	htop-git/patches/patch-netbsd_NetBSDProcessTable.c

Log Message:
htop-git: Sync with upstream changes.

Fix build for NetBSD, upstream patch has been submitted for fixing.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f462fdc4ed895fa6d7cb4b89be19e8d650172623

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 htop-git/Makefile                                  |  4 +--
 htop-git/distinfo                                  |  9 +++--
 htop-git/patches/patch-netbsd_NetBSDMachine.c      | 41 ++++++++++++++++++++++
 htop-git/patches/patch-netbsd_NetBSDProcess.c      | 17 +++++++++
 htop-git/patches/patch-netbsd_NetBSDProcessTable.c | 26 ++++++++++++++
 5 files changed, 92 insertions(+), 5 deletions(-)

diffs:
diff --git a/htop-git/Makefile b/htop-git/Makefile
index dd69072890..ef6585e2b9 100644
--- a/htop-git/Makefile
+++ b/htop-git/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD$
 
-DISTNAME=	htop-3.2.2.20230304
+DISTNAME=	htop-3.2.2.20240101
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=htop-dev/}
 GITHUB_PROJECT=	htop
-GITHUB_TAG=     e207c8aebdcdb88bc8ab838e2ac3dd1774d6a618
+GITHUB_TAG=     c3b4a770c02c28662980014b5a893e01451ec2b2
 
 MAINTAINER=	fox%NetBSD.org@localhost
 HOMEPAGE=	https://htop.dev/
diff --git a/htop-git/distinfo b/htop-git/distinfo
index 149aec3ae2..8e7fc92acc 100644
--- a/htop-git/distinfo
+++ b/htop-git/distinfo
@@ -1,5 +1,8 @@
 $NetBSD$
 
-BLAKE2s (htop-3.2.2.20230304-e207c8aebdcdb88bc8ab838e2ac3dd1774d6a618.tar.gz) = f562b93e4815ca0733f262f524827d45e4bfce19b06272c70c39494ce2447cba
-SHA512 (htop-3.2.2.20230304-e207c8aebdcdb88bc8ab838e2ac3dd1774d6a618.tar.gz) = 1d3d03c316d15c7ef999f47fef9c295bdee274322ad26e78c814e94f17e37a230ba26f8dc189f61f4524de00c6d9c06b711f55373350995df69e209be8573827
-Size (htop-3.2.2.20230304-e207c8aebdcdb88bc8ab838e2ac3dd1774d6a618.tar.gz) = 374575 bytes
+BLAKE2s (htop-3.2.2.20240101-c3b4a770c02c28662980014b5a893e01451ec2b2.tar.gz) = 1dbc7c8e11c85d7b4b6e6616e999e0092da7c4bda7e6606bdf02a31143c5c811
+SHA512 (htop-3.2.2.20240101-c3b4a770c02c28662980014b5a893e01451ec2b2.tar.gz) = 40e4ccf1aa3b312d4bc69d2e560969cef623dd22856f14fd54b0ecbaf51ac8e6d96a594848d25f6081c150c091e09fe979fd1993430cdaaa1006e9a40cc99bfb
+Size (htop-3.2.2.20240101-c3b4a770c02c28662980014b5a893e01451ec2b2.tar.gz) = 405036 bytes
+SHA1 (patch-netbsd_NetBSDMachine.c) = c963b30a1b34d86409a913a55f5b51e483e70e2d
+SHA1 (patch-netbsd_NetBSDProcess.c) = 498fb3f92ef7b42bf28c2705b69e2058523d9a7e
+SHA1 (patch-netbsd_NetBSDProcessTable.c) = 6edce0026f026a0b68952321d38f906ce20e912f
diff --git a/htop-git/patches/patch-netbsd_NetBSDMachine.c b/htop-git/patches/patch-netbsd_NetBSDMachine.c
new file mode 100644
index 0000000000..a0c4ac77a6
--- /dev/null
+++ b/htop-git/patches/patch-netbsd_NetBSDMachine.c
@@ -0,0 +1,41 @@
+$NetBSD$
+
+Fix build due to upstream changes.
+
+https://github.com/htop-dev/htop/pull/1360
+
+--- netbsd/NetBSDMachine.c.orig	2023-12-29 15:52:13.000000000 +0000
++++ netbsd/NetBSDMachine.c
+@@ -81,7 +81,7 @@ static void NetBSDMachine_updateCPUcount
+    }
+ 
+    if (value != super->existingCPUs) {
+-      opl->cpuData = xReallocArray(this->cpuData, value + 1, sizeof(CPUData));
++      this->cpuData = xReallocArray(this->cpuData, value + 1, sizeof(CPUData));
+       super->existingCPUs = value;
+       change = true;
+    }
+@@ -127,7 +127,7 @@ Machine* Machine_new(UsersTable* usersTa
+       CRT_fatalError("kvm_openfiles() failed");
+    }
+ 
+-   return this;
++   return super;
+ }
+ 
+ void Machine_delete(Machine* super) {
+@@ -268,11 +268,11 @@ static void NetBSDMachine_scanCPUFrequen
+ void Machine_scan(Machine* super) {
+    NetBSDMachine* this = (NetBSDMachine*) super;
+ 
+-   NetBSDProcessTable_scanMemoryInfo(this);
+-   NetBSDProcessTable_scanCPUTime(this);
++   NetBSDMachine_scanMemoryInfo(this);
++   NetBSDMachine_scanCPUTime(this);
+ 
+    if (super->settings->showCPUFrequency) {
+-      NetBSDProcessTable_scanCPUFrequency(npl);
++      NetBSDMachine_scanCPUFrequency(this);
+    }
+ }
+ 
diff --git a/htop-git/patches/patch-netbsd_NetBSDProcess.c b/htop-git/patches/patch-netbsd_NetBSDProcess.c
new file mode 100644
index 0000000000..254cb59ff0
--- /dev/null
+++ b/htop-git/patches/patch-netbsd_NetBSDProcess.c
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Fix build due to upstream changes.
+
+https://github.com/htop-dev/htop/pull/1360
+
+--- netbsd/NetBSDProcess.c.orig	2023-12-29 15:52:13.000000000 +0000
++++ netbsd/NetBSDProcess.c
+@@ -237,7 +237,7 @@ static void NetBSDProcess_rowWriteField(
+    switch (field) {
+    // add NetBSD-specific fields here
+    default:
+-      Process_writeField(np->super, str, field);
++      Process_writeField(&np->super, str, field);
+       return;
+    }
+ 
diff --git a/htop-git/patches/patch-netbsd_NetBSDProcessTable.c b/htop-git/patches/patch-netbsd_NetBSDProcessTable.c
new file mode 100644
index 0000000000..5dfa2a20d4
--- /dev/null
+++ b/htop-git/patches/patch-netbsd_NetBSDProcessTable.c
@@ -0,0 +1,26 @@
+$NetBSD$
+
+Fix build due to upstream changes.
+
+https://github.com/htop-dev/htop/pull/1360
+
+--- netbsd/NetBSDProcessTable.c.orig	2023-12-29 15:52:13.000000000 +0000
++++ netbsd/NetBSDProcessTable.c
+@@ -151,7 +151,7 @@ static double getpcpu(const NetBSDMachin
+ }
+ 
+ static void NetBSDProcessTable_scanProcs(NetBSDProcessTable* this) {
+-   const Machine* host = this->super.host;
++   const Machine* host = this->super.super.host;
+    const NetBSDMachine* nhost = (const NetBSDMachine*) host;
+    const Settings* settings = host->settings;
+    bool hideKernelThreads = settings->hideKernelThreads;
+@@ -182,7 +182,7 @@ static void NetBSDProcessTable_scanProcs
+          ProcessTable_add(&this->super, proc);
+ 
+          proc->tty_nr = kproc->p_tdev;
+-         const char* name = ((dev_t)kproc->p_tdev != KERN_PROC_TTY_NODEV) ? devname(kproc->p_tdev, S_IFCHR) : NULL;
++         const char* name = devname(kproc->p_tdev, S_IFCHR);
+          if (!name) {
+             free(proc->tty_name);
+             proc->tty_name = NULL;