diff options
| -rw-r--r-- | net/mldonkey-gui/Makefile | 6 | ||||
| -rw-r--r-- | net/mldonkey/Makefile | 3 | ||||
| -rw-r--r-- | net/mldonkey/Makefile.common | 4 | ||||
| -rw-r--r-- | net/mldonkey/distinfo | 11 | ||||
| -rw-r--r-- | net/mldonkey/patches/patch-aa | 41 | ||||
| -rw-r--r-- | net/mldonkey/patches/patch-ab | 23 |
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 |