Index: docbook-400/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/docbook-400/Makefile,v
retrieving revision 1.11
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.11 Makefile
--- docbook-400/Makefile	7 Mar 2003 06:11:38 -0000	1.11
+++ docbook-400/Makefile	27 Jun 2003 11:02:44 -0000
@@ -9,6 +9,7 @@
 
 PORTNAME=	docbook
 PORTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/sgml/4.0/
 DISTNAME=	docbk40
@@ -17,33 +18,36 @@
 COMMENT=	V4.0 of the DocBook DTD, designed for technical documentation
 
 RUN_DEPENDS=	${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
-		${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
+		${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 USE_ZIP=	yes
 NO_MTREE=	yes
 EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-PLIST_SUB=	DTD_NAME=${PORTNAME} DTD_VERSION=${PORTVERSION} \
-		MKCATALOG=${MKCATALOG}
+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
-MKCATALOG=	${PREFIX}/sbin/mkcatalog
+XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
+CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 
 LATEST_LINK=	docbook-400
 
 pre-install:
-	@[ -d ${INSTDIR}/4.0 ] || ${MKDIR} ${INSTDIR}/4.0
+	@[ -d ${INSTDIR}/${PORTVERSION} ] || ${MKDIR} ${INSTDIR}/${PORTVERSION}
 
 do-install:
-	@unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/4.0
-	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/4.0/catalog
-	@${ECHO_CMD} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/4.0/catalog
-	@${CHMOD} ${SHAREMODE} ${INSTDIR}/4.0/*
+	@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}
 
 post-install:
-	@${MKCATALOG} -q install ${PORTNAME}/${PORTVERSION}
+	@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${PORTNAME}/${PORTVERSION}/catalog
 
 .include <bsd.port.mk>
Index: docbook-400/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/docbook-400/pkg-plist,v
retrieving revision 1.6
diff -d -u -I\$FreeBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -u -r1.6 pkg-plist
--- docbook-400/pkg-plist	10 Nov 2002 22:30:17 -0000	1.6
+++ docbook-400/pkg-plist	27 Jun 2003 09:11:06 -0000
@@ -9,9 +9,9 @@
 share/sgml/docbook/4.0/docbook.cat
 share/sgml/docbook/4.0/docbook.dcl
 share/sgml/docbook/4.0/docbook.dtd
-@unexec %%MKCATALOG%% -q deinstall %%DTD_NAME%%/%%DTD_VERSION%%
+@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTD_NAME%%/%%DTD_VERSION%%/catalog
 share/sgml/docbook/4.0/catalog
-@exec %%MKCATALOG%% -q install %%DTD_NAME%%/%%DTD_VERSION%%
+@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add %%DTD_NAME%%/%%DTD_VERSION%%/catalog
 share/sgml/docbook/4.0/readme.txt
 @dirrm share/sgml/docbook/4.0
 @unexec rmdir %D/share/sgml/docbook 2>/dev/null || true