Update to 3.0.4, fixing build of mldonkey-gui with ocaml-3.12.1.

Changes:

2010/08/15: version 3.0.4 = tag release-3-0-4
7280: BT: fix make_torrent creates sometimes torrents without name argument
      (ygrek)
7278: configure: more useful --enable-debug (ygrek)
- enable also for ocamlopt
- enable when profiling
7274: DC: Increase message buffer size to fix communication with bots
      (somedamnthing)

2010/08/08
7267: http proxy authentication support (ygrek)
- new options http_proxy_login and http_proxy_password control authentication
  for TCP CONNECT and plain HTTP requests through http proxy

2010/08/07
7273: Fix compile errors on Debian/kFreeBSD
7272: Configure: Use Ocaml 3.12.0 as default compiler
7269: Fix typos (glondu)
-------------------------------------------------------------------------------
2010/08/01: version 3.0.3 = tag release-3-0-3

2010/07/28
7262: BT: improve porttest (ygrek)
7254: BT/bandwidth controllers: accept incoming connections while downloading
- should improve upload when downlink is saturated (ygrek)

2010/07/24
7258: russian i18n mlnet_strings (Balamutick/ygrek)

2010/07/18
7253: Fix downloading Ocaml 3.12 archive, use lablgtk-2.12.0 for Ocaml < 3.10
7252: GTK2 GUI: Fix compile bug with lablgtk2-20100620 and Ocaml 3.12
7251: BT: OCaml 3.08.3 compatibility fix (ygrek)
7250: DC: discover self IP (ygrek)
7249: DC: fix parsing MyINFO with non-latin nicks (ygrek)

2010/07/17
7248: DC: correctly parse dchub:// entries in xml hublist (ygrek)
7247: BT tracker: remember tracked files after restart (ygrek)

2010/07/16
7245: HTML: Fix unstable option sections links position (ygrek)
7210: upload scheduler: correctly handle clock jumps (ygrek)
7219: fsync rename options files (ygrek)

2010/07/15
7208: New aliases (ygrek)
- "unpause", "continue" for command "resume"
- "man" for command "help"
7233: BT: Announce shared files when share_scan_interval = 0 (ygrek)

2010/05/26
7206: MinGW: Fix diskinfo on large partitions

2010/05/24
7201: DC: Whitespace fixes (ygrek)
7202: BT: Improve internal tracker (ygrek)
- continue tracking files even if there are no requests
- better logging and error reporting
- remove peer from peers list when it sends 'stopped' event
7203: Fix linking with binutils-gold

2010/05/23
7183: DC: magnet links and html ui usability tweaks (ygrek)
7180: DC: better encoding handling (ygrek)
- new option default_encoding for communications with hubs, default CP1252
7181: HTML: Fix sorting of friends' file list (ygrek)
7200: Allow compilation with upcoming Ocaml 3.12
-------------------------------------------------------------------------------
2010/04/25: version 3.0.2 = tag release-3-0-2
7175: DC: PtokaX compatibility (ygrek)
7169: Equal scales for graphical up/down stats (ygrek)
7167: Improve add_mail_brackets option description,
      change default according to RFC (ygrek)

2010/04/11
7164: BT: more user-friendly tracker (ygrek)
- `compute_torrent` shows full path and url to generated torrent file
- `torrents` output htmlized
- corrected server header
- improved comments for tracker options
- search torrents in old directory too
7163: Fix not sending UDP packets when max_hard_upload_rate = 0 (ygrek)

2010/04/10
7162: filter longhelp output (ygrek)
- longhelp (or ??) with parameters will output only those commands that
  contain all of the specified parameters as substring

2010/04/08
7161: bw_toggle: Add options "high" and "low"
- bw_toggle without options works as before
- if "high" is added, the *_2 option set is used if max_opened_connections_2
  is higher than max_opened_connections, otherwise the option values are kept
- if "low" is added, the *_2 option set is used if max_opened_connections_2
  is lower than max_opened_connections, otherwise the option values are kept
6959: DC: Fix invalid XML (ygrek)
- enhanced patch (use Xml.escape and properly escape attributes in Xml.to_string)

2010/04/04
7153: BT: correctly handle failed tracker requests (ygrek)
7155: DC: understand hublist.xml (ygrek)

