Remove gnome1 packages except as needed for gnucash.

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

33 files changed, 1 insertions, 994 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index a1901d9acfc..933796e8111 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.296 2005/05/16 10:51:47 rh Exp $
+# $NetBSD: Makefile,v 1.297 2005/05/18 22:02:18 wiz Exp $
 
 COMMENT=	System utilities
 
@@ -87,7 +87,6 @@ SUBDIR+=	grub
 SUBDIR+=	grun
 SUBDIR+=	gst-plugins-gnomevfs
 SUBDIR+=	gtk-send-pr
-SUBDIR+=	gtop
 SUBDIR+=	gworkspace
 SUBDIR+=	hfsutils
 SUBDIR+=	i2ocfg
@@ -99,7 +98,6 @@ SUBDIR+=	kdirstat
 SUBDIR+=	krusader
 SUBDIR+=	lambd
 SUBDIR+=	lavaps
-SUBDIR+=	libgtop
 SUBDIR+=	libgtop2
 SUBDIR+=	libirman
 SUBDIR+=	libol
@@ -154,7 +152,6 @@ SUBDIR+=	rox-edit
 SUBDIR+=	rox-lib
 SUBDIR+=	rox-memo
 SUBDIR+=	rox-session
-SUBDIR+=	rox-system
 SUBDIR+=	rox-wallpaper
 SUBDIR+=	rox-wrappers
 SUBDIR+=	rsnapshot
