Recursive revbump associated with update of ocaml.

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

6 files changed, 18 insertions, 18 deletions

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