Update to 2.6.0:

 * catalog, catalog.xml: enable users to have "current" in schema URIs
   in doc instances;

   http://docbook.sourceforge.net/release/website/current/schema/

   Yeah, I know that it's traditionally been the case that DocBook
   doc instances contain public and system IDs for a specific version
   of the DocBook DTD. But note that:

     - all versions of DocBook 4 are backward-compatible

     - doc instances don't actually need to contain any system or
       public ID at all users employ RELAX NG-based tools

     - for RELAX NG-based toolchain, users will probably be authoring
       and validating their doc instances against whatever is the
       current version of the RELAX NG schema for DocBook that that
       they have installed

   So enabling users to put "current" in their doc instances instead
   of a specific version number means that they don't need to update
   the URIs if/when they want to author/validate using a future
   version of the DTD.

 * AUTHORS, BUGS, COPYING, INSTALL, README, TODO: Added standard distro
   files, to make life easier for packagers;

   From README, moved copyright info to COPYING and install info to
   INSTALL. README content is not just minimal how-to info. Added
   BUGS and TODO, which are just pointers to SF trackers. Added
   AUTHORS just for sake completeness.

 * Makefile: generate RELEASE-NOTES.html/.txt

 * RELEASE-NOTES.xml: New file.

7 files changed, 160 insertions, 200 deletions

diff --git a/textproc/docbook-website/Makefile b/textproc/docbook-website/Makefile
index d2339e70abb..aa681370eb3 100644
--- a/textproc/docbook-website/Makefile
+++ b/textproc/docbook-website/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2005/04/18 15:32:50 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/05 05:43:05 hrs Exp $
 #
 
-DISTNAME=	website-2.5.0
-PKGNAME=	docbook-${DISTNAME}
-PKGREVISION=	2
+DISTNAME=	docbook-website-2.6.0
+PKGREVISION=	0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=docbook/}
 
@@ -22,20 +21,20 @@ DTDDIR=		${PREFIX}/share/xml/website
 EGDIR=		${PREFIX}/share/examples/docbook-website
 
 XML_CATALOGS=	${DTDDIR}/catalog.xml
+SGML_CATALOGS=	${DTDDIR}/catalog
 
 do-install:
 	cd ${WRKSRC} && ${FIND} . -name "*.orig" -exec ${RM} {} \;
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA_DIR} ${DTDDIR}
 	${INSTALL_DATA_DIR} ${EGDIR}
-	cd ${WRKSRC} && ${PAX} -rwpm ChangeLog README VERSION WhatsNew	\
-		${DOCDIR}
+	cd ${WRKSRC} && ${PAX} -rwpm ChangeLog README VERSION \
+		RELEASE-NOTES.html RELEASE-NOTES.txt RELEASE-NOTES.xml \
+		TODO ${DOCDIR}
 	cd ${WRKSRC}/example && ${PAX} -rwpm . ${EGDIR}
-	${RM} ${PREFIX}/share/examples/docbook-website/graphics/.xvpics/spacer.png
-	${RMDIR} ${PREFIX}/share/examples/docbook-website/graphics/.xvpics
-	cd ${WRKSRC} && ${PAX} -rwpm VERSION extensions schema tests xsl \
+	cd ${WRKSRC} && ${PAX} -rwpm VERSION extensions schema xsl \
 		${DTDDIR}
-	${INSTALL_DATA} ${WRKSRC}/catalog.xml ${DTDDIR}
+	${INSTALL_DATA} ${WRKSRC}/catalog.xml ${WRKSRC}/catalog ${DTDDIR}
 
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/docbook-website/PLIST b/textproc/docbook-website/PLIST
index 84c9336913d..f7f6455e46e 100644
--- a/textproc/docbook-website/PLIST
+++ b/textproc/docbook-website/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.6 2005/03/02 17:58:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/05/05 05:43:05 hrs Exp $
 share/doc/docbook-website/ChangeLog
 share/doc/docbook-website/README
+share/doc/docbook-website/RELEASE-NOTES.html
+share/doc/docbook-website/RELEASE-NOTES.txt
+share/doc/docbook-website/RELEASE-NOTES.xml
+share/doc/docbook-website/TODO
 share/doc/docbook-website/VERSION
-share/doc/docbook-website/WhatsNew
-share/examples/docbook-website/.tabular
-share/examples/docbook-website/.textonly
 share/examples/docbook-website/ChangeLog
+share/examples/docbook-website/Makefile-example.txt
 share/examples/docbook-website/about.html
 share/examples/docbook-website/about.xml
 share/examples/docbook-website/autolayout.xml
