3 files changed, 60 insertions, 38 deletions

diff --git a/textproc/docbook-241/Makefile b/textproc/docbook-241/Makefile
index 432516213283..4a6fba0f1226 100644
--- a/textproc/docbook-241/Makefile
+++ b/textproc/docbook-241/Makefile
@@ -8,47 +8,48 @@
 #
 
 PORTNAME=	docbook
-PORTVERSION=	241
-PORTREVISION=	2
+PORTVERSION=	2.4.1
+PORTEPOCH=	1
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://ftp.ora.com/pub/davenport/
-DISTFILES=	docbk241.tar.Z
-EXTRACT_ONLY=	# empty
+MASTER_SITES=	http://www.oasis-open.org/docbook/sgml/2.4.1/
+DISTNAME=	docbk241
 
-MAINTAINER=	ports@FreeBSD.org
+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
 
+USE_ZIP=	yes
 NO_MTREE=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-PLIST_SUB=	DTD_NAME=${PORTNAME}
-PLIST_SUB+=	DTD_VERSION=${DTD_VERSION}
-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/2.4.1/dtd
+PLIST_SUB+=	SGMLCAT_ADD="${SGMLCAT_ADD}" \
+		SGMLCAT_RM="${SGMLCAT_RM}"
+
 XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
-DTD_VERSION=	2.4.1
+SGMLCAT=	${PREFIX}/share/sgml/catalog.ports
+XMLCAT=		${PREFIX}/share/xml/catalog.ports
+ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
 
-LATEST_LINK=	docbook-241
+SGMLCAT_ADD=	${XMLCATMGR} -sc ${SGMLCAT} add CATALOG \
+		    ${PREFIX}/${DTDDIR}/catalog
+SGMLCAT_RM=	${XMLCATMGR} -sc ${SGMLCAT} remove \
+		    ${PREFIX}/${DTDDIR}/catalog
 
-pre-su-install:
-	@[ -d ${INSTDIR}/${DTD_VERSION} ] || ${MKDIR} ${INSTDIR}/${DTD_VERSION}
+LATEST_LINK=	docbook-241
 
 do-install:
-	@zcat ${DISTDIR}/docbk241.tar.Z | \
-		(cd ${INSTDIR}/${DTD_VERSION}; ${PAX} -r)
-	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/${DTD_VERSION}/catalog
-	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/${DTD_VERSION}/catalog
-	@${CHMOD} ${SHAREMODE} ${INSTDIR}/${DTD_VERSION}/*
-	@${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}/${DTD_VERSION}/catalog
+	-${SGMLCAT_ADD}
 
 .include <bsd.port.mk>
diff --git a/textproc/docbook-241/distinfo b/textproc/docbook-241/distinfo
index 1adb04ca380c..9b98287d923a 100644
--- a/textproc/docbook-241/distinfo
+++ b/textproc/docbook-241/distinfo
@@ -1,3 +1,3 @@
-MD5 (docbk241.tar.Z) = 3991798ddca05a72fbe7c8dfb10c50c1
-SHA256 (docbk241.tar.Z) = b8886ade50f8a5cd8e052fe31c6af4e9e7057a24fc97397e8cc6999515613123
-SIZE (docbk241.tar.Z) = 47501
+MD5 (docbk241.zip) = 1c2ad8f5ad5e2e06ba8840263901330d
+SHA256 (docbk241.zip) = dbac0694e9bcaec43cab80c755ffb02cf8f613bf785ff8506e5ed72efa76a272
+SIZE (docbk241.zip) = 55653
diff --git a/textproc/docbook-241/pkg-plist b/textproc/docbook-241/pkg-plist
index d9ad42e50973..fb331e91944d 100644
--- a/textproc/docbook-241/pkg-plist
+++ b/textproc/docbook-241/pkg-plist
@@ -1,13 +1,34 @@
-share/sgml/docbook/2.4.1/241chg.txt
-share/sgml/docbook/2.4.1/calstbl.mod
-share/sgml/docbook/2.4.1/dbgenent.mod
-share/sgml/docbook/2.4.1/dbhier.mod
-share/sgml/docbook/2.4.1/dbpool.mod
-share/sgml/docbook/2.4.1/docbook.cat
-share/sgml/docbook/2.4.1/docbook.dcl
-share/sgml/docbook/2.4.1/docbook.dtd
-@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/%%DTD_VERSION%%/catalog
-share/sgml/docbook/2.4.1/catalog
-@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/%%DTD_VERSION%%/catalog
+@unexec %%SGMLCAT_RM%%
+share/sgml/docbook/2.4.1/dtd/241chg.txt
+share/sgml/docbook/2.4.1/dtd/announce.txt
+share/sgml/docbook/2.4.1/dtd/calstbl.mod
+share/sgml/docbook/2.4.1/dtd/catalog
+share/sgml/docbook/2.4.1/dtd/dbgenent.mod
+share/sgml/docbook/2.4.1/dtd/dbhier.mod
+share/sgml/docbook/2.4.1/dtd/dbpool.mod
+share/sgml/docbook/2.4.1/dtd/docbook.cat
+share/sgml/docbook/2.4.1/dtd/docbook.dcl
+share/sgml/docbook/2.4.1/dtd/docbook.dtd
+share/sgml/docbook/2.4.1/dtd/iso-amsa.gml
+share/sgml/docbook/2.4.1/dtd/iso-amsb.gml
+share/sgml/docbook/2.4.1/dtd/iso-amsc.gml
+share/sgml/docbook/2.4.1/dtd/iso-amsn.gml
+share/sgml/docbook/2.4.1/dtd/iso-amso.gml
+share/sgml/docbook/2.4.1/dtd/iso-amsr.gml
+share/sgml/docbook/2.4.1/dtd/iso-box.gml
+share/sgml/docbook/2.4.1/dtd/iso-cyr1.gml
+share/sgml/docbook/2.4.1/dtd/iso-cyr2.gml
+share/sgml/docbook/2.4.1/dtd/iso-dia.gml
+share/sgml/docbook/2.4.1/dtd/iso-grk1.gml
+share/sgml/docbook/2.4.1/dtd/iso-grk2.gml
+share/sgml/docbook/2.4.1/dtd/iso-grk3.gml
+share/sgml/docbook/2.4.1/dtd/iso-grk4.gml
+share/sgml/docbook/2.4.1/dtd/iso-lat1.gml
+share/sgml/docbook/2.4.1/dtd/iso-lat2.gml
+share/sgml/docbook/2.4.1/dtd/iso-num.gml
+share/sgml/docbook/2.4.1/dtd/iso-pub.gml
+share/sgml/docbook/2.4.1/dtd/iso-tech.gml
+@dirrm share/sgml/docbook/2.4.1/dtd
 @dirrm share/sgml/docbook/2.4.1
 @dirrmtry share/sgml/docbook
+@exec %%SGMLCAT_ADD%%