CVS commit: pkgsrc/net/unison

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Nov  5 00:21:40 UTC 2025

Modified Files:
        pkgsrc/net/unison: Makefile PLIST distinfo options.mk

Log Message:
net/unison: Update to 2.53.8

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.)


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 pkgsrc/net/unison/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/unison/PLIST
cvs rdiff -u -r1.42 -r1.43 pkgsrc/net/unison/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/unison/options.mk

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

Modified files:

Index: pkgsrc/net/unison/Makefile
diff -u pkgsrc/net/unison/Makefile:1.172 pkgsrc/net/unison/Makefile:1.173
--- pkgsrc/net/unison/Makefile:1.172    Thu Oct 23 20:38:55 2025
+++ pkgsrc/net/unison/Makefile  Wed Nov  5 00:21:39 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.172 2025/10/23 20:38:55 wiz Exp $
+# $NetBSD: Makefile,v 1.173 2025/11/05 00:21:39 gdt Exp $
 
-DISTNAME=      unison-2.53.7
-PKGREVISION=   5
+DISTNAME=      unison-2.53.8
+#PKGREVISION=  0
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=bcpierce00/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -12,7 +12,8 @@ HOMEPAGE=     https://github.com/bcpierce00/
 COMMENT=       File-synchronization tool
 LICENSE=       gnu-gpl-v3
 
-USE_TOOLS+=    gmake bash
+USE_TOOLS+=    bash pkg-config
+# \todo Explain
 MAKE_FLAGS+=   CFLAGS=""
 ALL_ENV+=      PREFIX=${PREFIX}
 ALL_ENV+=      MANDIR=${PREFIX}/${PKGMANDIR}
@@ -42,8 +43,6 @@ post-install:
        ${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
-       # \todo See fsmonitor above.
-       ${RM} ${DESTDIR}${PREFIX}/bin/fsmonitor.py
 
 TEST_TARGET=           test
 

Index: pkgsrc/net/unison/PLIST
diff -u pkgsrc/net/unison/PLIST:1.8 pkgsrc/net/unison/PLIST:1.9
--- pkgsrc/net/unison/PLIST:1.8 Mon Feb 19 19:39:00 2024
+++ pkgsrc/net/unison/PLIST     Wed Nov  5 00:21:39 2025
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 2024/02/19 19:39:00 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
 man/man1/unison.1
 share/doc/unison/CONTRIBUTING.md

Index: pkgsrc/net/unison/distinfo
diff -u pkgsrc/net/unison/distinfo:1.42 pkgsrc/net/unison/distinfo:1.43
--- pkgsrc/net/unison/distinfo:1.42     Sat Nov 23 13:59:40 2024
+++ pkgsrc/net/unison/distinfo  Wed Nov  5 00:21:39 2025
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.42 2024/11/23 13:59:40 wiz Exp $
+$NetBSD: distinfo,v 1.43 2025/11/05 00:21:39 gdt Exp $
 
-BLAKE2s (unison-2.53.7.tar.gz) = 9296c4aaf5f06fb7e4094b2662e2f502e1f7469a7b6c0d4ad5e2c4878cef8667
-SHA512 (unison-2.53.7.tar.gz) = 11bd1d2792fb84fa2b29426516d7b91a2295febcb84052118d492a29d9ddaa23265b66cc88113019ec6782f3edcf596f7a37c8637e673b2928188248b9d63d60
-Size (unison-2.53.7.tar.gz) = 1412694 bytes
+BLAKE2s (unison-2.53.8.tar.gz) = 45bd2d7358a1ebd7c6cd2ce161f98ca89c74786f3ca9f7055975661aebe1f3da
+SHA512 (unison-2.53.8.tar.gz) = 3e4ea9dc23645ff472c3d7bae79cad042a8ec0bbd57c8e28c49d1ad08cb2f177b09c60fec4853b11390d5825be74adb19334fcd7d2167963a05f67729890408a
+Size (unison-2.53.8.tar.gz) = 1448430 bytes

Index: pkgsrc/net/unison/options.mk
diff -u pkgsrc/net/unison/options.mk:1.9 pkgsrc/net/unison/options.mk:1.10
--- pkgsrc/net/unison/options.mk:1.9    Tue May  7 23:52:11 2024
+++ pkgsrc/net/unison/options.mk        Wed Nov  5 00:21:39 2025
@@ -1,17 +1,32 @@
-# $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
-# ocaml-lablgtk3 is broken
-PKG_SUGGESTED_OPTIONS=
+PKG_SUPPORTED_OPTIONS= lablgtk inotify
+PKG_SUGGESTED_OPTIONS= lablgtk
 
-.include "../../mk/bsd.options.mk"
+# gtk3 is true if unison-gui is built.
+# monitor is true if unison-fsmonitor is built.
+PLIST_VARS+=   gtk3 monitor
+
+# Extend to systems as they are tested to build fsmonitor.
+# \todo FreeBSD, Linux, macOS, OpenBSD, SunOS.
+# \todo Perhaps, just enable unless libinotify says NOT_FOR_PLATFORM.
 
-PLIST_VARS+=   gtk3
+.if ${MACHINE_PLATFORM:MNetBSD-*}
+PKG_SUGGESTED_OPTIONS+=        inotify
+.endif
+
+.include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mlablgtk)
 PLIST.gtk3=    yes
-DEPENDS+=      font-schumacher-misc>=1.0:../../fonts/font-schumacher-misc
 
+DEPENDS+=      font-schumacher-misc>=1.0:../../fonts/font-schumacher-misc
 .include "../../x11/ocaml-lablgtk3/buildlink3.mk"
 .endif
+
+.if !empty(PKG_OPTIONS:Minotify)
+PLIST.monitor= yes
+
+.include "../../devel/libinotify/buildlink3.mk"
+.endif