[pkgsrc/trunk]: pkgsrc/sysutils/libgtop NetBSD-5.99.21 lost struct uvmexp.swa...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/37378ebf37e7
branches:  trunk
changeset: 400939:37378ebf37e7
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Oct 30 18:31:41 2009 +0000

description:
NetBSD-5.99.21 lost struct uvmexp.swap{ins,outs}

diffstat:

 sysutils/libgtop/distinfo         |   3 +-
 sysutils/libgtop/patches/patch-ae |  43 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletions(-)

diffs (64 lines):

diff -r a305d603a5cb -r 37378ebf37e7 sysutils/libgtop/distinfo
--- a/sysutils/libgtop/distinfo Fri Oct 30 18:25:23 2009 +0000
+++ b/sysutils/libgtop/distinfo Fri Oct 30 18:31:41 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2009/10/22 17:11:44 drochner Exp $
+$NetBSD: distinfo,v 1.18 2009/10/30 18:31:41 tnn Exp $
 
 SHA1 (libgtop-2.28.0.tar.bz2) = f88595d43f1a451ca3799fe797696d4e53c4a772
 RMD160 (libgtop-2.28.0.tar.bz2) = e16de1b9ddfefec5aa6710f8737b5f66fccac1a4
@@ -7,6 +7,7 @@
 SHA1 (patch-ab) = cd11ad54870ab54fb940f922c1cc55d1c7ec2161
 SHA1 (patch-ac) = 3dd59355e36657df4c8575c35ef11c28d4192d77
 SHA1 (patch-ad) = 304b91c38fa9b39ffcfd2d39d9c382ecdc23469e
+SHA1 (patch-ae) = f7cab89412fe9c7bb62226d6c83a3245b9188092
 SHA1 (patch-ag) = 8ed7b66b4250dbc6f6321cef24941f58106fcbaf
 SHA1 (patch-ai) = 856c457b14e384b2c991bf51274f97a3a9c853f1
 SHA1 (patch-aj) = 94e41923f13732118e8e809a09ec4162bf2ca422
diff -r a305d603a5cb -r 37378ebf37e7 sysutils/libgtop/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/libgtop/patches/patch-ae Fri Oct 30 18:31:41 2009 +0000
@@ -0,0 +1,43 @@
+$NetBSD: patch-ae,v 1.7 2009/10/30 18:31:41 tnn Exp $
+
+--- sysdeps/bsd/swap.c.orig    2008-05-24 00:13:21.000000000 +0200
++++ sysdeps/bsd/swap.c
+@@ -195,29 +195,32 @@ glibtop_get_swap_p (glibtop *server, gli
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+               buf->pagein = vmm.v_swappgsin - swappgsin;
+               buf->pageout = vmm.v_swappgsout - swappgsout;
+-#else
+-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
++#elif defined(__NetBSD__) && (__NetBSD_Version__ >= 599002100)
++              /* no uvmexp.swap{ins,outs} */
++              buf->pagein = 0;
++              buf->pageout = 0;
++#elif defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
+               buf->pagein = uvmexp.swapins - swappgsin;
+               buf->pageout = uvmexp.swapouts - swappgsout;
+ #else
+               buf->pagein = vmm.v_swpin - swappgsin;
+               buf->pageout = vmm.v_swpout - swappgsout;
+ #endif
+-#endif
+       }
+ 
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+         swappgsin = vmm.v_swappgsin;
+       swappgsout = vmm.v_swappgsout;
+-#else
+-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
++#elif defined(__NetBSD__) && (__NetBSD_Version__ >= 599002100)
++      swappgsin = 0;
++      swappgsout = 0;
++#elif defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
+       swappgsin = uvmexp.swapins;
+       swappgsout = uvmexp.swapouts;
+ #else
+       swappgsin = vmm.v_swpin;
+       swappgsout = vmm.v_swpout;
+ #endif
+-#endif
+ 
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+