From 70e7dfd0074604d59fd6ddd8e5eeb53246cc97c2 Mon Sep 17 00:00:00 2001 From: jaapb Date: Tue, 5 Mar 2019 17:38:30 +0000 Subject: [PATCH] Updated devel/ocaml-compiler-libs for dune compatibility. Package now compatible with dune 1.7; revbump. --- devel/ocaml-compiler-libs/Makefile | 4 ++-- devel/ocaml-compiler-libs/PLIST | 7 ++----- devel/ocaml-compiler-libs/buildlink3.mk | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/devel/ocaml-compiler-libs/Makefile b/devel/ocaml-compiler-libs/Makefile index d926f55c55cc..9bf3bd341d9c 100644 --- a/devel/ocaml-compiler-libs/Makefile +++ b/devel/ocaml-compiler-libs/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.9 2018/11/27 18:54:05 jaapb Exp $ +# $NetBSD: Makefile,v 1.10 2019/03/05 17:38:30 jaapb Exp $ VERSION= 0.11.0 GITHUB_PROJECT= ocaml-compiler-libs GITHUB_TAG= v${VERSION} DISTNAME= ${GITHUB_PROJECT}-${VERSION} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/} diff --git a/devel/ocaml-compiler-libs/PLIST b/devel/ocaml-compiler-libs/PLIST index 1cf5052ca326..5033882a5546 100644 --- a/devel/ocaml-compiler-libs/PLIST +++ b/devel/ocaml-compiler-libs/PLIST @@ -1,6 +1,5 @@ -@comment $NetBSD: PLIST,v 1.2 2018/04/04 19:07:10 jaapb Exp $ +@comment $NetBSD: PLIST,v 1.3 2019/03/05 17:38:30 jaapb Exp $ ${OCAML_SITELIB}/ocaml-compiler-libs/META -${OCAML_SITELIB}/ocaml-compiler-libs/bytecomp/ocaml-compiler-libs.bytecomp.dune ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocaml-compiler-libs/bytecomp/ocaml_bytecomp.a ${OCAML_SITELIB}/ocaml-compiler-libs/bytecomp/ocaml_bytecomp.cma ${OCAML_SITELIB}/ocaml-compiler-libs/bytecomp/ocaml_bytecomp.cmi @@ -9,7 +8,6 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocaml-compiler-libs/bytecomp/ocaml_bytecomp.c ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocaml-compiler-libs/bytecomp/ocaml_bytecomp.cmxa ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocaml-compiler-libs/bytecomp/ocaml_bytecomp.cmxs ${OCAML_SITELIB}/ocaml-compiler-libs/bytecomp/ocaml_bytecomp.ml -${OCAML_SITELIB}/ocaml-compiler-libs/common/ocaml-compiler-libs.common.dune ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocaml-compiler-libs/common/ocaml_common.a ${OCAML_SITELIB}/ocaml-compiler-libs/common/ocaml_common.cma ${OCAML_SITELIB}/ocaml-compiler-libs/common/ocaml_common.cmi @@ -18,8 +16,8 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocaml-compiler-libs/common/ocaml_common.cmx ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocaml-compiler-libs/common/ocaml_common.cmxa ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocaml-compiler-libs/common/ocaml_common.cmxs ${OCAML_SITELIB}/ocaml-compiler-libs/common/ocaml_common.ml +${OCAML_SITELIB}/ocaml-compiler-libs/dune-package ${OCAML_SITELIB}/ocaml-compiler-libs/opam -${OCAML_SITELIB}/ocaml-compiler-libs/shadow/ocaml-compiler-libs.shadow.dune ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocaml-compiler-libs/shadow/ocaml_shadow.a ${OCAML_SITELIB}/ocaml-compiler-libs/shadow/ocaml_shadow.cma ${OCAML_SITELIB}/ocaml-compiler-libs/shadow/ocaml_shadow.cmi @@ -28,7 +26,6 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocaml-compiler-libs/shadow/ocaml_shadow.cmx ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocaml-compiler-libs/shadow/ocaml_shadow.cmxa ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocaml-compiler-libs/shadow/ocaml_shadow.cmxs ${OCAML_SITELIB}/ocaml-compiler-libs/shadow/ocaml_shadow.ml -${OCAML_SITELIB}/ocaml-compiler-libs/toplevel/ocaml-compiler-libs.toplevel.dune ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocaml-compiler-libs/toplevel/ocaml_toplevel.a ${OCAML_SITELIB}/ocaml-compiler-libs/toplevel/ocaml_toplevel.cma ${OCAML_SITELIB}/ocaml-compiler-libs/toplevel/ocaml_toplevel.cmi diff --git a/devel/ocaml-compiler-libs/buildlink3.mk b/devel/ocaml-compiler-libs/buildlink3.mk index 0b938db53c3f..6af2b64d59f5 100644 --- a/devel/ocaml-compiler-libs/buildlink3.mk +++ b/devel/ocaml-compiler-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2018/11/27 18:54:05 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2019/03/05 17:38:30 jaapb Exp $ BUILDLINK_TREE+= ocaml-compiler-libs @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-compiler-libs OCAML_COMPILER_LIBS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-compiler-libs+= ocaml-compiler-libs>=0.9.0 -BUILDLINK_ABI_DEPENDS.ocaml-compiler-libs+= ocaml-compiler-libs>=0.11.0nb3 +BUILDLINK_ABI_DEPENDS.ocaml-compiler-libs+= ocaml-compiler-libs>=0.11.0nb4 BUILDLINK_PKGSRCDIR.ocaml-compiler-libs?= ../../devel/ocaml-compiler-libs .endif # OCAML_COMPILER_LIBS_BUILDLINK3_MK