Update to 2.4.16.

PR:		35002
Submitted by:	Lev Serebryakov <lev@serebryakov.spb.ru>

3 files changed, 60 insertions, 11 deletions

diff --git a/textproc/libxml2/files/patch-aa b/textproc/libxml2/files/patch-aa
index ba39c1d..96086f8 100644
--- a/textproc/libxml2/files/patch-aa
+++ b/textproc/libxml2/files/patch-aa
@@ -1,24 +1,45 @@
---- work/libxml2-2.4.5/Makefile.in.orig	Tue Sep 18 20:11:32 2001
-+++ Makefile.in				Tue Sep 18 20:11:32 2001
-@@ -137,7 +137,7 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Tue Feb 26 20:08:54 2002
++++ Makefile.in	Tue Feb 26 20:36:25 2002
+@@ -130,7 +130,7 @@
+ 
+ AUTOMAKE_OPTIONS = no-dependencies
+ 
+-SUBDIRS = include . doc example python
++SUBDIRS = include . doc example @WITH_PYTHON_TRUE@ python
+ 
+ INCLUDES = -I@srcdir@/include -I$(top_builddir)/include @THREAD_CFLAGS@ @Z_CFLAGS@ 
+ 
+@@ -143,7 +143,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 = SAX.c entities.c encoding.c error.c parserInternals.c  		parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c  		valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c  		xpointer.c xinclude.c nanohttp.c nanoftp.c DOCBparser.c 		catalog.c strio.c trio.c
- @WITH_TRIO_SOURCES_FALSE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  		parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c  		valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c  		xpointer.c xinclude.c nanohttp.c nanoftp.c DOCBparser.c 		catalog.c 
-@@ -185,7 +185,7 @@
- testURI_DEPENDENCIES = $(DEPS)
- testURI_LDADD = $(LDADDS)
+ @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 @@
+ 
+ CLEANFILES = xml2Conf.sh
  
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
  confexec_DATA = xml2Conf.sh
- 
- CLEANFILES = xml2Conf.sh
-@@ -770,7 +770,7 @@
+ 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 @@
+ # Instll the tests program sources as examples 
+ #
+ BASE_DIR = @HTML_DIR@
+-DOC_MODULE = libxml2-$(VERSION)
++DOC_MODULE = libxml2
+ EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -809,7 +809,7 @@
  		uninstall-confexecDATA uninstall-m4dataDATA \
  		uninstall-pkgconfigDATA
  uninstall: uninstall-recursive
diff --git a/textproc/libxml2/files/patch-python::Makefile.in b/textproc/libxml2/files/patch-python::Makefile.in
new file mode 100644
index 0000000..41bcf33
--- /dev/null
+++ b/textproc/libxml2/files/patch-python::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- python/Makefile.in	2002/02/26 18:02:33	1.1
++++ python/Makefile.in	2002/02/26 18:02:50
+@@ -139,7 +139,7 @@
+ 	-I$(top_srcdir)/include
+ 
+ 
+-DOCS_DIR = $(prefix)/share/doc/libxml2-python-$(LIBXML_VERSION)
++DOCS_DIR = $(prefix)/share/doc/libxml2-python
+ DOCS = TODO libxml2class.txt
+ 
+ EXTRA_DIST = \
diff --git a/textproc/libxml2/files/patch-python::tests::Makefile.in b/textproc/libxml2/files/patch-python::tests::Makefile.in
new file mode 100644
index 0000000..0120732
--- /dev/null
+++ b/textproc/libxml2/files/patch-python::tests::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- python/tests/Makefile.in	2002/02/26 18:09:00	1.1
++++ python/tests/Makefile.in	2002/02/26 18:09:12
+@@ -128,7 +128,7 @@
+ Z_CFLAGS = @Z_CFLAGS@
+ Z_LIBS = @Z_LIBS@
+ 
+-EXAMPLE_DIR = $(prefix)/share/doc/libxml2-python-$(LIBXML_VERSION)/examples
++EXAMPLE_DIR = $(prefix)/share/doc/libxml2-python/examples
+ 
+ PYTESTS = \
+     build.py	\