pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/libgtop2 -make this build on -current where s...
details: https://anonhg.NetBSD.org/pkgsrc/rev/04114884b193
branches: trunk
changeset: 518901:04114884b193
user: drochner <drochner%pkgsrc.org@localhost>
date: Fri Sep 22 15:57:47 2006 +0000
description:
-make this build on -current where some fields were removed from
struct uvmexp -- use uvmexp_sysctl on NetBSD instead
-correct filesystem size calculation: the unit is vfsstat.f_frsize
-bump PKGREVISION
with jmmv's blessing
diffstat:
sysutils/libgtop2/Makefile | 4 +-
sysutils/libgtop2/distinfo | 5 ++-
sysutils/libgtop2/patches/patch-ag | 44 ++++++++++++++++++++++++++-----------
sysutils/libgtop2/patches/patch-aq | 13 +++++++++++
4 files changed, 49 insertions(+), 17 deletions(-)
diffs (173 lines):
diff -r 7df1dee5d3e9 -r 04114884b193 sysutils/libgtop2/Makefile
--- a/sysutils/libgtop2/Makefile Fri Sep 22 15:08:09 2006 +0000
+++ b/sysutils/libgtop2/Makefile Fri Sep 22 15:57:47 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2006/09/16 12:20:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.40 2006/09/22 15:57:47 drochner Exp $
DISTNAME= libgtop-2.14.2
PKGNAME= ${DISTNAME:S/-/2-/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/2.14/}
EXTRACT_SUFX= .tar.bz2
diff -r 7df1dee5d3e9 -r 04114884b193 sysutils/libgtop2/distinfo
--- a/sysutils/libgtop2/distinfo Fri Sep 22 15:08:09 2006 +0000
+++ b/sysutils/libgtop2/distinfo Fri Sep 22 15:57:47 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2006/09/01 06:54:28 joerg Exp $
+$NetBSD: distinfo,v 1.27 2006/09/22 15:57:47 drochner Exp $
SHA1 (libgtop-2.14.2.tar.bz2) = 20e79a58c08e06e5f5e68d8ebbd575471f754e96
RMD160 (libgtop-2.14.2.tar.bz2) = cb51f7252e015e17dcf3f1f991b36bf3e5496efe
@@ -9,7 +9,7 @@
SHA1 (patch-ad) = ada3c0128c0b7d3b670f8d30c910fe4c1e2e351a
SHA1 (patch-ae) = 035419a4e8a505c672f727c843dbd977acd8ce35
SHA1 (patch-af) = 520dbdec4a8cba6e82b08c169d97c3caebacd419
-SHA1 (patch-ag) = 74d20bdc56224ae553935cc81ce47504e98701fe
+SHA1 (patch-ag) = 2329761a8f0278e8f04a5704b4ab2f63d6b24576
SHA1 (patch-ah) = 57d112d551149190a6b9c24074427457f8591691
SHA1 (patch-ai) = 57d891785a45ec532757a48e77adafec091f3953
SHA1 (patch-aj) = c244b5c60e61594c3d2c0bc95e05e12ad68938db
@@ -19,6 +19,7 @@
SHA1 (patch-an) = 57a79bddc3f0e8237b72486aa8f8906f318ca38d
SHA1 (patch-ao) = 72aa455cbc10afc6a744fd0684ec2d7a2e2c19c7
SHA1 (patch-ap) = 1b842a59b821b2703b68935f59a65ffb6db3a68f
+SHA1 (patch-aq) = bb44484df341a009aa269fbaf5039e351e105e6c
SHA1 (patch-ba) = fc99c68ec9765439bc82a38223a74bde319d26d5
SHA1 (patch-bb) = 2940eeb9468f34683bd6d8adca196b669c412bfd
SHA1 (patch-bc) = 3638dfee30a4f10bc9662c23063df3f6a8cdc914
diff -r 7df1dee5d3e9 -r 04114884b193 sysutils/libgtop2/patches/patch-ag
--- a/sysutils/libgtop2/patches/patch-ag Fri Sep 22 15:08:09 2006 +0000
+++ b/sysutils/libgtop2/patches/patch-ag Fri Sep 22 15:57:47 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2006/02/28 23:48:11 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2006/09/22 15:57:47 drochner Exp $
---- sysdeps/freebsd/mem.c.orig 2004-08-28 20:55:37.000000000 +0000
+--- sysdeps/freebsd/mem.c.orig 2005-12-12 11:09:39.000000000 +0100
+++ sysdeps/freebsd/mem.c
-@@ -27,6 +27,10 @@
+@@ -28,6 +28,10 @@
#include <glibtop_suid.h>
@@ -13,7 +13,7 @@
#include <sys/sysctl.h>
#include <sys/vmmeter.h>
#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000)
-@@ -57,6 +61,7 @@ static int pageshift; /* log base 2 of
+@@ -58,6 +62,7 @@ static int pageshift; /* log base 2 of
/* define pagetok in terms of pageshift */
#define pagetok(size) ((size) << pageshift)
@@ -21,7 +21,7 @@
/* nlist structure for kernel access */
static struct nlist nlst [] = {
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
-@@ -74,6 +79,7 @@ static struct nlist nlst [] = {
+@@ -75,6 +80,7 @@ static struct nlist nlst [] = {
{ 0 }
#endif
};
@@ -29,7 +29,18 @@
/* MIB array for sysctl */
#ifdef __bsdi__
-@@ -93,10 +99,12 @@ glibtop_init_mem_p (glibtop *server)
+@@ -83,7 +89,9 @@ static int mib [] = { CTL_VM, VM_TOTAL }
+ static int mib [] = { CTL_VM, VM_METER };
+ #endif
+
+-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
++static int mib_uvmexp [] = { CTL_VM, VM_UVMEXP2 };
++#elif defined(__OpenBSD__)
+ static int mib_uvmexp [] = { CTL_VM, VM_UVMEXP };
+ #endif
+
+@@ -94,10 +102,12 @@ glibtop_init_mem_p (glibtop *server)
{
register int pagesize;
@@ -42,8 +53,15 @@
/* get the page size with "getpagesize" and calculate pageshift
* from it */
-@@ -121,6 +129,9 @@ glibtop_get_mem_p (glibtop *server, glib
- #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
+@@ -119,9 +129,15 @@ glibtop_get_mem_p (glibtop *server, glib
+ {
+ struct vmtotal vmt;
+ size_t length_vmt;
+-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
++ struct uvmexp_sysctl uvmexp;
++ size_t length_uvmexp;
++#elif defined(__OpenBSD__)
struct uvmexp uvmexp;
size_t length_uvmexp;
+#elif defined(__DragonFly__)
@@ -52,7 +70,7 @@
#else
struct vmmeter vmm;
#endif
-@@ -141,11 +152,19 @@ glibtop_get_mem_p (glibtop *server, glib
+@@ -142,11 +158,19 @@ glibtop_get_mem_p (glibtop *server, glib
* here.] */
/* Get the data from sysctl */
@@ -72,7 +90,7 @@
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
length_uvmexp = sizeof (uvmexp);
-@@ -153,6 +172,12 @@ glibtop_get_mem_p (glibtop *server, glib
+@@ -154,6 +178,12 @@ glibtop_get_mem_p (glibtop *server, glib
glibtop_warn_io_r (server, "sysctl (uvmexp)");
return;
}
@@ -85,7 +103,7 @@
#else
/* Get the data from kvm_* */
if (kvm_read (server->machine.kd, nlst[1].n_value,
-@@ -162,15 +187,24 @@ glibtop_get_mem_p (glibtop *server, glib
+@@ -163,15 +193,24 @@ glibtop_get_mem_p (glibtop *server, glib
}
#endif
@@ -111,7 +129,7 @@
v_total_count = vmm.v_page_count;
#else
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
-@@ -188,6 +222,9 @@ glibtop_get_mem_p (glibtop *server, glib
+@@ -189,6 +228,9 @@ glibtop_get_mem_p (glibtop *server, glib
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
v_used_count = uvmexp.active + uvmexp.inactive;
v_free_count = uvmexp.free;
@@ -121,7 +139,7 @@
#else
v_used_count = vmm.v_active_count + vmm.v_inactive_count;
v_free_count = vmm.v_free_count;
-@@ -197,12 +234,16 @@ glibtop_get_mem_p (glibtop *server, glib
+@@ -198,12 +240,16 @@ glibtop_get_mem_p (glibtop *server, glib
buf->used = (guint64) pagetok (v_used_count) << LOG1024;
buf->free = (guint64) pagetok (v_free_count) << LOG1024;
diff -r 7df1dee5d3e9 -r 04114884b193 sysutils/libgtop2/patches/patch-aq
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/libgtop2/patches/patch-aq Fri Sep 22 15:57:47 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.3 2006/09/22 15:57:47 drochner Exp $
+
+--- sysdeps/common/fsusage.c.orig 2006-09-22 16:31:47.000000000 +0200
++++ sysdeps/common/fsusage.c
+@@ -270,7 +270,7 @@ glibtop_get_fsusage_s (glibtop *server,
+ return;
+
+ #if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) \
+- || defined(__FreeBSD__)
++ || defined(__FreeBSD__) || defined(__NetBSD__)
+ /* Solaris but not SunOS and FreeBSD */
+ buf->block_size = fsd.f_frsize;
+ #else
Home |
Main Index |
Thread Index |
Old Index