diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index b70d50f2514..4edde963252 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.30 2006/11/11 21:04:27 steven Exp $
+# $OpenBSD: Makefile,v 1.31 2007/02/21 17:27:53 steven Exp $
 
 COMMENT=		"portable library for obtaining system information"
 
 DISTNAME=		libgtop-1.0.13
-PKGNAME=		${DISTNAME}p4
+PKGNAME=		${DISTNAME}p5
 SHARED_LIBS +=	gnomesupport         0.0      # .0.0
 SHARED_LIBS +=	gtop_sysdeps         1.12     # .1.12
 SHARED_LIBS +=	gtop_sysdeps_suid    1.12     # .1.12
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index 57524378350..0ee674c767a 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1,4 +1,5 @@
 MD5 (libgtop-1.0.13.tar.gz) = 305abba436c212f50d4be28464a14452
 RMD160 (libgtop-1.0.13.tar.gz) = 45e480f9fa9d5fc9d30c7a23afee8343d7f7c764
 SHA1 (libgtop-1.0.13.tar.gz) = 6cb381fcb2e1cf6af85fb1066a9ac7c4cab41b1b
+SHA256 (libgtop-1.0.13.tar.gz) = 226234b33995f46844719ca51c8898ae11e698a3d06b4f0ed4fd88fb0a654308
 SIZE (libgtop-1.0.13.tar.gz) = 1055646
diff --git a/devel/libgtop/patches/patch-doc_libgtop_texi b/devel/libgtop/patches/patch-doc_libgtop_texi
index 210e869bc78..6095a895db9 100644
--- a/devel/libgtop/patches/patch-doc_libgtop_texi
+++ b/devel/libgtop/patches/patch-doc_libgtop_texi
@@ -1,6 +1,6 @@
-$OpenBSD: patch-doc_libgtop_texi,v 1.1 2004/08/09 15:01:56 espie Exp $
---- doc/libgtop.texi.orig	Mon Aug  9 16:53:10 2004
-+++ doc/libgtop.texi	Mon Aug  9 16:55:14 2004
+$OpenBSD: patch-doc_libgtop_texi,v 1.2 2007/02/21 17:27:54 steven Exp $
+--- doc/libgtop.texi.orig	Mon Nov 26 23:37:58 2001
++++ doc/libgtop.texi	Sun Feb 18 18:38:17 2007
 @@ -8,6 +8,12 @@
  @include auto-macros.texi
  @include version.texi
@@ -8,7 +8,7 @@ $OpenBSD: patch-doc_libgtop_texi,v 1.1 2004/08/09 15:01:56 espie Exp $
 +@ifnottex
 +@dircategory Programming & development tools
 +@direntry
-+* libgtop (libgtop).		libgtop programming manual
++* libgtop: (libgtop).		libgtop programming manual
 +@end direntry
 +@end ifnottex
  @ifinfo
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index be7a692e3e0..e4f191ca8b3 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2007/02/03 11:42:18 sturm Exp $
+# $OpenBSD: Makefile,v 1.25 2007/02/21 17:27:54 steven Exp $
 
 COMMENT=		"portable library for obtaining system information"
 
 V=			2.14.6
 DISTNAME=		libgtop-${V}
-PKGNAME=		libgtop2-${V}
+PKGNAME=		libgtop2-${V}p0
 SHARED_LIBS=		gtop-2.0	6.0	# .7.0
 
 CATEGORIES=		devel
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index 0a20b3f0909..32a06983c93 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1,4 +1,5 @@
 MD5 (libgtop-2.14.6.tar.bz2) = 4aa425a6b66b976be6f364904eeda78a
 RMD160 (libgtop-2.14.6.tar.bz2) = 81c0544d43b680db33ba92e54ef4688a6ed4063b
 SHA1 (libgtop-2.14.6.tar.bz2) = bf43697d8b9abcdcbe1d9a9feed488d6fd130ebf
+SHA256 (libgtop-2.14.6.tar.bz2) = 2d3fc614e2a49e32701037b3245d233b5b44ac5dd0f61db9f09d7c8635792f39
 SIZE (libgtop-2.14.6.tar.bz2) = 758165
diff --git a/devel/libgtop2/patches/patch-doc_ligtop2_texi b/devel/libgtop2/patches/patch-doc_libgtop2_texi
similarity index 50%
rename from devel/libgtop2/patches/patch-doc_ligtop2_texi
rename to devel/libgtop2/patches/patch-doc_libgtop2_texi
index 2b83b95e5dc..010bc350082 100644
--- a/devel/libgtop2/patches/patch-doc_ligtop2_texi
+++ b/devel/libgtop2/patches/patch-doc_libgtop2_texi
@@ -1,6 +1,6 @@
-$OpenBSD: patch-doc_ligtop2_texi,v 1.1 2007/01/18 19:31:34 jasper Exp $
---- doc/libgtop2.texi	2006-09-22 15:39:45.000000000 +0200
-+++ doc/libgtop2.texi	2006-09-22 15:40:06.000000000 +0200
+$OpenBSD: patch-doc_libgtop2_texi,v 1.1 2007/02/21 17:27:54 steven Exp $
+--- doc/libgtop2.texi.orig	Tue Jan  2 23:50:28 2007
++++ doc/libgtop2.texi	Sun Feb 18 20:23:18 2007
 @@ -7,6 +7,12 @@
  
  @include version.texi
