Updated to 2.0.7.

Changes:

	o Added more locale files.
        o Makefile.am: Change subdirectory build order so that
	  'distclean' target work (and other targets remain working).
        o libgtop-2.0.pc.in: Fix missing build flags. Patch from
        Julio Merino.
        o sysdeps/linux/mem.c: (glibtop_get_mem_s): Fix memory calculation
        under Linux. Patch from <rwahl@gmx.de>.

And more... please review Changelog for a complete list of changes.

pkgsrc-changes:

	o FreeBSD 4.x/5.x support (only tested on 5.x)

14 files changed, 632 insertions, 168 deletions

diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 0b85d954393..a957cd73176 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/08/09 10:44:45 seb Exp $
+# $NetBSD: Makefile,v 1.15 2003/12/13 20:27:42 xtraeme Exp $
 
-DISTNAME=		libgtop-2.0.0
+DISTNAME=		libgtop-2.0.7
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		4
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgtop/2.0/}
 EXTRACT_SUFX=		.tar.bz2
@@ -38,6 +37,7 @@ USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libgtop-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/support/gnome-support-2.0.pc.in
 USE_MAKEINFO=		YES
 INFO_FILES=		libgtop2.info
 
@@ -52,6 +52,7 @@ CONFIGURE_ARGS+=	--with-glib-prefix=${BUILDLINK_PREFIX.glib2}
 CONFIGURE_ARGS+=	--with-catgets --with-libgtop-guile=no
 CONFIGURE_ENV+=		AWK="${AWK}" LN_S="${LN} -s" PERL="${PERL5}"
 
+.include "../../devel/popt/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgtop2/PLIST b/devel/libgtop2/PLIST
index 25cd2a5a29a..59a722e0d69 100644
--- a/devel/libgtop2/PLIST
+++ b/devel/libgtop2/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2003/06/23 11:27:51 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/12/13 20:27:42 xtraeme Exp $
 bin/libgtop_daemon2
 bin/libgtop_server2
+include/gnome/gnomesupport.h
 include/libgtop-2.0/glibtop.h
 include/libgtop-2.0/glibtop/close.h
 include/libgtop-2.0/glibtop/command.h
@@ -46,6 +47,8 @@ include/libgtop-2.0/glibtop_machine.h
 include/libgtop-2.0/glibtop_server.h
 include/libgtop-2.0/glibtop_suid.h
 info/libgtop2.info
+info/libgtop2.info-1
+info/libgtop2.info-2
 lib/libgnomesupport-2.0.a
 lib/libgnomesupport-2.0.la
 lib/libgnomesupport-2.0.so
@@ -55,48 +58,64 @@ lib/libgtop-2.0.a
 lib/libgtop-2.0.la
 lib/libgtop-2.0.so
 lib/libgtop-2.0.so.0
-lib/libgtop-2.0.so.0.0
-lib/libgtop/include/gnomesupport.h
+lib/libgtop-2.0.so.0.7
 lib/libgtop_common-2.0.a
 lib/libgtop_common-2.0.la
 lib/libgtop_common-2.0.so
 lib/libgtop_common-2.0.so.0
-lib/libgtop_common-2.0.so.0.0
+lib/libgtop_common-2.0.so.0.7
 lib/libgtop_names-2.0.a
 lib/libgtop_names-2.0.la
 lib/libgtop_names-2.0.so
 lib/libgtop_names-2.0.so.0
-lib/libgtop_names-2.0.so.0.0
+lib/libgtop_names-2.0.so.0.7
 lib/libgtop_suid_common-2.0.a
 lib/libgtop_suid_common-2.0.la
 lib/libgtop_suid_common-2.0.so
 lib/libgtop_suid_common-2.0.so.0
-lib/libgtop_suid_common-2.0.so.0.0
+lib/libgtop_suid_common-2.0.so.0.7
 lib/libgtop_sysdeps-2.0.a
 lib/libgtop_sysdeps-2.0.la
 lib/libgtop_sysdeps-2.0.so
 lib/libgtop_sysdeps-2.0.so.0
-lib/libgtop_sysdeps-2.0.so.0.0
+lib/libgtop_sysdeps-2.0.so.0.7
 lib/libgtop_sysdeps_suid-2.0.a
 lib/libgtop_sysdeps_suid-2.0.la
 lib/libgtop_sysdeps_suid-2.0.so
 lib/libgtop_sysdeps_suid-2.0.so.0
-lib/libgtop_sysdeps_suid-2.0.so.0.0
+lib/libgtop_sysdeps_suid-2.0.so.0.7
+lib/pkgconfig/gnome-support-2.0.pc
 lib/pkgconfig/libgtop-2.0.pc
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgtop-2.0.mo
-${PKGLOCALEDIR}/locale/es_ES/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libgtop-2.0.mo
@@ -104,16 +123,19 @@ ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
-@dirrm lib/libgtop/include
-@dirrm lib/libgtop
 @dirrm include/libgtop-2.0/glibtop
 @dirrm include/libgtop-2.0
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index 8112b9710aa..ba65bd4ae9e 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1,19 +1,21 @@
-$NetBSD: distinfo,v 1.6 2003/09/27 20:22:33 danw Exp $
+$NetBSD: distinfo,v 1.7 2003/12/13 20:27:42 xtraeme Exp $
 
-SHA1 (libgtop-2.0.0.tar.bz2) = 9178e5cede22ae5a8928677b195fe585b84b3b86
-Size (libgtop-2.0.0.tar.bz2) = 690581 bytes
-SHA1 (patch-aa) = 20cc13d5965815271f85f2dec086460176b2d1cd
-SHA1 (patch-ab) = 3ce99bf4d72cf4e4203364d78361c8a2df081d8d
+SHA1 (libgtop-2.0.7.tar.bz2) = e2e31b08a1609f3ba9f9a12e6d8f82ebe9e138fa
+Size (libgtop-2.0.7.tar.bz2) = 944207 bytes
+SHA1 (patch-aa) = b01ba86612ed2613034bfbfdc878ce5178eede6b
+SHA1 (patch-ab) = 83d16a720eaaa113bf714fa8d60fcb9acf11c988
 SHA1 (patch-ac) = 644bfe717bdcc993a668a3d075acda8ef39571d8
 SHA1 (patch-ad) = 9522d20b1467b73678003d5c0f98dcac7d312893
 SHA1 (patch-ae) = cf277165382c17d938593934b59d8035175fd8d0
 SHA1 (patch-af) = 0374fc36c418871e929fbb3c53ab4979e780e8d5