@@ -15,7 +17,7 @@ share/examples/docbook-website/bookmark/catalog
 share/examples/docbook-website/bookmark/xml.dcl
 share/examples/docbook-website/build-ext.xml
 share/examples/docbook-website/build-make.xml
-share/examples/docbook-website/build-textonly.xml
+share/examples/docbook-website/build-nontab.xml
 share/examples/docbook-website/build.xml
 share/examples/docbook-website/buildext.html
 share/examples/docbook-website/building.html
@@ -24,6 +26,8 @@ share/examples/docbook-website/buildmake.html
 share/examples/docbook-website/catalog.xml
 share/examples/docbook-website/custom.html
 share/examples/docbook-website/custom.xml
+share/examples/docbook-website/depends.nontabular
+share/examples/docbook-website/depends.tabular
 share/examples/docbook-website/dynxbel.js
 share/examples/docbook-website/example.css
 share/examples/docbook-website/formtest.html
@@ -93,11 +97,33 @@ share/examples/docbook-website/graphics/navicons/triangle/other/ChangeLog
 share/examples/docbook-website/graphics/navicons/triangle/other/closed.gif
 share/examples/docbook-website/graphics/navicons/triangle/other/leaf.gif
 share/examples/docbook-website/graphics/navicons/triangle/other/open.gif
+share/examples/docbook-website/graphics/note.gif
+share/examples/docbook-website/graphics/note.png
+share/examples/docbook-website/graphics/note.svg
+share/examples/docbook-website/graphics/note.tif
 share/examples/docbook-website/graphics/spacer.gif
 share/examples/docbook-website/index.html
 share/examples/docbook-website/layout.html
 share/examples/docbook-website/layout.xml
 share/examples/docbook-website/linking.html
+share/examples/docbook-website/n-about.html
+share/examples/docbook-website/n-buildext.html
+share/examples/docbook-website/n-building.html
+share/examples/docbook-website/n-buildmake.html
+share/examples/docbook-website/n-custom.html
+share/examples/docbook-website/n-formtest.html
+share/examples/docbook-website/n-full.html
+share/examples/docbook-website/n-index.html
+share/examples/docbook-website/n-layout.html
+share/examples/docbook-website/n-linking.html
+share/examples/docbook-website/n-nontab.html
+share/examples/docbook-website/n-php.html
+share/examples/docbook-website/n-rddl.html
+share/examples/docbook-website/n-revflag.html
+share/examples/docbook-website/n-rss.html
+share/examples/docbook-website/n-test1.html
+share/examples/docbook-website/n-test3.html
+share/examples/docbook-website/nontab.html
 share/examples/docbook-website/olink.xml
 share/examples/docbook-website/param.xml
 share/examples/docbook-website/php.html
@@ -108,11 +134,12 @@ share/examples/docbook-website/revflag.html
 share/examples/docbook-website/revflag.xml
 share/examples/docbook-website/rss.html
 share/examples/docbook-website/rss.xml
+share/examples/docbook-website/subdir/.cvskeepemptydir
 share/examples/docbook-website/subdir/ChangeLog
+share/examples/docbook-website/subdir/n-test1a.html
+share/examples/docbook-website/subdir/n-test1b.html
 share/examples/docbook-website/subdir/test1a.html
 share/examples/docbook-website/subdir/test1b.html
-share/examples/docbook-website/subdir/txttest1a.html
-share/examples/docbook-website/subdir/txttest1b.html
 share/examples/docbook-website/test1.html
 share/examples/docbook-website/test1.xml
 share/examples/docbook-website/test1a.xml
@@ -120,23 +147,23 @@ share/examples/docbook-website/test1b.xml
 share/examples/docbook-website/test2.xml
 share/examples/docbook-website/test3.html
 share/examples/docbook-website/test3.xml
-share/examples/docbook-website/textonly.html
+share/examples/docbook-website/website.database.xml
 share/examples/docbook-website/website.xml
 share/examples/docbook-website/wslayout.xml
 @comment in xmlcatmgr: share/xml/catalog
+@comment in xmlcatmgr: share/sgml/catalog
 share/xml/website/VERSION
+share/xml/website/catalog
 share/xml/website/catalog.xml
 share/xml/website/extensions/ChangeLog
 share/xml/website/extensions/saxon64.jar
 share/xml/website/extensions/saxon64/ChangeLog
 share/xml/website/extensions/saxon64/com/nwalsh/saxon/ChangeLog
 share/xml/website/extensions/saxon64/com/nwalsh/saxon/Website.java
