Update to version 0.80.

PR:		35692
Submitted by:	Dominic Marks <dominic_marks@btinternet.com>
Approved by:	maintainer

8 files changed, 8 insertions, 102 deletions

diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index f85a65760202..1dd3bea85a2b 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtk-gnutella
-PORTVERSION=	0.18
-PORTREVISION=	1
+PORTVERSION=	0.80
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://gtk-gnutella.sourceforge.net/download/ \
@@ -21,4 +20,6 @@ USE_GMAKE=	yes
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
 
+CONFIGURE_ARGS=	--enable-no-rfc1918
+
 .include <bsd.port.mk>
diff --git a/net-p2p/gtk-gnutella/distinfo b/net-p2p/gtk-gnutella/distinfo
index 18b9195934c6..6bee1881d7fe 100644
--- a/net-p2p/gtk-gnutella/distinfo
+++ b/net-p2p/gtk-gnutella/distinfo
@@ -1 +1 @@
-MD5 (gtk-gnutella-0.18.tar.gz) = dd4e19f3c600fe139e0522208f3c9e37
+MD5 (gtk-gnutella-0.80.tar.gz) = d3b8764557efdb0f4152057afacd91dd
diff --git a/net-p2p/gtk-gnutella/files/patch-download.c b/net-p2p/gtk-gnutella/files/patch-download.c
deleted file mode 100644
index cb5f1927af04..000000000000
--- a/net-p2p/gtk-gnutella/files/patch-download.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/downloads.c.orig	Wed Oct  3 19:12:04 2001
-+++ src/downloads.c	Fri Oct 26 11:09:48 2001
-@@ -7,6 +7,8 @@
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <fcntl.h>
- 
- GSList *sl_downloads = NULL;
-@@ -793,6 +795,7 @@
- gboolean download_send_request(struct download *d)
- {
- 	gint rw;
-+	struct sockaddr_in saddr;
- 
- 	g_return_val_if_fail(d, FALSE);
- 
-@@ -821,6 +824,8 @@
- 			d->record_index, d->file_name,
- 			GTA_VERSION, GTA_SUBVERSION);
- 
-+	saddr.sin_addr.s_addr=htonl(d->ip);
-+	printf("\n\n----Connected to %s:%d\n", inet_ntoa(saddr.sin_addr), d->port);
- 	printf("----Sending Request:\n%.*s----\n", (int) rw, dl_tmp);
- 	fflush(stdout);
- 
diff --git a/net-p2p/gtk-gnutella/files/patch-search.c b/net-p2p/gtk-gnutella/files/patch-search.c
deleted file mode 100644
index b418fcce1cf0..000000000000
--- a/net-p2p/gtk-gnutella/files/patch-search.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/search.c.orig	Thu Dec  6 23:52:35 2001
-+++ src/search.c	Fri Dec  7 00:05:49 2001
-@@ -13,6 +13,7 @@
- #include "dialog-filters.h"
- #include "routing.h"
- #include "autodownload.h"
-+#include "hosts.h"
- 
- #define MAKE_CODE(a,b,c,d) ( \
- 	((guint32) (a) << 24) | \
-@@ -1258,7 +1259,8 @@
- 		if (
- 			sch->items >= search_max_results ||
- 			search_result_is_dup(sch, rc) ||
--			!filter_record(sch, rc)
-+			!filter_record(sch, rc) ||
-+			!check_valid_host(rc->results_set->ip,6346)
- 		) {
- 			rs->records = g_slist_remove(rs->records, rc);
- 			rs->num_recs--;
diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index f85a65760202..1dd3bea85a2b 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtk-gnutella
-PORTVERSION=	0.18
-PORTREVISION=	1
+PORTVERSION=	0.80
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://gtk-gnutella.sourceforge.net/download/ \
@@ -21,4 +20,6 @@ USE_GMAKE=	yes
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
 
+CONFIGURE_ARGS=	--enable-no-rfc1918
+
 .include <bsd.port.mk>
diff --git a/net/gtk-gnutella/distinfo b/net/gtk-gnutella/distinfo
index 18b9195934c6..6bee1881d7fe 100644
--- a/net/gtk-gnutella/distinfo
+++ b/net/gtk-gnutella/distinfo
@@ -1 +1 @@
-MD5 (gtk-gnutella-0.18.tar.gz) = dd4e19f3c600fe139e0522208f3c9e37
+MD5 (gtk-gnutella-0.80.tar.gz) = d3b8764557efdb0f4152057afacd91dd
diff --git a/net/gtk-gnutella/files/patch-download.c b/net/gtk-gnutella/files/patch-download.c
deleted file mode 100644
index cb5f1927af04..000000000000
--- a/net/gtk-gnutella/files/patch-download.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/downloads.c.orig	Wed Oct  3 19:12:04 2001
-+++ src/downloads.c	Fri Oct 26 11:09:48 2001
-@@ -7,6 +7,8 @@
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <fcntl.h>
- 
- GSList *sl_downloads = NULL;
-@@ -793,6 +795,7 @@
- gboolean download_send_request(struct download *d)
- {
- 	gint rw;
-+	struct sockaddr_in saddr;
- 
- 	g_return_val_if_fail(d, FALSE);
- 
-@@ -821,6 +824,8 @@
- 			d->record_index, d->file_name,
- 			GTA_VERSION, GTA_SUBVERSION);
- 
-+	saddr.sin_addr.s_addr=htonl(d->ip);
-+	printf("\n\n----Connected to %s:%d\n", inet_ntoa(saddr.sin_addr), d->port);
- 	printf("----Sending Request:\n%.*s----\n", (int) rw, dl_tmp);
- 	fflush(stdout);
- 
diff --git a/net/gtk-gnutella/files/patch-search.c b/net/gtk-gnutella/files/patch-search.c
deleted file mode 100644
index b418fcce1cf0..000000000000
--- a/net/gtk-gnutella/files/patch-search.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/search.c.orig	Thu Dec  6 23:52:35 2001
-+++ src/search.c	Fri Dec  7 00:05:49 2001
-@@ -13,6 +13,7 @@
- #include "dialog-filters.h"
- #include "routing.h"
- #include "autodownload.h"
-+#include "hosts.h"
- 
- #define MAKE_CODE(a,b,c,d) ( \
- 	((guint32) (a) << 24) | \
-@@ -1258,7 +1259,8 @@
- 		if (
- 			sch->items >= search_max_results ||
- 			search_result_is_dup(sch, rc) ||
--			!filter_record(sch, rc)
-+			!filter_record(sch, rc) ||
-+			!check_valid_host(rc->results_set->ip,6346)
- 		) {
- 			rs->records = g_slist_remove(rs->records, rc);
- 			rs->num_recs--;