Upgrade to 1.2.1, reuse work from wip/bitchx (by Makoto Fujiwara)

Drop all local patches for old GCC fixes and tuning the program itself.

Upstream changelog
==================

[Changes 1.2.1]

* Prefer <fcntl.h> over <sys/fcntl.h> (reported by ncopa). (caf)

* Fix overflow in say() when handling a maximum-length client message. (caf)

* Remove WANT_CHAN_NICK_SERV define and include network services commands
  by default. (caf)

* Pass through externally-provided CPPFLAGS (reported by cpet). (caf)

* Don't set the mode on new channels until synched - this speeds up joining
  lots of channels at connect time if one of them is new, and reduces the
  chance of being flooded off the server. (caf)

* Correctly handle channel sync across multi-server. (caf)

* Fixes and improvements for channel logging. (caf)

* Use correct (MODECHAN and MODEUSER) display level for channel and user
  modes. (caf)

* Allow %- status format to handle max-length topics (reported by oxy). (caf)

* Add /FSET WOHIS_LOGGEDIN for services login info on hybrid, ratbox and
  ircu. (caf)

* Add sanity checking of incoming nicknames. (caf)

* /MV (massvoice) shouldn't send +v for already-voiced users. (caf)

* Fix lag check on recent 32 bit OpenBSD / NetBSD (reported by DJ). (caf)

* Fix key bindings that terminate with ^. (caf)

* Fix the $timer() scripting function. (caf)

* Fix the /TKB (timed kickban) command. (caf)

* Rewrite termcap/terminfo detection logic in configure and include term.h
  in term.c for the system definition of tparm().  This fixes a crash on
  NetBSD x86-64 (reported by jeezy), and should also ensure that terminfo
  is used in preference to termcap on NetBSD. (caf)

* Fix output when built against termcap. (caf)

* Fix STATUS_NOTIFY so that it appears in the right window. (caf)

* Improve robustness of status formats handling. (caf)

* Use system setenv() in preference to compat bsd_setenv(). (caf)

* Allow selection of alternate hashing methods with $crypt(). (caf)

* Improve the initial seeding of the randm() fallback RNG. (caf)

* Strengthen the cookie generation algorithm for /detach. (caf)

* RANDOM_SOURCE now only affects the rand() scripting function. (caf)

* Make RANDOM_LOCAL_PORTS actually random. (caf)

* Show same message on local terminal as used in emergency exit QUIT. (caf)

* Remove unused XLINK CTCP reply handler. (caf)

* Ensure add_socketread() doesn't leak file descriptors. (caf)

* Fix listing bans on local channels (/BANS &channel). (flashback)

