unison-snapshot: Replace upstream $^ patch with new upstream version

[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 09:41:26 2025 -0400
Changeset:	416adfca997bfab013187a1137b33f56557d9b9b

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

Log Message:
unison-snapshot: Replace upstream $^ patch with new upstream version

(The old one was troubled on nmake.)

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

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

diffstat:
 unison-snapshot/Makefile                         |  2 +-
 unison-snapshot/distinfo                         |  4 ++--
 unison-snapshot/patches/patch-src_Makefile       | 17 ++++++-----------
 unison-snapshot/patches/patch-src_make__tools.ml | 20 +++++++++++++-------
 4 files changed, 22 insertions(+), 21 deletions(-)

diffs:
diff --git a/unison-snapshot/Makefile b/unison-snapshot/Makefile
index d14763909f..3b631ac553 100644
--- a/unison-snapshot/Makefile
+++ b/unison-snapshot/Makefile
@@ -3,7 +3,7 @@
 # master after 2.53.7.
 # 2025-07-27
 DISTNAME=	unison-2.53.7.53
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=bcpierce00/}
 GITHUB_TAG=	aa11d8794640888cb96ac8213a7aa9ad6eae20fe
diff --git a/unison-snapshot/distinfo b/unison-snapshot/distinfo
index 5807311a85..3866d30bcf 100644
--- a/unison-snapshot/distinfo
+++ b/unison-snapshot/distinfo
@@ -3,5 +3,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) = 44d3b09b222bcc27faf4950e455b7c81d6177f60
-SHA1 (patch-src_make__tools.ml) = 1edfbe787d81c378143bf7f2263ab89d1d594274
+SHA1 (patch-src_Makefile) = af43e3a0a643ba7ecbfd078b6b7831ae8581185c
+SHA1 (patch-src_make__tools.ml) = da0c073e00b749c2a565f939e6651621d982d7f7
diff --git a/unison-snapshot/patches/patch-src_Makefile b/unison-snapshot/patches/patch-src_Makefile
index 8e64da37ef..d0794c96aa 100644
--- a/unison-snapshot/patches/patch-src_Makefile
+++ b/unison-snapshot/patches/patch-src_Makefile
@@ -6,17 +6,12 @@ Taken from a pending upstream patch.
 
 --- src/Makefile.orig	2025-07-26 12:17:25.000000000 +0000
 +++ src/Makefile
-@@ -16,10 +16,11 @@ default: all
- .PHONY: default
-
+@@ -18,7 +18,7 @@ default: all
  # Executed only by BSD make
--.BEGIN:
-+.BEGIN: FRC
-	@touch _mk.cfg
+ .BEGIN:
+ 	@touch _mk.cfg
 -	@ocaml make_tools.ml conf > Makefile.cfg
-+	@ocaml make_tools.ml conf BSD_HAS_CF="$^" BSD_HAS_GT="$>" > Makefile.cfg
-	@ocaml make_tools.ml conf2 > Makefile2.cfg
-+FRC: ;
-
++	@ocaml make_tools.ml conf MAKE="$(MAKE)" > Makefile.cfg
+ 	@ocaml make_tools.ml conf2 > Makefile2.cfg
+ 
  # Executed only by Solaris dmake
- .INIT:
diff --git a/unison-snapshot/patches/patch-src_make__tools.ml b/unison-snapshot/patches/patch-src_make__tools.ml
index ac55302cca..0f03a96a34 100644
--- a/unison-snapshot/patches/patch-src_make__tools.ml
+++ b/unison-snapshot/patches/patch-src_make__tools.ml
@@ -6,15 +6,21 @@ Taken from a pending upstream patch.
 
 --- src/make_tools.ml.orig	2025-07-26 12:17:25.000000000 +0000
 +++ src/make_tools.ml
-@@ -255,8 +255,10 @@ let () = "WINDRES" <--
+@@ -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 *)
-+  if is_empty inputs.$("BSD_HAS_CF") && not_empty inputs.$("BSD_HAS_GT") then
-+    "ALL__SRC" <-- "$>"    (* Older versions of BSD make *)
-+  else if is_empty inputs.$("_NMAKE_VER") then
-+    "ALL__SRC" <-- "$^"    (* GNU and POSIX make, new versions of BSD make *)
-   else
+-  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 ":"