git: e060db419352 - main - sysutils/xosview: Update to 1.23

[Rainer Hurling]

The branch main has been updated by rhurlin:

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

commit e060db41935278828ec825f88d46b1be1244008d
Author:     Otacílio de Araújo Ramos Neto <otaciliodearaujo at gmail.com>
AuthorDate: 2021-05-09 09:45:02 +0000
Commit:     Rainer Hurling <rhurlin at FreeBSD.org>
CommitDate: 2021-05-09 12:13:02 +0000

    sysutils/xosview: Update to 1.23
    
    - Change maintainers address
    - Patch under files is upstream now [1]
    
    [1] https://github.com/hills/xosview/commit/cd7dd1954760fdadbe63bd1184f41ae7e7af62bc#diff-32f3a92badc7976806ca65890b152452bca7c434e41dd60946474ad55b6fee62
    
    PR:             255718
    Co-authored-by: Rainer Hurling <rhurlin at FreeBSD.org>
---
 sysutils/xosview/Makefile                  |  6 ++++--
 sysutils/xosview/distinfo                  |  6 +++---
 sysutils/xosview/files/patch-bsd_kernel.cc | 32 ------------------------------
 sysutils/xosview/pkg-descr                 |  2 +-
 4 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index 415053390806..16ab32e7e8e0 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,10 +1,10 @@
 # Created by: Brian Handy <handy at physics.montana.edu>
 
 PORTNAME=	xosview
-DISTVERSION=	1.21
+DISTVERSION=	1.23
 CATEGORIES=	sysutils
 
-MAINTAINER=	otacilio.neto at bsd.com.br
+MAINTAINER=	otaciliodearaujo at gmail.com
 COMMENT=	Graphical performance meter
 
 LICENSE=	BSD4CLAUSE GPLv2
@@ -13,6 +13,8 @@ LICENSE_COMB=	multi
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	uses x86-specific hardware resources
 
+RUN_DEPENDS=	font-misc-misc>=1.1.2:x11-fonts/font-misc-misc
+
 USES=		gmake xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	hills
diff --git a/sysutils/xosview/distinfo b/sysutils/xosview/distinfo
index 3784ed104d43..eac46bf22709 100644
--- a/sysutils/xosview/distinfo
+++ b/sysutils/xosview/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546270995
-SHA256 (hills-xosview-1.21_GH0.tar.gz) = 7b7e2964526baf40c9bd59a6f414c42487187f6eaf1882c6d12ced4c80e7bbd5
-SIZE (hills-xosview-1.21_GH0.tar.gz) = 147486
+TIMESTAMP = 1620550480
+SHA256 (hills-xosview-1.23_GH0.tar.gz) = 2de555dc07e8d0a44417979116ce1661a3e1cde9f1a849881b999fbd4ec5bdb6
+SIZE (hills-xosview-1.23_GH0.tar.gz) = 147356
diff --git a/sysutils/xosview/files/patch-bsd_kernel.cc b/sysutils/xosview/files/patch-bsd_kernel.cc
deleted file mode 100644
index 4b7902a10357..000000000000
--- a/sysutils/xosview/files/patch-bsd_kernel.cc
+++ /dev/null
@@ -1,32 +0,0 @@
---- bsd/kernel.cc.orig	2018-09-12 13:52:23 UTC
-+++ bsd/kernel.cc
-@@ -93,6 +93,9 @@ static int mib_uvm[2] = { CTL_VM, VM_UVMEXP2 };
- static int mib_uvm[2] = { CTL_VM, VM_UVMEXP };
- #endif
- #else
-+#if defined(XOSVIEW_FREEBSD)
-+#define _WANT_VMMETER
-+#endif
- #include <sys/vmmeter.h>
- #endif
- 
-@@ -339,7 +342,9 @@ BSDGetPageStats(uint64_t *meminfo, uint64_t *pageinfo)
- 	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);
-@@ -361,7 +366,9 @@ 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;
diff --git a/sysutils/xosview/pkg-descr b/sysutils/xosview/pkg-descr
index a6dc5c3175a7..338b1fadb16d 100644
--- a/sysutils/xosview/pkg-descr
+++ b/sysutils/xosview/pkg-descr
@@ -4,4 +4,4 @@ network usage and more. Each resource is displayed as a horizontal bar
 which is separated into color coded regions showing how much of the
 resource is being put to a particular use.
 
-WWW: http://www.pogo.org.uk/~mark/xosview/
+WWW: https://www.pogo.org.uk/~mark/xosview/