Apply two patches from Hiroki Sato (hrs@) to remove bogus references

to 2.4.x versions.
Bump PKGREVISION.

4 files changed, 82 insertions, 40 deletions

diff --git a/textproc/docbook-website/Makefile b/textproc/docbook-website/Makefile
index fb949c123d6..d2339e70abb 100644
--- a/textproc/docbook-website/Makefile
+++ b/textproc/docbook-website/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:47:33 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/04/18 15:32:50 wiz Exp $
 #
 
 DISTNAME=	website-2.5.0
 PKGNAME=	docbook-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=docbook/}
 
diff --git a/textproc/docbook-website/distinfo b/textproc/docbook-website/distinfo
index ba11d151156..c79d9765676 100644
--- a/textproc/docbook-website/distinfo
+++ b/textproc/docbook-website/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2005/03/02 17:58:08 wiz Exp $
+$NetBSD: distinfo,v 1.8 2005/04/18 15:32:50 wiz Exp $
 
 SHA1 (website-2.5.0.tar.gz) = c36e345ff725c175407318fe878984f7ec5f0e56
 RMD160 (website-2.5.0.tar.gz) = fe67dfca0221751c310262d4d4658a3968d945ff
 Size (website-2.5.0.tar.gz) = 135313 bytes
 SHA1 (patch-aa) = 14249023b2b1b3f1891e5f8d973f86337a2e9eee
 SHA1 (patch-ab) = 32ef65364493b6fb01cf2106c7d0c9d6c66db2af
-SHA1 (patch-ac) = a4e23da7a1bd938c1a5468016705cd61d8df9e9d
+SHA1 (patch-ac) = c1c0cef0d3795011affd6e1e2ed9e0f683d2ec22
+SHA1 (patch-ad) = f3bfb2332e579ec0960d992d0250001a7ec4e3b5
diff --git a/textproc/docbook-website/patches/patch-ac b/textproc/docbook-website/patches/patch-ac
index d85e25b7744..5b4ec532864 100644
--- a/textproc/docbook-website/patches/patch-ac
+++ b/textproc/docbook-website/patches/patch-ac
@@ -1,96 +1,122 @@
-$NetBSD: patch-ac,v 1.1 2005/03/02 17:58:09 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2005/04/18 15:32:50 wiz Exp $
 
---- catalog.xml.orig	2005-03-01 05:04:43.000000000 +0900
-+++ catalog.xml	2005-03-01 05:04:49.000000000 +0900
-@@ -11,6 +11,9 @@
+--- catalog.xml.orig	2003-02-18 14:42:38.000000000 +0100
++++ catalog.xml
+@@ -6,15 +6,18 @@
+       an entry like this to your XML catalog file, editing the
+       path to match the location of your Website installation:
+ 
+-    <nextCatalog catalog="/usr/share/xml/website-2.4.0/catalog.xml" />
++    <nextCatalog catalog="/usr/share/xml/website-2.5.0/catalog.xml" />
+ -->
  
  <!-- Rewrite rules for the whole tree -->
  
+-<rewriteURI uriStartString="http://docbook.sourceforge.net/release/website/2.4.1/schema/"
 +<rewriteURI uriStartString="http://docbook.sourceforge.net/release/website/2.2/"
 +            rewritePrefix="schema/dtd/"/>
 +
- <rewriteURI uriStartString="http://docbook.sourceforge.net/release/website/2.4.1/schema/"
++<rewriteURI uriStartString="http://docbook.sourceforge.net/release/website/2.5.0/schema/"
              rewritePrefix="schema/"/>
  
-@@ -29,40 +32,81 @@
-     <!-- this could be the website-custom.dtd instead -->
+-<rewriteURI uriStartString="http://docbook.sourceforge.net/release/website/2.4.1/xsl/"
++<rewriteURI uriStartString="http://docbook.sourceforge.net/release/website/2.5.0/xsl/"
+             rewritePrefix="xsl/"/>
+ 
+ <!-- Website DTD locations -->
+@@ -24,44 +27,85 @@
+        prefer="public">
  
    <public
-+    publicId="-//Norman Walsh//DTD Website V2.2.0//EN"
+-    publicId="-//Norman Walsh//DTD Website V2.4.0//EN"
++    publicId="-//Norman Walsh//DTD Website V2.5.0//EN"
 +    uri="website.dtd"/>
 +    <!-- this could be the website-custom.dtd instead -->
 +
 +  <public
-     publicId="-//Norman Walsh//DTD Website Custom V2.4.0//EN"
-     uri="website-custom.dtd"/>
++    publicId="-//Norman Walsh//DTD Website V2.2.0//EN"
+     uri="website.dtd"/>
+     <!-- this could be the website-custom.dtd instead -->
  
    <public
-+    publicId="-//Norman Walsh//DTD Website Custom V2.2.0//EN"
+-    publicId="-//Norman Walsh//DTD Website Custom V2.4.0//EN"
++    publicId="-//Norman Walsh//DTD Website Custom V2.5.0//EN"
 +    uri="website-custom.dtd"/>
 +
 +  <public
-     publicId="-//Norman Walsh//DTD Website Full V2.4.0//EN"
++    publicId="-//Norman Walsh//DTD Website Custom V2.2.0//EN"
+     uri="website-custom.dtd"/>
+ 
+   <public
+-    publicId="-//Norman Walsh//DTD Website Full V2.4.0//EN"
++    publicId="-//Norman Walsh//DTD Website Full V2.5.0//EN"
      uri="website-full.dtd"/>
  
    <public
