diff -durN sysutils/wmcpuload.orig/Makefile sysutils/wmcpuload/Makefile --- sysutils/wmcpuload.orig/Makefile 2021-03-19 12:07:26.499722000 +0300 +++ sysutils/wmcpuload/Makefile 2021-03-19 12:13:13.833079000 +0300 @@ -2,31 +2,26 @@ # $FreeBSD$ PORTNAME= wmcpuload -PORTVERSION= 1.0.1 -PORTREVISION= 4 +PORTVERSION= 1.1.1 + CATEGORIES= sysutils windowmaker -MASTER_SITES= http://seiichisato.jp/dockapps/src/ +MASTER_SITES= https://www.dockapps.net/download/ MAINTAINER= xride@FreeBSD.org COMMENT= "lcd" dockapp for windowmaker, which displays the current cpuload +LICENSE= GPLv2 -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-05-05 - -USES= tar:bzip2 xorg -USE_XORG= xpm +USES= xorg +USE_XORG+= x11 xext xpm GNU_CONFIGURE= yes -PORTDOCS= ChangeLog README PLIST_FILES= "@(,kmem,2555) bin/wmcpuload" \ man/man1/wmcpuload.1.gz +PORTDOCS= ChangeLog README OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e '/^DEFS/s|-I\.\.$$|-I.. -I../libdockapp/|g ; \ - /^CFLAGS/s|-I../libdockapp/||g' ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} '/SETGID_FLAGS=/d' ${WRKSRC}/configure post-install: diff -durN sysutils/wmcpuload.orig/distinfo sysutils/wmcpuload/distinfo --- sysutils/wmcpuload.orig/distinfo 2021-03-19 12:07:16.360413000 +0300 +++ sysutils/wmcpuload/distinfo 2020-09-14 16:01:36.000000000 +0300 @@ -1,2 +1,2 @@ -SHA256 (wmcpuload-1.0.1.tar.bz2) = c05fffcf5b4aeb29280ac7e7762b937bddb9ac14283cf8e6110135009c6dd6f0 -SIZE (wmcpuload-1.0.1.tar.bz2) = 92457 +SHA256 (wmcpuload-1.1.1.tar.gz) = 8f08b2b937db105b677a9e4df2a67259d2580071e28456c0e6cd77db15f0648c +SIZE (wmcpuload-1.1.1.tar.gz) = 167751 diff -durN sysutils/wmcpuload.orig/files/patch-src_cpu__freebsd.c sysutils/wmcpuload/files/patch-src_cpu__freebsd.c --- sysutils/wmcpuload.orig/files/patch-src_cpu__freebsd.c 2021-03-19 12:07:54.602346000 +0300 +++ sysutils/wmcpuload/files/patch-src_cpu__freebsd.c 2021-02-08 14:29:04.000000000 +0300 @@ -1,6 +1,6 @@ ---- src/cpu_freebsd.c.orig 2008-05-03 07:05:31.000000000 +0200 -+++ src/cpu_freebsd.c 2008-05-03 07:12:09.000000000 +0200 -@@ -18,7 +18,8 @@ +--- src/cpu_freebsd.c.orig 2016-10-20 13:55:48 UTC ++++ src/cpu_freebsd.c +@@ -16,7 +16,8 @@ #include #include "cpu.h" @@ -10,7 +10,7 @@ #include #include -@@ -29,24 +30,18 @@ +@@ -27,27 +28,21 @@ # include #endif /* __FreeBSD_version < 500101 */ @@ -29,34 +29,29 @@ - if (kd == NULL) { - fprintf(stderr, "can't open kernel virtual memory"); -- exit(1); -- } -- -- kvm_nlist(kd, nlst); -- -- if (nlst[0].n_type == 0) { -- fprintf(stderr, "error extracting symbols"); + if (sysctl_mib[0] == -1) { + fprintf(stderr, "unknown sysctl kern.cp_time"); exit(1); } -@@ -68,14 +63,14 @@ +- kvm_nlist(kd, nlst); +- +- if (nlst[0].n_type == 0) { +- fprintf(stderr, "error extracting symbols"); +- exit(1); +- } +- + /* drop setgid & setuid (the latter should not be there really) */ + seteuid(getuid()); + setegid(getgid()); +@@ -66,8 +61,8 @@ cpu_get_usage(cpu_options *opts) int used, total, result; unsigned long int cpu_time[CPUSTATES]; - if (kvm_read(kd, nlst[0].n_value, &cpu_time, sizeof(cpu_time)) != - sizeof(cpu_time)) -- return 0; + sysctl_len = sizeof(cpu_time); + if (sysctl(sysctl_mib, 2, &cpu_time, &sysctl_len, NULL, 0) == -1) -+ return 0; + return 0; - used = cpu_time[CP_USER] + cpu_time[CP_SYS]; - if (!opts->ignore_nice) - used += cpu_time[CP_NICE]; -- total = used + cpu_time[CP_IDLE]; -+ total = used + cpu_time[CP_IDLE] + cpu_time[CP_NICE]; - - if (pre_total == 0) { - result = 0; + /* calculate usage */