2 files changed, 12 insertions, 221 deletions

diff --git a/textproc/ocaml-pxp/Makefile b/textproc/ocaml-pxp/Makefile
index 3d0972286da4..c27e5d2658ea 100644
--- a/textproc/ocaml-pxp/Makefile
+++ b/textproc/ocaml-pxp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pxp
 PORTVERSION=	1.1.95
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.ocaml-programming.de/packages/
 PKGNAMEPREFIX=	ocaml-
@@ -20,6 +21,11 @@ BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
 		${LOCALBASE}/lib/ocaml/site-lib/netstring/netstring.a:${PORTSDIR}/www/ocaml-net
 RUN_DEPENDS=	${LOCALBASE}/lib/ocaml/site-lib/netstring/netstring.a:${PORTSDIR}/www/ocaml-net
 
+.if !defined(WITHOUT_ULEX)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/ocaml/site-lib/ulex/ulexing.a:${PORTSDIR}/devel/ocaml-ulex
+RUN_DEPENDS+=	${LOCALBASE}/lib/ocaml/site-lib/ulex/ulexing.a:${PORTSDIR}/devel/ocaml-ulex
+.endif
+
 USE_GMAKE=	yes
 
 HAS_CONFIGURE=	yes
@@ -33,4 +39,10 @@ ALL_TARGET=	all opt
 post-extract:
 	${FIND} ${WRKSRC} -name "Makefile*" | ${XARGS} ${REINPLACE_CMD} -e 's/PACKAGES/PXP_PACKAGES/'
 
+post-install:
+	@${FIND} ${PREFIX}/lib/ocaml/site-lib/pxp* -type f | \
+		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
+	@${FIND} ${PREFIX}/lib/ocaml/site-lib/ -type d -name 'pxp*' | ${SORT} -r | \
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+
 .include <bsd.port.mk>
diff --git a/textproc/ocaml-pxp/pkg-plist b/textproc/ocaml-pxp/pkg-plist
deleted file mode 100644
index ee8d58373124..000000000000
--- a/textproc/ocaml-pxp/pkg-plist
+++ /dev/null
@@ -1,221 +0,0 @@
-lib/ocaml/site-lib/pxp/META
-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_event.cmi
-lib/ocaml/site-lib/pxp-engine/pxp_event.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
-lib/ocaml/site-lib/pxp-engine/pxp_lexers.mli
-lib/ocaml/site-lib/pxp-engine/pxp_lexing.cmi
-lib/ocaml/site-lib/pxp-engine/pxp_lexing.mli
-lib/ocaml/site-lib/pxp-engine/pxp_lib.cmi
-lib/ocaml/site-lib/pxp-engine/pxp_lib.mli
-lib/ocaml/site-lib/pxp-engine/pxp_marshal.cmi
-lib/ocaml/site-lib/pxp-engine/pxp_marshal.mli
-lib/ocaml/site-lib/pxp-engine/pxp_reader.cmi
-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_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-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-iso885916/META
-lib/ocaml/site-lib/pxp-lex-iso885916/pxp_lex_iso885916.a
-lib/ocaml/site-lib/pxp-lex-iso885916/pxp_lex_iso885916.cma
-lib/ocaml/site-lib/pxp-lex-iso885916/pxp_lex_iso885916.cmxa
-lib/ocaml/site-lib/pxp-lex-iso885916/pxp_lex_iso885916_01.cmi
-lib/ocaml/site-lib/pxp-lex-iso885916/pxp_lex_link_iso885916.cmi
-lib/ocaml/site-lib/pxp-lex-iso885916/pxp_lex_link_iso885916.cmo
-lib/ocaml/site-lib/pxp-lex-iso885916/pxp_lex_link_iso885916.cmx
-lib/ocaml/site-lib/pxp-lex-iso885916/pxp_lex_link_iso885916.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_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_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_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-iso885916
-@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