git: 7e591c4f2380 - main - sysutils/xosview: fix memory report

The branch main has been updated by fernape:

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

commit 7e591c4f2380c9e680eaa1b060b96e7f6be32eb0
Author:     Otacílio de Araújo Ramos Neto <otaciliodearaujo@gmail.com>
AuthorDate: 2023-04-12 15:48:37 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2023-04-13 09:41:38 +0000

    sysutils/xosview: fix memory report
    
    ChangeLog: https://www.freshports.org/sysutils/xosview/
    
    PR:             270733
    Reported by:    otaciliodearaujo@gmail.com (maintainer)
---
 sysutils/xosview/Makefile                  |  2 +-
 sysutils/xosview/files/patch-bsd_kernel.cc | 38 ++++++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index af04b4f31e34..9e7066ecafff 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xosview
 DISTVERSION=	1.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	otaciliodearaujo@gmail.com
diff --git a/sysutils/xosview/files/patch-bsd_kernel.cc b/sysutils/xosview/files/patch-bsd_kernel.cc
index 4fb5fe787e4f..a008568f689e 100644
--- a/sysutils/xosview/files/patch-bsd_kernel.cc
+++ b/sysutils/xosview/files/patch-bsd_kernel.cc
@@ -1,4 +1,4 @@
---- bsd/kernel.cc.orig	2021-05-16 03:48:22 UTC
+--- bsd/kernel.cc.orig	2020-07-11 12:10:34 UTC
 +++ bsd/kernel.cc
 @@ -48,8 +48,10 @@ static int maxcpus = 1;
  #include <sys/ioctl.h>
@@ -11,7 +11,35 @@
  
  #if defined(XOSVIEW_NETBSD)
  #include <sys/sched.h>
-@@ -1558,6 +1560,7 @@ BSDHasBattery() {
+@@ -338,15 +340,14 @@ BSDGetPageStats(uint64_t *meminfo, uint64_t *pageinfo)
+ 		u_int v_swappgsout;
+ 	} vm;
+ #if defined(XOSVIEW_FREEBSD)
+-	size_t size = sizeof(unsigned int);
++	size_t size = sizeof(u_int);
++	bzero(&vm, sizeof(vm));
+ #define	GET_VM_STATS(name) \
+ 	sysctlbyname("vm.stats.vm." #name, &vm.name, &size, NULL, 0)
+ 	GET_VM_STATS(v_active_count);
+ 	GET_VM_STATS(v_inactive_count);
+ 	GET_VM_STATS(v_wire_count);
+-#if __FreeBSD_version < 1200017
+ 	GET_VM_STATS(v_cache_count);
+-#endif
+ 	GET_VM_STATS(v_free_count);
+ 	GET_VM_STATS(v_page_size);
+ 	GET_VM_STATS(v_vnodepgsin);
+@@ -368,9 +369,7 @@ BSDGetPageStats(uint64_t *meminfo, uint64_t *pageinfo)
+ 		meminfo[0] = (uint64_t)vm.v_active_count * vm.v_page_size;
+ 		meminfo[1] = (uint64_t)vm.v_inactive_count * vm.v_page_size;
+ 		meminfo[2] = (uint64_t)vm.v_wire_count * vm.v_page_size;
+-#if __FreeBSD_version < 1200017
+ 		meminfo[3] = (uint64_t)vm.v_cache_count * vm.v_page_size;
+-#endif
+ 		meminfo[4] = (uint64_t)vm.v_free_count * vm.v_page_size;
+ #else  /* XOSVIEW_DFBSD */
+ 		meminfo[0] = (uint64_t)vms.v_active_count * vms.v_page_size;
+@@ -1558,6 +1557,7 @@ BSDHasBattery() {
  #else // XOSVIEW_FREEBSD || XOSVIEW_DFBSD
  	int fd;
  	if ( (fd = open(ACPIDEV, O_RDONLY)) == -1 ) {
@@ -19,7 +47,7 @@
  		// No ACPI -> try APM
  		if ( (fd = open(APMDEV, O_RDONLY)) == -1 )
  			return false;
-@@ -1569,6 +1572,9 @@ BSDHasBattery() {
+@@ -1569,6 +1569,9 @@ BSDHasBattery() {
  		if (aip.ai_batt_stat == 0xff || aip.ai_batt_life == 0xff)
  			return false;
  		return true;
@@ -29,7 +57,7 @@
  	}
  
  	union acpi_battery_ioctl_arg battio;
-@@ -1717,6 +1723,7 @@ BSDGetBatteryInfo(int *remaining, unsigned int *state)
+@@ -1717,6 +1720,7 @@ BSDGetBatteryInfo(int *remaining, unsigned int *state)
  	/* Adapted from acpiconf and apm. */
  	int fd;
  	if ( (fd = open(ACPIDEV, O_RDONLY)) == -1 ) {
@@ -37,7 +65,7 @@
  		// No ACPI -> try APM
  		if ( (fd = open(APMDEV, O_RDONLY)) == -1 )
  			err(EX_OSFILE, "could not open %s or %s", ACPIDEV, APMDEV);
-@@ -1740,6 +1747,10 @@ BSDGetBatteryInfo(int *remaining, unsigned int *state)
+@@ -1740,6 +1744,10 @@ BSDGetBatteryInfo(int *remaining, unsigned int *state)
  		else
  			*state = XOSVIEW_BATT_NONE;
  		return;