Fri Oct 30 18:31:41 2009 UTC ()
NetBSD-5.99.21 lost struct uvmexp.swap{ins,outs}


(tnn)
diff -r1.17 -r1.18 pkgsrc/sysutils/libgtop/distinfo
diff -r0 -r1.7 pkgsrc/sysutils/libgtop/patches/patch-ae
cvs diff -r1.17 -r1.18 pkgsrc/sysutils/libgtop/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/libgtop/distinfo 2009/10/22 17:11:44 1.17
+++ pkgsrc/sysutils/libgtop/distinfo 2009/10/30 18:31:41 1.18
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1$NetBSD: distinfo,v 1.17 2009/10/22 17:11:44 drochner Exp $ 1$NetBSD: distinfo,v 1.18 2009/10/30 18:31:41 tnn Exp $
2 2
3SHA1 (libgtop-2.28.0.tar.bz2) = f88595d43f1a451ca3799fe797696d4e53c4a772 3SHA1 (libgtop-2.28.0.tar.bz2) = f88595d43f1a451ca3799fe797696d4e53c4a772
4RMD160 (libgtop-2.28.0.tar.bz2) = e16de1b9ddfefec5aa6710f8737b5f66fccac1a4 4RMD160 (libgtop-2.28.0.tar.bz2) = e16de1b9ddfefec5aa6710f8737b5f66fccac1a4
5Size (libgtop-2.28.0.tar.bz2) = 793153 bytes 5Size (libgtop-2.28.0.tar.bz2) = 793153 bytes
6SHA1 (patch-aa) = b056c00edebf3578364de50bcd1345bff67b45bc 6SHA1 (patch-aa) = b056c00edebf3578364de50bcd1345bff67b45bc
7SHA1 (patch-ab) = cd11ad54870ab54fb940f922c1cc55d1c7ec2161 7SHA1 (patch-ab) = cd11ad54870ab54fb940f922c1cc55d1c7ec2161
8SHA1 (patch-ac) = 3dd59355e36657df4c8575c35ef11c28d4192d77 8SHA1 (patch-ac) = 3dd59355e36657df4c8575c35ef11c28d4192d77
9SHA1 (patch-ad) = 304b91c38fa9b39ffcfd2d39d9c382ecdc23469e 9SHA1 (patch-ad) = 304b91c38fa9b39ffcfd2d39d9c382ecdc23469e
 10SHA1 (patch-ae) = f7cab89412fe9c7bb62226d6c83a3245b9188092
10SHA1 (patch-ag) = 8ed7b66b4250dbc6f6321cef24941f58106fcbaf 11SHA1 (patch-ag) = 8ed7b66b4250dbc6f6321cef24941f58106fcbaf
11SHA1 (patch-ai) = 856c457b14e384b2c991bf51274f97a3a9c853f1 12SHA1 (patch-ai) = 856c457b14e384b2c991bf51274f97a3a9c853f1
12SHA1 (patch-aj) = 94e41923f13732118e8e809a09ec4162bf2ca422 13SHA1 (patch-aj) = 94e41923f13732118e8e809a09ec4162bf2ca422
13SHA1 (patch-al) = 8d69828a73fd8f87cef08786bc5c3cd864210da6 14SHA1 (patch-al) = 8d69828a73fd8f87cef08786bc5c3cd864210da6
14SHA1 (patch-am) = e69e9fd4ea90d2bb467050b5b4e8490baa162ef7 15SHA1 (patch-am) = e69e9fd4ea90d2bb467050b5b4e8490baa162ef7
15SHA1 (patch-an) = 169366e6dc034db05eb54d6abb1416889f17a8e2 16SHA1 (patch-an) = 169366e6dc034db05eb54d6abb1416889f17a8e2
16SHA1 (patch-ao) = f58a1bd19d63377b86478e72f23bd5a4cca5af76 17SHA1 (patch-ao) = f58a1bd19d63377b86478e72f23bd5a4cca5af76
17SHA1 (patch-aq) = bb44484df341a009aa269fbaf5039e351e105e6c 18SHA1 (patch-aq) = bb44484df341a009aa269fbaf5039e351e105e6c
18SHA1 (patch-bc) = 3638dfee30a4f10bc9662c23063df3f6a8cdc914 19SHA1 (patch-bc) = 3638dfee30a4f10bc9662c23063df3f6a8cdc914
19SHA1 (patch-bd) = 7825fd4d2e6c06510fa3d76b4efa4d2ffab2a7d8 20SHA1 (patch-bd) = 7825fd4d2e6c06510fa3d76b4efa4d2ffab2a7d8
20SHA1 (patch-ca) = 06bc86bce721155315a1905b750f795629460ff7 21SHA1 (patch-ca) = 06bc86bce721155315a1905b750f795629460ff7
21SHA1 (patch-cb) = cabc971530d8113694ff6d04108490749d40bcec 22SHA1 (patch-cb) = cabc971530d8113694ff6d04108490749d40bcec
22SHA1 (patch-cc) = 2cb1d2da57a8622c93ed255a416ed9c811e775a2 23SHA1 (patch-cc) = 2cb1d2da57a8622c93ed255a416ed9c811e775a2
File Added: pkgsrc/sysutils/libgtop/patches/patch-ae
$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__)