-SHA1 (patch-ag) = 470e29d999b079a5f75993978b3cdcdec2fd7d9c
-SHA1 (patch-ah) = 93ebb47710f1c4cc70406a92503bdc4a5bfa50d2
+SHA1 (patch-ag) = 7d46fc3b996e39e8532d2e20a47587a54e37b654
+SHA1 (patch-ah) = 29cfc8b7f98610efb2b6013367c06f0e09a32312
 SHA1 (patch-ai) = 07a83340eb9d6a36a3f5b2db33eb50c74fbc4777
-SHA1 (patch-aj) = e262a47aca7871420321d6fa5259a127b69d2095
-SHA1 (patch-al) = 6f3613fab44bbf27e5a60fdab35d26b93a04de47
-SHA1 (patch-am) = a1fd84155a76246276e952f5288636d2f086b3e7
-SHA1 (patch-an) = 2db9a77b2b021ecd6e0f8c82cebf0455ae6ce501
-SHA1 (patch-ao) = 8a3d4b50c00363527a00e3dba9ff4292ae777907
+SHA1 (patch-aj) = 0a0ca01be2a33a1a3b9f17e1d52db1a1b7502177
+SHA1 (patch-ak) = 95170aa2786c5313f859b2381031be9bc7f7cd76
+SHA1 (patch-al) = 93dbdb01e268005f231c00ce7e640dc68b7d6ca2
+SHA1 (patch-am) = cc12e383f36e7f3c0f25fd3a3ea2e0ceff04d43c
+SHA1 (patch-an) = 5ea04c27db91067733ab75d4ce4959446031cb91
+SHA1 (patch-ao) = f54754a2bdcce99a0d953186aee6d2bcbc5d7bae
 SHA1 (patch-ap) = c47c57d77424d18a3184a0625e0d953745d929fe
+SHA1 (patch-aq) = 8efdb60a0bf66b6d0614620a0523238b41e72b8b
diff --git a/devel/libgtop2/patches/patch-aa b/devel/libgtop2/patches/patch-aa
index c86140a8ac4..c1a44d5e561 100644
--- a/devel/libgtop2/patches/patch-aa
+++ b/devel/libgtop2/patches/patch-aa
@@ -1,38 +1,29 @@
-$NetBSD: patch-aa,v 1.2 2002/11/30 23:21:38 salo Exp $
+$NetBSD: patch-aa,v 1.3 2003/12/13 20:27:42 xtraeme Exp $
 
---- configure.orig	Tue Jun 11 07:46:22 2002
-+++ configure
-@@ -7738,13 +7738,13 @@ echo $ECHO_N "checking for libgtop sysde
+--- configure.orig	2003-12-13 08:32:17.000000000 +0100
++++ configure	2003-12-13 08:33:16.000000000 +0100
+@@ -19717,13 +19717,13 @@
  	  libgtop_sysdeps_dir=freebsd
  	  libgtop_use_machine_h=yes
  	  libgtop_need_server=yes
 -	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
-+	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
++	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server'
  	  ;;
  	solaris*)
  	  libgtop_sysdeps_dir=solaris
  	  libgtop_use_machine_h=yes
  	  libgtop_need_server=yes
 -	  libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
-+	  libgtop_postinstall='chgrp sys $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
++	  libgtop_postinstall='chgrp sys $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server'
  	  ;;
- 	*)
- 	  if test x$hacker_mode = xyes ; then
-@@ -15698,7 +15703,7 @@ LIBGTOP_INCS="$LIBGTOP_INCS $SUPPORTINCS
- LIBGTOP_GUILE_LIBS="$LIBGTOP_LIBS"
- LIBGTOP_GUILE_INCS="$LIBGTOP_INCS"
- LIBGTOP_BINDIR='$(bindir)'
--LIBGTOP_SERVER='$(bindir)/libgtop_server'
-+LIBGTOP_SERVER='$(bindir)/libgtop_server2'
+         aix*)
+ 	  libgtop_sysdeps_dir=aix
+@@ -30160,7 +30160,7 @@
  
- sysdeps_dir="$libgtop_sysdeps_dir"
- 
-@@ -15747,7 +15752,7 @@ INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -D
  
  if test x$libgtop_need_server = xyes ; then
