commit 3ac5f0b901ea176a8d9f834c29f4e8fc90b48fa3 Author: Juergen Daubert <jue@jue.li> Date: Fri Oct 24 11:05:03 2014 +0200 unison: fix build with ocaml 4.02 https://groups.yahoo.com/neo/groups/unison-users/conversations/topics/11283 diff --git a/unison/.md5sum b/unison/.md5sum index 54b0fc2..6989e7f 100644 --- a/unison/.md5sum +++ b/unison/.md5sum @@ -1 +1,2 @@ +6dede0c859811c1e5ce45216a3a23398 ubase_util.patch 42caf869f40440ed0e75eef07a605b2e unison-2.40.102.tar.gz diff --git a/unison/Pkgfile b/unison/Pkgfile index b7f84f5..dd038c4 100644 --- a/unison/Pkgfile +++ b/unison/Pkgfile @@ -6,11 +6,13 @@ name=unison version=2.40.102 -release=1 -source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$name-$version/$...) +release=2 +source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$name-$version/$... + ubase_util.patch) build() { cd $name-$version + patch -p0 -i $SRC/ubase_util.patch unset CFLAGS CXXFLAGS make -j1 UISTYLE=text THREADS=true unison install -D -m 755 unison $PKG/usr/bin/unison diff --git a/unison/ubase_util.patch b/unison/ubase_util.patch new file mode 100644 index 0000000..1570102 --- /dev/null +++ b/unison/ubase_util.patch @@ -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 +