diff --git a/net/unison/Makefile b/net/unison/Makefile index ed8a8e5bfd3..9c6b8758cb1 100644 --- a/net/unison/Makefile +++ b/net/unison/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.8 2014/10/16 16:07:51 chrisz Exp $ +# $OpenBSD: Makefile,v 1.9 2015/01/09 10:10:43 giovanni Exp $ COMMENT= multi-platform file synchronization tool CATEGORIES= net -V= 2.40.102 -REVISION = 5 +V= 2.48.3 DISTNAME= unison-${V} MASTER_SITES= ${HOMEPAGE}download/releases/stable/ diff --git a/net/unison/distinfo b/net/unison/distinfo index 688f9bb84fe..e14cab80b78 100644 --- a/net/unison/distinfo +++ b/net/unison/distinfo @@ -1,2 +1,2 @@ -SHA256 (unison-2.40.102.tar.gz) = PUqS8CtpmPFWy3FNIC0DWN0oRu+9zp3jDixmbXfB6FQ= -SIZE (unison-2.40.102.tar.gz) = 2694761 +SHA256 (unison-2.48.3.tar.gz) = ppX51F6V09nD8l/L8YkfXrIOWqUXCfgbeFog4UJwt+4= +SIZE (unison-2.48.3.tar.gz) = 1172532 diff --git a/net/unison/patches/patch-ubase_util_ml b/net/unison/patches/patch-ubase_util_ml deleted file mode 100644 index 09c4cc845a9..00000000000 --- a/net/unison/patches/patch-ubase_util_ml +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-ubase_util_ml,v 1.1 2014/10/17 06:22:08 chrisz Exp $ - -The Uprintf module is broken since OCaml 4.02. -The OCaml stdlib provides a similar function since 3.09. -Use this function instead. - ---- ubase/util.ml.orig Fri Sep 19 12:38:42 2014 -+++ ubase/util.ml Fri Sep 19 12:39:27 2014 -@@ -62,7 +62,8 @@ let set_infos s = - if s <> !infos then begin clear_infos (); infos := s; show_infos () end - - let msg f = -- clear_infos (); Uprintf.eprintf (fun () -> flush stderr; show_infos ()) f -+ clear_infos (); -+ Printf.kfprintf (fun _ -> flush stderr; show_infos ()) stderr f - - let msg : ('a, out_channel, unit) format -> 'a = msg - diff --git a/net/unison/patches/patch-uicommon_ml b/net/unison/patches/patch-uicommon_ml deleted file mode 100644 index b6224b10f63..00000000000 --- a/net/unison/patches/patch-uicommon_ml +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-uicommon_ml,v 1.1 2014/10/17 06:22:08 chrisz Exp $ - -Don't discard backtraces for uncaught exceptions. - ---- uicommon.ml.orig Tue Sep 23 11:23:39 2014 -+++ uicommon.ml Tue Sep 23 11:37:20 2014 -@@ -309,7 +309,8 @@ let reconItem2string oldPath theRI status = - let (r1, action, r2, path) = reconItem2stringList oldPath theRI in - Format.sprintf "%s %s %s %s %s" r1 (action2niceString action) r2 status path - --let exn2string = function -+let exn2string exn = -+ let s = match exn with - Sys.Break -> "Terminated!" - | Util.Fatal(s) -> Printf.sprintf "Fatal error: %s" s - | Util.Transient(s) -> Printf.sprintf "Error: %s" s -@@ -323,6 +324,9 @@ let exn2string = function - | _ -> "") - | Invalid_argument s -> Printf.sprintf "Invalid argument: %s" s - | other -> Printf.sprintf "Uncaught exception %s" (Printexc.to_string other) -+ in -+ s ^ -+ if Printexc.backtrace_status () then "\n" ^ Printexc.get_backtrace () else "" - - (* precondition: uc = File (Updates(_, ..) on both sides *) - let showDiffs ri printer errprinter id =