Update to 2.6.8.

4 files changed, 28 insertions, 66 deletions

diff --git a/textproc/libxml2/files/patch-aa b/textproc/libxml2/files/patch-aa
index 09476deebc19..c2a6689763b7 100644
--- a/textproc/libxml2/files/patch-aa
+++ b/textproc/libxml2/files/patch-aa
@@ -1,42 +1,40 @@
---- Makefile.in.orig	Thu Aug 14 22:02:48 2003
-+++ Makefile.in	Thu Aug 14 22:04:43 2003
-@@ -153,7 +153,7 @@
- install_sh = @install_sh@
- pythondir = @pythondir@
- 
+--- Makefile.in.orig	Tue Mar 23 09:17:22 2004
++++ Makefile.in	Tue Mar 23 09:18:51 2004
+@@ -418,13 +418,13 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -SUBDIRS = include . doc example @PYTHON_SUBDIR@
 +SUBDIRS = include . doc example @WITH_PYTHON_TRUE@ @PYTHON_SUBDIR@
- 
  DIST_SUBDIRS = include . doc example python
- 
-@@ -171,7 +171,7 @@
+ INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ 
+ bin_SCRIPTS = xml2-config
  lib_LTLIBRARIES = libxml2.la
- libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) -lm
- 
--libxml2_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
-+libxml2_la_LDFLAGS = -version-info 5:0:0
- 
- @WITH_TRIO_SOURCES_TRUE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  \
- @WITH_TRIO_SOURCES_TRUE@		parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c  \
-@@ -270,7 +270,7 @@
- 
+ libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) @M_LIBS@ @WIN32_EXTRA_LIBADD@
+-libxml2_la_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -version-info @LIBXML_VERSION_INFO@
++libxml2_la_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ -version-info 5:0:0
+ @WITH_TRIO_SOURCES_FALSE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  \
+ @WITH_TRIO_SOURCES_FALSE@		parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c  \
+ @WITH_TRIO_SOURCES_FALSE@		valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c  \
+@@ -501,7 +501,7 @@
+ testReader_DEPENDENCIES = $(DEPS)
+ testReader_LDADD = $(LDADDS)
  CLEANFILES = xml2Conf.sh
- 
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
  confexec_DATA = xml2Conf.sh
  EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
               libxml.m4 Copyright check-xml-test-suite.py \
-@@ -289,7 +289,7 @@
+@@ -521,7 +521,7 @@
  # Instll the tests program sources as examples 
  #
  BASE_DIR = $(datadir)/doc
 -DOC_MODULE = libxml2-$(VERSION)
 +DOC_MODULE = libxml2
  EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -1034,7 +1034,7 @@
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+@@ -1209,7 +1209,7 @@
  check-am: all-am
  	$(MAKE) $(AM_MAKEFLAGS) check-local
  check: check-recursive
diff --git a/textproc/libxml2/files/patch-ad b/textproc/libxml2/files/patch-ad
deleted file mode 100644
index d27c3bbd3dbb..000000000000
--- a/textproc/libxml2/files/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
---- doc/Makefile.in.orig	Mon Oct 20 23:08:16 2003
-+++ doc/Makefile.in	Mon Oct 20 23:16:20 2003
-@@ -175,7 +175,7 @@
- pythondir = @pythondir@
- 
- # The name of the module.
--DOC_MODULE = libxml2-$(VERSION)
-+DOC_MODULE = libxml2
- 
- # The top-level SGML file.
- DOC_MAIN_XML_FILE = gnome-xml.xml
-@@ -454,10 +454,9 @@
- install-data-local: 
- 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
- 	-@INSTALL@ -m 0644 $(srcdir)/xml.html $(srcdir)/encoding.html $(srcdir)/FAQ.html $(srcdir)/structure.gif $(srcdir)/DOM.gif $(srcdir)/smallfootonly.gif $(srcdir)/redhat.gif $(srcdir)/libxml.gif $(srcdir)/w3c.png $(srcdir)/Libxml2-Logo-180x168.gif $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(TARGET_DIR)
--	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/html
--	-@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)/html
--	-@INSTALL@ -m 0644 $(srcdir)/html/*.png $(DESTDIR)$(TARGET_DIR)/html
--	-@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)/html
-+	-@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)
-+	-@INSTALL@ -m 0644 $(srcdir)/html/*.png $(DESTDIR)$(TARGET_DIR)
-+	-@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
- 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial
- 	-@INSTALL@ -m 0644 $(srcdir)/tutorial/*.* \
- 		$(DESTDIR)$(TARGET_DIR)/tutorial
diff --git a/textproc/libxml2/files/patch-doc_examples_Makefile.in b/textproc/libxml2/files/patch-doc_examples_Makefile.in
deleted file mode 100644
index 619306d99fbd..000000000000
--- a/textproc/libxml2/files/patch-doc_examples_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/examples/Makefile.in.orig	Sun Jan 11 01:37:12 2004
-+++ doc/examples/Makefile.in	Sun Jan 11 01:37:53 2004
-@@ -185,7 +185,7 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
- pythondir = @pythondir@
--DOC_MODULE = libxml2-$(VERSION)
-+DOC_MODULE = libxml2
- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/examples
- 
- INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@
diff --git a/textproc/libxml2/files/patch-python::tests::Makefile.in b/textproc/libxml2/files/patch-python::tests::Makefile.in
index b0b5df548d0e..a2977bbd13ab 100644
--- a/textproc/libxml2/files/patch-python::tests::Makefile.in
+++ b/textproc/libxml2/files/patch-python::tests::Makefile.in
@@ -1,11 +1,11 @@
---- python/tests/Makefile.in.orig	Thu Aug 14 22:07:15 2003
-+++ python/tests/Makefile.in	Thu Aug 14 22:07:43 2003
-@@ -150,7 +150,7 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
- pythondir = @pythondir@
+--- python/tests/Makefile.in.orig	Tue Mar 23 09:22:07 2004
++++ python/tests/Makefile.in	Tue Mar 23 09:22:39 2004
+@@ -241,7 +241,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -EXAMPLE_DIR = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
 +EXAMPLE_DIR = $(datadir)/doc/libxml2-python/examples
- 
  PYTESTS = \
      build.py	\
+     attribs.py	\