3 files changed, 66 insertions, 14 deletions

diff --git a/converters/ocaml-base64/Makefile b/converters/ocaml-base64/Makefile
index d777b064a3b8..b3805c8efe40 100644
--- 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
+
+DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
+PORTDOCS=	CHANGES.md LICENSE.md README.md
+
+OPTIONS_DEFINE=	DOCS
 
-USES=			gmake
-HAS_CONFIGURE=		yes
-MAKE_JOBS_UNSAFE=	yes
+SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
 
-USE_OCAML=		yes
-USE_OCAML_FINDLIB=	yes
-USE_OCAMLFIND_PLIST=	yes
-USE_OCAML_LDCONFIG=	yes
-DOCSDIR=	${PREFIX}/share/doc/pcre-ocaml
+post-patch:
+	@${REINPLACE_CMD} \
+		-e "s/(name ${PORTNAME})/&\n (version ${PORTVERSION})/" \
+		${WRKSRC}/dune-project
 
-CONFIGURE_ARGS=		--destdir="${DESTDIRNAME}"
+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>
diff --git a/converters/ocaml-base64/distinfo b/converters/ocaml-base64/distinfo
index 90df79f170b7..c47a0c185ccb 100644
--- 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
diff --git a/converters/ocaml-base64/pkg-plist b/converters/ocaml-base64/pkg-plist
new file mode 100644
index 000000000000..c1066460086e
--- /dev/null
+++ 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