git: ec08f3e7ff10 - main - sysutils/atop: update to atop-2.0.2.fbsd.beta4

The branch main has been updated by samm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ec08f3e7ff1075387fcde5ec842f8bfbd61fa990

commit ec08f3e7ff1075387fcde5ec842f8bfbd61fa990
Author:     Oleksii Samorukov <samm@FreeBSD.org>
AuthorDate: 2026-10-13 21:28:52 +0000
Commit:     Oleksii Samorukov <samm@FreeBSD.org>
CommitDate: 2026-10-13 21:30:39 +0000

    sysutils/atop: update to atop-2.0.2.fbsd.beta4
    
    This release integrates port patches and fixes garbage in the process
    list.
---
 sysutils/atop/Makefile                |  3 +-
 sysutils/atop/distinfo                |  5 ++--
 sysutils/atop/files/patch-atop.c      | 12 --------
 sysutils/atop/files/patch-atop.h      | 14 ---------
 sysutils/atop/files/patch-photosyst.c | 56 -----------------------------------
 5 files changed, 4 insertions(+), 86 deletions(-)

diff --git a/sysutils/atop/Makefile b/sysutils/atop/Makefile
index b9ca712c3ca4..125d36d83de4 100644
--- a/sysutils/atop/Makefile
+++ b/sysutils/atop/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	atop
-PORTVERSION=	2.0.2.b3
-PORTREVISION=	4
+PORTVERSION=	2.0.2.b4
 CATEGORIES=	sysutils
 
 MAINTAINER=	samm@FreeBSD.org
diff --git a/sysutils/atop/distinfo b/sysutils/atop/distinfo
index b52ae16e4e70..aa3e542598b9 100644
--- a/sysutils/atop/distinfo
+++ b/sysutils/atop/distinfo
@@ -1,2 +1,3 @@
-SHA256 (samm-git-atop-freebsd-2.0.2.b3-atop-2.0.2.fbsd.beta3_GH0.tar.gz) = 66d504f1df021a4de9cbe72b1535ecb634a96f1c1c1d1eab9fce39c3794fc41e
-SIZE (samm-git-atop-freebsd-2.0.2.b3-atop-2.0.2.fbsd.beta3_GH0.tar.gz) = 179264
+TIMESTAMP = 1791926733
+SHA256 (samm-git-atop-freebsd-2.0.2.b4-atop-2.0.2.fbsd.beta4_GH0.tar.gz) = a3a8f29a3531e0539aa8f8eacd929e727edfda7321cc5bad162f4f2caa048beb
+SIZE (samm-git-atop-freebsd-2.0.2.b4-atop-2.0.2.fbsd.beta4_GH0.tar.gz) = 179863
diff --git a/sysutils/atop/files/patch-atop.c b/sysutils/atop/files/patch-atop.c
deleted file mode 100644
index 3d736de7d626..000000000000
--- a/sysutils/atop/files/patch-atop.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- atopsar.c.orig	2014-01-16 00:05:34 UTC
-+++ atopsar.c
-@@ -600,7 +600,8 @@
- 		*/
- 		printf("%s  ", convtime(curtime, timebuf));
- 	
--		if ( !(rv = (pridef[i].priline)(ss, (struct tstat *)0, 0,
-+		if ( !(rv = (pridef[i].priline)(ss, (struct tstat *)0,
-+					(struct tstat **)0, 0,
- 					numsecs, numsecs*hertz, hertz,
- 					osvers, osrel, ossub, 
- 		                        stampalways ? timebuf : "        ",
diff --git a/sysutils/atop/files/patch-atop.h b/sysutils/atop/files/patch-atop.h
deleted file mode 100644
index caa15d373d4e..000000000000
--- a/sysutils/atop/files/patch-atop.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- atop.h.orig	2014-01-15 16:05:34 UTC
-+++ atop.h
-@@ -49,6 +49,11 @@ struct netpertask;
- #define RRNETATOP	0x0004
- #define RRNETATOPD	0x0008
- 
-+#include <sys/param.h>
-+#if __FreeBSD_version > 1100116
-+#define P_KTHREAD P_KPROC
-+#endif
-+
- struct visualize {
- 	char	(*show_samp)  (time_t, int,
- 	                struct sstat *, struct tstat *, struct tstat **,
diff --git a/sysutils/atop/files/patch-photosyst.c b/sysutils/atop/files/patch-photosyst.c
deleted file mode 100644
index e3175649708e..000000000000
--- a/sysutils/atop/files/patch-photosyst.c
+++ /dev/null
@@ -1,56 +0,0 @@
---- photosyst.c.orig	2014-01-15 16:05:34 UTC
-+++ photosyst.c
-@@ -1118,7 +1118,11 @@ photosyst(struct sstat *si)
- 	    si->cpu.nrcpu = ncpu;
- 	if (si->cpu.nrcpu == 0)
- 		si->cpu.nrcpu = 1;
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 1200026
-+	count_t forks = 0;
-+#else
- 	int forks = 0;
-+#endif
- 	GETSYSCTL("vm.stats.vm.v_forkpages", forks);
- 	si->cpu.nprocs = forks;
- 	GETSYSCTL("kern.smp.maxcpus", maxcpus);
-@@ -1154,7 +1158,11 @@ photosyst(struct sstat *si)
- 	si->cpu.lavg5	= (double) sysload.ldavg[1] / sysload.fscale;
- 	si->cpu.lavg15	= (double) sysload.ldavg[2] / sysload.fscale;
- 	
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 1200026
-+	count_t devint = 0, csw = 0;
-+#else
- 	int devint = 0, csw = 0;
-+#endif
- 	GETSYSCTL("vm.stats.sys.v_intr", devint);
- 	if(devint)
- 	    si->cpu.devint = devint;
-@@ -1263,7 +1271,11 @@ photosyst(struct sstat *si)
- 	    si->mem.freeswap=swapary[0].ksw_total - swapary[0].ksw_used;
- 	}
- 	/* swap statistic */
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 1200026
-+	count_t pswapin = 0, pswapout = 0;
-+#else
- 	int pswapin = 0, pswapout = 0;
-+#endif
- 	GETSYSCTL("vm.stats.vm.v_swapin",pswapin);
- 	if(pswapin)
- 	    si->mem.swins = pswapin;
-@@ -1593,8 +1605,15 @@ photosyst(struct sstat *si)
- 		    continue;
- 
- 		tcp_total++;
--		if (tp->xt_tp.t_state == TCPS_ESTABLISHED ||
--		    tp->xt_tp.t_state == TCPS_CLOSE_WAIT)
-+		if (
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 1200026
-+		tp->t_state == TCPS_ESTABLISHED ||
-+		    tp->t_state == TCPS_CLOSE_WAIT
-+#else
-+		tp->xt_tp.t_state == TCPS_ESTABLISHED ||
-+		    tp->xt_tp.t_state == TCPS_CLOSE_WAIT
-+#endif
-+		)
- 			tcp_count++;
- 		}
- 		si->net.tcp.CurrEstab = tcp_count;