Update to 3.2.0.

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

5 files changed, 10 insertions, 37 deletions

diff --git a/net/gnome-nettool3/Makefile b/net/gnome-nettool3/Makefile
index c76cb7dd6..4d8b94159 100644
--- a/net/gnome-nettool3/Makefile
+++ b/net/gnome-nettool3/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/gnome-nettool3/Makefile,v 1.1 2011/05/01 23:42:02 mezz Exp $
+#   $MCom: ports/net/gnome-nettool3/Makefile,v 1.2 2012/01/05 20:09:52 kwm Exp $
 #
 
 PORTNAME=	gnome-nettool
-PORTVERSION=	3.0.1
+PORTVERSION=	3.2.0
 PORTEPOCH=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
diff --git a/net/gnome-nettool3/distinfo b/net/gnome-nettool3/distinfo
index 83fe7ef6e..3f8df0a6a 100644
--- a/net/gnome-nettool3/distinfo
+++ b/net/gnome-nettool3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-nettool-3.0.1.tar.xz) = 2c21b44b351ee470226e1e5580bb9acf0326d9b6c3040deff75322f8ca132317
-SIZE (gnome3/gnome-nettool-3.0.1.tar.xz) = 579848
+SHA256 (gnome3/gnome-nettool-3.2.0.tar.xz) = 9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79
+SIZE (gnome3/gnome-nettool-3.2.0.tar.xz) = 585556
diff --git a/net/gnome-nettool3/files/patch-src_lookup.c b/net/gnome-nettool3/files/patch-src_lookup.c
deleted file mode 100644
index 9744c1397..000000000
--- a/net/gnome-nettool3/files/patch-src_lookup.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/lookup.c.orig	Sun Jul  3 17:47:02 2005
-+++ src/lookup.c	Sun Jul  3 17:47:20 2005
-@@ -21,6 +21,7 @@
- #include <gtk/gtk.h>
- #include <glib/gi18n.h>
- #include <glib/gprintf.h>
-+#include <sys/types.h>
- 
- #include "lookup.h"
- #include "utils.h"
diff --git a/net/gnome-nettool3/files/patch-src_netstat.c b/net/gnome-nettool3/files/patch-src_netstat.c
index 1eec84927..ebcb39bc7 100644
--- a/net/gnome-nettool3/files/patch-src_netstat.c
+++ b/net/gnome-nettool3/files/patch-src_netstat.c
@@ -1,20 +1,11 @@
---- src/netstat.c.orig	Tue Jul  6 13:55:25 2004
-+++ src/netstat.c	Fri Aug 20 15:55:40 2004
-@@ -108,12 +108,17 @@
+--- src/netstat.c.orig	2012-04-13 06:33:27.000000000 -0500
++++ src/netstat.c	2012-04-13 06:34:30.000000000 -0500
+@@ -114,7 +114,7 @@
  	g_return_val_if_fail (netinfo != NULL, NULL);
  	
  	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->routing))) {
-+#ifdef __FreeBSD__
-+		/* XXX We only support ipv4 now */
-+		option = g_strdup ("-rn -f inet");
-+#else
- 		/* Works for Solaris and Linux */
+-#if defined (__OpenBSD__)
++#if defined (__OpenBSD__) || defined(__FreeBSD__)
  		if (netinfo_is_ipv6_enable ()) {
- 			option = g_strdup ("-rn -A inet -A inet6");
+ 			option = g_strdup ("-rn");
  		} else {
- 			option = g_strdup ("-rn -A inet");
- 		}
-+#endif
- 
- 		if (netinfo->stbar_text)
- 			g_free (netinfo->stbar_text);
diff --git a/net/gnome-nettool3/files/patch-src_nettool.c b/net/gnome-nettool3/files/patch-src_nettool.c
index 40e454467..0fe858295 100644
--- a/net/gnome-nettool3/files/patch-src_nettool.c
+++ b/net/gnome-nettool3/files/patch-src_nettool.c
@@ -1,13 +1,5 @@
 --- src/nettool.c.orig	2009-06-18 13:51:14.000000000 -0400
 +++ src/nettool.c	2009-07-19 16:05:59.000000000 -0400
-@@ -24,6 +24,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <signal.h>
- #include <errno.h>
- #include <sys/wait.h>
 @@ -374,6 +375,10 @@ netinfo_io_text_buffer_dialog (GIOChanne
  						 	len, NULL);
  			}