Update to 0.85.3, and switch to using glib2.

- Version 0.85.3

- fix the unfairness of upload/download speed limit. In previous version, most
  of the time, a transfer obtains nearly all the bandwidth available.

- client can establish connection through web proxy.

- new flag added: -C. This flag is used to provide the address and port of the
  web proxy to use.

- fix a bug crashing the client if it uses glib2.x (glib1.2 version is not
  affected).

- fix GDL type detection problem preventing attachment of broken GDL.

- .sub added to file type "doc" (most of the time, these files contains
  subtitles).

- remove numerous old debug messages.

- 2 new commands added: /GDLMETDIR and /GDLMETPOLL. Using them, DCTC can use
  some informations obtained by the e-donkey emule client (partial CRC in .met
  files).

  -----------

- Version 0.85.2

- .iso, .bin, .cue and .img added to the file type "exe".

- fix a bug occuring when a broken GDL with L0CRC is available.

- fix a bug occuring when attaching a broken GDL with L0CRC (L0CRC was lost).

- new flag added: -m . If this option is set, DCTC will automatically append a
  dc++ like tag to your description.

- fix a configuration problem when detecting MD* functions.

- fix a hanging problem occuring when an UI disconnects when DCTC sends lot of
  messages to it.

- UADDR handles smarter incoming IP without known name. It prevents duplicated
  IP with IP with known name. To increase efficiency, it also tries a set of
  well known ports accepting DC connection.

  -----------

- Version 0.85.1

- the old md5 support was removed (option: -5).

- hublist handles an environment variable named "HUBLIST". In this variable, you
  can put all the hublist URL you want to use, use [tab] as separator. If the
  variable is not defined, the default direct connect hublist is used.

- hublist supports bzip2 list.

- fix typo in dctc man pages. Add man page for hublist.

- timeout added to hublist to prevent long wait when a hublist server does not
  respond.

- new program added: dctc_gdl123. This program takes 2 corrupted GDLs of the
  same files and rebuild a partial GDL containing only identical parts of the 2
  corrupted GDLs.

  -----------

- Version 0.85.0

- periodically send something to the hub is no network activity exists. This is
  required else the hub will close the connection.

- new command added: /GDLCRC, /GDLNOCRC. Using them, you can set a CRC on a GDL.
  DCTC computes CRC in the same manner has e-donkey 2000 does thus you can use
  its CRC (a 32 characters string composed of 0,1,...9,A,...,F values). The CRC
  allows detection of corrupted file but it does not provide corrupted data
  recovery. (see Documentation/DCextension/ed2k_crc file).

- minor change in the GLSTC format. To keep compatibility with gtk 1.2 version,
  no field is added. If a GDL CRC exists, it is appended to the script to start
  field, you will see a " &CRC:" field inside it.

- new flag added: -Z. When used, the given parameter is a directory that will
  be used instead of the default $(HOME)/.dctc directory.
  Patch by Henrique do N. Angelo (phpDC project).

- fix g_string_sprintf[a] compilation problem with glib2.

- flag -m is removed. DCTC now always works in extended mode.

- Add support of DC protocol extension commands: MD4Get0 and MD4Set. When
  connected to a compatible hub, you can send or retrieve partial CRC allowing
  detection of corruption of part of files. (see Documentation/DCextension/
  ed2k_crc file).

WARNING: the CRC computation has 2 effects:
--------
      1) If someone asks your client a CRC of a file you have not yet computed,
         DCTC will freeze during the computation (problem will be solved in
         future release). The computation of the CRC of 450MB file tooks
         approximately 15 seconds on my XP1700+.
         Note: only the main thread will be busy, download/upload won't be
         stopped.
      2) the speed of CRC computation and of the splitting of the faulty file
         is done at full speed thus you will have a lot of disk I/O. If you
         burn a CD on a non burn-proof CD writer, the burning process will
         probably be interrupted. On my test computer (athlon XP1700+, 768MB
         RAM, UDMA100 7200rpm disk), when reparing a 450MB file, I have
         encountered a freeze of 0.5 second due to the high I/O load.

- '*.mid' files are known recognized as audio file.

5 files changed, 31 insertions, 15 deletions

