2 files changed, 41 insertions, 62 deletions

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%%