Update libxslt to 1.1.5

Changes:

1.1.5: Mar 23 2004:
   - performance: use dictionnary lookup for variables
   - remove use of _private from source documents
   - cleanup of "make tests" output
   - bugfixes: AVT in local variables, use localtime_r to avoid thread
    troubles (William), dictionary handling bug (William), limited number of
    stubstitutions in AVT (William), tokenize fix for UTF-8 (William),
    superfluous namespace (William), xsltproc error code on
    <xsl:message> halt, OpenVMS fix, dictionnary reference counting
    change.

4 files changed, 29 insertions, 41 deletions

diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 3765d207397..0adc1c4d1d2 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2004/03/13 09:55:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.41 2004/04/01 15:15:19 xtraeme Exp $
 
-DISTNAME=	libxslt-1.1.4
+DISTNAME=	libxslt-1.1.5
 PKGNAME=	${DISTNAME}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxslt/1.1/}
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--without-python
 
 TEST_TARGET=		check
 
-BUILDLINK_DEPENDS.libxml2+=	libxml2>=2.6.5
+BUILDLINK_DEPENDS.libxml2+=	libxml2>=2.6.8
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
diff --git a/textproc/libxslt/PLIST b/textproc/libxslt/PLIST
index b7ea2387e26..d8c4f3b63b4 100644
--- a/textproc/libxslt/PLIST
+++ b/textproc/libxslt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2004/03/13 09:55:24 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.25 2004/04/01 15:15:19 xtraeme Exp $
 bin/xslt-config
 bin/xsltproc
 include/libexslt/exslt.h
@@ -33,7 +33,7 @@ lib/libxslt.a
 lib/libxslt.la
 lib/libxslt.so
 lib/libxslt.so.2
-lib/libxslt.so.2.4
+lib/libxslt.so.2.5
 lib/pkgconfig/libexslt.pc
 lib/pkgconfig/libxslt.pc
 lib/xsltConf.sh
diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo
index 09fac60546d..1d1c7b3f948 100644
--- a/textproc/libxslt/distinfo
+++ b/textproc/libxslt/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.23 2004/03/13 09:55:24 jmmv Exp $
+$NetBSD: distinfo,v 1.24 2004/04/01 15:15:19 xtraeme Exp $
 
-SHA1 (libxslt-1.1.4.tar.bz2) = 317d35907f50c17f7bfb159209f057f10fdd4054
-Size (libxslt-1.1.4.tar.bz2) = 1717707 bytes
-SHA1 (patch-aa) = faf71aa86a064a70ab396322e64ab94f259ccd11
+SHA1 (libxslt-1.1.5.tar.bz2) = a9b0ad31a438c7ea838314d616db8583aab6d447
+Size (libxslt-1.1.5.tar.bz2) = 1751266 bytes
+SHA1 (patch-aa) = 8f4281db5cb4f330fe979873d87176944470e841
diff --git a/textproc/libxslt/patches/patch-aa b/textproc/libxslt/patches/patch-aa
index c10a8f84114..4eca3763f6c 100644
--- a/textproc/libxslt/patches/patch-aa
+++ b/textproc/libxslt/patches/patch-aa
@@ -1,18 +1,18 @@
-$NetBSD: patch-aa,v 1.12 2004/02/18 13:42:00 jmmv Exp $
+$NetBSD: patch-aa,v 1.13 2004/04/01 15:15:19 xtraeme Exp $
 
---- doc/Makefile.in.orig	2004-02-16 16:00:13.000000000 +0100
-+++ doc/Makefile.in
-@@ -86,7 +86,7 @@ F77 = @F77@
- GCJ = @GCJ@
- GCJFLAGS = @GCJFLAGS@
- 
+--- doc/Makefile.in.orig	2004-04-01 17:11:01.000000000 +0200
++++ doc/Makefile.in	2004-04-01 17:11:07.000000000 +0200
+@@ -83,7 +83,7 @@
+ EXTRA_LIBS = @EXTRA_LIBS@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
 -HTML_DIR = $(datadir)/doc
 +HTML_DIR = $(datadir)/doc/html
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBEXSLT_MAJOR_VERSION = @LIBEXSLT_MAJOR_VERSION@
-@@ -141,7 +141,7 @@ install_sh = @install_sh@
- pythondir = @pythondir@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -196,7 +196,7 @@
+ target_alias = @target_alias@
  
  # The name of the module.
 -DOC_MODULE = libxslt-$(VERSION)
@@ -20,28 +20,16 @@ $NetBSD: patch-aa,v 1.12 2004/02/18 13:42:00 jmmv Exp $
  
  # The top-level SGML file.
  DOC_MAIN_XML_FILE = libxslt.xml
