Recursive revbump associated with update of ocaml.

Also change of mk/ocaml.mk to lang/ocaml/ocaml.mk.

119 files changed, 314 insertions, 343 deletions

diff --git a/converters/bibtex2html/Makefile b/converters/bibtex2html/Makefile
index 1549325557b..a3e27e5b63c 100644
--- a/converters/bibtex2html/Makefile
+++ b/converters/bibtex2html/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2021/05/24 19:49:19 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2022/05/24 18:51:47 jaapb Exp $
 
 DISTNAME=	bibtex2html-1.98
-PKGREVISION=	17
+PKGREVISION=	18
 CATEGORIES=	converters
 MASTER_SITES=	http://www.lri.fr/~filliatr/ftp/bibtex2html/
 
diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile
index 869d2538e1a..529ee4913e1 100644
--- a/databases/geneweb/Makefile
+++ b/databases/geneweb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2021/04/21 08:44:31 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2022/05/24 18:51:47 jaapb Exp $
 
 DISTNAME=	geneweb-5.01
-PKGREVISION=	18
+PKGREVISION=	19
 CATEGORIES=	databases
 EXTRACT_SUFX=	.tgz
 MASTER_SITES+=	http://www.sartorelli.gen.nz/GeneWeb/Src/
diff --git a/databases/ocaml-macaque/Makefile b/databases/ocaml-macaque/Makefile
index f2d7e1804ce..47ab160f41b 100644
--- a/databases/ocaml-macaque/Makefile
+++ b/databases/ocaml-macaque/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2021/03/08 08:12:46 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/24 18:51:47 jaapb Exp $
 
 GITHUB_PROJECT=	macaque
 DISTNAME=	${GITHUB_PROJECT}-0.7.4
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
 
@@ -19,5 +19,5 @@ OCAML_USE_OASIS_DYNRUN=	yes
 
 .include "../../databases/pgocaml/buildlink3.mk"
 .include "../../lang/camlp4/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/ocaml-macaque/buildlink3.mk b/databases/ocaml-macaque/buildlink3.mk
index 3a36d0065e6..7cbc8436eb8 100644
--- a/databases/ocaml-macaque/buildlink3.mk
+++ b/databases/ocaml-macaque/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2018/07/19 15:15:21 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:51:47 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-macaque
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-macaque
 OCAML_MACAQUE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-macaque+=	ocaml-macaque>=0.7.4
-BUILDLINK_ABI_DEPENDS.ocaml-macaque+=	ocaml-macaque>=0.7.4nb1
+BUILDLINK_ABI_DEPENDS.ocaml-macaque+=	ocaml-macaque>=0.7.4nb4
 BUILDLINK_PKGSRCDIR.ocaml-macaque?=	../../databases/ocaml-macaque
 
 .include "../../databases/pgocaml/buildlink3.mk"
diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile
index 5ec7c012b2c..bbb36f9f53c 100644
--- a/devel/coccinelle/Makefile
+++ b/devel/coccinelle/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2021/03/08 08:12:47 jaapb Exp $
+# $NetBSD: Makefile,v 1.40 2022/05/24 18:51:47 jaapb Exp $
 
 DISTNAME=	coccinelle-1.0.0-rc17
 PKGNAME=	${DISTNAME:S/-rc/rc/}
-PKGREVISION=	18
+PKGREVISION=	19
 CATEGORIES=	devel
 MASTER_SITES=	http://coccinelle.lip6.fr/distrib/
 EXTRACT_SUFX=	.tgz
diff --git a/devel/frama-c/Makefile b/devel/frama-c/Makefile
index b3d15adbf2f..bd4664211b5 100644
--- a/devel/frama-c/Makefile
+++ b/devel/frama-c/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.102 2022/04/18 19:10:49 adam Exp $
+# $NetBSD: Makefile,v 1.103 2022/05/24 18:51:47 jaapb Exp $
 #
 
 DISTNAME=	frama-c-Phosphorus-20170501
 PKGNAME=	${DISTNAME:S/-Phosphorus//}
-PKGREVISION=	34
+PKGREVISION=	35
 CATEGORIES=	devel
 MASTER_SITES=	https://frama-c.com/download/
 
@@ -25,5 +25,5 @@ OCAML_USE_FINDLIB=	yes
 .include "../../devel/ocamlgraph/buildlink3.mk"
 .include "../../math/ocaml-zarith/buildlink3.mk"
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/menhir/buildlink3.mk b/devel/menhir/buildlink3.mk
index 9722f48f4f7..3c4a5c2da7f 100644
--- a/devel/menhir/buildlink3.mk
+++ b/devel/menhir/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/01/14 22:04:26 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:51:47 jaapb Exp $
 
 BUILDLINK_TREE+=	menhir
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	menhir
 MENHIR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.menhir+=	menhir>=20190626
-BUILDLINK_ABI_DEPENDS.menhir+=	menhir>=20190924
+BUILDLINK_ABI_DEPENDS.menhir+=	menhir>=20220210
 BUILDLINK_PKGSRCDIR.menhir?=	../../devel/menhir
 
 .endif	# MENHIR_BUILDLINK3_MK
diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile
index 1314caea468..ddae744affa 100644
--- a/devel/monotone-viz/Makefile
+++ b/devel/monotone-viz/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.120 2022/04/18 19:10:53 adam Exp $
+# $NetBSD: Makefile,v 1.121 2022/05/24 18:51:47 jaapb Exp $
 #
 
 DISTNAME=		monotone-viz-1.0.2-nolablgtk
 PKGNAME=		${DISTNAME:S/-nolablgtk//}
-PKGREVISION=		47
+PKGREVISION=		48
 CATEGORIES=		devel scm
 #MASTER_SITES=		http://oandrieu.nerim.net/monotone-viz/
 
diff --git a/devel/ocaml-batteries/Makefile b/devel/ocaml-batteries/Makefile
index df656e7f367..bdfffcc7e1d 100644
--- a/devel/ocaml-batteries/Makefile
+++ b/devel/ocaml-batteries/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2021/03/08 08:12:49 jaapb Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/24 18:51:47 jaapb Exp $
 
 VERSION=	2.11.0
 GITHUB_PROJECT=	batteries-included
 GITHUB_TAG=	v${VERSION}
 DISTNAME=	batteries-${VERSION}
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml-batteries-team/}
 
@@ -19,7 +19,7 @@ OCAML_USE_FINDLIB=	yes
 
 MAKE_ENV=	DESTDIR="${DESTDIR}" PREFIX="${PREFIX}"
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../math/ocaml-num/buildlink3.mk"
diff --git a/devel/ocaml-biniou/Makefile b/devel/ocaml-biniou/Makefile
index dfae4a982b9..95c2e4cafc3 100644
--- a/devel/ocaml-biniou/Makefile
+++ b/devel/ocaml-biniou/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2021/03/08 08:12:49 jaapb Exp $
+# $NetBSD: Makefile,v 1.16 2022/05/24 18:51:47 jaapb Exp $
 
 GITHUB_PROJECT=	biniou
 DISTNAME=	${GITHUB_PROJECT}-1.2.1
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml-community/}
 
@@ -15,6 +15,6 @@ LICENSE=	modified-bsd
 OCAML_USE_DUNE=		yes
 INSTALLATION_DIRS+=	bin
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../textproc/ocaml-easy-format/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-bos/Makefile b/devel/ocaml-bos/Makefile
index 52eb95117c2..c74ae8302b3 100644
--- a/devel/ocaml-bos/Makefile
+++ b/devel/ocaml-bos/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2021/03/08 08:12:49 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/24 18:51:48 jaapb Exp $
 
 DISTNAME=	bos-0.2.0
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://erratique.ch/software/bos/releases/
 EXTRACT_SUFX=	.tbz
@@ -18,7 +18,7 @@ INSTALLATION_DIRS+=	${OCAML_SITELIBDIR}/bos
 OCAML_USE_TOPKG=	yes
 OCAML_USE_OPAM=		yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../devel/ocaml-astring/buildlink3.mk"
 .include "../../devel/ocaml-fmt/buildlink3.mk"
diff --git a/devel/ocaml-core_unix/Makefile b/devel/ocaml-core_unix/Makefile
index 0bed5e1c7d0..5666e8ac379 100644
--- a/devel/ocaml-core_unix/Makefile
+++ b/devel/ocaml-core_unix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/05/24 17:39:15 jaapb Exp $
+# $NetBSD: Makefile,v 1.3 2022/05/24 18:51:48 jaapb Exp $
 
 DISTNAME=	${GITHUB_PROJECT}-0.15.0
 PKGNAME=	ocaml-${DISTNAME}
@@ -37,7 +37,7 @@ do-install:
 		${OPAM_INSTALL_DIR}/$$i.install; \
 	done
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-core/buildlink3.mk"
 .include "../../devel/ocaml-core_kernel/buildlink3.mk"
 .include "../../devel/ocaml-expect_test_helpers_core/buildlink3.mk"
diff --git a/devel/ocaml-cppo/Makefile b/devel/ocaml-cppo/Makefile
index 9e2383515dc..887859f2170 100644
--- a/devel/ocaml-cppo/Makefile
+++ b/devel/ocaml-cppo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2021/11/23 21:48:13 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2022/05/24 18:51:48 jaapb Exp $
 
 DISTNAME=	cppo-1.6.8
 PKGNAME=	ocaml-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml-community/}
 GITHUB_PROJECT=	cppo
@@ -23,7 +24,7 @@ OCAML_FINDLIB_DIRS+=	cppo_ocamlbuild
 DUNE_BUILD_PACKAGES=	cppo cppo_ocamlbuild
 OPAM_INSTALL_FILES=	cppo cppo_ocamlbuild
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .include "../../devel/ocamlbuild/buildlink3.mk"
 BUILDLINK_DEPMETHOD.ocamlbuild=        full
diff --git a/devel/ocaml-cppo/buildlink3.mk b/devel/ocaml-cppo/buildlink3.mk
index 20dd9281286..d7bd4dc70d7 100644
--- a/devel/ocaml-cppo/buildlink3.mk
+++ b/devel/ocaml-cppo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2020/01/23 13:11:14 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2022/05/24 18:51:48 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-cppo
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-cppo
 OCAML_CPPO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-cppo+=	ocaml-cppo>=1.3.1
-BUILDLINK_ABI_DEPENDS.ocaml-cppo+=	ocaml-cppo>=1.6.6
+BUILDLINK_ABI_DEPENDS.ocaml-cppo+=	ocaml-cppo>=1.6.8nb1
 BUILDLINK_PKGSRCDIR.ocaml-cppo?=	../../devel/ocaml-cppo
 .endif	# OCAML_CPPO_BUILDLINK3_MK
 
diff --git a/devel/ocaml-csexp/Makefile b/devel/ocaml-csexp/Makefile
index 115ff72528a..e70305ba30f 100644
--- a/devel/ocaml-csexp/Makefile
+++ b/devel/ocaml-csexp/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2022/03/01 09:44:12 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/24 18:51:48 jaapb Exp $
 
 GITHUB_PROJECT=	csexp
 DISTNAME=	${GITHUB_PROJECT}-1.5.1
 PKGNAME=	ocaml-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml-dune/}
 
@@ -15,6 +16,6 @@ USE_LANGUAGES=	# none
 
 OCAML_USE_DUNE=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-result/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-csexp/buildlink3.mk b/devel/ocaml-csexp/buildlink3.mk
index 2e271711c83..6c1a86668e8 100644
--- a/devel/ocaml-csexp/buildlink3.mk
+++ b/devel/ocaml-csexp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2022/03/01 09:44:12 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:51:48 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-csexp
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-csexp
 OCAML_CSEXP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-csexp+=	ocaml-csexp>=1.3.2
