Hi, This diff updates lablgtk2 to 2.14.2 (bugfix update) and mldonkey to version 3.0.4. Tested both on i386.
See http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/changes2.txt for further details... Also note that ocaml 3.12.0 is out. Anil, you're busy let me know and I will try to update our port during the weekend (no time now)... Ciao, David Index: x11/lablgtk2/Makefile =================================================================== RCS file: /cvs/ports/x11/lablgtk2/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- x11/lablgtk2/Makefile 30 Jul 2010 11:29:44 -0000 1.10 +++ x11/lablgtk2/Makefile 17 Sep 2010 11:43:13 -0000 @@ -2,12 +2,9 @@ COMMENT = OCaml interface to GTK+2 -V = 2.14.1 +V = 2.14.2 DISTNAME = lablgtk-$V PKGNAME = lablgtk2-$V - -REVISION = 0 - CATEGORIES = x11 devel HOMEPAGE = http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html Index: x11/lablgtk2/distinfo =================================================================== RCS file: /cvs/ports/x11/lablgtk2/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- x11/lablgtk2/distinfo 11 Jun 2010 10:20:42 -0000 1.3 +++ x11/lablgtk2/distinfo 17 Sep 2010 11:43:13 -0000 @@ -1,5 +1,5 @@ -MD5 (lablgtk-2.14.1.tar.gz) = vffjnUviD5+JyJ7thlsF+A== -RMD160 (lablgtk-2.14.1.tar.gz) = 76DBRG0D9N65BlZYbUedKzLhENo= -SHA1 (lablgtk-2.14.1.tar.gz) = 0PthhfIQxrEGwlDRqFVBt9pAIxA= -SHA256 (lablgtk-2.14.1.tar.gz) = METZapcIGM3X/F1/M6Xkdr+SxStEYXyVN4b6P3bBd7U= -SIZE (lablgtk-2.14.1.tar.gz) = 777615 +MD5 (lablgtk-2.14.2.tar.gz) = utd2gKctq4uRXK6Z0eybHw== +RMD160 (lablgtk-2.14.2.tar.gz) = qkY3BTmOtgcSGH72olKEn7Wcv/I= +SHA1 (lablgtk-2.14.2.tar.gz) = /RhEGMy8VCgldIymP7p1E40upWE= +SHA256 (lablgtk-2.14.2.tar.gz) = SYGr7avcRiMD80UQQELIivInzNUP0wqb9I/TU6sC0Lo= +SIZE (lablgtk-2.14.2.tar.gz) = 779803 Index: net/mldonkey/stable/Makefile =================================================================== RCS file: /cvs/ports/net/mldonkey/stable/Makefile,v retrieving revision 1.32 diff -u -p -r1.32 Makefile --- net/mldonkey/stable/Makefile 13 Jul 2010 21:08:00 -0000 1.32 +++ net/mldonkey/stable/Makefile 17 Sep 2010 11:42:30 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.32 2010/07/13 21:08:00 sthen 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 Index: net/mldonkey/stable/distinfo =================================================================== RCS file: /cvs/ports/net/mldonkey/stable/distinfo,v retrieving revision 1.15 diff -u -p -r1.15 distinfo --- net/mldonkey/stable/distinfo 4 Jun 2010 17:28:52 -0000 1.15 +++ net/mldonkey/stable/distinfo 17 Sep 2010 11:42:30 -0000 @@ -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 Index: net/mldonkey/stable/patches/patch-config_configure_in =================================================================== RCS file: /cvs/ports/net/mldonkey/stable/patches/patch-config_configure_in,v retrieving revision 1.11 diff -u -p -r1.11 patch-config_configure_in --- net/mldonkey/stable/patches/patch-config_configure_in 29 Oct 2009 08:28:10 -0000 1.11 +++ net/mldonkey/stable/patches/patch-config_configure_in 17 Sep 2010 11:42:30 -0000 @@ -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 +--- 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. # 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) Index: net/mldonkey/stable/patches/patch-src_gtk2_gui_guiHtml_ml =================================================================== RCS file: net/mldonkey/stable/patches/patch-src_gtk2_gui_guiHtml_ml diff -N net/mldonkey/stable/patches/patch-src_gtk2_gui_guiHtml_ml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net/mldonkey/stable/patches/patch-src_gtk2_gui_guiHtml_ml 17 Sep 2010 11:42:30 -0000 @@ -0,0 +1,26 @@ +$OpenBSD$ + +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 = { Index: net/mldonkey/stable/patches/patch-src_gtk2_gui_guiOptions_ml =================================================================== RCS file: net/mldonkey/stable/patches/patch-src_gtk2_gui_guiOptions_ml diff -N net/mldonkey/stable/patches/patch-src_gtk2_gui_guiOptions_ml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net/mldonkey/stable/patches/patch-src_gtk2_gui_guiOptions_ml 17 Sep 2010 11:42:30 -0000 @@ -0,0 +1,28 @@ +$OpenBSD$ + +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 Index: net/mldonkey/stable/pkg/PLIST =================================================================== RCS file: /cvs/ports/net/mldonkey/stable/pkg/PLIST,v retrieving revision 1.10 diff -u -p -r1.10 PLIST --- net/mldonkey/stable/pkg/PLIST 29 Oct 2009 08:28:10 -0000 1.10 +++ net/mldonkey/stable/pkg/PLIST 17 Sep 2010 11:42:30 -0000 @@ -70,6 +70,7 @@ share/mldonkey/distrib/i18n/mlnet_string 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