-@@ -152,7 +152,7 @@ DOC_SOURCE_DIR = ..
+@@ -206,7 +206,7 @@
+ 
  # A file in win32 depends upon two of the doc files
  WIN32_DIR = $(top_srcdir)/win32
- 
 -TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/html
 +TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
  PAGES = API.html bugs.html contribs.html FAQ.html docs.html \
           downloads.html help.html index.html intro.html news.html \
  	 xsltproc2.html
-@@ -384,9 +384,9 @@ eapi:	EXSLT/libexslt-api.xml EXSLT/libex
- web: $(PAGES) $(EPAGES)
- 
- $(PAGES): xslt.html $(srcdir)/site.xsl
--	-@(if [ -x $(bindir)/xsltproc ] ; then \
-+	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
- 	  echo "Rebuilding the HTML Web pages from xslt.html" ; \
--	  $(bindir)/xsltproc --nonet --html $(srcdir)/site.xsl \
-+	  $(top_srcdir)/xsltproc/xsltproc --nonet --html $(srcdir)/site.xsl \
- 	    xslt.html > index.html ; fi )
- 	-@(if [ -x $(bindir)/xmllint ] ; then \
- 	  echo "Validating the HTML Web pages" ; \
-@@ -395,9 +395,9 @@ $(PAGES): xslt.html $(srcdir)/site.xsl
+@@ -475,9 +475,9 @@
  $(EPAGES): EXSLT/exslt.html $(srcdir)/site.xsl
  	 -@(if [ ! -d EXSLT/html ] ; then \
  	   mkdir -p EXSLT/html ; fi )
@@ -53,7 +41,7 @@ $NetBSD: patch-aa,v 1.12 2004/02/18 13:42:00 jmmv Exp $
  	   	--stringparam dirname EXSLT/ \
  		--stringparam libname libexslt \
  		--stringparam logo_base ../ \
-@@ -408,20 +408,20 @@ $(EPAGES): EXSLT/exslt.html $(srcdir)/si
+@@ -488,20 +488,20 @@
  	   $(bindir)/xmllint --nonet --valid --noout $(EPAGES) ; fi );
  
  ../NEWS: $(srcdir)/news.xsl news.html
@@ -80,7 +68,7 @@ $NetBSD: patch-aa,v 1.12 2004/02/18 13:42:00 jmmv Exp $
  			     $(srcdir)/api.xsl \
  			     xslt.html ; fi );
  	-@(if [ -x $(bindir)/xmllint ] ; then \
-@@ -429,9 +429,9 @@ $(APIPAGES): libxslt-refs.xml site.xsl a
+@@ -509,9 +509,9 @@
  	  $(bindir)/xmllint --nonet --valid --noout API*.html; fi );
  
  $(EAPIPAGES): EXSLT/libexslt-refs.xml site.xsl api.xsl
@@ -92,7 +80,7 @@ $NetBSD: patch-aa,v 1.12 2004/02/18 13:42:00 jmmv Exp $
  			     --stringparam libname libexslt \
  			     --stringparam dirname EXSLT/ \
  			     --stringparam logo_base ../ \
-@@ -439,9 +439,9 @@ $(EAPIPAGES): EXSLT/libexslt-refs.xml si
+@@ -519,9 +519,9 @@
  			     EXSLT/exslt.html ; fi );
  
  html/index.html: libxslt-api.xml $(srcdir)/newapi.xsl
@@ -104,7 +92,7 @@ $NetBSD: patch-aa,v 1.12 2004/02/18 13:42:00 jmmv Exp $
  			     $(srcdir)/newapi.xsl libxslt-api.xml ; fi ); 
  	-@(if [ -x $(bindir)/xmllint ] ; then \
  	  echo "Validating the resulting XHTML pages" ; \
-@@ -449,9 +449,9 @@ html/index.html: libxslt-api.xml $(srcdi
+@@ -529,9 +529,9 @@
  
  EXSLT/html/index.html: EXSLT/libexslt-api.xml \
  	$(srcdir)/newapi.xsl
@@ -116,7 +104,7 @@ $NetBSD: patch-aa,v 1.12 2004/02/18 13:42:00 jmmv Exp $
  	  		     --stringparam libname libexslt \
  			     --stringparam dirname EXSLT/ \
  			     --stringparam logo_base ../../ \
-@@ -473,22 +473,22 @@ xsltproc.1: xsltproc.xml
+@@ -553,22 +553,22 @@
  # Note that in the following, xmllint output is piped to xsltproc
  search.php: $(srcdir)/api.xsl $(srcdir)/site.xsl $(srcdir)/search.templ \
              $(srcdir)/search.xml $(srcdir)/search.php.inc