From owner-freebsd-ports Tue Jan 12 11:30:09 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id LAA29126 for freebsd-ports-outgoing; Tue, 12 Jan 1999 11:30:09 -0800 (PST) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id LAA29111 for ; Tue, 12 Jan 1999 11:30:05 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id LAA03132; Tue, 12 Jan 1999 11:30:01 -0800 (PST) Received: from axl.noc.iafrica.com (axl.noc.iafrica.com [196.31.1.175]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id LAA28705 for ; Tue, 12 Jan 1999 11:26:13 -0800 (PST) (envelope-from sheldonh@axl.noc.iafrica.com) Received: from sheldonh (helo=axl.noc.iafrica.com) by axl.noc.iafrica.com with local-esmtp (Exim 2.10 #1) id 1009RS-0009d7-00 for FreeBSD-gnats-submit@freebsd.org; Tue, 12 Jan 1999 21:25:30 +0200 Message-Id: <37020.916169130@axl.noc.iafrica.com> Date: Tue, 12 Jan 1999 21:25:30 +0200 From: Sheldon Hearn Reply-To: Sheldon Hearn To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/9461: [PATCH] Partially unbreak sysutils/xosview Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >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 +# BROKEN= DiskMeter broken for 3.0+ -.if ${OSVERSION} >= 300006 -BROKEN= "DK_NDRIVE undefined" -.endif - -.include +.include 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 + #include /* 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 /* 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