Update to 2.6.8.

7 files changed, 99 insertions, 134 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 4e991f7efc91..e67c2f08fe1a 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.6.7
+PORTVERSION=	2.6.8
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
@@ -23,7 +23,8 @@ USE_GNOME=	gnomehack gnometarget pkgconfig
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-iconv=${LOCALBASE} \
-		--with-html-dir=${PREFIX}/share/doc
+		--with-html-dir=${PREFIX}/share/doc \
+		--with-html-subdir=${PORTNAME}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index ea6c5036dd8c..dda6a4bbca63 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libxml2-2.6.7.tar.bz2) = bdbef92cbdc5b4bd0365313ba22b75ce
-SIZE (gnome2/libxml2-2.6.7.tar.bz2) = 2651941
+MD5 (gnome2/libxml2-2.6.8.tar.bz2) = f8a0dc1983f67db388baa0f7c65d2b70
+SIZE (gnome2/libxml2-2.6.8.tar.bz2) = 2673629
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	\
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index bbae3e6bafed..56b2e31cabba 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -37,6 +37,7 @@ include/libxml2/libxml/xmlexports.h
 include/libxml2/libxml/xmlmemory.h
 include/libxml2/libxml/xmlreader.h
 include/libxml2/libxml/xmlregexp.h
+include/libxml2/libxml/xmlsave.h
 include/libxml2/libxml/xmlschemas.h
 include/libxml2/libxml/xmlschemastypes.h
 include/libxml2/libxml/xmlstring.h
@@ -96,16 +97,16 @@ share/aclocal/libxml.m4
 %%PYTHON:%%share/doc/libxml2-python/examples/xpathext.py
 %%PYTHON:%%share/doc/libxml2-python/examples/xpathret.py
 share/doc/libxml2/Copyright
+share/doc/libxml2/DOM.gif
+share/doc/libxml2/FAQ.html
+share/doc/libxml2/Libxml2-Logo-180x168.gif
+share/doc/libxml2/Libxml2-Logo-90x34.gif
+share/doc/libxml2/encoding.html
 share/doc/libxml2/examples/testHTML.c
 share/doc/libxml2/examples/testSAX.c
 share/doc/libxml2/examples/testXPath.c
 share/doc/libxml2/examples/xmllint.c
-share/doc/libxml2/html/DOM.gif
-share/doc/libxml2/html/FAQ.html
-share/doc/libxml2/html/Libxml2-Logo-180x168.gif
-share/doc/libxml2/html/Libxml2-Logo-90x34.gif
 share/doc/libxml2/html/book1.html
-share/doc/libxml2/html/encoding.html
 share/doc/libxml2/html/home.png
 share/doc/libxml2/html/index.html
 share/doc/libxml2/html/left.png
@@ -145,6 +146,7 @@ share/doc/libxml2/html/libxml-xmlexports.html
 share/doc/libxml2/html/libxml-xmlmemory.html
 share/doc/libxml2/html/libxml-xmlreader.html
 share/doc/libxml2/html/libxml-xmlregexp.html
+share/doc/libxml2/html/libxml-xmlsave.html
 share/doc/libxml2/html/libxml-xmlschemas.html
 share/doc/libxml2/html/libxml-xmlschemastypes.html
 share/doc/libxml2/html/libxml-xmlstring.html
@@ -154,67 +156,67 @@ share/doc/libxml2/html/libxml-xmlwriter.html
 share/doc/libxml2/html/libxml-xpath.html
 share/doc/libxml2/html/libxml-xpathInternals.html
 share/doc/libxml2/html/libxml-xpointer.html
-share/doc/libxml2/html/libxml.gif
-share/doc/libxml2/html/redhat.gif
 share/doc/libxml2/html/right.png
-share/doc/libxml2/html/smallfootonly.gif
-share/doc/libxml2/html/structure.gif
-share/doc/libxml2/html/tutorial/apa.html
-share/doc/libxml2/html/tutorial/apb.html
-share/doc/libxml2/html/tutorial/apc.html
-share/doc/libxml2/html/tutorial/apd.html
-share/doc/libxml2/html/tutorial/ape.html
-share/doc/libxml2/html/tutorial/apf.html
-share/doc/libxml2/html/tutorial/apg.html
-share/doc/libxml2/html/tutorial/aph.html
-share/doc/libxml2/html/tutorial/api.html
-share/doc/libxml2/html/tutorial/ar01s02.html
-share/doc/libxml2/html/tutorial/ar01s03.html
-share/doc/libxml2/html/tutorial/ar01s04.html
-share/doc/libxml2/html/tutorial/ar01s05.html
-share/doc/libxml2/html/tutorial/ar01s06.html
-share/doc/libxml2/html/tutorial/ar01s07.html
-share/doc/libxml2/html/tutorial/ar01s08.html
-share/doc/libxml2/html/tutorial/ar01s09.html
-share/doc/libxml2/html/tutorial/images/blank.png
-share/doc/libxml2/html/tutorial/images/callouts/1.png
-share/doc/libxml2/html/tutorial/images/callouts/10.png
-share/doc/libxml2/html/tutorial/images/callouts/2.png
-share/doc/libxml2/html/tutorial/images/callouts/3.png
-share/doc/libxml2/html/tutorial/images/callouts/4.png
-share/doc/libxml2/html/tutorial/images/callouts/5.png
-share/doc/libxml2/html/tutorial/images/callouts/6.png
-share/doc/libxml2/html/tutorial/images/callouts/7.png
-share/doc/libxml2/html/tutorial/images/callouts/8.png
-share/doc/libxml2/html/tutorial/images/callouts/9.png
-share/doc/libxml2/html/tutorial/images/caution.png
-share/doc/libxml2/html/tutorial/images/draft.png
-share/doc/libxml2/html/tutorial/images/home.png
-share/doc/libxml2/html/tutorial/images/important.png
-share/doc/libxml2/html/tutorial/images/next.png
-share/doc/libxml2/html/tutorial/images/note.png
-share/doc/libxml2/html/tutorial/images/prev.png
-share/doc/libxml2/html/tutorial/images/tip.png
-share/doc/libxml2/html/tutorial/images/toc-blank.png
-share/doc/libxml2/html/tutorial/images/toc-minus.png
-share/doc/libxml2/html/tutorial/images/toc-plus.png
-share/doc/libxml2/html/tutorial/images/up.png
-share/doc/libxml2/html/tutorial/images/warning.png
-share/doc/libxml2/html/tutorial/includeaddattribute.c
-share/doc/libxml2/html/tutorial/includeaddkeyword.c
-share/doc/libxml2/html/tutorial/includeconvert.c
-share/doc/libxml2/html/tutorial/includegetattribute.c
-share/doc/libxml2/html/tutorial/includekeyword.c
-share/doc/libxml2/html/tutorial/includexpath.c
-share/doc/libxml2/html/tutorial/index.html
-share/doc/libxml2/html/tutorial/ix01.html
-share/doc/libxml2/html/tutorial/xmltutorial.pdf
 share/doc/libxml2/html/up.png
