CVS commit: pkgsrc/sysutils/btop

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Sep 24 09:43:26 UTC 2026

Modified Files:
        pkgsrc/sysutils/btop: Makefile distinfo
Added Files:
        pkgsrc/sysutils/btop/patches: patch-src_netbsd_btop__collect.cpp

Log Message:
btop: add patch from upstream merge request that improves disk display

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/btop/Makefile \
    pkgsrc/sysutils/btop/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/sysutils/btop/patches/patch-src_netbsd_btop__collect.cpp

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

Modified files:

Index: pkgsrc/sysutils/btop/Makefile
diff -u pkgsrc/sysutils/btop/Makefile:1.9 pkgsrc/sysutils/btop/Makefile:1.10
--- pkgsrc/sysutils/btop/Makefile:1.9   Fri May  1 17:49:02 2026
+++ pkgsrc/sysutils/btop/Makefile       Thu Sep 24 09:43:26 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2026/05/01 17:49:02 fox Exp $
+# $NetBSD: Makefile,v 1.10 2026/09/24 09:43:26 wiz Exp $
 
 DISTNAME=      btop-1.4.7
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=aristocratos/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
Index: pkgsrc/sysutils/btop/distinfo
diff -u pkgsrc/sysutils/btop/distinfo:1.9 pkgsrc/sysutils/btop/distinfo:1.10
--- pkgsrc/sysutils/btop/distinfo:1.9   Fri May  1 17:49:02 2026
+++ pkgsrc/sysutils/btop/distinfo       Thu Sep 24 09:43:26 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2026/05/01 17:49:02 fox Exp $
+$NetBSD: distinfo,v 1.10 2026/09/24 09:43:26 wiz Exp $
 
 BLAKE2s (btop-1.4.7.tar.gz) = 17bc5647b6e8a4b727faff75931357ecde717500f2c658a2163df0b9e7f87a78
 SHA512 (btop-1.4.7.tar.gz) = 49f2d2aa4fa83816f4fdaebc7239b3036d6e776b45b059d40ec535867762f207dcd9e79df16e410b37965e10c758404bd6aab8106a8c8b8e0761d3950e8856ef
 Size (btop-1.4.7.tar.gz) = 1280005 bytes
 SHA1 (patch-Makefile) = 7cec0d616dd445ad139f0868141d15d1687bf402
+SHA1 (patch-src_netbsd_btop__collect.cpp) = 4271ed99dffc153ad1f94515fdc5e55a2f2401cc

Added files:

Index: pkgsrc/sysutils/btop/patches/patch-src_netbsd_btop__collect.cpp
diff -u /dev/null pkgsrc/sysutils/btop/patches/patch-src_netbsd_btop__collect.cpp:1.3
--- /dev/null   Thu Sep 24 09:43:26 2026
+++ pkgsrc/sysutils/btop/patches/patch-src_netbsd_btop__collect.cpp     Thu Sep 24 09:43:26 2026
@@ -0,0 +1,44 @@
+$NetBSD: patch-src_netbsd_btop__collect.cpp,v 1.3 2026/09/24 09:43:26 wiz Exp $
+
+https://github.com/aristocratos/btop/pull/1852
+
+--- src/netbsd/btop_collect.cpp.orig   2026-05-01 16:05:43.000000000 +0000
++++ src/netbsd/btop_collect.cpp
+@@ -627,8 +627,6 @@ namespace Mem {
+ 
+ namespace Mem {
+       bool has_swap = false;
+-      vector<string> fstab;
+-      fs::file_time_type fstab_time;
+       int disk_ios = 0;
+       vector<string> last_found;
+ 
+@@ -756,7 +754,7 @@ namespace Mem {
+                       double uptime = system_uptime();
+                       auto &disks_filter = Config::getS("disks_filter");
+                       bool filter_exclude = false;
+-                      // auto only_physical = Config::getB("only_physical");
++                      auto only_physical = Config::getB("only_physical");
+                       auto &disks = mem.disks;
+                       vector<string> filter;
+                       if (not disks_filter.empty()) {
+@@ -773,15 +771,14 @@ namespace Mem {
+                       found.reserve(last_found.size());
+                       for (int i = 0; i < count; i++) {
+                               auto fstype = string(stvfs[i].f_fstypename);
+-                              if (fstype == "autofs" || fstype == "devfs" || fstype == "linprocfs" || fstype == "procfs" || fstype == "tmpfs" || fstype == "linsysfs" ||
+-                                      fstype == "fdesckfs") {
+-                                      // in memory filesystems -> not useful to show
++                              string dev = stvfs[i].f_mntfromname;
++                              //? Physical = backed by a block device (source under /dev/, or the kernel's root_device placeholder before rc.d/root remounts /) or ZFS (source is pool[/dataset]).
++                              //? Pseudo (kernfs, ptyfs, tmpfs, procfs, ...) and network (host:/path) filesystems have other sources.
++                              if (only_physical and not dev.starts_with("/dev/") and dev != "root_device" and fstype != "zfs")
+                                       continue;
+-                              }
+ 
+                               std::error_code ec;
+                               string mountpoint = stvfs[i].f_mntonname;
+-                              string dev = stvfs[i].f_mntfromname;
+                               mapping[dev] = mountpoint;
+ 
+                               //? Match filter if not empty