- Use the official site with the .zip distribution

- Ignore error if catalog is already registered
- Cleanup and consistency with similar ports
- Bump PORTREVISION
- Take maintainership

3 files changed, 41 insertions, 38 deletions

diff --git a/textproc/docbook-300/Makefile b/textproc/docbook-300/Makefile
index 104d16b23260..515d04b51c95 100644
--- a/textproc/docbook-300/Makefile
+++ b/textproc/docbook-300/Makefile
@@ -9,45 +9,47 @@
 
 PORTNAME=	docbook
 PORTVERSION=	3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://ftp.ora.com/pub/davenport/
-DISTFILES=	docbk30.tar.Z
-EXTRACT_ONLY=	# empty
+MASTER_SITES=	http://www.oasis-open.org/docbook/sgml/${PORTVERSION}/
+DISTNAME=	docbk30
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gabor@FreeBSD.org
 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
-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/3.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-${PORTVERSION}
+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-300
 
 do-install:
-	@zcat ${DISTDIR}/docbk30.tar.Z | \
-		(cd ${INSTDIR}/${PORTVERSION}; ${PAX} -r)
-	@${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-300/distinfo b/textproc/docbook-300/distinfo
index 23dae929066f..e4976ebcce6e 100644
--- a/textproc/docbook-300/distinfo
+++ b/textproc/docbook-300/distinfo
@@ -1,3 +1,3 @@
-MD5 (docbk30.tar.Z) = 09bb7511c5f58ead035a4747400ac93d
-SHA256 (docbk30.tar.Z) = 11acb3973c7ae751860759504f3f4a24b337a52fb30ef021215a430e856d65c9
-SIZE (docbk30.tar.Z) = 61031
+MD5 (docbk30.zip) = 9a7f5b1b7dd52d0ca4fb080619f0459c
+SHA256 (docbk30.zip) = ecf71cbe8ddbad7494ff520d5b4edf73a428c0b159178cb0cb619cba685e61c6
+SIZE (docbk30.zip) = 43441
diff --git a/textproc/docbook-300/pkg-plist b/textproc/docbook-300/pkg-plist
index 9366da32f19f..ce4a3ae502a4 100644
--- a/textproc/docbook-300/pkg-plist
+++ b/textproc/docbook-300/pkg-plist
@@ -1,15 +1,16 @@
-share/sgml/docbook/3.0/30chg.txt
-share/sgml/docbook/3.0/40issues.txt
-share/sgml/docbook/3.0/announce.txt
-share/sgml/docbook/3.0/cals-tbl.dtd
-share/sgml/docbook/3.0/dbgenent.mod
-share/sgml/docbook/3.0/dbhier.mod
-share/sgml/docbook/3.0/dbpool.mod
-share/sgml/docbook/3.0/docbook.cat
-share/sgml/docbook/3.0/docbook.dcl
-share/sgml/docbook/3.0/docbook.dtd
-@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/%%DTD_VERSION%%/catalog
-share/sgml/docbook/3.0/catalog
-@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/%%DTD_VERSION%%/catalog
+@unexec %%SGMLCAT_RM%%
+share/sgml/docbook/3.0/dtd/30chg.txt
+share/sgml/docbook/3.0/dtd/40issues.txt
+share/sgml/docbook/3.0/dtd/announce.txt
+share/sgml/docbook/3.0/dtd/cals-tbl.dtd
+share/sgml/docbook/3.0/dtd/catalog
+share/sgml/docbook/3.0/dtd/dbgenent.mod
+share/sgml/docbook/3.0/dtd/dbhier.mod
+share/sgml/docbook/3.0/dtd/dbpool.mod
+share/sgml/docbook/3.0/dtd/docbook.cat
+share/sgml/docbook/3.0/dtd/docbook.dcl
+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%%