-share/xml/website/extensions/saxon64/prj.el
 share/xml/website/extensions/xalan2.jar
 share/xml/website/extensions/xalan2/ChangeLog
 share/xml/website/extensions/xalan2/com/nwalsh/xalan/ChangeLog
 share/xml/website/extensions/xalan2/com/nwalsh/xalan/Website.java
-share/xml/website/extensions/xalan2/prj.el
 share/xml/website/schema/ChangeLog
 share/xml/website/schema/dtd/ChangeLog
 share/xml/website/schema/dtd/autolayout.dtd
@@ -150,22 +177,35 @@ share/xml/website/schema/dtd/website-full.dtd
 share/xml/website/schema/dtd/website.dtd
 share/xml/website/schema/dtd/website.mod
 share/xml/website/schema/relaxng/ChangeLog
+share/xml/website/schema/relaxng/autolayout.rnc
 share/xml/website/schema/relaxng/autolayout.rng
-share/xml/website/schema/relaxng/config.xml
-share/xml/website/schema/relaxng/extensions.rng
-share/xml/website/schema/relaxng/forms.rng
+share/xml/website/schema/relaxng/calstblx.rnc
+share/xml/website/schema/relaxng/calstblx.rng
+share/xml/website/schema/relaxng/dbhierx.mod.rnc
+share/xml/website/schema/relaxng/dbhierx.mod.rng
+share/xml/website/schema/relaxng/dbpoolx.mod.rnc
+share/xml/website/schema/relaxng/dbpoolx.mod.rng
+share/xml/website/schema/relaxng/docbookx.rnc
+share/xml/website/schema/relaxng/docbookx.rng
+share/xml/website/schema/relaxng/extensions.mod.rnc
+share/xml/website/schema/relaxng/extensions.mod.rng
+share/xml/website/schema/relaxng/forms.mod.rnc
+share/xml/website/schema/relaxng/forms.mod.rng
+share/xml/website/schema/relaxng/htmltblx.mod.rnc
+share/xml/website/schema/relaxng/htmltblx.mod.rng
+share/xml/website/schema/relaxng/layout.rnc
 share/xml/website/schema/relaxng/layout.rng
-share/xml/website/schema/relaxng/rddl.rng
-share/xml/website/schema/relaxng/union.xml
+share/xml/website/schema/relaxng/namespaces.mod.rnc
+share/xml/website/schema/relaxng/namespaces.mod.rng
+share/xml/website/schema/relaxng/rddl.mod.rnc
+share/xml/website/schema/relaxng/rddl.mod.rng
+share/xml/website/schema/relaxng/website-full.rnc
 share/xml/website/schema/relaxng/website-full.rng
+share/xml/website/schema/relaxng/website.mod.rnc
+share/xml/website/schema/relaxng/website.mod.rng
+share/xml/website/schema/relaxng/website.rnc
 share/xml/website/schema/relaxng/website.rng
-share/xml/website/schema/relaxng/websitedb.rng
-share/xml/website/tests/ChangeLog
-share/xml/website/tests/test.xml
-share/xml/website/tests/testcust.xml
-share/xml/website/tests/testfull.xml
 share/xml/website/xsl/ChangeLog
-share/xml/website/xsl/VERSION
 share/xml/website/xsl/autolayout.xsl
 share/xml/website/xsl/chunk-common.xsl
 share/xml/website/xsl/chunk-tabular.xsl
@@ -183,7 +223,6 @@ share/xml/website/xsl/website-targets.xsl
 share/xml/website/xsl/website.xsl
 share/xml/website/xsl/xbel.xsl
 @dirrm share/xml/website/xsl
-@dirrm share/xml/website/tests
 @dirrm share/xml/website/schema/relaxng
 @dirrm share/xml/website/schema/dtd
 @dirrm share/xml/website/schema
@@ -198,6 +237,7 @@ share/xml/website/xsl/xbel.xsl
 @dirrm share/xml/website/extensions
 @dirrm share/xml/website
 @comment in xmlcatmgr: @dirrm share/xml
+@comment in xmlcatmgr: @dirrm share/sgml
 @dirrm share/examples/docbook-website/subdir
 @dirrm share/examples/docbook-website/graphics/navicons/triangle/other
 @dirrm share/examples/docbook-website/graphics/navicons/triangle/current
