Update to 2.5.0.

Changes since version 2.4.1 (2003-02-18)

Changes to website/*

  | 2003-06-22  Norman Walsh
  |
  | 	* VERSION: Version 2.5.0 released.
  |
  | 2003-06-21  Norman Walsh
  |
  | 	* Makefile: Tweaked
  |

Changes to website/example/*

  | 2003-02-20  Robert Stayton
  |
  | 	* olink.xml: Now covers XSL-based olink processing.
  |

Changes to website/xsl/*

  | 2003-06-22  Norman Walsh
  |
  | 	* param.xsl, tabular.xsl: Added table.spacer.image to improve
  | 	  tabular style accessibility. This is a fairly intrusive
  | 	  change, but I think its a significant improvement in
  | 	  accessibility.
  |
  | 2003-05-27  Robert Stayton
  |
  | 	* olink.xsl: Fix typo in test attribute.
  |
  | 2003-04-13  Norman Walsh
  |
  | 	* head.xsl: Feat Req #703116: add type to script
  |
  | 2003-02-26  Jirka Kosek
  |
  | 	* toc-tabular.xsl: Make comparsion safe even if nav.graphics
  | 	  is specified as string type
  |
  | 2003-02-20  Robert Stayton
  |
  | 	* chunk-common.xsl, olink.xsl, website-common.xsl,
  | 	  website-targets.xsl: Added XSL-based olink processing.
  |

Changes to website/example/graphics/*

  | 2003-06-22  Norman Walsh
  |
  | 	* spacer.gif: New file.
  |

Changes to website/schema/relaxng/*

  | 2003-06-22  Norman Walsh
  |
  | 	* autolayout.rng, extensions.rng, layout.rng: Cleanup
  | 	  attributes on script element
  |
  | 	* autolayout.rng, layout.rng, website-full.rng, website.rng:
  | 	  Updated version numbers
  |

Changes to website/schema/dtd/*

  | 2003-06-22  Norman Walsh
  |
  | 	* autolayout.dtd, extensions.mod, forms.mod, layout.dtd,
  | 	  namespaces.mod, rddl.mod, website-custom.dtd,
  | 	  website-full.dtd, website.dtd, website.mod: Updated version
  | 	  numbers
  |
  | 2003-06-21  Norman Walsh
  |
  | 	* autolayout.dtd, layout.dtd, website.mod: Allow type
  | 	  attribute on script
  |

Changes since version 2.3 (2002-09-17)

Changes to website/*

  | 2003-02-18  Norman Walsh
  |
  | 	* VERSION: Version 2.4.1 released.
  |
  | 	* catalog.xml: Added rewrite rules for the schema and xsl
  | 	  directories
  |
  | 	* catalog.xml: Added chunk-common to the catalog
  |
  | 2003-01-25  Norman Walsh
  |
  | 	* Makefile: Cleanup and support reorganized directories
  |
  | 	* README: Updated versions, copyright, and system identifiers
  |
  | 	* VERSION: Version 2.4.0 released.
  |
  | 	* catalog.xml: Fixed typos
  |
  | 2003-01-16  Norman Walsh
  |
  | 	* autolayout.dtd, catalog.xml, extensions.mod, forms.mod,
  | 	  layout.dtd, namespaces.mod, rddl.mod, website-custom.dtd,
  | 	  website-full.dtd, website.mod: Moved files; this messes up
  | 	  the CVS tags, but I'm doing it anyway :-(
  |
  | 	* website-custom.dtd: Based on Simplified 1.0
  |
  | 2003-01-12  Robert Stayton
  |
  | 	* catalog.xml: New file.
  |
  | 2002-11-17  Norman Walsh
  |
  | 	* VERSION, autolayout.dtd, extensions.mod, forms.mod,
  | 	  layout.dtd, namespaces.mod, rddl.mod, website-custom.dtd,
  | 	  website-full.dtd, website.mod: Bug #636004: fix version
  | 	  numbers
  |
  | 2002-10-16  Norman Walsh
  |
  | 	* website-custom.dtd: Fix typos in comments; correct spelling
  | 	  of qand_a_set PEs; add blockinfo for qandaset
  |
  | 	* website-full.dtd: Fix typos in comments
  |
  | 2002-10-02  Norman Walsh
  |
  | 	* autolayout.dtd, layout.dtd, website.mod: Add headlink
  | 	  element (HTML head 'link')
  |

Changes to website/example/*

  | 2003-02-18  Norman Walsh
  |
  | 	* layout.xml: Moved revisionflag
  |
  | 2003-01-25  Norman Walsh
  |
  | 	* catalog.xml: New file.
  |
  | 2003-01-24  Norman Walsh
  |
  | 	* Makefile: Use Saxon instead of xsltproc because the warnings
  | 	  about realtive namespace URIs bug me
  |
  | 2003-01-16  Norman Walsh
  |
  | 	* about.xml, build-ext.xml, build-make.xml,
  | 	  build-textonly.xml, building.xml, custom.xml, full.xml,
  | 	  layout.xml, olink.xml, param.xml, php.xml, rddl.xml,
  | 	  revflag.xml, rss.xml, test1.xml, test1a.xml, test1b.xml,
  | 	  test2.xml, test3.xml, website.xml, wslayout.xml: Updated DTD
  | 	  URIs
  |
  | 2003-01-12  Robert Stayton
  |
  | 	* build-ext.xml: Added para about using a processor that lacks
  | 	  extension functions.
  |
  | 	* build-make.xml: Corrections to Makefile listing.
  |
  | 2002-10-02  Norman Walsh
  |
  | 	* build-make.xml, layout.xml: Add global headlink and local
  | 	  headlink
  |

Changes to website/xsl/*

  | 2003-02-18  Norman Walsh
  |
  | 	* autolayout.xsl: Updated version numbers to 2.4.1
  |
  | 2003-02-16  Norman Walsh
  |
  | 	* rss.xsl: Check for localTime function before calling it
  |
  | 2003-01-26  Robert Stayton
  |
  | 	* chunk-common.xsl: No longer terminates if exists() function
  | 	  not available. Will not track dependencies, so all files
  | 	  built each time.
  |
  | 2003-01-16  Norman Walsh
  |
  | 	* autolayout.xsl: Update the public and system identifers
  |
  | 2003-01-11  Robert Stayton
  |
  | 	* makefile-dep.xsl: Add optional output-root param so
  | 	  dependency path matches the output path.
  |
  | 2002-11-17  Norman Walsh
  |
  | 	* website-common.xsl: Patch #540597: add rcsdate.format named
  | 	  template
  |
  | 2002-10-02  Norman Walsh
  |
  | 	* autolayout.xsl, head.xsl: Support headlink element
  |
  | 	* chunk-common.xsl: Support references to external pages when
  | 	  using XSLT exists() function to choose build order
  |

Changes to website/tests/*

  | 2002-10-16  Norman Walsh
  |
  | 	* test.xml, testfull.xml: Added XML declarations
  |

Changes to website/schema/*

  | 2003-01-25  Norman Walsh
  |
  | 	* Makefile: New file.
  |

Changes to website/schema/relaxng/*

  | 2003-02-18  Norman Walsh
  |
  | 	* autolayout.rng, extensions.rng, forms.rng, layout.rng,
  | 	  rddl.rng, website-full.rng, website.rng: Updated version
  | 	  numbers to 2.4.1
  |
  | 2003-01-23  Norman Walsh
  |
  | 	* .cvsignore: Ignore websitedb.rng
  |
  | 	* .cvsignore, Makefile: Updated
  |
  | 	* config.xml: Generated
  |
  | 	* config.xml, union.xml: Changed configuration strategy
  |
  | 	* extensions.rng, forms.rng, rddl.rng, website-full.rng,
  | 	  website.rng: Removed extraneous xmlns declaration
  |
  | 	* union.xml: Oops. I did need this file
  |
  | 	* websitedb.rng: This file is generated
  |
  | 2003-01-16  Norman Walsh
  |
  | 	* .cvsignore, Makefile, autolayout.rng, extensions.rng,
  | 	  forms.rng, layout.rng, rddl.rng, union.xml,
  | 	  website-full.rng, website.rng, websitedb.rng: New file.
  |

Changes to website/schema/dtd/*

  | 2003-02-18  Norman Walsh
  |
  | 	* autolayout.dtd, extensions.mod, forms.mod, layout.dtd,
  | 	  namespaces.mod, rddl.mod, website-custom.dtd,
  | 	  website-full.dtd, website.dtd, website.mod: Updated version
  | 	  numbers to 2.4.1
  |
  | 2003-01-25  Norman Walsh
  |
  | 	* Makefile: Cleanup
  |
  | 2003-01-23  Norman Walsh
  |
  | 	* Makefile: New file.
  |
  | 	* website-custom.dtd, website.dtd: Updated version numbers
  |
  | 2003-01-16  Norman Walsh
  |
  | 	* autolayout.dtd, extensions.mod, forms.mod, layout.dtd,
  | 	  namespaces.mod, rddl.mod, website-custom.dtd,
  | 	  website-full.dtd, website.dtd, website.mod: New file.
  |

5 files changed, 75 insertions, 40 deletions

diff --git a/textproc/docbook-website/Makefile b/textproc/docbook-website/Makefile
index 36cb3e12850..4cd6860ccba 100644
--- a/textproc/docbook-website/Makefile
+++ b/textproc/docbook-website/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2005/01/01 15:26:29 darcy Exp $
+# $NetBSD: Makefile,v 1.14 2005/02/19 00:22:10 wiz Exp $
 #
 
-DISTNAME=	website-2.3
+DISTNAME=	website-2.5.0
 PKGNAME=	docbook-${DISTNAME}
-PKGREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=docbook/}
 
@@ -22,7 +21,7 @@ DOCDIR=		${PREFIX}/share/doc/docbook-website
 DTDDIR=		${PREFIX}/share/xml/website
 EGDIR=		${PREFIX}/share/examples/docbook-website
 
-XML_CATALOGS=	${DTDDIR}/catalog
+XML_CATALOGS=	${DTDDIR}/catalog.xml
 
 do-install:
 	cd ${WRKSRC} && ${FIND} . -name "*.orig" -exec ${RM} {} \;
@@ -32,9 +31,11 @@ do-install:
 	cd ${WRKSRC} && ${PAX} -rwpm ChangeLog README VERSION WhatsNew	\
 		${DOCDIR}
 	cd ${WRKSRC}/example && ${PAX} -rwpm . ${EGDIR}
-	cd ${WRKSRC} && ${PAX} -rwpm VERSION extensions xsl *.dtd *.mod	\
+	${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 \
 		${DTDDIR}
-	${INSTALL_DATA} ${FILESDIR}/catalog ${DTDDIR}/catalog
+	${INSTALL_DATA} ${WRKSRC}/catalog.xml ${DTDDIR}
 
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/docbook-website/PLIST b/textproc/docbook-website/PLIST
index 2213d49931f..8e51c055826 100644
--- a/textproc/docbook-website/PLIST
+++ b/textproc/docbook-website/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/29 21:31:17 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/02/19 00:22:10 wiz Exp $
 share/doc/docbook-website/ChangeLog
 share/doc/docbook-website/README
 share/doc/docbook-website/VERSION
@@ -6,6 +6,7 @@ share/doc/docbook-website/WhatsNew
 share/examples/docbook-website/.tabular
 share/examples/docbook-website/.textonly
 share/examples/docbook-website/ChangeLog
+share/examples/docbook-website/about.html
 share/examples/docbook-website/about.xml
 share/examples/docbook-website/autolayout.xml
 share/examples/docbook-website/bookmark/ChangeLog
@@ -16,10 +17,17 @@ 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.xml
+share/examples/docbook-website/buildext.html
+share/examples/docbook-website/building.html
 share/examples/docbook-website/building.xml
+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/dynxbel.js
 share/examples/docbook-website/example.css
+share/examples/docbook-website/formtest.html
+share/examples/docbook-website/full.html
 share/examples/docbook-website/full.xml
 share/examples/docbook-website/graphics/ChangeLog
 share/examples/docbook-website/graphics/arrow.gif
@@ -85,25 +93,39 @@ 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/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/olink.xml
 share/examples/docbook-website/param.xml
+share/examples/docbook-website/php.html
 share/examples/docbook-website/php.xml
+share/examples/docbook-website/rddl.html
 share/examples/docbook-website/rddl.xml
+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/ChangeLog
+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
 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.xml
 share/examples/docbook-website/wslayout.xml
+@comment in xmlcatmgr: share/xml/catalog
 share/xml/website/VERSION
-share/xml/website/autolayout.dtd
-share/xml/website/catalog
-share/xml/website/extensions.mod
+share/xml/website/catalog.xml
 share/xml/website/extensions/ChangeLog
 share/xml/website/extensions/saxon64.jar
 share/xml/website/extensions/saxon64/ChangeLog
@@ -115,14 +137,33 @@ 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/forms.mod
-share/xml/website/layout.dtd
-share/xml/website/namespaces.mod
-share/xml/website/rddl.mod
-share/xml/website/website-custom.dtd
-share/xml/website/website-full.dtd
-share/xml/website/website.dtd
-share/xml/website/website.mod
+share/xml/website/schema/ChangeLog
+share/xml/website/schema/dtd/ChangeLog
+share/xml/website/schema/dtd/autolayout.dtd
+share/xml/website/schema/dtd/extensions.mod
+share/xml/website/schema/dtd/forms.mod
+share/xml/website/schema/dtd/layout.dtd
+share/xml/website/schema/dtd/namespaces.mod
+share/xml/website/schema/dtd/rddl.mod
+share/xml/website/schema/dtd/website-custom.dtd
+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.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/layout.rng
+share/xml/website/schema/relaxng/rddl.rng
+share/xml/website/schema/relaxng/union.xml
+share/xml/website/schema/relaxng/website-full.rng
+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
@@ -131,15 +172,21 @@ share/xml/website/xsl/chunk-tabular.xsl
 share/xml/website/xsl/chunk-website.xsl
 share/xml/website/xsl/head.xsl
 share/xml/website/xsl/makefile-dep.xsl
+share/xml/website/xsl/olink.xsl
 share/xml/website/xsl/param.xsl
 share/xml/website/xsl/rss.xsl
 share/xml/website/xsl/tabular.xsl
 share/xml/website/xsl/toc-tabular.xsl
 share/xml/website/xsl/toc.xsl
 share/xml/website/xsl/website-common.xsl
+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
 @dirrm share/xml/website/extensions/xalan2/com/nwalsh/xalan
 @dirrm share/xml/website/extensions/xalan2/com/nwalsh
 @dirrm share/xml/website/extensions/xalan2/com
@@ -150,6 +197,7 @@ share/xml/website/xsl/xbel.xsl
 @dirrm share/xml/website/extensions/saxon64
 @dirrm share/xml/website/extensions
 @dirrm share/xml/website
+@comment in xmlcatmgr: @dirrm share/xml
 @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 3f482085938..2b44f296951 100644
--- a/textproc/docbook-website/distinfo
+++ b/textproc/docbook-website/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/01/01 15:26:29 darcy Exp $
+$NetBSD: distinfo,v 1.4 2005/02/19 00:22:10 wiz Exp $
 
-SHA1 (website-2.3.tar.gz) = 895c98b09cc99a60f4ed6d52b588b07f7dd91733
-Size (website-2.3.tar.gz) = 80545 bytes
+SHA1 (website-2.5.0.tar.gz) = c36e345ff725c175407318fe878984f7ec5f0e56
+Size (website-2.5.0.tar.gz) = 135313 bytes
 SHA1 (patch-aa) = 14249023b2b1b3f1891e5f8d973f86337a2e9eee
-SHA1 (patch-ab) = a1db98fac78dbf553f5d30b2c45f7e3ebb8a18db
+SHA1 (patch-ab) = 32ef65364493b6fb01cf2106c7d0c9d6c66db2af
diff --git a/textproc/docbook-website/files/catalog b/textproc/docbook-website/files/catalog
deleted file mode 100644
index e16c0b49eb3..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.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>
diff --git a/textproc/docbook-website/patches/patch-ab b/textproc/docbook-website/patches/patch-ab
index b71254ca3dc..5b262513a04 100644
--- a/textproc/docbook-website/patches/patch-ab
+++ b/textproc/docbook-website/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2005/01/01 15:26:29 darcy Exp $
+$NetBSD: patch-ab,v 1.2 2005/02/19 00:22:10 wiz Exp $
 
---- website.dtd.orig	2002-09-04 07:21:31.000000000 -0400
-+++ website.dtd
-@@ -1048,12 +1048,8 @@
+--- schema/dtd/website.dtd.orig	2003-06-22 18:56:06.000000000 +0200
++++ schema/dtd/website.dtd
+@@ -1029,12 +1029,8 @@
  	contentwidth	CDATA		#IMPLIED
  	depth		CDATA		#IMPLIED
  	contentdepth	CDATA		#IMPLIED