7 files changed, 48 insertions, 25 deletions

diff --git a/irc/ctrlproxy/Makefile b/irc/ctrlproxy/Makefile
index 1c3ac04f82a7..b04181fd8fa4 100644
--- a/irc/ctrlproxy/Makefile
+++ b/irc/ctrlproxy/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	ctrlproxy
-PORTVERSION=	3.0.3
+PORTVERSION=	3.0.5
 CATEGORIES=	irc
 MASTER_SITES=	http://ctrlproxy.vernstok.nl/releases/
 
@@ -32,9 +32,10 @@ LDFLAGS=	-L${LOCALBASE}/lib
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/ctrlproxy.1 ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/ctrlproxy_config.5 ${MANPREFIX}/man/man5
+	${INSTALL_DATA} ${WRKSRC}/doc/help.txt ${DATADIR}/help
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in AUTHORS BUGS HACKING NEWS README UPGRADING
+.for file in AUTHORS HACKING NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/doc/user-guide.html ${DOCSDIR}
diff --git a/irc/ctrlproxy/distinfo b/irc/ctrlproxy/distinfo
index 94baefdda3be..3bf7c421546f 100644
--- a/irc/ctrlproxy/distinfo
+++ b/irc/ctrlproxy/distinfo
@@ -1,3 +1,3 @@
-MD5 (ctrlproxy-3.0.3.tar.gz) = db599c9e2f5196539f8b06814ba4fd18
-SHA256 (ctrlproxy-3.0.3.tar.gz) = bbb3bd6680c2ffdc6a337a7531f6560f9dc9c3d9f2254629ff567d27a2304182
-SIZE (ctrlproxy-3.0.3.tar.gz) = 229342
+MD5 (ctrlproxy-3.0.5.tar.gz) = 64be702fb70728756f70b8cbafe87c74
+SHA256 (ctrlproxy-3.0.5.tar.gz) = 251e51bfaf5ba391732e54da184253fcc78af347af3c15fab8f5c21e3effe517
+SIZE (ctrlproxy-3.0.5.tar.gz) = 244383
diff --git a/irc/ctrlproxy/files/patch-Makefile b/irc/ctrlproxy/files/patch-Makefile
index 99db5f2aadb5..ea05159aad67 100644
--- a/irc/ctrlproxy/files/patch-Makefile
+++ b/irc/ctrlproxy/files/patch-Makefile
@@ -1,25 +1,24 @@
 --- Makefile.orig	Sun Apr 15 14:17:58 2007
 +++ Makefile	Sat Jun 16 12:00:33 2007
-@@ -90,7 +90,7 @@
+@@ -108,7 +108,7 @@
  ctrlproxy.pc Makefile.settings: configure Makefile.settings.in ctrlproxy.pc.in
  	./$<
  
--install: all install-dirs install-bin install-header install-mods install-data install-pkgconfig $(EXTRA_INSTALL_TARGETS)
-+install: all install-dirs install-bin install-mods install-data install-pkgconfig $(EXTRA_INSTALL_TARGETS)
+-install: all install-dirs install-bin install-header install-data install-pkgconfig $(EXTRA_INSTALL_TARGETS)
++install: all install-dirs install-bin install-data install-pkgconfig $(EXTRA_INSTALL_TARGETS)
  install-dirs:
  	$(INSTALL) -d $(DESTDIR)$(modulesdir)
  
-@@ -113,8 +113,6 @@
+@@ -133,7 +133,6 @@
  
  install-doc:: doc
  	$(INSTALL) -d $(DESTDIR)$(docdir)
--	$(INSTALL) -m 0644 UPGRADING $(DESTDIR)$(docdir)
 -	$(MAKE) -C doc install PACKAGE_VERSION=$(PACKAGE_VERSION)
  
  uninstall-doc: 
  	$(MAKE) -C doc uninstall
-@@ -146,8 +144,8 @@
- 	-rmdir $(DESTDIR)$(modulesdir)
+@@ -156,8 +154,8 @@
+	$(INSTALL) -m 0644 config.admin $(DESTDIR)$(DEFAULT_CONFIG_DIR)/networks/admin
  
  install-pkgconfig:
 -	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
diff --git a/irc/ctrlproxy/files/patch-lib__client.c b/irc/ctrlproxy/files/patch-lib__client.c
new file mode 100644
index 000000000000..282091e2a2d3
--- /dev/null
+++ b/irc/ctrlproxy/files/patch-lib__client.c
@@ -0,0 +1,15 @@
+--- 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
new file mode 100644
index 000000000000..5126cc91c4b5
--- /dev/null
+++ b/irc/ctrlproxy/files/patch-lib__network.c
@@ -0,0 +1,15 @@
+--- 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__network.h b/irc/ctrlproxy/files/patch-lib__network.h
index 626d560ec2e0..4f5a82083a6a 100644
--- a/irc/ctrlproxy/files/patch-src__network.h
+++ b/irc/ctrlproxy/files/patch-lib__network.h
@@ -1,5 +1,5 @@
---- src/network.h.orig	Sun Apr 15 14:17:58 2007
-+++ src/network.h	Sat Jun 16 11:46:55 2007
+--- lib/network.h.orig	Sun Apr 15 14:17:58 2007
++++ lib/network.h	Sat Jun 16 11:46:55 2007
 @@ -30,8 +30,11 @@
  #endif
  
diff --git a/irc/ctrlproxy/pkg-plist b/irc/ctrlproxy/pkg-plist
index a49dd8497e4e..f8cdeb53e18a 100644
--- a/irc/ctrlproxy/pkg-plist
+++ b/irc/ctrlproxy/pkg-plist
@@ -1,24 +1,17 @@
 bin/ctrlproxy
-lib/ctrlproxy/libauto_away.so
-lib/ctrlproxy/liblistener.so
-lib/ctrlproxy/liblog_custom.so
-lib/ctrlproxy/liblog_irssi.so
-lib/ctrlproxy/librepl_highlight.so
-lib/ctrlproxy/librepl_lastdisconnect.so
-lib/ctrlproxy/librepl_simple.so
-lib/ctrlproxy/libsocks.so
+bin/ctrlproxy-admin
+bin/linestack-cmd
+libdata/pkgconfig/ctrlproxy.pc
 %%DATADIR%%/default/config
 %%DATADIR%%/default/networks/admin
+%%DATADIR%%/help
 %%DATADIR%%/motd
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/HACKING
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%PORTDOCS%%%%DOCSDIR%%/user-guide.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-libdata/pkgconfig/ctrlproxy.pc
 @dirrm %%DATADIR%%/default/networks
 @dirrm %%DATADIR%%/default
 @dirrm %%DATADIR%%