summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjaapb <jaapb@pkgsrc.org>2018-04-04 16:20:15 +0000
committerjaapb <jaapb@pkgsrc.org>2018-04-04 16:20:15 +0000
commit08dfa5f65af528e3cfc89fca852e4cc82b3b33d3 (patch)
tree8b7c1528c32c1ce5b3e49336acfe5de9026cb1fa
parenta22eaff946a558d458f319661ee7e11e0775c15f (diff)
downloadpkgsrc-08dfa5f65af528e3cfc89fca852e4cc82b3b33d3.tar.gz
New package revision for devel/ocaml-sexplib.
No upstream changes; this deals with some extra files caused to be installed by the new version of jbuilder.
-rw-r--r--devel/ocaml-sexplib/Makefile10
-rw-r--r--devel/ocaml-sexplib/PLIST19
-rw-r--r--devel/ocaml-sexplib/buildlink3.mk4
3 files changed, 25 insertions, 8 deletions
diff --git a/devel/ocaml-sexplib/Makefile b/devel/ocaml-sexplib/Makefile
index d983d835286..f93c01461e4 100644
--- a/devel/ocaml-sexplib/Makefile
+++ b/devel/ocaml-sexplib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2018/01/30 10:32:44 jaapb Exp $
+# $NetBSD: Makefile,v 1.15 2018/04/04 16:20:15 jaapb Exp $
GITHUB_PROJECT= sexplib
-GITHUB_TAG= v${VERS}
-DISTNAME= ${GITHUB_PROJECT}-${VERS}
+GITHUB_TAG= v${PKGVERSION_NOREV}
+DISTNAME= ${GITHUB_PROJECT}-0.10.0
PKGNAME= ocaml-${DISTNAME}
-VERS= 0.10.0
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/}
@@ -14,7 +14,7 @@ COMMENT= S-Expressions with Type Converters for OCaml
LICENSE= modified-bsd AND apache-2.0
OCAML_USE_FINDLIB= yes
-OCAML_USE_OPAM= yes
+OCAML_USE_JBUILDER= yes
BUILD_TARGET= default
diff --git a/devel/ocaml-sexplib/PLIST b/devel/ocaml-sexplib/PLIST
index 5831e22c84e..e2380309d98 100644
--- a/devel/ocaml-sexplib/PLIST
+++ b/devel/ocaml-sexplib/PLIST
@@ -1,12 +1,15 @@
-@comment $NetBSD: PLIST,v 1.4 2017/07/11 12:14:13 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/04/04 16:20:15 jaapb Exp $
share/doc/sexplib/CHANGES.md
share/doc/sexplib/CHANGES.txt
share/doc/sexplib/LICENSE-Tywith.txt
share/doc/sexplib/LICENSE.txt
share/doc/sexplib/README.org
+${OCAML_SITELIB}/sexplib/0/sexp.ml
${OCAML_SITELIB}/sexplib/0/sexp.mli
+${OCAML_SITELIB}/sexplib/0/sexp_conv.ml
${OCAML_SITELIB}/sexplib/0/sexp_conv.mli
${OCAML_SITELIB}/sexplib/0/sexp_conv_error.ml
+${OCAML_SITELIB}/sexplib/0/sexplib.0.dune
${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/0/sexplib0.a
${OCAML_SITELIB}/sexplib/0/sexplib0.cma
${OCAML_SITELIB}/sexplib/0/sexplib0.cmi
@@ -27,11 +30,16 @@ ${OCAML_SITELIB}/sexplib/0/sexplib0__Sexp_conv_error.cmi
${OCAML_SITELIB}/sexplib/0/sexplib0__Sexp_conv_error.cmt
${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/0/sexplib0__Sexp_conv_error.cmx
${OCAML_SITELIB}/sexplib/META
+${OCAML_SITELIB}/sexplib/conv.ml
${OCAML_SITELIB}/sexplib/conv.mli
${OCAML_SITELIB}/sexplib/conv_error.ml
+${OCAML_SITELIB}/sexplib/exn_magic.ml
${OCAML_SITELIB}/sexplib/exn_magic.mli
+${OCAML_SITELIB}/sexplib/lexer.ml
${OCAML_SITELIB}/sexplib/lexer.mli
+${OCAML_SITELIB}/sexplib/macro.ml
${OCAML_SITELIB}/sexplib/macro.mli
+${OCAML_SITELIB}/sexplib/num/sexplib.num.dune
${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/num/sexplib_num.a
${OCAML_SITELIB}/sexplib/num/sexplib_num.cma
${OCAML_SITELIB}/sexplib/num/sexplib_num.cmi
@@ -47,13 +55,18 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/num/sexplib_num__Sexplib_num_conv.cmx
${OCAML_SITELIB}/sexplib/num/sexplib_num__Std.cmi
${OCAML_SITELIB}/sexplib/num/sexplib_num__Std.cmt
${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/num/sexplib_num__Std.cmx
+${OCAML_SITELIB}/sexplib/num/sexplib_num_conv.ml
${OCAML_SITELIB}/sexplib/num/sexplib_num_conv.mli
${OCAML_SITELIB}/sexplib/num/std.ml
${OCAML_SITELIB}/sexplib/opam
+${OCAML_SITELIB}/sexplib/parser.ml
${OCAML_SITELIB}/sexplib/parser.mli
+${OCAML_SITELIB}/sexplib/parser_with_layout.ml
${OCAML_SITELIB}/sexplib/parser_with_layout.mli
+${OCAML_SITELIB}/sexplib/path.ml
${OCAML_SITELIB}/sexplib/path.mli
${OCAML_SITELIB}/sexplib/pre_sexp.ml
+${OCAML_SITELIB}/sexplib/sexp.ml
${OCAML_SITELIB}/sexplib/sexp.mli
${OCAML_SITELIB}/sexplib/sexp_intf.ml
${OCAML_SITELIB}/sexplib/sexp_with_layout.ml
@@ -64,6 +77,7 @@ ${OCAML_SITELIB}/sexplib/sexplib.cmt
${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/sexplib.cmx
${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/sexplib.cmxa
${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/sexplib.cmxs
+${OCAML_SITELIB}/sexplib/sexplib.dune
${OCAML_SITELIB}/sexplib/sexplib.ml-gen
${OCAML_SITELIB}/sexplib/sexplib__Conv.cmi
${OCAML_SITELIB}/sexplib/sexplib__Conv.cmt
@@ -123,10 +137,13 @@ ${OCAML_SITELIB}/sexplib/sexplib__Type_with_layout.cmi
${OCAML_SITELIB}/sexplib/sexplib__Type_with_layout.cmt
${OCAML_SITELIB}/sexplib/sexplib__Type_with_layout.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/sexplib__Type_with_layout.cmx
+${OCAML_SITELIB}/sexplib/src_pos.ml
${OCAML_SITELIB}/sexplib/src_pos.mli
${OCAML_SITELIB}/sexplib/std.ml
${OCAML_SITELIB}/sexplib/type.ml
+${OCAML_SITELIB}/sexplib/type_with_layout.ml
${OCAML_SITELIB}/sexplib/type_with_layout.mli
+${OCAML_SITELIB}/sexplib/unix/sexplib.unix.dune
${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/unix/sexplib_unix.a
${OCAML_SITELIB}/sexplib/unix/sexplib_unix.cma
${OCAML_SITELIB}/sexplib/unix/sexplib_unix.cmi
diff --git a/devel/ocaml-sexplib/buildlink3.mk b/devel/ocaml-sexplib/buildlink3.mk
index 4f0ce29d236..9750f26f897 100644
--- a/devel/ocaml-sexplib/buildlink3.mk
+++ b/devel/ocaml-sexplib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2018/01/10 16:09:33 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/04/04 16:20:15 jaapb Exp $
BUILDLINK_TREE+= ocaml-sexplib
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-sexplib
OCAML_SEXPLIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-sexplib+= ocaml-sexplib>=0.9.0
-BUILDLINK_ABI_DEPENDS.ocaml-sexplib+= ocaml-sexplib>=0.10.0
+BUILDLINK_ABI_DEPENDS.ocaml-sexplib+= ocaml-sexplib>=0.10.0nb1
BUILDLINK_PKGSRCDIR.ocaml-sexplib?= ../../devel/ocaml-sexplib
.endif # OCAML_SEXPLIB_BUILDLINK3_MK