7 files changed, 16 insertions, 10 deletions

diff --git a/textproc/docbook-500/Makefile b/textproc/docbook-500/Makefile
index 740b0147c856..ead9d79a8bc9 100644
--- a/textproc/docbook-500/Makefile
+++ b/textproc/docbook-500/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTVERSION=	5.0
-PORTREVISION=	3
+PORTREVISION=	4
 PKGNAMESUFFIX=	500
 
 MAINTAINER=	gabor@FreeBSD.org
@@ -13,6 +13,7 @@ HAS_MANUAL_CATALOG_FILE=	yes
 NO_DISTNAME_FIX=	yes
 XML_DTD=	yes
 MANUAL_DOCS=	yes
+NO_DTD_SUBDIR=	yes
 
 OPTIONS_DEFINE=	DTD SCHEMA RELAX_NG SCHEMATRON NVDL TOOLS XMLCHARENT DOCS
 OPTIONS_DEFAULT=	DTD SCHEMA RELAX_NG SCHEMATRON NVDL TOOLS XMLCHARENT
diff --git a/textproc/docbook-sk/Makefile b/textproc/docbook-sk/Makefile
index eb0b689b5e2c..3992348ac3cc 100644
--- a/textproc/docbook-sk/Makefile
+++ b/textproc/docbook-sk/Makefile
@@ -13,7 +13,7 @@ NO_ISOCAT=	yes
 XML_DTD=	yes
 HAS_MANUAL_CATALOG_FILE=	yes
 
-DTD_SUBDIR?=	${PORTNAME:S/-sk//}
+DTD_NAME?=	${PORTNAME:S/-sk//}
 
 PORTDOCS=	ChangeLog *.txt
 
diff --git a/textproc/docbook-xml-430/Makefile b/textproc/docbook-xml-430/Makefile
index dc68ec3f9fe7..00bd026dd890 100644
--- a/textproc/docbook-xml-430/Makefile
+++ b/textproc/docbook-xml-430/Makefile
@@ -13,7 +13,7 @@ NO_ISOCAT=	yes
 XML_DTD=	yes
 HAS_MANUAL_CATALOG_FILE=	yes
 
-DTD_SUBDIR?=	${PORTNAME:S/-xml//}
+DTD_NAME?=	${PORTNAME:S/-xml//}
 
 PORTDOCS=	ChangeLog README
 
diff --git a/textproc/docbook-xml-440/Makefile b/textproc/docbook-xml-440/Makefile
index d6d887056bcb..10a2ada43b17 100644
--- a/textproc/docbook-xml-440/Makefile
+++ b/textproc/docbook-xml-440/Makefile
@@ -16,7 +16,7 @@ MANUAL_DOCS=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-DTD_SUBDIR=	${PORTNAME:S/-xml//}
+DTD_NAME=	${PORTNAME:S/-xml//}
 
 PORTDOCS=	*
 
diff --git a/textproc/docbook-xml-450/Makefile b/textproc/docbook-xml-450/Makefile
index 769183c7ce57..9032b465f42b 100644
--- a/textproc/docbook-xml-450/Makefile
+++ b/textproc/docbook-xml-450/Makefile
@@ -15,7 +15,7 @@ MANUAL_DOCS=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-DTD_SUBDIR=	${PORTNAME:S/-xml//}
+DTD_NAME=	${PORTNAME:S/-xml//}
 
 PORTDOCS=	*
 
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile
index 0a2683a96da4..49e45b8461c3 100644
--- a/textproc/docbook-xml/Makefile
+++ b/textproc/docbook-xml/Makefile
@@ -14,7 +14,7 @@ NO_ISOCAT=	yes
 XML_DTD=	yes
 HAS_MANUAL_CATALOG_FILE=	yes
 
-DTD_SUBDIR?=	${PORTNAME:S/-xml//}
+DTD_NAME?=	${PORTNAME:S/-xml//}
 
 PORTDOCS=	README ChangeLog
 
diff --git a/textproc/docbook/bsd.docbook.mk b/textproc/docbook/bsd.docbook.mk
index 9f8ae0f55584..a9713a3047e3 100644
--- a/textproc/docbook/bsd.docbook.mk
+++ b/textproc/docbook/bsd.docbook.mk
@@ -35,9 +35,12 @@ SGMLCAT=	share/sgml/catalog.ports
 ISOCAT=		share/sgml/iso8879/catalog
 XMLCAT=		share/xml/catalog.ports
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION}
-DTD_SUBDIR?=	${PORTNAME}
+DTD_NAME?=	${PORTNAME}
 DTD_VERSION?=	${PORTVERSION}
-DTDDIR?=	share/${XML_SGML}/${DTD_SUBDIR}/${DTD_VERSION}/dtd
+.ifndef NO_DTD_SUBDIR
+DTD_SUBDIR?=	/dtd
+.endif
+DTDDIR?=	share/${XML_SGML}/${DTD_NAME}/${DTD_VERSION}${DTD_SUBDIR}
 PLIST_SUB+=	XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} XMLCAT=${XMLCAT} \
 		DTDDIR=${DTDDIR}
 
@@ -72,8 +75,10 @@ do-install:
 	${MV} ${STAGEDIR}${PREFIX}/${DTDDIR}/${f} ${STAGEDIR}${DOCSDIR}
 .  endfor
 .endif
-	@${ECHO_CMD} "@dirrm share/${XML_SGML}/${DTD_SUBDIR}/${DTD_VERSION}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrmtry share/${XML_SGML}/${DTD_SUBDIR}" >> ${TMPPLIST}
+.ifndef NO_DTD_SUBDIR
+	@${ECHO_CMD} "@dirrm share/${XML_SGML}/${DTD_NAME}/${DTD_VERSION}" >> ${TMPPLIST}
+.endif
+	@${ECHO_CMD} "@dirrmtry share/${XML_SGML}/${DTD_NAME}" >> ${TMPPLIST}
 .if defined(PORTDOCS)
 	@${ECHO_CMD} "@dirrmtry share/doc/${PORTNAME}" >> ${TMPPLIST}
 .endif