Index: Makefile
===================================================================
--- Makefile	(revision 334950)
+++ Makefile	(working copy)
@@ -27,25 +27,12 @@
 CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 CATALOG_PORTS_XML=	${PREFIX}/share/xml/catalog.ports

-NO_STAGE=	yes
 pre-su-install:
-	@[ -d ${DOCBOOKDIR}/ent ] || ${MKDIR} ${DOCBOOKDIR}/ent
+	@[ -d ${STAGEDIR}${DOCBOOKDIR}/ent ] || ${MKDIR} ${STAGEDIR}${DOCBOOKDIR}/ent

 do-install:
 	for file in `${FIND} ${WRKSRC} -type f | ${SED} -e 's|^${WRKSRC}/||' | ${GREP} -v '^\.' | ${SORT}`; do \
-		${INSTALL_DATA} ${WRKSRC}/$$file ${DOCBOOKDIR}/$$file; \
+		${INSTALL_DATA} ${WRKSRC}/$$file ${STAGEDIR}${DOCBOOKDIR}/$$file; \
 	done

-post-install:
-	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" file://${DOCBOOKDIR}/dbpoolx.mod
-	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//DTD DocBook XML V4.1.2//EN" file://${DOCBOOKDIR}/docbookx.dtd
-	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" file://${DOCBOOKDIR}/dbcentx.mod
-	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" file://${DOCBOOKDIR}/dbnotnx.mod
-	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" file://${DOCBOOKDIR}/dbgenent.mod
-	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" file://${DOCBOOKDIR}/dbhierx.mod
-	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//DTD XML Exchange Table Model 19990315//EN" file://${DOCBOOKDIR}/soextblx.dtd
-	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" file://${DOCBOOKDIR}/calstblx.dtd
-	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add rewriteSystem "http://www.oasis-open.org/docbook/xml/4.1.2" file://${DOCBOOKDIR}
-	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add rewriteURI "http://www.oasis-open.org/docbook/xml/4.1.2" file://${DOCBOOKDIR}
-
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 334950)
+++ pkg-plist	(working copy)
@@ -52,5 +52,4 @@
 share/xml/docbook/%%DTD_VERSION%%/soextblx.dtd
 @dirrm share/xml/docbook/%%DTD_VERSION%%/ent
 @dirrm share/xml/docbook/%%DTD_VERSION%%
-@unexec /bin/rmdir %D/share/xml/docbook 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/xml 2>/dev/null || /usr/bin/true
+@dirrmtry share/xml/docbook