diff options
Diffstat (limited to 'devel/libgtop/patches')
-rw-r--r-- | devel/libgtop/patches/patch-ad | 13 | ||||
-rw-r--r-- | devel/libgtop/patches/patch-ae | 13 | ||||
-rw-r--r-- | devel/libgtop/patches/patch-af | 13 | ||||
-rw-r--r-- | devel/libgtop/patches/patch-ag | 13 | ||||
-rw-r--r-- | devel/libgtop/patches/patch-ah | 13 | ||||
-rw-r--r-- | devel/libgtop/patches/patch-ai | 13 | ||||
-rw-r--r-- | devel/libgtop/patches/patch-aj | 13 | ||||
-rw-r--r-- | devel/libgtop/patches/patch-ak | 13 | ||||
-rw-r--r-- | devel/libgtop/patches/patch-al | 46 | ||||
-rw-r--r-- | devel/libgtop/patches/patch-am | 14 | ||||
-rw-r--r-- | devel/libgtop/patches/patch-an | 15 |
11 files changed, 57 insertions, 122 deletions
diff --git a/devel/libgtop/patches/patch-ad b/devel/libgtop/patches/patch-ad deleted file mode 100644 index 0f3a0465787..00000000000 --- a/devel/libgtop/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.4 1999/11/02 23:16:20 tron Exp $ - ---- sysdeps/freebsd/mem.c.orig Thu May 27 20:56:47 1999 -+++ sysdeps/freebsd/mem.c Wed Nov 3 00:05:33 1999 -@@ -92,7 +92,7 @@ - { - register int pagesize; - -- if (kvm_nlist (server->machine.kd, nlst) != 0) { -+ if (kvm_nlist (server->machine.kd, nlst) < 0) { - glibtop_warn_io_r (server, "kvm_nlist (mem)"); - return; - } diff --git a/devel/libgtop/patches/patch-ae b/devel/libgtop/patches/patch-ae deleted file mode 100644 index 80525ad8c5f..00000000000 --- a/devel/libgtop/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.4 1999/11/02 23:16:21 tron Exp $ - ---- sysdeps/freebsd/netload.c.orig Thu May 27 16:03:59 1999 -+++ sysdeps/freebsd/netload.c Wed Nov 3 00:05:46 1999 -@@ -67,7 +67,7 @@ - { - server->sysdeps.netload = _glibtop_sysdeps_netload; - -- if (kvm_nlist (server->machine.kd, nlst) != 0) -+ if (kvm_nlist (server->machine.kd, nlst) < 0) - glibtop_error_io_r (server, "kvm_nlist"); - } - diff --git a/devel/libgtop/patches/patch-af b/devel/libgtop/patches/patch-af deleted file mode 100644 index 5a712a77678..00000000000 --- a/devel/libgtop/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.4 1999/11/02 23:16:22 tron Exp $ - ---- sysdeps/freebsd/ppp.c.orig Thu May 27 16:04:00 1999 -+++ sysdeps/freebsd/ppp.c Wed Nov 3 00:05:51 1999 -@@ -82,7 +82,7 @@ - #endif - #endif /* HAVE_I4B */ - -- if (kvm_nlist (server->machine.kd, nlst) != 0) -+ if (kvm_nlist (server->machine.kd, nlst) < 0) - glibtop_error_io_r (server, "kvm_nlist"); - } - diff --git a/devel/libgtop/patches/patch-ag b/devel/libgtop/patches/patch-ag deleted file mode 100644 index a9ffd1c7826..00000000000 --- a/devel/libgtop/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.4 1999/11/02 23:16:22 tron Exp $ - ---- sysdeps/freebsd/sem_limits.c.orig Thu May 27 16:04:13 1999 -+++ sysdeps/freebsd/sem_limits.c Wed Nov 3 00:06:02 1999 -@@ -78,7 +78,7 @@ - void - glibtop_init_sem_limits_p (glibtop *server) - { -- if (kvm_nlist (server->machine.kd, nlst) != 0) { -+ if (kvm_nlist (server->machine.kd, nlst) < 0) { - glibtop_warn_io_r (server, "kvm_nlist (sem_limits)"); - return; - } diff --git a/devel/libgtop/patches/patch-ah b/devel/libgtop/patches/patch-ah deleted file mode 100644 index b388096ce8e..00000000000 --- a/devel/libgtop/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.4 1999/11/02 23:16:23 tron Exp $ - ---- sysdeps/freebsd/shm_limits.c.orig Thu May 27 16:04:14 1999 -+++ sysdeps/freebsd/shm_limits.c Wed Nov 3 00:06:09 1999 -@@ -76,7 +76,7 @@ - void - glibtop_init_shm_limits_p (glibtop *server) - { -- if (kvm_nlist (server->machine.kd, nlst) != 0) { -+ if (kvm_nlist (server->machine.kd, nlst) < 0) { - glibtop_warn_io_r (server, "kvm_nlist (shm_limits)"); - return; - } diff --git a/devel/libgtop/patches/patch-ai b/devel/libgtop/patches/patch-ai deleted file mode 100644 index c53d16b30ed..00000000000 --- a/devel/libgtop/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.4 1999/11/02 23:16:24 tron Exp $ - ---- sysdeps/freebsd/swap.c.orig Thu May 27 20:56:53 1999 -+++ sysdeps/freebsd/swap.c Wed Nov 3 00:06:17 1999 -@@ -95,7 +95,7 @@ - { - #if defined(__FreeBSD__) || defined(__bsdi__) - #if __FreeBSD__ < 4 || defined(__bsdi__) -- if (kvm_nlist (server->machine.kd, nlst) != 0) { -+ if (kvm_nlist (server->machine.kd, nlst) < 0) { - glibtop_warn_io_r (server, "kvm_nlist (swap)"); - return; - } diff --git a/devel/libgtop/patches/patch-aj b/devel/libgtop/patches/patch-aj deleted file mode 100644 index 22f03e9e628..00000000000 --- a/devel/libgtop/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.4 1999/11/02 23:16:25 tron Exp $ - ---- sysdeps/freebsd/cpu.c.orig Thu May 27 16:03:55 1999 -+++ sysdeps/freebsd/cpu.c Wed Nov 3 00:05:27 1999 -@@ -51,7 +51,7 @@ - void - glibtop_init_cpu_p (glibtop *server) - { -- if (kvm_nlist (server->machine.kd, nlst) != 0) { -+ if (kvm_nlist (server->machine.kd, nlst) < 0) { - glibtop_warn_io_r (server, "kvm_nlist (cpu)"); - return; - } diff --git a/devel/libgtop/patches/patch-ak b/devel/libgtop/patches/patch-ak deleted file mode 100644 index c31aacc59ec..00000000000 --- a/devel/libgtop/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.4 1999/11/02 23:16:26 tron Exp $ - ---- sysdeps/freebsd/msg_limits.c.orig Thu May 27 16:03:58 1999 -+++ sysdeps/freebsd/msg_limits.c Wed Nov 3 00:05:39 1999 -@@ -76,7 +76,7 @@ - void - glibtop_init_msg_limits_p (glibtop *server) - { -- if (kvm_nlist (server->machine.kd, nlst) != 0) { -+ if (kvm_nlist (server->machine.kd, nlst) < 0) { - glibtop_warn_io_r (server, "kvm_nlist (msg_limits)"); - return; - } diff --git a/devel/libgtop/patches/patch-al b/devel/libgtop/patches/patch-al index 772a0e52483..1f5fa8c8da3 100644 --- a/devel/libgtop/patches/patch-al +++ b/devel/libgtop/patches/patch-al @@ -1,7 +1,16 @@ -$NetBSD: patch-al,v 1.6 2000/02/01 16:43:44 rh Exp $ +$NetBSD: patch-al,v 1.7 2000/05/02 00:27:35 fredb Exp $ ---- sysdeps/freebsd/prockernel.c.orig Sat Oct 16 20:31:43 1999 -+++ sysdeps/freebsd/prockernel.c Sun Jan 30 20:00:03 2000 +--- sysdeps/freebsd/prockernel.c.orig Fri Jan 21 17:20:51 2000 ++++ sysdeps/freebsd/prockernel.c Mon May 1 18:56:00 2000 +@@ -34,7 +34,7 @@ + #if (!defined __OpenBSD__) && (!defined __bsdi__) + #include <sys/user.h> + #endif +-#if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__)) ++#if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__)) && !defined(__NetBSD__) + #include <machine/pcb.h> + #endif + #if defined(__FreeBSD__) && !defined(__alpha__) @@ -48,6 +48,11 @@ #include <osreldate.h> #endif @@ -14,7 +23,36 @@ $NetBSD: patch-al,v 1.6 2000/02/01 16:43:44 rh Exp $ static const unsigned long _glibtop_sysdeps_proc_kernel_pstats = (1L << GLIBTOP_PROC_KERNEL_MIN_FLT) + (1L << GLIBTOP_PROC_KERNEL_MAJ_FLT) + -@@ -167,14 +172,32 @@ +@@ -129,8 +134,15 @@ + + glibtop_suid_enter (server); + ++#ifdef __NetBSD__ ++ /* On NetBSD, there is no kvm_uread(), and kvm_read() always reads ++ * from kernel memory. */ ++ ++ if (kvm_read (server->machine.kd, ++#else + if ((pinfo [0].kp_proc.p_flag & P_INMEM) && + kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc, ++#endif + (unsigned long) &u_addr->u_stats, + (char *) &pstats, sizeof (pstats)) == sizeof (pstats)) + { +@@ -149,8 +161,12 @@ + buf->flags |= _glibtop_sysdeps_proc_kernel_pstats; + } + ++#ifdef __NetBSD__ ++ if (kvm_read (server->machine.kd, ++#else + if ((pinfo [0].kp_proc.p_flag & P_INMEM) && + kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc, ++#endif + (unsigned long) &u_addr->u_pcb, + (char *) &pcb, sizeof (pcb)) == sizeof (pcb)) + { +@@ -167,14 +183,32 @@ /*xxx FreeBSD/Alpha? */ #endif #else diff --git a/devel/libgtop/patches/patch-am b/devel/libgtop/patches/patch-am deleted file mode 100644 index 6cafcfcd017..00000000000 --- a/devel/libgtop/patches/patch-am +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-am,v 1.5 2000/01/20 14:05:47 tron Exp $ - ---- sysdeps/freebsd/procsignal.c.orig Sat Oct 16 20:31:43 1999 -+++ sysdeps/freebsd/procsignal.c Thu Jan 20 14:41:21 2000 -@@ -26,7 +26,9 @@ - #include <glibtop/procsignal.h> - - #include <glibtop_suid.h> -+#ifdef __FreeBSD__ - #include <osreldate.h> -+#endif - - static const unsigned long _glibtop_sysdeps_proc_signal = - (1L << GLIBTOP_PROC_SIGNAL_SIGNAL) + diff --git a/devel/libgtop/patches/patch-an b/devel/libgtop/patches/patch-an new file mode 100644 index 00000000000..c1acdfbcd46 --- /dev/null +++ b/devel/libgtop/patches/patch-an @@ -0,0 +1,15 @@ +$NetBSD: patch-an,v 1.1 2000/05/02 00:27:36 fredb Exp $ + +--- doc/libgtop.texi.orig Fri Jan 21 16:19:04 2000 ++++ doc/libgtop.texi Mon May 1 14:09:27 2000 +@@ -2,6 +2,10 @@ + @c %**start of header + @setfilename libgtop.info + @settitle LibGTop Reference Manual ++@dircategory Gnome ++@direntry ++* LibGTop: (libgtop). A library to retrieve system information. ++@end direntry + @setchapternewpage odd + @c %**end of header + |