-    sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la"
--   server_programs='libgtop_server'
-+   server_programs='libgtop_server2'
+-   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la"
++   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la \$(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la"
+    server_programs='libgtop_server2'
  else
     sysdeps_suid_lib=
-    server_programs=
diff --git a/devel/libgtop2/patches/patch-ab b/devel/libgtop2/patches/patch-ab
index 31efd06a0ae..f04f9d88a5d 100644
--- a/devel/libgtop2/patches/patch-ab
+++ b/devel/libgtop2/patches/patch-ab
@@ -1,48 +1,76 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/11/04 02:56:17 rh Exp $
+$NetBSD: patch-ab,v 1.2 2003/12/13 20:27:42 xtraeme 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 @@
+--- sysdeps/freebsd/procsignal.c.orig	Sat Sep  6 00:25:33 2003
++++ sysdeps/freebsd/procsignal.c	Sat Sep  6 00:30:38 2003
+@@ -67,11 +67,30 @@
+ 		return;
+ 	}
+ 
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
++
++#define	XXX_P_SIGLIST	ki_siglist
++#define	XXX_P_SIGMASK	ki_sigmask
++#define	XXX_P_SIGIGNORE	ki_sigignore
++#define	XXX_P_SIGCATCH	ki_sigcatch
++
++#else
++
++#define	XXX_P_SIGLIST	kp_proc.p_siglist
++#define	XXX_P_SIGMASK	kp_proc.p_sigmask
++#define	XXX_P_SIGIGNORE	kp_proc.p_sigignore
++#define	XXX_P_SIGCATCH	kp_proc.p_sigcatch
++
++#endif
++
++
  	/* 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_siglist.__bits[0];
++#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];
++#elif (defined(__NetBSD__) && (NSIG > 32)) || defined(__FreeBSD__) && (__FreeBSD_version >= 400011)
++	buf->signal [0] = pinfo [0].XXX_P_SIGLIST.__bits[0];
  #else
  	buf->signal [0] = pinfo [0].kp_proc.p_siglist;
-@@ -79,7 +81,9 @@
+ #endif
+@@ -79,8 +98,10 @@
  	/* 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_sigmask.__bits[0];
++#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];
++#elif (defined(__NetBSD__) && (NSIG > 32)) || defined(__FreeBSD__) && (__FreeBSD_version >= 400011)
++	buf->blocked [0] = pinfo [0].XXX_P_SIGMASK.__bits[0];
  #else
  	buf->blocked [0] = pinfo [0].kp_proc.p_sigmask;
-@@ -88,7 +92,9 @@
+ #endif
+@@ -88,8 +109,10 @@
  	/* 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_sigignore.__bits[0];
++#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];
++#elif (defined(__NetBSD__) && (NSIG > 32)) || defined(__FreeBSD__) && (__FreeBSD_version >= 400011)
++	buf->sigignore [0] = pinfo [0].XXX_P_SIGIGNORE.__bits[0];
  #else
  	buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore;
-@@ -97,7 +103,9 @@
+ #endif
+@@ -97,8 +120,10 @@
  	/* 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_sigcatch.__bits[0];
++#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];
++#elif (defined(__NetBSD__) && (NSIG > 32)) || defined(__FreeBSD__) && (__FreeBSD_version >= 400011)
++	buf->sigcatch [0] = pinfo [0].XXX_P_SIGCATCH.__bits[0];
  #else
  	buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch;
+ #endif
diff --git a/devel/libgtop2/patches/patch-ag b/devel/libgtop2/patches/patch-ag
index 13fcd7a5692..e0727e310fd 100644
--- a/devel/libgtop2/patches/patch-ag
+++ b/devel/libgtop2/patches/patch-ag
@@ -1,16 +1,16 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/11/04 02:56:17 rh Exp $
+$NetBSD: patch-ag,v 1.2 2003/12/13 20:27:42 xtraeme Exp $
 
---- sysdeps/freebsd/procmem.c.orig	Thu May 27 20:56:49 1999
-+++ sysdeps/freebsd/procmem.c
+--- sysdeps/freebsd/procmem.c.orig	Sat Sep  6 00:18:49 2003
++++ sysdeps/freebsd/procmem.c	Sat Sep  6 00:22:45 2003
 @@ -31,8 +31,12 @@
  #include <sys/param.h>
  #include <sys/proc.h>
  #include <sys/resource.h>
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000)
++#ifdef __NetBSD__ && (__NetBSD_Version__ >= 105020000)
++#include <uvm/uvm_extern.h>
++#else
  #include <vm/vm_object.h>
  #include <vm/vm_map.h>
-+#else
-+#include <uvm/uvm_extern.h>
 +#endif
  
  #include <sys/vnode.h>
@@ -19,10 +19,10 @@ $NetBSD: patch-ag,v 1.1.1.1 2002/11/04 02:56:17 rh Exp $
  #include <sys/user.h>
  #endif
  #include <sys/sysctl.h>
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000)
- #include <vm/vm.h>
-+#else
++#ifdef __NetBSD__ && (__NetBSD_Version__ >= 105020000)
 +#include <uvm/uvm.h>
++#else
+ #include <vm/vm.h>
 +#endif
  
 -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
@@ -39,25 +39,65 @@ $NetBSD: patch-ag,v 1.1.1.1 2002/11/04 02:56:17 rh Exp $
  #else
  	struct vm_object object;
  #endif
-@@ -233,17 +241,27 @@
+@@ -136,9 +144,24 @@
+ 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
+ 		return;
+ 	}
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
++
++#define        XXX_P_VMSPACE   ki_vmspace
++
++       buf->rss_rlim = pinfo [0].ki_rssize;
++
++       buf->vsize = buf->size = (u_int64_t) pagetok
++               (pinfo [0].ki_tsize + pinfo [0].ki_dsize + pinfo[0].ki_ssize)
++                       << LOG1024;
++       buf->resident = buf->rss = (u_int64_t) pagetok
++               (pinfo [0].ki_rssize) << LOG1024;
++
++#else
++
++#define        XXX_P_VMSPACE   kp_proc.p_vmspace
+ 
+ 	if (kvm_read (server->machine.kd,
+-		      (unsigned long) pinfo [0].kp_proc.p_limit,
++			(unsigned long) pinfo [0].XXX_P_VMSPACE,
+ 		      (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) {
+ 		glibtop_warn_io_r (server, "kvm_read (plimit)");
+ 		return;
+@@ -154,11 +177,12 @@
+ 	
+ 	buf->resident = buf->rss = (u_int64_t) pagetok
+ 		(vms->vm_rssize) << LOG1024;
++#endif
+ 
+ 	/* Now we get the shared memory. */
+ 
+ 	if (kvm_read (server->machine.kd,
+-		      (unsigned long) pinfo [0].kp_proc.p_vmspace,
++		      (unsigned long) pinfo [0].XXX_P_VMSPACE,
+ 		      (char *) &vmspace, sizeof (vmspace)) != sizeof (vmspace)) {
+ 		glibtop_warn_io_r (server, "kvm_read (vmspace)");
+ 		return;
+@@ -233,17 +257,26 @@
  		/* 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)
++#if defined(__NetBSD__) && (__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;
diff --git a/devel/libgtop2/patches/patch-ah b/devel/libgtop2/patches/patch-ah
index 13d4b6b8eb1..d32061129ae 100644
--- a/devel/libgtop2/patches/patch-ah
+++ b/devel/libgtop2/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/11/04 02:56:17 rh Exp $
+$NetBSD: patch-ah,v 1.2 2003/12/13 20:27:42 xtraeme 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 @@
+--- sysdeps/freebsd/procmap.c.orig	2003-09-07 00:45:14.000000000 +0200
++++ sysdeps/freebsd/procmap.c	2003-09-07 00:51:01.000000000 +0200
+@@ -32,9 +32,21 @@
  #include <sys/param.h>
  #include <sys/proc.h>
  #include <sys/resource.h>
@@ -10,37 +10,87 @@ $NetBSD: patch-ah,v 1.1.1.1 2002/11/04 02:56:17 rh Exp $
  #include <vm/vm_object.h>
  #include <vm/vm_prot.h>
  #include <vm/vm_map.h>
-+#else
++#elif defined(__NetBSD__) && (__NetBSD_Version__ >= 105020000)
 +#include <uvm/uvm_extern.h>
++#else
++#include <vm/vm_object.h>
++#include <vm/vm_map.h>
++#if (__FreeBSD_version >= 400011)
++#include <vm/vm.h>
++#else
++#include <vm/vm_prot.h>
++#endif
 +#endif
  
  #include <sys/vnode.h>
  #include <sys/mount.h>
-@@ -46,9 +50,12 @@
+@@ -46,7 +58,9 @@
  #include <sys/user.h>
  #endif
  #include <sys/sysctl.h>
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000)
++#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)
+ #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
  /* Fixme ... */
- #undef _KERNEL
- #define _UVM_UVM_AMAP_I_H_ 1
-@@ -214,11 +221,13 @@
+@@ -91,8 +105,9 @@
+ 	glibtop_map_entry *maps;
+ #if defined __FreeBSD__
+ 	struct vnode vnode;
++#if __FreeBSD_version >= 500039
+ 	struct inode inode;
+-	struct mount mount;
++#endif
+ #endif
+ 	int count, i = 0;
+ 	int update = 0;
+@@ -114,7 +129,11 @@
+ 	/* Now we get the memory maps. */
+ 
+ 	if (kvm_read (server->machine.kd,
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
++			(unsigned long) pinfo [0].ki_vmspace,
++#else
+ 		      (unsigned long) pinfo [0].kp_proc.p_vmspace,
++#endif 
+ 		      (char *) &vmspace, sizeof (vmspace)) != sizeof (vmspace))
+ 		glibtop_error_io_r (server, "kvm_read (vmspace)");
+ 
+@@ -214,9 +233,10 @@
  #endif
  
  #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;
+ 
+@@ -244,6 +264,15 @@
+ 			      &vnode, sizeof (vnode)) != sizeof (vnode))
+ 			glibtop_error_io_r (server, "kvm_read (vnode)");
  
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 500039)
++               switch (vnode.v_type) {
++                   case VREG:
++                       maps [i-1].inode = vnode.v_cachedid;
++                       maps [i-1].device = vnode.v_cachedfs;
++                   default:
++                   continue;
++               }
++#else
  		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,
