From owner-freebsd-ports Tue Feb 16 14:22:35 1999 Delivered-To: freebsd-ports@freebsd.org Received: from axl.noc.iafrica.com (axl.noc.iafrica.com [196.31.1.175]) by hub.freebsd.org (Postfix) with ESMTP id BA98711157 for ; Tue, 16 Feb 1999 14:21:43 -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.12 #1) id 10Css7-0009rt-00 for ports@freebsd.org; Wed, 17 Feb 1999 00:21:39 +0200 From: Sheldon Hearn To: ports@freebsd.org Subject: sysutils/xosview's SwapMeter broken Date: Wed, 17 Feb 1999 00:21:39 +0200 Message-ID: <37932.919203699@axl.noc.iafrica.com> Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Hi folks, The author of xosview has been working quite hard to get the software up to speed with FreeBSD 3.0+ . Version 1.7.0 has been released and sports a fixed up DiskMeter. Unfortunately, the SwapMeter is now broken because the swaplist symbol has gone away. Below are diffs against the current port to bring it up to 1.7.0 . I'm providing them in the hopes that someone else will offer advice on sorting out the SwapMeter. I managed to fix the DiskMeter quite easily by stealing code from xsysinfo, but I'm having trouble wrapping my head around the SwapMeter. Ciao, Sheldon. Index: Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/xosview/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 1999/01/18 03:00:39 1.13 +++ Makefile 1999/02/16 22:17:25 @@ -1,12 +1,12 @@ # New ports collection makefile for: xosview -# Version required: 1.6.2.a +# Version required: 1.7.0 # Date created: 19 Nov 1997 # Whom: Brian Handy # # $Id: Makefile,v 1.13 1999/01/18 03:00:39 steve Exp $ # -DISTNAME= xosview-1.6.2.a +DISTNAME= xosview-1.7.0 CATEGORIES= sysutils MASTER_SITES= http://lore.ece.utexas.edu/~bgrayson/xosview/ \ http://lambic.physics.montana.edu/xosview/ @@ -18,6 +18,6 @@ GNU_CONFIGURE= yes MAN1= xosview.1 -# BROKEN= DiskMeter broken for 3.0+ +# BROKEN= SwapMeter broken for 3.0+ .include Index: files/md5 =================================================================== RCS file: /home/ncvs/ports/sysutils/xosview/files/md5,v retrieving revision 1.6 diff -u -r1.6 md5 --- md5 1999/01/05 01:06:04 1.6 +++ md5 1999/01/25 22:00:31 @@ -1 +1 @@ -MD5 (xosview-1.6.2.a.tar.gz) = bf021401b5dbf3971ff8a4ea6c90ee11 +MD5 (xosview-1.7.0.tar.gz) = 7591a567dff144cdbecde1543f4dbc58 Index: patches/patch-ab =================================================================== RCS file: patch-ab diff -N patch-ab --- /tmp/cvsj34880 Wed Feb 17 00:18:10 1999 +++ /dev/null Tue Feb 16 22:11:45 1999 @@ -1,34 +0,0 @@ ---- 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) - { -+ -+#if (__FreeBSD_version < 300000) //werner May/29/98 quick hack for current -+ - struct ifnet * ifnetp; - struct ifnet ifnet; - //char ifname[256]; -@@ -311,6 +319,9 @@ - ifnetp = (struct ifnet*) ifnet.if_list.tqe_next; - #endif - } -+ -+#endif //werner -+ - } - - To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message