* Fix unbanning by number (/UNBAN #channel #number). (caf)

* Improve the list_channels() function. (caf)

* Use socklen_t instead of plain int where available. (flashback)

* Use <termios.h> in preference to <sys/termios.h> where it's available. (caf)

* Skip malformed abots.sav entries in read_abot(), avoiding null
  dereferences found by Coverity. (flashback)

* Ensure proper handling of % when /FSET DCC is used. (caf)

* Improve robustness of CDCC save file loading. (caf)

* Fix open file leak in /LASTLOG found by Coverity. (caf)

* Fix file descriptor leak on SOCKS4 connection failure found by
  Coverity. (caf)

* Fix out-of-bounds error in cryptit() found by Coverity. (flashback)

* Cleanup save_formats(). (caf)

* Fix off-by-one error in add_socketread() and set_socketwrite() found
  by Coverity. (caf)

* Fix longstanding bug with ordering of rfc1459[] array. (caf)

* Fix crash after /SETAR -, reported by riderplus. (caf)

* Remove special handling of 484 numeric, which is no longer needed and
  was buggy (making BitchX think that usermode +G was set). (caf)

* Add /OBITS command, shows obituaries for some BitchX friends. (caf)

* Fix abuses of the RESIZE macro.  Reported by nenolod. (caf)

* Clears up a crash and some build warnings in the acro plugin. (caf)

* Applied patches from jdhore to clean up the plugin building
  and installing process. (caf)

* Fix building on newer Cygwin (reported by VICODAN). (caf)

* Fix building plugins on FreeBSD-10 (reported by cpet). (caf)

* Messages sent to channels should use lastlog level PUBLIC, not MSG. (caf)

* panasync OK'd releasing tcl.c, so here it is. (caf)

* Fix QUIT messages with SSL connections. (flashback)

* Rename include/bitchx to include/options.h, fixes building on
  case-insensitive platforms. (caf)

* Use AI_ADDRCONFIG flag to improve server address selection when client
  is built for IPv6 but we don't have an IPv6 address. (caf)

* Enable SSL support by default, if OpenSSL is present at build time. (caf)

* Fix leak and potential crash in lame_resolv() using IPv6.  (caf, snadge)

* Apply patch from snadge defining BIND_4_COMPAT on OpenBSD, to allow
  /nslookup to build. (caf)

* Fix problem connecting to IPv4 when IPv6 enabled on FreeBSD and enable
  IPv6 on all supporting platforms. Thanks to brabes, snadge and packet. (caf)

* Improve connect() error handling. (caf)

* Remove obsolete .spec files. (caf)

* configure - only create sig.inc if it's actually needed. (caf)

* configure - use the right dependencies when checking for net/if.h, i
  arpa/inet.h and resolv.h. Reported by flashback. (caf)

* Fix plugin Makefiles for out-of-tree building, reported by nyet. (caf)

* Add DESTDIR support to build system, to ease rpm and deb packaging.
  Reported separately by nyet and VICODAN. (caf)

* Fix /detach and wserv with IPv6 enabled. (caf, snadge, packet)

* Make default for NICK_COMPLETION_CHAR explicit. (caf)

* Reduce footprint when starting up disconnected. (caf)

* Fix /nslookup command (including fixing compilation on cygwin). (caf)

* Improve /detach error handling and remove bogus F_SETOWN use, reported
  by madsage. (caf)

* Add /FSET WHOIS_SECURE for SSL connection info on ratbox, unreal and
  freenode. (caf)

* Add /FSET CHANNEL_URL for services channel URL numeric. (caf)

* Fix crash bug in $mircansi() scripting function. (caf)

* Add half-op support to /topic and /untopic. (caf)

* Tidy up the URL grabber, fixing a memory leak. (caf)

* Cleanup the /BHELP code, fixing a potential crash. Apply updates to
  BitchX.help from t3gah. (caf)

* [1.1s01] Sanity check color codes, fixes a potential crash. (caf)

* Add /FSET USERMODE_OTHER to correctly format user mode changes where the
  source isn't the same as the target, reported by gauze. (caf)

* Improve country() and add several new TLDs, suggested by gauze. (caf)

* Apply fixes from darkfires removing non-standard use of arithmetic on
  void * values, to allow building on Irix. (caf)

* Apply fix from darkfires to allow building with ICC. (caf)

* Show correct message when a socket connection is closed cleanly. (caf)

* Add /FSET WHOIS_CALLERID for +g mode notification on hybrid & ratbox. (caf)

* Build script fix to allow plugins to build on x86-64. (caf)

* Correct count in /CLONES (reported by t3gah), and format output nicely
  using an /fset. (caf)

* Add definition of BIND_8_COMPAT to fix build problem on Mac OS X. (caf)

* Ensure that SHOW_AWAY_ONCE doesn't hide away status in /whois output. (caf)

* Fix the the -z command line option for specifying username. (flashback)

* Fix up /WILN, /WILC and /WILCR. (caf)

* Backport changes from epic5 to make recv_nick, sent_nick and sent_body
  per-server, and apply new version of do_oops from flashback. This means
  that /oops, "/query .", "/query ,", "/msg ." and "/msg ," are per-server,
  along with the $. $, and $B aliases. (caf)

* Handle error return from getcwd() in /cd. (caf)

* Fix alloca warnings on freebsd. (caf)

* Fix memory leak in banlist.c. (caf)

* Apply a fix contributed by cpet for the configure script on
  FreeBSD 9. (caf)

* Fix a refcounting issue in the whowas list handling, which should make
  the listing of users that left in a netsplit right again. (caf)

* Improve argument-handling in /hostname command - now supports doing
  /hostname 2 to switch to second vhost. (caf)

* Change the display of server stats so that the averages (eg. users per
  channel) are correctly rounded. (caf)

* Reinstate RPL_WHOISACTUALLY / RPL_WHOISHOST numerics - things seem to have
  stabilised in the ircd world on this. (caf)

* Fixed two cases where the client was incorrectly deciding that a numeric
  originated from a remote server rather than the local server - this caused
  BitchX to falsely report channel desynch and incorrectly hide some
  numerics. (caf)

* Fixed $servernum() scripting function, it was returning the wrong server
  reference in most cases. (caf)

* [1.1s01] Fixed .cmsg crash reported by zimzum. (caf)

* Changed the defaults for JOIN_NEW_WINDOW_TYPE and QUERY_NEW_WINDOW_TYPE
  so that they work out of the box. (caf)

* Some cleanups in quit message handling, fixed a bug where a quit from an
  unexpected source could crash the client. (caf)

* Cleaned up the handling of channel mode changes a little, including fixing
  buggy handling of certain key and limit mode changes. (caf)

* Fix bug where you got disconnected if the server sent a 464 numeric
  (bad password) that the client wasn't expecting. (caf)

* Add /HOP and /DEHOP commands for halfop. (caf)

* Removed "scan" plugin, this functionality is now covered by /SCAN -stat.
  (caf)

* Change NICKSORT_OP to NICKSORT_STAT (sorts nicks by channel status -
  chanop first, then halops, voices and others).  Added /SCAN -stat
  to sort nicks using NICKSORT_OP.  Removed NICKSORT_VOICE - it was broken
  anyway. (caf)

* Add halfop nick prefix to default status line, and change the voice prefix
  so it appears whether or not you're opped. (caf)

* Add halfop support to $channel() scripting function. (caf)

* Rework /SCAN and /NAMES formatting.  This removes the /FSETs NAMES_BOTCOLOR,
  NAMES_FRIENDCOLOR, NAMES_NICKCOLOR, NAMES_OPCOLOR, NAMES_SHITCOLOR and
  NAMES_VOICECOLOR and replaces them with new /FSETs. (caf)

* Add $ishalfop(<nick> <channel) scripting function, just like the
  existing function in EPIC. (caf)

* Fix four bugs in the /FE scripting function. (caf)

* Fix incompatibility with 64-bit platforms. (caf)

* Fix module load version check logic. (caf)

* [1.1s01] Cleanups to allow compiling with new gcc releases. (caf)

* [1.1s01] Fix configure check for termcap.h. (caf)

* [1.1s01] Re-implement code to find available vhost addresses
  (CVE-2007-5839). (caf)

* [1.1s01] Fix test for GCC >= 2.7 - fixes compiling on S390 platform. (caf)

* [1.1s01] Improve buffer handling in convert_output_format_raw
  (CVE-2007-4584). (caf)

* [1.1s01] Handle negative numerics correctly (CVE-2007-3360). (caf)

18 files changed, 27 insertions, 384 deletions

diff --git a/chat/bitchx/Makefile b/chat/bitchx/Makefile
index 89630c0fae2..ba08a4a65b3 100644
--- a/chat/bitchx/Makefile
+++ b/chat/bitchx/Makefile
@@ -1,23 +1,19 @@
-# $NetBSD: Makefile,v 1.55 2015/08/18 07:31:03 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2015/09/27 19:06:23 kamil Exp $
 
-DISTNAME=	ircii-pana-1.1-final
-PKGNAME=	bitchx-1.1
-PKGREVISION=	8
+DISTNAME=	bitchx-1.2.1
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bitchx/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.bitchx.org/
 COMMENT=	IRC client based on ircII
-
-# This package is not even remotely 64-bit clean
-NOT_FOR_PLATFORM=	${LP64PLATFORMS}
+LICENSE=	modified-bsd
 
 USE_TOOLS+=	bash
 
-WRKSRC=			${WRKDIR}/BitchX
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-ssl
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
 CONFIG_SHELL=		${TOOLS_PATH.bash}
 
 .include "../../mk/bsd.prefs.mk"
@@ -31,11 +27,7 @@ SUBST_STAGE.manpage=	post-patch
 SUBST_FILES.manpage+=	doc/BitchX.1
 SUBST_SED.manpage+=	-e 's,@PREFIX@,${PREFIX},g'
 
-INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
-INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
-
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-
 .include "../../mk/terminfo.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/bitchx/PLIST b/chat/bitchx/PLIST
index 25af8956f39..39242a7a4c9 100644
--- a/chat/bitchx/PLIST
+++ b/chat/bitchx/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:28:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2015/09/27 19:06:23 kamil Exp $
 bin/BitchX
-bin/BitchX-1.1-final
+bin/BitchX-${PKGVERSION}
 bin/scr-bx
-man/man1/BitchX.1
-share/bx/BitchX.doc
+man/man1/BitchX.1.bz2
 share/bx/BitchX.help
 share/bx/BitchX.ircnames
 share/bx/BitchX.kick
@@ -913,10 +912,6 @@ share/bx/help/8_Scripts/wallopstat.bz2
 share/bx/help/8_Scripts/webster.bz2
 share/bx/help/8_Scripts/window.bz2
 share/bx/help/README_FIRST.bz2
-share/bx/help/commands.bz2
-share/bx/help/findcomm.bz2
-share/bx/help/functions.bz2
-share/bx/help/out.bz2
 share/bx/script/SCRIPTS
 share/bx/script/actplug.gmz
 share/bx/script/auto_resume
@@ -967,4 +962,3 @@ share/bx/translation/SWISS.bz2
 share/bx/translation/UNITED_KINGDOM.bz2
 share/bx/translation/UNITED_KINGDOM_COM.bz2
 share/bx/wserv
-@pkgdir lib/bx/plugins
diff --git a/chat/bitchx/distinfo b/chat/bitchx/distinfo
index 484725ce242..ae82a897bd9 100644
--- a/chat/bitchx/distinfo
+++ b/chat/bitchx/distinfo
@@ -1,19 +1,6 @@
-$NetBSD: distinfo,v 1.19 2013/12/06 15:35:53 seanb Exp $
+$NetBSD: distinfo,v 1.20 2015/09/27 19:06:23 kamil Exp $
 
-SHA1 (ircii-pana-1.1-final.tar.gz) = b25635b62c7ff905b6492a4aaa88c43b5aa164f8
-RMD160 (ircii-pana-1.1-final.tar.gz) = 4105de2587964146e2391a26a8a16e3d0059a93f
-Size (ircii-pana-1.1-final.tar.gz) = 2532476 bytes
-SHA1 (patch-aa) = c184a5341217d21277060d07c4ed12c20f374dc8
-SHA1 (patch-ab) = 843e1bdfe6bdd93c93944484edb56be7393f298d
-SHA1 (patch-ac) = ba59735707ca8758d62e78b7756330aa933f2de7
-SHA1 (patch-ad) = ba00fb80b1b980a32b70d84e4ca4db91e9fd5538
-SHA1 (patch-ae) = 90c7e0a19c81e710392c675be650c57e64ee65b3
-SHA1 (patch-af) = c79fcbcc57b8234d5918b1414219965b75e3c0d1
-SHA1 (patch-ag) = fc0b31a959a5799122178a255006ee67521fb49a
-SHA1 (patch-ah) = e3e8334298ba06e7980309a6b2e9b624e1fbd398
-SHA1 (patch-an) = 59a6dc31a90b88bbffac5bb4629feaa2488afeff
-SHA1 (patch-ao) = b91a58efaac234c815542375f4f87eb3bd4055e8
-SHA1 (patch-ap) = 7cc6162de323bf07e52cbad7d4b4b54ac01d105e
-SHA1 (patch-aq) = 97387bc2f7059f1a864f47ecd611ce62e13cb969
-SHA1 (patch-ar) = 09286c5e21c6b8f6d35ab53146297c2e4f44ad55
-SHA1 (patch-include_irc__std.h) = 49d8164f76bbb1f0f6601763b50fbe4aa760fc3e
+SHA1 (bitchx-1.2.1.tar.gz) = 48ca956d43d6d62e32040bddfae49e88c1188927
+RMD160 (bitchx-1.2.1.tar.gz) = 0bf85169f26297fe517b2886f8b9693c360f32f7
+Size (bitchx-1.2.1.tar.gz) = 2549182 bytes
+SHA1 (patch-configure) = fa29df53d26437edf98901fd1a192978cda2e685
diff --git a/chat/bitchx/patches/patch-aa b/chat/bitchx/patches/patch-aa
deleted file mode 100644
index 7f3c621daac..00000000000
--- a/chat/bitchx/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2004/11/26 11:38:14 adam Exp $
-
---- configure.orig	2003-04-11 01:09:04.000000000 +0000
-+++ configure
-@@ -14837,7 +14837,7 @@ if test -n "$CYGWIN" -o -n "$EMXOS2" -o 
-   mandir="\$(IRCLIB)"
- else
-   INSTALL_IRC="\${bindir}/\$(_VERSION_)\$(EXEEXT)"
--  IRCLIB="\${libdir}/bx"
-+  IRCLIB="\${datadir}/bx"
-   IRCPATH="\$(DEFAULT_CTOOLZ_DIR):\$(DEFAULT_CTOOLZ_DIR)/plugins:.:\$(PLUGINDIR):\$(INSTALL_SCRIPT):\$(IRCLIB)"
-   TRANSLATION_PATH="\$(IRCLIB)/translation"
-   HELPDIR="\$(IRCLIB)/help"
-@@ -14845,7 +14845,7 @@ else
-   INSTALL_SCRBX="\${bindir}/scr-bx\$(EXEEXT)"
-   INSTALL_SCRIPT="\$(IRCLIB)/script"
-   INSTALL_HELP_CMD="cp -pfr bitchx-docs/* \$(HELPDIR)"
--  PLUGINDIR="\$(IRCLIB)/plugins"
-+  PLUGINDIR="\${libdir}/bx/plugins"
-   DEFAULT_CTOOLZ_DIR="~/.BitchX"
-   DEFAULT_MSGLOGFILE="BitchX.away"
-   DEFAULT_BITCHX_HELP_FILE="BitchX.help"
diff --git a/chat/bitchx/patches/patch-ab b/chat/bitchx/patches/patch-ab
deleted file mode 100644
index 76898a75fae..00000000000
--- a/chat/bitchx/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/11/26 11:38:14 adam Exp $
-
---- include/config.h.orig	2003-07-26 07:00:32.000000000 +0000
-+++ include/config.h
-@@ -295,7 +295,7 @@
-  * This is recommended when you want to start BitchX in an xterm without
-  * the usage of the special "vga"-font. 
-  */
--#undef ONLY_STD_CHARS
-+#define ONLY_STD_CHARS
- 
- /*
-  * Normally BitchX uses only the IBMPC (cp437) charset.
diff --git a/chat/bitchx/patches/patch-ac b/chat/bitchx/patches/patch-ac
deleted file mode 100644
index e50f4cfcd3b..00000000000
--- a/chat/bitchx/patches/patch-ac
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2003/01/31 00:17:45 salo Exp $
-
---- source/term.c.orig	Thu Feb 28 05:22:51 2002
-+++ source/term.c	Thu Jan 30 23:27:35 2003
-@@ -824,13 +824,14 @@
- 	int	i;
- 	int	desired;
- 
-+	char	*t2ptr;
- 
- #if !defined(__EMX__) && !defined(WINNT) && !defined(GUI)
- 	memset(current_term, 0, sizeof(struct term_struct));
- 
- 	if (dumb_mode)
- 		ircpanic("term_init called in dumb_mode");
--	*termcap2 = 0;
-+	t2ptr = termcap2;
- 	if (!term && !(term = getenv("TERM")))
- 	{
- 		fprintf(stderr, "\n");
-@@ -877,13 +878,15 @@
- 		}
- 		else
- 		{
--			char *tmp = termcap2;
--
--			cval = Tgetstr(tcaps[i], tmp);
-+			cval = Tgetstr(tcaps[i], t2ptr);
-+#ifdef HAVE_TERMINFO
- 			if (cval == (char *) -1)
- 				*(char **)tcaps[i].ptr = NULL;
- 			else
- 				*(char **)tcaps[i].ptr = cval;
-+#else
-+			*(char **)tcaps[i].ptr = cval;
-+#endif
- 		}
- 	}
- 
diff --git a/chat/bitchx/patches/patch-ad b/chat/bitchx/patches/patch-ad
deleted file mode 100644
index 63d05ef75c4..00000000000
--- a/chat/bitchx/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2004/11/26 11:38:14 adam Exp $
-
---- source/screen.c.orig	2003-07-31 07:01:08.000000000 +0000
-+++ source/screen.c
-@@ -2974,6 +2974,8 @@ static 	char 	retbuf[512];
- 
- 	if (back == 58)
- 		strcat(retbuf, current_term->TI_sgrstrs[TERM_SGR_BLINK_ON - 1]);
-+	if (fore > 57)
-+		fore = last_fore;
- 	if (fore > -1)
- 		strcat(retbuf, current_term->TI_forecolors[fore_conv[fore]]);
- 	if (back > -1 && back < 58)
diff --git a/chat/bitchx/patches/patch-ae b/chat/bitchx/patches/patch-ae
deleted file mode 100644
index 708f0a6ad88..00000000000
--- a/chat/bitchx/patches/patch-ae
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2003/01/31 00:17:45 salo Exp $
-
---- doc/BitchX.1.orig	Sat Mar 31 00:58:28 2001
-+++ doc/BitchX.1	Thu Jan 30 23:37:53 2003
-@@ -167,14 +167,14 @@
- .I ~/.ircservers
- Contains a list of IRC servers to cycle through.
- .TP
--.I /usr/local/lib/bx/
-+.I @PREFIX@/share/bx/
- System-wide configuration dir.
- .TP
- .I ~/.BitchX/BitchX.sav
- Personal configuration file.
- .TP
- .I ~/.BitchX/BitchX.ircnames
--Default random real name.  NOTE: Must be copied from /usr/local/lib/bx/
-+Default random real name.  NOTE: Must be copied from @PREFIX@/share/bx/
- .TP
- .I ~/.BitchX/BitchX.formats
- Personal 
-@@ -182,12 +182,12 @@
- display formats.
- .TP
- .I ~/.BitchX/BitchX.reasons
--Default random kick messages.  NOTE: Must be copied from /usr/local/lib/bx/
-+Default random kick messages.  NOTE: Must be copied from @PREFIX@/share/bx/
- .TP
- .I ~/.BitchX/BitchX.quit
--Default random quit messages.  NOTE: Must be copied from /usr/local/lib/bx/
-+Default random quit messages.  NOTE: Must be copied from @PREFIX@/share/bx/
- .TP
--.I /usr/local/lib/bx/BitchX.help
-+.I @PREFIX@/share/bx/BitchX.help
- .B BitchX 
- help file.
- .TP
diff --git a/chat/bitchx/patches/patch-af b/chat/bitchx/patches/patch-af
deleted file mode 100644
index 27193d30776..00000000000
--- a/chat/bitchx/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/01/31 00:17:45 salo Exp $
-
---- Makefile.in.orig	Mon Mar  5 20:30:04 2001
-+++ Makefile.in	Fri Jan 31 00:35:17 2003
-@@ -231,7 +231,7 @@
- 	$(INSTALL_DATA) $(top_srcdir)/BitchX.ircnames $(IRCLIB)/$(DEFAULT_BITCHX_IRCNAME_FILE)
- 	$(INSTALL_DATA) $(top_srcdir)/BitchX.quit $(IRCLIB)/$(DEFAULT_BITCHX_QUIT_FILE)
- 	$(INSTALL_DATA) $(top_srcdir)/BitchX.reasons $(IRCLIB)/$(DEFAULT_BITCHX_KICK_FILE)
--	$(WINNT_INSTALL)
-+	$(INSTALL_DATA) $(top_srcdir)/doc/BitchX.doc $(IRCLIB)
- 
- install_local: all local_installdirs installdll_local
- 	$(INSTALL) source/$(_VERSION_)$(EXEEXT) $(local_dir)/bin/$(VERSION)$(EXEEXT)
-@@ -302,8 +302,6 @@
- 			done; \
- 		fi; \
- 	)
--	(find $(mandir)/man1/BitchX.1 -type f ! -name '*.bz2' ! -name '*.gz' -name '*' | \
--		(xargs bzip2 -9f || xargs gzip -9f) || :) 2>/dev/null
- 
- installdirs:
- 	umask 022; $(top_srcdir)/mkinstalldirs $(bindir) $(IRCLIB) $(mandir)/man1 $(TRANSLATION_PATH) $(INSTALL_SCRIPT) $(HELPDIR)
diff --git a/chat/bitchx/patches/patch-ag b/chat/bitchx/patches/patch-ag
deleted file mode 100644
index db447e09726..00000000000
--- a/chat/bitchx/patches/patch-ag
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2008/07/06 05:16:50 tonnerre Exp $
-
---- source/parse.c.orig	2008-07-06 06:24:53.000000000 +0200
-+++ source/parse.c
-@@ -1413,10 +1413,11 @@ static	void p_mode(char *from, char **Ar
- 	char	*channel;
- 	char	*line;
- 	int	flag;
-+	size_t	linelen;
- 	
- 	ChannelList *chan = NULL;
- 	ChannelList *chan2 = get_server_channels(from_server);
--	char buffer[BIG_BUFFER_SIZE+1];		
-+	char *buffer;
- 	char *smode;
- #ifdef COMPRESS_MODES
- 	char *tmpbuf = NULL;
-@@ -1432,7 +1433,13 @@ static	void p_mode(char *from, char **Ar
- 	set_display_target(channel, LOG_CRAP);
- 	if (channel && line)
- 	{
--		strcpy(buffer, line);
-+		buffer = malloc(linelen = strlen(line));
-+		if (!buffer)
-+		{
-+			perror("malloc");
-+			return;
-+		}
-+		strncpy(buffer, line, linelen);
- 		if (get_int_var(MODE_STRIPPER_VAR))
- 			strip_modes(from,channel,line);
- 		if (is_channel(channel))
-@@ -1486,6 +1493,7 @@ static	void p_mode(char *from, char **Ar
- 			do_logchannel(LOG_MODE_USER, chan, "%s %s %s", from, channel, line);
- 		}
- 		update_all_status(current_window, NULL, 0);
-+		free(buffer);
- 	}
- #ifdef GUI
- 	gui_update_nicklist(channel);
diff --git a/chat/bitchx/patches/patch-ah b/chat/bitchx/patches/patch-ah
deleted file mode 100644
index 0ccc33901ab..00000000000
--- a/chat/bitchx/patches/patch-ah
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2008/07/06 05:16:50 tonnerre Exp $
-
---- source/commands.c.orig	2003-06-11 09:00:41.000000000 +0200
-+++ source/commands.c
-@@ -2617,7 +2617,6 @@ BUILT_IN_COMMAND(e_hostname)
- #if !defined(__linux__) && !defined(BSD) && !defined(__EMX__)
- 		bitchsay("Local Host Name is [%s]", (LocalHostName)? LocalHostName: hostname);
- #elif defined(old_hostname)
--		char filename[81];
- 		char comm[200];
- 		FILE *fptr;
- 		char *p = NULL, *q;
-@@ -2632,34 +2631,29 @@ BUILT_IN_COMMAND(e_hostname)
- #endif
- #endif
- 
--		tmpnam(filename);
- #if defined(_BSDI_VERSION) && _BSDI_VERSION < 199701
- 		if (!(p = path_search("netstat", "/sbin:/usr/sbin:/bin:/usr/bin")))
- 		{
- 			yell("No Netstat to be found");
- 			return;
- 		}
--		sprintf(comm, "%s -in >%s", p, filename);
-+		sprintf(comm, "%s -in", p);
- #elif defined(__EMX__)
--		sprintf(comm, "netstat -a > %s", filename);
-+		sprintf(comm, "netstat -a");
- #else
- 		if (!(p = path_search("ifconfig", "/sbin:/usr/sbin:/bin:/usr/bin")))
- 		{
- 			yell("Can't find ifconfig");
- 			return;
- 		}
--                sprintf(comm, "%s -a >%s", p, filename);
-+                sprintf(comm, "%s -a", p);
- #endif
--		system(comm);
- 
- #ifdef __EMXPM__
- 		pm_seticon(last_input_screen);
- #endif
--		if ((fptr = fopen(filename, "r")) == NULL)
--		{
--			unlink(filename);
-+		if ((fptr = popen(comm, "r")) == NULL)
- 			return;
--		}
- #if defined(_BSDI_VERSION) && _BSDI_VERSION < 199701
- 		fgets(comm, 200, fptr);
- 		fgets(comm, 200, fptr);
-@@ -2777,7 +2771,6 @@ BUILT_IN_COMMAND(e_hostname)
- 			}
- 		}
- 		fclose(fptr);
--		unlink(filename);
- 		for (new = virtuals, i = 1; virtuals; i++)
- 		{
- 			new = virtuals;
diff --git a/chat/bitchx/patches/patch-an b/chat/bitchx/patches/patch-an
deleted file mode 100644
index f4316e56571..00000000000
--- a/chat/bitchx/patches/patch-an
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-an,v 1.1 2004/06/27 00:35:04 heas Exp $
-
---- include/modval.h.orig	2001-05-19 20:40:58.000000000 +0000
-+++ include/modval.h
-@@ -279,8 +279,8 @@ extern Function_ptr *global;
- #define output_line(x) ((int) (global[OUTPUT_LINE]((const unsigned char *)x)))
- #define output_with_count(x, y, z) ((int) (global[OUTPUT_WITH_COUNT]((const unsigned char *)x, (int)y, (int)z)))
- #define scroll_window(x) ((void) (global[SCROLL_WINDOW]((Window *)x)))
--#define cursor_not_in_display(x) ((void) (global[CURSOR_IN_DISPLAY]((Screen *)x)))
--#define cursor_in_display(x) ((void) (global[CURSOR_IN_DISPLAY]((Screen *)x)))
-+#define cursor_not_in_display(x) ((void) (global[CURSOR_NOT_IN_DISPLAY]((Screen *)x)))
-+#define cursor_in_display(x) ((void) (global[CURSOR_IN_DISPLAY]((Window *)x)))
- #define is_cursor_in_display(x) ((int) (global[IS_CURSOR_IN_DISPLAY]((Screen *)x)))
- #define repaint_window(x, y, z) ((void) (global[REPAINT_WINDOW]((Window *)x, (int)y, (int)z)))
- 
diff --git a/chat/bitchx/patches/patch-ao b/chat/bitchx/patches/patch-ao
deleted file mode 100644
index 6ba2a733335..00000000000
--- a/chat/bitchx/patches/patch-ao
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ao,v 1.4 2012/02/16 13:50:52 hans Exp $
-
---- source/term.c.orig	2007-03-17 14:16:38.000000000 +0100
-+++ source/term.c	2007-03-17 14:18:28.000000000 +0100
-@@ -92,7 +92,10 @@ extern	int		tgetflag();
- #endif
- 
- extern  char    *getenv();
-+
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__NetBSD__) && !defined(__sun)
- extern	char	*tparm();
-+#endif
- 
- /*
-  * The old code assumed termcap. termcap is almost always present, but on
diff --git a/chat/bitchx/patches/patch-ap b/chat/bitchx/patches/patch-ap
deleted file mode 100644
index 3060bb72a93..00000000000
--- a/chat/bitchx/patches/patch-ap
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2007/03/17 13:25:46 rillig Exp $
-
-gcc4 complains:
-error: static declaration of 'ctcp_type' follows non-static declaration
-
---- source/ctcp.c.orig	2003-05-27 09:00:22.000000000 +0200
-+++ source/ctcp.c	2007-03-17 14:12:31.000000000 +0100
-@@ -176,7 +176,7 @@ CtcpEntryDll *dll_ctcp = NULL;
- 
- /* CDE do ops and unban logging */
- 
--static char	*ctcp_type[] =
-+char	*ctcp_type[] =
- {
- 	"PRIVMSG",
- 	"NOTICE"
diff --git a/chat/bitchx/patches/patch-aq b/chat/bitchx/patches/patch-aq
deleted file mode 100644
index 4b0f0971930..00000000000
--- a/chat/bitchx/patches/patch-aq
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2007/03/17 13:25:46 rillig Exp $
-
-PendingTimers is only used in timer.c, so there is no need for an
-"extern" declaration.
-
---- include/struct.h.orig	2003-04-11 03:09:07.000000000 +0200
-+++ include/struct.h	2007-03-17 14:20:26.000000000 +0100
-@@ -1064,7 +1064,6 @@ struct	timeval	time;
- 	int	delete;
- }	TimerList;
- 
--extern TimerList *PendingTimers;
- typedef struct nicktab_stru
- {
- 	struct nicktab_stru *next;
diff --git a/chat/bitchx/patches/patch-ar b/chat/bitchx/patches/patch-ar
deleted file mode 100644
index c887b648bf0..00000000000
--- a/chat/bitchx/patches/patch-ar
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2007/06/25 14:15:21 lkundrak Exp $
-
-This patch fixes CVE-2007-3360 flaw, where a malicious server could
-inject a hook possibly executiong malicious code and direct client
-into executing it by using bogus hook index.
-
---- source/hook.c.orig	2007-06-25 15:41:37.000000000 +0200
-+++ source/hook.c	2007-06-25 15:41:39.000000000 +0200
-@@ -837,6 +837,12 @@ int 	BX_do_hook (int which, char *format
- #ifdef WANT_TCL
- 	int		tcl_ret = 0;
- #endif	
-+
-+	/* CVE-2007-3360 boundary check */
-+	if (which >= sizeof(hook_functions)/sizeof(hook_functions[0])) {
-+		return NO_ACTION_TAKEN;
-+	}
-+
- 	/*
- 	 * Figure out where the hooks are for the event type were asserting
- 	 */
diff --git a/chat/bitchx/patches/patch-configure b/chat/bitchx/patches/patch-configure
new file mode 100644
index 00000000000..4ebd3521d67
--- /dev/null
+++ b/chat/bitchx/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2015/09/27 19:06:23 kamil Exp $
+
+Install path for document
+
+--- configure	2015-01-12 17:46:50.000000000 +0900
++++ configure	2015-01-12 17:46:19.000000000 +0900
+@@ -15765,7 +15765,7 @@
+   mandir="\$(IRCLIB)"
+ else
+   INSTALL_IRC="\${bindir}/\$(_VERSION_)\$(EXEEXT)"
+-  IRCLIB="\${libdir}/bx"
++  IRCLIB="\${datadir}/bx"
+   IRCPATH="\$(DEFAULT_CTOOLZ_DIR):\$(DEFAULT_CTOOLZ_DIR)/plugins:.:\$(PLUGINDIR):\$(INSTALL_SCRIPT):\$(IRCLIB)"
+   TRANSLATION_PATH="\$(IRCLIB)/translation"
+   HELPDIR="\$(IRCLIB)/help"
diff --git a/chat/bitchx/patches/patch-include_irc__std.h b/chat/bitchx/patches/patch-include_irc__std.h
deleted file mode 100644
index a3463d68e76..00000000000
--- a/chat/bitchx/patches/patch-include_irc__std.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-include_irc__std.h,v 1.1 2013/12/06 15:35:53 seanb Exp $
-
-Later gcc have a string optimization pass at -O2 which
-will swap combinations strcat to stpcpy if it sees a
-stpcpy prototype.  This leads to undefined references 
-if it's not actually present.
-
---- include/irc_std.h.orig	2003-04-11 01:09:07.000000000 +0000
-+++ include/irc_std.h
-@@ -190,7 +190,7 @@ extern  char    *sys_errlist[];
- extern	int	gettimeofday(struct timeval *tv, struct timezone *tz);
- #endif
- 
--#ifndef STPCPY_DECLARED
-+#if defined(HAVE_STPCPY) && !defined(STPCPY_DECLARED)
- char *  stpcpy (char *to, const char *from);
- #endif
-