Updated package to latest version, 4.0.0. Changes include:

====== Features ======
* A new PPX has been added that allows to use tyxml with the HTML/SVG syntax, using the markup library (contribution by Anton 'aantron' Bachin).
* New Format-based printers are available, both as functors and has `pp` functions in the various implementations. Old printers are deprecated.
* Toplevel printers are now available for the `tyxml` library.
* The `str` library has been replaced by `re`.
* Various attributes arguments have been simplified. In particular:
  * Constants arguments have been removed
  * `` `On|`Off `` arguments are now replaced by booleans.
  * Some arguments now use an option type.

* XML comments are now properly serialized (without escaping but with sanitization).

====== Elements and attributes ======
* Add srcset and sizes attributes (contribution by Stéphane 'slegrand45' Legrand).
* The arguments of the `sandbox` attributes are now more consistent (contributino by Anton 'aantron' Bachin).
* Various SVG attributes and elements are now properly named (contributino by Anton 'aantron' Bachin).
* Add inputmode attribute.

====== Documentation ======
* Both the API documentation and the manual have been completely rewritten! Do not hesitate to read them and provide feedback.
* Various examples have been added in the `example/` directory. (basic_website contributed by Edgar 'fxfactorial' Aroutiounian).

====== Renaming and deprecations ======
* Files in the `tyxml` library are now packed in a `Tyxml` module.
  If you were using one of `Html5`, `Svg` and `Xml` module, simply open `Tyxml`.
* All Html5 modules are now named Html
* Various attributes and elements have been renamed. The original versions have been kept and marked deprecated.
* Various elements that were both deprecated in the HTML specification and not usable due to typing constraints have been removed.

4 files changed, 86 insertions, 71 deletions

diff --git a/textproc/ocaml-tyxml/Makefile b/textproc/ocaml-tyxml/Makefile
index 3486565e7b1..a1331ccfcd2 100644
--- a/textproc/ocaml-tyxml/Makefile
+++ b/textproc/ocaml-tyxml/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.12 2016/05/05 11:45:42 jaapb Exp $
+# $NetBSD: Makefile,v 1.13 2016/06/20 11:10:40 jaapb Exp $
 #
 
-DISTNAME=	tyxml-${VERSION}
+VERSION=	4.0.0
+GITHUB_PROJECT=	tyxml
+DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
-VERSION=	3.6.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
-GITHUB_PROJECT=	tyxml
 
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://ocsigen.org/tyxml/
@@ -16,16 +15,16 @@ LICENSE=	gnu-lgpl-v2.1 # with openssl exemption
 
 CONFLICTS+=	ocsigen<2.0
 
-WRKSRC=	${WRKDIR}/tyxml-${VERSION}
 MAKE_ENV+=	INSTALLDIR="${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}"
 
 USE_TOOLS=	gmake
-OCAML_USE_FINDLIB=	yes
 OCAML_USE_OASIS=	yes
 
-
 .include "../../mk/ocaml.mk"
+.include "../../devel/ocaml-ppx_tools/buildlink3.mk"
+.include "../../devel/ocaml-re/buildlink3.mk"
 .include "../../lang/camlp4/buildlink3.mk"
+.include "../../textproc/ocaml-markup/buildlink3.mk"
 .include "../../textproc/ocaml-uutf/buildlink3.mk"
 #.include "../../net/ocamlnet/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ocaml-tyxml/PLIST b/textproc/ocaml-tyxml/PLIST
