[pkgsrc/trunk]: pkgsrc/textproc/ocaml-markup Updated textproc/ocaml-markup to...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/textproc/ocaml-markup Updated textproc/ocaml-markup to...
From: jaapb <jaapb%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 09:07:42 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/2dc03d795b81
branches:  trunk
changeset: 378676:2dc03d795b81
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Fri Apr 13 12:44:51 2018 +0000

description:
Updated textproc/ocaml-markup to version 0.7.6.

Includes moving the build system to jbuilder and minor improvements.

diffstat:

 textproc/ocaml-markup/Makefile             |   18 +-
 textproc/ocaml-markup/PLIST                |  160 ++++++++++++++++++++++------
 textproc/ocaml-markup/buildlink3.mk        |    4 +-
 textproc/ocaml-markup/distinfo             |   11 +-
 textproc/ocaml-markup/patches/patch-__tags |   14 --
 5 files changed, 140 insertions(+), 67 deletions(-)

diffs (261 lines):

diff -r dff2a69ef1aa -r 2dc03d795b81 textproc/ocaml-markup/Makefile
--- a/textproc/ocaml-markup/Makefile    Fri Apr 13 12:40:28 2018 +0000
+++ b/textproc/ocaml-markup/Makefile    Fri Apr 13 12:44:51 2018 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2018/01/10 16:53:13 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2018/04/13 12:44:51 jaapb Exp $
 
-VERSION=       0.7.5
 GITHUB_PROJECT=        markup.ml
-DISTNAME=      markup-${VERSION}
-PKGNAME=       ${GITHUB_PROJECT}-${DISTNAME}
-PKGREVISION=   2
+GITHUB_TAG=    ${PKGVERSION_NOREV}
+DISTNAME=      markup-0.7.6
 PKGNAME=       ocaml-${DISTNAME}
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=aantron/}
@@ -14,13 +12,13 @@
 COMMENT=       Error-recovering streaming HTML5 and XML parsers for OCaml
 LICENSE=       2-clause-bsd
 
-WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${VERSION}
+HAS_CONFIGURE= yes
 USE_LANGUAGES= # none
-USE_TOOLS+=    gmake
-OCAML_USE_FINDLIB=     yes
+
+OCAML_USE_JBUILDER=    yes
 
-BUILD_TARGET=  build
-INSTALL_TARGET=        ocamlfind-install
+do-configure:
+       ${RUN} cd ${WRKSRC} && ocaml src/configure.ml
 
 .include "../../devel/ocaml-lwt/buildlink3.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"
diff -r dff2a69ef1aa -r 2dc03d795b81 textproc/ocaml-markup/PLIST
--- a/textproc/ocaml-markup/PLIST       Fri Apr 13 12:40:28 2018 +0000
+++ b/textproc/ocaml-markup/PLIST       Fri Apr 13 12:44:51 2018 +0000
@@ -1,5 +1,43 @@
-@comment $NetBSD: PLIST,v 1.2 2017/07/11 11:11:00 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/04/13 12:44:51 jaapb Exp $
 ${OCAML_SITELIB}/markup/META
