update to ircII 20140824.

main changes are significant internal cleanup, dozens of minor bug
fixes, and two new major features:  connect via HTTP proxy, and
connect to SSL IRC servers.

4 files changed, 19 insertions, 33 deletions

diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile
index c5e18750980..77be456cbfa 100644
--- a/chat/ircII/Makefile
+++ b/chat/ircII/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2014/03/12 07:22:34 mrg Exp $
+# $NetBSD: Makefile,v 1.64 2014/08/25 06:22:18 mrg Exp $
 
 DISTNAME=		ircii-${VERS}
 PKGNAME=		ircII-${VERS}
-PKGREVISION=		1
 CATEGORIES=		chat
 MASTER_SITES=		http://ircii.warped.com/
 EXTRACT_SUFX=		.tar.bz2
@@ -16,11 +15,19 @@ CONFLICTS=		blackened-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-VERS=			20131230
+VERS=			20140824
 PLIST_SUBST+=	VERS=${VERS:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
+# By default, mandir defaults to @datarootdir@/man, and then it gets
+# ${DESTDIR} applied already.  However, if you pass --mandir it does
+# not provide it, and you have to supply it directly as well.  To do
+# this in pkgsrc, we have to set CONFIGURE_HAS_MANDIR=no so that
+# we don't pass --mandir=${PREFIX}/man as well, last.
+CONFIGURE_HAS_MANDIR=	no
+CONFIGURE_ARGS+=	--mandir=${DESTDIR}${PREFIX}/man
+
 WRKSRC=			${WRKDIR}/ircii-${VERS}
 GNU_CONFIGURE=		yes
 .if defined(DEFAULT_IRC_SERVER)
diff --git a/chat/ircII/PLIST b/chat/ircII/PLIST
index a189b58c9fc..334a169a607 100644
--- a/chat/ircII/PLIST
+++ b/chat/ircII/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2014/01/02 07:57:49 mrg Exp $
+@comment $NetBSD: PLIST,v 1.26 2014/08/25 06:22:18 mrg Exp $
 bin/irc
 bin/irc-${VERS}
 bin/ircbug
@@ -315,7 +315,6 @@ share/irc/help/rbind${GZSUFFIX}
 share/irc/help/redirect${GZSUFFIX}
 share/irc/help/rehash${GZSUFFIX}
 share/irc/help/restart${GZSUFFIX}
-share/irc/help/rules${GZSUFFIX}
 share/irc/help/save${GZSUFFIX}
 share/irc/help/say${GZSUFFIX}
 share/irc/help/send${GZSUFFIX}
@@ -351,6 +350,10 @@ share/irc/help/set/debug${GZSUFFIX}
 share/irc/help/set/decrypt_program${GZSUFFIX}
 share/irc/help/set/display${GZSUFFIX}
 share/irc/help/set/display_encoding${GZSUFFIX}
+share/irc/help/set/ssl_ca_path${GZSUFFIX}
+share/irc/help/set/ssl_ca_file${GZSUFFIX}
+share/irc/help/set/ssl_ca_chain_file${GZSUFFIX}
+share/irc/help/set/ssl_ca_private_key_file${GZSUFFIX}
 share/irc/help/set/eight_bit_characters${GZSUFFIX}
 share/irc/help/set/encrypt_program${GZSUFFIX}
 share/irc/help/set/exec_protection${GZSUFFIX}
diff --git a/chat/ircII/distinfo b/chat/ircII/distinfo
index 44e468edf83..c7b5b81b7f3 100644
--- a/chat/ircII/distinfo
+++ b/chat/ircII/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.37 2014/03/12 07:22:34 mrg Exp $
+$NetBSD: distinfo,v 1.38 2014/08/25 06:22:18 mrg Exp $
 
-SHA1 (ircii-20131230.tar.bz2) = b59f8fcd344c09b8820f6efbcc74ba9af7e587ce
-RMD160 (ircii-20131230.tar.bz2) = ae2696afc9b6efec3e866ae217d5f5bd258d4493
-Size (ircii-20131230.tar.bz2) = 552149 bytes
+SHA1 (ircii-20140824.tar.bz2) = e77f3574e51bb50d4b250e578a966946116f211b
+RMD160 (ircii-20140824.tar.bz2) = ee7bc0e0f4c2f24e0ec57857ae6d902b338aaddf
+Size (ircii-20140824.tar.bz2) = 590349 bytes
 SHA1 (patch-ac) = 9f6f3b27670b63ff00b55c5431ec1da5219369ff
-SHA1 (patch-source_input.c) = 4ddd92d6209624db964f08f0d7b0375781344138
diff --git a/chat/ircII/patches/patch-source_input.c b/chat/ircII/patches/patch-source_input.c
deleted file mode 100644
index 633f631886d..00000000000
--- a/chat/ircII/patches/patch-source_input.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-source_input.c,v 1.1 2014/03/12 07:22:34 mrg Exp $
-
-fix a problem with the input line when it goes beyond the screen size
-
-Index: source/input.c
-===================================================================
-RCS file: /home/cvs/ircii/source/input.c,v
-retrieving revision 1.55
-retrieving revision 1.56
-diff -p -r1.55 -r1.56
-*** source/input.c	30 Dec 2013 16:42:38 -0000	1.55
---- source/input.c	30 Jan 2014 10:13:06 -0000	1.56
-*************** update_input(update)
-*** 488,493 ****
---- 484,491 ----
-  			}
-  		}
-  		VisBuf[optr] = '\0';
-+ 		if (old_cursor_pos > inputdata->cursor_x)
-+ 			old_cursor_pos = 0;
-  		term_move_cursor(old_cursor_pos, inputdata->cursor_y);
-  		written = output_line(VisBuf + old_cursor_pos, 0);
-  		if (term_clear_to_eol() && written < current_screen->co)