3 files changed, 8 insertions, 47 deletions
diff --git a/textproc/libxml2/patches/patch-aa b/textproc/libxml2/patches/patch-aa
index ae775e8c3a2..d72c8423b27 100644
--- a/textproc/libxml2/patches/patch-aa
+++ b/textproc/libxml2/patches/patch-aa
@@ -1,15 +1,13 @@
-$NetBSD: patch-aa,v 1.15 2003/12/26 21:49:08 jmmv Exp $
+$NetBSD: patch-aa,v 1.16 2004/03/28 21:31:46 jmmv Exp $
 
---- Makefile.in.orig	2003-12-10 05:56:54.000000000 -0600
+--- Makefile.in.orig	2004-03-23 12:43:08.000000000 +0100
 +++ Makefile.in
-@@ -318,8 +318,8 @@ pkgconfig_DATA = libxml-2.0.pc
- # Instll the tests program sources as examples 
+@@ -522,7 +522,7 @@ pkgconfig_DATA = libxml-2.0.pc
  #
  BASE_DIR = $(datadir)/doc
--DOC_MODULE = libxml2-$(VERSION)
+ DOC_MODULE = libxml2-$(VERSION)
 -EXAMPLES_DIR = $(BASE_DIR)/$(DOC_MODULE)/examples
-+DOC_MODULE = libxml2
-+EXAMPLES_DIR = $(datadir)/examples/$(DOC_MODULE)
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++EXAMPLES_DIR = $(datadir)/examples/libxml2
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
diff --git a/textproc/libxml2/patches/patch-ab b/textproc/libxml2/patches/patch-ab
deleted file mode 100644
index 7aa3cc9f94c..00000000000
--- a/textproc/libxml2/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2003/12/26 21:49:08 jmmv Exp $
-
---- doc/examples/Makefile.in.orig	2003-12-24 12:53:04.000000000 +0100
-+++ doc/examples/Makefile.in
-@@ -185,8 +185,8 @@ am__include = @am__include@
- am__quote = @am__quote@
- install_sh = @install_sh@
- pythondir = @pythondir@
--DOC_MODULE = libxml2-$(VERSION)
--TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/examples
-+DOC_MODULE = libxml2
-+TARGET_DIR = $(datadir)/examples/$(DOC_MODULE)
- 
- INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@
- DEPS = $(top_builddir)/libxml2.la
diff --git a/textproc/libxml2/patches/patch-ad b/textproc/libxml2/patches/patch-ad
deleted file mode 100644
index 1d0caf5ea81..00000000000
--- a/textproc/libxml2/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.14 2003/12/26 21:49:08 jmmv Exp $
-
---- doc/Makefile.in.orig	2003-12-24 05:53:04.000000000 -0600
-+++ doc/Makefile.in
-@@ -186,7 +186,7 @@ install_sh = @install_sh@
- pythondir = @pythondir@
- SUBDIRS = examples
- # The name of the module.
--DOC_MODULE = libxml2-$(VERSION)
-+DOC_MODULE = libxml2
- 
- # The top-level SGML file.
- DOC_MAIN_XML_FILE = gnome-xml.xml
-@@ -197,7 +197,7 @@ DOC_SOURCE_DIR = ..
- # A file in win32 depends upon one of the doc files
- WIN32_DIR = $(top_srcdir)/win32
- 
--TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/html
-+TARGET_DIR = $(HTML_DIR)/html/$(DOC_MODULE)
- PAGES = architecture.html bugs.html contribs.html docs.html DOM.html \
-     downloads.html entities.html example.html help.html index.html \
-     interface.html intro.html library.html namespaces.html news.html \