Tue Jun 5 16:19:16 2018 UTC ()
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.


(jaapb)
diff -r1.24 -r1.25 pkgsrc/devel/js_of_ocaml/Makefile
diff -r1.16 -r1.17 pkgsrc/devel/js_of_ocaml/PLIST
diff -r1.7 -r1.8 pkgsrc/devel/js_of_ocaml/buildlink3.mk
diff -r1.3 -r1.4 pkgsrc/devel/js_of_ocaml/options.mk
cvs diff -r1.24 -r1.25 pkgsrc/devel/js_of_ocaml/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/js_of_ocaml/Makefile 2018/04/13 12:59:41 1.24
+++ pkgsrc/devel/js_of_ocaml/Makefile 2018/06/05 16:19:16 1.25
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.24 2018/04/13 12:59:41 jaapb Exp $ 1# $NetBSD: Makefile,v 1.25 2018/06/05 16:19:16 jaapb Exp $
2# 2#
3 3
4GITHUB_PROJECT= js_of_ocaml 4GITHUB_PROJECT= js_of_ocaml
5DISTNAME= ${GITHUB_PROJECT}-3.1.0 5DISTNAME= ${GITHUB_PROJECT}-3.1.0
 6PKGREVISION= 1
6CATEGORIES= devel 7CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
8 9
9MAINTAINER= jaapb@NetBSD.org 10MAINTAINER= jaapb@NetBSD.org
10HOMEPAGE= http://ocsigen.org/js_of_ocaml/ 11HOMEPAGE= http://ocsigen.org/js_of_ocaml/
11COMMENT= Compiler of OCaml bytecode to Javascript 12COMMENT= Compiler of OCaml bytecode to Javascript
12LICENSE= gnu-lgpl-v2 13LICENSE= gnu-lgpl-v2
13 14
14USE_TOOLS= bash 15USE_TOOLS= bash
15 16
16OCAML_USE_FINDLIB= yes 17OCAML_USE_FINDLIB= yes
17OCAML_USE_JBUILDER= yes 18OCAML_USE_JBUILDER= yes
18 19
cvs diff -r1.16 -r1.17 pkgsrc/devel/js_of_ocaml/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/js_of_ocaml/PLIST 2018/04/13 12:59:41 1.16
+++ pkgsrc/devel/js_of_ocaml/PLIST 2018/06/05 16:19:16 1.17
@@ -1,17 +1,39 @@ @@ -1,17 +1,39 @@
1@comment $NetBSD: PLIST,v 1.16 2018/04/13 12:59:41 jaapb Exp $ 1@comment $NetBSD: PLIST,v 1.17 2018/06/05 16:19:16 jaapb Exp $
2bin/js_of_ocaml 2bin/js_of_ocaml
3bin/jsoo_link 3bin/jsoo_link
4bin/jsoo_minify 4bin/jsoo_minify
 5${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/META
 6${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/js_of_ocaml-camlp4.deriving.dune
 7${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.a
 8${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cma
 9${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmi
 10${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmt
 11${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmti
 12${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmx
 13${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmxa
 14${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmxs
 15${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.ml
 16${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.mli
 17${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/js_of_ocaml-camlp4.dune
 18${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/opam
 19${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.a
 20${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cma
 21${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmi
 22${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmt
 23${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmx
 24${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmxa
 25${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmxs
 26${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.ml
5${OCAML_SITELIB}/js_of_ocaml-compiler/META 27${OCAML_SITELIB}/js_of_ocaml-compiler/META
6${OCAML_SITELIB}/js_of_ocaml-compiler/annot_lexer.ml 28${OCAML_SITELIB}/js_of_ocaml-compiler/annot_lexer.ml
7${OCAML_SITELIB}/js_of_ocaml-compiler/annot_lexer.mli 29${OCAML_SITELIB}/js_of_ocaml-compiler/annot_lexer.mli
8${OCAML_SITELIB}/js_of_ocaml-compiler/annot_parser.ml 30${OCAML_SITELIB}/js_of_ocaml-compiler/annot_parser.ml
9${OCAML_SITELIB}/js_of_ocaml-compiler/annot_parser.mli 31${OCAML_SITELIB}/js_of_ocaml-compiler/annot_parser.mli
10${OCAML_SITELIB}/js_of_ocaml-compiler/b64.ml 32${OCAML_SITELIB}/js_of_ocaml-compiler/b64.ml
11${OCAML_SITELIB}/js_of_ocaml-compiler/b64.mli 33${OCAML_SITELIB}/js_of_ocaml-compiler/b64.mli
12${OCAML_SITELIB}/js_of_ocaml-compiler/bigarray.js 34${OCAML_SITELIB}/js_of_ocaml-compiler/bigarray.js
13${OCAML_SITELIB}/js_of_ocaml-compiler/bigstring.js 35${OCAML_SITELIB}/js_of_ocaml-compiler/bigstring.js
14${OCAML_SITELIB}/js_of_ocaml-compiler/code.ml 36${OCAML_SITELIB}/js_of_ocaml-compiler/code.ml
15${OCAML_SITELIB}/js_of_ocaml-compiler/code.mli 37${OCAML_SITELIB}/js_of_ocaml-compiler/code.mli
16${OCAML_SITELIB}/js_of_ocaml-compiler/compiler_version.ml 38${OCAML_SITELIB}/js_of_ocaml-compiler/compiler_version.ml
17${OCAML_SITELIB}/js_of_ocaml-compiler/compiler_version.mli 39${OCAML_SITELIB}/js_of_ocaml-compiler/compiler_version.mli
@@ -607,26 +629,29 @@ ${OCAML_SITELIB}/js_of_ocaml/worker.cmti @@ -607,26 +629,29 @@ ${OCAML_SITELIB}/js_of_ocaml/worker.cmti
607${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/worker.cmx 629${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/worker.cmx
608${OCAML_SITELIB}/js_of_ocaml/worker.ml 630${OCAML_SITELIB}/js_of_ocaml/worker.ml
609${OCAML_SITELIB}/js_of_ocaml/worker.mli 631${OCAML_SITELIB}/js_of_ocaml/worker.mli
610${OCAML_SITELIB}/js_of_ocaml/xmlHttpRequest.cmi 632${OCAML_SITELIB}/js_of_ocaml/xmlHttpRequest.cmi
611${OCAML_SITELIB}/js_of_ocaml/xmlHttpRequest.cmt 633${OCAML_SITELIB}/js_of_ocaml/xmlHttpRequest.cmt
612${OCAML_SITELIB}/js_of_ocaml/xmlHttpRequest.cmti 634${OCAML_SITELIB}/js_of_ocaml/xmlHttpRequest.cmti
613${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/xmlHttpRequest.cmx 635${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/xmlHttpRequest.cmx
614${OCAML_SITELIB}/js_of_ocaml/xmlHttpRequest.ml 636${OCAML_SITELIB}/js_of_ocaml/xmlHttpRequest.ml
615${OCAML_SITELIB}/js_of_ocaml/xmlHttpRequest.mli 637${OCAML_SITELIB}/js_of_ocaml/xmlHttpRequest.mli
616${OCAML_SITELIB}/stublibs/dlljs_of_ocaml_stubs.so 638${OCAML_SITELIB}/stublibs/dlljs_of_ocaml_stubs.so
617man/man1/js_of_ocaml.1 639man/man1/js_of_ocaml.1
618man/man1/jsoo_link.1 640man/man1/jsoo_link.1
619man/man1/jsoo_minify.1 641man/man1/jsoo_minify.1
 642${PLIST.camlp4}share/doc/js_of_ocaml-camlp4/CHANGES
 643${PLIST.camlp4}share/doc/js_of_ocaml-camlp4/LICENSE
 644${PLIST.camlp4}share/doc/js_of_ocaml-camlp4/README.md
620share/doc/js_of_ocaml-compiler/CHANGES 645share/doc/js_of_ocaml-compiler/CHANGES
621share/doc/js_of_ocaml-compiler/LICENSE 646share/doc/js_of_ocaml-compiler/LICENSE
622share/doc/js_of_ocaml-compiler/README.md 647share/doc/js_of_ocaml-compiler/README.md
623share/doc/js_of_ocaml-lwt/CHANGES 648share/doc/js_of_ocaml-lwt/CHANGES
624share/doc/js_of_ocaml-lwt/LICENSE 649share/doc/js_of_ocaml-lwt/LICENSE
625share/doc/js_of_ocaml-lwt/README.md 650share/doc/js_of_ocaml-lwt/README.md
626share/doc/js_of_ocaml-ocamlbuild/CHANGES 651share/doc/js_of_ocaml-ocamlbuild/CHANGES
627share/doc/js_of_ocaml-ocamlbuild/LICENSE 652share/doc/js_of_ocaml-ocamlbuild/LICENSE
628share/doc/js_of_ocaml-ocamlbuild/README.md 653share/doc/js_of_ocaml-ocamlbuild/README.md
629share/doc/js_of_ocaml-ppx/CHANGES 654share/doc/js_of_ocaml-ppx/CHANGES
630share/doc/js_of_ocaml-ppx/LICENSE 655share/doc/js_of_ocaml-ppx/LICENSE
631share/doc/js_of_ocaml-ppx/README.md 656share/doc/js_of_ocaml-ppx/README.md
632share/doc/js_of_ocaml-ppx_deriving_json/CHANGES 657share/doc/js_of_ocaml-ppx_deriving_json/CHANGES
cvs diff -r1.7 -r1.8 pkgsrc/devel/js_of_ocaml/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/js_of_ocaml/buildlink3.mk 2018/04/13 12:59:41 1.7
+++ pkgsrc/devel/js_of_ocaml/buildlink3.mk 2018/06/05 16:19:16 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.7 2018/04/13 12:59:41 jaapb Exp $ 1# $NetBSD: buildlink3.mk,v 1.8 2018/06/05 16:19:16 jaapb Exp $
2 2
3BUILDLINK_TREE+= js_of_ocaml 3BUILDLINK_TREE+= js_of_ocaml
4 4
5.if !defined(JS_OF_OCAML_BUILDLINK3_MK) 5.if !defined(JS_OF_OCAML_BUILDLINK3_MK)
6JS_OF_OCAML_BUILDLINK3_MK:= 6JS_OF_OCAML_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.js_of_ocaml+= js_of_ocaml>=3.0.0 8BUILDLINK_API_DEPENDS.js_of_ocaml+= js_of_ocaml>=3.0.0
9BUILDLINK_ABI_DEPENDS.js_of_ocaml+= js_of_ocaml>=3.1.0 9BUILDLINK_ABI_DEPENDS.js_of_ocaml+= js_of_ocaml>=3.1.0nb1
10BUILDLINK_PKGSRCDIR.js_of_ocaml?= ../../devel/js_of_ocaml 10BUILDLINK_PKGSRCDIR.js_of_ocaml?= ../../devel/js_of_ocaml
11 11
12.endif # JS_OF_OCAML_BUILDLINK3_MK 12.endif # JS_OF_OCAML_BUILDLINK3_MK
13 13
14BUILDLINK_TREE+= -js_of_ocaml 14BUILDLINK_TREE+= -js_of_ocaml
cvs diff -r1.3 -r1.4 pkgsrc/devel/js_of_ocaml/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/js_of_ocaml/options.mk 2018/04/13 12:59:41 1.3
+++ pkgsrc/devel/js_of_ocaml/options.mk 2018/06/05 16:19:16 1.4
@@ -1,23 +1,34 @@ @@ -1,23 +1,34 @@
1# $NetBSD: options.mk,v 1.3 2018/04/13 12:59:41 jaapb Exp $ 1# $NetBSD: options.mk,v 1.4 2018/06/05 16:19:16 jaapb Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.js_of_ocaml 3PKG_OPTIONS_VAR= PKG_OPTIONS.js_of_ocaml
4PKG_SUPPORTED_OPTIONS= ocaml-tyxml 4PKG_SUPPORTED_OPTIONS= ocaml-tyxml camlp4
5PKG_SUGGESTED_OPTIONS= ocaml-tyxml 5PKG_SUGGESTED_OPTIONS= ocaml-tyxml
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11PLIST_VARS+= tyxml 11PLIST_VARS+= tyxml camlp4
12 12
13### 13###
14### TyXML support 14### TyXML support
15### 15###
16.if !empty(PKG_OPTIONS:Mocaml-tyxml) 16.if !empty(PKG_OPTIONS:Mocaml-tyxml)
17.include "../../textproc/ocaml-tyxml/buildlink3.mk" 17.include "../../textproc/ocaml-tyxml/buildlink3.mk"
18.include "../../devel/ocaml-reactiveData/buildlink3.mk" 18.include "../../devel/ocaml-reactiveData/buildlink3.mk"
19PLIST.tyxml= yes 19PLIST.tyxml= yes
20JBUILDER_BUILD_PACKAGES+= js_of_ocaml-tyxml 20JBUILDER_BUILD_PACKAGES+= js_of_ocaml-tyxml
21OPAM_INSTALL_FILES+= js_of_ocaml-tyxml 21OPAM_INSTALL_FILES+= js_of_ocaml-tyxml
22.else 22.else
23.endif 23.endif
 24
 25###
 26### Camlp4 support
 27###
 28.if !empty(PKG_OPTIONS:Mcamlp4)
 29.include "../../lang/camlp4/buildlink3.mk"
 30PLIST.camlp4= yes
 31JBUILDER_BUILD_PACKAGES+= js_of_ocaml-camlp4
 32OPAM_INSTALL_FILES+= js_of_ocaml-camlp4
 33.else
 34.endif