Update to 2.5.2.

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

10 files changed, 98 insertions, 10 deletions

diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 2261a7121..58b1ad401 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomesystemmonitor
-PORTVERSION=	2.5.1
+PORTVERSION=	2.5.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.5
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomeui libwnck
+USE_GNOME=	gnomeprefix lthack gnomehack libgnomeui libwnck
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lutil"
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 0127855d1..2d0c5962a 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-system-monitor-2.5.1.tar.bz2) = 1cd9e5d21c33212498bf7fe1933f315c
+MD5 (gnome2/gnome-system-monitor-2.5.2.tar.bz2) = 627167b4395f119d0c8439ec83518edb
diff --git a/sysutils/gnome-system-monitor/files/patch-src_interface.c b/sysutils/gnome-system-monitor/files/patch-src_interface.c
new file mode 100644
index 000000000..9006a2094
--- /dev/null
+++ b/sysutils/gnome-system-monitor/files/patch-src_interface.c
@@ -0,0 +1,19 @@
+--- src/interface.c.orig	Fri Dec 12 02:22:50 2003
++++ src/interface.c	Fri Dec 12 02:23:05 2003
+@@ -395,6 +395,7 @@
+ 	sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+ 	for (i=0;i<procdata->config.num_cpus; i++) {
+ 		GtkWidget *temp_hbox;
++		gchar *text;
+ 		/* Two per row */
+ 		if (fabs(fmod(i,2) - 0) < .01) {
+ 			hbox = gtk_hbox_new (FALSE, 12);
+@@ -416,7 +417,7 @@
+ 			    G_CALLBACK (cb_cpu_color_changed), GINT_TO_POINTER (i));
+ 		gtk_box_pack_start (GTK_BOX (temp_hbox), color_picker, FALSE, FALSE, 0);
+ 		
+-		gchar *text = g_strdup_printf (_("CPU%d:"), i+1);
++		text = g_strdup_printf (_("CPU%d:"), i+1);
+ 		label = gtk_label_new (text);
+ 		gtk_box_pack_start (GTK_BOX (temp_hbox), label, FALSE, FALSE, 0);
+ 		g_free (text);
diff --git a/sysutils/gnome-system-monitor/files/patch-src_util.c b/sysutils/gnome-system-monitor/files/patch-src_util.c
index b7e262b0c..288ccc26a 100644
--- a/sysutils/gnome-system-monitor/files/patch-src_util.c
+++ b/sysutils/gnome-system-monitor/files/patch-src_util.c
@@ -1,5 +1,5 @@
---- src/util.c.orig	Thu May  9 01:16:48 2002
-+++ src/util.c	Thu May  9 01:17:13 2002
+--- 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__
@@ -8,3 +8,27 @@
  # 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 42f0f82ed..f9d3e0eaf 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -52,6 +52,7 @@ 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/lt/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
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 2261a7121..58b1ad401 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomesystemmonitor
-PORTVERSION=	2.5.1
+PORTVERSION=	2.5.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.5
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomeui libwnck
+USE_GNOME=	gnomeprefix lthack gnomehack libgnomeui libwnck
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lutil"
diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo
index 0127855d1..2d0c5962a 100644
--- a/sysutils/gnomesystemmonitor/distinfo
+++ b/sysutils/gnomesystemmonitor/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-system-monitor-2.5.1.tar.bz2) = 1cd9e5d21c33212498bf7fe1933f315c
+MD5 (gnome2/gnome-system-monitor-2.5.2.tar.bz2) = 627167b4395f119d0c8439ec83518edb
diff --git a/sysutils/gnomesystemmonitor/files/patch-src_interface.c b/sysutils/gnomesystemmonitor/files/patch-src_interface.c
new file mode 100644
index 000000000..9006a2094
--- /dev/null
+++ b/sysutils/gnomesystemmonitor/files/patch-src_interface.c
@@ -0,0 +1,19 @@
+--- src/interface.c.orig	Fri Dec 12 02:22:50 2003
++++ src/interface.c	Fri Dec 12 02:23:05 2003
+@@ -395,6 +395,7 @@
+ 	sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+ 	for (i=0;i<procdata->config.num_cpus; i++) {
+ 		GtkWidget *temp_hbox;
++		gchar *text;
+ 		/* Two per row */
+ 		if (fabs(fmod(i,2) - 0) < .01) {
+ 			hbox = gtk_hbox_new (FALSE, 12);
+@@ -416,7 +417,7 @@
+ 			    G_CALLBACK (cb_cpu_color_changed), GINT_TO_POINTER (i));
+ 		gtk_box_pack_start (GTK_BOX (temp_hbox), color_picker, FALSE, FALSE, 0);
+ 		
+-		gchar *text = g_strdup_printf (_("CPU%d:"), i+1);
++		text = g_strdup_printf (_("CPU%d:"), i+1);
+ 		label = gtk_label_new (text);
+ 		gtk_box_pack_start (GTK_BOX (temp_hbox), label, FALSE, FALSE, 0);
+ 		g_free (text);
diff --git a/sysutils/gnomesystemmonitor/files/patch-src_util.c b/sysutils/gnomesystemmonitor/files/patch-src_util.c
index b7e262b0c..288ccc26a 100644
--- a/sysutils/gnomesystemmonitor/files/patch-src_util.c
+++ b/sysutils/gnomesystemmonitor/files/patch-src_util.c
@@ -1,5 +1,5 @@
---- src/util.c.orig	Thu May  9 01:16:48 2002
-+++ src/util.c	Thu May  9 01:17:13 2002
+--- 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__
@@ -8,3 +8,27 @@
  # 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 42f0f82ed..f9d3e0eaf 100644
--- a/sysutils/gnomesystemmonitor/pkg-plist
+++ b/sysutils/gnomesystemmonitor/pkg-plist
@@ -52,6 +52,7 @@ 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/lt/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