The documentation files are installed into share/doc instead of

share/doc/html. Bumped PKGREVISION.

4 files changed, 97 insertions, 106 deletions

diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index b3800b366c4..3eab0fb32f2 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2006/04/06 06:22:51 reed Exp $
+# $NetBSD: Makefile,v 1.64 2006/04/12 21:48:12 rillig Exp $
 
 DISTNAME=	libxslt-1.1.15
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxslt/1.1/}
 EXTRACT_SUFX=	.tar.bz2
@@ -19,7 +19,7 @@ PKGCONFIG_OVERRIDE+=	libexslt.pc.in
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libxml-prefix=${BUILDLINK_PREFIX.libxml2}
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	--without-python
 
 TEST_TARGET=		check
diff --git a/textproc/libxslt/PLIST b/textproc/libxslt/PLIST
index 99c46325534..3e8a89450b9 100644
--- a/textproc/libxslt/PLIST
+++ b/textproc/libxslt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2004/10/31 11:01:23 recht Exp $
+@comment $NetBSD: PLIST,v 1.34 2006/04/12 21:48:12 rillig Exp $
 bin/xslt-config
 bin/xsltproc
 include/libexslt/exslt.h
@@ -33,95 +33,95 @@ man/man1/xsltproc.1
 man/man3/libexslt.3
 man/man3/libxslt.3
 share/aclocal/libxslt.m4
