diff options
| -rw-r--r-- | textproc/docbook-website/Makefile | 13 | ||||
| -rw-r--r-- | textproc/docbook-website/PLIST | 72 | ||||
| -rw-r--r-- | textproc/docbook-website/distinfo | 8 | ||||
| -rw-r--r-- | textproc/docbook-website/files/catalog | 14 | ||||
| -rw-r--r-- | textproc/docbook-website/patches/patch-ab | 8 |
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 |