[pkgsrc/trunk]: pkgsrc/devel/ocaml-yojson Updated package devel/ocaml-yojson ...

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/871eca86b5cd
branches:  trunk
changeset: 325927:871eca86b5cd
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Tue Nov 27 23:33:40 2018 +0000

description:
Updated package devel/ocaml-yojson to use dune.

diffstat:

 devel/ocaml-yojson/Makefile      |  14 +++-----------
 devel/ocaml-yojson/PLIST         |   3 ++-
 devel/ocaml-yojson/buildlink3.mk |   4 ++--
 3 files changed, 7 insertions(+), 14 deletions(-)

diffs (71 lines):

diff -r 8e605630b267 -r 871eca86b5cd devel/ocaml-yojson/Makefile
--- a/devel/ocaml-yojson/Makefile       Tue Nov 27 23:27:25 2018 +0000
+++ b/devel/ocaml-yojson/Makefile       Tue Nov 27 23:33:40 2018 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2018/11/12 16:10:23 jaapb Exp $
+# $NetBSD: Makefile,v 1.10 2018/11/27 23:33:40 jaapb Exp $
 
 GITHUB_PROJECT=        yojson
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 DISTNAME=      ${GITHUB_PROJECT}-1.4.1
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mjambon/}
 
@@ -13,18 +13,10 @@
 COMMENT=       JSON parsing and pretty-printing library for OCaml
 LICENSE=       modified-bsd
 
-MAKE_JOBS_SAFE=                no
-USE_TOOLS+=            gmake
-BUILD_TARGET=          META all
-OCAML_USE_JBUILDER=    yes
+OCAML_USE_DUNE=        yes
 INSTALLATION_DIRS+=    bin
 
 .include "../../mk/ocaml.mk"
-
-.if ${OCAML_USE_OPT_COMPILER} == "yes"
-BUILD_TARGET+= opt
-.endif
-
 .include "../../devel/ocaml-biniou/buildlink3.mk"
 .include "../../devel/ocaml-cppo/buildlink3.mk"
 .include "../../textproc/ocaml-easy-format/buildlink3.mk"
diff -r 8e605630b267 -r 871eca86b5cd devel/ocaml-yojson/PLIST
--- a/devel/ocaml-yojson/PLIST  Tue Nov 27 23:27:25 2018 +0000
+++ b/devel/ocaml-yojson/PLIST  Tue Nov 27 23:33:40 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2018/07/19 14:18:09 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/11/27 23:33:40 jaapb Exp $
 ${PLIST.ocaml-opt}bin/ydump
 ${OCAML_SITELIB}/yojson/META
 ${OCAML_SITELIB}/yojson/opam
@@ -11,6 +11,7 @@
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/yojson/yojson.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/yojson/yojson.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/yojson/yojson.cmxs
+${OCAML_SITELIB}/yojson/yojson.dune
 ${OCAML_SITELIB}/yojson/yojson.ml
 ${OCAML_SITELIB}/yojson/yojson.mli
 ${OCAML_SITELIB}/yojson/yojson_biniou.cmi
diff -r 8e605630b267 -r 871eca86b5cd devel/ocaml-yojson/buildlink3.mk
--- a/devel/ocaml-yojson/buildlink3.mk  Tue Nov 27 23:27:25 2018 +0000
+++ b/devel/ocaml-yojson/buildlink3.mk  Tue Nov 27 23:33:40 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2018/07/19 14:18:09 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/11/27 23:33:40 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-yojson
 
@@ -6,7 +6,7 @@
 OCAML_YOJSON_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-yojson+=   ocaml-yojson>=1.3.3
-BUILDLINK_ABI_DEPENDS.ocaml-yojson+=   ocaml-yojson>=1.4.1nb2
+BUILDLINK_ABI_DEPENDS.ocaml-yojson+=   ocaml-yojson>=1.4.1nb4
 BUILDLINK_PKGSRCDIR.ocaml-yojson?=     ../../devel/ocaml-yojson
 
 .endif # OCAML_YOJSON_BUILDLINK3_MK