From 4ff89648f69beae004fd108e70e170af3ecf6105 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 14 Oct 2015 22:26:19 +0000
Subject: [PATCH] libxml2: fix for broken xmlcatalog command.

---
 dev-libs/libxml2/libxml2-2.9.2.recipe         |  2 +-
 .../libxml2/patches/libxml2-2.9.2.patchset    | 52 ++++++++++++++-----
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/dev-libs/libxml2/libxml2-2.9.2.recipe b/dev-libs/libxml2/libxml2-2.9.2.recipe
index c63417ff3..15b2818db 100644
--- a/dev-libs/libxml2/libxml2-2.9.2.recipe
+++ b/dev-libs/libxml2/libxml2-2.9.2.recipe
@@ -10,7 +10,7 @@ available in other environments."
 HOMEPAGE="http://www.xmlsoft.org/"
 COPYRIGHT="1998-2013 Daniel Veillard.  All Rights Reserved."
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="ftp://xmlsoft.org/libxml2/libxml2-$portVersion.tar.gz"
 CHECKSUM_SHA256="5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc"
 PATCHES="libxml2-$portVersion.patchset"
diff --git a/dev-libs/libxml2/patches/libxml2-2.9.2.patchset b/dev-libs/libxml2/patches/libxml2-2.9.2.patchset
index 3a42b6d30..be92c868b 100644
--- a/dev-libs/libxml2/patches/libxml2-2.9.2.patchset
+++ b/dev-libs/libxml2/patches/libxml2-2.9.2.patchset
@@ -1,4 +1,4 @@
-From 52a5d213a7c464b51c0259f855811ecda990e3c6 Mon Sep 17 00:00:00 2001
+From fb5c9a96e34496aa83c941e67adf68cd47ede27d Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Wed, 1 Jan 2014 22:13:22 +0100
 Subject: Port patches from libxml2-2.8.0.
@@ -10,15 +10,15 @@ index 70720f3..c617e0d 100644
 +++ b/Makefile.am
 @@ -1225,8 +1225,8 @@ cmake_DATA = libxml2-config.cmake
  #
- # Install the tests program sources as examples
+ # Install the tests program sources as examples 
  #
 -BASE_DIR=$(datadir)/doc
 -DOC_MODULE=libxml2-$(VERSION)
 +BASE_DIR=$(docdir)
 +DOC_MODULE=
  EXAMPLES_DIR=$(BASE_DIR)/$(DOC_MODULE)/examples
-
- install-data-local:
+ 
+ install-data-local: 
 diff --git a/configure.ac b/configure.ac
 index 14ac0a8..e75dd93 100644
 --- a/configure.ac
@@ -82,7 +82,7 @@ index 95ebead..81222d9 100644
 -exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
 +exampledir = $(docdir)_python-$(LIBXML_VERSION)/examples
  dist_example_DATA = $(PYTESTS) $(XMLS)
-
+ 
  PYTESTS=	\
 diff --git a/xml2-config.in b/xml2-config.in
 index 1957486..9c98a0e 100644
@@ -97,29 +97,29 @@ index 1957486..9c98a0e 100644
 +	includedir=$prefix/develop/headers
 +	libdir=$prefix/develop/lib
  	;;
-
+ 
      --prefix)
 @@ -50,7 +50,7 @@ while test $# -gt 0; do
-
+ 
      --exec-prefix=*)
        exec_prefix=$optarg
 -      libdir=$exec_prefix/lib
 +      libdir=$exec_prefix/develop/lib
        ;;
-
+ 
      --exec-prefix)
---
+-- 
 2.2.2
 
 
-From e084f0448ce3d80d3800b65477514f1d917dd654 Mon Sep 17 00:00:00 2001
+From c977e91e6569803e3372fd0d345e85a08f94420d Mon Sep 17 00:00:00 2001
 From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
 Date: Sat, 30 May 2015 11:38:15 +1200
 Subject: Haiku: search for catalogs in directories
 
 
 diff --git a/catalog.c b/catalog.c
-index 5773db3..3f0f611 100644
+index 5773db3..1065298 100644
 --- a/catalog.c
 +++ b/catalog.c
 @@ -32,6 +32,9 @@
@@ -143,12 +143,12 @@ index 5773db3..3f0f611 100644
 -#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog"
 +#define XML_SGML_DEFAULT_CATALOG "/boot/system/data/sgml/catalog"
  #endif
-
+ 
  #if defined(_WIN32) && defined(_MSC_VER)
 @@ -3074,6 +3077,21 @@ xmlCatalogIsEmpty(xmlCatalogPtr catal) {
   *									*
   ************************************************************************/
-
+ 
 +#ifdef __HAIKU__
 +static xmlCatalogEntryPtr *__haikuNextEntry;
 +static int __haikuAddCatalog(const char* subpath, const struct stat* sb, int typeflag)
@@ -184,6 +184,30 @@ index 5773db3..3f0f611 100644
  			xmlFree(path);
  		    }
  		}
---
+-- 
+2.2.2
+
+
+From 3bbfd1d6cfd3c50e88f2410b3f6b1d7186d6ee4e Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 14 Oct 2015 17:17:50 +0000
+Subject: This breaks xmlcatalog command.
+
+
+diff --git a/parser.c b/parser.c
+index 1d93967..67c9dfd 100644
+--- a/parser.c
++++ b/parser.c
+@@ -14830,9 +14830,6 @@ xmlInitParser(void) {
+ #ifdef LIBXML_XPATH_ENABLED
+ 	xmlXPathInit();
+ #endif
+-#ifdef LIBXML_CATALOG_ENABLED
+-        xmlInitializeCatalog();
+-#endif
+ 	xmlParserInitialized = 1;
+ #ifdef LIBXML_THREAD_ENABLED
+     }
+-- 
 2.2.2