Hi, update mldonkey to 3.1.5 and add a fix for OCaml 4.02. OK?
Christopher Index: stable/Makefile =================================================================== RCS file: /cvs/ports/net/mldonkey/stable/Makefile,v retrieving revision 1.58 diff -u -p -r1.58 Makefile --- stable/Makefile 22 Aug 2014 22:49:07 -0000 1.58 +++ stable/Makefile 27 Aug 2014 09:03:16 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.58 2014/08/22 22:49:07 kili Exp $ COMMENT = e-donkey client -DISTNAME = mldonkey-3.1.4 -REVISION= 1 +DISTNAME = mldonkey-3.1.5 CATEGORIES = net HOMEPAGE = http://mldonkey.sourceforge.net/Main_Page @@ -36,7 +35,7 @@ CONFIGURE_ENV += CPPFLAGS='-I${LOCALBASE USE_GMAKE = Yes MODULES = lang/ocaml devel/gettext -BUILD_DEPENDS = x11/lablgtk2 +BUILD_DEPENDS = lang/ocaml,-camlp4 x11/lablgtk2 LIB_DEPENDS = archivers/bzip2 \ devel/libmagic \ graphics/gd \ Index: stable/distinfo =================================================================== RCS file: /cvs/ports/net/mldonkey/stable/distinfo,v retrieving revision 1.24 diff -u -p -r1.24 distinfo --- stable/distinfo 13 Mar 2014 21:21:48 -0000 1.24 +++ stable/distinfo 27 Aug 2014 09:03:16 -0000 @@ -1,2 +1,2 @@ -SHA256 (mldonkey-3.1.4.tar.bz2) = HkVL5R/sNG1lCnIEnk3ERxA20SmkiEQ6Z0Nq9i7zdf4= -SIZE (mldonkey-3.1.4.tar.bz2) = 2847159 +SHA256 (mldonkey-3.1.5.tar.bz2) = dPnUvMcjVqoo0IEnZ+9bnaoD78XR3av1ZEfcBJaZEcs= +SIZE (mldonkey-3.1.5.tar.bz2) = 2847382 Index: stable/patches/patch-src_daemon_common_commonMessages_ml =================================================================== RCS file: stable/patches/patch-src_daemon_common_commonMessages_ml diff -N stable/patches/patch-src_daemon_common_commonMessages_ml --- stable/patches/patch-src_daemon_common_commonMessages_ml 13 Mar 2014 21:21:48 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ -$OpenBSD: patch-src_daemon_common_commonMessages_ml,v 1.1 2014/03/13 21:21:48 dcoppa Exp $ - -commit c6bf00a685b15bdf88d56d526bedbcd643c93a66 -Author: ygrek <[email protected]> -Date: Tue Mar 11 16:15:09 2014 +0800 - -Revert "gettext: reduce complexity, drop unused code" - -This reverts commit 6a094b4381dacdc9043c8348002179eb87846e16. -"Unused" code is actually used in gui - ---- src/daemon/common/commonMessages.ml.orig Sun Feb 23 19:14:52 2014 -+++ src/daemon/common/commonMessages.ml Thu Mar 13 16:37:48 2014 -@@ -1399,9 +1399,11 @@ let bad_login = _s "Bad login/password" - - let full_access = _s "Full access enabled" - --let download_started n = _s (Printf.sprintf "Download of file %d started<br>" n) -+let download_started = message "download_started" -+ (T.boption (T.int T.bformat)) "Download of file %d started<br>" - --let no_such_command s = _s (Printf.sprintf "No such command %s\n" s) -+let no_such_command = message "no_such_command" -+ (T.boption (T.string T.bformat)) "No such command %s\n" - - let bad_number_of_args cmd help = _s (Printf.sprintf "Bad number of arguments, see help for correct use:\n%s %s" cmd help) - Index: stable/patches/patch-src_daemon_driver_driverCommands_ml =================================================================== RCS file: stable/patches/patch-src_daemon_driver_driverCommands_ml diff -N stable/patches/patch-src_daemon_driver_driverCommands_ml --- stable/patches/patch-src_daemon_driver_driverCommands_ml 13 Mar 2014 21:21:48 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-src_daemon_driver_driverCommands_ml,v 1.1 2014/03/13 21:21:48 dcoppa Exp $ - -commit c6bf00a685b15bdf88d56d526bedbcd643c93a66 -Author: ygrek <[email protected]> -Date: Tue Mar 11 16:15:09 2014 +0800 - -Revert "gettext: reduce complexity, drop unused code" - -This reverts commit 6a094b4381dacdc9043c8348002179eb87846e16. -"Unused" code is actually used in gui - ---- src/daemon/driver/driverCommands.ml.orig Sun Feb 23 19:17:59 2014 -+++ src/daemon/driver/driverCommands.ml Thu Mar 13 16:37:48 2014 -@@ -87,7 +87,7 @@ let execute_command arg_list output cmd args = - let rec iter list = - match list with - [] -> -- Buffer.add_string buf (no_such_command cmd) -+ Gettext.buftext buf no_such_command cmd - | (command, _, arg_kind, help) :: tail -> - if command = cmd then begin - if !verbose_user_commands && not (user2_is_admin output.conn_user.ui_user) then Index: stable/patches/patch-src_daemon_driver_driverControlers_ml =================================================================== RCS file: stable/patches/patch-src_daemon_driver_driverControlers_ml diff -N stable/patches/patch-src_daemon_driver_driverControlers_ml --- stable/patches/patch-src_daemon_driver_driverControlers_ml 13 Mar 2014 21:21:48 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-src_daemon_driver_driverControlers_ml,v 1.1 2014/03/13 21:21:48 dcoppa Exp $ - -commit c6bf00a685b15bdf88d56d526bedbcd643c93a66 -Author: ygrek <[email protected]> -Date: Tue Mar 11 16:15:09 2014 +0800 - -Revert "gettext: reduce complexity, drop unused code" - -This reverts commit 6a094b4381dacdc9043c8348002179eb87846e16. -"Unused" code is actually used in gui - ---- src/daemon/driver/driverControlers.ml.orig Sun Feb 23 19:14:52 2014 -+++ src/daemon/driver/driverControlers.ml Thu Mar 13 16:37:48 2014 -@@ -1296,7 +1296,7 @@ let http_handler o t r = - List.iter CommonInteractive.start_download files; - - let module M = CommonMessages in -- Buffer.add_string buf (M.download_started num) -+ Gettext.buftext buf M.download_started num - with e -> - Printf.bprintf buf "Error %s with %s<br>" - (Printexc2.to_string e) value; Index: stable/patches/patch-src_utils_lib_gettext_ml4 =================================================================== RCS file: stable/patches/patch-src_utils_lib_gettext_ml4 diff -N stable/patches/patch-src_utils_lib_gettext_ml4 --- stable/patches/patch-src_utils_lib_gettext_ml4 13 Mar 2014 21:21:48 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,131 +0,0 @@ -$OpenBSD: patch-src_utils_lib_gettext_ml4,v 1.1 2014/03/13 21:21:48 dcoppa Exp $ - -commit c6bf00a685b15bdf88d56d526bedbcd643c93a66 -Author: ygrek <[email protected]> -Date: Tue Mar 11 16:15:09 2014 +0800 - -Revert "gettext: reduce complexity, drop unused code" - -This reverts commit 6a094b4381dacdc9043c8348002179eb87846e16. -"Unused" code is actually used in gui - ---- src/utils/lib/gettext.ml4.orig Sun Feb 23 19:16:11 2014 -+++ src/utils/lib/gettext.ml4 Thu Mar 13 18:01:25 2014 -@@ -29,7 +29,7 @@ let lprintf_n fmt = - lprintf2 log_prefix fmt - - type expected_types = --| Type_int -+ Type_int - | Type_char - | Type_string - | Type_float -@@ -136,6 +136,81 @@ let type_format fmt = - in - scan_format 0 - -+type 'a variable -+type 'a arrow -+ -+ -+let arrow_add_variable -+ (x : 'a variable) -+ (y : 'b arrow) = -+ let x = Obj.magic x in -+ let y = Obj.magic y in -+ (Obj.magic (x :: y) : ('a -> 'b) arrow) -+ -+ -+ -+open Options -+ -+let value_to_text (expected_type : 'a arrow) v = -+ let s = value_to_string v in -+ let expected_type = Obj.magic expected_type in -+ let format_type = type_format s in -+ if format_type = expected_type then -+ (Obj.magic s : ('a, unit, string) format) else -+ failwith "Bad format" -+ -+let text_to_value v = -+ let v = Obj.magic v in -+ string_to_value v -+ -+let text_option (expected_type : 'a arrow) -+ = -+ define_option_class "Text" -+ (value_to_text expected_type) -+ text_to_value -+ -+let gettext v = Printf.sprintf !!v -+ -+let buftext buf (v : ('a, Buffer.t, unit) format Options.option_record) = -+ Printf.bprintf buf !!v -+ -+module T = struct -+ let int x = arrow_add_variable (Obj.magic Type_int : int variable) x -+ let char x = arrow_add_variable (Obj.magic Type_char : char variable) x -+ let string x = arrow_add_variable (Obj.magic Type_string : string variable) x -+ let float x = arrow_add_variable (Obj.magic Type_float : float variable) x -+ let bool x = arrow_add_variable (Obj.magic Type_bool : bool variable) x -+ let int32 x = arrow_add_variable (Obj.magic Type_int32 : int32 variable) x -+ let int64 x = arrow_add_variable (Obj.magic Type_int64 : int64 variable) x -+ let nativeint x = arrow_add_variable (Obj.magic Type_nativeint : nativeint variable) x -+ let format = (Obj.magic [] : string arrow) -+ let bformat = (Obj.magic [] : unit arrow) -+ let option = text_option -+ let boption x = (Obj.magic text_option) x -+ end -+ -+ -+(********* Some tests ************) -+ -+(* -+let option_file = create_options_file "test.ini" -+ -+let nshared = define_option option_file -+ ["nshared"] "Text for Nshared option" -+ (text_option -+ (T.int (T.int32 T.format))) -+ "Shared: %d/%ld" -+ -+let _ = -+ try -+ load option_file -+ with Sys_error _ -> -+ save_with_help option_file -+ -+let _ = -+ lprint_string (Printf.sprintf !! nshared 23 (Int32.one)); -+ *) -+ - type 'a _string = { - name : string; - index : int; -@@ -208,7 +283,15 @@ let translate modname s t = - save_strings_file := true; - !translation.(m.index) <- t - end -+(* -+ let x = -+ let y = (Obj.magic x : string) in -+ Obj.magic (register y : string message) - -+ let s_ x = register x -+*) -+ -+ - let verify index translated = - let index_type = type_format !default.(index) in - let translated_type = type_format translated in -@@ -222,8 +305,8 @@ let verify index translated = - false - end - --let ss_ : string -> string -> string _string = register --let _ss : string _string -> string = fun m -> -+let ss_ modname (x : string) = register modname x -+let _ss m = - let index = m.index in - !requests.(index) <- !requests.(index) + 1; - let translation = !translation.(index) in Index: stable/patches/patch-src_utils_lib_gettext_mli =================================================================== RCS file: stable/patches/patch-src_utils_lib_gettext_mli diff -N stable/patches/patch-src_utils_lib_gettext_mli --- stable/patches/patch-src_utils_lib_gettext_mli 13 Mar 2014 21:21:48 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,66 +0,0 @@ -$OpenBSD: patch-src_utils_lib_gettext_mli,v 1.1 2014/03/13 21:21:48 dcoppa Exp $ - -commit c6bf00a685b15bdf88d56d526bedbcd643c93a66 -Author: ygrek <[email protected]> -Date: Tue Mar 11 16:15:09 2014 +0800 - -Revert "gettext: reduce complexity, drop unused code" - -This reverts commit 6a094b4381dacdc9043c8348002179eb87846e16. -"Unused" code is actually used in gui - ---- src/utils/lib/gettext.mli.orig Sun Feb 23 19:16:11 2014 -+++ src/utils/lib/gettext.mli Thu Mar 13 17:43:36 2014 -@@ -17,7 +17,52 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - *) - -+open Autoconf -+ -+type 'a variable -+type 'a arrow -+ -+val text_option : 'a arrow -> -+ ('a, unit, string) format Options.option_class -+ -+(* -+let nshared = -+ (arrow_variable int_variable int32_variable) -+ "Shared: %d/%ld" -+ *) -+ -+val save_strings : unit -> unit - val set_strings_file : string -> unit - - val _b : string -> ('a, 'b, 'c, 'd) format4 -> ('a, 'b, 'c, 'd) format4 - val _s : string -> string -> string -+ -+type 'a _string -+ -+val bb_ : string -> ('a, 'b, 'c) format -> ('a, 'b, 'c) format _string -+val _bb : ('a, 'b, 'c) format _string -> ('a, 'b, 'c) format -+ -+val ss_ : string -> string -> string _string -+val _ss : string _string -> string -+ -+ -+module T : -+ sig -+ val int : 'b arrow -> (int -> 'b) arrow -+ val char : 'b arrow -> (char -> 'b) arrow -+ val string : 'b arrow -> (string -> 'b) arrow -+ val float : 'b arrow -> (float -> 'b) arrow -+ val bool : 'b arrow -> (bool -> 'b) arrow -+ val int32 : 'b arrow -> (int32 -> 'b) arrow -+ val int64 : 'b arrow -> (int64 -> 'b) arrow -+ val nativeint : 'b arrow -> (nativeint -> 'b) arrow -+ val format : string arrow -+ val bformat : unit arrow -+ val option : 'a arrow -> -+ ('a, unit, string) format Options.option_class -+ val boption : 'a arrow -> -+ ('a, Buffer.t, unit) format Options.option_class -+ end -+ -+val gettext : ('a, unit, string) format Options.option_record -> 'a -+val buftext : Buffer.t -> ('a, Buffer.t, unit) format Options.option_record -> 'a Index: stable/patches/patch-src_utils_net_terminal_ml =================================================================== RCS file: stable/patches/patch-src_utils_net_terminal_ml diff -N stable/patches/patch-src_utils_net_terminal_ml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ stable/patches/patch-src_utils_net_terminal_ml 27 Aug 2014 09:03:16 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ + +Fix string literal in comment for OCaml 4.02 + +--- src/utils/net/terminal.ml.orig Wed Aug 20 14:20:03 2014 ++++ src/utils/net/terminal.ml Wed Aug 20 14:19:22 2014 +@@ -185,7 +185,7 @@ module Output = struct + let canal = List.assoc chan !chanmap in + etat.chan <- Some (chan, canal); + info (sprintf "connecte au canal '%s'" chan); +- (* {| canal ALL } *) ++ (* { | canal ALL } *) + with Not_found -> (* pas encore de recepteur pour ce canal *) + try (* on en cree un *) + let serveur = nsrecord.get_loc chan in -- http://gmerlin.de OpenPGP: http://gmerlin.de/christopher.pub F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE
signature.asc
Description: PGP signature
