cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Up to 2.10.1 for Gnome 2.10.1.

Browse Source
This commit is contained in:
marcm 2005-05-25 23:28:16 +00:00
parent 2f4bd46f55
commit a7e12873f7
12 changed files with 80 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devel/libgtop2/Makefile
View File

@ -1,16 +1,15 @@
# $OpenBSD: Makefile,v 1.14 2004/12/11 17:41:52 marcm Exp $
# $OpenBSD: Makefile,v 1.15 2005/05/25 23:28:16 marcm Exp $
COMMENT= "portable library for obtaining system information"
V= 2.8.2
V= 2.10.1
DISTNAME= libgtop-${V}
PKGNAME= libgtop2-${V}
CATEGORIES= devel
HOMEPAGE= http://www.gnome.org
MAINTAINER= Marc Matteo <marcm@openbsd.org>
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/2.8/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtop/2.10/}
EXTRACT_SUFX= .tar.bz2
# GPL

8
devel/libgtop2/distinfo
View File

@ -1,4 +1,4 @@
MD5 (libgtop-2.8.2.tar.bz2) = 96f9a35edeaa52f30adca6005f0f1b6d
RMD160 (libgtop-2.8.2.tar.bz2) = f7a523bd37e8f3bca3ebc9f37670c6e1ed757b31
SHA1 (libgtop-2.8.2.tar.bz2) = 5cfb4a4b3346b5242aad0bfd85c3bfd98c88c4e0
SIZE (libgtop-2.8.2.tar.bz2) = 1047623
MD5 (libgtop-2.10.1.tar.bz2) = b006baa3bd486005411a03534b45708e
RMD160 (libgtop-2.10.1.tar.bz2) = ffde8db00bd1828510b68da135d813f9bd67a55e
SHA1 (libgtop-2.10.1.tar.bz2) = 9c1e29e2008f03415fcf3b530248588a2284f1ac
SIZE (libgtop-2.10.1.tar.bz2) = 750637