-BUILDLINK_ABI_DEPENDS.ocaml-csexp+=	ocaml-csexp>=1.5.1
+BUILDLINK_ABI_DEPENDS.ocaml-csexp+=	ocaml-csexp>=1.5.1nb1
 BUILDLINK_PKGSRCDIR.ocaml-csexp?=	../../devel/ocaml-csexp
 
 .endif	# OCAML_CSEXP_BUILDLINK3_MK
diff --git a/devel/ocaml-deriving-ocsigen/Makefile b/devel/ocaml-deriving-ocsigen/Makefile
index 2a4d669e749..03d47172597 100644
--- a/devel/ocaml-deriving-ocsigen/Makefile
+++ b/devel/ocaml-deriving-ocsigen/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2021/03/08 08:12:50 jaapb Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/24 18:51:48 jaapb Exp $
 #
 
 VERSION=	0.8.1
 GITHUB_PROJECT=	deriving
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 PKGNAME=	ocaml-${GITHUB_PROJECT}-ocsigen-${VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 COMMENT=	Extension to OCaml for deriving functions from type declarations
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
@@ -20,5 +20,5 @@ OCAML_FINDLIB_DIRS=	deriving
 
 .include "../../lang/camlp4/buildlink3.mk"
 .include "../../math/ocaml-num/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-digestif/Makefile b/devel/ocaml-digestif/Makefile
index a3637062a84..b68300c90d3 100644
--- a/devel/ocaml-digestif/Makefile
+++ b/devel/ocaml-digestif/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2022/03/21 07:59:31 jaapb Exp $
+# $NetBSD: Makefile,v 1.8 2022/05/24 18:51:48 jaapb Exp $
 
 DISTNAME=	digestif-1.1.0
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mirage/}
 GITHUB_PROJECT=	digestif
@@ -20,7 +20,7 @@ USE_LANGUAGES=	# none
 USE_TOOLS+=	gmake pkg-config
 OCAML_USE_DUNE=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-eqaf/buildlink3.mk"
 .include "../../devel/ocaml-fmt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-duff/Makefile b/devel/ocaml-duff/Makefile
index 7f6d64f1bc1..426487bb4dd 100644
--- a/devel/ocaml-duff/Makefile
+++ b/devel/ocaml-duff/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2021/03/08 08:12:51 jaapb Exp $
+# $NetBSD: Makefile,v 1.3 2022/05/24 18:51:48 jaapb Exp $
 
 GITHUB_PROJECT=	duff
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	${GITHUB_PROJECT}-0.2
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mirage/}
 
@@ -16,7 +16,7 @@ LICENSE=	modified-bsd
 USE_LANGUAGES=	# none
 OCAML_USE_DUNE=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-bos/buildlink3.mk"
 .include "../../devel/ocaml-cmdliner/buildlink3.mk"
 .include "../../devel/ocaml-cstruct/buildlink3.mk"
diff --git a/devel/ocaml-dune-configurator/Makefile b/devel/ocaml-dune-configurator/Makefile
index 365ed842208..8ae8dc8affc 100644
--- a/devel/ocaml-dune-configurator/Makefile
+++ b/devel/ocaml-dune-configurator/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2022/03/10 08:49:18 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/24 18:51:48 jaapb Exp $
 
 .include "../../devel/ocaml-dune/Makefile.common"
 
 PKGNAME=	ocaml-dune-configurator-${DUNE_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	jaapb@NetBSD.org
@@ -13,7 +13,7 @@ COMMENT=	Configuration test library for Dune
 OCAML_USE_DUNE=		yes
 DUNE_BUILD_PACKAGES=	dune-configurator
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-csexp/buildlink3.mk"
 .include "../../devel/ocaml-result/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-dune-configurator/buildlink3.mk b/devel/ocaml-dune-configurator/buildlink3.mk
index d9da5e329ce..f6d61ec4b90 100644
--- a/devel/ocaml-dune-configurator/buildlink3.mk
+++ b/devel/ocaml-dune-configurator/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2022/03/10 08:49:18 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:51:48 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-dune-configurator
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-dune-configurator
 OCAML_DUNE_CONFIGURATOR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-dune-configurator+=	ocaml-dune-configurator>=2.7.1
-BUILDLINK_ABI_DEPENDS.ocaml-dune-configurator+=	ocaml-dune-configurator>=2.9.3nb2
+BUILDLINK_ABI_DEPENDS.ocaml-dune-configurator+=	ocaml-dune-configurator>=2.9.3nb3
 BUILDLINK_PKGSRCDIR.ocaml-dune-configurator?=	../../devel/ocaml-dune-configurator
 
 .include "../../devel/ocaml-dune/buildlink3.mk"
diff --git a/devel/ocaml-dune/Makefile b/devel/ocaml-dune/Makefile
index 835ad251e45..d34e4387623 100644
--- a/devel/ocaml-dune/Makefile
+++ b/devel/ocaml-dune/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2022/04/12 11:28:00 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2022/05/24 18:51:48 jaapb Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	ocaml-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	jaapb@NetBSD.org
@@ -37,6 +38,6 @@ OPAM_INSTALL_FILES=	dune-glob \
 post-build:
 	${RUN} cd ${WRKSRC} && ./dune.exe build -p dune,dune-action-plugin,dune-build-info,dune-glob,dune-private-libs @install
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-dune/buildlink3.mk b/devel/ocaml-dune/buildlink3.mk
index 171cabd4a2d..e306951cc63 100644
--- a/devel/ocaml-dune/buildlink3.mk
+++ b/devel/ocaml-dune/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2022/03/01 09:33:09 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2022/05/24 18:51:48 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-dune
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-dune
 OCAML_DUNE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-dune+=	ocaml-dune>=2.2.0
-BUILDLINK_ABI_DEPENDS.ocaml-dune+=	ocaml-dune>=2.9.3
+BUILDLINK_ABI_DEPENDS.ocaml-dune+=	ocaml-dune>=2.9.3nb1
 BUILDLINK_PKGSRCDIR.ocaml-dune?=	../../devel/ocaml-dune
 .endif	# OCAML_DUNE_BUILDLINK3_MK
 
diff --git a/devel/ocaml-encore/Makefile b/devel/ocaml-encore/Makefile
index 64d27fbb3cb..f6ee4504ca7 100644
--- a/devel/ocaml-encore/Makefile
+++ b/devel/ocaml-encore/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2021/03/08 08:12:51 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/24 18:51:49 jaapb Exp $
 
 GITHUB_PROJECT=	encore
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	${GITHUB_PROJECT}-0.4
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mirage/}
 
@@ -16,7 +16,7 @@ LICENSE=	modified-bsd
 USE_LANGUAGES=	# none
 OCAML_USE_DUNE=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-angstrom/buildlink3.mk"
 .include "../../devel/ocaml-ke/buildlink3.mk"
 .include "../../devel/ocaml-ocplib-endian/buildlink3.mk"
diff --git a/devel/ocaml-eqaf/Makefile b/devel/ocaml-eqaf/Makefile
index ce6454492d6..baacf53ec83 100644
--- a/devel/ocaml-eqaf/Makefile
+++ b/devel/ocaml-eqaf/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2021/03/08 08:12:51 jaapb Exp $
+# $NetBSD: Makefile,v 1.3 2022/05/24 18:51:49 jaapb Exp $
 
 GITHUB_PROJECT=	eqaf
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	${GITHUB_PROJECT}-0.2
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mirage/}
 
@@ -16,6 +16,6 @@ LICENSE=	mit
 USE_LANGUAGES=	# none
 OCAML_USE_DUNE=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-fmt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-extlib/Makefile b/devel/ocaml-extlib/Makefile
index 3083ad05c9f..e917dc527c1 100644
--- a/devel/ocaml-extlib/Makefile
+++ b/devel/ocaml-extlib/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2021/03/08 20:36:53 jaapb Exp $
+# $NetBSD: Makefile,v 1.23 2022/05/24 18:51:49 jaapb Exp $
 
 VERSION=	1.7.8
 GITHUB_PROJECT=	ocaml-extlib
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ygrek/}
 
@@ -15,7 +16,7 @@ USE_TOOLS+=	gmake
 
 OCAML_USE_FINDLIB=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
 BUILD_TARGET=	build
diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index e71855028c8..a2e0640653b 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2022/02/02 14:45:18 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2022/05/24 18:51:49 jaapb Exp $
 
 DISTNAME=		findlib-1.9.3
 PKGNAME=		ocaml-${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://download.camlcity.org/download/
 
@@ -13,7 +14,7 @@ LICENSE=		mit
 OCAML_FINDLIB_DIRS+=	bigarray bytes compiler-libs dynlink findlib \
 			ocamldoc stdlib str threads unix
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 # spacetime profiling is only available for native code on 64bit platforms
 PLIST_VARS+=		64bit
diff --git a/devel/ocaml-findlib/PLIST b/devel/ocaml-findlib/PLIST
index 3d4982ab0b4..2a2e16cc90f 100644
--- a/devel/ocaml-findlib/PLIST
+++ b/devel/ocaml-findlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2022/02/02 14:45:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2022/05/24 18:51:49 jaapb Exp $
 bin/ocamlfind
 ${OCAML_SITELIB}/bigarray/META
 ${OCAML_SITELIB}/bytes/META
@@ -39,7 +39,6 @@ ${OCAML_SITELIB}/findlib/ocaml_args.cmi
 ${OCAML_SITELIB}/findlib/topfind.cmi
 ${OCAML_SITELIB}/findlib/topfind.mli
 ${OCAML_SITELIB}/ocamldoc/META
-${PLIST.ocaml-opt}${PLIST.64bit}${OCAML_SITELIB}/raw_spacetime/META
 ${OCAML_SITELIB}/stdlib/META
 ${OCAML_SITELIB}/str/META
 ${OCAML_SITELIB}/threads/META
diff --git a/devel/ocaml-findlib/buildlink3.mk b/devel/ocaml-findlib/buildlink3.mk
index 77b74e02e02..f01cc8247b6 100644
--- a/devel/ocaml-findlib/buildlink3.mk
+++ b/devel/ocaml-findlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2021/03/18 08:30:43 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2022/05/24 18:51:49 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-findlib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-findlib
 OCAML_FINDLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-findlib+=	ocaml-findlib>=1.2
-BUILDLINK_ABI_DEPENDS.ocaml-findlib+=	ocaml-findlib>=1.9.1
+BUILDLINK_ABI_DEPENDS.ocaml-findlib+=	ocaml-findlib>=1.9.3nb1
 BUILDLINK_PKGSRCDIR.ocaml-findlib?=	../../devel/ocaml-findlib
 
 BUILDLINK_TARGETS+=	ocaml-findlib-wrappers ocaml-findlib-ldconf
diff --git a/devel/ocaml-fpath/Makefile b/devel/ocaml-fpath/Makefile
index 61c1705ec83..a90882073d7 100644
--- a/devel/ocaml-fpath/Makefile
+++ b/devel/ocaml-fpath/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2021/03/28 12:30:19 mef Exp $
+# $NetBSD: Makefile,v 1.5 2022/05/24 18:51:49 jaapb Exp $
 
 DISTNAME=	fpath-0.7.2
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://erratique.ch/software/fpath/releases/
 EXTRACT_SUFX=	.tbz
@@ -20,5 +20,5 @@ OCAML_USE_OPAM=		yes
 .include "../../devel/ocaml-astring/buildlink3.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../devel/ocaml-result/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-git/Makefile b/devel/ocaml-git/Makefile
index bf14ce53a62..f9f8982009a 100644
--- a/devel/ocaml-git/Makefile
+++ b/devel/ocaml-git/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2021/03/08 08:12:52 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/24 18:51:49 jaapb Exp $
 
 GITHUB_PROJECT=	ocaml-git
 DISTNAME=	${GITHUB_PROJECT}-2.0.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mirage/}
 
