From 683020c2c46fe5466a53cd8c74df71907958a7fb Mon Sep 17 00:00:00 2001
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Tue, 30 Apr 2002 11:00:47 +0000
Subject: [PATCH] Update to 2.4.21.

---
 textproc/libxml2/Makefile       |  2 +-
 textproc/libxml2/distinfo       |  2 +-
 textproc/libxml2/files/patch-aa | 16 ++++++++--------
 textproc/libxml2/pkg-plist      |  6 ++++++
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 58ddfe250165..f01bb281c754 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libxml2
-PORTVERSION=	2.4.20
+PORTVERSION=	2.4.21
 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 84e211279a81..64f782f2cecd 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libxml2-2.4.20.tar.bz2) = 79ff94d28e3f85fe8042250099b379bd
+MD5 (gnome2/libxml2-2.4.21.tar.bz2) = f471a780f39d54e30f0c0177e63daba2
diff --git a/textproc/libxml2/files/patch-aa b/textproc/libxml2/files/patch-aa
index 96086f8eebaf..6dc160d8d833 100644
--- a/textproc/libxml2/files/patch-aa
+++ b/textproc/libxml2/files/patch-aa
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Tue Feb 26 20:08:54 2002
-+++ Makefile.in	Tue Feb 26 20:36:25 2002
-@@ -130,7 +130,7 @@
+--- Makefile.in.orig	Tue Apr 30 13:21:49 2002
++++ Makefile.in	Tue Apr 30 13:22:23 2002
+@@ -134,7 +134,7 @@
  
  AUTOMAKE_OPTIONS = no-dependencies
  
@@ -12,16 +12,16 @@ $FreeBSD$
  
  INCLUDES = -I@srcdir@/include -I$(top_builddir)/include @THREAD_CFLAGS@ @Z_CFLAGS@ 
  
-@@ -143,7 +143,7 @@
+@@ -149,7 +149,7 @@
  lib_LTLIBRARIES = libxml2.la
  libxml2_la_LIBADD = @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  \
-@@ -206,7 +206,7 @@
+ @WITH_TRIO_SOURCES_TRUE@		valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c  \
+@@ -234,7 +234,7 @@
  
  CLEANFILES = xml2Conf.sh
  
@@ -30,7 +30,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 \
-@@ -224,7 +224,7 @@
+@@ -252,7 +252,7 @@
  # Instll the tests program sources as examples 
  #
  BASE_DIR = @HTML_DIR@
@@ -39,7 +39,7 @@ $FreeBSD$
  EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -809,7 +809,7 @@
+@@ -863,7 +863,7 @@
  		uninstall-confexecDATA uninstall-m4dataDATA \
  		uninstall-pkgconfigDATA
  uninstall: uninstall-recursive
diff --git a/textproc/libxml2/pkg-plist b/textproc/libxml2/pkg-plist
index f79dca1364b8..a9f64035583c 100644
--- a/textproc/libxml2/pkg-plist
+++ b/textproc/libxml2/pkg-plist
@@ -18,6 +18,7 @@ include/libxml2/libxml/nanoftp.h
 include/libxml2/libxml/nanohttp.h
 include/libxml2/libxml/parser.h
 include/libxml2/libxml/parserInternals.h
+include/libxml2/libxml/schemasInternals.h
 include/libxml2/libxml/threads.h
 include/libxml2/libxml/tree.h
 include/libxml2/libxml/uri.h
@@ -25,8 +26,13 @@ include/libxml2/libxml/valid.h
 include/libxml2/libxml/xinclude.h
 include/libxml2/libxml/xlink.h
 include/libxml2/libxml/xmlIO.h
+include/libxml2/libxml/xmlautomata.h
 include/libxml2/libxml/xmlerror.h
 include/libxml2/libxml/xmlmemory.h
+include/libxml2/libxml/xmlregexp.h
+include/libxml2/libxml/xmlschemas.h
+include/libxml2/libxml/xmlschemastypes.h
+include/libxml2/libxml/xmlunicode.h
 include/libxml2/libxml/xmlversion.h
 include/libxml2/libxml/xmlwin32version.h
 include/libxml2/libxml/xpath.h