2010/04/02
7151: BT: html ui tweaks (ygrek)

2010/04/01
7150: BT: track torrents created with compute_torrent (ygrek)

2010/03/27
7142: BT: max_uploaders_per_torrent option not restored from .ini files (xboct)
7140: MinGW: Fix linking with Ocaml 3.11.2
7139: BT: Some improvements and fixes (ygrek)
- Don't request sources from tracker (set numwant=0) if we don't need them e.g.
  'stopped' event or when sharing
- Prevent client from repeatedly sending 'started' events for shared files
- Check that peer addresses, returned from tracker in compact format, are valid
  and not blocked (same check as for non-compact format)
- Show torrent info_hash in html ui
7138: BT: Recognize more client brands (ygrek)
7137: Fix error in calculating average upload speed for client (ygrek)
7136: GTK2 GUI: start downloads from search results items
      by double-click (soulcatcher)

2010/03/20
7128: BT: Fix ratio reporting (ygrek)
7127: Configure: Use Ocaml 3.11.2 as default compiler
7076: Support preallocating files on Unix systems (drwho)
      Recent Linux kernels support fast preallocation when the filesystem is
      XFS, EXT4 or BTRFS, this patch adds preallocation support when
      posix_fallocate() is available
6968: GTK2 GUI: Fix switching server preferred status (dcoppa)

6 files changed, 53 insertions, 35 deletions

diff --git a/net/mldonkey-gui/Makefile b/net/mldonkey-gui/Makefile
index 342ea6c4af2..5ee2cc0c0d8 100644
--- a/net/mldonkey-gui/Makefile
+++ b/net/mldonkey-gui/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2010/06/14 15:33:13 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2010/08/28 21:35:01 wiz Exp $
 #
 
 .include "../../net/mldonkey/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/mldonkey/mldonkey-gui/}
-PKGREVISION=		3
 
 COMMENT+=		(GTK interface)
 
@@ -12,14 +11,13 @@ DEPENDS+=		mldonkey-[0-9]*:../../net/mldonkey
 
 USE_TOOLS+=		pkg-config
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin libexec/mldonkey
 
 .include "options.mk"
 
 do-install:
 	${RM} -f ${DESTDIR}${PREFIX}/bin/mlgui
 	cd ${DESTDIR}${PREFIX}/bin && ${LN} -s ../libexec/mldonkey/mlgui mlgui
