unison-snapshot: Update along upstream

[Greg Troxel <gdt%lexort.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Wed Feb 14 08:14:20 2024 -0500
Changeset:	860562aa2279527d8ae9cfb3cad891937894b77f

Modified Files:
	unison-snapshot/Makefile
	unison-snapshot/distinfo
	unison-snapshot/options.mk

Log Message:
unison-snapshot: Update along upstream

This brings the ability for fsmonitor to work, but the package doesn't
cope with that yet.

Restore the lablgtk option because I believe upstream is fixed, but
leave it off because pkgsrc ocaml-cairo is broken.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=860562aa2279527d8ae9cfb3cad891937894b77f

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

diffstat:
 unison-snapshot/Makefile   | 22 ++++++++++++----------
 unison-snapshot/distinfo   |  6 +++---
 unison-snapshot/options.mk |  6 +++---
 3 files changed, 18 insertions(+), 16 deletions(-)

diffs:
diff --git a/unison-snapshot/Makefile b/unison-snapshot/Makefile
index 411cce6047..b830bfaef4 100644
--- a/unison-snapshot/Makefile
+++ b/unison-snapshot/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD: Makefile,v 1.142 2022/08/17 20:28:37 wiz Exp $
 
 # 2.53.3.beyond
-DISTNAME=	unison-2.53.3.0.52
+DISTNAME=	unison-2.53.3.0.53
 #PKGREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=bcpierce00/}
 #GITHUB_TAG=	v${PKGVERSION_NOREV}
-GITHUB_TAG=	d9bb5734b802b23e1ca3553fdeb8e2d15d45e0ac
+GITHUB_TAG=	1c7922bb9d34ff694e7aa33a69ca0009bd82cc98
 
 
 MAINTAINER=	gdt%NetBSD.org@localhost
@@ -17,6 +17,8 @@ LICENSE=	gnu-gpl-v3
 
 USE_TOOLS+=	gmake bash
 MAKE_FLAGS+=	CFLAGS=""
+ALL_ENV+=	PREFIX=${PREFIX}
+ALL_ENV+=	MANDIR=${PREFIX}/man
 MAKE_ENV+=	HOME=${WRKDIR:Q}
 
 .include "../../lang/ocaml/ocaml.mk"
@@ -32,21 +34,21 @@ MAKE_FLAGS+=	NATIVE=false
 .include "options.mk"
 .include "../../mk/bsd.prefs.mk"
 
-TEST_TARGET=		test
+# \todo
+#   add fsmonitor option, needing python and libinotify, or forcing it off
 
-INSTALLATION_DIRS=	bin
-INSTALLATION_DIRS+=	${PKGMANDIR}/man1
+# Unison does not install non-man docs
 INSTALLATION_DIRS+=	share/doc/unison
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/unison ${DESTDIR}${PREFIX}/bin
-	# gross hack for now
-	${INSTALL_PROGRAM} ${WRKSRC}/src/unison-gui ${DESTDIR}${PREFIX}/bin || ${TRUE}
+post-install:
 	${INSTALL_MAN} ${WRKSRC}/src/COPYING ${DESTDIR}${PREFIX}/share/doc/unison
 	${INSTALL_MAN} ${WRKSRC}/CONTRIBUTING.md ${DESTDIR}${PREFIX}/share/doc/unison
 	${INSTALL_MAN} ${WRKSRC}/INSTALL.md ${DESTDIR}${PREFIX}/share/doc/unison
 	${INSTALL_MAN} ${WRKSRC}/NEWS.md ${DESTDIR}${PREFIX}/share/doc/unison
-	${INSTALL_MAN} ${WRKSRC}/man/unison.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	# \todo See fsmonitor above.
+	${RM} ${WRKSRC}/NEWS.md ${DESTDIR}${PREFIX}/bin/fsmonitor.py
+
+TEST_TARGET=		test
 
 .include "../../mk/pthread.buildlink3.mk"
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
diff --git a/unison-snapshot/distinfo b/unison-snapshot/distinfo
index 83b654631f..5bdecd777f 100644
--- a/unison-snapshot/distinfo
+++ b/unison-snapshot/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.34 2022/05/08 15:02:33 gdt Exp $
 
-BLAKE2s (unison-2.53.3.0.52-d9bb5734b802b23e1ca3553fdeb8e2d15d45e0ac.tar.gz) = 1c7cfc48df16faae88265fb6926db41170d3f1b278bd6713367956b07d98042f
-SHA512 (unison-2.53.3.0.52-d9bb5734b802b23e1ca3553fdeb8e2d15d45e0ac.tar.gz) = bb4bda338f852bc72ee9078372a3262f185e4a1730c4094f6bf0be62880bd0d150e3e83ac7569428618d5610c8325265e52fe24a4072e7dedc4a32409efdd6b7
-Size (unison-2.53.3.0.52-d9bb5734b802b23e1ca3553fdeb8e2d15d45e0ac.tar.gz) = 1407916 bytes
+BLAKE2s (unison-2.53.3.0.53-1c7922bb9d34ff694e7aa33a69ca0009bd82cc98.tar.gz) = c3e9d854691edd8fb32455f9c6621348f345f521e838bbe150beccfebf9767c1
+SHA512 (unison-2.53.3.0.53-1c7922bb9d34ff694e7aa33a69ca0009bd82cc98.tar.gz) = ca5df4d8d3ca60d2262c49a94e2e443ff6d0bd8d8dedcd3f5d5cacd10f121e665e6b9b052a4f5c8f43ace9c51ab6d6dedbb5fd50cb949aa52551a476e299c52c
+Size (unison-2.53.3.0.53-1c7922bb9d34ff694e7aa33a69ca0009bd82cc98.tar.gz) = 1408500 bytes
diff --git a/unison-snapshot/options.mk b/unison-snapshot/options.mk
index fc3ffc562f..c8bbcfa569 100644
--- a/unison-snapshot/options.mk
+++ b/unison-snapshot/options.mk
@@ -1,9 +1,9 @@
 # $NetBSD: options.mk,v 1.6 2022/03/13 15:07:13 gdt Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.unison
-# upstream makefiles are broken for now
-PKG_SUPPORTED_OPTIONS=	# lablgtk
-PKG_SUGGESTED_OPTIONS=	# lablgtk
+PKG_SUPPORTED_OPTIONS=	lablgtk
+# ocaml-cairo is broken
+PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.options.mk"