summaryrefslogtreecommitdiff
path: root/sysutils/xosview
diff options
context:
space:
mode:
authorchristos <christos>2006-06-05 20:20:26 +0000
committerchristos <christos>2006-06-05 20:20:26 +0000
commit000c3c008fb8b4d3b2d30b93c6a338ab37029ea5 (patch)
tree7c4c66deba8413a2326b40b74e63e26cfa789f2a /sysutils/xosview
parent20f25e7879330209ee8fe9002ae5c0e2be68987e (diff)
downloadpkgsrc-000c3c008fb8b4d3b2d30b93c6a338ab37029ea5.tar.gz
don't include nfs statistics in the iostats; pointed by Veego
Diffstat (limited to 'sysutils/xosview')
-rw-r--r--sysutils/xosview/distinfo4
-rw-r--r--sysutils/xosview/patches/patch-aa11
2 files changed, 8 insertions, 7 deletions
diff --git a/sysutils/xosview/distinfo b/sysutils/xosview/distinfo
index a6e8504f29a..48bc8c53b58 100644
--- a/sysutils/xosview/distinfo
+++ b/sysutils/xosview/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2006/06/05 02:35:30 christos Exp $
+$NetBSD: distinfo,v 1.18 2006/06/05 20:20:26 christos Exp $
SHA1 (xosview-1.8.3.tar.gz) = 420fd0620ff9fb9ba83fc833eeb8b872414e377e
RMD160 (xosview-1.8.3.tar.gz) = 595e812dee686ccaa5d95eb537782679d752271b
Size (xosview-1.8.3.tar.gz) = 259793 bytes
-SHA1 (patch-aa) = 094b0fc6e27b8ea92bcd0e0040e7d211395ed97e
+SHA1 (patch-aa) = 5a97b1a82b511d856c93dc07ed1e2d25d8556427
diff --git a/sysutils/xosview/patches/patch-aa b/sysutils/xosview/patches/patch-aa
index b7b27988890..1686744a36f 100644
--- a/sysutils/xosview/patches/patch-aa
+++ b/sysutils/xosview/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.13 2006/06/05 02:35:30 christos Exp $
+$NetBSD: patch-aa,v 1.14 2006/06/05 20:20:26 christos Exp $
---- bsd/kernel.cc.orig 2006-06-04 22:19:00.000000000 -0400
-+++ bsd/kernel.cc 2006-06-04 22:31:47.000000000 -0400
+--- bsd/kernel.cc.orig 2006-02-18 02:36:06.000000000 -0500
++++ 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. */
@@ -41,7 +41,7 @@ $NetBSD: patch-aa,v 1.13 2006/06/05 02:35:30 christos Exp $
return 1;
#endif
return ValidSymbol(DISKLIST_SYM_INDEX);
-@@ -816,19 +824,28 @@
+@@ -816,19 +824,29 @@
#else
#if defined(NETBSD_1_6A)
// Use the new sysctl to do this for us.
@@ -68,7 +68,8 @@ $NetBSD: patch-aa,v 1.13 2006/06/05 02:35:30 christos Exp $
xferred += drive_stats[i].dk_rbytes + drive_stats[i].dk_wbytes;
+#endif
+#ifdef HW_IOSTATS
-+ xferred += drive_stats[i].rbytes + drive_stats[i].wbytes;
++ if (drive_stats[i].type == IOSTAT_DISK)
++ xferred += drive_stats[i].rbytes + drive_stats[i].wbytes;
+#endif
}
*bytesXferred = xferred;