Updated package to newest version, 3.3.0, and added ocaml.mk framework.

Changes, apart from bugfixes,
include:
  * Add `Xml_print.Utf8` to encode html elements to utf8 properly.
  * Add signature functors to ease export of module created with the functorial interface.
    See the manual for more details.
  * Fix variance for Svg.attrib.
  * Fix export of Xml.list_wrap for Html5.M and Svg.M. Should fix syntax extension with those.
  * Remove Xhtml.
  * Remove plus elements.
    For example, table doesn't enforce non-emptyness anymore.
  * Add various types that were not exported (img, dl, figure, rp, rt and ruby types).
  * Expose `string_of_number`, the better stringifier introduced in 3.1.0.
  * Functorial interface breaking changes:
    * Modify the functorized interface to export typed events.
      You can now specify different handlers for keyboard and mouse events.
      There are two new types and functions (keyboard and mous events) in the Xml signature.
    * Add a wrapping type for lists of nodes. See reactiveData and new eliom wrapping.
  * Replace fake booleans (`\`True | \`False`) by actual booleans. Breaking change.
  * Camlp4 is now an optional dependency. The syntax extension is build only when the syntax flag is enabled (true by default).
  * Use a better stringifier for float values (copied from js_of_ocaml).
  * Add attributes `muted`, `crossorigin` and `mediagroup` for `<audio>` and `<video>`.
  * In the functorial interface, allow to wrap xml nodes inside a monad by provi
ding an additionnal wrapping module. Used by reactive nodes in eliom.
  * Use oasis as build systems
  * Adding module Unsafe for inserting missing nodes or attributes
  * In the functorial interface, allow to wrap xml nodes inside a monad by provi
ding an additionnal wrapping module. Used by reactive nodes in eliom.
  * Use oasis as build systems
  * Adding module Unsafe for inserting missing nodes or attributes

5 files changed, 81 insertions, 123 deletions

diff --git a/textproc/ocaml-tyxml/Makefile b/textproc/ocaml-tyxml/Makefile
index 93af9334e14..0e73802f843 100644
--- a/textproc/ocaml-tyxml/Makefile
+++ b/textproc/ocaml-tyxml/Makefile
@@ -1,33 +1,29 @@
-# $NetBSD: Makefile,v 1.6 2014/11/01 04:36:17 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.7 2014/11/15 14:53:03 jaapb Exp $
 #
 
-DISTNAME=	tyxml-2.2.0
-PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	1
+PKGNAME=	ocaml-tyxml-${VERSION}
+DISTNAME=	${VERSION}
+VERSION=	3.3.0
 CATEGORIES=	textproc
-MASTER_SITES=	http://ocsigen.org/download/
+MASTER_SITES=	https://github.com/ocsigen/tyxml/archive/
 
 MAINTAINER=	jaapb@NetBSD.org
-HOMEPAGE=	http://ocsigen.org/download/
+HOMEPAGE=	http://ocsigen.org/tyxml/
 COMMENT=	OCaml XML typing library
 LICENSE=	gnu-lgpl-v2.1 # with openssl exemption
 
-USE_LANGUAGES=	c
-USE_TOOLS=	gmake
-
-DEPENDS+=	ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
 CONFLICTS+=	ocsigen<2.0
 
-MAKE_ENV+=	INSTALLDIR="${DESTDIR}${PREFIX}/lib/ocaml/site-lib"
-INSTALLATION_DIRS=	lib/ocaml/site-lib
+WRKSRC=	${WRKDIR}/tyxml-${VERSION}
+MAKE_ENV+=	INSTALLDIR="${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}"
+
+USE_TOOLS=	gmake
+OCAML_USE_FINDLIB=	yes
+OCAML_USE_OASIS=	yes
 
-PLIST_VARS=	opt
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
-PLIST.opt=	yes
-.endif
 
+.include "../../mk/ocaml.mk"
 .include "../../lang/camlp4/buildlink3.mk"
