3 files changed, 109 insertions, 91 deletions

diff --git a/textproc/xmlwrapp/Makefile b/textproc/xmlwrapp/Makefile
index 37af9656e65d..132287d70022 100644
--- a/textproc/xmlwrapp/Makefile
+++ b/textproc/xmlwrapp/Makefile
@@ -7,37 +7,48 @@
 #
 
 PORTNAME=	xmlwrapp
-PORTVERSION=	0.6.2
+PORTVERSION=	0.6.3
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A modern style C++ library for working with XML data
 
-LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	boost_iostreams.4:${PORTSDIR}/devel/boost-libs
 
 OPTIONS=	XSLT "build libxsltwrap library (requires libxslt)" off
 
-CONFIGURE_ARGS=	--prefix ${PREFIX}
-CPPFLAGS+=	-I${LOCALBASE}/include
+USE_GNOME=	gnomehack libxml2 pkgconfig
+USE_PERL5_BUILD=yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	libxml2 pkgconfig gnomehack
-USE_PERL5_BUILD=	yes
+CONFIGURE_ARGS=	--disable-silent-rules
 USE_LDCONFIG=	yes
-WANT_GNOME=	yes
-HAS_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
 .if defined(WITH_XSLT)
 USE_GNOME+=	libxslt
+PLIST_SUB+=	XSLT=""
 .else
 CONFIGURE_ARGS+=--disable-xslt
+PLIST_SUB+=	XSLT="@comment "
 .endif
 
 post-patch:
-.if defined(NOPORTDOCS)
-	${REINPLACE_CMD} 's/docs//' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} '/if test/s|==|=|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} '/^SUBDIRS/s|docs||' ${WRKSRC}/Makefile.in
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@(cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/xmlwrapp/distinfo b/textproc/xmlwrapp/distinfo
index e180dc2a249c..b18155215801 100644
--- a/textproc/xmlwrapp/distinfo
+++ b/textproc/xmlwrapp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xmlwrapp-0.6.2.tar.gz) = befef91d8a5826d66b1f18db8786ab6b0d097555ccb07906c85f12f69d638767
-SIZE (xmlwrapp-0.6.2.tar.gz) = 946770
+SHA256 (xmlwrapp-0.6.3.tar.gz) = 1701fa2960cf2afd70b8ebee2740cbe893d4318a3c269319e657e5738d802ab2
+SIZE (xmlwrapp-0.6.3.tar.gz) = 910879
diff --git a/textproc/xmlwrapp/pkg-plist b/textproc/xmlwrapp/pkg-plist
index c500500db566..18c046530914 100644
--- a/textproc/xmlwrapp/pkg-plist
+++ b/textproc/xmlwrapp/pkg-plist
@@ -9,19 +9,19 @@ include/xmlwrapp/nodes_view.h
 include/xmlwrapp/tree_parser.h
 include/xmlwrapp/version.h
 include/xmlwrapp/xmlwrapp.h
-%%GNOME:%%include/xsltwrapp/init.h
-%%GNOME:%%include/xsltwrapp/stylesheet.h
-%%GNOME:%%include/xsltwrapp/xsltwrapp.h
+%%XSLT%%include/xsltwrapp/init.h
+%%XSLT%%include/xsltwrapp/stylesheet.h
+%%XSLT%%include/xsltwrapp/xsltwrapp.h
 lib/libxmlwrapp.a
+lib/libxmlwrapp.la
 lib/libxmlwrapp.so
 lib/libxmlwrapp.so.5
-lib/libxmlwrapp.la
-%%GNOME:%%lib/libxsltwrapp.a
-%%GNOME:%%lib/libxsltwrapp.so
-%%GNOME:%%lib/libxsltwrapp.so.3
-%%GNOME:%%lib/libxsltwrapp.la
+%%XSLT%%lib/libxsltwrapp.a
+%%XSLT%%lib/libxsltwrapp.so
+%%XSLT%%lib/libxsltwrapp.la
+%%XSLT%%lib/libxsltwrapp.so.3
 libdata/pkgconfig/xmlwrapp.pc
-%%GNOME:%%libdata/pkgconfig/xsltwrapp.pc
+%%XSLT%%libdata/pkgconfig/xsltwrapp.pc
 %%PORTDOCS%%%%DOCSDIR%%/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/attr.html
 %%PORTDOCS%%%%DOCSDIR%%/attributes_8h.html
