please take these diffs for a spin.
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.112
diff -u -r1.112 Makefile
--- Makefile 1 Apr 2008 11:36:24 -0000 1.112
+++ Makefile 26 Apr 2008 08:22:21 -0000
@@ -3,11 +3,11 @@
COMMENT-main= XML parsing library
COMMENT-python= Python bindings for libxml
-VERSION= 2.6.30
+VERSION= 2.6.32
DISTNAME= libxml2-${VERSION}
-PKGNAME-main= libxml-${VERSION}p0
-PKGNAME-python= py-libxml-${VERSION}p1
-SHARED_LIBS= xml2 9.7
+PKGNAME-main= libxml-${VERSION}
+PKGNAME-python= py-libxml-${VERSION}
+SHARED_LIBS= xml2 9.8
CATEGORIES= textproc
MASTER_SITES= ftp://xmlsoft.org/libxml/ \
${MASTER_SITE_GNOME:=sources/libxml2/2.6/}
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/libxml/distinfo,v
retrieving revision 1.42
diff -u -r1.42 distinfo
--- distinfo 10 Sep 2007 17:21:05 -0000 1.42
+++ distinfo 26 Apr 2008 08:22:39 -0000
@@ -1,5 +1,5 @@
-MD5 (libxml2-2.6.30.tar.gz) = Rg5thT6CTacA1phTLlcxaw==
-RMD160 (libxml2-2.6.30.tar.gz) = itzKKmC06Q3omNlxCjpFBptzu/4=
-SHA1 (libxml2-2.6.30.tar.gz) = UZcB3zoQdwmA6ZMzb+Ge99lbW7o=
-SHA256 (libxml2-2.6.30.tar.gz) = h3dioPRHhUh9dH7XvT2zZK3nWUPm2OnEn6Y0DDgzc14=
-SIZE (libxml2-2.6.30.tar.gz) = 4726657
+MD5 (libxml2-2.6.32.tar.gz) = JiHTIsFvAlfjDw/ysTOE3g==
+RMD160 (libxml2-2.6.32.tar.gz) = 7bnJqBPssS6yFNH3XZJ6yzgUgxw=
+SHA1 (libxml2-2.6.32.tar.gz) = HEZcDvnSG7Sn3wLU7frX3+HiY98=
+SHA256 (libxml2-2.6.32.tar.gz) = G0QouHmvyq48IBOyEoO6rQQGYfvVAuiT6DrcPRXIXVM=
+SIZE (libxml2-2.6.32.tar.gz) = 4722227
Index: patches/patch-Makefile.in
===================================================================
RCS file: /cvs/ports/textproc/libxml/patches/patch-Makefile.in,v
retrieving revision 1.17
diff -u -r1.17 patch-Makefile.in
--- patches/patch-Makefile.in 5 Jul 2007 16:05:09 -0000 1.17
+++ patches/patch-Makefile.in 26 Apr 2008 08:51:50 -0000
@@ -1,6 +1,6 @@
---- Makefile.in.orig Tue Jun 12 18:20:23 2007
-+++ Makefile.in Mon Jul 2 12:50:32 2007
-@@ -525,7 +525,7 @@ testModule_DEPENDENCIES = $(DEPS)
+--- Makefile.in.orig Tue Apr 8 16:55:03 2008
++++ Makefile.in Sat Apr 26 10:51:02 2008
+@@ -584,7 +584,7 @@ testModule_DEPENDENCIES = $(DEPS)
testModule_LDADD = $(LDADDS)
noinst_LTLIBRARIES = testdso.la
testdso_la_SOURCES = testdso.c
@@ -9,7 +9,7 @@
testapi_SOURCES = testapi.c
testapi_LDFLAGS =
testapi_DEPENDENCIES = $(DEPS)
-@@ -554,7 +554,7 @@ pkgconfig_DATA = libxml-2.0.pc
+@@ -613,7 +613,7 @@ pkgconfig_DATA = libxml-2.0.pc
# Install the tests program sources as examples
#
BASE_DIR = $(datadir)/doc
@@ -18,7 +18,7 @@
EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -1922,6 +1922,7 @@ SVGtests : xmllint$(EXEEXT)
+@@ -1990,6 +1990,7 @@ SVGtests : xmllint$(EXEEXT)
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0";\
else \
echo Testing $$name ; \
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/textproc/libxml/patches/patch-configure,v
retrieving revision 1.17
diff -u -r1.17 patch-configure
--- patches/patch-configure 5 Jul 2007 16:05:09 -0000 1.17
+++ patches/patch-configure 26 Apr 2008 08:51:50 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.16 2006/06/18 13:48:19 steven Exp $
---- configure.orig Tue Jun 12 18:10:36 2007
-+++ configure Mon Jul 2 12:50:32 2007
-@@ -27029,7 +27029,7 @@ fi
+--- configure.orig Tue Apr 8 16:48:27 2008
++++ configure Sat Apr 26 10:51:02 2008
+@@ -27302,7 +27302,7 @@ fi
fi
if test "$with_python" != ""
then
Index: patches/patch-doc_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/libxml/patches/patch-doc_Makefile_in,v
retrieving revision 1.15
diff -u -r1.15 patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in 5 Jul 2007 16:05:09 -0000 1.15
+++ patches/patch-doc_Makefile_in 26 Apr 2008 08:51:50 -0000
@@ -1,10 +1,10 @@
$OpenBSD: patch-doc_Makefile_in,v 1.14 2006/06/11 18:24:11 steven Exp $
---- doc/Makefile.in.orig Tue Jun 12 18:20:21 2007
-+++ doc/Makefile.in Mon Jul 2 12:50:32 2007
-@@ -274,7 +274,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
+--- doc/Makefile.in.orig Tue Apr 8 16:55:01 2008
++++ doc/Makefile.in Sat Apr 26 10:51:46 2008
+@@ -275,7 +275,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
-SUBDIRS = devhelp examples
+SUBDIRS = examples
Index: patches/patch-parserInternals_c
===================================================================
RCS file: patches/patch-parserInternals_c
diff -N patches/patch-parserInternals_c
--- patches/patch-parserInternals_c 1 Apr 2008 11:34:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-$OpenBSD$
---- parserInternals.c.orig Tue Jun 12 15:33:54 2007
-+++ parserInternals.c Tue Apr 1 10:36:06 2008
-@@ -638,14 +638,13 @@ xmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) {
-
- c = *cur;
- if (c & 0x80) {
-- if (c == 0xC0)
-+ if (((c & 0x40) == 0) || (c == 0xC0))
- goto encoding_error;
- if (cur[1] == 0)
- xmlParserInputGrow(ctxt->input, INPUT_CHUNK);
- if ((cur[1] & 0xc0) != 0x80)
- goto encoding_error;
- if ((c & 0xe0) == 0xe0) {
--
- if (cur[2] == 0)
- xmlParserInputGrow(ctxt->input, INPUT_CHUNK);
- if ((cur[2] & 0xc0) != 0x80)
-@@ -662,18 +661,24 @@ xmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) {
- val |= (cur[1] & 0x3f) << 12;
- val |= (cur[2] & 0x3f) << 6;
- val |= cur[3] & 0x3f;
-+ if (val < 0x10000)
-+ goto encoding_error;
- } else {
- /* 3-byte code */
- *len = 3;
- val = (cur[0] & 0xf) << 12;
- val |= (cur[1] & 0x3f) << 6;
- val |= cur[2] & 0x3f;
-+ if (val < 0x800)
-+ goto encoding_error;
- }
- } else {
- /* 2-byte code */
- *len = 2;
- val = (cur[0] & 0x1f) << 6;
- val |= cur[1] & 0x3f;
-+ if (val < 0x80)
-+ goto encoding_error;
- }
- if (!IS_CHAR(val)) {
- xmlErrEncodingInt(ctxt, XML_ERR_INVALID_CHAR,
-@@ -683,6 +688,13 @@ xmlCurrentChar(xmlParserCtxtPtr ctxt, int *len) {
- } else {
- /* 1-byte code */
- *len = 1;
-+ if (*ctxt->input->cur == 0)
-+ xmlParserInputGrow(ctxt->input, INPUT_CHUNK);
-+ if ((*ctxt->input->cur == 0) &&
-+ (ctxt->input->end > ctxt->input->cur)) {
-+ xmlErrEncodingInt(ctxt, XML_ERR_INVALID_CHAR,
-+ "Char 0x%X out of allowed range\n", val);
-+ }
- if (*ctxt->input->cur == 0xD) {
- if (ctxt->input->cur[1] == 0xA) {
- ctxt->nbChars++;
Index: patches/patch-python_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/libxml/patches/patch-python_Makefile_in,v
retrieving revision 1.8
diff -u -r1.8 patch-python_Makefile_in
--- patches/patch-python_Makefile_in 5 Jul 2007 16:05:09 -0000 1.8
+++ patches/patch-python_Makefile_in 26 Apr 2008 09:53:51 -0000
@@ -1,13 +1,12 @@
$OpenBSD: patch-python_Makefile_in,v 1.7 2006/10/30 11:20:08 bernd Exp $
---- python/Makefile.in.orig Tue Jun 12 18:20:22 2007
-+++ python/Makefile.in Mon Jul 2 12:50:32 2007
-@@ -735,9 +735,6 @@ uninstall-info: uninstall-info-recursive
- @WITH_PYTHON_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pythondir)
- @WITH_PYTHON_TRUE@ @INSTALL@ -m 0644 libxml2.py $(DESTDIR)$(pythondir)
- @WITH_PYTHON_TRUE@ @INSTALL@ -m 0644 $(srcdir)/drv_libxml2.py
$(DESTDIR)$(pythondir)
[EMAIL PROTECTED]@ $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
[EMAIL PROTECTED]@ @(for doc in $(DOCS) ; \
[EMAIL PROTECTED]@ do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ;
done)
+--- python/Makefile.in.orig Tue Apr 8 16:55:02 2008
++++ python/Makefile.in Sat Apr 26 11:53:47 2008
+@@ -737,7 +737,7 @@ info: info-recursive
- @[EMAIL PROTECTED](GENERATED): gen_prog
+ info-am:
+-install-data-am: install-dist_docsDATA install-dist_pythonDATA \
++install-data-am: install-dist_pythonDATA \
+ install-pythonDATA install-pythonLTLIBRARIES
+
+ install-dvi: install-dvi-recursive
Index: patches/patch-python_tests_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/libxml/patches/patch-python_tests_Makefile_in,v
retrieving revision 1.7
diff -u -r1.7 patch-python_tests_Makefile_in
--- patches/patch-python_tests_Makefile_in 5 Jul 2007 16:05:09 -0000
1.7
+++ patches/patch-python_tests_Makefile_in 26 Apr 2008 09:59:44 -0000
@@ -1,7 +1,16 @@
$OpenBSD: patch-python_tests_Makefile_in,v 1.6 2006/06/13 17:31:29 alek Exp $
---- python/tests/Makefile.in.orig Tue Jun 12 18:20:23 2007
-+++ python/tests/Makefile.in Mon Jul 2 12:50:32 2007
-@@ -297,7 +297,6 @@ PYTESTS = \
+--- python/tests/Makefile.in.orig Tue Apr 8 16:55:02 2008
++++ python/tests/Makefile.in Sat Apr 26 11:59:41 2008
+@@ -270,7 +270,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
++exampledir = $(datadir)/examples/libxml2
+ dist_example_DATA = $(PYTESTS) $(XMLS)
+ PYTESTS = \
+ build.py \
+@@ -307,7 +307,6 @@ PYTESTS = \
readererr.py\
relaxng.py \
schema.py \
Index: patches/patch-xstc_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/libxml/patches/patch-xstc_Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-xstc_Makefile_in
--- patches/patch-xstc_Makefile_in 5 Jul 2007 16:05:09 -0000 1.1
+++ patches/patch-xstc_Makefile_in 26 Apr 2008 08:51:50 -0000
@@ -1,7 +1,7 @@
$OpenBSD$
---- xstc/Makefile.in.orig Mon Jul 2 13:45:51 2007
-+++ xstc/Makefile.in Mon Jul 2 13:46:06 2007
-@@ -461,7 +461,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Meta
+--- xstc/Makefile.in.orig Tue Apr 8 16:55:02 2008
++++ xstc/Makefile.in Sat Apr 26 10:51:02 2008
+@@ -471,7 +471,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Meta
else echo "Dont' know how to fetch $(TARBALLURL_2)" ; fi ; fi ; fi)
-@(if [ -f $(TARBALL_2) ] ; then \
echo -n "extracting test data (NIST)..." ; \
@@ -10,7 +10,7 @@
echo "done" ; \
fi)
-@(if [ ! -f $(TARBALL) ] ; then \
-@@ -473,7 +473,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Meta
+@@ -483,7 +483,7 @@ $(TESTDIRS) Tests/Metadata/$(NISTTESTDEF_2) Tests/Meta
else echo "Dont' know how to fetch $(TARBALLURL)" ; fi ; fi ; fi)
-@(if [ -f $(TARBALL) ] ; then \
echo -n "extracting test data (Sun, Microsoft)..." ; \
Index: pkg/PFRAG.shared-python
===================================================================
RCS file: /cvs/ports/textproc/libxml/pkg/PFRAG.shared-python,v
retrieving revision 1.2
diff -u -r1.2 PFRAG.shared-python
--- pkg/PFRAG.shared-python 23 Apr 2007 15:34:04 -0000 1.2
+++ pkg/PFRAG.shared-python 26 Apr 2008 10:04:18 -0000
@@ -1,4 +1,4 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared-python,v 1.1 2006/10/30 11:10:11 bernd
Exp $
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared-python,v 1.2 2007/04/23 15:34:04
steven Exp $
lib/python${MODPY_VERSION}/
lib/python${MODPY_VERSION}/site-packages/
lib/python${MODPY_VERSION}/site-packages/drv_libxml2.py
@@ -55,4 +55,5 @@
share/examples/libxml2/walker.py
share/examples/libxml2/xpath.py
share/examples/libxml2/xpathext.py
+share/examples/libxml2/xpathns.py
share/examples/libxml2/xpathret.py
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/textproc/libxml/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -r1.3 PLIST-main
--- pkg/PLIST-main 5 Jul 2007 16:05:10 -0000 1.3
+++ pkg/PLIST-main 26 Apr 2008 08:59:22 -0000
@@ -1,4 +1,4 @@
[EMAIL PROTECTED] $OpenBSD: PLIST-main,v 1.2 2007/04/23 15:34:04 steven Exp $
[EMAIL PROTECTED] $OpenBSD: PLIST-main,v 1.3 2007/07/05 16:05:10 steven Exp $
@pkgpath textproc/libxml
%%SHARED%%
bin/xml2-config
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/libxslt/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- Makefile 15 Sep 2007 20:59:38 -0000 1.55
+++ Makefile 26 Apr 2008 08:27:48 -0000
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.54 2007/09/10 17:21:38 steven Exp $
+# $OpenBSD: Makefile,v 1.55 2007/09/15 20:59:38 merdely Exp $
COMMENT= XSLT C Library for GNOME
-DISTNAME= libxslt-1.1.22
-SHARED_LIBS= exslt 9.5 \
- xslt 3.5
+DISTNAME= libxslt-1.1.23
+SHARED_LIBS= exslt 9.6 \
+ xslt 3.6
CATEGORIES= textproc
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/libxslt/distinfo,v
retrieving revision 1.26
diff -u -r1.26 distinfo
--- distinfo 10 Sep 2007 17:21:38 -0000 1.26
+++ distinfo 26 Apr 2008 08:28:01 -0000
@@ -1,5 +1,5 @@
-MD5 (libxslt-1.1.22.tar.gz) = 1qmgIKdqPbF4SNdp1snIqQ==
-RMD160 (libxslt-1.1.22.tar.gz) = vC0ypNf+p3fD1LDOP1pwyOo/iWk=
-SHA1 (libxslt-1.1.22.tar.gz) = Vc5NxlloHZpbojIsRcvf51tGY5w=
-SHA256 (libxslt-1.1.22.tar.gz) = Th857hZZb9KoPSjWw7Bl90IlTzM2+Tzo7RyuSOy+Sdo=
-SIZE (libxslt-1.1.22.tar.gz) = 2783003
+MD5 (libxslt-1.1.23.tar.gz) = BlCyNlC3CtfOJEfuFvRFow==
+RMD160 (libxslt-1.1.23.tar.gz) = /Oy63dmzXk1eRGcPa9bZ1f/zJ7w=
+SHA1 (libxslt-1.1.23.tar.gz) = m2uyeYCIk2Q9kRblFOr+yyLv92w=
+SHA256 (libxslt-1.1.23.tar.gz) = +Y/JJrCWXbD81/+egPRUNqrBrbEwxUL2vkT5AzFDaBw=
+SIZE (libxslt-1.1.23.tar.gz) = 2791463
Index: patches/patch-doc_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/libxslt/patches/patch-doc_Makefile_in,v
retrieving revision 1.7
diff -u -r1.7 patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in 5 Jul 2007 16:05:56 -0000 1.7
+++ patches/patch-doc_Makefile_in 26 Apr 2008 08:28:23 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.6 2006/05/22 11:33:49 steven Exp $
---- doc/Makefile.in.orig Tue Jun 12 18:53:58 2007
-+++ doc/Makefile.in Mon Jul 2 15:23:38 2007
-@@ -211,7 +211,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+$OpenBSD: patch-doc_Makefile_in,v 1.7 2007/07/05 16:05:56 steven Exp $
+--- doc/Makefile.in.orig Tue Apr 8 19:18:24 2008
++++ doc/Makefile.in Sat Apr 26 10:28:18 2008
+@@ -210,7 +210,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
# The name of the module.
-DOC_MODULE = libxslt-$(VERSION)
Index: patches/patch-libxslt_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/libxslt/patches/patch-libxslt_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-libxslt_Makefile_in
--- patches/patch-libxslt_Makefile_in 5 Jul 2007 16:05:56 -0000 1.2
+++ patches/patch-libxslt_Makefile_in 26 Apr 2008 08:28:23 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-libxslt_Makefile_in,v 1.1 2006/05/22 11:33:49 steven Exp $
---- libxslt/Makefile.in.orig Tue Jun 12 18:53:58 2007
-+++ libxslt/Makefile.in Mon Jul 2 15:23:38 2007
-@@ -613,7 +613,7 @@ install-data-am: install-man install-xsltincHEADERS
+$OpenBSD: patch-libxslt_Makefile_in,v 1.2 2007/07/05 16:05:56 steven Exp $
+--- libxslt/Makefile.in.orig Tue Apr 8 19:18:24 2008
++++ libxslt/Makefile.in Sat Apr 26 10:28:19 2008
+@@ -613,7 +613,7 @@ install-dvi: install-dvi-am
install-exec-am: install-libLTLIBRARIES
@$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+# $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
- install-info: install-info-am
+ install-html: install-html-am
Index: patches/patch-tests_docs_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/libxslt/patches/patch-tests_docs_Makefile_in,v
retrieving revision 1.8
diff -u -r1.8 patch-tests_docs_Makefile_in
--- patches/patch-tests_docs_Makefile_in 10 Sep 2007 17:21:38 -0000
1.8
+++ patches/patch-tests_docs_Makefile_in 26 Apr 2008 08:28:22 -0000
@@ -1,6 +1,6 @@
---- tests/docs/Makefile.in.orig Thu Aug 23 17:22:58 2007
-+++ tests/docs/Makefile.in Tue Sep 4 18:43:45 2007
-@@ -450,7 +450,7 @@ distdir: $(DISTFILES)
+--- tests/docs/Makefile.in.orig Tue Apr 8 19:18:25 2008
++++ tests/docs/Makefile.in Sat Apr 26 10:28:19 2008
+@@ -444,7 +444,7 @@ distdir: $(DISTFILES)
fi; \
done
check-am: all-am
