diff --git a/devel/ocaml-camlp5/Makefile b/devel/ocaml-camlp5/Makefile
index 68efa32b46d2..1980daa9ea5f 100644
--- a/devel/ocaml-camlp5/Makefile
+++ b/devel/ocaml-camlp5/Makefile
@@ -1,62 +1,62 @@
 PORTNAME=	camlp5
 PORTVERSION=	8.02.01
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Preprocessor-pretty-printer of OCaml
 WWW=		https://camlp5.github.io
 
 LICENSE=	INRIA
 LICENSE_NAME=	INRIA permissive license with copyright notice requirements
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	${SA_DIR}/bos/META:devel/ocaml-bos \
 		${SA_DIR}/camlp-streams/META:devel/ocaml-camlp-streams \
 		${SA_DIR}/fmt/META:devel/ocaml-fmt \
 		${SA_DIR}/pcre2/META:devel/ocaml-pcre2 \
 		${SA_DIR}/re/META:devel/ocaml-re \
 		${SA_DIR}/rresult/META:devel/ocaml-rresult
 RUN_DEPENDS=	${SA_DIR}/camlp-streams/META:devel/ocaml-camlp-streams \
 		${SA_DIR}/pcre2/META:devel/ocaml-pcre2 \
 		${SA_DIR}/re/META:devel/ocaml-re \
 		${SA_DIR}/rresult/META:devel/ocaml-rresult
 
 USES=		gmake perl5 tar:tgz
 USE_GITHUB=	yes
 USE_OCAML=	yes
 USE_PERL5=	build
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix ${PREFIX} --mandir ${PREFIX}/share/man
 ALL_TARGET=	world.opt
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_SINGLE=		MODE
 OPTIONS_SINGLE_MODE=	TRANSITIONAL STRICT
 OPTIONS_DEFAULT=	STRICT
 TRANSITIONAL_DESC=	Compatible syntax tree with old versions
 STRICT_DESC=		New syntax tree quotations kit
 
 OPTIONS_DEFINE=	DOCS
 
 DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
 PORTDOCS=	CHANGES DEVEL ICHANGES MODE README.md UPGRADING
 
 STRICT_CONFIGURE_ON=	--strict
 TRANSITIONAL_CONFIGURE_ON=	--transitional
 
 SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/META \
 	    ${STAGEDIR}${PREFIX}/lib/ocaml/camlp5
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/camlp5*.opt \
 	    ${STAGEDIR}${PREFIX}/${OCAML_LIBDIR}/camlp5/*.o
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-dolmen/Makefile b/devel/ocaml-dolmen/Makefile
index be0f524d1956..e5157f3bc480 100644
--- a/devel/ocaml-dolmen/Makefile
+++ b/devel/ocaml-dolmen/Makefile
@@ -1,95 +1,96 @@
 PORTNAME=	dolmen
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	freebsd@dev.thsi.be
 COMMENT=	Library for writing deduction and logic languages in Objective Caml
 WWW=		https://github.com/Gbury/dolmen
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/menhir:devel/menhir \
 		${SA_DIR}/farith/META:math/ocaml-farith \
 		${SA_DIR}/fmt/META:devel/ocaml-fmt \
 		${SA_DIR}/gen/META:devel/ocaml-gen \
 		${SA_DIR}/linol/META:devel/ocaml-linol \
 		${SA_DIR}/logs/META:devel/ocaml-logs \
 		${SA_DIR}/lsp/META:devel/ocaml-lsp \
 		${SA_DIR}/pp_loc/META:devel/ocaml-pp_loc \
 		${SA_DIR}/ppx_deriving/META:devel/ocaml-ppx_deriving \
 		${SA_DIR}/ppx_hash/META:devel/ocaml-ppx_hash \
 		${SA_DIR}/ppx_yojson_conv/META:devel/ocaml-ppx_yojson_conv \
 		${SA_DIR}/spelll/META:textproc/ocaml-spelll \
 		${SA_DIR}/uutf/META:devel/ocaml-uutf
 LIB_DEPENDS=	libev.so:devel/libev \
 		libgmp.so:math/gmp
 RUN_DEPENDS=	${SA_DIR}/farith/META:math/ocaml-farith \
 		${SA_DIR}/fmt/META:devel/ocaml-fmt \
 		${SA_DIR}/gen/META:devel/ocaml-gen \
 		${SA_DIR}/linol/META:devel/ocaml-linol \
 		${SA_DIR}/logs/META:devel/ocaml-logs \
 		${SA_DIR}/lsp/META:devel/ocaml-lsp \
 		${SA_DIR}/menhirLib/META:devel/menhir \
 		${SA_DIR}/pp_loc/META:devel/ocaml-pp_loc \
 		${SA_DIR}/ppx_deriving/META:devel/ocaml-ppx_deriving \
 		${SA_DIR}/ppx_hash/META:devel/ocaml-ppx_hash \
 		${SA_DIR}/ppx_yojson_conv_lib/META:devel/ocaml-ppx_yojson_conv_lib \
 		${SA_DIR}/spelll/META:textproc/ocaml-spelll \
 		${SA_DIR}/uutf/META:devel/ocaml-uutf
 
 USES=		ocaml:dune
 USE_GITHUB=	yes
 GH_ACCOUNT=	Gbury
 
 USE_OCAML=		yes
 OCAML_PACKAGES=		${PORTNAME} ${PORTNAME}_bin ${PORTNAME}_loop \
 			${PORTNAME}_lsp ${PORTNAME}_model ${PORTNAME}_type
 DUNE_INSTALL_TARGETS=	${OCAML_PACKAGES}
 
 DOCSDIR=	${OCAML_DOCSDIR}
 PORTDOCS=	dolmen/odoc-pages/index.mld \
 		${OCAML_PACKAGES:@p@$p/CHANGES.md $p/LICENSE $p/README.md@}
 
 OPTIONS_DEFINE=	DOCS MANPAGES
 OPTIONS_SUB=	yes
 
 SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "/^version:/s/dev/${PORTVERSION}/" \
 		${WRKSRC}/dolmen.opam \
 		${WRKSRC}/dolmen_bin.opam \
 		${WRKSRC}/dolmen_loop.opam \
 		${WRKSRC}/dolmen_lsp.opam \
 		${WRKSRC}/dolmen_model.opam \
 		${WRKSRC}/dolmen_type.opam
 
 post-install:
 	@${STRIP_CMD} \
 		${STAGEDIR}${PREFIX}/bin/dolmen \
 		${STAGEDIR}${PREFIX}/bin/dolmenls
 	@(cd ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}; \
 		${STRIP_CMD} \
 			dolmen/ae/dolmen_ae.cmxs \
 			dolmen/class/dolmen_class.cmxs \
 			dolmen/dimacs/dolmen_dimacs.cmxs dolmen/dolmen.cmxs \
 			dolmen/icnf/dolmen_icnf.cmxs \
 			dolmen/intf/dolmen_intf.cmxs \
 			dolmen/line/dolmen_line.cmxs \
 			dolmen/smtlib2/dolmen_smtlib2.cmxs \
 			dolmen/smtlib2/poly/dolmen_smtlib2_poly.cmxs \
 			dolmen/smtlib2/v6/dolmen_smtlib2_v6.cmxs \
 			dolmen/smtlib2/v6_response/dolmen_smtlib2_v6_response.cmxs \
 			dolmen/smtlib2/v6_script/dolmen_smtlib2_v6_script.cmxs \
 			dolmen/std/dolmen_std.cmxs \
 			dolmen/tptp/dolmen_tptp.cmxs \
 			dolmen/tptp/v6_3_0/dolmen_tptp_v6_3_0.cmxs \
 			dolmen/zf/dolmen_zf.cmxs dolmen_loop/dolmen_loop.cmxs \
 			dolmen_model/dolmen_model.cmxs \
 			dolmen_type/dolmen_type.cmxs)
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-linol/Makefile b/devel/ocaml-linol/Makefile
index e9397a3a6930..58a2dcbd385d 100644
--- a/devel/ocaml-linol/Makefile
+++ b/devel/ocaml-linol/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	linol
 PORTVERSION=	0.6
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	freebsd@dev.thsi.be
 COMMENT=	Wrapper for ocaml-lsp and JSON-RPC implementation for Objective Caml
 WWW=		https://github.com/c-cube/linol
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${SA_DIR}/logs/META:devel/ocaml-logs \
 		${SA_DIR}/lsp/META:devel/ocaml-lsp \
 		${SA_DIR}/lwt/META:devel/ocaml-lwt \
 		${SA_DIR}/ppx_yojson_conv/META:devel/ocaml-ppx_yojson_conv \
 		${SA_DIR}/trace/META:devel/ocaml-trace \
 		${SA_DIR}/yojson/META:textproc/ocaml-yojson
 RUN_DEPENDS=	${SA_DIR}/logs/META:devel/ocaml-logs \
 		${SA_DIR}/lsp/META:devel/ocaml-lsp \
 		${SA_DIR}/lwt/META:devel/ocaml-lwt \
 		${SA_DIR}/ppx_yojson_conv_lib/META:devel/ocaml-ppx_yojson_conv_lib \
 		${SA_DIR}/trace/META:devel/ocaml-trace \
 		${SA_DIR}/yojson/META:textproc/ocaml-yojson
 
 USES=		ocaml:dune
 USE_GITHUB=	yes
 GH_ACCOUNT=	c-cube
 USE_OCAML=	yes
 OCAML_PACKAGES=	${PORTNAME} ${PORTNAME}-lwt
 DUNE_INSTALL_TARGETS=	${OCAML_PACKAGES}
 
 DOCSDIR=	${OCAML_DOCSDIR}
 PORTDOCS=	${OCAML_PACKAGES:@p@$p/CHANGES.md $p/README.md@}
 
 OPTIONS_DEFINE=	DOCS
 
 SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/${PORTNAME}.cmxs
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-lsp/Makefile b/devel/ocaml-lsp/Makefile
index ba3ac3606bcc..f9ebae9d256a 100644
--- a/devel/ocaml-lsp/Makefile
+++ b/devel/ocaml-lsp/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	ocaml-lsp
 DISTVERSION=	1.19.0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	freebsd@dev.thsi.be
 COMMENT=	Library implementing the LSP and JSONRPC protocols in Objective Caml
 WWW=		https://github.com/Gbury/dolmen
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${SA_DIR}/ppx_yojson_conv/META:devel/ocaml-ppx_yojson_conv \
 		${SA_DIR}/uutf/META:devel/ocaml-uutf \
 		${SA_DIR}/yojson/META:textproc/ocaml-yojson
 RUN_DEPENDS=	${SA_DIR}/ppx_yojson_conv_lib/META:devel/ocaml-ppx_yojson_conv_lib \
 		${SA_DIR}/uutf/META:devel/ocaml-uutf \
 		${SA_DIR}/yojson/META:textproc/ocaml-yojson
 
 USES=		ocaml:dune
 USE_GITHUB=	yes
 GH_ACCOUNT=	ocaml
 
 USE_OCAML=		yes
 OCAML_PACKAGES=		lsp jsonrpc
 DUNE_INSTALL_TARGETS=	${OCAML_PACKAGES}
 
 DOCSDIR=	${OCAML_DOCSDIR}
 PORTDOCS=	${OCAML_PACKAGES:@p@$p/CHANGES.md $p/LICENSE.md $p/README.md@}
 
 OPTIONS_DEFINE=		DOCS LSPSERVER
 LSPSERVER_DESC=		Include ocaml-lsp-server
 LSPSERVER_BROKEN=	needs ocamc-loc
 LSPSERVER_VARS=		ocaml_packages+=ocaml-lsp-server
 
 SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "s/(name lsp)/&\n(version ${DISTVERSION})/" \
 		${WRKSRC}/dune-project
 
 post-install:
 	@${STRIP_CMD} \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/jsonrpc/jsonrpc.cmxs \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lsp/lsp.cmxs
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-ppx_yojson_conv/Makefile b/devel/ocaml-ppx_yojson_conv/Makefile
index 174b0c29ac40..cc33ab7d4d21 100644
--- a/devel/ocaml-ppx_yojson_conv/Makefile
+++ b/devel/ocaml-ppx_yojson_conv/Makefile
@@ -1,48 +1,49 @@
 PORTNAME=	ppx_yojson_conv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.17.0
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	freebsd@dev.thsi.be
 COMMENT=	PPX plugin to derive (de)serialization functions using Yojson
 WWW=		https://github.com/janestreet/ppx_yojson_conv
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${SA_DIR}/base/META:devel/ocaml-base \
 		${SA_DIR}/ppx_js_style/META:devel/ocaml-ppx_js_style \
 		${SA_DIR}/ppx_yojson_conv_lib/META:devel/ocaml-ppx_yojson_conv_lib \
 		${SA_DIR}/ppxlib/META:devel/ocaml-ppxlib \
 		${SA_DIR}/sexplib0/META:devel/ocaml-sexplib0 \
 		${SA_DIR}/yojson/META:textproc/ocaml-yojson
 RUN_DEPENDS=	${SA_DIR}/base/META:devel/ocaml-base \
 		${SA_DIR}/ppx_yojson_conv_lib/META:devel/ocaml-ppx_yojson_conv_lib \
 		${SA_DIR}/ppxlib/META:devel/ocaml-ppxlib \
 		${SA_DIR}/sexplib0/META:devel/ocaml-sexplib0 \
 		${SA_DIR}/yojson/META:textproc/ocaml-yojson
 
 USES=		ocaml:dune
 USE_GITHUB=	yes
 GH_ACCOUNT=	janestreet
 USE_OCAML=	yes
 
 DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
 PORTDOCS=	LICENSE.md README.org
 
 OPTIONS_DEFINE=	DOCS
 
 SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "s/(lang dune 3.11)/(lang dune 3.7)/" \
 		${WRKSRC}/dune-project
 
 post-install:
 	@${STRIP_CMD} \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/ppx_yojson_conv/expander/ppx_yojson_conv_expander.cmxs \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/ppx_yojson_conv/ppx_yojson_conv.cmxs
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-ppx_yojson_conv_lib/Makefile b/devel/ocaml-ppx_yojson_conv_lib/Makefile
index 48af0f7bbb32..b41b1d12c380 100644
--- a/devel/ocaml-ppx_yojson_conv_lib/Makefile
+++ b/devel/ocaml-ppx_yojson_conv_lib/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	ppx_yojson_conv_lib
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.17.0
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	freebsd@dev.thsi.be
 COMMENT=	Runtime library for ppx_yojson_conv
 WWW=		https://github.com/janestreet/ppx_yojson_conv_lib
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${SA_DIR}/yojson/META:textproc/ocaml-yojson
 RUN_DEPENDS=	${SA_DIR}/yojson/META:textproc/ocaml-yojson
 
 USES=		ocaml:dune
 USE_GITHUB=	yes
 GH_ACCOUNT=	janestreet
 USE_OCAML=	yes
 
 DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
 PORTDOCS=	LICENSE.md
 
 OPTIONS_DEFINE=	DOCS
 
 SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "s/(lang dune 3.11)/(lang dune 3.7)/" \
 		${WRKSRC}/dune-project
 
 post-install:
 	@${STRIP_CMD} \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/${PORTNAME}.cmxs
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-re/Makefile b/devel/ocaml-re/Makefile
index e8a52fc2c8ba..3acfdd2cba10 100644
--- a/devel/ocaml-re/Makefile
+++ b/devel/ocaml-re/Makefile
@@ -1,44 +1,39 @@
 PORTNAME=	re
 PORTVERSION=	1.11.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Pure OCaml regular expressions
 WWW=		https://github.com/ocaml/ocaml-re
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${SA_DIR}/seq/META:devel/ocaml-seq
-RUN_DEPENDS=	${SA_DIR}/seq/META:devel/ocaml-seq
-
 USES=		ocaml:dune
 USE_GITHUB=	yes
 GH_ACCOUNT=	ocaml
 GH_PROJECT=	${PKGNAMEPREFIX}${PORTNAME}
 USE_OCAML=	yes
 
 DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
 PORTDOCS=	CHANGES.md LICENSE.md README.md
 
 OPTIONS_DEFINE=	DOCS
 
-SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
-
 post-patch:
 	${REINPLACE_CMD} \
 		-e "s/(name ${PORTNAME})/&\n (version ${PORTVERSION})/" \
 		${WRKSRC}/dune-project
 
 post-install:
 	${STRIP_CMD} \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/emacs/re_emacs.cmxs \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/glob/re_glob.cmxs \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/pcre/re_pcre.cmxs \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/str/re_str.cmxs \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/perl/re_perl.cmxs \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/posix/re_posix.cmxs \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/re.cmxs
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-re/files/patch-lib_dune b/devel/ocaml-re/files/patch-lib_dune
new file mode 100644
index 000000000000..dab1e1998729
--- /dev/null
+++ b/devel/ocaml-re/files/patch-lib_dune
@@ -0,0 +1,8 @@
+--- lib/dune.orig	2023-08-19 10:51:09 UTC
++++ lib/dune
+@@ -1,5 +1,4 @@
+ (library
+  (name re)
+  (synopsis "Pure OCaml regular expression library")
+- (libraries seq)
+  (public_name re))
diff --git a/devel/ocaml-seq/Makefile b/devel/ocaml-seq/Makefile
index e130084dbcec..e301063c52ce 100644
--- a/devel/ocaml-seq/Makefile
+++ b/devel/ocaml-seq/Makefile
@@ -1,28 +1,31 @@
 PORTNAME=	seq
 PORTVERSION=	0.2.2
 DISTVERSIONPREFIX=	${PKGNAMEPREFIX}${PORTNAME}-
 PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	freebsd@dev.thsi.be
 COMMENT=	Compatibility library for the iterator type of OCaml
 WWW=		https://github.com/c-cube/seq
 
 LICENSE=	LGPL21
 
+DEPRECATED=	Seq is provided by lang/ocaml.
+EXPIRATION_DATE=	2024-12-10
+
 USES=		ocaml:dune
 USE_GITHUB=	yes
 GH_ACCOUNT=	c-cube
 GH_TAGNAME=	6934813195285661cba3e017e7d3cd79d362bb2f
 USE_OCAML=	yes
 
 DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
 PORTDOCS=	LICENSE README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/seq.cmxs
 
 .include <bsd.port.mk>
diff --git a/math/alt-ergo/Makefile b/math/alt-ergo/Makefile
index 5978e3fa0760..9dd6ce4db55c 100644
--- a/math/alt-ergo/Makefile
+++ b/math/alt-ergo/Makefile
@@ -1,75 +1,76 @@
 PORTNAME=	alt-ergo
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.4
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	freebsd@dev.thsi.be
 COMMENT=	Automatic solver of mathematical formulas for program verification
 WWW=		https://alt-ergo.ocamlpro.com
 
 LICENSE=	CeCILL-C
 LICENSE_NAME=	Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre] C license, version 1
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_powerpc64=	fails to compile: Assembler messages: /tmp/camlasm2822e8.s:10348: Error: operand out of range
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/menhir:devel/menhir \
 		${SA_DIR}/dolmen/META:devel/ocaml-dolmen \
 		${SA_DIR}/num/META:math/ocaml-num \
 		${SA_DIR}/ocplib-simplex/META:math/ocaml-ocplib-simplex \
 		${SA_DIR}/ppx_blob/META:devel/ocaml-ppx_blob \
 		${SA_DIR}/psmt2-frontend/META:devel/ocaml-psmt2-frontend \
 		${SA_DIR}/zarith/META:math/ocaml-zarith \
 		${SA_DIR}/zip/META:archivers/ocaml-zip
 LIB_DEPENDS=	libgmp.so:math/gmp
 RUN_DEPENDS=	${SA_DIR}/dolmen/META:devel/ocaml-dolmen \
 		${SA_DIR}/num/META:math/ocaml-num \
 		${SA_DIR}/ocplib-simplex/META:math/ocaml-ocplib-simplex \
 		${SA_DIR}/ppx_blob/META:devel/ocaml-ppx_blob \
 		${SA_DIR}/psmt2-frontend/META:devel/ocaml-psmt2-frontend \
 		${SA_DIR}/zarith/META:math/ocaml-zarith \
 		${SA_DIR}/zip/META:archivers/ocaml-zip
 
 USES=		ocaml:dune
 USE_GITHUB=	yes
 GH_ACCOUNT=	OCamlPro
 
 USE_OCAML=		yes
 OCAML_PACKAGES=		alt-ergo alt-ergo-lib alt-ergo-parsers
 DUNE_INSTALL_TARGETS=	${OCAML_PACKAGES}
 
 DOCSDIR=	${OCAML_DOCSDIR}
 PORTDOCS=	${OCAML_PACKAGES:@p@$p/CHANGES.md $p/LICENSE.md $p/README.md $p/odoc-pages/index.mld@} \
 		alt-ergo/odoc-pages/index_common.mld \
 		alt-ergo/odoc-pages/index_fmsimplex.mld
 
 OPTIONS_DEFINE=	DOCS MANPAGES
 OPTIONS_SUB=	yes
 
 SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e "s/(version dev)/(version ${PORTVERSION})/" \
 		${WRKSRC}/dune-project
 	@${REINPLACE_CMD} \
 		-e "s/ seq//" -e "s/ stdlib-shims//" \
 		${WRKSRC}/src/bin/common/dune \
 		${WRKSRC}/src/lib/dune \
 		${WRKSRC}/src/parsers/dune
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/alt-ergo \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/alt-ergo-lib/AltErgoLib.cmxs \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/alt-ergo-lib/__private__/alt_ergo_prelude/alt_ergo_prelude.cmxs \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/alt-ergo-parsers/AltErgoParsers.cmxs \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/alt-ergo/__private__/alt_ergo_common/alt_ergo_common.cmxs \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/alt-ergo/plugins/FmSimplexPlugin.cmxs
 
 do-test:
 	@(cd ${TEST_WRKSRC} && \
 		${SETENV} ${TEST_ENV} ${DUNE_ENV} ${DUNE_CMD} build @tests/gentest --auto-promote && \
 		${SETENV} ${TEST_ENV} ${DUNE_ENV} ${DUNE_CMD} build @runtest @runtest-quick @runtest-ci)
 
 .include <bsd.port.mk>
diff --git a/textproc/ocaml-yojson/Makefile b/textproc/ocaml-yojson/Makefile
index 74cf8f8fd440..e504e8216025 100644
--- a/textproc/ocaml-yojson/Makefile
+++ b/textproc/ocaml-yojson/Makefile
@@ -1,36 +1,34 @@
 PORTNAME=	yojson
 DISTVERSION=	2.2.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	freebsd@dev.thsi.be
 COMMENT=	JSON library for OCaml
 WWW=		https://github.com/ocaml-community/yojson/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-BUILD_DEPENDS=	${SA_DIR}/seq/META:devel/ocaml-seq \
-		cppo:devel/ocaml-cppo
-RUN_DEPENDS=	${SA_DIR}/seq/META:devel/ocaml-seq
+BUILD_DEPENDS=	cppo:devel/ocaml-cppo
 
 USES=		ocaml:dune
 USE_GITHUB=	yes
 GH_ACCOUNT=	ocaml-community
 USE_OCAML=	yes
 
 DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
 
 PORTDOCS=	CHANGES.md LICENSE.md README.md odoc-pages/index.mld
 
 OPTIONS_DEFINE=	DOCS
 
 DUNE_INSTALL_TARGETS=	${OCAML_PACKAGES}
-SA_DIR=			${LOCALBASE}/${OCAML_SITELIBDIR}
 
 post-install:
 	@${STRIP_CMD} \
 		${STAGEDIR}${PREFIX}/bin/ydump \
 		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/${PORTNAME}.cmxs
 
 .include <bsd.port.mk>
diff --git a/textproc/ocaml-yojson/files/patch-dune-project b/textproc/ocaml-yojson/files/patch-dune-project
new file mode 100644
index 000000000000..f71c3714a767
--- /dev/null
+++ b/textproc/ocaml-yojson/files/patch-dune-project
@@ -0,0 +1,12 @@
+--- dune-project.orig	2024-06-27 14:38:13 UTC
++++ dune-project
+@@ -18,8 +18,7 @@ yojson package.")
+   (documentation "https://ocaml.org/p/yojson/latest")
+   (depends
+     (ocaml (>= 4.02.3))
+-    (alcotest (and :with-test (>= 0.8.5)))
+-    (seq (>= 0.2.2))))
++    (alcotest (and :with-test (>= 0.8.5)))))
+ 
+ (package
+   (name yojson-five)
diff --git a/textproc/ocaml-yojson/files/patch-lib_dune b/textproc/ocaml-yojson/files/patch-lib_dune
new file mode 100644
index 000000000000..e6e4465ee7c8
--- /dev/null
+++ b/textproc/ocaml-yojson/files/patch-lib_dune
@@ -0,0 +1,9 @@
+--- lib/dune.orig	2024-06-27 14:38:13 UTC
++++ lib/dune
+@@ -115,6 +115,5 @@
+  (public_name yojson)
+  (modules yojson t basic safe raw common codec lexer_utils)
+  (synopsis "JSON parsing and printing")
+- (libraries seq)
+  (flags
+   (:standard -w -27-32)))