Update to 2.24.1.

XXX:
"writable memory" is too large to be correct, and the graph
updates make Xorg eat the whole CPU, otherwise looks ok.

New in 2.24.1 - 20 October 2008
* Translation updates.

New in 2.24.0 - 22 September 2008
* Translation updates.

New in 2.23.91 - 1 September 2008
* Fixed bug 549383 – network assertion in the resource tab.

New in 2.23.90 - 18 August 2008
* Fixed truncated process names.

New in 2.23.6 - 4 August 2008
* Don't segfault in the disk list when icon cannot be retried from gvfs.

New in 2.23.5 - 21 July 2008
* Fixed network speed when there are pseudo-devices with no address.

New in 2.23.3 - 2 June 2008
* New 'Waiting Channel' process column.

New in 2.23.2 - 26 May 2008
* This is the first 2.23 release
* New option to start with the system tab.
* Don't crash on invalid regex in lsof. Display an error message.
* Fixed the graph time scale.
* Performance fix for bad graphic card drivers (yes, system-monitor is
  very fast with the vesa driver without this patch). Blame your
  driver's writers.
* Moved to gio.
* Many internal cleanups.
* Filesystem column are now configurable.
* lsof now shows IPv6 connections.
* New wchan column (if you have a better name for that...)

Thanks to Mark McCelland, Karl Lattimer, Toby Dacre, Matthis Clasen and
Hubert Figuière.

4 files changed, 57 insertions, 19 deletions

diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 2eafa313bc2..597c066de86 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2008/07/15 10:51:35 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2008/11/15 19:38:53 wiz Exp $
 #
 
-DISTNAME=	gnome-system-monitor-2.22.3
+DISTNAME=	gnome-system-monitor-2.24.1
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.22/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.24/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -22,27 +22,31 @@ USE_LANGUAGES=		c c++
 CONFLICTS+=		gnome2-system-monitor-[0-9]*
 
 LIBS+=			-lutil
-GCONF_SCHEMAS+=	gnome-system-monitor.schemas
+GCONF_SCHEMAS+=		gnome-system-monitor.schemas
 
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.9.1
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
-BUILDLINK_API_DEPENDS.libgtop+=	libgtop>=2.19.3
-
-# TODO: Add libgksu support.
 .include "../../devel/GConf/schemas.mk"
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.16.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glibmm+=	glibmm>=2.14
+.include "../../devel/glibmm/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.15.3
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
+BUILDLINK_ABI_DEPENDS.dbus-glib+=	dbus-glib>=0.70
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgtop+=	libgtop>=2.23.1
 .include "../../sysutils/libgtop/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.12.0
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtkmm+=	gtkmm>=2.8
 .include "../../x11/gtkmm/buildlink3.mk"
+# doesn't seem to do anything with it
+#.include "../../sysutils/libgksu/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-system-monitor/PLIST b/sysutils/gnome-system-monitor/PLIST
index 27a9f04e154..a0e21e52d6b 100644
--- a/sysutils/gnome-system-monitor/PLIST
+++ b/sysutils/gnome-system-monitor/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/04/15 18:55:56 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/11/15 19:38:53 wiz Exp $
 bin/gnome-system-monitor
 share/applications/gnome-system-monitor.desktop
 share/gconf/schemas/gnome-system-monitor.schemas
@@ -17,6 +17,20 @@ share/gnome/help/gnome-system-monitor/C/figures/systemMonitor.png
 share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png
 share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml
 share/gnome/help/gnome-system-monitor/C/legal.xml
+share/gnome/help/gnome-system-monitor/ar/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/ar/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/ar/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/ar/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/ar/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/ar/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/ar/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/ar/figures/processListing.png
+share/gnome/help/gnome-system-monitor/ar/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/ar/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/ar/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/ar/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/ar/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/ar/gnome-system-monitor.xml
 share/gnome/help/gnome-system-monitor/bg/figures/addColumn.png
 share/gnome/help/gnome-system-monitor/bg/figures/changePriority.png
 share/gnome/help/gnome-system-monitor/bg/figures/colorPanel.png
@@ -170,6 +184,7 @@ share/locale/oc/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/or/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/ps/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
 share/locale/ro/LC_MESSAGES/gnome-system-monitor.mo
@@ -180,7 +195,7 @@ 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/sr@latin/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/te/LC_MESSAGES/gnome-system-monitor.mo
@@ -193,6 +208,7 @@ 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
 share/omf/gnome-system-monitor/gnome-system-monitor-C.omf
+share/omf/gnome-system-monitor/gnome-system-monitor-ar.omf
 share/omf/gnome-system-monitor/gnome-system-monitor-bg.omf
 share/omf/gnome-system-monitor/gnome-system-monitor-ca.omf
 share/omf/gnome-system-monitor/gnome-system-monitor-es.omf
@@ -206,7 +222,7 @@ share/pixmaps/gnome-system-monitor/upload.svg
 @dirrm share/pixmaps/gnome-system-monitor
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/gnome-system-monitor
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @dirrm share/omf
 @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
@@ -221,6 +237,8 @@ share/pixmaps/gnome-system-monitor/upload.svg
 @dirrm share/gnome/help/gnome-system-monitor/ca
 @dirrm share/gnome/help/gnome-system-monitor/bg/figures
 @dirrm share/gnome/help/gnome-system-monitor/bg
+@dirrm share/gnome/help/gnome-system-monitor/ar/figures
+@dirrm share/gnome/help/gnome-system-monitor/ar
 @dirrm share/gnome/help/gnome-system-monitor/C/figures
 @dirrm share/gnome/help/gnome-system-monitor/C
 @dirrm share/gnome/help/gnome-system-monitor
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index d6b71d1a8c9..b7103272b21 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2008/07/15 10:51:35 drochner Exp $
+$NetBSD: distinfo,v 1.7 2008/11/15 19:38:53 wiz Exp $
 
-SHA1 (gnome-system-monitor-2.22.3.tar.bz2) = 6778d4dfa3b3f555d98d14c6f24a1f6f74befe9f
-RMD160 (gnome-system-monitor-2.22.3.tar.bz2) = c7150f8117add33e6e4fb4da77b58e71a99d1e70
-Size (gnome-system-monitor-2.22.3.tar.bz2) = 1921084 bytes
+SHA1 (gnome-system-monitor-2.24.1.tar.bz2) = e1b8fba8c4482faf8234d27b0f8d10004072060c
+RMD160 (gnome-system-monitor-2.24.1.tar.bz2) = b152f3c7abc92d42225616ccad4285e075be1ac6
+Size (gnome-system-monitor-2.24.1.tar.bz2) = 2004578 bytes
 SHA1 (patch-aa) = 76c5d94f36fd3c29e8c3cabc77925e93851465b9
+SHA1 (patch-ab) = 6899d479d82872e971710a41d2ea7324edb949a3
diff --git a/sysutils/gnome-system-monitor/patches/patch-ab b/sysutils/gnome-system-monitor/patches/patch-ab
new file mode 100644
index 00000000000..17c0ba1a6d5
--- /dev/null
+++ b/sysutils/gnome-system-monitor/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2008/11/15 19:38:53 wiz Exp $
+
+--- src/openfiles.cpp.orig	2008-09-11 19:55:34.000000000 +0000
++++ src/openfiles.cpp
+@@ -15,6 +15,10 @@
+ #include "util.h"
+ #include "gconf-keys.h"
+ 
++#ifndef NI_IDN
++#define NI_IDN	32
++#endif
++
+ enum
+ {
+ 	COL_FD,