4 files changed, 42 insertions, 14 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 00c04df42293..65bed90efe41 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libgtop/Makefile,v 1.52 2009/09/21 09:27:35 kwm Exp $
+#   $MCom: ports/devel/libgtop/Makefile,v 1.56 2010/05/02 00:04:47 marcus Exp $
 #
 
 PORTNAME=	libgtop
-PORTVERSION=	2.28.0
+PORTVERSION=	2.28.1
 PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
@@ -39,7 +39,7 @@ PKGMESSAGE=	${FILESDIR}/pkg-message
 RUN_DEPENDS+=	lsof:${PORTSDIR}/sysutils/lsof
 .endif
 
-post-patch:
+post-configure:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
 
 post-install:
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index be335ea4e84c..f6fedf2c05e3 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgtop-2.28.0.tar.bz2) = f74fabd765452e9a6893852afa93a7c7
-SHA256 (gnome2/libgtop-2.28.0.tar.bz2) = 22a9c6241c5a65e267a995a4a60ba483dcc629a4873e746b463e6eb6466975b3
-SIZE (gnome2/libgtop-2.28.0.tar.bz2) = 793153
+MD5 (gnome2/libgtop-2.28.1.tar.bz2) = 994c299b6dba330524a67ea45776b3ab
+SHA256 (gnome2/libgtop-2.28.1.tar.bz2) = 0a7e0e7d736a608a5ed25f8e475a87bf38e61dbef66822e25e8ef50705cf70f6
+SIZE (gnome2/libgtop-2.28.1.tar.bz2) = 760104
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
index 8fd7ffffffc9..f29ef64d7c64 100644
--- a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
@@ -1,5 +1,5 @@
---- sysdeps/freebsd/procwd.c.orig	2009-12-13 18:53:02.827740000 -0500
-+++ sysdeps/freebsd/procwd.c	2009-12-13 18:59:27.000000000 -0500
+--- sysdeps/freebsd/procwd.c.orig	2009-04-19 19:51:00.000000000 +0200
++++ sysdeps/freebsd/procwd.c	2010-05-07 13:17:54.000000000 +0200
 @@ -27,6 +27,9 @@
  #include <sys/sysctl.h>
  #include <sys/param.h>
@@ -19,13 +19,19 @@
  static GPtrArray *
  parse_output(const char *output, glibtop_proc_wd *buf)
  {
-@@ -101,10 +104,14 @@ glibtop_get_proc_wd_s(glibtop *server, g
+@@ -97,24 +100,39 @@ parse_output(const char *output, glibtop
+ char**
+ glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid)
+ {
+-	char path[MAXPATHLEN];
++	int exe_mib[4];
++	size_t len;
  #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
  	struct kinfo_file *freep, *kif;
  	GPtrArray *dirs;
-+#ifndef HAVE_KINFO_GETFILE
- 	size_t len;
+-	size_t len;
 -	int i;
++#ifndef HAVE_KINFO_GETFILE
  	int name[4];
  #else
 +	int cnt;
@@ -35,15 +41,31 @@
  	char *output;
  #endif
  
-@@ -115,6 +122,7 @@ glibtop_get_proc_wd_s(glibtop *server, g
- 		buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
+ 	memset (buf, 0, sizeof (glibtop_proc_wd));
++	len = 0;
+ 
+-	g_snprintf(path, sizeof(path), "/proc/%u/file", pid);
+-	if (safe_readlink(path, buf->exe, sizeof(buf->exe)))
+-		buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
++	exe_mib[0] = CTL_KERN;
++	exe_mib[1] = KERN_PROC;
++	exe_mib[2] = KERN_PROC_PATHNAME;
++	exe_mib[3] = pid;
++
++	if (sysctl(exe_mib, 4, NULL, &len, NULL, 0) == 0) {
++		if (len > sizeof(buf->exe))
++			len = sizeof(buf->exe);
++		if (sysctl(exe_mib, 4, buf->exe, &len, NULL, 0) == 0)
++			buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
++	}
  
  #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
 +#ifndef HAVE_KINFO_GETFILE
++	len = 0;
  	name[0] = CTL_KERN;
  	name[1] = KERN_PROC;
  	name[2] = KERN_PROC_FILEDESC;
-@@ -127,10 +135,21 @@ glibtop_get_proc_wd_s(glibtop *server, g
+@@ -127,10 +145,21 @@ glibtop_get_proc_wd_s(glibtop *server, g
  		g_free(freep);
  		return NULL;
  	}
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index bb4b9e1d1580..5c1a377e9a4c 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -98,6 +98,7 @@ libdata/pkgconfig/libgtop-2.0.pc
 share/locale/am/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ar/LC_MESSAGES/libgtop-2.0.mo
 share/locale/as/LC_MESSAGES/libgtop-2.0.mo
+share/locale/ast/LC_MESSAGES/libgtop-2.0.mo
 share/locale/az/LC_MESSAGES/libgtop-2.0.mo
 share/locale/be/LC_MESSAGES/libgtop-2.0.mo
 share/locale/bg/LC_MESSAGES/libgtop-2.0.mo
@@ -112,6 +113,7 @@ share/locale/da/LC_MESSAGES/libgtop-2.0.mo
 share/locale/de/LC_MESSAGES/libgtop-2.0.mo
 share/locale/dz/LC_MESSAGES/libgtop-2.0.mo
 share/locale/el/LC_MESSAGES/libgtop-2.0.mo
+share/locale/en@shaw/LC_MESSAGES/libgtop-2.0.mo
 share/locale/en_CA/LC_MESSAGES/libgtop-2.0.mo
 share/locale/en_GB/LC_MESSAGES/libgtop-2.0.mo
 share/locale/eo/LC_MESSAGES/libgtop-2.0.mo
@@ -205,11 +207,15 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
 @dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as