index 6514dc6e704..86e275f2714 100644
--- a/textproc/ocaml-tyxml/PLIST
+++ b/textproc/ocaml-tyxml/PLIST
@@ -1,47 +1,41 @@
-@comment $NetBSD: PLIST,v 1.3 2016/02/06 12:51:34 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/06/20 11:10:40 jaapb Exp $
+bin/ppx_tyxml
 ${OCAML_SITELIB}/tyxml/META
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/basic_types.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/camllexer.cmx
-${OCAML_SITELIB}/tyxml/html5.annot
-${OCAML_SITELIB}/tyxml/html5.cmi
-${OCAML_SITELIB}/tyxml/html5.cmt
-${OCAML_SITELIB}/tyxml/html5.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/html5.cmx
-${OCAML_SITELIB}/tyxml/html5.mli
-${OCAML_SITELIB}/tyxml/html5_f.annot
-${OCAML_SITELIB}/tyxml/html5_f.cmi
-${OCAML_SITELIB}/tyxml/html5_f.cmt
-${OCAML_SITELIB}/tyxml/html5_f.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/html5_f.cmx
-${OCAML_SITELIB}/tyxml/html5_f.mli
-${OCAML_SITELIB}/tyxml/html5_sigs.cmi
-${OCAML_SITELIB}/tyxml/html5_sigs.cmti
-${OCAML_SITELIB}/tyxml/html5_sigs.mli
-${OCAML_SITELIB}/tyxml/html5_types.cmi
-${OCAML_SITELIB}/tyxml/html5_types.cmti
-${OCAML_SITELIB}/tyxml/html5_types.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/pa_tyxml.a
-${OCAML_SITELIB}/tyxml/pa_tyxml.cma
-${OCAML_SITELIB}/tyxml/pa_tyxml.annot
-${OCAML_SITELIB}/tyxml/pa_tyxml.cmi
-${OCAML_SITELIB}/tyxml/pa_tyxml.cmt
-${OCAML_SITELIB}/tyxml/pa_tyxml.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/pa_tyxml.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/pa_tyxml.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/pa_tyxml.cmxs
-${OCAML_SITELIB}/tyxml/pa_tyxml.mli
-${OCAML_SITELIB}/tyxml/simplexmlparser.annot
-${OCAML_SITELIB}/tyxml/simplexmlparser.cmi
-${OCAML_SITELIB}/tyxml/simplexmlparser.cmt
-${OCAML_SITELIB}/tyxml/simplexmlparser.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/simplexmlparser.cmx
-${OCAML_SITELIB}/tyxml/simplexmlparser.mli
-${OCAML_SITELIB}/tyxml/svg.annot
-${OCAML_SITELIB}/tyxml/svg.cmi
-${OCAML_SITELIB}/tyxml/svg.cmt
-${OCAML_SITELIB}/tyxml/svg.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/svg.cmx
-${OCAML_SITELIB}/tyxml/svg.mli
+${OCAML_SITELIB}/tyxml/html_f.annot
+${OCAML_SITELIB}/tyxml/html_f.cmi
+${OCAML_SITELIB}/tyxml/html_f.cmt
+${OCAML_SITELIB}/tyxml/html_f.cmti
+${OCAML_SITELIB}/tyxml/html_f.cmx
+${OCAML_SITELIB}/tyxml/html_f.mli
+${OCAML_SITELIB}/tyxml/html_sigs.cmi
+${OCAML_SITELIB}/tyxml/html_sigs.cmti
+${OCAML_SITELIB}/tyxml/html_sigs.mli
+${OCAML_SITELIB}/tyxml/html_sigs_reflected.cmx
+${OCAML_SITELIB}/tyxml/html_types.cmi
+${OCAML_SITELIB}/tyxml/html_types.cmti
+${OCAML_SITELIB}/tyxml/html_types.mli
+${OCAML_SITELIB}/tyxml/html_types_reflected.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx.a
+${OCAML_SITELIB}/tyxml/ppx.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_attribute_value.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_attributes.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_common.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_element.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_element_content.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_internal.a
+${OCAML_SITELIB}/tyxml/ppx_internal.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_internal.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_internal.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_namespace.cmx
+${OCAML_SITELIB}/tyxml/ppx_tyxml.annot
+${OCAML_SITELIB}/tyxml/ppx_tyxml.cmi
+${OCAML_SITELIB}/tyxml/ppx_tyxml.cmt
+${OCAML_SITELIB}/tyxml/ppx_tyxml.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_tyxml.cmx
+${OCAML_SITELIB}/tyxml/ppx_tyxml.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_tyxml_empty.cmx
 ${OCAML_SITELIB}/tyxml/svg_f.annot
 ${OCAML_SITELIB}/tyxml/svg_f.cmi
 ${OCAML_SITELIB}/tyxml/svg_f.cmt
@@ -51,38 +45,61 @@ ${OCAML_SITELIB}/tyxml/svg_f.mli
 ${OCAML_SITELIB}/tyxml/svg_sigs.cmi
 ${OCAML_SITELIB}/tyxml/svg_sigs.cmti
 ${OCAML_SITELIB}/tyxml/svg_sigs.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/svg_sigs_reflected.cmx
 ${OCAML_SITELIB}/tyxml/svg_types.cmi
 ${OCAML_SITELIB}/tyxml/svg_types.cmti
 ${OCAML_SITELIB}/tyxml/svg_types.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tymlx_p.a
-${OCAML_SITELIB}/tyxml/tymlx_p.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tymlx_p.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tymlx_p.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/svg_types_reflected.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml.a
+${OCAML_SITELIB}/tyxml/tyxml.annot
 ${OCAML_SITELIB}/tyxml/tyxml.cma
+${OCAML_SITELIB}/tyxml/tyxml.cmi
+${OCAML_SITELIB}/tyxml/tyxml.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml.cmxs
+${OCAML_SITELIB}/tyxml/tyxml.ml
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_f.a
 ${OCAML_SITELIB}/tyxml/tyxml_f.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_f.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_f.cmxs
+${OCAML_SITELIB}/tyxml/tyxml_html.annot
+${OCAML_SITELIB}/tyxml/tyxml_html.cmi
+${OCAML_SITELIB}/tyxml/tyxml_html.cmt
+${OCAML_SITELIB}/tyxml/tyxml_html.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_html.cmx
+${OCAML_SITELIB}/tyxml/tyxml_html.mli
 ${OCAML_SITELIB}/tyxml/tyxml_name.annot
 ${OCAML_SITELIB}/tyxml/tyxml_name.cmi
 ${OCAML_SITELIB}/tyxml/tyxml_name.cmt
 ${OCAML_SITELIB}/tyxml/tyxml_name.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_name.cmx
 ${OCAML_SITELIB}/tyxml/tyxml_name.mli
