From 30bca97b1dbba133a575091522e019441b91c916 Mon Sep 17 00:00:00 2001 From: jaapb Date: Thu, 21 Mar 2019 11:05:02 +0000 Subject: 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. --- net/unison/Makefile | 6 +++--- net/unison/distinfo | 17 +++++++++-------- net/unison/patches/patch-src_Makefile.OCaml | 11 +---------- net/unison/patches/patch-src_files.ml | 14 ++++++++++++++ net/unison/patches/patch-src_fs.ml | 14 -------------- net/unison/patches/patch-src_recon.ml | 16 ++++++++++++++++ net/unison/patches/patch-src_system_system__generic.ml | 14 ++++++++++++++ net/unison/patches/patch-src_system_system_intf.ml | 14 -------------- 8 files changed, 57 insertions(+), 49 deletions(-) create mode 100644 net/unison/patches/patch-src_files.ml delete mode 100644 net/unison/patches/patch-src_fs.ml create mode 100644 net/unison/patches/patch-src_recon.ml create mode 100644 net/unison/patches/patch-src_system_system__generic.ml delete mode 100644 net/unison/patches/patch-src_system_system_intf.ml (limited to 'net') diff --git a/net/unison/Makefile b/net/unison/Makefile index b4743837a37..d377382098a 100644 --- a/net/unison/Makefile +++ b/net/unison/Makefile @@ -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/} diff --git a/net/unison/distinfo b/net/unison/distinfo index f7084d72d55..1607ce1641b 100644 --- a/net/unison/distinfo +++ b/net/unison/distinfo @@ -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 diff --git a/net/unison/patches/patch-src_Makefile.OCaml b/net/unison/patches/patch-src_Makefile.OCaml index e24c49e58d0..a551e9590cd 100644 --- a/net/unison/patches/patch-src_Makefile.OCaml +++ b/net/unison/patches/patch-src_Makefile.OCaml @@ -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 diff --git a/net/unison/patches/patch-src_files.ml b/net/unison/patches/patch-src_files.ml new file mode 100644 index 00000000000..81455a78d7f --- /dev/null +++ b/net/unison/patches/patch-src_files.ml @@ -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 diff --git a/net/unison/patches/patch-src_fs.ml b/net/unison/patches/patch-src_fs.ml deleted file mode 100644 index 81ca1488538..00000000000 --- a/net/unison/patches/patch-src_fs.ml +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-src_fs.ml,v 1.1 2017/11/14 13:03:35 jaapb Exp $ - -System symlink definition has changed ---- src/fs.ml.orig 2015-10-05 18:14:23.000000000 +0000 -+++ src/fs.ml -@@ -21,7 +21,7 @@ type fspath = Fspath.t - type dir_handle = System.dir_handle - = { readdir : unit -> string; closedir : unit -> unit } - --let symlink l f = System.symlink l (Fspath.toString f) -+let symlink ?to_dir l f = System.symlink l (Fspath.toString f) - - let readlink f = System.readlink (Fspath.toString f) - diff --git a/net/unison/patches/patch-src_recon.ml b/net/unison/patches/patch-src_recon.ml new file mode 100644 index 00000000000..172346eaae8 --- /dev/null +++ b/net/unison/patches/patch-src_recon.ml @@ -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 = diff --git a/net/unison/patches/patch-src_system_system__generic.ml b/net/unison/patches/patch-src_system_system__generic.ml new file mode 100644 index 00000000000..7eae96cf6e0 --- /dev/null +++ b/net/unison/patches/patch-src_system_system__generic.ml @@ -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 diff --git a/net/unison/patches/patch-src_system_system_intf.ml b/net/unison/patches/patch-src_system_system_intf.ml deleted file mode 100644 index e1172590bc5..00000000000 --- a/net/unison/patches/patch-src_system_system_intf.ml +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-src_system_system_intf.ml,v 1.1 2017/11/14 13:03:35 jaapb Exp $ - -System symlink definition has changed ---- src/system/system_intf.ml.orig 2015-10-05 18:14:23.000000000 +0000 -+++ src/system/system_intf.ml -@@ -20,7 +20,7 @@ module type Core = sig - type fspath - type dir_handle = { readdir : unit -> string; closedir : unit -> unit } - --val symlink : string -> fspath -> unit -+val symlink : ?to_dir:bool -> string -> fspath -> unit - val readlink : fspath -> string - val chown : fspath -> int -> int -> unit - val chmod : fspath -> int -> unit -- cgit v1.2.3