Update to 2.6.0. Changes from previous version (list not complete):

* Add process list column for X Server memory usage (Havoc Pennington)
* Add support for multiple processors - bug # 91363
* Fix color saving of graphs - bug #126612 (Kaushal Kumar)
* Fix crash when asking for root passwoard - bug #126923 (Kiran Kumar Immidi)
* Fix memory display

4 files changed, 117 insertions, 22 deletions

diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile
index 294520f02a9..4df99f760cb 100644
--- a/sysutils/gnome2-system-monitor/Makefile
+++ b/sysutils/gnome2-system-monitor/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2004/03/26 02:27:54 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/01 19:08:26 jmmv Exp $
 #
 
-DISTNAME=	gnome-system-monitor-2.4.0
+DISTNAME=	gnome-system-monitor-2.6.0
 PKGNAME=	${DISTNAME:S/gnome/gnome2/}
-PKGREVISION=	5
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	xtraeme@NetBSD.org
@@ -24,6 +23,10 @@ USE_X11=		yes
 LIBS+=			-lutil
 GCONF2_SCHEMAS+=	gnome-system-monitor.schemas
 
+pre-configure:
+	cd ${WRKSRC} && ${PREFIX}/bin/libtoolize
+	cd ${WRKSRC} && ${AUTOCONF}
+
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgtop2/buildlink3.mk"
@@ -37,4 +40,5 @@ GCONF2_SCHEMAS+=	gnome-system-monitor.schemas
 .include "../../x11/startup-notification/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome2-system-monitor/PLIST b/sysutils/gnome2-system-monitor/PLIST
index 52faf5c62c5..3e0a17f3e78 100644
--- a/sysutils/gnome2-system-monitor/PLIST
+++ b/sysutils/gnome2-system-monitor/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/29 00:49:49 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/04/01 19:08:26 jmmv Exp $
 bin/gnome-system-monitor
 share/applications/gnome-system-monitor.desktop
 share/gconf/schemas/gnome-system-monitor.schemas
@@ -6,6 +6,7 @@ share/gnome/help/gnome-system-monitor/C/figures/addColumn.png
 share/gnome/help/gnome-system-monitor/C/figures/changePriority.png
 share/gnome/help/gnome-system-monitor/C/figures/colorPanel.png
 share/gnome/help/gnome-system-monitor/C/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/C/figures/gnome-system-monitor_window.png
 share/gnome/help/gnome-system-monitor/C/figures/memoryMaps.png
 share/gnome/help/gnome-system-monitor/C/figures/moreInfo.png
 share/gnome/help/gnome-system-monitor/C/figures/processListing.png
@@ -28,6 +29,7 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-system-monitor.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-system-monitor.mo
@@ -36,12 +38,14 @@ ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-system-monitor.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/li/LC_MESSAGES/gnome-system-monitor.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
@@ -60,6 +64,7 @@ ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gnome-system-monitor.mo
 ${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/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
@@ -67,7 +72,12 @@ ${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
 @dirrm share/gnome/help/gnome-system-monitor/C
 @dirrm share/gnome/help/gnome-system-monitor
+@comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in GConf2: @dirrm share/gconf/schemas
+@comment in xdg-dirs: @dirrm share/applications
diff --git a/sysutils/gnome2-system-monitor/distinfo b/sysutils/gnome2-system-monitor/distinfo
index b6581ef4087..d2b89db5f29 100644
--- a/sysutils/gnome2-system-monitor/distinfo
+++ b/sysutils/gnome2-system-monitor/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/29 00:49:48 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/04/01 19:08:26 jmmv Exp $
 
-SHA1 (gnome-system-monitor-2.4.0.tar.bz2) = 3442308452ed9f180aaf2406a015f1cc000c4a35
-Size (gnome-system-monitor-2.4.0.tar.bz2) = 546873 bytes
-SHA1 (patch-aa) = b818871b1e56a52e24181f95fa6674b547958aeb
+SHA1 (gnome-system-monitor-2.6.0.tar.bz2) = 81d08427908b8f9651200939229261aabc3b3f55
+Size (gnome-system-monitor-2.6.0.tar.bz2) = 597694 bytes
+SHA1 (patch-aa) = 991a6b9b7d1df06d4b92893d4545eea95fd1fec7
diff --git a/sysutils/gnome2-system-monitor/patches/patch-aa b/sysutils/gnome2-system-monitor/patches/patch-aa
index c59adb822bc..60a66e4583c 100644
--- a/sysutils/gnome2-system-monitor/patches/patch-aa
+++ b/sysutils/gnome2-system-monitor/patches/patch-aa
@@ -1,28 +1,109 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/12/29 00:49:49 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2004/04/01 19:08:26 jmmv Exp $
 
---- src/util.c.orig	2003-12-29 01:33:58.000000000 +0100
-+++ src/util.c	2003-12-29 01:34:44.000000000 +0100
-@@ -12,11 +12,13 @@
- #include <sys/types.h>
- #include <sys/ioctl.h>
- #include <sys/wait.h>
--
-+#include <sys/param.h>
+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
  
- #include "util.h"
-@@ -40,7 +42,7 @@
+ #ifdef __sun
+@@ -49,8 +52,9 @@
   */
  #define OPEN_TTY() getpt()
  
 -#ifdef __FreeBSD__
-+#ifdef BSD
- /* FreeBSD doesn't have getpt(). This function emulates it's behaviour. */
+-/* 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);
+ 		}