ocaml: Updates to ocaml compiler and several ocaml ports

- Update devel/ocaml to 4.14.2 [1] - Specify runtime dependency on GNU AS as full path, this fixes build on armv6 - armv7 [1] [2] - converters/ocaml-base64: Update to 3.5.1, add LICENSE, other improvements - converters/ocaml-jsonm: Strip shared objects [3] - databases/ocaml-dbm: Update to 1.3, move to gitlub, other improvements - devel/menhir: Update to 20231231 - devel/ocaml-base: Unbreak non-x86 [2] - devel/ocaml-camlp-streams: Silence patch and strip commands - devel/ocaml-ipaddr: Update to 5.5.0 - devel/ocaml-lwt: Update to 5.7.0 [4] - devel/ocaml-result: Set package version, strip shared objects [5] - devel/ocaml-sexplib: Resurrect and update to 0.16.0. - devel/ocaml-stdio: Update to 0.17.0 - security/ocaml-cryptokit: Update to 1.19, add LICENSE, other improvements - security/ocaml-ssl: Update to 0.7.0, install stublibs in package directory [6] - x11-toolkits/ocaml-graphics: Reorder Makefile, silence patch command - Bump PORTREVISION on ports requiring it after update. Adding ports: - devel/ocaml-cstruct - devel/ocaml-compiler-libs [7] - devel/ocaml-ppx_derivers [7] - devel/ocaml-ppxlib [7] - devel/ocaml-domain-name - devel/ocaml-ocplib-endian [8] - devel/ocaml-parsexp - devel/ocaml-ppx_sexp_conv - security/ocaml-lwt_ssl [9] Resetting maintainership from michipili@gmail.com due to multiple timeouts and long term unresponsiveness. Assigning maintainership of lang/ocaml to author of this patch. Many thanks to him for his work! PR: 278300 [1], 278791 [2], 277818 [3], 277781 [4], 277775 [6], 277779 [7], 277780 [8], 277782 [9] Approved by: michipili@gmail.com (maintainer timeout) [1], danfe@FreeBSD.org (maintainer timeout) [3] [4] [6], fixit, avoid breakage [5] Differential Revision: https://reviews.freebsd.org/D45254
2024-11-18 00:10:04 +00:00 · 2024-05-22 19:06:27 +02:00 · 2024-05-22 19:06:27 +02:00 · bb2bea65db
commit bb2bea65db
parent 1e1a1e9ebc
148 changed files with 2356 additions and 373 deletions
--- a/1
+++ b/1
@ -2291,7 +2291,6 @@ www/kristall||2023-07-02|Has expired: Requires older openssl
 sysutils/cfengine-masterfiles318||2023-07-02|Has expired: Expire one year after cfengine-masterfiles 3.19.0 released
 sysutils/cfengine318||2023-07-02|Has expired: Expire one year after cfengine 3.19.0 released
 devel/linux-c7-dbus-glib||2023-07-02|Merged into devel/linux-c7-dbus-libs
-devel/ocaml-sexplib|devel/ocaml-sexplib0|2023-07-05|Project renamed
 net/nuster||2023-07-08|Has expired: Does not support OpenSSL 3 and upstream last release was in 2020
 devel/godot2-tools|devel/godot-tools|2023-07-08|Has expired: Requires legacy OpenSSL 1.1.1 so use devel/godot
 devel/rubygem-aws-sdk-core3172|devel/rubygem-aws-sdk-core|2023-07-09|Remove obsoleted port. Use devel/rubygem-aws-sdk-core instead
--- a/archivers/ocaml-bz2/Makefile
+++ b/archivers/ocaml-bz2/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	bz2
 PORTVERSION=	0.6.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	archivers
 MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/72/
 PKGNAMEPREFIX=	ocaml-
--- a/archivers/ocaml-zip/Makefile
+++ b/archivers/ocaml-zip/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	zip
 PORTVERSION=	1.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers
 PKGNAMEPREFIX=	ocaml-
 DISTNAME=	caml${PORTNAME}-${PORTVERSION}
--- a/converters/ocaml-base64/Makefile
+++ b/converters/ocaml-base64/Makefile
@ -1,7 +1,6 @@
 PORTNAME=	base64
-PORTVERSION=	2.0.0
+PORTVERSION=	3.5.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 CATEGORIES=	converters
 PKGNAMEPREFIX=	ocaml-

@ -9,22 +8,43 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Base64 encoding and decoding in OCaml
 WWW=		https://github.com/mirage/ocaml-base64

-BUILD_DEPENDS=	ocamlbuild:devel/ocaml-ocamlbuild
+LICENSE=	ISCL
+LICENSE_FILE=	${WRKSRC}/LICENSE.md

+BUILD_DEPENDS=	${SA_DIR}/bos/META:devel/ocaml-bos \
+		${SA_DIR}/fmt/META:devel/ocaml-fmt \
+		${SA_DIR}/rresult/META:devel/ocaml-rresult
+RUN_DEPENDS=	${SA_DIR}/bos/META:devel/ocaml-bos \
+		${SA_DIR}/fmt/META:devel/ocaml-fmt \
+		${SA_DIR}/rresult/META:devel/ocaml-rresult
+
+USES=		ocaml:dune
 USE_GITHUB=	yes
 GH_ACCOUNT=	mirage
 GH_PROJECT=	ocaml-base64
+USE_OCAML=	yes

-USES=			gmake
-HAS_CONFIGURE=		yes
-MAKE_JOBS_UNSAFE=	yes
+DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
+PORTDOCS=	CHANGES.md LICENSE.md README.md

-USE_OCAML=		yes
-USE_OCAML_FINDLIB=	yes
-USE_OCAMLFIND_PLIST=	yes
-USE_OCAML_LDCONFIG=	yes
-DOCSDIR=	${PREFIX}/share/doc/pcre-ocaml
+OPTIONS_DEFINE=	DOCS

-CONFIGURE_ARGS=		--destdir="${DESTDIRNAME}"
+SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
+
+post-patch:
+	@${REINPLACE_CMD} \
+		-e "s/(name ${PORTNAME})/&\n (version ${PORTVERSION})/" \
+		${WRKSRC}/dune-project
+
+post-install:
+	@(cd ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}; \
+	${STRIP_CMD} \
+		base64/base64.cmxs \
+		base64/rfc2045/base64_rfc2045.cmxs)
+	# this port never shipped stublibs
+	# cleanup from older port's wrong USE_OCAML_LDCONFIG
+	@${ECHO_CMD} @postexec ${SED} -i "''" -e \
+		"'/^${PREFIX:S#/#\/#g}\/${OCAML_SITELIBDIR:S#/#\/#g}\/base64$$/d'" \
+		%D/${OCAML_LDCONF}  >> ${TMPPLIST}

 .include <bsd.port.mk>
--- a/converters/ocaml-base64/distinfo
+++ b/converters/ocaml-base64/distinfo
@ -1,2 +1,3 @@
-SHA256 (mirage-ocaml-base64-v2.0.0_GH0.tar.gz) = 029b6a7af1493a077dc25c8e0f3534e5f5ff6e4260e3998a9ca3850fb7238c2c
-SIZE (mirage-ocaml-base64-v2.0.0_GH0.tar.gz) = 46084
+TIMESTAMP = 1710548595
+SHA256 (mirage-ocaml-base64-v3.5.1_GH0.tar.gz) = f3e8b9be43567689064b419fa5eefd9c758f00b864e9f731a0dbc1b9fecfc768
+SIZE (mirage-ocaml-base64-v3.5.1_GH0.tar.gz) = 18986
--- a/converters/ocaml-base64/pkg-plist
+++ b/converters/ocaml-base64/pkg-plist
@ -0,0 +1,31 @@
+%%OCAML_SITELIBDIR%%/base64/META
+%%OCAML_SITELIBDIR%%/base64/base64.a
+%%OCAML_SITELIBDIR%%/base64/base64.cma
+%%OCAML_SITELIBDIR%%/base64/base64.cmi
+%%OCAML_SITELIBDIR%%/base64/base64.cmt
+%%OCAML_SITELIBDIR%%/base64/base64.cmti
+%%OCAML_SITELIBDIR%%/base64/base64.cmx
+%%OCAML_SITELIBDIR%%/base64/base64.cmxa
+%%OCAML_SITELIBDIR%%/base64/base64.cmxs
+%%OCAML_SITELIBDIR%%/base64/base64.ml
+%%OCAML_SITELIBDIR%%/base64/base64.mli
+%%OCAML_SITELIBDIR%%/base64/base64__.cmi
+%%OCAML_SITELIBDIR%%/base64/base64__.cmt
+%%OCAML_SITELIBDIR%%/base64/base64__.cmx
+%%OCAML_SITELIBDIR%%/base64/base64__.ml
+%%OCAML_SITELIBDIR%%/base64/base64__Unsafe.cmi
+%%OCAML_SITELIBDIR%%/base64/base64__Unsafe.cmt
+%%OCAML_SITELIBDIR%%/base64/base64__Unsafe.cmx
+%%OCAML_SITELIBDIR%%/base64/dune-package
+%%OCAML_SITELIBDIR%%/base64/opam
+%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.a
+%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.cma
+%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.cmi
+%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.cmt
+%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.cmti
+%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.cmx
+%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.cmxa
+%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.cmxs
+%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.ml
+%%OCAML_SITELIBDIR%%/base64/rfc2045/base64_rfc2045.mli
+%%OCAML_SITELIBDIR%%/base64/unsafe.ml
--- a/converters/ocaml-jsonm/Makefile
+++ b/converters/ocaml-jsonm/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	jsonm
 PORTVERSION=	1.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	converters
 MASTER_SITES=	https://erratique.ch/software/jsonm/releases/
 PKGNAMEPREFIX=	ocaml-
@ -33,4 +33,9 @@ do-install:
 		--docdir=${OCAML_DOCSDIR:S,^${PREFIX}/,,} \
 		--libdir=${OCAML_SITELIBDIR} ${PORTNAME}.install

+post-install:
+	@${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/bin/jsontrip \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/jsonm/jsonm.cmxs
+
 .include <bsd.port.mk>
--- a/databases/ocaml-dbm/Makefile
+++ b/databases/ocaml-dbm/Makefile
@ -1,31 +1,40 @@
 PORTNAME=	dbm
-PORTVERSION=	1.0
-PORTREVISION=	2
+PORTVERSION=	1.3
+DISTVERSIONPREFIX=	camldbm-
 CATEGORIES=	databases
-MASTER_SITES=	https://forge.ocamlcore.org/frs/download.php/728/
 PKGNAMEPREFIX=	ocaml-
-DISTNAME=	caml${PORTNAME}-${PORTVERSION}
+
+EXTRA_PATCHES=	${PATCHDIR}/3bb91d6-revised-configuration:-p1

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OCaml binding to the NDBM and GDBM database library
-WWW=		https://forge.ocamlcore.org/projects/camldbm/
+WWW=		https://github.com/ocaml/dbm

-LICENSE=	LGPL20
+LICENSE=	LGPL20 # with a special exception to clause 6

-CONFLICTS=	ocaml-[0-3]* ocaml-nox11-[0-3]*
-
-USES=		tar:tgz
-HAS_CONFIGURE=	yes
+USE_GITHUB=	yes
 USE_OCAML=	yes
-DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
-MAKE_ENV+=	DESTDIR="${STAGEDIR}"
+GH_ACCOUNT=	ocaml
+USE_OCAML_LDCONFIG=	yes
+
+DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
+HAS_CONFIGURE=	yes
+MAKE_ENV+=	LIBDIR="${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/dbm" \
+		STUBLIBDIR="${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/dbm"
+
+post-patch:
+	@${REINPLACE_CMD} \
+		-E 's/^(LIBDIR|STUBLIBDIR)=/\1?=/' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} \
+		-e 's/^version =.*/version = "${PORTVERSION}"/' ${WRKSRC}/META

 pre-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/dbm \
-		${STAGEDIR}${PREFIX}/lib/ocaml/stublibs
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/dbm

 post-install:
