head 1.14; access; symbols pkgsrc-2020Q1:1.13.0.38 pkgsrc-2020Q1-base:1.13 pkgsrc-2019Q4:1.13.0.60 pkgsrc-2019Q4-base:1.13 pkgsrc-2019Q3:1.13.0.56 pkgsrc-2019Q3-base:1.13 pkgsrc-2019Q2:1.13.0.54 pkgsrc-2019Q2-base:1.13 pkgsrc-2019Q1:1.13.0.52 pkgsrc-2019Q1-base:1.13 pkgsrc-2018Q4:1.13.0.50 pkgsrc-2018Q4-base:1.13 pkgsrc-2018Q3:1.13.0.48 pkgsrc-2018Q3-base:1.13 pkgsrc-2018Q2:1.13.0.46 pkgsrc-2018Q2-base:1.13 pkgsrc-2018Q1:1.13.0.44 pkgsrc-2018Q1-base:1.13 pkgsrc-2017Q4:1.13.0.42 pkgsrc-2017Q4-base:1.13 pkgsrc-2017Q3:1.13.0.40 pkgsrc-2017Q3-base:1.13 pkgsrc-2017Q2:1.13.0.36 pkgsrc-2017Q2-base:1.13 pkgsrc-2017Q1:1.13.0.34 pkgsrc-2017Q1-base:1.13 pkgsrc-2016Q4:1.13.0.32 pkgsrc-2016Q4-base:1.13 pkgsrc-2016Q3:1.13.0.30 pkgsrc-2016Q3-base:1.13 pkgsrc-2016Q2:1.13.0.28 pkgsrc-2016Q2-base:1.13 pkgsrc-2016Q1:1.13.0.26 pkgsrc-2016Q1-base:1.13 pkgsrc-2015Q4:1.13.0.24 pkgsrc-2015Q4-base:1.13 pkgsrc-2015Q3:1.13.0.22 pkgsrc-2015Q3-base:1.13 pkgsrc-2015Q2:1.13.0.20 pkgsrc-2015Q2-base:1.13 pkgsrc-2015Q1:1.13.0.18 pkgsrc-2015Q1-base:1.13 pkgsrc-2014Q4:1.13.0.16 pkgsrc-2014Q4-base:1.13 pkgsrc-2014Q3:1.13.0.14 pkgsrc-2014Q3-base:1.13 pkgsrc-2014Q2:1.13.0.12 pkgsrc-2014Q2-base:1.13 pkgsrc-2014Q1:1.13.0.10 pkgsrc-2014Q1-base:1.13 pkgsrc-2013Q4:1.13.0.8 pkgsrc-2013Q4-base:1.13 pkgsrc-2013Q3:1.13.0.6 pkgsrc-2013Q3-base:1.13 pkgsrc-2013Q2:1.13.0.4 pkgsrc-2013Q2-base:1.13 pkgsrc-2013Q1:1.13.0.2 pkgsrc-2013Q1-base:1.13 pkgsrc-2012Q4:1.12.0.54 pkgsrc-2012Q4-base:1.12 pkgsrc-2012Q3:1.12.0.52 pkgsrc-2012Q3-base:1.12 pkgsrc-2012Q2:1.12.0.50 pkgsrc-2012Q2-base:1.12 pkgsrc-2012Q1:1.12.0.48 pkgsrc-2012Q1-base:1.12 pkgsrc-2011Q4:1.12.0.46 pkgsrc-2011Q4-base:1.12 pkgsrc-2011Q3:1.12.0.44 pkgsrc-2011Q3-base:1.12 pkgsrc-2011Q2:1.12.0.42 pkgsrc-2011Q2-base:1.12 pkgsrc-2011Q1:1.12.0.40 pkgsrc-2011Q1-base:1.12 pkgsrc-2010Q4:1.12.0.38 pkgsrc-2010Q4-base:1.12 pkgsrc-2010Q3:1.12.0.36 pkgsrc-2010Q3-base:1.12 pkgsrc-2010Q2:1.12.0.34 pkgsrc-2010Q2-base:1.12 pkgsrc-2010Q1:1.12.0.32 pkgsrc-2010Q1-base:1.12 pkgsrc-2009Q4:1.12.0.30 pkgsrc-2009Q4-base:1.12 pkgsrc-2009Q3:1.12.0.28 pkgsrc-2009Q3-base:1.12 pkgsrc-2009Q2:1.12.0.26 pkgsrc-2009Q2-base:1.12 pkgsrc-2009Q1:1.12.0.24 pkgsrc-2009Q1-base:1.12 pkgsrc-2008Q4:1.12.0.22 pkgsrc-2008Q4-base:1.12 pkgsrc-2008Q3:1.12.0.20 pkgsrc-2008Q3-base:1.12 cube-native-xorg:1.12.0.18 cube-native-xorg-base:1.12 pkgsrc-2008Q2:1.12.0.16 pkgsrc-2008Q2-base:1.12 cwrapper:1.12.0.14 pkgsrc-2008Q1:1.12.0.12 pkgsrc-2008Q1-base:1.12 pkgsrc-2007Q4:1.12.0.10 pkgsrc-2007Q4-base:1.12 pkgsrc-2007Q3:1.12.0.8 pkgsrc-2007Q3-base:1.12 pkgsrc-2007Q2:1.12.0.6 pkgsrc-2007Q2-base:1.12 pkgsrc-2007Q1:1.12.0.4 pkgsrc-2007Q1-base:1.12 pkgsrc-2006Q4:1.12.0.2 pkgsrc-2006Q4-base:1.12 pkgsrc-2006Q3:1.11.0.6 pkgsrc-2006Q3-base:1.11 pkgsrc-2006Q2:1.11.0.4 pkgsrc-2006Q2-base:1.11 pkgsrc-2006Q1:1.11.0.2 pkgsrc-2006Q1-base:1.11 pkgsrc-2005Q4:1.9.0.14 pkgsrc-2005Q4-base:1.9 pkgsrc-2005Q3:1.9.0.12 pkgsrc-2005Q3-base:1.9 pkgsrc-2005Q2:1.9.0.10 pkgsrc-2005Q2-base:1.9 pkgsrc-2005Q1:1.9.0.8 pkgsrc-2005Q1-base:1.9 pkgsrc-2004Q4:1.9.0.6 pkgsrc-2004Q4-base:1.9 pkgsrc-2004Q3:1.9.0.4 pkgsrc-2004Q3-base:1.9 pkgsrc-2004Q2:1.9.0.2 pkgsrc-2004Q2-base:1.9 pkgsrc-2004Q1:1.8.0.4 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.8.0.2 pkgsrc-2003Q4-base:1.8 netbsd-1-6-1:1.7.0.6 netbsd-1-6-1-base:1.7 netbsd-1-6:1.7.0.8 netbsd-1-6-RELEASE-base:1.7 pkgviews:1.7.0.4 pkgviews-base:1.7 buildlink2:1.7.0.2 buildlink2-base:1.7 netbsd-1-5-PATCH003:1.7 netbsd-1-5-PATCH001:1.7 netbsd-1-5-RELEASE:1.7 netbsd-1-4-PATCH003:1.7 netbsd-1-4-PATCH002:1.7 comdex-fall-1999:1.7 netbsd-1-4-PATCH001:1.7 netbsd-1-4-RELEASE:1.7 netbsd-1-3-PATCH003:1.5 netbsd-1-3-PATCH002:1.2; locks; strict; comment @# @; 1.14 date 2020.05.24.11.24.19; author rillig; state dead; branches; next 1.13; commitid oUrjRpsulUaW8u9C; 1.13 date 2013.01.11.23.33.36; author joerg; state Exp; branches; next 1.12; 1.12 date 2006.10.28.02.15.12; author christos; state Exp; branches; next 1.11; 1.11 date 2006.03.14.15.48.01; author rillig; state dead; branches; next 1.10; 1.10 date 2006.02.18.10.12.24; author rillig; state Exp; branches; next 1.9; 1.9 date 2004.04.21.18.45.09; author perry; state Exp; branches; next 1.8; 1.8 date 2003.11.10.17.18.28; author agc; state dead; branches; next 1.7; 1.7 date 99.04.07.10.25.11; author agc; state Exp; branches; next 1.6; 1.6 date 98.10.22.05.42.37; author garbled; state dead; branches; next 1.5; 1.5 date 98.08.07.11.14.11; author agc; state Exp; branches; next 1.4; 1.4 date 98.05.29.02.55.20; author hubertf; state Exp; branches; next 1.3; 1.3 date 98.05.18.09.07.33; author tron; state dead; branches; next 1.2; 1.2 date 98.03.18.16.18.36; author agc; state Exp; branches; next 1.1; 1.1 date 98.03.18.13.42.16; author agc; state Exp; branches; next ; desc @@ 1.14 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-ab,v 1.13 2013/01/11 23:33:36 joerg Exp $ --- bsd/memmeter.cc.orig 2002-07-14 03:48:45.000000000 +0000 +++ bsd/memmeter.cc @@@@ -26,6 +26,8 @@@@ #include /* Needed for kvm_cnt, kvm_uvm_exp. */ -#if defined(XOSVIEW_BSDI) || defined(XOSVIEW_FREEBSD) || defined(XOSVIEW_OPENBSD) /* Does - OpenBSD need this? */ +#if defined(XOSVIEW_BSDI) || defined(XOSVIEW_FREEBSD) || defined(XOSVIEW_OPENBSD) # include #endif +#if defined(__NetBSD__) +#include +#endif @@@@ -79,3 +81,3 @@@@ void MemMeter::getmeminfo (void) { size_t meminfosize = sizeof (struct vmtotal); - sysctl (params, 2, &meminfo, &meminfosize, NULL, NULL); + sysctl (params, 2, &meminfo, &meminfosize, NULL, 0); /* Note that the numbers are in terms of 4K pages. */ @@@@ -93,4 +95,11 @@@@ void MemMeter::getmeminfo (void) { #if defined(UVM) && (defined(XOSVIEW_NETBSD) || defined(XOSVIEW_OPENBSD)) +#ifdef VM_UVMEXP2 + int params[] = {CTL_VM, VM_UVMEXP2}; + struct uvmexp_sysctl kvm_uvm_exp; + size_t kvm_uvm_exp_size = sizeof (kvm_uvm_exp); + sysctl (params, 2, &kvm_uvm_exp, &kvm_uvm_exp_size, NULL, 0); +#else struct uvmexp kvm_uvm_exp; BSDGetUVMPageStats(&kvm_uvm_exp); +#endif int pgsize = kvm_uvm_exp.pagesize; @ 1.13 log @NetBSD/current needs uvm/uvm_extern.h @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.12 2006/10/28 02:15:12 christos Exp $ @ 1.12 log @- don't use kmem to get uvmexp; use sysctl - don't define UVM, it is done in the top level Makefile @ text @d1 1 a1 1 $NetBSD$ d3 14 a16 5 --- bsd/memmeter.cc.orig 2002-07-13 23:48:45.000000000 -0400 +++ bsd/memmeter.cc 2006-10-27 22:09:54.000000000 -0400 @@@@ -77,7 +77,7 @@@@ struct vmtotal meminfo; int params[] = {CTL_VM, VM_METER}; d21 1 a21 5 total_ = 4096*(meminfo.t_free+meminfo.t_rm); @@@@ -91,8 +91,15 @@@@ * this, and later we'll add all the common fields to this. */ total_ = 0.0; a32 2 fields_[0] = kvm_uvm_exp.active*pgsize; fields_[1] = kvm_uvm_exp.inactive*pgsize; @ 1.11 log @Updated xosview to 1.8.3. All our patches have been applied upstream. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.10 2006/02/18 10:12:24 rillig Exp $ d3 9 a11 10 Status: applied upstream. --- bsd/intratemeter.cc.orig 2003-10-09 00:20:06.000000000 -0400 +++ bsd/intratemeter.cc 2004-04-21 14:32:07.000000000 -0400 @@@@ -48,7 +48,7 @@@@ dodecay_ = parent_->isResourceTrue("irqrateDecay"); useGraph_ = parent_->isResourceTrue("irqrateGraph"); SetUsedFormat (parent_->getResource("irqrateUsedFormat")); - total_ = 100; + total_ = 2000; d13 17 a29 2 // Now, grab a sample. I don't know if this is needed here. BCG BSDGetIntrStats (lastirqs_); @ 1.10 log @The patches have been applied upstream. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.9 2004/04/21 18:45:09 perry Exp $ @ 1.9 log @Kludgily fix a bug where the IRQ meter overran on machines with high HZ. @ text @d1 3 a3 1 $NetBSD: patch-aa,v 1.10 2004/04/15 14:37:22 christos Exp $ @ 1.8 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-ab,v 1.7 1999/04/07 10:25:11 agc Exp $ d3 8 a10 26 Avoid ugly "-n\n" output on Solaris. --- config/Makefile.top.in 1999/04/07 10:14:34 1.1 +++ config/Makefile.top.in 1999/04/07 10:17:30 @@@@ -55,17 +55,20 @@@@ ## These next lines look really ugly. The echo statements are an ## attempt to make the output look a little nicer. The "echo -n" ## statements create a two-space indent at the beginning of the line. +## They also don't work properly on Solaris (unless you have the +## lottery of having /usr/ucb/echo found before /bin/echo in your +## PATH), so delete them for just now. install: xosview - @@echo "Installing executable..."; echo -n " " + @@echo "Installing executable..." @@INSTALL_PROGRAM@@ @@INSTALL_ARGS@@ xosview $(BINDIR) - @@echo "Installing application defaults..."; echo -n " " + @@echo "Installing application defaults..." @@INSTALL_DATA@@ Xdefaults $(XAPPLOADDIR)/XOsview @@echo "Making sure $(MANDIR) exists..." @@if [ ! -d $(MANDIR) ]; then \ echo "Making $(MANDIR)..."; \ mkdir $(MANDIR); \ fi - @@echo "Installing man page..."; echo -n " " + @@echo "Installing man page..." @@INSTALL_DATA@@ xosview.1 $(MANDIR) d12 2 a13 1 install-man: @ 1.7 log @Avoid ugly "-n\n" output on Solaris when installing the package. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 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-ab,v 1.5 1998/08/07 11:14:11 agc Exp $ d3 28 a30 24 --- Xrm.cc.orig Fri May 29 04:34:30 1998 +++ Xrm.cc Fri May 29 04:39:30 1998 @@@@ -156,7 +156,7 @@@@ if (xappdir != NULL) { char xappfile[1024]; - sprintf (xappfile, "%s/%s", xappdir, className()); + snprintf (xappfile, 1024, "%s/%s", xappdir, className()); // this did not work for XAPPLRESDIR //if (!access (xappfile, X_OK | R_OK)) if (!access (xappfile, R_OK)) @@@@ -185,8 +185,10 @@@@ // Now, check for a user resource file, and merge it in if there is one... if ( getenv( "HOME" ) != NULL ){ char userrfilename[1024]; - strcpy(userrfilename, getenv("HOME")); - strcat(userrfilename, "/.Xdefaults"); +#define XDEFAULTS "/.Xdefaults" + strncpy(userrfilename, getenv("HOME"), 1024-strlen(XDEFAULTS)); + strcat(userrfilename, XDEFAULTS); +#undef XDEFAULTS // User file overrides system (_db). XrmCombineFileDatabase (userrfilename, &_db, 1); } @ 1.5 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Fix two buffer overruns. @ text @d1 2 @ 1.3 log @Update xosview to 1.6.0 using patches supplied by Brian Grayson, fixes PR pkg/5461. @ text @d1 24 a24 38 --- netbsd/pagemeter.cc.orig Sun Dec 7 18:50:28 1997 +++ netbsd/pagemeter.cc Wed Mar 18 15:11:46 1998 @@@@ -56,9 +56,15 @@@@ void PageMeter::getpageinfo (void) { // Begin NetBSD-specific code... +#if defined(UVM) + struct uvmexp uvm; + NetBSDGetPageStats(&uvm); +#else struct vmmeter vm; - NetBSDGetPageStats(&vm); +#endif + + #ifdef XOSVIEW_FREEBSD #warning "FreeBSD hack" /* I'm not completely sure these are the right statistics, but @@@@ -66,10 +72,17 @@@@ fields_[0] = vm.v_vnodein - prev_.v_vnodein; fields_[1] = vm.v_vnodeout - prev_.v_vnodeout; #else +#if defined(UVM) + fields_[0] = uvm.pageins - prev_.pageins; + fields_[1] = uvm.pgswapout - prev_.pgswapout; + prev_ = uvm; +#else fields_[0] = vm.v_pgpgin - prev_.v_pgpgin; fields_[1] = vm.v_pgpgout - prev_.v_pgpgout; -#endif prev_ = vm; +#endif +#endif + // End NetBSD-specific code... if (total_ < fields_[0] + fields_[1]) total_ = fields_[0] + fields_[1]; @ 1.2 log @Further mods from Matt Green for the UVM case. @ text @@ 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 @d1 2 a2 2 --- netbsd/pagemeter.cc.orig Tue Mar 3 18:25:08 1998 +++ netbsd/pagemeter.cc Sun Mar 1 17:24:30 1998 d25 1 a25 1 + fields_[0] = uvm.pgswapin - prev_.pgswapin; @