update to 1.1.20

changes:
-Portability fixes
-Bug fixes
-python stylesheet compare and transform context access
-EXSLT string replace support
-xsltproc better low level error handling

mostly from Blair Sadewitz per mail to tech-pkg

8 files changed, 122 insertions, 66 deletions

diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index e7459a6eb57..d7077b0c638 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.73 2007/01/16 19:49:43 rillig Exp $
+# $NetBSD: Makefile,v 1.74 2007/02/01 18:01:39 drochner Exp $
 
-DISTNAME=	libxslt-1.1.19
+DISTNAME=	libxslt-1.1.20
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://xmlsoft.org/libxslt/
 #MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxslt/1.1/}
diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo
index d2368ac7cf5..1448ccba239 100644
--- a/textproc/libxslt/distinfo
+++ b/textproc/libxslt/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.43 2007/01/16 19:49:43 rillig Exp $
+$NetBSD: distinfo,v 1.44 2007/02/01 18:01:39 drochner Exp $
 
-SHA1 (libxslt-1.1.19.tar.gz) = 74a69c9c8bb4a263a4b9e2a604f7210b34818eaf
-RMD160 (libxslt-1.1.19.tar.gz) = ff8dbc7024c66b5f2886e8df2c7ac1bdedb07030
-Size (libxslt-1.1.19.tar.gz) = 2799906 bytes
-SHA1 (patch-aa) = 3e745804f7f3900eaf88dc6d7ea831b81b0ff765
-SHA1 (patch-ab) = 70216897fc4c91d148eeece637df53a0f2555f1c
-SHA1 (patch-ac) = eed53c657171b5af321470c3f3e9ba222b8d4367
-SHA1 (patch-ad) = 8353ad7cc928cb386e57e0bc65f8ebc2c90a1323
+SHA1 (libxslt-1.1.20.tar.gz) = 1ca621c042b4f3d9a7e730c53961b89bcce2c645
+RMD160 (libxslt-1.1.20.tar.gz) = f2882ff47312de3b6317136ef751d4b42ab15a53
+Size (libxslt-1.1.20.tar.gz) = 3689759 bytes
+SHA1 (patch-aa) = 7ea42e9b88a22e4b7061c1f35f620a9cc99150ee
+SHA1 (patch-ae) = f396896cf165c89d779646e904e9d0626382ab8a
+SHA1 (patch-af) = 05357ed22830233c1f8a082e35bad5e6f6334011
diff --git a/textproc/libxslt/patches/patch-aa b/textproc/libxslt/patches/patch-aa
index 2edcbd498f6..16ad6ff77fe 100644
--- a/textproc/libxslt/patches/patch-aa
+++ b/textproc/libxslt/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.16 2006/04/12 21:48:12 rillig Exp $
+$NetBSD: patch-aa,v 1.17 2007/02/01 18:01:39 drochner Exp $
 
---- doc/Makefile.in.orig	Sun Mar 13 20:45:10 2005
-+++ doc/Makefile.in	Tue Mar 22 00:17:59 2005
-@@ -210,7 +210,7 @@
+--- doc/Makefile.in.orig	2007-01-17 15:42:16.000000000 +0100
++++ doc/Makefile.in
+@@ -211,7 +211,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  
  # The name of the module.
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.16 2006/04/12 21:48:12 rillig Exp $
  
  # The top-level SGML file.
  DOC_MAIN_XML_FILE = libxslt.xml
-@@ -220,7 +220,7 @@
+@@ -221,7 +221,7 @@ DOC_SOURCE_DIR = ..
  
  # A file in win32 depends upon two of the doc files
  WIN32_DIR = $(top_srcdir)/win32
@@ -19,8 +19,8 @@ $NetBSD: patch-aa,v 1.16 2006/04/12 21:48:12 rillig Exp $
 +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
-@@ -493,9 +493,9 @@
+ 	 xsltproc.html xsltproc2.html
+@@ -494,9 +494,9 @@ $(PAGES): xslt.html $(srcdir)/site.xsl
  $(EPAGES): EXSLT/exslt.html $(srcdir)/site.xsl
  	 -@(if [ ! -d EXSLT/html ] ; then \
  	   mkdir -p EXSLT/html ; fi )
@@ -32,7 +32,7 @@ $NetBSD: patch-aa,v 1.16 2006/04/12 21:48:12 rillig Exp $
  	   	--stringparam dirname EXSLT/ \
  		--stringparam libname libexslt \
  		--stringparam logo_base ../ \
-@@ -506,20 +506,20 @@
+@@ -507,20 +507,20 @@ $(EPAGES): EXSLT/exslt.html $(srcdir)/si
  	   $(bindir)/xmllint --nonet --valid --noout $(EPAGES) ; fi );
  
  ../NEWS: $(srcdir)/news.xsl news.html