+@@ -256,7 +285,7 @@
+ 			      (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
diff --git a/devel/libgtop2/patches/patch-aj b/devel/libgtop2/patches/patch-aj
index fd2d6e5bf73..8db1c0f3a5a 100644
--- a/devel/libgtop2/patches/patch-aj
+++ b/devel/libgtop2/patches/patch-aj
@@ -1,31 +1,13 @@
-$NetBSD: patch-aj,v 1.2 2003/09/27 20:22:33 danw Exp $
+$NetBSD: patch-aj,v 1.3 2003/12/13 20:27:42 xtraeme Exp $
 
---- src/daemon/Makefile.in.orig	Tue Jun 11 07:49:23 2002
-+++ src/daemon/Makefile.in
-@@ -148,7 +148,7 @@ sysdeps_suid_lib = @sysdeps_suid_lib@
- 
- LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
- 
--INCLUDES = $(LIBGTOP_CFLAGS) @INCLUDES@ -D_BSD 				  -DLIBGTOP_COMPILE_SYSTEM=\"`uname -s`\" 				  -DLIBGTOP_COMPILE_RELEASE=\"`uname -r`\" 				  -DLIBGTOP_COMPILE_MACHINE=\"`uname -m`\"
-+INCLUDES = $(LIBGTOP_CFLAGS) @INCLUDES@ -D_BSD 				  -DLIBGTOP_COMPILE_SYSTEM=\""`uname -s`"\" 				  -DLIBGTOP_COMPILE_RELEASE=\""`uname -r`"\" 				  -DLIBGTOP_COMPILE_MACHINE=\""`uname -m`"\"
- 
- @NEED_LIBGTOP_TRUE@suid_sysdeps = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la
- @NEED_LIBGTOP_FALSE@suid_sysdeps = 
-@@ -167,7 +167,7 @@ libgtop_daemon2_LDADD = $(top_builddir)/
- @ENABLE_STATIC_TRUE@libgtop_daemon2_LDFLAGS = -static
- 
- libgtop_server2_SOURCES = server.c slave.c io.c version.c daemon.h
--libgtop_server2_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la 				  $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la
-+libgtop_server2_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la 				  $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la -lintl
- 
- 
- @ENABLE_STATIC_TRUE@libgtop_server2_LDFLAGS = -static
-@@ -298,6 +298,8 @@ clean-libtool:
- distclean-libtool:
- 
- maintainer-clean-libtool:
-+
-+libgtop_server: libgtop_server2
- 
- libgtop_server2$(EXEEXT): $(libgtop_server2_OBJECTS) $(libgtop_server2_DEPENDENCIES)
- 	@rm -f libgtop_server2$(EXEEXT)
+--- src/daemon/Makefile.in.orig	Mon Apr 29 12:05:45 2002
++++ src/daemon/Makefile.in	Mon Apr 29 12:12:14 2002
+@@ -92,7 +92,7 @@
+ LIBGTOP_GUILE_NAMES_LIBS = @LIBGTOP_GUILE_NAMES_LIBS@
+ LIBGTOP_INCS = @LIBGTOP_INCS@
+ LIBGTOP_INTERFACE_AGE = @LIBGTOP_INTERFACE_AGE@
+-LIBGTOP_LIBS = @LIBGTOP_LIBS@
++LIBGTOP_LIBS =
+ LIBGTOP_MAJOR_VERSION = @LIBGTOP_MAJOR_VERSION@
+ LIBGTOP_MICRO_VERSION = @LIBGTOP_MICRO_VERSION@
+ LIBGTOP_MINOR_VERSION = @LIBGTOP_MINOR_VERSION@
diff --git a/devel/libgtop2/patches/patch-ak b/devel/libgtop2/patches/patch-ak
new file mode 100644
index 00000000000..6b563f7b8d0
--- /dev/null
+++ b/devel/libgtop2/patches/patch-ak
@@ -0,0 +1,102 @@
+$NetBSD: patch-ak,v 1.3 2003/12/13 20:27:42 xtraeme Exp $
+
+--- sysdeps/freebsd/proctime.c.orig	Sat Sep  6 20:51:34 2003
++++ sysdeps/freebsd/proctime.c	Sat Sep  6 20:57:26 2003
+@@ -57,6 +57,8 @@
+  * system, and interrupt time usage.
+  */
+ 
++#ifndef __FreeBSD__
++
+ static void
+ calcru(p, up, sp, ip)
+      struct proc *p;
+@@ -66,9 +68,7 @@
+ {
+ 	quad_t totusec;
+ 	u_quad_t u, st, ut, it, tot;
+-#if (__FreeBSD_version < 300003)
+         long sec, usec;
+-#endif
+         struct timeval tv;
+ 
+ 	st = p->p_sticks;
+@@ -117,6 +117,8 @@
+ 	}
+ }
+ 
++#endif /* !__FreeBSD__ */
++
+ /* Provides detailed information about a process. */
+ 
+ void
+@@ -142,7 +144,7 @@
+ 	/* It does not work for the swapper task. */
+ 	if (pid == 0) return;
+ 	
+-#if !(defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000))
++#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000))
+ 	if (server->sysdeps.proc_time == 0)
+ 		return;
+ 
+@@ -157,7 +159,9 @@
+ 	if ((pinfo == NULL) || (count != 1))
+ 		glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
+ 
+-#if (defined __FreeBSD__) && (__FreeBSD_version >= 300003)
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
++	buf->rtime = pinfo [0].ki_runtime;
++#elif (defined __FreeBSD__) && (__FreeBSD_version <= 500013)
+ 	buf->rtime = pinfo [0].kp_proc.p_runtime;
+ #else
+ 	buf->rtime = tv2sec (pinfo [0].kp_proc.p_rtime);
+@@ -192,8 +196,40 @@
+ 
+ 	buf->flags |= _glibtop_sysdeps_proc_time_user;
+ #else
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
++#if __FreeBSD_version >= 500016
++       if ((pinfo [0].ki_flag & PS_INMEM)) {
++#else
++       if ((pinfo [0].ki_flag & P_INMEM)) {
++#endif
++           buf->utime = pinfo [0].ki_runtime;
++           buf->stime = 0; /* XXX */
++           buf->cutime = tv2sec (pinfo [0].ki_childtime);
++           buf->cstime = 0; /* XXX */
++           buf->start_time = tv2sec (pinfo [0].ki_start);
++           buf->flags = _glibtop_sysdeps_proc_time_user;
++       }
++
+ 	glibtop_suid_enter (server);
+ 
++#elif (__FreeBSD_version <= 500013)
++
++        if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
++            kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
++                       (unsigned long) &u_addr->u_stats,
++                       (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
++		{
++
++                       buf->utime = tv2sec (pinfo[0].kp_eproc.e_stats.p_ru.ru_utime);
++                       buf->stime = tv2sec (pinfo[0].kp_eproc.e_stats.p_ru.ru_stime);
++                       buf->cutime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_utime);
++                       buf->cstime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_stime);
++                       buf->start_time = tv2sec (pinfo[0].kp_eproc.e_stats.p_start);
++                       buf->flags = _glibtop_sysdeps_proc_time_user;
++                       glibtop_suid_leave (server);
++		}
++#else
++
+ 	if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
+ 	    kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
+ 		       (unsigned long) &u_addr->u_stats,
+@@ -222,7 +258,7 @@
+ 
+ 			buf->flags = _glibtop_sysdeps_proc_time_user;
+ 		}
+-
++#endif
+ 	glibtop_suid_leave (server);
+ #endif
+ }
diff --git a/devel/libgtop2/patches/patch-al b/devel/libgtop2/patches/patch-al
index 4e95f2761e7..39d5be0d874 100644
--- a/devel/libgtop2/patches/patch-al
+++ b/devel/libgtop2/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.2 2003/01/21 20:08:09 rh Exp $
+$NetBSD: patch-al,v 1.3 2003/12/13 20:27:42 xtraeme Exp $
 