+${OCAML_SITELIB}/markup/common.ml
+${OCAML_SITELIB}/markup/detect.ml
+${OCAML_SITELIB}/markup/detect.mli
+${OCAML_SITELIB}/markup/encoding.ml
+${OCAML_SITELIB}/markup/entities.ml
+${OCAML_SITELIB}/markup/error.ml
+${OCAML_SITELIB}/markup/html_parser.ml
+${OCAML_SITELIB}/markup/html_parser.mli
+${OCAML_SITELIB}/markup/html_tokenizer.ml
+${OCAML_SITELIB}/markup/html_tokenizer.mli
+${OCAML_SITELIB}/markup/html_writer.ml
+${OCAML_SITELIB}/markup/html_writer.mli
+${OCAML_SITELIB}/markup/input.ml
+${OCAML_SITELIB}/markup/input.mli
+${OCAML_SITELIB}/markup/kstream.ml
+${OCAML_SITELIB}/markup/kstream.mli
+${OCAML_SITELIB}/markup/lwt/markup.lwt.dune
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/markup_lwt.a
+${OCAML_SITELIB}/markup/lwt/markup_lwt.cma
+${OCAML_SITELIB}/markup/lwt/markup_lwt.cmi
+${OCAML_SITELIB}/markup/lwt/markup_lwt.cmt
+${OCAML_SITELIB}/markup/lwt/markup_lwt.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/markup_lwt.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/markup_lwt.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/markup_lwt.cmxs
+${OCAML_SITELIB}/markup/lwt/markup_lwt.ml
+${OCAML_SITELIB}/markup/lwt/markup_lwt.mli
+${OCAML_SITELIB}/markup/lwt/unix/markup.lwt.unix.dune
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.a
+${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cma
+${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmi
+${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmt
+${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmxs
+${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.ml
+${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup.a
 ${OCAML_SITELIB}/markup/markup.cma
 ${OCAML_SITELIB}/markup/markup.cmi
@@ -7,38 +45,90 @@
 ${OCAML_SITELIB}/markup/markup.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup.cmxs
+${OCAML_SITELIB}/markup/markup.dune
+${OCAML_SITELIB}/markup/markup.ml
 ${OCAML_SITELIB}/markup/markup.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__xml_parser.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_common.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_detect.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_encoding.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_entities.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_error.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_html_parser.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_html_tokenizer.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_html_writer.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_input.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_kstream.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_lwt.a
-${OCAML_SITELIB}/markup/markup_lwt.cma
-${OCAML_SITELIB}/markup/markup_lwt.cmi
-${OCAML_SITELIB}/markup/markup_lwt.cmt
-${OCAML_SITELIB}/markup/markup_lwt.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_lwt.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_lwt.cmxa
-${OCAML_SITELIB}/markup/markup_lwt.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_lwt_unix.a
-${OCAML_SITELIB}/markup/markup_lwt_unix.cma
-${OCAML_SITELIB}/markup/markup_lwt_unix.cmi
-${OCAML_SITELIB}/markup/markup_lwt_unix.cmt
-${OCAML_SITELIB}/markup/markup_lwt_unix.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_lwt_unix.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_lwt_unix.cmxa
-${OCAML_SITELIB}/markup/markup_lwt_unix.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_namespace.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_stream_io.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_text.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_trie.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_utility.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_xml_tokenizer.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup_xml_writer.cmx
+${OCAML_SITELIB}/markup/markup__.cmi
+${OCAML_SITELIB}/markup/markup__.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__.cmx
+${OCAML_SITELIB}/markup/markup__.ml-gen
+${OCAML_SITELIB}/markup/markup__Common.cmi
+${OCAML_SITELIB}/markup/markup__Common.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Common.cmx
+${OCAML_SITELIB}/markup/markup__Detect.cmi
+${OCAML_SITELIB}/markup/markup__Detect.cmt
+${OCAML_SITELIB}/markup/markup__Detect.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Detect.cmx
+${OCAML_SITELIB}/markup/markup__Encoding.cmi
+${OCAML_SITELIB}/markup/markup__Encoding.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Encoding.cmx
+${OCAML_SITELIB}/markup/markup__Entities.cmi
+${OCAML_SITELIB}/markup/markup__Entities.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Entities.cmx
+${OCAML_SITELIB}/markup/markup__Error.cmi
+${OCAML_SITELIB}/markup/markup__Error.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Error.cmx
+${OCAML_SITELIB}/markup/markup__Html_parser.cmi
+${OCAML_SITELIB}/markup/markup__Html_parser.cmt
+${OCAML_SITELIB}/markup/markup__Html_parser.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Html_parser.cmx
+${OCAML_SITELIB}/markup/markup__Html_tokenizer.cmi
+${OCAML_SITELIB}/markup/markup__Html_tokenizer.cmt
+${OCAML_SITELIB}/markup/markup__Html_tokenizer.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Html_tokenizer.cmx
+${OCAML_SITELIB}/markup/markup__Html_writer.cmi
+${OCAML_SITELIB}/markup/markup__Html_writer.cmt
+${OCAML_SITELIB}/markup/markup__Html_writer.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Html_writer.cmx
+${OCAML_SITELIB}/markup/markup__Input.cmi
+${OCAML_SITELIB}/markup/markup__Input.cmt
+${OCAML_SITELIB}/markup/markup__Input.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Input.cmx
+${OCAML_SITELIB}/markup/markup__Kstream.cmi
+${OCAML_SITELIB}/markup/markup__Kstream.cmt
+${OCAML_SITELIB}/markup/markup__Kstream.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Kstream.cmx
+${OCAML_SITELIB}/markup/markup__Namespace.cmi
+${OCAML_SITELIB}/markup/markup__Namespace.cmt
+${OCAML_SITELIB}/markup/markup__Namespace.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Namespace.cmx
+${OCAML_SITELIB}/markup/markup__Stream_io.cmi
+${OCAML_SITELIB}/markup/markup__Stream_io.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Stream_io.cmx
+${OCAML_SITELIB}/markup/markup__Text.cmi
+${OCAML_SITELIB}/markup/markup__Text.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Text.cmx
+${OCAML_SITELIB}/markup/markup__Trie.cmi
+${OCAML_SITELIB}/markup/markup__Trie.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Trie.cmx
+${OCAML_SITELIB}/markup/markup__Utility.cmi
+${OCAML_SITELIB}/markup/markup__Utility.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Utility.cmx
+${OCAML_SITELIB}/markup/markup__Xml_parser.cmi
+${OCAML_SITELIB}/markup/markup__Xml_parser.cmt
+${OCAML_SITELIB}/markup/markup__Xml_parser.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Xml_parser.cmx
+${OCAML_SITELIB}/markup/markup__Xml_tokenizer.cmi
+${OCAML_SITELIB}/markup/markup__Xml_tokenizer.cmt
+${OCAML_SITELIB}/markup/markup__Xml_tokenizer.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Xml_tokenizer.cmx
+${OCAML_SITELIB}/markup/markup__Xml_writer.cmi
+${OCAML_SITELIB}/markup/markup__Xml_writer.cmt
+${OCAML_SITELIB}/markup/markup__Xml_writer.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Xml_writer.cmx
+${OCAML_SITELIB}/markup/namespace.ml
+${OCAML_SITELIB}/markup/namespace.mli
+${OCAML_SITELIB}/markup/opam
+${OCAML_SITELIB}/markup/stream_io.ml
+${OCAML_SITELIB}/markup/text.ml
+${OCAML_SITELIB}/markup/trie.ml
+${OCAML_SITELIB}/markup/utility.ml
+${OCAML_SITELIB}/markup/xml_parser.ml
+${OCAML_SITELIB}/markup/xml_parser.mli
+${OCAML_SITELIB}/markup/xml_tokenizer.ml
+${OCAML_SITELIB}/markup/xml_tokenizer.mli
+${OCAML_SITELIB}/markup/xml_writer.ml
+${OCAML_SITELIB}/markup/xml_writer.mli
+share/doc/markup/LICENSE.md
+share/doc/markup/README.md
diff -r dff2a69ef1aa -r 2dc03d795b81 textproc/ocaml-markup/buildlink3.mk
--- a/textproc/ocaml-markup/buildlink3.mk       Fri Apr 13 12:40:28 2018 +0000
+++ b/textproc/ocaml-markup/buildlink3.mk       Fri Apr 13 12:44:51 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2018/01/22 12:00:02 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/04/13 12:44:51 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-markup
 
@@ -6,7 +6,7 @@
 OCAML_MARKUP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-markup+=   ocaml-markup>=0.7.2
-BUILDLINK_ABI_DEPENDS.ocaml-markup+=   ocaml-markup>=0.7.5nb2
+BUILDLINK_ABI_DEPENDS.ocaml-markup+=   ocaml-markup>=0.7.6
 BUILDLINK_PKGSRCDIR.ocaml-markup?=     ../../textproc/ocaml-markup
 
 .endif # OCAML_MARKUP_BUILDLINK3_MK
diff -r dff2a69ef1aa -r 2dc03d795b81 textproc/ocaml-markup/distinfo
--- a/textproc/ocaml-markup/distinfo    Fri Apr 13 12:40:28 2018 +0000
+++ b/textproc/ocaml-markup/distinfo    Fri Apr 13 12:44:51 2018 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2018/01/22 12:00:02 jaapb Exp $
+$NetBSD: distinfo,v 1.4 2018/04/13 12:44:51 jaapb Exp $
 
-SHA1 (markup-0.7.5.tar.gz) = 571cdc5c40381d5425f19e5ac94af89235dd7548
-RMD160 (markup-0.7.5.tar.gz) = 8dd45547fa219eb730af22100dbc0da414ed331b
-SHA512 (markup-0.7.5.tar.gz) = 19350df7a3a619c479fa030b8772009bc32f3e9830494f5707e05f85b9ee9ff0ddf382d292c7a11bbd3b63c8c108e6a84b2d01f5e983f49d7cdf63ee3c4545c8
-Size (markup-0.7.5.tar.gz) = 278654 bytes
-SHA1 (patch-__tags) = 8fd95c32d2808d991041b5d9a28022e4df9f36d0
+SHA1 (markup-0.7.6.tar.gz) = ea5c5146723d642a3094cbb7c7cf612d6f1a5c5e
+RMD160 (markup-0.7.6.tar.gz) = b865e82717a8ec96d60de2c0b9c601ce9443bafd
+SHA512 (markup-0.7.6.tar.gz) = dcb06d0d271677842f76f3eabd64ac4aefbd8c8194c0ca8732d32120b4f1026378f989c2979706f752d3df45f878194283bd2754023033b61063878de4deb319
+Size (markup-0.7.6.tar.gz) = 279370 bytes
diff -r dff2a69ef1aa -r 2dc03d795b81 textproc/ocaml-markup/patches/patch-__tags
--- a/textproc/ocaml-markup/patches/patch-__tags        Fri Apr 13 12:40:28 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-__tags,v 1.1 2018/01/22 12:00:02 jaapb Exp $
-
-Lwt needs threaded compilation now
---- _tags.orig 2017-06-14 00:18:16.000000000 +0000
-+++ _tags
-@@ -3,7 +3,7 @@
- 
- <src/*> or <test/**>: package(uutf)
- <src/markup_lwt*>: package(lwt)
--<src/markup_lwt_unix*>: package(lwt.unix)
-+<src/markup_lwt_unix*>: package(lwt.unix), thread
- 
- <src/translate_entities.*>: package(yojson)
-
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated textproc/ocaml-markup to 0.7.6
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/ocaml-biniou Revbump for devel/ocaml-biniou.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated textproc/ocaml-markup to 0.7.6
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/ocaml-biniou Revbump for devel/ocaml-biniou.
Indexes:
Home | Main Index | Thread Index | Old Index