Date: Fri, 2 Dec 2005 13:29:09 +0100 (CET) From: Ulrich Spoerlein <q@galgenberg.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/89836: [MAINTAINER] sysutils/symon: update to 2.72 Message-ID: <200512021229.jB2CT9Kh003134@roadrunner.q.local> Resent-Message-ID: <200512021230.jB2CU3tQ014655@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 89836 >Category: ports >Synopsis: [MAINTAINER] sysutils/symon: update to 2.72 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Dec 02 12:30:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Ulrich Spoerlein >Release: FreeBSD 6.0-STABLE i386 >Organization: >Environment: System: FreeBSD roadrunner 6.0-STABLE FreeBSD 6.0-STABLE #2: Thu Nov 24 13:25:54 CET 2005 >Description: - Update to 2.72 Added file(s): - files/patch-platform.h - files/patch-sm_pf.c Removed file(s): - files/patch-sm_mem.c - files/patch-sm_proc.c Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- symon-2.72.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/symon/Makefile,v retrieving revision 1.6 diff -u -p -u -r1.6 Makefile --- Makefile 22 Oct 2005 10:22:02 -0000 1.6 +++ Makefile 2 Dec 2005 12:28:24 -0000 @@ -6,8 +6,7 @@ # PORTNAME= symon -PORTVERSION= 2.71 -PORTREVISION= 2 +PORTVERSION= 2.72 CATEGORIES= sysutils MASTER_SITES= http://www.xs4all.nl/~wpd/symon/philes/ Index: distinfo =================================================================== RCS file: /home/ncvs/ports/sysutils/symon/distinfo,v retrieving revision 1.2 diff -u -p -u -r1.2 distinfo --- distinfo 26 Apr 2005 14:32:53 -0000 1.2 +++ distinfo 2 Dec 2005 12:28:24 -0000 @@ -1,2 +1,3 @@ -MD5 (symon-2.71.tar.gz) = a9c0c77239c834fad0f326521d76437e -SIZE (symon-2.71.tar.gz) = 79223 +MD5 (symon-2.72.tar.gz) = c88eeb4c7fb1c99e7d4448a8c3977bb2 +SHA256 (symon-2.72.tar.gz) = b91a084ad6e8d91cd8c01a01a56a88e97e6a42f2036cdd844206ca5ff1f88bf1 +SIZE (symon-2.72.tar.gz) = 82218 Index: files/patch-platform.h =================================================================== RCS file: files/patch-platform.h diff -N files/patch-platform.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-platform.h 2 Dec 2005 12:28:24 -0000 @@ -0,0 +1,14 @@ +--- platform/FreeBSD/platform.h.orig Fri Oct 21 16:58:43 2005 ++++ platform/FreeBSD/platform.h Fri Dec 2 12:03:04 2005 +@@ -4,8 +4,10 @@ + #define _CONF_FREEBSD_H + + #include <sys/queue.h> +-#include <sys/socket.h> + #include <sys/types.h> ++#include <sys/socket.h> ++#include <sys/time.h> ++#include <sys/dkstat.h> + #include <sys/resource.h> + + #include <net/if.h> Index: files/patch-sm_io.c =================================================================== RCS file: /home/ncvs/ports/sysutils/symon/files/patch-sm_io.c,v retrieving revision 1.1 diff -u -p -u -r1.1 patch-sm_io.c --- files/patch-sm_io.c 31 Jul 2005 11:38:02 -0000 1.1 +++ files/patch-sm_io.c 2 Dec 2005 12:28:24 -0000 @@ -1,6 +1,6 @@ ---- platform/FreeBSD/sm_io.c.orig Mon Jul 25 12:08:47 2005 -+++ platform/FreeBSD/sm_io.c Mon Jul 25 12:12:27 2005 -@@ -81,7 +81,7 @@ +--- platform/FreeBSD/sm_io.c.orig Sat Nov 12 20:16:41 2005 ++++ platform/FreeBSD/sm_io.c Sat Nov 12 20:17:10 2005 +@@ -80,7 +80,7 @@ void gets_io() { @@ -9,7 +9,7 @@ io_numdevs = devstat_getnumdevs(NULL); #else io_numdevs = getnumdevs(); -@@ -98,7 +98,7 @@ +@@ -97,7 +97,7 @@ /* clear the devinfo struct, as getdevs expects it to be all zeroes */ bzero(io_stats.dinfo, sizeof(struct devinfo)); @@ -18,12 +18,12 @@ devstat_getdevs(NULL, &io_stats); #else getdevs(&io_stats); -@@ -118,7 +118,7 @@ - strlen(ds->device_name) < strlen(dev) && - isdigit(dev[strlen(ds->device_name)]) && - atoi(&dev[strlen(ds->device_name)]) == ds->unit_number) { +@@ -117,7 +117,7 @@ + strlen(ds->device_name) < strlen(st->arg) && + isdigit(st->arg[strlen(ds->device_name)]) && + atoi(&st->arg[strlen(ds->device_name)]) == ds->unit_number) { -#if DEVSTAT_USER_API_VER == 5 +#if DEVSTAT_USER_API_VER == 5 || DEVSTAT_USER_API_VER == 6 - return snpack(symon_buf, maxlen, dev, MT_IO2, + return snpack(symon_buf, maxlen, st->arg, MT_IO2, ds->operations[DEVSTAT_READ], ds->operations[DEVSTAT_WRITE], Index: files/patch-sm_mem.c =================================================================== RCS file: files/patch-sm_mem.c diff -N files/patch-sm_mem.c --- files/patch-sm_mem.c 27 Sep 2005 19:03:43 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ ---- platform/FreeBSD/sm_mem.c.orig Tue Sep 27 18:32:40 2005 -+++ platform/FreeBSD/sm_mem.c Tue Sep 27 19:00:29 2005 -@@ -119,6 +119,7 @@ - me_stats[1] = pagetob(me_vmtotal.t_rm); - me_stats[2] = pagetob(me_vmtotal.t_free); - -+ me_stats[3] = me_stats[4] = 0; - #ifdef HAS_XSWDEV - vmnswp_siz = sizeof (int); - if (sysctl(me_vmnswp_mib_nam, me_vmnswp_mib_len, &vmnswp_dat, (void *)&vmnswp_siz, NULL, 0) < 0) { -@@ -134,8 +135,6 @@ - me_stats[3] += (vmiswp_dat.xsw_used * DEV_BSIZE); - me_stats[4] += (vmiswp_dat.xsw_nblks * DEV_BSIZE); - } --#else -- me_stats[3] = me_stats[4] = 0; - #endif - - return snpack(symon_buf, maxlen, s, MT_MEM, Index: files/patch-sm_pf.c =================================================================== RCS file: files/patch-sm_pf.c diff -N files/patch-sm_pf.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-sm_pf.c 2 Dec 2005 12:28:24 -0000 @@ -0,0 +1,15 @@ +--- platform/FreeBSD/sm_pf.c.orig Fri Dec 2 12:06:20 2005 ++++ platform/FreeBSD/sm_pf.c Fri Dec 2 12:06:38 2005 +@@ -73,6 +73,12 @@ + fatal("pf support not available"); + } + ++void ++gets_pfq() ++{ ++ fatal("pf support not available"); ++} ++ + int + get_pf(char *symon_buf, int maxlen, struct stream *st) + { Index: files/patch-sm_proc.c =================================================================== RCS file: files/patch-sm_proc.c diff -N files/patch-sm_proc.c --- files/patch-sm_proc.c 26 Apr 2005 14:32:53 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ ---- platform/FreeBSD/sm_proc.c.orig Mon Apr 25 17:34:28 2005 -+++ platform/FreeBSD/sm_proc.c Mon Apr 25 17:34:43 2005 -@@ -182,9 +182,9 @@ - if (kvm_read(proc_kd, (unsigned long)pp->ki_paddr, &pproc, - sizeof(pproc)) == sizeof(pproc)) { - #ifdef HAS_RUSAGE_EXT -- cpu_uticks += pproc.p_rux.p_uticks; /* user */ -- cpu_sticks += pproc.p_rux.p_sticks; /* sys */ -- cpu_iticks += pproc.p_rux.p_iticks; /* int */ -+ cpu_uticks += pproc.p_rux.rux_uticks; /* user */ -+ cpu_sticks += pproc.p_rux.rux_sticks; /* sys */ -+ cpu_iticks += pproc.p_rux.rux_iticks; /* int */ - #else - cpu_uticks += pproc.p_uticks; /* user */ - cpu_sticks += pproc.p_sticks; /* sys */ --- symon-2.72.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512021229.jB2CT9Kh003134>