head 1.21; access; symbols pkgsrc-2020Q1:1.20.0.2 pkgsrc-2020Q1-base:1.20 pkgsrc-2019Q4:1.19.0.106 pkgsrc-2019Q4-base:1.19 pkgsrc-2019Q3:1.19.0.102 pkgsrc-2019Q3-base:1.19 pkgsrc-2019Q2:1.19.0.100 pkgsrc-2019Q2-base:1.19 pkgsrc-2019Q1:1.19.0.98 pkgsrc-2019Q1-base:1.19 pkgsrc-2018Q4:1.19.0.96 pkgsrc-2018Q4-base:1.19 pkgsrc-2018Q3:1.19.0.94 pkgsrc-2018Q3-base:1.19 pkgsrc-2018Q2:1.19.0.92 pkgsrc-2018Q2-base:1.19 pkgsrc-2018Q1:1.19.0.90 pkgsrc-2018Q1-base:1.19 pkgsrc-2017Q4:1.19.0.88 pkgsrc-2017Q4-base:1.19 pkgsrc-2017Q3:1.19.0.86 pkgsrc-2017Q3-base:1.19 pkgsrc-2017Q2:1.19.0.82 pkgsrc-2017Q2-base:1.19 pkgsrc-2017Q1:1.19.0.80 pkgsrc-2017Q1-base:1.19 pkgsrc-2016Q4:1.19.0.78 pkgsrc-2016Q4-base:1.19 pkgsrc-2016Q3:1.19.0.76 pkgsrc-2016Q3-base:1.19 pkgsrc-2016Q2:1.19.0.74 pkgsrc-2016Q2-base:1.19 pkgsrc-2016Q1:1.19.0.72 pkgsrc-2016Q1-base:1.19 pkgsrc-2015Q4:1.19.0.70 pkgsrc-2015Q4-base:1.19 pkgsrc-2015Q3:1.19.0.68 pkgsrc-2015Q3-base:1.19 pkgsrc-2015Q2:1.19.0.66 pkgsrc-2015Q2-base:1.19 pkgsrc-2015Q1:1.19.0.64 pkgsrc-2015Q1-base:1.19 pkgsrc-2014Q4:1.19.0.62 pkgsrc-2014Q4-base:1.19 pkgsrc-2014Q3:1.19.0.60 pkgsrc-2014Q3-base:1.19 pkgsrc-2014Q2:1.19.0.58 pkgsrc-2014Q2-base:1.19 pkgsrc-2014Q1:1.19.0.56 pkgsrc-2014Q1-base:1.19 pkgsrc-2013Q4:1.19.0.54 pkgsrc-2013Q4-base:1.19 pkgsrc-2013Q3:1.19.0.52 pkgsrc-2013Q3-base:1.19 pkgsrc-2013Q2:1.19.0.50 pkgsrc-2013Q2-base:1.19 pkgsrc-2013Q1:1.19.0.48 pkgsrc-2013Q1-base:1.19 pkgsrc-2012Q4:1.19.0.46 pkgsrc-2012Q4-base:1.19 pkgsrc-2012Q3:1.19.0.44 pkgsrc-2012Q3-base:1.19 pkgsrc-2012Q2:1.19.0.42 pkgsrc-2012Q2-base:1.19 pkgsrc-2012Q1:1.19.0.40 pkgsrc-2012Q1-base:1.19 pkgsrc-2011Q4:1.19.0.38 pkgsrc-2011Q4-base:1.19 pkgsrc-2011Q3:1.19.0.36 pkgsrc-2011Q3-base:1.19 pkgsrc-2011Q2:1.19.0.34 pkgsrc-2011Q2-base:1.19 pkgsrc-2011Q1:1.19.0.32 pkgsrc-2011Q1-base:1.19 pkgsrc-2010Q4:1.19.0.30 pkgsrc-2010Q4-base:1.19 pkgsrc-2010Q3:1.19.0.28 pkgsrc-2010Q3-base:1.19 pkgsrc-2010Q2:1.19.0.26 pkgsrc-2010Q2-base:1.19 pkgsrc-2010Q1:1.19.0.24 pkgsrc-2010Q1-base:1.19 pkgsrc-2009Q4:1.19.0.22 pkgsrc-2009Q4-base:1.19 pkgsrc-2009Q3:1.19.0.20 pkgsrc-2009Q3-base:1.19 pkgsrc-2009Q2:1.19.0.18 pkgsrc-2009Q2-base:1.19 pkgsrc-2009Q1:1.19.0.16 pkgsrc-2009Q1-base:1.19 pkgsrc-2008Q4:1.19.0.14 pkgsrc-2008Q4-base:1.19 pkgsrc-2008Q3:1.19.0.12 pkgsrc-2008Q3-base:1.19 cube-native-xorg:1.19.0.10 cube-native-xorg-base:1.19 pkgsrc-2008Q2:1.19.0.8 pkgsrc-2008Q2-base:1.19 cwrapper:1.19.0.6 pkgsrc-2008Q1:1.19.0.4 pkgsrc-2008Q1-base:1.19 pkgsrc-2007Q4:1.19.0.2 pkgsrc-2007Q4-base:1.19 pkgsrc-2007Q3:1.17.0.4 pkgsrc-2007Q3-base:1.17 pkgsrc-2007Q2:1.17.0.2 pkgsrc-2007Q2-base:1.17 pkgsrc-2007Q1:1.15.0.4 pkgsrc-2007Q1-base:1.15 pkgsrc-2006Q4:1.15.0.2 pkgsrc-2006Q4-base:1.15 pkgsrc-2006Q3:1.14.0.4 pkgsrc-2006Q3-base:1.14 pkgsrc-2006Q2:1.14.0.2 pkgsrc-2006Q2-base:1.14 pkgsrc-2006Q1:1.12.0.2 pkgsrc-2006Q1-base:1.12 pkgsrc-2005Q4:1.10.0.14 pkgsrc-2005Q4-base:1.10 pkgsrc-2005Q3:1.10.0.12 pkgsrc-2005Q3-base:1.10 pkgsrc-2005Q2:1.10.0.10 pkgsrc-2005Q2-base:1.10 pkgsrc-2005Q1:1.10.0.8 pkgsrc-2005Q1-base:1.10 pkgsrc-2004Q4:1.10.0.6 pkgsrc-2004Q4-base:1.10 pkgsrc-2004Q3:1.10.0.4 pkgsrc-2004Q3-base:1.10 pkgsrc-2004Q2:1.10.0.2 pkgsrc-2004Q2-base:1.10 pkgsrc-2004Q1:1.9.0.4 pkgsrc-2004Q1-base:1.9 pkgsrc-2003Q4:1.9.0.2 pkgsrc-2003Q4-base:1.9 netbsd-1-6-1:1.8.0.6 netbsd-1-6-1-base:1.8 netbsd-1-6:1.8.0.8 netbsd-1-6-RELEASE-base:1.8 pkgviews:1.8.0.4 pkgviews-base:1.8 buildlink2:1.8.0.2 buildlink2-base:1.8 netbsd-1-5-PATCH003:1.8 netbsd-1-5-PATCH001:1.8 netbsd-1-5-RELEASE:1.8 netbsd-1-4-PATCH003:1.8 netbsd-1-4-PATCH002:1.8 comdex-fall-1999:1.8 netbsd-1-4-PATCH001:1.8 netbsd-1-4-RELEASE:1.8 netbsd-1-3-PATCH003:1.6 netbsd-1-3-PATCH002:1.3; locks; strict; comment @# @; 1.21 date 2020.05.24.11.24.19; author rillig; state dead; branches; next 1.20; commitid oUrjRpsulUaW8u9C; 1.20 date 2020.02.22.13.10.22; author pgoyette; state Exp; branches; next 1.19; commitid rLcqeX0brTqDGFXB; 1.19 date 2007.12.17.22.08.12; author veego; state Exp; branches; next 1.18; 1.18 date 2007.11.30.19.32.56; author rillig; state Exp; branches; next 1.17; 1.17 date 2007.04.15.08.12.36; author veego; state Exp; branches; next 1.16; 1.16 date 2007.04.09.21.22.11; author veego; state Exp; branches; next 1.15; 1.15 date 2006.10.28.02.15.12; author christos; state Exp; branches; next 1.14; 1.14 date 2006.06.05.20.20.26; author christos; state Exp; branches; next 1.13; 1.13 date 2006.06.05.02.35.30; author christos; state Exp; branches; next 1.12; 1.12 date 2006.03.14.15.48.01; author rillig; state dead; branches; next 1.11; 1.11 date 2006.02.18.10.12.24; author rillig; state Exp; branches; next 1.10; 1.10 date 2004.04.15.14.37.22; author christos; state Exp; branches; next 1.9; 1.9 date 2003.11.10.17.18.28; author agc; state dead; branches; next 1.8; 1.8 date 98.11.04.16.37.11; author agc; state Exp; branches; next 1.7; 1.7 date 98.10.22.05.42.37; author garbled; state dead; branches; next 1.6; 1.6 date 98.08.07.11.14.10; author agc; state Exp; branches; next 1.5; 1.5 date 98.05.21.15.28.29; author frueauf; state Exp; branches; next 1.4; 1.4 date 98.05.18.09.07.32; author tron; state dead; branches; next 1.3; 1.3 date 98.03.18.16.18.36; author agc; state Exp; branches; next 1.2; 1.2 date 98.03.18.13.42.16; author agc; state Exp; branches; next 1.1; 1.1 date 98.02.11.08.10.18; author tron; state Exp; branches; next ; desc @@ 1.21 log @sysutils/xosview: update to 1.22 This gets rid of a few uncommented and unclear patches. The upstream code has changed a lot, therefore the pkgsrc patches have all been dropped. Upstream changes are unknown since the CHANGES file mentions 1.9 as the latest version. @ text @$NetBSD: patch-aa,v 1.20 2020/02/22 13:10:22 pgoyette Exp $ --- bsd/kernel.cc.orig 2006-02-17 23:36:06.000000000 -0800 +++ bsd/kernel.cc 2020-02-21 13:26:06.554690464 -0800 @@@@ -115,8 +115,16 @@@@ // in __NetBSD_Version__ for us if needed. #if defined(XOSVIEW_NETBSD) && defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106010000) #define NETBSD_1_6A +#ifdef HW_DISKSTATS +static int dmib[3] = {CTL_HW, HW_DISKSTATS, sizeof(struct disk_sysctl)}; +#endif +#ifdef HW_IOSTATS +static int dmib[3] = {CTL_HW, HW_IOSTATS, sizeof(struct io_sysctl)}; +#include +#endif #endif +#include "netmeter.h" /* For netIface_ */ #include "general.h" #include "kernel.h" /* To grab CVSID stuff. */ @@@@ -303,9 +311,11 @@@@ void OpenKDIfNeeded() { + static int initialized = 0; char unusederrorstring[_POSIX2_LINE_MAX]; - if (kd) return; // kd is non-NULL, so it has been initialized. BCG + if (initialized) return; + initialized = 1; /* Open it read-only, for a little added safety. */ /* If the first character of kernelFileName is not '\0', then use @@@@ -313,8 +323,10 @@@@ specifying NULL. */ if ((kd = kvm_openfiles ((kernelFileName[0]) ? kernelFileName : NULL, NULL, NULL, O_RDONLY, unusederrorstring)) - == NULL) - err (-1, "OpenKDIfNeeded():kvm-open()"); + == NULL) { + warn ("OpenKDIfNeeded():kvm-open()"); + return; + } // Parenthetical note: FreeBSD kvm_openfiles() uses getbootfile() to get // the correct kernel file if the 1st arg is NULL. As far as I can see, // one should always use NULL in FreeBSD, but I suppose control is never a @@@@ -400,6 +412,8 @@@@ static int mib[] = { CTL_KERN, KERN_CPUSTATS }; #endif #if defined(XOSVIEW_NETBSD) && (__NetBSD_Version__ >= 104260000) + uint64_t cp_time[CPUSTATES]; + size_t size = sizeof(cp_time[0]) * CPUSTATES; static int mib[] = { CTL_KERN, KERN_CP_TIME }; #endif @@@@ -407,14 +421,11 @@@@ if (CPUSTATES != 5) errx (-1, "Error: xosview for *BSD expects 5 cpu states!\n"); #if defined(__NetBSD_Version__) && __NetBSD_Version__ > 104260000 /* > 1.4Z */ - struct schedstate_percpu ssp; - size_t size = sizeof(ssp.spc_cp_time); - if (sysctl(mib, 2, ssp.spc_cp_time, &size, NULL, 0) < 0) { - fprintf(stderr, "can't get schedstate_percpu: %s\n", strerror(errno)); - memset(&ssp, 0, sizeof(ssp)); + if (sysctl(mib, 2, cp_time, &size, NULL, 0) < 0) { + fprintf(stderr, "xosview: sysctl kern.cp_time failed: %s\n", strerror(errno)); + bzero(&cp_time, size); } - for (size = 0; size < CPUSTATES; size++) - timeArray[size] = (long) ssp.spc_cp_time[size]; + bcopy (cp_time, timeArray, size); #else #ifdef XOSVIEW_BSDI if (sysctl(mib, 2, &cpu, &size, NULL, 0) < 0) { @@@@ -441,7 +452,7 @@@@ } void -BSDGetNetInOut (long long * inbytes, long long * outbytes) { +NetMeter::BSDGetNetInOut (long long * inbytes, long long * outbytes) { struct ifnet * ifnetp; @@@@ -466,7 +477,8 @@@@ while (ifnetp) { // Now, dereference the pointer to get the ifnet struct. safe_kvm_read ((u_long) ifnetp, &ifnet, sizeof(ifnet)); -#ifdef NET_DEBUG +#ifdef XOSVIEW_NETBSD + if (netIface_ != "False" ) { char ifname[256]; #ifdef NETBSD_OLD_IFACE // In pre-1.2A, getting the interface name was more complicated. @@@@ -476,15 +488,29 @@@@ safe_kvm_read ((u_long) (((char*)ifnetp) + (&ifnet.if_xname[0] - (char*)&ifnet)), ifname, 256); snprintf (ifname, 256, "%s", ifname); #endif +#ifdef NET_DEBUG printf ("Interface name is %s\n", ifname); +#if defined(XOSVIEW_NETBSD) && (__NetBSD_Version__ >= 999004500) +/* Need to create new way to access interface stats */ +#else printf ("Ibytes: %8llu Obytes %8llu\n", (unsigned long long) ifnet.if_ibytes, (unsigned long long) ifnet.if_obytes); printf ("Ipackets: %8llu\n", (unsigned long long) ifnet.if_ipackets); #endif +#endif /* NET_DEBUG */ + if (ifname != netIface_) + goto skipif; + } +#endif /* XOSVIEW_NETBSD */ +#if defined(XOSVIEW_NETBSD) && (__NetBSD_Version__ >= 999004500) +/* Need to create new way to access interface stats */ +#else *inbytes += ifnet.if_ibytes; *outbytes += ifnet.if_obytes; +#endif + skipif: // Linked-list step taken from if.c in netstat source, line 120. #ifdef XOSVIEW_FREEBSD #if (__FreeBSD_version >= 300000) @@@@ -773,13 +799,12 @@@@ #ifdef NETBSD_1_6A // Do a sysctl with a NULL data pointer to get the size that would // have been returned, and use that to figure out # drives. - int mib[3] = {CTL_HW, HW_DISKSTATS, sizeof(struct disk_sysctl)}; size_t size; - if (sysctl(mib, 3, NULL, &size, NULL, 0) < 0) { + if (sysctl(dmib, 3, NULL, &size, NULL, 0) < 0) { warnx("!!! The DiskMeter sysctl failed. Disabling DiskMeter."); return 0; } - NetBSD_N_Drives = size / sizeof(struct disk_sysctl); + NetBSD_N_Drives = size / dmib[2]; return 1; #endif return ValidSymbol(DISKLIST_SYM_INDEX); @@@@ -816,19 +841,29 @@@@ #else #if defined(NETBSD_1_6A) // Use the new sysctl to do this for us. - int mib[3] = {CTL_HW, HW_DISKSTATS, sizeof(struct disk_sysctl)}; - size_t sysctl_sz = NetBSD_N_Drives * sizeof(struct disk_sysctl); + size_t sysctl_sz = NetBSD_N_Drives * dmib[2]; +#ifdef HW_DISKSTATS struct disk_sysctl drive_stats[NetBSD_N_Drives]; +#endif +#ifdef HW_IOSTATS + struct io_sysctl drive_stats[NetBSD_N_Drives]; +#endif // Do the sysctl. - if (sysctl(mib, 3, drive_stats, &sysctl_sz, NULL, 0) < 0) { + if (sysctl(dmib, 3, drive_stats, &sysctl_sz, NULL, 0) < 0) { err(1, "sysctl hw.diskstats failed"); } // Now accumulate the total. unsigned long long xferred = 0; for (unsigned int i = 0; i < NetBSD_N_Drives; i++) { +#ifdef HW_DISKSTATS xferred += drive_stats[i].dk_rbytes + drive_stats[i].dk_wbytes; +#endif +#ifdef HW_IOSTATS + if (drive_stats[i].type == IOSTAT_DISK) + xferred += drive_stats[i].rbytes + drive_stats[i].wbytes; +#endif } *bytesXferred = xferred; #else @@@@ -1016,7 +1051,7 @@@@ while (evptr && i < NUM_INTR) { - safe_kvm_read((unsigned int)evptr, &evcnt, sizeof(evcnt)); + safe_kvm_read((u_long)evptr, &evcnt, sizeof(evcnt)); evptr = evcnt.ev_list.tqe_next; @@@@ -1024,7 +1059,7 @@@@ if (evcnt.ev_type != EVCNT_TYPE_INTR) continue; - safe_kvm_read((unsigned int)evcnt.ev_name, evname, evcnt.ev_namelen); + safe_kvm_read((u_long)evcnt.ev_name, evname, evcnt.ev_namelen); // If it's a soft interrupt (has a name that starts with "soft"), skip it. if (!strncmp(evname, "soft", 4)) continue; @ 1.20 log @For now, disable the collection of network interface statistics on NetBSD 9.99.45 or newer. With recent changes to network internals, we need to come up with a new way to retrieve these statistics. @ text @d1 1 a1 1 $NetBSD$ @ 1.19 log @Apply patch from PR pkg/37557 which fixed a build error on x86_64. @ text @d3 2 a4 2 --- bsd/kernel.cc.orig 2006-02-18 08:36:06.000000000 +0100 +++ bsd/kernel.cc 2007-12-17 21:23:26.000000000 +0100 d95 1 a95 1 @@@@ -476,15 +488,21 @@@@ d101 3 d108 1 a108 1 -#endif d114 3 d119 1 d125 1 a125 1 @@@@ -773,13 +791,12 @@@@ d141 1 a141 1 @@@@ -816,19 +833,29 @@@@ d174 1 a174 1 @@@@ -1016,7 +1043,7 @@@@ d183 1 a183 1 @@@@ -1024,7 +1051,7 @@@@ @ 1.18 log @Allow xosview to be installed by unprivileged users, especially on BSD systems. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.17 2007/04/15 08:12:36 veego Exp $ d4 1 a4 1 +++ bsd/kernel.cc 2007-10-11 01:53:02.000000000 +0200 d167 18 @ 1.17 log @Move the netperf.h include up two lines to remove the $Id line in this patch. @ text @d1 1 a1 1 $NetBSD$ d4 1 a4 1 +++ bsd/kernel.cc 2007-04-14 21:34:03.000000000 +0200 d22 27 a48 1 @@@@ -400,6 +408,8 @@@@ d57 1 a57 1 @@@@ -407,14 +417,11 @@@@ d76 1 a76 1 @@@@ -441,7 +448,7 @@@@ d85 1 a85 1 @@@@ -466,7 +473,8 @@@@ d95 1 a95 1 @@@@ -476,15 +484,21 @@@@ d118 1 a118 1 @@@@ -773,13 +787,12 @@@@ d134 1 a134 1 @@@@ -816,19 +829,29 @@@@ @ 1.16 log @- Make myself the MAINTAINER - Fix the manpage path in the Makefile - Adapt the memmeter.cc changes to pagemeter so it doesn't use kmem to get uvmexp. - struct schedstate_percpu is no longer a public interface outside the kernel - Add netIface support for NetBSD. Now you can monitor only one network interface. See the manpage for more details. This change is allready present in the sourceforge tree. - PKGREVISION++ @ text @d4 2 a5 2 +++ bsd/kernel.cc 2007-04-09 15:27:42.000000000 +0200 @@@@ -115,10 +115,18 @@@@ d18 1 a20 1 +#include "netmeter.h" /* For netIface_ */ a21 2 CVSID("$Id$"); CVSID_DOT_H(KERNEL_H_CVSID); @ 1.15 log @- don't use kmem to get uvmexp; use sysctl - don't define UVM, it is done in the top level Makefile @ text @d3 3 a5 3 --- bsd/kernel.cc.orig 2006-02-18 02:36:06.000000000 -0500 +++ bsd/kernel.cc 2006-10-27 22:12:37.000000000 -0400 @@@@ -115,6 +115,13 @@@@ d19 76 a94 1 @@@@ -773,13 +780,12 @@@@ d110 1 a110 1 @@@@ -816,19 +822,29 @@@@ @ 1.14 log @don't include nfs statistics in the iostats; pointed by Veego @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.13 2006/06/05 02:35:30 christos Exp $ d4 2 a5 11 +++ bsd/kernel.cc 2006-06-05 16:17:01.000000000 -0400 @@@@ -21,6 +21,8 @@@@ /* NetBSD pulls in stdio.h via one of the other includes, but * the other BSDs don't. */ # include +#else +# define UVM #endif #include @@@@ -115,6 +117,13 @@@@ d19 1 a19 1 @@@@ -773,13 +782,12 @@@@ d35 1 a35 1 @@@@ -816,19 +824,29 @@@@ @ 1.13 log @Make this compile again. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- bsd/kernel.cc.orig 2006-06-04 22:19:00.000000000 -0400 +++ bsd/kernel.cc 2006-06-04 22:31:47.000000000 -0400 d44 1 a44 1 @@@@ -816,19 +824,28 @@@@ d71 2 a72 1 + xferred += drive_stats[i].rbytes + drive_stats[i].wbytes; @ 1.12 log @Updated xosview to 1.8.3. All our patches have been applied upstream. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.11 2006/02/18 10:12:24 rillig Exp $ d3 43 a45 5 Status: applied upstream. --- bsd/kernel.cc.orig 2003-10-13 21:53:17.000000000 -0400 +++ bsd/kernel.cc 2004-04-15 10:16:49.000000000 -0400 @@@@ -817,11 +817,11 @@@@ d48 4 a51 3 int mib[3] = {CTL_HW, HW_DISKSTATS, sizeof(struct disk_sysctl)}; - size_t sysctl_size = NetBSD_N_Drives * sizeof(struct disk_sysctl); + size_t sysctl_sz = NetBSD_N_Drives * sizeof(struct disk_sysctl); d53 4 d59 2 a60 2 - if (sysctl(mib, 3, drive_stats, &sysctl_size, NULL, 0) < 0) { + if (sysctl(mib, 3, drive_stats, &sysctl_sz, NULL, 0) < 0) { d64 12 @ 1.11 log @The patches have been applied upstream. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.10 2004/04/15 14:37:22 christos Exp $ @ 1.10 log @Thanks to @@@@@@'s new macros we need another patch now. @ text @d1 3 a3 1 $NetBSD$ @ 1.9 log @Update xosview to version 1.8.1alpha, from a nudge by Brian Grayson. Fixes build on NetBSD-1.6.2 and NetBSD-1.6ZE. Existing patches have either been incorporated or are unnecessary. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 1998/11/04 16:37:11 agc Exp $ d3 15 a17 3 --- config/Makefile.config.in 1998/11/04 15:12:15 1.1 +++ config/Makefile.config.in 1998/11/04 15:51:37 @@@@ -20,7 +20,7 @@@@ a18 7 # Optimized CXXFLAGS CXXFLAGS += $(CFLAGS) -Wall -O4 -pipe -I@@x_includes@@ \ - -I$(TOP) -I$(TOP)/@@host_dir@@ @@DEFS@@ + -I$(TOP) -I$(TOP)/@@host_dir@@ -I${TOP}/include @@DEFS@@ # DEBUG CXXFLAGS #CXXFLAGS += $(CFLAGS) -Wall -ggdb -pipe -I@@x_includes@@ \ # -I$(TOP) -I$(TOP)/@@host_dir@@ @@DEFS@@ @ 1.8 log @Make this package compile on arm32 with UVM. Add UVM to BUILD_DEFS. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @Update this pkg to 1.6.2.a. This fixes the pkg to run on alpha. Thanks to Brian Grayson for fixing it. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 1998/08/07 11:14:10 agc Exp $ d3 11 a13 14 --- configure.orig Sat May 16 22:35:12 1998 +++ configure Thu May 21 17:07:50 1998 @@@@ -1340,9 +1340,9 @@@@ ## contents are still nonnull. # First, grab the UVM string out of /etc/mk.conf (and silently # ignore if /etc/mk.conf doesn't exist.) - uvmstring=`grep UVM /etc/mk.conf 2>/dev/null` + uvmstring=`grep ^UVM /etc/mk.conf 2>/dev/null` # Now, replace any whitespace around the =. - uvmstring=`echo $uvmstring | sed -e 's/ *= */=/'` + uvmstring=`echo $uvmstring | sed -e 's/ *= */=/;s/ *\?=/=/'` # Now, remove any trailing whitespace, and strip comments. uvmstring=`echo $uvmstring | sed -e 's/ *$//;s/#.*$//'` # At this point, we should have either the empty string or @ 1.6 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Make configure a bit smarter to find UVM in /etc/mk.conf. @ text @d1 2 @ 1.4 log @Update xosview to 1.6.0 using patches supplied by Brian Grayson, fixes PR pkg/5461. @ text @d1 14 a14 28 *** netbsd/pagemeter.h.orig Fri Jul 18 04:37:33 1997 --- netbsd/pagemeter.h Wed Mar 18 15:02:27 1998 *************** *** 21,25 **** --- 21,31 ---- #include "fieldmeterdecay.h" + #if defined(UVM) + #include + #include + #include + #else #include + #endif class PageMeter : public FieldMeterDecay { *************** *** 36,40 **** --- 42,50 ---- void getpageinfo( void ); private: + #if defined(UVM) + struct uvmexp prev_; + #else struct vmmeter prev_; + #endif }; @ 1.3 log @Further mods from Matt Green for the UVM case. @ text @@ 1.2 log @Patches from Mario Kemper to make xosview work with UVM. Munged around by me to: + make it work with old VM as well as UVM. + cut down the context in two of the patches to miss out Id strings. @ text @d2 1 a2 1 --- netbsd/pagemeter.h Fri Mar 13 17:36:28 1998 d5 1 a5 1 --- 21,33 ---- d10 1 a10 3 + #include + #include + #include d19 1 a19 1 --- 44,52 ---- @ 1.1 log @Avoid problem with double inclusion of "machine/cpu.h" on some ports, fixes PR pkg/4731. @ text @d1 30 a30 20 --- config/Makefile.netbsd.in.orig Sat Nov 29 21:58:24 1997 +++ config/Makefile.netbsd.in Wed Feb 11 00:31:43 1998 @@@@ -9,6 +9,17 @@@@ CXXFLAGS += -I@@top_srcdir@@ +.include +.if (${ARCH} == "hp300") +CXXFLAGS += -D_HP300_CPU_H_ +.endif +.if (${ARCH} == "mac68k") +CXXFLAGS += -D_CPU_MACHINE_ +.endif +.if (${ARCH} == "x68k") +CXXFLAGS += -D_X68K_CPU_H_ +.endif + OBJS = \ MeterMaker.o \ cpumeter.o \ @