CVS commit: pkgsrc/net/unison

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Thu Mar 21 11:05:02 UTC 2019

Modified Files:
        pkgsrc/net/unison: Makefile distinfo
        pkgsrc/net/unison/patches: patch-src_Makefile.OCaml
Added Files:
        pkgsrc/net/unison/patches: patch-src_files.ml patch-src_recon.ml
            patch-src_system_system__generic.ml
Removed Files:
        pkgsrc/net/unison/patches: patch-src_fs.ml
            patch-src_system_system_intf.ml

Log Message:
Updated net/unison2.48 to version 2.48.15v4.

No large upstream changes, it seems, just a maintenance release to keep
compatibility with newer OCaml versions.


To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 pkgsrc/net/unison/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/unison/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/unison/patches/patch-src_Makefile.OCaml
cvs rdiff -u -r0 -r1.1 pkgsrc/net/unison/patches/patch-src_files.ml \
    pkgsrc/net/unison/patches/patch-src_recon.ml \
    pkgsrc/net/unison/patches/patch-src_system_system__generic.ml
cvs rdiff -u -r1.1 -r0 pkgsrc/net/unison/patches/patch-src_fs.ml \
    pkgsrc/net/unison/patches/patch-src_system_system_intf.ml

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

Modified files:

Index: pkgsrc/net/unison/Makefile
diff -u pkgsrc/net/unison/Makefile:1.129 pkgsrc/net/unison/Makefile:1.130
--- pkgsrc/net/unison/Makefile:1.129    Sun Dec  9 18:52:42 2018
+++ pkgsrc/net/unison/Makefile  Thu Mar 21 11:05:02 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.129 2018/12/09 18:52:42 adam Exp $
+# $NetBSD: Makefile,v 1.130 2019/03/21 11:05:02 jaapb Exp $
 
-DISTNAME=      unison-2.48.15
-PKGREVISION=   17
+GITHUB_TAG=    v${PKGVERSION_NOREV}
+DISTNAME=      unison-2.48.15v4
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=bcpierce00/}
 

Index: pkgsrc/net/unison/distinfo
diff -u pkgsrc/net/unison/distinfo:1.29 pkgsrc/net/unison/distinfo:1.30
--- pkgsrc/net/unison/distinfo:1.29     Mon Jan 22 10:35:44 2018
+++ pkgsrc/net/unison/distinfo  Thu Mar 21 11:05:02 2019
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.29 2018/01/22 10:35:44 wiz Exp $
+$NetBSD: distinfo,v 1.30 2019/03/21 11:05:02 jaapb Exp $
 
-SHA1 (unison-2.48.15.tar.gz) = 7a22715321fdd4808d12f9122df9314a45283a18
-RMD160 (unison-2.48.15.tar.gz) = aa98f4fb12e4363c8a51e1969fa829cab7e96869
-SHA512 (unison-2.48.15.tar.gz) = 2614b7291f9d9eb1cb5380560e4883849c6bba449d31e5bc704395291978d41e43208cfff701708a5ae9c9a6a220a8ceb06496fd1e2ab1915bf2f5c36349739f
-Size (unison-2.48.15.tar.gz) = 1912444 bytes
+SHA1 (unison-2.48.15v4.tar.gz) = 249cc0068ab62478c813189b2ac1426a3ff5edae
+RMD160 (unison-2.48.15v4.tar.gz) = 6480dfb05d6cefe20ebffa64eb6bd50c3aa7aa97
+SHA512 (unison-2.48.15v4.tar.gz) = 658b37fd18d8dee517e88ad707f7e80c1731542a0e07e6a8d56e6598e38bcf405cdb8db224274bf9b3319ed87efc45057d1f79e6437c4ca53afe9cec4afe6c78
+Size (unison-2.48.15v4.tar.gz) = 1911781 bytes
 SHA1 (patch-src_Makefile) = 19cf0b79995c7848bc02d220267be4f3a3e4b59b
