Permalink
Browse files

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.
  • Loading branch information...
1 parent 7bc29cb commit dbd54d66b81c2bfcfe6d61374d01bc0158114371 jmmv committed Jan 29, 2003
Showing with 20 additions and 15 deletions.
  1. +5 −5 textproc/docbook-website/Makefile
  2. +1 −3 textproc/docbook-website/PLIST
  3. +14 −7 textproc/docbook-website/files/catalog
@@ -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"
@@ -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
@@ -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>

0 comments on commit dbd54d6

Please sign in to comment.