Revision: 71078 http://trac.macports.org/changeset/71078 Author: ryandesign@macports.org Date: 2010-08-31 14:50:56 -0700 (Tue, 31 Aug 2010) Log Message: ----------- mldonkey: update to 3.0.4; see #26292 Modified Paths: -------------- trunk/dports/net/mldonkey/Portfile Added Paths: ----------- trunk/dports/net/mldonkey/files/ trunk/dports/net/mldonkey/files/patch-gui-guiHtml.diff trunk/dports/net/mldonkey/files/patch-gui-guiOptions.diff Modified: trunk/dports/net/mldonkey/Portfile =================================================================== --- trunk/dports/net/mldonkey/Portfile 2010-08-31 21:02:46 UTC (rev 71077) +++ trunk/dports/net/mldonkey/Portfile 2010-08-31 21:50:56 UTC (rev 71078) @@ -3,8 +3,7 @@ PortSystem 1.0 name mldonkey -version 3.0.3 -revision 2 +version 3.0.4 categories net maintainers nomaintainer description OCaml/GTK client for the eDonkey p2p network @@ -20,10 +19,13 @@ platforms darwin master_sites sourceforge -checksums md5 b5b5252fe60b5ec52396c9f58b7cb577 \ - sha1 9187808cc318887e797469096f952a90759085c8 \ - rmd160 f7a7668294252309d4dc68633ffbc32bdc76e14a +checksums md5 06a084874dfd99dbad4dabc21e986354 \ + sha1 8d9e32acdc4cda1a7ff0f09e06c76cd589691d3f \ + rmd160 e98e3319ed6099af0fb226402547e4407114c074 +patchfiles patch-gui-guiHtml.diff \ + patch-gui-guiOptions.diff + # ocaml is not universal universal_variant no Added: trunk/dports/net/mldonkey/files/patch-gui-guiHtml.diff =================================================================== --- trunk/dports/net/mldonkey/files/patch-gui-guiHtml.diff (rev 0) +++ trunk/dports/net/mldonkey/files/patch-gui-guiHtml.diff 2010-08-31 21:50:56 UTC (rev 71078) @@ -0,0 +1,17 @@ +--- src/gtk2/gui/guiHtml.ml.orig 2010-08-31 01:20:59.000000000 +0200 ++++ src/gtk2/gui/guiHtml.ml 2010-08-31 01:22:48.000000000 +0200 +@@ -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 = { Added: trunk/dports/net/mldonkey/files/patch-gui-guiOptions.diff =================================================================== --- trunk/dports/net/mldonkey/files/patch-gui-guiOptions.diff (rev 0) +++ trunk/dports/net/mldonkey/files/patch-gui-guiOptions.diff 2010-08-31 21:50:56 UTC (rev 71078) @@ -0,0 +1,19 @@ +--- src/gtk2/gui/guiOptions.ml.orig 2010-08-31 01:21:34.000000000 +0200 ++++ src/gtk2/gui/guiOptions.ml 2010-08-31 01:22:48.000000000 +0200 +@@ -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