-SHA1 (patch-src_Makefile.OCaml) = 04681c195b2e7e11f3068960236f3ccd216fa816
-SHA1 (patch-src_fs.ml) = 1d02f83d245466c0aad45a3261bba8149ed3db56
+SHA1 (patch-src_Makefile.OCaml) = deba98414926fc73b229a071a6f061b7bdb8a458
+SHA1 (patch-src_files.ml) = 3a15b35f6a5e5242e4c3e198dabc38ca89bbdbe0
 SHA1 (patch-src_mkProjectInfo.ml) = a1908748dbe4c1db0e2b012e73fe46c6bca30348
-SHA1 (patch-src_system_system_intf.ml) = 89b8598b364bee489b356f9cb3cb297d981b526e
+SHA1 (patch-src_recon.ml) = 8aa1b2a4109fe183eedf209a91efc3f2164a3b3a
+SHA1 (patch-src_system_system__generic.ml) = e9c8d638739d35e046efe5f28df6fa8cb4c46a48
 SHA1 (patch-src_uigtk2.ml) = a9ef837e0289ba2d209a21df3102ed0267a52f9d

Index: pkgsrc/net/unison/patches/patch-src_Makefile.OCaml
diff -u pkgsrc/net/unison/patches/patch-src_Makefile.OCaml:1.2 pkgsrc/net/unison/patches/patch-src_Makefile.OCaml:1.3
--- pkgsrc/net/unison/patches/patch-src_Makefile.OCaml:1.2      Mon Jan 22 10:35:45 2018
+++ pkgsrc/net/unison/patches/patch-src_Makefile.OCaml  Thu Mar 21 11:05:02 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Makefile.OCaml,v 1.2 2018/01/22 10:35:45 wiz Exp $
+$NetBSD: patch-src_Makefile.OCaml,v 1.3 2019/03/21 11:05:02 jaapb Exp $
 
 Correct lablgtk paths for 2.16, and use ocamlopt.opt for compilation
 Add -unsafe-string for OCaml >= 4.06.
@@ -16,15 +16,6 @@ Add -unsafe-string for OCaml >= 4.06.
  ##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well 
  ## at the moment and we don't want to confuse people by building it by default
  ifeq ($(OSARCH),osx)
-@@ -95,7 +95,7 @@ buildexecutable::
- ### Default parameters
- 
- # Generate backtrace information for exceptions
--CAMLFLAGS+=-g
-+CAMLFLAGS+=-g -unsafe-string
- 
- INCLFLAGS=-I lwt -I ubase -I system
- CAMLFLAGS+=$(INCLFLAGS)
 @@ -292,14 +292,14 @@ endif
  
  # Gtk GUI

Added files:

Index: pkgsrc/net/unison/patches/patch-src_files.ml
diff -u /dev/null pkgsrc/net/unison/patches/patch-src_files.ml:1.1
--- /dev/null   Thu Mar 21 11:05:02 2019
+++ pkgsrc/net/unison/patches/patch-src_files.ml        Thu Mar 21 11:05:02 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_files.ml,v 1.1 2019/03/21 11:05:02 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/unison/patches/patch-src_recon.ml
diff -u /dev/null pkgsrc/net/unison/patches/patch-src_recon.ml:1.1
--- /dev/null   Thu Mar 21 11:05:02 2019
+++ pkgsrc/net/unison/patches/patch-src_recon.ml        Thu Mar 21 11:05:02 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_recon.ml,v 1.1 2019/03/21 11:05:02 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/unison/patches/patch-src_system_system__generic.ml
diff -u /dev/null pkgsrc/net/unison/patches/patch-src_system_system__generic.ml:1.1
--- /dev/null   Thu Mar 21 11:05:02 2019
+++ pkgsrc/net/unison/patches/patch-src_system_system__generic.ml       Thu Mar 21 11:05:02 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_system_system__generic.ml,v 1.1 2019/03/21 11:05:02 jaapb Exp $
+
+Needed for compatibility with OCaml 4.08
+--- src/system/system_generic.ml.orig  2017-12-18 12:23:54.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