-	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/libexec/mldonkey
 	${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${DESTDIR}${PREFIX}/libexec/mldonkey
 	${INSTALL_PROGRAM} ${WRKSRC}/mlguistarter \
 		${DESTDIR}${PREFIX}/libexec/mldonkey
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 6dd3616da1e..f0c6399493c 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2010/06/13 22:45:11 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2010/08/28 21:35:00 wiz Exp $
 #
 
 .include "Makefile.common"
-PKGREVISION=		2
 
 RCD_SCRIPTS=		mldonkey
 
diff --git a/net/mldonkey/Makefile.common b/net/mldonkey/Makefile.common
index 497e2428134..74af5ae6628 100644
--- a/net/mldonkey/Makefile.common
+++ b/net/mldonkey/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.38 2009/10/31 01:19:59 wiz Exp $
+# $NetBSD: Makefile.common,v 1.39 2010/08/28 21:35:00 wiz Exp $
 #
 # used by net/mldonkey/Makefile
 # used by net/mldonkey-gui/Makefile
 
-DISTNAME=	mldonkey-3.0.1
+DISTNAME=	mldonkey-3.0.4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mldonkey/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/mldonkey/distinfo b/net/mldonkey/distinfo
index 4581d2429db..da62a13167c 100644
--- a/net/mldonkey/distinfo
+++ b/net/mldonkey/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.52 2010/08/18 19:59:03 asau Exp $
+$NetBSD: distinfo,v 1.53 2010/08/28 21:35:00 wiz Exp $
 
-SHA1 (mldonkey-3.0.1.tar.bz2) = f538245be05e6fc667dd596c1136fd0f64d845b8
-RMD160 (mldonkey-3.0.1.tar.bz2) = d16a87200bfb2a930b45afb86277b4f03c8da9de
-Size (mldonkey-3.0.1.tar.bz2) = 2722659 bytes
-SHA1 (patch-aa) = 1239c7e24f3ff678667a9a2ed8ed14577838acd7
+SHA1 (mldonkey-3.0.4.tar.bz2) = 8d9e32acdc4cda1a7ff0f09e06c76cd589691d3f
+RMD160 (mldonkey-3.0.4.tar.bz2) = e98e3319ed6099af0fb226402547e4407114c074
+Size (mldonkey-3.0.4.tar.bz2) = 2757488 bytes
+SHA1 (patch-aa) = 2910727ded2c1c21b75c83e3486bbbe119083400
+SHA1 (patch-ab) = f3254c6b66d4116d36bffd65b19fe7f4b0bf2f14
diff --git a/net/mldonkey/patches/patch-aa b/net/mldonkey/patches/patch-aa
index 76bd601e0ba..8cac453c553 100644
--- a/net/mldonkey/patches/patch-aa
+++ b/net/mldonkey/patches/patch-aa
@@ -1,24 +1,21 @@
-$NetBSD: patch-aa,v 1.19 2010/08/18 19:59:03 asau Exp $
+$NetBSD: patch-aa,v 1.20 2010/08/28 21:35:00 wiz Exp $
 
-Ensure mldonkey accepts ocaml 3.11.* and 3.12.*
+From upstream CVS, fixing compilation with ocaml-3.12.
 
---- config/configure.orig	2009-10-23 09:55:40.000000000 +0400
-+++ config/configure	2010-08-18 23:57:43.000000000 +0400
-@@ -4784,7 +4784,7 @@
- else
-   OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
-   case "$OCAMLVERSION" in
--    "$REQUIRED_OCAML"*|3.11.0*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
-+    "$REQUIRED_OCAML"*|3.12.*|3.11.*|3.10.*|3.09.*|3.08.4*|3.08.3*) ;;
-     *)
-         echo "Need build"
-         BUILD_OCAML=yes
-@@ -5263,7 +5263,7 @@
- OCAMLLIB=`$OCAMLC -where`
- REBUILD_OCAML=no
- case "$OCAMLVERSION" in
--    3.10*|3.11*)
-+    3.10*|3.11*|3.12.*)
-       if test "$GUI" = "oldgui"; then
-         OLDGUI_NO_310=yes
-         GUI=no
+--- src/gtk2/gui/guiHtml.ml.orig	2006-05-19 23:43:54.000000000 +0000
++++ src/gtk2/gui/guiHtml.ml
+@@ -50,9 +50,13 @@ let user_agent =
+ 
+ let make_request url =
+   let module H = Http_client in
++  let auth = match !!O.gtk_connection_http_proxy_login with
++  | "" -> None
++  | _ -> Some (!!O.gtk_connection_http_proxy_login, !!O.gtk_connection_http_proxy_password)
++  in
+   let proxy =
+     if !!O.gtk_connection_http_use_proxy
+-      then Some (!!O.gtk_connection_http_proxy_server, !!O.gtk_connection_http_proxy_port)
++      then Some (!!O.gtk_connection_http_proxy_server, !!O.gtk_connection_http_proxy_port, auth)
+       else None
+   in
+   let r = {
diff --git a/net/mldonkey/patches/patch-ab b/net/mldonkey/patches/patch-ab
new file mode 100644
index 00000000000..92bab4b5f9c
--- /dev/null
+++ b/net/mldonkey/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.5 2010/08/28 21:35:00 wiz Exp $
+
+From upstream CVS, fixing compilation with ocaml-3.12.
+
+--- src/gtk2/gui/guiOptions.ml.orig	2007-07-01 13:00:11.000000000 +0000
++++ src/gtk2/gui/guiOptions.ml
+@@ -166,6 +166,16 @@ let gtk_connection_http_use_proxy = defi
+     "Direct TCP connections to HTTP proxy (the proxy should support CONNECT)"
+     bool_option false
+ 
++let gtk_connection_http_proxy_login = define_option current_section
++    ["gtk_connection_http_proxy_login"]
++    "HTTP proxy login (leave empty if proxy doesn't require authentication)"
++    string_option ""
++
++let gtk_connection_http_proxy_password = define_option current_section
++    ["gtk_connection_http_proxy_password"]
++    "HTTP proxy password"
++    string_option ""
++
+ (* {Client} *)
+ 
+ let gtk_client_login = define_option current_section