5 files changed, 17 insertions, 46 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 32b45e3ca7e9..ead0af74a12c 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -11,8 +11,8 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.7.6
-PORTREVISION?=	2
+PORTVERSION=	2.7.7
+PORTREVISION?=	0
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	ftp://fr.rpmfind.net/pub/libxml/ \
 		ftp://gd.tuwien.ac.at/pub/libxml/ \
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 3d95c9b7a3df..48c948da1190 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libxml2-2.7.6.tar.gz) = 7740a8ec23878a2f50120e1faa2730f2
-SHA256 (gnome2/libxml2-2.7.6.tar.gz) = 238c4f0203c012e5776522640c0fb3ac532c4064981c1ce3e74c00b75501d761
-SIZE (gnome2/libxml2-2.7.6.tar.gz) = 4854591
+MD5 (gnome2/libxml2-2.7.7.tar.gz) = 9abc9959823ca9ff904f1fbcf21df066
+SHA256 (gnome2/libxml2-2.7.7.tar.gz) = af5b781418ba4fff556fa43c50086658ea8a2f31909c2b625c2ce913a1d9eb68
+SIZE (gnome2/libxml2-2.7.7.tar.gz) = 4868502
diff --git a/textproc/libxml2/files/patch-aa b/textproc/libxml2/files/patch-aa
index 95759e67b21d..91bee0a4204b 100644
--- a/textproc/libxml2/files/patch-aa
+++ b/textproc/libxml2/files/patch-aa
@@ -1,15 +1,15 @@
---- Makefile.in.orig	2009-09-12 14:00:00.000000000 -0400
-+++ Makefile.in	2009-09-12 14:01:06.000000000 -0400
-@@ -558,7 +558,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
+--- Makefile.in.orig	2010-03-20 17:51:45.000000000 -0400
++++ Makefile.in	2010-03-20 17:52:13.000000000 -0400
+@@ -562,7 +562,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
 -SUBDIRS = include . doc example xstc @PYTHON_SUBDIR@
 +SUBDIRS = include . doc example xstc @WITH_PYTHON_TRUE@ @PYTHON_SUBDIR@
  DIST_SUBDIRS = include . doc example python xstc
  INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ 
  bin_SCRIPTS = xml2-config
-@@ -568,7 +568,7 @@ libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIB
+@@ -572,7 +572,7 @@ libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIB
  @USE_VERSION_SCRIPT_TRUE@LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms
  libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ \
                       $(LIBXML2_VERSION_SCRIPT) \
@@ -18,7 +18,7 @@
  		     @MODULE_PLATFORM_LIBS@
  
  @WITH_TRIO_SOURCES_FALSE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  \
-@@ -684,7 +684,7 @@ runxmlconf_LDFLAGS = 
+@@ -688,7 +688,7 @@ runxmlconf_LDFLAGS = 
  runxmlconf_DEPENDENCIES = $(DEPS)
  runxmlconf_LDADD = $(LDADDS)
  CLEANFILES = xml2Conf.sh *.gcda *.gcno
@@ -27,7 +27,7 @@
  confexec_DATA = xml2Conf.sh
  CVS_EXTRA_DIST = 
  EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
-@@ -707,8 +707,8 @@ pkgconfig_DATA = libxml-2.0.pc
+@@ -711,8 +711,8 @@ pkgconfig_DATA = libxml-2.0.pc
  # Install the tests program sources as examples 
  #
  BASE_DIR = $(datadir)/doc
@@ -38,7 +38,7 @@
  
  #
  # Coverage support, largely borrowed from libvirt
-@@ -1541,7 +1541,7 @@ distcleancheck: distclean
+@@ -1546,7 +1546,7 @@ distcleancheck: distclean
  	       exit 1; } >&2
  check-am: all-am
  check: check-recursive
diff --git a/textproc/libxml2/files/patch-configure b/textproc/libxml2/files/patch-configure
index 05ebdee18edd..3c72220519b7 100644
--- a/textproc/libxml2/files/patch-configure
+++ b/textproc/libxml2/files/patch-configure
@@ -1,15 +1,6 @@
---- configure.orig	2009-10-06 18:31:12.000000000 +0200
-+++ configure	2009-11-30 12:54:21.000000000 +0100
-@@ -12149,7 +12149,7 @@
- VERSION_SCRIPT_FLAGS=
- $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \
-     VERSION_SCRIPT_FLAGS=-Wl,--version-script=
--test "`uname`" == "SunOS" && \
-+test "`uname`" = "SunOS" && \
-     VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
- 
-  if test -n "$VERSION_SCRIPT_FLAGS"; then
-@@ -19856,11 +19856,12 @@
+--- configure.orig	2010-03-20 17:52:35.000000000 -0400
++++ configure	2010-03-20 17:52:35.000000000 -0400
+@@ -19865,11 +19865,12 @@ fi
      fi
      if test "$PYTHON_VERSION" != ""
      then
@@ -23,7 +14,7 @@
  	else
  	    if test -r $prefix/include/python$PYTHON_VERSION/Python.h
  	    then
-@@ -20665,6 +20666,8 @@
+@@ -20678,6 +20679,8 @@ fi
  	       fi
  	   fi
         ;;
diff --git a/textproc/libxml2/files/patch-xmlIO.c b/textproc/libxml2/files/patch-xmlIO.c
deleted file mode 100644
index 6f765aefc9f9..000000000000
--- a/textproc/libxml2/files/patch-xmlIO.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./xmlIO.c.orig	2009-09-24 08:32:00.000000000 -0700
-+++ ./xmlIO.c	2010-03-17 12:35:00.957293884 -0700
-@@ -2518,6 +2518,9 @@
- #ifdef HAVE_ZLIB_H
- 	if ((xmlInputCallbackTable[i].opencallback == xmlGzfileOpen) &&
- 		(strcmp(URI, "-") != 0)) {
-+#if defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1230
-+	    ret->compressed = !gzdirect(context);
-+#else
- 	    if (((z_stream *)context)->avail_in > 4) {
- 	        char *cptr, buff4[4];
- 		cptr = (char *) ((z_stream *)context)->next_in;
-@@ -2529,6 +2532,7 @@
- 		    gzrewind(context);
- 		}
- 	    }
-+#endif
- 	}
- #endif
-     }