Resolve 100% cpu usage issue.

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

6 files changed, 27 insertions, 11 deletions

diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 15a9c3818..4b55afbd4 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgtop2
 PORTVERSION=	2.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
diff --git a/devel/libgtop2/files/patch-configure b/devel/libgtop2/files/patch-configure
index afb7c5b7f..3bf337326 100644
--- a/devel/libgtop2/files/patch-configure
+++ b/devel/libgtop2/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Fri Nov 14 14:38:11 2003
-+++ configure	Fri Nov 14 15:01:39 2003
+--- configure.orig	Tue Jan  6 09:20:30 2004
++++ configure	Tue Jan  6 21:32:03 2004
 @@ -1854,9 +1854,9 @@
  
  # libtool versioning
@@ -13,6 +13,15 @@
  LT_VERSION_INFO="-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}"
  
  
+@@ -10200,7 +10200,7 @@
+ 
+             echo "$as_me:$LINENO: checking GLIB_LIBS" >&5
+ echo $ECHO_N "checking GLIB_LIBS... $ECHO_C" >&6
+-            GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED libgnome-2.0"`
++            GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED"`
+             echo "$as_me:$LINENO: result: $GLIB_LIBS" >&5
+ echo "${ECHO_T}$GLIB_LIBS" >&6
+         else
 @@ -18326,7 +18326,7 @@
  
  
diff --git a/devel/libgtop2/files/patch-lib::read.c b/devel/libgtop2/files/patch-lib::read.c
index 7457dcbf1..38583f876 100644
--- a/devel/libgtop2/files/patch-lib::read.c
+++ b/devel/libgtop2/files/patch-lib::read.c
@@ -21,7 +21,7 @@
  
 -	if (ret < 0)
 +	if (ret < 0) {
-+		if (errno == EINTR || errno == EAGAIN)
++		if (errno == EINTR)
 +			goto retry;
  		glibtop_error_io_r (server, _("read %d bytes"), size);
 +	}
diff --git a/devel/libgtop2/files/patch-lib::write.c b/devel/libgtop2/files/patch-lib::write.c
index ad879ecb4..45c2434ea 100644
--- a/devel/libgtop2/files/patch-lib::write.c
+++ b/devel/libgtop2/files/patch-lib::write.c
@@ -21,7 +21,7 @@
  
 -	if (ret < 0)
 +	if (ret < 0) {
-+		if (errno == EINTR || errno == EAGAIN)
++		if (errno == EINTR)
 +			goto retry;
  		glibtop_error_io_r (server, _("write %d bytes"), size);
 +	}
diff --git a/devel/libgtop2/files/patch-src::daemon::io.c b/devel/libgtop2/files/patch-src::daemon::io.c
index 8ec46eac1..0a11649ce 100644
--- a/devel/libgtop2/files/patch-src::daemon::io.c
+++ b/devel/libgtop2/files/patch-src::daemon::io.c
@@ -16,7 +16,7 @@
  	if (s == 0) {
 -		if (write (1, (const void *) resp, sizeof (glibtop_response)) < 0)
 +		if (write (1, (const void *) resp, sizeof (glibtop_response)) < 0) {
-+			if (errno == EINTR || errno == EAGAIN)
++			if (errno == EINTR)
 +				goto retry1;
  			glibtop_warn_io ("write");
 +		}
@@ -32,7 +32,7 @@
  		if (s == 0) {
 -			if (write (1, data, resp->data_size) < 0)
 +			if (write (1, data, resp->data_size) < 0) {
-+				if (errno == EINTR || errno == EAGAIN)
++				if (errno == EINTR)
 +					goto retry2;
  				glibtop_warn_io ("write");
 +			}
@@ -51,7 +51,7 @@
  		}
  
  		if (nread <= 0) {
-+			if (errno == EINTR || errno == EAGAIN)
++			if (errno == EINTR)
 +				goto retry;
  			glibtop_warn_io ("recv");
  			return 0;
diff --git a/devel/libgtop2/files/patch-src_daemon_Makefile.in b/devel/libgtop2/files/patch-src_daemon_Makefile.in
index 5af32511c..0cfc6debb 100644
--- a/devel/libgtop2/files/patch-src_daemon_Makefile.in
+++ b/devel/libgtop2/files/patch-src_daemon_Makefile.in
@@ -1,5 +1,5 @@
---- src/daemon/Makefile.in.orig	Fri Nov 14 14:38:11 2003
-+++ src/daemon/Makefile.in	Fri Nov 14 14:59:16 2003
+--- src/daemon/Makefile.in.orig	Tue Jan  6 21:32:29 2004
++++ src/daemon/Makefile.in	Tue Jan  6 21:41:46 2004
 @@ -86,7 +86,7 @@
  LIBGTOP_EXTRA_LIBS = @LIBGTOP_EXTRA_LIBS@
  LIBGTOP_INCS = @LIBGTOP_INCS@
@@ -9,11 +9,18 @@
  LIBGTOP_MAJOR_VERSION = @LIBGTOP_MAJOR_VERSION@
  LIBGTOP_MICRO_VERSION = @LIBGTOP_MICRO_VERSION@
  LIBGTOP_MINOR_VERSION = @LIBGTOP_MINOR_VERSION@
-@@ -160,6 +160,7 @@
+@@ -160,11 +160,14 @@
  				  @sysdeps_suid_lib@ \
  				  $(suid_sysdeps) $(suid_common)\
  				  $(LIBGTOP_LIBS)\
 +				  $(GLIB_LIBS) \
++				  -lpopt \
  				  @libs_xauth@
  
  
+ libgtop_server2_SOURCES = server.c slave.c io.c version.c daemon.h
+ libgtop_server2_LDADD = $(GLIB_LIBS) $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la \
++				  -lpopt \
+ 				  $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la
+ 
+