update to 1.1.21

changes: bugfixes, documentation update

5 files changed, 12 insertions, 104 deletions

diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 8820781e3b1..75831f6a7a9 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.75 2007/02/05 17:42:40 adam Exp $
+# $NetBSD: Makefile,v 1.76 2007/07/12 19:33:03 drochner Exp $
 
-DISTNAME=	libxslt-1.1.20
+DISTNAME=	libxslt-1.1.21
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxslt/1.1/} \
 		ftp://xmlsoft.org/libxslt/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://xmlsoft.org/XSLT/
diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo
index dae0f9c86e7..f526695ac2a 100644
--- a/textproc/libxslt/distinfo
+++ b/textproc/libxslt/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.45 2007/02/05 17:42:40 adam Exp $
+$NetBSD: distinfo,v 1.46 2007/07/12 19:33:03 drochner Exp $
 
-SHA1 (libxslt-1.1.20.tar.bz2) = 365263bc9f47f1df4c23ffb8169d48b56ebc2417
-RMD160 (libxslt-1.1.20.tar.bz2) = 663816b06322574473185582a6407bcf3fc38111
-Size (libxslt-1.1.20.tar.bz2) = 2341454 bytes
+SHA1 (libxslt-1.1.21.tar.gz) = 8237698b7c4171f021e0b80adeefc444ee9514d4
+RMD160 (libxslt-1.1.21.tar.gz) = 5c55d24fdcb5c14f004829e9bf2b02320edd63a0
+Size (libxslt-1.1.21.tar.gz) = 2780016 bytes
 SHA1 (patch-aa) = 7ea42e9b88a22e4b7061c1f35f620a9cc99150ee
 SHA1 (patch-ae) = f396896cf165c89d779646e904e9d0626382ab8a
-SHA1 (patch-af) = 05357ed22830233c1f8a082e35bad5e6f6334011
diff --git a/textproc/libxslt/patches/patch-af b/textproc/libxslt/patches/patch-af
deleted file mode 100644
index 363eb978263..00000000000
--- a/textproc/libxslt/patches/patch-af
+++ /dev/null
@@ -1,89 +0,0 @@
-$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)
diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile
index 26e26c1071e..144f0f55e08 100644
--- a/textproc/py-libxslt/Makefile
+++ b/textproc/py-libxslt/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.25 2007/06/16 13:16:11 taca Exp $
+# $NetBSD: Makefile,v 1.26 2007/07/12 19:33:04 drochner Exp $
 
-DISTNAME=	libxslt-1.1.20
+DISTNAME=	libxslt-1.1.21
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc python
 MASTER_SITES=	ftp://xmlsoft.org/libxslt/
 MASTER_SITES+=	${MASTER_SITE_GNOME:=sources/libxslt/1.1/}
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://xmlsoft.org/XSLT/
diff --git a/textproc/py-libxslt/distinfo b/textproc/py-libxslt/distinfo
index 0e22d4da6fc..87c190c7e93 100644
--- a/textproc/py-libxslt/distinfo
+++ b/textproc/py-libxslt/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2007/06/16 13:16:11 taca Exp $
+$NetBSD: distinfo,v 1.15 2007/07/12 19:33:04 drochner Exp $
 
-SHA1 (libxslt-1.1.20.tar.bz2) = 365263bc9f47f1df4c23ffb8169d48b56ebc2417
-RMD160 (libxslt-1.1.20.tar.bz2) = 663816b06322574473185582a6407bcf3fc38111
-Size (libxslt-1.1.20.tar.bz2) = 2341454 bytes
+SHA1 (libxslt-1.1.21.tar.gz) = 8237698b7c4171f021e0b80adeefc444ee9514d4
+RMD160 (libxslt-1.1.21.tar.gz) = 5c55d24fdcb5c14f004829e9bf2b02320edd63a0
+Size (libxslt-1.1.21.tar.gz) = 2780016 bytes