Fri Aug 3 09:19:56 2018 UTC ()
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.


(jaapb)
diff -r1.26 -r1.27 pkgsrc/devel/js_of_ocaml/Makefile
diff -r1.18 -r1.19 pkgsrc/devel/js_of_ocaml/PLIST
diff -r1.9 -r1.10 pkgsrc/devel/js_of_ocaml/buildlink3.mk
diff -r1.4 -r1.5 pkgsrc/devel/js_of_ocaml/options.mk
cvs diff -r1.26 -r1.27 pkgsrc/devel/js_of_ocaml/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/js_of_ocaml/Makefile 2018/07/19 14:05:57 1.26
+++ pkgsrc/devel/js_of_ocaml/Makefile 2018/08/03 09:19:56 1.27
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.26 2018/07/19 14:05:57 jaapb Exp $ 1# $NetBSD: Makefile,v 1.27 2018/08/03 09:19:56 jaapb Exp $
2# 2#
3 3
4GITHUB_PROJECT= js_of_ocaml 4GITHUB_PROJECT= js_of_ocaml
5DISTNAME= ${GITHUB_PROJECT}-3.2.0 5DISTNAME= ${GITHUB_PROJECT}-3.2.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.18 -r1.19 pkgsrc/devel/js_of_ocaml/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/js_of_ocaml/PLIST 2018/07/19 14:05:57 1.18
+++ pkgsrc/devel/js_of_ocaml/PLIST 2018/08/03 09:19:56 1.19
@@ -1,28 +1,39 @@ @@ -1,28 +1,39 @@
1@comment $NetBSD: PLIST,v 1.18 2018/07/19 14:05:57 jaapb Exp $ 1@comment $NetBSD: PLIST,v 1.19 2018/08/03 09:19:56 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 5${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/META
6${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/js_of_ocaml-camlp4.dune 6${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/js_of_ocaml-camlp4.dune
7${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/opam 7${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/opam
8${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.a 8${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.a
9${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cma 9${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cma
10${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmi 10${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmi
11${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmt 11${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmt
 12${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.ml
12${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmx 13${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmx
13${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmxa 14${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmxa
14${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmxs 15${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmxs
15${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.ml 16${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/js_of_ocaml-camlp4.deriving.dune
 17${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.a
 18${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cma
 19${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmi
 20${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmt
 21${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmti
 22${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmx
 23${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmxa
 24${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmxs
 25${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.ml
 26${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.mli
16${OCAML_SITELIB}/js_of_ocaml-compiler/META 27${OCAML_SITELIB}/js_of_ocaml-compiler/META
17${OCAML_SITELIB}/js_of_ocaml-compiler/annot_lexer.ml 28${OCAML_SITELIB}/js_of_ocaml-compiler/annot_lexer.ml
18${OCAML_SITELIB}/js_of_ocaml-compiler/annot_lexer.mli 29${OCAML_SITELIB}/js_of_ocaml-compiler/annot_lexer.mli
19${OCAML_SITELIB}/js_of_ocaml-compiler/annot_parser.ml 30${OCAML_SITELIB}/js_of_ocaml-compiler/annot_parser.ml
20${OCAML_SITELIB}/js_of_ocaml-compiler/annot_parser.mli 31${OCAML_SITELIB}/js_of_ocaml-compiler/annot_parser.mli
21${OCAML_SITELIB}/js_of_ocaml-compiler/b64.ml 32${OCAML_SITELIB}/js_of_ocaml-compiler/b64.ml
22${OCAML_SITELIB}/js_of_ocaml-compiler/b64.mli 33${OCAML_SITELIB}/js_of_ocaml-compiler/b64.mli
23${OCAML_SITELIB}/js_of_ocaml-compiler/bigarray.js 34${OCAML_SITELIB}/js_of_ocaml-compiler/bigarray.js
24${OCAML_SITELIB}/js_of_ocaml-compiler/bigstring.js 35${OCAML_SITELIB}/js_of_ocaml-compiler/bigstring.js
25${OCAML_SITELIB}/js_of_ocaml-compiler/code.ml 36${OCAML_SITELIB}/js_of_ocaml-compiler/code.ml
26${OCAML_SITELIB}/js_of_ocaml-compiler/code.mli 37${OCAML_SITELIB}/js_of_ocaml-compiler/code.mli
27${OCAML_SITELIB}/js_of_ocaml-compiler/compiler_version.ml 38${OCAML_SITELIB}/js_of_ocaml-compiler/compiler_version.ml
28${OCAML_SITELIB}/js_of_ocaml-compiler/compiler_version.mli 39${OCAML_SITELIB}/js_of_ocaml-compiler/compiler_version.mli
cvs diff -r1.9 -r1.10 pkgsrc/devel/js_of_ocaml/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/js_of_ocaml/buildlink3.mk 2018/07/19 14:05:57 1.9
+++ pkgsrc/devel/js_of_ocaml/buildlink3.mk 2018/08/03 09:19:56 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.9 2018/07/19 14:05:57 jaapb Exp $ 1# $NetBSD: buildlink3.mk,v 1.10 2018/08/03 09:19:56 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.2.0 9BUILDLINK_ABI_DEPENDS.js_of_ocaml+= js_of_ocaml>=3.2.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.4 -r1.5 pkgsrc/devel/js_of_ocaml/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/js_of_ocaml/options.mk 2018/06/05 16:19:16 1.4
+++ pkgsrc/devel/js_of_ocaml/options.mk 2018/08/03 09:19:56 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.4 2018/06/05 16:19:16 jaapb Exp $ 1# $NetBSD: options.mk,v 1.5 2018/08/03 09:19:56 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 camlp4 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 camlp4 11PLIST_VARS+= tyxml camlp4
12 12
13### 13###
14### TyXML support 14### TyXML support
@@ -17,18 +17,19 @@ PLIST_VARS+= tyxml camlp4 @@ -17,18 +17,19 @@ PLIST_VARS+= tyxml camlp4
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 24
25### 25###
26### Camlp4 support 26### Camlp4 support
27### 27###
28.if !empty(PKG_OPTIONS:Mcamlp4) 28.if !empty(PKG_OPTIONS:Mcamlp4)
29.include "../../lang/camlp4/buildlink3.mk" 29.include "../../lang/camlp4/buildlink3.mk"
 30DEPENDS+= ocaml-deriving-ocsigen>=0.8.1:../../devel/ocaml-deriving-ocsigen
30PLIST.camlp4= yes 31PLIST.camlp4= yes
31JBUILDER_BUILD_PACKAGES+= js_of_ocaml-camlp4 32JBUILDER_BUILD_PACKAGES+= js_of_ocaml-camlp4
32OPAM_INSTALL_FILES+= js_of_ocaml-camlp4 33OPAM_INSTALL_FILES+= js_of_ocaml-camlp4
33.else 34.else
34.endif 35.endif