Tue Nov 27 17:20:09 2018 UTC ()
Updated textproc/ocaml-markup to version 0.8.0.

This package does away with the configure script and spins the lwt
parts off into a new markup-lwt library (which is now optional).

Some upstream bugfixes as well.


(jaapb)
diff -r1.8 -r1.9 pkgsrc/textproc/ocaml-markup/Makefile
diff -r1.3 -r1.4 pkgsrc/textproc/ocaml-markup/PLIST
diff -r1.5 -r1.6 pkgsrc/textproc/ocaml-markup/buildlink3.mk
diff -r1.4 -r1.5 pkgsrc/textproc/ocaml-markup/distinfo
diff -r0 -r1.1 pkgsrc/textproc/ocaml-markup/options.mk
cvs diff -r1.8 -r1.9 pkgsrc/textproc/ocaml-markup/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/ocaml-markup/Makefile 2018/11/12 16:10:27 1.8
+++ pkgsrc/textproc/ocaml-markup/Makefile 2018/11/27 17:20:09 1.9
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.8 2018/11/12 16:10:27 jaapb Exp $ 1# $NetBSD: Makefile,v 1.9 2018/11/27 17:20:09 jaapb Exp $
2 2
3GITHUB_PROJECT= markup.ml 3GITHUB_PROJECT= markup.ml
4GITHUB_TAG= ${PKGVERSION_NOREV} 4GITHUB_TAG= ${PKGVERSION_NOREV}
5DISTNAME= markup-0.7.6 5DISTNAME= markup-0.8.0
6PKGNAME= ocaml-${DISTNAME} 6PKGNAME= ocaml-${DISTNAME}
7PKGREVISION= 2 
8CATEGORIES= textproc 7CATEGORIES= textproc
9MASTER_SITES= ${MASTER_SITE_GITHUB:=aantron/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=aantron/}
10 9
11MAINTAINER= jaapb@NetBSD.org 10MAINTAINER= jaapb@NetBSD.org
12HOMEPAGE= https://github.com/aantron/markup.ml/ 11HOMEPAGE= https://github.com/aantron/markup.ml/
13COMMENT= Error-recovering streaming HTML5 and XML parsers for OCaml 12COMMENT= Error-recovering streaming HTML5 and XML parsers for OCaml
14LICENSE= 2-clause-bsd 13LICENSE= 2-clause-bsd
15 14
16HAS_CONFIGURE= yes 15#HAS_CONFIGURE= yes
17USE_LANGUAGES= # none 16USE_LANGUAGES= # none
18 17
19OCAML_USE_JBUILDER= yes 18OCAML_USE_DUNE= yes
 19DUNE_BUILD_PACKAGES= markup
 20OPAM_INSTALL_FILES= markup
