Update to 2.6.5:

2005/10/11: spiralvoice (version 2.6.5 = tag release-2-6-5)

4508: Configure: Print some important build targets
4507: EDK: Print server banners into logfile (pango)
4500: BT: Fix multifile download with zero-byte files (thanks to jave)
4506: replace obsolete longarry and fifo2 code (bogeyman)

2005/10/10: spiralvoice

4504: Clean http_server.ml logging
4502: Remove obsolete Weak2 sourcecode (bogeyman)
4503: OV: fill buckets only with peers we send to and heard of (bogeyman)
4499: Check for stalled pid file and remove it if MLDonkey is not running
      (does not work on MinGW due to missing Unix.kill) (pango, spiralvoice)
4501: HTML: Fix chunk wrapping on IE (zet)

2005/10/09: spiralvoice

4477: prevented some compiler warnings (Schlumpf)
4496: Nicer summary of configure command

2005/10/06: spiralvoice

4337: improved upload scheduler (pango)
4494: fix infinite loop when create_dir_mask on fat32 (zet)
4495: BT: include Wiki link to report unknown clients (bogeyman)
4493: BT: Correctly parse .torrent files with an empty directory (zet)
4487: BT/HTML: Display files inside a multifile torrent (bogeyman, jave)
4458: EDK: add enable_sui toggle option (enabled by default) (zet)
4491: Compilation fix for NetBSD>=2.99 (Thomas Klausner)
4490: memstats for a weakhash and a new OV command dump_bucket (bogeyman)
4473: New command: whoami
4457: BeOS: Compile patch for CryptoPP (Michael Lotz)
4460: Added search for .torrents via IsoHunt (WingMaster)
4456: Fix shrink effect in vd for Opera (Luar Roji)

4452: Clean configure.in, check for c++ compiler
* zlib is not optional anymore
* remove old code (Cryptokit, Broosnet etc.)
* distinguish between Cygwin and MinGW
* print start warning message only for Cygwin
* remove whitespaces

4450: Remove swarmer data when cancelling download (kempston, zet)

2005/09/21: spiralvoice

4454: commonSources: add sources from resumed files
      (outside_queue sources) back to the queues (zet)
4453: Telnet: Print reject message for connecting client
      if it is not allowed to connect,
      prepend "dllink" for all commands starting with "http://"
4455: Improve make distclean
4449: New parameter for pid file: -pid <dir>, small improvements for pid files
4451: Correct the help of allowed_ips (gildor)

2005/09/19: spiralvoice

4439: Fix for "make mlnet.byte" (zet)
4438: Fix secure-ident related compile bugs in Opennap & Soulseek
4437: BT: show up/down stats for Brand unknown (bogeyman)
4436: EDK: Solve memleak in donkeyChunks (file_md4s_to_register) (bogeyman)
4434: Added button to eMugle in Search (wingmaster)
4432: Add more info to mem_stats (zet)

2005/09/18: spiralvoice

4431: Newgui: Compile fix
4419: EDK: Support secure user identification (crypto5, by zet)

2005/09/17: spiralvoice

4424: OV: discard peers with ip 1.0.0.0 and random port
4425: EDK: Support server extended getsources2 opcode (zet)
4429: Better error message if MLDonkey lacks network support
      for a file in files.ini
4427: BT: 10 retries / follow 10 redirections in
      dllink http://server/file.torrent
4423: OV/KAD: Save only active peers to config files/ save max 200 peers
      (bogeyman)

2005/09/14: spiralvoice

4420: Remove obsoleted commonSwarming1 code
4418: Re-activate sources_per_chunk option (pango)
4417: BT: Improve BT upload speed (pango)
4374: fix "max_hard_download_rate has to be doubled" (pango)
      This patch changes internal code, no option has to be changed

2005/09/13: spiralvoice

4406: Improved Unicode filename support (CML)
4412: OV: Handle OvernetPeerNotFound correctly (bogeyman)
4411: OV/KAD: Some peers are not added to known_peers (bogeyman)
4410: Shorter filesystem name for XFS
4409: Compile fix if Bzip2 is not available
4408: OpenBSD: configure.in fix to find libbz2 and others in /usr/local

2005/09/08: spiralvoice

