Updated to 1.1.0 provided by Min Sik Kim PR pkg/23518.

Changes:

1.1.0: Nov 4 2003:
   - Removed DocBook SGML broken support
   - fix xsl:key to work with PIs
   - Makefile and build improvement (Graham Wilson), build cleanup (William
    Brack), macro fix (Justin Fletcher), build outside of source tree (Roumen
    Petrov)
   - xsltproc option display fix (Alexey Efimov), --load-trace (Crutcher
    Dunnavant)
   - Python: never use stdout for error
   - extension memory error fix (Karl Eichwalder)
   - header path fixes (Steve Ball)
   - added saxon:line-number() to libexslt (Brett Kail)
   - Fix some tortuous template problems when using predicates (William
    Brack)
   - Debugger status patch (Kasimier Buchcik)
   - Use new libxml2-2.6.x APIs for faster processing
   - Make sure xsl:sort is empty
   - Fixed a bug in default processing of attributes
   - Removes the deprecated breakpoint library
   - detect invalid names on templates (William Brack)
   - fix exslt:document (and similar) base handling problem

6 files changed, 75 insertions, 90 deletions

diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index fed17df63ea..6b3938814cf 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2003/11/02 07:02:32 xtraeme Exp $
+# $NetBSD: Makefile,v 1.30 2003/12/04 19:33:47 xtraeme Exp $
 
-DISTNAME=	libxslt-1.0.33
+DISTNAME=	libxslt-1.1.0
 PKGNAME=	${DISTNAME}
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxslt/1.0/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxslt/1.1/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	xtraeme@NetBSD.org
diff --git a/textproc/libxslt/PLIST b/textproc/libxslt/PLIST
index 31fd331f5d1..5e2a987e20b 100644
--- a/textproc/libxslt/PLIST
+++ b/textproc/libxslt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2003/10/05 10:28:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2003/12/04 19:33:47 xtraeme Exp $
 bin/xslt-config
 bin/xsltproc
 include/libexslt/exslt.h
@@ -27,18 +27,13 @@ include/libxslt/xsltutils.h
 lib/libexslt.a
 lib/libexslt.la
 lib/libexslt.so
-lib/libexslt.so.7
-lib/libexslt.so.7.22
+lib/libexslt.so.8
+lib/libexslt.so.8.0
 lib/libxslt.a
 lib/libxslt.la
 lib/libxslt.so
-lib/libxslt.so.1
-lib/libxslt.so.1.33
-lib/libxsltbreakpoint.a
-lib/libxsltbreakpoint.la
-lib/libxsltbreakpoint.so
-lib/libxsltbreakpoint.so.1
-lib/libxsltbreakpoint.so.1.8
+lib/libxslt.so.2
+lib/libxslt.so.2.0
 lib/pkgconfig/libxslt.pc
 lib/xsltConf.sh
 man/man1/xsltproc.1
@@ -61,7 +56,6 @@ share/doc/html/libxslt/APIsymbols.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/book1.html
 share/doc/html/libxslt/bugs.html
 share/doc/html/libxslt/contexts.gif
 share/doc/html/libxslt/contribs.html
@@ -70,25 +64,31 @@ 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-extensions.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-notes.html
+share/doc/html/libxslt/html/libxslt-numbersInternals.html
+share/doc/html/libxslt/html/libxslt-pattern.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-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/libxslt-attributes.html
-share/doc/html/libxslt/libxslt-extensions.html
-share/doc/html/libxslt/libxslt-functions.html
-share/doc/html/libxslt/libxslt-imports.html
-share/doc/html/libxslt/libxslt-keys.html
-share/doc/html/libxslt/libxslt-lib.html
-share/doc/html/libxslt/libxslt-namespaces.html
-share/doc/html/libxslt/libxslt-notes.html
-share/doc/html/libxslt/libxslt-numbersInternals.html
-share/doc/html/libxslt/libxslt-pattern.html
-share/doc/html/libxslt/libxslt-templates.html
-share/doc/html/libxslt/libxslt-transform.html
-share/doc/html/libxslt/libxslt-variables.html
-share/doc/html/libxslt/libxslt-xslt.html
-share/doc/html/libxslt/libxslt-xsltInternals.html
-share/doc/html/libxslt/libxslt-xsltutils.html
 share/doc/html/libxslt/news.html
 share/doc/html/libxslt/node.gif
 share/doc/html/libxslt/object.gif
@@ -105,6 +105,7 @@ share/doc/html/libxslt/xslt.html
 share/doc/html/libxslt/xsltproc.html
 share/doc/html/libxslt/xsltproc2.html
 @dirrm share/doc/html/libxslt/tutorial
+@dirrm share/doc/html/libxslt/html
 @dirrm share/doc/html/libxslt
 @dirrm include/libxslt
 @dirrm include/libexslt
diff --git a/textproc/libxslt/buildlink2.mk b/textproc/libxslt/buildlink2.mk
index 4dedf3e5753..2b011b42f89 100644
--- a/textproc/libxslt/buildlink2.mk
+++ b/textproc/libxslt/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.9 2003/07/13 13:53:34 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2003/12/04 19:33:47 xtraeme Exp $
 
 .if !defined(LIBXSLT_BUILDLINK2_MK)
 LIBXSLT_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libxslt
-BUILDLINK_DEPENDS.libxslt?=	libxslt>=1.0.31nb1
+BUILDLINK_DEPENDS.libxslt?=	libxslt>=1.1.0
 BUILDLINK_PKGSRCDIR.libxslt?=	../../textproc/libxslt
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libxslt=libxslt
diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo
index 07643b8afb0..b932eb5d15c 100644
--- a/textproc/libxslt/distinfo
+++ b/textproc/libxslt/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.18 2003/10/05 10:28:42 wiz Exp $
+$NetBSD: distinfo,v 1.19 2003/12/04 19:33:47 xtraeme Exp $
 