20 21
21do-configure: 22#do-configure:
22 ${RUN} cd ${WRKSRC} && ocaml src/configure.ml 23# ${RUN} cd ${WRKSRC} && ocaml src/configure.ml
23 24
24.include "../../devel/ocaml-lwt/buildlink3.mk" 25.include "options.mk"
25.include "../../devel/ocamlbuild/buildlink3.mk" 26.include "../../devel/ocamlbuild/buildlink3.mk"
26.include "../../textproc/ocaml-uutf/buildlink3.mk" 27.include "../../textproc/ocaml-uutf/buildlink3.mk"
27.include "../../mk/ocaml.mk" 28.include "../../mk/ocaml.mk"
28.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/textproc/ocaml-markup/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/ocaml-markup/PLIST 2018/04/13 12:44:51 1.3
+++ pkgsrc/textproc/ocaml-markup/PLIST 2018/11/27 17:20:09 1.4
@@ -1,68 +1,70 @@ @@ -1,68 +1,70 @@
1@comment $NetBSD: PLIST,v 1.3 2018/04/13 12:44:51 jaapb Exp $ 1@comment $NetBSD: PLIST,v 1.4 2018/11/27 17:20:09 jaapb Exp $
 2${OCAML_SITELIB}/markup-lwt/META
 3${OCAML_SITELIB}/markup-lwt/markup-lwt.dune
 4${PLIST.ocaml-opt}${OCAML_SITELIB}/markup-lwt/markup_lwt.a
 5${OCAML_SITELIB}/markup-lwt/markup_lwt.cma
 6${OCAML_SITELIB}/markup-lwt/markup_lwt.cmi
 7${OCAML_SITELIB}/markup-lwt/markup_lwt.cmt
 8${OCAML_SITELIB}/markup-lwt/markup_lwt.cmti
 9${PLIST.ocaml-opt}${OCAML_SITELIB}/markup-lwt/markup_lwt.cmx
 10${PLIST.ocaml-opt}${OCAML_SITELIB}/markup-lwt/markup_lwt.cmxa
 11${PLIST.ocaml-opt}${OCAML_SITELIB}/markup-lwt/markup_lwt.cmxs
 12${OCAML_SITELIB}/markup-lwt/markup_lwt.ml
 13${OCAML_SITELIB}/markup-lwt/markup_lwt.mli
 14${OCAML_SITELIB}/markup-lwt/opam
 15${OCAML_SITELIB}/markup-lwt/unix/markup-lwt.unix.dune
 16${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.a
 17${PLIST.ocaml-opt}${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.cma
 18${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.cmi
 19${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.cmt
 20${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.cmti
 21${PLIST.ocaml-opt}${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.cmx
 22${PLIST.ocaml-opt}${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.cmxa
 23${PLIST.ocaml-opt}${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.cmxs
 24${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.ml
 25${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.mli
2${OCAML_SITELIB}/markup/META 26${OCAML_SITELIB}/markup/META
3${OCAML_SITELIB}/markup/common.ml 27${OCAML_SITELIB}/markup/common.ml
4${OCAML_SITELIB}/markup/detect.ml 28${OCAML_SITELIB}/markup/detect.ml
5${OCAML_SITELIB}/markup/detect.mli 29${OCAML_SITELIB}/markup/detect.mli
6${OCAML_SITELIB}/markup/encoding.ml 30${OCAML_SITELIB}/markup/encoding.ml
7${OCAML_SITELIB}/markup/entities.ml 31${OCAML_SITELIB}/markup/entities.ml
8${OCAML_SITELIB}/markup/error.ml 32${OCAML_SITELIB}/markup/error.ml
9${OCAML_SITELIB}/markup/html_parser.ml 33${OCAML_SITELIB}/markup/html_parser.ml
10${OCAML_SITELIB}/markup/html_parser.mli 34${OCAML_SITELIB}/markup/html_parser.mli
11${OCAML_SITELIB}/markup/html_tokenizer.ml 35${OCAML_SITELIB}/markup/html_tokenizer.ml
12${OCAML_SITELIB}/markup/html_tokenizer.mli 36${OCAML_SITELIB}/markup/html_tokenizer.mli
13${OCAML_SITELIB}/markup/html_writer.ml 37${OCAML_SITELIB}/markup/html_writer.ml
14${OCAML_SITELIB}/markup/html_writer.mli 38${OCAML_SITELIB}/markup/html_writer.mli
15${OCAML_SITELIB}/markup/input.ml 39${OCAML_SITELIB}/markup/input.ml
16${OCAML_SITELIB}/markup/input.mli 40${OCAML_SITELIB}/markup/input.mli
17${OCAML_SITELIB}/markup/kstream.ml 41${OCAML_SITELIB}/markup/kstream.ml
18${OCAML_SITELIB}/markup/kstream.mli 42${OCAML_SITELIB}/markup/kstream.mli
19${OCAML_SITELIB}/markup/lwt/markup.lwt.dune 
20${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/markup_lwt.a 
21${OCAML_SITELIB}/markup/lwt/markup_lwt.cma 
22${OCAML_SITELIB}/markup/lwt/markup_lwt.cmi 
23${OCAML_SITELIB}/markup/lwt/markup_lwt.cmt 
24${OCAML_SITELIB}/markup/lwt/markup_lwt.cmti 
25${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/markup_lwt.cmx 
26${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/markup_lwt.cmxa 
27${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/markup_lwt.cmxs 
28${OCAML_SITELIB}/markup/lwt/markup_lwt.ml 
29${OCAML_SITELIB}/markup/lwt/markup_lwt.mli 
30${OCAML_SITELIB}/markup/lwt/unix/markup.lwt.unix.dune 
31${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.a 
32${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cma 
33${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmi 
34${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmt 
35${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmti 
36${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmx 
37${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmxa 
38${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmxs 
39${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.ml 
40${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.mli 
41${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup.a 43${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup.a
42${OCAML_SITELIB}/markup/markup.cma 44${OCAML_SITELIB}/markup/markup.cma
43${OCAML_SITELIB}/markup/markup.cmi 45${OCAML_SITELIB}/markup/markup.cmi
44${OCAML_SITELIB}/markup/markup.cmt 46${OCAML_SITELIB}/markup/markup.cmt
45${OCAML_SITELIB}/markup/markup.cmti 47${OCAML_SITELIB}/markup/markup.cmti
46${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup.cmx 48${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup.cmx
47${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup.cmxa 49${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup.cmxa
48${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup.cmxs 50${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup.cmxs
49${OCAML_SITELIB}/markup/markup.dune 51${OCAML_SITELIB}/markup/markup.dune
50${OCAML_SITELIB}/markup/markup.ml 52${OCAML_SITELIB}/markup/markup.ml
51${OCAML_SITELIB}/markup/markup.mli 53${OCAML_SITELIB}/markup/markup.mli
52${OCAML_SITELIB}/markup/markup__.cmi 54${OCAML_SITELIB}/markup/markup__.cmi
53${OCAML_SITELIB}/markup/markup__.cmt 55${OCAML_SITELIB}/markup/markup__.cmt
54${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__.cmx 56${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__.cmx
55${OCAML_SITELIB}/markup/markup__.ml-gen 57${OCAML_SITELIB}/markup/markup__.ml
56${OCAML_SITELIB}/markup/markup__Common.cmi 58${OCAML_SITELIB}/markup/markup__Common.cmi
57${OCAML_SITELIB}/markup/markup__Common.cmt 59${OCAML_SITELIB}/markup/markup__Common.cmt
58${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Common.cmx 60${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Common.cmx
59${OCAML_SITELIB}/markup/markup__Detect.cmi 61${OCAML_SITELIB}/markup/markup__Detect.cmi
60${OCAML_SITELIB}/markup/markup__Detect.cmt 62${OCAML_SITELIB}/markup/markup__Detect.cmt
61${OCAML_SITELIB}/markup/markup__Detect.cmti 63${OCAML_SITELIB}/markup/markup__Detect.cmti
62${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Detect.cmx 64${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Detect.cmx
63${OCAML_SITELIB}/markup/markup__Encoding.cmi 65${OCAML_SITELIB}/markup/markup__Encoding.cmi
64${OCAML_SITELIB}/markup/markup__Encoding.cmt 66${OCAML_SITELIB}/markup/markup__Encoding.cmt
65${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Encoding.cmx 67${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Encoding.cmx
66${OCAML_SITELIB}/markup/markup__Entities.cmi 68${OCAML_SITELIB}/markup/markup__Entities.cmi
67${OCAML_SITELIB}/markup/markup__Entities.cmt 69${OCAML_SITELIB}/markup/markup__Entities.cmt
68${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Entities.cmx 70${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Entities.cmx
@@ -120,15 +122,17 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/marku @@ -120,15 +122,17 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/marku
120${OCAML_SITELIB}/markup/namespace.ml 122${OCAML_SITELIB}/markup/namespace.ml
121${OCAML_SITELIB}/markup/namespace.mli 123${OCAML_SITELIB}/markup/namespace.mli
122${OCAML_SITELIB}/markup/opam 124${OCAML_SITELIB}/markup/opam
123${OCAML_SITELIB}/markup/stream_io.ml 125${OCAML_SITELIB}/markup/stream_io.ml
124${OCAML_SITELIB}/markup/text.ml 126${OCAML_SITELIB}/markup/text.ml
125${OCAML_SITELIB}/markup/trie.ml 127${OCAML_SITELIB}/markup/trie.ml
126${OCAML_SITELIB}/markup/utility.ml 128${OCAML_SITELIB}/markup/utility.ml
127${OCAML_SITELIB}/markup/xml_parser.ml 129${OCAML_SITELIB}/markup/xml_parser.ml
128${OCAML_SITELIB}/markup/xml_parser.mli 130${OCAML_SITELIB}/markup/xml_parser.mli
129${OCAML_SITELIB}/markup/xml_tokenizer.ml 131${OCAML_SITELIB}/markup/xml_tokenizer.ml
130${OCAML_SITELIB}/markup/xml_tokenizer.mli 132${OCAML_SITELIB}/markup/xml_tokenizer.mli
131${OCAML_SITELIB}/markup/xml_writer.ml 133${OCAML_SITELIB}/markup/xml_writer.ml
132${OCAML_SITELIB}/markup/xml_writer.mli 134${OCAML_SITELIB}/markup/xml_writer.mli
 135share/doc/markup-lwt/LICENSE.md
 136share/doc/markup-lwt/README.md
133share/doc/markup/LICENSE.md 137share/doc/markup/LICENSE.md
134share/doc/markup/README.md 138share/doc/markup/README.md
cvs diff -r1.5 -r1.6 pkgsrc/textproc/ocaml-markup/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/textproc/ocaml-markup/buildlink3.mk 2018/07/19 15:15:29 1.5
+++ pkgsrc/textproc/ocaml-markup/buildlink3.mk 2018/11/27 17:20:09 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.5 2018/07/19 15:15:29 jaapb Exp $ 1# $NetBSD: buildlink3.mk,v 1.6 2018/11/27 17:20:09 jaapb Exp $
2 2
3BUILDLINK_TREE+= ocaml-markup 3BUILDLINK_TREE+= ocaml-markup
4 4
5.if !defined(OCAML_MARKUP_BUILDLINK3_MK) 5.if !defined(OCAML_MARKUP_BUILDLINK3_MK)
6OCAML_MARKUP_BUILDLINK3_MK:= 6OCAML_MARKUP_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.ocaml-markup+= ocaml-markup>=0.7.2 8BUILDLINK_API_DEPENDS.ocaml-markup+= ocaml-markup>=0.7.2
9BUILDLINK_ABI_DEPENDS.ocaml-markup+= ocaml-markup>=0.7.6nb1 9BUILDLINK_ABI_DEPENDS.ocaml-markup+= ocaml-markup>=0.8.0
10BUILDLINK_PKGSRCDIR.ocaml-markup?= ../../textproc/ocaml-markup 10BUILDLINK_PKGSRCDIR.ocaml-markup?= ../../textproc/ocaml-markup
11 11
12.endif # OCAML_MARKUP_BUILDLINK3_MK 12.endif # OCAML_MARKUP_BUILDLINK3_MK
13 13
14BUILDLINK_TREE+= -ocaml-markup 14BUILDLINK_TREE+= -ocaml-markup
cvs diff -r1.4 -r1.5 pkgsrc/textproc/ocaml-markup/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/ocaml-markup/distinfo 2018/04/13 12:44:51 1.4
+++ pkgsrc/textproc/ocaml-markup/distinfo 2018/11/27 17:20:09 1.5
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.4 2018/04/13 12:44:51 jaapb Exp $ 1$NetBSD: distinfo,v 1.5 2018/11/27 17:20:09 jaapb Exp $
2 2
3SHA1 (markup-0.7.6.tar.gz) = ea5c5146723d642a3094cbb7c7cf612d6f1a5c5e 3SHA1 (markup-0.8.0.tar.gz) = 74cc130b8959693592aa181d1164400c9eccde2f
4RMD160 (markup-0.7.6.tar.gz) = b865e82717a8ec96d60de2c0b9c601ce9443bafd 4RMD160 (markup-0.8.0.tar.gz) = 242c0eb71b9923241930f9a8e476980c2db930c9
5SHA512 (markup-0.7.6.tar.gz) = dcb06d0d271677842f76f3eabd64ac4aefbd8c8194c0ca8732d32120b4f1026378f989c2979706f752d3df45f878194283bd2754023033b61063878de4deb319 5SHA512 (markup-0.8.0.tar.gz) = f28b7f5cf9d1e4a86e240c7b9f5d62ccd0444142af3ba2ef1fb8906ea233ff9408d91aea4c66ba4c9a8163135efe87c59b9f9c23068710d6b2d54d38515b505a
6Size (markup-0.7.6.tar.gz) = 279370 bytes 6Size (markup-0.8.0.tar.gz) = 280344 bytes
File Added: pkgsrc/textproc/ocaml-markup/options.mk
# $NetBSD: options.mk,v 1.1 2018/11/27 17:20:09 jaapb Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.ocaml-markup
PKG_SUPPORTED_OPTIONS=	lwt
PKG_SUGGESTED_OPTIONS=	# empty
PLIST_VARS+=	lwt

.include "../../mk/bsd.prefs.mk"

.include "../../mk/bsd.options.mk"

###
### Camlp4 support
###
.if !empty(PKG_OPTIONS:Mlwt)
.include "../../devel/ocaml-lwt/buildlink3.mk"
PLIST.lwt=	yes
DUNE_BUILD_PACKAGES+=	markup-lwt
OPAM_INSTALL_FILES+=	markup-lwt
.else
.endif