commit f4e1380f7a3ad40a1339d2ab7443a0bdc3e4164f Author: Juergen Daubert <jue@jue.li> Date: Wed Dec 31 13:14:18 2014 +0100 unison: update to 2.48.3 diff --git a/unison/.footprint b/unison/.footprint index bd2ebc0..aea880a 100644 --- a/unison/.footprint +++ b/unison/.footprint @@ -1,3 +1,4 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/unison +-rwxr-xr-x root/root usr/bin/unison-fsmonitor diff --git a/unison/.md5sum b/unison/.md5sum index 6989e7f..4aebdc6 100644 --- a/unison/.md5sum +++ b/unison/.md5sum @@ -1,2 +1 @@ -6dede0c859811c1e5ce45216a3a23398 ubase_util.patch -42caf869f40440ed0e75eef07a605b2e unison-2.40.102.tar.gz +321f352d711c7cc7bc2c73842a54dd00 unison-2.48.3.tar.gz diff --git a/unison/Pkgfile b/unison/Pkgfile index dd038c4..1c7f0c8 100644 --- a/unison/Pkgfile +++ b/unison/Pkgfile @@ -5,15 +5,14 @@ # Depends on: ocaml name=unison -version=2.40.102 -release=2 -source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$name-$version/$... - ubase_util.patch) +version=2.48.3 +release=1 +source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$name-$version/$...) 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 + make -j1 UISTYLE=text THREADS=true NATIVE=true unison unison-fsmonitor + install -d $PKG/usr/bin + install -m 755 unison unison-fsmonitor $PKG/usr/bin/ } diff --git a/unison/ubase_util.patch b/unison/ubase_util.patch deleted file mode 100644 index 1570102..0000000 --- a/unison/ubase_util.patch +++ /dev/null @@ -1,16 +0,0 @@ -$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 -