git: 1ab547de8726 - main - graphics/ocaml-images: unbreak the build and undeprecate the port

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1ab547de8726da676dec333669974977b613a45b

commit 1ab547de8726da676dec333669974977b613a45b
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-11-27 12:35:02 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-11-27 12:35:02 +0000

    graphics/ocaml-images: unbreak the build and undeprecate the port
    
    OMake's shell-success-null() function had been removed in version
    0.10.5: after using $(NULL_DEVICE), it no longer needed a special
    name and had replaced shell-success() function.
---
 graphics/ocaml-images/Makefile                  |  8 ++++----
 graphics/ocaml-images/files/patch-src_bitmap.ml | 11 +++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile
index 25a2ad4f295e..d26cadbe1c0c 100644
--- a/graphics/ocaml-images/Makefile
+++ b/graphics/ocaml-images/Makefile
@@ -12,10 +12,6 @@ MAINTAINER=	michael.grunewald@laposte.net
 COMMENT=	Objective Caml image processing library
 WWW=		http://pauillac.inria.fr/camlimages/
 
-BROKEN=		does not build: broken plist
-DEPRECATED=	Fails to package and marked broken over a year ago
-EXPIRATION_DATE=2023-11-30
-
 BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ocaml.m4:lang/ocaml-autoconf
 BUILD_DEPENDS+=	omake:devel/omake
 
@@ -74,6 +70,10 @@ USES+=		xorg
 USE_XORG=	xpm
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's,shell-success-null,shell-success,' \
+		${WRKSRC}/OMyMakeroot
+
 do-configure:
 	@(cd ${WRKSRC} && ${REINPLACE_CMD} ${OMAKESUBS} OMakefile)
 	(cd ${WRKSRC} && ${OMAKE} ${OMARGS} configure)
diff --git a/graphics/ocaml-images/files/patch-src_bitmap.ml b/graphics/ocaml-images/files/patch-src_bitmap.ml
new file mode 100644
index 000000000000..eec47155e7a5
--- /dev/null
+++ b/graphics/ocaml-images/files/patch-src_bitmap.ml
@@ -0,0 +1,11 @@
+--- src/bitmap.ml.orig	2011-06-22 18:04:32 UTC
++++ src/bitmap.ml
+@@ -186,7 +186,7 @@ module Make(B:Bitdepth) = struct
+ 
+   let swap_out_eldest words =
+     let sorted =
+-      Sort.list (fun b1 b2 -> b1.last_used < b2.last_used) !swappable_blocks in
++      List.sort (fun b1 b2 -> compare b1.last_used b2.last_used) !swappable_blocks in
+     let rec swapper sorted i =
+      match sorted with
+       | [] -> ()