- Update to 3.0.6

- Add distfile mirror.
- Also includes a bugfix for ctrlproxy failing to recognize
  'learn-nickserv' option.  The bug has been submitted to upstream and
  it'll be included in next release.

Submitted by:		Ashish Shukla <wahjava at gmail.com> via mail
Approved by:		maintainer

5 files changed, 20 insertions, 36 deletions

diff --git a/irc/ctrlproxy/Makefile b/irc/ctrlproxy/Makefile
index 19e20f4852cd..eb8794b42dd7 100644
--- a/irc/ctrlproxy/Makefile
+++ b/irc/ctrlproxy/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	ctrlproxy
-PORTVERSION=	3.0.5
-PORTREVISION=	2
+PORTVERSION=	3.0.6
 CATEGORIES=	irc
-MASTER_SITES=	http://ctrlproxy.vernstok.nl/releases/
+MASTER_SITES=	http://www.ctrlproxy.org/releases/ \
+		LOCAL/chinsan/ctrlproxy/
 
 MAINTAINER=	chinsan@FreeBSD.org
 COMMENT=	Flexible IRC proxy
diff --git a/irc/ctrlproxy/distinfo b/irc/ctrlproxy/distinfo
index 3bf7c421546f..d67ef65405e7 100644
--- a/irc/ctrlproxy/distinfo
+++ b/irc/ctrlproxy/distinfo
@@ -1,3 +1,3 @@
-MD5 (ctrlproxy-3.0.5.tar.gz) = 64be702fb70728756f70b8cbafe87c74
-SHA256 (ctrlproxy-3.0.5.tar.gz) = 251e51bfaf5ba391732e54da184253fcc78af347af3c15fab8f5c21e3effe517
-SIZE (ctrlproxy-3.0.5.tar.gz) = 244383
+MD5 (ctrlproxy-3.0.6.tar.gz) = fdb5135860d3c01baac0248c23096480
+SHA256 (ctrlproxy-3.0.6.tar.gz) = 2cd6d620bf08493111db6d80688d0066d392d5f3fde2b5567ce2b0e97257a7ce
+SIZE (ctrlproxy-3.0.6.tar.gz) = 476401
diff --git a/irc/ctrlproxy/files/patch-lib__client.c b/irc/ctrlproxy/files/patch-lib__client.c
deleted file mode 100644
index 282091e2a2d3..000000000000
--- a/irc/ctrlproxy/files/patch-lib__client.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/client.c.orig	2007-12-07 20:46:47.000000000 +0530
-+++ lib/client.c	2007-12-23 22:08:20.000000000 +0530
-@@ -277,8 +277,10 @@
- 	
- 	c->incoming = NULL;
- 
--	g_iconv_close(c->outgoing_iconv);
--	g_iconv_close(c->incoming_iconv);
-+	if (c->outgoing_iconv != (GIConv)-1)
-+		g_iconv_close(c->outgoing_iconv);
-+	if (c->incoming_iconv != (GIConv)-1)
-+		g_iconv_close(c->incoming_iconv);
- 
- 	if (c->exit_on_close) 
- 		exit(0);
diff --git a/irc/ctrlproxy/files/patch-lib__network.c b/irc/ctrlproxy/files/patch-lib__network.c
deleted file mode 100644
index 5126cc91c4b5..000000000000
--- a/irc/ctrlproxy/files/patch-lib__network.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/network.c.orig	2007-12-07 20:46:47.000000000 +0530
-+++ lib/network.c	2007-12-23 22:45:38.000000000 +0530
-@@ -1261,8 +1261,10 @@
- 	ssl_free_client_credentials(s->ssl_credentials);
- #endif
- 
--	g_iconv_close(s->connection.incoming_iconv);
--	g_iconv_close(s->connection.outgoing_iconv);
-+	if (s->connection.incoming_iconv != (GIConv)-1)
-+		g_iconv_close(s->connection.incoming_iconv);
-+	if (s->connection.outgoing_iconv != (GIConv)-1)
-+		g_iconv_close(s->connection.outgoing_iconv);
- 
- 	g_free(s);
- }
diff --git a/irc/ctrlproxy/files/patch-src_settings.c b/irc/ctrlproxy/files/patch-src_settings.c
new file mode 100644
index 000000000000..f67394ca5d87
--- /dev/null
+++ b/irc/ctrlproxy/files/patch-src_settings.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/settings.c.orig
++++ src/settings.c
+@@ -1055,7 +1055,7 @@
+ 	}
+ 
+     if (g_key_file_has_key(kf, "global", "learn-nickserv", NULL))
+-		cfg->learn_nickserv = g_key_file_get_boolean(kf, "global", "learn-nicksev", NULL);
++		cfg->learn_nickserv = g_key_file_get_boolean(kf, "global", "learn-nickserv", NULL);
+     else 
+ 	    cfg->learn_nickserv = TRUE;
+