+${OCAML_SITELIB}/tyxml/tyxml_svg.annot
+${OCAML_SITELIB}/tyxml/tyxml_svg.cmi
+${OCAML_SITELIB}/tyxml/tyxml_svg.cmt
+${OCAML_SITELIB}/tyxml/tyxml_svg.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_svg.cmx
+${OCAML_SITELIB}/tyxml/tyxml_svg.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_tools.a
 ${OCAML_SITELIB}/tyxml/tyxml_tools.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_tools.cmxa
+${OCAML_SITELIB}/tyxml/tyxml_tools.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_tools.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/xhtmlparser.cmx
-${OCAML_SITELIB}/tyxml/xml.annot
-${OCAML_SITELIB}/tyxml/xml.cmi
-${OCAML_SITELIB}/tyxml/xml.cmt
-${OCAML_SITELIB}/tyxml/xml.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/xml.cmx
-${OCAML_SITELIB}/tyxml/xml.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_top.a
+${OCAML_SITELIB}/tyxml/tyxml_top.annot
+${OCAML_SITELIB}/tyxml/tyxml_top.cma
+${OCAML_SITELIB}/tyxml/tyxml_top.cmi
+${OCAML_SITELIB}/tyxml/tyxml_top.cmt
+${OCAML_SITELIB}/tyxml/tyxml_top.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_top.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_top.cmxs
+${OCAML_SITELIB}/tyxml/tyxml_top.ml
+${OCAML_SITELIB}/tyxml/tyxml_xml.annot
+${OCAML_SITELIB}/tyxml/tyxml_xml.cmi
+${OCAML_SITELIB}/tyxml/tyxml_xml.cmt
+${OCAML_SITELIB}/tyxml/tyxml_xml.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_xml.cmx
+${OCAML_SITELIB}/tyxml/tyxml_xml.mli
 ${OCAML_SITELIB}/tyxml/xml_iter.annot
 ${OCAML_SITELIB}/tyxml/xml_iter.cmi
 ${OCAML_SITELIB}/tyxml/xml_iter.cmt
@@ -104,4 +121,3 @@ ${OCAML_SITELIB}/tyxml/xml_wrap.cmt
 ${OCAML_SITELIB}/tyxml/xml_wrap.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/xml_wrap.cmx
 ${OCAML_SITELIB}/tyxml/xml_wrap.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/xmllexer.cmx
diff --git a/textproc/ocaml-tyxml/buildlink3.mk b/textproc/ocaml-tyxml/buildlink3.mk
index 6505e77e407..ac71cf89072 100644
--- a/textproc/ocaml-tyxml/buildlink3.mk
+++ b/textproc/ocaml-tyxml/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/01/20 16:03:24 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2016/06/20 11:10:40 jaapb Exp $
 
 BUILDLINK_TREE+=        ocaml-tyxml
 
 .if !defined(OCAML_TYXML_BUILDLINK3_MK)
 OCAML_TYXML_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-tyxml+=     ocaml-tyxml>=3.3.0nb1
+BUILDLINK_API_DEPENDS.ocaml-tyxml+=     ocaml-tyxml>=4.0.0
 BUILDLINK_PKGSRCDIR.ocaml-tyxml?=       ../../textproc/ocaml-tyxml
 
 .endif  # OCAML_TYXML_BUILDLINK3_MK
diff --git a/textproc/ocaml-tyxml/distinfo b/textproc/ocaml-tyxml/distinfo
index c8cae335cb4..ee0175e78af 100644
--- a/textproc/ocaml-tyxml/distinfo
+++ b/textproc/ocaml-tyxml/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2016/02/06 12:51:34 jaapb Exp $
+$NetBSD: distinfo,v 1.7 2016/06/20 11:10:40 jaapb Exp $
 
-SHA1 (tyxml-3.6.0.tar.gz) = 984a3231c45b44a5ec16f45a35422b0cb2e0c55c
-RMD160 (tyxml-3.6.0.tar.gz) = 08d45c53964be373eea96371f39dd5451d9d0379
-SHA512 (tyxml-3.6.0.tar.gz) = f750f80dce92d42172dd9601ec5201c34e1de6587270d00bc86673b2b220b0baed3d91586d4334d98a453cf388b2fa8d1abb763971365ffbf93992c7fde1d127
-Size (tyxml-3.6.0.tar.gz) = 129924 bytes
+SHA1 (tyxml-4.0.0.tar.gz) = 094b7f60874747cdb80001dd807fc0a5a4787c7c
+RMD160 (tyxml-4.0.0.tar.gz) = 8f67b1c06bc549f573dce4835b37acb11b5154e0
+SHA512 (tyxml-4.0.0.tar.gz) = 3e0267bef7ee339697c86a211b76983683066102f5e1ed194cf4a0dbcc358971b58b820e092a74cb614b9fd5a1d866bff48b3cd7ca66297cd97ba4fa40d03f05
+Size (tyxml-4.0.0.tar.gz) = 172367 bytes