@@ -32,6 +32,8 @@ libdata/pkgconfig/xmlwrapp.pc
 %%PORTDOCS%%%%DOCSDIR%%/attributes_8h__incl.md5
 %%PORTDOCS%%%%DOCSDIR%%/attributes_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/attributes_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/bc_s.png
+%%PORTDOCS%%%%DOCSDIR%%/bdwn.png
 %%PORTDOCS%%%%DOCSDIR%%/classes.html
 %%PORTDOCS%%%%DOCSDIR%%/classxml_1_1attributes-members.html
 %%PORTDOCS%%%%DOCSDIR%%/classxml_1_1attributes.html
@@ -46,7 +48,6 @@ libdata/pkgconfig/xmlwrapp.pc
 %%PORTDOCS%%%%DOCSDIR%%/classxml_1_1document-members.html
 %%PORTDOCS%%%%DOCSDIR%%/classxml_1_1document.html
 %%PORTDOCS%%%%DOCSDIR%%/classxml_1_1event__parser-members.html
-%%PORTDOCS%%%%DOCSDIR%%/closed.gif
 %%PORTDOCS%%%%DOCSDIR%%/classxml_1_1event__parser.html
 %%PORTDOCS%%%%DOCSDIR%%/classxml_1_1init-members.html
 %%PORTDOCS%%%%DOCSDIR%%/classxml_1_1init.html
@@ -58,7 +59,6 @@ libdata/pkgconfig/xmlwrapp.pc
 %%PORTDOCS%%%%DOCSDIR%%/classxml_1_1node_1_1const__iterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/classxml_1_1node_1_1const__iterator.html
 %%PORTDOCS%%%%DOCSDIR%%/classxml_1_1node_1_1iterator-members.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/classxml_1_1node_1_1iterator.html
 %%PORTDOCS%%%%DOCSDIR%%/classxml_1_1nodes__view-members.html
 %%PORTDOCS%%%%DOCSDIR%%/classxml_1_1nodes__view.html
@@ -69,7 +69,6 @@ libdata/pkgconfig/xmlwrapp.pc
 %%PORTDOCS%%%%DOCSDIR%%/classxml_1_1tree__parser-members.html
 %%PORTDOCS%%%%DOCSDIR%%/classxml_1_1tree__parser.html
 %%PORTDOCS%%%%DOCSDIR%%/classxslt_1_1init-members.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen.png
 %%PORTDOCS%%%%DOCSDIR%%/classxslt_1_1init.html
 %%PORTDOCS%%%%DOCSDIR%%/classxslt_1_1init__coll__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/classxslt_1_1init__coll__graph.md5
@@ -79,6 +78,7 @@ libdata/pkgconfig/xmlwrapp.pc
 %%PORTDOCS%%%%DOCSDIR%%/classxslt_1_1init__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/classxslt_1_1stylesheet-members.html
 %%PORTDOCS%%%%DOCSDIR%%/classxslt_1_1stylesheet.html
+%%PORTDOCS%%%%DOCSDIR%%/closed.png
 %%PORTDOCS%%%%DOCSDIR%%/document_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/document_8h__dep__incl.map
 %%PORTDOCS%%%%DOCSDIR%%/document_8h__dep__incl.md5
@@ -88,6 +88,9 @@ libdata/pkgconfig/xmlwrapp.pc
 %%PORTDOCS%%%%DOCSDIR%%/document_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/document_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/documents.html
+%%PORTDOCS%%%%DOCSDIR%%/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/doxygen.png
+%%PORTDOCS%%%%DOCSDIR%%/dynsections.js
 %%PORTDOCS%%%%DOCSDIR%%/event__parser_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/event__parser_8h__dep__incl.map
 %%PORTDOCS%%%%DOCSDIR%%/event__parser_8h__dep__incl.md5
@@ -105,82 +108,84 @@ libdata/pkgconfig/xmlwrapp.pc
 %%PORTDOCS%%%%DOCSDIR%%/functions_type.html
 %%PORTDOCS%%%%DOCSDIR%%/globals.html
 %%PORTDOCS%%%%DOCSDIR%%/globals_defs.html
-%%PORTDOCS%%%%DOCSDIR%%/graph_legend.dot
 %%PORTDOCS%%%%DOCSDIR%%/graph_legend.html
