Convert the catalog file to the XML Catalog format (okay'ed by grant).

Use textproc/xmlcatmgr/catalogs.mk to register it, with the XML_CATALOGS
variable.  Bump PKGREVISION.

3 files changed, 20 insertions, 15 deletions

diff --git a/textproc/docbook-website/Makefile b/textproc/docbook-website/Makefile
index 35499b6a0fd..ffdd69b4dba 100644
--- a/textproc/docbook-website/Makefile
+++ b/textproc/docbook-website/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/01/28 13:03:50 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/29 21:31:17 jmmv Exp $
 #
 
 DISTNAME=	website-2.3
 PKGNAME=	docbook-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=docbook/}
 
@@ -21,6 +21,8 @@ DOCDIR=		${PREFIX}/share/doc/docbook-website
 DTDDIR=		${PREFIX}/share/xml/website
 EGDIR=		${PREFIX}/share/examples/docbook-website
 
+XML_CATALOGS=	${DTDDIR}/catalog
+
 do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA_DIR} ${DTDDIR}
@@ -30,9 +32,7 @@ do-install:
 	@cd ${WRKSRC}/example; ${PAX} -rw . ${EGDIR}
 	@cd ${WRKSRC}; ${PAX} -rw VERSION extensions xsl *.dtd *.mod	\
 		${DTDDIR}
-	${PREFIX}/bin/xmlcatmgr -c ${PREFIX}/share/xml/catalog \
-		add "CATALOG" "${PREFIX}/share/xml/website/catalog"
 	${INSTALL_DATA} ${FILESDIR}/catalog ${DTDDIR}/catalog
 
-.include "../../textproc/xmlcatmgr/buildlink2.mk"
+.include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/docbook-website/PLIST b/textproc/docbook-website/PLIST
index 39d5628cfda..2213d49931f 100644
--- a/textproc/docbook-website/PLIST
+++ b/textproc/docbook-website/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/18 09:16:58 grant Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/01/29 21:31:17 jmmv Exp $
 share/doc/docbook-website/ChangeLog
 share/doc/docbook-website/README
 share/doc/docbook-website/VERSION
@@ -149,8 +149,6 @@ share/xml/website/xsl/xbel.xsl
 @dirrm share/xml/website/extensions/saxon64/com
 @dirrm share/xml/website/extensions/saxon64
 @dirrm share/xml/website/extensions
-@exec %D/bin/xmlcatmgr -c %D/share/xml/catalog add CATALOG %D/share/xml/website/catalog
-@unexec %D/bin/xmlcatmgr -c %D/share/xml/catalog remove %D/share/xml/website/catalog
 @dirrm share/xml/website
 @dirrm share/examples/docbook-website/subdir
 @dirrm share/examples/docbook-website/graphics/navicons/triangle/other
diff --git a/textproc/docbook-website/files/catalog b/textproc/docbook-website/files/catalog
index 06e56090e00..e16c0b49eb3 100644
--- a/textproc/docbook-website/files/catalog
+++ b/textproc/docbook-website/files/catalog
@@ -1,7 +1,14 @@
-PUBLIC "-//Norman Walsh//DTD Website Autolayout V2.2//EN"
-PUBLIC "-//Norman Walsh//DTD Website Namespaces Module V2.2//EN"
-PUBLIC "-//Norman Walsh//DTD Website Layout V2.2//EN"
-PUBLIC "-//Norman Walsh//DTD Website V2.2//EN"
-PUBLIC "-//Norman Walsh//DTD Website Full V2.2//EN"
-PUBLIC "-//Norman Walsh//DTD Website Extensions Module V2.2//EN"
-PUBLIC "-//Norman Walsh//DTD Website V2.2//EN"
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+	"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $NetBSD: catalog,v 1.2 2003/01/29 21:31:17 jmmv Exp $ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <public publicId="-//Norman Walsh//DTD Website Autolayout V2.2//EN" uri="autolayout.dtd" />
+  <public publicId="-//Norman Walsh//DTD Website Namespaces Module V2.2//EN" uri="namespaces.mod" />
+  <public publicId="-//Norman Walsh//DTD Website Layout V2.2//EN" uri="layout.dtd" />
+  <public publicId="-//Norman Walsh//DTD Website V2.2//EN" uri="website.dtd" />
+  <public publicId="-//Norman Walsh//DTD Website Full V2.2//EN" uri="website-full.dtd" />
+  <public publicId="-//Norman Walsh//DTD Website Extensions Module V2.2//EN" uri="extensions.mod" />
+</catalog>