From abf70898ce2de69598e9638711f601733d406ed9 Mon Sep 17 00:00:00 2001 From: jaapb Date: Tue, 24 May 2022 18:51:47 +0000 Subject: Recursive revbump associated with update of ocaml. Also change of mk/ocaml.mk to lang/ocaml/ocaml.mk. --- misc/dose3/Makefile | 8 ++++---- misc/ocaml-cudf/Makefile | 6 +++--- misc/ocaml-opaline/Makefile | 9 +++++---- misc/ocaml-opaline/buildlink3.mk | 4 ++-- misc/ocaml-opam/Makefile | 6 +++--- misc/ocaml-topkg/Makefile | 5 +++-- misc/ocaml-topkg/buildlink3.mk | 4 ++-- 7 files changed, 22 insertions(+), 20 deletions(-) (limited to 'misc') 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 -- cgit v1.2.3