diff options
| author | tnn <tnn@pkgsrc.org> | 2009-10-30 18:31:41 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2009-10-30 18:31:41 +0000 |
| commit | a40d4a606423e4aa66935771969103e3c2971f2f (patch) | |
| tree | 61115c911aeb323d239eb3191693ea5ab12656be | |
| parent | 660b58cc1ecc58b2465fd5b4a06ee6f80c1c3de2 (diff) | |
| download | pkgsrc-a40d4a606423e4aa66935771969103e3c2971f2f.tar.gz | |
NetBSD-5.99.21 lost struct uvmexp.swap{ins,outs}
| -rw-r--r-- | sysutils/libgtop/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/libgtop/patches/patch-ae | 43 |
2 files changed, 45 insertions, 1 deletions
diff --git a/sysutils/libgtop/distinfo b/sysutils/libgtop/distinfo index d1add37f5b5..2ddc65fe08d 100644 --- a/sysutils/libgtop/distinfo +++ b/sysutils/libgtop/distinfo @@ -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-aa) = b056c00edebf3578364de50bcd1345bff67b45bc 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 --git a/sysutils/libgtop/patches/patch-ae b/sysutils/libgtop/patches/patch-ae new file mode 100644 index 00000000000..0e2e238a99a --- /dev/null +++ b/sysutils/libgtop/patches/patch-ae @@ -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__) + |