Date: Tue, 12 Jan 1999 21:25:30 +0200 From: Sheldon Hearn <axl@iafrica.com> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/9461: [PATCH] Partially unbreak sysutils/xosview Message-ID: <37020.916169130@axl.noc.iafrica.com>
next in thread | raw e-mail | index | archive | help
>Number: 9461
>Category: ports
>Synopsis: [PATCH] Partially unbreak sysutils/xosview
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 12 11:30:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Sheldon Hearn
>Release: FreeBSD 3.0-CURRENT i386
>Organization:
UUNET Internet Africa
>Environment:
FreeBSD 3.0 after 1998/09/15 08:16:17
>Description:
The new kernel device statistics code breaks xosview's
DiskMeter, which still expects FreeBSD to use the old methods.
Thus the port has been marked broken for 3 months. I plan to
look into a proper fix, but for now I'm suggesting that we at
least unbreak the port, even if the DiskMeter is broken.
>How-To-Repeat:
cd ${PORTSDIR}/sysutils/xosview ; make
>Fix:
The following patch is a partial unbreak (here read ugly hack)
that gets xosview working, although it leaves the DiskMeter
broken. I believe this is better than the nothing that's
happened since October last year. ;)
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/xosview/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile 1999/01/05 01:06:02 1.12
+++ Makefile 1999/01/12 15:46:11
@@ -18,10 +18,6 @@
GNU_CONFIGURE= yes
MAN1= xosview.1
-.include <bsd.port.pre.mk>
+# BROKEN= DiskMeter broken for 3.0+
-.if ${OSVERSION} >= 300006
-BROKEN= "DK_NDRIVE undefined"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: patches/patch-ab
===================================================================
RCS file: /home/ncvs/ports/sysutils/xosview/patches/patch-ab,v
retrieving revision 1.2
diff -u -r1.2 patch-ab
--- patch-ab 1999/01/05 01:06:04 1.2
+++ patch-ab 1999/01/12 15:53:44
@@ -1,6 +1,18 @@
---- bsd/kernel.cc.orig Fri May 29 11:10:57 1998
-+++ bsd/kernel.cc Fri May 29 11:13:23 1998
-@@ -270,6 +270,9 @@
+--- bsd/kernel.cc.orig Thu Sep 24 21:21:30 1998
++++ bsd/kernel.cc Tue Jan 12 17:53:33 1999
+@@ -28,6 +28,11 @@
+ #include <errno.h>
+ #include <sys/dkstat.h> /* For CPUSTATES, which tells us how
+ many cpu states there are. */
++
++#ifndef DK_NDRIVE /* Ghastly hack allows FreeBSD 3.0+ to build */
++#define DK_NDRIVE 8 /* but leaves the DiskMeter broken */
++#endif
++
+ #ifndef XOSVIEW_FREEBSD
+ #include <sys/disk.h> /* For disk statistics. */
+ #endif
+@@ -277,6 +282,9 @@
void
BSDGetNetInOut (long long * inbytes, long long * outbytes)
{
@@ -10,7 +22,7 @@
struct ifnet * ifnetp;
struct ifnet ifnet;
//char ifname[256];
-@@ -304,6 +307,9 @@
+@@ -311,6 +319,9 @@
ifnetp = (struct ifnet*) ifnet.if_list.tqe_next;
#endif
}
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?37020.916169130>