Update to GNOME 2.4.0. For all the goodies on what's changed, known issues,

future plans, etc., please see http://www.gnome.org/start/2.4/.

This commit represents work done by adamw, bland, and myself as well as
many other contributers:

Koop Mast <einekoai@chello.nl>
Akifyev Sergey <asa@gascom.ru>
Franz Klammer <klammer@webonaut.com>
Øyvind Kolbu <oyvind@kebab.gaffel.nu>
Thomas E. Zander <riggs@rrr.de>
Jeremy Messenger <mezz7@cox.net>

Without these contirbuters, and our faithful users, GNOME 2.4.0 would not
be possible.

Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as
general FAQs and documentation (GNOME 2.4 updates to be posted soon).  The
best way to upgrade so that you get all shared library dependencies is:

portupgrade -rf -m BATCH=yes atk
portupgrade -R -m BATCH=yes gnome2

Approved by:	portmgr (kris, will, myself implicitly)
Requested by:	re as well as many other users

4 files changed, 21 insertions, 11 deletions

diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 570f8c96e235..1cfc0ea85e44 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	gnomesystemmonitor
-PORTVERSION=	2.0.5
-PORTREVISION=	1
+PORTVERSION=	2.4.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.4
 DISTNAME=	gnome-system-monitor-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME 2.0 system monitor program
+COMMENT=	GNOME 2 system monitor program
 
 LIB_DEPENDS=	gtop-2.0.2:${PORTSDIR}/devel/libgtop2
 
diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo
index 0e6bd079ac54..3063caabeafe 100644
--- a/sysutils/gnomesystemmonitor/distinfo
+++ b/sysutils/gnomesystemmonitor/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-system-monitor-2.0.5.tar.bz2) = 42d4ea444ecda4ba95d27baae3532583
+MD5 (gnome2/gnome-system-monitor-2.4.0.tar.bz2) = f855d85adcc2eb0f20f639cbc2f00cbf
diff --git a/sysutils/gnomesystemmonitor/files/patch-configure b/sysutils/gnomesystemmonitor/files/patch-configure
index ec8d268afa07..504276306bba 100644
--- a/sysutils/gnomesystemmonitor/files/patch-configure
+++ b/sysutils/gnomesystemmonitor/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sat Jun  7 01:23:06 2003
-+++ configure	Sat Jun  7 01:23:17 2003
-@@ -4014,7 +4014,7 @@
+--- configure.orig	Mon Nov 25 21:02:50 2002
++++ configure	Fri Nov 29 20:30:44 2002
+@@ -3731,7 +3731,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
@@ -9,3 +9,12 @@
  _ACEOF
  
  
+@@ -6630,7 +6630,7 @@
+ s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
+ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@PROCMAN_CFLAGS@,$PROCMAN_CFLAGS,;t t
+-s,@PROCMAN_LIBS@,$PROCMAN_LIBS,;t t
++s,@PROCMAN_LIBS@, $PROCMAN_LIBS,;t t
+ s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t
+ s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t
+ s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist
index 2ab1491579c8..d035ed3953c7 100644
--- a/sysutils/gnomesystemmonitor/pkg-plist
+++ b/sysutils/gnomesystemmonitor/pkg-plist
@@ -34,14 +34,15 @@ share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/bn/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
 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/es/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/et/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/he/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/hi/LC_MESSAGES/gnome-system-monitor.mo
@@ -50,6 +51,7 @@ share/locale/id/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/it/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ko/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/li/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/lv/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
@@ -64,10 +66,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/sv/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/tr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo