Update to 1.1. This is the official release of Simplified DocBook V1.1 DTD

and no technical changes from 1.1CR2.

4 files changed, 40 insertions, 14 deletions

diff --git a/textproc/docbook-simple/Makefile b/textproc/docbook-simple/Makefile
index 69df14589d0..3d418321113 100644
--- a/textproc/docbook-simple/Makefile
+++ b/textproc/docbook-simple/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:33 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/05 19:20:45 hrs Exp $
 #
 
-DISTNAME=	docbook-simple-1.1CR2
-PKGNAME=	${DISTNAME:C/CR/rc/}
-PKGREVISION=	1
+DISTNAME=	docbook-simple-1.1
+PKGREVISION=	0
 CATEGORIES=	textproc
-MASTER_SITES=	http://docbook.org/xml/simple/1.1CR2/
+MASTER_SITES=	http://docbook.org/xml/simple/1.1/
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	minskim@NetBSD.org
@@ -24,15 +23,13 @@ DTDFILES=	sdbcent.mod sdocbook-custom.dtd sdocbookref-custom.dtd \
 		sinclist.mod
 MISCFILES=	sdocbook.css
 
-XML_ENTRIES=	public "-//OASIS//DTD Simplified DocBook XML V1.1CR2//EN" \
-		${PREFIX}/share/xml/docbook-simple/sdocbook.dtd
-XML_ENTRIES+=	public "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1CR2//EN" \
-		${PREFIX}/share/xml/docbook-simple/sdocbookref.dtd
+XML_CATALOGS=	${PREFIX}/share/xml/docbook-simple/catalog.xml
 
 do-install:
 	${INSTALL_DATA_DIR} ${DTDDIR}
 	(cd ${WRKSRC}; ${INSTALL_DATA} ${DTDFILES} ${DTDDIR})
 	(cd ${WRKSRC}; ${INSTALL_DATA} ${MISCFILES} ${DTDDIR})
+	${INSTALL_DATA} ${FILESDIR}/catalog.xml.in ${DTDDIR}/catalog.xml
 
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/docbook-simple/PLIST b/textproc/docbook-simple/PLIST
index 220f1015e49..d882b310c13 100644
--- a/textproc/docbook-simple/PLIST
+++ b/textproc/docbook-simple/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2004/05/28 16:40:34 minskim Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/05/05 19:20:45 hrs Exp $
+share/xml/docbook-simple/catalog.xml
 share/xml/docbook-simple/sdbcent.mod
 share/xml/docbook-simple/sdbhier.mod
 share/xml/docbook-simple/sdbpool.mod
diff --git a/textproc/docbook-simple/distinfo b/textproc/docbook-simple/distinfo
index 46a44d5edfa..b4a0ab211d3 100644
--- a/textproc/docbook-simple/distinfo
+++ b/textproc/docbook-simple/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 14:48:41 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/05/05 19:20:45 hrs Exp $
 
-SHA1 (docbook-simple-1.1CR2.zip) = 440025c6b5ceede7c1270da61aa7d026063d9c42
-RMD160 (docbook-simple-1.1CR2.zip) = 782b3b7e7d60829544e763ea82fc0791afe1ce0d
-Size (docbook-simple-1.1CR2.zip) = 34525 bytes
+SHA1 (docbook-simple-1.1.zip) = 8d8556b313969c9f494d2f9641e4d81e79c94f3d
+RMD160 (docbook-simple-1.1.zip) = bcfe3be6e14c05f421c50e88f41a67894f1c0c18
+Size (docbook-simple-1.1.zip) = 34500 bytes
diff --git a/textproc/docbook-simple/files/catalog.xml.in b/textproc/docbook-simple/files/catalog.xml.in
new file mode 100644
index 00000000000..2fda7f4d442
--- /dev/null
+++ b/textproc/docbook-simple/files/catalog.xml.in
@@ -0,0 +1,28 @@
+<?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.xml.in,v 1.1 2005/05/05 19:20:45 hrs Exp $ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+<rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/simple/1.1/"
+            rewritePrefix="./" />
+
+<rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/simple/1.1/"
+            rewritePrefix="./" />
+
+<rewriteSystem systemIdStartString="http://docbook.org/xml/simple/1.1/"
+            rewritePrefix="./" />
+
+<rewriteURI uriStartString="http://docbook.org/xml/simple/1.1/"
+            rewritePrefix="./" />
+
+
+<public publicId="-//OASIS//DTD Simplified DocBook XML V1.1//EN"
+        uri="http://docbook.org/xml/simple/1.1/sdocbook.dtd" />
+
+<public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN"
+        uri="http://docbook.org/xml/simple/1.1/sdocbookref.dtd" />
+
+</catalog>