Update to 2.9.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3435 df743ca5-7f9a-e211-a948-0013205c9059

10 files changed, 60 insertions, 78 deletions

diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index dc93512ae..3a31c2815 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomesystemmonitor
-PORTVERSION=	2.9.3
+PORTVERSION=	2.9.4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.9
@@ -16,7 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 system monitor program
 
-LIB_DEPENDS=	gtop-2.0.2:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS=	gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \
+		gnomesu.1:${PORTSDIR}/security/libgnomesu
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 6cc892297..b2d33ba29 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-system-monitor-2.9.3.tar.bz2) = 36923ed8a0719c66ee488caf6a24fd0b
-SIZE (gnome2/gnome-system-monitor-2.9.3.tar.bz2) = 671029
+MD5 (gnome2/gnome-system-monitor-2.9.4.tar.bz2) = 580be8e8614e9e7d0978a8d601d3197d
+SIZE (gnome2/gnome-system-monitor-2.9.4.tar.bz2) = 658257
diff --git a/sysutils/gnome-system-monitor/files/patch-src_openfiles.c b/sysutils/gnome-system-monitor/files/patch-src_openfiles.c
new file mode 100644
index 000000000..6f6b8dc1b
--- /dev/null
+++ b/sysutils/gnome-system-monitor/files/patch-src_openfiles.c
@@ -0,0 +1,24 @@
+--- src/openfiles.c.orig	Fri Jan 14 03:16:02 2005
++++ src/openfiles.c	Fri Jan 14 03:16:34 2005
+@@ -106,7 +106,7 @@
+ 	const glibtop_open_files_entry *o2 = b;
+ 
+ 	/* Falta manejar los diferentes tipos! */
+-	return (o1->fd == o2->fd) && (o1->type == o1->type); // XXX!
++	return (o1->fd == o2->fd) && (o1->type == o1->type); /* XXX! */
+ }
+ 
+ 
+@@ -115,10 +115,10 @@
+ {
+ 	ProcInfo *info;
+ 	GtkTreeModel *model;
+-	glibtop_open_files_entry *openfiles;
+-	glibtop_proc_open_files procmap;
+ 	GHashTable *new_maps;
+ 	gint i;
++	glibtop_open_files_entry *openfiles;
++	glibtop_proc_open_files procmap;
+ 
+ 	info = g_object_get_data (G_OBJECT (tree), "selected_info");
+ 	g_return_if_fail (info);
diff --git a/sysutils/gnome-system-monitor/files/patch-src_util.c b/sysutils/gnome-system-monitor/files/patch-src_util.c
deleted file mode 100644
index 288ccc26a..000000000
--- a/sysutils/gnome-system-monitor/files/patch-src_util.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/util.c.orig	Fri Dec 12 02:26:57 2003
-+++ src/util.c	Fri Dec 12 02:35:38 2003
-@@ -16,6 +16,7 @@
- 
- #ifdef __FreeBSD__
- # include <errno.h>
-+# include <termios.h>
- # include <libutil.h>
- #endif
- 
-@@ -181,7 +182,11 @@
- 	 * Make su think we're sending the password from a terminal:
- 	 */
- 
-+#ifndef __FreeBSD__
- 	if (((t_fd = OPEN_TTY()) < 0) || (grantpt(t_fd) < 0) || (unlockpt(t_fd) < 0)) {
-+#else
-+	if ((t_fd = OPEN_TTY()) < 0) {
-+#endif
- 		fprintf (stderr, "Unable to open a terminal\n");
- 		ABORT (root);
- 	}
-@@ -259,7 +264,11 @@
- 			}
- 		}
- 
-+#ifndef __FreeBSD__
- 		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);
- 		}
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index 78c51c94e..6b49799fd 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -16,7 +16,6 @@ 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/omf/gnome-system-monitor/gnome-system-monitor-C.omf
-share/gnome/pixmaps/procman.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
@@ -56,6 +55,7 @@ share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ne/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/no/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index dc93512ae..3a31c2815 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomesystemmonitor
-PORTVERSION=	2.9.3
+PORTVERSION=	2.9.4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.9
@@ -16,7 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 system monitor program
 
