Major cleanup.

Note that storage directory is changed.

PR:		ports/34054 (in concept)
Submitted by:	des

8 files changed, 108 insertions, 158 deletions

diff --git a/textproc/docbook-sk/Makefile b/textproc/docbook-sk/Makefile
index ee4a2cc3fd4e..d67da193aa6c 100644
--- a/textproc/docbook-sk/Makefile
+++ b/textproc/docbook-sk/Makefile
@@ -5,36 +5,37 @@
 # $FreeBSD$
 #
 
-PORTNAME=	docbook-xml
+PORTNAME=	docbook
+PKGNAMESUFFIX=	-xml
 PORTVERSION=	4.1.2
+PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.docbook.org/xml/4.1.2/
+MASTER_SITES=	http://www.docbook.org/xml/${PORTVERSION}/
 DISTNAME=	docbkx412
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
+RUN_DEPENDS=	${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+
 USE_ZIP=	YES
 NO_BUILD=	YES
 NO_WRKSUBDIR=	YES
+PLIST_SUB=	DTD_VERSION=${PORTVERSION} \
+		MKCATALOG=${MKCATALOG} CATALOG=${CATALOG}
 
-INSTDIR=	${PREFIX}/share/xml
-DTDDIR=		${INSTDIR}/docbook
-ENTDIR=		${INSTDIR}/docbook/ent
-DTDFILES=	calstblx.dtd dbcentx.mod dbgenent.mod dbhierx.mod \
-		dbnotnx.mod dbpoolx.mod docbookx.dtd soextblx.dtd
-MISCFILES=	40chg.txt 41chg.txt readme.txt
-
-post-extract:
-	${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/catalog.tmpl > ${WRKSRC}/catalog
+DOCBOOKDIR=	${PREFIX}/share/xml/${PORTNAME}/${PORTVERSION}
+MKCATALOG=	${LOCALBASE}/sbin/mkcatalog
+CATALOG=	${PREFIX}/share/xml/catalog
 
 pre-install:
-	${MKDIR} ${ENTDIR}
+	@[ -d ${DOCBOOKDIR}/ent ] || ${MKDIR} ${DOCBOOKDIR}/ent
 
 do-install:
-	@(cd ${WRKSRC};     ${INSTALL_DATA} ${DTDFILES} ${DTDDIR})
-	@(cd ${WRKSRC}/ent; ${INSTALL_DATA} *.ent ${ENTDIR})
-	@(cd ${WRKSRC};     ${INSTALL_DATA} ${MISCFILES} ${DTDDIR})
-	${INSTALL_DATA} ${WRKSRC}/catalog ${INSTDIR}
-	${INSTALL_DATA} ${FILESDIR}/catalog.docbook ${DTDDIR}/catalog
+	for file in `unzip -l ${DISTDIR}/${DISTFILES}|${AWK} '/:[0-9].*[^\/]$$/{print $$4}'`; do \
+		${INSTALL_DATA} ${WRKSRC}/$$file ${DOCBOOKDIR}/$$file; \
+	done
+
+post-install:
+	${MKCATALOG} -q -c ${CATALOG} install docbook/${PORTVERSION} docbook.cat
 
 .include <bsd.port.mk>
diff --git a/textproc/docbook-sk/files/catalog.docbook b/textproc/docbook-sk/files/catalog.docbook
deleted file mode 100644
index 118fcd9085ad..000000000000
--- a/textproc/docbook-sk/files/catalog.docbook
+++ /dev/null
@@ -1,27 +0,0 @@
-PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd"
-PUBLIC "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" "calstblx.dtd"
-PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "soextblx.dtd"
-PUBLIC "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" "dbpoolx.mod"
-PUBLIC "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" "dbhierx.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" "dbgenent.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" "dbnotnx.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" "dbcentx.mod"
-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "ent/iso-dia.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "ent/iso-tech.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "ent/iso-lat2.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "ent/iso-grk1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "ent/iso-grk2.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "ent/iso-grk3.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "ent/iso-grk4.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "ent/iso-amsa.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "ent/iso-amsb.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "ent/iso-amsc.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "ent/iso-amsn.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "ent/iso-amso.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "ent/iso-amsr.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "ent/iso-box.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "ent/iso-cyr1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "ent/iso-cyr2.ent"
diff --git a/textproc/docbook-sk/files/catalog.tmpl b/textproc/docbook-sk/files/catalog.tmpl
deleted file mode 100644
index 4165882fd08a..000000000000
--- a/textproc/docbook-sk/files/catalog.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-CATALOG "%%PREFIX%%/share/xml/docbook/catalog"
diff --git a/textproc/docbook-sk/pkg-plist b/textproc/docbook-sk/pkg-plist
index 91d329405f3f..c86be1b41305 100644
--- a/textproc/docbook-sk/pkg-plist
+++ b/textproc/docbook-sk/pkg-plist
@@ -1,35 +1,37 @@
-share/xml/catalog
-share/xml/docbook/40chg.txt
-share/xml/docbook/41chg.txt
-share/xml/docbook/calstblx.dtd
-share/xml/docbook/catalog
-share/xml/docbook/dbcentx.mod
-share/xml/docbook/dbgenent.mod
-share/xml/docbook/dbhierx.mod
-share/xml/docbook/dbnotnx.mod
-share/xml/docbook/dbpoolx.mod
-share/xml/docbook/docbookx.dtd
-share/xml/docbook/ent/iso-amsa.ent
-share/xml/docbook/ent/iso-amsb.ent
-share/xml/docbook/ent/iso-amsc.ent
-share/xml/docbook/ent/iso-amsn.ent
-share/xml/docbook/ent/iso-amso.ent
-share/xml/docbook/ent/iso-amsr.ent
-share/xml/docbook/ent/iso-box.ent
-share/xml/docbook/ent/iso-cyr1.ent
-share/xml/docbook/ent/iso-cyr2.ent
-share/xml/docbook/ent/iso-dia.ent
-share/xml/docbook/ent/iso-grk1.ent
-share/xml/docbook/ent/iso-grk2.ent
-share/xml/docbook/ent/iso-grk3.ent
-share/xml/docbook/ent/iso-grk4.ent
-share/xml/docbook/ent/iso-lat1.ent
-share/xml/docbook/ent/iso-lat2.ent
-share/xml/docbook/ent/iso-num.ent
-share/xml/docbook/ent/iso-pub.ent
-share/xml/docbook/ent/iso-tech.ent
-share/xml/docbook/readme.txt
-share/xml/docbook/soextblx.dtd
-@dirrm share/xml/docbook/ent
+share/xml/docbook/%%DTD_VERSION%%/40chg.txt
+share/xml/docbook/%%DTD_VERSION%%/41chg.txt
+share/xml/docbook/%%DTD_VERSION%%/ChangeLog
+share/xml/docbook/%%DTD_VERSION%%/calstblx.dtd
+share/xml/docbook/%%DTD_VERSION%%/dbcentx.mod
+share/xml/docbook/%%DTD_VERSION%%/dbgenent.mod
+share/xml/docbook/%%DTD_VERSION%%/dbhierx.mod
+share/xml/docbook/%%DTD_VERSION%%/dbnotnx.mod
+share/xml/docbook/%%DTD_VERSION%%/dbpoolx.mod
+@unexec %%MKCATALOG%% -q -c%%CATALOG%% deinstall docbook/%%DTD_VERSION%% docbook.cat
+share/xml/docbook/%%DTD_VERSION%%/docbook.cat
+@exec %%MKCATALOG%% -q -c%%CATALOG%% install docbook/%%DTD_VERSION%% docbook.cat
+share/xml/docbook/%%DTD_VERSION%%/docbookx.dtd
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsa.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsb.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsc.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsn.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-amso.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsr.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-box.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-cyr1.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-cyr2.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-dia.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-grk1.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-grk2.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-grk3.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-grk4.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-lat1.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-lat2.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-num.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-pub.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-tech.ent
+share/xml/docbook/%%DTD_VERSION%%/readme.txt
+share/xml/docbook/%%DTD_VERSION%%/soextblx.dtd
+@dirrm share/xml/docbook/%%DTD_VERSION%%/ent
+@dirrm share/xml/docbook/%%DTD_VERSION%%
 @unexec rmdir %D/share/xml/docbook 2>/dev/null || true
-@unexec rmdir %D/share/xml 2>/dev/null || true
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile
index ee4a2cc3fd4e..d67da193aa6c 100644
--- a/textproc/docbook-xml/Makefile
+++ b/textproc/docbook-xml/Makefile
@@ -5,36 +5,37 @@
 # $FreeBSD$
 #
 
-PORTNAME=	docbook-xml
+PORTNAME=	docbook
+PKGNAMESUFFIX=	-xml
 PORTVERSION=	4.1.2
+PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.docbook.org/xml/4.1.2/
+MASTER_SITES=	http://www.docbook.org/xml/${PORTVERSION}/
 DISTNAME=	docbkx412
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
+RUN_DEPENDS=	${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+
 USE_ZIP=	YES
 NO_BUILD=	YES
 NO_WRKSUBDIR=	YES
+PLIST_SUB=	DTD_VERSION=${PORTVERSION} \
+		MKCATALOG=${MKCATALOG} CATALOG=${CATALOG}
 
-INSTDIR=	${PREFIX}/share/xml
-DTDDIR=		${INSTDIR}/docbook
-ENTDIR=		${INSTDIR}/docbook/ent
-DTDFILES=	calstblx.dtd dbcentx.mod dbgenent.mod dbhierx.mod \
-		dbnotnx.mod dbpoolx.mod docbookx.dtd soextblx.dtd
-MISCFILES=	40chg.txt 41chg.txt readme.txt
-
-post-extract:
-	${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/catalog.tmpl > ${WRKSRC}/catalog
+DOCBOOKDIR=	${PREFIX}/share/xml/${PORTNAME}/${PORTVERSION}
+MKCATALOG=	${LOCALBASE}/sbin/mkcatalog
+CATALOG=	${PREFIX}/share/xml/catalog
 
 pre-install:
-	${MKDIR} ${ENTDIR}
+	@[ -d ${DOCBOOKDIR}/ent ] || ${MKDIR} ${DOCBOOKDIR}/ent
 
 do-install:
-	@(cd ${WRKSRC};     ${INSTALL_DATA} ${DTDFILES} ${DTDDIR})
-	@(cd ${WRKSRC}/ent; ${INSTALL_DATA} *.ent ${ENTDIR})
-	@(cd ${WRKSRC};     ${INSTALL_DATA} ${MISCFILES} ${DTDDIR})
-	${INSTALL_DATA} ${WRKSRC}/catalog ${INSTDIR}
-	${INSTALL_DATA} ${FILESDIR}/catalog.docbook ${DTDDIR}/catalog
+	for file in `unzip -l ${DISTDIR}/${DISTFILES}|${AWK} '/:[0-9].*[^\/]$$/{print $$4}'`; do \
+		${INSTALL_DATA} ${WRKSRC}/$$file ${DOCBOOKDIR}/$$file; \
+	done
+
+post-install:
+	${MKCATALOG} -q -c ${CATALOG} install docbook/${PORTVERSION} docbook.cat
 
 .include <bsd.port.mk>
diff --git a/textproc/docbook-xml/files/catalog.docbook b/textproc/docbook-xml/files/catalog.docbook
deleted file mode 100644
index 118fcd9085ad..000000000000
--- a/textproc/docbook-xml/files/catalog.docbook
+++ /dev/null
@@ -1,27 +0,0 @@
-PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd"
-PUBLIC "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" "calstblx.dtd"
-PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "soextblx.dtd"
-PUBLIC "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" "dbpoolx.mod"
-PUBLIC "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" "dbhierx.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" "dbgenent.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" "dbnotnx.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" "dbcentx.mod"
-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "ent/iso-dia.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "ent/iso-tech.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "ent/iso-lat2.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "ent/iso-grk1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "ent/iso-grk2.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "ent/iso-grk3.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "ent/iso-grk4.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "ent/iso-amsa.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "ent/iso-amsb.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "ent/iso-amsc.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "ent/iso-amsn.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "ent/iso-amso.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "ent/iso-amsr.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "ent/iso-box.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "ent/iso-cyr1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "ent/iso-cyr2.ent"
diff --git a/textproc/docbook-xml/files/catalog.tmpl b/textproc/docbook-xml/files/catalog.tmpl
deleted file mode 100644
index 4165882fd08a..000000000000
--- a/textproc/docbook-xml/files/catalog.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-CATALOG "%%PREFIX%%/share/xml/docbook/catalog"
diff --git a/textproc/docbook-xml/pkg-plist b/textproc/docbook-xml/pkg-plist
index 91d329405f3f..c86be1b41305 100644
--- a/textproc/docbook-xml/pkg-plist
+++ b/textproc/docbook-xml/pkg-plist
@@ -1,35 +1,37 @@
-share/xml/catalog
-share/xml/docbook/40chg.txt
-share/xml/docbook/41chg.txt
-share/xml/docbook/calstblx.dtd
-share/xml/docbook/catalog
-share/xml/docbook/dbcentx.mod
-share/xml/docbook/dbgenent.mod
-share/xml/docbook/dbhierx.mod
-share/xml/docbook/dbnotnx.mod
-share/xml/docbook/dbpoolx.mod
-share/xml/docbook/docbookx.dtd
-share/xml/docbook/ent/iso-amsa.ent
-share/xml/docbook/ent/iso-amsb.ent
-share/xml/docbook/ent/iso-amsc.ent
-share/xml/docbook/ent/iso-amsn.ent
-share/xml/docbook/ent/iso-amso.ent
-share/xml/docbook/ent/iso-amsr.ent
-share/xml/docbook/ent/iso-box.ent
-share/xml/docbook/ent/iso-cyr1.ent
-share/xml/docbook/ent/iso-cyr2.ent
-share/xml/docbook/ent/iso-dia.ent
-share/xml/docbook/ent/iso-grk1.ent
-share/xml/docbook/ent/iso-grk2.ent
-share/xml/docbook/ent/iso-grk3.ent
-share/xml/docbook/ent/iso-grk4.ent
-share/xml/docbook/ent/iso-lat1.ent
-share/xml/docbook/ent/iso-lat2.ent
-share/xml/docbook/ent/iso-num.ent
-share/xml/docbook/ent/iso-pub.ent
-share/xml/docbook/ent/iso-tech.ent
-share/xml/docbook/readme.txt
-share/xml/docbook/soextblx.dtd
-@dirrm share/xml/docbook/ent
+share/xml/docbook/%%DTD_VERSION%%/40chg.txt
+share/xml/docbook/%%DTD_VERSION%%/41chg.txt
+share/xml/docbook/%%DTD_VERSION%%/ChangeLog
+share/xml/docbook/%%DTD_VERSION%%/calstblx.dtd
+share/xml/docbook/%%DTD_VERSION%%/dbcentx.mod
+share/xml/docbook/%%DTD_VERSION%%/dbgenent.mod
+share/xml/docbook/%%DTD_VERSION%%/dbhierx.mod
+share/xml/docbook/%%DTD_VERSION%%/dbnotnx.mod
+share/xml/docbook/%%DTD_VERSION%%/dbpoolx.mod
+@unexec %%MKCATALOG%% -q -c%%CATALOG%% deinstall docbook/%%DTD_VERSION%% docbook.cat
+share/xml/docbook/%%DTD_VERSION%%/docbook.cat
+@exec %%MKCATALOG%% -q -c%%CATALOG%% install docbook/%%DTD_VERSION%% docbook.cat
+share/xml/docbook/%%DTD_VERSION%%/docbookx.dtd
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsa.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsb.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsc.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsn.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-amso.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-amsr.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-box.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-cyr1.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-cyr2.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-dia.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-grk1.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-grk2.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-grk3.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-grk4.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-lat1.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-lat2.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-num.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-pub.ent
+share/xml/docbook/%%DTD_VERSION%%/ent/iso-tech.ent
+share/xml/docbook/%%DTD_VERSION%%/readme.txt
+share/xml/docbook/%%DTD_VERSION%%/soextblx.dtd
+@dirrm share/xml/docbook/%%DTD_VERSION%%/ent
+@dirrm share/xml/docbook/%%DTD_VERSION%%
 @unexec rmdir %D/share/xml/docbook 2>/dev/null || true
-@unexec rmdir %D/share/xml 2>/dev/null || true