[pkgsrc/trunk]: pkgsrc/sysutils/xuvmstat NetBSD 5.99.21 and newer does not sw...

[martin <martin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/50b68c697eb2
branches:  trunk
changeset: 572654:50b68c697eb2
user:      martin <martin%pkgsrc.org@localhost>
date:      Thu Mar 04 14:56:13 2010 +0000

description:
NetBSD 5.99.21 and newer does not swap out user areas

diffstat:

 sysutils/xuvmstat/distinfo         |   4 ++--
 sysutils/xuvmstat/patches/patch-aa |  12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r 24106679bba9 -r 50b68c697eb2 sysutils/xuvmstat/distinfo
--- a/sysutils/xuvmstat/distinfo        Thu Mar 04 11:16:27 2010 +0000
+++ b/sysutils/xuvmstat/distinfo        Thu Mar 04 14:56:13 2010 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2006/11/10 10:07:20 martin Exp $
+$NetBSD: distinfo,v 1.9 2010/03/04 14:56:13 martin Exp $
 
 SHA1 (xuvmstat20050909.tar.gz) = b8118b1b11c260683ff14fe2200e9ee584f6b7c5
 RMD160 (xuvmstat20050909.tar.gz) = 6400ee7e396c410bf22ef9673b27b909f2a29a68
 Size (xuvmstat20050909.tar.gz) = 7661 bytes
-SHA1 (patch-aa) = 96cd66b0614087827aa1e8e34ddec778ad71509c
+SHA1 (patch-aa) = 8bcd46408285f29472e5c65535dcb30945bb2b90
 SHA1 (patch-ab) = d68a14dc0a465b1f6e6a3b422f41f677c03b20b6
 SHA1 (patch-ac) = c08d6a7034e7911edd8c7080ad5913e68c601e54
 SHA1 (patch-ad) = a5acb667b1c30afac025ef815a45b0e94f664bd9
diff -r 24106679bba9 -r 50b68c697eb2 sysutils/xuvmstat/patches/patch-aa
--- a/sysutils/xuvmstat/patches/patch-aa        Thu Mar 04 11:16:27 2010 +0000
+++ b/sysutils/xuvmstat/patches/patch-aa        Thu Mar 04 14:56:13 2010 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.8 2006/11/10 10:07:20 martin Exp $
+$NetBSD: patch-aa,v 1.9 2010/03/04 14:56:13 martin Exp $
 
 --- xuvmstat.c.orig    2005-09-09 15:38:48.000000000 +0200
-+++ xuvmstat.c 2006-11-10 10:52:11.000000000 +0100
++++ xuvmstat.c 2010-03-04 15:51:54.000000000 +0100
 @@ -40,13 +40,13 @@
  
  #include "libcdcx.h"
@@ -199,12 +199,18 @@
        gp_ctx = create_graph(3, "SWITCH/SWAP", names, before, after, color, white);
      }  
  
-@@ -373,25 +373,25 @@
+@@ -372,26 +372,31 @@
+                  buf, strlen(buf)); 
      y += get_fontheight(fnt_fixed) + 5;
  
++#if __NetBSD_Version__ >= 599002100
++    snprintf(buf, sizeof(buf), " woke=%d, revs=%d",
++      curexp.pdwoke, curexp.pdrevs);
++#else
      snprintf(buf, sizeof(buf), " woke=%d, revs=%d, swout=%d",
 -      cexp.pdwoke, cexp.pdrevs, cexp.pdswout);
 +      curexp.pdwoke, curexp.pdrevs, curexp.pdswout);
++#endif
      XDrawImageString(xdpy->dpy, win, gc, 5, get_fontheight(fnt_fixed) + y,
                   buf, strlen(buf)); 
      y += get_fontheight(fnt_fixed) + 1;