3 files changed, 158 insertions, 22 deletions

diff --git a/textproc/ocaml-pxp/Makefile b/textproc/ocaml-pxp/Makefile
index bead0141b941..fd5b8aebaeae 100644
--- a/textproc/ocaml-pxp/Makefile
+++ b/textproc/ocaml-pxp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pxp
-PORTVERSION=	1.1.5
+PORTVERSION=	1.1.94.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.ocaml-programming.de/packages/
 PKGNAMEPREFIX=	ocaml-
@@ -23,6 +23,7 @@ BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
 USE_GMAKE=	yes
 
 HAS_CONFIGURE=	yes
+CONFIGURE_ARGS+=-without-wlex-compat
 
 USE_REINPLACE=	yes
 
diff --git a/textproc/ocaml-pxp/distinfo b/textproc/ocaml-pxp/distinfo
index b82a3d5da4ac..d690491ba2aa 100644
--- a/textproc/ocaml-pxp/distinfo
+++ b/textproc/ocaml-pxp/distinfo
@@ -1 +1 @@
-MD5 (pxp-1.1.5.tar.gz) = d462c59148db685309bf9a05f939c184
+MD5 (pxp-1.1.94.2.tar.gz) = 08a9f129448ece4fbaa4bcaf1fdafc04
diff --git a/textproc/ocaml-pxp/pkg-plist b/textproc/ocaml-pxp/pkg-plist
index dc06cca8ec0f..8974e98d4eda 100644
--- a/textproc/ocaml-pxp/pkg-plist
+++ b/textproc/ocaml-pxp/pkg-plist
@@ -3,16 +3,28 @@ lib/ocaml/site-lib/pxp-engine/META
 lib/ocaml/site-lib/pxp-engine/pxp_aux.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_codewriter.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_codewriter.mli
+lib/ocaml/site-lib/pxp-engine/pxp_core_parser.cmi
+lib/ocaml/site-lib/pxp-engine/pxp_core_parser.mli
+lib/ocaml/site-lib/pxp-engine/pxp_core_types.cmi
+lib/ocaml/site-lib/pxp-engine/pxp_core_types.mli
+lib/ocaml/site-lib/pxp-engine/pxp_core_types_type.cmi
+lib/ocaml/site-lib/pxp-engine/pxp_core_types_type.mli
 lib/ocaml/site-lib/pxp-engine/pxp_dfa.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_dfa.mli
 lib/ocaml/site-lib/pxp-engine/pxp_document.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_document.mli
 lib/ocaml/site-lib/pxp-engine/pxp_dtd.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_dtd.mli
+lib/ocaml/site-lib/pxp-engine/pxp_dtd_parser.cmi
+lib/ocaml/site-lib/pxp-engine/pxp_dtd_parser.mli
 lib/ocaml/site-lib/pxp-engine/pxp_engine.a
 lib/ocaml/site-lib/pxp-engine/pxp_engine.cma
 lib/ocaml/site-lib/pxp-engine/pxp_engine.cmxa
 lib/ocaml/site-lib/pxp-engine/pxp_entity.cmi
+lib/ocaml/site-lib/pxp-engine/pxp_entity_manager.cmi
+lib/ocaml/site-lib/pxp-engine/pxp_ev_parser.cmi
+lib/ocaml/site-lib/pxp-engine/pxp_ev_parser.mli
+lib/ocaml/site-lib/pxp-engine/pxp_lex_aux.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_lexer_types.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_lexer_types.mli
 lib/ocaml/site-lib/pxp-engine/pxp_lexers.cmi
@@ -28,47 +40,170 @@ lib/ocaml/site-lib/pxp-engine/pxp_reader.mli
 lib/ocaml/site-lib/pxp-engine/pxp_top.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_top.cmo
 lib/ocaml/site-lib/pxp-engine/pxp_top.mli
+lib/ocaml/site-lib/pxp-engine/pxp_tree_parser.cmi
+lib/ocaml/site-lib/pxp-engine/pxp_tree_parser.mli
+lib/ocaml/site-lib/pxp-engine/pxp_type_anchor.cmi
+lib/ocaml/site-lib/pxp-engine/pxp_type_anchor.mli
 lib/ocaml/site-lib/pxp-engine/pxp_types.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_types.mli
 lib/ocaml/site-lib/pxp-engine/pxp_yacc.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_yacc.mli
 lib/ocaml/site-lib/pxp-lex-iso88591/META
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_aux_iso88591.cmi
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_content_iso88591.cmi
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_content_string_iso88591.cmi
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_declaration_iso88591.cmi
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_document_iso88591.cmi
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_document_type_iso88591.cmi
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_dtd_string_iso88591.cmi
 lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_iso88591.a
 lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_iso88591.cma
 lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_iso88591.cmxa
+lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_iso88591_01.cmi
 lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_link_iso88591.cmi
 lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_link_iso88591.cmo
 lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_link_iso88591.cmx
 lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_link_iso88591.o
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_misc_iso88591.cmi
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_name_string_iso88591.cmi
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_within_tag_iso88591.cmi
+lib/ocaml/site-lib/pxp-lex-iso885910/META
+lib/ocaml/site-lib/pxp-lex-iso885910/pxp_lex_iso885910.a
+lib/ocaml/site-lib/pxp-lex-iso885910/pxp_lex_iso885910.cma
+lib/ocaml/site-lib/pxp-lex-iso885910/pxp_lex_iso885910.cmxa
+lib/ocaml/site-lib/pxp-lex-iso885910/pxp_lex_iso885910_01.cmi
+lib/ocaml/site-lib/pxp-lex-iso885910/pxp_lex_link_iso885910.cmi
+lib/ocaml/site-lib/pxp-lex-iso885910/pxp_lex_link_iso885910.cmo
+lib/ocaml/site-lib/pxp-lex-iso885910/pxp_lex_link_iso885910.cmx
+lib/ocaml/site-lib/pxp-lex-iso885910/pxp_lex_link_iso885910.o
+lib/ocaml/site-lib/pxp-lex-iso885913/META
+lib/ocaml/site-lib/pxp-lex-iso885913/pxp_lex_iso885913.a
+lib/ocaml/site-lib/pxp-lex-iso885913/pxp_lex_iso885913.cma
+lib/ocaml/site-lib/pxp-lex-iso885913/pxp_lex_iso885913.cmxa
+lib/ocaml/site-lib/pxp-lex-iso885913/pxp_lex_iso885913_01.cmi
+lib/ocaml/site-lib/pxp-lex-iso885913/pxp_lex_link_iso885913.cmi
+lib/ocaml/site-lib/pxp-lex-iso885913/pxp_lex_link_iso885913.cmo
+lib/ocaml/site-lib/pxp-lex-iso885913/pxp_lex_link_iso885913.cmx
+lib/ocaml/site-lib/pxp-lex-iso885913/pxp_lex_link_iso885913.o
+lib/ocaml/site-lib/pxp-lex-iso885914/META
+lib/ocaml/site-lib/pxp-lex-iso885914/pxp_lex_iso885914.a
+lib/ocaml/site-lib/pxp-lex-iso885914/pxp_lex_iso885914.cma
+lib/ocaml/site-lib/pxp-lex-iso885914/pxp_lex_iso885914.cmxa
+lib/ocaml/site-lib/pxp-lex-iso885914/pxp_lex_iso885914_01.cmi
+lib/ocaml/site-lib/pxp-lex-iso885914/pxp_lex_link_iso885914.cmi
+lib/ocaml/site-lib/pxp-lex-iso885914/pxp_lex_link_iso885914.cmo
+lib/ocaml/site-lib/pxp-lex-iso885914/pxp_lex_link_iso885914.cmx
+lib/ocaml/site-lib/pxp-lex-iso885914/pxp_lex_link_iso885914.o
+lib/ocaml/site-lib/pxp-lex-iso885915/META
+lib/ocaml/site-lib/pxp-lex-iso885915/pxp_lex_iso885915.a
+lib/ocaml/site-lib/pxp-lex-iso885915/pxp_lex_iso885915.cma
+lib/ocaml/site-lib/pxp-lex-iso885915/pxp_lex_iso885915.cmxa
+lib/ocaml/site-lib/pxp-lex-iso885915/pxp_lex_iso885915_01.cmi
+lib/ocaml/site-lib/pxp-lex-iso885915/pxp_lex_link_iso885915.cmi
+lib/ocaml/site-lib/pxp-lex-iso885915/pxp_lex_link_iso885915.cmo
+lib/ocaml/site-lib/pxp-lex-iso885915/pxp_lex_link_iso885915.cmx
+lib/ocaml/site-lib/pxp-lex-iso885915/pxp_lex_link_iso885915.o
+lib/ocaml/site-lib/pxp-lex-iso88592/META
+lib/ocaml/site-lib/pxp-lex-iso88592/pxp_lex_iso88592.a
+lib/ocaml/site-lib/pxp-lex-iso88592/pxp_lex_iso88592.cma
+lib/ocaml/site-lib/pxp-lex-iso88592/pxp_lex_iso88592.cmxa
+lib/ocaml/site-lib/pxp-lex-iso88592/pxp_lex_iso88592_01.cmi
+lib/ocaml/site-lib/pxp-lex-iso88592/pxp_lex_link_iso88592.cmi
+lib/ocaml/site-lib/pxp-lex-iso88592/pxp_lex_link_iso88592.cmo
+lib/ocaml/site-lib/pxp-lex-iso88592/pxp_lex_link_iso88592.cmx
+lib/ocaml/site-lib/pxp-lex-iso88592/pxp_lex_link_iso88592.o
+lib/ocaml/site-lib/pxp-lex-iso88593/META
+lib/ocaml/site-lib/pxp-lex-iso88593/pxp_lex_iso88593.a
+lib/ocaml/site-lib/pxp-lex-iso88593/pxp_lex_iso88593.cma
+lib/ocaml/site-lib/pxp-lex-iso88593/pxp_lex_iso88593.cmxa
+lib/ocaml/site-lib/pxp-lex-iso88593/pxp_lex_iso88593_01.cmi
+lib/ocaml/site-lib/pxp-lex-iso88593/pxp_lex_link_iso88593.cmi
+lib/ocaml/site-lib/pxp-lex-iso88593/pxp_lex_link_iso88593.cmo
+lib/ocaml/site-lib/pxp-lex-iso88593/pxp_lex_link_iso88593.cmx
+lib/ocaml/site-lib/pxp-lex-iso88593/pxp_lex_link_iso88593.o
+lib/ocaml/site-lib/pxp-lex-iso88594/META
+lib/ocaml/site-lib/pxp-lex-iso88594/pxp_lex_iso88594.a
+lib/ocaml/site-lib/pxp-lex-iso88594/pxp_lex_iso88594.cma
+lib/ocaml/site-lib/pxp-lex-iso88594/pxp_lex_iso88594.cmxa
+lib/ocaml/site-lib/pxp-lex-iso88594/pxp_lex_iso88594_01.cmi
+lib/ocaml/site-lib/pxp-lex-iso88594/pxp_lex_link_iso88594.cmi
+lib/ocaml/site-lib/pxp-lex-iso88594/pxp_lex_link_iso88594.cmo
+lib/ocaml/site-lib/pxp-lex-iso88594/pxp_lex_link_iso88594.cmx
+lib/ocaml/site-lib/pxp-lex-iso88594/pxp_lex_link_iso88594.o
+lib/ocaml/site-lib/pxp-lex-iso88595/META
+lib/ocaml/site-lib/pxp-lex-iso88595/pxp_lex_iso88595.a
+lib/ocaml/site-lib/pxp-lex-iso88595/pxp_lex_iso88595.cma
+lib/ocaml/site-lib/pxp-lex-iso88595/pxp_lex_iso88595.cmxa
+lib/ocaml/site-lib/pxp-lex-iso88595/pxp_lex_iso88595_01.cmi
+lib/ocaml/site-lib/pxp-lex-iso88595/pxp_lex_link_iso88595.cmi
+lib/ocaml/site-lib/pxp-lex-iso88595/pxp_lex_link_iso88595.cmo
+lib/ocaml/site-lib/pxp-lex-iso88595/pxp_lex_link_iso88595.cmx
+lib/ocaml/site-lib/pxp-lex-iso88595/pxp_lex_link_iso88595.o
+lib/ocaml/site-lib/pxp-lex-iso88596/META
+lib/ocaml/site-lib/pxp-lex-iso88596/pxp_lex_iso88596.a
+lib/ocaml/site-lib/pxp-lex-iso88596/pxp_lex_iso88596.cma
+lib/ocaml/site-lib/pxp-lex-iso88596/pxp_lex_iso88596.cmxa
+lib/ocaml/site-lib/pxp-lex-iso88596/pxp_lex_iso88596_01.cmi
+lib/ocaml/site-lib/pxp-lex-iso88596/pxp_lex_link_iso88596.cmi
+lib/ocaml/site-lib/pxp-lex-iso88596/pxp_lex_link_iso88596.cmo
+lib/ocaml/site-lib/pxp-lex-iso88596/pxp_lex_link_iso88596.cmx
+lib/ocaml/site-lib/pxp-lex-iso88596/pxp_lex_link_iso88596.o
+lib/ocaml/site-lib/pxp-lex-iso88597/META
+lib/ocaml/site-lib/pxp-lex-iso88597/pxp_lex_iso88597.a
+lib/ocaml/site-lib/pxp-lex-iso88597/pxp_lex_iso88597.cma
+lib/ocaml/site-lib/pxp-lex-iso88597/pxp_lex_iso88597.cmxa
+lib/ocaml/site-lib/pxp-lex-iso88597/pxp_lex_iso88597_01.cmi
+lib/ocaml/site-lib/pxp-lex-iso88597/pxp_lex_link_iso88597.cmi
+lib/ocaml/site-lib/pxp-lex-iso88597/pxp_lex_link_iso88597.cmo
+lib/ocaml/site-lib/pxp-lex-iso88597/pxp_lex_link_iso88597.cmx
+lib/ocaml/site-lib/pxp-lex-iso88597/pxp_lex_link_iso88597.o
+lib/ocaml/site-lib/pxp-lex-iso88598/META
+lib/ocaml/site-lib/pxp-lex-iso88598/pxp_lex_iso88598.a
+lib/ocaml/site-lib/pxp-lex-iso88598/pxp_lex_iso88598.cma
+lib/ocaml/site-lib/pxp-lex-iso88598/pxp_lex_iso88598.cmxa
+lib/ocaml/site-lib/pxp-lex-iso88598/pxp_lex_iso88598_01.cmi
+lib/ocaml/site-lib/pxp-lex-iso88598/pxp_lex_link_iso88598.cmi
+lib/ocaml/site-lib/pxp-lex-iso88598/pxp_lex_link_iso88598.cmo
+lib/ocaml/site-lib/pxp-lex-iso88598/pxp_lex_link_iso88598.cmx
+lib/ocaml/site-lib/pxp-lex-iso88598/pxp_lex_link_iso88598.o
+lib/ocaml/site-lib/pxp-lex-iso88599/META
+lib/ocaml/site-lib/pxp-lex-iso88599/pxp_lex_iso88599.a
+lib/ocaml/site-lib/pxp-lex-iso88599/pxp_lex_iso88599.cma
+lib/ocaml/site-lib/pxp-lex-iso88599/pxp_lex_iso88599.cmxa
+lib/ocaml/site-lib/pxp-lex-iso88599/pxp_lex_iso88599_01.cmi
+lib/ocaml/site-lib/pxp-lex-iso88599/pxp_lex_link_iso88599.cmi
+lib/ocaml/site-lib/pxp-lex-iso88599/pxp_lex_link_iso88599.cmo
+lib/ocaml/site-lib/pxp-lex-iso88599/pxp_lex_link_iso88599.cmx
+lib/ocaml/site-lib/pxp-lex-iso88599/pxp_lex_link_iso88599.o
 lib/ocaml/site-lib/pxp-lex-utf8/META
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_aux_utf8.cmi
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_content_string_utf8.cmi
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_content_utf8.cmi
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_declaration_utf8.cmi
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_document_type_utf8.cmi
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_document_utf8.cmi
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_dtd_string_utf8.cmi
 lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_link_utf8.cmi
 lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_link_utf8.cmo
 lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_link_utf8.cmx
 lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_link_utf8.o
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_misc_utf8.cmi
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_name_string_utf8.cmi
 lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8.a
 lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8.cma
 lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8.cmxa
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_within_tag_utf8.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_01.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_02.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_03.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_04.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_05.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_06.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_07.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_08.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_09.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_10.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_11.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_12.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_13.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_14.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_15.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_16.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_17.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_18.cmi
 @dirrm lib/ocaml/site-lib/pxp
 @dirrm lib/ocaml/site-lib/pxp-engine
 @dirrm lib/ocaml/site-lib/pxp-lex-iso88591
+@dirrm lib/ocaml/site-lib/pxp-lex-iso885910
+@dirrm lib/ocaml/site-lib/pxp-lex-iso885913
+@dirrm lib/ocaml/site-lib/pxp-lex-iso885914
+@dirrm lib/ocaml/site-lib/pxp-lex-iso885915
+@dirrm lib/ocaml/site-lib/pxp-lex-iso88592
+@dirrm lib/ocaml/site-lib/pxp-lex-iso88593
+@dirrm lib/ocaml/site-lib/pxp-lex-iso88594
+@dirrm lib/ocaml/site-lib/pxp-lex-iso88595
+@dirrm lib/ocaml/site-lib/pxp-lex-iso88596
+@dirrm lib/ocaml/site-lib/pxp-lex-iso88597
+@dirrm lib/ocaml/site-lib/pxp-lex-iso88598
+@dirrm lib/ocaml/site-lib/pxp-lex-iso88599
 @dirrm lib/ocaml/site-lib/pxp-lex-utf8