Update to 2.9.3.

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

5 files changed, 3 insertions, 165 deletions

diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 68f41b299..ee8538aa9 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libgtop2
-PORTVERSION=	2.9.0
+PORTVERSION=	2.9.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.9
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index 5068e7f19..5a4287dbf 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgtop-2.9.0.tar.bz2) = 122507d242f3902e87a02507999a51da
-SIZE (gnome2/libgtop-2.9.0.tar.bz2) = 1045143
+MD5 (gnome2/libgtop-2.9.3.tar.bz2) = 56f1c714a2fca4c69091e12cd61ed398
+SIZE (gnome2/libgtop-2.9.3.tar.bz2) = 781148
diff --git a/devel/libgtop2/files/patch-lib::lib.pl b/devel/libgtop2/files/patch-lib::lib.pl
deleted file mode 100644
index 6e08ba030..000000000
--- a/devel/libgtop2/files/patch-lib::lib.pl
+++ /dev/null
@@ -1,62 +0,0 @@
---- lib/lib.pl.orig	Mon Sep  1 20:17:45 2003
-+++ lib/lib.pl	Wed Sep  3 11:53:12 2003
-@@ -116,6 +116,8 @@
- 	$param_decl = '';
- 	$send_size = '';
- 	$send_ptr = '';
-+	$send_buf_decl = '';
-+	$send_buf = '';
- 	$nr_params = (@params = split(/:/, $param_def, 9999));
- 	for ($param = 1; $param <= $nr_params; $param++) {
- 	    $list = $params[$param];
-@@ -135,28 +137,37 @@
- 
- 		  $fields[$field];
- 		$call_param = $call_param . ', ' . $fields[$field];
--		if ($send_ptr eq '') {
--		    $send_ptr = "\n\tconst void *send_ptr = &" .
--
--		      $fields[$field] . ';';
--		}
--		if ($send_size eq '') {
--		    $send_size = "\n\tconst size_t send_size =\n\t\t";
-+		if ($send_buf eq '') {
-+		    $send_size = "\n\tconst size_t send_size = ";
-+		    $send_ptr = "\n\tconst void *send_ptr = &";
-+		    if ($nr_params == 1 && $count == 1) {
-+			$send_size = $send_size . 'sizeof (' . $fields[$field] . ');';
-+			$send_ptr = $send_ptr . $fields[$field] . ';';
-+			last;
-+		    }
-+		    $send_size = $send_size . 'sizeof (send_buf);';
-+		    $send_ptr = $send_ptr . 'send_buf;';
- 		}
- 		else {
--		    $send_size = $send_size . ' + ';
-+		    $send_buf_decl = $send_buf_decl . ' ';
-+		    $send_buf = $send_buf . ', ';
- 		}
--		$send_size = $send_size . 'sizeof (' . $fields[$field] . ')';
-+		$send_buf_decl = $send_buf_decl . '' .  $convert{$type} . ' ' .
-+
-+		  $fields[$field] . ';';
-+		$send_buf = $send_buf . '' . $fields[$field];
- 	    }
- 	}
--	if ($send_size ne '') {
--	    $send_size = $send_size . ';';
--	}
--	else {
-+	if ($send_size eq '') {
- 	    $send_size = "\n\tconst size_t send_size = 0;";
- 	}
- 	if ($send_ptr eq '') {
- 	    $send_ptr = "\n\tconst void *send_ptr = NULL;";
-+	}
-+	if ($send_buf ne '') {
-+	    $send_ptr = "\n\tconst struct { " . $send_buf_decl . " } send_buf =\n" .
-+	      "\t\t{ " . $send_buf . ' };' .
-+	      $send_ptr;
- 	}
-     }
- 
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
deleted file mode 100644
index 3a09d6688..000000000
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
---- sysdeps/freebsd/Makefile.in.orig	Wed Dec  1 13:03:30 2004
-+++ sysdeps/freebsd/Makefile.in	Wed Dec  1 13:12:27 2004
-@@ -148,11 +148,11 @@
- 
- noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
- 
--libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c
-+libgtop_sysdeps_2_0_la_SOURCES = nosuid.c
- 
- libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
- 
--libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c 				  uptime.c loadavg.c shm_limits.c msg_limits.c 				  sem_limits.c proclist.c procstate.c procuid.c 				  proctime.c procmem.c procsignal.c prockernel.c 				  procsegment.c procargs.c procmap.c netload.c 				  ppp.c
-+libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c 				  uptime.c loadavg.c shm_limits.c msg_limits.c 				  sem_limits.c proclist.c procstate.c procuid.c 				  proctime.c procmem.c procsignal.c prockernel.c 				  procsegment.c procargs.c procmap.c netlist.c netload.c 				  ppp.c
- 
- 
- libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
-@@ -176,13 +176,13 @@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- libgtop_sysdeps_2_0_la_LIBADD = 
--libgtop_sysdeps_2_0_la_OBJECTS =  nosuid.lo siglist.lo
-+libgtop_sysdeps_2_0_la_OBJECTS =  nosuid.lo
- libgtop_sysdeps_suid_2_0_la_LIBADD = 
- libgtop_sysdeps_suid_2_0_la_OBJECTS =  open.lo close.lo cpu.lo mem.lo \
- swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo sem_limits.lo \
- proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \
- procsignal.lo prockernel.lo procsegment.lo procargs.lo procmap.lo \
--netload.lo ppp.lo
-+netlist.lo netload.lo ppp.lo
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_netlist.c b/devel/libgtop2/files/patch-sysdeps_freebsd_netlist.c
deleted file mode 100644
index 43b1fc7cb..000000000
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_netlist.c
+++ /dev/null
@@ -1,68 +0,0 @@
---- sysdeps/freebsd/netlist.c.orig	Wed Dec  1 13:00:43 2004
-+++ sysdeps/freebsd/netlist.c	Wed Dec  1 13:01:57 2004
-@@ -0,0 +1,65 @@
-+/* $Id: patch-sysdeps_freebsd_netlist.c,v 1.1 2004-12-01 18:17:57 marcus Exp $ */
-+
-+/* Copyright (C) 1998-99 Martin Baulig
-+   This file is part of LibGTop 1.0.
-+
-+   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-+
-+   LibGTop is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License,
-+   or (at your option) any later version.
-+
-+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+   for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with LibGTop; see the file COPYING. If not, write to the
-+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+*/
-+
-+#include <config.h>
-+#include <glibtop/netlist.h>
-+#include <glibtop/error.h>
-+
-+#include <net/if.h>
-+
-+
-+static const unsigned long _glibtop_sysdeps_netlist = (1 << GLIBTOP_NETLIST_NUMBER);
-+
-+/* Init function. */
-+
-+void
-+glibtop_init_netlist_s (glibtop *server)
-+{
-+	server->sysdeps.netlist = _glibtop_sysdeps_netlist;
-+}
-+
-+
-+char**
-+glibtop_get_netlist_s (glibtop *server, glibtop_netlist *buf)
-+{
-+	struct if_nameindex *ifstart, *ifs;
-+	GPtrArray *devices;
-+
-+	ifs = ifstart = if_nameindex();
-+
-+	devices = g_ptr_array_new();
-+
-+	while(ifs && ifs->if_name) {
-+		g_ptr_array_add(devices, g_strdup(ifs->if_name));
-+		buf->number++;
-+	}
-+
-+	if_freenameindex(ifstart);
-+
-+	buf->flags = _glibtop_sysdeps_netlist;
-+
-+	g_ptr_array_add(devices, NULL);
-+
-+	return (char **) g_ptr_array_free(devices, FALSE);
-+}
-+