diff --git a/net/dctc/Makefile b/net/dctc/Makefile
index bbcafbb8978..5fefed3b780 100644
--- a/net/dctc/Makefile
+++ b/net/dctc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/06/10 09:56:18 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2003/06/10 13:20:24 wiz Exp $
 #
 
-DISTNAME=	dctc-0.84.1
-PKGREVISION=	2
+DISTNAME=	dctc-0.85.3
 CATEGORIES=	net
 MASTER_SITES=	http://www.ac2i.tzo.com/dctc/ \
 		http://brainz.servebeer.com/dctc/
@@ -31,5 +30,5 @@ post-configure:
 	@${ECHO} '#endif' >> ${WRKSRC}/config.h
 
 .include "../../databases/db4/buildlink2.mk"
-.include "../../devel/glib/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/dctc/PLIST b/net/dctc/PLIST
index 379ef55c00b..79e2c2deb32 100644
--- a/net/dctc/PLIST
+++ b/net/dctc/PLIST
@@ -1,7 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/28 13:41:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/06/10 13:20:24 wiz Exp $
 bin/GDLjoiner
+bin/dc2k
 bin/dctc
 bin/dctc_cmd
+bin/dctc_gdl123
 bin/hublist
 man/man1/dctc.1
 man/man1/dctc_cmd.1
+man/man1/dctc_gdl123.1
+man/man1/hublist.1
diff --git a/net/dctc/distinfo b/net/dctc/distinfo
index 144d505a874..f3a5fd9cbdf 100644
--- a/net/dctc/distinfo
+++ b/net/dctc/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.10 2003/01/28 13:41:17 wiz Exp $
+$NetBSD: distinfo,v 1.11 2003/06/10 13:20:24 wiz Exp $
 
-SHA1 (dctc-0.84.1.tar.gz) = a58d95079d0420c365d87247581980dc6ed7b312
-Size (dctc-0.84.1.tar.gz) = 373521 bytes
+SHA1 (dctc-0.85.3.tar.gz) = c3dece5332528e30286ec44952d806ada4b025e3
+Size (dctc-0.85.3.tar.gz) = 414522 bytes
 SHA1 (patch-aa) = 68a3ca5f8b7e28717e1a294456be56c846f3c521
-SHA1 (patch-ae) = 40e4f5c3929beb1b118a7a8180cdf93a2083e084
+SHA1 (patch-ab) = a6078244a4f8dbc23ff271a46996717fdf07eaca
+SHA1 (patch-ae) = d53881200e85a4ebcb62b37d8acbe5ab8bddabae
 SHA1 (patch-ag) = 61f8cc1cb35312de15dbc43e0ce7d185b7cda88e
 SHA1 (patch-ah) = 4d481b1fcb1b32debf44b4506ed39be09d64ae79
diff --git a/net/dctc/patches/patch-ab b/net/dctc/patches/patch-ab
new file mode 100644
index 00000000000..f6f1359a364
--- /dev/null
+++ b/net/dctc/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.4 2003/06/10 13:20:24 wiz Exp $
+
+--- configure.orig	Tue Jun 10 12:13:42 2003
++++ configure
+@@ -6591,6 +6591,7 @@ fi
+ 							if test "x$HAVE_DB40" = "xyes"; then
+ 								
+ 								berkeleydb_libs="-ldb4"
++      								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
diff --git a/net/dctc/patches/patch-ae b/net/dctc/patches/patch-ae
index 16530375bcc..306085cc58c 100644
--- a/net/dctc/patches/patch-ae
+++ b/net/dctc/patches/patch-ae
@@ -1,16 +1,16 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/09/11 20:47:14 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2003/06/10 13:20:25 wiz Exp $
 
---- src/keyboard.c.orig	Mon Jul 15 09:13:14 2002
-+++ src/keyboard.c
-@@ -35,7 +35,6 @@
- #include <netdb.h>
+--- src/keyboard.c.orig	Sun May 18 08:48:16 2003
++++ src/keyboard.c	Tue Jun 10 12:04:22 2003
+@@ -39,7 +39,6 @@
+ #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
-@@ -47,7 +46,6 @@
+@@ -51,7 +50,6 @@
                 struct seminfo *__buf;      /* buffer for IPC_INFO */
         };
         #endif