unison-snapshot: Advance along master

[Greg Troxel (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Thu Dec 19 20:20:36 2024 -0500
Changeset:	1e2916c86dd38121d849412d53acd7cf6aa220d5

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

Log Message:
unison-snapshot: Advance along master

Re-enables GUI, force-disables fsmonitor.

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

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

diffstat:
 unison-snapshot/COMMIT_MSG |  9 ++++++++-
 unison-snapshot/Makefile   | 11 ++++++++---
 unison-snapshot/distinfo   |  7 ++++---
 unison-snapshot/options.mk |  3 +--
 4 files changed, 21 insertions(+), 9 deletions(-)

diffs:
diff --git a/unison-snapshot/COMMIT_MSG b/unison-snapshot/COMMIT_MSG
index 7493c256bb..60ac6894a8 100644
--- a/unison-snapshot/COMMIT_MSG
+++ b/unison-snapshot/COMMIT_MSG
@@ -1,5 +1,12 @@
 net/unison: Update to 2.53.8
 
-So far, changes are:
+Packaging changes:
+
+  - drop gmake usage in pkgsrc makefile
+  - enable lablgtk (because it builds now)
+  - hard force off BSD fsmonitor, pending upstream fix
+
+Upstream NEWS
 
   - minor build system improvements
+  - upstream Makefile rototill, so that it works with BSD make
diff --git a/unison-snapshot/Makefile b/unison-snapshot/Makefile
index bfba9c6a00..a6a61218af 100644
--- a/unison-snapshot/Makefile
+++ b/unison-snapshot/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.166 2024/11/23 13:59:40 wiz Exp $
 
 # master after 2.53.7
-DISTNAME=	unison-2.53.7.50
+DISTNAME=	unison-2.53.7.51
 #PKGREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=bcpierce00/}
-GITHUB_TAG=	d08a5c35e5a9a2cf9729fff56af0313999aa0c06
+GITHUB_TAG=	8db0681d52140512f6154cac01596b276415ad13
 
 MAINTAINER=	gdt%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/bcpierce00/unison
@@ -13,7 +13,8 @@ HOMEPAGE=	https://github.com/bcpierce00/unison
 COMMENT=	File-synchronization tool
 LICENSE=	gnu-gpl-v3
 
-USE_TOOLS+=	gmake bash
+USE_TOOLS+=	bash
+# \todo Explain
 MAKE_FLAGS+=	CFLAGS=""
 ALL_ENV+=	PREFIX=${PREFIX}
 ALL_ENV+=	MANDIR=${PREFIX}/${PKGMANDIR}
@@ -21,6 +22,9 @@ MAKE_ENV+=	HOME=${WRKDIR:Q}
 
 .include "../../lang/ocaml/ocaml.mk"
 
+# Unison will use ocampopt if possible, and otherwise ocamlc, but
+# passing NATIVE lets pkgsrc build byte code on a native platform,
+# should that be desired.
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
 MAKE_FLAGS+=	NATIVE=true
 .else
@@ -34,6 +38,7 @@ MAKE_FLAGS+=	NATIVE=false
 
 # \todo
 #   add fsmonitor option, needing python and libinotify, or forcing it off
+#   for now, it is statically forced off, pending upstream fix
 
 # Unison does not install non-man docs
 INSTALLATION_DIRS+=	share/doc/unison
diff --git a/unison-snapshot/distinfo b/unison-snapshot/distinfo
index bc7c6e48ad..63f69cde6b 100644
--- a/unison-snapshot/distinfo
+++ b/unison-snapshot/distinfo
@@ -1,5 +1,6 @@
 $NetBSD: distinfo,v 1.40 2024/05/07 23:52:11 gdt Exp $
 
-BLAKE2s (unison-2.53.7.50-d08a5c35e5a9a2cf9729fff56af0313999aa0c06.tar.gz) = 22aaf39ef2fc3ba13f9b89d75cddc0e708c82c04157cb0b4d1aca236b1df91ca
-SHA512 (unison-2.53.7.50-d08a5c35e5a9a2cf9729fff56af0313999aa0c06.tar.gz) = a9a6dc33c42e128349fffcc8686667d724e3bb71580d909c43763d4c3f8a2cf6add3e08de67da22fba5dd24a281fc2d8704b474c0ade7025a41d106d580d7382
-Size (unison-2.53.7.50-d08a5c35e5a9a2cf9729fff56af0313999aa0c06.tar.gz) = 1413751 bytes
+BLAKE2s (unison-2.53.7.51-8db0681d52140512f6154cac01596b276415ad13.tar.gz) = 808870058b000adde985d19860a9957e2ae3d49e0452c120b8de9c0b53cfbda7
+SHA512 (unison-2.53.7.51-8db0681d52140512f6154cac01596b276415ad13.tar.gz) = 46a76b35f294ffea164049a5ab651009e17fafaf61a1095fad7003c69f1a62584fe5241c4cf67650397ce481a26061c431542f8c4a0a6b186bbdb188779d92f0
+Size (unison-2.53.7.51-8db0681d52140512f6154cac01596b276415ad13.tar.gz) = 1421142 bytes
+SHA1 (patch-src_make__tools.ml) = 70daaf644c1b0777845b027d5309ee1e18825cd5
diff --git a/unison-snapshot/options.mk b/unison-snapshot/options.mk
index efd430c1d6..ad5d913b58 100644
--- a/unison-snapshot/options.mk
+++ b/unison-snapshot/options.mk
@@ -2,8 +2,7 @@
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.unison
 PKG_SUPPORTED_OPTIONS=	lablgtk
-# ocaml-lablgtk3 is broken
-PKG_SUGGESTED_OPTIONS=
+PKG_SUGGESTED_OPTIONS=	lablgtk
 
 .include "../../mk/bsd.options.mk"