Update to 2.10.1.

6 files changed, 25 insertions, 24 deletions

diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 2b31a5a82165..ec69dc4ac6a1 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libgtop2
-PORTVERSION=	2.10.0
-PORTREVISION=	1
+PORTVERSION=	2.10.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.10
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index f6a71904beaf..88c6f1eff264 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgtop-2.10.0.tar.bz2) = 9a52cd5332a13e57ca606d8a85a67c97
-SIZE (gnome2/libgtop-2.10.0.tar.bz2) = 746223
+MD5 (gnome2/libgtop-2.10.1.tar.bz2) = b006baa3bd486005411a03534b45708e
+SIZE (gnome2/libgtop-2.10.1.tar.bz2) = 750637
diff --git a/devel/libgtop2/files/patch-lib::read.c b/devel/libgtop2/files/patch-lib::read.c
index 53d091a32b04..b4ca4953413b 100644
--- a/devel/libgtop2/files/patch-lib::read.c
+++ b/devel/libgtop2/files/patch-lib::read.c
@@ -1,13 +1,13 @@
---- lib/read.c.orig	Fri Jun 18 04:03:55 2004
-+++ lib/read.c	Sat Aug  7 16:05:41 2004
+--- lib/read.c.orig	Mon Apr 11 03:25:32 2005
++++ lib/read.c	Mon Apr 11 03:27:06 2005
 @@ -22,6 +22,7 @@
  */
  
  #include <config.h>
 +#include <errno.h>
  #include <glibtop/read.h>
+ #include <glibtop/error.h>
  #include "libgtop-i18n.h"
- 
 @@ -56,14 +57,18 @@
  	fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size);
  #endif
diff --git a/devel/libgtop2/files/patch-lib::write.c b/devel/libgtop2/files/patch-lib::write.c
index 45c2434ea72e..0d00f7a5f243 100644
--- a/devel/libgtop2/files/patch-lib::write.c
+++ b/devel/libgtop2/files/patch-lib::write.c
@@ -1,14 +1,15 @@
---- lib/write.c.orig	Mon Sep  8 23:05:01 2003
-+++ lib/write.c	Tue Sep  9 10:04:37 2003
-@@ -21,6 +21,7 @@
-    Boston, MA 02111-1307, USA.
+--- lib/write.c.orig	Mon Apr 11 03:28:12 2005
++++ lib/write.c	Mon Apr 11 03:29:00 2005
+@@ -22,7 +22,7 @@
  */
  
+ #include <config.h>
+-
 +#include <errno.h>
  #include <glibtop/write.h>
- 
- /* Writes some data to server. */
-@@ -38,12 +39,16 @@
+ #include <glibtop/error.h>
+ #include "libgtop-i18n.h"
+@@ -42,12 +42,16 @@
  	fprintf (stderr, "LIBRARY: really writing %d bytes.\n", size);
  #endif
  
@@ -23,6 +24,6 @@
 +	if (ret < 0) {
 +		if (errno == EINTR)
 +			goto retry;
- 		glibtop_error_io_r (server, _("write %d bytes"), size);
+ 		glibtop_error_io_r (server, ngettext ("wrote %d byte", "wrote %d bytes", size), size);
 +	}
  }
diff --git a/devel/libgtop2/files/patch-src::daemon::io.c b/devel/libgtop2/files/patch-src::daemon::io.c
index 0a11649ced4d..a2d23482266c 100644
--- a/devel/libgtop2/files/patch-src::daemon::io.c
+++ b/devel/libgtop2/files/patch-src::daemon::io.c
@@ -1,14 +1,14 @@
---- src/daemon/io.c.orig	Sun Oct 19 12:54:32 2003
-+++ src/daemon/io.c	Mon Dec  1 13:50:25 2003
+--- src/daemon/io.c.orig	Mon Apr 11 03:30:12 2005
++++ src/daemon/io.c	Mon Apr 11 03:33:22 2005
 @@ -21,6 +21,7 @@
     Boston, MA 02111-1307, USA.
  */
  
 +#include <errno.h>
  #include "daemon.h"
+ #include <glibtop/error.h>
  
- void
-@@ -35,9 +36,13 @@
+@@ -36,9 +37,13 @@
  	resp->offset = offset;
  	resp->data_size = data_size;
  
@@ -23,11 +23,10 @@
  	} else {
  		if (send (s, (const void *) resp, sizeof (glibtop_response), 0) < 0)
  			glibtop_warn_io ("send");
-@@ -47,10 +52,13 @@
- #ifdef REAL_DEBUG
+@@ -49,9 +54,13 @@
  		fprintf (stderr, "Writing %d bytes of data.\n", resp->data_size);
  #endif
--
+ 
 +retry2:
  		if (s == 0) {
 -			if (write (1, data, resp->data_size) < 0)
@@ -39,7 +38,7 @@
  		} else {
  			if (send (s, data, resp->data_size, 0) , 0)
  				glibtop_warn_io ("send");
-@@ -66,6 +74,7 @@
+@@ -67,6 +76,7 @@
  	size_t already_read = 0, remaining = total_size;
  
  	while (already_read < total_size) {
@@ -47,7 +46,7 @@
  		if (s)
  			nread = recv (s, ptr, remaining, 0);
  		else
-@@ -77,6 +86,8 @@
+@@ -78,6 +88,8 @@
  		}
  
  		if (nread <= 0) {
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index 1f1a0363cadd..d72f99ba40fe 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -95,6 +95,7 @@ share/locale/pt/LC_MESSAGES/libgtop-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ro/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ru/LC_MESSAGES/libgtop-2.0.mo
+share/locale/rw/LC_MESSAGES/libgtop-2.0.mo
 share/locale/sk/LC_MESSAGES/libgtop-2.0.mo
 share/locale/sl/LC_MESSAGES/libgtop-2.0.mo
 share/locale/sq/LC_MESSAGES/libgtop-2.0.mo
@@ -105,6 +106,7 @@ share/locale/ta/LC_MESSAGES/libgtop-2.0.mo
 share/locale/tr/LC_MESSAGES/libgtop-2.0.mo
 share/locale/uk/LC_MESSAGES/libgtop-2.0.mo
 share/locale/vi/LC_MESSAGES/libgtop-2.0.mo
+share/locale/xh/LC_MESSAGES/libgtop-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
 @dirrm include/libgtop-2.0/glibtop