Added dependency to camlp4 option for devel/js_of_ocaml

Said package needs devel/ocaml-deriving-ocsigen to compile the entirety
of its camlp4 stuff.

4 files changed, 19 insertions, 6 deletions

diff --git a/devel/js_of_ocaml/Makefile b/devel/js_of_ocaml/Makefile
index d8d2705dd7d..25e8bfe2140 100644
--- a/devel/js_of_ocaml/Makefile
+++ b/devel/js_of_ocaml/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2018/07/19 14:05:57 jaapb Exp $
+# $NetBSD: Makefile,v 1.27 2018/08/03 09:19:56 jaapb Exp $
 #
 
 GITHUB_PROJECT=	js_of_ocaml
 DISTNAME=	${GITHUB_PROJECT}-3.2.0
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
 
diff --git a/devel/js_of_ocaml/PLIST b/devel/js_of_ocaml/PLIST
index 4a1b78b6534..3117f6a8bae 100644
--- a/devel/js_of_ocaml/PLIST
+++ b/devel/js_of_ocaml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2018/07/19 14:05:57 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.19 2018/08/03 09:19:56 jaapb Exp $
 bin/js_of_ocaml
 bin/jsoo_link
 bin/jsoo_minify
@@ -9,10 +9,21 @@ ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.a
 ${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cma
 ${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmi
 ${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmt
+${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.ml
 ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmx
 ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmxa
 ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmxs
-${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.ml
+${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/js_of_ocaml-camlp4.deriving.dune
+${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.a
+${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cma
+${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmi
+${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmt
+${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmti
+${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmx
+${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmxa
+${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmxs
+${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.ml
+${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.mli
 ${OCAML_SITELIB}/js_of_ocaml-compiler/META
 ${OCAML_SITELIB}/js_of_ocaml-compiler/annot_lexer.ml
 ${OCAML_SITELIB}/js_of_ocaml-compiler/annot_lexer.mli
diff --git a/devel/js_of_ocaml/buildlink3.mk b/devel/js_of_ocaml/buildlink3.mk
index 05d1abf694d..8e9d01a691c 100644
--- a/devel/js_of_ocaml/buildlink3.mk
+++ b/devel/js_of_ocaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2018/07/19 14:05:57 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/08/03 09:19:56 jaapb Exp $
 
 BUILDLINK_TREE+=	js_of_ocaml
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	js_of_ocaml
 JS_OF_OCAML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.js_of_ocaml+=	js_of_ocaml>=3.0.0
-BUILDLINK_ABI_DEPENDS.js_of_ocaml+=	js_of_ocaml>=3.2.0
+BUILDLINK_ABI_DEPENDS.js_of_ocaml+=	js_of_ocaml>=3.2.0nb1
 BUILDLINK_PKGSRCDIR.js_of_ocaml?=	../../devel/js_of_ocaml
 
 .endif	# JS_OF_OCAML_BUILDLINK3_MK
diff --git a/devel/js_of_ocaml/options.mk b/devel/js_of_ocaml/options.mk
index 7fe804fdd7f..41db9947e3c 100644
--- a/devel/js_of_ocaml/options.mk
+++ b/devel/js_of_ocaml/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2018/06/05 16:19:16 jaapb Exp $
+# $NetBSD: options.mk,v 1.5 2018/08/03 09:19:56 jaapb Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.js_of_ocaml
 PKG_SUPPORTED_OPTIONS=	ocaml-tyxml camlp4
@@ -27,6 +27,7 @@ OPAM_INSTALL_FILES+=	js_of_ocaml-tyxml
 ###
 .if !empty(PKG_OPTIONS:Mcamlp4)
 .include "../../lang/camlp4/buildlink3.mk"
+DEPENDS+=	ocaml-deriving-ocsigen>=0.8.1:../../devel/ocaml-deriving-ocsigen
 PLIST.camlp4=	yes
 JBUILDER_BUILD_PACKAGES+=	js_of_ocaml-camlp4
 OPAM_INSTALL_FILES+=	js_of_ocaml-camlp4