+-    publicId="-//Norman Walsh//DTD Website Autolayout V2.4.0//EN"
 +    publicId="-//Norman Walsh//DTD Website Full V2.2.0//EN"
 +    uri="website-full.dtd"/>
 +
 +  <public
-     publicId="-//Norman Walsh//DTD Website Autolayout V2.4.0//EN"
-     uri="autolayout.dtd"/>
- 
-   <public
-+    publicId="-//Norman Walsh//DTD Website Autolayout V2.2.0//EN"
++    publicId="-//Norman Walsh//DTD Website Autolayout V2.5.0//EN"
 +    uri="autolayout.dtd"/>
 +
 +  <public
-     publicId="-//Norman Walsh//DTD Website Layout V2.4.0//EN"
-     uri="layout.dtd"/>
++    publicId="-//Norman Walsh//DTD Website Autolayout V2.2.0//EN"
+     uri="autolayout.dtd"/>
  
    <public
-+    publicId="-//Norman Walsh//DTD Website Layout V2.2.0//EN"
+-    publicId="-//Norman Walsh//DTD Website Layout V2.4.0//EN"
++    publicId="-//Norman Walsh//DTD Website Layout V2.5.0//EN"
 +    uri="layout.dtd"/>
 +
 +  <public
-     publicId="-//Norman Walsh//DTD Website Module V2.4.0//EN"
-     uri="website.mod"/>
++    publicId="-//Norman Walsh//DTD Website Layout V2.2.0//EN"
+     uri="layout.dtd"/>
  
    <public
-+    publicId="-//Norman Walsh//DTD Website Module V2.2.0//EN"
+-    publicId="-//Norman Walsh//DTD Website Module V2.4.0//EN"
++    publicId="-//Norman Walsh//DTD Website Module V2.5.0//EN"
 +    uri="website.mod"/>
 +
 +  <public
-     publicId="-//Norman Walsh//DTD Website Extensions Module V2.4.0//EN"
++    publicId="-//Norman Walsh//DTD Website Module V2.2.0//EN"
+     uri="website.mod"/>
+ 
+   <public
+-    publicId="-//Norman Walsh//DTD Website Extensions Module V2.4.0//EN"
++    publicId="-//Norman Walsh//DTD Website Extensions Module V2.5.0//EN"
      uri="extensions.mod"/>
  
    <public
+-    publicId="-//Norman Walsh//DTD Website Namespaces Module V2.4.0//EN"
 +    publicId="-//Norman Walsh//DTD Website Extensions Module V2.2.0//EN"
 +    uri="extensions.mod"/>
 +
 +  <public
-     publicId="-//Norman Walsh//DTD Website Namespaces Module V2.4.0//EN"
-     uri="namespaces.mod"/>
- 
-   <public
-+    publicId="-//Norman Walsh//DTD Website Namespaces Module V2.2.0//EN"
++    publicId="-//Norman Walsh//DTD Website Namespaces Module V2.5.0//EN"
 +    uri="namespaces.mod"/>
 +
 +  <public
-     publicId="-//Norman Walsh//DTD Website RDDL Module V2.4.0//EN"
-     uri="rddl.mod"/>
++    publicId="-//Norman Walsh//DTD Website Namespaces Module V2.2.0//EN"
+     uri="namespaces.mod"/>
  
    <public
-+    publicId="-//Norman Walsh//DTD Website RDDL Module V2.2.0//EN"
+-    publicId="-//Norman Walsh//DTD Website RDDL Module V2.4.0//EN"
++    publicId="-//Norman Walsh//DTD Website RDDL Module V2.5.0//EN"
 +    uri="rddl.mod"/>
 +
 +  <public
-     publicId="-//Norman Walsh//DTD Website Forms Module V2.4.0//EN"
-     uri="forms.mod"/>
++    publicId="-//Norman Walsh//DTD Website RDDL Module V2.2.0//EN"
+     uri="rddl.mod"/>
+ 
+   <public
+-    publicId="-//Norman Walsh//DTD Website Forms Module V2.4.0//EN"
++    publicId="-//Norman Walsh//DTD Website Forms Module V2.5.0//EN"
++    uri="forms.mod"/>
 +
 +  <public
 +    publicId="-//Norman Walsh//DTD Website Forms Module V2.2.0//EN"
-+    uri="forms.mod"/>
+     uri="forms.mod"/>
  </group>
  
- <!-- Website RelaxNG locations -->
diff --git a/textproc/docbook-website/patches/patch-ad b/textproc/docbook-website/patches/patch-ad
new file mode 100644
index 00000000000..9e7e4ba6c11
--- /dev/null
+++ b/textproc/docbook-website/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2005/04/18 15:32:50 wiz Exp $
+
+--- xsl/autolayout.xsl.orig	2003-02-18 14:45:32.000000000 +0100
++++ xsl/autolayout.xsl
+@@ -3,8 +3,8 @@
+                 version="1.0">
+ 
+ <xsl:output method="xml" indent="no"
+-            doctype-public="-//Norman Walsh//DTD Website Autolayout V2.4.1//EN"
+-            doctype-system="http://docbook.sourceforge.net/release/website/2.4.1/schema/dtd/autolayout.dtd"
++            doctype-public="-//Norman Walsh//DTD Website Autolayout V2.5.0//EN"
++            doctype-system="http://docbook.sourceforge.net/release/website/2.5.0/schema/dtd/autolayout.dtd"
+ />
+ 
+ <xsl:strip-space elements="toc tocentry layout copyright"/>