@@ -8,7 +8,7 @@ $OpenBSD: patch-doc_ligtop2_texi,v 1.1 2007/01/18 19:31:34 jasper Exp $
 +@ifnottex
 +@dircategory Programming & development tools
 +@direntry
-+* libgtop2 (libgtop2).		libgtop2 programming manual
++* libgtop2: (libgtop2).		libgtop2 programming manual
 +@end direntry
 +@end ifnottex
  @ifinfo
diff --git a/devel/libgtop2/patches/patch-lib_open_c b/devel/libgtop2/patches/patch-lib_open_c
index 47b419c7369..455d3bc22b7 100644
--- a/devel/libgtop2/patches/patch-lib_open_c
+++ b/devel/libgtop2/patches/patch-lib_open_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-lib_open_c,v 1.3 2007/01/18 19:31:34 jasper Exp $
---- lib/open.c	2006-09-22 15:39:45.000000000 +0200
-+++ lib/open.c	2006-09-22 15:56:00.000000000 +0200
-@@ -112,7 +112,7 @@
+$OpenBSD: patch-lib_open_c,v 1.4 2007/02/21 17:27:54 steven Exp $
+--- lib/open.c.orig	Tue Jan  2 23:50:29 2007
++++ lib/open.c	Sun Feb 18 20:23:18 2007
+@@ -112,7 +112,7 @@ glibtop_open_l (glibtop *server, const c
  			close (server->input [0]); close (server->output [1]);
  			dup2 (server->input [1], 1);
  			dup2 (server->output [0], 0);
diff --git a/devel/libgtop2/patches/patch-src_daemon_gnuserv_c b/devel/libgtop2/patches/patch-src_daemon_gnuserv_c
index 94e2b04f3fe..4152eff3bde 100644
--- a/devel/libgtop2/patches/patch-src_daemon_gnuserv_c
+++ b/devel/libgtop2/patches/patch-src_daemon_gnuserv_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_daemon_gnuserv_c,v 1.1 2007/01/18 19:31:34 jasper Exp $
---- src/daemon/gnuserv.c	2006-09-22 15:39:45.000000000 +0200
-+++ src/daemon/gnuserv.c	2006-09-22 16:08:41.000000000 +0200
-@@ -207,6 +207,12 @@
+$OpenBSD: patch-src_daemon_gnuserv_c,v 1.2 2007/02/21 17:27:54 steven Exp $
+--- src/daemon/gnuserv.c.orig	Tue Jan  2 23:50:27 2007
++++ src/daemon/gnuserv.c	Sun Feb 18 20:23:18 2007
+@@ -207,6 +207,12 @@ permitted (u_long host_addr, int fd)
  	    return FALSE;
  	}
  
diff --git a/devel/libgtop2/patches/patch-sysdeps_freebsd_procmap_c b/devel/libgtop2/patches/patch-sysdeps_freebsd_procmap_c
index 924a1566a42..4a7439f2880 100644
--- a/devel/libgtop2/patches/patch-sysdeps_freebsd_procmap_c
+++ b/devel/libgtop2/patches/patch-sysdeps_freebsd_procmap_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-sysdeps_freebsd_procmap_c,v 1.5 2007/01/18 19:31:34 jasper Exp $
---- sysdeps/freebsd/procmap.c	Mon Dec 12 11:09:39 2005
-+++ sysdeps/freebsd/procmap.c	Fri Sep 22 16:53:54 2006
+$OpenBSD: patch-sysdeps_freebsd_procmap_c,v 1.6 2007/02/21 17:27:54 steven Exp $
+--- sysdeps/freebsd/procmap.c.orig	Tue Jan  2 23:50:28 2007
++++ sysdeps/freebsd/procmap.c	Sun Feb 18 20:23:18 2007
 @@ -36,7 +36,7 @@
  #include <vm/vm_object.h>
  #include <vm/vm_prot.h>
@@ -24,7 +24,7 @@ $OpenBSD: patch-sysdeps_freebsd_procmap_c,v 1.5 2007/01/18 19:31:34 jasper Exp $
  /* Fixme ... */
  #undef _KERNEL
  #define _UVM_UVM_AMAP_I_H_ 1