-SHA1 (libxslt-1.0.33.tar.bz2) = 738b96d5dc6bec9d0cd61179f2cb2287c0666919
-Size (libxslt-1.0.33.tar.bz2) = 1610718 bytes
-SHA1 (patch-aa) = 3b9036c7729ad4f23fd3a4ebab0d10846a958ee6
-SHA1 (patch-ab) = 6eb8e88c4ff17c09ca85f0ea98f233a44b593f6c
+SHA1 (libxslt-1.1.0.tar.bz2) = 816af587d9b0c37ad95e0d81469674b55ba46a2d
+Size (libxslt-1.1.0.tar.bz2) = 1614899 bytes
+SHA1 (patch-aa) = a90d8c179a2d47639d9fc2672e697512dab4812c
diff --git a/textproc/libxslt/patches/patch-aa b/textproc/libxslt/patches/patch-aa
index 6ae4e3d1eb2..54a7cb37478 100644
--- a/textproc/libxslt/patches/patch-aa
+++ b/textproc/libxslt/patches/patch-aa
@@ -1,15 +1,39 @@
-$NetBSD: patch-aa,v 1.8 2003/07/11 23:43:54 wiz Exp $
+$NetBSD: patch-aa,v 1.9 2003/12/04 19:33:47 xtraeme Exp $
 
---- libexslt/Makefile.in.orig	Mon Jul  7 00:00:12 2003
-+++ libexslt/Makefile.in
-@@ -153,8 +153,8 @@ libexslt_la_SOURCES = \
- 
- # The following DOES NOT WORK reliably. Sorry no prelinking to uninstalled
- # yet libraries.
--# libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
--libexslt_la_LIBADD = $(INSTALLED_XSLT_LIB) $(EXTRA_LIBS)
-+libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
-+# libexslt_la_LIBADD = $(INSTALLED_XSLT_LIB) $(EXTRA_LIBS)
- libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@
- 
- man_MANS = libexslt.3
+--- doc/Makefile.in.orig	2003-12-04 18:57:11.000000000 +0100
++++ doc/Makefile.in	2003-12-04 18:58:19.000000000 +0100
+@@ -76,7 +76,7 @@
+ ECHO = @ECHO@
+ EXTRA_LIBS = @EXTRA_LIBS@
+ 
+-HTML_DIR = $(datadir)/doc
++HTML_DIR = $(datadir)/doc/html
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBEXSLT_MAJOR_VERSION = @LIBEXSLT_MAJOR_VERSION@
+@@ -139,7 +139,7 @@
+ 
+ 
+ # The name of the module.
+-DOC_MODULE = libxslt-$(VERSION)
++DOC_MODULE = libxslt
+ 
+ # The top-level SGML file.
+ DOC_MAIN_XML_FILE = libxslt.xml
+@@ -150,7 +150,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 docs.html downloads.html \
+        help.html index.html intro.html news.html xsltproc2.html FAQ.html
+ 
+@@ -424,7 +424,6 @@
+ 	-@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)/html
+ 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial
+ 	-@INSTALL@ -m 0644 $(srcdir)/tutorial/* $(DESTDIR)$(TARGET_DIR)/tutorial
+-	-(cd $(DESTDIR); gtkdoc-fixxref --module=libxslt --html-dir=$(HTML_DIR))
+ 
+ dist-hook:
+ 	(cd $(srcdir) ; tar cvf - *.1 *.html site.xsl news.xsl xsa.xsl *.gif html/*.html html/*.png tutorial/libxslt*) | (cd $(distdir); tar xf -)
diff --git a/textproc/libxslt/patches/patch-ab b/textproc/libxslt/patches/patch-ab
deleted file mode 100644
index a87bb29f12c..00000000000
--- a/textproc/libxslt/patches/patch-ab
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2003/10/05 10:28:42 wiz Exp $
-
---- doc/Makefile.in.orig	Fri Sep 12 14:23:10 2003
-+++ doc/Makefile.in
-@@ -76,7 +76,7 @@ DLLTOOL = @DLLTOOL@
- ECHO = @ECHO@
- EXTRA_LIBS = @EXTRA_LIBS@
- 
--HTML_DIR = $(datadir)/doc
-+HTML_DIR = $(datadir)/doc/html
- INSTALLED_XSLT_LIB = @INSTALLED_XSLT_LIB@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-@@ -145,7 +145,7 @@ EXTRA_DIST = \
- 
- 
- # The name of the module.
--DOC_MODULE = libxslt-$(VERSION)
-+DOC_MODULE = libxslt
- 
- # The top-level SGML file.
- DOC_MAIN_XML_FILE = libxslt.xml
-@@ -156,7 +156,7 @@ DOC_SOURCE_DIR = ..
- # 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 docs.html downloads.html \
-        help.html index.html intro.html news.html xsltproc2.html FAQ.html
- 
-@@ -428,7 +428,6 @@ install-data-local: 
- 	-@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
- 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial
- 	-@INSTALL@ -m 0644 $(srcdir)/tutorial/* $(DESTDIR)$(TARGET_DIR)/tutorial
--	-(cd $(DESTDIR); gtkdoc-fixxref --module=libxslt --html-dir=$(HTML_DIR))
- 
- dist-hook:
- 	(cd $(srcdir) ; tar cvf - *.1 *.html site.xsl news.xsl xsa.xsl *.gif html/*.html html/*.png tutorial/libxslt*) | (cd $(distdir); tar xf -)