Update to 0.85.4:

Downloads are now automatically handled by one client instead of
spreading them among the running clients. A problem with incorrectly
handling trailing corrupted segments was fixed, and users with a
slash in their nicknames are handled properly.

7 files changed, 51 insertions, 30 deletions

diff --git a/net/dctc/Makefile b/net/dctc/Makefile
index 4b1f647a732..81f607e02c1 100644
--- a/net/dctc/Makefile
+++ b/net/dctc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2003/07/13 13:52:49 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2003/07/15 19:46:14 wiz Exp $
 #
 
-DISTNAME=	dctc-0.85.3
-PKGREVISION=	1
+DISTNAME=	dctc-0.85.4
 CATEGORIES=	net
 MASTER_SITES=	http://www.ac2i.tzo.com/dctc/ \
 		http://brainz.servebeer.com/dctc/
@@ -14,7 +13,6 @@ COMMENT=	Direct Connect clone (Direct Connect Text Client)
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
 CONFIGURE_ARGS+=	--enable-manual-db-detect
-REPLACE_PERL=	GDLjoiner
 USE_PERL5=	YES
 USE_GMAKE=	YES
 
@@ -26,9 +24,6 @@ post-configure:
 	@${ECHO} '#ifndef MSG_NOSIGNAL' >> ${WRKSRC}/config.h
 	@${ECHO} '# define MSG_NOSIGNAL 0' >> ${WRKSRC}/config.h
 	@${ECHO} '#endif' >> ${WRKSRC}/config.h
-	@${ECHO} '#ifndef ENODATA' >> ${WRKSRC}/config.h
-	@${ECHO} '# define ENODATA ENOMSG' >> ${WRKSRC}/config.h
-	@${ECHO} '#endif' >> ${WRKSRC}/config.h
 
 .include "../../databases/db4/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
diff --git a/net/dctc/PLIST b/net/dctc/PLIST
index 79e2c2deb32..2873f6d48a5 100644
--- a/net/dctc/PLIST
+++ b/net/dctc/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2003/06/10 13:20:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/07/15 19:46:14 wiz Exp $
 bin/GDLjoiner
 bin/dc2k
 bin/dctc
 bin/dctc_cmd
 bin/dctc_gdl123
+bin/dctc_master
 bin/hublist
 man/man1/dctc.1
 man/man1/dctc_cmd.1
diff --git a/net/dctc/distinfo b/net/dctc/distinfo
index d19280838eb..0a34ce840fd 100644
--- a/net/dctc/distinfo
+++ b/net/dctc/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.12 2003/06/10 13:35:23 wiz Exp $
+$NetBSD: distinfo,v 1.13 2003/07/15 19:46:14 wiz Exp $
 
-SHA1 (dctc-0.85.3.tar.gz) = c3dece5332528e30286ec44952d806ada4b025e3
-Size (dctc-0.85.3.tar.gz) = 414522 bytes
-SHA1 (patch-aa) = 68a3ca5f8b7e28717e1a294456be56c846f3c521
-SHA1 (patch-ab) = a6078244a4f8dbc23ff271a46996717fdf07eaca
+SHA1 (dctc-0.85.4.tar.gz) = 8422f041ccd398fcabb032a6ece9f2f50d827bb7
+Size (dctc-0.85.4.tar.gz) = 493733 bytes
+SHA1 (patch-ab) = 4a28cc7d9e2a22c52ad319bbda0893d70fd000be
+SHA1 (patch-ac) = 0f9070bc9ce04caaad8612d075d3b5dfcb5523f5
+SHA1 (patch-ad) = 09466a9fec9403bf3dc911a5af5f86050087159b
 SHA1 (patch-ae) = d53881200e85a4ebcb62b37d8acbe5ab8bddabae
diff --git a/net/dctc/patches/patch-aa b/net/dctc/patches/patch-aa
deleted file mode 100644
index 060f1f2deff..00000000000
--- a/net/dctc/patches/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $
-
---- GDLjoiner.orig	Thu Aug 22 17:35:13 2002
-+++ GDLjoiner
-@@ -1,4 +1,4 @@
--#! /usr/bin/env perl
-+#! /usr/bin/perl
- #
- # Used to join a directory of dctc created parts of one file
- # Copyright Tobias Olsson 2002
diff --git a/net/dctc/patches/patch-ab b/net/dctc/patches/patch-ab
index f6f1359a364..a039bbda772 100644
--- a/net/dctc/patches/patch-ab
+++ b/net/dctc/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.4 2003/06/10 13:20:24 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2003/07/15 19:46:15 wiz Exp $
 
---- configure.orig	Tue Jun 10 12:13:42 2003
+--- configure.orig	Sun Jul 13 23:40:52 2003
 +++ configure
-@@ -6591,6 +6591,7 @@ fi
+@@ -9752,6 +9752,7 @@ fi
  							if test "x$HAVE_DB40" = "xyes"; then
- 								
+ 
  								berkeleydb_libs="-ldb4"
-+      								CPPFLAGS="$CPPFLAGS -DBDB_V4"
++							        CPPFLAGS="$CPPFLAGS -DBDB_V4"
  							else
- 								{ echo "configure: error: no supported BerkeleyDB found (4.1, 4.0, 3.1, 3.2, 3.3)" 1>&2; exit 1; }
- 							fi
+ 								{ { echo "$as_me:$LINENO: error: no supported BerkeleyDB found (4.1, 4.0, 3.1, 3.2, 3.3)" >&5
+ echo "$as_me: error: no supported BerkeleyDB found (4.1, 4.0, 3.1, 3.2, 3.3)" >&2;}
diff --git a/net/dctc/patches/patch-ac b/net/dctc/patches/patch-ac
new file mode 100644
index 00000000000..c430b3db582
--- /dev/null
+++ b/net/dctc/patches/patch-ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.5 2003/07/15 19:46:15 wiz Exp $
+
+--- src/keyboard_master.c.orig	Sun Jun 22 10:40:35 2003
++++ src/keyboard_master.c
+@@ -39,7 +40,6 @@ $Id: keyboard_master.c,v 1.1 2003/06/22 
+ #include <openssl/md4.h>
+ #include <glib.h>
+ 
+-#if !(defined(BSD) && (BSD >= 199103))
+        #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
+        /* union semun is defined by including <sys/sem.h> */
+        #else
+@@ -51,7 +51,6 @@ $Id: keyboard_master.c,v 1.1 2003/06/22 
+                struct seminfo *__buf;      /* buffer for IPC_INFO */
+        };
+        #endif
+-#endif
+ 
+ #include "dc_com.h"
+ #include "display.h"
diff --git a/net/dctc/patches/patch-ad b/net/dctc/patches/patch-ad
new file mode 100644
index 00000000000..697a436daed
--- /dev/null
+++ b/net/dctc/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.3 2003/07/15 19:46:15 wiz Exp $
+
+--- src/mydb.h.orig	Sat May 17 08:12:37 2003
++++ src/mydb.h
+@@ -24,6 +24,9 @@ $Id: mydb.h,v 1.1.1.1 2003/05/17 06:12:3
+ #ifndef __DB_H__
+ #define __DB_H__
+ 
++#include <sys/types.h>
++#include <netinet/in.h>
++
+ #include "md.h"
+  
+ /* directory containing virtual shares */