Update to 2.10.0:

New in 2.10.0 - 7 mar 2005
* Updated i18n.

New in 2.9.92 - 28 fev 2005
* Detect libgnomesu at runtime using GModule. (Hongli Lai)
 misc. cleanups.

New in 2.9.91 - 7 jan 2005
* Fixed a couple of strings.
* Updated i18n.

New in 2.9.90 - 24 jan 2005
* Fixed drawing of graph - Martin Ejdestig
* UI fixes - Luca Ferretti
* Open Files shows files opened by a process - Nicolás Lichtmaier

New in 2.9.4 - 10 jan 2295
* New OpenFiles view - nick@reloco.com.ar.
* Uses libgnomesu - Hongli Lai.
* HIG fixes - Luca Ferretti.
* Displays "User Memory" instead of "Used Memory".

New in 2.9.3 - 20 Dec 2004
* Fixed crasher bugs : #161350 and #160560.
* Updated translations.

New in 2.9.0
* Performance improvements.
* Themed icon.
* Columns are now reorderable in the proctable.
* Devices list also shows 'free' diskspace.
* 64bits fixes.
* SELinux support.
* Big cleanups.
* Fixed so many bugs ...

4 files changed, 12 insertions, 120 deletions

diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile
index d1a98f9f70b..80a3195b43a 100644
--- a/sysutils/gnome2-system-monitor/Makefile
+++ b/sysutils/gnome2-system-monitor/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2005/02/26 17:26:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2005/03/22 16:35:35 jmmv Exp $
 #
 
-DISTNAME=	gnome-system-monitor-2.8.3
+DISTNAME=	gnome-system-monitor-2.10.0
 PKGNAME=	${DISTNAME:S/gnome/gnome2/}
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.8/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.10/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
@@ -33,6 +33,7 @@ pre-configure:
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/libgtop2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
diff --git a/sysutils/gnome2-system-monitor/PLIST b/sysutils/gnome2-system-monitor/PLIST
index 889620c4d70..de0ba9976de 100644
--- a/sysutils/gnome2-system-monitor/PLIST
+++ b/sysutils/gnome2-system-monitor/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/10/20 21:25:44 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/03/22 16:35:35 jmmv Exp $
 bin/gnome-system-monitor
 share/applications/gnome-system-monitor.desktop
 share/gconf/schemas/gnome-system-monitor.schemas