diff --git a/textproc/docbook-website/distinfo b/textproc/docbook-website/distinfo
index c79d9765676..131bd2ddc36 100644
--- a/textproc/docbook-website/distinfo
+++ b/textproc/docbook-website/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.8 2005/04/18 15:32:50 wiz Exp $
+$NetBSD: distinfo,v 1.9 2005/05/05 05:43:05 hrs 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 (docbook-website-2.6.0.tar.gz) = a4c5155c1cd66712a1584dfbfd8e34bd68aae5f1
+RMD160 (docbook-website-2.6.0.tar.gz) = 31d9f2e6a88e3e46bc8369599f33abb926ada883
+Size (docbook-website-2.6.0.tar.gz) = 243138 bytes
+SHA1 (patch-aa) = 2789db80eacd75ab4c922a168e8ea2979f467b70
 SHA1 (patch-ab) = 32ef65364493b6fb01cf2106c7d0c9d6c66db2af
-SHA1 (patch-ac) = c1c0cef0d3795011affd6e1e2ed9e0f683d2ec22
-SHA1 (patch-ad) = f3bfb2332e579ec0960d992d0250001a7ec4e3b5
diff --git a/textproc/docbook-website/files/catalog b/textproc/docbook-website/files/catalog
deleted file mode 100644
index 9e643ff90b2..00000000000
--- a/textproc/docbook-website/files/catalog
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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.4 2005/02/19 00:44:52 wiz 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>
diff --git a/textproc/docbook-website/patches/patch-aa b/textproc/docbook-website/patches/patch-aa
index ec109da45d2..b0f2af4b2e4 100644
--- a/textproc/docbook-website/patches/patch-aa
+++ b/textproc/docbook-website/patches/patch-aa
@@ -1,13 +1,87 @@
-$NetBSD: patch-aa,v 1.1 2003/01/28 10:43:44 grant Exp $
+$NetBSD: patch-aa,v 1.2 2005/05/05 05:43:05 hrs Exp $
 
---- xsl/website-common.xsl.orig	Mon Sep 16 23:21:16 2002
-+++ xsl/website-common.xsl
-@@ -17,7 +17,7 @@
+--- catalog.orig	2005-05-03 04:24:46.000000000 +0900
++++ catalog	2005-05-03 04:25:02.000000000 +0900
+@@ -2,12 +2,12 @@
+ OVERRIDE YES
  
- <!-- ==================================================================== -->
+ PUBLIC "-//Norman Walsh//DTD Website V2.6//EN" "schema/dtd/website.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.6/schema/website.dtd" "schema/dtd/website.dtd"/>
+-SYSTEM "http://docbook.sourceforge.net/release/website/current/schema/website.dtd" "schema/dtd/website.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.6/schema/website.dtd" "schema/dtd/website.dtd"
++SYSTEM "http://docbook.sourceforge.net/release/website/current/schema/website.dtd" "schema/dtd/website.dtd"
  
