unison-snapshot: Merge changes from net/unison

[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:		Tue Nov 4 19:24:22 2025 -0500
Changeset:	fd8295db35a62bdeb40c6d4768037099def397d1

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

Log Message:
unison-snapshot: Merge changes from net/unison

  - $NetBSD$, for the compulsive
  - rename libinotify option to inotify to match existing option usage
  - [not merge] set up for unison beyond 2.53.8

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

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

diffstat:
 unison-snapshot/COMMIT_MSG | 41 ++---------------------------------------
 unison-snapshot/Makefile   |  2 +-
 unison-snapshot/PLIST      |  2 +-
 unison-snapshot/distinfo   |  2 +-
 unison-snapshot/options.mk |  8 ++++----
 5 files changed, 9 insertions(+), 46 deletions(-)

diffs:
diff --git a/unison-snapshot/COMMIT_MSG b/unison-snapshot/COMMIT_MSG
index abe796a966..c4a3e42db9 100644
--- a/unison-snapshot/COMMIT_MSG
+++ b/unison-snapshot/COMMIT_MSG
@@ -1,42 +1,5 @@
-net/unison: Update to 2.53.8
+net/unison: Update to [maybe 2.53.9, maybe 2.54.0]
 
 Packaging changes:
 
-  - drop gmake usage in pkgsrc makefile
-  - enable lablgtk (because it builds now)
-  - add fsmonitor option, enabled on NetBSD
-
-Upstream NEWS
-
-## Changes in 2.53.8
-
-Released 2025-11-05
-
-  * Improve and simplify makefiles.
-    It is now possible to build with BSD make, Solaris/illumos make and
-        NMAKE, in addition to GNU Make.  Building with MSVC is much simpler
-        now.  The changes are larger than might be expected in a micro;
-    anyone building from source (or packaging) should consult
-    INSTALL.md for updated build instructions.
-  * Stop installing fsmonitor.py.
-  * Add ability to use reflinking instead of copying (if supported by
-    filesystem).
-  * Don't write fpcache if it is not necessary.
-  * Experimental default-off support to detect moves/renames and
-        rename on destination instead of copying (see -moves-experimental).
-
-  Deprecation warning: support for external rsync will be removed,
-  likely in 2.54.0.
-
-  DEPRECATION MAY HAPPEN WITH LESS THAN TYPICAL NOTICE:
-  lablgtk is difficult to use safely, and future maintenance is
-  unclear.  Implementing the GUI without lablgtk requires more effort
-  than seems likely to happen.  Thus, it is possible that support for
-  the unison GUI may end suddenly, on a particular platform, or on all
-  platforms -- even in a micro release.  See
-    https://github.com/bcpierce00/unison/issues/1075  
-
-  MAINTENANCE WARNING: No one is contributing to verify that the Mac
-  GUI continues to work -- so it might not.  (So far, there are no
-  reports of serious failures.)
-
+Upstream NEWS:
diff --git a/unison-snapshot/Makefile b/unison-snapshot/Makefile
index dba3c1238a..6a08e7c210 100644
--- a/unison-snapshot/Makefile
+++ b/unison-snapshot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.170 2025/08/30 22:46:06 wiz Exp $
+# $NetBSD: Makefile,v 1.173 2025/11/05 00:21:39 gdt Exp $
 
 # master at 2.53.8
 DISTNAME=	unison-2.53.8
diff --git a/unison-snapshot/PLIST b/unison-snapshot/PLIST
index 503d5c657b..9dd9eb01e4 100644
--- a/unison-snapshot/PLIST
+++ b/unison-snapshot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2022/05/08 15:02:33 gdt Exp $
+@comment $NetBSD: PLIST,v 1.9 2025/11/05 00:21:39 gdt Exp $
 bin/unison
 ${PLIST.monitor}bin/unison-fsmonitor
 ${PLIST.gtk3}bin/unison-gui
diff --git a/unison-snapshot/distinfo b/unison-snapshot/distinfo
index a0281a8223..acb12736ca 100644
--- a/unison-snapshot/distinfo
+++ b/unison-snapshot/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2024/05/07 23:52:11 gdt Exp $
+$NetBSD: distinfo,v 1.43 2025/11/05 00:21:39 gdt Exp $
 
 BLAKE2s (unison-2.53.8.tar.gz) = 45bd2d7358a1ebd7c6cd2ce161f98ca89c74786f3ca9f7055975661aebe1f3da
 SHA512 (unison-2.53.8.tar.gz) = 3e4ea9dc23645ff472c3d7bae79cad042a8ec0bbd57c8e28c49d1ad08cb2f177b09c60fec4853b11390d5825be74adb19334fcd7d2167963a05f67729890408a
diff --git a/unison-snapshot/options.mk b/unison-snapshot/options.mk
index 4d2912e685..df2fb9ff10 100644
--- a/unison-snapshot/options.mk
+++ b/unison-snapshot/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.9 2024/05/07 23:52:11 gdt Exp $
+# $NetBSD: options.mk,v 1.10 2025/11/05 00:21:39 gdt Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.unison
-PKG_SUPPORTED_OPTIONS=	lablgtk libinotify
+PKG_SUPPORTED_OPTIONS=	lablgtk inotify
 PKG_SUGGESTED_OPTIONS=	lablgtk
 
 # gtk3 is true if unison-gui is built.
@@ -13,7 +13,7 @@ PLIST_VARS+=	gtk3 monitor
 # \todo Perhaps, just enable unless libinotify says NOT_FOR_PLATFORM.
 
 .if ${MACHINE_PLATFORM:MNetBSD-*}
-PKG_SUGGESTED_OPTIONS+=	libinotify
+PKG_SUGGESTED_OPTIONS+=	inotify
 .endif
 
 .include "../../mk/bsd.options.mk"
@@ -25,7 +25,7 @@ DEPENDS+=	font-schumacher-misc>=1.0:../../fonts/font-schumacher-misc
 .include "../../x11/ocaml-lablgtk3/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Mlibinotify)
+.if !empty(PKG_OPTIONS:Minotify)
 PLIST.monitor=	yes
 
 .include "../../devel/libinotify/buildlink3.mk"