Update to 2.4.25.

4 files changed, 19 insertions, 16 deletions

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index d3637d92367d..28898a484a56 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.4.24
+PORTVERSION=	2.4.25
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 5b3523b66050..4a7ffa98c9fe 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libxml2-2.4.24.tar.bz2) = b2dc5525fd6e49d36b90f1e07bac3f34
+MD5 (gnome2/libxml2-2.4.25.tar.bz2) = 1783360685323bd2a7d185a456c605bd
diff --git a/textproc/libxml2/files/patch-aa b/textproc/libxml2/files/patch-aa
index 6dc160d8d833..263d59cb7601 100644
--- a/textproc/libxml2/files/patch-aa
+++ b/textproc/libxml2/files/patch-aa
@@ -1,27 +1,24 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Tue Apr 30 13:21:49 2002
-+++ Makefile.in	Tue Apr 30 13:22:23 2002
-@@ -134,7 +134,7 @@
+--- Makefile.in.orig	Tue Oct  8 00:40:19 2002
++++ Makefile.in	Tue Oct  8 00:43:51 2002
+@@ -137,7 +137,7 @@
  
  AUTOMAKE_OPTIONS = no-dependencies
  
--SUBDIRS = include . doc example python
-+SUBDIRS = include . doc example @WITH_PYTHON_TRUE@ python
+-SUBDIRS = include . doc example @PYTHON_SUBDIR@
++SUBDIRS = include . doc example @WITH_PYTHON_TRUE@ @PYTHON_SUBDIR@
  
- INCLUDES = -I@srcdir@/include -I$(top_builddir)/include @THREAD_CFLAGS@ @Z_CFLAGS@ 
+ DIST_SUBDIRS = include . doc example python
  
-@@ -149,7 +149,7 @@
+@@ -154,7 +154,7 @@
  lib_LTLIBRARIES = libxml2.la
- libxml2_la_LIBADD = @Z_LIBS@ $(ICONV_LIBS) -lm
+ 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 = @WITH_TRIO_SOURCES_TRUE@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  \
  @WITH_TRIO_SOURCES_TRUE@		valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c  \
-@@ -234,7 +234,7 @@
+@@ -239,7 +239,7 @@
  
  CLEANFILES = xml2Conf.sh
  
@@ -30,7 +27,7 @@ $FreeBSD$
  confexec_DATA = xml2Conf.sh
  EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml.spec \
               libxml.m4 Copyright check-xml-test-suite.py \
-@@ -252,7 +252,7 @@
+@@ -257,7 +257,7 @@
  # Instll the tests program sources as examples 
  #
  BASE_DIR = @HTML_DIR@
@@ -39,7 +36,7 @@ $FreeBSD$
  EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -863,7 +863,7 @@
+@@ -868,7 +868,7 @@
  		uninstall-confexecDATA uninstall-m4dataDATA \
  		uninstall-pkgconfigDATA
  uninstall: uninstall-recursive
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index 3836c337b6dd..069e1412bb1c 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -50,10 +50,14 @@ share/aclocal/libxml.m4
 %%PYTHON:%%share/doc/libxml2-python/examples/build.py
 %%PYTHON:%%share/doc/libxml2-python/examples/cutnpaste.py
 %%PYTHON:%%share/doc/libxml2-python/examples/error.py
+%%PYTHON:%%share/doc/libxml2-python/examples/inbuf.py
 %%PYTHON:%%share/doc/libxml2-python/examples/invalid.xml
+%%PYTHON:%%share/doc/libxml2-python/examples/outbuf.py
 %%PYTHON:%%share/doc/libxml2-python/examples/push.py
 %%PYTHON:%%share/doc/libxml2-python/examples/pushSAX.py
 %%PYTHON:%%share/doc/libxml2-python/examples/pushSAXhtml.py
+%%PYTHON:%%share/doc/libxml2-python/examples/regexp.py
+%%PYTHON:%%share/doc/libxml2-python/examples/resolver.py
 %%PYTHON:%%share/doc/libxml2-python/examples/serialize.py
 %%PYTHON:%%share/doc/libxml2-python/examples/tst.py
 %%PYTHON:%%share/doc/libxml2-python/examples/tst.xml
@@ -71,6 +75,8 @@ 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/index.sgml