3 files changed, 29 insertions, 38 deletions

diff --git a/textproc/docbook-410/Makefile b/textproc/docbook-410/Makefile
index 4c8915699b0a..90847bd73722 100644
--- a/textproc/docbook-410/Makefile
+++ b/textproc/docbook-410/Makefile
@@ -6,7 +6,9 @@ PORTVERSION=	4.1
 PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.docbook.org/sgml/4.1/
+PKGNAMESUFFIX=	410
 DISTNAME=	docbk41
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	V4.1 of the DocBook DTD, designed for technical documentation
@@ -14,35 +16,23 @@ COMMENT=	V4.1 of the DocBook DTD, designed for technical documentation
 RUN_DEPENDS=	${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
 		${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
-USE_ZIP=	yes
 NO_MTREE=	yes
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
+EXTRACT_AFTER_ARGS=	-s ,^,${DISTNAME}/,
 
-DTDDIR=		share/sgml/docbook/4.1/dtd
-PLIST_SUB+=	SGMLCAT_ADD="${SGMLCAT_ADD}" \
-		SGMLCAT_RM="${SGMLCAT_RM}"
+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
-XMLCAT=		${PREFIX}/share/xml/catalog.ports
 ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
 
-SGMLCAT_ADD=	${XMLCATMGR} -sc ${SGMLCAT} add CATALOG \
-		    ${PREFIX}/${DTDDIR}/catalog
-SGMLCAT_RM=	${XMLCATMGR} -sc ${SGMLCAT} remove \
-		    ${PREFIX}/${DTDDIR}/catalog
-
-PKGNAMESUFFIX=	${PKGORIGIN:T:S/docbook-//}
+SUB_FILES=	catalog
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR}
-	files=$$(${FIND} ${WRKSRC} -type f \! -name '.*'); \
-	for i in $${files}; do \
-		${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/${DTDDIR}; \
-	done
-	${INSTALL_DATA} ${FILESDIR}/catalog ${STAGEDIR}${PREFIX}/${DTDDIR}
-	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${STAGEDIR}${PREFIX}/${DTDDIR}/catalog
-
+	@${MKDIR} ${STAGEDIR}${DTDDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DTDDIR}
+	${INSTALL_DATA} ${WRKDIR}/catalog ${STAGEDIR}${DTDDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/docbook-410/files/catalog b/textproc/docbook-410/files/catalog.in
index 33d2cd585650..609d749dbec6 100644
--- a/textproc/docbook-410/files/catalog
+++ b/textproc/docbook-410/files/catalog.in
@@ -38,3 +38,4 @@ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN" "dbcent.mod"
 
   -- End of catalog data for DocBook V4.1 ................................. --
   -- ...................................................................... --
+CATALOG "%%PREFIX%%/share/sgml/iso8879/catalog"
diff --git a/textproc/docbook-410/pkg-plist b/textproc/docbook-410/pkg-plist
index b5c175dead9e..20d85cf5e676 100644
--- a/textproc/docbook-410/pkg-plist
+++ b/textproc/docbook-410/pkg-plist
@@ -1,20 +1,20 @@
-@unexec %%SGMLCAT_RM%%
-share/sgml/docbook/4.1/dtd/40chg.txt
-share/sgml/docbook/4.1/dtd/41chg.txt
-share/sgml/docbook/4.1/dtd/50issues.txt
-share/sgml/docbook/4.1/dtd/ChangeLog
-share/sgml/docbook/4.1/dtd/cals-tbl.dtd
-share/sgml/docbook/4.1/dtd/catalog
-share/sgml/docbook/4.1/dtd/dbcent.mod
-share/sgml/docbook/4.1/dtd/dbgenent.mod
-share/sgml/docbook/4.1/dtd/dbhier.mod
-share/sgml/docbook/4.1/dtd/dbnotn.mod
-share/sgml/docbook/4.1/dtd/dbpool.mod
-share/sgml/docbook/4.1/dtd/docbook.cat
-share/sgml/docbook/4.1/dtd/docbook.dcl
-share/sgml/docbook/4.1/dtd/docbook.dtd
-share/sgml/docbook/4.1/dtd/readme.txt
-@dirrm share/sgml/docbook/4.1/dtd
+@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
+%%DTDDIR%%/dbcent.mod
+%%DTDDIR%%/dbgenent.mod
+%%DTDDIR%%/dbhier.mod
+%%DTDDIR%%/dbnotn.mod
+%%DTDDIR%%/dbpool.mod
+%%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 %%SGMLCAT_ADD%%
+@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog