5 files changed, 69 insertions, 58 deletions

diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 536b338648a1..3702dd447f2c 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.76 2006/10/02 23:31:11 ahze Exp $
+#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.95 2007/03/12 23:11:28 marcus Exp $
 #
 
 PORTNAME=	gnome-system-monitor
-PORTVERSION=	2.16.1
-PORTREVISION=	1
+PORTVERSION=	2.18.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,14 +17,17 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 system monitor program
 
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
+    		pcre.0:${PORTSDIR}/devel/pcre
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_XLIB=	yes
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libwnck
+USE_GNOME=	gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lutil"
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 8a66b02dd773..c34703923c5c 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-monitor-2.16.1.tar.bz2) = 37b44e0e84865fc0aba8bfd4bbdf2338
-SHA256 (gnome2/gnome-system-monitor-2.16.1.tar.bz2) = 1be70e1ae696e3607dfeda186298e7034cca4e0c8020bf92c7485b8c6450504c
-SIZE (gnome2/gnome-system-monitor-2.16.1.tar.bz2) = 1480061
+MD5 (gnome2/gnome-system-monitor-2.18.0.tar.bz2) = 5b4256a20710c8431290ea27238c0905
+SHA256 (gnome2/gnome-system-monitor-2.18.0.tar.bz2) = 2aab8f003bf5373e4a68cb04a1c5942faf8b1ae0be49296b670877a954e5a6c9
+SIZE (gnome2/gnome-system-monitor-2.18.0.tar.bz2) = 1669066
diff --git a/sysutils/gnome-system-monitor/files/patch-src::proctable.c b/sysutils/gnome-system-monitor/files/patch-src::proctable.c
deleted file mode 100644
index 0d99406504e3..000000000000
--- a/sysutils/gnome-system-monitor/files/patch-src::proctable.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/proctable.c.orig	Wed Aug 30 14:11:01 2006
-+++ src/proctable.c	Tue Oct 24 13:39:29 2006
-@@ -923,6 +923,12 @@ static void cb_exclude(ProcInfo* info, G
- }
- 
- 
-+static int
-+pid_compare(const void* first, const void* second)
-+{
-+	return *(unsigned*)first - *(unsigned*)second;
-+}
-+
- static void
- refresh_list (ProcData *procdata, const unsigned *pid_list, const guint n)
- {
-@@ -1015,10 +1021,16 @@ proctable_update_list (ProcData * const 
- 
- 	pid_list = glibtop_get_proclist (&proclist, which, arg);
- 
-+	qsort(pid_list, proclist.number, sizeof (*pid_list), pid_compare);
-+
- 	/* FIXME: total cpu time elapsed should be calculated on an individual basis here
- 	** should probably have a total_time_last gint in the ProcInfo structure */
- 	glibtop_get_cpu (&cpu);
--	total_time = MAX(cpu.total - total_time_last, 1);
-+	total_time = cpu.total - total_time_last;
-+	if (cpu.frequency) {
-+		total_time /= (cpu.frequency/100);
-+	}
-+	total_time = MAX(total_time, 1);
- 	total_time_last = cpu.total;
- 
- 	refresh_list (procdata, pid_list, proclist.number);
diff --git a/sysutils/gnome-system-monitor/files/patch-src_openfiles.c b/sysutils/gnome-system-monitor/files/patch-src_openfiles.c
deleted file mode 100644
index 971e718b2101..000000000000
--- a/sysutils/gnome-system-monitor/files/patch-src_openfiles.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/openfiles.c.orig	Mon Apr 11 03:50:49 2005
-+++ src/openfiles.c	Mon Apr 11 03:52:13 2005
-@@ -8,6 +8,7 @@
- #include <netdb.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- #include "procman.h"
- #include "openfiles.h"
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index 3adab4f7d10e..b251815c687b 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -29,9 +29,54 @@ share/gnome/help/gnome-system-monitor/bg/figures/sortMenu2.png
 share/gnome/help/gnome-system-monitor/bg/figures/systemMonitor.png
 share/gnome/help/gnome-system-monitor/bg/figures/viewMenu.png
 share/gnome/help/gnome-system-monitor/bg/gnome-system-monitor.xml
-share/gnome/help/gnome-system-monitor/bg/legal.xml
+share/gnome/help/gnome-system-monitor/fr/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/fr/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/fr/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/fr/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/fr/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/fr/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/fr/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/fr/figures/processListing.png
+share/gnome/help/gnome-system-monitor/fr/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/fr/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/fr/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/fr/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/fr/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/fr/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/pa/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/pa/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/pa/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/pa/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/pa/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/pa/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/pa/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/pa/figures/processListing.png
+share/gnome/help/gnome-system-monitor/pa/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/pa/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/pa/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/pa/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/pa/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/pa/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/sv/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/sv/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/sv/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/sv/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/sv/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/sv/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/sv/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/sv/figures/processListing.png
+share/gnome/help/gnome-system-monitor/sv/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/sv/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/sv/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/sv/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/sv/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/sv/gnome-system-monitor.xml
 share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf
 share/gnome/omf/gnome-system-monitor/gnome-system-monitor-bg.omf
+share/gnome/omf/gnome-system-monitor/gnome-system-monitor-fr.omf
+share/gnome/omf/gnome-system-monitor/gnome-system-monitor-pa.omf
+share/gnome/omf/gnome-system-monitor/gnome-system-monitor-sv.omf
+share/gnome/pixmaps/gnome-system-monitor/side.png
 share/locale/am/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/az/LC_MESSAGES/gnome-system-monitor.mo
@@ -104,12 +149,6 @@ share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
-@dirrm share/gnome/omf/gnome-system-monitor
-@dirrm share/gnome/help/gnome-system-monitor/bg/figures
-@dirrm share/gnome/help/gnome-system-monitor/bg
-@dirrm share/gnome/help/gnome-system-monitor/C/figures
-@dirrm share/gnome/help/gnome-system-monitor/C
-@dirrm share/gnome/help/gnome-system-monitor
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -164,3 +203,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be/LC_MESSAGES
 @dirrmtry share/locale/be
+@dirrm share/gnome/pixmaps/gnome-system-monitor
+@dirrm share/gnome/omf/gnome-system-monitor
+@dirrm share/gnome/help/gnome-system-monitor/sv/figures
+@dirrm share/gnome/help/gnome-system-monitor/sv
+@dirrm share/gnome/help/gnome-system-monitor/pa/figures
+@dirrm share/gnome/help/gnome-system-monitor/pa
+@dirrm share/gnome/help/gnome-system-monitor/fr/figures
+@dirrm share/gnome/help/gnome-system-monitor/fr
+@dirrm share/gnome/help/gnome-system-monitor/bg/figures
+@dirrm share/gnome/help/gnome-system-monitor/bg
+@dirrm share/gnome/help/gnome-system-monitor/C/figures
+@dirrm share/gnome/help/gnome-system-monitor/C
+@dirrm share/gnome/help/gnome-system-monitor