Re-added camlp4 support to devel/js_of_ocaml and revbump.

I removed this in an earlier update, but it turns out that it is still
needed for other packages. Oops.

4 files changed, 44 insertions, 7 deletions

diff --git a/devel/js_of_ocaml/Makefile b/devel/js_of_ocaml/Makefile
index bb63bad817e..c1f6dc0f01d 100644
--- a/devel/js_of_ocaml/Makefile
+++ b/devel/js_of_ocaml/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2018/04/13 12:59:41 jaapb Exp $
+# $NetBSD: Makefile,v 1.25 2018/06/05 16:19:16 jaapb Exp $
 #
 
 GITHUB_PROJECT=	js_of_ocaml
 DISTNAME=	${GITHUB_PROJECT}-3.1.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 86ca2ceb667..35b71228b82 100644
--- a/devel/js_of_ocaml/PLIST
+++ b/devel/js_of_ocaml/PLIST
@@ -1,7 +1,29 @@
-@comment $NetBSD: PLIST,v 1.16 2018/04/13 12:59:41 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.17 2018/06/05 16:19:16 jaapb Exp $
 bin/js_of_ocaml
 bin/jsoo_link
 bin/jsoo_minify
+${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/META
+${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
+${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/js_of_ocaml-camlp4.dune
+${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/opam
+${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}${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
 ${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
@@ -617,6 +639,9 @@ ${OCAML_SITELIB}/stublibs/dlljs_of_ocaml_stubs.so
 man/man1/js_of_ocaml.1
 man/man1/jsoo_link.1
 man/man1/jsoo_minify.1
+${PLIST.camlp4}share/doc/js_of_ocaml-camlp4/CHANGES
+${PLIST.camlp4}share/doc/js_of_ocaml-camlp4/LICENSE
+${PLIST.camlp4}share/doc/js_of_ocaml-camlp4/README.md
 share/doc/js_of_ocaml-compiler/CHANGES
 share/doc/js_of_ocaml-compiler/LICENSE
 share/doc/js_of_ocaml-compiler/README.md
diff --git a/devel/js_of_ocaml/buildlink3.mk b/devel/js_of_ocaml/buildlink3.mk
index 3524742995a..8a41bbbb0f2 100644
--- a/devel/js_of_ocaml/buildlink3.mk
+++ b/devel/js_of_ocaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2018/04/13 12:59:41 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/06/05 16:19:16 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.1.0
+BUILDLINK_ABI_DEPENDS.js_of_ocaml+=	js_of_ocaml>=3.1.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 e77c99a4c43..7fe804fdd7f 100644
--- a/devel/js_of_ocaml/options.mk
+++ b/devel/js_of_ocaml/options.mk
@@ -1,14 +1,14 @@
-# $NetBSD: options.mk,v 1.3 2018/04/13 12:59:41 jaapb Exp $
+# $NetBSD: options.mk,v 1.4 2018/06/05 16:19:16 jaapb Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.js_of_ocaml
-PKG_SUPPORTED_OPTIONS=	ocaml-tyxml
+PKG_SUPPORTED_OPTIONS=	ocaml-tyxml camlp4
 PKG_SUGGESTED_OPTIONS=	ocaml-tyxml
 
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	tyxml
+PLIST_VARS+=	tyxml camlp4
 
 ###
 ### TyXML support
@@ -21,3 +21,14 @@ JBUILDER_BUILD_PACKAGES+=	js_of_ocaml-tyxml
 OPAM_INSTALL_FILES+=	js_of_ocaml-tyxml
 .else
 .endif
+
+###
+### Camlp4 support
+###
+.if !empty(PKG_OPTIONS:Mcamlp4)
+.include "../../lang/camlp4/buildlink3.mk"
+PLIST.camlp4=	yes
+JBUILDER_BUILD_PACKAGES+=	js_of_ocaml-camlp4
+OPAM_INSTALL_FILES+=	js_of_ocaml-camlp4
+.else
+.endif