3 files changed, 14 insertions, 152 deletions

diff --git a/textproc/zenxml/Makefile b/textproc/zenxml/Makefile
index 36650c2dadbd..ed0d4888ffd6 100644
--- a/textproc/zenxml/Makefile
+++ b/textproc/zenxml/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	zenxml
-PORTVERSION=	2.3
+PORTVERSION=	2.4
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/
 DISTNAME=	zenXml_${PORTVERSION}
@@ -12,24 +12,25 @@ COMMENT=	Simple XML processing using C++
 LICENSE=	GPLv3
 
 USES=		dos2unix zip
-
 NO_BUILD=	yes
+NO_ARCH=	yes
 WRKSRC=		${WRKDIR}
 
 ZENINC=		${PREFIX}/include/${PORTNAME:S/xml//}
 
 OPTIONS_DEFINE=	DOCS
 
+PORTDOCS=	*
+
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
-	${MKDIR} ${STAGEDIR}${ZENINC}
-	(cd ${WRKSRC}/${PORTNAME} && \
-	    ${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME})
-	(cd ${WRKSRC}/${PORTNAME:S/xml//} && \
-	    ${COPYTREE_SHARE} \*.h ${STAGEDIR}${ZENINC})
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${ZENINC}
+	cd ${WRKSRC}/${PORTNAME} && \
+	    ${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME}
+	cd ${WRKSRC}/${PORTNAME:S/xml//} && \
+	    ${COPYTREE_SHARE} \*.h ${STAGEDIR}${ZENINC}
 
 do-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/zenxml/distinfo b/textproc/zenxml/distinfo
index cabe63faf13e..286dcc017dc2 100644
--- a/textproc/zenxml/distinfo
+++ b/textproc/zenxml/distinfo
@@ -1,2 +1,3 @@
-SHA256 (zenXml_2.3.zip) = 2044c6ce766d1e037692d554b0a7698de75c9a686d0c381b19b21534132e37d0
-SIZE (zenXml_2.3.zip) = 274255
+TIMESTAMP = 1518318204
+SHA256 (zenXml_2.4.zip) = 881de299f77017f8c20e05092ef41c7963e20928b63b431fe14cc4597948cc68
+SIZE (zenXml_2.4.zip) = 272101
diff --git a/textproc/zenxml/pkg-plist b/textproc/zenxml/pkg-plist
index 871abd72b37c..a264bc307db7 100644
--- a/textproc/zenxml/pkg-plist
+++ b/textproc/zenxml/pkg-plist
@@ -14,143 +14,3 @@ include/zenxml/error.h
 include/zenxml/io.h
 include/zenxml/parser.h
 include/zenxml/xml.h
-%%PORTDOCS%%%%DOCSDIR%%/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%/bc_s.png
-%%PORTDOCS%%%%DOCSDIR%%/bdwn.png
-%%PORTDOCS%%%%DOCSDIR%%/bind_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/classes.html
-%%PORTDOCS%%%%DOCSDIR%%/classzen_1_1_xml_doc-members.html
-%%PORTDOCS%%%%DOCSDIR%%/classzen_1_1_xml_doc.html
-%%PORTDOCS%%%%DOCSDIR%%/classzen_1_1_xml_element-members.html
-%%PORTDOCS%%%%DOCSDIR%%/classzen_1_1_xml_element.html
-%%PORTDOCS%%%%DOCSDIR%%/classzen_1_1_xml_in-members.html
-%%PORTDOCS%%%%DOCSDIR%%/classzen_1_1_xml_in.html
-%%PORTDOCS%%%%DOCSDIR%%/classzen_1_1_xml_out-members.html
-%%PORTDOCS%%%%DOCSDIR%%/classzen_1_1_xml_out.html
-%%PORTDOCS%%%%DOCSDIR%%/closed.png
-%%PORTDOCS%%%%DOCSDIR%%/cvrt__struc_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/cvrt__text_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/dir_5fe60cdff4f93e8435d81ae38a3e2e18.html
-%%PORTDOCS%%%%DOCSDIR%%/dom_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/dynsections.js
-%%PORTDOCS%%%%DOCSDIR%%/error_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/ftv2blank.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2cl.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2doc.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2folderclosed.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2folderopen.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2lastnode.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2link.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2mlastnode.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2mnode.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2mo.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2node.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2ns.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2plastnode.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2pnode.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2splitbar.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2vertline.png
-%%PORTDOCS%%%%DOCSDIR%%/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/functions_func.html
-%%PORTDOCS%%%%DOCSDIR%%/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/hierarchy.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/io_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/jquery.js
-%%PORTDOCS%%%%DOCSDIR%%/namespacemembers.html
-%%PORTDOCS%%%%DOCSDIR%%/namespacemembers_func.html
-%%PORTDOCS%%%%DOCSDIR%%/namespaces.html
-%%PORTDOCS%%%%DOCSDIR%%/namespacezen.html
-%%PORTDOCS%%%%DOCSDIR%%/nav_f.png
-%%PORTDOCS%%%%DOCSDIR%%/nav_g.png
-%%PORTDOCS%%%%DOCSDIR%%/nav_h.png
-%%PORTDOCS%%%%DOCSDIR%%/open.png
-%%PORTDOCS%%%%DOCSDIR%%/parser_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/search/all_0.html
-%%PORTDOCS%%%%DOCSDIR%%/search/all_0.js
-%%PORTDOCS%%%%DOCSDIR%%/search/all_1.html
-%%PORTDOCS%%%%DOCSDIR%%/search/all_1.js
-%%PORTDOCS%%%%DOCSDIR%%/search/all_2.html
-%%PORTDOCS%%%%DOCSDIR%%/search/all_2.js
-%%PORTDOCS%%%%DOCSDIR%%/search/all_3.html
-%%PORTDOCS%%%%DOCSDIR%%/search/all_3.js
-%%PORTDOCS%%%%DOCSDIR%%/search/all_4.html
-%%PORTDOCS%%%%DOCSDIR%%/search/all_4.js
-%%PORTDOCS%%%%DOCSDIR%%/search/all_5.html
-%%PORTDOCS%%%%DOCSDIR%%/search/all_5.js
-%%PORTDOCS%%%%DOCSDIR%%/search/all_6.html
-%%PORTDOCS%%%%DOCSDIR%%/search/all_6.js
-%%PORTDOCS%%%%DOCSDIR%%/search/all_7.html
-%%PORTDOCS%%%%DOCSDIR%%/search/all_7.js
-%%PORTDOCS%%%%DOCSDIR%%/search/all_8.html
-%%PORTDOCS%%%%DOCSDIR%%/search/all_8.js
-%%PORTDOCS%%%%DOCSDIR%%/search/all_9.html
-%%PORTDOCS%%%%DOCSDIR%%/search/all_9.js
-%%PORTDOCS%%%%DOCSDIR%%/search/all_a.html
-%%PORTDOCS%%%%DOCSDIR%%/search/all_a.js
-%%PORTDOCS%%%%DOCSDIR%%/search/all_b.html
-%%PORTDOCS%%%%DOCSDIR%%/search/all_b.js
-%%PORTDOCS%%%%DOCSDIR%%/search/all_c.html
-%%PORTDOCS%%%%DOCSDIR%%/search/all_c.js
-%%PORTDOCS%%%%DOCSDIR%%/search/classes_0.html
-%%PORTDOCS%%%%DOCSDIR%%/search/classes_0.js
-%%PORTDOCS%%%%DOCSDIR%%/search/close.png
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_0.html
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_0.js
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_1.html
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_1.js
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_2.html
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_2.js
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_3.html
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_3.js
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_4.html
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_4.js
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_5.html
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_5.js
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_6.html
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_6.js
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_7.html
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_7.js
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_8.html
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_8.js
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_9.html
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_9.js
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_a.html
-%%PORTDOCS%%%%DOCSDIR%%/search/functions_a.js
-%%PORTDOCS%%%%DOCSDIR%%/search/mag_sel.png
-%%PORTDOCS%%%%DOCSDIR%%/search/namespaces_0.html
-%%PORTDOCS%%%%DOCSDIR%%/search/namespaces_0.js
-%%PORTDOCS%%%%DOCSDIR%%/search/nomatches.html
-%%PORTDOCS%%%%DOCSDIR%%/search/pages_0.html
-%%PORTDOCS%%%%DOCSDIR%%/search/pages_0.js
-%%PORTDOCS%%%%DOCSDIR%%/search/search.css
-%%PORTDOCS%%%%DOCSDIR%%/search/search.js
-%%PORTDOCS%%%%DOCSDIR%%/search/search_l.png
-%%PORTDOCS%%%%DOCSDIR%%/search/search_m.png
-%%PORTDOCS%%%%DOCSDIR%%/search/search_r.png
-%%PORTDOCS%%%%DOCSDIR%%/search/variables_0.html
-%%PORTDOCS%%%%DOCSDIR%%/search/variables_0.js
-%%PORTDOCS%%%%DOCSDIR%%/search/variables_1.html
-%%PORTDOCS%%%%DOCSDIR%%/search/variables_1.js
-%%PORTDOCS%%%%DOCSDIR%%/search/variables_2.html
-%%PORTDOCS%%%%DOCSDIR%%/search/variables_2.js
-%%PORTDOCS%%%%DOCSDIR%%/structzen_1_1_xml_error-members.html
-%%PORTDOCS%%%%DOCSDIR%%/structzen_1_1_xml_error.html
-%%PORTDOCS%%%%DOCSDIR%%/structzen_1_1_xml_error.png
-%%PORTDOCS%%%%DOCSDIR%%/structzen_1_1_xml_file_error-members.html
-%%PORTDOCS%%%%DOCSDIR%%/structzen_1_1_xml_file_error.html
-%%PORTDOCS%%%%DOCSDIR%%/structzen_1_1_xml_file_error.png
-%%PORTDOCS%%%%DOCSDIR%%/structzen_1_1_xml_parsing_error-members.html
-%%PORTDOCS%%%%DOCSDIR%%/structzen_1_1_xml_parsing_error.html
-%%PORTDOCS%%%%DOCSDIR%%/structzen_1_1_xml_parsing_error.png
-%%PORTDOCS%%%%DOCSDIR%%/sync_off.png
-%%PORTDOCS%%%%DOCSDIR%%/sync_on.png
-%%PORTDOCS%%%%DOCSDIR%%/tab_a.png
-%%PORTDOCS%%%%DOCSDIR%%/tab_b.png
-%%PORTDOCS%%%%DOCSDIR%%/tab_h.png
-%%PORTDOCS%%%%DOCSDIR%%/tab_s.png
-%%PORTDOCS%%%%DOCSDIR%%/tabs.css
-%%PORTDOCS%%%%DOCSDIR%%/xml_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/zenXml.png