Update to 2.3.10

4 files changed, 12 insertions, 37 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 9b6891e16c9..63e835f2784 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.3.8
-PORTREVISION=	1
+PORTVERSION=	2.3.10
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/libxml
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 370bfca89e5..c5434d3f628 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1 +1 @@
-MD5 (libxml2-2.3.8.tar.gz) = 5b94809f8d5b0cc158c1407e3d798b85
+MD5 (libxml2-2.3.10.tar.gz) = 8625086f7134417d530527c1efbb756b
diff --git a/textproc/libxml2/files/patch-ab b/textproc/libxml2/files/patch-ab
index d02bc14ee9b..95463f93ba3 100644
--- a/textproc/libxml2/files/patch-ab
+++ b/textproc/libxml2/files/patch-ab
@@ -1,47 +1,21 @@
-
-$FreeBSD$
-
---- configure.orig	Thu May  3 14:34:45 2001
-+++ configure	Sun May  6 10:40:20 2001
-@@ -3536,7 +3536,7 @@
- 
- 
+--- configure.orig	Fri Jun  1 03:33:59 2001
++++ configure	Mon Jun 18 13:39:58 2001
+@@ -3545,3 +3545,3 @@
  XML_LIBDIR='-L${libdir}'
 -XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}'
 +XML_INCLUDEDIR='-I${includedir}/libxml2 -I${includedir}/libxml2/libxml'
- XML_LIBS="-lxml2 $Z_LIBS -lm $LIBS"
- 
- XML_CFLAGS=""
-@@ -3819,7 +3819,7 @@
- fi
- 
  
--if "${NEED_TRIO}" = "1"; then
-+if test "${NEED_TRIO}" = "1"; then
-   WITH_TRIO_SOURCES_TRUE=
-   WITH_TRIO_SOURCES_FALSE='#'
- else
-@@ -4003,7 +4003,7 @@
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
+@@ -4028,3 +4028,3 @@
      builtin and then its argument prototype would still apply.  */
 -char iconv();
 +char libiconv();
  
- int main() {
- 
-@@ -4013,7 +4013,7 @@
- #if defined (__stub_iconv) || defined (__stub___iconv)
- choke me
+@@ -4038,3 +4038,3 @@
  #else
 -iconv();
 +libiconv();
  #endif
- 
- ; return 0; }
-@@ -4049,10 +4049,10 @@
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
+@@ -4074,6 +4074,6 @@
      builtin and then its argument prototype would still apply.  */
 -char iconv();
 +char libiconv();
@@ -50,5 +24,3 @@ $FreeBSD$
 -iconv()
 +libiconv()
  ; return 0; }
- EOF
- if { (eval echo configure:4059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index e82017848fc..307cd8b5ffb 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -5,6 +5,7 @@ include/libxml2/libxml/DOCBparser.h
 include/libxml2/libxml/HTMLparser.h
 include/libxml2/libxml/HTMLtree.h
 include/libxml2/libxml/SAX.h
+include/libxml2/libxml/catalog.h
 include/libxml2/libxml/debugXML.h
 include/libxml2/libxml/encoding.h
 include/libxml2/libxml/entities.h
@@ -36,7 +37,9 @@ share/doc/libxml2/html/FAQ.html
 share/doc/libxml2/html/book1.html
 share/doc/libxml2/html/encoding.html
 share/doc/libxml2/html/index.sgml
+share/doc/libxml2/html/libxml-catalog.html
 share/doc/libxml2/html/libxml-debugxml.html
+share/doc/libxml2/html/libxml-docbparser.html
 share/doc/libxml2/html/libxml-encoding.html
 share/doc/libxml2/html/libxml-entities.html
 share/doc/libxml2/html/libxml-htmlparser.html
@@ -52,6 +55,7 @@ share/doc/libxml2/html/libxml-tree.html
 share/doc/libxml2/html/libxml-uri.html
 share/doc/libxml2/html/libxml-valid.html
 share/doc/libxml2/html/libxml-xinclude.html
+share/doc/libxml2/html/libxml-xmlerror.html
 share/doc/libxml2/html/libxml-xmlio.html
 share/doc/libxml2/html/libxml-xmlmemory.html
 share/doc/libxml2/html/libxml-xpath.html