---- sysdeps/freebsd/prockernel.c.orig	Tue Jun 11 07:34:42 2002
-+++ sysdeps/freebsd/prockernel.c
-@@ -34,7 +34,7 @@
+--- sysdeps/freebsd/prockernel.c.orig	Sat Sep  6 00:34:15 2003
++++ sysdeps/freebsd/prockernel.c	Sat Sep  6 00:45:41 2003
+@@ -34,12 +34,9 @@
  #if (!defined __OpenBSD__) && (!defined __bsdi__)
  #include <sys/user.h>
  #endif
@@ -10,8 +10,13 @@ $NetBSD: patch-al,v 1.2 2003/01/21 20:08:09 rh Exp $
 +#if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__)) && !defined(__NetBSD__)
  #include <machine/pcb.h>
  #endif
- #if defined(__FreeBSD__) && !defined(__alpha__)
-@@ -48,6 +48,22 @@
+-#if defined(__FreeBSD__) && !defined(__alpha__)
+-#include <machine/tss.h>
+-#endif
+ 
+ #include <unistd.h>
+ #include <fcntl.h>
+@@ -48,6 +45,23 @@
  #include <osreldate.h>
  #endif
  
@@ -31,26 +36,63 @@ $NetBSD: patch-al,v 1.2 2003/01/21 20:08:09 rh Exp $
 +#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 +117,7 @@ glibtop_get_proc_kernel_p (glibtop *serv