@@ -37,5 +37,5 @@ OPAM_INSTALL_FILES=	git
 .include "../../devel/ocamlgraph/buildlink3.mk"
 .include "../../www/ocaml-cohttp/buildlink3.mk"
 .include "../../www/ocaml-uri/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-js-build-tools/Makefile b/devel/ocaml-js-build-tools/Makefile
index 117823b3843..793db286792 100644
--- a/devel/ocaml-js-build-tools/Makefile
+++ b/devel/ocaml-js-build-tools/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2021/03/08 08:12:52 jaapb Exp $
+# $NetBSD: Makefile,v 1.14 2022/05/24 18:51:49 jaapb Exp $
 
 VERSION=	113.33.06
 GITHUB_PROJECT=	js-build-tools
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=janestreet/}
 
@@ -20,5 +20,5 @@ OCAML_USE_FINDLIB=	yes
 .include "../../devel/ocaml-oasis/buildlink3.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../misc/ocaml-opam/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-ke/Makefile b/devel/ocaml-ke/Makefile
index 212c44a178d..cd5ddd58232 100644
--- a/devel/ocaml-ke/Makefile
+++ b/devel/ocaml-ke/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2021/03/08 08:12:53 jaapb Exp $
+# $NetBSD: Makefile,v 1.3 2022/05/24 18:51:49 jaapb Exp $
 
 GITHUB_PROJECT=	ke
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	${GITHUB_PROJECT}-0.4
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mirage/}
 
@@ -16,7 +16,7 @@ LICENSE=	modified-bsd
 USE_LANGUAGES=	# none
 OCAML_USE_DUNE=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-bigarray-compat/buildlink3.mk"
 .include "../../devel/ocaml-fmt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-logs/Makefile b/devel/ocaml-logs/Makefile
index 8d733288393..d0fa5101147 100644
--- a/devel/ocaml-logs/Makefile
+++ b/devel/ocaml-logs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/03/08 08:12:53 jaapb Exp $
+# $NetBSD: Makefile,v 1.7 2022/05/24 18:51:49 jaapb Exp $
 
 DISTNAME=	logs-0.7.0
 PKGNAME=	ocaml-${DISTNAME}
@@ -19,5 +19,5 @@ OCAML_USE_OPAM=		yes
 
 .include "options.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-lru/Makefile b/devel/ocaml-lru/Makefile
index dbd5ecc878b..0fdb2fda0f6 100644
--- a/devel/ocaml-lru/Makefile
+++ b/devel/ocaml-lru/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2021/03/08 08:12:53 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/24 18:51:50 jaapb Exp $
 
 GITHUB_PROJECT=	lru
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	${GITHUB_PROJECT}-0.2.0
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=pqwy/}
 
@@ -20,5 +20,5 @@ OCAML_USE_OPAM=		yes
 
 .include "../../devel/ocaml-psq/buildlink3.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-lwt_camlp4/Makefile b/devel/ocaml-lwt_camlp4/Makefile
index f1eb32fee2c..859630af943 100644
--- a/devel/ocaml-lwt_camlp4/Makefile
+++ b/devel/ocaml-lwt_camlp4/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2021/03/08 08:12:53 jaapb Exp $
+# $NetBSD: Makefile,v 1.8 2022/05/24 18:51:50 jaapb Exp $
 
 GITHUB_PROJECT=	lwt_camlp4
 GITHUB_TAG=	45f25a0
 DISTNAME=	lwt_camlp4-20180325
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=aantron/}
 
@@ -20,7 +20,7 @@ WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-45f25a081e01071ab566924b48ba5f7553bb33ac
 OCAML_USE_DUNE=		yes
 DUNE_BUILD_PACKAGES=	lwt_camlp4
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-lwt/buildlink3.mk"
 .include "../../lang/camlp4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-lwt_glib/Makefile b/devel/ocaml-lwt_glib/Makefile
index a1ce0b2af13..537dee60d51 100644
--- a/devel/ocaml-lwt_glib/Makefile
+++ b/devel/ocaml-lwt_glib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2021/12/08 16:04:03 adam Exp $
+# $NetBSD: Makefile,v 1.13 2022/05/24 18:51:50 jaapb Exp $
 
 GITHUB_PROJECT=	lwt_glib
 GITHUB_TAG=	${PKGVERSION_NOREV}
 DISTNAME=	${GITHUB_PROJECT}-1.1.1
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
 
@@ -20,7 +20,7 @@ CONFLICTS=	ocaml-lwt<3.0.0
 OCAML_USE_DUNE=		yes
 DUNE_BUILD_PACKAGES=	lwt_glib
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-lwt/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-lwt_log/Makefile b/devel/ocaml-lwt_log/Makefile
index 23491b82bd5..6d48abab1ea 100644
--- a/devel/ocaml-lwt_log/Makefile
+++ b/devel/ocaml-lwt_log/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2021/03/08 08:12:53 jaapb Exp $
+# $NetBSD: Makefile,v 1.9 2022/05/24 18:51:50 jaapb Exp $
 
 DISTNAME=	lwt_log-1.1.1
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	3
 CATEGORIES=	devel security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
 GITHUB_PROJECT=	lwt_log
@@ -18,6 +18,6 @@ CONFLICTS=	ocaml-lwt<3.0.0
 OCAML_USE_DUNE=	yes
 JBUILDER_BUILD_PACKAGES=	lwt_log
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-lwt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-lwt_ssl/Makefile b/devel/ocaml-lwt_ssl/Makefile
index 4276b18abf5..c055522aed4 100644
--- a/devel/ocaml-lwt_ssl/Makefile
+++ b/devel/ocaml-lwt_ssl/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2021/03/08 08:12:54 jaapb Exp $
+# $NetBSD: Makefile,v 1.13 2022/05/24 18:51:50 jaapb Exp $
 
 GITHUB_PROJECT=	lwt_ssl
 GITHUB_TAG=	${PKGVERSION_NOREV}
 DISTNAME=	lwt_ssl-1.1.3
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
 
@@ -18,7 +18,7 @@ CONFLICTS=	ocaml-lwt<3.0.0
 OCAML_USE_DUNE=		yes
 DUNE_BUILD_PACKAGES=	lwt_ssl
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-lwt/buildlink3.mk"
 .include "../../security/ocaml-ssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-lwt_ssl/buildlink3.mk b/devel/ocaml-lwt_ssl/buildlink3.mk
index ee4b0f8fd9c..fab7dc70240 100644
--- a/devel/ocaml-lwt_ssl/buildlink3.mk
+++ b/devel/ocaml-lwt_ssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2021/03/08 08:12:54 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2022/05/24 18:51:50 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-lwt_ssl
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-lwt_ssl
 OCAML_LWT_SSL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-lwt_ssl+=	ocaml-lwt_ssl>=1.1.0
-BUILDLINK_ABI_DEPENDS.ocaml-lwt_ssl?=	ocaml-lwt_ssl>=1.1.3nb1
+BUILDLINK_ABI_DEPENDS.ocaml-lwt_ssl?=	ocaml-lwt_ssl>=1.1.3nb2
 BUILDLINK_PKGSRCDIR.ocaml-lwt_ssl?=	../../devel/ocaml-lwt_ssl
 
 .include "../../devel/ocaml-lwt/buildlink3.mk"
diff --git a/devel/ocaml-oasis/Makefile b/devel/ocaml-oasis/Makefile
index 8b533026a33..5fcb1b9ff1e 100644
--- a/devel/ocaml-oasis/Makefile
+++ b/devel/ocaml-oasis/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2021/03/08 08:12:54 jaapb Exp $
+# $NetBSD: Makefile,v 1.16 2022/05/24 18:51:50 jaapb Exp $
 
 DISTNAME=	oasis-0.4.10
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1694/
 
@@ -17,7 +17,7 @@ INSTALLATION_DIRS+=	bin
 
 OCAML_FINDLIB_DIRS+=	plugin-loader
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 post-install:
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
diff --git a/devel/ocaml-oasis/buildlink3.mk b/devel/ocaml-oasis/buildlink3.mk
index a4d846bd669..b7d23099c98 100644
--- a/devel/ocaml-oasis/buildlink3.mk
+++ b/devel/ocaml-oasis/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2021/03/08 08:12:54 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2022/05/24 18:51:50 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-oasis
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-oasis
 OCAML_OASIS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-oasis+=	ocaml-oasis>=0.4.4
-BUILDLINK_ABI_DEPENDS.ocaml-oasis?=	ocaml-oasis>=0.4.10nb6
+BUILDLINK_ABI_DEPENDS.ocaml-oasis?=	ocaml-oasis>=0.4.10nb7
 BUILDLINK_PKGSRCDIR.ocaml-oasis?=	../../devel/ocaml-oasis
 
 .include "../../lang/ocaml/buildlink3.mk"
diff --git a/devel/ocaml-optcomp/Makefile b/devel/ocaml-optcomp/Makefile
index 75d71a43c66..098b6761865 100644
--- a/devel/ocaml-optcomp/Makefile
+++ b/devel/ocaml-optcomp/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2021/03/08 08:12:54 jaapb Exp $
+# $NetBSD: Makefile,v 1.18 2022/05/24 18:51:50 jaapb Exp $
 
 VERSION=	1.6
 GITHUB_PROJECT=	optcomp
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	13
+PKGREVISION=	14
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=diml/}
 
@@ -20,7 +20,7 @@ OCAML_USE_OASIS=	yes
 pre-configure:
 	${RUN} cd ${WRKSRC} && oasis setup
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-oasis/buildlink3.mk"
 .include "../../lang/camlp4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-ppx_derivers/Makefile b/devel/ocaml-ppx_derivers/Makefile
index 1c1a6edbfe6..fe622d67874 100644
--- a/devel/ocaml-ppx_derivers/Makefile
+++ b/devel/ocaml-ppx_derivers/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2021/03/08 08:12:56 jaapb Exp $
+# $NetBSD: Makefile,v 1.12 2022/05/24 18:51:50 jaapb Exp $
 
 GITHUB_PROJECT=	ppx_derivers
 DISTNAME=	${GITHUB_PROJECT}-1.2.1
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=diml/}
 
@@ -15,5 +15,5 @@ LICENSE=	modified-bsd
 USE_LANGUAGES=	# none
 OCAML_USE_DUNE=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-ppx_derivers/buildlink3.mk b/devel/ocaml-ppx_derivers/buildlink3.mk
index af8c698391a..f50deef287b 100644
--- a/devel/ocaml-ppx_derivers/buildlink3.mk
+++ b/devel/ocaml-ppx_derivers/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2020/01/17 09:37:32 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2022/05/24 18:51:50 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-ppx_derivers
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-ppx_derivers
 OCAML_PPX_DERIVERS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-ppx_derivers+=	ocaml-ppx_derivers>=1.0
-BUILDLINK_ABI_DEPENDS.ocaml-ppx_derivers+=	ocaml-ppx_derivers>=1.2.1
+BUILDLINK_ABI_DEPENDS.ocaml-ppx_derivers+=	ocaml-ppx_derivers>=1.2.1nb2
 BUILDLINK_PKGSRCDIR.ocaml-ppx_derivers?=	../../devel/ocaml-ppx_derivers
 .endif	# OCAML_PPX_DERIVERS_BUILDLINK3_MK
 
