@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2018/11/12 16:10:27 jaapb Exp $
+# $NetBSD: Makefile,v 1.9 2018/11/27 17:20:09 jaapb Exp $
GITHUB_PROJECT= markup.ml
GITHUB_TAG= ${PKGVERSION_NOREV}
-DISTNAME= markup-0.7.6
+DISTNAME= markup-0.8.0
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GITHUB:=aantron/}
@@ -13,15 +12,17 @@
COMMENT= Error-recovering streaming HTML5 and XML parsers for OCaml
LICENSE= 2-clause-bsd
-HAS_CONFIGURE= yes
+#HAS_CONFIGURE= yes
USE_LANGUAGES= # none
-OCAML_USE_JBUILDER= yes
+OCAML_USE_DUNE= yes
+DUNE_BUILD_PACKAGES= markup
+OPAM_INSTALL_FILES= markup
-do-configure:
- ${RUN} cd ${WRKSRC} && ocaml src/configure.ml
+#do-configure:
+# ${RUN} cd ${WRKSRC} && ocaml src/configure.ml
-.include "../../devel/ocaml-lwt/buildlink3.mk"
+.include "options.mk"
.include "../../devel/ocamlbuild/buildlink3.mk"
.include "../../textproc/ocaml-uutf/buildlink3.mk"
.include "../../mk/ocaml.mk"
@@ -1,4 +1,28 @@
-@comment $NetBSD: PLIST,v 1.3 2018/04/13 12:44:51 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/11/27 17:20:09 jaapb Exp $
+${OCAML_SITELIB}/markup-lwt/META
+${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/opam
+${OCAML_SITELIB}/markup-lwt/unix/markup-lwt.unix.dune
+${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.a
+${PLIST.ocaml-opt}${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
${OCAML_SITELIB}/markup/META
${OCAML_SITELIB}/markup/common.ml
${OCAML_SITELIB}/markup/detect.ml
@@ -16,28 +40,6 @@
${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
@@ -52,7 +54,7 @@
${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__.ml
${OCAML_SITELIB}/markup/markup__Common.cmi
${OCAML_SITELIB}/markup/markup__Common.cmt
${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Common.cmx
@@ -130,5 +132,7 @@
${OCAML_SITELIB}/markup/xml_tokenizer.mli
${OCAML_SITELIB}/markup/xml_writer.ml
${OCAML_SITELIB}/markup/xml_writer.mli
+share/doc/markup-lwt/LICENSE.md
+share/doc/markup-lwt/README.md
share/doc/markup/LICENSE.md
share/doc/markup/README.md
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2018/07/19 15:15:29 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/11/27 17:20:09 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.6nb1
+BUILDLINK_ABI_DEPENDS.ocaml-markup+= ocaml-markup>=0.8.0
BUILDLINK_PKGSRCDIR.ocaml-markup?= ../../textproc/ocaml-markup
.endif # OCAML_MARKUP_BUILDLINK3_MK
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2018/04/13 12:44:51 jaapb Exp $
+$NetBSD: distinfo,v 1.5 2018/11/27 17:20:09 jaapb Exp $
-SHA1 (markup-0.7.6.tar.gz) = ea5c5146723d642a3094cbb7c7cf612d6f1a5c5e
+SHA1 (markup-0.8.0.tar.gz) = 74cc130b8959693592aa181d1164400c9eccde2f
-RMD160 (markup-0.7.6.tar.gz) = b865e82717a8ec96d60de2c0b9c601ce9443bafd
+RMD160 (markup-0.8.0.tar.gz) = 242c0eb71b9923241930f9a8e476980c2db930c9
-SHA512 (markup-0.7.6.tar.gz) = dcb06d0d271677842f76f3eabd64ac4aefbd8c8194c0ca8732d32120b4f1026378f989c2979706f752d3df45f878194283bd2754023033b61063878de4deb319
+SHA512 (markup-0.8.0.tar.gz) = f28b7f5cf9d1e4a86e240c7b9f5d62ccd0444142af3ba2ef1fb8906ea233ff9408d91aea4c66ba4c9a8163135efe87c59b9f9c23068710d6b2d54d38515b505a
-Size (markup-0.7.6.tar.gz) = 279370 bytes
+Size (markup-0.8.0.tar.gz) = 280344 bytes