8
devel/libgtop2/patches/patch-lib_open_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_open_c,v 1.1 2004/08/01 06:06:35 marcm Exp $
--- lib/open.c.orig Sat Jul 31 13:11:08 2004
+++ lib/open.c Sat Jul 31 13:11:32 2004
@@ -109,7 +109,7 @@ glibtop_open_l (glibtop *server, const c
$OpenBSD: patch-lib_open_c,v 1.2 2005/05/25 23:28:16 marcm Exp $
--- lib/open.c.orig Tue Feb 15 04:48:33 2005
+++ lib/open.c Mon Apr 11 19:56:33 2005
@@ -111,7 +111,7 @@ glibtop_open_l (glibtop *server, const c
close (server->input [0]); close (server->output [1]);
dup2 (server->input [1], 1);
dup2 (server->output [0], 0);

10
devel/libgtop2/patches/patch-lib_read_c
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-lib_read_c,v 1.3 2004/12/11 17:41:53 marcm Exp $
--- lib/read.c.orig Sun Oct 10 10:21:57 2004
+++ lib/read.c Fri Dec 10 17:04:00 2004
$OpenBSD: patch-lib_read_c,v 1.4 2005/05/25 23:28:16 marcm Exp $
--- lib/read.c.orig Tue Feb 15 04:48:33 2005
+++ lib/read.c Mon Apr 11 19:56:33 2005
@@ -22,6 +22,7 @@
*/
#include <config.h>
+#include <errno.h>
#include <glibtop/read.h>
#include <glibtop/error.h>
#include "libgtop-i18n.h"
@@ -55,14 +56,18 @@ glibtop_read_l (glibtop *server, size_t
@@ -56,14 +57,18 @@ glibtop_read_l (glibtop *server, size_t
fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size);
#endif

12
devel/libgtop2/patches/patch-lib_write_c
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-lib_write_c,v 1.1 2004/08/01 06:06:35 marcm Exp $
--- lib/write.c.orig Thu Mar 4 07:29:12 2004
+++ lib/write.c Sat Jul 31 13:01:28 2004
$OpenBSD: patch-lib_write_c,v 1.2 2005/05/25 23:28:16 marcm Exp $
--- lib/write.c.orig Tue Feb 15 04:48:33 2005
+++ lib/write.c Mon Apr 11 19:56:33 2005
@@ -23,6 +23,7 @@
#include <config.h>
+#include <errno.h>
#include <glibtop/write.h>
#include <glibtop/error.h>
#include "libgtop-i18n.h"
@@ -41,12 +42,16 @@ glibtop_write_l (glibtop *server, size_t
@@ -42,12 +43,16 @@ glibtop_write_l (glibtop *server, size_t
fprintf (stderr, "LIBRARY: really writing %d bytes.\n", size);
#endif
@ -24,6 +24,6 @@ $OpenBSD: patch-lib_write_c,v 1.1 2004/08/01 06:06:35 marcm Exp $
+ if (ret < 0) {
+ if (errno == EINTR)
+ goto retry;
glibtop_error_io_r (server, ngettext ("write %d byte", "write %d bytes", size), size);
glibtop_error_io_r (server, ngettext ("wrote %d byte", "wrote %d bytes", size), size);
+ }
}

16
devel/libgtop2/patches/patch-src_daemon_io_c
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-src_daemon_io_c,v 1.1 2004/08/01 06:06:35 marcm Exp $
--- src/daemon/io.c.orig Sun Oct 19 09:54:32 2003
+++ src/daemon/io.c Sat Jul 31 13:01:36 2004
$OpenBSD: patch-src_daemon_io_c,v 1.2 2005/05/25 23:28:16 marcm Exp $
--- src/daemon/io.c.orig Tue Feb 15 04:48:33 2005
+++ src/daemon/io.c Mon Apr 11 19:56:33 2005
@@ -21,6 +21,7 @@
Boston, MA 02111-1307, USA.
*/
+#include <errno.h>
#include "daemon.h"
#include <glibtop/error.h>
void
@@ -35,9 +36,13 @@ do_output (int s, glibtop_response *resp
@@ -36,9 +37,13 @@ do_output (int s, glibtop_response *resp
resp->offset = offset;
resp->data_size = data_size;
@ -24,7 +24,7 @@ $OpenBSD: patch-src_daemon_io_c,v 1.1 2004/08/01 06:06:35 marcm Exp $
} else {
if (send (s, (const void *) resp, sizeof (glibtop_response), 0) < 0)
glibtop_warn_io ("send");
@@ -47,10 +52,13 @@ do_output (int s, glibtop_response *resp
@@ -48,10 +53,13 @@ do_output (int s, glibtop_response *resp
#ifdef REAL_DEBUG
fprintf (stderr, "Writing %d bytes of data.\n", resp->data_size);
#endif
@ -40,7 +40,7 @@ $OpenBSD: patch-src_daemon_io_c,v 1.1 2004/08/01 06:06:35 marcm Exp $
} else {
if (send (s, data, resp->data_size, 0) , 0)
glibtop_warn_io ("send");
@@ -66,6 +74,7 @@ do_read (int s, void *ptr, size_t total_
@@ -67,6 +75,7 @@ do_read (int s, void *ptr, size_t total_
size_t already_read = 0, remaining = total_size;
while (already_read < total_size) {
@ -48,7 +48,7 @@ $OpenBSD: patch-src_daemon_io_c,v 1.1 2004/08/01 06:06:35 marcm Exp $
if (s)
nread = recv (s, ptr, remaining, 0);
else
@@ -77,6 +86,8 @@ do_read (int s, void *ptr, size_t total_
@@ -78,6 +87,8 @@ do_read (int s, void *ptr, size_t total_
}
if (nread <= 0) {

14
devel/libgtop2/patches/patch-sysdeps_freebsd_cpu_c
View File

@ -1,5 +1,5 @@
--- sysdeps/freebsd/cpu.c.orig Sun Jul 18 13:33:56 2004
+++ sysdeps/freebsd/cpu.c Fri Dec 10 19:15:09 2004
--- sysdeps/freebsd/cpu.c.orig Tue Mar 1 15:03:57 2005
+++ sysdeps/freebsd/cpu.c Mon Apr 11 19:56:33 2005
@@ -27,7 +27,7 @@
#include <glibtop_suid.h>
@ -9,16 +9,16 @@
#include <sys/sched.h>
#endif
@@ -36,7 +36,7 @@ static const unsigned long _glibtop_sysd
(1L << GLIBTOP_CPU_NICE) + (1L << GLIBTOP_CPU_SYS) +
(1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_FREQUENCY);
@@ -37,7 +37,7 @@ static const unsigned long _glibtop_sysd
(1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_FREQUENCY) +
(1L << GLIBTOP_CPU_IOWAIT);
-#ifndef KERN_CP_TIME
+#if !defined(KERN_CP_TIME) && !defined(KERN_CPTIME)
/* nlist structure for kernel access */
static struct nlist nlst [] = {
#ifdef __bsdi__
@@ -54,13 +54,16 @@ static int mib [] = { CTL_KERN, KERN_CLO
@@ -55,13 +55,16 @@ static int mib [] = { CTL_KERN, KERN_CLO
#ifdef KERN_CP_TIME
static int mib2 [] = { CTL_KERN, KERN_CP_TIME };
#endif
@ -36,7 +36,7 @@
if (kvm_nlist (server->machine.kd, nlst) < 0) {
glibtop_warn_io_r (server, "kvm_nlist (cpu)");
return;
@@ -93,7 +96,7 @@ glibtop_get_cpu_p (glibtop *server, glib
@@ -94,7 +97,7 @@ glibtop_get_cpu_p (glibtop *server, glib
if (server->sysdeps.cpu == 0)
return;

11
devel/libgtop2/patches/patch-sysdeps_freebsd_fsusage_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-sysdeps_freebsd_fsusage_c,v 1.1 2005/05/25 23:28:16 marcm Exp $
--- sysdeps/freebsd/fsusage.c.orig Mon Apr 11 21:06:33 2005
+++ sysdeps/freebsd/fsusage.c Mon Apr 11 21:06:46 2005
@@ -34,7 +34,6 @@ _glibtop_freebsd_get_fsusage_read_write(
return;
}
- buf->read = sfs.f_syncreads + sfs.f_asyncreads;
buf->write = sfs.f_syncwrites + sfs.f_asyncwrites;
buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE);

14
devel/libgtop2/patches/patch-sysdeps_freebsd_procmap_c
View File

@ -1,5 +1,5 @@
--- sysdeps/freebsd/procmap.c.orig Wed Jun 9 11:52:21 2004
+++ sysdeps/freebsd/procmap.c Fri Dec 10 19:15:09 2004
--- sysdeps/freebsd/procmap.c.orig Wed Feb 23 00:20:45 2005
+++ sysdeps/freebsd/procmap.c Mon Apr 11 19:56:33 2005
@@ -35,7 +35,7 @@
#include <vm/vm_object.h>
#include <vm/vm_prot.h>
@ -9,7 +9,7 @@
#include <uvm/uvm_extern.h>
#else
#include <vm/vm_object.h>
@@ -58,10 +58,12 @@
@@ -64,10 +64,12 @@
#endif
#include <sys/sysctl.h>
#if !defined(__NetBSD__) || (__NetBSD_Version__ < 105020000)
@ -24,7 +24,7 @@
/* Fixme ... */
#undef _KERNEL
#define _UVM_UVM_AMAP_I_H_ 1
@@ -95,7 +97,7 @@ glibtop_get_proc_map_p (glibtop *server,
@@ -101,7 +103,7 @@ glibtop_get_proc_map_p (glibtop *server,
struct kinfo_proc *pinfo;
struct vm_map_entry entry, *first;
struct vmspace vmspace;
@ -33,7 +33,7 @@
struct vnode vnode;
struct inode inode;
#else
@@ -179,7 +181,7 @@ glibtop_get_proc_map_p (glibtop *server,
@@ -187,7 +189,7 @@ glibtop_get_proc_map_p (glibtop *server,
continue;
#endif
#else
@ -42,7 +42,7 @@
if (UVM_ET_ISSUBMAP (&entry))
continue;
#else
@@ -205,7 +207,7 @@ glibtop_get_proc_map_p (glibtop *server,
@@ -213,7 +215,7 @@ glibtop_get_proc_map_p (glibtop *server,
i++;
@ -51,7 +51,7 @@
if (!entry.object.uvm_obj)
continue;
@@ -229,7 +231,7 @@ glibtop_get_proc_map_p (glibtop *server,
@@ -237,7 +239,7 @@ glibtop_get_proc_map_p (glibtop *server,
glibtop_error_io_r (server, "kvm_read (object)");
#endif

24
devel/libgtop2/patches/patch-sysdeps_freebsd_procmem_c
View File

@ -1,10 +1,10 @@
--- sysdeps/freebsd/procmem.c.orig Sun Jul 18 13:33:56 2004
+++ sysdeps/freebsd/procmem.c Fri Dec 10 19:15:09 2004
--- sysdeps/freebsd/procmem.c.orig Tue Mar 1 15:03:57 2005
+++ sysdeps/freebsd/procmem.c Mon Apr 11 20:50:12 2005
@@ -31,7 +31,7 @@
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/resource.h>
-#ifdef __NetBSD__ && (__NetBSD_Version__ >= 105020000)
-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105020000)
+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105020000) || defined(__OpenBSD__)
#include <uvm/uvm_extern.h>
#else
@ -13,7 +13,7 @@
#include <sys/user.h>
#endif
#include <sys/sysctl.h>
-#ifdef __NetBSD__ && (__NetBSD_Version__ >= 105020000)
-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105020000)
+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105020000) || defined(__OpenBSD__)
#include <uvm/uvm.h>
#else
@ -27,22 +27,18 @@
(1L << GLIBTOP_PROC_MEM_SHARE);
#elif defined(__FreeBSD__)
(1L << GLIBTOP_PROC_MEM_SHARE);
@@ -120,12 +120,12 @@ glibtop_get_proc_mem_p (glibtop *server,
@@ -120,8 +120,9 @@ glibtop_get_proc_mem_p (glibtop *server,
struct kinfo_proc *pinfo;
struct vm_map_entry entry, *first;
struct vmspace *vms, vmspace;
-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
struct vnode vnode;
+ struct rlimit rlimit;
#else
struct vm_object object;
#endif
- struct plimit plimit;
+ struct rlimit rlimit;
int count;
glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0);
@@ -159,16 +159,12 @@ glibtop_get_proc_mem_p (glibtop *server,
@@ -161,16 +162,12 @@ glibtop_get_proc_mem_p (glibtop *server,
#else
#define PROC_VMSPACE kp_proc.p_vmspace
@ -63,7 +59,7 @@
vms = &pinfo [0].kp_eproc.e_vm;
@@ -220,7 +216,7 @@ glibtop_get_proc_mem_p (glibtop *server,
@@ -222,7 +219,7 @@ glibtop_get_proc_mem_p (glibtop *server,
continue;
#endif
#else
@ -72,7 +68,7 @@
if (UVM_ET_ISSUBMAP (&entry))
continue;
#else
@@ -228,8 +224,7 @@ glibtop_get_proc_mem_p (glibtop *server,
@@ -230,8 +227,7 @@ glibtop_get_proc_mem_p (glibtop *server,
continue;
#endif
#endif
@ -82,7 +78,7 @@
if (!entry.object.uvm_obj)
continue;
@@ -256,7 +251,7 @@ glibtop_get_proc_mem_p (glibtop *server,
@@ -258,7 +254,7 @@ glibtop_get_proc_mem_p (glibtop *server,
#endif
/* If the object is of type vnode, add its size */

4
devel/libgtop2/pkg/PFRAG.shared
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.8 2004/12/10 20:33:59 marcm Exp $
@lib lib/libgtop-2.0.so.4.0
@comment $OpenBSD: PFRAG.shared,v 1.9 2005/05/25 23:28:16 marcm Exp $
@lib lib/libgtop-2.0.so.5.0

20
devel/libgtop2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2004/12/10 20:33:59 marcm Exp $
@comment $OpenBSD: PLIST,v 1.10 2005/05/25 23:28:16 marcm Exp $
bin/libgtop_daemon2
bin/libgtop_server2
include/libgtop-2.0/
@ -7,7 +7,6 @@ include/libgtop-2.0/glibtop.h
include/libgtop-2.0/glibtop/close.h
include/libgtop-2.0/glibtop/command.h
include/libgtop-2.0/glibtop/cpu.h
include/libgtop-2.0/glibtop/error.h
include/libgtop-2.0/glibtop/fsusage.h
include/libgtop-2.0/glibtop/global.h
include/libgtop-2.0/glibtop/gnuserv.h
@ -16,8 +15,8 @@ include/libgtop-2.0/glibtop/loadavg.h
include/libgtop-2.0/glibtop/mem.h
include/libgtop-2.0/glibtop/mountlist.h
include/libgtop-2.0/glibtop/msg_limits.h
include/libgtop-2.0/glibtop/netlist.h
include/libgtop-2.0/glibtop/netload.h
include/libgtop-2.0/glibtop/open.h
include/libgtop-2.0/glibtop/parameter.h
include/libgtop-2.0/glibtop/ppp.h
include/libgtop-2.0/glibtop/procargs.h
@ -25,27 +24,25 @@ include/libgtop-2.0/glibtop/prockernel.h
include/libgtop-2.0/glibtop/proclist.h
include/libgtop-2.0/glibtop/procmap.h
include/libgtop-2.0/glibtop/procmem.h
include/libgtop-2.0/glibtop/procopenfiles.h
include/libgtop-2.0/glibtop/procsegment.h
include/libgtop-2.0/glibtop/procsignal.h
include/libgtop-2.0/glibtop/procstate.h
include/libgtop-2.0/glibtop/proctime.h
include/libgtop-2.0/glibtop/procuid.h
include/libgtop-2.0/glibtop/read.h
include/libgtop-2.0/glibtop/read_data.h
include/libgtop-2.0/glibtop/sem_limits.h
include/libgtop-2.0/glibtop/shm_limits.h
include/libgtop-2.0/glibtop/signal.h
include/libgtop-2.0/glibtop/swap.h
include/libgtop-2.0/glibtop/sysdeps.h
include/libgtop-2.0/glibtop/sysinfo.h
include/libgtop-2.0/glibtop/types.h
include/libgtop-2.0/glibtop/union.h
include/libgtop-2.0/glibtop/uptime.h
include/libgtop-2.0/glibtop/version.h
include/libgtop-2.0/glibtop/write.h
include/libgtop-2.0/glibtop_machine.h
include/libgtop-2.0/glibtop_server.h
include/libgtop-2.0/glibtop_suid.h
include/libgtop-2.0/libgtopconfig.h
@info info/libgtop2.info
lib/libgtop-2.0.a
lib/libgtop-2.0.la
@ -133,6 +130,9 @@ share/locale/ms/
share/locale/ms/LC_MESSAGES/
share/locale/ms/LC_MESSAGES/libgtop-2.0.mo
share/locale/nb/LC_MESSAGES/libgtop-2.0.mo
share/locale/ne/
share/locale/ne/LC_MESSAGES/
share/locale/ne/LC_MESSAGES/libgtop-2.0.mo
share/locale/nl/LC_MESSAGES/libgtop-2.0.mo
share/locale/nn/LC_MESSAGES/libgtop-2.0.mo
share/locale/no/LC_MESSAGES/libgtop-2.0.mo
@ -147,6 +147,9 @@ share/locale/pt/LC_MESSAGES/libgtop-2.0.mo
share/locale/pt_BR/LC_MESSAGES/libgtop-2.0.mo
share/locale/ro/LC_MESSAGES/libgtop-2.0.mo
share/locale/ru/LC_MESSAGES/libgtop-2.0.mo
share/locale/rw/
share/locale/rw/LC_MESSAGES/
share/locale/rw/LC_MESSAGES/libgtop-2.0.mo
share/locale/sk/LC_MESSAGES/libgtop-2.0.mo
share/locale/sl/LC_MESSAGES/libgtop-2.0.mo
share/locale/sq/
@ -167,6 +170,9 @@ share/locale/uk/LC_MESSAGES/libgtop-2.0.mo
share/locale/vi/
share/locale/vi/LC_MESSAGES/
share/locale/vi/LC_MESSAGES/libgtop-2.0.mo
share/locale/xh/
share/locale/xh/LC_MESSAGES/
share/locale/xh/LC_MESSAGES/libgtop-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
%%SHARED%%