@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.138 2008/06/16 10:39:17 adrianp Exp $
+# $NetBSD: Makefile,v 1.139 2008/06/17 12:53:54 tron Exp $
 #
 
 COMMENT=	Communication programs
@@ -19,7 +19,6 @@
 SUBDIR+=	climm
 SUBDIR+=	dccserver
 SUBDIR+=	dircproxy
-SUBDIR+=	dircproxy-devel
 SUBDIR+=	eggdrop
 SUBDIR+=	ejabberd
 SUBDIR+=	ekg

@@ -9,3 +9,8 @@
 This can be used to give you roughly the same functionality as
 using ircII and screen together, except you can use whatever IRC
 client you like, including X ones!
+
+* THIS IS AN UNSTABLE DEVELOPMENT RELEASE OF DIRCPROXY.  IT HAS HIGHER
+* THEN USUAL RISK OF DESTROYING YOUR SYSTEM.
+*
+* FOR A STABLE RELEASE USE THE LATEST 1.0.x

@@ -1,28 +1,32 @@
-# $NetBSD: Makefile,v 1.15 2008/06/12 02:14:16 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2008/06/17 12:53:54 tron Exp $
 
-DISTNAME=	dircproxy-1.0.5
-PKGREVISION=	2
+DISTNAME=	dircproxy-1.2.0-beta2
+PKGNAME=	${DISTNAME:S/-beta/beta/}
+PKGREVISION=	1
 CATEGORIES=	chat
-MASTER_SITES=	ftp://ftp.netsplit.com/pub/dircproxy/stable/ \
-		http://dircproxy.securiweb.net/pub/1.0/
+MASTER_SITES=	http://dircproxy.securiweb.net/
+EXTRACT_SUFX=	.tar.bz
 
-MAINTAINER=	sb125499@ohiou.edu
+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)
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		perl:run
 
-CONFLICTS=		dircproxy-1.1.[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"

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/05/02 20:33:57 reed Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/06/17 12:53:54 tron Exp $
 bin/dircproxy
 bin/dircproxy-crypt
 man/man1/dircproxy-crypt.1
@@ -6,7 +6,7 @@
 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

@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.5 2007/03/17 13:47:08 rillig Exp $
+$NetBSD: distinfo,v 1.6 2008/06/17 12:53:54 tron Exp $
 
-SHA1 (dircproxy-1.0.5.tar.gz) = eaf159d2a1303f82e079940b381c0e71b9b90c28
+SHA1 (dircproxy-1.2.0-beta2.tar.bz) = 43ab3d1b7559fd34a315c50150eebedeb4ec48db
-RMD160 (dircproxy-1.0.5.tar.gz) = 8082fbe3c83b9e38eae9a2b48bf244e277b3e63b
+RMD160 (dircproxy-1.2.0-beta2.tar.bz) = 3e8bf9e11fd46caa7fd90189faf51c9e5f37d369
-Size (dircproxy-1.0.5.tar.gz) = 217965 bytes
+Size (dircproxy-1.2.0-beta2.tar.bz) = 314480 bytes
-SHA1 (patch-aa) = 9c59e9f4c0cfaca7a9e000eab2a8af1b6c16329f
+SHA1 (patch-aa) = 59870074b86f1150f904e10269c654719b506f29
-SHA1 (patch-ab) = 4d2cd9dbc972e4f2f7ac20b32dc65e755796d6f0
+SHA1 (patch-ab) = c0e8706c0f1bb7a2c981d1140d1b1deb105c601b
-SHA1 (patch-ac) = 2f599b0e30c3cc2b3b801546b1df8f8ae1de2c5d
+SHA1 (patch-ac) = ad94320d493ea50603c90cd0c1e2499716496712
-SHA1 (patch-ad) = 3177586587616f9441110acf59b8751bd8dde5c3
-SHA1 (patch-ae) = 212e7505d26442166ff77a29c9779bed34c2f255

@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: dircproxy.sh,v 1.2 2003/11/21 23:06:12 xtraeme Exp $
+# $NetBSD: dircproxy.sh,v 1.3 2008/06/17 12:53:54 tron Exp $
 #
 
 # PROVIDE: dircproxy

@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2003/06/02 15:20:08 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2008/06/17 12:53:54 tron Exp $
 
---- conf/Makefile.in.orig	2002-11-21 15:19:04.000000000 +0100
+--- conf/Makefile.in.orig	2006-02-18 22:39:32.000000000 +0000
 +++ conf/Makefile.in
-@@ -34,7 +34,7 @@ oldincludedir = /usr/include
- 
- DESTDIR =
- 
+@@ -17,7 +17,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/examples/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
- 
+ top_builddir = ..

@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2005/03/10 13:31:05 tv Exp $
+$NetBSD: patch-ab,v 1.2 2008/06/17 12:53:54 tron 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 @@
 +
  #include "irc_prot.h"
  #include "stringex.h"
- 
+ #include "net.h"

@@ -1,15 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2007/03/17 13:47:08 rillig Exp $
+$NetBSD: patch-ac,v 1.2 2008/06/17 12:53:54 tron Exp $
 
-The ?: operator returns an rvalue, not an lvalue.
-
---- src/dcc_net.c.orig	2001-12-21 21:15:55.000000000 +0100
-+++ src/dcc_net.c	2007-03-17 14:44:21.000000000 +0100
-@@ -364,7 +364,7 @@ int dccnet_expunge_proxies(void) {
-       n = p->next;
-       _dccnet_free(p);
+--- src/irc_server.c.orig	2006-10-07 22:07:08.000000000 +0100
++++ src/irc_server.c
+@@ -1155,7 +1155,7 @@ static int _ircserver_gotmsg(struct ircp
+       
+         if (!strcmp(cmsg.cmd, "ACTION")) {
+           irclog_log(p, IRC_LOG_ACTION, logdest, msg.src.orig,
+-                     "%s", cmsg.paramstarts[0]);
++                     "%s", (cmsg.paramstarts != NULL) ?  cmsg.paramstarts[0]: "none");
  
--      p = (l ? l->next : proxies) = n;
+         } else if (!strcmp(cmsg.cmd, "DCC")
-+      p = *(l ? &(l->next) : &(proxies)) = n;
+                    && p->conn_class->dcc_proxy_incoming) {
-     } else {
-       l = p;
-       p = p->next;