Recursive revbump associated with update of ocaml.

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

5 files changed, 13 insertions, 13 deletions

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"