Update to 2.6.0. While this release is a major revision release, it maintains

API and ABI backward compatibility.  Note, due to enhanced error checking
(particularly with namespaces), extra errors might be seen on the command line,
but they do not appear to be fatal.

4 files changed, 42 insertions, 14 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index bded43452526..a8cc0c97e804 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.5.11
+PORTVERSION=	2.6.0
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -47,8 +47,8 @@ CONFIGURE_ARGS+=	--with-threads
 CONFIGURE_ARGS+=	--without-threads
 .endif
 
-.if defined(WITH_SCHEMA)
-CONFIGURE_ARGS+=	--with-schemas
+.if defined(WITHOUT_SCHEMA)
+CONFIGURE_ARGS+=	--without-schemas
 .endif
 
 .if defined(WITH_MEM_DEBUG)
@@ -67,12 +67,12 @@ pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "libxml2 has the following tunables:"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "		WITHOUT_PYTHON=yes	Turns off Python support"
-	@${ECHO_MSG} "		WITH_THREADS=yes	Turns on pthread support"
-	@${ECHO_MSG} "		WITH_SCHEMA=yes		Turns on XML Schema support"
-	@${ECHO_MSG} "		WITH_MEM_DEBUG=yes	Turns on memory debugging (DEVELOPERS ONLY!)"
-	@${ECHO_MSG} "		WITH_XMLLINT_HIST=yes	Turns on history for xmllint"
-	@${ECHO_MSG} "		WITH_THREAD_ALLOC=yes	Turns on per-thread memory (DEVELOPERS ONLY!)"
+	@${ECHO_MSG} "	WITHOUT_PYTHON=yes	Turns off Python support"
+	@${ECHO_MSG} "	WITH_THREADS=yes	Turns on pthread support"
+	@${ECHO_MSG} "	WITHOUT_SCHEMA=yes	Turns on XML Schema support"
+	@${ECHO_MSG} "	WITH_MEM_DEBUG=yes	Turns on memory debugging (DEVELOPERS ONLY!)"
+	@${ECHO_MSG} "	WITH_XMLLINT_HIST=yes	Turns on history for xmllint"
+	@${ECHO_MSG} "	WITH_THREAD_ALLOC=yes	Turns on per-thread memory (DEVELOPERS ONLY!)"
 	@${ECHO_MSG} ""
 
 post-patch:
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 65a99039df65..ec47a83ef37d 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libxml2-2.5.11.tar.bz2) = 5b6d9dae5f07f5827e194c69ac1723c1
+MD5 (gnome2/libxml2-2.6.0.tar.bz2) = b21bd508afa07a402c4c00b6de666173
diff --git a/textproc/libxml2/files/patch-ad b/textproc/libxml2/files/patch-ad
index 6a7282d2c80c..d27c3bbd3dbb 100644
--- a/textproc/libxml2/files/patch-ad
+++ b/textproc/libxml2/files/patch-ad
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	Thu Aug 14 22:05:15 2003
-+++ doc/Makefile.in	Thu Aug 14 22:05:46 2003
-@@ -153,7 +153,7 @@
+--- 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.
@@ -9,3 +9,17 @@
  
  # 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/pkg-plist b/textproc/libxml2/pkg-plist
index e63b6ef77845..adba327413bb 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -6,9 +6,12 @@ include/libxml2/libxml/DOCBparser.h
 include/libxml2/libxml/HTMLparser.h
 include/libxml2/libxml/HTMLtree.h
 include/libxml2/libxml/SAX.h
+include/libxml2/libxml/SAX2.h
 include/libxml2/libxml/c14n.h
 include/libxml2/libxml/catalog.h
+include/libxml2/libxml/chvalid.h
 include/libxml2/libxml/debugXML.h
+include/libxml2/libxml/dict.h
 include/libxml2/libxml/encoding.h
 include/libxml2/libxml/entities.h
 include/libxml2/libxml/globals.h
@@ -29,6 +32,7 @@ include/libxml2/libxml/xlink.h
 include/libxml2/libxml/xmlIO.h
 include/libxml2/libxml/xmlautomata.h
 include/libxml2/libxml/xmlerror.h
+include/libxml2/libxml/xmlexports.h
 include/libxml2/libxml/xmlmemory.h
 include/libxml2/libxml/xmlreader.h
 include/libxml2/libxml/xmlregexp.h
@@ -36,6 +40,7 @@ include/libxml2/libxml/xmlschemas.h
 include/libxml2/libxml/xmlschemastypes.h
 include/libxml2/libxml/xmlunicode.h
 include/libxml2/libxml/xmlversion.h
+include/libxml2/libxml/xmlwriter.h
 include/libxml2/libxml/xpath.h
 include/libxml2/libxml/xpathInternals.h
 include/libxml2/libxml/xpointer.h
@@ -65,6 +70,7 @@ share/aclocal/libxml.m4
 %%PYTHON:%%share/doc/libxml2-python/examples/reader4.py
 %%PYTHON:%%share/doc/libxml2-python/examples/reader5.py
 %%PYTHON:%%share/doc/libxml2-python/examples/reader6.py
+%%PYTHON:%%share/doc/libxml2-python/examples/reader7.py
 %%PYTHON:%%share/doc/libxml2-python/examples/readererr.py
 %%PYTHON:%%share/doc/libxml2-python/examples/regexp.py
 %%PYTHON:%%share/doc/libxml2-python/examples/relaxng.py
@@ -77,6 +83,7 @@ share/aclocal/libxml.m4
 %%PYTHON:%%share/doc/libxml2-python/examples/tstxpath.py
 %%PYTHON:%%share/doc/libxml2-python/examples/valid.xml
 %%PYTHON:%%share/doc/libxml2-python/examples/validate.py
+%%PYTHON:%%share/doc/libxml2-python/examples/walker.py
 %%PYTHON:%%share/doc/libxml2-python/examples/xpath.py
 %%PYTHON:%%share/doc/libxml2-python/examples/xpathext.py
 %%PYTHON:%%share/doc/libxml2-python/examples/xpathret.py
@@ -91,7 +98,9 @@ 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
 share/doc/libxml2/html/libxml-DOCBparser.html
 share/doc/libxml2/html/libxml-HTMLparser.html
 share/doc/libxml2/html/libxml-HTMLtree.html
@@ -130,8 +139,10 @@ 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/up.png
 share/doc/libxml2/html/tutorial/apa.html
 share/doc/libxml2/html/tutorial/apb.html
 share/doc/libxml2/html/tutorial/apc.html
@@ -140,6 +151,7 @@ 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
@@ -147,6 +159,7 @@ 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
@@ -176,6 +189,7 @@ 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