author: Mathieu Arnold <mat@FreeBSD.org> 2014-02-18 11:43:14 +0000
committer: Mathieu Arnold <mat@FreeBSD.org> 2014-02-18 11:43:14 +0000
commit: da20a902ce24d5a49b46fb8b64461e7c8d894f88 (patch)
tree: 9cda45745964271508016c620ebfba2bd7d1f68f /textproc
parent: 8db5eef6fa61b9abe61158ecfc1ddaa1a7c11951 (diff)
download: ports-da20a902ce24d5a49b46fb8b64461e7c8d894f88.tar.gz
ports-da20a902ce24d5a49b46fb8b64461e7c8d894f88.zip
32 files changed, 395 insertions, 677 deletions
diff --git a/textproc/docbook-241/Makefile b/textproc/docbook-241/Makefile
index 9e987265ca52..6ba510ba0d43 100644
--- a/textproc/docbook-241/Makefile
+++ b/textproc/docbook-241/Makefile
@@ -1,39 +1,16 @@
 # Created by: nik
 # $FreeBSD$
 
-PORTNAME=	docbook
 PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.oasis-open.org/docbook/sgml/2.4.1/
 PKGNAMESUFFIX=	241
 DISTNAME=	docbk241
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	V2.4.1 of the DocBook DTD, designed for technical documentation
 
