3 files changed, 13 insertions, 25 deletions

diff --git a/textproc/docbook-300/Makefile b/textproc/docbook-300/Makefile
index 550458731922..6f07125308a8 100644
--- a/textproc/docbook-300/Makefile
+++ b/textproc/docbook-300/Makefile
@@ -6,7 +6,9 @@ PORTVERSION=	3.0
 PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/sgml/${PORTVERSION}/
+PKGNAMESUFFIX=	300
 DISTNAME=	docbk30
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	V3.0 of the DocBook DTD, designed for technical documentation
@@ -14,38 +16,23 @@ COMMENT=	V3.0 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/3.0/dtd
-PLIST_SUB+=	SGMLCAT_ADD="${SGMLCAT_ADD}" \
-		SGMLCAT_RM="${SGMLCAT_RM}"
+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
-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
+SUB_FILES=	catalog
 
-PKGNAMESUFFIX=	${PKGORIGIN:T:S/docbook-//}
-
-NO_STAGE=	yes
 do-install:
-	@${MKDIR} ${PREFIX}/${DTDDIR}
-	files=$$(${FIND} ${WRKSRC} -type f \! -name '.*'); \
-	for i in $${files}; do \
-		${INSTALL_DATA} $${i} ${PREFIX}/${DTDDIR}; \
-	done
-	${INSTALL_DATA} ${FILESDIR}/catalog ${PREFIX}/${DTDDIR}
-	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${PREFIX}/${DTDDIR}/catalog
-
-post-install:
-	-${SGMLCAT_ADD}
+	@${MKDIR} ${STAGEDIR}${DTDDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DTDDIR}
+	${INSTALL_DATA} ${WRKDIR}/catalog ${STAGEDIR}${DTDDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/docbook-300/files/catalog b/textproc/docbook-300/files/catalog.in
index 931533af9539..578e284730e2 100644
--- a/textproc/docbook-300/files/catalog
+++ b/textproc/docbook-300/files/catalog.in
@@ -6,3 +6,4 @@ PUBLIC "-//USA-DOD//DTD Table Model 951010//EN" "cals-tbl.dtd"
 PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V3.0//EN" "dbpool.mod"
 PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod"
 PUBLIC "-//Davenport//ENTITIES DocBook Additional General Entities V3.0//EN" "dbgenent.mod"
+CATALOG "%%PREFIX%%/share/sgml/iso8879/catalog"
diff --git a/textproc/docbook-300/pkg-plist b/textproc/docbook-300/pkg-plist
index ce4a3ae502a4..a9da3873b1e7 100644
--- a/textproc/docbook-300/pkg-plist
+++ b/textproc/docbook-300/pkg-plist
@@ -1,4 +1,4 @@
-@unexec %%SGMLCAT_RM%%
+@unexec %%XMLCATMGR%% -sc %%SGMLCAT%% remove %D/%%DTDDIR%%/catalog
 share/sgml/docbook/3.0/dtd/30chg.txt
 share/sgml/docbook/3.0/dtd/40issues.txt
 share/sgml/docbook/3.0/dtd/announce.txt
@@ -13,4 +13,4 @@ share/sgml/docbook/3.0/dtd/docbook.dtd
 @dirrm share/sgml/docbook/3.0/dtd
 @dirrm share/sgml/docbook/3.0
 @dirrmtry share/sgml/docbook
-@exec %%SGMLCAT_ADD%%
+@exec %%XMLCATMGR%% -sc %%SGMLCAT%% add CATALOG %D/%%DTDDIR%%/catalog