diff --git a/devel/ocaml-ppx_fields_conv/Makefile b/devel/ocaml-ppx_fields_conv/Makefile
index eda7236cff1..7ab0b902ab3 100644
--- a/devel/ocaml-ppx_fields_conv/Makefile
+++ b/devel/ocaml-ppx_fields_conv/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2021/03/08 08:12:56 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/24 18:51:50 jaapb Exp $
 
 GITHUB_PROJECT=	ppx_fields_conv
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	${GITHUB_PROJECT}-0.14.2
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=janestreet/}
 
@@ -19,5 +19,5 @@ OCAML_USE_DUNE=	yes
 
 .include "../../devel/ocaml-fieldslib/buildlink3.mk"
 .include "../../devel/ocaml-ppxlib/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-ppx_fields_conv/buildlink3.mk b/devel/ocaml-ppx_fields_conv/buildlink3.mk
index a01b745ae88..726982c57bd 100644
--- a/devel/ocaml-ppx_fields_conv/buildlink3.mk
+++ b/devel/ocaml-ppx_fields_conv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2020/12/11 08:06:15 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2022/05/24 18:51:50 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-ppx_fields_conv
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-ppx_fields_conv
 OCAML_PPX_FIELDS_CONV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-ppx_fields_conv+=	ocaml-ppx_fields_conv>=0.12.0
-BUILDLINK_ABI_DEPENDS.ocaml-ppx_fields_conv+=	ocaml-ppx_fields_conv>=0.14.2
+BUILDLINK_ABI_DEPENDS.ocaml-ppx_fields_conv+=	ocaml-ppx_fields_conv>=0.14.2nb2
 BUILDLINK_PKGSRCDIR.ocaml-ppx_fields_conv?=	../../devel/ocaml-ppx_fields_conv
 
 .include "../../devel/ocaml-fieldslib/buildlink3.mk"
diff --git a/devel/ocaml-ppx_tools_versioned/Makefile b/devel/ocaml-ppx_tools_versioned/Makefile
index eca07824457..e14b728e1df 100644
--- a/devel/ocaml-ppx_tools_versioned/Makefile
+++ b/devel/ocaml-ppx_tools_versioned/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2021/03/08 08:12:58 jaapb Exp $
+# $NetBSD: Makefile,v 1.15 2022/05/24 18:51:51 jaapb Exp $
 
 VERSION=	5.4.0
 GITHUB_PROJECT=	ppx_tools_versioned
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml-ppx/}
 
@@ -20,5 +20,5 @@ OCAML_USE_FINDLIB=	yes
 OCAML_USE_DUNE=		yes
 
 .include "../../devel/ocaml-migrate-parsetree/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-ppxfind/Makefile b/devel/ocaml-ppxfind/Makefile
index d57b10c3746..95c3a05e57c 100644
--- a/devel/ocaml-ppxfind/Makefile
+++ b/devel/ocaml-ppxfind/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2021/03/08 08:12:59 jaapb Exp $
+# $NetBSD: Makefile,v 1.5 2022/05/24 18:51:51 jaapb Exp $
 
 GITHUB_PROJECT=	ppxfind
 DISTNAME=	${GITHUB_PROJECT}-1.4
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=diml/}
 
@@ -15,6 +15,6 @@ LICENSE=	modified-bsd
 OCAML_USE_DUNE=		yes
 INSTALL_UNSTRIPPED=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-migrate-parsetree/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-psq/Makefile b/devel/ocaml-psq/Makefile
index 71bbd5bfb9d..d81f0094a37 100644
--- a/devel/ocaml-psq/Makefile
+++ b/devel/ocaml-psq/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2021/03/08 08:12:59 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/24 18:51:51 jaapb Exp $
 
 GITHUB_PROJECT=	psq
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	${GITHUB_PROJECT}-0.1.0
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=pqwy/}
 
@@ -19,5 +19,5 @@ OCAML_USE_TOPKG=	yes
 OCAML_USE_OPAM=		yes
 
 .include "../../devel/ocamlbuild/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-resource-pooling/Makefile b/devel/ocaml-resource-pooling/Makefile
index c644856df62..59325f90515 100644
--- a/devel/ocaml-resource-pooling/Makefile
+++ b/devel/ocaml-resource-pooling/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2021/03/08 08:12:59 jaapb Exp $
+# $NetBSD: Makefile,v 1.5 2022/05/24 18:51:51 jaapb Exp $
 
 GITHUB_PROJECT=	resource-pooling
 DISTNAME=	${GITHUB_PROJECT}-1.1
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
 
@@ -17,5 +17,5 @@ OCAML_USE_DUNE=	yes
 
 .include "../../devel/ocaml-lwt/buildlink3.mk"
 .include "../../devel/ocaml-lwt_log/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-resource-pooling/buildlink3.mk b/devel/ocaml-resource-pooling/buildlink3.mk
index 3b824d25a37..930b1cdba05 100644
--- a/devel/ocaml-resource-pooling/buildlink3.mk
+++ b/devel/ocaml-resource-pooling/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/04/21 10:48:30 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:51:51 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-resource-pooling
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-resource-pooling
 OCAML_RESOURCE_POOLING_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-resource-pooling+=	ocaml-resource-pooling>=1.0
-BUILDLINK_API_DEPENDS.ocaml-resource-pooling+=	ocaml-resource-pooling>=1.1
+BUILDLINK_ABI_DEPENDS.ocaml-resource-pooling+=	ocaml-resource-pooling>=1.1nb2
 BUILDLINK_PKGSRCDIR.ocaml-resource-pooling?=	../../devel/ocaml-resource-pooling
 
 .endif	# OCAML_RESOURCE_POOLING_BUILDLINK3_MK
diff --git a/devel/ocaml-result/Makefile b/devel/ocaml-result/Makefile
index ba47cf19376..b07d52cf545 100644
--- a/devel/ocaml-result/Makefile
+++ b/devel/ocaml-result/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2021/03/08 08:12:59 jaapb Exp $
+# $NetBSD: Makefile,v 1.15 2022/05/24 18:51:51 jaapb Exp $
 
 GITHUB_PROJECT=	result
 DISTNAME=	${GITHUB_PROJECT}-1.5
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=janestreet/}
 
@@ -16,5 +16,5 @@ USE_LANGUAGES=		# none
 OCAML_USE_DUNE=		yes
 INSTALLATION_DIRS+=	${OCAML_SITELIBDIR}/result share/doc/result
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-result/buildlink3.mk b/devel/ocaml-result/buildlink3.mk
index 2f5e91e536d..97e0e2b8599 100644
--- a/devel/ocaml-result/buildlink3.mk
+++ b/devel/ocaml-result/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2020/12/09 11:07:26 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2022/05/24 18:51:51 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-result
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-result
 OCAML_RESULT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-result+=	ocaml-result>=1.5
-BUILDLINK_ABI_DEPENDS.ocaml-result+=	ocaml-result>=1.5
+BUILDLINK_ABI_DEPENDS.ocaml-result+=	ocaml-result>=1.5nb2
 BUILDLINK_PKGSRCDIR.ocaml-result?=	../../devel/ocaml-result
 .endif	# OCAML_RESULT_BUILDLINK3_MK
 
diff --git a/devel/ocaml-stringext/Makefile b/devel/ocaml-stringext/Makefile
index cee73abcae0..e1aceb1e977 100644
--- a/devel/ocaml-stringext/Makefile
+++ b/devel/ocaml-stringext/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2021/03/08 08:13:00 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/24 18:51:51 jaapb Exp $
 
 GITHUB_PROJECT=	stringext
 DISTNAME=	${GITHUB_PROJECT}-1.6.0
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=rgrinberg/}
 
@@ -14,5 +14,5 @@ LICENSE=	mit
 
 OCAML_USE_DUNE=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-stringext/buildlink3.mk b/devel/ocaml-stringext/buildlink3.mk
index 126f8b3f1c9..16a261fe4c6 100644
--- a/devel/ocaml-stringext/buildlink3.mk
+++ b/devel/ocaml-stringext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/01/24 16:27:41 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:51:51 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-stringext
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-stringext
 OCAML_STRINGEXT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-stringext+=	ocaml-stringext>=1.5.0
-BUILDLINK_ABI_DEPENDS.ocaml-stringext+=	ocaml-stringext>=1.6.0
+BUILDLINK_ABI_DEPENDS.ocaml-stringext+=	ocaml-stringext>=1.6.0nb2
 BUILDLINK_PKGSRCDIR.ocaml-stringext?=	../../devel/ocaml-stringext
 .endif	# OCAML_STRINGEXT_BUILDLINK3_MK
 
diff --git a/devel/ocaml-type_conv/Makefile b/devel/ocaml-type_conv/Makefile
index 40f76273098..ef23ef8a81c 100644
--- a/devel/ocaml-type_conv/Makefile
+++ b/devel/ocaml-type_conv/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2021/03/08 08:13:01 jaapb Exp $
+# $NetBSD: Makefile,v 1.18 2022/05/24 18:51:51 jaapb Exp $
 
 
 VERSION=	113.00.02
 GITHUB_PROJECT=	type_conv
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=janestreet/}
 
@@ -20,5 +20,5 @@ OCAML_USE_FINDLIB=	yes
 
 .include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../lang/camlp4/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-type_conv/buildlink3.mk b/devel/ocaml-type_conv/buildlink3.mk
index 30694d2b01a..28c24798c3f 100644
--- a/devel/ocaml-type_conv/buildlink3.mk
+++ b/devel/ocaml-type_conv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2021/03/08 08:13:01 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2022/05/24 18:51:51 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-type_conv
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-type_conv
 OCAML_TYPE_CONV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-type_conv+=	ocaml-type_conv>=109.60.01
-BUILDLINK_ABI_DEPENDS.ocaml-type_conv?=	ocaml-type_conv>=113.00.02nb11
+BUILDLINK_ABI_DEPENDS.ocaml-type_conv?=	ocaml-type_conv>=113.00.02nb12
 BUILDLINK_PKGSRCDIR.ocaml-type_conv?=	../../devel/ocaml-type_conv
 
 .include "../../lang/ocaml/buildlink3.mk"
diff --git a/devel/ocaml-yojson/Makefile b/devel/ocaml-yojson/Makefile
index 65cc3de7ed3..3ed833f587e 100644
--- a/devel/ocaml-yojson/Makefile
+++ b/devel/ocaml-yojson/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2021/03/08 08:13:01 jaapb Exp $
+# $NetBSD: Makefile,v 1.14 2022/05/24 18:51:51 jaapb Exp $
 
 GITHUB_PROJECT=	yojson
 DISTNAME=	${GITHUB_PROJECT}-1.7.0
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mjambon/}
 
@@ -15,7 +15,7 @@ LICENSE=	modified-bsd
 OCAML_USE_DUNE=		yes
 INSTALLATION_DIRS+=	bin
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-biniou/buildlink3.mk"
 .include "../../devel/ocaml-cppo/buildlink3.mk"
 .include "../../textproc/ocaml-easy-format/buildlink3.mk"
diff --git a/devel/ocamlbuild/Makefile b/devel/ocamlbuild/Makefile
index b21263ff7eb..126c0d59e7d 100644
--- a/devel/ocamlbuild/Makefile
+++ b/devel/ocamlbuild/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2022/03/01 09:07:28 jaapb Exp $
+# $NetBSD: Makefile,v 1.16 2022/05/24 18:51:51 jaapb Exp $
 
 DISTNAME=	ocamlbuild-0.14.1
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml/}
 