-LIB_DEPENDS=	gtop-2.0.2:${PORTSDIR}/devel/libgtop2
+LIB_DEPENDS=	gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \
+		gnomesu.1:${PORTSDIR}/security/libgnomesu
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo
index 6cc892297..b2d33ba29 100644
--- a/sysutils/gnomesystemmonitor/distinfo
+++ b/sysutils/gnomesystemmonitor/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-system-monitor-2.9.3.tar.bz2) = 36923ed8a0719c66ee488caf6a24fd0b
-SIZE (gnome2/gnome-system-monitor-2.9.3.tar.bz2) = 671029
+MD5 (gnome2/gnome-system-monitor-2.9.4.tar.bz2) = 580be8e8614e9e7d0978a8d601d3197d
+SIZE (gnome2/gnome-system-monitor-2.9.4.tar.bz2) = 658257
diff --git a/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c b/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c
new file mode 100644
index 000000000..6f6b8dc1b
--- /dev/null
+++ b/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c
@@ -0,0 +1,24 @@
+--- src/openfiles.c.orig	Fri Jan 14 03:16:02 2005
++++ src/openfiles.c	Fri Jan 14 03:16:34 2005
+@@ -106,7 +106,7 @@
+ 	const glibtop_open_files_entry *o2 = b;
+ 
+ 	/* Falta manejar los diferentes tipos! */
+-	return (o1->fd == o2->fd) && (o1->type == o1->type); // XXX!
++	return (o1->fd == o2->fd) && (o1->type == o1->type); /* XXX! */
+ }
+ 
+ 
+@@ -115,10 +115,10 @@
+ {
+ 	ProcInfo *info;
+ 	GtkTreeModel *model;
+-	glibtop_open_files_entry *openfiles;
+-	glibtop_proc_open_files procmap;
+ 	GHashTable *new_maps;
+ 	gint i;
++	glibtop_open_files_entry *openfiles;
++	glibtop_proc_open_files procmap;
+ 
+ 	info = g_object_get_data (G_OBJECT (tree), "selected_info");
+ 	g_return_if_fail (info);
diff --git a/sysutils/gnomesystemmonitor/files/patch-src_util.c b/sysutils/gnomesystemmonitor/files/patch-src_util.c
deleted file mode 100644
index 288ccc26a..000000000
--- a/sysutils/gnomesystemmonitor/files/patch-src_util.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/util.c.orig	Fri Dec 12 02:26:57 2003
-+++ src/util.c	Fri Dec 12 02:35:38 2003
-@@ -16,6 +16,7 @@
- 
- #ifdef __FreeBSD__
- # include <errno.h>
-+# include <termios.h>
- # include <libutil.h>
- #endif
- 
-@@ -181,7 +182,11 @@
- 	 * Make su think we're sending the password from a terminal:
- 	 */
- 
-+#ifndef __FreeBSD__
- 	if (((t_fd = OPEN_TTY()) < 0) || (grantpt(t_fd) < 0) || (unlockpt(t_fd) < 0)) {
-+#else
-+	if ((t_fd = OPEN_TTY()) < 0) {
-+#endif
- 		fprintf (stderr, "Unable to open a terminal\n");
- 		ABORT (root);
- 	}
-@@ -259,7 +264,11 @@
- 			}
- 		}
- 
-+#ifndef __FreeBSD__
- 		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);
- 		}
diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist
index 78c51c94e..6b49799fd 100644
--- a/sysutils/gnomesystemmonitor/pkg-plist
+++ b/sysutils/gnomesystemmonitor/pkg-plist
@@ -16,7 +16,6 @@ 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/omf/gnome-system-monitor/gnome-system-monitor-C.omf
-share/gnome/pixmaps/procman.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
@@ -56,6 +55,7 @@ share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ne/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/no/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo