From 68d09754c0782114628e3e357d0b07ad733ebc43 Mon Sep 17 00:00:00 2001
From: daniel <daniel@openbsd.org>
Date: Sat, 4 Dec 2021 01:31:33 +0000
Subject: [PATCH] minor tweaks for ocaml 4.12

Both mldonkey and the 2.4x series of unison need the same minor tweak so they
can build on ocaml 4.12.

The unison change was ok bket@ (MAINTAINER)
---
 net/mldonkey/Makefile                          |  4 ++--
 .../patch-src_networks_donkey_donkeyClient_ml  | 17 +++++++++++++++++
 net/unison/2.4x/Makefile                       |  4 ++--
 net/unison/2.4x/patches/patch-uutil_ml         | 18 ++++++++++++++++++
 4 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 net/mldonkey/patches/patch-src_networks_donkey_donkeyClient_ml
 create mode 100644 net/unison/2.4x/patches/patch-uutil_ml

diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 67bb4fba054..f81d98a93a2 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.37 2021/12/02 03:59:20 daniel Exp $
+# $OpenBSD: Makefile,v 1.38 2021/12/04 01:31:33 daniel Exp $
 
 COMMENT =	e-donkey client
 
 VER =		3.1.6
 DISTNAME =	mldonkey-${VER}
-REVISION =	9
+REVISION =	10
 CATEGORIES =	net
 
 HOMEPAGE =	http://mldonkey.sourceforge.net/Main_Page
diff --git a/net/mldonkey/patches/patch-src_networks_donkey_donkeyClient_ml b/net/mldonkey/patches/patch-src_networks_donkey_donkeyClient_ml
new file mode 100644
index 00000000000..e060db3e447
--- /dev/null
+++ b/net/mldonkey/patches/patch-src_networks_donkey_donkeyClient_ml
@@ -0,0 +1,17 @@
+$OpenBSD: patch-src_networks_donkey_donkeyClient_ml,v 1.1 2021/12/04 01:31:33 daniel Exp $
+
+ocaml 4.12 compat
+
+Index: src/networks/donkey/donkeyClient.ml
+--- src/networks/donkey/donkeyClient.ml.orig
++++ src/networks/donkey/donkeyClient.ml
+@@ -818,8 +818,7 @@ another better way, since this functionnality is still
+         end
+ 
+ 
+-external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc"
+-let hash x = hash_param 10 100 x
++let hash = Hashtbl.hash
+ 
+ let shared_of_file file =
+   match file.file_shared with
diff --git a/net/unison/2.4x/Makefile b/net/unison/2.4x/Makefile
index e4cbe01fa63..846066331b6 100644
--- a/net/unison/2.4x/Makefile
+++ b/net/unison/2.4x/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.15 2021/12/02 03:59:20 daniel Exp $
+# $OpenBSD: Makefile,v 1.16 2021/12/04 01:31:33 daniel Exp $
 
 VER=		2.48.15
 REV=		v4
-REVISION=	7
+REVISION=	8
 GH_TAGNAME=	v${VER}${REV}
 PKGNAME=	unison-${VER}${REV:S/^v/pl/}
 
diff --git a/net/unison/2.4x/patches/patch-uutil_ml b/net/unison/2.4x/patches/patch-uutil_ml
new file mode 100644
index 00000000000..9e0dd167ed6
--- /dev/null
+++ b/net/unison/2.4x/patches/patch-uutil_ml
@@ -0,0 +1,18 @@
+$OpenBSD: patch-uutil_ml,v 1.1 2021/12/04 01:31:33 daniel Exp $
+
+ocaml 4.12 compat
+
+Index: uutil.ml
+--- uutil.ml.orig
++++ uutil.ml
+@@ -34,9 +34,7 @@ let myNameAndVersion = myName ^ " " ^ myVersion
+ 
+ let hash2 x y = (17 * x + 257 * y) land 0x3FFFFFFF
+ 
+-external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc"
+-
+-let hash x = hash_param 10 100 x
++let hash = Hashtbl.hash
+ 
+ (*****************************************************************************)
+ (*                             File sizes                                    *)