-RUN_DEPENDS=	${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
-		${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
-
-NO_MTREE=	yes
-NO_BUILD=	yes
-EXTRACT_AFTER_ARGS=	-s ,^,${DISTNAME}/,
-
-DTDDIR=		${PREFIX}/share/sgml/docbook/2.4.1/dtd
-PLIST_SUB+=	XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \
-		DTDDIR=${DTDDIR:S/${PREFIX}\///}
-
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-SGMLCAT=	${PREFIX}/share/sgml/catalog.ports
-ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
-
-SUB_FILES=	catalog
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${DTDDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DTDDIR}
-	${INSTALL_DATA} ${WRKDIR}/catalog ${STAGEDIR}${DTDDIR}
+HAS_OASIS_MASTER_SITE=	yes
 
+.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>
diff --git a/textproc/docbook-241/pkg-plist b/textproc/docbook-241/pkg-plist
index 8aaee0d793b4..89f529bc7662 100644
--- a/textproc/docbook-241/pkg-plist
+++ b/textproc/docbook-241/pkg-plist
@@ -1,8 +1,7 @@
-@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog
-%%DTDDIR%%/241chg.txt
-%%DTDDIR%%/announce.txt
 %%DTDDIR%%/calstbl.mod
 %%DTDDIR%%/catalog
+@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
+@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
 %%DTDDIR%%/dbgenent.mod
 %%DTDDIR%%/dbhier.mod
 %%DTDDIR%%/dbpool.mod
@@ -28,7 +27,4 @@
 %%DTDDIR%%/iso-num.gml
 %%DTDDIR%%/iso-pub.gml
 %%DTDDIR%%/iso-tech.gml
-@dirrmtry %%DTDDIR%%
-@dirrm share/sgml/docbook/2.4.1
-@dirrmtry share/sgml/docbook
-@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog
+@dirrm %%DTDDIR%%
diff --git a/textproc/docbook-300/Makefile b/textproc/docbook-300/Makefile
index 6f07125308a8..26d2d74df33b 100644
--- a/textproc/docbook-300/Makefile
+++ b/textproc/docbook-300/Makefile
@@ -1,38 +1,15 @@
 # Created by: nik
 # $FreeBSD$
 
-PORTNAME=	docbook
 PORTVERSION=	3.0
-PORTREVISION=	4
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.oasis-open.org/docbook/sgml/${PORTVERSION}/
+PORTREVISION=	5
 PKGNAMESUFFIX=	300
 DISTNAME=	docbk30
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	V3.0 of the DocBook DTD, designed for technical documentation
 
-RUN_DEPENDS=	${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
-		${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
-
-NO_MTREE=	yes
-NO_BUILD=	yes
-EXTRACT_AFTER_ARGS=	-s ,^,${DISTNAME}/,
-
-DTDDIR=		${PREFIX}/share/sgml/docbook/3.0/dtd
-PLIST_SUB+=	XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \
-		DTDDIR=${DTDDIR:S/${PREFIX}\///}
-
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-SGMLCAT=	${PREFIX}/share/sgml/catalog.ports
-ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
-
-SUB_FILES=	catalog
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${DTDDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DTDDIR}
-	${INSTALL_DATA} ${WRKDIR}/catalog ${STAGEDIR}${DTDDIR}
+HAS_OASIS_MASTER_SITE=	yes
 
+.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>
diff --git a/textproc/docbook-300/pkg-plist b/textproc/docbook-300/pkg-plist
index 5292ba1d5ec2..1383c79ad61b 100644
--- a/textproc/docbook-300/pkg-plist
+++ b/textproc/docbook-300/pkg-plist
@@ -1,9 +1,7 @@
-@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog
-%%DTDDIR%%/30chg.txt
-%%DTDDIR%%/40issues.txt
-%%DTDDIR%%/announce.txt
 %%DTDDIR%%/cals-tbl.dtd
 %%DTDDIR%%/catalog
+@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
+@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
 %%DTDDIR%%/dbgenent.mod
 %%DTDDIR%%/dbhier.mod
 %%DTDDIR%%/dbpool.mod
@@ -11,6 +9,3 @@
 %%DTDDIR%%/docbook.dcl
 %%DTDDIR%%/docbook.dtd
 @dirrm %%DTDDIR%%
-@dirrm share/sgml/docbook/3.0
-@dirrmtry share/sgml/docbook
-@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog
diff --git a/textproc/docbook-310/Makefile b/textproc/docbook-310/Makefile
index 2af8441ba2ea..c41905c88aba 100644
--- a/textproc/docbook-310/Makefile
+++ b/textproc/docbook-310/Makefile
@@ -1,38 +1,16 @@
 # Created by: nik
 # $FreeBSD$
 
-PORTNAME=	docbook
 PORTVERSION=	3.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.docbook.org/sgml/3.1/
 PKGNAMESUFFIX=	310
 DISTNAME=	docbk31
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	V3.1 of the DocBook DTD, designed for technical documentation
 
-RUN_DEPENDS=	${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
-		${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
-
-NO_MTREE=	yes
-NO_BUILD=	yes
-EXTRACT_AFTER_ARGS=	-s ,^,${DISTNAME}/,
-
-DTDDIR=		${PREFIX}/share/sgml/docbook/3.1/dtd
-PLIST_SUB+=	XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \
-		DTDDIR=${DTDDIR:S/${PREFIX}\///}
-
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-SGMLCAT=	${PREFIX}/share/sgml/catalog.ports
-ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
-
-SUB_FILES=	catalog
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${DTDDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DTDDIR}
-	${INSTALL_DATA} ${WRKDIR}/catalog ${STAGEDIR}${DTDDIR}
+PORTDOCS=	ChangeLog *.txt
 
+.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>
diff --git a/textproc/docbook-310/pkg-plist b/textproc/docbook-310/pkg-plist
index 343e8c18649e..bdc1825c1b08 100644
--- a/textproc/docbook-310/pkg-plist
+++ b/textproc/docbook-310/pkg-plist
@@ -1,10 +1,7 @@
-@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog
-%%DTDDIR%%/31chg.txt
-%%DTDDIR%%/40issues.txt
-%%DTDDIR%%/50issues.txt
-%%DTDDIR%%/ChangeLog
 %%DTDDIR%%/cals-tbl.dtd
 %%DTDDIR%%/catalog
+@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
+@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
 %%DTDDIR%%/dbcent.mod
 %%DTDDIR%%/dbgenent.mod
 %%DTDDIR%%/dbhier.mod
@@ -13,8 +10,4 @@
 %%DTDDIR%%/docbook.cat
 %%DTDDIR%%/docbook.dcl
 %%DTDDIR%%/docbook.dtd
-%%DTDDIR%%/readme.txt
 @dirrm %%DTDDIR%%
-@dirrm share/sgml/docbook/3.1
-@dirrmtry share/sgml/docbook
-@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog
diff --git a/textproc/docbook-400/Makefile b/textproc/docbook-400/Makefile
index bc6c151c3b82..45eff76fd84f 100644
--- a/textproc/docbook-400/Makefile
+++ b/textproc/docbook-400/Makefile
@@ -1,38 +1,15 @@
 # Created by: asmodai
 # $FreeBSD$
 
-PORTNAME=	docbook
 PORTVERSION=	4.0
-PORTREVISION=	3
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.oasis-open.org/docbook/sgml/4.0/
+PORTREVISION=	4
 PKGNAMESUFFIX=	400
 DISTNAME=	docbk40
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	V4.0 of the DocBook DTD, designed for technical documentation
 
-RUN_DEPENDS=	${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
-		${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
-
-NO_MTREE=	yes
-NO_BUILD=	yes
-EXTRACT_AFTER_ARGS=	-s ,^,${DISTNAME}/,
-
-DTDDIR=		${PREFIX}/share/sgml/docbook/4.0/dtd
-PLIST_SUB+=	XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \
-		DTDDIR=${DTDDIR:S/${PREFIX}\///}
-
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-SGMLCAT=	${PREFIX}/share/sgml/catalog.ports
-ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
-
-SUB_FILES=	catalog
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${DTDDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DTDDIR}
-	${INSTALL_DATA} ${WRKDIR}/catalog ${STAGEDIR}${DTDDIR}
+HAS_OASIS_MASTER_SITE=	yes
 
+.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>
diff --git a/textproc/docbook-400/pkg-plist b/textproc/docbook-400/pkg-plist
index 6db5f6fe7d9a..bdc1825c1b08 100644
--- a/textproc/docbook-400/pkg-plist
+++ b/textproc/docbook-400/pkg-plist
@@ -1,8 +1,7 @@
-@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog
-%%DTDDIR%%/40chg.txt
-%%DTDDIR%%/50issues.txt
 %%DTDDIR%%/cals-tbl.dtd
 %%DTDDIR%%/catalog
+@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
+@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
 %%DTDDIR%%/dbcent.mod
 %%DTDDIR%%/dbgenent.mod
 %%DTDDIR%%/dbhier.mod
@@ -11,8 +10,4 @@
 %%DTDDIR%%/docbook.cat
 %%DTDDIR%%/docbook.dcl
 %%DTDDIR%%/docbook.dtd
-%%DTDDIR%%/readme.txt
 @dirrm %%DTDDIR%%
-@dirrm share/sgml/docbook/4.0
-@dirrmtry share/sgml/docbook
-@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog
diff --git a/textproc/docbook-410/Makefile b/textproc/docbook-410/Makefile
index 90847bd73722..a7520797080a 100644
--- a/textproc/docbook-410/Makefile
+++ b/textproc/docbook-410/Makefile
@@ -1,38 +1,15 @@
 # Created by: murray
 # $FreeBSD$
 
-PORTNAME=	docbook
 PORTVERSION=	4.1
-PORTREVISION=	4
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.docbook.org/sgml/4.1/
+PORTREVISION=	5
 PKGNAMESUFFIX=	410
 DISTNAME=	docbk41
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	V4.1 of the DocBook DTD, designed for technical documentation
 
-RUN_DEPENDS=	${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
-		${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
-
-NO_MTREE=	yes
-NO_BUILD=	yes
-EXTRACT_AFTER_ARGS=	-s ,^,${DISTNAME}/,
-
-DTDDIR=		${PREFIX}/share/sgml/${PORTNAME}/${PORTVERSION}/dtd
-PLIST_SUB+=	XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \
-		DTDDIR=${DTDDIR:S/${PREFIX}\///}
-
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-SGMLCAT=	${PREFIX}/share/sgml/catalog.ports
-ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
-
-SUB_FILES=	catalog
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${DTDDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DTDDIR}
-	${INSTALL_DATA} ${WRKDIR}/catalog ${STAGEDIR}${DTDDIR}
+PORTDOCS=	ChangeLog *.txt
 
+.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>
diff --git a/textproc/docbook-410/pkg-plist b/textproc/docbook-410/pkg-plist
index 20d85cf5e676..bdc1825c1b08 100644
--- a/textproc/docbook-410/pkg-plist
+++ b/textproc/docbook-410/pkg-plist
@@ -1,10 +1,7 @@
-@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog
-%%DTDDIR%%/40chg.txt
-%%DTDDIR%%/41chg.txt
-%%DTDDIR%%/50issues.txt
-%%DTDDIR%%/ChangeLog
 %%DTDDIR%%/cals-tbl.dtd
 %%DTDDIR%%/catalog
+@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
+@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
 %%DTDDIR%%/dbcent.mod
 %%DTDDIR%%/dbgenent.mod
 %%DTDDIR%%/dbhier.mod
@@ -13,8 +10,4 @@
 %%DTDDIR%%/docbook.cat
 %%DTDDIR%%/docbook.dcl
 %%DTDDIR%%/docbook.dtd
-%%DTDDIR%%/readme.txt
 @dirrm %%DTDDIR%%
-@dirrm share/sgml/docbook/4.1
-@dirrmtry share/sgml/docbook
-@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog
diff --git a/textproc/docbook-420/Makefile b/textproc/docbook-420/Makefile
index 9a7ee8400e64..d39d73a8957e 100644
--- a/textproc/docbook-420/Makefile
+++ b/textproc/docbook-420/Makefile
@@ -1,42 +1,14 @@
 # Created by: kutulu
 # $FreeBSD$
 
-PORTNAME=	docbook
 PORTVERSION=	4.2
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.docbook.org/sgml/4.2/
-PKGNAMESUFFIX=	-420
+PORTREVISION=	1
+PKGNAMESUFFIX=	420
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	V4.2 of the DocBook DTD, designed for technical documentation
 
-EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
-RUN_DEPENDS=	${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
-		${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
-
-USE_ZIP=	yes
-NO_MTREE=	yes
-NO_BUILD=	yes
-PLIST_SUB=	DTD_NAME=${PORTNAME}
-PLIST_SUB+=	DTD_VERSION=${PORTVERSION}
-PLIST_SUB+=	XMLCATMGR=${XMLCATMGR}
-PLIST_SUB+=	CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
-SUB_FILES+=	catalog
-SUB_LIST+=	ISOCAT=${ISOCAT}
-
-INSTDIR=	${STAGEDIR}${PREFIX}/share/sgml/docbook
-ISOCAT=		${LOCALBASE}/share/sgml/iso8879/catalog
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-CATALOG_PORTS_SGML=	${LOCALBASE}/share/sgml/catalog.ports
-
-do-extract:
-	${MKDIR} ${WRKSRC}
-	${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} \
-		-d ${WRKSRC}
-
-do-install:
-	@${MKDIR} ${INSTDIR}/${PORTVERSION}
-	${INSTALL_DATA} ${WRKSRC}/* ${WRKDIR}/catalog \
-		${INSTDIR}/${PORTVERSION}/
+PORTDOCS=	ChangeLog
 
+.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>
diff --git a/textproc/docbook-420/files/catalog.in b/textproc/docbook-420/files/catalog.in
index 4b86994d889f..28da63f711bb 100644
--- a/textproc/docbook-420/files/catalog.in
+++ b/textproc/docbook-420/files/catalog.in
@@ -84,4 +84,4 @@ PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
   -- End of catalog data for DocBook V4.2 ................................. --
   -- ...................................................................... --
 
-CATALOG "%%ISOCAT%%"
+CATALOG "%%PREFIX%%/share/sgml/iso8879/catalog"
diff --git a/textproc/docbook-420/pkg-plist b/textproc/docbook-420/pkg-plist
index 3ee8d6291a44..b1f4b0f038d0 100644
--- a/textproc/docbook-420/pkg-plist
+++ b/textproc/docbook-420/pkg-plist
@@ -1,19 +1,17 @@
-share/sgml/docbook/4.2/ChangeLog
-share/sgml/docbook/4.2/calstblx.dtd
-@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/%%DTD_VERSION%%/catalog
-share/sgml/docbook/4.2/catalog
-share/sgml/docbook/4.2/catalog.xml
-@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/%%DTD_VERSION%%/catalog
-share/sgml/docbook/4.2/dbcentx.mod
-share/sgml/docbook/4.2/dbgenent.mod
-share/sgml/docbook/4.2/dbhierx.mod
-share/sgml/docbook/4.2/dbnotnx.mod
-share/sgml/docbook/4.2/dbpoolx.mod
-share/sgml/docbook/4.2/docbook.cat
-share/sgml/docbook/4.2/docbook.dcl
-share/sgml/docbook/4.2/docbook.dtd
-share/sgml/docbook/4.2/docbookx.dtd
-share/sgml/docbook/4.2/soextblx.dtd
-share/sgml/docbook/4.2/README
-@dirrm share/sgml/docbook/4.2
-@dirrmtry share/sgml/docbook
+%%DTDDIR%%/calstblx.dtd
+%%DTDDIR%%/catalog
+@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
+@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
+%%DTDDIR%%/catalog.xml
+%%DTDDIR%%/dbcentx.mod
+%%DTDDIR%%/dbgenent.mod
+%%DTDDIR%%/dbhierx.mod
+%%DTDDIR%%/dbnotnx.mod
+%%DTDDIR%%/dbpoolx.mod
+%%DTDDIR%%/docbook.cat
+%%DTDDIR%%/docbook.dcl
+%%DTDDIR%%/docbook.dtd
+%%DTDDIR%%/docbookx.dtd
+%%DTDDIR%%/soextblx.dtd
+%%DTDDIR%%/README
+@dirrm %%DTDDIR%%
diff --git a/textproc/docbook-430/Makefile b/textproc/docbook-430/Makefile
index a74d572c5ea7..f098fc2cf7cc 100644
--- a/textproc/docbook-430/Makefile
+++ b/textproc/docbook-430/Makefile
@@ -1,46 +1,17 @@
 # Created by: hrs
 # $FreeBSD$
 
-PORTNAME=	docbook
 PORTVERSION=	4.3
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.oasis-open.org/docbook/sgml/${PORTVERSION}/
-PKGNAMESUFFIX=	-430
-EXTRACT_SUFX=	.zip
+PORTREVISION=	1
+PKGNAMESUFFIX=	430
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	DocBook/SGML DTD V4.3, designed for technical documentation
 
-RUN_DEPENDS=	${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
-		${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
-
-NO_BUILD=	yes
-EXTRACT_AFTER_ARGS=	-s ,^,${DISTNAME}/,
-
-DTDDIR=		${PREFIX}/share/sgml/${PORTNAME}/${PORTVERSION}
-SGMLCAT=	${PREFIX}/share/sgml/catalog.ports
-ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-
-PLIST_SUB+=	XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \
-		DTDDIR=${DTDDIR:S/${PREFIX}\///}
-
 PORTDOCS=	ChangeLog README
-DTD_FILES=	calstblx.dtd catalog.xml dbcentx.mod dbgenent.mod \
-		dbhierx.mod dbnotnx.mod dbpoolx.mod docbook.cat docbook.dcl \
-		docbook.dtd docbookx.dtd htmltblx.mod soextblx.dtd catalog
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION}
-
-post-extract:
-	${CP} ${WRKSRC}/docbook.cat ${WRKSRC}/catalog
-
-post-patch:
-	${ECHO_CMD} 'CATALOG "${LOCALBASE}/${ISOCAT}"' >> ${WRKSRC}/catalog
 
-do-install:
-	@${MKDIR} ${STAGEDIR}${DTDDIR}
-	${INSTALL_DATA} ${DTD_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DTDDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+HAS_CATALOG_FILE=	yes
+HAS_OASIS_MASTER_SITE=	yes
 
+.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>
diff --git a/textproc/docbook-430/pkg-plist b/textproc/docbook-430/pkg-plist
index cb557fea6226..929851c32e7e 100644
--- a/textproc/docbook-430/pkg-plist
+++ b/textproc/docbook-430/pkg-plist
@@ -1,6 +1,7 @@
-@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog
 %%DTDDIR%%/calstblx.dtd
 %%DTDDIR%%/catalog
+@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
+@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
 %%DTDDIR%%/catalog.xml
 %%DTDDIR%%/dbcentx.mod
 %%DTDDIR%%/dbgenent.mod
@@ -13,7 +14,4 @@
 %%DTDDIR%%/docbookx.dtd
 %%DTDDIR%%/htmltblx.mod
 %%DTDDIR%%/soextblx.dtd
-@dirrmtry %%DTDDIR%%
-@dirrmtry share/sgml/docbook
-@dirrmtry share/doc/docbook
-@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog
+@dirrm %%DTDDIR%%
diff --git a/textproc/docbook-440/Makefile b/textproc/docbook-440/Makefile
index aec43ee8c898..48bc6a6f09ca 100644
--- a/textproc/docbook-440/Makefile
+++ b/textproc/docbook-440/Makefile
@@ -1,47 +1,17 @@
 # Created by: Gabor Kovesdan <gabor@kovesdan.org>
 # $FreeBSD$
 
-PORTNAME=	docbook
 PORTVERSION=	4.4
-PORTREVISION=	2
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.oasis-open.org/docbook/sgml/${PORTVERSION}/
+PORTREVISION=	3
 PKGNAMESUFFIX=	440
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	DocBook/SGML DTD V4.4, designed for technical documentation
 
-RUN_DEPENDS=	${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
-		${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
-
-NO_BUILD=	yes
-EXTRACT_AFTER_ARGS=	-s ,^,${DISTNAME}/,
-
-DTDDIR=		${PREFIX}/share/sgml/${PORTNAME}/${PORTVERSION}
-SGMLCAT=	${PREFIX}/share/sgml/catalog.ports
-ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-
-PLIST_SUB+=	XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \
-		DTDDIR=${DTDDIR:S/${PREFIX}\///}
+HAS_OASIS_MASTER_SITE=	yes
+HAS_CATALOG_FILE=	yes
 
 PORTDOCS=	ChangeLog README
-DTD_FILES=	calstblx.dtd catalog.xml dbcentx.mod dbgenent.mod \
-		dbhierx.mod dbnotnx.mod dbpoolx.mod docbook.cat docbook.dcl \
-		docbook.dtd docbookx.dtd htmltblx.mod soextblx.dtd catalog
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION}
-
-post-extract:
-	${CP} ${WRKSRC}/docbook.cat ${WRKSRC}/catalog
-
-post-patch:
-	${ECHO_CMD} 'CATALOG "${LOCALBASE}/${ISOCAT}"' >> ${WRKSRC}/catalog
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${DTDDIR}
-	${INSTALL_DATA} ${DTD_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DTDDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
+.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>
diff --git a/textproc/docbook-440/pkg-plist b/textproc/docbook-440/pkg-plist
index 0b0182a7189c..929851c32e7e 100644
--- a/textproc/docbook-440/pkg-plist
+++ b/textproc/docbook-440/pkg-plist
@@ -1,6 +1,7 @@
-@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog
 %%DTDDIR%%/calstblx.dtd
 %%DTDDIR%%/catalog
+@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
+@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
 %%DTDDIR%%/catalog.xml
 %%DTDDIR%%/dbcentx.mod
 %%DTDDIR%%/dbgenent.mod
@@ -13,6 +14,4 @@
 %%DTDDIR%%/docbookx.dtd
 %%DTDDIR%%/htmltblx.mod
 %%DTDDIR%%/soextblx.dtd
-@dirrmtry %%DTDDIR%%
-@dirrmtry share/sgml/docbook
-@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog
+@dirrm %%DTDDIR%%
diff --git a/textproc/docbook-450/Makefile b/textproc/docbook-450/Makefile
index d0ace788b6d3..dd4928fc6b6e 100644
--- a/textproc/docbook-450/Makefile
+++ b/textproc/docbook-450/Makefile
@@ -1,47 +1,17 @@
 # Created by: Gabor Kovesdan <gabor@kovesdan.org>
 # $FreeBSD$
 
-PORTNAME=	docbook
 PORTVERSION=	4.5
-PORTREVISION=	2
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.oasis-open.org/docbook/sgml/${PORTVERSION}/
+PORTREVISION=	3
 PKGNAMESUFFIX=	450
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	DocBook/SGML DTD V4.5, designed for technical documentation
 
-RUN_DEPENDS=	${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
-		${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
-
-NO_BUILD=	yes
-EXTRACT_AFTER_ARGS=	-s ,^,${DISTNAME}/,
-
-DTDDIR=		${PREFIX}/share/sgml/${PORTNAME}/${PORTVERSION}
-SGMLCAT=	${PREFIX}/share/sgml/catalog.ports
-ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-
-PLIST_SUB+=	XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \
-		DTDDIR=${DTDDIR:S/${PREFIX}\///}
+HAS_OASIS_MASTER_SITE=	yes
+HAS_CATALOG_FILE=	yes
 
 PORTDOCS=	README
-DTD_FILES=	calstblx.dtd catalog.xml dbcentx.mod dbgenent.mod \
-		dbhierx.mod dbnotnx.mod dbpoolx.mod docbook.cat docbook.dcl \
-		docbook.dtd docbookx.dtd htmltblx.mod soextblx.dtd catalog
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION}
-
-post-extract:
-	${CP} ${WRKSRC}/docbook.cat ${WRKSRC}/catalog
-
-post-patch:
-	${ECHO_CMD} 'CATALOG "${LOCALBASE}/${ISOCAT}"' >> ${WRKSRC}/catalog
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${DTDDIR}
-	${INSTALL_DATA} ${DTD_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DTDDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
+.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>
diff --git a/textproc/docbook-450/pkg-plist b/textproc/docbook-450/pkg-plist
index 8586d9d09083..929851c32e7e 100644
--- a/textproc/docbook-450/pkg-plist
+++ b/textproc/docbook-450/pkg-plist
@@ -1,6 +1,7 @@
-@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog
 %%DTDDIR%%/calstblx.dtd
 %%DTDDIR%%/catalog
+@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
+@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
 %%DTDDIR%%/catalog.xml
 %%DTDDIR%%/dbcentx.mod
 %%DTDDIR%%/dbgenent.mod
@@ -14,5 +15,3 @@
 %%DTDDIR%%/htmltblx.mod
 %%DTDDIR%%/soextblx.dtd
 @dirrm %%DTDDIR%%
-@dirrmtry share/sgml/docbook
-@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog
diff --git a/textproc/docbook-500/Makefile b/textproc/docbook-500/Makefile
index ba90c2e0c9bd..740b0147c856 100644
--- a/textproc/docbook-500/Makefile
+++ b/textproc/docbook-500/Makefile
@@ -1,29 +1,18 @@
 # Created by: Gabor Kovesdan <gabor@kovesdan.org>
 # $FreeBSD$
 
-PORTNAME=	docbook
 PORTVERSION=	5.0
-PORTREVISION=	2
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.docbook.org/xml/5.0/
+PORTREVISION=	3
 PKGNAMESUFFIX=	500
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	DocBook 5.0, designed for technical documentation
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
-
-NO_BUILD=	yes
-
-DTDDIR=		share/xml/${PORTNAME}/${PORTVERSION}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION}
-
-PLIST_SUB+=	XMLCATMGR=${XMLCATMGR} XMLCAT=${XMLCAT} \
-		DTDDIR=${DTDDIR}
-
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-XMLCAT=		${PREFIX}/share/xml/catalog.ports
+NO_ISOCAT=	yes
+HAS_MANUAL_CATALOG_FILE=	yes
+NO_DISTNAME_FIX=	yes
+XML_DTD=	yes
+MANUAL_DOCS=	yes
 
 OPTIONS_DEFINE=	DTD SCHEMA RELAX_NG SCHEMATRON NVDL TOOLS XMLCHARENT DOCS
 OPTIONS_DEFAULT=	DTD SCHEMA RELAX_NG SCHEMATRON NVDL TOOLS XMLCHARENT
@@ -36,20 +25,16 @@ TOOLS_DESC=		Tools for working with DocBook
 XMLCHARENT_DESC=	Install ISO 8879 XML entites
 OPTIONS_SUB=	yes
 
-XMLCHARENT_RUN_DEPENDS+=	${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent
+XMLCHARENT_RUN_DEPENDS=	${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent
 
 PORTDOCS=	*
 
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR}
-	${INSTALL_DATA} ${WRKSRC}/catalog.xml ${STAGEDIR}${PREFIX}/${DTDDIR}
-.for m in dtd xsd rng sch tools
-	cd ${WRKSRC} && ${COPYTREE_SHARE} ${m} ${STAGEDIR}${PREFIX}/${DTDDIR}
-.endfor
+post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR}/nvdl
-	${INSTALL_DATA} ${WRKSRC}/docbook.nvdl ${STAGEDIR}${PREFIX}/${DTDDIR}/nvdl
+	${MV} ${STAGEDIR}${PREFIX}/${DTDDIR}/docbook.nvdl ${STAGEDIR}${PREFIX}/${DTDDIR}/nvdl
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ChangeLog README VERSION ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+	cd ${STAGEDIR}${PREFIX}/${DTDDIR} && ${MV} ChangeLog README VERSION ${STAGEDIR}${DOCSDIR}
+	cd ${STAGEDIR}${PREFIX}/${DTDDIR} && ${MV} docs/* ${STAGEDIR}${DOCSDIR} && ${RMDIR} docs
 
+.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>
diff --git a/textproc/docbook-500/pkg-plist b/textproc/docbook-500/pkg-plist
index f317e7555d34..cbee3ea89ee3 100644
--- a/textproc/docbook-500/pkg-plist
+++ b/textproc/docbook-500/pkg-plist
@@ -1,5 +1,6 @@
-@unexec %%XMLCATMGR%% -c %%XMLCAT%% remove %D/%%DTDDIR%%/catalog.xml
 %%DTDDIR%%/catalog.xml
+@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove %D/%F
+@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add nextCatalog %D/%F
 %%DTD%%%%DTDDIR%%/dtd/docbook.dtd
 %%DTD%%@dirrm %%DTDDIR%%/dtd
 %%NVDL%%%%DTDDIR%%/nvdl/docbook.nvdl
@@ -19,6 +20,3 @@
 %%SCHEMA%%%%DTDDIR%%/xsd/xml.xsd
 %%SCHEMA%%@dirrm %%DTDDIR%%/xsd
 @dirrm %%DTDDIR%%
-@dirrmtry share/xml/docbook
-@dirrmtry share/xml
-@exec %%XMLCATMGR%% -c %%XMLCAT%% add nextCatalog %D/%%DTDDIR%%/catalog.xml
diff --git a/textproc/docbook-sk/Makefile b/textproc/docbook-sk/Makefile
index 59c95982bbb0..eb0b689b5e2c 100644
--- a/textproc/docbook-sk/Makefile
+++ b/textproc/docbook-sk/Makefile
@@ -3,30 +3,19 @@
 
 PORTNAME=	docbook-sk
 PORTVERSION=	4.1.2
-PORTREVISION=	4
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.oasis-open.org/docbook/xml/${PORTVERSION}/
+PORTREVISION=	5
 DISTNAME=	docbkx${PORTVERSION:S/.//g}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	XML version of the DocBook DTD version controlled for ScrollKeeper
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+NO_ISOCAT=	yes
+XML_DTD=	yes
+HAS_MANUAL_CATALOG_FILE=	yes
 
-NO_BUILD=	yes
-EXTRACT_AFTER_ARGS=	-s ,^,${DISTNAME}/,
+DTD_SUBDIR?=	${PORTNAME:S/-sk//}
 
-PLIST_SUB=	XMLCATMGR=${XMLCATMGR} \
-		DOCBOOKDIR=${DOCBOOKDIR:S/${PREFIX}\///} \
-		CATALOG_PORTS_XML=${CATALOG_PORTS_XML}
-
-DOCBOOKDIR=	${PREFIX}/share/xml/${PORTNAME:S/-sk//}/${PORTVERSION}
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-CATALOG_PORTS_XML=	${PREFIX}/share/xml/catalog.ports
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${DOCBOOKDIR}/ent
-	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCBOOKDIR}
+PORTDOCS=	ChangeLog *.txt
 
+.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>
diff --git a/textproc/docbook-sk/pkg-plist b/textproc/docbook-sk/pkg-plist
index bb09dc77cced..31045f8af879 100644
--- a/textproc/docbook-sk/pkg-plist
+++ b/textproc/docbook-sk/pkg-plist
@@ -1,56 +1,50 @@
-%%DOCBOOKDIR%%/40chg.txt
-%%DOCBOOKDIR%%/41chg.txt
-%%DOCBOOKDIR%%/ChangeLog
-%%DOCBOOKDIR%%/calstblx.dtd
-%%DOCBOOKDIR%%/dbcentx.mod
-%%DOCBOOKDIR%%/dbgenent.mod
-%%DOCBOOKDIR%%/dbhierx.mod
-%%DOCBOOKDIR%%/dbnotnx.mod
-%%DOCBOOKDIR%%/dbpoolx.mod
-%%DOCBOOKDIR%%/docbook.cat
-%%DOCBOOKDIR%%/docbookx.dtd
-@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" file://%D/%%DOCBOOKDIR%%/dbpoolx.mod
-@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//DTD DocBook XML V4.1.2//EN" file://%D/%%DOCBOOKDIR%%/docbookx.dtd
-@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" file://%D/%%DOCBOOKDIR%%/dbcentx.mod
-@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" file://%D/%%DOCBOOKDIR%%/dbnotnx.mod
-@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" file://%D/%%DOCBOOKDIR%%/dbgenent.mod
-@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" file://%D/%%DOCBOOKDIR%%/dbhierx.mod
-@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//DTD XML Exchange Table Model 19990315//EN" file://%D/%%DOCBOOKDIR%%/soextblx.dtd
-@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" file://%D/%%DOCBOOKDIR%%/calstblx.dtd
-@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add rewriteSystem "http://www.oasis-open.org/docbook/xml/4.1.2" file://%D/%%DOCBOOKDIR%%
-@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add rewriteURI "http://www.oasis-open.org/docbook/xml/4.1.2" file://%D/%%DOCBOOKDIR%%
-@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN"
-@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//DTD DocBook XML V4.1.2//EN"
-@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN"
-@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN"
-@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN"
-@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN"
-@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
-@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove public "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN"
-@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove rewriteSystem "http://www.oasis-open.org/docbook/xml/4.1.2"
-@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove rewriteURI "http://www.oasis-open.org/docbook/xml/4.1.2"
-%%DOCBOOKDIR%%/ent/iso-amsa.ent
-%%DOCBOOKDIR%%/ent/iso-amsb.ent
-%%DOCBOOKDIR%%/ent/iso-amsc.ent
-%%DOCBOOKDIR%%/ent/iso-amsn.ent
-%%DOCBOOKDIR%%/ent/iso-amso.ent
-%%DOCBOOKDIR%%/ent/iso-amsr.ent
-%%DOCBOOKDIR%%/ent/iso-box.ent
-%%DOCBOOKDIR%%/ent/iso-cyr1.ent
-%%DOCBOOKDIR%%/ent/iso-cyr2.ent
-%%DOCBOOKDIR%%/ent/iso-dia.ent
-%%DOCBOOKDIR%%/ent/iso-grk1.ent
-%%DOCBOOKDIR%%/ent/iso-grk2.ent
-%%DOCBOOKDIR%%/ent/iso-grk3.ent
-%%DOCBOOKDIR%%/ent/iso-grk4.ent
-%%DOCBOOKDIR%%/ent/iso-lat1.ent
-%%DOCBOOKDIR%%/ent/iso-lat2.ent
-%%DOCBOOKDIR%%/ent/iso-num.ent
-%%DOCBOOKDIR%%/ent/iso-pub.ent
-%%DOCBOOKDIR%%/ent/iso-tech.ent
-%%DOCBOOKDIR%%/readme.txt
-%%DOCBOOKDIR%%/soextblx.dtd
-@dirrm %%DOCBOOKDIR%%/ent
-@dirrm %%DOCBOOKDIR%%
-@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
+%%DTDDIR%%/calstblx.dtd
+%%DTDDIR%%/dbcentx.mod
+%%DTDDIR%%/dbgenent.mod
+%%DTDDIR%%/dbhierx.mod
+%%DTDDIR%%/dbnotnx.mod
+%%DTDDIR%%/dbpoolx.mod
+%%DTDDIR%%/docbook.cat
+%%DTDDIR%%/docbookx.dtd
+@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" file://%D/%%DTDDIR%%/dbpoolx.mod
+@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//DTD DocBook XML V4.1.2//EN" file://%D/%%DTDDIR%%/docbookx.dtd
+@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" file://%D/%%DTDDIR%%/dbcentx.mod
+@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" file://%D/%%DTDDIR%%/dbnotnx.mod
+@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" file://%D/%%DTDDIR%%/dbgenent.mod
+@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" file://%D/%%DTDDIR%%/dbhierx.mod
+@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//DTD XML Exchange Table Model 19990315//EN" file://%D/%%DTDDIR%%/soextblx.dtd
+@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" file://%D/%%DTDDIR%%/calstblx.dtd
+@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add rewriteSystem "http://www.oasis-open.org/docbook/xml/4.1.2" file://%D/%%DTDDIR%%
+@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add rewriteURI "http://www.oasis-open.org/docbook/xml/4.1.2" file://%D/%%DTDDIR%%
+@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN"
+@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//DTD DocBook XML V4.1.2//EN"
+@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN"
+@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN"
+@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN"
+@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN"
+@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
+@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN"
+@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove rewriteSystem "http://www.oasis-open.org/docbook/xml/4.1.2"
+@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove rewriteURI "http://www.oasis-open.org/docbook/xml/4.1.2"
+%%DTDDIR%%/ent/iso-amsa.ent
+%%DTDDIR%%/ent/iso-amsb.ent
+%%DTDDIR%%/ent/iso-amsc.ent
+%%DTDDIR%%/ent/iso-amsn.ent
+%%DTDDIR%%/ent/iso-amso.ent
+%%DTDDIR%%/ent/iso-amsr.ent
+%%DTDDIR%%/ent/iso-box.ent
+%%DTDDIR%%/ent/iso-cyr1.ent
+%%DTDDIR%%/ent/iso-cyr2.ent
+%%DTDDIR%%/ent/iso-dia.ent
+%%DTDDIR%%/ent/iso-grk1.ent
+%%DTDDIR%%/ent/iso-grk2.ent
+%%DTDDIR%%/ent/iso-grk3.ent
+%%DTDDIR%%/ent/iso-grk4.ent
+%%DTDDIR%%/ent/iso-lat1.ent
+%%DTDDIR%%/ent/iso-lat2.ent
+%%DTDDIR%%/ent/iso-num.ent
+%%DTDDIR%%/ent/iso-pub.ent
+%%DTDDIR%%/ent/iso-tech.ent
+%%DTDDIR%%/soextblx.dtd
+@dirrm %%DTDDIR%%/ent
+@dirrm %%DTDDIR%%
diff --git a/textproc/docbook-xml-430/Makefile b/textproc/docbook-xml-430/Makefile
index b2208a60778d..dc68ec3f9fe7 100644
--- a/textproc/docbook-xml-430/Makefile
+++ b/textproc/docbook-xml-430/Makefile
@@ -3,74 +3,19 @@
 
 PORTNAME=	docbook-xml
 PORTVERSION=	4.3
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.oasis-open.org/docbook/xml/${PORTVERSION}/
+PORTREVISION=	1
 PKGNAMESUFFIX=	-430
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	DocBook/XML DTD V4.3, designed for technical documentation
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+NO_ISOCAT=	yes
+XML_DTD=	yes
+HAS_MANUAL_CATALOG_FILE=	yes
 
-USE_ZIP=	yes
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-PLIST=		${WRKSRC}/pkg-plist
+DTD_SUBDIR?=	${PORTNAME:S/-xml//}
 
-XMLCATBASE=	share/xml
-DTD_NAME=	${PORTNAME:S,-xml,,}
-DTD_VERSION=	${PORTVERSION}
-
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-CATALOG_PORTS_XML=	${PREFIX}/${XMLCATBASE}/catalog.ports
-REGIST_CAT_FLAGS_XML=	-c ${CATALOG_PORTS_XML} \
-			add nextCatalog ${DTD_NAME}/${DTD_VERSION}/catalog.xml
-UNREGIST_CAT_FLAGS_XML=	-c ${CATALOG_PORTS_XML} \
-			remove nextCatalog ${DTD_NAME}/${DTD_VERSION}/catalog.xml
-
-DOC_FILES=	ChangeLog README
-DTDDIR=		${XMLCATBASE}/${DTD_NAME}/${DTD_VERSION}
-DTD_FILES=	calstblx.dtd catalog.xml dbcentx.mod dbgenent.mod \
-		dbhierx.mod dbnotnx.mod dbpoolx.mod docbook.cat docbookx.dtd \
-		htmltblx.mod soextblx.dtd
-ENTDIR=		${DTDDIR}/ent
-ENT_FILES=	iso-amsa.ent iso-amsb.ent iso-amsc.ent iso-amsn.ent \
-		iso-amso.ent iso-amsr.ent iso-box.ent iso-cyr1.ent \
-		iso-cyr2.ent iso-dia.ent iso-grk1.ent iso-grk2.ent \
-		iso-grk3.ent iso-grk4.ent iso-lat1.ent iso-lat2.ent \
-		iso-num.ent iso-pub.ent iso-tech.ent
-
-NO_STAGE=	yes
-pre-install:
-	(for F in ${ENT_FILES}; do \
-			${ECHO_CMD} "${ENTDIR}/$${F}"; \
-		done;\
-	${ECHO_CMD} "@dirrm ${ENTDIR}"; ) > ${PLIST}
-	(for F in ${DTD_FILES}; do \
-			${ECHO_CMD} "${DTDDIR}/$${F}"; \
-		done;\
-	${ECHO_CMD} "@dirrm ${DTDDIR}";\
-	${ECHO_CMD} "@dirrmtry ${XMLCATBASE}/${DTD_NAME}"; ) >> ${PLIST}
-.if !defined(NOPORTDOCS)
-	(for F in ${DOC_FILES}; do \
-			${ECHO_CMD} "${DOCSDIR:S,^${PREFIX}/,,}/$${F}"; \
-		done;\
-	${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${PREFIX}/,,}" ) >> ${PLIST}
-.endif
-	${ECHO_CMD} "@exec ${XMLCATMGR} ${REGIST_CAT_FLAGS_XML}" >> ${PLIST}
-	${ECHO_CMD} "@unexec ${XMLCATMGR} ${UNREGIST_CAT_FLAGS_XML}" >> ${PLIST}
-
-do-install:
-	${MKDIR} ${PREFIX}/${DTDDIR}
-	${INSTALL_DATA} ${DTD_FILES:S,^,${WRKSRC}/,} ${PREFIX}/${DTDDIR}
-	${MKDIR} ${PREFIX}/${ENTDIR}
-	${INSTALL_DATA} ${ENT_FILES:S,^,${WRKSRC}/ent/,} ${PREFIX}/${ENTDIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES:S,^,${WRKSRC}/,} ${DOCSDIR}
-.endif
-
-post-install:
-	-${XMLCATMGR} ${REGIST_CAT_FLAGS_XML}
+PORTDOCS=	ChangeLog README
 
+.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>
diff --git a/textproc/docbook-xml-430/pkg-plist b/textproc/docbook-xml-430/pkg-plist
new file mode 100644
index 000000000000..107bc4489eca
--- /dev/null
+++ b/textproc/docbook-xml-430/pkg-plist
@@ -0,0 +1,34 @@
+%%DTDDIR%%/calstblx.dtd
+%%DTDDIR%%/catalog.xml
+@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove %D/%F
+@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add nextCatalog %D/%F
+%%DTDDIR%%/dbcentx.mod
+%%DTDDIR%%/dbgenent.mod
+%%DTDDIR%%/dbhierx.mod
+%%DTDDIR%%/dbnotnx.mod
+%%DTDDIR%%/dbpoolx.mod
+%%DTDDIR%%/docbook.cat
+%%DTDDIR%%/docbookx.dtd
+%%DTDDIR%%/ent/iso-amsa.ent
+%%DTDDIR%%/ent/iso-amsb.ent
+%%DTDDIR%%/ent/iso-amsc.ent
+%%DTDDIR%%/ent/iso-amsn.ent
+%%DTDDIR%%/ent/iso-amso.ent
+%%DTDDIR%%/ent/iso-amsr.ent
+%%DTDDIR%%/ent/iso-box.ent
+%%DTDDIR%%/ent/iso-cyr1.ent
+%%DTDDIR%%/ent/iso-cyr2.ent
+%%DTDDIR%%/ent/iso-dia.ent
+%%DTDDIR%%/ent/iso-grk1.ent
+%%DTDDIR%%/ent/iso-grk2.ent
+%%DTDDIR%%/ent/iso-grk3.ent
+%%DTDDIR%%/ent/iso-grk4.ent
+%%DTDDIR%%/ent/iso-lat1.ent
+%%DTDDIR%%/ent/iso-lat2.ent
+%%DTDDIR%%/ent/iso-num.ent
+%%DTDDIR%%/ent/iso-pub.ent
+%%DTDDIR%%/ent/iso-tech.ent
+%%DTDDIR%%/htmltblx.mod
+%%DTDDIR%%/soextblx.dtd
+@dirrmtry %%DTDDIR%%/ent
+@dirrmtry %%DTDDIR%%
diff --git a/textproc/docbook-xml-440/Makefile b/textproc/docbook-xml-440/Makefile
index 14a23b977fee..d1aa43648ff6 100644
--- a/textproc/docbook-xml-440/Makefile
+++ b/textproc/docbook-xml-440/Makefile
@@ -3,72 +3,26 @@
 
 PORTNAME=	docbook-xml
 PORTVERSION=	4.4
-PORTREVISION=	1
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.oasis-open.org/docbook/xml/${PORTVERSION}/
+PORTREVISION=	2
 PKGNAMESUFFIX=	44
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DocBook/XML DTD V4.4, designed for technical documentation
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+NO_ISOCAT=	yes
+XML_DTD=	yes
+HAS_MANUAL_CATALOG_FILE=	yes
+MANUAL_DOCS=	yes
 
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-PLIST=		${WRKSRC}/pkg-plist
+DTD_SUBDIR=	${PORTNAME:S/-xml//}
 
-XMLCATBASE=	share/xml
-DTD_NAME=	docbook
-DTD_VERSION=	${PORTVERSION}
+PORTDOCS=	*
 
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-CATALOG_PORTS_XML=	${PREFIX}/${XMLCATBASE}/catalog.ports
-REGIST_CAT_FLAGS_XML=	-c ${CATALOG_PORTS_XML} \
-			add nextCatalog ${DTD_NAME}/${DTD_VERSION}/catalog.xml
-UNREGIST_CAT_FLAGS_XML=	-c ${CATALOG_PORTS_XML} \
-			remove nextCatalog ${DTD_NAME}/${DTD_VERSION}/catalog.xml
-
-DOC_FILES=	ChangeLog README
-DTDDIR=		${XMLCATBASE}/${DTD_NAME}/${DTD_VERSION}
-DTD_FILES=	calstblx.dtd catalog.xml dbcentx.mod dbgenent.mod \
-		dbhierx.mod dbnotnx.mod dbpoolx.mod docbook.cat docbookx.dtd \
-		htmltblx.mod soextblx.dtd
-ENTDIR=		${DTDDIR}/ent
-ENT_FILES=	isoamsa.ent isoamsb.ent isoamsc.ent isoamsn.ent \
-		isoamso.ent isoamsr.ent isobox.ent isocyr1.ent \
-		isocyr2.ent isodia.ent isogrk1.ent isogrk2.ent \
-		isogrk3.ent isogrk4.ent isolat1.ent isolat2.ent \
-		isonum.ent isopub.ent isotech.ent
-
-OPTIONS_DEFINE=	DOCS
-
-pre-install:
-	@${RM} -f ${PLIST}
-.for F in ${ENT_FILES}
-	@${ECHO_CMD} "${ENTDIR}/${F}" >> ${PLIST}
-.endfor
-	@${ECHO_CMD} "@dirrm ${ENTDIR}" >> ${PLIST}
-.for F in ${DTD_FILES}
-	@${ECHO_CMD} "${DTDDIR}/${F}" >> ${PLIST}
-.endfor
-	@${ECHO_CMD} "@dirrm ${DTDDIR}" >> ${PLIST}
-	@${ECHO_CMD} "@dirrmtry ${XMLCATBASE}/${DTD_NAME}" >> ${PLIST}
-.for F in ${DOC_FILES}
-	@${ECHO_CMD} "%%PORTDOCS%%${DOCSDIR:S!^${PREFIX}/!!}/${F}.${PORTVERSION}" >> ${PLIST}
-.endfor
-	@${ECHO_CMD} "%%PORTDOCS%%@dirrmtry ${DOCSDIR:S!^${PREFIX}/!!}" >> ${PLIST}
-	@${ECHO_CMD} "@exec ${XMLCATMGR} ${REGIST_CAT_FLAGS_XML}" >> ${PLIST}
-	@${ECHO_CMD} "@unexec ${XMLCATMGR} ${UNREGIST_CAT_FLAGS_XML}" >> ${PLIST}
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR}
-	${INSTALL_DATA} ${DTD_FILES:S!^!${WRKSRC}/!} ${STAGEDIR}${PREFIX}/${DTDDIR}
-	${MKDIR} ${STAGEDIR}${PREFIX}/${ENTDIR}
-	${INSTALL_DATA} ${ENT_FILES:S!^!${WRKSRC}/ent/!} ${STAGEDIR}${PREFIX}/${ENTDIR}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for F in ${DOC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${F} ${STAGEDIR}${DOCSDIR}/${F}.${PORTVERSION}
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/ent
+.for f in ChangeLog README ent/README
+	${MV} ${STAGEDIR}${PREFIX}/${DTDDIR}/${f} ${STAGEDIR}${DOCSDIR}/${f}
 .endfor
 
+.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>
diff --git a/textproc/docbook-xml-440/pkg-plist b/textproc/docbook-xml-440/pkg-plist
new file mode 100644
index 000000000000..ffbeb8f805e3
--- /dev/null
+++ b/textproc/docbook-xml-440/pkg-plist
@@ -0,0 +1,34 @@
+%%DTDDIR%%/calstblx.dtd
+%%DTDDIR%%/catalog.xml
+@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove %D/%F
+@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add nextCatalog %D/%F
+%%DTDDIR%%/dbcentx.mod
+%%DTDDIR%%/dbgenent.mod
+%%DTDDIR%%/dbhierx.mod
+%%DTDDIR%%/dbnotnx.mod
+%%DTDDIR%%/dbpoolx.mod
+%%DTDDIR%%/docbook.cat
+%%DTDDIR%%/docbookx.dtd
+%%DTDDIR%%/ent/isoamsa.ent
+%%DTDDIR%%/ent/isoamsb.ent
+%%DTDDIR%%/ent/isoamsc.ent
+%%DTDDIR%%/ent/isoamsn.ent
+%%DTDDIR%%/ent/isoamso.ent
+%%DTDDIR%%/ent/isoamsr.ent
+%%DTDDIR%%/ent/isobox.ent
+%%DTDDIR%%/ent/isocyr1.ent
+%%DTDDIR%%/ent/isocyr2.ent
+%%DTDDIR%%/ent/isodia.ent
+%%DTDDIR%%/ent/isogrk1.ent
+%%DTDDIR%%/ent/isogrk2.ent
+%%DTDDIR%%/ent/isogrk3.ent
+%%DTDDIR%%/ent/isogrk4.ent
+%%DTDDIR%%/ent/isolat1.ent
+%%DTDDIR%%/ent/isolat2.ent
+%%DTDDIR%%/ent/isonum.ent
+%%DTDDIR%%/ent/isopub.ent
+%%DTDDIR%%/ent/isotech.ent
+%%DTDDIR%%/htmltblx.mod
+%%DTDDIR%%/soextblx.dtd
+@dirrmtry %%DTDDIR%%/ent
+@dirrmtry %%DTDDIR%%
diff --git a/textproc/docbook-xml-450/Makefile b/textproc/docbook-xml-450/Makefile
index 88d1417aac9a..a7d541f36dd6 100644
--- a/textproc/docbook-xml-450/Makefile
+++ b/textproc/docbook-xml-450/Makefile
@@ -3,69 +3,25 @@
 
 PORTNAME=	docbook-xml
 PORTVERSION=	4.5
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.oasis-open.org/docbook/xml/${PORTVERSION}/
+PORTREVISION=	1
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	DocBook/XML DTD V4.5, designed for technical documentation
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+NO_ISOCAT=	yes
+XML_DTD=	yes
+HAS_MANUAL_CATALOG_FILE=	yes
+MANUAL_DOCS=	yes
 
-USE_ZIP=	yes
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-PKGNAMESUFFIX=	${PORTVERSION:S/.//}
-PLIST=		${WRKSRC}/pkg-plist
+DTD_SUBDIR=	${PORTNAME:S/-xml//}
 
-XMLCATBASE=	share/xml
-DTD_NAME=	docbook
-DTD_VERSION=	${PORTVERSION}
+PORTDOCS=	*
 
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-CATALOG_PORTS_XML=	${PREFIX}/${XMLCATBASE}/catalog.ports
-REGIST_CAT_FLAGS_XML=	-c ${CATALOG_PORTS_XML} \
-			add nextCatalog ${DTD_NAME}/${DTD_VERSION}/catalog.xml
-UNREGIST_CAT_FLAGS_XML=	-c ${CATALOG_PORTS_XML} \
-			remove nextCatalog ${DTD_NAME}/${DTD_VERSION}/catalog.xml
-
-DOC_FILES=	ChangeLog README
-DTDDIR=		${XMLCATBASE}/${DTD_NAME}/${DTD_VERSION}
-DTD_FILES=	calstblx.dtd catalog.xml dbcentx.mod dbgenent.mod \
-		dbhierx.mod dbnotnx.mod dbpoolx.mod docbook.cat docbookx.dtd \
-		htmltblx.mod soextblx.dtd
-ENTDIR=		${DTDDIR}/ent
-ENT_FILES=	isoamsa.ent isoamsb.ent isoamsc.ent isoamsn.ent \
-		isoamso.ent isoamsr.ent isobox.ent isocyr1.ent \
-		isocyr2.ent isodia.ent isogrk1.ent isogrk2.ent \
-		isogrk3.ent isogrk4.ent isolat1.ent isolat2.ent \
-		isonum.ent isopub.ent isotech.ent
-
-pre-install:
-	@${RM} -f ${PLIST}
-.for F in ${ENT_FILES}
-	@${ECHO_CMD} "${ENTDIR}/${F}" >> ${PLIST}
-.endfor
-	@${ECHO_CMD} "@dirrm ${ENTDIR}" >> ${PLIST}
-.for F in ${DTD_FILES}
-	@${ECHO_CMD} "${DTDDIR}/${F}" >> ${PLIST}
-.endfor
-	@${ECHO_CMD} "@dirrm ${DTDDIR}" >> ${PLIST}
-	@${ECHO_CMD} "@dirrmtry ${XMLCATBASE}/${DTD_NAME}" >> ${PLIST}
-.for F in ${DOC_FILES}
-	@${ECHO_CMD} "${DOCSDIR:S!^${PREFIX}/!!}/${F}.${PORTVERSION}" >> ${PLIST}
-.endfor
-	@${ECHO_CMD} "@dirrmtry ${DOCSDIR:S!^${PREFIX}/!!}" >> ${PLIST}
-	@${ECHO_CMD} "@exec ${XMLCATMGR} ${REGIST_CAT_FLAGS_XML}" >> ${PLIST}
-	@${ECHO_CMD} "@unexec ${XMLCATMGR} ${UNREGIST_CAT_FLAGS_XML}" >> ${PLIST}
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR}
-	${INSTALL_DATA} ${DTD_FILES:S!^!${WRKSRC}/!} ${STAGEDIR}${PREFIX}/${DTDDIR}
-	${MKDIR} ${STAGEDIR}${PREFIX}/${ENTDIR}
-	${INSTALL_DATA} ${ENT_FILES:S!^!${WRKSRC}/ent/!} ${STAGEDIR}${PREFIX}/${ENTDIR}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for F in ${DOC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${F} ${STAGEDIR}${DOCSDIR}/${F}.${PORTVERSION}
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/ent
+.for f in ChangeLog README ent/README
+	${MV} ${STAGEDIR}${PREFIX}/${DTDDIR}/${f} ${STAGEDIR}${DOCSDIR}/${f}
 .endfor
 
+.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>
diff --git a/textproc/docbook-xml-450/pkg-plist b/textproc/docbook-xml-450/pkg-plist
new file mode 100644
index 000000000000..ffbeb8f805e3
--- /dev/null
+++ b/textproc/docbook-xml-450/pkg-plist
@@ -0,0 +1,34 @@
+%%DTDDIR%%/calstblx.dtd
+%%DTDDIR%%/catalog.xml
+@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove %D/%F
+@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add nextCatalog %D/%F
+%%DTDDIR%%/dbcentx.mod
+%%DTDDIR%%/dbgenent.mod
+%%DTDDIR%%/dbhierx.mod
+%%DTDDIR%%/dbnotnx.mod
+%%DTDDIR%%/dbpoolx.mod
+%%DTDDIR%%/docbook.cat
+%%DTDDIR%%/docbookx.dtd
+%%DTDDIR%%/ent/isoamsa.ent
+%%DTDDIR%%/ent/isoamsb.ent
+%%DTDDIR%%/ent/isoamsc.ent
+%%DTDDIR%%/ent/isoamsn.ent
+%%DTDDIR%%/ent/isoamso.ent
+%%DTDDIR%%/ent/isoamsr.ent
+%%DTDDIR%%/ent/isobox.ent
+%%DTDDIR%%/ent/isocyr1.ent
+%%DTDDIR%%/ent/isocyr2.ent
+%%DTDDIR%%/ent/isodia.ent
+%%DTDDIR%%/ent/isogrk1.ent
+%%DTDDIR%%/ent/isogrk2.ent
+%%DTDDIR%%/ent/isogrk3.ent
+%%DTDDIR%%/ent/isogrk4.ent
+%%DTDDIR%%/ent/isolat1.ent
+%%DTDDIR%%/ent/isolat2.ent
+%%DTDDIR%%/ent/isonum.ent
+%%DTDDIR%%/ent/isopub.ent
+%%DTDDIR%%/ent/isotech.ent
+%%DTDDIR%%/htmltblx.mod
+%%DTDDIR%%/soextblx.dtd
+@dirrmtry %%DTDDIR%%/ent
+@dirrmtry %%DTDDIR%%
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile
index 01b555bece84..0a2683a96da4 100644
--- a/textproc/docbook-xml/Makefile
+++ b/textproc/docbook-xml/Makefile
@@ -3,37 +3,20 @@
 
 PORTNAME=	docbook-xml
 PORTVERSION=	4.2
-PORTREVISION=	1
-CATEGORIES=	textproc
+PORTREVISION=	2
 MASTER_SITES=	http://www.docbook.org/xml/${PORTVERSION}/ \
 		http://www.oasis-open.org/committees/docbook/xml/${PORTVERSION}/
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	XML version of the DocBook DTD
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+NO_ISOCAT=	yes
+XML_DTD=	yes
+HAS_MANUAL_CATALOG_FILE=	yes
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-USE_ZIP=	YES
-NO_BUILD=	YES
-NO_WRKSUBDIR=	YES
-PLIST_SUB=	DTD_VERSION=${PORTVERSION} \
-		XMLCATMGR=${XMLCATMGR}\
-		DOCBOOKDIR=${DOCBOOKDIR}\
-		CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} \
-		CATALOG_PORTS_XML=${CATALOG_PORTS_XML}
+DTD_SUBDIR?=	${PORTNAME:S/-xml//}
 
-DOCBOOKDIR=	${PREFIX}/share/xml/${PORTNAME:S/-xml//}/${PORTVERSION}
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
-CATALOG_PORTS_XML=	${PREFIX}/share/xml/catalog.ports
-
-pre-su-install:
-	@[ -d ${STAGEDIR}${DOCBOOKDIR}/ent ] || ${MKDIR} ${STAGEDIR}${DOCBOOKDIR}/ent
-
-do-install:
-	for file in `unzip -l ${DISTDIR}/${DISTFILES}|${AWK} '/:[0-9].*[^\/]$$/{print $$4}'`; do \
-		${INSTALL_DATA} ${WRKSRC}/$$file ${STAGEDIR}${DOCBOOKDIR}/$$file; \
-	done
+PORTDOCS=	README ChangeLog
 
+.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>
diff --git a/textproc/docbook-xml/pkg-plist b/textproc/docbook-xml/pkg-plist
index d2e244255014..6188a54da39f 100644
--- a/textproc/docbook-xml/pkg-plist
+++ b/textproc/docbook-xml/pkg-plist
@@ -1,38 +1,35 @@
-share/xml/docbook/%%DTD_VERSION%%/ChangeLog
-share/xml/docbook/%%DTD_VERSION%%/README
-share/xml/docbook/%%DTD_VERSION%%/calstblx.dtd
-@unexec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% remove %%DOCBOOKDIR%%/catalog.xml
-share/xml/docbook/%%DTD_VERSION%%/catalog.xml
-@exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add nextCatalog %%DOCBOOKDIR%%/catalog.xml
-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 %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DOCBOOKDIR%%/docbook.cat
-share/xml/docbook/%%DTD_VERSION%%/docbook.cat
-@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DOCBOOKDIR%%/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%%/soextblx.dtd
-@dirrm share/xml/docbook/%%DTD_VERSION%%/ent
-@dirrm share/xml/docbook/%%DTD_VERSION%%
-@dirrm share/xml/docbook
+%%DTDDIR%%/calstblx.dtd
+%%DTDDIR%%/catalog.xml
+@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove %D/%F
+@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add nextCatalog %D/%F
+%%DTDDIR%%/dbcentx.mod
+%%DTDDIR%%/dbgenent.mod
+%%DTDDIR%%/dbhierx.mod
+%%DTDDIR%%/dbnotnx.mod
+%%DTDDIR%%/dbpoolx.mod
+%%DTDDIR%%/docbook.cat
+@unexec %D/%%XMLCATMGR%% -sc %D/%%XMLCAT%% remove %D/%F
+@exec %D/%%XMLCATMGR%% -sc %D/%%XMLCAT%% add CATALOG %D/%F
+%%DTDDIR%%/docbookx.dtd
+%%DTDDIR%%/ent/iso-amsa.ent
+%%DTDDIR%%/ent/iso-amsb.ent
+%%DTDDIR%%/ent/iso-amsc.ent
+%%DTDDIR%%/ent/iso-amsn.ent
+%%DTDDIR%%/ent/iso-amso.ent
+%%DTDDIR%%/ent/iso-amsr.ent
+%%DTDDIR%%/ent/iso-box.ent
+%%DTDDIR%%/ent/iso-cyr1.ent
+%%DTDDIR%%/ent/iso-cyr2.ent
+%%DTDDIR%%/ent/iso-dia.ent
+%%DTDDIR%%/ent/iso-grk1.ent
+%%DTDDIR%%/ent/iso-grk2.ent
+%%DTDDIR%%/ent/iso-grk3.ent
+%%DTDDIR%%/ent/iso-grk4.ent
+%%DTDDIR%%/ent/iso-lat1.ent
+%%DTDDIR%%/ent/iso-lat2.ent
+%%DTDDIR%%/ent/iso-num.ent
+%%DTDDIR%%/ent/iso-pub.ent
+%%DTDDIR%%/ent/iso-tech.ent
+%%DTDDIR%%/soextblx.dtd
+@dirrm %%DTDDIR%%/ent
+@dirrm %%DTDDIR%%
diff --git a/textproc/docbook/bsd.docbook.mk b/textproc/docbook/bsd.docbook.mk
new file mode 100644
index 000000000000..9f8ae0f55584
--- /dev/null
+++ b/textproc/docbook/bsd.docbook.mk
@@ -0,0 +1,80 @@
+# MAINTAINER: portmgr@FreeBSD.org
+#
+# $FreeBSD$
+
+.ifdef XML_DTD
+XML_SGML=	xml
+.else
+XML_SGML=	sgml
+.endif
+
+PORTNAME?=	docbook
+CATEGORIES=	textproc
+.ifndef MASTER_SITES
+.  ifdef HAS_OASIS_MASTER_SITE
+MASTER_SITES=	http://www.oasis-open.org/docbook/${XML_SGML}/${PORTVERSION}/
+.  else
+MASTER_SITES=	http://www.docbook.org/${XML_SGML}/${PORTVERSION}/
+.  endif
+.endif
+EXTRACT_SUFX?=	.zip
+
+.ifndef NO_ISOCAT
+RUN_DEPENDS+=	${LOCALBASE}/${ISOCAT}:${PORTSDIR}/textproc/iso8879
+.endif
+RUN_DEPENDS+=	${LOCALBASE}/${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+
+NO_MTREE=	yes
+NO_BUILD=	yes
+.ifndef NO_DISTNAME_FIX
+EXTRACT_AFTER_ARGS=	-s ,^,${DISTNAME}/,
+.endif
+
+XMLCATMGR=	bin/xmlcatmgr
+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_VERSION?=	${PORTVERSION}
+DTDDIR?=	share/${XML_SGML}/${DTD_SUBDIR}/${DTD_VERSION}/dtd
+PLIST_SUB+=	XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} XMLCAT=${XMLCAT} \
+		DTDDIR=${DTDDIR}
+
+.if !defined(PORTDOCS)
+PORTDOCS=	*.txt
+.endif
+
+.if defined(PORTDOCS) && !defined(MANUAL_DOCS)
+OPTIONS_DEFINE+=	DOCS
+.endif
+
+.ifdef HAS_CATALOG_FILE
+post-extract:
+	@${CP} ${WRKSRC}/docbook.cat ${WRKSRC}/catalog
+
+post-patch:
+	@${ECHO_CMD} 'CATALOG "${LOCALBASE}/${ISOCAT}"' >> ${WRKSRC}/catalog
+	@${RM} ${WRKSRC}/catalog.orig
+.elifndef HAS_MANUAL_CATALOG_FILE
+SUB_FILES=	catalog
+.endif
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${DTDDIR}
+.if !defined(HAS_CATALOG_FILE) && !defined(HAS_MANUAL_CATALOG_FILE)
+	${INSTALL_DATA} ${WRKDIR}/catalog ${STAGEDIR}${PREFIX}/${DTDDIR}
+.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.if defined(PORTDOCS) && !defined(MANUAL_DOCS)
+.  for f in ${PORTDOCS}
+	${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}
+.if defined(PORTDOCS)
+	@${ECHO_CMD} "@dirrmtry share/doc/${PORTNAME}" >> ${TMPPLIST}
+.endif
+
author	Mathieu Arnold <mat@FreeBSD.org>	2014-02-18 11:43:14 +0000
committer	Mathieu Arnold <mat@FreeBSD.org>	2014-02-18 11:43:14 +0000
commit	da20a902ce24d5a49b46fb8b64461e7c8d894f88 (patch)
tree	9cda45745964271508016c620ebfba2bd7d1f68f /textproc
parent	8db5eef6fa61b9abe61158ecfc1ddaa1a7c11951 (diff)
download	ports-da20a902ce24d5a49b46fb8b64461e7c8d894f88.tar.gz ports-da20a902ce24d5a49b46fb8b64461e7c8d894f88.zip