3 files changed, 27 insertions, 2 deletions
diff --git a/devel/ocaml-camomile/Makefile b/devel/ocaml-camomile/Makefile
index 5f0c49154a86..fef9628df493 100644
--- a/devel/ocaml-camomile/Makefile
+++ b/devel/ocaml-camomile/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	camomile
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-
 
@@ -10,7 +10,9 @@ WWW=		https://camomile.sourceforge.net/
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	dune:devel/ocaml-dune
+BUILD_DEPENDS=	${SA_DIR}/camlp-streams/META:devel/ocaml-camlp-streams \
+		dune:devel/ocaml-dune
+RUN_DEPENDS=	${SA_DIR}/camlp-streams/META:devel/ocaml-camlp-streams
 
 USES=		gmake
 USE_GITHUB=	yes
@@ -25,6 +27,8 @@ PORTDOCS=	CHANGES.md LICENSE.md README.md
 
 OPTIONS_DEFINE=	DOCS
 
+SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^INSTALL_ARGS/ \
 		s:$$: $$(if $$(LIBDIR),--libdir $$(LIBDIR),):' \
diff --git a/devel/ocaml-camomile/files/patch-Camomile_dune b/devel/ocaml-camomile/files/patch-Camomile_dune
new file mode 100644
index 000000000000..0cecc40282b3
--- /dev/null
+++ b/devel/ocaml-camomile/files/patch-Camomile_dune
@@ -0,0 +1,11 @@
+--- Camomile/dune.orig	2024-02-11 22:33:43 UTC
++++ Camomile/dune
+@@ -9,7 +9,7 @@
+  (name camomileLibrary)
+  (public_name camomile.library)
+  (wrapped true)
+- (libraries bigarray camomileDefaultConfig)
++ (libraries bigarray camomileDefaultConfig camlp-streams)
+  (modules
+   :standard \ camomileDefaultConfig
+   camomile_do_not_use
diff --git a/devel/ocaml-camomile/files/patch-Camomile_tools_dune b/devel/ocaml-camomile/files/patch-Camomile_tools_dune
new file mode 100644
index 000000000000..d13b51aac180
--- /dev/null
+++ b/devel/ocaml-camomile/files/patch-Camomile_tools_dune
@@ -0,0 +1,10 @@
+--- Camomile/tools/dune.orig	2024-02-11 22:37:19 UTC
++++ Camomile/tools/dune
+@@ -21,6 +21,6 @@
+ 
+ (executable
+  (name camomilelocaledef)
+- (libraries toolslib camomile.library)
++ (libraries toolslib camomile.library camlp-streams)
+  (flags -I Camomile :standard)
+  (modules camomilelocaledef camomilelocaledef_lexer))