----Security_Multipart0(Mon_Apr_18_02_49_00_2005_784)--
Content-Type: Multipart/Mixed;
 boundary="--Next_Part(Mon_Apr_18_02_49_00_2005_915)--"
Content-Transfer-Encoding: 7bit

----Next_Part(Mon_Apr_18_02_49_00_2005_915)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Klaus Heinz <k.heinz.apr.fuenf@onlinehome.de> wrote
  in <20050417171650.GG1948@silence.homedns.org>:

k.> Hi,
k.> 
k.> textproc/docbook-website-2.5.0 contains patch-ac which adds lines to
k.> 
k.>  $LOCALBASE/share/xml/website/catalog.xml
k.> 
k.> for versions other than 2.5.0 of docbook-website.
k.> 
k.> Should this patch be updated to add appropriate lines for
k.> 
k.>   PUBLIC "-//Norman Walsh//DTD Website V2.5.0//EN"
k.> 
k.> ?

 Yes, you are right.  The attached patch is needed.

 Aliases for V2.2.0 have temporarily been added as a workaround
 for our htdocs tree build, so please keep them for a while.
 When rewriting the doctype declaration in all of the .xml files
 which use docbook-website in the htdocs tree is finished,
 they can be removed safely.  Thanks.

-- 
| Hiroki SATO

----Next_Part(Mon_Apr_18_02_49_00_2005_915)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="website-catalog.diff"

diff -Naur website-2.5.0-orig\catalog.xml website-2.5.0\catalog.xml
--- website-2.5.0-orig\catalog.xml	Tue Feb 18 08:42:38 2003
+++ website-2.5.0\catalog.xml	Thu Oct 21 13:13:45 2004
@@ -6,15 +6,15 @@
       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.5.0/schema/"
             rewritePrefix="schema/"/>
 
-<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 +24,44 @@
        prefer="public">
 
   <public
-    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"
+    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 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 Autolayout V2.5.0//EN"
     uri="autolayout.dtd"/>
 
   <public
-    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"
+    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 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 Namespaces Module V2.5.0//EN"
     uri="namespaces.mod"/>
 
   <public
-    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"
+    publicId="-//Norman Walsh//DTD Website Forms Module V2.5.0//EN"
     uri="forms.mod"/>
 </group>
 
diff -Naur website-2.5.0-orig\xsl\autolayout.xsl website-2.5.0\xsl\autolayout.xsl
--- website-2.5.0-orig\xsl\autolayout.xsl	Tue Feb 18 08:45:32 2003
+++ website-2.5.0\xsl\autolayout.xsl	Thu Oct 21 13:25:39 2004
@@ -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"/>

----Next_Part(Mon_Apr_18_02_49_00_2005_915)----

----Security_Multipart0(Mon_Apr_18_02_49_00_2005_784)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (FreeBSD)

iD8DBQBCYqGMTyzT2CeTzy0RAqnhAJ40KxmWPlJ++zuTe3OdXLC6Nkld7wCeNrUY
Cm2GHPUF3a8/o6hTmh/Iyd0=
=vHBK
-----END PGP SIGNATURE-----

----Security_Multipart0(Mon_Apr_18_02_49_00_2005_784)----