@@ -20,5 +21,5 @@ INSTALL_TARGET=		findlib-install
 MAKE_ENV=	CHECK_IF_PREINSTALLED=false OCAMLBUILD_BINDIR=${PREFIX}/bin \
 		OCAMLBUILD_LIBDIR=${PREFIX}/${OCAML_SITELIBDIR}
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocamlbuild/buildlink3.mk b/devel/ocamlbuild/buildlink3.mk
index 44ac6938a9d..0756dd9d436 100644
--- a/devel/ocamlbuild/buildlink3.mk
+++ b/devel/ocamlbuild/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2022/03/01 09:07:28 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2022/05/24 18:51:51 jaapb Exp $
 
 BUILDLINK_TREE+=	ocamlbuild
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocamlbuild
 OCAMLBUILD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocamlbuild+=	ocamlbuild>=0.9.2
-BUILDLINK_ABI_DEPENDS.ocamlbuild+=	ocamlbuild>=0.14.1
+BUILDLINK_ABI_DEPENDS.ocamlbuild+=	ocamlbuild>=0.14.1nb1
 BUILDLINK_PKGSRCDIR.ocamlbuild?=	../../devel/ocamlbuild
 BUILDLINK_DEPMETHOD.ocamlbuild?=	build
 .endif	# OCAMLBUILD_BUILDLINK3_MK
diff --git a/devel/ocamlgraph/Makefile b/devel/ocamlgraph/Makefile
index 3b585ecc3a2..b8cd6d69a3f 100644
--- a/devel/ocamlgraph/Makefile
+++ b/devel/ocamlgraph/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2022/04/18 19:10:53 adam Exp $
+# $NetBSD: Makefile,v 1.58 2022/05/24 18:51:52 jaapb Exp $
 
 DISTNAME=	ocamlgraph-1.8.8
-PKGREVISION=	32
+PKGREVISION=	33
 CATEGORIES=	devel
 MASTER_SITES=	http://ocamlgraph.lri.fr/download/
 
@@ -19,7 +19,7 @@ OCAML_USE_FINDLIB=	yes
 
 MAKE_ENV+=	USE_LABLGTK="${USE_LABLGTK}"
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
 MAKE_ENV+=	OCAMLBEST="opt"
diff --git a/devel/ocamlify/Makefile b/devel/ocamlify/Makefile
index cda497eb99b..644055d6aca 100644
--- a/devel/ocamlify/Makefile
+++ b/devel/ocamlify/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2021/03/08 08:13:01 jaapb Exp $
+# $NetBSD: Makefile,v 1.15 2022/05/24 18:51:52 jaapb Exp $
 
 DISTNAME=	ocamlify-0.0.2
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	devel
 MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1209/
 
@@ -13,5 +13,5 @@ LICENSE=	gnu-lgpl-v2.1
 OCAML_USE_OASIS=	yes
 OCAML_FINDLIB_REGISTER=	no
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocamlmod/Makefile b/devel/ocamlmod/Makefile
index 42c05c3c3ba..b281765fac8 100644
--- a/devel/ocamlmod/Makefile
+++ b/devel/ocamlmod/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2021/03/08 08:13:01 jaapb Exp $
+# $NetBSD: Makefile,v 1.16 2022/05/24 18:51:52 jaapb Exp $
 
 DISTNAME=	ocamlmod-0.0.8
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1544/
 
@@ -13,5 +13,5 @@ LICENSE=	gnu-lgpl-v2.1
 OCAML_USE_OASIS=	yes
 OCAML_FINDLIB_REGISTER=	no
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/omake/Makefile b/devel/omake/Makefile
index 19dd749b2e1..0564f95b730 100644
--- a/devel/omake/Makefile
+++ b/devel/omake/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2021/03/08 08:13:02 jaapb Exp $
+# $NetBSD: Makefile,v 1.24 2022/05/24 18:51:52 jaapb Exp $
 #
 
 DISTNAME=	omake-0.10.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml-omake/}
 GITHUB_TAG=	${PKGNAME}
diff --git a/devel/verifast/Makefile b/devel/verifast/Makefile
index 816af8477a0..9c4efbab1ad 100644
--- a/devel/verifast/Makefile
+++ b/devel/verifast/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2022/04/18 19:10:56 adam Exp $
+# $NetBSD: Makefile,v 1.40 2022/05/24 18:51:52 jaapb Exp $
 
 DISTNAME=		verifast-18.02
-PKGREVISION=		27
+PKGREVISION=		28
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GITHUB:=verifast/}
 GITHUB_PROJECT=		verifast
@@ -38,7 +38,7 @@ do-install:
 		>> ${DESTDIR}${PREFIX}/bin/vfide
 	${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/vfide
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .include "../../lang/camlp4/buildlink3.mk"
 .include "../../math/ocaml-num/buildlink3.mk"
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index fc53e228dbc..edc2f413ef7 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.138 2022/04/18 19:11:14 adam Exp $
+# $NetBSD: Makefile,v 1.139 2022/05/24 18:51:52 jaapb Exp $
 
 VERSION=		4.0.1
 PKGNAME=		camlimages-${VERSION}
-PKGREVISION=		97
+PKGREVISION=		98
 CATEGORIES=		graphics
 MASTER_SITES=		https://bitbucket.org/camlspotter/camlimages/get/
 DISTNAME=		v${VERSION}
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 9a5cd2b248a..ced1ff6e54c 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.247 2022/05/04 21:05:43 wiz Exp $
+# $NetBSD: Makefile,v 1.248 2022/05/24 18:51:52 jaapb Exp $
 
 DISTNAME=	graphviz-2.50.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.gz
diff --git a/graphics/ocaml-cairo/Makefile b/graphics/ocaml-cairo/Makefile
index 7fc116b6ee5..108504ae0ae 100644
--- a/graphics/ocaml-cairo/Makefile
+++ b/graphics/ocaml-cairo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2022/04/18 19:11:22 adam Exp $
+# $NetBSD: Makefile,v 1.17 2022/05/24 18:51:52 jaapb Exp $
 
 GITHUB_PROJECT=	ocaml-cairo
 DISTNAME=	${GITHUB_PROJECT}-0.6.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Chris00/}
 
@@ -21,7 +21,7 @@ DUNE_BUILD_PACKAGES=	${OCAML_FINDLIB_DIRS}
 #   https://github.com/Chris00/ocaml-cairo/issues/29
 
 .include "options.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../devel/ocaml-dune-configurator/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/boomerang/Makefile b/lang/boomerang/Makefile
index 2b2a9676762..2b21f0fc6a1 100644
--- a/lang/boomerang/Makefile
+++ b/lang/boomerang/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2021/12/27 05:14:44 dholland Exp $
+# $NetBSD: Makefile,v 1.23 2022/05/24 18:51:52 jaapb Exp $
 #
 
 DISTNAME=	boomerang-0.2-source
 PKGNAME=	${DISTNAME:S/-source//}
-PKGREVISION=	16
+PKGREVISION=	17
 CATEGORIES=	lang
 MASTER_SITES=	http://www.seas.upenn.edu/~harmony/download/
 
diff --git a/lang/camlp4/Makefile b/lang/camlp4/Makefile
index 083744f50d5..9e08dc908cf 100644
--- a/lang/camlp4/Makefile
+++ b/lang/camlp4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2021/03/08 08:13:02 jaapb Exp $
+# $NetBSD: Makefile,v 1.24 2022/05/24 18:51:53 jaapb Exp $
 
 GITHUB_PROJECT=	camlp4
 DISTNAME=	${GITHUB_PROJECT}-4.08+1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml/}
 
