Thu Mar 21 10:02:58 2019 UTC ()
Added patches to net/unison2.51 for compilation with ocaml 4.08


(jaapb)
diff -r1.9 -r1.10 pkgsrc/net/unison2.51/Makefile
diff -r1.4 -r1.5 pkgsrc/net/unison2.51/distinfo
diff -r0 -r1.1 pkgsrc/net/unison2.51/patches/patch-src_files.ml
diff -r0 -r1.1 pkgsrc/net/unison2.51/patches/patch-src_recon.ml
diff -r0 -r1.3 pkgsrc/net/unison2.51/patches/patch-src_system_system__generic.ml
cvs diff -r1.9 -r1.10 pkgsrc/net/unison2.51/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/unison2.51/Attic/Makefile 2018/12/09 18:52:42 1.9
+++ pkgsrc/net/unison2.51/Attic/Makefile 2019/03/21 10:02:58 1.10
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.9 2018/12/09 18:52:42 adam Exp $ 1# $NetBSD: Makefile,v 1.10 2019/03/21 10:02:58 jaapb Exp $
2 2
3DISTNAME= unison-2.51.2 3DISTNAME= unison-2.51.2
4PKGREVISION= 8 4PKGREVISION= 9
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_GITHUB:=bcpierce00/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=bcpierce00/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= tonio@NetBSD.org 9MAINTAINER= tonio@NetBSD.org
10HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/ 10HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/
11COMMENT= File-synchronization tool 11COMMENT= File-synchronization tool
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14# File "/data/scratch/net/unison/work/src/fswatch.mli", line 18, characters 17-29: 14# File "/data/scratch/net/unison/work/src/fswatch.mli", line 18, characters 17-29:
15# Error: Unbound module Prefs 15# Error: Unbound module Prefs
16#MAKE_JOBS_SAFE= no 16#MAKE_JOBS_SAFE= no
17 17
cvs diff -r1.4 -r1.5 pkgsrc/net/unison2.51/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/unison2.51/Attic/distinfo 2018/04/30 12:22:31 1.4
+++ pkgsrc/net/unison2.51/Attic/distinfo 2019/03/21 10:02:58 1.5
@@ -1,8 +1,11 @@ @@ -1,8 +1,11 @@
1$NetBSD: distinfo,v 1.4 2018/04/30 12:22:31 wiz Exp $ 1$NetBSD: distinfo,v 1.5 2019/03/21 10:02:58 jaapb Exp $
2 2
3SHA1 (unison-2.51.2.tar.gz) = 63e3b526254ab6356a3fabf74be533982c2962c2 3SHA1 (unison-2.51.2.tar.gz) = 63e3b526254ab6356a3fabf74be533982c2962c2
4RMD160 (unison-2.51.2.tar.gz) = d73c88be2a5c3c677939f4adede4c0f772ecff33 4RMD160 (unison-2.51.2.tar.gz) = d73c88be2a5c3c677939f4adede4c0f772ecff33
5SHA512 (unison-2.51.2.tar.gz) = 4ec4a1603ce5e561084dcd59621a0cc72c1ea40e3e23e36408c436c51bde3eb82774f671aba85c016f87982417800e8a27b978be59c92aa62ce9e4be1a072011 5SHA512 (unison-2.51.2.tar.gz) = 4ec4a1603ce5e561084dcd59621a0cc72c1ea40e3e23e36408c436c51bde3eb82774f671aba85c016f87982417800e8a27b978be59c92aa62ce9e4be1a072011
6Size (unison-2.51.2.tar.gz) = 1398790 bytes 6Size (unison-2.51.2.tar.gz) = 1398790 bytes
7SHA1 (patch-src_Makefile) = 3172ed284bea2d21ccb475439c53ce65a45b79f6 7SHA1 (patch-src_Makefile) = 3172ed284bea2d21ccb475439c53ce65a45b79f6
 8SHA1 (patch-src_files.ml) = 3a15b35f6a5e5242e4c3e198dabc38ca89bbdbe0
 9SHA1 (patch-src_recon.ml) = 8aa1b2a4109fe183eedf209a91efc3f2164a3b3a
 10SHA1 (patch-src_system_system__generic.ml) = e3c9ac74b266331d7c253b9e8ce4e0046699c6bd
8SHA1 (patch-src_uigtk2.ml) = 87a9c1e678f4056c0a32bfb3c3b7320652a171a2 11SHA1 (patch-src_uigtk2.ml) = 87a9c1e678f4056c0a32bfb3c3b7320652a171a2
File Added: pkgsrc/net/unison2.51/patches/Attic/patch-src_files.ml
$NetBSD: patch-src_files.ml,v 1.1 2019/03/21 10:02:58 jaapb Exp $

Replace deprecated sort function
--- src/files.ml.orig	2018-01-27 21:12:13.000000000 +0000
+++ src/files.ml
@@ -734,7 +734,7 @@ let get_files_in_directory dir =
   with End_of_file ->
     dirh.System.closedir ()
   end;
-  Sort.list (<) !files
+  List.sort String.compare !files
 
 let ls dir pattern =
   Util.convertUnixErrorsToTransient
File Added: pkgsrc/net/unison2.51/patches/Attic/patch-src_recon.ml
$NetBSD: patch-src_recon.ml,v 1.1 2019/03/21 10:02:58 jaapb Exp $

Replace deprecated sort function
--- src/recon.ml.orig	2018-01-27 21:12:13.000000000 +0000
+++ src/recon.ml
@@ -661,8 +661,8 @@ let rec reconcile
 
 (* Sorts the paths so that they will be displayed in order                   *)
 let sortPaths pathUpdatesList =
-  Sort.list
-    (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
+  List.sort
+    Path.compare
     pathUpdatesList
 
 let rec enterPath p1 p2 t =
File Added: pkgsrc/net/unison2.51/patches/Attic/patch-src_system_system__generic.ml
$NetBSD: patch-src_system_system__generic.ml,v 1.3 2019/03/21 10:02:58 jaapb Exp $

Needed for compatibility with OCaml 4.08
--- src/system/system_generic.ml.orig	2018-01-27 21:12:13.000000000 +0000
+++ src/system/system_generic.ml
@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
 let chmod = Unix.chmod
 let chown = Unix.chown
 let utimes = Unix.utimes
-let link = Unix.link
+let link s d = Unix.link s d
 let openfile = Unix.openfile
 let opendir f =
   let h = Unix.opendir f in