4397: Buildinfo: Run-time check for Windows OS version / Unix uname (zet)
4403: html_mods: mem_stats in a single readable table (zet)
4402: BT: BT-user_agent option (zet)

2005/09/06: spiralvoice

4268: Web/Gui: free core's buffer allocated by vd # and gui (bogeyman)
4393: Lower ip blocking memory usage (pango)
      new option ip_blocking_descriptions true|false
4401: BT: Send 'stopped' event to all trackers when exiting (zet)

4 files changed, 8 insertions, 31 deletions

diff --git a/net/mldonkey-gui/options.mk b/net/mldonkey-gui/options.mk
index 74eea9892a5..b35c0558c93 100644
--- a/net/mldonkey-gui/options.mk
+++ b/net/mldonkey-gui/options.mk
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2005/10/06 11:51:13 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2005/10/20 00:32:17 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mldonkey-gui
 PKG_OPTIONS_REQUIRED_GROUPS+=	toolkit
 PKG_OPTIONS_GROUP.toolkit=	lablgtk lablgtk2
 # lablgtk2 GUI segfaults easily
-PKG_SUGGESTED_OPTIONS=	lablgtk
+PKG_SUGGESTED_OPTIONS=	lablgtk2
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/net/mldonkey/Makefile.common b/net/mldonkey/Makefile.common
index 3b36146ffd9..9275e60689a 100644
--- a/net/mldonkey/Makefile.common
+++ b/net/mldonkey/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.8 2005/10/06 11:50:03 wiz Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/10/20 00:32:16 wiz Exp $
 #
 
-DISTNAME=	mldonkey-2.6.4
+DISTNAME=	mldonkey-2.6.5
 CATEGORIES=	net
 MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/mldonkey/distinfo b/net/mldonkey/distinfo
index c897221fbd2..879063aa4ae 100644
--- a/net/mldonkey/distinfo
+++ b/net/mldonkey/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.20 2005/10/06 11:50:03 wiz Exp $
+$NetBSD: distinfo,v 1.21 2005/10/20 00:32:16 wiz Exp $
 
-SHA1 (mldonkey-2.6.4.tar.bz2) = 47839d3f0e00041553a5d98f973a900af3377f75
-RMD160 (mldonkey-2.6.4.tar.bz2) = c0c5ea86035de17a713480bb126678985f9d8a1f
-Size (mldonkey-2.6.4.tar.bz2) = 2669228 bytes
-SHA1 (patch-ac) = 4555be191b724a73338a40b1cf840ccb4d3ad9e1
+SHA1 (mldonkey-2.6.5.tar.bz2) = cfdc4f15ef9897fffe5e0330bc7429a85f7d7af8
+RMD160 (mldonkey-2.6.5.tar.bz2) = 150270524d42f0c67cc3ea348f1825ca260ead7e
+Size (mldonkey-2.6.5.tar.bz2) = 2756288 bytes
diff --git a/net/mldonkey/patches/patch-ac b/net/mldonkey/patches/patch-ac
deleted file mode 100644
index 21f41ee8c92..00000000000
--- a/net/mldonkey/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/10/06 11:50:03 wiz Exp $
-
---- src/utils/lib/stubs_c.c.orig	2005-09-03 00:39:59.000000000 +0200
-+++ src/utils/lib/stubs_c.c
-@@ -1066,7 +1066,7 @@ statfs_statfs (value pathv)
- 
- #ifdef HAVE_STATS
- static value
--#if ((defined (sun) || defined (__sun__)))
-+#if ((defined (sun) || defined (__sun__))) || (defined(__NetBSD__) && (__NetBSD_Version__ > 299000000))
- copy_statfs (struct statvfs *buf)
- #else
- copy_statfs (struct statfs *buf)
-@@ -1123,7 +1123,7 @@ statfs_statfs (value pathv)
-   CAMLparam1 (pathv);
-   CAMLlocal1 (bufv);
-   const char *path = String_val (pathv);
--#if ((defined (sun) || defined (__sun__)))
-+#if ((defined (sun) || defined (__sun__))) || (defined(__NetBSD__) && (__NetBSD_Version__ > 299000000))
-   struct statvfs buf;
-   if (statvfs (path, &buf) == -1)
- #else