--<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
-+<xsl:import href="../../../xsl/docbook/html/docbook.xsl"/>
- <xsl:import href="xbel.xsl"/>
- <xsl:include href="VERSION"/>
- <xsl:include href="param.xsl"/>
+ PUBLIC "-//Norman Walsh//DTD Website Full V2.6//EN" "schema/dtd/website-full.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.6/schema/website-full.dtd" "schema/dtd/website-full.dtd"/>
+-SYSTEM "http://docbook.sourceforge.net/release/website/current/schema/website-full.dtd" "schema/dtd/website-full.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.6/schema/website-full.dtd" "schema/dtd/website-full.dtd"
++SYSTEM "http://docbook.sourceforge.net/release/website/current/schema/website-full.dtd" "schema/dtd/website-full.dtd"
+ 
+ PUBLIC "-//Norman Walsh//DTD Website Autolayout V2.5.0//EN" "schema/dtd/autolayout.dtd"
+ SYSTEM "http://docbook.sourceforge.net/release/website/2.5.0/autolayout.dtd" "schema/dtd/autolayout.dtd"
+@@ -21,49 +21,49 @@
+ -- the URIs in all their existing Website document instances --
+ 
+ PUBLIC "-//Norman Walsh//DTD Website V2.5.0//EN" "schema/dtd/website.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.5.0/schema/website.dtd" "schema/dtd/website.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.5.0/schema/website.dtd" "schema/dtd/website.dtd"
+ 
+ PUBLIC "-//Norman Walsh//DTD Website Full V2.5.0//EN" "schema/dtd/website-full.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.5.0/schema/website-full.dtd" "schema/dtd/website-full.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.5.0/schema/website-full.dtd" "schema/dtd/website-full.dtd"
+ 
+ PUBLIC "-//Norman Walsh//DTD Website V2.4.1//EN" "schema/dtd/website.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.4.1/schema/website.dtd" "schema/dtd/website.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.4.1/schema/website.dtd" "schema/dtd/website.dtd"
+ 
+ PUBLIC "-//Norman Walsh//DTD Website Full V2.4.1//EN" "schema/dtd/website-full.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.4.1/schema/website-full.dtd" "schema/dtd/website-full.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.4.1/schema/website-full.dtd" "schema/dtd/website-full.dtd"
+ 
+ PUBLIC "-//Norman Walsh//DTD Website V2.4.0//EN" "schema/dtd/website.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.4.0/schema/website.dtd" "schema/dtd/website.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.4.0/schema/website.dtd" "schema/dtd/website.dtd"
+ 
+ PUBLIC "-//Norman Walsh//DTD Website Full V2.4.0//EN" "schema/dtd/website-full.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.4.0/schema/website-full.dtd" "schema/dtd/website-full.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.4.0/schema/website-full.dtd" "schema/dtd/website-full.dtd"
+ 
+ PUBLIC "-//Norman Walsh//DTD Website V2.3//EN" "schema/dtd/website.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.3/schema/website.dtd" "schema/dtd/website.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.3/schema/website.dtd" "schema/dtd/website.dtd"
+ 
+ PUBLIC "-//Norman Walsh//DTD Website Full V2.3//EN" "schema/dtd/website-full.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.3/schema/website-full.dtd" "schema/dtd/website-full.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.3/schema/website-full.dtd" "schema/dtd/website-full.dtd"
+ 
+ PUBLIC "-//Norman Walsh//DTD Website V2.2//EN" "schema/dtd/website.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.2/schema/website.dtd" "schema/dtd/website.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.2/schema/website.dtd" "schema/dtd/website.dtd"
+ 
+ PUBLIC "-//Norman Walsh//DTD Website Full V2.2//EN" "schema/dtd/website-full.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.2/schema/website-full.dtd" "schema/dtd/website-full.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.2/schema/website-full.dtd" "schema/dtd/website-full.dtd"
+ 
+ PUBLIC "-//Norman Walsh//DTD Website V2.1//EN" "schema/dtd/website.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.1/schema/website.dtd" "schema/dtd/website.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.1/schema/website.dtd" "schema/dtd/website.dtd"
+ 
+ PUBLIC "-//Norman Walsh//DTD Website Full V2.1//EN" "schema/dtd/website-full.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.1/schema/website-full.dtd" "schema/dtd/website-full.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.1/schema/website-full.dtd" "schema/dtd/website-full.dtd"
+ 
+ PUBLIC "-//Norman Walsh//DTD Website V2.1b1//EN" "schema/dtd/website.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.1b1/schema/website.dtd" "schema/dtd/website.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.1b1/schema/website.dtd" "schema/dtd/website.dtd"
+ 
+ PUBLIC "-//Norman Walsh//DTD Website Full V2.1b1//EN" "schema/dtd/website-full.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.1b1/schema/website-full.dtd" "schema/dtd/website-full.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.1b1/schema/website-full.dtd" "schema/dtd/website-full.dtd"
+ 
+ PUBLIC "-//Norman Walsh//DTD Website V2.0//EN" "schema/dtd/website.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.0/schema/website.dtd" "schema/dtd/website.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.0/schema/website.dtd" "schema/dtd/website.dtd"
+ 
+ PUBLIC "-//Norman Walsh//DTD Website V2.0b1//EN" "schema/dtd/website.dtd"
+-SYSTEM "http://docbook.sourceforge.net/release/website/2.0b1/schema/website.dtd" "schema/dtd/website.dtd"/>
++SYSTEM "http://docbook.sourceforge.net/release/website/2.0b1/schema/website.dtd" "schema/dtd/website.dtd"
diff --git a/textproc/docbook-website/patches/patch-ac b/textproc/docbook-website/patches/patch-ac
deleted file mode 100644
index 5b4ec532864..00000000000
--- a/textproc/docbook-website/patches/patch-ac
+++ /dev/null
@@ -1,122 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/04/18 15:32:50 wiz Exp $
-
---- 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.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 +27,85 @@
-        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 V2.2.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 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.5.0//EN"
-+    uri="autolayout.dtd"/>
-+
-+  <public
-+    publicId="-//Norman Walsh//DTD Website Autolayout V2.2.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 Layout V2.2.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 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.5.0//EN"
-+    uri="namespaces.mod"/>
-+
-+  <public
-+    publicId="-//Norman Walsh//DTD Website Namespaces Module V2.2.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 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"/>
- </group>
- 
diff --git a/textproc/docbook-website/patches/patch-ad b/textproc/docbook-website/patches/patch-ad
deleted file mode 100644
index 9e7e4ba6c11..00000000000
--- a/textproc/docbook-website/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$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"/>