cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to mldonkey-3.0.4

Browse Source
This commit is contained in:
dcoppa 2010-09-17 15:58:30 +00:00
parent 55e3c74a0e
commit 3bd318d181
6 changed files with 68 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/mldonkey/stable/Makefile
View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.32 2010/07/13 21:08:00 sthen Exp $
# $OpenBSD: Makefile,v 1.33 2010/09/17 15:58:30 dcoppa Exp $
COMMENT = e-donkey client
DISTNAME = mldonkey-3.0.2
REVISION= 0
DISTNAME = mldonkey-3.0.4
CATEGORIES = net
HOMEPAGE = http://mldonkey.sourceforge.net/Main_Page

10
net/mldonkey/stable/distinfo
View File

@ -1,5 +1,5 @@
MD5 (mldonkey-3.0.2.tar.bz2) = vtczGB7DY0zfAHMIXu0BEA==
RMD160 (mldonkey-3.0.2.tar.bz2) = 14mPJim9sRiAn31sMKerw/fAHn0=
SHA1 (mldonkey-3.0.2.tar.bz2) = H1gGdLMhsH1adftRDkXRRZsdXbg=
SHA256 (mldonkey-3.0.2.tar.bz2) = BCkJHWnJFveEHxwlz9yFAs+TCclSdlk2FXQAY/VjL1A=
SIZE (mldonkey-3.0.2.tar.bz2) = 2725866
MD5 (mldonkey-3.0.4.tar.bz2) = BqCEh039mdutTavCHphjVA==
RMD160 (mldonkey-3.0.4.tar.bz2) = 6Y4zGe1gma8PsiZAJUfkQHEUwHQ=
SHA1 (mldonkey-3.0.4.tar.bz2) = jZ4yrNxM2hp/8PCeBsds1YlpHT8=
SHA256 (mldonkey-3.0.4.tar.bz2) = xg27j6UkXega61XgcUFn/3pr56MXr1+ywc2IcKqI3nI=
SIZE (mldonkey-3.0.4.tar.bz2) = 2757488

10
net/mldonkey/stable/patches/patch-config_configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_configure_in,v 1.11 2009/10/29 08:28:10 giovanni Exp $
--- config/configure.in.orig Tue Oct 27 05:39:25 2009
+++ config/configure.in Tue Oct 27 05:41:56 2009
@@ -845,7 +845,7 @@ if test "$GD" != "no"; then
$OpenBSD: patch-config_configure_in,v 1.12 2010/09/17 15:58:30 dcoppa Exp $
--- config/configure.in.orig Sun Aug 15 17:41:00 2010
+++ config/configure.in Fri Sep 17 12:09:17 2010
@@ -855,7 +855,7 @@ if test "$GD" != "no"; then
PNG_LDFLAGS=`$PNGLIBCONFIG --ldflags`
LDFLAGS="$LDFLAGS $PNG_LDFLAGS"
fi
@ -10,7 +10,7 @@ $OpenBSD: patch-config_configure_in,v 1.11 2009/10/29 08:28:10 giovanni Exp $
# restore variables
LIBS=$SAVE_LIBS_PNG
CFLAGS=$SAVE_CFLAGS_PNG
@@ -873,7 +873,7 @@ if test "$GD" != "no"; then
@@ -883,7 +883,7 @@ if test "$GD" != "no"; then
GD=yes
GD_PNG=yes
AC_MSG_RESULT(yes)

26
net/mldonkey/stable/patches/patch-src_gtk2_gui_guiHtml_ml Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-src_gtk2_gui_guiHtml_ml,v 1.1 2010/09/17 15:58:30 dcoppa Exp $
From upstream cvs, fixes error:
File "src/gtk2/gui/guiHtml.ml", line 61, characters 25-30:
Error: This expression has type (string * int) option
but an expression was expected of type
(string * int * (string * string) option) option
--- src/gtk2/gui/guiHtml.ml.orig Sat May 20 01:43:54 2006
+++ src/gtk2/gui/guiHtml.ml Fri Sep 17 13:00:17 2010
@@ -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 = {

28
net/mldonkey/stable/patches/patch-src_gtk2_gui_guiOptions_ml Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-src_gtk2_gui_guiOptions_ml,v 1.1 2010/09/17 15:58:30 dcoppa Exp $
From upstream cvs, fixes error:
File "src/gtk2/gui/guiHtml.ml", line 61, characters 25-30:
Error: This expression has type (string * int) option
but an expression was expected of type
(string * int * (string * string) option) option
--- src/gtk2/gui/guiOptions.ml.orig Sun Jul 1 15:00:11 2007
+++ src/gtk2/gui/guiOptions.ml Fri Sep 17 13:00:17 2010
@@ -166,6 +166,16 @@ let gtk_connection_http_use_proxy = define_option curr
"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

3
net/mldonkey/stable/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2009/10/29 08:28:10 giovanni Exp $
@comment $OpenBSD: PLIST,v 1.11 2010/09/17 15:58:30 dcoppa Exp $
bin/mlbt
bin/mlbt+gui
bin/mldc
@ -70,6 +70,7 @@ share/mldonkey/distrib/i18n/mlnet_strings.fr.noaccents
share/mldonkey/distrib/i18n/mlnet_strings.ga
share/mldonkey/distrib/i18n/mlnet_strings.it_IT.UTF-8
share/mldonkey/distrib/i18n/mlnet_strings.pt_BR
share/mldonkey/distrib/i18n/mlnet_strings.ru_RU.UTF-8
share/mldonkey/distrib/i18n/mlnet_strings.sp
share/mldonkey/distrib/i18n/mlnet_strings.sv
share/mldonkey/distrib/kill_mldonkey