[pkgsrc/trunk]: pkgsrc/sysutils/xosview sysutils/xosview: Update to 1.23

[micha <micha%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b6221b61e000
branches:  trunk
changeset: 770585:b6221b61e000
user:      micha <micha%pkgsrc.org@localhost>
date:      Fri Dec 03 13:06:57 2021 +0000

description:
sysutils/xosview: Update to 1.23

Patch removed (merged upstream).

No changelog provided (refers to Github history).

diffstat:

 sysutils/xosview/DESCR                       |   1 +
 sysutils/xosview/Makefile                    |   6 ++--
 sysutils/xosview/distinfo                    |   9 +++----
 sysutils/xosview/patches/patch-bsd_kernel.cc |  30 ----------------------------
 4 files changed, 8 insertions(+), 38 deletions(-)

diffs (76 lines):

diff -r c64a911059f2 -r b6221b61e000 sysutils/xosview/DESCR
--- a/sysutils/xosview/DESCR    Fri Dec 03 13:05:59 2021 +0000
+++ b/sysutils/xosview/DESCR    Fri Dec 03 13:06:57 2021 +0000
@@ -3,3 +3,4 @@
 as a graphical performance meter.
 
 Author: Mike Romberg <romberg%fsl.noaa.gov@localhost>
+(the 1.x branch is maintained by Mark Hills)
diff -r c64a911059f2 -r b6221b61e000 sysutils/xosview/Makefile
--- a/sysutils/xosview/Makefile Fri Dec 03 13:05:59 2021 +0000
+++ b/sysutils/xosview/Makefile Fri Dec 03 13:06:57 2021 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.78 2021/07/17 08:10:48 dholland Exp $
+# $NetBSD: Makefile,v 1.79 2021/12/03 13:06:57 micha Exp $
 
-DISTNAME=      xosview-1.22
-PKGREVISION=   1
+DISTNAME=      xosview-1.23
 CATEGORIES=    sysutils x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=hills/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.pogo.org.uk/~mark/xosview/
 COMMENT=       X11 graphical display of OS statistics
+LICENSE=       gnu-gpl-v2 AND original-bsd
 
 USE_TOOLS+=    gmake
 USE_LANGUAGES= c gnu++03
diff -r c64a911059f2 -r b6221b61e000 sysutils/xosview/distinfo
--- a/sysutils/xosview/distinfo Fri Dec 03 13:05:59 2021 +0000
+++ b/sysutils/xosview/distinfo Fri Dec 03 13:06:57 2021 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.34 2021/10/26 11:20:28 nia Exp $
+$NetBSD: distinfo,v 1.35 2021/12/03 13:06:57 micha Exp $
 
-BLAKE2s (xosview-1.22.tar.gz) = 100e66b3c4013aa3694a7f7894d7b714cbf10fe13031983334069e60e0b5b0cf
-SHA512 (xosview-1.22.tar.gz) = 40e668ff1d142b6986ea5d50475d4c82523c62269d328d2f6001c651808d9b5194ccd6f144fd0ff791110302c91688126aca5762d6645d9dbc3819cd15df343b
-Size (xosview-1.22.tar.gz) = 147492 bytes
-SHA1 (patch-bsd_kernel.cc) = 7a86aab574c2d7cf88fdb03b95a8ab46933d5e48
+BLAKE2s (xosview-1.23.tar.gz) = 31b109d2cc86a3760f9eded657e7dd3f8b8c19a2fad7a23cb942f48c0d588105
+SHA512 (xosview-1.23.tar.gz) = b4313ff6473c7f1f89ba2cc9b8828cc25c7ab010a5f5c9b7602def77dbfdcbb5b0da57826919deb7be9000f6e1b5ed3801b2ad54c661b7d7bbc6c30f24f1a1a6
+Size (xosview-1.23.tar.gz) = 147356 bytes
diff -r c64a911059f2 -r b6221b61e000 sysutils/xosview/patches/patch-bsd_kernel.cc
--- a/sysutils/xosview/patches/patch-bsd_kernel.cc      Fri Dec 03 13:05:59 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-bsd_kernel.cc,v 1.3 2020/07/07 19:13:18 bsiegert Exp $
-
-Don't fail for unprivileged users.
-
-https://github.com/hills/xosview/pull/15
-
---- bsd/kernel.cc.orig 2020-02-22 19:33:08.000000000 +0000
-+++ bsd/kernel.cc
-@@ -219,8 +219,10 @@ OpenKDIfNeeded() {
-        *  that kernel file.  Otherwise, use the default kernel, by
-        *  specifying NULL.  */
-       if ((kd = kvm_openfiles((kernelFileName[0] ? kernelFileName : NULL),
--                                  NULL, NULL, O_RDONLY, errstring)) == NULL)
--              err(EX_OSFILE, "OpenKDIfNeeded(): %s", errstring);
-+                                  NULL, NULL, O_RDONLY, errstring)) == NULL) {
-+              warn("OpenKDIfNeeded(): %s", errstring);
-+              return;
-+      }
- 
-       // Parenthetical note:  FreeBSD kvm_openfiles() uses getbootfile() to get
-       // the correct kernel file if the 1st arg is NULL.  As far as I can see,
-@@ -276,7 +278,7 @@ BSDGetCPUSpeed() {
-       size = sizeof(speed);
- #if defined(XOSVIEW_NETBSD)
-       if ( sysctlbyname("machdep.tsc_freq", &speed, &size, NULL, 0) < 0 )
--              err(EX_OSERR, "sysctl machdep.tsc_freq failed");
-+              return 0;
- #else  /* XOSVIEW_DFBSD */
-       if ( sysctlbyname("hw.tsc_frequency", &speed, &size, NULL, 0) < 0 )
-               err(EX_OSERR, "sysctl hw.tsc_frequency failed");