-share/doc/html/libxslt/API.html
-share/doc/html/libxslt/APIchunk0.html
-share/doc/html/libxslt/APIchunk1.html
-share/doc/html/libxslt/APIchunk2.html
-share/doc/html/libxslt/APIchunk3.html
-share/doc/html/libxslt/APIchunk4.html
-share/doc/html/libxslt/APIchunk5.html
-share/doc/html/libxslt/APIchunk6.html
-share/doc/html/libxslt/APIchunk7.html
-share/doc/html/libxslt/APIchunk8.html
-share/doc/html/libxslt/APIchunk9.html
-share/doc/html/libxslt/APIconstructors.html
-share/doc/html/libxslt/APIfiles.html
-share/doc/html/libxslt/APIfunctions.html
-share/doc/html/libxslt/APIsymbols.html
-share/doc/html/libxslt/EXSLT/APIchunk0.html
-share/doc/html/libxslt/EXSLT/APIconstructors.html
-share/doc/html/libxslt/EXSLT/APIfiles.html
-share/doc/html/libxslt/EXSLT/APIfunctions.html
-share/doc/html/libxslt/EXSLT/APIsymbols.html
-share/doc/html/libxslt/EXSLT/bugs.html
-share/doc/html/libxslt/EXSLT/docs.html
-share/doc/html/libxslt/EXSLT/downloads.html
-share/doc/html/libxslt/EXSLT/exslt.html
-share/doc/html/libxslt/EXSLT/help.html
-share/doc/html/libxslt/EXSLT/index.html
-share/doc/html/libxslt/EXSLT/intro.html
-share/doc/html/libxslt/FAQ.html
-share/doc/html/libxslt/Libxslt-Logo-180x168.gif
-share/doc/html/libxslt/Libxslt-Logo-90x34.gif
-share/doc/html/libxslt/bugs.html
-share/doc/html/libxslt/contexts.gif
-share/doc/html/libxslt/contribs.html
-share/doc/html/libxslt/docbook.html
-share/doc/html/libxslt/docs.html
-share/doc/html/libxslt/downloads.html
-share/doc/html/libxslt/extensions.html
-share/doc/html/libxslt/help.html
-share/doc/html/libxslt/html/book1.html
-share/doc/html/libxslt/html/home.png
-share/doc/html/libxslt/html/index.html
-share/doc/html/libxslt/html/left.png
-share/doc/html/libxslt/html/libxslt-attributes.html
-share/doc/html/libxslt/html/libxslt-documents.html
-share/doc/html/libxslt/html/libxslt-extensions.html
-share/doc/html/libxslt/html/libxslt-extra.html
-share/doc/html/libxslt/html/libxslt-functions.html
-share/doc/html/libxslt/html/libxslt-imports.html
-share/doc/html/libxslt/html/libxslt-keys.html
-share/doc/html/libxslt/html/libxslt-lib.html
-share/doc/html/libxslt/html/libxslt-namespaces.html
-share/doc/html/libxslt/html/libxslt-numbersInternals.html
-share/doc/html/libxslt/html/libxslt-pattern.html
-share/doc/html/libxslt/html/libxslt-preproc.html
-share/doc/html/libxslt/html/libxslt-security.html
-share/doc/html/libxslt/html/libxslt-templates.html
-share/doc/html/libxslt/html/libxslt-transform.html
-share/doc/html/libxslt/html/libxslt-variables.html
-share/doc/html/libxslt/html/libxslt-xslt.html
-share/doc/html/libxslt/html/libxslt-xsltInternals.html
-share/doc/html/libxslt/html/libxslt-xsltexports.html
-share/doc/html/libxslt/html/libxslt-xsltutils.html
-share/doc/html/libxslt/html/right.png
-share/doc/html/libxslt/html/up.png
-share/doc/html/libxslt/index.html
-share/doc/html/libxslt/internals.html
-share/doc/html/libxslt/intro.html
-share/doc/html/libxslt/news.html
-share/doc/html/libxslt/node.gif
-share/doc/html/libxslt/object.gif
-share/doc/html/libxslt/processing.gif
-share/doc/html/libxslt/python.html
-share/doc/html/libxslt/redhat.gif
-share/doc/html/libxslt/smallfootonly.gif
-share/doc/html/libxslt/stylesheet.gif
-share/doc/html/libxslt/templates.gif
-share/doc/html/libxslt/tutorial/libxslt_tutorial.c
-share/doc/html/libxslt/tutorial/libxslttutorial.html
-share/doc/html/libxslt/tutorial/libxslttutorial.xml
-share/doc/html/libxslt/tutorial2/libxslt_pipes.c
-share/doc/html/libxslt/tutorial2/libxslt_pipes.html
-share/doc/html/libxslt/tutorial2/libxslt_pipes.xml
-share/doc/html/libxslt/xslt.html
-share/doc/html/libxslt/xsltproc.html
-share/doc/html/libxslt/xsltproc2.html
-@dirrm share/doc/html/libxslt/tutorial2
-@dirrm share/doc/html/libxslt/tutorial
-@dirrm share/doc/html/libxslt/html
-@dirrm share/doc/html/libxslt/EXSLT
-@dirrm share/doc/html/libxslt
+share/doc/libxslt/API.html
+share/doc/libxslt/APIchunk0.html
+share/doc/libxslt/APIchunk1.html
+share/doc/libxslt/APIchunk2.html
+share/doc/libxslt/APIchunk3.html
+share/doc/libxslt/APIchunk4.html
+share/doc/libxslt/APIchunk5.html
+share/doc/libxslt/APIchunk6.html
+share/doc/libxslt/APIchunk7.html
+share/doc/libxslt/APIchunk8.html
+share/doc/libxslt/APIchunk9.html
+share/doc/libxslt/APIconstructors.html
+share/doc/libxslt/APIfiles.html
+share/doc/libxslt/APIfunctions.html
+share/doc/libxslt/APIsymbols.html
+share/doc/libxslt/EXSLT/APIchunk0.html
+share/doc/libxslt/EXSLT/APIconstructors.html
+share/doc/libxslt/EXSLT/APIfiles.html
+share/doc/libxslt/EXSLT/APIfunctions.html
+share/doc/libxslt/EXSLT/APIsymbols.html
+share/doc/libxslt/EXSLT/bugs.html
+share/doc/libxslt/EXSLT/docs.html
+share/doc/libxslt/EXSLT/downloads.html
+share/doc/libxslt/EXSLT/exslt.html
+share/doc/libxslt/EXSLT/help.html
+share/doc/libxslt/EXSLT/index.html
+share/doc/libxslt/EXSLT/intro.html
+share/doc/libxslt/FAQ.html
+share/doc/libxslt/Libxslt-Logo-180x168.gif
+share/doc/libxslt/Libxslt-Logo-90x34.gif
+share/doc/libxslt/bugs.html
+share/doc/libxslt/contexts.gif
+share/doc/libxslt/contribs.html
+share/doc/libxslt/docbook.html
+share/doc/libxslt/docs.html
+share/doc/libxslt/downloads.html
+share/doc/libxslt/extensions.html
+share/doc/libxslt/help.html
+share/doc/libxslt/html/book1.html
+share/doc/libxslt/html/home.png
+share/doc/libxslt/html/index.html
+share/doc/libxslt/html/left.png
+share/doc/libxslt/html/libxslt-attributes.html
+share/doc/libxslt/html/libxslt-documents.html
+share/doc/libxslt/html/libxslt-extensions.html
+share/doc/libxslt/html/libxslt-extra.html
+share/doc/libxslt/html/libxslt-functions.html
+share/doc/libxslt/html/libxslt-imports.html
+share/doc/libxslt/html/libxslt-keys.html
+share/doc/libxslt/html/libxslt-lib.html
+share/doc/libxslt/html/libxslt-namespaces.html
+share/doc/libxslt/html/libxslt-numbersInternals.html
+share/doc/libxslt/html/libxslt-pattern.html
+share/doc/libxslt/html/libxslt-preproc.html
+share/doc/libxslt/html/libxslt-security.html
+share/doc/libxslt/html/libxslt-templates.html
+share/doc/libxslt/html/libxslt-transform.html
+share/doc/libxslt/html/libxslt-variables.html
+share/doc/libxslt/html/libxslt-xslt.html
+share/doc/libxslt/html/libxslt-xsltInternals.html
+share/doc/libxslt/html/libxslt-xsltexports.html
+share/doc/libxslt/html/libxslt-xsltutils.html
+share/doc/libxslt/html/right.png
+share/doc/libxslt/html/up.png
+share/doc/libxslt/index.html
+share/doc/libxslt/internals.html
+share/doc/libxslt/intro.html
+share/doc/libxslt/news.html
+share/doc/libxslt/node.gif
+share/doc/libxslt/object.gif
+share/doc/libxslt/processing.gif
+share/doc/libxslt/python.html
+share/doc/libxslt/redhat.gif
+share/doc/libxslt/smallfootonly.gif
+share/doc/libxslt/stylesheet.gif
+share/doc/libxslt/templates.gif
+share/doc/libxslt/tutorial/libxslt_tutorial.c
+share/doc/libxslt/tutorial/libxslttutorial.html
+share/doc/libxslt/tutorial/libxslttutorial.xml
+share/doc/libxslt/tutorial2/libxslt_pipes.c
+share/doc/libxslt/tutorial2/libxslt_pipes.html
+share/doc/libxslt/tutorial2/libxslt_pipes.xml
+share/doc/libxslt/xslt.html
+share/doc/libxslt/xsltproc.html
+share/doc/libxslt/xsltproc2.html
+@dirrm share/doc/libxslt/tutorial2
+@dirrm share/doc/libxslt/tutorial
+@dirrm share/doc/libxslt/html
+@dirrm share/doc/libxslt/EXSLT
+@dirrm share/doc/libxslt
 @dirrm include/libxslt
 @dirrm include/libexslt
diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo
index 6b2bcd93c09..b089324da0f 100644
--- a/textproc/libxslt/distinfo
+++ b/textproc/libxslt/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.37 2005/12/24 20:35:51 kim Exp $
+$NetBSD: distinfo,v 1.38 2006/04/12 21:48:12 rillig Exp $
 
 SHA1 (libxslt-1.1.15.tar.bz2) = 1fec57e083fe436bade3ec2352b9bcb9f5169df2
 RMD160 (libxslt-1.1.15.tar.bz2) = 8a560fdc635a2ab8d74ba95f9a98236a52204573
 Size (libxslt-1.1.15.tar.bz2) = 1822862 bytes
-SHA1 (patch-aa) = 75fb3542d881d77d19844f160857e2008056af0f
+SHA1 (patch-aa) = 3e745804f7f3900eaf88dc6d7ea831b81b0ff765
 SHA1 (patch-ab) = b1acdc7cadeead599110f3e8185d8469947bae54
 SHA1 (patch-ac) = eed53c657171b5af321470c3f3e9ba222b8d4367
 SHA1 (patch-ad) = 8353ad7cc928cb386e57e0bc65f8ebc2c90a1323
diff --git a/textproc/libxslt/patches/patch-aa b/textproc/libxslt/patches/patch-aa
index 2ce7a02687a..2edcbd498f6 100644
--- a/textproc/libxslt/patches/patch-aa
+++ b/textproc/libxslt/patches/patch-aa
@@ -1,16 +1,7 @@
-$NetBSD: patch-aa,v 1.15 2005/03/21 23:30:51 recht Exp $
+$NetBSD: patch-aa,v 1.16 2006/04/12 21:48:12 rillig Exp $
 
 --- doc/Makefile.in.orig	Sun Mar 13 20:45:10 2005
 +++ doc/Makefile.in	Tue Mar 22 00:17:59 2005
-@@ -84,7 +84,7 @@
- EXTRA_LIBS = @EXTRA_LIBS@
- F77 = @F77@
- FFLAGS = @FFLAGS@
--HTML_DIR = $(datadir)/doc
-+HTML_DIR = $(datadir)/doc/html
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
 @@ -210,7 +210,7 @@
  target_alias = @target_alias@