diff options
| author | wiz <wiz@pkgsrc.org> | 2014-10-22 09:43:01 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-10-22 09:43:01 +0000 |
| commit | 69d7dd5253e036f92f9a7ffbc36775dfd67ae5e9 (patch) | |
| tree | e60465d28194b9f4081034d788cd467df037358a /net/unison | |
| parent | a512096db39bdae3b315025ec94ab0c0bc84c027 (diff) | |
| download | pkgsrc-69d7dd5253e036f92f9a7ffbc36775dfd67ae5e9.tar.gz | |
Fix unison with ocaml-4.02.x. Based on
http://caml.inria.fr/mantis/view.php?id=6621
Bump PKGREVISION.
Diffstat (limited to 'net/unison')
| -rw-r--r-- | net/unison/Makefile | 4 | ||||
| -rw-r--r-- | net/unison/distinfo | 3 | ||||
| -rw-r--r-- | net/unison/patches/patch-ubase_util.ml | 16 |
3 files changed, 20 insertions, 3 deletions
diff --git a/net/unison/Makefile b/net/unison/Makefile index 8f910f74c2a..4f29757b4d3 100644 --- a/net/unison/Makefile +++ b/net/unison/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.87 2014/10/10 08:39:08 jaapb Exp $ +# $NetBSD: Makefile,v 1.88 2014/10/22 09:43:01 wiz Exp $ DISTNAME= unison-2.40.102 -PKGREVISION= 21 +PKGREVISION= 22 CATEGORIES= net MASTER_SITES= http://www.seas.upenn.edu/~bcpierce/unison/download/releases/stable/ diff --git a/net/unison/distinfo b/net/unison/distinfo index 8240b8b6d9f..c434bbed9f2 100644 --- a/net/unison/distinfo +++ b/net/unison/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.21 2012/12/09 15:02:50 wiz Exp $ +$NetBSD: distinfo,v 1.22 2014/10/22 09:43:01 wiz Exp $ SHA1 (unison-2.40.102.tar.gz) = bf18f64fa30bd04234e864d42190294e0d9a2910 RMD160 (unison-2.40.102.tar.gz) = 0231fd41895bde97ad4ae15bdc4994f9c9e27ad6 Size (unison-2.40.102.tar.gz) = 2694761 bytes SHA1 (patch-Makefile.OCaml) = 2872f07e323f23375b0b7ea5ec17fe387fe22a0f SHA1 (patch-aa) = dd1a001fb7071cd9141615b42a692e6d1d812081 +SHA1 (patch-ubase_util.ml) = d8ee8ea1cc1a5d0e8794623c24621f1a2d57d189 diff --git a/net/unison/patches/patch-ubase_util.ml b/net/unison/patches/patch-ubase_util.ml new file mode 100644 index 00000000000..1570102745f --- /dev/null +++ b/net/unison/patches/patch-ubase_util.ml @@ -0,0 +1,16 @@ +$NetBSD: patch-ubase_util.ml,v 1.1 2014/10/22 09:43:01 wiz Exp $ + +Fix incompatibility with ocaml-4.02.x, based on +http://caml.inria.fr/mantis/view.php?id=6621 + +--- ubase/util.ml.orig 2010-04-15 17:29:31.000000000 +0000 ++++ ubase/util.ml +@@ -62,7 +62,7 @@ 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 c -> flush c; show_infos ()) stderr f + + let msg : ('a, out_channel, unit) format -> 'a = msg + |