unison-snapshot: Update to 2.53.7.54

[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 Jul 29 12:24:16 2025 -0400
Changeset:	be8a47fa648859abc2cc8fd4f570943eeaca15f9

Modified Files:
	unison-snapshot/Makefile
	unison-snapshot/distinfo
Removed Files:
	unison-snapshot/patches/patch-src_Makefile
	unison-snapshot/patches/patch-src_make__tools.ml

Log Message:
unison-snapshot: Update to 2.53.7.54

Advance along upstream git master, incorporating the merged patch for
BSD make $^ suppport.  Drop patches from pkgsrc.

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

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

diffstat:
 unison-snapshot/Makefile                         |  6 +++---
 unison-snapshot/distinfo                         |  8 +++-----
 unison-snapshot/patches/patch-src_Makefile       | 17 ----------------
 unison-snapshot/patches/patch-src_make__tools.ml | 26 ------------------------
 4 files changed, 6 insertions(+), 51 deletions(-)

diffs:
diff --git a/unison-snapshot/Makefile b/unison-snapshot/Makefile
index 3b631ac553..512369b528 100644
--- a/unison-snapshot/Makefile
+++ b/unison-snapshot/Makefile
@@ -2,11 +2,11 @@
 
 # master after 2.53.7.
 # 2025-07-27
-DISTNAME=	unison-2.53.7.53
-PKGREVISION=	2
+DISTNAME=	unison-2.53.7.54
+#PKGREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=bcpierce00/}
-GITHUB_TAG=	aa11d8794640888cb96ac8213a7aa9ad6eae20fe
+GITHUB_TAG=	23dc5341f50f501afe1bbc71b86f1ca45b9ef656
 
 MAINTAINER=	gdt%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/bcpierce00/unison
diff --git a/unison-snapshot/distinfo b/unison-snapshot/distinfo
index 3866d30bcf..4e6bd7c917 100644
--- a/unison-snapshot/distinfo
+++ b/unison-snapshot/distinfo
@@ -1,7 +1,5 @@
 $NetBSD: distinfo,v 1.40 2024/05/07 23:52:11 gdt Exp $
 
-BLAKE2s (unison-2.53.7.53-aa11d8794640888cb96ac8213a7aa9ad6eae20fe.tar.gz) = 6e5b89b855f4a92de99a1951d6a0804bf5ea749c2169d6cc7491b405a4638501
-SHA512 (unison-2.53.7.53-aa11d8794640888cb96ac8213a7aa9ad6eae20fe.tar.gz) = 85aef87ed31392403d526c1dca752891823195e1839fd448f8f78f0a7db7335ce1c9694b35418bb13ae2f134c26aa8a8bc5dc7e71184b6a6c6135a548fa07dac
-Size (unison-2.53.7.53-aa11d8794640888cb96ac8213a7aa9ad6eae20fe.tar.gz) = 1432049 bytes
-SHA1 (patch-src_Makefile) = af43e3a0a643ba7ecbfd078b6b7831ae8581185c
-SHA1 (patch-src_make__tools.ml) = da0c073e00b749c2a565f939e6651621d982d7f7
+BLAKE2s (unison-2.53.7.54-23dc5341f50f501afe1bbc71b86f1ca45b9ef656.tar.gz) = cfdfe5354eaca3cffc6e23458529f67d096e4bca13cb103c6e81e7db6502bdc7
+SHA512 (unison-2.53.7.54-23dc5341f50f501afe1bbc71b86f1ca45b9ef656.tar.gz) = 3977289dcd015d44201fca111eade12a41186cb5db24102ad7aa4b9fc17568ec511f789c8fc9f1242e0655f9e53d87e08b162983064f13525369671d88258a6c
+Size (unison-2.53.7.54-23dc5341f50f501afe1bbc71b86f1ca45b9ef656.tar.gz) = 1432094 bytes
diff --git a/unison-snapshot/patches/patch-src_Makefile b/unison-snapshot/patches/patch-src_Makefile
deleted file mode 100644
index d0794c96aa..0000000000
--- a/unison-snapshot/patches/patch-src_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Determine if $^ is supported.
-
-Taken from a pending upstream patch.
-
---- src/Makefile.orig	2025-07-26 12:17:25.000000000 +0000
-+++ src/Makefile
-@@ -18,7 +18,7 @@ default: all
- # Executed only by BSD make
- .BEGIN:
- 	@touch _mk.cfg
--	@ocaml make_tools.ml conf > Makefile.cfg
-+	@ocaml make_tools.ml conf MAKE="$(MAKE)" > Makefile.cfg
- 	@ocaml make_tools.ml conf2 > Makefile2.cfg
- 
- # Executed only by Solaris dmake
diff --git a/unison-snapshot/patches/patch-src_make__tools.ml b/unison-snapshot/patches/patch-src_make__tools.ml
deleted file mode 100644
index 0f03a96a34..0000000000
--- a/unison-snapshot/patches/patch-src_make__tools.ml
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-Use $^ if supported.
-
-Taken from a pending upstream patch.
-
---- src/make_tools.ml.orig	2025-07-26 12:17:25.000000000 +0000
-+++ src/make_tools.ml
-@@ -255,9 +255,14 @@ let () = "WINDRES" <--
-   end) ^ "windres"
- 
- let () =
--  if is_empty inputs.$("_NMAKE_VER") then
--    "ALL__SRC" <-- "$^$>"  (* First one is for GNU and POSIX make, the other for BSD make *)
--  else
-+  if is_empty inputs.$("_NMAKE_VER") then begin
-+    if is_empty inputs.$("MAKE") || not_empty (
-+          shell ~err_null:true ("printf '_cf_test: FRC ; @echo $^\nFRC: ;' | " ^
-+            inputs.$("MAKE") ^ " -f -")) then
-+      "ALL__SRC" <-- "$^"  (* GNU and POSIX make, new versions of BSD make *)
-+    else
-+      "ALL__SRC" <-- "$>"  (* Older versions of BSD make *)
-+  end else
-     "ALL__SRC" <-- "$(**)" (* NMAKE; enclose in brackets for safety if not run by NMAKE *)
- 
- let () = "rule_sep" <-- if not_empty inputs.$("ASSUME_DMAKE") then ":=" else ":"