Update to 2.6.4:

2005/09/04: spiralvoice (version 2.6.4 = tag release-2-6-4)

4392: Print "Core started" on stdout even if logging is enabled
      Fixes problems when MLDonkey is spawned by a GUI

2005/09/03: spiralvoice

4247: memstats: BT/FT/GNUT/G2: initial memstats, ALL: show nr of old_files,
      BT: nr of torrent files
4390: Mail: Print incoming path if !!url_in_mail is used
4389: BT: Fix core exit if dirs of a shared multifile torrent are not writable
4368: new option: create_file_sparse true|false, this works only for
      files on NTFS drives in MinGW compiled MLDonkey (thanks to zet)

2005/09/01: spiralvoice

4385: EDK: Preserve untested servers (by pango)
4351: optimize ip blocking lists (by pango)
4376: EDK: Re-enable result_done (already downloaded) in search results (by zet)
4126: Improved log_file handling

* there is now a default log_file: mlnet.log, old downloads.ini is *not* updated
* its default log_file_size is 2MB, this is checked only on core start,
  if log_file is bigger it will be resetted
* logging will always be appended to log_file
* new command "clear_log" to reset log_file while the core is working
* new command "open_log" to reopen log after close_log
* removed command "log_file", same can be achieved through "set log_file <file>"

4384: HTML: Add "Import Serverlist" in servers, clean third button row (by schlumpf)
4365: Disable console "X" close button on MinGW, second version (by CML)
4382: Solve libgd configure in mandrake 10.0
4381: better differentiation of eDonkey and BT Stats Table (by schlumpf)
4380: some info for SCM Version (CVS co Date/ SVN revision) (by schlumpf)
4379: Fix compile error when libgd is not present
4378: Longhelp: Better description for add_user
4377: Better description for shared_directories in downloads.ini
4356: EDK: Improved server.met handling / fix contact.dat loading

* Changed user agent from "MLdonkey" to "MLDonkey", solves problem
  when downloading files from www.gruk.org and www.srv1000.com
* MLDonkey new recognizes links like ed2k://|serverlist|http://server/file.ext|/
* "servers" command now takes URLs
* if period in web_infos is zero the file is only loaded during core start
  (as requested by the owner of www.gruk.org)
* in all places where a filename or URL for a server.met can be used this
  file can also be compressed with gz/bz2/zip
* automatically replace old default server.met in web_infos
        ("server.met", 24,
            "http://ocbmaurice.dyndns.org/pl/slist.pl/server.met?download/server-best.met");
  with fake servers free list from gruk.org:
        ("server.met", 0, "http://www.gruk.org/server.met.gz");
* fixed bug which prevented loading Overnet contact.dat file in web_infos

2005/08/29: spiralvoice

4368: Use sparse files on MinGW/NTFS (by zet)
4370: BT/Win32: fix multifile hashing (by Amorphous)

2005/08/28: spiralvoice

4366: HTML: more maintainable html_mods styles (by pango)
4367: Improve logging
4361: New command: uptime

Lots of improvements for MinGW, this platform now supports
files > 2GB, threads and libgd generated statistics.
Here you will find compilation instructions:
http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows

4342: Large_file support for mld_hash and MinGW MLDonkey core (by zet)
4358: Add thread support for MinGW (by zet)
4362: configure.in support for libgd on MinGW/FreeBSD
4349: increase filedescriptor limit for mingw (by zet)
4365: Disable console "X" close button on MinGW (by zet)

2005/08/26: spiralvoice

4360: Configure: Test for nl_langinfo(CODESET)
4359: Upload: Give upload slot truely randomly (by pango)
4347: Improve exit codes, codes were inspired by sysexits.h
4345: Code clean: Optimize redundant time_to_string functions
4357: Rename ed2k_hash to mld_hash
4344: Improve ./configure checks (bzlib.h, iconv on Windows)
---------------------------------------------------------------------
2005/08/21: spiralvoice (version 2.6.3 = tag release-2-6-3)

4254: Patch reverted, did not work
      "html_mods: Table data is incorrectly centered"
4336: Improve some log file messages
4321: BT: fixed "make_torrent produce corrupted files on Windows" (by beedauchon)
4335: Buildinfo: Fix bug if Bzip2 version string is empty (by beedauchon)
4329: HTTPClient: Implement retries for failed requests
4319: Fix compile if libbz2 is not available,
      new configure option: --disable-bzip2
4334: BT/FileTP: Some progress on cancel bug (by kempston)
4333: send ip blocked addr state to gui, compute_torrent from gui (by z)
4332: Let configure fail if GNU make is not installed

2005/08/18: spiralvoice

4323: HTML: Search results: new colums for Bitrate, Codec and length
4324: Log: Improve output for verbosity "hid"
4322: EDK: compatibleclient 40 -> Shareaza
4320: Fix compile on FreeBSD < 5.3

2005/08/15: spiralvoice

4317: Updated ./configure for compiling lablgtk2 with --enable-batch
4316: Updated ./distrib/Install.txt for Ocaml 3.08.4 and new GUI options
4292: html_mods: Match styles default frameHeight with the common default
4314: Allow compiling with Ocaml 3.08.4
      Compiling with 3.08.3 still works