-@@ -102,7 +102,7 @@
+@@ -102,7 +102,7 @@ glibtop_get_proc_map_p (glibtop *server,
  	struct kinfo_proc *pinfo;
  	struct vm_map_entry entry, *first;
  	struct vmspace vmspace;
@@ -33,7 +33,7 @@ $OpenBSD: patch-sysdeps_freebsd_procmap_c,v 1.5 2007/01/18 19:31:34 jasper Exp $
  	struct vnode vnode;
  	struct inode inode;
  #else
-@@ -167,7 +167,7 @@
+@@ -167,7 +167,7 @@ glibtop_get_proc_map_p (glibtop *server,
  
  	/* I tested this a few times with `mmap'; as soon as you write
  	 * to the mmap'ed area, the object type changes from OBJT_VNODE
@@ -42,7 +42,7 @@ $OpenBSD: patch-sysdeps_freebsd_procmap_c,v 1.5 2007/01/18 19:31:34 jasper Exp $
  
  	do {
  		if (update) {
-@@ -188,7 +188,7 @@
+@@ -188,7 +188,7 @@ glibtop_get_proc_map_p (glibtop *server,
   			continue;
  #endif
  #else
@@ -51,7 +51,7 @@ $OpenBSD: patch-sysdeps_freebsd_procmap_c,v 1.5 2007/01/18 19:31:34 jasper Exp $
   		if (UVM_ET_ISSUBMAP (&entry))
  			continue;
  #else
-@@ -214,7 +214,7 @@
+@@ -214,7 +214,7 @@ glibtop_get_proc_map_p (glibtop *server,
  
  		i++;
  
@@ -60,7 +60,7 @@ $OpenBSD: patch-sysdeps_freebsd_procmap_c,v 1.5 2007/01/18 19:31:34 jasper Exp $
  		if (!entry.object.uvm_obj)
  			continue;
  
-@@ -238,7 +238,7 @@
+@@ -238,7 +238,7 @@ glibtop_get_proc_map_p (glibtop *server,
  			glibtop_error_io_r (server, "kvm_read (object)");
  #endif
  
diff --git a/devel/libgtop2/patches/patch-sysdeps_freebsd_sem_limits_c b/devel/libgtop2/patches/patch-sysdeps_freebsd_sem_limits_c
index 9d9cb920a62..9c3785c3d89 100644
--- a/devel/libgtop2/patches/patch-sysdeps_freebsd_sem_limits_c
+++ b/devel/libgtop2/patches/patch-sysdeps_freebsd_sem_limits_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-sysdeps_freebsd_sem_limits_c,v 1.4 2007/01/18 19:31:34 jasper Exp $
---- sysdeps/freebsd/sem_limits.c	Mon Dec 12 11:09:39 2005
-+++ sysdeps/freebsd/sem_limits.c	Fri Sep 22 16:49:16 2006
-@@ -57,7 +57,10 @@
+$OpenBSD: patch-sysdeps_freebsd_sem_limits_c,v 1.5 2007/02/21 17:27:54 steven Exp $
+--- sysdeps/freebsd/sem_limits.c.orig	Tue Jan  2 23:50:28 2007
++++ sysdeps/freebsd/sem_limits.c	Sun Feb 18 20:23:18 2007
+@@ -57,7 +57,10 @@ glibtop_get_sem_limits_p (glibtop *serve
  #include <sys/sem.h>
  
  static unsigned long _glibtop_sysdeps_sem_limits =
@@ -13,7 +13,7 @@ $OpenBSD: patch-sysdeps_freebsd_sem_limits_c,v 1.4 2007/01/18 19:31:34 jasper Ex
  (1L << GLIBTOP_IPC_SEMMNS) + (1L << GLIBTOP_IPC_SEMMNU) +
  (1L << GLIBTOP_IPC_SEMMSL) + (1L << GLIBTOP_IPC_SEMOPM) +
  (1L << GLIBTOP_IPC_SEMUME) + (1L << GLIBTOP_IPC_SEMUSZ) +
-@@ -105,7 +108,9 @@
+@@ -105,7 +108,9 @@ glibtop_get_sem_limits_p (glibtop *serve
  	if (server->sysdeps.sem_limits == 0)
  		return;
  
diff --git a/devel/libgtop2/patches/patch-sysdeps_freebsd_sysinfo_c b/devel/libgtop2/patches/patch-sysdeps_freebsd_sysinfo_c
index d1b8db11880..2f99e6d1443 100644
--- a/devel/libgtop2/patches/patch-sysdeps_freebsd_sysinfo_c
+++ b/devel/libgtop2/patches/patch-sysdeps_freebsd_sysinfo_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-sysdeps_freebsd_sysinfo_c,v 1.1 2007/01/18 19:31:34 jasper Exp $
---- sysdeps/freebsd/sysinfo.c	Fri Sep 22 17:51:40 2006
-+++ sysdeps/freebsd/sysinfo.c	Fri Sep 22 20:30:24 2006
-@@ -45,14 +45,22 @@
+$OpenBSD: patch-sysdeps_freebsd_sysinfo_c,v 1.2 2007/02/21 17:27:54 steven Exp $
+--- sysdeps/freebsd/sysinfo.c.orig	Tue Jan  2 23:50:28 2007
++++ sysdeps/freebsd/sysinfo.c	Sun Feb 18 20:23:18 2007
+@@ -45,14 +45,22 @@ init_sysinfo (glibtop *server)
  
  	glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0);