Syntax extension needs to be installed for dependencies. Revbump.

3 files changed, 35 insertions, 9 deletions

diff --git a/textproc/ocaml-tyxml/Makefile b/textproc/ocaml-tyxml/Makefile
index a1331ccfcd2..77303b80612 100644
--- a/textproc/ocaml-tyxml/Makefile
+++ b/textproc/ocaml-tyxml/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2016/06/20 11:10:40 jaapb Exp $
+# $NetBSD: Makefile,v 1.14 2016/06/20 15:20:03 jaapb Exp $
 #
 
 VERSION=	4.0.0
 GITHUB_PROJECT=	tyxml
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 PKGNAME=	ocaml-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
 
@@ -16,6 +17,7 @@ LICENSE=	gnu-lgpl-v2.1 # with openssl exemption
 CONFLICTS+=	ocsigen<2.0
 
 MAKE_ENV+=	INSTALLDIR="${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}"
+CONFIGURE_ARGS+=	"--enable-syntax"
 
 USE_TOOLS=	gmake
 OCAML_USE_OASIS=	yes
diff --git a/textproc/ocaml-tyxml/PLIST b/textproc/ocaml-tyxml/PLIST
index 86e275f2714..22ee67a34a6 100644
--- a/textproc/ocaml-tyxml/PLIST
+++ b/textproc/ocaml-tyxml/PLIST
@@ -1,20 +1,32 @@
-@comment $NetBSD: PLIST,v 1.4 2016/06/20 11:10:40 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.5 2016/06/20 15:20:03 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/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
+${PLIST.ocaml-opt}${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
+${PLIST.ocaml-opt}${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/html_types_reflected.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/pa_tyxml.a
+${OCAML_SITELIB}/tyxml/pa_tyxml.annot
+${OCAML_SITELIB}/tyxml/pa_tyxml.cma
+${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
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx.a
 ${OCAML_SITELIB}/tyxml/ppx.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx.cmxa
@@ -36,6 +48,12 @@ ${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/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_f.annot
 ${OCAML_SITELIB}/tyxml/svg_f.cmi
 ${OCAML_SITELIB}/tyxml/svg_f.cmt
@@ -50,6 +68,10 @@ ${OCAML_SITELIB}/tyxml/svg_types.cmi
 ${OCAML_SITELIB}/tyxml/svg_types.cmti
 ${OCAML_SITELIB}/tyxml/svg_types.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/svg_types_reflected.cmx
+${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.annot
 ${OCAML_SITELIB}/tyxml/tyxml.cma
@@ -83,14 +105,14 @@ ${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
-${OCAML_SITELIB}/tyxml/tyxml_tools.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_tools.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_tools.cmxs
 ${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.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
@@ -100,6 +122,7 @@ ${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
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/xhtmlparser.cmx
 ${OCAML_SITELIB}/tyxml/xml_iter.annot
 ${OCAML_SITELIB}/tyxml/xml_iter.cmi
 ${OCAML_SITELIB}/tyxml/xml_iter.cmt
@@ -121,3 +144,4 @@ ${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 ac71cf89072..10e89a90f15 100644
--- a/textproc/ocaml-tyxml/buildlink3.mk
+++ b/textproc/ocaml-tyxml/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2016/06/20 11:10:40 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2016/06/20 15:20:03 jaapb Exp $
 
 BUILDLINK_TREE+=        ocaml-tyxml
 
 .if !defined(OCAML_TYXML_BUILDLINK3_MK)
 OCAML_TYXML_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-tyxml+=     ocaml-tyxml>=4.0.0
+BUILDLINK_API_DEPENDS.ocaml-tyxml+=     ocaml-tyxml>=4.0.0nb1
 BUILDLINK_PKGSRCDIR.ocaml-tyxml?=       ../../textproc/ocaml-tyxml
 
 .endif  # OCAML_TYXML_BUILDLINK3_MK