Upgrade to version 0.19.

3 files changed, 41 insertions, 42 deletions

diff --git a/textproc/xmerl/Makefile b/textproc/xmerl/Makefile
index 96c7ca86a937..0764d3728a24 100644
--- a/textproc/xmerl/Makefile
+++ b/textproc/xmerl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xmerl
-PORTVERSION=	0.18
-PORTREVISION=	2
+PORTVERSION=	0.19
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sowap
@@ -21,24 +20,21 @@ RUN_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
 
 USE_GMAKE=	yes
 
-XMERL_DOCS=	README.html changes.txt xpath-grammar.txt xslt-example.dtd xslt-example.xls
-
 do-install:
 	@${MKDIR} ${DOCSDIR}
-	@for FILE in ${XMERL_DOCS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${FILE} ${DOCSDIR}; \
-	done
+	@${CP} -r ${WRKSRC}/doc/* ${DOCSDIR}
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 
-	@${MKDIR} ${PREFIX}/lib/erlang/lib/xmerl
+	@${MKDIR} ${PREFIX}/lib/erlang/lib/${PORTNAME}
 
-	@for FILE in ebin inc priv src; do \
-		${MKDIR} ${PREFIX}/lib/erlang/lib/xmerl/$${FILE}; \
+	@for FILE in ebin inc src; do \
+		${MKDIR} ${PREFIX}/lib/erlang/lib/${PORTNAME}/$${FILE}; \
 		${CP} -r ${WRKSRC}/$${FILE}/* \
-			${PREFIX}/lib/erlang/lib/xmerl/$${FILE}; \
+			${PREFIX}/lib/erlang/lib/${PORTNAME}/$${FILE}; \
 		${CHMOD} ${SHAREMODE} \
-			${PREFIX}/lib/erlang/lib/xmerl/$${FILE}/*; \
+			${PREFIX}/lib/erlang/lib/${PORTNAME}/$${FILE}/*; \
 	done
 
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/erlang/lib/xmerl
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/erlang/lib/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/textproc/xmerl/distinfo b/textproc/xmerl/distinfo
index cc5f23f66d0c..9a76bdabf65b 100644
--- a/textproc/xmerl/distinfo
+++ b/textproc/xmerl/distinfo
@@ -1 +1 @@
-MD5 (erlang/xmerl-0.18.tar.gz) = bdf74f4f9e8de69cb2c9fb6891f773ce
+MD5 (erlang/xmerl-0.19.tar.gz) = 1551755ebbf682c7747af169ff4c6101
diff --git a/textproc/xmerl/pkg-plist b/textproc/xmerl/pkg-plist
index 7c14f9796b14..8b987988cc93 100644
--- a/textproc/xmerl/pkg-plist
+++ b/textproc/xmerl/pkg-plist
@@ -1,5 +1,3 @@
-lib/erlang/lib/xmerl/ebin/test.beam
-lib/erlang/lib/xmerl/ebin/test_html.beam
 lib/erlang/lib/xmerl/ebin/xmerl.app
 lib/erlang/lib/xmerl/ebin/xmerl.beam
 lib/erlang/lib/xmerl/ebin/xmerl_eventp.beam
@@ -8,33 +6,17 @@ lib/erlang/lib/xmerl/ebin/xmerl_lib.beam
 lib/erlang/lib/xmerl/ebin/xmerl_scan.beam
 lib/erlang/lib/xmerl/ebin/xmerl_simple.beam
 lib/erlang/lib/xmerl/ebin/xmerl_text.beam
+lib/erlang/lib/xmerl/ebin/xmerl_validate.beam
 lib/erlang/lib/xmerl/ebin/xmerl_xlate.beam
 lib/erlang/lib/xmerl/ebin/xmerl_xml.beam
 lib/erlang/lib/xmerl/ebin/xmerl_xpath.beam
 lib/erlang/lib/xmerl/ebin/xmerl_xpath_parse.beam
 lib/erlang/lib/xmerl/ebin/xmerl_xpath_pred.beam
 lib/erlang/lib/xmerl/ebin/xmerl_xpath_scan.beam
+lib/erlang/lib/xmerl/ebin/xmerl_xs.beam
 lib/erlang/lib/xmerl/inc/xmerl.hrl
 lib/erlang/lib/xmerl/inc/xmerl_xlink.hrl
-lib/erlang/lib/xmerl/priv/testdata/a_and_c.xml
-lib/erlang/lib/xmerl/priv/testdata/all_well.xml
-lib/erlang/lib/xmerl/priv/testdata/femdygnsprognos.xml
-lib/erlang/lib/xmerl/priv/testdata/m1.erl
-lib/erlang/lib/xmerl/priv/testdata/m2.erl
-lib/erlang/lib/xmerl/priv/testdata/m3.erl
-lib/erlang/lib/xmerl/priv/testdata/m4.erl
-lib/erlang/lib/xmerl/priv/testdata/play.dtd
-lib/erlang/lib/xmerl/priv/testdata/simple.xml
-lib/erlang/lib/xmerl/priv/testdata/test.xml
-lib/erlang/lib/xmerl/priv/testdata/test2.xml
-lib/erlang/lib/xmerl/priv/testdata/test3.xml
-lib/erlang/lib/xmerl/priv/testdata/test4.xml
-lib/erlang/lib/xmerl/priv/testdata/test5.xml
-lib/erlang/lib/xmerl/priv/testdata/testdtd.dtd
-lib/erlang/lib/xmerl/priv/testdata/topic_maps.dtd
 lib/erlang/lib/xmerl/src/Makefile
-lib/erlang/lib/xmerl/src/test.erl
-lib/erlang/lib/xmerl/src/test_html.erl
 lib/erlang/lib/xmerl/src/xmerl.app.src
 lib/erlang/lib/xmerl/src/xmerl.erl
 lib/erlang/lib/xmerl/src/xmerl_eventp.erl
@@ -43,6 +25,7 @@ lib/erlang/lib/xmerl/src/xmerl_lib.erl
 lib/erlang/lib/xmerl/src/xmerl_scan.erl
 lib/erlang/lib/xmerl/src/xmerl_simple.erl
 lib/erlang/lib/xmerl/src/xmerl_text.erl
+lib/erlang/lib/xmerl/src/xmerl_validate.erl
 lib/erlang/lib/xmerl/src/xmerl_xlate.erl
 lib/erlang/lib/xmerl/src/xmerl_xml.erl
 lib/erlang/lib/xmerl/src/xmerl_xpath.erl
@@ -50,15 +33,35 @@ lib/erlang/lib/xmerl/src/xmerl_xpath_parse.erl
 lib/erlang/lib/xmerl/src/xmerl_xpath_parse.yrl
 lib/erlang/lib/xmerl/src/xmerl_xpath_pred.erl
 lib/erlang/lib/xmerl/src/xmerl_xpath_scan.erl
-%%DOCSDIR%%/README.html
-%%DOCSDIR%%/changes.txt
-%%DOCSDIR%%/xpath-grammar.txt
-%%DOCSDIR%%/xslt-example.dtd
-%%DOCSDIR%%/xslt-example.xls
-@dirrm %%DOCSDIR%%
+lib/erlang/lib/xmerl/src/xmerl_xs.erl
+%%DOCSDIR%%/contributors.html
+%%DOCSDIR%%/examples/Makefile
+%%DOCSDIR%%/examples/mkdocs.erl
+%%DOCSDIR%%/examples/sdocbook2xhtml.erl
+%%DOCSDIR%%/examples/test_html.erl
+%%DOCSDIR%%/examples/xmerl_test.erl
+%%DOCSDIR%%/examples/xml/test.xml
+%%DOCSDIR%%/examples/xml/test2.xml
+%%DOCSDIR%%/examples/xml/test3.xml
+%%DOCSDIR%%/examples/xml/test4.xml
+%%DOCSDIR%%/examples/xml/test5.xml
+%%DOCSDIR%%/examples/xml/testdtd.dtd
+%%DOCSDIR%%/examples/xml/xmerl.xml
+%%DOCSDIR%%/examples/xml/xmerl_xs.xml
+%%DOCSDIR%%/examples/xserl_test.erl
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/stylesheet.css
+%%DOCSDIR%%/xmerl.html
+%%DOCSDIR%%/xmerl_eventp.html
+%%DOCSDIR%%/xmerl_examples.html
+%%DOCSDIR%%/xmerl_scan.html
+%%DOCSDIR%%/xmerl_xpath.html
+%%DOCSDIR%%/xmerl_xs.html
+%%DOCSDIR%%/xmerl_xs_examples.html
 @dirrm lib/erlang/lib/xmerl/src
-@dirrm lib/erlang/lib/xmerl/priv/testdata
-@dirrm lib/erlang/lib/xmerl/priv
 @dirrm lib/erlang/lib/xmerl/inc
 @dirrm lib/erlang/lib/xmerl/ebin
 @dirrm lib/erlang/lib/xmerl
+@dirrm %%DOCSDIR%%/examples/xml
+@dirrm %%DOCSDIR%%/examples
+@dirrm %%DOCSDIR%%