Remove gnome1 packages except as needed for gnucash.

Ok'd by jmmv@ and rh@ (gnome 1 maintainers).

14 files changed, 0 insertions, 550 deletions

diff --git a/sysutils/libgtop/patches/patch-aa b/sysutils/libgtop/patches/patch-aa
deleted file mode 100644
index 93f3a00e4b8..00000000000
--- a/sysutils/libgtop/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/04/02 12:13:57 jmmv Exp $
-
---- sysdeps/freebsd/glibtop_machine.h.orig	Mon Nov 26 23:37:59 2001
-+++ sysdeps/freebsd/glibtop_machine.h	Sun Jan 19 23:18:04 2003
-@@ -39,6 +39,14 @@
- #include <osreldate.h>
- #endif
- 
-+#ifdef __NetBSD__
-+#include <sys/proc.h>
-+
-+#ifndef SRUN
-+#define SRUN	SACTIVE
-+#endif
-+#endif
-+
- BEGIN_LIBGTOP_DECLS
- 
- typedef struct _glibtop_machine glibtop_machine;
diff --git a/sysutils/libgtop/patches/patch-ab b/sysutils/libgtop/patches/patch-ab
deleted file mode 100644
index f1e3952e6a4..00000000000
--- a/sysutils/libgtop/patches/patch-ab
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2004/04/02 12:13:57 jmmv Exp $
-
---- sysdeps/freebsd/procsignal.c.orig	Sun Feb 13 22:31:39 2000
-+++ sysdeps/freebsd/procsignal.c	Wed Jan  3 00:42:45 2001
-@@ -70,7 +70,9 @@
- 	/* signal: mask of pending signals.
- 	 *         pinfo [0].kp_proc.p_siglist
- 	 */
--#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
-+#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000)
-+	buf->signal [0] = pinfo [0].kp_proc.p_sigctx.ps_siglist.__bits[0];
-+#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
- 	buf->signal [0] = pinfo [0].kp_proc.p_siglist.__bits[0];
- #else
- 	buf->signal [0] = pinfo [0].kp_proc.p_siglist;
-@@ -79,7 +81,9 @@
- 	/* blocked: mask of blocked signals.
- 	 *          pinfo [0].kp_proc.p_sigmask
- 	 */
--#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
-+#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000)
-+	buf->blocked [0] = pinfo [0].kp_proc.p_sigctx.ps_sigmask.__bits[0];
-+#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
- 	buf->blocked [0] = pinfo [0].kp_proc.p_sigmask.__bits[0];
- #else
- 	buf->blocked [0] = pinfo [0].kp_proc.p_sigmask;
-@@ -88,7 +92,9 @@
- 	/* sigignore: mask of ignored signals.
- 	 *            pinfo [0].kp_proc.p_sigignore
- 	*/
--#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
-+#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000)
-+	buf->sigignore [0] = pinfo [0].kp_proc.p_sigctx.ps_sigignore.__bits[0];
-+#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
- 	buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore.__bits[0];
- #else
- 	buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore;
-@@ -97,7 +103,9 @@
- 	/* sigcatch: mask of caught signals.
- 	 *           pinfo [0].kp_proc.p_sigcatch
- 	*/
--#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
-+#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000)
-+	buf->sigcatch [0] = pinfo [0].kp_proc.p_sigctx.ps_sigcatch.__bits[0];
-+#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
- 	buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch.__bits[0];
- #else
- 	buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch;
diff --git a/sysutils/libgtop/patches/patch-ac b/sysutils/libgtop/patches/patch-ac
deleted file mode 100644
index dd28ca9d6ec..00000000000
--- a/sysutils/libgtop/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2004/04/02 12:13:57 jmmv Exp $
-
---- include/glibtop/procstate.h.orig	Tue Feb 23 06:43:11 1999
-+++ include/glibtop/procstate.h	Sun Aug 29 19:50:34 1999
-@@ -36,6 +36,13 @@
- 
- #define GLIBTOP_MAX_PROC_STATE		4
- 
-+#define GLIBTOP_PROCESS_RUNNING			1
-+#define GLIBTOP_PROCESS_INTERRUPTIBLE		2
-+#define GLIBTOP_PROCESS_UNINTERRUPTIBLE		4
-+#define GLIBTOP_PROCESS_ZOMBIE			8
-+#define GLIBTOP_PROCESS_STOPPED			16
-+#define GLIBTOP_PROCESS_SWAPPING		32
-+
- typedef struct _glibtop_proc_state	glibtop_proc_state;
- 
- /* Name and status */
diff --git a/sysutils/libgtop/patches/patch-ad b/sysutils/libgtop/patches/patch-ad
deleted file mode 100644
index 11ebda40403..00000000000
--- a/sysutils/libgtop/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2004/04/02 12:13:57 jmmv Exp $
-
---- sysdeps/freebsd/procargs.c.orig	Thu May 27 16:04:01 1999
-+++ sysdeps/freebsd/procargs.c	Sat Jun  3 23:18:52 2000
-@@ -83,9 +83,9 @@
- 
- 	args = kvm_getargv (server->machine.kd, pinfo, max_len);
- 	if (args == NULL) {
--		glibtop_suid_leave (server);
--		glibtop_warn_io_r (server, "kvm_getargv (%d)", pid);
--		return NULL;
-+		static char *dummy = NULL;
-+
-+		args = &dummy;
- 	}
- 
- 	glibtop_suid_leave (server);
diff --git a/sysutils/libgtop/patches/patch-ae b/sysutils/libgtop/patches/patch-ae
deleted file mode 100644
index 70f950f368d..00000000000
--- a/sysutils/libgtop/patches/patch-ae
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/04/02 12:13:57 jmmv Exp $
-
---- sysdeps/freebsd/cpu.c.orig	Sun Feb 13 16:47:58 2000
-+++ sysdeps/freebsd/cpu.c
-@@ -27,11 +27,16 @@
- 
- #include <glibtop_suid.h>
- 
-+#ifdef __NetBSD__
-+#include <sys/sched.h>
-+#endif
-+
- 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);
- 
-+#ifndef KERN_CP_TIME
- /* nlist structure for kernel access */
- static struct nlist nlst [] = {
- #ifdef __bsdi__
-@@ -41,21 +46,27 @@
- #endif
- 	{ 0 }
- };
-+#endif
- 
- /* MIB array for sysctl */
- static int mib_length=2;
- static int mib [] = { CTL_KERN, KERN_CLOCKRATE };
-+#ifdef KERN_CP_TIME
-+static int mib2 [] = { CTL_KERN, KERN_CP_TIME };
-+#endif
- 
- /* Init function. */
- 
- void
- glibtop_init_cpu_p (glibtop *server)
- {
-+#ifndef KERN_CP_TIME
- 	if (kvm_nlist (server->machine.kd, nlst) < 0) {
- 		glibtop_warn_io_r (server, "kvm_nlist (cpu)");
- 		return;
- 	}
- 
-+#endif
- 	/* Set this only if kvm_nlist () succeeded. */
- 	server->sysdeps.cpu = _glibtop_sysdeps_cpu;
- }
-@@ -65,7 +76,11 @@
- void
- glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
- {
-+#ifdef KERN_CP_TIME
-+	u_int64_t cpts [CPUSTATES];
-+#else
- 	long cpts [CPUSTATES];
-+#endif
- 	/* sysctl vars*/
- 	struct clockinfo ci;
- 	size_t length;
-@@ -78,11 +93,19 @@
- 	if (server->sysdeps.cpu == 0)
- 		return;
- 
-+#ifdef KERN_CP_TIME
-+	length = sizeof (cpts);
-+	if (sysctl (mib2, mib_length, cpts, &length, NULL, 0)) {
-+		glibtop_warn_io_r (server, "sysctl");
-+		return;
-+	}
-+#else
- 	if (kvm_read (server->machine.kd, nlst [0].n_value,
- 		      &cpts, sizeof (cpts)) != sizeof (cpts)) {
- 		glibtop_warn_io_r (server, "kvm_read (cp_time)");
- 		return;
- 	}
-+#endif
- 	
- 	/* Get the clockrate data */
- 	length = sizeof (struct clockinfo);
diff --git a/sysutils/libgtop/patches/patch-af b/sysutils/libgtop/patches/patch-af
deleted file mode 100644
index 8a4257272b6..00000000000
--- a/sysutils/libgtop/patches/patch-af
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-af,v 1.3 2004/04/02 12:13:57 jmmv Exp $
-
---- sysdeps/freebsd/procstate.c.orig	Mon Nov 26 23:37:59 2001
-+++ sysdeps/freebsd/procstate.c	Sun Jan 19 23:21:15 2003
-@@ -99,9 +99,11 @@
- 	case SRUN:
- 		buf->state = GLIBTOP_PROCESS_RUNNING;
- 		break;
-+#ifdef SSLEEP
- 	case SSLEEP:
- 		buf->state = GLIBTOP_PROCESS_INTERRUPTIBLE;
- 		break;
-+#endif
- 	case SSTOP:
- 		buf->state = GLIBTOP_PROCESS_STOPPED;
- 		break;
-@@ -119,9 +121,11 @@
- 	case SRUN:
- 		buf->state = 'R';
- 		break;
-+#ifdef SSLEEP
- 	case SSLEEP:
- 		buf->state = 'S';
- 		break;
-+#endif
- 	case SSTOP:
- 		buf->state = 'T';
- 		break;
diff --git a/sysutils/libgtop/patches/patch-ag b/sysutils/libgtop/patches/patch-ag
deleted file mode 100644
index 6744e0365e0..00000000000
--- a/sysutils/libgtop/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2004/04/02 12:13:57 jmmv Exp $
-
---- sysdeps/freebsd/procuid.c.orig	Mon Nov 26 23:37:59 2001
-+++ sysdeps/freebsd/procuid.c	Sun Jan 19 23:26:08 2003
-@@ -94,7 +94,11 @@
- 	buf->tpgid = pinfo [0].kp_eproc.e_tpgid;
- 
- 	buf->nice     = pinfo [0].kp_proc.p_nice;
-+#if defined(__NetBSD__) && defined(SACTIVE)
-+	buf->priority = 0;
-+#else
- 	buf->priority = pinfo [0].kp_proc.p_priority;
-+#endif
- 
- 	/* Set the flags for the data we're about to return*/
- 	buf->flags = _glibtop_sysdeps_proc_uid;
diff --git a/sysutils/libgtop/patches/patch-al b/sysutils/libgtop/patches/patch-al
deleted file mode 100644
index fdc2798cd41..00000000000
--- a/sysutils/libgtop/patches/patch-al
+++ /dev/null
@@ -1,120 +0,0 @@
-$NetBSD: patch-al,v 1.3 2004/04/02 12:13:57 jmmv Exp $
-
---- sysdeps/freebsd/prockernel.c.orig	2001-11-26 23:37:59.000000000 +0100
-+++ sysdeps/freebsd/prockernel.c	2004-03-01 03:44:24.000000000 +0100
-@@ -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,14 @@
- #include <osreldate.h>
- #endif
- 
-+#ifdef __NetBSD__
-+#include <machine/vmparam.h>
-+#include <machine/pmap.h>
-+#ifdef __arm32__
-+#define	KERNBASE	KERNEL_BASE
-+#endif
-+#endif
-+
- static const unsigned long _glibtop_sysdeps_proc_kernel_pstats =
- (1L << GLIBTOP_PROC_KERNEL_MIN_FLT) +
- (1L << GLIBTOP_PROC_KERNEL_MAJ_FLT) +
-@@ -101,6 +109,7 @@
- 	if ((pinfo == NULL) || (count != 1))
- 		glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
- 
-+#if !defined(__NetBSD__) || !defined(SACTIVE)
- 	buf->nwchan = (unsigned long) pinfo [0].kp_proc.p_wchan &~ KERNBASE;
- 	buf->flags |= (1L << GLIBTOP_PROC_KERNEL_NWCHAN);
- 
-@@ -112,6 +121,7 @@
- 	} else {
- 		buf->wchan [0] = 0;
- 	}
-+#endif
- 
- 	/* Taken from `saveuser ()' in `/usr/src/bin/ps/ps.c'. */
- 
-@@ -129,8 +139,16 @@
- 
- 	glibtop_suid_enter (server);
- 
-+#if !defined(__NetBSD__) || !defined(SACTIVE)
-+#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))
- 		{
-@@ -148,9 +166,14 @@
- 			
- 			buf->flags |= _glibtop_sysdeps_proc_kernel_pstats;
- 		}
-+#endif
- 
-+#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,15 +190,43 @@
- 			/*xxx FreeBSD/Alpha? */
- #endif
- #else
-+#ifdef __i386__
- 			buf->kstk_esp = (u_int64_t) pcb.pcb_tss.tss_esp0;
- #ifdef __bsdi__
- 			buf->kstk_eip = (u_int64_t) pcb.pcb_tss.tss_eip;
- #else
- 			buf->kstk_eip = (u_int64_t) pcb.pcb_tss.__tss_eip;
- #endif
-+#else
-+#if defined(__NetBSD__)
-+#if defined(__m68k__)
-+			buf->kstk_esp = (u_int64_t) pcb.pcb_usp;
-+			buf->kstk_eip = (u_int64_t) 0;
-+#elif defined(__x86_64__)
-+			buf->kstk_esp = (u_int64_t) pcb.pcb_usersp;
-+			buf->kstk_eip = (u_int64_t) 0;
-+#elif (defined(__arm32__) || defined(__powerpc__))
-+			buf->kstk_esp = (u_int64_t) pcb.pcb_sp;
-+			buf->kstk_eip = (u_int64_t) 0;
-+#elif defined(__mipsel__)
-+			buf->kstk_esp = (u_int64_t) pcb.pcb_context[8];
-+			buf->kstk_eip = (u_int64_t) 0;
-+#elif defined(__sparc__)
-+			buf->kstk_esp = (u_int64_t) pcb.pcb_sp;
-+			buf->kstk_eip = (u_int64_t) pcb.pcb_pc;
-+#elif defined(__alpha__)
-+			buf->kstk_esp = (u_int64_t) pcb.pcb_context[9];
-+			buf->kstk_eip = (u_int64_t) pcb.pcb_context[8];
-+#else
-+			/* provide some defaults for other platforms */
-+			buf->kstk_esp = (u_int64_t) 0;
-+			buf->kstk_eip = (u_int64_t) 0;
-+#endif /* ${MACHINE_ARCH} */
-+#endif /* __NetBSD__ */
- 
- 			buf->flags |= _glibtop_sysdeps_proc_kernel_pcb;
- #endif
-+#endif
- 		}
- 
- 	/* Taken from `wchan ()' in `/usr/src/bin/ps/print.c'. */
diff --git a/sysutils/libgtop/patches/patch-an b/sysutils/libgtop/patches/patch-an
deleted file mode 100644
index 0bb131ac4c4..00000000000
--- a/sysutils/libgtop/patches/patch-an
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2004/04/02 12:10:18 jmmv 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
- 
diff --git a/sysutils/libgtop/patches/patch-ao b/sysutils/libgtop/patches/patch-ao
deleted file mode 100644
index dff77a8a404..00000000000
--- a/sysutils/libgtop/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1.1.1 2004/04/02 12:10:18 jmmv Exp $
-
---- src/daemon/Makefile.in.orig	Tue Feb 27 15:02:08 2001
-+++ src/daemon/Makefile.in
-@@ -196,7 +196,7 @@
- @ENABLE_STATIC_TRUE@libgtop_daemon_LDFLAGS = -static
- 
- libgtop_server_SOURCES = server.c slave.c io.c version.c daemon.h
--libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la 				  $(top_builddir)/sysdeps/common/libgtop_suid_common.la
-+libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la 				  $(top_builddir)/sysdeps/common/libgtop_suid_common.la -lintl
- 
- 
- @ENABLE_STATIC_TRUE@libgtop_server_LDFLAGS = -static
diff --git a/sysutils/libgtop/patches/patch-ap b/sysutils/libgtop/patches/patch-ap
deleted file mode 100644
index 92b717358c1..00000000000
--- a/sysutils/libgtop/patches/patch-ap
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ap,v 1.1.1.1 2004/04/02 12:10:18 jmmv Exp $
-
---- sysdeps/freebsd/mem.c.orig	Sun Feb 13 10:47:58 2000
-+++ sysdeps/freebsd/mem.c	Sat Jul 29 22:32:44 2000
-@@ -29,7 +29,9 @@
- 
- #include <sys/sysctl.h>
- #include <sys/vmmeter.h>
-+#if defined(__NetBSD__)  && (__NetBSD_Version__ < 105020000)
- #include <vm/vm_param.h>
-+#endif
- 
- #if defined(__NetBSD__)  && (__NetBSD_Version__ >= 104000000)
- #include <uvm/uvm_extern.h>
-@@ -74,7 +76,6 @@
- };
- 
- /* MIB array for sysctl */
--static int mib_length=2;
- #ifdef __bsdi__
- static int mib [] = { CTL_VM, VM_TOTAL };
- #else
diff --git a/sysutils/libgtop/patches/patch-aq b/sysutils/libgtop/patches/patch-aq
deleted file mode 100644
index b20a26382bd..00000000000
--- a/sysutils/libgtop/patches/patch-aq
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-aq,v 1.1.1.1 2004/04/02 12:10:18 jmmv Exp $
-
---- sysdeps/freebsd/procmap.c.orig	Thu May 27 20:56:48 1999
-+++ sysdeps/freebsd/procmap.c	Wed Nov 29 21:57:15 2000
-@@ -32,9 +32,13 @@
- #include <sys/param.h>
- #include <sys/proc.h>
- #include <sys/resource.h>
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000)
- #include <vm/vm_object.h>
- #include <vm/vm_prot.h>
- #include <vm/vm_map.h>
-+#else
-+#include <uvm/uvm_extern.h>
-+#endif
- 
- #include <sys/vnode.h>
- #include <sys/mount.h>
-@@ -46,9 +50,12 @@
- #include <sys/user.h>
- #endif
- #include <sys/sysctl.h>
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000)
- #include <vm/vm.h>
-+#endif
- 
--#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
-+#if defined(__NetBSD__) && \
-+	(__NetBSD_Version__ >= 104000000) && (__NetBSD_Version < 105020000)
- /* Fixme ... */
- #undef _KERNEL
- #define _UVM_UVM_AMAP_I_H_ 1
-@@ -214,11 +221,13 @@
- #endif
- 
- #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
-+#if defined(UVM_VNODE_VALID)
- 		if (!vnode.v_uvm.u_flags & UVM_VNODE_VALID)
- 			continue;
- 
- 		if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) ||
- 		    !vnode.v_data) continue;
-+#endif
- 
- 		if (kvm_read (server->machine.kd,
- 			      (unsigned long) vnode.v_data,
diff --git a/sysutils/libgtop/patches/patch-ar b/sysutils/libgtop/patches/patch-ar
deleted file mode 100644
index e896045f16b..00000000000
--- a/sysutils/libgtop/patches/patch-ar
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-ar,v 1.1.1.1 2004/04/02 12:10:18 jmmv Exp $
-
---- sysdeps/freebsd/procmem.c.orig	Thu May 27 20:56:49 1999
-+++ sysdeps/freebsd/procmem.c
-@@ -31,8 +31,12 @@
- #include <sys/param.h>
- #include <sys/proc.h>
- #include <sys/resource.h>
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000)
- #include <vm/vm_object.h>
- #include <vm/vm_map.h>
-+#else
-+#include <uvm/uvm_extern.h>
-+#endif
- 
- #include <sys/vnode.h>
- #include <ufs/ufs/quota.h>
-@@ -43,9 +47,14 @@
- #include <sys/user.h>
- #endif
- #include <sys/sysctl.h>
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000)
- #include <vm/vm.h>
-+#else
-+#include <uvm/uvm.h>
-+#endif
- 
--#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
-+#if defined(__NetBSD__) && \
-+	(__NetBSD_Version__ >= 104000000) && (__NetBSD_Version__ < 105020000)
- /* Fixme ... */
- #undef _KERNEL
- #define _UVM_UVM_AMAP_I_H_ 1
-@@ -113,7 +122,6 @@
- 	struct vmspace *vms, vmspace;
- #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
- 	struct vnode vnode;
--	struct inode inode;
- #else
- 	struct vm_object object;
- #endif
-@@ -233,17 +241,27 @@
- 		/* If the object is of type vnode, add its size */
- 
- #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
-+#if defined(UVM_VNODE_VALID)
- 		if (!vnode.v_uvm.u_flags & UVM_VNODE_VALID)
- 			continue;
-+#endif
- 
- 		if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) ||
- 		    !vnode.v_data) continue;
- 
-+#if (__NetBSD_Version__ >= 105250000)
-+		/* Reference count must be at least two. */
-+		if (vnode.v_usecount <= 1)
-+			continue;
-+
-+		buf->share += pagetok (vnode.v_uobj.uo_npages) << LOG1024;
-+#else
- 		/* Reference count must be at least two. */
- 		if (vnode.v_uvm.u_obj.uo_refs <= 1)
- 			continue;
- 
- 		buf->share += pagetok (vnode.v_uvm.u_obj.uo_npages) << LOG1024;
-+#endif /* __NetBSD_Version__ >= 105250000 */
- #endif
- 
- #ifdef __FreeBSD__
diff --git a/sysutils/libgtop/patches/patch-as b/sysutils/libgtop/patches/patch-as
deleted file mode 100644
index c2fd14058f2..00000000000
--- a/sysutils/libgtop/patches/patch-as
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-as,v 1.1.1.1 2004/04/02 12:10:18 jmmv Exp $
-
---- sysdeps/freebsd/uptime.c.orig	Thu May 27 16:04:16 1999
-+++ sysdeps/freebsd/uptime.c
-@@ -49,6 +49,27 @@
- void
- glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf)
- {
-+#ifdef __NetBSD__
-+	time_t now;
-+	time_t uptime;
-+	int mib[2];
-+	struct timeval boottime;
-+	size_t size;
-+
-+	mib[0] = CTL_KERN;
-+	mib[1] = KERN_BOOTTIME;
-+	size = sizeof(boottime);
-+	if (sysctl(mib, 2, &boottime, &size, NULL, 0) != -1 &&
-+	    boottime.tv_sec != 0) {
-+		time(&now);
-+		buf->uptime = now - boottime.tv_sec;
-+		/* XXX: don't know a useful value to put here. */
-+		buf->idletime = 0;
-+		buf->flags = _glibtop_sysdeps_uptime;
-+	}
-+#else
-+	buf->flags = _glibtop_sysdeps_uptime;
-+
- 	glibtop_cpu cpu;
- 
- 	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_UPTIME), 0);
-@@ -70,4 +91,5 @@
- 	buf->idletime = (double) cpu.idle / (double) cpu.frequency;
- 
- 	buf->flags = _glibtop_sysdeps_uptime;
-+#endif
- }