4312: BT: Allow seeding (by beedauchon)
4311: BT: create_torrent: default_tracker and default_comment (by beedauchon)
4309: GUI: send ed2k/bt network u/d totals (by z)
4308: Gnutella/G2: Fix commit if no TigerTree is available
4305: buildinfo: Print some system internals
4304: EDK: Fix disconnect state with verbosity = "hid"
4297: Create ini file backups on shutdown
Note: file_sources.ini is never saved, it makes no sense to keep this file.

New options:

* backup_options_format, default "tar.gz", "zip" can also be used

* backup_options_delay, default 0
How often (in hours) should a backup of the ini files be written into old_config.
A value of zero means that a backup is written only when the core shuts down.

* backup_options_generations, default 10
Define the total number of options archives in old_config.

Command save got two new parameters:
* "save all" saves options, sources and creates a ini file backup
* "save backup" speaks for itself;-)
---------------------------------------------------------------------
2005/08/11: spiralvoice (version 2.6.2 = tag release-2-6-2)

4296: BT: Fix options parsing
---------------------------------------------------------------------
2005/08/09: spiralvoice (version 2.6.1 = tag release-2-6-1)

4291: EDK: Better logging for unknown compatibleclient values
4290: BT: Some small fixes for messages interested and cancel
      by beedauchon
4289: LOG: Improve verbosity "hid"
4287: Better clear Fifo buffers, by bogeyman
4268: Web/Gui: free core's buffer allocated by vd # and gui
      by bogeyman

2005/08/08: spiralvoice

4285: IPBlock: Server support
* display in vm/vma if a server has a blocked IP
* prevent connections to a IP blocked server,
  in EDK case this resulted in a LowID connection

4284: Remove whitespaces / Some logging changes

2005/08/07: spiralvoice

4279: MinGW: HDD statistics support
4281: Remove white spaces / Some logging stuff
4251: HTML: few fixes / new option html_frame_border true|false
4278: Windows: Fix bug creating work dirs in empty dir

2005/08/06: spiralvoice

4276: IPBlock: Never block local IPs even if they are in blocklist
4274: Use relative path if downloads.ini is present

2005/08/05: spiralvoice

4272: HTML: Cursor focus in input field
4271: GTK2: Fix compile bug in src/gtk2/chat/chat_art.ml
4155: Let MLDonkey create its data in $HOME/.mldonkey

Usage instructions:
* if the core is started in a directory where downloads.ini exists
  this directory will be used, this is the same behaviour as before
* on Windows the current directory will always be used,
  this is consistent with eMule
* on other systems $HOME/.mldonkey will be created and used,
  this is consistent with eDonkey, aMule and Unix standards
* if variable MLDONKEY_DIR is used that directory has priority,
  to simulate the behaviour without this patch use:
    export MLDONKEY_DIR="." && ./mlnet

2005/08/04: spiralvoice

4270: Overnet: Convert local IPs sent by OV clients to real IPs
4269: IPBlock: Several fixes, better zip file support
4264: Fasttrack: Force commit of all complete files

4258: BT: Statistics, recognize more clients, min_interval, torrents/old and more...
      This patch was done by Beedauchon, it incorporates weeks of work from him.
* move .torrent to torrents/old if the file is not shared anymore
* new command rm_old_torrents: delete all files in torrents/old
* eDonkey like statistics for BT clients (csbt command)
* compute_torrent and make_torrent can put a comment into the .torrent file
* MLdonkey computes a BT-compatible client_uid starting with "-ML"
* parse more fields from .torrent files and display them in HTML interface
* Tracker: replace "/tracker" by "/announce"
* Tracker: add "/scrape"
* Multitracker support for downloading

2005/08/02: spiralvoice

4263: Fasttrack: Force bootstrapping nodes

2005/08/01: spiralvoice

4261: HTML: Add DL button - opens dialog for entering links (by omgwtf2)
4260: IPblock: Enable IP blocking for Overnet and HTTP server
      (=BT Tracker) (by beedauchon)
4257: Kick uploaders which send no data for more than 1 minute
4256: Print message if glibc version mismatch
      updates for buildinfo (version of libbz2, libz, libpng)

2005/07/29: spiralvoice

4255: HTML: updates for cs command
4254: html_mods: Table data is incorrectly centered
4253: HTML: New style Construction (by omgwtf2)
4251: few html fixes (reverted) (by beedauchon)

2005/07/28: spiralvoice

4250: Remove whitespaces from commonUploads.ml
4249: HTML: Links to fake check services in search results
      (by bogeyman)

2005/07/27: spiralvoice

4194: FileTP : Add support for "referer",
      error messages cleanup (by beedauchon)
4245: BT: Remove whitespace (by beedauchon)
4244: Change web_infos period to hours (this is a bugfix,
      no need to change ini files)
      new option: enable_mlnet_redirector

2005/07/26: spiralvoice

4243: FileTP: Clean lots of whitespaces
4031: HTML: relative refs in HTML output (by beedauchon)
4191: Access to disk data (free space, max file name length)
      This is first step implmenting this, checkout the
      disk command for debugging.
