diff options
author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-11-06 12:09:00 +0800 |
---|---|---|
committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-11-06 12:09:00 +0800 |
commit | 4568a4b38cb02d9af935b517538d9ec4562537b6 (patch) | |
tree | bc95c6806b9dafe15bb1e04ee8e88b5f5fee87cb /devel | |
parent | 04997a2718769b8e98459d6bb87f600d7d579ae6 (diff) | |
download | marcuscom-ports-4568a4b38cb02d9af935b517538d9ec4562537b6.tar.gz marcuscom-ports-4568a4b38cb02d9af935b517538d9ec4562537b6.tar.zst marcuscom-ports-4568a4b38cb02d9af935b517538d9ec4562537b6.zip |
- Remove files
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5058 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
-rw-r--r-- | devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in | 33 | ||||
-rw-r--r-- | devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in | 34 | ||||
-rw-r--r-- | devel/libgtop2/files/patch-configure | 33 | ||||
-rw-r--r-- | devel/libgtop2/files/patch-lib::read.c | 30 | ||||
-rw-r--r-- | devel/libgtop2/files/patch-lib::write.c | 29 | ||||
-rw-r--r-- | devel/libgtop2/files/patch-src::daemon::io.c | 57 | ||||
-rw-r--r-- | devel/libgtop2/files/patch-src_daemon_server.c | 17 | ||||
-rw-r--r-- | devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c | 123 | ||||
-rw-r--r-- | devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h | 21 | ||||
-rw-r--r-- | devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c | 95 | ||||
-rw-r--r-- | devel/libgtop2/files/patch-systeps::freebsd::prockernel.c | 15 | ||||
-rw-r--r-- | devel/libgtop2/files/patch-systeps::freebsd::procmap.c | 11 | ||||
-rw-r--r-- | devel/libgtop2/files/patch-systeps::freebsd::proctime.c | 31 | ||||
-rw-r--r-- | devel/libgtop2/files/pkg-message | 13 |
14 files changed, 0 insertions, 542 deletions
diff --git a/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in deleted file mode 100644 index dea0aec82..000000000 --- a/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in +++ /dev/null @@ -1,33 +0,0 @@ ---- sysdeps/freebsd/Makefile.in.orig Mon Aug 8 15:10:50 2005 -+++ sysdeps/freebsd/Makefile.in Mon Aug 8 15:15:54 2005 -@@ -143,12 +143,11 @@ - - noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la - --libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c -+libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c netlist.c - - libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - --libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netlist.c netload.c ppp.c procopenfiles.c fsusage.c -- -+libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netload.c ppp.c procopenfiles.c fsusage.c sysinfo.c - - libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - -@@ -171,13 +170,13 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ - libgtop_sysdeps_2_0_la_LIBADD = --libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo -+libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo netlist.lo - libgtop_sysdeps_suid_2_0_la_LIBADD = - libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo cpu.lo mem.lo \ - swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo sem_limits.lo \ - proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \ - procsignal.lo prockernel.lo procsegment.lo procargs.lo procmap.lo \ --netlist.lo netload.lo ppp.lo procopenfiles.lo fsusage.lo -+netload.lo ppp.lo procopenfiles.lo fsusage.lo sysinfo.lo - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in deleted file mode 100644 index 8168ecb6d..000000000 --- a/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in +++ /dev/null @@ -1,34 +0,0 @@ ---- sysdeps/freebsd/Makefile.in.orig Mon Aug 8 20:25:56 2005 -+++ sysdeps/freebsd/Makefile.in Mon Aug 8 20:28:06 2005 -@@ -143,12 +143,11 @@ - - noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la - --libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c -+libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c netlist.c - - libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - --libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netlist.c netload.c ppp.c procopenfiles.c fsusage.c -- -+libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netload.c ppp.c procopenfiles.c fsusage.c sysinfo.c - - libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - -@@ -171,13 +170,13 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ - libgtop_sysdeps_2_0_la_LIBADD = --libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo --libgtop_sysdeps_suid_2_0_la_LIBADD = -+libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo netlist.lo -+libgtop_sysdeps_suid_2_0_la_LIBADD = -lgeom -ldevstat - libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo cpu.lo mem.lo \ - swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo sem_limits.lo \ - proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \ - procsignal.lo prockernel.lo procsegment.lo procargs.lo procmap.lo \ --netlist.lo netload.lo ppp.lo procopenfiles.lo fsusage.lo -+netload.lo ppp.lo procopenfiles.lo fsusage.lo sysinfo.lo - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/devel/libgtop2/files/patch-configure b/devel/libgtop2/files/patch-configure deleted file mode 100644 index e40ac7b08..000000000 --- a/devel/libgtop2/files/patch-configure +++ /dev/null @@ -1,33 +0,0 @@ ---- configure.orig Wed Jul 13 19:29:53 2005 -+++ configure Wed Jul 13 19:36:36 2005 -@@ -1931,9 +1931,9 @@ - - # libtool versioning - LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION --LT_CURRENT=$LIBGTOP_CURRENT --LT_REVISION=$LIBGTOP_REVISION --LT_AGE=$LIBGTOP_AGE -+LT_CURRENT=2 -+LT_REVISION=0 -+LT_AGE=0 - LT_VERSION_INFO="-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}" - - -@@ -23654,6 +23654,8 @@ - fi - - done -+;; -+esac - - - -@@ -23792,8 +23794,6 @@ - - fi - -- ;; --esac - - - echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5 diff --git a/devel/libgtop2/files/patch-lib::read.c b/devel/libgtop2/files/patch-lib::read.c deleted file mode 100644 index b4ca49534..000000000 --- a/devel/libgtop2/files/patch-lib::read.c +++ /dev/null @@ -1,30 +0,0 @@ ---- lib/read.c.orig Mon Apr 11 03:25:32 2005 -+++ lib/read.c Mon Apr 11 03:27:06 2005 -@@ -22,6 +22,7 @@ - */ - - #include <config.h> -+#include <errno.h> - #include <glibtop/read.h> - #include <glibtop/error.h> - #include "libgtop-i18n.h" -@@ -56,14 +57,18 @@ - fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size); - #endif - -+retry: - if (server->socket) { - do_read (server->socket, buf, size); - } else { -- if(read (server->input [0], buf, size) < 0) -+ if(read (server->input [0], buf, size) < 0) { -+ if (errno == EINTR) -+ goto retry; - glibtop_error_io_r ( - server, - ngettext ("read %d byte", - "read %d bytes", size), - size); -+ } - } - } diff --git a/devel/libgtop2/files/patch-lib::write.c b/devel/libgtop2/files/patch-lib::write.c deleted file mode 100644 index 0d00f7a5f..000000000 --- a/devel/libgtop2/files/patch-lib::write.c +++ /dev/null @@ -1,29 +0,0 @@ ---- lib/write.c.orig Mon Apr 11 03:28:12 2005 -+++ lib/write.c Mon Apr 11 03:29:00 2005 -@@ -22,7 +22,7 @@ - */ - - #include <config.h> -- -+#include <errno.h> - #include <glibtop/write.h> - #include <glibtop/error.h> - #include "libgtop-i18n.h" -@@ -42,12 +42,16 @@ - fprintf (stderr, "LIBRARY: really writing %d bytes.\n", size); - #endif - -+retry: - if (server->socket) { - ret = send (server->socket, buf, size, 0); - } else { - ret = write (server->output [1], buf, size); - } - -- if (ret < 0) -+ if (ret < 0) { -+ if (errno == EINTR) -+ goto retry; - glibtop_error_io_r (server, ngettext ("wrote %d byte", "wrote %d bytes", size), size); -+ } - } diff --git a/devel/libgtop2/files/patch-src::daemon::io.c b/devel/libgtop2/files/patch-src::daemon::io.c deleted file mode 100644 index a2d234822..000000000 --- a/devel/libgtop2/files/patch-src::daemon::io.c +++ /dev/null @@ -1,57 +0,0 @@ ---- src/daemon/io.c.orig Mon Apr 11 03:30:12 2005 -+++ src/daemon/io.c Mon Apr 11 03:33:22 2005 -@@ -21,6 +21,7 @@ - Boston, MA 02111-1307, USA. - */ - -+#include <errno.h> - #include "daemon.h" - #include <glibtop/error.h> - -@@ -36,9 +37,13 @@ - resp->offset = offset; - resp->data_size = data_size; - -+retry1: - if (s == 0) { -- if (write (1, (const void *) resp, sizeof (glibtop_response)) < 0) -+ if (write (1, (const void *) resp, sizeof (glibtop_response)) < 0) { -+ if (errno == EINTR) -+ goto retry1; - glibtop_warn_io ("write"); -+ } - } else { - if (send (s, (const void *) resp, sizeof (glibtop_response), 0) < 0) - glibtop_warn_io ("send"); -@@ -49,9 +54,13 @@ - fprintf (stderr, "Writing %d bytes of data.\n", resp->data_size); - #endif - -+retry2: - if (s == 0) { -- if (write (1, data, resp->data_size) < 0) -+ if (write (1, data, resp->data_size) < 0) { -+ if (errno == EINTR) -+ goto retry2; - glibtop_warn_io ("write"); -+ } - } else { - if (send (s, data, resp->data_size, 0) , 0) - glibtop_warn_io ("send"); -@@ -67,6 +76,7 @@ - size_t already_read = 0, remaining = total_size; - - while (already_read < total_size) { -+retry: - if (s) - nread = recv (s, ptr, remaining, 0); - else -@@ -78,6 +88,8 @@ - } - - if (nread <= 0) { -+ if (errno == EINTR) -+ goto retry; - glibtop_warn_io ("recv"); - return 0; - } diff --git a/devel/libgtop2/files/patch-src_daemon_server.c b/devel/libgtop2/files/patch-src_daemon_server.c deleted file mode 100644 index bf0bba5c7..000000000 --- a/devel/libgtop2/files/patch-src_daemon_server.c +++ /dev/null @@ -1,17 +0,0 @@ ---- src/daemon/server.c.orig Mon Feb 17 15:22:19 2003 -+++ src/daemon/server.c Mon Feb 17 15:23:31 2003 -@@ -88,11 +88,12 @@ - if (strcmp (uts.sysname, LIBGTOP_COMPILE_SYSTEM) || - strcmp (uts.release, LIBGTOP_COMPILE_RELEASE) || - strcmp (uts.machine, LIBGTOP_COMPILE_MACHINE)) { -- fprintf (stderr, "Can only run on %s %s %s\n", -+ fprintf (stderr, "This libgtop was compiled on %s %s %s\n", - LIBGTOP_COMPILE_SYSTEM, - LIBGTOP_COMPILE_RELEASE, - LIBGTOP_COMPILE_MACHINE); -- _exit (1); -+ fprintf (stderr, "If you see strange problems caused by it,\n"); -+ fprintf (stderr, "you should recompile libgtop and dependent applications\n"); - } - #endif - diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c b/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c deleted file mode 100644 index 128eda35b..000000000 --- a/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c +++ /dev/null @@ -1,123 +0,0 @@ ---- sysdeps/freebsd/fsusage.c.orig Mon Feb 28 03:54:41 2005 -+++ sysdeps/freebsd/fsusage.c Tue May 24 01:49:42 2005 -@@ -9,6 +9,12 @@ - #include <unistd.h> - #include <sys/param.h> - #include <sys/mount.h> -+#if __FreeBSD_version >= 600000 -+#include <libgeom.h> -+#include <sys/resource.h> -+#include <devstat.h> -+#include <sys/devicestat.h> -+#endif - - #include <stdio.h> - #include <string.h> -@@ -27,15 +33,107 @@ _glibtop_freebsd_get_fsusage_read_write( - { - int result; - struct statfs sfs; -+#if __FreeBSD_version >= 600000 -+ struct devstat *ds; -+ void *sc; -+ struct timespec ts; -+ struct gprovider *gp; -+ struct gident *gid; -+ struct gmesh gmp; -+ double etime; -+ uint64_t ld[2]; -+#endif - - result = statfs (path, &sfs); - - if (result == -1) { -+ glibtop_warn_io_r (server, "statfs"); - return; - } -+#if __FreeBSD_version >= 600000 -+ ld[0] = 0; -+ ld[1] = 0; -+ result = geom_gettree (&gmp); -+ if (result != 0) { -+ glibtop_warn_io_r (server, "geom_gettree = %d", result); -+ return; -+ } -+ -+ result = geom_stats_open (); -+ if (result) { -+ glibtop_warn_io_r (server, "geom_stats_open()"); -+ geom_deletetree (&gmp); -+ return; -+ } -+ -+ sc = geom_stats_snapshot_get (); -+ if (sc == NULL) { -+ glibtop_warn_io_r (server, "geom_stats_snapshot_get()"); -+ geom_stats_close (); -+ geom_deletetree (&gmp); -+ return; -+ } -+ -+ geom_stats_snapshot_timestamp (sc, &ts); -+ etime = ts.tv_sec + (ts.tv_nsec * 1e-9); -+ geom_stats_snapshot_reset (sc); -+ -+ for (;;) { -+ ds = geom_stats_snapshot_next (sc); -+ if (ds == NULL) { -+ break; -+ } -+ if (ds->id == NULL) { -+ continue; -+ } -+ -+ gid = geom_lookupid (&gmp, ds->id); -+ if (gid == NULL) { -+ geom_deletetree (&gmp); -+ result = geom_gettree (&gmp); -+ gid = geom_lookupid (&gmp, ds->id); -+ } -+ -+ if (gid == NULL) { -+ continue; -+ } -+ if (gid->lg_what == ISCONSUMER) { -+ continue; -+ } -+ -+ gp = gid->lg_ptr; -+ -+ if (!g_str_has_suffix (sfs.f_mntfromname, gp->lg_name)) { -+ continue; -+ } -+ else { -+ result = devstat_compute_statistics (ds, NULL, etime, -+ DSM_TOTAL_TRANSFERS_READ, -+ &ld[0], -+ DSM_TOTAL_TRANSFERS_WRITE, -+ &ld[1], DSM_NONE); -+ if (result != 0) { -+ glibtop_warn_io_r (server, -+ "devstat_compute_statistics()"); -+ geom_stats_snapshot_free (sc); -+ geom_stats_close (); -+ geom_deletetree (&gmp); -+ return; -+ } -+ break; -+ } -+ } - -+ geom_stats_snapshot_free (sc); -+ geom_stats_close (); -+ geom_deletetree (&gmp); -+ -+ buf->read = ld[0]; -+ buf->write = ld[1]; -+#else - buf->read = sfs.f_syncreads + sfs.f_asyncreads; - buf->write = sfs.f_syncwrites + sfs.f_asyncwrites; -+#endif - - buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE); - } diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h b/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h deleted file mode 100644 index 5ded2dc3c..000000000 --- a/devel/libgtop2/files/patch-sysdeps_freebsd_glibtop_server.h +++ /dev/null @@ -1,21 +0,0 @@ ---- sysdeps/freebsd/glibtop_server.h.orig Mon Oct 20 11:19:49 2003 -+++ sysdeps/freebsd/glibtop_server.h Mon Aug 8 15:10:14 2005 -@@ -21,8 +21,8 @@ - Boston, MA 02111-1307, USA. - */ - --#ifndef __GLIBTOP_SERVER_H__ --#define __GLIBTOP_SERVER_H__ -+#ifndef __FREEBSD__GLIBTOP_SERVER_H__ -+#define __FREEBSD__GLIBTOP_SERVER_H__ - - G_BEGIN_DECLS - -@@ -45,6 +45,7 @@ G_BEGIN_DECLS - #define GLIBTOP_SUID_PROC_ARGS (1 << GLIBTOP_SYSDEPS_PROC_ARGS) - #define GLIBTOP_SUID_PROC_MAP (1 << GLIBTOP_SYSDEPS_PROC_MAP) - #define GLIBTOP_SUID_NETLOAD (1 << GLIBTOP_SYSDEPS_NETLOAD) -+#define GLIBTOP_SUID_NETLIST 0 - #define GLIBTOP_SUID_PPP (1 << GLIBTOP_SYSDEPS_PPP) - - G_END_DECLS diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c b/devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c deleted file mode 100644 index a3c461f70..000000000 --- a/devel/libgtop2/files/patch-sysdeps_freebsd_sysinfo.c +++ /dev/null @@ -1,95 +0,0 @@ ---- sysdeps/freebsd/sysinfo.c.orig Thu Jun 9 22:56:29 2005 -+++ sysdeps/freebsd/sysinfo.c Thu Jun 9 22:58:36 2005 -@@ -0,0 +1,92 @@ -+/* $Id: patch-sysdeps_freebsd_sysinfo.c,v 1.1 2005-06-10 03:04:32 marcus Exp $ */ -+ -+/* Copyright (C) 1998-99 Martin Baulig -+ This file is part of LibGTop 1.0. -+ -+ Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998. -+ -+ LibGTop is free software; you can redistribute it and/or modify it -+ under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, -+ or (at your option) any later version. -+ -+ LibGTop is distributed in the hope that it will be useful, but WITHOUT -+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with LibGTop; see the file COPYING. If not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#include <config.h> -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#include <glibtop/error.h> -+#include <glibtop/cpu.h> -+#include <glibtop/sysinfo.h> -+ -+static const unsigned long _glibtop_sysdeps_sysinfo = -+(1L << GLIBTOP_SYSINFO_CPUINFO); -+ -+static glibtop_sysinfo sysinfo = { .flags = 0 }; -+ -+static void -+init_sysinfo (glibtop *server) -+{ -+ char *model; -+ int ncpus = 1; -+ int mhz = 0; -+ size_t len; -+ -+ if(G_LIKELY(sysinfo.flags)) return; -+ -+ glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0); -+ -+ len = sizeof (ncpus); -+ sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0); -+ len = 0; -+ sysctlbyname ("hw.model", NULL, &len, NULL, 0); -+ model = malloc (len); -+ sysctlbyname ("hw.model", model, &len, NULL, 0); -+ len = sizeof (mhz); -+ sysctlbyname ("hw.clockrate", &mhz, &len, NULL, 0); -+ -+ for(sysinfo.ncpu = 0; -+ sysinfo.ncpu < GLIBTOP_NCPU && sysinfo.ncpu < ncpus; -+ sysinfo.ncpu++) { -+ -+ glibtop_entry * const cpuinfo = &sysinfo.cpuinfo[sysinfo.ncpu]; -+ -+ cpuinfo->labels = g_ptr_array_new (); -+ -+ cpuinfo->values = g_hash_table_new_full(g_str_hash, g_str_equal, -+ g_free, g_free); -+ -+ cpuinfo->descriptions = g_hash_table_new_full(g_str_hash, g_str_equal, -+ g_free, g_free); -+ -+ g_ptr_array_add (cpuinfo->labels, "processor"); -+ g_hash_table_insert (cpuinfo->values, "processor", &sysinfo.ncpu); -+ -+ g_ptr_array_add (cpuinfo->labels, "vendor_id"); -+ g_hash_table_insert (cpuinfo->values, "vendor_id", model); -+ -+ g_ptr_array_add (cpuinfo->labels, "cpu MHz"); -+ g_hash_table_insert (cpuinfo->values, "cpu MHz", &mhz); -+ -+ } -+ -+ free (model); -+ -+ sysinfo.flags = _glibtop_sysdeps_sysinfo; -+} -+ -+const glibtop_sysinfo * -+glibtop_get_sysinfo_s (glibtop *server) -+{ -+ init_sysinfo (server); -+ return &sysinfo; -+} diff --git a/devel/libgtop2/files/patch-systeps::freebsd::prockernel.c b/devel/libgtop2/files/patch-systeps::freebsd::prockernel.c deleted file mode 100644 index f23b1cdae..000000000 --- a/devel/libgtop2/files/patch-systeps::freebsd::prockernel.c +++ /dev/null @@ -1,15 +0,0 @@ ---- sysdeps/freebsd/prockernel.c Mon Jul 19 05:33:56 2004 -+++ sysdeps/freebsd/prockernel.c.orig Sat Mar 19 02:39:47 2005 -@@ -115,8 +115,10 @@ - - /* Get the process information */ - pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count); -- if ((pinfo == NULL) || (count != 1)) -- glibtop_error_io_r (server, "kvm_getprocs (%d)", pid); -+ if ((pinfo == NULL) || (count != 1)) { -+ glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid); -+ return; -+ } - - #if defined(__FreeBSD__) && (__FreeBSD_version >= 500013) - diff --git a/devel/libgtop2/files/patch-systeps::freebsd::procmap.c b/devel/libgtop2/files/patch-systeps::freebsd::procmap.c deleted file mode 100644 index c8c701e46..000000000 --- a/devel/libgtop2/files/patch-systeps::freebsd::procmap.c +++ /dev/null @@ -1,11 +0,0 @@ ---- sysdeps/freebsd/procmap.c Wed Feb 23 17:20:45 2005 -+++ sysdeps/freebsd/procmap.c.orig Sat Mar 19 02:46:57 2005 -@@ -129,7 +129,7 @@ - /* Get the process data */ - pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count); - if ((pinfo == NULL) || (count < 1)) { -- glibtop_error_io_r (server, "kvm_getprocs (%d)", pid); -+ glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid); - return NULL; - } - diff --git a/devel/libgtop2/files/patch-systeps::freebsd::proctime.c b/devel/libgtop2/files/patch-systeps::freebsd::proctime.c deleted file mode 100644 index 9857d6cb8..000000000 --- a/devel/libgtop2/files/patch-systeps::freebsd::proctime.c +++ /dev/null @@ -1,31 +0,0 @@ ---- sysdeps/freebsd/proctime.c.orig Wed Feb 23 03:20:45 2005 -+++ sysdeps/freebsd/proctime.c Tue Aug 2 12:49:38 2005 -@@ -146,8 +146,10 @@ glibtop_get_proc_time_p (glibtop *server - - /* Get the process information */ - pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count); -- if ((pinfo == NULL) || (count != 1)) -- glibtop_error_io_r (server, "kvm_getprocs (%d)", pid); -+ if ((pinfo == NULL) || (count != 1)) { -+ glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid); -+ return; -+ } - - #if defined(__FreeBSD__) && (__FreeBSD_version >= 500013) - buf->rtime = pinfo [0].ki_runtime; -@@ -193,9 +195,13 @@ glibtop_get_proc_time_p (glibtop *server - if ((pinfo [0].ki_flag & P_INMEM)) { - #endif - buf->utime = pinfo [0].ki_runtime; -- buf->stime = 0; /* XXX */ -+ buf->stime = tv2sec (pinfo [0].ki_rusage.ru_stime); - buf->cutime = tv2sec (pinfo [0].ki_childtime); -- buf->cstime = 0; /* XXX */ -+#if __FreeBSD_version >= 600000 -+ buf->cstime = tv2sec (pinfo [0].ki_rusage_ch.ru_stime); -+#else -+ buf->cstime = 0; -+#endif - buf->start_time = tv2sec (pinfo [0].ki_start); - buf->flags = _glibtop_sysdeps_proc_time_user; - } diff --git a/devel/libgtop2/files/pkg-message b/devel/libgtop2/files/pkg-message deleted file mode 100644 index dacaf62a9..000000000 --- a/devel/libgtop2/files/pkg-message +++ /dev/null @@ -1,13 +0,0 @@ -=============================================================================== - -In order to use the File System read/write monitor, you must chmod -/dev/devstat so that all users can open it read-only. For example: - -# chmod 0444 /dev/devstat - -In order for this to persist across reboots, add the following to -/etc/devfs.conf: - -perm devstat 0444 - -=============================================================================== |