Updated devel/ocaml-result for dune compatibility. Package now compatible with dune 1.7; revbump.diff -r1.9 -r1.10 pkgsrc/devel/ocaml-result/Makefile
(jaapb)
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | # $NetBSD: Makefile,v 1.9 2018/11/27 15:37:45 jaapb Exp $ | 1 | # $NetBSD: Makefile,v 1.10 2019/03/05 16:27:42 jaapb Exp $ | |
2 | 2 | |||
3 | GITHUB_PROJECT= result | 3 | GITHUB_PROJECT= result | |
4 | DISTNAME= ${GITHUB_PROJECT}-1.3 | 4 | DISTNAME= ${GITHUB_PROJECT}-1.3 | |
5 | PKGNAME= ocaml-${DISTNAME} | 5 | PKGNAME= ocaml-${DISTNAME} | |
6 | PKGREVISION= 3 | 6 | PKGREVISION= 4 | |
7 | CATEGORIES= devel | 7 | CATEGORIES= devel | |
8 | MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/} | 8 | MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/} | |
9 | 9 | |||
10 | MAINTAINER= jaapb@NetBSD.org | 10 | MAINTAINER= jaapb@NetBSD.org | |
11 | HOMEPAGE= https://github.com/janestreet/result/ | 11 | HOMEPAGE= https://github.com/janestreet/result/ | |
12 | COMMENT= OCaml compatibility library for Result module | 12 | COMMENT= OCaml compatibility library for Result module | |
13 | LICENSE= modified-bsd | 13 | LICENSE= modified-bsd | |
14 | 14 | |||
15 | USE_LANGUAGES= # none | 15 | USE_LANGUAGES= # none | |
16 | OCAML_USE_DUNE= yes | 16 | OCAML_USE_DUNE= yes | |
17 | INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/result share/doc/result | 17 | INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/result share/doc/result | |
18 | 18 | |||
19 | .include "../../mk/ocaml.mk" | 19 | .include "../../mk/ocaml.mk" |
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2018/04/09 09:36:08 jaapb Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2019/03/05 16:27:42 jaapb Exp $ | |
2 | ${OCAML_SITELIB}/result/META | 2 | ${OCAML_SITELIB}/result/META | |
3 | ${OCAML_SITELIB}/result/dune-package | |||
3 | ${OCAML_SITELIB}/result/opam | 4 | ${OCAML_SITELIB}/result/opam | |
4 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/result/result.a | 5 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/result/result.a | |
5 | ${OCAML_SITELIB}/result/result.cma | 6 | ${OCAML_SITELIB}/result/result.cma | |
6 | ${OCAML_SITELIB}/result/result.cmi | 7 | ${OCAML_SITELIB}/result/result.cmi | |
7 | ${OCAML_SITELIB}/result/result.cmt | 8 | ${OCAML_SITELIB}/result/result.cmt | |
8 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/result/result.cmx | 9 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/result/result.cmx | |
9 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/result/result.cmxa | 10 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/result/result.cmxa | |
10 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/result/result.cmxs | 11 | ${PLIST.ocaml-opt}${OCAML_SITELIB}/result/result.cmxs | |
11 | ${OCAML_SITELIB}/result/result.dune | |||
12 | ${OCAML_SITELIB}/result/result.ml | 12 | ${OCAML_SITELIB}/result/result.ml | |
13 | share/doc/result/CHANGES.md | 13 | share/doc/result/CHANGES.md | |
14 | share/doc/result/LICENSE.md | 14 | share/doc/result/LICENSE.md | |
15 | share/doc/result/README.md | 15 | share/doc/result/README.md |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | # $NetBSD: buildlink3.mk,v 1.6 2018/11/27 15:37:45 jaapb Exp $ | 1 | # $NetBSD: buildlink3.mk,v 1.7 2019/03/05 16:27:42 jaapb Exp $ | |
2 | 2 | |||
3 | BUILDLINK_TREE+= ocaml-result | 3 | BUILDLINK_TREE+= ocaml-result | |
4 | 4 | |||
5 | .if !defined(OCAML_RESULT_BUILDLINK3_MK) | 5 | .if !defined(OCAML_RESULT_BUILDLINK3_MK) | |
6 | OCAML_RESULT_BUILDLINK3_MK:= | 6 | OCAML_RESULT_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.ocaml-result+= ocaml-result>=1.2 | 8 | BUILDLINK_API_DEPENDS.ocaml-result+= ocaml-result>=1.2 | |
9 | BUILDLINK_ABI_DEPENDS.ocaml-result+= ocaml-result>=1.3nb3 | 9 | BUILDLINK_ABI_DEPENDS.ocaml-result+= ocaml-result>=1.3nb4 | |
10 | BUILDLINK_PKGSRCDIR.ocaml-result?= ../../devel/ocaml-result | 10 | BUILDLINK_PKGSRCDIR.ocaml-result?= ../../devel/ocaml-result | |
11 | .endif # OCAML_RESULT_BUILDLINK3_MK | 11 | .endif # OCAML_RESULT_BUILDLINK3_MK | |
12 | 12 | |||
13 | BUILDLINK_TREE+= -ocaml-result | 13 | BUILDLINK_TREE+= -ocaml-result |