Update to version 2.8.6.

Initial patches from Juan RP via PR pkg/20101.

Changelog:

2.8.6
=====
- Bnc now lists all docked sessions
- Rewrote the send/recv code
- Implemented non-blocking sockets
- Fixed a problem with bnc not binding to vhost when specified by
  IP instead of dns

2.8.4
=====
- a quick change added to conf.c by moomoomoo to fix a major bug and
  tide us over until the 3.0.0 version is ready for public release.

2.8.2
=====
- Coded in channel watching code for docking.
- Coded a new line parsing system
- Coded a new system for the client lists, maybe it will fix some bugs
- implemented docking, still very beta though /detach password /resume
  FD password
- rewrote some of the inner workings, hope this fixed some bugs.
- rewrote config file format, now uses real words (listen xxx) read
  example.conf for details. Old format will still work.

4 files changed, 29 insertions, 28 deletions

diff --git a/chat/bnc/Makefile b/chat/bnc/Makefile
index 95ea5db5da6..5c16e50ece6 100644
--- a/chat/bnc/Makefile
+++ b/chat/bnc/Makefile
@@ -1,35 +1,35 @@
-# $NetBSD: Makefile,v 1.5 2001/09/27 23:17:48 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/31 01:00:50 salo Exp $
 # FreeBSD Id: ports/irc/bnc/Makefile,v 1.9 2000/05/22 06:38:58 will Exp
 
-DISTNAME=	bnc2.8.2
-PKGNAME=	bnc-2.8.2
+DISTNAME=	bnc2.8.6
+PKGNAME=	${DISTNAME:S/bnc/&-/}
 CATEGORIES=	chat
-MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITES=	http://www.gotbnc.com/files/	\
+		ftp://ftp.ircadmin.net/bnc/
 
 MAINTAINER=	zuntum@netbsd.org
-HOMEPAGE=	http://bnc.dragondata.com
+HOMEPAGE=	http://bnc.dragondata.com/
 COMMENT=	Simple IRC relay proxy with support for virtual hosting
 
 DEPENDS+=	dialog-[0-9]*:../../misc/dialog
 
 GNU_CONFIGURE=	YES
 
-MAKE_ENV+=	OPTS="${CFLAGS}"
-
 post-patch:
-	${SED}	-e "s,./mkpasswd,${PREFIX}/bin/bncmkpasswd,g"		\
-		-e "s,dialog --,${LOCALBASE}/bin/dialog --,g"		\
-		${WRKSRC}/bncsetup > ${WRKSRC}/bncsetup.done
-	${MV} ${WRKSRC}/bncsetup.done ${WRKSRC}/bncsetup
+	${MV} ${WRKSRC}/bncsetup ${WRKSRC}/bncsetup.orig
+	${SED}	-e "s|./mkpasswd|${PREFIX}/bin/bncmkpasswd|g"	\
+		-e "s|dialog --|${LOCALBASE}/bin/dialog --|g"	\
+		${WRKSRC}/bncsetup.orig > ${WRKSRC}/bncsetup
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bnc ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/mkpasswd ${PREFIX}/bin/bncmkpasswd
 	${INSTALL_SCRIPT} ${WRKSRC}/bncchk ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bncsetup ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/mkpasswd ${PREFIX}/bin/bncmkpasswd
-	${INSTALL_DATA} ${WRKSRC}/example.conf 				\
-		${PREFIX}/share/examples/bnc.conf.sample
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bnc
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bnc
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/bnc
+	${INSTALL_DATA} ${WRKSRC}/example.conf 	\
+		${PREFIX}/share/examples/bnc/bnc.conf.sample
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/bnc/PLIST b/chat/bnc/PLIST
index da84620bb05..1f543cc66fc 100644
--- a/chat/bnc/PLIST
+++ b/chat/bnc/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:06:18 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/31 01:00:51 salo Exp $
 bin/bnc
 bin/bncchk
 bin/bncmkpasswd
 bin/bncsetup
 share/doc/bnc/README
-share/examples/bnc.conf.sample
+share/examples/bnc/bnc.conf.sample
+@dirrm share/examples/bnc
 @dirrm share/doc/bnc
diff --git a/chat/bnc/distinfo b/chat/bnc/distinfo
index 1b522b8e1a7..5bf045c2f8b 100644
--- a/chat/bnc/distinfo
+++ b/chat/bnc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 11:07:15 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/01/31 01:00:51 salo Exp $
 
-SHA1 (bnc2.8.2.tar.gz) = da1329e65ad4876fab8d7abeb0c313d07c780af9
-Size (bnc2.8.2.tar.gz) = 48378 bytes
-SHA1 (patch-aa) = d013af5ab689e23c5d14b9ec440e736c8e4f7596
+SHA1 (bnc2.8.6.tar.gz) = 19544b83c4e8d558d56621b5001590432de2b4d0
+Size (bnc2.8.6.tar.gz) = 52569 bytes
+SHA1 (patch-aa) = a33813759c0b50cca01b954042c851d7a4e41948
diff --git a/chat/bnc/patches/patch-aa b/chat/bnc/patches/patch-aa
index 85fe9e4c425..f11ee479802 100644
--- a/chat/bnc/patches/patch-aa
+++ b/chat/bnc/patches/patch-aa
@@ -1,18 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/06 18:39:51 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/31 01:00:52 salo Exp $
 
---- Makefile.in.orig	Wed Mar 15 09:57:57 2000
-+++ Makefile.in
-@@ -1,12 +1,10 @@
- OBJS = bnc.o conf.o server.o cmds.o mtype.o
+--- Makefile.in.orig	Thu Jul 11 17:58:29 2002
++++ Makefile.in	Fri Jan 31 01:30:57 2003
+@@ -1,11 +1,10 @@
  LIBS = @LIBS@
 -OPTS = -O3
- COPT = -DVERSION='"v2.8.2"' -Wall
++OPTS = ${CFLAGS}
+ COPT = -Wall
  OOPT =
  STRIP = strip
 -CC = gcc
  
 -ALL: bnc mkpasswd
 +all: bnc mkpasswd
- 	@echo "*** Done compiling required files"
- 	@echo "Please read the README file included"
  
+ mkpasswd:mkpasswd.c
+ 	${CC} ${OPTS} ${COPT} ${LIBS} -o mkpasswd mkpasswd.c