net/unison: Update to 2.51.3

Upstream NEWS content

## 2.51.3
  * ocaml support is now from 4.05 to 4.11
  * reduction of stack usage by proper tail recursion
  * MS Windows build improvements
  * Some nontrivial changes to profile parsing (G.raud Meyer)
    ’=’ has been considered whitespace until now: several
    following chars are considered as only one; trailing chars are
    discarded; any non emty sequence of char is splitting. This is
    non standard and leads to confusion, for example -ignore==
    ’Name .*=*’ is valid when -ignore=’Name .*=*’ is not, and
    worse -ignore=’Name *=’ is the same as -ignore=’Name *’. The
    parser now takes just a single ’=’ as delimiter after the
    option name. Other = characters are considered as part of the
    value being assigned to the option.
  * Numerous improvements to the text user-interface (G.raud Meyer)
    New key-commands that restrict the display to a set of
    "matching" items: ones that are offering to propagate changes
    in a particular direction, conflicts, files to be merged,
    etc., plus several more useful key-commands. Type "?" to
    Unison to see all available commands.

7 files changed, 20 insertions, 92 deletions

diff --git a/net/unison2.51/Makefile b/net/unison2.51/Makefile
index c5ff807d1a4..297b4aa5879 100644
--- a/net/unison2.51/Makefile
+++ b/net/unison2.51/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.28 2020/09/19 15:51:23 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2020/10/29 23:14:15 gdt Exp $
 
 # Currently, 2.51.x is the standard approach, and thus this package
 # produces a "unison-2.51.x" package which installs a "unison" binary.
 # When the next unison branch is released, we will likely again have
 # multiple unison packages, with whichever is the standard approach
 # using the unversioned name.
-DISTNAME=	unison-2.51.2
-PKGREVISION=	22
+DISTNAME=	unison-2.51.3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=bcpierce00/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -16,14 +15,12 @@ HOMEPAGE=	https://www.cis.upenn.edu/~bcpierce/unison/
 COMMENT=	File-synchronization tool
 LICENSE=	gnu-gpl-v3
 
-# File "/data/scratch/net/unison/work/src/fswatch.mli", line 18, characters 17-29:
-# Error: Unbound module Prefs
-#MAKE_JOBS_SAFE=	no
-
+# \todo Explain
 # docs: unison-manual.pdf/html/ps/dvi
 #WRKSRC=	${WRKDIR}/src
-USE_TOOLS+=	gmake
-MAKE_FLAGS+=	CFLAGS="" -C src
+
+USE_TOOLS+=	gmake bash
+MAKE_FLAGS+=	CFLAGS=""
 MAKE_ENV+=	HOME=${WRKDIR:Q}
 
 .include "options.mk"
@@ -43,12 +40,15 @@ MAKE_FLAGS+=	NATIVE=false
 MAKE_FLAGS+=	THREADS=true
 .endif
 
-BUILD_TARGET=	buildexecutable
+#BUILD_TARGET=	buildexecutable
+
+TEST_TARGET=		test
 
 INSTALLATION_DIRS=	bin
 INSTALLATION_DIRS+=	share/doc/unison
 
-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/unison ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/src/BUGS.txt ${DESTDIR}${PREFIX}/share/doc/unison
 	${INSTALL_MAN} ${WRKSRC}/src/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison
 	${INSTALL_MAN} ${WRKSRC}/src/COPYING ${DESTDIR}${PREFIX}/share/doc/unison
diff --git a/net/unison2.51/distinfo b/net/unison2.51/distinfo
index 32308ffde07..7617820e955 100644
--- a/net/unison2.51/distinfo
+++ b/net/unison2.51/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.5 2019/03/21 10:02:58 jaapb Exp $
+$NetBSD: distinfo,v 1.6 2020/10/29 23:14:15 gdt 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
+SHA1 (unison-2.51.3.tar.gz) = 6ef63d07da4bf8c1a2fd3ac1f58dbf609de57bea
+RMD160 (unison-2.51.3.tar.gz) = 9e3cac2b30afb9b5cda94147dafb0b475b3f3017
+SHA512 (unison-2.51.3.tar.gz) = 202bc592cf18d3ac76d7e29ec71add5d6e33a96b4b885e0e2add9a5a621db2290184f268c70e4f05e4884d6cdfed09f6fcd3dde85681c39628a10ea552917c8f
+Size (unison-2.51.3.tar.gz) = 1370060 bytes
+SHA1 (patch-src_Makefile) = ff73628825232b9494844c020b78d2978f753d07
diff --git a/net/unison2.51/patches/patch-src_Makefile b/net/unison2.51/patches/patch-src_Makefile
index a01dc0593e9..79261694cb2 100644
--- a/net/unison2.51/patches/patch-src_Makefile
+++ b/net/unison2.51/patches/patch-src_Makefile
@@ -1,7 +1,7 @@
-$NetBSD: patch-src_Makefile,v 1.1 2018/04/30 10:14:29 wiz Exp $
+$NetBSD: patch-src_Makefile,v 1.2 2020/10/29 23:14:15 gdt Exp $
 
 Correct installation procedure
---- src/Makefile.orig	2018-01-27 21:12:13.000000000 +0000
+--- src/Makefile.orig	2020-10-18 12:56:47.000000000 +0000
 +++ src/Makefile
 @@ -49,7 +49,7 @@ all:: INSTALL
  
@@ -24,18 +24,10 @@ Correct installation procedure
 @@ -86,9 +86,7 @@ doinstall: buildexecutable
  	    echo "makefile variable NAME not bound"; \
  	    exit 1 \
-           ; fi 
+ 	  ; fi
 -	-mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
  	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
 -	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
  
  ######################################################################
  # Demo
-@@ -344,7 +342,6 @@ tags:
- 	             *Makefile* \
-           ; fi 
- 
--all:: TAGS
- 
- TAGS:
- 	$(MAKE) tags
diff --git a/net/unison2.51/patches/patch-src_files.ml b/net/unison2.51/patches/patch-src_files.ml
deleted file mode 100644
index 57f469a2cf3..00000000000
--- a/net/unison2.51/patches/patch-src_files.ml
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
diff --git a/net/unison2.51/patches/patch-src_recon.ml b/net/unison2.51/patches/patch-src_recon.ml
deleted file mode 100644
index 22a473f7c3f..00000000000
--- a/net/unison2.51/patches/patch-src_recon.ml
+++ /dev/null
@@ -1,16 +0,0 @@
-$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 =
diff --git a/net/unison2.51/patches/patch-src_system_system__generic.ml b/net/unison2.51/patches/patch-src_system_system__generic.ml
deleted file mode 100644
index 6135d10884b..00000000000
--- a/net/unison2.51/patches/patch-src_system_system__generic.ml
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
diff --git a/net/unison2.51/patches/patch-src_uigtk2.ml b/net/unison2.51/patches/patch-src_uigtk2.ml
deleted file mode 100644
index 93c1e4640a0..00000000000
--- a/net/unison2.51/patches/patch-src_uigtk2.ml
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_uigtk2.ml,v 1.2 2018/04/30 10:23:49 wiz Exp $
-
-Lablgtk now has safe_string
-https://github.com/bcpierce00/unison/commit/2e7ea9481c6c3ff2ec513c39f73cfe15c0763c06
-
---- src/uigtk2.ml.orig	2015-10-05 18:14:23.000000000 +0000
-+++ src/uigtk2.ml
-@@ -94,7 +94,7 @@ let icon =
- let icon =
-   let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in
-   Gpointer.blit
--    (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
-+    (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
-   p
- 
- let leftPtrWatch =