<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8c2c931036d3f75abda16a6627d3207435558cfa">https://github.com/macports/macports-ports/commit/8c2c931036d3f75abda16a6627d3207435558cfa</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8c2c931036d htop: fix for < 10.9
</span>8c2c931036d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8c2c931036d3f75abda16a6627d3207435558cfa
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sun Jan 28 19:31:59 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> htop: fix for < 10.9
</span>---
sysutils/htop/Portfile | 13 +++++++----
.../0001-darwin-Platform.c-use-mach-port.h.patch | 24 +++++++++++++++++++
...formHelpers-fix-CPU-detection-for-PowerPC.patch | 27 ++++++++++++++++++++++
3 files changed, 60 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/htop/Portfile b/sysutils/htop/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c2381fab32..631a2f76be4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/htop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/htop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup legacysupport 1.1
github.setup htop-dev htop 3.3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> epoch 1
checksums rmd160 32f836bc4016f2ebf6b2332396993baad5c69ee6 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,6 @@ checksums rmd160 32f836bc4016f2ebf6b2332396993baad5c69ee6 \
</span> size 406099
categories sysutils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {cal @neverpanic} openmaintainer
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,12 +21,18 @@ long_description ${name} is {*}${description} systems. It aims to be a better
</span>
homepage https://htop.dev
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:autoconf \
</span> port:automake \
port:libtool \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/htop-dev/htop/pull/1381
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-darwin-Platform.c-use-mach-port.h.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/htop-dev/htop/pull/1383
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0002-darwin-PlatformHelpers-fix-CPU-detection-for-PowerPC.patch
</span>
pre-configure {
system -W ${worksrcpath} "sh autogen.sh"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/htop/files/0001-darwin-Platform.c-use-mach-port.h.patch b/sysutils/htop/files/0001-darwin-Platform.c-use-mach-port.h.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4d8bc895343
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/htop/files/0001-darwin-Platform.c-use-mach-port.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 541c17c975bc8a4f1f243e568006b0e26ae52c47 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 4 Feb 2024 09:28:26 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] darwin/Platform.c: use mach/port.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Unbreak builds on macOS versions where _mach_port_t.h does not exist.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+mach/port.h exists on every macOS and has needed defines.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darwin/Platform.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git darwin/Platform.c darwin/Platform.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 387910e1..77b9bcdc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- darwin/Platform.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ darwin/Platform.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@ in the source distribution for its full text.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <net/if_types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <net/route.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <sys/_types/_mach_port_t.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/port.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreFoundation/CFBase.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreFoundation/CFDictionary.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/htop/files/0002-darwin-PlatformHelpers-fix-CPU-detection-for-PowerPC.patch b/sysutils/htop/files/0002-darwin-PlatformHelpers-fix-CPU-detection-for-PowerPC.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a68c2d98736
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/htop/files/0002-darwin-PlatformHelpers-fix-CPU-detection-for-PowerPC.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 497a1e3a4fc254e882745e37f2eb7d9131d0b56a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 18 Jan 2024 12:39:56 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] darwin/PlatformHelpers: fix CPU detection for PowerPC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Closes: https://github.com/htop-dev/htop/issues/1382
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Notice, that hw.cpusubtype outputs a numerical code of a CPU.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+For PowerPC, 100 = G5, 11 = ppc7450, 10 = ppc7400.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ darwin/PlatformHelpers.c | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git darwin/PlatformHelpers.c darwin/PlatformHelpers.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a4ea82be..b52346eb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- darwin/PlatformHelpers.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ darwin/PlatformHelpers.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,6 +60,10 @@ bool Platform_KernelVersionIsBetween(KernelVersion lowerBound, KernelVersion upp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void Platform_getCPUBrandString(char* cpuBrandString, size_t cpuBrandStringSize) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sysctlbyname("machdep.cpu.brand_string", cpuBrandString, &cpuBrandStringSize, NULL, 0) == -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #ifdef __POWERPC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sysctlbyname("hw.cpusubtype", cpuBrandString, &cpuBrandStringSize, NULL, 0) != -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "WARN: Unable to determine the CPU brand string.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "errno: %i, %s\n", errno, strerror(errno));
</span></pre><pre style='margin:0'>
</pre>