Update to 1.1.2, from Min Sik Kim in PR pkg/23896 with some changes by me:

1.1.2:
        * libxlst/numbers.c: fixed xsl:number level="any" for Bug
          129057
        * libxslt/numbers.c: added namespace comparison for
          xsl:number count function (Bug 129057)
        * tests/docs/Makefile.am tests/docs/bug-139.xml
          tests/general/Makefile.am tests/general/bug-139*: added
          test for entities parsing (Bug #129489)
        * tests/docs/Makefile.am tests/docs/bug-138.xml
          tests/general/Makefile.am tests/general/bug-138*: added
          test for namespace problem (Bug #129624)
        * xsltproc.c: fixed #129327 make sure parser flags get transmitted to
          the transformation context
        * libxslt/documents.c libxslt/transform.c libxslt/xsltInternals.h
          libxslt/xsltutils.c libxslt/xsltutils.h: add a new call
          xsltSetCtxtParseOptions() to update parsing options in document()
        * libxslt/keys.c: fixed second problem on #122483, namespace
          definitions must be propagated to keys.
        * tests/docs/Makefile.am tests/docs/bug-137.xml
          tests/general/Makefile.am tests/docs/bug-137*: added test
          to the regression for bug #122483
        * libxslt/transform.c: added the cast needed to fix #129188 warning
        * libexslt/transform.c: fixed Bug 129624 (erroneous output
          of namespaces)
        * libexslt/date.c: fixed several routines to assure empty
          string returned (rather than a string object with a null
          string pointer) (Bug 129561)
        * doc/Makefile.am doc/site.xsl doc/api.xsl doc/newapi.xsl
          doc/xslt.html doc/apibuild.py doc/EXSLT doc/EXSLT/exslt.html:
          enhanced documentation to include exslt; rebuilt docs
        * libxslt/xsltutils.h
        * doc/*
        document XSLT_TRACE macro (sort of) and rebuild docs
        * win32/Makefile.mingw win32/configure.js: tried to fix mingw
          build, no success, it still works halfway.
        * win32/Makefile.* win32/configure.js libxslt/xsltexports.h
          libexslt/exsltexports.h libxslt/win32config.h: msvc and
          mingw compilation fixes.

1.1.1:
   - code cleanup (William Brack)
   - Windows: Makefile improvements (Igor Zlatkovic)
   - documentation improvements: William Brack, libexslt man page (Jonathan
    Wakely)
   - param in EXSLT functions (Shaun McCance)
   - XSLT debugging improvements (Mark Vakoc)
   - bug fixes: number formatting (Bjorn Reese), exslt:tokenize (William
    Brack), key selector parsing with | reported by Oleg Paraschenko,
    xsl:element with computed namespaces (William Brack), xslt:import/include
    recursion detection (William Brack), exslt:function used in keys (William
    Brack), bug when CDATA_SECTION are foun in the tree (William Brack),
    entities handling when using XInclude.

4 files changed, 37 insertions, 28 deletions

diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 6b3938814cf..8fb967acdc0 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2003/12/04 19:33:47 xtraeme Exp $
+# $NetBSD: Makefile,v 1.31 2003/12/26 21:56:14 jmmv Exp $
 
-DISTNAME=	libxslt-1.1.0
+DISTNAME=	libxslt-1.1.2
 PKGNAME=	${DISTNAME}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxslt/1.1/}
@@ -13,8 +13,10 @@ COMMENT=	XSLT parser library from the GNOME project
 USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
+USE_PERL5=		build
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libxslt.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/libexslt.pc.in
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libxml-prefix=${BUILDLINK_PREFIX.libxml2}
diff --git a/textproc/libxslt/PLIST b/textproc/libxslt/PLIST
index 5e2a987e20b..d5a85a3dad5 100644
--- a/textproc/libxslt/PLIST
+++ b/textproc/libxslt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2003/12/04 19:33:47 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.19 2003/12/26 21:56:15 jmmv Exp $
 bin/xslt-config
 bin/xsltproc
 include/libexslt/exslt.h
@@ -28,12 +28,13 @@ lib/libexslt.a
 lib/libexslt.la
 lib/libexslt.so
 lib/libexslt.so.8
-lib/libexslt.so.8.0
+lib/libexslt.so.8.2
 lib/libxslt.a
 lib/libxslt.la
 lib/libxslt.so
 lib/libxslt.so.2
-lib/libxslt.so.2.0
+lib/libxslt.so.2.2
+lib/pkgconfig/libexslt.pc
 lib/pkgconfig/libxslt.pc
 lib/xsltConf.sh
 man/man1/xsltproc.1
@@ -49,10 +50,19 @@ 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/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
@@ -69,20 +79,24 @@ 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-notes.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
@@ -106,6 +120,7 @@ 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/EXSLT
 @dirrm share/doc/html/libxslt
 @dirrm include/libxslt
 @dirrm include/libexslt
diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo
index b932eb5d15c..14281e43c14 100644
--- a/textproc/libxslt/distinfo
+++ b/textproc/libxslt/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.19 2003/12/04 19:33:47 xtraeme Exp $
+$NetBSD: distinfo,v 1.20 2003/12/26 21:56:15 jmmv Exp $
 
-SHA1 (libxslt-1.1.0.tar.bz2) = 816af587d9b0c37ad95e0d81469674b55ba46a2d
-Size (libxslt-1.1.0.tar.bz2) = 1614899 bytes
-SHA1 (patch-aa) = a90d8c179a2d47639d9fc2672e697512dab4812c
+SHA1 (libxslt-1.1.2.tar.bz2) = 41e7aca98fe9b10e93adf63caaa1c8daf53de00a
+Size (libxslt-1.1.2.tar.bz2) = 1699575 bytes
+SHA1 (patch-aa) = 86fdf91bf85843186f1fed59b0921cc5ec2f2da3
diff --git a/textproc/libxslt/patches/patch-aa b/textproc/libxslt/patches/patch-aa
index 54a7cb37478..6f243032b44 100644
--- a/textproc/libxslt/patches/patch-aa
+++ b/textproc/libxslt/patches/patch-aa
@@ -1,18 +1,18 @@
-$NetBSD: patch-aa,v 1.9 2003/12/04 19:33:47 xtraeme Exp $
+$NetBSD: patch-aa,v 1.10 2003/12/26 21:56:15 jmmv Exp $
 
---- 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@
+--- doc/Makefile.in.orig	2003-12-24 08:15:27.000000000 -0600
++++ doc/Makefile.in
+@@ -86,7 +86,7 @@ F77 = @F77@
+ GCJ = @GCJ@
+ GCJFLAGS = @GCJFLAGS@
  
 -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 @@
- 
+@@ -141,7 +141,7 @@ install_sh = @install_sh@
+ pythondir = @pythondir@
  
  # The name of the module.
 -DOC_MODULE = libxslt-$(VERSION)
@@ -20,20 +20,12 @@ $NetBSD: patch-aa,v 1.9 2003/12/04 19:33:47 xtraeme Exp $
  
  # The top-level SGML file.
  DOC_MAIN_XML_FILE = libxslt.xml
-@@ -150,7 +150,7 @@
+@@ -152,7 +152,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
- 
-@@ -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))
+          help.html index.html intro.html news.html xsltproc2.html FAQ.html
  
- 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 -)