+@@ -78,9 +92,11 @@
+ 			   pid_t pid)
+ {
+ 	struct kinfo_proc *pinfo;
++#ifndef __FreeBSD__
+ 	struct user *u_addr = (struct user *)USRSTACK;
+ 	struct pstats pstats;
+ 	struct pcb pcb;
++#endif
+ 	int count;
+ 
+ 	char filename [BUFSIZ];
+@@ -101,17 +117,36 @@
  	if ((pinfo == NULL) || (count != 1))
  		glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
  
+-	buf->nwchan = (unsigned long) pinfo [0].kp_proc.p_wchan &~ KERNBASE;
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
++
++#define	XXX_P_WCHAN	ki_wchan
++#define	XXX_P_WMESG	ki_wmesg
++#define	XXX_E_WMESG	ki_wmesg
++
++#else
++
++#define	XXX_P_WCHAN	kp_proc.p_wchan
++#define	XXX_P_WMESG	kp_proc.p_wmesg
++#define	XXX_E_WMESG	kp_eproc.e_wmesg
++
++#endif
++
 +#if !defined(__NetBSD__) || !defined(SACTIVE)
- 	buf->nwchan = (unsigned long) pinfo [0].kp_proc.p_wchan &~ KERNBASE;
++	buf->nwchan = (unsigned long) pinfo [0].XXX_P_WCHAN &~ KERNBASE;
++
  	buf->flags |= (1L << GLIBTOP_PROC_KERNEL_NWCHAN);
  
-@@ -112,6 +129,7 @@ glibtop_get_proc_kernel_p (glibtop *serv
+-	if (pinfo [0].kp_proc.p_wchan && pinfo [0].kp_proc.p_wmesg) {
+-		strncpy (buf->wchan, pinfo [0].kp_eproc.e_wmesg,
++	if (pinfo [0].XXX_P_WCHAN && pinfo [0].XXX_P_WMESG) {
++		strncpy (buf->wchan, pinfo [0].XXX_E_WMESG,
+ 			 sizeof (buf->wchan) - 1);
+ 		buf->wchan [sizeof (buf->wchan) - 1] = 0;
+ 		buf->flags |= (1L << GLIBTOP_PROC_KERNEL_WCHAN);
  	} else {
  		buf->wchan [0] = 0;
  	}
 +#endif
++
++#ifndef __FreeBSD__
  
  	/* Taken from `saveuser ()' in `/usr/src/bin/ps/ps.c'. */
  
-@@ -129,8 +147,16 @@ glibtop_get_proc_kernel_p (glibtop *serv
+@@ -129,8 +164,17 @@
  
  	glibtop_suid_enter (server);
  
@@ -61,13 +103,14 @@ $NetBSD: patch-al,v 1.2 2003/01/21 20:08:09 rh Exp $
 +
 +	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))
  		{
-@@ -149,8 +175,12 @@ glibtop_get_proc_kernel_p (glibtop *serv
+@@ -149,8 +193,12 @@
  			buf->flags |= _glibtop_sysdeps_proc_kernel_pstats;
  		}
  
@@ -80,7 +123,7 @@ $NetBSD: patch-al,v 1.2 2003/01/21 20:08:09 rh Exp $
  		       (unsigned long) &u_addr->u_pcb,
  		       (char *) &pcb, sizeof (pcb)) == sizeof (pcb))
  		{
-@@ -167,16 +197,42 @@ glibtop_get_proc_kernel_p (glibtop *serv
+@@ -167,18 +215,52 @@
  			/*xxx FreeBSD/Alpha? */
  #endif
  #else
@@ -91,6 +134,7 @@ $NetBSD: patch-al,v 1.2 2003/01/21 20:08:09 rh Exp $
  #else
  			buf->kstk_eip = (u_int64_t) pcb.pcb_tss.__tss_eip;
  #endif
+-
 +#else
 +#if defined(__NetBSD__)
 +#if defined(__m68k__)
@@ -114,12 +158,23 @@ $NetBSD: patch-al,v 1.2 2003/01/21 20:08:09 rh Exp $
 +			buf->kstk_eip = (u_int64_t) 0;
 +#endif /* ${MACHINE_ARCH} */
 +#endif /* __NetBSD__ */
- 
  			buf->flags |= _glibtop_sysdeps_proc_kernel_pcb;
  #endif
 +#endif
  		}
+-
 +#endif
- 
  	/* Taken from `wchan ()' in `/usr/src/bin/ps/print.c'. */
  
+ 	glibtop_suid_leave (server);
++
++#else	
++	/* XXX: the code here was, quite frankly, junk, and almost
++	 * certainly wrong - remove it all, leave these fields
++	 * unpopulated, and give up until such time as the right
++	 * code is produced for both FreeBSD 4.x and 5.x
++	 */
++	return;
++#endif /* __FreeBSD__ */
++
+ }
diff --git a/devel/libgtop2/patches/patch-am b/devel/libgtop2/patches/patch-am
index ea05da91cc5..b4b3b507d57 100644
--- a/devel/libgtop2/patches/patch-am
+++ b/devel/libgtop2/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.2 2003/01/21 20:08:10 rh Exp $
+$NetBSD: patch-am,v 1.3 2003/12/13 20:27:42 xtraeme Exp $
 
---- sysdeps/freebsd/procstate.c.orig	Tue Jun 11 07:34:42 2002
-+++ sysdeps/freebsd/procstate.c
-@@ -37,11 +37,7 @@ static const unsigned long _glibtop_sysd
+--- sysdeps/freebsd/procstate.c.orig	Fri Sep  5 23:39:12 2003
++++ sysdeps/freebsd/procstate.c	Fri Sep  5 23:45:03 2003
+@@ -37,11 +37,7 @@
  (1L << GLIBTOP_PROC_STATE_GID);
  
  static const unsigned long _glibtop_sysdeps_proc_state_new =
@@ -14,19 +14,51 @@ $NetBSD: patch-am,v 1.2 2003/01/21 20:08:10 rh Exp $
  
  /* Init function. */
  
-@@ -82,11 +78,6 @@ glibtop_get_proc_state_p (glibtop *serve
- 	buf->uid = pinfo [0].kp_eproc.e_pcred.p_svuid;
- 	buf->gid = pinfo [0].kp_eproc.e_pcred.p_svgid;
+@@ -76,32 +72,47 @@
+ 		return;
+ 	}
+ 
+-	strncpy (buf->cmd, pinfo [0].kp_proc.p_comm, sizeof (buf->cmd)-1);
+-	buf->cmd [sizeof (buf->cmd)-1] = 0;
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
++#define	XXX_P_COMM	ki_comm
++#define	XXX_P_SVUID	ki_svuid
++#define	XXX_P_SVGID	ki_svgid
++#define	XXX_P_RUID	ki_ruid
++#define	XXX_P_RGID	ki_rgid
++#define XXX_P_STAT	ki_stat
+ 
+-	buf->uid = pinfo [0].kp_eproc.e_pcred.p_svuid;
+-	buf->gid = pinfo [0].kp_eproc.e_pcred.p_svgid;
++#else
++#define	XXX_P_COMM	kp_proc.p_comm
++#define	XXX_P_SVUID	kp_eproc.e_pcred.p_svuid
++#define	XXX_P_SVGID	kp_eproc.e_pcred.p_svgid
++#define	XXX_P_RUID	kp_eproc.e_pcred.p_ruid
++#define	XXX_P_RGID	kp_eproc.e_pcred.p_rgid
++#define	XXX_P_STAT	kp_proc.p_stat
  
 -#if LIBGTOP_VERSION_CODE >= 1001000
 -	buf->ruid = pinfo [0].kp_eproc.e_pcred.p_ruid;
 -	buf->rgid = pinfo [0].kp_eproc.e_pcred.p_rgid;
--#endif
--
+ #endif
+ 
++	strncpy (buf->cmd, pinfo [0].XXX_P_COMM, sizeof (buf->cmd)-1);
++	buf->cmd [sizeof (buf->cmd)-1] = 0;
++
++	buf->uid = pinfo [0].XXX_P_SVUID;
++	buf->gid = pinfo [0].XXX_P_SVGID;
++
  	/* Set the flags for the data we're about to return*/
  	buf->flags = _glibtop_sysdeps_proc_state |
  		_glibtop_sysdeps_proc_state_new;
-@@ -99,9 +90,11 @@ glibtop_get_proc_state_p (glibtop *serve
+ 
+ #if LIBGTOP_VERSION_CODE >= 1001000
+-	switch (pinfo [0].kp_proc.p_stat) {
++	switch (pinfo [0].XXX_P_STAT) {
+ 	case SIDL:
+ 		buf->state = 0;
+ 		break;
  	case SRUN:
  		buf->state = GLIBTOP_PROCESS_RUNNING;
  		break;
@@ -38,7 +70,15 @@ $NetBSD: patch-am,v 1.2 2003/01/21 20:08:10 rh Exp $
  	case SSTOP:
  		buf->state = GLIBTOP_PROCESS_STOPPED;
  		break;
-@@ -119,9 +112,11 @@ glibtop_get_proc_state_p (glibtop *serve
+@@ -112,16 +123,18 @@
+ 		return;
+ 	}
+ #else
+-	switch (pinfo [0].kp_proc.p_stat) {
++	switch (pinfo [0].XXX_P_STAT) {
+ 	case SIDL:
+ 		buf->state = 'S';
+ 		break;
  	case SRUN:
  		buf->state = 'R';
  		break;
diff --git a/devel/libgtop2/patches/patch-an b/devel/libgtop2/patches/patch-an
index 15c8cc150a0..b551a957081 100644
--- a/devel/libgtop2/patches/patch-an
+++ b/devel/libgtop2/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.2 2003/01/21 20:08:10 rh Exp $
+$NetBSD: patch-an,v 1.3 2003/12/13 20:27:42 xtraeme Exp $
 
---- sysdeps/freebsd/procuid.c.orig	Tue Jun 11 07:34:42 2002
-+++ sysdeps/freebsd/procuid.c
-@@ -35,15 +35,7 @@ static const unsigned long _glibtop_sysd
+--- sysdeps/freebsd/procuid.c.orig	Fri Sep  5 23:46:58 2003
++++ sysdeps/freebsd/procuid.c	Fri Sep  5 23:51:37 2003
+@@ -35,15 +35,7 @@
  (1L << GLIBTOP_PROC_UID_NICE);
  
  static const unsigned long _glibtop_sysdeps_proc_uid_groups =
@@ -18,14 +18,63 @@ $NetBSD: patch-an,v 1.2 2003/01/21 20:08:10 rh Exp $
  
  /* Init function. */
  
-@@ -94,14 +86,18 @@ glibtop_get_proc_uid_p (glibtop *server,
- 	buf->tpgid = pinfo [0].kp_eproc.e_tpgid;
+@@ -84,24 +76,57 @@
+ 		return;
+ 	}
  
- 	buf->nice     = pinfo [0].kp_proc.p_nice;
+-	buf->uid  = pinfo [0].kp_eproc.e_pcred.p_ruid;
+-	buf->euid = pinfo [0].kp_eproc.e_pcred.p_svuid;
+-	buf->gid  = pinfo [0].kp_eproc.e_pcred.p_rgid;
+-	buf->egid = pinfo [0].kp_eproc.e_pcred.p_svgid;
+-
+-	buf->ppid  = pinfo [0].kp_eproc.e_ppid;
+-	buf->pgrp  = pinfo [0].kp_eproc.e_pgid;
+-	buf->tpgid = pinfo [0].kp_eproc.e_tpgid;
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
++
++#define	XXX_P_RUID	ki_ruid
++#define	XXX_P_SVUID	ki_svuid
++#define	XXX_P_RGID	ki_rgid
++#define	XXX_P_SVGID	ki_svgid
++#define	XXX_E_PPID	ki_ppid
++#define	XXX_E_PGID	ki_pgid
++#define	XXX_E_TPGID	ki_tpgid
++#define	XXX_P_NICE	ki_nice
++#if __FreeBSD_version >= 500013
++#define	XXX_P_PRIORITY	ki_pri.pri_user
++#else
++#define	XXX_P_PRIORITY	ki_priority
++#endif
++#else
++
++#define	XXX_P_RUID	kp_eproc.e_pcred.p_ruid
++#define	XXX_P_SVUID	kp_eproc.e_pcred.p_svuid
++#define	XXX_P_RGID	kp_eproc.e_pcred.p_rgid
++#define	XXX_P_SVGID	kp_eproc.e_pcred.p_svgid
++#define	XXX_E_PPID	kp_eproc.e_ppid
++#define	XXX_E_PGID	kp_eproc.e_pgid
++#define	XXX_E_TPGID	kp_eproc.e_tpgid
++#define	XXX_P_NICE	kp_proc.p_nice
++#define	XXX_P_PRIORITY	kp_proc.p_priority
++
++#endif
+ 
+-	buf->nice     = pinfo [0].kp_proc.p_nice;
+-	buf->priority = pinfo [0].kp_proc.p_priority;
++	buf->uid  = pinfo [0].XXX_P_RUID;
++	buf->euid = pinfo [0].XXX_P_SVUID;
++	buf->gid  = pinfo [0].XXX_P_RGID;
++	buf->egid = pinfo [0].XXX_P_SVGID;
++
++	buf->ppid  = pinfo [0].XXX_E_PPID;
++	buf->pgrp  = pinfo [0].XXX_E_PGID;
++	buf->tpgid = pinfo [0].XXX_E_TPGID;
++
++	buf->nice     = pinfo [0].XXX_P_NICE;
 +#if defined(__NetBSD__) && defined(SACTIVE)
 +	buf->priority = 0;
 +#else
- 	buf->priority = pinfo [0].kp_proc.p_priority;
++	buf->priority = pinfo [0].XXX_P_PRIORITY;
 +#endif
  
  	/* Set the flags for the data we're about to return*/
diff --git a/devel/libgtop2/patches/patch-ao b/devel/libgtop2/patches/patch-ao
index da6c7f5d2b7..9497fe7dd58 100644
--- a/devel/libgtop2/patches/patch-ao
+++ b/devel/libgtop2/patches/patch-ao
@@ -1,13 +1,83 @@
-$NetBSD: patch-ao,v 1.1 2003/01/11 11:22:31 jmmv Exp $
+$NetBSD: patch-ao,v 1.2 2003/12/13 20:27:42 xtraeme Exp $
 
---- libgtop-2.0.pc.in.orig	Mon Jun 10 23:34:52 2002
-+++ libgtop-2.0.pc.in
-@@ -7,7 +7,7 @@ Name: libgtop
- Description: Portable System Access Library
- Requires: glib-2.0
- Version: @VERSION@
--Libs: -L${libdir} @LIBGTOP_LIBS@
-+Libs: -L${libdir} @LIBGTOP_LIBS@ @LIBGTOP_EXTRA_LIBS@
- Cflags: -I${includedir}/libgtop-2.0
+--- sysdeps/freebsd/netload.c.orig	Mon Oct 20 01:55:32 2003
++++ sysdeps/freebsd/netload.c	Fri Nov 14 23:09:15 2003
+@@ -83,6 +83,7 @@
+     u_long ifnetaddr, ifnetfound, ifaddraddr;
+     struct sockaddr *sa;
+     char tname [16];
++    char temp [16];
  
+     union {
+ 	struct ifaddr ifa;
+@@ -109,10 +110,13 @@
+ 			  sizeof (ifnet)) != sizeof (ifnet))
+ 		    glibtop_error_io_r (server, "kvm_read (ifnetaddr)");
  
+-#if defined(__FreeBSD__) || defined(__bsdi__)
++#if (defined(__FreeBSD__) && (__FreeBSD_version < 501113)) || defined(__bsdi__)
+ 	    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;
+ #else
+ 	    strncpy (tname, ifnet.if_xname, 16);
+ 	    tname [15] = 0;
+@@ -140,39 +144,39 @@
+ 		sin = (struct sockaddr_in *)sa;
+ 
+ 		if (ifnet.if_flags & IFF_UP)
+-			buf->if_flags |= GLIBTOP_IF_FLAGS_UP;
++			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_UP);
+ 		if (ifnet.if_flags & IFF_BROADCAST)
+-			buf->if_flags |= GLIBTOP_IF_FLAGS_BROADCAST;
++			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_BROADCAST);
+ 		if (ifnet.if_flags & IFF_DEBUG)
+-			buf->if_flags |= GLIBTOP_IF_FLAGS_DEBUG;
++			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_DEBUG);
+ 		if (ifnet.if_flags & IFF_LOOPBACK)
+-			buf->if_flags |= GLIBTOP_IF_FLAGS_LOOPBACK;
++			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LOOPBACK);
+ 		if (ifnet.if_flags & IFF_POINTOPOINT)
+-			buf->if_flags |= GLIBTOP_IF_FLAGS_POINTOPOINT;
++			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_POINTOPOINT);
+ 		if (ifnet.if_flags & IFF_RUNNING)
+-			buf->if_flags |= GLIBTOP_IF_FLAGS_RUNNING;
++			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_RUNNING);
+ 		if (ifnet.if_flags & IFF_NOARP)
+-			buf->if_flags |= GLIBTOP_IF_FLAGS_NOARP;
++			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_NOARP);
+ 		if (ifnet.if_flags & IFF_PROMISC)
+-			buf->if_flags |= GLIBTOP_IF_FLAGS_PROMISC;
++			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_PROMISC);
+ 		if (ifnet.if_flags & IFF_ALLMULTI)
+-			buf->if_flags |= GLIBTOP_IF_FLAGS_ALLMULTI;
++			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALLMULTI);
+ 		if (ifnet.if_flags & IFF_OACTIVE)
+-			buf->if_flags |= GLIBTOP_IF_FLAGS_OACTIVE;
++			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_OACTIVE);
+ 		if (ifnet.if_flags & IFF_SIMPLEX)
+-			buf->if_flags |= GLIBTOP_IF_FLAGS_SIMPLEX;
++			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_SIMPLEX);
+ 		if (ifnet.if_flags & IFF_LINK0)
+-			buf->if_flags |= GLIBTOP_IF_FLAGS_LINK0;
++			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK0);
+ 		if (ifnet.if_flags & IFF_LINK1)
+-			buf->if_flags |= GLIBTOP_IF_FLAGS_LINK1;
++			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK1);
+ 		if (ifnet.if_flags & IFF_LINK2)
+-			buf->if_flags |= GLIBTOP_IF_FLAGS_LINK2;
++			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK2);
+ #ifdef __FreeBSD__
+ 		if (ifnet.if_flags & IFF_ALTPHYS)
+-			buf->if_flags |= GLIBTOP_IF_FLAGS_ALTPHYS;
++			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALTPHYS);
+ #endif
+ 		if (ifnet.if_flags & IFF_MULTICAST)
+-			buf->if_flags |= GLIBTOP_IF_FLAGS_MULTICAST;
++			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_MULTICAST);
+ 
+ #if !defined(__bsdi__)
+ 		/* Commenting out to "fix" #13345. */
diff --git a/devel/libgtop2/patches/patch-aq b/devel/libgtop2/patches/patch-aq
new file mode 100644
index 00000000000..e4f5000d44b
--- /dev/null
+++ b/devel/libgtop2/patches/patch-aq
@@ -0,0 +1,32 @@
+$NetBSD: patch-aq,v 1.1 2003/12/13 20:27:42 xtraeme Exp $
+
+--- sysdeps/freebsd/proclist.c.orig	Fri Sep  5 23:30:45 2003
++++ sysdeps/freebsd/proclist.c	Fri Sep  5 23:35:54 2003
+@@ -86,13 +86,24 @@
+ 	pids = glibtop_realloc_r (server, pids, count * sizeof (unsigned));
+ 	/* Copy the pids over to this chain */
+ 	for (i=j=0; i < count; i++) {
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
++#define XXX_P_STAT	ki_stat
++#define XXX_P_RUID	ki_ruid
++#define XXX_P_PID	ki_pid
++
++#else
++#define XXX_P_STAT	kp_proc.p_stat
++#define XXX_P_RUID	kp_eproc.e_pcred.p_ruid
++#define XXX_P_PID	kp_proc.p_pid
++
++#endif
+ 		if ((real_which & GLIBTOP_EXCLUDE_IDLE) &&
+-		    (pinfo[i].kp_proc.p_stat != SRUN))
++			(pinfo[i].XXX_P_STAT != SRUN))
+ 			continue;
+ 		else if ((real_which & GLIBTOP_EXCLUDE_SYSTEM) &&
+-			 (pinfo[i].kp_eproc.e_pcred.p_ruid == 0))
++			(pinfo[i].XXX_P_RUID == 0))
+ 			continue;
+-		pids [j++] = (unsigned) pinfo[i].kp_proc.p_pid;
++		pids [j++] = (unsigned) pinfo[i].XXX_P_PID;
+ 	} /* end for */
+ 	/* Set the fields in buf */
+ 	buf->number = j;