2 files changed, 37 insertions, 35 deletions

diff --git a/textproc/docbook-400/Makefile b/textproc/docbook-400/Makefile
index 6ca012fc5174..c8e6137f6885 100644
--- a/textproc/docbook-400/Makefile
+++ b/textproc/docbook-400/Makefile
@@ -9,46 +9,47 @@
 
 PORTNAME=	docbook
 PORTVERSION=	4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/sgml/4.0/
 DISTNAME=	docbk40
 
-MAINTAINER=	ports@FreeBSD.org
+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
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 USE_ZIP=	yes
 NO_MTREE=	yes
-EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-PLIST_SUB=	DTD_NAME=${PORTNAME}
-PLIST_SUB+=	DTD_VERSION=${PORTVERSION}
-PLIST_SUB+=	XMLCATMGR=${XMLCATMGR}
-PLIST_SUB+=	CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
 
-INSTDIR=	${PREFIX}/share/sgml/docbook
-ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
+DTDDIR=		share/sgml/docbook/4.0/dtd
+PLIST_SUB+=	SGMLCAT_ADD="${SGMLCAT_ADD}" \
+		SGMLCAT_RM="${SGMLCAT_RM}"
+
 XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
+SGMLCAT=	${PREFIX}/share/sgml/catalog.ports
+XMLCAT=		${PREFIX}/share/xml/catalog.ports
+ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
 
-LATEST_LINK=	docbook-400
+SGMLCAT_ADD=	${XMLCATMGR} -sc ${SGMLCAT} add CATALOG \
+		    ${PREFIX}/${DTDDIR}/catalog
+SGMLCAT_RM=	${XMLCATMGR} -sc ${SGMLCAT} remove \
+		    ${PREFIX}/${DTDDIR}/catalog
 
-pre-su-install:
-	@[ -d ${INSTDIR}/${PORTVERSION} ] || ${MKDIR} ${INSTDIR}/${PORTVERSION}
+LATEST_LINK=	docbook-400
 
 do-install:
-	@unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/${PORTVERSION}
-	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/${PORTVERSION}/catalog
-	@${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/${PORTVERSION}/catalog
-	@${CHMOD} ${SHAREMODE} ${INSTDIR}/${PORTVERSION}/*
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
+	@${MKDIR} ${PREFIX}/${DTDDIR}
+	files=$$(${FIND} ${WRKSRC} -type f | ${GREP} -v "${WRKSRC}/\."); \
+	for i in $${files}; do \
+		${INSTALL_DATA} $${i} ${PREFIX}/${DTDDIR}; \
+	done
+	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${PREFIX}/${DTDDIR}/catalog
 
 post-install:
-	@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/${PORTVERSION}/catalog
+	-${SGMLCAT_ADD}
 
 .include <bsd.port.mk>
diff --git a/textproc/docbook-400/pkg-plist b/textproc/docbook-400/pkg-plist
index bb7676ec9986..976804ac2ce3 100644
--- a/textproc/docbook-400/pkg-plist
+++ b/textproc/docbook-400/pkg-plist
@@ -1,17 +1,18 @@
-share/sgml/docbook/4.0/40chg.txt
-share/sgml/docbook/4.0/50issues.txt
-share/sgml/docbook/4.0/cals-tbl.dtd
-share/sgml/docbook/4.0/dbcent.mod
-share/sgml/docbook/4.0/dbgenent.mod
-share/sgml/docbook/4.0/dbhier.mod
-share/sgml/docbook/4.0/dbnotn.mod
-share/sgml/docbook/4.0/dbpool.mod
-share/sgml/docbook/4.0/docbook.cat
-share/sgml/docbook/4.0/docbook.dcl
-share/sgml/docbook/4.0/docbook.dtd
-@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/%%DTD_VERSION%%/catalog
-share/sgml/docbook/4.0/catalog
-@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/%%DTD_VERSION%%/catalog
-share/sgml/docbook/4.0/readme.txt
+@unexec %%SGMLCAT_RM%%
+share/sgml/docbook/4.0/dtd/40chg.txt
+share/sgml/docbook/4.0/dtd/50issues.txt
+share/sgml/docbook/4.0/dtd/cals-tbl.dtd
+share/sgml/docbook/4.0/dtd/catalog
+share/sgml/docbook/4.0/dtd/dbcent.mod
+share/sgml/docbook/4.0/dtd/dbgenent.mod
+share/sgml/docbook/4.0/dtd/dbhier.mod
+share/sgml/docbook/4.0/dtd/dbnotn.mod
+share/sgml/docbook/4.0/dtd/dbpool.mod
+share/sgml/docbook/4.0/dtd/docbook.cat
+share/sgml/docbook/4.0/dtd/docbook.dcl
+share/sgml/docbook/4.0/dtd/docbook.dtd
+share/sgml/docbook/4.0/dtd/readme.txt
+@dirrm share/sgml/docbook/4.0/dtd
 @dirrm share/sgml/docbook/4.0
 @dirrmtry share/sgml/docbook
+@exec %%SGMLCAT_ADD%%