6 files changed, 26 insertions, 35 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 2296271f9d36..8a85608a4ffa 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -12,7 +12,7 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.6.30
+PORTVERSION=	2.6.31
 PORTREVISION?=	0
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	ftp://xmlsoft.org/libxml2/ \
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 26ed90a88a0c..21a4cb88c719 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libxml2-2.6.30.tar.gz) = 460e6d853e824da700d698532e57316b
-SHA256 (gnome2/libxml2-2.6.30.tar.gz) = 877762a0f44785487d747ed7bd3db364ade75943e6d8e9c49fa6340c3833735e
-SIZE (gnome2/libxml2-2.6.30.tar.gz) = 4726657
+MD5 (gnome2/libxml2-2.6.31.tar.gz) = 714b0683b1ec4bdc63bc356d729f9b18
+SHA256 (gnome2/libxml2-2.6.31.tar.gz) = 3e7982341bbb1f11d5df344177955769e16b4d271f1f5c271740b3d1fad9bac6
+SIZE (gnome2/libxml2-2.6.31.tar.gz) = 4734599
diff --git a/textproc/libxml2/files/patch-aa b/textproc/libxml2/files/patch-aa
index 9cb55f02d517..d7c7e50a9d88 100644
--- a/textproc/libxml2/files/patch-aa
+++ b/textproc/libxml2/files/patch-aa
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Mon Jan 17 20:35:00 2005
-+++ Makefile.in	Mon Jan 17 20:36:53 2005
-@@ -417,13 +417,13 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
+--- Makefile.in.orig	2008-01-22 15:47:56.000000000 -0500
++++ Makefile.in	2008-01-22 15:49:21.000000000 -0500
+@@ -486,13 +486,13 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -SUBDIRS = include . doc example xstc @PYTHON_SUBDIR@
 +SUBDIRS = include . doc example xstc @WITH_PYTHON_TRUE@ @PYTHON_SUBDIR@
  DIST_SUBDIRS = include . doc example python xstc
@@ -16,7 +16,7 @@
  @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  \
-@@ -512,7 +512,7 @@
+@@ -590,7 +590,7 @@ testapi_LDFLAGS = 
  testapi_DEPENDENCIES = $(DEPS)
  testapi_LDADD = $(LDADDS)
  CLEANFILES = xml2Conf.sh
@@ -25,7 +25,7 @@
  confexec_DATA = xml2Conf.sh
  CVS_EXTRA_DIST = 
  EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
-@@ -534,8 +534,8 @@
+@@ -613,8 +613,8 @@ pkgconfig_DATA = libxml-2.0.pc
  # Install the tests program sources as examples 
  #
  BASE_DIR = $(datadir)/doc
@@ -36,7 +36,7 @@
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
-@@ -1246,7 +1246,7 @@
+@@ -1344,7 +1344,7 @@ distcleancheck: distclean
  check-am: all-am
  	$(MAKE) $(AM_MAKEFLAGS) check-local
  check: check-recursive
diff --git a/textproc/libxml2/files/patch-doc_devhelp_Makefile.in b/textproc/libxml2/files/patch-doc_devhelp_Makefile.in
index 38e7bc33011d..d7581357d0b9 100644
--- a/textproc/libxml2/files/patch-doc_devhelp_Makefile.in
+++ b/textproc/libxml2/files/patch-doc_devhelp_Makefile.in
@@ -1,9 +1,9 @@
---- doc/devhelp/Makefile.in.orig	Mon Sep 12 18:42:04 2005
-+++ doc/devhelp/Makefile.in	Mon Sep 12 18:42:20 2005
-@@ -258,7 +258,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
+--- doc/devhelp/Makefile.in.orig	2008-01-22 15:49:34.000000000 -0500
++++ doc/devhelp/Makefile.in	2008-01-22 15:49:58.000000000 -0500
+@@ -259,7 +259,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -DEVHELP_DIR = $(datadir)/gtk-doc/html/libxml2
 +DEVHELP_DIR = $(datadir)/doc/libxml2/html
  HTML_FILES = index.html general.html $(HTML_MODULES)
diff --git a/textproc/libxml2/files/patch-python::Makefile.in b/textproc/libxml2/files/patch-python::Makefile.in
index 403493dc2937..949ca3dfb01b 100644
--- a/textproc/libxml2/files/patch-python::Makefile.in
+++ b/textproc/libxml2/files/patch-python::Makefile.in
@@ -1,15 +1,6 @@
---- python/Makefile.in.orig	Mon Jan 15 19:11:51 2007
-+++ python/Makefile.in	Mon Jan 15 19:14:37 2007
-@@ -56,7 +56,7 @@
- am__installdirs = "$(DESTDIR)$(pythondir)"
- pythonLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(python_LTLIBRARIES)
--@WITH_PYTHON_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/libxml2.la
-+@WITH_PYTHON_TRUE@am__DEPENDENCIES_1 =
- @WITH_PYTHON_TRUE@libxml2mod_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am__libxml2mod_la_SOURCES_DIST = libxml.c types.c libxml2-py.c
- @WITH_PYTHON_TRUE@am_libxml2mod_la_OBJECTS = libxml.lo types.lo \
-@@ -309,7 +309,7 @@
+--- python/Makefile.in.orig	2008-01-22 15:50:22.000000000 -0500
++++ python/Makefile.in	2008-01-22 15:50:22.000000000 -0500
+@@ -313,7 +313,7 @@ INCLUDES = \
  	-I$(top_builddir)/include \
  	-I$(top_builddir)/$(subdir)
  
@@ -18,7 +9,7 @@
  # libxml2class.txt is generated
  DOCS = ${srcdir}/TODO
  EXTRA_DIST = \
-@@ -326,7 +326,7 @@
+@@ -330,7 +330,7 @@ EXTRA_DIST = \
  
  libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version 
  @WITH_PYTHON_TRUE@mylibs = \
diff --git a/textproc/libxml2/files/patch-python::tests::Makefile.in b/textproc/libxml2/files/patch-python::tests::Makefile.in
index 7a640460ea51..3fbde71724b5 100644
--- a/textproc/libxml2/files/patch-python::tests::Makefile.in
+++ b/textproc/libxml2/files/patch-python::tests::Makefile.in
@@ -1,9 +1,9 @@
---- 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@
+--- python/tests/Makefile.in.orig	2008-01-22 15:51:51.000000000 -0500
++++ python/tests/Makefile.in	2008-01-22 15:52:12.000000000 -0500
+@@ -259,7 +259,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -EXAMPLE_DIR = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
 +EXAMPLE_DIR = $(datadir)/examples/py-libxml2
  PYTESTS = \