Update to 3.0.5

PR:		152037
Submitted by:	sunpoet

4 files changed, 3 insertions, 41 deletions

diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index bf937eaf837a..2c40ca7fc7b8 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	3.0.4
-PORTREVISION=	1
+PORTVERSION=	3.0.5
 CATEGORIES+=	net-p2p
 MASTER_SITES=	SF
 
diff --git a/net-p2p/mldonkey/distinfo b/net-p2p/mldonkey/distinfo
index 090834938054..613804b1a213 100644
--- a/net-p2p/mldonkey/distinfo
+++ b/net-p2p/mldonkey/distinfo
@@ -1,3 +1,2 @@
-MD5 (mldonkey-3.0.4.tar.bz2) = 06a084874dfd99dbad4dabc21e986354
-SHA256 (mldonkey-3.0.4.tar.bz2) = c60dbb8fa5245de81aeb55e0714167ff7a6be7a317af5fb2c1cd8870aa88de72
-SIZE (mldonkey-3.0.4.tar.bz2) = 2757488
+SHA256 (mldonkey-3.0.5.tar.bz2) = de578283350e084e14db8b45871413c491c1cdff1095ae47929f79f093bf0ded
+SIZE (mldonkey-3.0.5.tar.bz2) = 2780580
diff --git a/net-p2p/mldonkey/files/patch-src__gtk2__gui__guiHtml.ml b/net-p2p/mldonkey/files/patch-src__gtk2__gui__guiHtml.ml
deleted file mode 100644
index 9a609cfea34f..000000000000
--- a/net-p2p/mldonkey/files/patch-src__gtk2__gui__guiHtml.ml
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/gtk2/gui/guiHtml.ml.orig	2006-05-19 20:43:31.000000000 -0300
-+++ src/gtk2/gui/guiHtml.ml	2010-09-21 00:37:03.000000000 -0300
-@@ -50,9 +50,13 @@
- 
- 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-p2p/mldonkey/files/patch-src__gtk2__gui__guiOptions.ml b/net-p2p/mldonkey/files/patch-src__gtk2__gui__guiOptions.ml
deleted file mode 100644
index 53c83a123c77..000000000000
--- a/net-p2p/mldonkey/files/patch-src__gtk2__gui__guiOptions.ml
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/gtk2/gui/guiOptions.ml.orig	2007-07-01 09:59:48.000000000 -0300
-+++ src/gtk2/gui/guiOptions.ml	2010-09-21 00:37:03.000000000 -0300
-@@ -166,6 +166,16 @@
-     "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