Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_155316257814550"
MIME-Version: 1.0
Date: Thu, 21 Mar 2019 10:02:58 +0000
From: "Jaap Boender" <jaapb@netbsd.org>
Subject: CVS commit: pkgsrc/net/unison2.51
To: pkgsrc-changes@NetBSD.org
Reply-To: jaapb@netbsd.org
Message-Id: <20190321100258.E608EFB16@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_155316257814550
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jaapb
Date:		Thu Mar 21 10:02:58 UTC 2019

Modified Files:
	pkgsrc/net/unison2.51: Makefile distinfo
Added Files:
	pkgsrc/net/unison2.51/patches: patch-src_files.ml patch-src_recon.ml
	    patch-src_system_system__generic.ml

Log Message:
Added patches to net/unison2.51 for compilation with ocaml 4.08


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/unison2.51/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/unison2.51/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/unison2.51/patches/patch-src_files.ml \
    pkgsrc/net/unison2.51/patches/patch-src_recon.ml
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/net/unison2.51/patches/patch-src_system_system__generic.ml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_155316257814550
Content-Disposition: inline
Content-Length: 3911
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/unison2.51/Makefile
diff -u pkgsrc/net/unison2.51/Makefile:1.9 pkgsrc/net/unison2.51/Makefile:1.10
--- pkgsrc/net/unison2.51/Makefile:1.9	Sun Dec  9 18:52:42 2018
+++ pkgsrc/net/unison2.51/Makefile	Thu Mar 21 10:02:58 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2018/12/09 18:52:42 adam Exp $
+# $NetBSD: Makefile,v 1.10 2019/03/21 10:02:58 jaapb Exp $
 
 DISTNAME=	unison-2.51.2
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=bcpierce00/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}

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

Added files:

Index: pkgsrc/net/unison2.51/patches/patch-src_files.ml
diff -u /dev/null pkgsrc/net/unison2.51/patches/patch-src_files.ml:1.1
--- /dev/null	Thu Mar 21 10:02:58 2019
+++ pkgsrc/net/unison2.51/patches/patch-src_files.ml	Thu Mar 21 10:02:58 2019
@@ -0,0 +1,14 @@
+$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
Index: pkgsrc/net/unison2.51/patches/patch-src_recon.ml
diff -u /dev/null pkgsrc/net/unison2.51/patches/patch-src_recon.ml:1.1
--- /dev/null	Thu Mar 21 10:02:58 2019
+++ pkgsrc/net/unison2.51/patches/patch-src_recon.ml	Thu Mar 21 10:02:58 2019
@@ -0,0 +1,16 @@
+$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 =

Index: pkgsrc/net/unison2.51/patches/patch-src_system_system__generic.ml
diff -u /dev/null pkgsrc/net/unison2.51/patches/patch-src_system_system__generic.ml:1.3
--- /dev/null	Thu Mar 21 10:02:58 2019
+++ pkgsrc/net/unison2.51/patches/patch-src_system_system__generic.ml	Thu Mar 21 10:02:58 2019
@@ -0,0 +1,14 @@
+$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


--_----------=_155316257814550--