+%%PORTDOCS%%%%DOCSDIR%%/graph_legend.md5
 %%PORTDOCS%%%%DOCSDIR%%/graph_legend.png
 %%PORTDOCS%%%%DOCSDIR%%/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__0.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__0.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__0.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__1.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__1.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__1.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__10.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__10.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__10.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__11.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__11.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__11.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__12.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__12.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__12.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__13.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__13.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__13.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__14.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__14.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__14.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__15.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__15.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__15.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__16.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__16.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__16.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__17.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__17.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__17.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__18.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__18.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__18.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__19.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__19.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__19.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__2.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__2.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__2.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__3.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__3.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__3.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__4.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__4.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__4.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__5.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__5.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__5.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__6.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__6.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__6.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__7.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__7.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__7.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__8.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__8.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__8.png
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__9.map
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__9.md5
-%%PORTDOCS%%%%DOCSDIR%%/inherit__graph__9.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_0.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_0.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_0.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_1.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_1.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_1.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_10.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_10.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_10.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_11.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_11.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_11.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_12.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_12.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_12.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_13.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_13.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_13.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_14.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_14.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_14.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_15.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_15.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_15.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_16.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_16.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_16.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_17.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_17.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_17.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_18.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_18.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_18.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_19.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_19.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_19.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_2.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_2.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_2.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_3.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_3.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_3.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_4.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_4.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_4.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_5.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_5.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_5.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_6.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_6.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_6.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_7.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_7.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_7.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_8.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_8.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_8.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_9.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_9.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_9.png
 %%PORTDOCS%%%%DOCSDIR%%/inherits.html
 %%PORTDOCS%%%%DOCSDIR%%/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/jquery.js
 %%PORTDOCS%%%%DOCSDIR%%/namespaces.html
 %%PORTDOCS%%%%DOCSDIR%%/namespacexml.html
 %%PORTDOCS%%%%DOCSDIR%%/namespacexslt.html
+%%PORTDOCS%%%%DOCSDIR%%/nav_f.png
+%%PORTDOCS%%%%DOCSDIR%%/nav_h.png
 %%PORTDOCS%%%%DOCSDIR%%/node.html
 %%PORTDOCS%%%%DOCSDIR%%/node_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/node_8h__dep__incl.map
 %%PORTDOCS%%%%DOCSDIR%%/node_8h__dep__incl.md5
 %%PORTDOCS%%%%DOCSDIR%%/node_8h__dep__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/open.gif
 %%PORTDOCS%%%%DOCSDIR%%/node_8h__incl.map
 %%PORTDOCS%%%%DOCSDIR%%/node_8h__incl.md5
 %%PORTDOCS%%%%DOCSDIR%%/node_8h__incl.png
@@ -193,6 +198,7 @@ libdata/pkgconfig/xmlwrapp.pc
 %%PORTDOCS%%%%DOCSDIR%%/nodes__view_8h__incl.md5
 %%PORTDOCS%%%%DOCSDIR%%/nodes__view_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/nodes__view_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/open.png
 %%PORTDOCS%%%%DOCSDIR%%/parsing.html
 %%PORTDOCS%%%%DOCSDIR%%/prepare.html
 %%PORTDOCS%%%%DOCSDIR%%/structxml_1_1node_1_1cdata-members.html
@@ -208,12 +214,13 @@ libdata/pkgconfig/xmlwrapp.pc
 %%PORTDOCS%%%%DOCSDIR%%/stylesheet_8h__dep__incl.md5
 %%PORTDOCS%%%%DOCSDIR%%/stylesheet_8h__dep__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/stylesheet_8h__incl.map
-%%PORTDOCS%%%%DOCSDIR%%/tab_b.gif
 %%PORTDOCS%%%%DOCSDIR%%/stylesheet_8h__incl.md5
 %%PORTDOCS%%%%DOCSDIR%%/stylesheet_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/stylesheet_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/tab_l.gif
-%%PORTDOCS%%%%DOCSDIR%%/tab_r.gif
+%%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%%/tips.html
 %%PORTDOCS%%%%DOCSDIR%%/tree__parser_8h.html
@@ -246,6 +253,6 @@ libdata/pkgconfig/xmlwrapp.pc
 %%PORTDOCS%%%%DOCSDIR%%/xsltwrapp_2init_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/xsltwrapp_2init_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/xsltwrapp_8h_source.html
-@dirrm include/xmlwrapp
-%%GNOME:%%@dirrm include/xsltwrapp
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%XSLT%%@dirrm include/xsltwrapp
+@dirrm include/xmlwrapp