-	${INSTALL_DATA} ${WRKSRC}/META \
+	@${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/dbm/dllcamldbm.so
+	@${INSTALL_DATA} ${WRKSRC}/META \
 		${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/dbm

 .include <bsd.port.mk>
--- a/databases/ocaml-dbm/distinfo
+++ b/databases/ocaml-dbm/distinfo
@ -1,2 +1,3 @@
-SHA256 (camldbm-1.0.tgz) = 19741fa7827c306ae43b18170b01f5547326ec7ea6c2f4bd80c93439b5ff538f
-SIZE (camldbm-1.0.tgz) = 14397
+TIMESTAMP = 1710705889
+SHA256 (ocaml-dbm-camldbm-1.3_GH0.tar.gz) = 126fd020be0dd13be7e8854fcd3637392ff039c8b865243bb4dad15a954a0da7
+SIZE (ocaml-dbm-camldbm-1.3_GH0.tar.gz) = 14831
--- a/databases/ocaml-dbm/files/3bb91d6-revised-configuration
+++ b/databases/ocaml-dbm/files/3bb91d6-revised-configuration
@ -0,0 +1,127 @@
+From 3bb91d6ffd700f9211a84dd2fc80c428bfcf5510 Mon Sep 17 00:00:00 2001
+From: Xavier Leroy <xavierleroy@users.noreply.github.com>
+Date: Wed, 20 Jul 2022 11:18:18 +0200
+Subject: [PATCH] Revised autoconfiguration (#16)
+
+- Let the C compiler find the ndbm.h or gdbm.h files
+  (instead of looking for them in specific directories).
+- Don't use the gdbm-ndbm.h compatibility mode, it no longer exists.
+---
+ cldbm.c   |  4 +---
+ configure | 69 ++++++++++++++++++++++---------------------------------
+ 2 files changed, 29 insertions(+), 44 deletions(-)
+
+diff --git a/cldbm.c b/cldbm.c
+index 34e2d37..0fa4d13 100644
+--- a/cldbm.c
+++ b/cldbm.c
+@@ -21,9 +21,7 @@
+ #include <caml/fail.h>
+ #include <caml/callback.h>
+ 
+-#ifdef DBM_USES_GDBM_NDBM
+-#include <gdbm-ndbm.h>
+-#elif defined DBM_COMPAT
+#ifdef DBM_COMPAT
+ #include <ndbm.h>
+ #else
+ #include <gdbm.h>
+diff --git a/configure b/configure
+index 9a3d094..e049218 100755
+--- a/configure
+++ b/configure
+@@ -36,7 +36,7 @@ hasgot() {
+    fi
+    echo '  return 0;'
+    echo '}') > hasgot.c
+-  ${CC:-cc} -I$1 -o hasgot.exe hasgot.c $3 $4
+  ${CC:-cc} $1 -o hasgot.exe hasgot.c $3 2>/dev/null
+   res=$?
+   rm -f hasgot.c hasgot.exe
+   return $res
+@@ -46,58 +46,45 @@ dbm_include="not found"
+ dbm_link="not found"
+ dbm_defines=""
+ 
+-for dir in /usr/include /usr/include/db1 /usr/include/gdbm /usr/local/include; do
+-  if test -f $dir/ndbm.h; then
+-    dbm_include=$dir
+-    dbm_defines="-DDBM_COMPAT"
+-    if hasgot $dir ndbm.h; then
+-      dbm_link=""
+-    elif hasgot $dir ndbm.h -lndbm; then
+-      dbm_link="-lndbm"
+-    elif hasgot $dir ndbm.h -ldb1; then
+-      dbm_link="-ldb1"
+-    elif hasgot $dir ndbm.h -lgdbm; then
+-      dbm_link="-lgdbm"
+-    elif hasgot $dir ndbm.h -lgdbm_compat -lgdbm; then
+-      dbm_link="-lgdbm_compat -lgdbm"
+for include in \
+      "" \
+      "-I/usr/include/db1" \
+      "-I/usr/include/gdbm" \
+      "-I/usr/local/include" \
+      "-I/opt/homebrew/include" ; do
+    if hasgot "$include" ndbm.h ""; then
+        dbm_include="$include"
+        dbm_defines="-DDBM_COMPAT"
+        dbm_link=""
+        break
+    elif hasgot "$include" gdbm.h -lgdbm; then
+        dbm_include="$include"
+        dbm_link="-lgdbm"
+        break
+    elif hasgot "$include" ndbm.h -lndbm; then
+        dbm_include="$include"
+        dbm_defines="-DDBM_COMPAT"
+        dbm_link="-lndbm"
+        break
+    elif hasgot "$include" ndbm.h -ldb1; then
+        dbm_include="$include"
+        dbm_defines="-DDBM_COMPAT"
+        dbm_link="-ldb1"
+        break
+     fi
+-    break
+-  fi
+-  if test -f $dir/gdbm-ndbm.h; then
+-    dbm_include=$dir
+-    dbm_defines="-DDBM_COMPAT -DDBM_USES_GDBM_NDBM"
+-    if hasgot $dir gdbm-ndbm.h -lgdbm_compat -lgdbm; then
+-      dbm_link="-lgdbm_compat -lgdbm"
+-    fi
+-    break
+-  fi
+-  if test -f $dir/gdbm.h; then
+-    dbm_include=$dir
+-    if hasgot $dir gdbm.h -lgdbm; then
+-      dbm_link="-lgdbm"
+-    fi
+-    break
+-  fi
+ done
+ if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
+-  echo "NDBM not found, the \"camldbm\" library cannot be built."
+  echo "NDBM and GDBM not found, the \"camldbm\" library cannot be built."
+   exit 2
+ fi
+ 
+ echo "Configuration for the \"camldbm\" library:"
+-echo "        headers found in ......... $dbm_include"
+-echo "        options for compiling .... $dbm_defines"
+echo "        options for compiling .... $dbm_include $dbm_defines"
+ echo "        options for linking ...... $dbm_link"
+ echo
+ echo "Configuration successful"
+ echo
+ 
+-if test "$dbm_include" = "/usr/include"; then
+-  dbm_include=""
+-else
+-  dbm_include="-I$dbm_include"
+-fi
+-
+ echo "OCAML_STDLIB=$stdlib" > Makefile.config
+ echo "DBM_INCLUDES=$dbm_include" >> Makefile.config
+ echo "DBM_LINK=$dbm_link" >> Makefile.config
--- a/databases/ocaml-dbm/files/patch-META
+++ b/databases/ocaml-dbm/files/patch-META
@ -1,10 +0,0 @@
-$NetBSD: patch-META,v 1.1 2013/07/21 17:04:29 jaapb Exp $
-
-point to correct directory for library files
--- META.orig	2011-11-22 15:56:49.000000000 +0000
-+++ META
-@@ -3,3 +3,4 @@ requires = ""
- version = "1.0"
- archive(byte) = "dbm.cma"
- archive(native) = "dbm.cmxa"
-+directory = "^"
--- a/databases/ocaml-dbm/files/patch-Makefile
+++ b/databases/ocaml-dbm/files/patch-Makefile
@ -1,27 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2012/12/15 10:25:52 jaapb Exp $
-
-Install into DESTDIR
--- Makefile.orig	2011-11-22 15:56:49.000000000 +0000
-+++ Makefile
-@@ -57,13 +57,14 @@ depend:
- 	$(OCAMLDEP) *.ml *.mli > .depend
- 
- install::
-	if test -f dllcamldbm.$(SO); then cp dllcamldbm.$(SO) $(STUBLIBDIR)/; fi 
-	cp libcamldbm.$(A) $(LIBDIR)/
-	cd $(LIBDIR) && ranlib libcamldbm.$(A)
-	cp dbm.cma dbm.cmxa dbm.cmi dbm.mli $(LIBDIR)/
-	cp dbm.$(A) $(LIBDIR)/
-	cd $(LIBDIR) && ranlib dbm.$(A)
-	if test -f dbm.cmxs; then cp dbm.cmxs $(LIBDIR)/; fi
-+	if test -f dllcamldbm.$(SO); then cp dllcamldbm.$(SO) \
-+	$(DESTDIR)/$(STUBLIBDIR)/; fi 
-+	cp libcamldbm.$(A) $(DESTDIR)/$(LIBDIR)/
-+	cd $(DESTDIR)/$(LIBDIR) && ranlib libcamldbm.$(A)
-+	cp dbm.cma dbm.cmxa dbm.cmi dbm.mli $(DESTDIR)/$(LIBDIR)/
-+	cp dbm.$(A) $(DESTDIR)/$(LIBDIR)/
-+	cd $(DESTDIR)/$(LIBDIR) && ranlib dbm.$(A)
-+	if test -f dbm.cmxs; then cp dbm.cmxs $(DESTDIR)/$(LIBDIR)/; fi
- 
- clean::
- 	rm -f *.cm* *.$(O) *.$(A) *.$(SO)
--- a/databases/ocaml-dbm/pkg-plist
+++ b/databases/ocaml-dbm/pkg-plist
@ -1,9 +1,10 @@
-lib/ocaml/dbm.a
-lib/ocaml/dbm.cma
-lib/ocaml/dbm.cmi
-lib/ocaml/dbm.cmxa
-lib/ocaml/dbm.cmxs
-lib/ocaml/dbm.mli
-lib/ocaml/libcamldbm.a
-lib/ocaml/site-lib/dbm/META
-lib/ocaml/stublibs/dllcamldbm.so
+%%OCAML_SITELIBDIR%%/dbm/META
+%%OCAML_SITELIBDIR%%/dbm/dbm.a
+%%OCAML_SITELIBDIR%%/dbm/dbm.cma
+%%OCAML_SITELIBDIR%%/dbm/dbm.cmi
+%%OCAML_SITELIBDIR%%/dbm/dbm.cmx
+%%OCAML_SITELIBDIR%%/dbm/dbm.cmxa
+%%OCAML_SITELIBDIR%%/dbm/dbm.cmxs
+%%OCAML_SITELIBDIR%%/dbm/dbm.mli
+%%OCAML_SITELIBDIR%%/dbm/dllcamldbm.so
+%%OCAML_SITELIBDIR%%/dbm/libcamldbm.a
--- a/databases/ocaml-mysql/Makefile
+++ b/databases/ocaml-mysql/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	mysql
 PORTVERSION=	1.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://ygrek.org.ua/p/release/ocaml-mysql/
 PKGNAMEPREFIX=	ocaml-
--- a/databases/ocaml-sqlite3/Makefile
+++ b/databases/ocaml-sqlite3/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	sqlite3
 PORTVERSION=	4.0.5
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 PKGNAMEPREFIX=	ocaml-

--- a/devel/Makefile
+++ b/devel/Makefile
@ -1717,8 +1717,11 @@
    SUBDIR += ocaml-cfg
    SUBDIR += ocaml-classes
    SUBDIR += ocaml-cmdliner
+    SUBDIR += ocaml-compiler-libs
    SUBDIR += ocaml-cppo
    SUBDIR += ocaml-csexp
+    SUBDIR += ocaml-cstruct
+    SUBDIR += ocaml-domain-name
    SUBDIR += ocaml-dune
    SUBDIR += ocaml-extlib
    SUBDIR += ocaml-findlib
@ -1731,13 +1734,18 @@
    SUBDIR += ocaml-magic
    SUBDIR += ocaml-mtime
    SUBDIR += ocaml-ocamlbuild
+    SUBDIR += ocaml-ocplib-endian
    SUBDIR += ocaml-opam
    SUBDIR += ocaml-ounit
    SUBDIR += ocaml-parmap
+    SUBDIR += ocaml-parsexp
    SUBDIR += ocaml-pcre
    SUBDIR += ocaml-pcre2
    SUBDIR += ocaml-pomap
+    SUBDIR += ocaml-ppx_derivers
+    SUBDIR += ocaml-ppx_sexp_conv
    SUBDIR += ocaml-ppx-tools
+    SUBDIR += ocaml-ppxlib
    SUBDIR += ocaml-re
    SUBDIR += ocaml-react
    SUBDIR += ocaml-res
@ -1747,6 +1755,7 @@
    SUBDIR += ocaml-sem
    SUBDIR += ocaml-seq
    SUBDIR += ocaml-sexplib0
+    SUBDIR += ocaml-sexplib
    SUBDIR += ocaml-stdio
    SUBDIR += ocaml-topkg
    SUBDIR += ocaml-type_conv
--- a/devel/coccinelle/Makefile
+++ b/devel/coccinelle/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	coccinelle
 PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel

 MAINTAINER=	ports@FreeBSD.org
--- a/devel/menhir/Makefile
+++ b/devel/menhir/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	menhir
-PORTVERSION=	20170712
-PORTREVISION=	2
+PORTVERSION=	20231231
 CATEGORIES=	devel
 MASTER_SITES=	http://cristal.inria.fr/~fpottier/menhir/

@ -11,32 +10,23 @@ WWW=		http://cristal.inria.fr/~fpottier/menhir
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE

-BUILD_DEPENDS=	ocamlbuild:devel/ocaml-ocamlbuild
-
-USES=		gmake shebangfix
+USES=		ocaml:dune
+USE_GITLAB=	yes
 USE_OCAML=	yes
-USE_OCAML_FINDLIB=	yes
-USE_OCAMLFIND_PLIST=	yes
-OCAML_PKGDIRS=		menhirLib
+GL_SITE=	https://gitlab.inria.fr/
+GL_ACCOUNT=	fpottier
+OCAML_PACKAGES=		menhir menhirLib menhirSdk
+DUNE_INSTALL_TARGETS=	${OCAML_PACKAGES}

-SHEBANG_FILES=	demos/find-menhir.sh
-MAKE_JOBS_UNSAFE=	yes
-
-DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
-
-PORTDOCS=	*
+DOCSDIR=	${OCAML_DOCSDIR}
+PORTDOCS=	${OCAML_PACKAGES:@p@$p@}

 OPTIONS_DEFINE=	DOCS

-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|doc/menhir|doc/ocaml/menhir| ; \
-		 s| \($$(bindir)\)| $${DESTDIR}\1| ; \
-		 s| \($$(libdir)\)| $${DESTDIR}\1| ; \
-		 s| \($$(docdir)\)| $${DESTDIR}\1| ; \
-		 s| \($$(mandir)\)| $${DESTDIR}\1|' ${WRKSRC}/Makefile
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/menhir
+	@${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/menhirLib/menhirLib.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/menhirSdk/menhirSdk.cmxs

 .include <bsd.port.mk>
--- a/devel/menhir/distinfo
+++ b/devel/menhir/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1500460606
-SHA256 (menhir-20170712.tar.gz) = ca482d690052343d6cb9452433248a0a92cc8bfc8fa529dc313220c9d7c0d000
-SIZE (menhir-20170712.tar.gz) = 855262
+TIMESTAMP = 1710615133
+SHA256 (menhir-20231231.tar.bz2) = fb76a37b84e28acd3ecf58efea3abc8c7a9a70987a44915837e81093a7853d3a
+SIZE (menhir-20231231.tar.bz2) = 1245465
--- a/devel/menhir/pkg-plist
+++ b/devel/menhir/pkg-plist
@ -1,8 +1,50 @@
 bin/menhir
 share/man/man1/menhir.1.gz
-%%DATADIR%%/standard.mly
+%%OCAML_SITELIBDIR%%/menhir/META
+%%OCAML_SITELIBDIR%%/menhir/dune-package
+%%OCAML_SITELIBDIR%%/menhirLib/META
+%%OCAML_SITELIBDIR%%/menhirLib/dune-package
+%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.a
+%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.cma
+%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.cmi
+%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.cmt
+%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.cmti
+%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.cmx
+%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.cmxa
+%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.cmxs
+%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.ml
+%%OCAML_SITELIBDIR%%/menhirLib/menhirLib.mli
 %%OCAML_SITELIBDIR%%/menhirSdk/META
+%%OCAML_SITELIBDIR%%/menhirSdk/cmly_api.ml
+%%OCAML_SITELIBDIR%%/menhirSdk/cmly_format.ml
+%%OCAML_SITELIBDIR%%/menhirSdk/cmly_read.ml
+%%OCAML_SITELIBDIR%%/menhirSdk/cmly_read.mli
+%%OCAML_SITELIBDIR%%/menhirSdk/dune-package
+%%OCAML_SITELIBDIR%%/menhirSdk/keyword.ml
+%%OCAML_SITELIBDIR%%/menhirSdk/keyword.mli
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.a
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.cma
 %%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.cmi
-%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.cmo
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.cmt
 %%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.cmx
-%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.o
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.cmxa
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.cmxs
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk.ml
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_api.cmi
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_api.cmt
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_api.cmx
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_format.cmi
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_format.cmt
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_format.cmx
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_read.cmi
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_read.cmt
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_read.cmti
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Cmly_read.cmx
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Keyword.cmi
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Keyword.cmt
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Keyword.cmti
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Keyword.cmx
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Version.cmi
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Version.cmt
+%%OCAML_SITELIBDIR%%/menhirSdk/menhirSdk__Version.cmx
+%%OCAML_SITELIBDIR%%/menhirSdk/version.ml
--- a/devel/ocaml-annexlib/Makefile
+++ b/devel/ocaml-annexlib/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	annexlib
 PORTVERSION=	0.13.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	http://raevnos.pennmush.org/code/extlib/
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-astring/Makefile
+++ b/devel/ocaml-astring/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	astring
 PORTVERSION=	0.8.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://erratique.ch/software/astring/releases/
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-base/Makefile
+++ b/devel/ocaml-base/Makefile
@ -1,6 +1,7 @@
 PORTNAME=	base
 PORTVERSION=	0.16.3
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

--- a/devel/ocaml-base/files/patch-src_discover_discover.ml
+++ b/devel/ocaml-base/files/patch-src_discover_discover.ml
@ -0,0 +1,14 @@
+--- src/discover/discover.ml.orig	2024-04-29 15:54:18 UTC
+++ src/discover/discover.ml
+@@ -4,7 +4,11 @@ int main(int argc, char ** argv)
+   {|
+ int main(int argc, char ** argv)
+ {
+#if defined(__clang__) && !defined(__x86_64__) && !defined(__i386__)
+#error "-mpopcnt is not for this arch"
+#else
+   return __builtin_popcount(argc);
+#endif
+ }
+ |}
+ ;;
--- a/devel/ocaml-bos/Makefile
+++ b/devel/ocaml-bos/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	bos
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://erratique.ch/software/bos/releases/
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-calendar/Makefile
+++ b/devel/ocaml-calendar/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	calendar
 PORTVERSION=	2.03.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/915/
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-camljava/Makefile
+++ b/devel/ocaml-camljava/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	camljava
 PORTVERSION=	0.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel java
 MASTER_SITES=	http://caml.inria.fr/distrib/bazar-ocaml/
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-camlp-streams/Makefile
+++ b/devel/ocaml-camlp-streams/Makefile
@ -21,11 +21,11 @@ PORTDOCS=	CHANGES.md LICENSE README.md
 OPTIONS_DEFINE=	DOCS

 post-patch:
-	${REINPLACE_CMD} \
+	@${REINPLACE_CMD} \
 		-e "s/(name ${PORTNAME})/&\n (version ${PORTVERSION})/" \
 		${WRKSRC}/dune-project

 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/camlp_streams.cmxs
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/camlp_streams.cmxs

 .include <bsd.port.mk>
--- a/devel/ocaml-camlp4/Makefile
+++ b/devel/ocaml-camlp4/Makefile
@ -1,9 +1,10 @@
 PORTNAME=	camlp4
 PORTVERSION=	4.14+1
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

-MAINTAINER=	michipili@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	System for writing extensible parsers for OCaml
 WWW=		https://github.com/ocaml/camlp4

--- a/devel/ocaml-camlp5/Makefile
+++ b/devel/ocaml-camlp5/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	camlp5
 PORTVERSION=	8.02.01
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

--- a/devel/ocaml-camomile/Makefile
+++ b/devel/ocaml-camomile/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	camomile
 PORTVERSION=	1.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

--- a/devel/ocaml-cfg/Makefile
+++ b/devel/ocaml-cfg/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	cfg
 PORTVERSION=	2.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

--- a/devel/ocaml-classes/Makefile
+++ b/devel/ocaml-classes/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	classes
 PORTVERSION=	4.00
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-cmdliner/Makefile
+++ b/devel/ocaml-cmdliner/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	cmdliner
 PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	https://erratique.ch/software/cmdliner/releases/
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-compiler-libs/Makefile
+++ b/devel/ocaml-compiler-libs/Makefile
@ -0,0 +1,36 @@
+PORTNAME=	ocaml-compiler-libs
+PORTVERSION=	0.12.4
+DISTVERSIONPREFIX=	v
+CATEGORIES=	devel
+
+MAINTAINER=	freebsd@dev.thsi.be
+COMMENT=	Wrapper library for OCaml internals
+WWW=		https://github.com/janestreet/ocaml-compiler-libs
+
+LICENSE=	MIT
+
+USES=		ocaml:dune
+USE_GITHUB=	yes
+GH_ACCOUNT=	janestreet
+GH_PROJECT=	ocaml-compiler-libs
+USE_OCAML=	yes
+
+DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
+PORTDOCS=	CHANGES.md LICENSE.md README.org
+
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	@${REINPLACE_CMD} \
+		-e "s/(name ${PORTNAME})/&\n (version ${PORTVERSION})/" \
+		${WRKSRC}/dune-project
+
+post-install:
+	@${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/bytecomp/ocaml_bytecomp.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/common/ocaml_common.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/optcomp/ocaml_optcomp.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/shadow/ocaml_shadow.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/toplevel/ocaml_toplevel.cmxs
+
+.include <bsd.port.mk>
--- a/devel/ocaml-compiler-libs/distinfo
+++ b/devel/ocaml-compiler-libs/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1709655074
+SHA256 (janestreet-ocaml-compiler-libs-v0.12.4_GH0.tar.gz) = f4c37daf975b67c1f645a5d0294ec8ca686b982da410d9f915ccd93548c6e2f1
+SIZE (janestreet-ocaml-compiler-libs-v0.12.4_GH0.tar.gz) = 5435
--- a/devel/ocaml-compiler-libs/pkg-descr
+++ b/devel/ocaml-compiler-libs/pkg-descr
@ -0,0 +1,2 @@
+Wraps OCaml compiler internal libraries into a reduced set of
+libraries, to reduce the pollution of the toplevel module namespace.
--- a/devel/ocaml-compiler-libs/pkg-plist
+++ b/devel/ocaml-compiler-libs/pkg-plist
@ -0,0 +1,43 @@
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/META
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/bytecomp/ocaml_bytecomp.a
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/bytecomp/ocaml_bytecomp.cma
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/bytecomp/ocaml_bytecomp.cmi
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/bytecomp/ocaml_bytecomp.cmt
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/bytecomp/ocaml_bytecomp.cmx
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/bytecomp/ocaml_bytecomp.cmxa
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/bytecomp/ocaml_bytecomp.cmxs
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/bytecomp/ocaml_bytecomp.ml
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/common/ocaml_common.a
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/common/ocaml_common.cma
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/common/ocaml_common.cmi
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/common/ocaml_common.cmt
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/common/ocaml_common.cmx
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/common/ocaml_common.cmxa
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/common/ocaml_common.cmxs
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/common/ocaml_common.ml
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/dune-package
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/opam
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/optcomp/ocaml_optcomp.a
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/optcomp/ocaml_optcomp.cma
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/optcomp/ocaml_optcomp.cmi
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/optcomp/ocaml_optcomp.cmt
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/optcomp/ocaml_optcomp.cmx
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/optcomp/ocaml_optcomp.cmxa
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/optcomp/ocaml_optcomp.cmxs
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/optcomp/ocaml_optcomp.ml
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/shadow/ocaml_shadow.a
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/shadow/ocaml_shadow.cma
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/shadow/ocaml_shadow.cmi
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/shadow/ocaml_shadow.cmt
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/shadow/ocaml_shadow.cmx
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/shadow/ocaml_shadow.cmxa
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/shadow/ocaml_shadow.cmxs
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/shadow/ocaml_shadow.ml
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/toplevel/ocaml_toplevel.a
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/toplevel/ocaml_toplevel.cma
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/toplevel/ocaml_toplevel.cmi
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/toplevel/ocaml_toplevel.cmt
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/toplevel/ocaml_toplevel.cmx
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/toplevel/ocaml_toplevel.cmxa
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/toplevel/ocaml_toplevel.cmxs
+%%OCAML_SITELIBDIR%%/ocaml-compiler-libs/toplevel/ocaml_toplevel.ml
--- a/devel/ocaml-cppo/Makefile
+++ b/devel/ocaml-cppo/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	cppo
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

--- a/devel/ocaml-csexp/Makefile
+++ b/devel/ocaml-csexp/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	csexp
 PORTVERSION=	1.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

--- a/devel/ocaml-cstruct/Makefile
+++ b/devel/ocaml-cstruct/Makefile
@ -0,0 +1,53 @@
+PORTNAME=	cstruct
+DISTVERSIONPREFIX=	v
+DISTVERSION=	6.2.0
+CATEGORIES=	devel
+PKGNAMEPREFIX=	ocaml-
+
+MAINTAINER=	freebsd@dev.thsi.be
+COMMENT=	OCaml library and syntax extension to access C-like structures
+WWW=		https://github.com/mirage/ocaml-cstruct
+
+LICENSE=	ISCL
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+BUILD_DEPENDS=	${SA_DIR}/fmt/META:devel/ocaml-fmt \
+		${SA_DIR}/lwt/META:devel/ocaml-lwt \
+		${SA_DIR}/ppxlib/META:devel/ocaml-ppxlib \
+		${SA_DIR}/sexplib/META:devel/ocaml-sexplib
+RUN_DEPENDS=	${SA_DIR}/fmt/META:devel/ocaml-fmt \
+		${SA_DIR}/lwt/META:devel/ocaml-lwt \
+		${SA_DIR}/ppxlib/META:devel/ocaml-ppxlib \
+		${SA_DIR}/sexplib/META:devel/ocaml-sexplib
+
+USES=		ocaml:dune
+USE_GITHUB=	yes
+GH_ACCOUNT=	mirage
+GH_PROJECT=	ocaml-${PORTNAME}
+USE_OCAML=	yes
+USE_OCAML_LDCONFIG=	yes
+# missing ${PORTNAME}-async
+OCAML_PACKAGES=		${PORTNAME} ${PORTNAME}-lwt ${PORTNAME}-sexp \
+			${PORTNAME}-unix ppx_${PORTNAME}
+DUNE_INSTALL_TARGETS=	${OCAML_PACKAGES}
+
+DOCSDIR=	${OCAML_DOCSDIR}
+PORTDOCS=	${OCAML_PACKAGES:@p@$p/CHANGES.md $p/LICENSE.md $p/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:
+	@(cd ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}; \
+	${STRIP_CMD} \
+		cstruct/dllcstruct_stubs.so \
+		ppx_cstruct/ppx.exe \
+		${OCAML_PACKAGES:@p@$p/${p:S/-/_/g}.cmxs@})
+
+.include <bsd.port.mk>
--- a/devel/ocaml-cstruct/distinfo
+++ b/devel/ocaml-cstruct/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1710533677
+SHA256 (mirage-ocaml-cstruct-v6.2.0_GH0.tar.gz) = 629a4bf17893c48c2f7b951eddc875a61de18bf190bb5a096976837198349cd4
+SIZE (mirage-ocaml-cstruct-v6.2.0_GH0.tar.gz) = 244005
--- a/devel/ocaml-cstruct/pkg-descr
+++ b/devel/ocaml-cstruct/pkg-descr
@ -0,0 +1,18 @@
+This library for OCaml contains functionnality to access
+datastructures using a determined byte-layouts such as networking
+datagrams or binay file formats (e.g.).
+
+A PPX syntax extension is provided to allow the definition of
+byte-layouts in the form of "cstruct" type definitions -- looking much
+alike the well-known structure declaration of the C programming
+language (hence the name of this library) --, and to generate accessor
+functions to manipule its members.
+
+In addition to those core features, the library contains accessory
+functions allowing:
+
+- The representation of "cstruct" as S-expression;
+
+- I/O operations over the Unix OCaml library and the Lwt cooperative
+  threading library. The async integration is currently not provided
+  by this port (patch welcome!).
--- a/devel/ocaml-cstruct/pkg-plist
+++ b/devel/ocaml-cstruct/pkg-plist
@ -0,0 +1,75 @@
+%%OCAML_SITELIBDIR%%/cstruct-lwt/META
+%%OCAML_SITELIBDIR%%/cstruct-lwt/cstruct_lwt.a
+%%OCAML_SITELIBDIR%%/cstruct-lwt/cstruct_lwt.cma
+%%OCAML_SITELIBDIR%%/cstruct-lwt/cstruct_lwt.cmxa
+%%OCAML_SITELIBDIR%%/cstruct-lwt/cstruct_lwt.cmxs
+%%OCAML_SITELIBDIR%%/cstruct-lwt/dune-package
+%%OCAML_SITELIBDIR%%/cstruct-lwt/lwt_cstruct.cmi
+%%OCAML_SITELIBDIR%%/cstruct-lwt/lwt_cstruct.cmt
+%%OCAML_SITELIBDIR%%/cstruct-lwt/lwt_cstruct.cmti
+%%OCAML_SITELIBDIR%%/cstruct-lwt/lwt_cstruct.cmx
+%%OCAML_SITELIBDIR%%/cstruct-lwt/lwt_cstruct.ml
+%%OCAML_SITELIBDIR%%/cstruct-lwt/lwt_cstruct.mli
+%%OCAML_SITELIBDIR%%/cstruct-lwt/opam
+%%OCAML_SITELIBDIR%%/cstruct-sexp/META
+%%OCAML_SITELIBDIR%%/cstruct-sexp/cstruct_sexp.a
+%%OCAML_SITELIBDIR%%/cstruct-sexp/cstruct_sexp.cma
+%%OCAML_SITELIBDIR%%/cstruct-sexp/cstruct_sexp.cmi
+%%OCAML_SITELIBDIR%%/cstruct-sexp/cstruct_sexp.cmt
+%%OCAML_SITELIBDIR%%/cstruct-sexp/cstruct_sexp.cmti
+%%OCAML_SITELIBDIR%%/cstruct-sexp/cstruct_sexp.cmx
+%%OCAML_SITELIBDIR%%/cstruct-sexp/cstruct_sexp.cmxa
+%%OCAML_SITELIBDIR%%/cstruct-sexp/cstruct_sexp.cmxs
+%%OCAML_SITELIBDIR%%/cstruct-sexp/cstruct_sexp.ml
+%%OCAML_SITELIBDIR%%/cstruct-sexp/cstruct_sexp.mli
+%%OCAML_SITELIBDIR%%/cstruct-sexp/dune-package
+%%OCAML_SITELIBDIR%%/cstruct-sexp/opam
+%%OCAML_SITELIBDIR%%/cstruct-unix/META
+%%OCAML_SITELIBDIR%%/cstruct-unix/cstruct_unix.a
+%%OCAML_SITELIBDIR%%/cstruct-unix/cstruct_unix.cma
+%%OCAML_SITELIBDIR%%/cstruct-unix/cstruct_unix.cmxa
+%%OCAML_SITELIBDIR%%/cstruct-unix/cstruct_unix.cmxs
+%%OCAML_SITELIBDIR%%/cstruct-unix/dune-package
+%%OCAML_SITELIBDIR%%/cstruct-unix/opam
+%%OCAML_SITELIBDIR%%/cstruct-unix/unix_cstruct.cmi
+%%OCAML_SITELIBDIR%%/cstruct-unix/unix_cstruct.cmt
+%%OCAML_SITELIBDIR%%/cstruct-unix/unix_cstruct.cmti
+%%OCAML_SITELIBDIR%%/cstruct-unix/unix_cstruct.cmx
+%%OCAML_SITELIBDIR%%/cstruct-unix/unix_cstruct.ml
+%%OCAML_SITELIBDIR%%/cstruct-unix/unix_cstruct.mli
+%%OCAML_SITELIBDIR%%/cstruct/META
+%%OCAML_SITELIBDIR%%/cstruct/cstruct.a
+%%OCAML_SITELIBDIR%%/cstruct/cstruct.cma
+%%OCAML_SITELIBDIR%%/cstruct/cstruct.cmi
+%%OCAML_SITELIBDIR%%/cstruct/cstruct.cmt
+%%OCAML_SITELIBDIR%%/cstruct/cstruct.cmti
+%%OCAML_SITELIBDIR%%/cstruct/cstruct.cmx
+%%OCAML_SITELIBDIR%%/cstruct/cstruct.cmxa
+%%OCAML_SITELIBDIR%%/cstruct/cstruct.cmxs
+%%OCAML_SITELIBDIR%%/cstruct/cstruct.js
+%%OCAML_SITELIBDIR%%/cstruct/cstruct.ml
+%%OCAML_SITELIBDIR%%/cstruct/cstruct.mli
+%%OCAML_SITELIBDIR%%/cstruct/cstruct_cap.cmi
+%%OCAML_SITELIBDIR%%/cstruct/cstruct_cap.cmt
+%%OCAML_SITELIBDIR%%/cstruct/cstruct_cap.cmti
+%%OCAML_SITELIBDIR%%/cstruct/cstruct_cap.cmx
+%%OCAML_SITELIBDIR%%/cstruct/cstruct_cap.ml
+%%OCAML_SITELIBDIR%%/cstruct/cstruct_cap.mli
+%%OCAML_SITELIBDIR%%/cstruct/dllcstruct_stubs.so
+%%OCAML_SITELIBDIR%%/cstruct/dune-package
+%%OCAML_SITELIBDIR%%/cstruct/libcstruct_stubs.a
+%%OCAML_SITELIBDIR%%/cstruct/opam
+%%OCAML_SITELIBDIR%%/ppx_cstruct/META
+%%OCAML_SITELIBDIR%%/ppx_cstruct/dune-package
+%%OCAML_SITELIBDIR%%/ppx_cstruct/opam
+%%OCAML_SITELIBDIR%%/ppx_cstruct/ppx.exe
+%%OCAML_SITELIBDIR%%/ppx_cstruct/ppx_cstruct.a
+%%OCAML_SITELIBDIR%%/ppx_cstruct/ppx_cstruct.cma
+%%OCAML_SITELIBDIR%%/ppx_cstruct/ppx_cstruct.cmi
+%%OCAML_SITELIBDIR%%/ppx_cstruct/ppx_cstruct.cmt
+%%OCAML_SITELIBDIR%%/ppx_cstruct/ppx_cstruct.cmti
+%%OCAML_SITELIBDIR%%/ppx_cstruct/ppx_cstruct.cmx
+%%OCAML_SITELIBDIR%%/ppx_cstruct/ppx_cstruct.cmxa
+%%OCAML_SITELIBDIR%%/ppx_cstruct/ppx_cstruct.cmxs
+%%OCAML_SITELIBDIR%%/ppx_cstruct/ppx_cstruct.ml
+%%OCAML_SITELIBDIR%%/ppx_cstruct/ppx_cstruct.mli
--- a/devel/ocaml-domain-name/Makefile
+++ b/devel/ocaml-domain-name/Makefile
@ -0,0 +1,33 @@
+PORTNAME=	domain-name
+PORTVERSION=	0.4.0
+DISTVERSIONPREFIX=	v
+CATEGORIES=	devel
+PKGNAMEPREFIX=	ocaml-
+
+MAINTAINER=	freebsd@dev.thsi.be
+COMMENT=	OCaml library for representing RFC 1035 Internet domain names
+WWW=		https://github.com/hannesm/domain-name
+
+LICENSE=	ISCL
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+USES=		ocaml:dune
+USE_GITHUB=	yes
+GH_ACCOUNT=	hannesm
+USE_OCAML=	yes
+
+OPTIONS_DEFINE=	DOCS
+
+DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
+PORTDOCS=	CHANGES.md LICENSE.md README.md
+
+post-patch:
+	@${REINPLACE_CMD} \
+		-e "s/(name ${PORTNAME})/&\n (version ${PORTVERSION})/" \
+		${WRKSRC}/dune-project
+
+post-install:
+	@${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/domain-name/domain_name.cmxs
+
+.include <bsd.port.mk>
--- a/devel/ocaml-domain-name/distinfo
+++ b/devel/ocaml-domain-name/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1710538537
+SHA256 (hannesm-domain-name-v0.4.0_GH0.tar.gz) = 95ab9a092b4111110b2d9c76937895766fd913042b09fe16b730321ae5183dd0
+SIZE (hannesm-domain-name-v0.4.0_GH0.tar.gz) = 9585
--- a/devel/ocaml-domain-name/pkg-descr
+++ b/devel/ocaml-domain-name/pkg-descr
@ -0,0 +1,4 @@
+This library provides an abstract data type to represent conformant
+internet domain names, and some functions for creating (parsing),
+canonicalize, printing, manipulating, comparing and testing properties
+of internet domain names.
--- a/devel/ocaml-domain-name/pkg-plist
+++ b/devel/ocaml-domain-name/pkg-plist
@ -0,0 +1,13 @@
+%%OCAML_SITELIBDIR%%/domain-name/META
+%%OCAML_SITELIBDIR%%/domain-name/domain_name.a
+%%OCAML_SITELIBDIR%%/domain-name/domain_name.cma
+%%OCAML_SITELIBDIR%%/domain-name/domain_name.cmi
+%%OCAML_SITELIBDIR%%/domain-name/domain_name.cmt
+%%OCAML_SITELIBDIR%%/domain-name/domain_name.cmti
+%%OCAML_SITELIBDIR%%/domain-name/domain_name.cmx
+%%OCAML_SITELIBDIR%%/domain-name/domain_name.cmxa
+%%OCAML_SITELIBDIR%%/domain-name/domain_name.cmxs
+%%OCAML_SITELIBDIR%%/domain-name/domain_name.ml
+%%OCAML_SITELIBDIR%%/domain-name/domain_name.mli
+%%OCAML_SITELIBDIR%%/domain-name/dune-package
+%%OCAML_SITELIBDIR%%/domain-name/opam
--- a/devel/ocaml-dune/Makefile
+++ b/devel/ocaml-dune/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	dune
 PORTVERSION=	3.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

--- a/devel/ocaml-extlib/Makefile
+++ b/devel/ocaml-extlib/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	extlib
 DISTVERSION=	1.7.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/ygrek/ocaml-extlib/releases/download/${DISTVERSION}/
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	findlib
 PORTVERSION=	1.9.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://download.camlcity.org/download/
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-fmt/Makefile
+++ b/devel/ocaml-fmt/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	fmt
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://erratique.ch/software/fmt/releases/
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-fpath/Makefile
+++ b/devel/ocaml-fpath/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	fpath
 PORTVERSION=	0.7.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://erratique.ch/software/fpath/releases/
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-ipaddr/Makefile
+++ b/devel/ocaml-ipaddr/Makefile
@ -1,34 +1,49 @@
 PORTNAME=	ipaddr
+PORTVERSION=	5.5.0
 DISTVERSIONPREFIX=	v
-PORTVERSION=	3.1.0
-PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OCaml library for manipulation of IP address representations
+WWW=		https://github.com/mirage/ocaml-ipaddr

-BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib0/sexplib0.a:devel/ocaml-sexplib0 \
-		dune:devel/ocaml-dune
-RUN_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib0/sexplib0.a:devel/ocaml-sexplib0
+LICENSE=	ISCL
+LICENSE_FILE=	${WRKSRC}/LICENSE.md

+BUILD_DEPENDS=	${SA_DIR}/cstruct/META:devel/ocaml-cstruct \
+		${SA_DIR}/domain-name/META:devel/ocaml-domain-name \
+		${SA_DIR}/ppx_sexp_conv/META:devel/ocaml-ppx_sexp_conv
+RUN_DEPENDS=	${SA_DIR}/cstruct/META:devel/ocaml-cstruct \
+		${SA_DIR}/domain-name/META:devel/ocaml-domain-name \
+		${SA_DIR}/ppx_sexp_conv/META:devel/ocaml-ppx_sexp_conv
+
+USES=		ocaml:dune
 USE_GITHUB=	yes
 GH_ACCOUNT=	mirage
 GH_PROJECT=	ocaml-ipaddr
-
-USES=			gmake
-
 USE_OCAML=		yes
-USE_OCAML_FINDLIB=	yes
-USE_OCAML_CAMLP4=	yes
-USE_OCAML_LDCONFIG=	yes
+OCAML_PACKAGES=		ipaddr ipaddr-cstruct ipaddr-sexp
+OCAML_PACKAGES+=	macaddr macaddr-cstruct macaddr-sexp
+
+DOCSDIR=	${OCAML_DOCSDIR}
+PORTDOCS=	${OCAML_PACKAGES:@p@$p/CHANGES.md $p/LICENSE.md $p/README.md@}
+
+OPTIONS_DEFINE=	DOCS
+
+SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}

 post-patch:
-	@${REINPLACE_CMD} -e '/^SETUP =/s,ocaml,& -unsafe-string,' \
-		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} \
+		-e "s/(name ${PORTNAME})/&\n (version ${PORTVERSION})/" \
+		${WRKSRC}/dune-project

-do-install:
-	cd ${INSTALL_WRKSRC} && dune install --destdir=${STAGEDIR} \
-		--prefix=${PREFIX} --libdir=${PREFIX}/${OCAML_SITELIBDIR}
+post-install:
+	@(cd ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}; \
+	${STRIP_CMD} \
+		ipaddr/top/ipaddr_top.cmxs \
+		ipaddr/unix/ipaddr_unix.cmxs \
+		macaddr/top/macaddr_top.cmxs \
+		${OCAML_PACKAGES:@p@$p/${p:S/-/_/g}.cmxs@})

 .include <bsd.port.mk>
--- a/devel/ocaml-ipaddr/distinfo
+++ b/devel/ocaml-ipaddr/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1684858044
-SHA256 (mirage-ocaml-ipaddr-v3.1.0_GH0.tar.gz) = 707d5f9bb6659ff1cb5850aa20f6424cbf60b681033264c4c2049af75bd923c2
-SIZE (mirage-ocaml-ipaddr-v3.1.0_GH0.tar.gz) = 25889
+TIMESTAMP = 1710533243
+SHA256 (mirage-ocaml-ipaddr-v5.5.0_GH0.tar.gz) = eb036ed6cb8d39244bfd3b87cbf3b516e1ce7ed15aecb3272505c1370202973b
+SIZE (mirage-ocaml-ipaddr-v5.5.0_GH0.tar.gz) = 36026
--- a/devel/ocaml-ipaddr/files/patch-lib_ipaddr.ml
+++ b/devel/ocaml-ipaddr/files/patch-lib_ipaddr.ml
@ -1,33 +0,0 @@
--- lib/ipaddr.ml.orig	2019-03-03 17:12:39 UTC
-+++ lib/ipaddr.ml
-@@ -69,9 +69,9 @@ let int_of_char c = match c with
- let char_A = int_of_char 'A'
- 
- let int_of_char c = match c with
-  | '0'..'9' -> Pervasives.int_of_char c - char_0
-  | 'a'..'f' -> 10 + Pervasives.int_of_char c - char_a
-  | 'A'..'F' -> 10 + Pervasives.int_of_char c - char_A
-+  | '0'..'9' -> Stdlib.int_of_char c - char_0
-+  | 'a'..'f' -> 10 + Stdlib.int_of_char c - char_a
-+  | 'A'..'F' -> 10 + Stdlib.int_of_char c - char_A
-   | _ -> -1
- 
- let bad_char i s =
-@@ -258,7 +258,7 @@ module V4 = struct
- 
-     let compare (pre,sz) (pre',sz') =
-       let c = compare pre pre' in
-      if c = 0 then Pervasives.compare sz sz' else c
-+      if c = 0 then Stdlib.compare sz sz' else c
- 
-     let ip = make
- 
-@@ -706,7 +706,7 @@ module V6 = struct
- 
-     let compare (pre,sz) (pre',sz') =
-       let c = compare pre pre' in
-      if c = 0 then Pervasives.compare sz sz' else c
-+      if c = 0 then Stdlib.compare sz sz' else c
- 
-     let ip = make
- 
--- a/devel/ocaml-ipaddr/pkg-plist
+++ b/devel/ocaml-ipaddr/pkg-plist
@ -1,3 +1,29 @@
+%%OCAML_SITELIBDIR%%/ipaddr-cstruct/META
+%%OCAML_SITELIBDIR%%/ipaddr-cstruct/dune-package
+%%OCAML_SITELIBDIR%%/ipaddr-cstruct/ipaddr_cstruct.a
+%%OCAML_SITELIBDIR%%/ipaddr-cstruct/ipaddr_cstruct.cma
+%%OCAML_SITELIBDIR%%/ipaddr-cstruct/ipaddr_cstruct.cmi
+%%OCAML_SITELIBDIR%%/ipaddr-cstruct/ipaddr_cstruct.cmt
+%%OCAML_SITELIBDIR%%/ipaddr-cstruct/ipaddr_cstruct.cmti
+%%OCAML_SITELIBDIR%%/ipaddr-cstruct/ipaddr_cstruct.cmx
+%%OCAML_SITELIBDIR%%/ipaddr-cstruct/ipaddr_cstruct.cmxa
+%%OCAML_SITELIBDIR%%/ipaddr-cstruct/ipaddr_cstruct.cmxs
+%%OCAML_SITELIBDIR%%/ipaddr-cstruct/ipaddr_cstruct.ml
+%%OCAML_SITELIBDIR%%/ipaddr-cstruct/ipaddr_cstruct.mli
+%%OCAML_SITELIBDIR%%/ipaddr-cstruct/opam
+%%OCAML_SITELIBDIR%%/ipaddr-sexp/META
+%%OCAML_SITELIBDIR%%/ipaddr-sexp/dune-package
+%%OCAML_SITELIBDIR%%/ipaddr-sexp/ipaddr_sexp.a
+%%OCAML_SITELIBDIR%%/ipaddr-sexp/ipaddr_sexp.cma
+%%OCAML_SITELIBDIR%%/ipaddr-sexp/ipaddr_sexp.cmi
+%%OCAML_SITELIBDIR%%/ipaddr-sexp/ipaddr_sexp.cmt
+%%OCAML_SITELIBDIR%%/ipaddr-sexp/ipaddr_sexp.cmti
+%%OCAML_SITELIBDIR%%/ipaddr-sexp/ipaddr_sexp.cmx
+%%OCAML_SITELIBDIR%%/ipaddr-sexp/ipaddr_sexp.cmxa
+%%OCAML_SITELIBDIR%%/ipaddr-sexp/ipaddr_sexp.cmxs
+%%OCAML_SITELIBDIR%%/ipaddr-sexp/ipaddr_sexp.ml
+%%OCAML_SITELIBDIR%%/ipaddr-sexp/ipaddr_sexp.mli
+%%OCAML_SITELIBDIR%%/ipaddr-sexp/opam
 %%OCAML_SITELIBDIR%%/ipaddr/META
 %%OCAML_SITELIBDIR%%/ipaddr/dune-package
 %%OCAML_SITELIBDIR%%/ipaddr/ipaddr.a
@ -11,16 +37,6 @@
 %%OCAML_SITELIBDIR%%/ipaddr/ipaddr.ml
 %%OCAML_SITELIBDIR%%/ipaddr/ipaddr.mli
 %%OCAML_SITELIBDIR%%/ipaddr/opam
-%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.a
-%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cma
-%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmi
-%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmt
-%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmti
-%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmx
-%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmxa
-%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.cmxs
-%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.ml
-%%OCAML_SITELIBDIR%%/ipaddr/sexp/ipaddr_sexp.mli
 %%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.a
 %%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.cma
 %%OCAML_SITELIBDIR%%/ipaddr/top/ipaddr_top.cmi
@ -41,6 +57,32 @@
 %%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.cmxs
 %%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.ml
 %%OCAML_SITELIBDIR%%/ipaddr/unix/ipaddr_unix.mli
+%%OCAML_SITELIBDIR%%/macaddr-cstruct/META
+%%OCAML_SITELIBDIR%%/macaddr-cstruct/dune-package
+%%OCAML_SITELIBDIR%%/macaddr-cstruct/macaddr_cstruct.a
+%%OCAML_SITELIBDIR%%/macaddr-cstruct/macaddr_cstruct.cma
+%%OCAML_SITELIBDIR%%/macaddr-cstruct/macaddr_cstruct.cmi
+%%OCAML_SITELIBDIR%%/macaddr-cstruct/macaddr_cstruct.cmt
+%%OCAML_SITELIBDIR%%/macaddr-cstruct/macaddr_cstruct.cmti
+%%OCAML_SITELIBDIR%%/macaddr-cstruct/macaddr_cstruct.cmx
+%%OCAML_SITELIBDIR%%/macaddr-cstruct/macaddr_cstruct.cmxa
+%%OCAML_SITELIBDIR%%/macaddr-cstruct/macaddr_cstruct.cmxs
+%%OCAML_SITELIBDIR%%/macaddr-cstruct/macaddr_cstruct.ml
+%%OCAML_SITELIBDIR%%/macaddr-cstruct/macaddr_cstruct.mli
+%%OCAML_SITELIBDIR%%/macaddr-cstruct/opam
+%%OCAML_SITELIBDIR%%/macaddr-sexp/META
+%%OCAML_SITELIBDIR%%/macaddr-sexp/dune-package
+%%OCAML_SITELIBDIR%%/macaddr-sexp/macaddr_sexp.a
+%%OCAML_SITELIBDIR%%/macaddr-sexp/macaddr_sexp.cma
+%%OCAML_SITELIBDIR%%/macaddr-sexp/macaddr_sexp.cmi
+%%OCAML_SITELIBDIR%%/macaddr-sexp/macaddr_sexp.cmt
+%%OCAML_SITELIBDIR%%/macaddr-sexp/macaddr_sexp.cmti
+%%OCAML_SITELIBDIR%%/macaddr-sexp/macaddr_sexp.cmx
+%%OCAML_SITELIBDIR%%/macaddr-sexp/macaddr_sexp.cmxa
+%%OCAML_SITELIBDIR%%/macaddr-sexp/macaddr_sexp.cmxs
+%%OCAML_SITELIBDIR%%/macaddr-sexp/macaddr_sexp.ml
+%%OCAML_SITELIBDIR%%/macaddr-sexp/macaddr_sexp.mli
+%%OCAML_SITELIBDIR%%/macaddr-sexp/opam
 %%OCAML_SITELIBDIR%%/macaddr/META
 %%OCAML_SITELIBDIR%%/macaddr/dune-package
 %%OCAML_SITELIBDIR%%/macaddr/macaddr.a
@ -54,16 +96,6 @@
 %%OCAML_SITELIBDIR%%/macaddr/macaddr.ml
 %%OCAML_SITELIBDIR%%/macaddr/macaddr.mli
 %%OCAML_SITELIBDIR%%/macaddr/opam
-%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.a
-%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cma
-%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmi
-%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmt
-%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmti
-%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmx
-%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmxa
-%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.cmxs
-%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.ml
-%%OCAML_SITELIBDIR%%/macaddr/sexp/macaddr_sexp.mli
 %%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.a
 %%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.cma
 %%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.cmi
@ -72,9 +104,3 @@
 %%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.cmxa
 %%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.cmxs
 %%OCAML_SITELIBDIR%%/macaddr/top/macaddr_top.ml
-share/doc/ocaml/ipaddr/CHANGES.md
-share/doc/ocaml/ipaddr/LICENSE.md
-share/doc/ocaml/ipaddr/README.md
-share/doc/ocaml/macaddr/CHANGES.md
-share/doc/ocaml/macaddr/LICENSE.md
-share/doc/ocaml/macaddr/README.md
--- a/devel/ocaml-lacaml/Makefile
+++ b/devel/ocaml-lacaml/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	lacaml
 PORTVERSION=	8.0.7
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/mmottl/lacaml/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-logs/Makefile
+++ b/devel/ocaml-logs/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	logs
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://erratique.ch/software/logs/releases/
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-lwt/Makefile
+++ b/devel/ocaml-lwt/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	lwt
-PORTVERSION=	2.5.2
-PORTREVISION=	2
+PORTVERSION=	5.7.0
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

@ -9,64 +8,51 @@ COMMENT=	Cooperative threading library for OCaml

 LICENSE=	LGPL21

-BUILD_DEPENDS=	${SA_DIR}/react/react.a:devel/ocaml-react \
-		${SA_DIR}/ssl/ssl.a:security/ocaml-ssl
-BUILD_DEPENDS+=	ocamlbuild:devel/ocaml-ocamlbuild
-RUN_DEPENDS=	${SA_DIR}/react/react.a:devel/ocaml-react \
-		${SA_DIR}/ssl/ssl.a:security/ocaml-ssl
+BUILD_DEPENDS=	${SA_DIR}/ocplib-endian/META:devel/ocaml-ocplib-endian \
+		${SA_DIR}/ppxlib/META:devel/ocaml-ppxlib \
+		${SA_DIR}/react/react.a:devel/ocaml-react
+BUILD_DEPENDS+=	cppo:devel/ocaml-cppo
+RUN_DEPENDS=	${SA_DIR}/ocplib-endian/META:devel/ocaml-ocplib-endian \
+		${SA_DIR}/ppxlib/META:devel/ocaml-ppxlib \
+		${SA_DIR}/react/react.a:devel/ocaml-react
+LIB_DEPENDS=	libev.so:devel/libev

 USE_GITHUB=	yes
 GH_ACCOUNT=	ocsigen

-MAKE_JOBS_UNSAFE=	yes
-
-USES=			gmake
+USES=			ocaml:dune
 USE_OCAML=		yes
-OCAMLC_DEPEND=		ocaml>=4.14:${OCAMLC_PORT}
-USE_OCAML_FINDLIB=	yes
-USE_OCAML_CAMLP4=	yes
-USE_OCAMLFIND_PLIST=	yes
+OCAML_PACKAGES=		lwt lwt_ppx lwt_ppx_let lwt_react
 USE_OCAML_LDCONFIG=	yes
-HAS_CONFIGURE=		yes
-CONFIGURE_ARGS=		--destdir "${STAGEDIR}" \
-			--prefix "${PREFIX}" \
-			--enable-camlp4 \
-			--enable-ssl \
-			--enable-react \
-			--disable-libev \
-			--disable-glib

-DOCSDIR=		${PREFIX}/share/doc/ocaml/${PORTNAME}
-SA_DIR=			${LOCALBASE}/${OCAML_SITELIBDIR}
+DOCSDIR=	${OCAML_DOCSDIR}
+PORTDOCS=	lwt/CHANGES lwt/LICENSE.md lwt/README.md lwt/odoc-pages \
+		lwt_ppx/CHANGES lwt_ppx/LICENSE.md lwt_ppx/README.md \
+		lwt_ppx_let/CHANGES lwt_ppx_let/LICENSE.md lwt_ppx_let/README.md \
+		lwt_react/CHANGES lwt_react/LICENSE.md lwt_react/README.md

-OPTIONS_DEFINE=		DOCS
+OPTIONS_DEFINE=	DOCS

-DOCS_CONFIGURE_ENABLE=	docs
-DOCS_CONFIGURE_ON=	--docdir ${STAGEDIR}${DOCSDIR}
-# For some reason, ocaml-text is needed when building documentation
-DOCS_BUILD_DEPENDS=	${SA_DIR}/text/text.a:textproc/ocaml-text
-DOCS_RUN_DEPENDS=	${SA_DIR}/text/text.a:textproc/ocaml-text
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,"install" :: findlib_name,"install" :: "-destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,' \
-		${WRKSRC}/setup.ml
-	@${REINPLACE_CMD} -e 's,| O_CLOEXEC,& | O_KEEPEXEC, \
-	    ; s,else Unix\.socketpair ,&?cloexec:None,' \
-		${WRKSRC}/src/unix/lwt_unix.ml \
-		${WRKSRC}/src/unix/lwt_unix.mli
-	@${REINPLACE_CMD} -e 's,socket -> string,socket -> bytes,' \
-		${WRKSRC}/src/ssl/lwt_ssl.mli
+SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}

 do-configure:
-	cd ${WRKSRC}; ocaml setup.ml -configure ${CONFIGURE_ARGS}
-	@${REINPLACE_CMD} -e 's%"-lev"%"-lev -L${PREFIX}/lib/ev -Wl,-R${PREFIX}/lib/ev"%' \
-		${WRKSRC}/setup.data
+	@(cd ${WRKSRC}; \
+	${SETENVI} ${WRK_ENV} ${SCRIPT_ENV} ${DUNE_CMD} exec \
+		--display=short --always-show-command-line \
+		--no-config -j ${MAKE_JOBS_NUMBER} --profile release \
+		--root=${DUNE_ROOT} --build-dir=${DUNE_BUILD_DIR} \
+		--promote-install-files --ignore-promoted-rules \
+		--default-target @install --require-dune-project-file \
+		--only-packages=lwt \
+		src/unix/config/discover.exe -- --save --use-libev true --libev-default true)

-do-build:
-	cd ${WRKSRC}; ocaml setup.ml -build
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}
-	cd ${WRKSRC}; ocaml setup.ml -install
+post-install:
+	@${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lwt/dlllwt_unix_stubs.so \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lwt/lwt.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lwt/unix/lwt_unix.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lwt_ppx/ppx.exe \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lwt_ppx/ppx_lwt.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/lwt_react/lwt_react.cmxs

 .include <bsd.port.mk>
--- a/devel/ocaml-lwt/distinfo
+++ b/devel/ocaml-lwt/distinfo
@ -1,2 +1,3 @@
-SHA256 (ocsigen-lwt-2.5.2_GH0.tar.gz) = b319514cf51656780a8f609a63ead08d3052a442546b218530ce146d37bf6331
-SIZE (ocsigen-lwt-2.5.2_GH0.tar.gz) = 268168
+TIMESTAMP = 1710429313
+SHA256 (ocsigen-lwt-5.7.0_GH0.tar.gz) = 371031c38071f6f1b1b815cbe07f436c013af8fd8c4862c57a12e37c15c8b785
+SIZE (ocsigen-lwt-5.7.0_GH0.tar.gz) = 313632
--- a/devel/ocaml-lwt/files/patch-src_unix_lwt__bytes.ml
+++ b/devel/ocaml-lwt/files/patch-src_unix_lwt__bytes.ml
@ -1,12 +0,0 @@
--- src/unix/lwt_bytes.ml.orig	2016-04-25 14:32:43 UTC
-+++ src/unix/lwt_bytes.ml
-@@ -219,7 +219,8 @@ let map_file ~fd ?pos ~shared ?(size=(-1)) () =
-    +-----------------------------------------------------------------+ *)
- 
- let map_file ~fd ?pos ~shared ?(size=(-1)) () =
-  Array1.map_file fd ?pos char c_layout shared size
-+  Unix.map_file fd ?pos char c_layout shared [|size|]
-+  |> Bigarray.array1_of_genarray
- 
- external mapped : t -> bool = "lwt_unix_mapped" "noalloc"
- 
--- a/devel/ocaml-lwt/files/patch-src_unix_lwt__unix.ml
+++ b/devel/ocaml-lwt/files/patch-src_unix_lwt__unix.ml
@ -1,10 +0,0 @@
--- src/unix/lwt_unix.ml.orig	2024-02-01 21:33:02 UTC
-+++ src/unix/lwt_unix.ml
-@@ -1471,6 +1471,7 @@ type socket_bool_option =
-   | SO_ACCEPTCONN
-   | TCP_NODELAY
-   | IPV6_ONLY
-+  | SO_REUSEPORT
- 
- type socket_int_option =
-     Unix.socket_int_option =
--- a/devel/ocaml-lwt/files/patch-src_unix_lwt__unix.mli
+++ b/devel/ocaml-lwt/files/patch-src_unix_lwt__unix.mli
@ -1,10 +0,0 @@
--- src/unix/lwt_unix.mli.orig	2016-04-25 14:32:43 UTC
-+++ src/unix/lwt_unix.mli
-@@ -806,6 +806,7 @@ type socket_bool_option =
-   | SO_ACCEPTCONN
-   | TCP_NODELAY
-   | IPV6_ONLY
-+  | SO_REUSEPORT
- 
- type socket_int_option =
-     Unix.socket_int_option =
--- a/devel/ocaml-lwt/pkg-plist
+++ b/devel/ocaml-lwt/pkg-plist
@ -0,0 +1,198 @@
+%%OCAML_SITELIBDIR%%/lwt/META
+%%OCAML_SITELIBDIR%%/lwt/dlllwt_unix_stubs.so
+%%OCAML_SITELIBDIR%%/lwt/dune-package
+%%OCAML_SITELIBDIR%%/lwt/lwt.a
+%%OCAML_SITELIBDIR%%/lwt/lwt.cma
+%%OCAML_SITELIBDIR%%/lwt/lwt.cmi
+%%OCAML_SITELIBDIR%%/lwt/lwt.cmt
+%%OCAML_SITELIBDIR%%/lwt/lwt.cmti
+%%OCAML_SITELIBDIR%%/lwt/lwt.cmx
+%%OCAML_SITELIBDIR%%/lwt/lwt.cmxa
+%%OCAML_SITELIBDIR%%/lwt/lwt.cmxs
+%%OCAML_SITELIBDIR%%/lwt/lwt.ml
+%%OCAML_SITELIBDIR%%/lwt/lwt.mli
+%%OCAML_SITELIBDIR%%/lwt/lwt_condition.cmi
+%%OCAML_SITELIBDIR%%/lwt/lwt_condition.cmt
+%%OCAML_SITELIBDIR%%/lwt/lwt_condition.cmti
+%%OCAML_SITELIBDIR%%/lwt/lwt_condition.cmx
+%%OCAML_SITELIBDIR%%/lwt/lwt_condition.ml
+%%OCAML_SITELIBDIR%%/lwt/lwt_condition.mli
+%%OCAML_SITELIBDIR%%/lwt/lwt_list.cmi
+%%OCAML_SITELIBDIR%%/lwt/lwt_list.cmt
+%%OCAML_SITELIBDIR%%/lwt/lwt_list.cmti
+%%OCAML_SITELIBDIR%%/lwt/lwt_list.cmx
+%%OCAML_SITELIBDIR%%/lwt/lwt_list.ml
+%%OCAML_SITELIBDIR%%/lwt/lwt_list.mli
+%%OCAML_SITELIBDIR%%/lwt/lwt_mutex.cmi
+%%OCAML_SITELIBDIR%%/lwt/lwt_mutex.cmt
+%%OCAML_SITELIBDIR%%/lwt/lwt_mutex.cmti
+%%OCAML_SITELIBDIR%%/lwt/lwt_mutex.cmx
+%%OCAML_SITELIBDIR%%/lwt/lwt_mutex.ml
+%%OCAML_SITELIBDIR%%/lwt/lwt_mutex.mli
+%%OCAML_SITELIBDIR%%/lwt/lwt_mvar.cmi
+%%OCAML_SITELIBDIR%%/lwt/lwt_mvar.cmt
+%%OCAML_SITELIBDIR%%/lwt/lwt_mvar.cmti
+%%OCAML_SITELIBDIR%%/lwt/lwt_mvar.cmx
+%%OCAML_SITELIBDIR%%/lwt/lwt_mvar.ml
+%%OCAML_SITELIBDIR%%/lwt/lwt_mvar.mli
+%%OCAML_SITELIBDIR%%/lwt/lwt_pool.cmi
+%%OCAML_SITELIBDIR%%/lwt/lwt_pool.cmt
+%%OCAML_SITELIBDIR%%/lwt/lwt_pool.cmti
+%%OCAML_SITELIBDIR%%/lwt/lwt_pool.cmx
+%%OCAML_SITELIBDIR%%/lwt/lwt_pool.ml
+%%OCAML_SITELIBDIR%%/lwt/lwt_pool.mli
+%%OCAML_SITELIBDIR%%/lwt/lwt_pqueue.cmi
+%%OCAML_SITELIBDIR%%/lwt/lwt_pqueue.cmt
+%%OCAML_SITELIBDIR%%/lwt/lwt_pqueue.cmti
+%%OCAML_SITELIBDIR%%/lwt/lwt_pqueue.cmx
+%%OCAML_SITELIBDIR%%/lwt/lwt_pqueue.ml
+%%OCAML_SITELIBDIR%%/lwt/lwt_pqueue.mli
+%%OCAML_SITELIBDIR%%/lwt/lwt_result.cmi
+%%OCAML_SITELIBDIR%%/lwt/lwt_result.cmt
+%%OCAML_SITELIBDIR%%/lwt/lwt_result.cmti
+%%OCAML_SITELIBDIR%%/lwt/lwt_result.cmx
+%%OCAML_SITELIBDIR%%/lwt/lwt_result.ml
+%%OCAML_SITELIBDIR%%/lwt/lwt_result.mli
+%%OCAML_SITELIBDIR%%/lwt/lwt_seq.cmi
+%%OCAML_SITELIBDIR%%/lwt/lwt_seq.cmt
+%%OCAML_SITELIBDIR%%/lwt/lwt_seq.cmti
+%%OCAML_SITELIBDIR%%/lwt/lwt_seq.cmx
+%%OCAML_SITELIBDIR%%/lwt/lwt_seq.ml
+%%OCAML_SITELIBDIR%%/lwt/lwt_seq.mli
+%%OCAML_SITELIBDIR%%/lwt/lwt_sequence.cmi
+%%OCAML_SITELIBDIR%%/lwt/lwt_sequence.cmt
+%%OCAML_SITELIBDIR%%/lwt/lwt_sequence.cmti
+%%OCAML_SITELIBDIR%%/lwt/lwt_sequence.cmx
+%%OCAML_SITELIBDIR%%/lwt/lwt_sequence.ml
+%%OCAML_SITELIBDIR%%/lwt/lwt_sequence.mli
+%%OCAML_SITELIBDIR%%/lwt/lwt_stream.cmi
+%%OCAML_SITELIBDIR%%/lwt/lwt_stream.cmt
+%%OCAML_SITELIBDIR%%/lwt/lwt_stream.cmti
+%%OCAML_SITELIBDIR%%/lwt/lwt_stream.cmx
+%%OCAML_SITELIBDIR%%/lwt/lwt_stream.ml
+%%OCAML_SITELIBDIR%%/lwt/lwt_stream.mli
+%%OCAML_SITELIBDIR%%/lwt/lwt_switch.cmi
+%%OCAML_SITELIBDIR%%/lwt/lwt_switch.cmt
+%%OCAML_SITELIBDIR%%/lwt/lwt_switch.cmti
+%%OCAML_SITELIBDIR%%/lwt/lwt_switch.cmx
+%%OCAML_SITELIBDIR%%/lwt/lwt_switch.ml
+%%OCAML_SITELIBDIR%%/lwt/lwt_switch.mli
+%%OCAML_SITELIBDIR%%/lwt/opam
+%%OCAML_SITELIBDIR%%/lwt/unix/liblwt_unix_stubs.a
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_bytes.cmi
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_bytes.cmt
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_bytes.cmti
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_bytes.cmx
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_bytes.ml
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_bytes.mli
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_config.cmi
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_config.cmt
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_config.cmx
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_config.h
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_config.ml
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_engine.cmi
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_engine.cmt
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_engine.cmti
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_engine.cmx
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_engine.ml
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_engine.mli
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_features.cmi
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_features.cmt
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_features.cmx
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_features.h
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_features.ml
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_fmt.cmi
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_fmt.cmt
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_fmt.cmti
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_fmt.cmx
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_fmt.ml
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_fmt.mli
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_gc.cmi
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_gc.cmt
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_gc.cmti
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_gc.cmx
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_gc.ml
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_gc.mli
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_io.cmi
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_io.cmt
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_io.cmti
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_io.cmx
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_io.ml
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_io.mli
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_main.cmi
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_main.cmt
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_main.cmti
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_main.cmx
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_main.ml
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_main.mli
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_preemptive.cmi
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_preemptive.cmt
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_preemptive.cmti
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_preemptive.cmx
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_preemptive.ml
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_preemptive.mli
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_process.cmi
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_process.cmt
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_process.cmti
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_process.cmx
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_process.ml
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_process.mli
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_sys.cmi
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_sys.cmt
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_sys.cmti
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_sys.cmx
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_sys.ml
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_sys.mli
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_throttle.cmi
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_throttle.cmt
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_throttle.cmti
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_throttle.cmx
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_throttle.ml
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_throttle.mli
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_timeout.cmi
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_timeout.cmt
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_timeout.cmti
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_timeout.cmx
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_timeout.ml
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_timeout.mli
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_unix.a
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_unix.cma
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_unix.cmi
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_unix.cmt
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_unix.cmti
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_unix.cmx
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_unix.cmxa
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_unix.cmxs
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_unix.h
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_unix.ml
+%%OCAML_SITELIBDIR%%/lwt/unix/lwt_unix.mli
+%%OCAML_SITELIBDIR%%/lwt_ppx/META
+%%OCAML_SITELIBDIR%%/lwt_ppx/dune-package
+%%OCAML_SITELIBDIR%%/lwt_ppx/opam
+%%OCAML_SITELIBDIR%%/lwt_ppx/ppx.exe
+%%OCAML_SITELIBDIR%%/lwt_ppx/ppx_lwt.a
+%%OCAML_SITELIBDIR%%/lwt_ppx/ppx_lwt.cma
+%%OCAML_SITELIBDIR%%/lwt_ppx/ppx_lwt.cmi
+%%OCAML_SITELIBDIR%%/lwt_ppx/ppx_lwt.cmt
+%%OCAML_SITELIBDIR%%/lwt_ppx/ppx_lwt.cmti
+%%OCAML_SITELIBDIR%%/lwt_ppx/ppx_lwt.cmx
+%%OCAML_SITELIBDIR%%/lwt_ppx/ppx_lwt.cmxa
+%%OCAML_SITELIBDIR%%/lwt_ppx/ppx_lwt.cmxs
+%%OCAML_SITELIBDIR%%/lwt_ppx/ppx_lwt.ml
+%%OCAML_SITELIBDIR%%/lwt_ppx/ppx_lwt.mli
+%%OCAML_SITELIBDIR%%/lwt_ppx_let/META
+%%OCAML_SITELIBDIR%%/lwt_ppx_let/dune-package
+%%OCAML_SITELIBDIR%%/lwt_ppx_let/opam
+%%OCAML_SITELIBDIR%%/lwt_react/META
+%%OCAML_SITELIBDIR%%/lwt_react/dune-package
+%%OCAML_SITELIBDIR%%/lwt_react/lwt_react.a
+%%OCAML_SITELIBDIR%%/lwt_react/lwt_react.cma
+%%OCAML_SITELIBDIR%%/lwt_react/lwt_react.cmi
+%%OCAML_SITELIBDIR%%/lwt_react/lwt_react.cmt
+%%OCAML_SITELIBDIR%%/lwt_react/lwt_react.cmti
+%%OCAML_SITELIBDIR%%/lwt_react/lwt_react.cmx
+%%OCAML_SITELIBDIR%%/lwt_react/lwt_react.cmxa
+%%OCAML_SITELIBDIR%%/lwt_react/lwt_react.cmxs
+%%OCAML_SITELIBDIR%%/lwt_react/lwt_react.ml
+%%OCAML_SITELIBDIR%%/lwt_react/lwt_react.mli
+%%OCAML_SITELIBDIR%%/lwt_react/opam
--- a/devel/ocaml-magic/Makefile
+++ b/devel/ocaml-magic/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	magic
 PORTVERSION=	0.7.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	SF/ocaml-${PORTNAME}/ocaml-${PORTNAME}/0.7
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-mtime/Makefile
+++ b/devel/ocaml-mtime/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	mtime
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://erratique.ch/software/mtime/releases/
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-ocamlbuild/Makefile
+++ b/devel/ocaml-ocamlbuild/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	ocamlbuild
 PORTVERSION=	0.14.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

--- a/devel/ocaml-ocplib-endian/Makefile
+++ b/devel/ocaml-ocplib-endian/Makefile
@ -0,0 +1,34 @@
+PORTNAME=	ocplib-endian
+PORTVERSION=	1.2
+CATEGORIES=	devel
+PKGNAMEPREFIX=	ocaml-
+
+MAINTAINER=	freebsd@dev.thsi.be
+COMMENT=	Optimized manipulation of integers over the standard byte-array types of OCaml
+WWW=		https://github.com/janestreet/base
+
+LICENSE=	LGPL21+ # with a special exception to clause 6
+
+BUILD_DEPENDS=	cppo:devel/ocaml-cppo
+
+USES=		ocaml:dune
+USE_GITHUB=	yes
+GH_ACCOUNT=	OCamlPro
+USE_OCAML=	yes
+
+DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
+PORTDOCS=	CHANGES.md README.md
+
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	@${REINPLACE_CMD} \
+		-e "s/(name ${PORTNAME})/&\n (version ${PORTVERSION})/" \
+		${WRKSRC}/dune-project
+
+post-install:
+	@${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/bigstring/ocplib_endian_bigstring.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/ocplib_endian.cmxs
+
+.include <bsd.port.mk>
--- a/devel/ocaml-ocplib-endian/distinfo
+++ b/devel/ocaml-ocplib-endian/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1710446606
+SHA256 (OCamlPro-ocplib-endian-1.2_GH0.tar.gz) = 97ae74e8aeead46a0475df14af637ce78e2372c07258619ad8967506f2d4b320
+SIZE (OCamlPro-ocplib-endian-1.2_GH0.tar.gz) = 18061
--- a/devel/ocaml-ocplib-endian/pkg-descr
+++ b/devel/ocaml-ocplib-endian/pkg-descr
@ -0,0 +1,2 @@
+This OCaml library allows to read and write 8/16/32/64-bits integers
+from and to Bigstring, Bytes and String, using a specific endianness.
--- a/devel/ocaml-ocplib-endian/pkg-plist
+++ b/devel/ocaml-ocplib-endian/pkg-plist
@ -0,0 +1,29 @@
+%%OCAML_SITELIBDIR%%/ocplib-endian/META
+%%OCAML_SITELIBDIR%%/ocplib-endian/bigstring/endianBigstring.cmi
+%%OCAML_SITELIBDIR%%/ocplib-endian/bigstring/endianBigstring.cmt
+%%OCAML_SITELIBDIR%%/ocplib-endian/bigstring/endianBigstring.cmti
+%%OCAML_SITELIBDIR%%/ocplib-endian/bigstring/endianBigstring.cmx
+%%OCAML_SITELIBDIR%%/ocplib-endian/bigstring/endianBigstring.ml
+%%OCAML_SITELIBDIR%%/ocplib-endian/bigstring/endianBigstring.mli
+%%OCAML_SITELIBDIR%%/ocplib-endian/bigstring/ocplib_endian_bigstring.a
+%%OCAML_SITELIBDIR%%/ocplib-endian/bigstring/ocplib_endian_bigstring.cma
+%%OCAML_SITELIBDIR%%/ocplib-endian/bigstring/ocplib_endian_bigstring.cmxa
+%%OCAML_SITELIBDIR%%/ocplib-endian/bigstring/ocplib_endian_bigstring.cmxs
+%%OCAML_SITELIBDIR%%/ocplib-endian/dune-package
+%%OCAML_SITELIBDIR%%/ocplib-endian/endianBytes.cmi
+%%OCAML_SITELIBDIR%%/ocplib-endian/endianBytes.cmt
+%%OCAML_SITELIBDIR%%/ocplib-endian/endianBytes.cmti
+%%OCAML_SITELIBDIR%%/ocplib-endian/endianBytes.cmx
+%%OCAML_SITELIBDIR%%/ocplib-endian/endianBytes.ml
+%%OCAML_SITELIBDIR%%/ocplib-endian/endianBytes.mli
+%%OCAML_SITELIBDIR%%/ocplib-endian/endianString.cmi
+%%OCAML_SITELIBDIR%%/ocplib-endian/endianString.cmt
+%%OCAML_SITELIBDIR%%/ocplib-endian/endianString.cmti
+%%OCAML_SITELIBDIR%%/ocplib-endian/endianString.cmx
+%%OCAML_SITELIBDIR%%/ocplib-endian/endianString.ml
+%%OCAML_SITELIBDIR%%/ocplib-endian/endianString.mli
+%%OCAML_SITELIBDIR%%/ocplib-endian/ocplib_endian.a
+%%OCAML_SITELIBDIR%%/ocplib-endian/ocplib_endian.cma
+%%OCAML_SITELIBDIR%%/ocplib-endian/ocplib_endian.cmxa
+%%OCAML_SITELIBDIR%%/ocplib-endian/ocplib_endian.cmxs
+%%OCAML_SITELIBDIR%%/ocplib-endian/opam
--- a/devel/ocaml-ounit/Makefile
+++ b/devel/ocaml-ounit/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	ounit
 PORTVERSION=	1.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	http://www.xs4all.nl/~mmzeeman/ocaml/
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-parmap/Makefile
+++ b/devel/ocaml-parmap/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	parmap
 DISTVERSION=	1.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

--- a/devel/ocaml-parsexp/Makefile
+++ b/devel/ocaml-parsexp/Makefile
@ -0,0 +1,35 @@
+PORTNAME=	parsexp
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.16.0
+CATEGORIES=	devel
+PKGNAMEPREFIX=	ocaml-
+
+MAINTAINER=	freebsd@dev.thsi.be
+COMMENT=	OCaml library for parsing S-expressions
+WWW=		https://janestreet.github.io/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+BUILD_DEPENDS=	${SA_DIR}/sexplib0/META:devel/ocaml-sexplib0
+RUN_DEPENDS=	${SA_DIR}/sexplib0/META:devel/ocaml-sexplib0
+
+USES=		ocaml:dune
+USE_GITHUB=	yes
+GH_ACCOUNT=	janestreet
+USE_OCAML=	yes
+
+OPTIONS_DEFINE=	DOCS
+
+DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
+PORTDOCS=	CHANGES.md LICENSE.md README.org
+
+OPTIONS_DEFINE=	DOCS
+
+SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
+
+post-install:
+	@${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/parsexp/parsexp.cmxs
+
+.include <bsd.port.mk>
--- a/devel/ocaml-parsexp/distinfo
+++ b/devel/ocaml-parsexp/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1710455796
+SHA256 (janestreet-parsexp-v0.16.0_GH0.tar.gz) = 859db54b077f606ce550dfac468c399f3a14d32a4ac60da166d403fe57836e9f
+SIZE (janestreet-parsexp-v0.16.0_GH0.tar.gz) = 56904
--- a/devel/ocaml-parsexp/pkg-descr
+++ b/devel/ocaml-parsexp/pkg-descr
@ -0,0 +1,2 @@
+This library provides generic parsers for parsing S-expressions in
+OCaml.
--- a/devel/ocaml-parsexp/pkg-plist
+++ b/devel/ocaml-parsexp/pkg-plist
@ -0,0 +1,127 @@
+%%OCAML_SITELIBDIR%%/parsexp/META
+%%OCAML_SITELIBDIR%%/parsexp/automaton.ml
+%%OCAML_SITELIBDIR%%/parsexp/automaton.mli
+%%OCAML_SITELIBDIR%%/parsexp/automaton_action.ml
+%%OCAML_SITELIBDIR%%/parsexp/automaton_action.mli
+%%OCAML_SITELIBDIR%%/parsexp/automaton_intf.ml
+%%OCAML_SITELIBDIR%%/parsexp/automaton_stack.ml
+%%OCAML_SITELIBDIR%%/parsexp/automaton_stack.mli
+%%OCAML_SITELIBDIR%%/parsexp/automaton_stack_intf.ml
+%%OCAML_SITELIBDIR%%/parsexp/automaton_state.ml
+%%OCAML_SITELIBDIR%%/parsexp/automaton_state.mli
+%%OCAML_SITELIBDIR%%/parsexp/automaton_state_intf.ml
+%%OCAML_SITELIBDIR%%/parsexp/automaton_tables.ml
+%%OCAML_SITELIBDIR%%/parsexp/automaton_tables.mli
+%%OCAML_SITELIBDIR%%/parsexp/conv.ml
+%%OCAML_SITELIBDIR%%/parsexp/conv.mli
+%%OCAML_SITELIBDIR%%/parsexp/conv_error.ml
+%%OCAML_SITELIBDIR%%/parsexp/conv_error.mli
+%%OCAML_SITELIBDIR%%/parsexp/conv_intf.ml
+%%OCAML_SITELIBDIR%%/parsexp/cst.ml
+%%OCAML_SITELIBDIR%%/parsexp/cst.mli
+%%OCAML_SITELIBDIR%%/parsexp/dune-package
+%%OCAML_SITELIBDIR%%/parsexp/import.ml
+%%OCAML_SITELIBDIR%%/parsexp/of_sexp_error.ml
+%%OCAML_SITELIBDIR%%/parsexp/of_sexp_error.mli
+%%OCAML_SITELIBDIR%%/parsexp/old_parser_cont_state.ml
+%%OCAML_SITELIBDIR%%/parsexp/old_parser_cont_state.mli
+%%OCAML_SITELIBDIR%%/parsexp/opam
+%%OCAML_SITELIBDIR%%/parsexp/parse_error.ml
+%%OCAML_SITELIBDIR%%/parsexp/parse_error.mli
+%%OCAML_SITELIBDIR%%/parsexp/parse_error_intf.ml
+%%OCAML_SITELIBDIR%%/parsexp/parser.ml
+%%OCAML_SITELIBDIR%%/parsexp/parser.mli
+%%OCAML_SITELIBDIR%%/parsexp/parser_intf.ml
+%%OCAML_SITELIBDIR%%/parsexp/parsexp.a
+%%OCAML_SITELIBDIR%%/parsexp/parsexp.cma
+%%OCAML_SITELIBDIR%%/parsexp/parsexp.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp.cmti
+%%OCAML_SITELIBDIR%%/parsexp/parsexp.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp.cmxa
+%%OCAML_SITELIBDIR%%/parsexp/parsexp.cmxs
+%%OCAML_SITELIBDIR%%/parsexp/parsexp.ml
+%%OCAML_SITELIBDIR%%/parsexp/parsexp.mli
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__.ml
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton.cmti
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_action.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_action.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_action.cmti
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_action.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_intf.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_intf.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_intf.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_stack.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_stack.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_stack.cmti
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_stack.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_stack_intf.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_stack_intf.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_stack_intf.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_state.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_state.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_state.cmti
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_state.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_state_intf.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_state_intf.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_state_intf.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_tables.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_tables.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_tables.cmti
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Automaton_tables.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Conv.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Conv.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Conv.cmti
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Conv.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Conv_error.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Conv_error.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Conv_error.cmti
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Conv_error.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Conv_intf.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Conv_intf.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Conv_intf.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Cst.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Cst.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Cst.cmti
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Cst.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Import.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Import.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Import.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Of_sexp_error.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Of_sexp_error.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Of_sexp_error.cmti
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Of_sexp_error.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Old_parser_cont_state.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Old_parser_cont_state.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Old_parser_cont_state.cmti
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Old_parser_cont_state.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Parse_error.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Parse_error.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Parse_error.cmti
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Parse_error.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Parse_error_intf.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Parse_error_intf.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Parse_error_intf.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Parser.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Parser.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Parser.cmti
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Parser.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Parser_intf.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Parser_intf.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Parser_intf.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Parsexp_intf.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Parsexp_intf.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Parsexp_intf.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Positions.cmi
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Positions.cmt
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Positions.cmti
+%%OCAML_SITELIBDIR%%/parsexp/parsexp__Positions.cmx
+%%OCAML_SITELIBDIR%%/parsexp/parsexp_intf.ml
+%%OCAML_SITELIBDIR%%/parsexp/positions.ml
+%%OCAML_SITELIBDIR%%/parsexp/positions.mli
--- a/devel/ocaml-pcre/Makefile
+++ b/devel/ocaml-pcre/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	pcre
 PORTVERSION=	7.2.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

--- a/devel/ocaml-pcre2/Makefile
+++ b/devel/ocaml-pcre2/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	pcre2
 PORTVERSION=	7.5.2
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

--- a/devel/ocaml-pomap/Makefile
+++ b/devel/ocaml-pomap/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	pomap
 PORTVERSION=	4.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

--- a/devel/ocaml-ppx-tools/Makefile
+++ b/devel/ocaml-ppx-tools/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	ppx-tools
 PORTVERSION=	6.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

--- a/devel/ocaml-ppx_derivers/Makefile
+++ b/devel/ocaml-ppx_derivers/Makefile
@ -0,0 +1,33 @@
+PORTNAME=	ppx_derivers
+PORTVERSION=	1.2.1
+CATEGORIES=	devel
+PKGNAMEPREFIX=	ocaml-
+
+MAINTAINER=	freebsd@dev.thsi.be
+COMMENT=	PPX compatibility library for OCaml
+WWW=		https://github.com/ocaml-ppx/ppx_derivers
+
+LICENSE=	MIT
+
+USES=		ocaml:dune
+USE_GITHUB=	yes
+GH_ACCOUNT=	ocaml-ppx
+USE_OCAML=	yes
+
+DOCSDIR=	${OCAML_DOCSDIR}/ppx_derivers
+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}/ppx_derivers/ppx_derivers.cmxs
+
+.include <bsd.port.mk>
--- a/devel/ocaml-ppx_derivers/distinfo
+++ b/devel/ocaml-ppx_derivers/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1709657045
+SHA256 (ocaml-ppx-ppx_derivers-1.2.1_GH0.tar.gz) = b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95
+SIZE (ocaml-ppx-ppx_derivers-1.2.1_GH0.tar.gz) = 2530
--- a/devel/ocaml-ppx_derivers/pkg-descr
+++ b/devel/ocaml-ppx_derivers/pkg-descr
@ -0,0 +1,3 @@
+Legacy OCaml PPX library which allows the interoperability of
+ppx_deriving and ppx_type_conv. New code should depend on ocaml-ppxlib
+instead of depending on this library.
--- a/devel/ocaml-ppx_derivers/pkg-plist
+++ b/devel/ocaml-ppx_derivers/pkg-plist
@ -0,0 +1,13 @@
+%%OCAML_SITELIBDIR%%/ppx_derivers/META
+%%OCAML_SITELIBDIR%%/ppx_derivers/dune-package
+%%OCAML_SITELIBDIR%%/ppx_derivers/opam
+%%OCAML_SITELIBDIR%%/ppx_derivers/ppx_derivers.a
+%%OCAML_SITELIBDIR%%/ppx_derivers/ppx_derivers.cma
+%%OCAML_SITELIBDIR%%/ppx_derivers/ppx_derivers.cmi
+%%OCAML_SITELIBDIR%%/ppx_derivers/ppx_derivers.cmt
+%%OCAML_SITELIBDIR%%/ppx_derivers/ppx_derivers.cmti
+%%OCAML_SITELIBDIR%%/ppx_derivers/ppx_derivers.cmx
+%%OCAML_SITELIBDIR%%/ppx_derivers/ppx_derivers.cmxa
+%%OCAML_SITELIBDIR%%/ppx_derivers/ppx_derivers.cmxs
+%%OCAML_SITELIBDIR%%/ppx_derivers/ppx_derivers.ml
+%%OCAML_SITELIBDIR%%/ppx_derivers/ppx_derivers.mli
--- a/devel/ocaml-ppx_sexp_conv/Makefile
+++ b/devel/ocaml-ppx_sexp_conv/Makefile
@ -0,0 +1,41 @@
+PORTNAME=	ppx_sexp_conv
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.16.0
+CATEGORIES=	devel
+PKGNAMEPREFIX=	ocaml-
+
+MAINTAINER=	freebsd@dev.thsi.be
+COMMENT=	Deriving PPX plugin to generate S-expression converters
+WWW=		https://github.com/janestreet/ppx_sexp_conv
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+BUILD_DEPENDS=	${SA_DIR}/base/META:devel/ocaml-base \
+		${SA_DIR}/sexplib0/META:devel/ocaml-sexplib0 \
+		${SA_DIR}/ppxlib/META:devel/ocaml-ppxlib
+RUN_DEPENDS=	${SA_DIR}/base/META:devel/ocaml-base \
+		${SA_DIR}/sexplib0/META:devel/ocaml-sexplib0 \
+		${SA_DIR}/ppxlib/META:devel/ocaml-ppxlib
+
+USES=		ocaml:dune
+USE_GITHUB=	yes
+GH_ACCOUNT=	janestreet
+USE_OCAML=	yes
+
+OPTIONS_DEFINE=	DOCS
+
+DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
+PORTDOCS=	CHANGES.md LICENSE.md README.org
+
+OPTIONS_DEFINE=	DOCS
+
+SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
+
+post-install:
+	@${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/ppx_sexp_conv/expander/ppx_sexp_conv_expander.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/ppx_sexp_conv/ppx_sexp_conv.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/ppx_sexp_conv/runtime-lib/ppx_sexp_conv_lib.cmxs
+
+.include <bsd.port.mk>
--- a/devel/ocaml-ppx_sexp_conv/distinfo
+++ b/devel/ocaml-ppx_sexp_conv/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1710456993
+SHA256 (janestreet-ppx_sexp_conv-v0.16.0_GH0.tar.gz) = 3b7065f4ec2f8b72df688c7b5604cea82a733fdccab4317c758a64710fc71e87
+SIZE (janestreet-ppx_sexp_conv-v0.16.0_GH0.tar.gz) = 66918
--- a/devel/ocaml-ppx_sexp_conv/pkg-descr
+++ b/devel/ocaml-ppx_sexp_conv/pkg-descr
@ -0,0 +1,2 @@
+This library contains functionality for parsing and pretty-printing
+S-expressions.
--- a/devel/ocaml-ppx_sexp_conv/pkg-plist
+++ b/devel/ocaml-ppx_sexp_conv/pkg-plist
@ -0,0 +1,95 @@
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/META
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/dune-package
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/attrs.ml
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/attrs.mli
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/conversion.ml
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/conversion.mli
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/expand_of_sexp.ml
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/expand_of_sexp.mli
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/expand_sexp_of.ml
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/expand_sexp_of.mli
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/fresh_name.ml
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/fresh_name.mli
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/helpers.ml
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/helpers.mli
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/lifted.ml
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/lifted.mli
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander.a
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander.cma
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander.cmi
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander.cmt
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander.cmti
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander.cmx
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander.cmxa
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander.ml
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander.mli
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__.cmi
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__.cmt
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__.cmx
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__.ml
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Attrs.cmi
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Attrs.cmt
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Attrs.cmti
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Attrs.cmx
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander.cmxs
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Conversion.cmi
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Conversion.cmt
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Conversion.cmti
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Conversion.cmx
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Expand_of_sexp.cmi
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Expand_of_sexp.cmt
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Expand_of_sexp.cmti
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Expand_of_sexp.cmx
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Expand_sexp_of.cmi
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Expand_sexp_of.cmt
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Expand_sexp_of.cmti
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Expand_sexp_of.cmx
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Fresh_name.cmi
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Fresh_name.cmt
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Fresh_name.cmti
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Fresh_name.cmx
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Helpers.cmi
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Helpers.cmt
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Helpers.cmti
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Helpers.cmx
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Lifted.cmi
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Lifted.cmt
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Lifted.cmti
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Lifted.cmx
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Ppx_sexp_conv_grammar.cmi
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Ppx_sexp_conv_grammar.cmt
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Ppx_sexp_conv_grammar.cmti
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Ppx_sexp_conv_grammar.cmx
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Record_field_attrs.cmi
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Record_field_attrs.cmt
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Record_field_attrs.cmti
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Record_field_attrs.cmx
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Renaming.cmi
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Renaming.cmt
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Renaming.cmti
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_expander__Renaming.cmx
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_grammar.ml
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/ppx_sexp_conv_grammar.mli
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/record_field_attrs.ml
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/record_field_attrs.mli
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/renaming.ml
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/expander/renaming.mli
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/opam
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/ppx_sexp_conv.a
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/ppx_sexp_conv.cma
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/ppx_sexp_conv.cmi
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/ppx_sexp_conv.cmt
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/ppx_sexp_conv.cmti
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/ppx_sexp_conv.cmx
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/ppx_sexp_conv.cmxa
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/ppx_sexp_conv.cmxs
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/ppx_sexp_conv.ml
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/ppx_sexp_conv.mli
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/runtime-lib/ppx_sexp_conv_lib.a
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/runtime-lib/ppx_sexp_conv_lib.cma
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/runtime-lib/ppx_sexp_conv_lib.cmi
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/runtime-lib/ppx_sexp_conv_lib.cmt
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/runtime-lib/ppx_sexp_conv_lib.cmx
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/runtime-lib/ppx_sexp_conv_lib.cmxa
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/runtime-lib/ppx_sexp_conv_lib.cmxs
+%%OCAML_SITELIBDIR%%/ppx_sexp_conv/runtime-lib/ppx_sexp_conv_lib.ml
--- a/devel/ocaml-ppxlib/Makefile
+++ b/devel/ocaml-ppxlib/Makefile
@ -0,0 +1,55 @@
+PORTNAME=	ppxlib
+PORTVERSION=	0.32.0
+CATEGORIES=	devel
+PKGNAMEPREFIX=	ocaml-
+
+MAINTAINER=	freebsd@dev.thsi.be
+COMMENT=	Library to write PPX syntax extension for OCaml
+WWW=		https://github.com/ocaml-ppx/ppxlib
+
+LICENSE=	MIT
+
+BUILD_DEPENDS=	${SA_DIR}/ocaml-compiler-libs/META:devel/ocaml-compiler-libs \
+		${SA_DIR}/ppx_derivers/META:devel/ocaml-ppx_derivers \
+		${SA_DIR}/sexplib0/META:devel/ocaml-sexplib0
+RUN_DEPENDS=	${SA_DIR}/ocaml-compiler-libs/META:devel/ocaml-compiler-libs \
+		${SA_DIR}/ppx_derivers/META:devel/ocaml-ppx_derivers \
+		${SA_DIR}/sexplib0/META:devel/ocaml-sexplib0
+
+USES=			ocaml:dune
+USE_GITHUB=		yes
+GH_ACCOUNT=		ocaml-ppx
+USE_OCAML=		yes
+DUNE_INSTALL_TARGETS=	${PORTNAME}
+
+DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
+PORTDOCS=	CHANGES.md LICENSE.md HISTORY.md README.md odoc-pages
+
+OPTIONS_DEFINE=	DOCS
+
+SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
+
+post-patch:
+	@(cd ${WRKSRC}; \
+	${REINPLACE_CMD} -e s/stdlib-shims//g \
+		ast/dune dune-project metaquot_lifters/dune src/dune src/gen/dune \
+		stdppx/dune traverse/dune; \
+	${REINPLACE_CMD} -e "s/(name ${PORTNAME})/&\n (version ${PORTVERSION})/" \
+		dune-project)
+
+post-install:
+	@${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/ast/ppxlib_ast.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/astlib/astlib.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/runner/ppxlib_runner.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/metaquot/ppxlib_metaquot.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/metaquot/ppx.exe \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/metaquot_lifters/ppxlib_metaquot_lifters.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/runner_as_ppx/ppxlib_runner_as_ppx.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/print_diff/ppxlib_print_diff.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/stdppx/stdppx.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/traverse/ppxlib_traverse.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/traverse_builtins/ppxlib_traverse_builtins.cmxs \
+		${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/ppxlib.cmxs
+
+.include <bsd.port.mk>
--- a/devel/ocaml-ppxlib/distinfo
+++ b/devel/ocaml-ppxlib/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1709654335
+SHA256 (ocaml-ppx-ppxlib-0.32.0_GH0.tar.gz) = 2b6abac31c46a855c8ef34b4aaa433796b37ef64209f0a9b668d3de9702302fb
+SIZE (ocaml-ppx-ppxlib-0.32.0_GH0.tar.gz) = 585028
--- a/devel/ocaml-ppxlib/pkg-descr
+++ b/devel/ocaml-ppxlib/pkg-descr
@ -0,0 +1,9 @@
+Library to help in writing OCaml PPX rewriters, which can be used to
+extend the syntax of an OCaml programs. PPX rewriters are a powerfull
+alternative to the older camlp4/campl5 technology, and they can also
+be composed.
+
+This PPX library provides facilities to, under other, work at the
+level of the OCaml's abstract syntax tree (AST), write driver
+front-ends for the OCaml compiler, parse an OCaml expression as an
+AST, etc.
--- a/devel/ocaml-ppxlib/pkg-plist
+++ b/devel/ocaml-ppxlib/pkg-plist
@ -0,0 +1,556 @@
+%%OCAML_SITELIBDIR%%/ppxlib/META
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ast.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ast_helper_lite.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ast_helper_lite.mli
+%%OCAML_SITELIBDIR%%/ppxlib/ast/import.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ast/location_error.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ast/location_error.mli
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast.a
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast.cma
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast.cmxa
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast.cmxs
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Ast.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Ast.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Ast.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Ast_helper_lite.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Ast_helper_lite.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Ast_helper_lite.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Ast_helper_lite.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Import.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Import.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Import.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Location_error.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Location_error.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Location_error.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Location_error.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Stdlib0.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Stdlib0.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Stdlib0.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Versions.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Versions.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Versions.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Versions.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Warn.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Warn.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Warn.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ast/ppxlib_ast__Warn.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ast/stdlib0.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ast/versions.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ast/versions.mli
+%%OCAML_SITELIBDIR%%/ppxlib/ast/warn.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ast/warn.mli
+%%OCAML_SITELIBDIR%%/ppxlib/ast_builder.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ast_builder.mli
+%%OCAML_SITELIBDIR%%/ppxlib/ast_builder_generated.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ast_builder_intf.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ast_pattern.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ast_pattern.mli
+%%OCAML_SITELIBDIR%%/ppxlib/ast_pattern0.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ast_pattern_generated.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ast_traverse.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ast_traverse.mli
+%%OCAML_SITELIBDIR%%/ppxlib/ast_traverse0.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ast_traverse0.mli
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/ast_402.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/ast_403.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/ast_404.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/ast_405.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/ast_406.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/ast_407.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/ast_408.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/ast_409.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/ast_410.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/ast_411.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/ast_412.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/ast_413.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/ast_414.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/ast_500.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/ast_501.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/ast_metadata.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/ast_metadata.mli
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib.a
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib.cma
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib.cmxa
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib.cmxs
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_402.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_402.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_402.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_403.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_403.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_403.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_404.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_404.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_404.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_405.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_405.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_405.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_406.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_406.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_406.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_407.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_407.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_407.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_408.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_408.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_408.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_409.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_409.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_409.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_410.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_410.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_410.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_411.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_411.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_411.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_412.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_412.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_412.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_413.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_413.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_413.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_414.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_414.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_414.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_500.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_500.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_500.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_501.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_501.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_501.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_metadata.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_metadata.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_metadata.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Ast_metadata.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Config.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Config.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Config.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Config.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Keyword.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Keyword.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Keyword.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Keyword.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Location.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Location.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Location.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Location.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Longident.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Longident.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Longident.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Longident.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_402_403.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_402_403.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_402_403.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_403_402.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_403_402.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_403_402.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_403_404.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_403_404.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_403_404.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_404_403.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_404_403.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_404_403.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_404_405.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_404_405.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_404_405.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_405_404.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_405_404.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_405_404.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_405_406.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_405_406.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_405_406.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_406_405.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_406_405.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_406_405.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_406_407.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_406_407.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_406_407.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_407_406.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_407_406.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_407_406.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_407_408.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_407_408.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_407_408.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_408_407.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_408_407.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_408_407.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_408_409.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_408_409.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_408_409.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_409_408.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_409_408.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_409_408.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_409_410.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_409_410.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_409_410.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_410_409.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_410_409.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_410_409.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_410_411.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_410_411.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_410_411.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_411_410.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_411_410.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_411_410.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_411_412.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_411_412.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_411_412.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_412_411.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_412_411.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_412_411.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_412_413.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_412_413.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_412_413.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_413_412.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_413_412.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_413_412.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_413_414.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_413_414.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_413_414.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_414_413.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_414_413.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_414_413.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_414_500.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_414_500.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_414_500.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_500_414.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_500_414.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_500_414.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_500_501.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_500_501.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_500_501.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_501_500.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_501_500.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Migrate_501_500.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Parse.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Parse.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Parse.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Parse.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Pprintast.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Pprintast.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Pprintast.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Pprintast.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Stdlib0.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Stdlib0.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/astlib__Stdlib0.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/config.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/config.mli
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/keyword.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/keyword.mli
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/location.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/location.mli
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/longident.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/longident.mli
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_402_403.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_403_402.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_403_404.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_404_403.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_404_405.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_405_404.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_405_406.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_406_405.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_406_407.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_407_406.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_407_408.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_408_407.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_408_409.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_409_408.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_409_410.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_410_409.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_410_411.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_411_410.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_411_412.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_412_411.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_412_413.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_413_412.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_413_414.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_414_413.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_414_500.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_500_414.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_500_501.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/migrate_501_500.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/parse.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/parse.mli
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/pprintast.ml
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/pprintast.mli
+%%OCAML_SITELIBDIR%%/ppxlib/astlib/stdlib0.ml
+%%OCAML_SITELIBDIR%%/ppxlib/attribute.ml
+%%OCAML_SITELIBDIR%%/ppxlib/attribute.mli
+%%OCAML_SITELIBDIR%%/ppxlib/caller_id.ml
+%%OCAML_SITELIBDIR%%/ppxlib/code_matcher.ml
+%%OCAML_SITELIBDIR%%/ppxlib/code_matcher.mli
+%%OCAML_SITELIBDIR%%/ppxlib/code_path.ml
+%%OCAML_SITELIBDIR%%/ppxlib/code_path.mli
+%%OCAML_SITELIBDIR%%/ppxlib/common.ml
+%%OCAML_SITELIBDIR%%/ppxlib/common.mli
+%%OCAML_SITELIBDIR%%/ppxlib/context_free.ml
+%%OCAML_SITELIBDIR%%/ppxlib/context_free.mli
+%%OCAML_SITELIBDIR%%/ppxlib/deriving.ml
+%%OCAML_SITELIBDIR%%/ppxlib/deriving.mli
+%%OCAML_SITELIBDIR%%/ppxlib/driver.ml
+%%OCAML_SITELIBDIR%%/ppxlib/driver.mli
+%%OCAML_SITELIBDIR%%/ppxlib/dune-package
+%%OCAML_SITELIBDIR%%/ppxlib/expansion_context.ml
+%%OCAML_SITELIBDIR%%/ppxlib/expansion_context.mli
+%%OCAML_SITELIBDIR%%/ppxlib/expansion_helpers.ml
+%%OCAML_SITELIBDIR%%/ppxlib/expansion_helpers.mli
+%%OCAML_SITELIBDIR%%/ppxlib/extension.ml
+%%OCAML_SITELIBDIR%%/ppxlib/extension.mli
+%%OCAML_SITELIBDIR%%/ppxlib/ignore_unused_warning.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ignore_unused_warning.mli
+%%OCAML_SITELIBDIR%%/ppxlib/import.ml
+%%OCAML_SITELIBDIR%%/ppxlib/keyword.ml
+%%OCAML_SITELIBDIR%%/ppxlib/keyword.mli
+%%OCAML_SITELIBDIR%%/ppxlib/loc.ml
+%%OCAML_SITELIBDIR%%/ppxlib/loc.mli
+%%OCAML_SITELIBDIR%%/ppxlib/location.ml
+%%OCAML_SITELIBDIR%%/ppxlib/location.mli
+%%OCAML_SITELIBDIR%%/ppxlib/location_check.ml
+%%OCAML_SITELIBDIR%%/ppxlib/location_check.mli
+%%OCAML_SITELIBDIR%%/ppxlib/longident.ml
+%%OCAML_SITELIBDIR%%/ppxlib/longident.mli
+%%OCAML_SITELIBDIR%%/ppxlib/merlin_helpers.ml
+%%OCAML_SITELIBDIR%%/ppxlib/merlin_helpers.mli
+%%OCAML_SITELIBDIR%%/ppxlib/metaquot/ppx.exe
+%%OCAML_SITELIBDIR%%/ppxlib/metaquot/ppxlib_metaquot.a
+%%OCAML_SITELIBDIR%%/ppxlib/metaquot/ppxlib_metaquot.cma
+%%OCAML_SITELIBDIR%%/ppxlib/metaquot/ppxlib_metaquot.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/metaquot/ppxlib_metaquot.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/metaquot/ppxlib_metaquot.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/metaquot/ppxlib_metaquot.cmxa
+%%OCAML_SITELIBDIR%%/ppxlib/metaquot/ppxlib_metaquot.cmxs
+%%OCAML_SITELIBDIR%%/ppxlib/metaquot/ppxlib_metaquot.ml
+%%OCAML_SITELIBDIR%%/ppxlib/metaquot_lifters/ppxlib_metaquot_lifters.a
+%%OCAML_SITELIBDIR%%/ppxlib/metaquot_lifters/ppxlib_metaquot_lifters.cma
+%%OCAML_SITELIBDIR%%/ppxlib/metaquot_lifters/ppxlib_metaquot_lifters.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/metaquot_lifters/ppxlib_metaquot_lifters.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/metaquot_lifters/ppxlib_metaquot_lifters.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/metaquot_lifters/ppxlib_metaquot_lifters.cmxa
+%%OCAML_SITELIBDIR%%/ppxlib/metaquot_lifters/ppxlib_metaquot_lifters.cmxs
+%%OCAML_SITELIBDIR%%/ppxlib/metaquot_lifters/ppxlib_metaquot_lifters.ml
+%%OCAML_SITELIBDIR%%/ppxlib/name.ml
+%%OCAML_SITELIBDIR%%/ppxlib/name.mli
+%%OCAML_SITELIBDIR%%/ppxlib/opam
+%%OCAML_SITELIBDIR%%/ppxlib/options.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib.a
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib.cma
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib.cmxa
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib.cmxs
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__.ml
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_builder.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_builder.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_builder.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_builder.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_builder_generated.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_builder_generated.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_builder_generated.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_builder_intf.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_builder_intf.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_builder_intf.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_pattern.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_pattern.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_pattern.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_pattern.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_pattern0.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_pattern0.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_pattern0.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_pattern_generated.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_pattern_generated.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_pattern_generated.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_traverse.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_traverse.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_traverse.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_traverse.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_traverse0.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_traverse0.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_traverse0.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ast_traverse0.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Attribute.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Attribute.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Attribute.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Attribute.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Caller_id.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Caller_id.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Caller_id.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Code_matcher.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Code_matcher.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Code_matcher.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Code_matcher.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Code_path.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Code_path.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Code_path.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Code_path.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Common.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Common.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Common.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Common.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Context_free.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Context_free.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Context_free.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Context_free.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Deriving.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Deriving.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Deriving.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Deriving.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Driver.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Driver.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Driver.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Driver.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Expansion_context.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Expansion_context.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Expansion_context.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Expansion_context.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Expansion_helpers.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Expansion_helpers.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Expansion_helpers.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Expansion_helpers.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Extension.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Extension.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Extension.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Extension.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ignore_unused_warning.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ignore_unused_warning.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ignore_unused_warning.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Ignore_unused_warning.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Import.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Import.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Import.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Keyword.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Keyword.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Keyword.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Keyword.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Loc.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Loc.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Loc.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Loc.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Location.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Location.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Location.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Location.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Location_check.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Location_check.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Location_check.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Location_check.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Longident.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Longident.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Longident.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Longident.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Merlin_helpers.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Merlin_helpers.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Merlin_helpers.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Merlin_helpers.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Name.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Name.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Name.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Name.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Options.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Options.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Options.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Quoter.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Quoter.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Quoter.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Quoter.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Reconcile.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Reconcile.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Reconcile.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Reconcile.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Skip_hash_bang.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Skip_hash_bang.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Skip_hash_bang.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Skip_hash_bang.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Spellcheck.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Spellcheck.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Spellcheck.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Utils.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Utils.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Utils.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/ppxlib__Utils.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/print_diff/ppxlib_print_diff.a
+%%OCAML_SITELIBDIR%%/ppxlib/print_diff/ppxlib_print_diff.cma
+%%OCAML_SITELIBDIR%%/ppxlib/print_diff/ppxlib_print_diff.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/print_diff/ppxlib_print_diff.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/print_diff/ppxlib_print_diff.cmti
+%%OCAML_SITELIBDIR%%/ppxlib/print_diff/ppxlib_print_diff.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/print_diff/ppxlib_print_diff.cmxa
+%%OCAML_SITELIBDIR%%/ppxlib/print_diff/ppxlib_print_diff.cmxs
+%%OCAML_SITELIBDIR%%/ppxlib/print_diff/ppxlib_print_diff.ml
+%%OCAML_SITELIBDIR%%/ppxlib/print_diff/ppxlib_print_diff.mli
+%%OCAML_SITELIBDIR%%/ppxlib/quoter.ml
+%%OCAML_SITELIBDIR%%/ppxlib/quoter.mli
+%%OCAML_SITELIBDIR%%/ppxlib/reconcile.ml
+%%OCAML_SITELIBDIR%%/ppxlib/reconcile.mli
+%%OCAML_SITELIBDIR%%/ppxlib/runner/ppx_driver_runner.ml
+%%OCAML_SITELIBDIR%%/ppxlib/runner/ppxlib_runner.a
+%%OCAML_SITELIBDIR%%/ppxlib/runner/ppxlib_runner.cma
+%%OCAML_SITELIBDIR%%/ppxlib/runner/ppxlib_runner.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/runner/ppxlib_runner.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/runner/ppxlib_runner.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/runner/ppxlib_runner.cmxa
+%%OCAML_SITELIBDIR%%/ppxlib/runner/ppxlib_runner.cmxs
+%%OCAML_SITELIBDIR%%/ppxlib/runner/ppxlib_runner.ml
+%%OCAML_SITELIBDIR%%/ppxlib/runner/ppxlib_runner__Ppx_driver_runner.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/runner/ppxlib_runner__Ppx_driver_runner.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/runner/ppxlib_runner__Ppx_driver_runner.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/runner_as_ppx/ppx_driver_runner_as_ppx.ml
+%%OCAML_SITELIBDIR%%/ppxlib/runner_as_ppx/ppxlib_runner_as_ppx.a
+%%OCAML_SITELIBDIR%%/ppxlib/runner_as_ppx/ppxlib_runner_as_ppx.cma
+%%OCAML_SITELIBDIR%%/ppxlib/runner_as_ppx/ppxlib_runner_as_ppx.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/runner_as_ppx/ppxlib_runner_as_ppx.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/runner_as_ppx/ppxlib_runner_as_ppx.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/runner_as_ppx/ppxlib_runner_as_ppx.cmxa
+%%OCAML_SITELIBDIR%%/ppxlib/runner_as_ppx/ppxlib_runner_as_ppx.cmxs
+%%OCAML_SITELIBDIR%%/ppxlib/runner_as_ppx/ppxlib_runner_as_ppx.ml
+%%OCAML_SITELIBDIR%%/ppxlib/runner_as_ppx/ppxlib_runner_as_ppx__Ppx_driver_runner_as_ppx.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/runner_as_ppx/ppxlib_runner_as_ppx__Ppx_driver_runner_as_ppx.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/runner_as_ppx/ppxlib_runner_as_ppx__Ppx_driver_runner_as_ppx.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/skip_hash_bang.ml
+%%OCAML_SITELIBDIR%%/ppxlib/skip_hash_bang.mli
+%%OCAML_SITELIBDIR%%/ppxlib/spellcheck.ml
+%%OCAML_SITELIBDIR%%/ppxlib/stdppx/stdppx.a
+%%OCAML_SITELIBDIR%%/ppxlib/stdppx/stdppx.cma
+%%OCAML_SITELIBDIR%%/ppxlib/stdppx/stdppx.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/stdppx/stdppx.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/stdppx/stdppx.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/stdppx/stdppx.cmxa
+%%OCAML_SITELIBDIR%%/ppxlib/stdppx/stdppx.cmxs
+%%OCAML_SITELIBDIR%%/ppxlib/stdppx/stdppx.ml
+%%OCAML_SITELIBDIR%%/ppxlib/traverse/ppxlib_traverse.a
+%%OCAML_SITELIBDIR%%/ppxlib/traverse/ppxlib_traverse.cma
+%%OCAML_SITELIBDIR%%/ppxlib/traverse/ppxlib_traverse.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/traverse/ppxlib_traverse.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/traverse/ppxlib_traverse.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/traverse/ppxlib_traverse.cmxa
+%%OCAML_SITELIBDIR%%/ppxlib/traverse/ppxlib_traverse.cmxs
+%%OCAML_SITELIBDIR%%/ppxlib/traverse/ppxlib_traverse.ml
+%%OCAML_SITELIBDIR%%/ppxlib/traverse_builtins/ppxlib_traverse_builtins.a
+%%OCAML_SITELIBDIR%%/ppxlib/traverse_builtins/ppxlib_traverse_builtins.cma
+%%OCAML_SITELIBDIR%%/ppxlib/traverse_builtins/ppxlib_traverse_builtins.cmi
+%%OCAML_SITELIBDIR%%/ppxlib/traverse_builtins/ppxlib_traverse_builtins.cmt
+%%OCAML_SITELIBDIR%%/ppxlib/traverse_builtins/ppxlib_traverse_builtins.cmx
+%%OCAML_SITELIBDIR%%/ppxlib/traverse_builtins/ppxlib_traverse_builtins.cmxa
+%%OCAML_SITELIBDIR%%/ppxlib/traverse_builtins/ppxlib_traverse_builtins.cmxs
+%%OCAML_SITELIBDIR%%/ppxlib/traverse_builtins/ppxlib_traverse_builtins.ml
+%%OCAML_SITELIBDIR%%/ppxlib/utils.ml
+%%OCAML_SITELIBDIR%%/ppxlib/utils.mli
--- a/devel/ocaml-re/Makefile
+++ b/devel/ocaml-re/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	re
 PORTVERSION=	1.11.0
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

--- a/devel/ocaml-react/Makefile
+++ b/devel/ocaml-react/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	react
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://erratique.ch/software/react/releases/
 PKGNAMEPREFIX=	ocaml-
--- a/devel/ocaml-res/Makefile
+++ b/devel/ocaml-res/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	res
 PORTVERSION=	5.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

--- a/devel/ocaml-result/Makefile
+++ b/devel/ocaml-result/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	result
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-

@ -23,4 +23,7 @@ MAKE_ENV=	LIBDIR=${PREFIX}/${OCAML_SITELIBDIR}

 OPTIONS_DEFINE=	DOCS

+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/result/result.cmxs
+
 .include <bsd.port.mk>
--- a/devel/ocaml-result/files/patch-dune-project
+++ b/devel/ocaml-result/files/patch-dune-project
@ -0,0 +1,7 @@
+--- dune-project.orig	2024-03-22 15:32:03 UTC
+++ dune-project
+@@ -1,2 +1,3 @@
+-(lang dune 1.0)
+(lang dune 2.5)
+ (name result)
+(version 1.5)
--- a/devel/ocaml-rresult/Makefile
+++ b/devel/ocaml-rresult/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	rresult
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://erratique.ch/software/rresult/releases/
 PKGNAMEPREFIX=	ocaml-
--- a/Show More
+++ b/Show More