@@ -59,7 +59,7 @@ $NetBSD: patch-aa,v 1.16 2006/04/12 21:48:12 rillig Exp $
  			     $(srcdir)/api.xsl \
  			     xslt.html ; fi );
  	-@(if [ -x $(bindir)/xmllint ] ; then \
-@@ -527,9 +527,9 @@
+@@ -528,9 +528,9 @@ $(APIPAGES): libxslt-refs.xml site.xsl a
  	  $(bindir)/xmllint --nonet --valid --noout API*.html; fi );
  
  $(EAPIPAGES): EXSLT/libexslt-refs.xml site.xsl api.xsl
@@ -71,7 +71,7 @@ $NetBSD: patch-aa,v 1.16 2006/04/12 21:48:12 rillig Exp $
  			     --stringparam libname libexslt \
  			     --stringparam dirname EXSLT/ \
  			     --stringparam logo_base ../ \
-@@ -537,9 +537,9 @@
+@@ -538,9 +538,9 @@ $(EAPIPAGES): EXSLT/libexslt-refs.xml si
  			     EXSLT/exslt.html ; fi );
  
  html/index.html: libxslt-api.xml $(srcdir)/newapi.xsl
@@ -83,7 +83,7 @@ $NetBSD: patch-aa,v 1.16 2006/04/12 21:48:12 rillig Exp $
  			     $(srcdir)/newapi.xsl libxslt-api.xml ; fi ); 
  	-@(if [ -x $(bindir)/xmllint ] ; then \
  	  echo "Validating the resulting XHTML pages" ; \
-@@ -552,9 +552,9 @@
+@@ -553,9 +553,9 @@ wiki: libxslt-api.xml $(srcdir)/wiki.xsl
  
  EXSLT/html/index.html: EXSLT/libexslt-api.xml \
  	$(srcdir)/newapi.xsl
@@ -95,7 +95,7 @@ $NetBSD: patch-aa,v 1.16 2006/04/12 21:48:12 rillig Exp $
  	  		     --stringparam libname libexslt \
  			     --stringparam dirname EXSLT/ \
  			     --stringparam logo_base ../../ \
-@@ -576,22 +576,22 @@
+@@ -577,22 +577,22 @@ xsltproc.1: xsltproc.xml
  # 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
diff --git a/textproc/libxslt/patches/patch-ab b/textproc/libxslt/patches/patch-ab
deleted file mode 100644
index 901a1e04fa5..00000000000
--- a/textproc/libxslt/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.14 2006/05/03 11:02:46 drochner Exp $
-
---- libexslt/crypto.c.orig	2006-03-10 12:01:42.000000000 +0100
-+++ libexslt/crypto.c
-@@ -317,6 +317,13 @@ exsltCryptoCryptoApiRc4Decrypt (xmlXPath
- #define PLATFORM_MD5 GCRY_MD_MD5
- #define PLATFORM_SHA1 GCRY_MD_SHA1
- 
-+#ifdef HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+
- #ifdef HAVE_SYS_SELECT_H
- #include <sys/select.h>		/* needed by gcrypt.h 4 Jul 04 */
- #endif
diff --git a/textproc/libxslt/patches/patch-ac b/textproc/libxslt/patches/patch-ac
deleted file mode 100644
index 5578b27c231..00000000000
--- a/textproc/libxslt/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/12/24 20:34:55 kim Exp $
-
---- configure.in.orig	2005-09-05 01:19:44.000000000 +0300
-+++ configure.in	2005-12-24 22:32:02.000000000 +0200
-@@ -469,7 +469,7 @@
- fi
- 
- AC_SUBST(WITH_MODULES)
--AM_CONDITIONAL(WITH_MODULES, test "$WITH_MODULES" == "1")
-+AM_CONDITIONAL(WITH_MODULES, test "$WITH_MODULES" = "1")
- 
- dnl
- dnl setup default module path
diff --git a/textproc/libxslt/patches/patch-ad b/textproc/libxslt/patches/patch-ad
deleted file mode 100644
index d27cf2504e3..00000000000
--- a/textproc/libxslt/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/12/24 20:34:55 kim Exp $
-
---- configure.orig	2005-09-05 01:28:05.000000000 +0300
-+++ configure	2005-12-24 22:33:33.000000000 +0200
-@@ -22590,7 +22590,7 @@
- 
- 
- 
--if test "$WITH_MODULES" == "1"; then
-+if test "$WITH_MODULES" = "1"; then
-   WITH_MODULES_TRUE=
-   WITH_MODULES_FALSE='#'
- else
diff --git a/textproc/libxslt/patches/patch-ae b/textproc/libxslt/patches/patch-ae
new file mode 100644
index 00000000000..ec4c300632e
--- /dev/null
+++ b/textproc/libxslt/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.3 2007/02/01 18:01:39 drochner Exp $
+
+--- libexslt/date.c.orig	2007-02-01 14:03:55.000000000 +0100
++++ libexslt/date.c
+@@ -30,6 +30,7 @@
+ 
+ #if HAVE_LOCALTIME_R	/* _POSIX_SOURCE required by gnu libc */
+ #define _POSIX_SOURCE
++#define _POSIX_C_SOURCE 199506L /* POSIX.1c */
+ #endif
+ 
+ #include <libxml/tree.h>
diff --git a/textproc/libxslt/patches/patch-af b/textproc/libxslt/patches/patch-af
new file mode 100644
index 00000000000..363eb978263
--- /dev/null
+++ b/textproc/libxslt/patches/patch-af
@@ -0,0 +1,89 @@
+$NetBSD: patch-af,v 1.1 2007/02/01 18:01:39 drochner Exp $
+
+--- libxslt/pattern.c.orig	2007-02-01 14:36:48.000000000 +0100
++++ libxslt/pattern.c
+@@ -2066,9 +2066,10 @@ xsltCompilePattern(const xmlChar *patter
+ int
+ xsltAddTemplate(xsltStylesheetPtr style, xsltTemplatePtr cur,
+ 	        const xmlChar *mode, const xmlChar *modeURI) {
+-    xsltCompMatchPtr pat, list, *top = NULL, next;
++    xsltCompMatchPtr pat, list, *help, next;
+     const xmlChar *name = NULL;
+     float priority;              /* the priority */
++    void *top = NULL;
+ 
+     if ((style == NULL) || (cur == NULL) || (cur->match == NULL))
+ 	return(-1);
+@@ -2097,24 +2098,24 @@ xsltAddTemplate(xsltStylesheetPtr style,
+ 	    if (pat->steps[0].value != NULL)
+ 		name = pat->steps[0].value;
+ 	    else
+-		top = (xsltCompMatchPtr *) &(style->attrMatch);
++		top = &(style->attrMatch);
+ 	    break;
+         case XSLT_OP_CHILD:
+         case XSLT_OP_PARENT:
+         case XSLT_OP_ANCESTOR:
+-	    top = (xsltCompMatchPtr *) &(style->elemMatch);
++	    top = &(style->elemMatch);
+ 	    break;
+         case XSLT_OP_ROOT:
+-	    top = (xsltCompMatchPtr *) &(style->rootMatch);
++	    top = &(style->rootMatch);
+ 	    break;
+         case XSLT_OP_KEY:
+-	    top = (xsltCompMatchPtr *) &(style->keyMatch);
++	    top = &(style->keyMatch);
+ 	    break;
+         case XSLT_OP_ID:
+ 	    /* TODO optimize ID !!! */
+         case XSLT_OP_NS:
+         case XSLT_OP_ALL:
+-	    top = (xsltCompMatchPtr *) &(style->elemMatch);
++	    top = &(style->elemMatch);
+ 	    break;
+         case XSLT_OP_END:
+ 	case XSLT_OP_PREDICATE:
+@@ -2130,20 +2131,20 @@ xsltAddTemplate(xsltStylesheetPtr style,
+ 	    if (pat->steps[0].value != NULL)
+ 		name = pat->steps[0].value;
+ 	    else
+-		top = (xsltCompMatchPtr *) &(style->piMatch);
++		top = &(style->piMatch);
+ 	    break;
+ 	case XSLT_OP_COMMENT:
+-	    top = (xsltCompMatchPtr *) &(style->commentMatch);
++	    top = &(style->commentMatch);
+ 	    break;
+ 	case XSLT_OP_TEXT:
+-	    top = (xsltCompMatchPtr *) &(style->textMatch);
++	    top = &(style->textMatch);
+ 	    break;
+         case XSLT_OP_ELEM:
+ 	case XSLT_OP_NODE:
+ 	    if (pat->steps[0].value != NULL)
+ 		name = pat->steps[0].value;
+ 	    else
+-		top = (xsltCompMatchPtr *) &(style->elemMatch);
++		top = &(style->elemMatch);
+ 	    break;
+ 	}
+ 	if (name != NULL) {
+@@ -2182,13 +2183,14 @@ xsltAddTemplate(xsltStylesheetPtr style,
+ 		}
+ 	    }
+ 	} else if (top != NULL) {
+-	    list = *top;
++	    help = top;
++	    list = *help;
+ 	    if (list == NULL) {
+-		*top = pat;
++		*help = pat;
+ 		pat->next = NULL;
+ 	    } else if (list->priority <= pat->priority) {
+ 		pat->next = list;
+-		*top = pat;
++		*help = pat;
+ 	    } else {
+ 		while (list->next != NULL) {
+ 		    if (list->next->priority <= pat->priority)