Upgrade to 2.9.92.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3731 df743ca5-7f9a-e211-a948-0013205c9059

13 files changed, 3 insertions, 558 deletions

diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 91ed62b3d..ad694dc15 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libgtop2
-PORTVERSION=	2.9.91
-PORTREVISION=	2
+PORTVERSION=	2.9.92
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.9
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index 0b774468a..859987f26 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgtop-2.9.91.tar.bz2) = ce0412b797130596a6d7d503a494d2ce
-SIZE (gnome2/libgtop-2.9.91.tar.bz2) = 767017
+MD5 (gnome2/libgtop-2.9.92.tar.bz2) = 3fedd8f34f1438c5be3b82d9185f42fe
+SIZE (gnome2/libgtop-2.9.92.tar.bz2) = 754248
diff --git a/devel/libgtop2/files/patch-ah b/devel/libgtop2/files/patch-ah
deleted file mode 100644
index e0d748442..000000000
--- a/devel/libgtop2/files/patch-ah
+++ /dev/null
@@ -1,63 +0,0 @@
---- sysdeps/freebsd/procmap.c.orig	Sat Sep 25 07:49:06 2004
-+++ sysdeps/freebsd/procmap.c	Fri Nov 19 11:26:15 2004
-@@ -47,7 +47,13 @@
- #endif
- #endif
- 
-+#ifdef __FreeBSD__
-+#define _KVM_VNODE
-+#endif
- #include <sys/vnode.h>
-+#ifdef __FreeBSD__
-+#undef _KVM_VNODE
-+#endif
- #include <sys/mount.h>
- #include <ufs/ufs/quota.h>
- #include <ufs/ufs/inode.h>
-@@ -104,7 +110,7 @@
- 	glibtop_map_entry *maps;
- #if defined __FreeBSD__
- 	struct vnode vnode;
--#if __FreeBSD_version >= 500039
-+#if __FreeBSD_version < 500039
- 	struct inode inode;
- #endif
- #endif
-@@ -122,8 +128,10 @@
- 
- 	/* Get the process data */
- 	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
--	if ((pinfo == NULL) || (count < 1))
-+	if ((pinfo == NULL) || (count < 1)) {
- 		glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
-+		return NULL;
-+	}
- 
- 	/* Now we get the memory maps. */
- 
-@@ -264,8 +272,10 @@
- #if defined(__FreeBSD__) && (__FreeBSD_version >= 500039)
-                switch (vnode.v_type) {
-                    case VREG:
-+#if __FreeBSD_version < 600006
-                        maps [i-1].inode = vnode.v_cachedid;
-                        maps [i-1].device = vnode.v_cachedfs;
-+#endif
-                    default:
-                    continue;
-                }
-@@ -278,13 +288,9 @@
- 			      &inode, sizeof (inode)) != sizeof (inode))
- 			glibtop_error_io_r (server, "kvm_read (inode)");
- 
--		if (kvm_read (server->machine.kd,
--			      (unsigned long) vnode.v_mount,
--			      &mount, sizeof (mount)) != sizeof (mount))
--			glibtop_error_io_r (server, "kvm_read (mount)");
--#endif
- 		maps [i-1].inode  = inode.i_number;
- 		maps [i-1].device = inode.i_dev;
-+#endif
- #endif
- 	} while (entry.next != first);
- 
diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
deleted file mode 100644
index 1b4eb788a..000000000
--- a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- sysdeps/freebsd/procmem.c.orig	Fri Sep 24 18:49:06 2004
-+++ sysdeps/freebsd/procmem.c	Sat Feb 26 03:53:09 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)
- #include <uvm/uvm_extern.h>
- #else
- #include <vm/vm_object.h>
-@@ -47,7 +47,7 @@
- #include <sys/user.h>
- #endif
- #include <sys/sysctl.h>
--#ifdef __NetBSD__ && (__NetBSD_Version__ >= 105020000)
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105020000)
- #include <uvm/uvm.h>
- #else
- #include <vm/vm.h>
-@@ -125,7 +125,9 @@
- #else
- 	struct vm_object object;
- #endif
-+#if !defined(__FreeBSD__) || (__FreeBSD_version < 500013)
- 	struct plimit plimit;
-+#endif
- 	int count;
- 
- 	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0);
diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c b/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c
deleted file mode 100644
index 37b5b56df..000000000
--- a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- sysdeps/freebsd/proctime.c.orig	Wed Mar 10 21:23:52 2004
-+++ sysdeps/freebsd/proctime.c	Thu Mar 11 15:47:35 2004
-@@ -59,6 +59,7 @@
- 
- #ifndef __FreeBSD__
- 
-+#ifndef __FreeBSD__
- static void
- calcru(p, up, sp, ip)
-      struct proc *p;
-@@ -81,19 +82,10 @@
- 		tot = 1;
- 	}
- 
--#if (defined __FreeBSD__) && (__FreeBSD_version >= 300003)
--
--	/* This was changed from a `struct timeval' into a `guint64'
--	 * on FreeBSD 3.0 and renamed p_rtime -> p_runtime.
--	 */
--
--	totusec = (u_quad_t) p->p_runtime;
--#else
- 	sec = p->p_rtime.tv_sec;
- 	usec = p->p_rtime.tv_usec;
- 
- 	totusec = (quad_t)sec * 1000000 + usec;
--#endif
- 
- 	if (totusec < 0) {
- 		/* XXX no %qd in kernel.  Truncate. */
-@@ -116,6 +108,7 @@
- 		ip->tv_usec = it % 1000000;
- 	}
- }
-+#endif
- 
- #endif /* !__FreeBSD__ */
- 
-@@ -133,9 +126,6 @@
- #endif
- 	struct pstats pstats;
- 	int count;
--
--	char filename [BUFSIZ];
--	struct stat statb;
- 
- 	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_TIME), 0);
- 	
diff --git a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c
deleted file mode 100644
index e6dd6d097..000000000
--- a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- sysdeps/common/fsusage.c.orig	Thu Dec 23 16:56:10 2004
-+++ sysdeps/common/fsusage.c	Fri Feb 25 21:55:06 2005
-@@ -134,6 +134,15 @@
- #define _glibtop_get_fsusage_read_write(S, B, P) \
-         _glibtop_linux_get_fsusage_read_write(S, B, P)
- 
-+#elif defined(__FreeBSD__)
-+void G_GNUC_INTERNAL
-+_glibtop_freebsd_get_fsusage_read_write(glibtop *server,
-+					glibtop_fsusage *buf,
-+					const char *path);
-+
-+#define _glibtop_get_fsusage_read_write(S, B, P) \
-+	_glibtop_freebsd_get_fsusage_read_write(S, B, P)
-+
- #else /* default fallback */
- #warning glibtop_get_fsusage .read .write are not implemented.
- static inline void
-@@ -254,8 +263,9 @@
-   if (statvfs (path, &fsd) < 0)
-     return;
- 
--#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))
--  /* Solaris but not SunOS */
-+#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) \
-+	|| defined(__FreeBSD__)
-+  /* Solaris but not SunOS and FreeBSD */
-   buf->block_size = fsd.f_frsize;
- #else
-   /* else, including Linux */
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
deleted file mode 100644
index 32d2574bc..000000000
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- sysdeps/freebsd/Makefile.in.orig	Fri Feb 25 21:29:00 2005
-+++ sysdeps/freebsd/Makefile.in	Sat Feb 26 00:41:15 2005
-@@ -150,7 +150,7 @@
- 
- 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
-+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_LDFLAGS = $(LT_VERSION_INFO)
-@@ -180,7 +180,7 @@
- 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
-+netlist.lo netload.lo ppp.lo procopenfiles.lo fsusage.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-sysdeps_freebsd_cpu.c b/devel/libgtop2/files/patch-sysdeps_freebsd_cpu.c
deleted file mode 100644
index deef0180f..000000000
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_cpu.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- sysdeps/freebsd/cpu.c.orig	Sat Feb 26 00:43:48 2005
-+++ sysdeps/freebsd/cpu.c	Fri Feb 25 21:44:42 2005
-@@ -34,7 +34,8 @@
- static const unsigned long _glibtop_sysdeps_cpu =
- (1L << GLIBTOP_CPU_TOTAL) + (1L << GLIBTOP_CPU_USER) +
- (1L << GLIBTOP_CPU_NICE) + (1L << GLIBTOP_CPU_SYS) +
--(1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_FREQUENCY);
-+(1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_FREQUENCY) +
-+(1L << GLIBTOP_CPU_IOWAIT);
- 
- #ifndef KERN_CP_TIME
- /* nlist structure for kernel access */
-@@ -122,6 +123,8 @@
- 	buf->sys = cpts [CP_SYS];
- 	/* set idle time */
- 	buf->idle = cpts [CP_IDLE];
-+	/* set iowait (really just interrupt) time */
-+	buf->iowait = cpts [CP_INTR];
- 
- 	/* set frequency */
- 	/*
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 ca5d04bb3..000000000
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_fsusage.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- sysdeps/freebsd/fsusage.c.orig	Sat Feb 26 00:31:17 2005
-+++ sysdeps/freebsd/fsusage.c	Sat Feb 26 00:40:27 2005
-@@ -0,0 +1,41 @@
-+#include <glibtop.h>
-+#include <glibtop/error.h>
-+#include <glibtop/fsusage.h>
-+
-+#include <glibtop_suid.h>
-+
-+#include <glib.h>
-+
-+#include <unistd.h>
-+#include <sys/param.h>
-+#include <sys/mount.h>
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
-+
-+void
-+G_GNUC_INTERNAL
-+_glibtop_freebsd_get_fsusage_read_write(glibtop *server,
-+				      glibtop_fsusage *buf,
-+				      const char *path);
-+
-+void G_GNUC_INTERNAL
-+_glibtop_freebsd_get_fsusage_read_write(glibtop *server,
-+				      glibtop_fsusage *buf,
-+				      const char *path)
-+{
-+	int result;
-+	struct statfs sfs;
-+
-+	result = statfs (path, &sfs);
-+
-+	if (result == -1) {
-+		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);
-+}
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_netlist.c b/devel/libgtop2/files/patch-sysdeps_freebsd_netlist.c
deleted file mode 100644
index a055baa3b..000000000
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_netlist.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- sysdeps/freebsd/netlist.c.orig	Sun Dec  5 07:01:43 2004
-+++ sysdeps/freebsd/netlist.c	Sat Feb 26 00:13:28 2005
-@@ -43,6 +43,10 @@
- 	struct if_nameindex *ifstart, *ifs;
- 	GPtrArray *devices;
- 
-+	glibtop_init_s (&server, GLIBTOP_SYSDEPS_NETLIST, 0);
-+
-+	memset (buf, 0, sizeof (glibtop_netlist));
-+
- 	ifs = ifstart = if_nameindex();
- 
- 	devices = g_ptr_array_new();
-@@ -50,6 +54,7 @@
- 	while(ifs && ifs->if_name) {
- 		g_ptr_array_add(devices, g_strdup(ifs->if_name));
- 		buf->number++;
-+		ifs++;
- 	}
- 
- 	if_freenameindex(ifstart);
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_netload.c b/devel/libgtop2/files/patch-sysdeps_freebsd_netload.c
deleted file mode 100644
index c357dff29..000000000
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_netload.c
+++ /dev/null
@@ -1,216 +0,0 @@
---- sysdeps/freebsd/netload.c.orig	Sat Feb 26 00:43:56 2005
-+++ sysdeps/freebsd/netload.c	Sat Feb 26 00:48:46 2005
-@@ -40,11 +40,6 @@
- 
- static const unsigned long _glibtop_sysdeps_netload =
- (1L << GLIBTOP_NETLOAD_IF_FLAGS) +
--(1L << GLIBTOP_NETLOAD_MTU) +
--#if !defined(__bsdi__)
--(1L << GLIBTOP_NETLOAD_SUBNET) +
--#endif
--(1L << GLIBTOP_NETLOAD_ADDRESS) +
- (1L << GLIBTOP_NETLOAD_PACKETS_IN) +
- (1L << GLIBTOP_NETLOAD_PACKETS_OUT) +
- (1L << GLIBTOP_NETLOAD_PACKETS_TOTAL) +
-@@ -56,6 +51,13 @@
- (1L << GLIBTOP_NETLOAD_ERRORS_TOTAL) +
- (1L << GLIBTOP_NETLOAD_COLLISIONS);
- 
-+static const unsigned _glibtop_sysdeps_netload_data =
-+(1L << GLIBTOP_NETLOAD_ADDRESS) +
-+#if !defined(__bsdi__)
-+(1L << GLIBTOP_NETLOAD_SUBNET) +
-+#endif
-+(1L << GLIBTOP_NETLOAD_MTU);
-+
- /* nlist structure for kernel access */
- static struct nlist nlst [] = {
-     { "_ifnet" },
-@@ -81,9 +83,9 @@
- {
-     struct ifnet ifnet;
-     u_long ifnetaddr, ifnetfound, ifaddraddr;
--    struct sockaddr *sa;
-+    struct sockaddr *sa = NULL;
-     char tname [16];
--    char temp [16];
-+    char name [32];
- 
-     union {
- 	struct ifaddr ifa;
-@@ -114,13 +116,22 @@
- 	    if (kvm_read (server->machine.kd, (u_long) ifnet.if_name,
- 			  tname, 16) != 16)
- 		    glibtop_error_io_r (server, "kvm_read (if_name)");
--	    snprintf(temp, (15 - strlen(tname)), "%d", ifnet.if_unit);
--	    strcat(tname, temp);
--	    tname [15] = 0;
-+	    tname[15] = '\0';
-+	    snprintf (name, 32, "%s%d", tname, ifnet.if_unit);
- #else
--	    g_strlcpy (tname, ifnet.if_xname, sizeof tname);
-+	    g_strlcpy (name, ifnet.if_xname, sizeof(name));
-+#endif
-+#if defined(__FreeBSD__) && (__FreeBSD_version >= 300000)
-+	    ifnetaddr = (u_long) ifnet.if_link.tqe_next;
-+#elif defined(__FreeBSD__) || defined(__bsdi__)
-+	    ifnetaddr = (u_long) ifnet.if_next;
-+#else
-+	    ifnetaddr = (u_long) ifnet.if_list.tqe_next;
- #endif
- 
-+	    if (strcmp (name, interface) != 0)
-+		    continue;
-+
- #if defined(__FreeBSD__) && (__FreeBSD_version >= 300000)
- 	    ifaddraddr = (u_long) ifnet.if_addrhead.tqh_first;
- #elif defined(__FreeBSD__) || defined(__bsdi__)
-@@ -129,6 +140,55 @@
- 	    ifaddraddr = (u_long) ifnet.if_addrlist.tqh_first;
- #endif
- 	}
-+	if (ifnet.if_flags & IFF_UP)
-+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_UP);
-+	if (ifnet.if_flags & IFF_BROADCAST)
-+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_BROADCAST);
-+	if (ifnet.if_flags & IFF_DEBUG)
-+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_DEBUG);
-+	if (ifnet.if_flags & IFF_LOOPBACK)
-+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LOOPBACK);
-+	if (ifnet.if_flags & IFF_POINTOPOINT)
-+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_POINTOPOINT);
-+	if (ifnet.if_flags & IFF_RUNNING)
-+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_RUNNING);
-+	if (ifnet.if_flags & IFF_NOARP)
-+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_NOARP);
-+	if (ifnet.if_flags & IFF_PROMISC)
-+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_PROMISC);
-+	if (ifnet.if_flags & IFF_ALLMULTI)
-+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALLMULTI);
-+	if (ifnet.if_flags & IFF_OACTIVE)
-+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_OACTIVE);
-+	if (ifnet.if_flags & IFF_SIMPLEX)
-+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_SIMPLEX);
-+	if (ifnet.if_flags & IFF_LINK0)
-+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK0);
-+	if (ifnet.if_flags & IFF_LINK1)
-+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK1);
-+	if (ifnet.if_flags & IFF_LINK2)
-+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK2);
-+#ifdef __FreeBSD__
-+	if (ifnet.if_flags & IFF_ALTPHYS)
-+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALTPHYS);
-+#endif
-+	if (ifnet.if_flags & IFF_MULTICAST)
-+		buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_MULTICAST);
-+
-+	buf->packets_in = ifnet.if_ipackets;
-+	buf->packets_out = ifnet.if_opackets;
-+	buf->packets_total = buf->packets_in + buf->packets_out;
-+
-+	buf->bytes_in = ifnet.if_ibytes;
-+	buf->bytes_out = ifnet.if_obytes;
-+	buf->bytes_total = buf->bytes_in + buf->bytes_out;
-+
-+	buf->errors_in = ifnet.if_ierrors;
-+	buf->errors_out = ifnet.if_oerrors;
-+	buf->errors_total = buf->errors_in + buf->errors_out;
-+
-+	buf->collisions = ifnet.if_collisions;
-+	buf->flags = _glibtop_sysdeps_netload;
- 
- 	if (ifaddraddr) {
- 	    if ((kvm_read (server->machine.kd, ifaddraddr, &ifaddr,
-@@ -137,86 +197,22 @@
- 
- #define CP(x) ((char *)(x))
- 	    cp = (CP(ifaddr.ifa.ifa_addr) - CP(ifaddraddr)) +
--		CP(&ifaddr); sa = (struct sockaddr *)cp;
-+		CP(&ifaddr);
-+	    sa = (struct sockaddr *)cp;
- 
--	    if (!strcmp (interface, tname) && (sa->sa_family == AF_INET)) {
-+	    if (sa->sa_family == AF_INET) {
- 		sin = (struct sockaddr_in *)sa;
--
--		if (ifnet.if_flags & IFF_UP)
--			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_UP);
--		if (ifnet.if_flags & IFF_BROADCAST)
--			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_BROADCAST);
--		if (ifnet.if_flags & IFF_DEBUG)
--			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_DEBUG);
--		if (ifnet.if_flags & IFF_LOOPBACK)
--			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LOOPBACK);
--		if (ifnet.if_flags & IFF_POINTOPOINT)
--			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_POINTOPOINT);
--		if (ifnet.if_flags & IFF_RUNNING)
--			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_RUNNING);
--		if (ifnet.if_flags & IFF_NOARP)
--			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_NOARP);
--		if (ifnet.if_flags & IFF_PROMISC)
--			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_PROMISC);
--		if (ifnet.if_flags & IFF_ALLMULTI)
--			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALLMULTI);
--		if (ifnet.if_flags & IFF_OACTIVE)
--			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_OACTIVE);
--		if (ifnet.if_flags & IFF_SIMPLEX)
--			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_SIMPLEX);
--		if (ifnet.if_flags & IFF_LINK0)
--			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK0);
--		if (ifnet.if_flags & IFF_LINK1)
--			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK1);
--		if (ifnet.if_flags & IFF_LINK2)
--			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK2);
--#ifdef __FreeBSD__
--		if (ifnet.if_flags & IFF_ALTPHYS)
--			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALTPHYS);
--#endif
--		if (ifnet.if_flags & IFF_MULTICAST)
--			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_MULTICAST);
--
- #if !defined(__bsdi__)
- 		/* Commenting out to "fix" #13345. */
- 		buf->subnet = htonl (ifaddr.in.ia_subnet);
- #endif
- 		buf->address = sin->sin_addr.s_addr;
--
- 		buf->mtu = ifnet.if_mtu;
- 
--		buf->packets_in = ifnet.if_ipackets;
--		buf->packets_out = ifnet.if_opackets;
--		buf->packets_total = buf->packets_in + buf->packets_out;
--
--		buf->bytes_in = ifnet.if_ibytes;
--		buf->bytes_out = ifnet.if_obytes;
--		buf->bytes_total = buf->bytes_in + buf->bytes_out;
--
--		buf->errors_in = ifnet.if_ierrors;
--		buf->errors_out = ifnet.if_oerrors;
--		buf->errors_total = buf->errors_in + buf->errors_out;
--
--		buf->collisions = ifnet.if_collisions;
--		buf->flags = _glibtop_sysdeps_netload;
--		return;
--	    }
-+		buf->flags |= _glibtop_sysdeps_netload_data;
- 
--#if defined(__FreeBSD__) && (__FreeBSD_version >= 300000)
--	    ifaddraddr = (u_long)ifaddr.ifa.ifa_link.tqe_next;
--#elif defined(__FreeBSD__) || defined(__bsdi__)
--	    ifaddraddr = (u_long)ifaddr.ifa.ifa_next;
--#else
--	    ifaddraddr = (u_long)ifaddr.ifa.ifa_list.tqe_next;
--#endif
-+	    }
- 	}
--
--#if defined(__FreeBSD__) && (__FreeBSD_version >= 300000)
--	ifnetaddr = (u_long) ifnet.if_link.tqe_next;
--#elif defined(__FreeBSD__) || defined(__bsdi__)
--	ifnetaddr = (u_long) ifnet.if_next;
--#else
--	ifnetaddr = (u_long) ifnet.if_list.tqe_next;
--#endif
-+	return;
-     }
- }
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_procopenfiles.c b/devel/libgtop2/files/patch-sysdeps_freebsd_procopenfiles.c
deleted file mode 100644
index 68e7b4cc8..000000000
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_procopenfiles.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- sysdeps/freebsd/procopenfiles.c.orig	Wed Jan 12 02:15:21 2005
-+++ sysdeps/freebsd/procopenfiles.c	Wed Jan 12 02:18:27 2005
-@@ -0,0 +1,52 @@
-+/* $Id: patch-sysdeps_freebsd_procopenfiles.c,v 1.1 2005-01-12 07:59:02 marcus Exp $ */
-+
-+/* Copyright (C) 1998-99 Martin Baulig
-+   Copyright (C) 2004 Nicolás Lichtmaier
-+   This file is part of LibGTop 1.0.
-+
-+   Modified by Nicolás Lichtmaier to give a process open files.
-+
-+   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 <glibtop.h>
-+#include <glibtop/error.h>
-+#include <glibtop/procopenfiles.h>
-+
-+#include <glibtop_suid.h>
-+
-+static const unsigned long _glibtop_sysdeps_proc_open_files =
-+(1L << GLIBTOP_PROC_OPEN_FILES_NUMBER)|
-+(1L << GLIBTOP_PROC_OPEN_FILES_TOTAL)|
-+(1L << GLIBTOP_PROC_OPEN_FILES_SIZE);
-+
-+/* Init function. */
-+
-+void
-+glibtop_init_proc_open_files_s (glibtop *server)
-+{
-+	server->sysdeps.proc_open_files = _glibtop_sysdeps_proc_open_files;
-+}
-+
-+
-+/* XXX Unimplemented on FreeBSD */
-+glibtop_open_files_entry *
-+glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf,	pid_t pid)
-+{
-+	return NULL;
-+}
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index 21708fd71..1f1a0363c 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -4,7 +4,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
@@ -15,7 +14,6 @@ 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
@@ -29,19 +27,15 @@ 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