-.include "../../lang/ocaml/buildlink3.mk"
-.include "../../net/ocamlnet/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 f86ba5d281d..a7be13b9b34 100644
--- a/textproc/ocaml-tyxml/PLIST
+++ b/textproc/ocaml-tyxml/PLIST
@@ -1,57 +1,62 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/06/04 13:13:14 wiz Exp $
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/tyxml
-lib/ocaml/site-lib/tyxml/META
-lib/ocaml/site-lib/tyxml/html5.cmi
-lib/ocaml/site-lib/tyxml/html5.mli
-lib/ocaml/site-lib/tyxml/html5_f.cmi
-lib/ocaml/site-lib/tyxml/html5_f.mli
-lib/ocaml/site-lib/tyxml/html5_sigs.cmi
-lib/ocaml/site-lib/tyxml/html5_sigs.mli
-lib/ocaml/site-lib/tyxml/html5_types.cmi
-lib/ocaml/site-lib/tyxml/html5_types.mli
-lib/ocaml/site-lib/tyxml/pa_tyxml.cmi
-lib/ocaml/site-lib/tyxml/pa_tyxml.cmo
-lib/ocaml/site-lib/tyxml/pa_tyxml.mli
-lib/ocaml/site-lib/tyxml/simplexmlparser.cmi
-lib/ocaml/site-lib/tyxml/simplexmlparser.cmo
-lib/ocaml/site-lib/tyxml/simplexmlparser.mli
-${PLIST.opt}lib/ocaml/site-lib/tyxml/simplexmlparser.cmx
-${PLIST.opt}lib/ocaml/site-lib/tyxml/simplexmlparser.cmxs
-lib/ocaml/site-lib/tyxml/simplexmlparser.o
-lib/ocaml/site-lib/tyxml/svg.cmi
-lib/ocaml/site-lib/tyxml/svg.mli
-lib/ocaml/site-lib/tyxml/svg_f.cmi
-lib/ocaml/site-lib/tyxml/svg_f.mli
-lib/ocaml/site-lib/tyxml/svg_sigs.cmi
-lib/ocaml/site-lib/tyxml/svg_sigs.mli
-lib/ocaml/site-lib/tyxml/svg_types.cmi
-lib/ocaml/site-lib/tyxml/svg_types.mli
-${PLIST.opt}lib/ocaml/site-lib/tyxml/tyxml.a
-lib/ocaml/site-lib/tyxml/tyxml.cma
-${PLIST.opt}lib/ocaml/site-lib/tyxml/tyxml.cmxa
-${PLIST.opt}lib/ocaml/site-lib/tyxml/tyxml.cmxs
-${PLIST.opt}lib/ocaml/site-lib/tyxml/tyxml_f.a
-lib/ocaml/site-lib/tyxml/tyxml_f.cma
-${PLIST.opt}lib/ocaml/site-lib/tyxml/tyxml_f.cmxa
-${PLIST.opt}lib/ocaml/site-lib/tyxml/tyxml_f.cmxs
-lib/ocaml/site-lib/tyxml/xhtml.cmi
-lib/ocaml/site-lib/tyxml/xhtml.mli
-lib/ocaml/site-lib/tyxml/xhtml_f.cmi
-lib/ocaml/site-lib/tyxml/xhtml_f.mli
-lib/ocaml/site-lib/tyxml/xhtml_sigs.cmi
-lib/ocaml/site-lib/tyxml/xhtml_sigs.mli
-lib/ocaml/site-lib/tyxml/xhtml_types.cmi
-lib/ocaml/site-lib/tyxml/xhtml_types.mli
-lib/ocaml/site-lib/tyxml/xml.cmi
-lib/ocaml/site-lib/tyxml/xml.mli
-lib/ocaml/site-lib/tyxml/xml_iter.cmi
-lib/ocaml/site-lib/tyxml/xml_iter.mli
-lib/ocaml/site-lib/tyxml/xml_print.cmi
-lib/ocaml/site-lib/tyxml/xml_print.mli
-lib/ocaml/site-lib/tyxml/xml_sigs.cmi
-lib/ocaml/site-lib/tyxml/xml_sigs.mli
-lib/ocaml/site-lib/tyxml/xmllexer.cmo
-${PLIST.opt}lib/ocaml/site-lib/tyxml/xmllexer.cmx
-${PLIST.opt}lib/ocaml/site-lib/tyxml/xmllexer.cmxs
-lib/ocaml/site-lib/tyxml/xmllexer.o
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/tyxml
+@comment $NetBSD: PLIST,v 1.2 2014/11/15 14:53:03 jaapb Exp $
+${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.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/html5.cmx
+${OCAML_SITELIB}/tyxml/html5.mli
+${OCAML_SITELIB}/tyxml/html5_f.cmi
+${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.mli
+${OCAML_SITELIB}/tyxml/html5_types.cmi
+${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.cmi
+${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.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/simplexmlparser.cmx
+${OCAML_SITELIB}/tyxml/simplexmlparser.mli
+${OCAML_SITELIB}/tyxml/svg.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/svg.cmx
+${OCAML_SITELIB}/tyxml/svg.mli
+${OCAML_SITELIB}/tyxml/svg_f.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/svg_f.cmx
+${OCAML_SITELIB}/tyxml/svg_f.mli
+${OCAML_SITELIB}/tyxml/svg_sigs.cmi
+${OCAML_SITELIB}/tyxml/svg_sigs.mli
+${OCAML_SITELIB}/tyxml/svg_types.cmi
+${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/tyxml.a
+${OCAML_SITELIB}/tyxml/tyxml.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml.cmxs
+${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
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/xhtmlparser.cmx
+${OCAML_SITELIB}/tyxml/xml.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/xml.cmx
+${OCAML_SITELIB}/tyxml/xml.mli
+${OCAML_SITELIB}/tyxml/xml_iter.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/xml_iter.cmx
+${OCAML_SITELIB}/tyxml/xml_iter.mli
+${OCAML_SITELIB}/tyxml/xml_print.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/xml_print.cmx
+${OCAML_SITELIB}/tyxml/xml_print.mli
+${OCAML_SITELIB}/tyxml/xml_sigs.cmi
+${OCAML_SITELIB}/tyxml/xml_sigs.mli
+${OCAML_SITELIB}/tyxml/xml_wrap.cmi
+${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/distinfo b/textproc/ocaml-tyxml/distinfo
index 8d80d3cbf84..9508188c9cd 100644
--- a/textproc/ocaml-tyxml/distinfo
+++ b/textproc/ocaml-tyxml/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.3 2013/06/11 14:52:39 jaapb Exp $
+$NetBSD: distinfo,v 1.4 2014/11/15 14:53:03 jaapb Exp $
 
-SHA1 (tyxml-2.2.0.tar.gz) = b60fa2f0ba7fa1a6c412c432f65ca110b143bbe8
-RMD160 (tyxml-2.2.0.tar.gz) = 8cd613dbf1bbe6f439a5c5001b812288081aa3c8
-Size (tyxml-2.2.0.tar.gz) = 105748 bytes
-SHA1 (patch-Makefile) = 4cb1aeac6a3eda3b0d010dd66472c9119e0cf481
-SHA1 (patch-lib_Makefile) = 8b8b2ca1ebaea07480e82523d3ca56a11439ebf2
+SHA1 (3.3.0.tar.gz) = 66830f036756b31788ac42737d34fb5eb43e2cfe
+RMD160 (3.3.0.tar.gz) = f6ecbbd3fbdd153b1fe625124fd25a03016e40bb
+Size (3.3.0.tar.gz) = 124692 bytes
diff --git a/textproc/ocaml-tyxml/patches/patch-Makefile b/textproc/ocaml-tyxml/patches/patch-Makefile
deleted file mode 100644
index 4c1d8045c00..00000000000
--- a/textproc/ocaml-tyxml/patches/patch-Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-Makefile,v 1.2 2013/06/11 14:52:40 jaapb Exp $
-
---- Makefile.orig	2012-12-07 15:15:22.000000000 +0000
-+++ Makefile
-@@ -52,19 +52,20 @@ files/META.tyxml: files/META.in Makefile
- 	  $< > $@
- 
- install:
-+	mkdir -p ${INSTALLDIR}
- 	$(OCAMLFIND) install ${PACKAGENAME} \
--	  -patch-version ${VERSION} \
-+	  -patch-version ${VERSION} -destdir ${INSTALLDIR} \
- 	  files/META ${INTF} ${IMPL} ${NATIMPL} \
- 	  ${MLI_TO_INSTALL}
- 
- install-byte:
- 	$(OCAMLFIND) install ${PACKAGENAME} \
--	  -patch-version ${VERSION} \
-+	  -patch-version ${VERSION} -destdir ${INSTALLDIR} \
- 	  files/META ${INTF} ${IMPL} ${MLI_TO_INSTALL}
- 
- install-opt:
- 	$(OCAMLFIND) install ${PACKAGENAME} \
--	  -patch-version ${VERSION} \
-+	  -patch-version ${VERSION} -destdir ${INSTALLDIR} \
- 	  files/META ${INTF} ${NATIMPL} ${MLI_TO_INSTALL}
- 
- uninstall:
diff --git a/textproc/ocaml-tyxml/patches/patch-lib_Makefile b/textproc/ocaml-tyxml/patches/patch-lib_Makefile
deleted file mode 100644
index 10efb10e760..00000000000
--- a/textproc/ocaml-tyxml/patches/patch-lib_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-lib_Makefile,v 1.1 2013/06/11 14:52:40 jaapb Exp $
-
---- lib/Makefile.orig	2012-12-07 15:15:22.000000000 +0000
-+++ lib/Makefile
-@@ -13,7 +13,7 @@ DUCE_INTF  := xml_sigs_duce.mli xhtml_ty
- 
- DUCE_FILES := xml_print_duce.ml xhtml_duce.ml
- 
--LIBS     := -package netstring
-+LIBS     := -package netstring,netstring-pcre
- 
- # SYNTAX := -ppopt ../syntax/pa_include.cmo -package camlp4 -syntax camlp4o
-