Update to 1.2.0 development version

* Nickserv support
* Binding to a local IP
* a new /dircproxy RELOAD to reload the config
* Add DCC Resume
* Add 005 Support
* Can be build with SSL support (experimental)
* Support for IPV6 (experimental)
* a new /dircproxy NOTIFY command
* Support for MD5 password

7 files changed, 59 insertions, 32 deletions

diff --git a/chat/dircproxy-devel/Makefile b/chat/dircproxy-devel/Makefile
index f86d134186b..ad3d1a6cde3 100644
--- a/chat/dircproxy-devel/Makefile
+++ b/chat/dircproxy-devel/Makefile
@@ -1,24 +1,29 @@
-# $NetBSD: Makefile,v 1.5 2005/12/29 06:21:32 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/02/19 15:47:35 adrianp Exp $
 
-DISTNAME=	dircproxy-1.1.0
+DISTNAME=	dircproxy-1.2.0-beta
+PKGNAME=	${DISTNAME:S/-beta//}
 CATEGORIES=	chat
-MASTER_SITES=	http://www.securiweb.net/pub/oss/dircproxy/1.1/
+MASTER_SITES=	http://dircproxy.securiweb.net/pub/1.2/
+EXTRACT_SUFX=	.tar.bz
 
 MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://dircproxy.securiweb.net/
-COMMENT=	Detachable internet relay chat proxy server
+COMMENT=	Detachable internet relay chat proxy server (devel version)
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		perl:run
 
-CONFLICTS=		dircproxy-1.0.[0-9]*
+.include "options.mk"
 
-REPLACE_PERL=		contrib/log.pl contrib/privmsg-log.pl
+CONFLICTS=		dircproxy-1.[0-1].[0-9]*
+
+REPLACE_PERL+=		contrib/log.pl contrib/privmsg-log.pl
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 EGDIR=			${PREFIX}/share/examples/dircproxy
-CONF_FILES=		${EGDIR}/dircproxyrc ${PKG_SYSCONFDIR}/dircproxyrc
+CONF_FILES=		${EGDIR:Q}/dircproxyrc.sample \
+			${PKG_SYSCONFDIR:Q}/dircproxyrc
 RCD_SCRIPTS=		dircproxy
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/dircproxy-devel/PLIST b/chat/dircproxy-devel/PLIST
index 3da51b7fa18..817a89af39e 100644
--- a/chat/dircproxy-devel/PLIST
+++ b/chat/dircproxy-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/02 20:33:58 reed Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/02/19 15:47:35 adrianp Exp $
 bin/dircproxy
 bin/dircproxy-crypt
 man/man1/dircproxy-crypt.1
@@ -6,7 +6,7 @@ man/man1/dircproxy.1
 share/dircproxy/cronchk.sh
 share/dircproxy/log.pl
 share/dircproxy/privmsg-log.pl
-share/examples/dircproxy/dircproxyrc
+share/examples/dircproxy/dircproxyrc.sample
 share/examples/rc.d/dircproxy
 @dirrm share/examples/dircproxy
 @dirrm share/dircproxy
diff --git a/chat/dircproxy-devel/distinfo b/chat/dircproxy-devel/distinfo
index f333cae122b..ae6edff1c45 100644
--- a/chat/dircproxy-devel/distinfo
+++ b/chat/dircproxy-devel/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/07/30 21:18:33 rillig Exp $
+$NetBSD: distinfo,v 1.3 2006/02/19 15:47:35 adrianp Exp $
 
-SHA1 (dircproxy-1.1.0.tar.gz) = a967a542c4c6063e8f977276b68deb6692c9d150
-RMD160 (dircproxy-1.1.0.tar.gz) = 7c7f622a4b67854e608a68191a0537fc83b94045
-Size (dircproxy-1.1.0.tar.gz) = 250060 bytes
-SHA1 (patch-aa) = c5dc0f01db56074c40c4986ed3bdc666b8fc9ecc
-SHA1 (patch-ab) = 4d2cd9dbc972e4f2f7ac20b32dc65e755796d6f0
-SHA1 (patch-ac) = 8d3984e635bd1d580fd746d26a36444b2b7ae38c
+SHA1 (dircproxy-1.2.0-beta.tar.bz) = d0979ad3711184fa581fe413c9e3ea156660ac56
+RMD160 (dircproxy-1.2.0-beta.tar.bz) = 08016210b245872f7c071e25d067f7ef1e97f17d
+Size (dircproxy-1.2.0-beta.tar.bz) = 312912 bytes
+SHA1 (patch-aa) = 59870074b86f1150f904e10269c654719b506f29
+SHA1 (patch-ab) = c0e8706c0f1bb7a2c981d1140d1b1deb105c601b
+SHA1 (patch-ac) = 923b52d7536fc6545e78b6d55d7757a42778e8b1
diff --git a/chat/dircproxy-devel/options.mk b/chat/dircproxy-devel/options.mk
new file mode 100644
index 00000000000..c2a9617c4b5
--- /dev/null
+++ b/chat/dircproxy-devel/options.mk
@@ -0,0 +1,22 @@
+# $NetBSD: options.mk,v 1.1 2006/02/19 15:47:35 adrianp Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.dircproxy
+PKG_SUPPORTED_OPTIONS=	ssl debug
+PKG_SUGGESTED_OPTIONS=	ssl
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Compile with SSL support
+###
+.if !empty(PKG_OPTIONS:Mssl)
+CONFIGURE_ARGS+=	--enable-ssl
+.include "../../security/openssl/buildlink3.mk"
+.endif
+
+###
+### Turn on debugging
+###
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
diff --git a/chat/dircproxy-devel/patches/patch-aa b/chat/dircproxy-devel/patches/patch-aa
index cfcba4a19eb..1c98c4923b9 100644
--- a/chat/dircproxy-devel/patches/patch-aa
+++ b/chat/dircproxy-devel/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/04/03 14:18:02 adrianp Exp $
+$NetBSD: patch-aa,v 1.2 2006/02/19 15:47:35 adrianp Exp $
 
---- conf/Makefile.in	2002-08-18 02:41:15.000000000 +0100
-+++ conf/Makefile.in.orig
-@@ -33,7 +33,7 @@ infodir = @infodir@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
+--- conf/Makefile.in.orig	2006-02-18 22:39:32.000000000 +0000
++++ conf/Makefile.in
+@@ -17,7 +17,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/examples/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
diff --git a/chat/dircproxy-devel/patches/patch-ab b/chat/dircproxy-devel/patches/patch-ab
index 0a7073317b1..b9628d15a42 100644
--- a/chat/dircproxy-devel/patches/patch-ab
+++ b/chat/dircproxy-devel/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/04/03 14:18:02 adrianp Exp $
+$NetBSD: patch-ab,v 1.2 2006/02/19 15:47:35 adrianp Exp $
 
---- src/irc_net.h.orig	2002-02-06 05:07:42.000000000 -0500
+--- src/irc_net.h.orig	2006-02-18 22:39:32.000000000 +0000
 +++ src/irc_net.h
-@@ -21,6 +21,10 @@
+@@ -23,6 +23,10 @@
  #include <arpa/inet.h>
  #include <time.h>
  
@@ -12,4 +12,4 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/04/03 14:18:02 adrianp Exp $
 +
  #include "irc_prot.h"
  #include "stringex.h"
- 
+ #include "net.h"
diff --git a/chat/dircproxy-devel/patches/patch-ac b/chat/dircproxy-devel/patches/patch-ac
index 2798eed3967..c8ce05660cd 100644
--- a/chat/dircproxy-devel/patches/patch-ac
+++ b/chat/dircproxy-devel/patches/patch-ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.1 2005/07/30 21:18:33 rillig Exp $
+$NetBSD: patch-ac,v 1.2 2006/02/19 15:47:35 adrianp Exp $
 
 Conditional lvalues aren't portable enough for IRIX 6.5.
 
---- src/irc_server.c.orig	Sat Aug 17 23:48:03 2002
-+++ src/irc_server.c	Sat Jul 30 23:14:18 2005
-@@ -699,7 +699,7 @@ static int _ircserver_gotmsg(struct ircp
+--- src/irc_server.c.orig	2006-02-18 22:39:32.000000000 +0000
++++ src/irc_server.c
+@@ -788,7 +788,7 @@ static int _ircserver_gotmsg(struct ircp
                free(s);
  
                /* Was in the squelch list, so remove it and stop looking */
 -              s = (l ? l->next : p->squelch_modes) = n;
-+              s = *(l ? &(l->next) : &(p->squelch_modes)) = n;
++	      s = *(l ? &(l->next) : &(p->squelch_modes)) = n;
                squelch = 1;
                break;
              } else {