diff --git a/sysutils/gtop/DESCR b/sysutils/gtop/DESCR
deleted file mode 100644
index bec1a24a4ca..00000000000
--- a/sysutils/gtop/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-GNOME system monitor - top like, memory graphs, processes detailed view
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
deleted file mode 100644
index 6312b158e02..00000000000
--- a/sysutils/gtop/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.39 2005/04/11 21:47:24 tv Exp $
-
-DISTNAME=		gtop-1.0.13
-PKGREVISION=		10
-CATEGORIES=		sysutils gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtop/1.0/}
-
-MAINTAINER=		tron@NetBSD.org
-HOMEPAGE=		http://www.gnome.org/
-COMMENT=		GNOME system monitor - top like, memory graphs, process viewer
-
-BUILD_USES_MSGFMT=	YES
-
-OSVERSION_SPECIFIC=	YES
-USE_DIRS+=		xdg-1.1
-USE_PKGLOCALEDIR=	YES
-USE_GNU_TOOLS+=		make
-USE_X11BASE=		YES
-USE_LIBTOOL=		YES
-
-GNU_CONFIGURE=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-CONFIGURE_ENV+=		LOCALEDIR=${PKGLOCALEDIR}
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../sysutils/libgtop/buildlink3.mk"
-.include "../../x11/gnome-core/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gtop/PLIST b/sysutils/gtop/PLIST
deleted file mode 100644
index 3ca4e0fe630..00000000000
--- a/sysutils/gtop/PLIST
+++ /dev/null
@@ -1,46 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:17 zuntum Exp $
-bin/gtop
-share/gnome/apps/System/gtop.desktop
-share/gtoprc
-share/gnome/help/gtop/C/topic.dat
-share/gnome/help/gtop/C/figs/gtop-fs-1.png
-share/gnome/help/gtop/C/figs/gtop-fs-2.png
-share/gnome/help/gtop/C/figs/gtop-mem.png
-share/gnome/help/gtop/C/figs/gtop-pic-bottom.png
-share/gnome/help/gtop/C/figs/gtop-pic-main.png
-share/gnome/help/gtop/C/figs/gtop-pic-middle.png
-share/gnome/help/gtop/C/figs/gtop-pic-top.png
-share/gnome/help/gtop/C/figs/gtop-prefs.png
-share/gnome/help/gtop/C/figs/gtop-proc.png
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gtop.mo
-share/pixmaps/gnome-gtop.png
-@dirrm share/gnome/help/gtop/C/figs
-@dirrm share/gnome/help/gtop/C
-@dirrm share/gnome/help/gtop
diff --git a/sysutils/gtop/distinfo b/sysutils/gtop/distinfo
deleted file mode 100644
index 94ebab09c0a..00000000000
--- a/sysutils/gtop/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 13:40:53 agc Exp $
-
-SHA1 (gtop-1.0.13.tar.gz) = 114b3068c6c66b7cd582c6bfe2d1143957ae5a19
-RMD160 (gtop-1.0.13.tar.gz) = 39cbacba2c0dbbbd923557d900232d5143e510d6
-Size (gtop-1.0.13.tar.gz) = 823015 bytes
-SHA1 (patch-aa) = 5f17676fc7fca9cf8b99dc02fd34142f99ff5fd3
-SHA1 (patch-ab) = d97ba2e37838cd93be8b1d33ebdfe81d6d64b1d1
-SHA1 (patch-ac) = 6b3feaf723163a8edab0315e01cf5cd63cf4d258
diff --git a/sysutils/gtop/patches/patch-aa b/sysutils/gtop/patches/patch-aa
deleted file mode 100644
index 6544d7d7b2c..00000000000
--- a/sysutils/gtop/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2001/04/24 18:33:30 rh Exp $
-
---- configure.orig	Tue Apr 24 20:11:44 2001
-+++ configure
-@@ -4953,13 +4953,13 @@
- if { (eval echo configure:4954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   CATOBJEXT=.gmo
--		   DATADIRNAME=share
-+		   DATADIRNAME=${LOCALEDIR}
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=${LOCALEDIR}
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
-@@ -5188,7 +5188,7 @@
-       # We need to process the po/ directory.
-       POSUB=po
-     else
--      DATADIRNAME=share
-+      DATADIRNAME=${LOCALEDIR}
-       nls_cv_header_intl=intl/libintl.h
-       nls_cv_header_libgt=intl/libgettext.h
-     fi
diff --git a/sysutils/gtop/patches/patch-ab b/sysutils/gtop/patches/patch-ab
deleted file mode 100644
index 83a13d2b394..00000000000
--- a/sysutils/gtop/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/09/30 22:03:40 mycroft Exp $
-
---- main.c.orig	2001-02-27 14:41:29.000000000 +0000
-+++ main.c	2003-09-30 22:01:36.000000000 +0000
-@@ -149,7 +149,7 @@
- 	GNOMEUIINFO_END
- };
- 
--#define ADD_PROPERTIES(x,y) gtop_property_object_list = g_list_append (gtop_property_object_list, gnome_property_object_new (& ## x ## Property_Descriptor, &gtop_properties. ## y ##))
-+#define ADD_PROPERTIES(x,y) gtop_property_object_list = g_list_append (gtop_property_object_list, gnome_property_object_new (&x ## Property_Descriptor, &gtop_properties.y))
- 
- void
- gtop_quit (void)
diff --git a/sysutils/gtop/patches/patch-ac b/sysutils/gtop/patches/patch-ac
deleted file mode 100644
index 78448556c51..00000000000
--- a/sysutils/gtop/patches/patch-ac
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2003/10/14 20:58:38 tron Exp $
-
---- procview.c.orig	2001-02-15 01:57:30.000000000 +0100
-+++ procview.c	2003-10-14 22:56:08.000000000 +0200
-@@ -96,29 +96,29 @@
- \
- static int cmp_ ## NAME (const ProcProcData **P, const ProcProcData **Q) \
- { \
--	  return (*P)->d->sort_order * ((*P)-> ## NAME - (*Q)-> ## NAME); \
-+	  return (*P)->d->sort_order * ((*P)->NAME - (*Q)->NAME); \
- }
- 
- #define CMP_INT(NAME) \
- \
- static int cmp_ ## NAME (const ProcProcData **P, const ProcProcData **Q) \
- { \
--	  return (*P)->d->sort_order * ((*P)->p-> ## NAME - (*Q)->p-> ## NAME); \
-+	  return (*P)->d->sort_order * ((*P)->p->NAME - (*Q)->p->NAME); \
- }
- 
- #define CMP_INT2(NAME,V1,V2) \
- \
- static int cmp_ ## NAME (const ProcProcData **P, const ProcProcData **Q) \
- { \
--	  return (*P)->d->sort_order * ((*P)->p-> ## V1 + (*P)->p-> ## V2 - (\
--                               (*Q)->p-> ## V1 + (*Q)->p-> ## V2)); \
-+	  return (*P)->d->sort_order * ((*P)->p-> V1 + (*P)->p-> V2 - (\
-+                               (*Q)->p-> V1 + (*Q)->p-> V2)); \
- }
- 
- #define CMP_STR(NAME) \
- \
- static int cmp_ ## NAME (const ProcProcData **P, const ProcProcData **Q) \
- { \
--	  return (*P)->d->sort_order * strcasecmp ((*P)->p-> ## NAME, (*Q)->p-> ## NAME); \
-+	  return (*P)->d->sort_order * strcasecmp ((*P)->p->NAME, (*Q)->p->NAME); \
- }
- 
- #define SORT_ASC 1
diff --git a/sysutils/libgtop/DESCR b/sysutils/libgtop/DESCR
deleted file mode 100644
index 55f3012d616..00000000000
--- a/sysutils/libgtop/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-libgtop is a library that fetches system information about the running
-system such as cpu and memory usage, active processes etc.  It
-provides a setgid server that fetches the information and a
-client-side library that talks to this server.
diff --git a/sysutils/libgtop/Makefile b/sysutils/libgtop/Makefile
deleted file mode 100644
index 45f13cadb3f..00000000000
--- a/sysutils/libgtop/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:25 tv Exp $
-
-DISTNAME=		libgtop-1.0.13
-PKGREVISION=		5
-CATEGORIES=		sysutils gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgtop/1.0/}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		jmmv@NetBSD.org
-HOMEPAGE=		http://www.gnome.org/
-COMMENT=		Library to retrieve system information, used in GNOME
-
-BUILD_USES_MSGFMT=	yes
-
-NOT_FOR_PLATFORM=	SunOS-*-*
-OSVERSION_SPECIFIC=	yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == NetBSD
-.  if (${MACHINE_ARCH} != alpha) && (${MACHINE_ARCH} != x86_64) && \
-	(${MACHINE_ARCH} != arm) && (${MACHINE_ARCH} != arm32) && \
-	(${MACHINE_ARCH} != i386) && (${MACHINE_ARCH} != m68k) && \
-	(${MACHINE_ARCH} != mipsel) && (${MACHINE_ARCH} != powerpc) && \
-	(${MACHINE_ARCH} != sparc) && (${MACHINE_ARCH} != sparc64)
-PKG_FAIL_REASON=	"${PKGNAME} has not yet been ported to ${MACHINE_ARCH}."
-PKG_FAIL_REASON+=	"Please look at /usr/include/${MACHINE_ARCH}/pcb.h"
-PKG_FAIL_REASON+=	"and update patches/patch-al appropriately."
-PKG_FAIL_REASON+=	"(More information can be found in libgtop.info.)"
-.  endif
-.endif
-
-USE_PERL5=		build
-USE_PKGLOCALEDIR=	yes
-USE_X11BASE=		YES
-USE_GNU_TOOLS+=		make
-USE_LIBTOOL=		YES
-USE_MAKEINFO=		YES
-INFO_FILES=		libgtop.info
-
-# The following flags are for debugging purposes.  They don't need to
-# be used unless you are actively developing/debugging libgtop.
-#CPPFLAGS+=		-DLIBGTOP_ENABLE_DEBUG -DLIBGTOP_FATAL_WARNINGS
-#CFLAGS+=		-g
-#LDFLAGS+=		-g
-
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-glib-prefix=${BUILDLINK_PREFIX.glib} \
-			--with-catgets --with-libgtop-guile=no
-CONFIGURE_ENV+=		AWK="${AWK}" LN_S="${LN} -s" PERL="${PERL5}"
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../x11/gnome-libs/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/libgtop/PLIST b/sysutils/libgtop/PLIST
deleted file mode 100644
index de7c7e9d020..00000000000
--- a/sysutils/libgtop/PLIST
+++ /dev/null
@@ -1,91 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:53 jlam Exp $
-bin/libgtop-config
-bin/libgtop_daemon
-bin/libgtop_server
-include/libgtop-1.0/glibtop.h
-include/libgtop-1.0/glibtop/close.h
-include/libgtop-1.0/glibtop/command.h
-include/libgtop-1.0/glibtop/cpu.h
-include/libgtop-1.0/glibtop/error.h
-include/libgtop-1.0/glibtop/fsusage.h
-include/libgtop-1.0/glibtop/global.h
-include/libgtop-1.0/glibtop/gnuserv.h
-include/libgtop-1.0/glibtop/inodedb.h
-include/libgtop-1.0/glibtop/loadavg.h
-include/libgtop-1.0/glibtop/mem.h
-include/libgtop-1.0/glibtop/mountlist.h
-include/libgtop-1.0/glibtop/msg_limits.h
-include/libgtop-1.0/glibtop/netload.h
-include/libgtop-1.0/glibtop/open.h
-include/libgtop-1.0/glibtop/parameter.h
-include/libgtop-1.0/glibtop/ppp.h
-include/libgtop-1.0/glibtop/procargs.h
-include/libgtop-1.0/glibtop/prockernel.h
-include/libgtop-1.0/glibtop/proclist.h
-include/libgtop-1.0/glibtop/procmap.h
-include/libgtop-1.0/glibtop/procmem.h
-include/libgtop-1.0/glibtop/procsegment.h
-include/libgtop-1.0/glibtop/procsignal.h
-include/libgtop-1.0/glibtop/procstate.h
-include/libgtop-1.0/glibtop/proctime.h
-include/libgtop-1.0/glibtop/procuid.h
-include/libgtop-1.0/glibtop/read.h
-include/libgtop-1.0/glibtop/read_data.h
-include/libgtop-1.0/glibtop/sem_limits.h
-include/libgtop-1.0/glibtop/shm_limits.h
-include/libgtop-1.0/glibtop/signal.h
-include/libgtop-1.0/glibtop/swap.h
-include/libgtop-1.0/glibtop/sysdeps.h
-include/libgtop-1.0/glibtop/sysinfo.h
-include/libgtop-1.0/glibtop/types.h
-include/libgtop-1.0/glibtop/union.h
-include/libgtop-1.0/glibtop/uptime.h
-include/libgtop-1.0/glibtop/version.h
-include/libgtop-1.0/glibtop/write.h
-include/libgtop-1.0/glibtop/xmalloc.h
-include/libgtop-1.0/glibtop_machine.h
-include/libgtop-1.0/glibtop_server.h
-include/libgtop-1.0/glibtop_suid.h
-lib/libgtop-features.def
-lib/libgtop.la
-lib/libgtopConf.sh
-lib/libgtop_common.la
-lib/libgtop_names.la
-lib/libgtop_suid_common.la
-lib/libgtop_sysdeps.la
-lib/libgtop_sysdeps_suid.la
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/es_DO/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/es_GT/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/es_HN/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/es_MX/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/es_PA/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/es_PE/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/es_SV/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/libgtop.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgtop.mo
-@dirrm include/libgtop-1.0/glibtop
-@dirrm include/libgtop-1.0
diff --git a/sysutils/libgtop/buildlink3.mk b/sysutils/libgtop/buildlink3.mk
deleted file mode 100644
index 7a02e163ab2..00000000000
--- a/sysutils/libgtop/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:15 tv Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBGTOP_BUILDLINK3_MK:=	${LIBGTOP_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libgtop
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgtop}
-BUILDLINK_PACKAGES+=	libgtop
-
-.if !empty(LIBGTOP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgtop+=	libgtop>=1.0.13nb4
-BUILDLINK_RECOMMENDED.libgtop+=	libgtop>=1.0.13nb5
-BUILDLINK_PKGSRCDIR.libgtop?=	../../sysutils/libgtop
-.endif	# LIBGTOP_BUILDLINK3_MK
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../x11/gnome-libs/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/libgtop/distinfo b/sysutils/libgtop/distinfo
deleted file mode 100644
index 5894a0d93e0..00000000000
--- a/sysutils/libgtop/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 13:40:54 agc Exp $
-
-SHA1 (libgtop-1.0.13.tar.bz2) = 7002d37ab43ebac14315298472a170ceaedbd072
-RMD160 (libgtop-1.0.13.tar.bz2) = c2371d3ffc5a0c5c8adacee70d9ed3f1f48ddeba
-Size (libgtop-1.0.13.tar.bz2) = 733873 bytes
-SHA1 (patch-aa) = a640afa2d6a8b7f418052fabbdb04bfc6805b42d
-SHA1 (patch-ab) = 3ce99bf4d72cf4e4203364d78361c8a2df081d8d
-SHA1 (patch-ac) = 644bfe717bdcc993a668a3d075acda8ef39571d8
-SHA1 (patch-ad) = 9522d20b1467b73678003d5c0f98dcac7d312893
-SHA1 (patch-ae) = cf277165382c17d938593934b59d8035175fd8d0
-SHA1 (patch-af) = 6874f04a186a4dccfecadaa2e40a372bc9f2e2fe
-SHA1 (patch-ag) = eb02b990d1316ac5f2ec0430e49b9c4487c6dab8
-SHA1 (patch-al) = 15c860638199d3d8c260b89b3fb70ced5054a69c
-SHA1 (patch-an) = 339df94fd374d99565be913d1f8b59ea2f7b7881
-SHA1 (patch-ao) = 09cb66ba7ee9a7368ec1cd1d4bd40ea3f6637a31
-SHA1 (patch-ap) = 07a83340eb9d6a36a3f5b2db33eb50c74fbc4777
-SHA1 (patch-aq) = 93ebb47710f1c4cc70406a92503bdc4a5bfa50d2
-SHA1 (patch-ar) = 470e29d999b079a5f75993978b3cdcdec2fd7d9c
-SHA1 (patch-as) = 0374fc36c418871e929fbb3c53ab4979e780e8d5
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
- }
diff --git a/sysutils/rox-system/DESCR b/sysutils/rox-system/DESCR
deleted file mode 100644
index 3475937b1c2..00000000000
--- a/sysutils/rox-system/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-System displays information about your system - what processes are running
-and the amount of memory they are using, as well as free and used disk space.
diff --git a/sysutils/rox-system/Makefile b/sysutils/rox-system/Makefile
deleted file mode 100644
index 92489443aae..00000000000
--- a/sysutils/rox-system/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:29 tv Exp $
-#
-
-DISTNAME=	System-0.1.2
-PKGNAME=	rox-system-0.1.2
-PKGREVISION=	4
-CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	rxg@NetBSD.org
-HOMEPAGE=	http://rox.sourceforge.net/
-COMMENT=	Simple system monitor
-
-DEPENDS+=	rox>=1.2.0nb2:../../sysutils/rox
-
-WRKSRC=		${WRKDIR}/System/src
-DIST_SUBDIR=	rox
-
-GNU_CONFIGURE=		yes
-
-APPDIR=		${PREFIX}/share/rox
-
-post-patch:
-	${CP} ${WRKDIR}/System/AppRun ${WRKDIR}
-	${SED} -e "s:"\$$APP_DIR/\$$PLATFORM":${PREFIX}/libexec/rox:g" < \
-		${WRKDIR}/AppRun > ${WRKDIR}/System/AppRun
-
-post-build:
-	${MV} ${WRKSRC} ${WRKDIR}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/src/System ${PREFIX}/libexec/rox
-	${CP} -Rf ${WRKDIR}/System ${APPDIR}
-
-.include "../../sysutils/libgtop/buildlink3.mk"
-.include "../../x11/gnome-libs/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rox-system/PLIST b/sysutils/rox-system/PLIST
deleted file mode 100644
index 44dcd4670fb..00000000000
--- a/sysutils/rox-system/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/04 17:47:58 cjep Exp $
-libexec/rox/System
-share/rox/System/AppIcon.xpm
-share/rox/System/AppInfo.xml
-share/rox/System/AppRun
-share/rox/System/Help/COPYING
-share/rox/System/Help/Changes
-share/rox/System/Help/README
-@dirrm share/rox/System/Help
-@dirrm share/rox/System
diff --git a/sysutils/rox-system/distinfo b/sysutils/rox-system/distinfo
deleted file mode 100644
index 662e05b09dc..00000000000
--- a/sysutils/rox-system/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:40:56 agc Exp $
-
-SHA1 (rox/System-0.1.2.tgz) = aafe4e16e5f689c009785f3dee47339ca34c369d
-RMD160 (rox/System-0.1.2.tgz) = dc6ae62f1a15706fedd51488561dd6f1ff5f3f14
-Size (rox/System-0.1.2.tgz) = 44875 bytes
-SHA1 (patch-aa) = 2bcca73b001805a2114138ce8dff1e7568bcefa4
-SHA1 (patch-ab) = dd03ab528d6334e576071754fd0bd356231747a2
diff --git a/sysutils/rox-system/patches/patch-aa b/sysutils/rox-system/patches/patch-aa
deleted file mode 100644
index 8c21c87c0e1..00000000000
--- a/sysutils/rox-system/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/04 17:47:58 cjep Exp $
-
---- Makefile.in.orig	Tue May 28 09:58:22 2002
-+++ Makefile.in
-@@ -21,6 +21,9 @@
- 
- ############ Things to keep the same
- 
-+all: ${OBJECTS}
-+	${CC} -o ${PROG} ${OBJECTS} ${LDFLAGS}
-+
- ${EXEC}: ${PLATFORM_DIR} ${OBJECTS}
- 	${CC} -o ${EXEC} ${OBJECTS} ${LDFLAGS}
- 
diff --git a/sysutils/rox-system/patches/patch-ab b/sysutils/rox-system/patches/patch-ab
deleted file mode 100644
index 3c1a2311918..00000000000
--- a/sysutils/rox-system/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/10/13 12:14:09 wiz Exp $
-
---- configure.orig	Tue May 28 10:54:40 2002
-+++ configure
-@@ -784,9 +784,6 @@
-   esac
- fi
- 
--if test -z "$PKG_CONFIG"; then
--  PKG_CONFIG=pkg-config
--fi
- 
- 
- echo $ac_n "checking for Gtk+-2.0""... $ac_c" 1>&6