4 files changed, 31 insertions, 25 deletions

diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index ea752f096a58..37a7e1672735 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomesystemmonitor
-PORTVERSION=	2.6.0
-PORTREVISION=	2
+PORTVERSION=	2.8.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.6
+MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.8
 DISTNAME=	gnome-system-monitor-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -23,9 +22,11 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix intlhack lthack gnomehack libgnomeui libwnck
-USE_LIBTOOL_VER=13
+USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libwnck
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lutil"
 
+GCONF_SCHEMAS=	gnome-system-monitor.schemas
+
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 75cc73e5deaa..9653e3817c5e 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 1bc8709baa43fdca7eee8cad1dc76b17
-SIZE (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 597694
+MD5 (gnome2/gnome-system-monitor-2.8.0.tar.bz2) = 9aec14e8c549b26b2d2cd0e997038d8f
+SIZE (gnome2/gnome-system-monitor-2.8.0.tar.bz2) = 681242
diff --git a/sysutils/gnome-system-monitor/files/patch-src::proctable.c b/sysutils/gnome-system-monitor/files/patch-src::proctable.c
index fda683104a47..05f4c5384caf 100644
--- a/sysutils/gnome-system-monitor/files/patch-src::proctable.c
+++ b/sysutils/gnome-system-monitor/files/patch-src::proctable.c
@@ -1,6 +1,6 @@
---- src/proctable.c.orig	Sun Feb  8 10:06:08 2004
-+++ src/proctable.c	Tue Apr 13 01:01:51 2004
-@@ -547,6 +548,9 @@
+--- src/proctable.c.orig	Mon Jul 19 10:02:09 2004
++++ src/proctable.c	Mon Jul 19 10:08:18 2004
+@@ -563,6 +563,9 @@
  	glibtop_get_proc_uid (&procuid, pid);
  	glibtop_get_proc_time (&proctime, pid);
  	newcputime = proctime.utime + proctime.stime;
@@ -10,38 +10,40 @@
  	model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree));
  
          wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
-@@ -651,6 +655,9 @@
+@@ -667,6 +670,10 @@
  	glibtop_get_proc_uid (&procuid, pid);
  	glibtop_get_proc_time (&proctime, pid);
  	newcputime = proctime.utime + proctime.stime;
 +	if (proctime.frequency) {
 +		newcputime /= (proctime.frequency/100);
 +	}
++
  
          wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
                                        pid,
-@@ -751,12 +758,20 @@
- 	return NULL;
+@@ -761,6 +768,12 @@
+ 	return FALSE;
  }
  
 +static int
 +pid_compare(const void* first, const void* second)
 +{
-+  return *(unsigned*)first - *(unsigned*)second;
++	return *(unsigned*)first - *(unsigned*)second;
 +}
 +
  static void
  refresh_list (ProcData *data, unsigned *pid_list, gint n)
  {
- 	ProcData *procdata = data;
- 	GList *list = procdata->info;
+@@ -769,6 +782,8 @@
+ 	GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree));
  	gint i = 0;
-+
-+	qsort(pid_list, n, sizeof (*pid_list), pid_compare);
  	
- 	while (i < n)
- 	{
-@@ -848,6 +863,9 @@
++	qsort(pid_list, n, sizeof (*pid_list), pid_compare);
++
+ 	/* Add or update processes */
+ 	while (i < n) {
+ 		ProcInfo *info;
+@@ -862,6 +877,9 @@
  	** should probably have a total_time_last gint in the ProcInfo structure */
  	glibtop_get_cpu (&cpu);
  	total_time = cpu.total - total_time_last;
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index 96505c1e463e..27dd1f9c7159 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -1,7 +1,4 @@
 bin/gnome-system-monitor
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-system-monitor.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-system-monitor.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-system-monitor.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/gnome-system-monitor.desktop
 share/gnome/help/gnome-system-monitor/C/figures/addColumn.png
 share/gnome/help/gnome-system-monitor/C/figures/changePriority.png
@@ -27,6 +24,7 @@ share/locale/az/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/be/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/bs/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ca/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo
@@ -34,12 +32,15 @@ share/locale/da/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/de/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/el/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/es/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/eu/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/fr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ga/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/gu/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/he/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/hi/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/hr/LC_MESSAGES/gnome-system-monitor.mo
@@ -55,8 +56,10 @@ share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/no/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pt/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-system-monitor.mo
@@ -64,10 +67,10 @@ share/locale/ro/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ru/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo