Date: Thu, 28 Jul 2005 16:49:14 +0200 (CEST) From: Ulrich Spoerlein <q@galgenberg.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/84228: [MAINTAINER] sysutils/symon: Unbreak on 7.0-CURRENT Message-ID: <200507281449.j6SEnEX1002538@roadrunner.q.local> Resent-Message-ID: <200507281450.j6SEo89P072141@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 84228
>Category: ports
>Synopsis: [MAINTAINER] sysutils/symon: Unbreak on 7.0-CURRENT
>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: Thu Jul 28 14:50:08 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Ulrich Spoerlein
>Release: FreeBSD 6.0-BETA1 i386
>Organization:
>Environment:
System: FreeBSD roadrunner 6.0-BETA1 FreeBSD 6.0-BETA1 #3: Mon Jul 25 18:37:30 CEST 2005
>Description:
DEVSTAT_USER_API_VER was bumped.
Added file(s):
- files/patch-sm_io.c
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- symon-2.71.patch begins here ---
Index: files/patch-sm_io.c
===================================================================
RCS file: files/patch-sm_io.c
diff -N files/patch-sm_io.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-sm_io.c 28 Jul 2005 14:47:52 -0000
@@ -0,0 +1,29 @@
+--- 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 @@
+ void
+ gets_io()
+ {
+-#if DEVSTAT_USER_API_VER == 5
++#if DEVSTAT_USER_API_VER == 5 || DEVSTAT_USER_API_VER == 6
+ io_numdevs = devstat_getnumdevs(NULL);
+ #else
+ io_numdevs = getnumdevs();
+@@ -98,7 +98,7 @@
+ /* clear the devinfo struct, as getdevs expects it to be all zeroes */
+ bzero(io_stats.dinfo, sizeof(struct devinfo));
+
+-#if DEVSTAT_USER_API_VER == 5
++#if DEVSTAT_USER_API_VER == 5 || DEVSTAT_USER_API_VER == 6
+ 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) {
+-#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,
+ ds->operations[DEVSTAT_READ],
+ ds->operations[DEVSTAT_WRITE],
--- symon-2.71.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?200507281449.j6SEnEX1002538>