@@ -17,7 +17,7 @@ MAKE_JOBS_SAFE=	no
 
 BROKEN=		"Obsolete package, no longer supported by OCaml 4.09"
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 BUILD_TARGET=		byte camlp4/META
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
diff --git a/lang/camlp5/Makefile b/lang/camlp5/Makefile
index 148984aba1f..c1112e62899 100644
--- a/lang/camlp5/Makefile
+++ b/lang/camlp5/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2021/03/18 21:18:18 dholland Exp $
+# $NetBSD: Makefile,v 1.41 2022/05/24 18:51:53 jaapb Exp $
 #
 
 GITHUB_PROJECT=	camlp5
 DISTNAME=	${GITHUB_PROJECT}-7.13
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=camlp5/}
 GITHUB_TAG=	rel${PKGVERSION_NOREV:S/.//}
@@ -26,7 +26,7 @@ REPLACE_SH=	tools/*.sh meta/*.sh ocaml_src/tools/*.sh compile/*.sh
 INSTALLATION_DIRS+=	${OCAML_SITELIBDIR}/camlp5
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .if (${OCAML_USE_OPT_COMPILER} == "yes")
 BUILD_TARGET=	world.opt
diff --git a/lang/camlp5/buildlink3.mk b/lang/camlp5/buildlink3.mk
index 05880efdf3a..7b2f500d124 100644
--- a/lang/camlp5/buildlink3.mk
+++ b/lang/camlp5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2021/03/08 08:13:02 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2022/05/24 18:51:53 jaapb Exp $
 #
 
 BUILDLINK_TREE+=	camlp5
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=	camlp5
 CAMLP5_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.camlp5+=	camlp5>=7.00
-BUILDLINK_ABI_DEPENDS.camlp5+=	camlp5>=7.13nb1
+BUILDLINK_ABI_DEPENDS.camlp5+=	camlp5>=7.13nb2
 BUILDLINK_PKGSRCDIR.camlp5?=	../../lang/camlp5
 
 .include "../../lang/ocaml/buildlink3.mk"
diff --git a/lang/pict/Makefile b/lang/pict/Makefile
index dda810832cd..59011a79625 100644
--- a/lang/pict/Makefile
+++ b/lang/pict/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2021/03/08 08:13:03 jaapb Exp $
+# $NetBSD: Makefile,v 1.24 2022/05/24 18:51:53 jaapb Exp $
 
 DISTNAME=	pict-4.1
-PKGREVISION=	17
+PKGREVISION=	18
 CATEGORIES=	lang
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/papers/pict/pict-4.1/
 
@@ -24,7 +24,7 @@ MAKE_ENV+=		X11INCLUDE=${X11BASE}/include \
 
 TEST_TARGET=	test
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .if !empty(OCAML_USE_OPT_COMPILER:Myes)
 MAKE_ENV+=		OCAMLOPT=yes
diff --git a/math/ocaml-num/Makefile b/math/ocaml-num/Makefile
index b919e4fd486..46949107910 100644
--- a/math/ocaml-num/Makefile
+++ b/math/ocaml-num/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2022/03/01 09:50:00 jaapb Exp $
+# $NetBSD: Makefile,v 1.8 2022/05/24 18:51:53 jaapb Exp $
 
 GITHUB_PROJECT=	num
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	${GITHUB_PROJECT}-1.4
 PKGNAME=	ocaml-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml/}
 
@@ -21,5 +22,5 @@ INSTALLATION_DIRS+=	lib/ocaml/stublibs
 OCAML_USE_FINDLIB=	yes
 OCAML_FINDLIB_DIRS+=	num-top
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/ocaml-zarith/Makefile b/math/ocaml-zarith/Makefile
index 04210f2f9e8..d6d98f0447b 100644
--- a/math/ocaml-zarith/Makefile
+++ b/math/ocaml-zarith/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2022/05/24 17:55:23 jaapb Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/24 18:51:53 jaapb Exp $
 #
 
 VERSION=	1.12
@@ -27,5 +27,5 @@ OCAML_USE_FINDLIB=	yes
 REPLACE_PERL+=	z_pp.pl
 
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/z3/Makefile b/math/z3/Makefile
index 1da9506a3a8..419b147c0b9 100644
--- a/math/z3/Makefile
+++ b/math/z3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2021/03/08 08:13:03 jaapb Exp $
+# $NetBSD: Makefile,v 1.16 2022/05/24 18:51:53 jaapb Exp $
 
 .include "Makefile.common"
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	The Z3 theorem prover / SMT solver
 
 .include "options.mk"
diff --git a/misc/dose3/Makefile b/misc/dose3/Makefile
index c8db5387ebc..e62a7919198 100644
--- a/misc/dose3/Makefile
+++ b/misc/dose3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2022/03/21 07:50:50 jaapb Exp $
+# $NetBSD: Makefile,v 1.20 2022/05/24 18:51:53 jaapb Exp $
 
 DISTNAME=	dose3-5.0.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	misc
 MASTER_SITES=	https://gforge.inria.fr/frs/download.php/file/36063/
 
@@ -15,7 +15,7 @@ USE_TOOLS+=		aclocal automake autoconf gmake pod2man
 MAKE_JOBS_SAFE=		no
 OCAML_USE_FINDLIB=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .if ${OCAML_USE_OPT_COMPILER} != "yes"
 CONFIGURE_ARGS+=	--with-bytecodeonly
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--with-bytecodeonly
 pre-configure:
 	cd ${WRKSRC} && aclocal -I m4 && autoconf
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-cppo/buildlink3.mk"
 .include "../../devel/ocaml-extlib/buildlink3.mk"
 .include "../../devel/ocaml-re/buildlink3.mk"
diff --git a/misc/ocaml-cudf/Makefile b/misc/ocaml-cudf/Makefile
index 8ccfb88cb81..02773606cba 100644
--- a/misc/ocaml-cudf/Makefile
+++ b/misc/ocaml-cudf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2021/03/08 08:13:04 jaapb Exp $
+# $NetBSD: Makefile,v 1.19 2022/05/24 18:51:53 jaapb Exp $
 
 DISTNAME=	cudf-0.9
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	misc
 MASTER_SITES=	https://gforge.inria.fr/frs/download.php/file/36602/
 
@@ -17,7 +17,7 @@ MAKE_JOBS_SAFE=		no
 
 PKGCONFIG_OVERRIDE+=	c-lib/cudf.pc.in
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 BUILD_TARGET=	all
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
diff --git a/misc/ocaml-opaline/Makefile b/misc/ocaml-opaline/Makefile
index cf0b2c98807..874481b5928 100644
--- a/misc/ocaml-opaline/Makefile
+++ b/misc/ocaml-opaline/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.9 2022/03/01 09:36:20 jaapb Exp $
+# $NetBSD: Makefile,v 1.10 2022/05/24 18:51:53 jaapb Exp $
 
-GITHUB_PROJECT=	opaline
-GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	${GITHUB_PROJECT}-0.3.3
 PKGNAME=	ocaml-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jaapb/}
+GITHUB_PROJECT=	opaline
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	https://github.com/jaapb/opaline
@@ -14,7 +15,7 @@ LICENSE=	mit
 
 INSTALLATION_DIRS+=	bin
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
 MAKE_ENV+=	OPTNESS=native
diff --git a/misc/ocaml-opaline/buildlink3.mk b/misc/ocaml-opaline/buildlink3.mk
index bd7eb08cdfe..7b2e1f9f3c7 100644
--- a/misc/ocaml-opaline/buildlink3.mk
+++ b/misc/ocaml-opaline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2022/03/01 09:36:20 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2022/05/24 18:51:53 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-opaline
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-opaline
 OCAML_OPALINE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-opaline+=	ocaml-opaline>=0.3.1
-BUILDLINK_ABI_DEPENDS.ocaml-opaline+=	ocaml-opaline>=0.3.3
+BUILDLINK_ABI_DEPENDS.ocaml-opaline+=	ocaml-opaline>=0.3.3nb1
 BUILDLINK_PKGSRCDIR.ocaml-opaline?=	../../misc/ocaml-opaline
 
 # We only need this to install
diff --git a/misc/ocaml-opam/Makefile b/misc/ocaml-opam/Makefile
index 10b9c74df71..6c0dfd1001b 100644
--- a/misc/ocaml-opam/Makefile
+++ b/misc/ocaml-opam/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.43 2021/12/08 16:05:42 adam Exp $
+# $NetBSD: Makefile,v 1.44 2022/05/24 18:51:54 jaapb Exp $
 
 VERSION=	2.0.8
 GITHUB_PROJECT=	opam
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml/}
 
@@ -29,5 +29,5 @@ OPAM_INSTALL_FILES=	opam opam-installer opam-solver
 .include "../../misc/ocaml-opam-file-format/buildlink3.mk"
 .include "../../textproc/ocaml-jsonm/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/ocaml-topkg/Makefile b/misc/ocaml-topkg/Makefile
index 55069e7b026..1bc4368dfae 100644
--- a/misc/ocaml-topkg/Makefile
+++ b/misc/ocaml-topkg/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2022/01/31 12:04:19 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/05/24 18:51:54 jaapb Exp $
 
 DISTNAME=	topkg-1.0.5
 PKGNAME=	ocaml-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://erratique.ch/software/topkg/releases/
 EXTRACT_SUFX=	.tbz
@@ -16,7 +17,7 @@ OCAML_USE_OPAM=		yes
 
 INSTALLATION_DIRS+=	share/doc/topkg
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/ocaml-topkg/buildlink3.mk b/misc/ocaml-topkg/buildlink3.mk
index 9fa27cd620d..d39016a5093 100644
--- a/misc/ocaml-topkg/buildlink3.mk
+++ b/misc/ocaml-topkg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2021/03/08 20:41:00 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2022/05/24 18:51:54 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-topkg
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-topkg
 OCAML_TOPKG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-topkg+=	ocaml-topkg>=1.0.0
-BUILDLINK_ABI_DEPENDS.ocaml-topkg+=	ocaml-topkg>=1.0.3
+BUILDLINK_ABI_DEPENDS.ocaml-topkg+=	ocaml-topkg>=1.0.5nb1
 BUILDLINK_PKGSRCDIR.ocaml-topkg?=	../../misc/ocaml-topkg
 
 .endif	# OCAML_TOPKG_BUILDLINK3_MK
diff --git a/mk/ocaml.mk b/mk/ocaml.mk
index d00113c8dce..90c3e11c9bb 100644
--- a/mk/ocaml.mk
+++ b/mk/ocaml.mk
@@ -1,16 +1,8 @@
-# $NetBSD: ocaml.mk,v 1.33 2022/04/12 11:27:13 tnn Exp $
+# $NetBSD: ocaml.mk,v 1.34 2022/05/24 18:51:54 jaapb Exp $
 #
 # This Makefile fragment handles the common variables used by OCaml packages.
+# It should be included by every package that uses OCaml.
 #
-# Build def variables:
-# OCAML_USE_OPT_COMPILER 
-# if set to yes, will enable optimised (native code) compilation
-# default value: depends on architecture
-#
-# PLIST variable:
-# PLIST.ocaml-opt for files only installed when using the optimised compiler
-# Set based on OCAML_USE_OPT_COMPILER
-# 
 # Package-settable variables:
 # OCAML_USE_FINDLIB
 # package uses findlib infrastructure
@@ -43,10 +35,9 @@ OCAML_MK= # defined
 MKPIE_SUPPORTED=	no
 
 .include "../../mk/bsd.fast.prefs.mk"
+.include "../../wip/ocaml/native.mk"
 
-BUILD_DEFS+=	OCAML_USE_OPT_COMPILER
 
-_VARGROUPS+=	ocaml
 _PKG_VARS.ocaml=	\
 	OCAML_USE_FINDLIB \
 	OCAML_FINDLIB_DIRS \
@@ -61,9 +52,6 @@ _PKG_VARS.ocaml=	\
 	OCAML_TOPKG_FLAGS \
 	OCAML_TOPKG_TARGETS \
 	OCAML_TOPKG_OPTIONAL_TARGETS \
-	JBUILDER_BUILD_FLAGS \
-	JBUILDER_BUILD_PACKAGES \
-	JBUILDER_BUILD_TARGETS \
 	OCAML_USE_DUNE \
 	DUNE_BUILD_FLAGS \
 	DUNE_BUILD_PACKAGES \
@@ -71,8 +59,6 @@ _PKG_VARS.ocaml=	\
 	OCAML_BUILD_ARGS \
 	OPAM_INSTALL_DIR \
 	OPAM_INSTALL_FILES
-_DEF_VARS.ocaml=	\
-	OCAML_USE_OPT_COMPILER
 _SYS_VARS.ocaml=	\
 	OCAML_SITELIBDIR
 
@@ -99,9 +85,6 @@ OCAML_TOPKG_OPTIONAL_TARGETS?=	# empty
 OCAML_TOPKG_NATIVE_TARGETS?=	# empty
 
 OPAM_INSTALL_FILES?=	${OCAML_TOPKG_NAME}
-JBUILDER_BUILD_FLAGS?=	# empty
-JBUILDER_BUILD_TARGETS?=	@install
-JBUILDER_BUILD_PACKAGES?=	# empty
 DUNE_BUILD_FLAGS?=	# empty
 DUNE_BUILD_TARGETS?=	@install
 DUNE_BUILD_PACKAGES?=	# empty
@@ -109,15 +92,6 @@ DUNE_BUILD_PACKAGES?=	# empty
 # Default value of OASIS_BUILD_ARGS
 OASIS_BUILD_ARGS?=	# empty
 
-# Default value of OCAML_USE_OPT_COMPILER
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    !empty(MACHINE_ARCH:M*arm*) || (${MACHINE_ARCH} == "aarch64") || \
-    (${MACHINE_ARCH} == "aarch64eb") || (${MACHINE_ARCH} == "x86_64")
-OCAML_USE_OPT_COMPILER?=	yes
-.else
-OCAML_USE_OPT_COMPILER?=	no
-.endif
-
 #
 # Configure stuff for OASIS_DYNRUN
 #
@@ -189,18 +163,6 @@ OCAML_FINDLIB_REGISTER?=	yes
 # Compiler stuff
 #
 
-# Things that get installed with the opt compiler
-PLIST_VARS+=	ocaml-opt
-
-.if ${OCAML_USE_OPT_COMPILER} == "yes"
-# The opt compiler needs the C compiler suite
-USE_LANGUAGES+=	c
-PLIST.ocaml-opt=	yes
-.else
-# If we're bytecode compiling, don't strip executables
-INSTALL_UNSTRIPPED=	yes
-.endif
-
 #
 # OASIS targets
 #
diff --git a/net/mldonkey-gui/Makefile b/net/mldonkey-gui/Makefile
index 6d414f08946..f0c492c62d8 100644
--- a/net/mldonkey-gui/Makefile
+++ b/net/mldonkey-gui/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.138 2022/04/18 19:11:52 adam Exp $
+# $NetBSD: Makefile,v 1.139 2022/05/24 18:51:54 jaapb Exp $
 
-PKGREVISION= 51
+PKGREVISION= 52
 .include "../../net/mldonkey/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/mldonkey/mldonkey-gui/}
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 32bc71b721b..28d9f05decb 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.102 2021/05/24 19:53:19 wiz Exp $
+# $NetBSD: Makefile,v 1.103 2022/05/24 18:51:54 jaapb Exp $
 
-PKGREVISION= 20
+PKGREVISION= 21
 .include "Makefile.common"
 
 RCD_SCRIPTS=		mldonkey
diff --git a/net/unison/Makefile b/net/unison/Makefile
index b9bc810ecd6..2cbd7e050e5 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.140 2022/05/08 15:02:33 gdt Exp $
+# $NetBSD: Makefile,v 1.141 2022/05/24 18:51:54 jaapb Exp $
 
 DISTNAME=	unison-2.52.1
-#PKGREVISION=	0
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=bcpierce00/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -16,7 +16,7 @@ USE_TOOLS+=	gmake bash
 MAKE_FLAGS+=	CFLAGS=""
 MAKE_ENV+=	HOME=${WRKDIR:Q}
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .if (${OCAML_USE_OPT_COMPILER} == "yes")
 MAKE_FLAGS+=	NATIVE=true
diff --git a/print/advi/Makefile b/print/advi/Makefile
index 37d4b4c6580..410c3025790 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.139 2022/04/18 19:11:56 adam Exp $
+# $NetBSD: Makefile,v 1.140 2022/05/24 18:51:54 jaapb Exp $
 
 DISTNAME=		advi-1.10.2
-PKGREVISION=		54
+PKGREVISION=		55
 CATEGORIES=		print
 MASTER_SITES=		http://gallium.inria.fr/advi/
 
diff --git a/security/ocaml-safepass/Makefile b/security/ocaml-safepass/Makefile
index 4d2424b2f95..3ae34967be9 100644
--- a/security/ocaml-safepass/Makefile
+++ b/security/ocaml-safepass/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2021/03/08 08:13:06 jaapb Exp $
+# $NetBSD: Makefile,v 1.9 2022/05/24 18:51:54 jaapb Exp $
 
 GITHUB_PROJECT=	ocaml-safepass
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	${GITHUB_PROJECT}-3.0
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=darioteixeira/}
 
@@ -17,5 +17,5 @@ OCAML_USE_DUNE=	yes
 pre-build:
 	${RUN} cd ${WRKSRC} && dune upgrade
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/sks/Makefile b/security/sks/Makefile
index cddbcf1bf43..9c1268a2f29 100644
--- a/security/sks/Makefile
+++ b/security/sks/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2021/05/24 19:54:06 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2022/05/24 18:51:54 jaapb Exp $
 #
 
 DISTNAME=	sks-1.1.5
-PKGREVISION=	18
+PKGREVISION=	19
 CATEGORIES=	security
 MASTER_SITES=	https://bitbucket.org/skskeyserver/sks-keyserver/downloads/
 EXTRACT_SUFX=	.tgz
diff --git a/sysutils/hivex/Makefile b/sysutils/hivex/Makefile
index 03ce94f96f5..cc3f4f7f156 100644
--- a/sysutils/hivex/Makefile
+++ b/sysutils/hivex/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2022/04/18 19:12:05 adam Exp $
+# $NetBSD: Makefile,v 1.17 2022/05/24 18:51:55 jaapb Exp $
 
 DISTNAME=	hivex-1.3.18
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.libguestfs.org/hivex/
 
diff --git a/textproc/harmony/Makefile b/textproc/harmony/Makefile
index 20e27709ec1..f4b238b6e70 100644
--- a/textproc/harmony/Makefile
+++ b/textproc/harmony/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2021/03/08 08:13:06 jaapb Exp $
+# $NetBSD: Makefile,v 1.29 2022/05/24 18:51:55 jaapb Exp $
 #
 
 DISTNAME=	harmony-stable-${VERSION}
 PKGNAME=	harmony-${VERSION}
-PKGREVISION=	18
+PKGREVISION=	19
 CATEGORIES=	misc
 MASTER_SITES=	https://alliance.seas.upenn.edu/~harmony/download/
 
@@ -47,7 +47,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/manual.pdf ${DESTDIR}${PREFIX}/share/doc/harmony
 	${INSTALL_DATA} ${WRKSRC}/doc/main.pdf ${DESTDIR}${PREFIX}/share/doc/harmony
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .include "../../devel/pcre-ocaml/buildlink3.mk"
 .include "../../net/ocamlnet/buildlink3.mk"
diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile
index 29d579ebfaf..bbe281e3ef5 100644
--- a/textproc/hevea/Makefile
+++ b/textproc/hevea/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2021/05/20 13:53:28 tonio Exp $
+# $NetBSD: Makefile,v 1.32 2022/05/24 18:51:55 jaapb Exp $
 
 DISTNAME=	hevea-2.35
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://hevea.inria.fr/distri/
 
@@ -11,7 +12,7 @@ LICENSE=	qpl-v1.0
 
 MAKE_ENV+=	DESTDIR=${DESTDIR}
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .if !empty(OCAML_USE_OPT_COMPILER:M[Yy][Ee][Ss])
 MAKE_ENV+=	TARGET=opt
 .else
diff --git a/textproc/ocaml-easy-format/Makefile b/textproc/ocaml-easy-format/Makefile
index 53718f41279..e06f7c0e5cf 100644
--- a/textproc/ocaml-easy-format/Makefile
+++ b/textproc/ocaml-easy-format/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2021/03/08 08:13:07 jaapb Exp $
+# $NetBSD: Makefile,v 1.11 2022/05/24 18:51:55 jaapb Exp $
 
 GITHUB_PROJECT=	easy-format
 DISTNAME=	${GITHUB_PROJECT}-1.3.2
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mjambon/}
 
@@ -14,5 +14,5 @@ LICENSE=	modified-bsd
 
 OCAML_USE_DUNE=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ocaml-expat/Makefile b/textproc/ocaml-expat/Makefile
index 83df7a4dbff..0e621884058 100644
--- a/textproc/ocaml-expat/Makefile
+++ b/textproc/ocaml-expat/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.20 2021/03/08 08:13:07 jaapb Exp $
+# $NetBSD: Makefile,v 1.21 2022/05/24 18:51:55 jaapb Exp $
 #
 
 VERSION=	1.0.0
 GITHUB_PROJECT=	ocaml-expat
 GITHUB_TAG=	v${VERSION}
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=whitequark/}
 
@@ -18,7 +18,7 @@ USE_TOOLS+=		gmake
 USE_LANGUAGES=		c
 OCAML_USE_FINDLIB=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 BUILD_TARGET=	all
 .if (${OCAML_USE_OPT_COMPILER} == "yes")
diff --git a/textproc/ocaml-jsonm/Makefile b/textproc/ocaml-jsonm/Makefile
index c48651967f3..5186a9362c2 100644
--- a/textproc/ocaml-jsonm/Makefile
+++ b/textproc/ocaml-jsonm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2021/03/08 08:13:07 jaapb Exp $
+# $NetBSD: Makefile,v 1.14 2022/05/24 18:51:55 jaapb Exp $
 
 DISTNAME=	jsonm-1.0.1
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	textproc
 MASTER_SITES=	http://erratique.ch/software/jsonm/releases/
 EXTRACT_SUFX=	.tbz
@@ -15,7 +15,7 @@ LICENSE=	isc
 OCAML_USE_TOPKG=	yes
 INSTALLATION_DIRS+=	bin share/doc/jsonm
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 # Normally, we'd do this using opam-installer, but that requires
 # this package.
diff --git a/textproc/ocaml-jsonm/buildlink3.mk b/textproc/ocaml-jsonm/buildlink3.mk
index a5fff617e12..b9fad40464f 100644
--- a/textproc/ocaml-jsonm/buildlink3.mk
+++ b/textproc/ocaml-jsonm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2018/07/19 15:15:29 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2022/05/24 18:51:55 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-jsonm
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-jsonm
 OCAML_JSONM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-jsonm+=	ocaml-jsonm>=0.9.1
-BUILDLINK_ABI_DEPENDS.ocaml-jsonm+=	ocaml-jsonm>=1.0.1nb4
+BUILDLINK_ABI_DEPENDS.ocaml-jsonm+=	ocaml-jsonm>=1.0.1nb7
 BUILDLINK_PKGSRCDIR.ocaml-jsonm?=	../../textproc/ocaml-jsonm
 
 .include "../../textproc/ocaml-uutf/buildlink3.mk"
diff --git a/textproc/ocaml-text/Makefile b/textproc/ocaml-text/Makefile
index d2b85f96ae9..1cbf913f868 100644
--- a/textproc/ocaml-text/Makefile
+++ b/textproc/ocaml-text/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2021/03/08 08:13:07 jaapb Exp $
+# $NetBSD: Makefile,v 1.26 2022/05/24 18:51:55 jaapb Exp $
 #
 
 DISTNAME=	ocaml-text-0.8
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=vbmithr/}
 
@@ -21,6 +21,6 @@ HAS_CONFIGURE=		yes
 
 OCAML_USE_OASIS=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ocaml-uchar/Makefile b/textproc/ocaml-uchar/Makefile
index 9bdaafe0141..b15d7ff4c40 100644
--- a/textproc/ocaml-uchar/Makefile
+++ b/textproc/ocaml-uchar/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2021/03/08 08:13:07 jaapb Exp $
+# $NetBSD: Makefile,v 1.11 2022/05/24 18:51:55 jaapb Exp $
 
 VERSION=	0.0.2
 GITHUB_PROJECT=	uchar
 GITHUB_TAG=	v${VERSION}
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml/}
 
@@ -16,7 +16,7 @@ LICENSE=	gnu-lgpl-v2.1
 
 INSTALLATION_DIRS=	${OCAML_SITELIBDIR}/uchar
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
 NATIVE=	true
diff --git a/textproc/ocaml-uchar/buildlink3.mk b/textproc/ocaml-uchar/buildlink3.mk
index 8e30ac3dc32..b4ace637e55 100644
--- a/textproc/ocaml-uchar/buildlink3.mk
+++ b/textproc/ocaml-uchar/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2018/11/27 16:46:05 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2022/05/24 18:51:55 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-uchar
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-uchar
 OCAML_UCHAR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-uchar+=	ocaml-uchar>=0.0.1
-BUILDLINK_ABI_DEPENDS.ocaml-uchar+=	ocaml-uchar>=0.0.2
+BUILDLINK_ABI_DEPENDS.ocaml-uchar+=	ocaml-uchar>=0.0.2nb2
 BUILDLINK_PKGSRCDIR.ocaml-uchar?=	../../textproc/ocaml-uchar
 
 .endif	# OCAML_UCHAR_BUILDLINK3_MK
diff --git a/textproc/ocaml-xml-light/Makefile b/textproc/ocaml-xml-light/Makefile
index 582cea61894..d4dcb960c6c 100644
--- a/textproc/ocaml-xml-light/Makefile
+++ b/textproc/ocaml-xml-light/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2021/03/08 08:13:08 jaapb Exp $
+# $NetBSD: Makefile,v 1.3 2022/05/24 18:51:56 jaapb Exp $
 
 GITHUB_PROJECT=	xml-light
 DISTNAME=	${GITHUB_PROJECT}-2.4
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ncannasse/}
 DIST_SUBDIR=	ocaml-${GITHUB_PROJECT}
@@ -19,7 +19,7 @@ MAKE_JOBS_SAFE=	no
 
 OCAML_USE_FINDLIB=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 BUILD_TARGET=	all
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
diff --git a/textproc/ocaml-xml-light/buildlink3.mk b/textproc/ocaml-xml-light/buildlink3.mk
index 84ffe6a3c2b..124c988a282 100644
--- a/textproc/ocaml-xml-light/buildlink3.mk
+++ b/textproc/ocaml-xml-light/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2018/11/29 10:45:37 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2022/05/24 18:51:56 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-xml-light
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	ocaml-xml-light
 OCAML_XML_LIGHT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-xml-light+=	ocaml-xml-light>=2.4
+BUILDLINK_ABI_DEPENDS.ocaml-xml-light+=	ocaml-xml-light>=2.4nb2
 BUILDLINK_PKGSRCDIR.ocaml-xml-light?=	../../textproc/ocaml-xml-light
 .endif	# OCAML_XML_LIGHT_BUILDLINK3_MK
 
diff --git a/textproc/pxp/Makefile b/textproc/pxp/Makefile
index 41c3e4ab58d..9f41db01523 100644
--- a/textproc/pxp/Makefile
+++ b/textproc/pxp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2021/03/08 08:13:08 jaapb Exp $
+# $NetBSD: Makefile,v 1.25 2022/05/24 18:51:56 jaapb Exp $
 #
 
 DISTNAME=		pxp-1.2.8
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		textproc
 MASTER_SITES=		http://download.camlcity.org/download/
 
@@ -33,7 +33,7 @@ INSTALLATION_DIRS=	${OCAML_SITELIBDIR}/pxp
 OCAML_USE_FINDLIB=	yes
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .if (${OCAML_USE_OPT_COMPILER} == "yes")
 BUILD_TARGET+=	opt
diff --git a/textproc/py-pybtex-docutils/Makefile b/textproc/py-pybtex-docutils/Makefile
index f5020794f5b..2f7f5299615 100644
--- a/textproc/py-pybtex-docutils/Makefile
+++ b/textproc/py-pybtex-docutils/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:55:03 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/24 18:51:56 jaapb Exp $
 
 DISTNAME=	pybtex-docutils-1.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pybtex-docutils/}
 
diff --git a/time/ocaml-calendar/Makefile b/time/ocaml-calendar/Makefile
index cfae388e17c..ba10a985bf3 100644
--- a/time/ocaml-calendar/Makefile
+++ b/time/ocaml-calendar/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2021/03/08 08:13:08 jaapb Exp $
+# $NetBSD: Makefile,v 1.25 2022/05/24 18:51:56 jaapb Exp $
 #
 
 DISTNAME=	calendar-2.04
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	time devel
 MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1481/
 
@@ -20,5 +20,5 @@ OCAML_USE_FINDLIB=	yes
 
 TEST_TARGET=	tests
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/ocaml-mtime/Makefile b/time/ocaml-mtime/Makefile
index 4c9a6c59615..4b700cf3875 100644
--- a/time/ocaml-mtime/Makefile
+++ b/time/ocaml-mtime/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2021/03/08 08:13:08 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2022/05/24 18:51:56 jaapb Exp $
 
 DISTNAME=	mtime-1.1.0
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	time
 MASTER_SITES=	https://erratique.ch/software/mtime/releases/
 EXTRACT_SUFX=	.tbz
@@ -16,6 +16,6 @@ OCAML_USE_TOPKG=	yes
 OCAML_USE_OPAM=		yes
 
 .include "options.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/wyrd/Makefile b/time/wyrd/Makefile
index 406bf4ab10f..9b8f3ee889d 100644
--- a/time/wyrd/Makefile
+++ b/time/wyrd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2021/03/08 08:13:08 jaapb Exp $
+# $NetBSD: Makefile,v 1.29 2022/05/24 18:51:56 jaapb Exp $
 #
 
 DISTNAME=		wyrd-1.4.6
-PKGREVISION=		14
+PKGREVISION=		15
 CATEGORIES=		time
 #MASTER_SITES=		http://pessimization.com/software/wyrd/
 
diff --git a/www/ocaml-curl/Makefile b/www/ocaml-curl/Makefile
index a0bb49c0ad5..668c5ba638c 100644
--- a/www/ocaml-curl/Makefile
+++ b/www/ocaml-curl/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.43 2021/12/08 16:06:58 adam Exp $
+# $NetBSD: Makefile,v 1.44 2022/05/24 18:51:56 jaapb Exp $
 #
 
 DISTNAME=		ocurl-0.5.3
 PKGNAME=		ocaml-curl-0.5.3
 EXTRACT_SUFX=		.tgz
-PKGREVISION=		39
+PKGREVISION=		40
 CATEGORIES=		www net devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ocurl/}
 
@@ -27,5 +27,5 @@ WRKSRC=			${WRKDIR}/ocurl
 USE_LANGUAGES=		c
 
 .include "../../www/curl/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ocaml-http/Makefile b/www/ocaml-http/Makefile
index c87fc9f7234..280607e70f5 100644
--- a/www/ocaml-http/Makefile
+++ b/www/ocaml-http/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2021/03/08 08:13:09 jaapb Exp $
+# $NetBSD: Makefile,v 1.20 2022/05/24 18:51:56 jaapb Exp $
 #
 
 DISTNAME=	ocaml-http-0.1.5
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	www
 MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/545/
 
@@ -20,7 +20,7 @@ BUILD_TARGET=	all
 
 OCAML_USE_FINDLIB=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .if (${OCAML_USE_OPT_COMPILER} == "yes")
 BUILD_TARGET+=	opt
diff --git a/www/ocsigen-i18n/Makefile b/www/ocsigen-i18n/Makefile
index 4fb6ff535f9..a039b917519 100644
--- a/www/ocsigen-i18n/Makefile
+++ b/www/ocsigen-i18n/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2021/03/08 08:13:09 jaapb Exp $
+# $NetBSD: Makefile,v 1.9 2022/05/24 18:51:56 jaapb Exp $
 
 GITHUB_PROJECT=	ocsigen-i18n
 DISTNAME=	${GITHUB_PROJECT}-3.7.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=besport/}
 
@@ -20,7 +20,7 @@ INSTALLATION_DIRS+=	bin
 OCAML_USE_FINDLIB=	yes
 OCAML_FINDLIB_DIRS=	# empty
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
 MAKE_ENV+=	OPTNESS=native
diff --git a/www/ocsigen-start/Makefile b/www/ocsigen-start/Makefile
index c38313ddb18..9ab7c4579c0 100644
--- a/www/ocsigen-start/Makefile
+++ b/www/ocsigen-start/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2021/03/08 08:13:09 jaapb Exp $
+# $NetBSD: Makefile,v 1.13 2022/05/24 18:51:57 jaapb Exp $
 
 GITHUB_PROJECT=	ocsigen-start
 DISTNAME=	${GITHUB_PROJECT}-2.21.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
 
@@ -16,7 +16,7 @@ USE_TOOLS=	gmake
 
 OCAML_USE_FINDLIB=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
 MAKE_ENV+=	NATIVE=yes
diff --git a/www/ocsigen-toolkit/Makefile b/www/ocsigen-toolkit/Makefile
index a3b9a527b35..2ed642b1f1b 100644
--- a/www/ocsigen-toolkit/Makefile
+++ b/www/ocsigen-toolkit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2021/03/08 08:13:09 jaapb Exp $
+# $NetBSD: Makefile,v 1.9 2022/05/24 18:51:57 jaapb Exp $
 
 GITHUB_PROJECT=	ocsigen-toolkit
 DISTNAME=	${GITHUB_PROJECT}-2.8.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
 
@@ -16,7 +16,7 @@ USE_TOOLS=	gmake
 
 OCAML_USE_FINDLIB=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
 MAKE_ENV+=	NATIVE=yes
diff --git a/www/swiftsurf/Makefile b/www/swiftsurf/Makefile
index 947131e801d..180ab86a0dc 100644
--- a/www/swiftsurf/Makefile
+++ b/www/swiftsurf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2021/03/08 08:13:09 jaapb Exp $
+# $NetBSD: Makefile,v 1.39 2022/05/24 18:51:57 jaapb Exp $
 
 DISTNAME=		swiftsurf-1.2.5
-PKGREVISION=		20
+PKGREVISION=		21
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=swiftsurf/}
 
@@ -16,7 +16,7 @@ SUBST_FILES.conf=	src/conf.ml
 SUBST_VARS.conf=	PKG_SYSCONFDIR
 SUBST_STAGE.conf=	pre-configure
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .if !empty(OCAML_USE_OPT_COMPILER:M[Yy][Ee][Ss])
 BUILD_TARGET=	nat
diff --git a/x11/labltk/Makefile b/x11/labltk/Makefile
index 835178423bf..cf83c97adc8 100644
--- a/x11/labltk/Makefile
+++ b/x11/labltk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2021/03/08 08:13:10 jaapb Exp $
+# $NetBSD: Makefile,v 1.40 2022/05/24 18:51:57 jaapb Exp $
 
 DISTNAME=	labltk-8.06.3
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	x11
 # caution: it's the 1701, not the filename, that identifies the download
 MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1701/
diff --git a/x11/ocaml-graphics/Makefile b/x11/ocaml-graphics/Makefile
index d8206d3e467..85db25aebe2 100644
--- a/x11/ocaml-graphics/Makefile
+++ b/x11/ocaml-graphics/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2021/12/26 05:09:45 dholland Exp $
+# $NetBSD: Makefile,v 1.42 2022/05/24 18:51:57 jaapb Exp $
 
 GITHUB_PROJECT=	graphics
 DISTNAME=	ocaml-${GITHUB_PROJECT}-2.0.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml/}
 
@@ -15,6 +15,6 @@ WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 
 OCAML_USE_DUNE=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/ocaml-graphics/buildlink3.mk b/x11/ocaml-graphics/buildlink3.mk
index c5135a089c2..4907583aff9 100644
--- a/x11/ocaml-graphics/buildlink3.mk
+++ b/x11/ocaml-graphics/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2021/03/08 08:13:10 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2022/05/24 18:51:57 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-graphics
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-graphics
 OCAML_GRAPHICS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-graphics+=	ocaml-graphics>=2.0.0
-BUILDLINK_ABI_DEPENDS.ocaml-graphics?=	ocaml-graphics>=2.0.0nb1
+BUILDLINK_ABI_DEPENDS.ocaml-graphics?=	ocaml-graphics>=2.0.0nb3
 BUILDLINK_PKGSRCDIR.ocaml-graphics?=	../../x11/ocaml-graphics
 
 .include "../../lang/ocaml/buildlink3.mk"
diff --git a/x11/ocaml-lablgtk/Makefile b/x11/ocaml-lablgtk/Makefile
index 8ad1ee7524c..44466ea0038 100644
--- a/x11/ocaml-lablgtk/Makefile
+++ b/x11/ocaml-lablgtk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.70 2022/04/18 19:10:17 adam Exp $
+# $NetBSD: Makefile,v 1.71 2022/05/24 18:51:57 jaapb Exp $
 
 GITHUB_PROJECT=	lablgtk
 DISTNAME=	${GITHUB_PROJECT}-2.18.12
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=garrigue/}
 
@@ -44,7 +44,7 @@ PLIST_VARS+=	stubs
 PLIST.stubs=	yes
 .endif
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .include "options.mk"
 
diff --git a/x11/ocaml-lablgtk3/Makefile b/x11/ocaml-lablgtk3/Makefile
index 6b21b0a733e..7d15063356a 100644
--- a/x11/ocaml-lablgtk3/Makefile
+++ b/x11/ocaml-lablgtk3/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2022/04/18 19:10:17 adam Exp $
+# $NetBSD: Makefile,v 1.14 2022/05/24 18:51:57 jaapb Exp $
 
 GITHUB_PROJECT=	lablgtk
 GITHUB_TAG=	${VERSION}
 VERSION=	3.1.2
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 PKGNAME=	ocaml-${GITHUB_PROJECT}3-${VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=garrigue/}
 
@@ -22,7 +22,7 @@ OPAM_INSTALL_FILES=	${OCAML_FINDLIB_DIRS}
 DUNE_BUILD_PACKAGES=	${OCAML_FINDLIB_DIRS}
 
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 
 .include "options.mk"