head 1.9; access; symbols pkgsrc-2020Q1:1.8.0.88 pkgsrc-2020Q1-base:1.8 pkgsrc-2019Q4:1.8.0.110 pkgsrc-2019Q4-base:1.8 pkgsrc-2019Q3:1.8.0.106 pkgsrc-2019Q3-base:1.8 pkgsrc-2019Q2:1.8.0.104 pkgsrc-2019Q2-base:1.8 pkgsrc-2019Q1:1.8.0.102 pkgsrc-2019Q1-base:1.8 pkgsrc-2018Q4:1.8.0.100 pkgsrc-2018Q4-base:1.8 pkgsrc-2018Q3:1.8.0.98 pkgsrc-2018Q3-base:1.8 pkgsrc-2018Q2:1.8.0.96 pkgsrc-2018Q2-base:1.8 pkgsrc-2018Q1:1.8.0.94 pkgsrc-2018Q1-base:1.8 pkgsrc-2017Q4:1.8.0.92 pkgsrc-2017Q4-base:1.8 pkgsrc-2017Q3:1.8.0.90 pkgsrc-2017Q3-base:1.8 pkgsrc-2017Q2:1.8.0.86 pkgsrc-2017Q2-base:1.8 pkgsrc-2017Q1:1.8.0.84 pkgsrc-2017Q1-base:1.8 pkgsrc-2016Q4:1.8.0.82 pkgsrc-2016Q4-base:1.8 pkgsrc-2016Q3:1.8.0.80 pkgsrc-2016Q3-base:1.8 pkgsrc-2016Q2:1.8.0.78 pkgsrc-2016Q2-base:1.8 pkgsrc-2016Q1:1.8.0.76 pkgsrc-2016Q1-base:1.8 pkgsrc-2015Q4:1.8.0.74 pkgsrc-2015Q4-base:1.8 pkgsrc-2015Q3:1.8.0.72 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.70 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.68 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.66 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.64 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.62 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.60 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.58 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.56 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.54 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.52 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.50 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.48 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.46 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.44 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.42 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.40 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.38 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.36 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.34 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.32 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.30 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.28 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.26 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.24 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.8.0.22 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.8.0.20 pkgsrc-2009Q1-base:1.8 pkgsrc-2008Q4:1.8.0.18 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.16 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.14 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.12 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.10 pkgsrc-2008Q1:1.8.0.8 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.6 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.4 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.2 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.7.0.28 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.26 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.24 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.22 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.20 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.18 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.16 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.14 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.12 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.10 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.8 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.6 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.4 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 netbsd-1-6-1:1.6.0.6 netbsd-1-6-1-base:1.6 netbsd-1-6:1.6.0.8 netbsd-1-6-RELEASE-base:1.6 pkgviews:1.6.0.4 pkgviews-base:1.6 buildlink2:1.6.0.2 buildlink2-base:1.6 netbsd-1-5-PATCH003:1.6 netbsd-1-5-PATCH001:1.6 netbsd-1-5-RELEASE:1.6 netbsd-1-4-PATCH003:1.6 netbsd-1-4-PATCH002:1.5 comdex-fall-1999:1.5 netbsd-1-4-PATCH001:1.5 netbsd-1-4-RELEASE:1.5 netbsd-1-3-PATCH003:1.3 netbsd-1-3-PATCH002:1.1; locks; strict; comment @# @; 1.9 date 2020.05.24.11.24.19; author rillig; state dead; branches; next 1.8; commitid oUrjRpsulUaW8u9C; 1.8 date 2007.04.09.21.22.11; author veego; state Exp; branches; next 1.7; 1.7 date 2003.11.10.17.18.28; author agc; state dead; branches; next 1.6; 1.6 date 2000.06.27.08.15.51; author tron; state Exp; branches; next 1.5; 1.5 date 99.04.11.12.15.42; author tron; state Exp; branches; next 1.4; 1.4 date 98.10.22.05.42.37; author garbled; state dead; branches; next 1.3; 1.3 date 98.09.15.17.38.08; author garbled; state Exp; branches; next 1.2; 1.2 date 98.05.18.09.07.33; author tron; state dead; branches; next 1.1; 1.1 date 98.03.18.13.42.16; author agc; state Exp; branches; next ; desc @@ 1.9 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-ac,v 1.8 2007/04/09 21:22:11 veego Exp $ --- bsd/netmeter.h.orig 2003-10-09 06:23:10.000000000 +0200 +++ bsd/netmeter.h @@@@ -33,8 +33,11 @@@@ public: void checkevent( void ); void checkResources( void ); + + void BSDGetNetInOut (long long * inbytes, long long * outbytes); protected: float netBandwidth_; + std::string netIface_; private: // NetBSD: Use long long, so we won't run into problems after 4 GB @ 1.8 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 @d1 1 a1 1 $NetBSD$ @ 1.7 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-ac,v 1.6 2000/06/27 08:15:51 tron Exp $ d3 4 a6 4 --- configure.orig Tue Feb 16 17:06:16 1999 +++ configure Sun Apr 11 14:11:30 1999 @@@@ -1717,6 +1717,21 @@@@ host_dir=bsd d8 1 a8 8 ;; +netbsd1.[45]*) + host_os=netbsd + EXTRALIBS="-lkvm $XPMLIB" + INSTALL_ARGS='-s -g kmem -m 02555' + cat >> confdefs.h <<\EOF +#define XOSVIEW_NETBSD 1 +EOF d10 7 a16 10 + cat >> confdefs.h <<\EOF +#define UVM 1 +EOF + + host_dir=bsd + +;; ## Also check for versions that have not been tested. netbsd*) echo "configure: warning: *************** Warning ***************** @ 1.6 log @Fix "xosview" to build under NetBSD 1.5 again. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.5 1999/04/11 12:15:42 tron Exp $ @ 1.5 log @Let "configure" recognize NetBSD 1.4. @ text @d1 1 a1 1 $NetBSD$ d9 1 a9 1 +netbsd1.4*) @ 1.4 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 6 a6 5 $NetBSD: patch-ac,v 1.3 1998/09/15 17:38:08 garbled Exp $ --- config/Makefile.top.in.orig Mon Sep 14 23:27:27 1998 +++ config/Makefile.top.in Mon Sep 14 23:27:41 1998 @@@@ -41,7 +41,7 @@@@ @@top_srcdir@@/@@host_os@@/libmeter.a: meterlib d8 19 a26 6 xosview: $(OBJS) @@top_srcdir@@/@@host_os@@/libmeter.a - $(CXX) $(LFLAGS) -o xosview $(OBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LFLAGS) -o xosview $(OBJS) $(LIBS) ## If for some reason (such as permissions) you wish to change where ## xosview is installed, modify X11BASEDIR here to point to your @ 1.3 log @Make xosview compile on ELF. This pkg has deeper problems on alpha however.. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update xosview to 1.6.0 using patches supplied by Brian Grayson, fixes PR pkg/5461. @ text @d1 12 a12 79 *** netbsd/kernel.cc.orig Sat Nov 15 03:00:02 1997 --- netbsd/kernel.cc Fri Mar 13 17:26:48 1998 *************** *** 22,25 **** --- 22,26 ---- #include /* For err(), warn(), etc. BCG */ + #include #include /* For CPUSTATES, which tells us how many cpu states there are. */ *************** *** 34,38 **** --- 35,53 ---- #include /* NetMeter helper functions. */ #endif + + #include + + #if defined(UVM) + #include + #include + #include + #include + #else + #include + #include #include /* For struct vmmeter. */ + #endif + + #include #include "kernel.h" /* To grab CVSID stuff. */ *************** *** 52,56 **** --- 67,75 ---- { "_ifnet" }, #define IFNET_SYM_INDEX 1 + #if defined(UVM) + { "_disklist" }, //Just to make kvm_nlist happy + #else { "_cnt" }, + #endif #define VMMETER_SYM_INDEX 2 #ifndef XOSVIEW_FREEBSD /* FreeBSD doesn't have a diskmeter yet. */ *************** *** 148,151 **** --- 167,185 ---- NetBSDPageInit() { OpenKDIfNeeded(); } + #if defined(UVM) + void + NetBSDGetPageStats(struct uvmexp* uvm) { + size_t size; + int mib[2]; + if (!uvm) errx(-1, "NetBSDGetPageStats(): passed pointer was null!\n"); + size = sizeof(uvmexp); + mib[0] = CTL_VM; + mib[1] = VM_UVMEXP; + if (sysctl(mib, 2, uvm, &size, NULL, 0) < 0) { + printf("can't get uvmexp: %s\n", strerror(errno)); + memset(&uvm, 0, sizeof(uvmexp)); + } + } + #else void NetBSDGetPageStats(struct vmmeter* vmp) { *************** *** 153,157 **** safe_kvm_read_symbol(VMMETER_SYM_INDEX, vmp, sizeof(struct vmmeter)); } ! // ------------------------ CPUMeter functions ------------------ --- 187,191 ---- safe_kvm_read_symbol(VMMETER_SYM_INDEX, vmp, sizeof(struct vmmeter)); } ! #endif // ------------------------ CPUMeter functions ------------------ @ 1.1 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 @@