From b320d18e59f851eadf529244e53f2f962f68c184 Mon Sep 17 00:00:00 2001 From: jaapb Date: Tue, 5 Mar 2019 17:41:04 +0000 Subject: [PATCH] Updated package devel/ocaml-lwt_camlp4 for dune compatibility. Package now compatible with dune 1.7; revbump. --- devel/ocaml-lwt_camlp4/Makefile | 4 ++-- devel/ocaml-lwt_camlp4/PLIST | 6 ++---- devel/ocaml-lwt_camlp4/buildlink3.mk | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/devel/ocaml-lwt_camlp4/Makefile b/devel/ocaml-lwt_camlp4/Makefile index 0cfaa76f338c..34d213c6aa37 100644 --- a/devel/ocaml-lwt_camlp4/Makefile +++ b/devel/ocaml-lwt_camlp4/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.4 2018/11/27 23:04:03 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2019/03/05 17:41:04 jaapb Exp $ GITHUB_PROJECT= lwt_camlp4 GITHUB_TAG= 45f25a0 DISTNAME= lwt_camlp4-20180325 PKGNAME= ocaml-${DISTNAME} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=aantron/} diff --git a/devel/ocaml-lwt_camlp4/PLIST b/devel/ocaml-lwt_camlp4/PLIST index be9f97bfc41b..d2c4550d77be 100644 --- a/devel/ocaml-lwt_camlp4/PLIST +++ b/devel/ocaml-lwt_camlp4/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1 2018/06/05 15:48:36 jaapb Exp $ +@comment $NetBSD: PLIST,v 1.2 2019/03/05 17:41:04 jaapb Exp $ ${OCAML_SITELIB}/lwt_camlp4/META -${OCAML_SITELIB}/lwt_camlp4/log/lwt_camlp4.log.dune +${OCAML_SITELIB}/lwt_camlp4/dune-package ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/log/lwt_camlp4_log.a ${OCAML_SITELIB}/lwt_camlp4/log/lwt_camlp4_log.cma ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/log/lwt_camlp4_log.cmxa @@ -15,9 +15,7 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/lwt_camlp4.a ${OCAML_SITELIB}/lwt_camlp4/lwt_camlp4.cma ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/lwt_camlp4.cmxa ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/lwt_camlp4.cmxs -${OCAML_SITELIB}/lwt_camlp4/lwt_camlp4.dune ${OCAML_SITELIB}/lwt_camlp4/opam -${OCAML_SITELIB}/lwt_camlp4/options/lwt_camlp4.options.dune ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/options/lwt_camlp4_options.a ${OCAML_SITELIB}/lwt_camlp4/options/lwt_camlp4_options.cma ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/options/lwt_camlp4_options.cmxa diff --git a/devel/ocaml-lwt_camlp4/buildlink3.mk b/devel/ocaml-lwt_camlp4/buildlink3.mk index 073eaab40b56..6b3c15073598 100644 --- a/devel/ocaml-lwt_camlp4/buildlink3.mk +++ b/devel/ocaml-lwt_camlp4/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.2 2018/11/27 23:04:03 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2019/03/05 17:41:04 jaapb Exp $ BUILDLINK_TREE+= ocaml-lwt_camlp4 .if !defined(OCAML_LWT_CAMLP4_BUILDLINK3_MK) OCAML_LWT_CAMLP4_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.ocaml-lwt_camlp4+= ocaml-lwt_camlp4>=20180325nb3 +BUILDLINK_API_DEPENDS.ocaml-lwt_camlp4+= ocaml-lwt_camlp4>=20180325nb4 BUILDLINK_PKGSRCDIR.ocaml-lwt_camlp4?= ../../devel/ocaml-lwt_camlp4 .include "../../devel/ocaml-lwt/buildlink3.mk"