4242: IPBlock: Support guarding_full.zip
4241: Fix html_mods_vd_gfx_remove
4240: EDK: New option keep_downloaded_in_old_files

2005/07/23: spiralvoice

4184: support guarding.p2p in zip/gz/bz2 format
      bz2 segfaults on OpenBSD, therefore disabled
      see notes in the patch on how to compile with MinGW

2005/07/22: spiralvoice

4205: Improve logging with timestamps 2 (incomplete)
4204: Improve logging with timestamps (incomplete)

2005/07/21: spiralvoice

4195: GUI: Change configure options

Now "./configure" compiles no GUI, "--disable-gui" is default.
To use a GUI use "--enable-gui", this enables GTK2 GUI.
Other options are:
--enable-gui=newgui2 (use GTK2 GUI)
--enable-gui=newgui1 (use GTK1 newgui)
--enable-gui=oldgui  (use GTK1 oldgui)
Options like "--disable-newgui" or "--enable-gtk2" were removed.

2005/07/20: spiralvoice

4193: CommonGraphics : some whitespace cleanups
4190: Gdstats: Fix tag.png/jpg link output
4188: Overnet: Dont put our own ID in the buckets (by Bogeyman)

5 files changed, 31 insertions, 42 deletions

diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 19cba1dd588..3cd0d5faec1 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2005/08/23 11:48:50 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2005/10/06 11:50:03 wiz Exp $
 #
 
 .include "Makefile.common"
 
 USE_PKGINSTALL=		YES
 
-CONFIGURE_ARGS+=	--disable-gui
-
 RCD_SCRIPTS=		mldonkey
 
 BUILD_DEFS+=		MLDONKEY_GROUP MLDONKEY_HOME MLDONKEY_USER
diff --git a/net/mldonkey/Makefile.common b/net/mldonkey/Makefile.common
index f6403f4836d..3b36146ffd9 100644
--- a/net/mldonkey/Makefile.common
+++ b/net/mldonkey/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.7 2005/07/23 18:47:43 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/10/06 11:50:03 wiz Exp $
 #
 
-DISTNAME=	mldonkey-2.6.0
+DISTNAME=	mldonkey-2.6.4
 CATEGORIES=	net
 MASTER_SITES=	http://savannah.nongnu.org/download/mldonkey/
 EXTRACT_SUFX=	.tar.bz2
@@ -30,9 +30,6 @@ PRINT_PLIST_AWK+=	/^@dirrm libexec\/mldonkey$$/ \
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/gd/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
-
-post-extract:
-	${CHMOD} 0644 ${WRKSRC}/Makefile
-
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/net/mldonkey/distinfo b/net/mldonkey/distinfo
index 2a6a9078d4e..c897221fbd2 100644
--- a/net/mldonkey/distinfo
+++ b/net/mldonkey/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.19 2005/09/05 10:37:55 tron Exp $
+$NetBSD: distinfo,v 1.20 2005/10/06 11:50:03 wiz Exp $
 
-SHA1 (mldonkey-2.6.0.tar.bz2) = 47702bf225d0a9b892fe93d7540ca70a7501a2af
-RMD160 (mldonkey-2.6.0.tar.bz2) = 87638cc1ec77f1d465100b424ce6429a172381af
-Size (mldonkey-2.6.0.tar.bz2) = 2622242 bytes
-SHA1 (patch-aa) = 06de73fd10577e442cbea00045611e8967844a39
+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
diff --git a/net/mldonkey/patches/patch-aa b/net/mldonkey/patches/patch-aa
deleted file mode 100644
index cd74295293c..00000000000
--- a/net/mldonkey/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2005/09/05 10:37:55 tron Exp $
-
---- config/configure.orig	2005-07-19 20:58:13.000000000 +0100
-+++ config/configure	2005-09-05 11:15:29.000000000 +0100
-@@ -4460,6 +4460,7 @@
-   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
-   case "$OCAMLVERSION" in
-     "$REQUIRED_OCAML"*) ;;
-+    3.08.4) ;;
-     3.08.2*)
-         if test "$system" = "rhapsody"; then
-             case "$OCAMLVERSION" in
-@@ -4504,6 +4505,7 @@
-     REBUILD_OCAML=no
-   case "$OCAMLVERSION" in
-     "$REQUIRED_OCAML"*) ;;
-+    3.08.4) ;;
-     3.08.2*)
-         if test "$system" = "rhapsody"; then
-             case "$OCAMLVERSION" in
-@@ -5104,6 +5106,7 @@
-     REBUILD_OCAML=no
-   case "$OCAMLVERSION" in
-     "$REQUIRED_OCAML"*) ;;
-+    3.08.4) ;;
-     3.08.2*)
-         if test "$system" = "rhapsody"; then
-             case "$OCAMLVERSION" in
diff --git a/net/mldonkey/patches/patch-ac b/net/mldonkey/patches/patch-ac
new file mode 100644
index 00000000000..21f41ee8c92
--- /dev/null
+++ b/net/mldonkey/patches/patch-ac
@@ -0,0 +1,22 @@
+$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