3 files changed, 34 insertions, 11 deletions

diff --git a/textproc/libxml2/files/patch-aa b/textproc/libxml2/files/patch-aa
index c2a6689763b7..dff4eba3fdef 100644
--- a/textproc/libxml2/files/patch-aa
+++ b/textproc/libxml2/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Mar 23 09:17:22 2004
-+++ Makefile.in	Tue Mar 23 09:18:51 2004
+--- Makefile.in.orig	Fri Jul  2 13:56:41 2004
++++ Makefile.in	Fri Jul  2 13:59:27 2004
 @@ -418,13 +418,13 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
@@ -25,15 +25,17 @@
  confexec_DATA = xml2Conf.sh
  EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
               libxml.m4 Copyright check-xml-test-suite.py \
-@@ -521,7 +521,7 @@
+@@ -521,8 +521,8 @@
  # Instll the tests program sources as examples 
  #
  BASE_DIR = $(datadir)/doc
 -DOC_MODULE = libxml2-$(VERSION)
+-EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
 +DOC_MODULE = libxml2
- EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
++EXAMPLES_DIR = $(datadir)/examples/libxml2
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
 @@ -1209,7 +1209,7 @@
  check-am: all-am
  	$(MAKE) $(AM_MAKEFLAGS) check-local
diff --git a/textproc/libxml2/files/patch-python::Makefile.in b/textproc/libxml2/files/patch-python::Makefile.in
index e7f8a271b16b..8ab00f6e42dd 100644
--- a/textproc/libxml2/files/patch-python::Makefile.in
+++ b/textproc/libxml2/files/patch-python::Makefile.in
@@ -1,11 +1,32 @@
---- python/Makefile.in.orig	Thu Aug 14 22:06:11 2003
-+++ python/Makefile.in	Thu Aug 14 22:06:39 2003
-@@ -161,7 +161,7 @@
+--- python/Makefile.in.orig	Fri Jul  2 10:54:27 2004
++++ python/Makefile.in	Fri Jul  2 11:02:17 2004
+@@ -51,7 +51,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 \
+@@ -284,7 +284,7 @@
+ 	-I$(PYTHON_INCLUDES) \
  	-I$(top_srcdir)/include
  
- 
 -DOCS_DIR = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
-+DOCS_DIR = $(datadir)/doc/libxml2-python
++DOCS_DIR = $(datadir)/doc/py-libxml2
  # libxml2class.txt is generated
- DOCS = TODO
+ DOCS = ${srcdir}/TODO
+ EXTRA_DIST = \
+@@ -299,9 +299,9 @@
+ 	libxml2-python-api.xml	\
+ 	$(DOCS)
+ 
+-libxml2mod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/.libs
++libxml2mod_la_LDFLAGS = -module -avoid-version
+ @WITH_PYTHON_TRUE@mylibs = \
+-@WITH_PYTHON_TRUE@	$(top_builddir)/libxml2.la
++@WITH_PYTHON_TRUE@	-lxml2
  
+ @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la
+ @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c types.c libxml2-py.c
diff --git a/textproc/libxml2/files/patch-python::tests::Makefile.in b/textproc/libxml2/files/patch-python::tests::Makefile.in
index a2977bbd13ab..7a640460ea51 100644
--- a/textproc/libxml2/files/patch-python::tests::Makefile.in
+++ b/textproc/libxml2/files/patch-python::tests::Makefile.in
@@ -5,7 +5,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
 -EXAMPLE_DIR = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
-+EXAMPLE_DIR = $(datadir)/doc/libxml2-python/examples
++EXAMPLE_DIR = $(datadir)/examples/py-libxml2
  PYTESTS = \
      build.py	\
      attribs.py	\