@@ -33,6 +33,7 @@ ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-system-monitor.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-system-monitor.mo
@@ -56,6 +57,7 @@ ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gnome-system-monitor.mo
+${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gnome-system-monitor.mo
@@ -71,14 +73,13 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gnome-system-monitor.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
 share/omf/gnome-system-monitor/gnome-system-monitor-C.omf
-share/pixmaps/procman.png
-@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/gnome-system-monitor
 @comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/gnome-system-monitor/C/figures
diff --git a/sysutils/gnome2-system-monitor/distinfo b/sysutils/gnome2-system-monitor/distinfo
index e709b7f211d..d0b9d1f1ea7 100644
--- a/sysutils/gnome2-system-monitor/distinfo
+++ b/sysutils/gnome2-system-monitor/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/02/26 17:26:39 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2005/03/22 16:35:35 jmmv Exp $
 
-SHA1 (gnome-system-monitor-2.8.3.tar.bz2) = 99c6c1801a595c4456382815bf5f44880a6f4b7f
-RMD160 (gnome-system-monitor-2.8.3.tar.bz2) = 9d137022bb33bdb402fff56f960b2b72c4cae0a5
-Size (gnome-system-monitor-2.8.3.tar.bz2) = 690661 bytes
-SHA1 (patch-aa) = 991a6b9b7d1df06d4b92893d4545eea95fd1fec7
+SHA1 (gnome-system-monitor-2.10.0.tar.bz2) = d83103adf571cce8551f084acc809b11d8701b63
+RMD160 (gnome-system-monitor-2.10.0.tar.bz2) = 01ef83ccf7591011851fab096a20781a0faecee1
+Size (gnome-system-monitor-2.10.0.tar.bz2) = 752223 bytes
diff --git a/sysutils/gnome2-system-monitor/patches/patch-aa b/sysutils/gnome2-system-monitor/patches/patch-aa
deleted file mode 100644
index 60a66e4583c..00000000000
--- a/sysutils/gnome2-system-monitor/patches/patch-aa
+++ /dev/null
@@ -1,109 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/04/01 19:08:26 jmmv Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=129176
-
-Index: configure.in
-===================================================================
-RCS file: /cvs/gnome/procman/configure.in,v
-retrieving revision 1.101
-diff -u -r1.101 configure.in
---- configure.in	15 Feb 2004 19:43:59 -0000	1.101
-+++ configure.in	19 Feb 2004 12:17:40 -0000
-@@ -6,11 +6,22 @@
- 
- AC_PROG_INTLTOOL
- 
-+AC_CANONICAL_HOST
- AC_ISC_POSIX
- AC_PROG_CC
- AM_PROG_CC_STDC
- AC_HEADER_STDC
- GNOME_COMPILE_WARNINGS
-+
-+# Some systems need special libraries to get pty functions.
-+case "${host}" in
-+    *netbsd*)
-+        LIBS="${LIBS} -lutil"
-+        ;;
-+    *)
-+        ;;
-+esac
-+AC_CHECK_FUNCS(getpt grantpt ptsname unlockpt)
- 
- LIBGNOME_REQUIRED=2.0.0
- LIBGNOMEUI_REQUIRED=2.0.0
-Index: src/util.c
-===================================================================
-RCS file: /cvs/gnome/procman/src/util.c,v
-retrieving revision 1.16
-diff -u -r1.16 util.c
---- src/util.c	2 Jan 2004 17:02:45 -0000	1.16
-+++ src/util.c	19 Feb 2004 12:17:40 -0000
-@@ -16,7 +16,10 @@
- 
- #ifdef __FreeBSD__
- # include <errno.h>
-+# include <termios.h>
- # include <libutil.h>
-+#elif defined(__NetBSD__)
-+# include <util.h>
- #endif
- 
- #ifdef __sun
-@@ -49,8 +52,9 @@
-  */
- #define OPEN_TTY() getpt()
- 
--#ifdef __FreeBSD__
--/* FreeBSD doesn't have getpt(). This function emulates it's behaviour. */
-+#if !defined(HAVE_GETPT) && (defined(__FreeBSD__) || defined(__NetBSD__))
-+/* FreeBSD and NetBSD don't have getpt(). This function emulates its
-+   behaviour. */
- int getpt (void);
- 
- int
-@@ -68,6 +72,7 @@
- #endif
- 
- #ifdef __sun
-+#if !defined(HAVE_GETPT)
- /* Sun doesn't have getpt().  This function emulates it's behavior. */
- int getpt (void);
- 
-@@ -113,6 +118,7 @@
- 
- 	return fds;
- }
-+#endif
- 
- /* Handle the fact that solaris doesn't have an asprintf */
- /* pinched from 
-@@ -181,7 +187,14 @@
- 	 * Make su think we're sending the password from a terminal:
- 	 */
- 
--	if (((t_fd = OPEN_TTY()) < 0) || (grantpt(t_fd) < 0) || (unlockpt(t_fd) < 0)) {
-+	if (((t_fd = OPEN_TTY()) < 0)
-+#ifdef HAVE_GRANTPT
-+            || (grantpt(t_fd) < 0)
-+#endif
-+#ifdef HAVE_UNLOCKPT
-+            || (unlockpt(t_fd) < 0)
-+#endif
-+            ) {
- 		fprintf (stderr, "Unable to open a terminal\n");
- 		ABORT (root);
- 	}
-@@ -259,7 +272,11 @@
- 			}
- 		}
- 
--		if(((pts = ptsname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) {
-+#ifdef HAVE_PTSNAME
-+		if (((pts = ptsname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) {
-+#else
-+		if (((pts = ttyname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) {
-+#endif
- 			perror ("Unable to open pseudo slave terminal");
- 			_exit (-1);
- 		}