-share/doc/libxml2/html/w3c.png
-share/doc/libxml2/html/xml.html
-@dirrm share/doc/libxml2/html/tutorial/images/callouts
-@dirrm share/doc/libxml2/html/tutorial/images
-@dirrm share/doc/libxml2/html/tutorial
+share/doc/libxml2/libxml.gif
+share/doc/libxml2/redhat.gif
+share/doc/libxml2/smallfootonly.gif
+share/doc/libxml2/structure.gif
+share/doc/libxml2/tutorial/apa.html
+share/doc/libxml2/tutorial/apb.html
+share/doc/libxml2/tutorial/apc.html
+share/doc/libxml2/tutorial/apd.html
+share/doc/libxml2/tutorial/ape.html
+share/doc/libxml2/tutorial/apf.html
+share/doc/libxml2/tutorial/apg.html
+share/doc/libxml2/tutorial/aph.html
+share/doc/libxml2/tutorial/api.html
+share/doc/libxml2/tutorial/ar01s02.html
+share/doc/libxml2/tutorial/ar01s03.html
+share/doc/libxml2/tutorial/ar01s04.html
+share/doc/libxml2/tutorial/ar01s05.html
+share/doc/libxml2/tutorial/ar01s06.html
+share/doc/libxml2/tutorial/ar01s07.html
+share/doc/libxml2/tutorial/ar01s08.html
+share/doc/libxml2/tutorial/ar01s09.html
+share/doc/libxml2/tutorial/images/blank.png
+share/doc/libxml2/tutorial/images/callouts/1.png
+share/doc/libxml2/tutorial/images/callouts/10.png
+share/doc/libxml2/tutorial/images/callouts/2.png
+share/doc/libxml2/tutorial/images/callouts/3.png
+share/doc/libxml2/tutorial/images/callouts/4.png
+share/doc/libxml2/tutorial/images/callouts/5.png
+share/doc/libxml2/tutorial/images/callouts/6.png
+share/doc/libxml2/tutorial/images/callouts/7.png
+share/doc/libxml2/tutorial/images/callouts/8.png
+share/doc/libxml2/tutorial/images/callouts/9.png
+share/doc/libxml2/tutorial/images/caution.png
+share/doc/libxml2/tutorial/images/draft.png
+share/doc/libxml2/tutorial/images/home.png
+share/doc/libxml2/tutorial/images/important.png
+share/doc/libxml2/tutorial/images/next.png
+share/doc/libxml2/tutorial/images/note.png
+share/doc/libxml2/tutorial/images/prev.png
+share/doc/libxml2/tutorial/images/tip.png
+share/doc/libxml2/tutorial/images/toc-blank.png
+share/doc/libxml2/tutorial/images/toc-minus.png
+share/doc/libxml2/tutorial/images/toc-plus.png
+share/doc/libxml2/tutorial/images/up.png
+share/doc/libxml2/tutorial/images/warning.png
+share/doc/libxml2/tutorial/includeaddattribute.c
+share/doc/libxml2/tutorial/includeaddkeyword.c
+share/doc/libxml2/tutorial/includeconvert.c
+share/doc/libxml2/tutorial/includegetattribute.c
+share/doc/libxml2/tutorial/includekeyword.c
+share/doc/libxml2/tutorial/includexpath.c
+share/doc/libxml2/tutorial/index.html
+share/doc/libxml2/tutorial/ix01.html
+share/doc/libxml2/tutorial/xmltutorial.pdf
+share/doc/libxml2/w3c.png
+share/doc/libxml2/xml.html
+@dirrm share/doc/libxml2/tutorial/images/callouts
+@dirrm share/doc/libxml2/tutorial/images
+@dirrm share/doc/libxml2/tutorial
 @dirrm share/doc/libxml2/html
 %%PYTHON:%%@dirrm share/doc/libxml2-python/examples
 %%PYTHON:%%@dirrm share/doc/libxml2-python