Update to 2.17.4, now completely written in C++ (ugh).

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

6 files changed, 29 insertions, 20 deletions

diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 1acf73206..e7ccadeaa 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.79 2006/11/24 08:03:19 marcus Exp $
+#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.80 2006/12/04 18:42:20 marcus Exp $
 #
 
 PORTNAME=	gnome-system-monitor
-PORTVERSION=	2.17.3
+PORTVERSION=	2.17.4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index adc6c8a44..9ebab52fc 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-monitor-2.17.3.tar.bz2) = af2f3d794768b52df5c737b9aadcc9d8
-SHA256 (gnome2/gnome-system-monitor-2.17.3.tar.bz2) = 50fd90d2bba4ef3a5d3549aa1f6edf767ff1476c3f98f31ea1598ec99db5fa5e
-SIZE (gnome2/gnome-system-monitor-2.17.3.tar.bz2) = 1483250
+MD5 (gnome2/gnome-system-monitor-2.17.4.tar.bz2) = d0af976830b7e40bfcc00297da4a46ab
+SHA256 (gnome2/gnome-system-monitor-2.17.4.tar.bz2) = 95b30914883afb50ab17c45b034ddced5edf789726b31f7697f196f9eb416097
+SIZE (gnome2/gnome-system-monitor-2.17.4.tar.bz2) = 1483906
diff --git a/sysutils/gnome-system-monitor/files/patch-src_interface.cpp b/sysutils/gnome-system-monitor/files/patch-src_interface.cpp
new file mode 100644
index 000000000..e7a0dc05a
--- /dev/null
+++ b/sysutils/gnome-system-monitor/files/patch-src_interface.cpp
@@ -0,0 +1,14 @@
+--- src/interface.cpp.orig	Sun Dec 17 21:19:35 2006
++++ src/interface.cpp	Sun Dec 17 21:21:53 2006
+@@ -654,9 +654,9 @@ disconnect_proxy_cb (GtkUIManager *manag
+ {
+ 	if (GTK_IS_MENU_ITEM (proxy)) {
+ 		g_signal_handlers_disconnect_by_func
+-			(proxy, reinterpret_cast<void*>(G_CALLBACK(menu_item_select_cb)), procdata);
++			(proxy, (void *) (G_CALLBACK(menu_item_select_cb)), procdata);
+ 		g_signal_handlers_disconnect_by_func
+-			(proxy, reinterpret_cast<void*>(G_CALLBACK(menu_item_deselect_cb)), procdata);
++			(proxy, (void *) (G_CALLBACK(menu_item_deselect_cb)), procdata);
+ 	}
+ }
+ 
diff --git a/sysutils/gnome-system-monitor/files/patch-src_openfiles.c b/sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp
index 971e718b2..3732177fd 100644
--- a/sysutils/gnome-system-monitor/files/patch-src_openfiles.c
+++ b/sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp
@@ -1,5 +1,5 @@
---- src/openfiles.c.orig	Mon Apr 11 03:50:49 2005
-+++ src/openfiles.c	Mon Apr 11 03:52:13 2005
+--- src/openfiles.cpp.orig	Mon Apr 11 03:50:49 2005
++++ src/openfiles.cpp	Mon Apr 11 03:52:13 2005
 @@ -8,6 +8,7 @@
  #include <netdb.h>
  #include <sys/types.h>
diff --git a/sysutils/gnome-system-monitor/files/patch-src::proctable.c b/sysutils/gnome-system-monitor/files/patch-src_proctable.cpp
index 0d9940650..a34f18164 100644
--- a/sysutils/gnome-system-monitor/files/patch-src::proctable.c
+++ b/sysutils/gnome-system-monitor/files/patch-src_proctable.cpp
@@ -1,5 +1,5 @@
---- src/proctable.c.orig	Wed Aug 30 14:11:01 2006
-+++ src/proctable.c	Tue Oct 24 13:39:29 2006
+--- src/proctable.cpp.orig	Wed Aug 30 14:11:01 2006
++++ src/proctable.cpp	Tue Oct 24 13:39:29 2006
 @@ -923,6 +923,12 @@ static void cb_exclude(ProcInfo* info, G
  }
  
diff --git a/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp b/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp
index 7af65a835..eef9c6eca 100644
--- a/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp
+++ b/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp
@@ -1,21 +1,16 @@
---- src/sysinfo.cpp.orig	Mon Nov 20 15:41:52 2006
-+++ src/sysinfo.cpp	Mon Dec  4 13:39:52 2006
-@@ -8,9 +8,14 @@
- #include <glibtop/mem.h>
- #include <glibtop/sysinfo.h>
- 
-+#include <sys/types.h>
-+#include <sys/wait.h>
- #include <unistd.h>
+--- src/sysinfo.cpp.orig	Thu Dec 14 17:51:28 2006
++++ src/sysinfo.cpp	Sun Dec 17 21:17:34 2006
+@@ -12,6 +12,9 @@
  #include <netdb.h>
  #include <sys/socket.h>
+ #include <sys/wait.h>
 +#ifdef __FreeBSD__
 +#include <sys/utsname.h>
 +#endif
  
  #include <string>
  #include <vector>
-@@ -191,6 +196,29 @@ namespace {
+@@ -190,6 +193,29 @@ namespace {
      }
    };
  
@@ -45,7 +40,7 @@
  
    SysInfo* get_sysinfo()
    {
-@@ -198,8 +226,11 @@ namespace {
+@@ -197,8 +223,11 @@ namespace {
        g_free(p);
        return new LSBSysInfo;
      }