From 2cfffc78f18d35c03a02aa6d71eb33a0c662c032 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 31 Mar 2019 14:05:43 +0200 Subject: [PATCH] libxml2: bump version. --- dev-libs/libxml2/libxml2-2.9.2.recipe | 172 -------------- dev-libs/libxml2/libxml2-2.9.3.recipe | 175 -------------- ...xml2-2.9.7.recipe => libxml2-2.9.9.recipe} | 8 +- .../libxml2/patches/libxml2-2.9.2.patchset | 213 ------------------ .../libxml2/patches/libxml2-2.9.7.patchset | 189 ---------------- ...-2.9.3.patchset => libxml2-2.9.9.patchset} | 0 dev-libs/libxml2/patches/libxml2-trunk.diff | 35 --- 7 files changed, 4 insertions(+), 788 deletions(-) delete mode 100644 dev-libs/libxml2/libxml2-2.9.2.recipe delete mode 100644 dev-libs/libxml2/libxml2-2.9.3.recipe rename dev-libs/libxml2/{libxml2-2.9.7.recipe => libxml2-2.9.9.recipe} (96%) delete mode 100644 dev-libs/libxml2/patches/libxml2-2.9.2.patchset delete mode 100644 dev-libs/libxml2/patches/libxml2-2.9.7.patchset rename dev-libs/libxml2/patches/{libxml2-2.9.3.patchset => libxml2-2.9.9.patchset} (100%) delete mode 100644 dev-libs/libxml2/patches/libxml2-trunk.diff diff --git a/dev-libs/libxml2/libxml2-2.9.2.recipe b/dev-libs/libxml2/libxml2-2.9.2.recipe deleted file mode 100644 index c81483ff5..000000000 --- a/dev-libs/libxml2/libxml2-2.9.2.recipe +++ /dev/null @@ -1,172 +0,0 @@ -SUMMARY="The XML C parser and toolkit of Gnome" -DESCRIPTION="Libxml2 is the XML C parser and toolkit developed for the Gnome \ -project, but is usable outside of the Gnome platform as well. -XML itself is a metalanguage to design markup languages, i.e. text language \ -where semantic and structure are added to the content using extra \"markup\" \ -information enclosed between angle brackets. HTML is the most well-known \ -markup language. -Though the library is written in C a variety of language bindings make it \ -available in other environments." -HOMEPAGE="http://www.xmlsoft.org/" -COPYRIGHT="1998-2013 Daniel Veillard. All Rights Reserved." -LICENSE="MIT" -REVISION="3" -SOURCE_URI="ftp://xmlsoft.org/libxml2/libxml2-$portVersion.tar.gz" -CHECKSUM_SHA256="5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc" -PATCHES="libxml2-$portVersion.patchset" - -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - - -# build the python module only for the primary architecture -pythonModuleEnabled=false -if [ -z "$secondaryArchSuffix" ]; then - pythonModuleEnabled=true -fi - -PROVIDES=" - libxml2$secondaryArchSuffix = $portVersion compat >= 2 - lib:libxml2$secondaryArchSuffix = $portVersion compat >= 2 - " -if [ -z "$secondaryArchSuffix" ]; then - PROVIDES="$PROVIDES - cmd:xmlcatalog = $portVersion compat >= 2 - cmd:xmllint = $portVersion compat >= 2 - " -fi -REQUIRES=" - haiku$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -PROVIDES_devel=" - libxml2${secondaryArchSuffix}_devel = $portVersion - cmd:xml2_config$secondaryArchSuffix = $portVersion compat >= 2 - devel:libxml2$secondaryArchSuffix = $portVersion compat >= 2 - " -REQUIRES_devel=" - libxml2$secondaryArchSuffix == $portVersion base - devel:libz$secondaryArchSuffix - " - -if $pythonModuleEnabled; then - SUMMARY_python="The python module for libxml2" - PROVIDES_python=" - libxml2_python = $portVersion - " - REQUIRES_python=" - libxml2 == $portVersion base - cmd:python - " -fi - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libz$secondaryArchSuffix - " -if $pythonModuleEnabled; then - BUILD_REQUIRES="$BUILD_REQUIRES - python >= 2.7 - " - # Note: We don't use "cmd:python" here to avoid issues with the - # python search path. -fi -BUILD_PREREQUIRES=" - lib:libicudata$secondaryArchSuffix - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:sed - cmd:pkg_config$secondaryArchSuffix - " - -PATCH() -{ - # replace hard-coded references to the development documentation dir - sed -i "s,^DEVHELP_DIR=\(.*\),DEVHELP_DIR=${developDocDir}," \ - doc/devhelp/Makefile.am - sed -i "s,%{_datadir}/gtk-doc/html/libxml2,${developDocDir},g" \ - libxml.spec.in -} - -BUILD() -{ - libtoolize --force --copy --install - aclocal - autoconf - automake --add-missing - - withPython= - if $pythonModuleEnabled; then - # We symlink python's directories into our packaging directory and tell - # configure that it can find python there. This way the correct - # installation directory for the python module is determined. - pythonDir="$portPackageLinksDir/python" - ln -s $pythonDir/bin $pythonDir/develop $pythonDir/lib $prefix - withPython="--with-python=$prefix" - fi - - runConfigure ./configure LDFLAGS="-lnetwork" \ - --with-html-dir=$docDir/html \ - --with-html-subdir="" \ - $withPython - make $jobArgs -} - -INSTALL() -{ - if $pythonModuleEnabled; then - # Unfortunately we can't just remove the in symlinks we created in - # BUILD() and install normally, since then make detects that the - # Python.h is missing and tries to rebuild the module. So we leave - # things as is and use DESTDIR to install the everything in a subdir. - # Then we remove the symlinks and move everything where it belongs. - make DESTDIR=$prefix install - rm -f $prefix/bin $prefix/develop $prefix/lib - mv $prefix/$prefix/* $prefix - rm -r $prefix/packages - else - make install - fi - - # prepare develop/lib - prepareInstalledDevelLibs libxml2 - fixPkgconfig - mv $libDir/xml2Conf.sh $developLibDir/ - fixDevelopLibDirReferences $developLibDir/xml2Conf.sh $binDir/xml2-config - - # python package - if $pythonModuleEnabled; then - packageEntries python \ - $libDir/python* \ - ${docDir}_python* - fi - - # devel package - packageEntries devel \ - $binDir/xml2-config \ - $dataDir \ - $developDir \ - $docDir \ - $manDir/man1/xml2-config.1 \ - $manDir/man3 - - # Remove stuff we don't need in the secondary architecture base package. - if [ -n "$secondaryArchSuffix" ]; then - rm -rf $binDir - rm -rf $documentationDir - else - # left-over since all contents has been moved to other packages - rmdir $(dirname $docDir) - fi -} - -TEST() -{ - make tests -} diff --git a/dev-libs/libxml2/libxml2-2.9.3.recipe b/dev-libs/libxml2/libxml2-2.9.3.recipe deleted file mode 100644 index 65ac73d35..000000000 --- a/dev-libs/libxml2/libxml2-2.9.3.recipe +++ /dev/null @@ -1,175 +0,0 @@ -SUMMARY="The XML C parser and toolkit of Gnome" -DESCRIPTION="Libxml2 is the XML C parser and toolkit developed for the Gnome \ -project, but is usable outside of the Gnome platform as well. -XML itself is a metalanguage to design markup languages, i.e. text language \ -where semantic and structure are added to the content using extra \"markup\" \ -information enclosed between angle brackets. HTML is the most well-known \ -markup language. -Though the library is written in C a variety of language bindings make it \ -available in other environments." -HOMEPAGE="http://www.xmlsoft.org/" -COPYRIGHT="1998-2013 Daniel Veillard. All Rights Reserved." -LICENSE="MIT" -REVISION="5" -SOURCE_URI="ftp://xmlsoft.org/libxml2/libxml2-$portVersion.tar.gz" -CHECKSUM_SHA256="4de9e31f46b44d34871c22f54bfc54398ef124d6f7cafb1f4a5958fbcd3ba12d" -PATCHES="libxml2-$portVersion.patchset" - -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - - -# build the python module only for the primary architecture -pythonModuleEnabled=false -if [ -z "$secondaryArchSuffix" ]; then - pythonModuleEnabled=true -fi - -PROVIDES=" - libxml2$secondaryArchSuffix = $portVersion compat >= 2 - lib:libxml2$secondaryArchSuffix = $portVersion compat >= 2 - " -if [ -z "$secondaryArchSuffix" ]; then - PROVIDES="$PROVIDES - cmd:xmlcatalog = $portVersion compat >= 2 - cmd:xmllint = $portVersion compat >= 2 - " -fi -REQUIRES=" - haiku$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -PROVIDES_devel=" - libxml2${secondaryArchSuffix}_devel = $portVersion - cmd:xml2_config$secondaryArchSuffix = $portVersion compat >= 2 - devel:libxml2$secondaryArchSuffix = $portVersion compat >= 2 - " -REQUIRES_devel=" - libxml2$secondaryArchSuffix == $portVersion base - devel:libz$secondaryArchSuffix - " - -if $pythonModuleEnabled; then - SUMMARY_python="The python module for libxml2" - PROVIDES_python=" - libxml2_python = $portVersion - " - REQUIRES_python=" - libxml2 == $portVersion base - haiku$secondaryArchSuffix - lib:libz$secondaryArchSuffix - cmd:python - " -fi - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libz$secondaryArchSuffix - " -if $pythonModuleEnabled; then - BUILD_REQUIRES="$BUILD_REQUIRES - python >= 2.7 - " - # Note: We don't use "cmd:python" here to avoid issues with the - # python search path. -fi -BUILD_PREREQUIRES=" - lib:libicudata$secondaryArchSuffix - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix - cmd:make - cmd:sed - cmd:pkg_config$secondaryArchSuffix - " - -PATCH() -{ - # replace hard-coded references to the development documentation dir - sed -i "s,^DEVHELP_DIR=\(.*\),DEVHELP_DIR=${developDocDir}," \ - doc/devhelp/Makefile.am - sed -i "s,%{_datadir}/gtk-doc/html/libxml2,${developDocDir},g" \ - libxml.spec.in -} - -BUILD() -{ - libtoolize --force --copy --install - aclocal - autoconf - automake --add-missing - - withPython= - if $pythonModuleEnabled; then - # We symlink python's directories into our packaging directory and tell - # configure that it can find python there. This way the correct - # installation directory for the python module is determined. - pythonDir="$portPackageLinksDir/python" - ln -s $pythonDir/bin $pythonDir/develop $pythonDir/lib $prefix - withPython="--with-python=$prefix" - fi - - runConfigure ./configure LDFLAGS="-lnetwork" \ - --with-html-dir=$docDir/html \ - --with-html-subdir="" \ - $withPython - make $jobArgs -} - -INSTALL() -{ - if $pythonModuleEnabled; then - # Unfortunately we can't just remove the in symlinks we created in - # BUILD() and install normally, since then make detects that the - # Python.h is missing and tries to rebuild the module. So we leave - # things as is and use DESTDIR to install the everything in a subdir. - # Then we remove the symlinks and move everything where it belongs. - make DESTDIR=$prefix install - rm -f $prefix/bin $prefix/develop $prefix/lib - mv $prefix/$prefix/* $prefix - rm -r $prefix/packages - else - make install - fi - - rm $libDir/libxml2.la - # prepare develop/lib - prepareInstalledDevelLibs libxml2 - fixPkgconfig - mv $libDir/xml2Conf.sh $developLibDir/ - fixDevelopLibDirReferences $developLibDir/xml2Conf.sh $binDir/xml2-config - - # python package - if $pythonModuleEnabled; then - packageEntries python \ - $libDir/python* \ - ${docDir}_python* - fi - - # devel package - packageEntries devel \ - $binDir/xml2-config \ - $dataDir \ - $developDir \ - $docDir \ - $manDir/man1/xml2-config.1 \ - $manDir/man3 - - # Remove stuff we don't need in the secondary architecture base package. - if [ -n "$secondaryArchSuffix" ]; then - rm -rf $binDir - rm -rf $documentationDir - else - # left-over since all contents has been moved to other packages - rmdir $(dirname $docDir) - fi -} - -TEST() -{ - make tests -} diff --git a/dev-libs/libxml2/libxml2-2.9.7.recipe b/dev-libs/libxml2/libxml2-2.9.9.recipe similarity index 96% rename from dev-libs/libxml2/libxml2-2.9.7.recipe rename to dev-libs/libxml2/libxml2-2.9.9.recipe index 67be84666..ba61e5eaf 100644 --- a/dev-libs/libxml2/libxml2-2.9.7.recipe +++ b/dev-libs/libxml2/libxml2-2.9.9.recipe @@ -10,13 +10,13 @@ available in other environments." HOMEPAGE="http://www.xmlsoft.org/" COPYRIGHT="1998-2013 Daniel Veillard. All Rights Reserved." LICENSE="MIT" -REVISION="2" +REVISION="1" SOURCE_URI="ftp://xmlsoft.org/libxml2/libxml2-$portVersion.tar.gz" -CHECKSUM_SHA256="f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c" +CHECKSUM_SHA256="94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871" PATCHES="libxml2-$portVersion.patchset" -ARCHITECTURES="?x86_gcc2 ?x86 x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 ?x86 x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 x86" # build the python module only for the primary architecture diff --git a/dev-libs/libxml2/patches/libxml2-2.9.2.patchset b/dev-libs/libxml2/patches/libxml2-2.9.2.patchset deleted file mode 100644 index be92c868b..000000000 --- a/dev-libs/libxml2/patches/libxml2-2.9.2.patchset +++ /dev/null @@ -1,213 +0,0 @@ -From fb5c9a96e34496aa83c941e67adf68cd47ede27d Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Wed, 1 Jan 2014 22:13:22 +0100 -Subject: Port patches from libxml2-2.8.0. - - -diff --git a/Makefile.am b/Makefile.am -index 70720f3..c617e0d 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1225,8 +1225,8 @@ cmake_DATA = libxml2-config.cmake - # - # 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: -diff --git a/configure.ac b/configure.ac -index 14ac0a8..e75dd93 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -853,24 +853,19 @@ if test "$with_python" != "no" ; then - fi - if test "$PYTHON_VERSION" != "" -a "$PYTHON_INCLUDES" = "" - then -- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -+ if test -r $with_python/develop/headers/python$PYTHON_VERSION/Python.h - then -- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION -+ PYTHON_INCLUDES=$with_python/develop/headers/python$PYTHON_VERSION - else -- if test -r $prefix/include/python$PYTHON_VERSION/Python.h -+ if test -r $prefix/develop/headers/python$PYTHON_VERSION/Python.h - then -- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION -+ PYTHON_INCLUDES=$prefix/develop/headers/python$PYTHON_VERSION - else -- if test -r /usr/include/python$PYTHON_VERSION/Python.h -+ if test -r /boot/system/develop/headers/python$PYTHON_VERSION/Python.h - then -- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION -- else -- if test -r $with_python/include/Python.h -- then -- PYTHON_INCLUDES=$with_python/include -- else -- echo could not find python$PYTHON_VERSION/Python.h or $with_python/include/Python.h -- fi -+ PYTHON_INCLUDES=/boot/system/develop/headers/python$PYTHON_VERSION -+ else -+ echo could not find python$PYTHON_VERSION/Python.h or $with_python/develop/headers/Python.h - fi - fi - fi -@@ -881,13 +876,13 @@ if test "$with_python" != "no" ; then - fi - if test "$PYTHON_VERSION" != "" -a "$PYTHON_SITE_PACKAGES" = "" - then -- if test -d $libdir/python$PYTHON_VERSION/site-packages -+ if test -d $libdir/python$PYTHON_VERSION/vendor-packages - then -- PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages -+ PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/vendor-packages - else -- if test -d $with_python/lib/site-packages -+ if test -d $with_python/lib/vendor-packages - then -- PYTHON_SITE_PACKAGES=$with_python/lib/site-packages -+ PYTHON_SITE_PACKAGES=$with_python/lib/vendor-packages - else - PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"` - fi -diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am -index 95ebead..81222d9 100644 ---- a/python/tests/Makefile.am -+++ b/python/tests/Makefile.am -@@ -1,4 +1,4 @@ --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 ---- a/xml2-config.in -+++ b/xml2-config.in -@@ -40,8 +40,8 @@ while test $# -gt 0; do - case "$1" in - --prefix=*) - prefix=$optarg -- includedir=$prefix/include -- libdir=$prefix/lib -+ 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 c977e91e6569803e3372fd0d345e85a08f94420d Mon Sep 17 00:00:00 2001 -From: Jessica Hamilton -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..1065298 100644 ---- a/catalog.c -+++ b/catalog.c -@@ -32,6 +32,9 @@ - #include - #endif - #include -+#ifdef __HAIKU__ -+#include -+#endif - #include - #include - #include -@@ -70,10 +73,10 @@ - #define XML_URN_PUBID "urn:publicid:" - #define XML_CATAL_BREAK ((xmlChar *) -1) - #ifndef XML_XML_DEFAULT_CATALOG --#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog" -+#define XML_XML_DEFAULT_CATALOG "/boot/system/data/xml/catalog" - #endif - #ifndef XML_SGML_DEFAULT_CATALOG --#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) -+{ -+ if (typeflag == FTW_F) { -+ *__haikuNextEntry = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL, -+ NULL, BAD_CAST subpath, xmlCatalogDefaultPrefer, NULL); -+ if (*__haikuNextEntry != NULL) -+ __haikuNextEntry = &((*__haikuNextEntry)->next); -+ } -+ -+ return 0; -+} -+#endif -+ - /** - * xmlInitializeCatalogData: - * -@@ -3166,10 +3184,16 @@ xmlInitializeCatalog(void) { - cur++; - path = (char *) xmlStrndup((const xmlChar *)paths, cur - paths); - if (path != NULL) { -+#ifdef __HAIKU__ -+ __haikuNextEntry = nextent; -+ ftw(path, __haikuAddCatalog, 3); -+ nextent = __haikuNextEntry; -+#else - *nextent = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL, - NULL, BAD_CAST path, xmlCatalogDefaultPrefer, NULL); - if (*nextent != NULL) - nextent = &((*nextent)->next); -+#endif - xmlFree(path); - } - } --- -2.2.2 - - -From 3bbfd1d6cfd3c50e88f2410b3f6b1d7186d6ee4e Mon Sep 17 00:00:00 2001 -From: Jerome Duval -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 - diff --git a/dev-libs/libxml2/patches/libxml2-2.9.7.patchset b/dev-libs/libxml2/patches/libxml2-2.9.7.patchset deleted file mode 100644 index 81ed11a10..000000000 --- a/dev-libs/libxml2/patches/libxml2-2.9.7.patchset +++ /dev/null @@ -1,189 +0,0 @@ -From 767d83b5c8d71625205469ceeb1b53e65fde0e37 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Wed, 1 Jan 2014 22:13:22 +0100 -Subject: Port patches from libxml2-2.8.0. - - -diff --git a/Makefile.am b/Makefile.am -index 70720f3..c617e0d 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1225,8 +1225,8 @@ cmake_DATA = libxml2-config.cmake - # - # 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: -diff --git a/configure.ac b/configure.ac -index 0260281..4a6df6e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -856,24 +856,19 @@ if test "$with_python" != "no" ; then - fi - if test "$PYTHON_VERSION" != "" -a "$PYTHON_INCLUDES" = "" - then -- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -+ if test -r $with_python/develop/headers/python$PYTHON_VERSION/Python.h - then -- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION -+ PYTHON_INCLUDES=$with_python/develop/headers/python$PYTHON_VERSION - else -- if test -r $prefix/include/python$PYTHON_VERSION/Python.h -+ if test -r $prefix/develop/headers/python$PYTHON_VERSION/Python.h - then -- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION -+ PYTHON_INCLUDES=$prefix/develop/headers/python$PYTHON_VERSION - else -- if test -r /usr/include/python$PYTHON_VERSION/Python.h -+ if test -r /boot/system/develop/headers/python$PYTHON_VERSION/Python.h - then -- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION -- else -- if test -r $with_python/include/Python.h -- then -- PYTHON_INCLUDES=$with_python/include -- else -- echo could not find python$PYTHON_VERSION/Python.h or $with_python/include/Python.h -- fi -+ PYTHON_INCLUDES=/boot/system/develop/headers/python$PYTHON_VERSION -+ else -+ echo could not find python$PYTHON_VERSION/Python.h or $with_python/develop/headers/Python.h - fi - fi - fi -@@ -884,13 +879,13 @@ if test "$with_python" != "no" ; then - fi - if test "$PYTHON_VERSION" != "" -a "$PYTHON_SITE_PACKAGES" = "" - then -- if test -d $libdir/python$PYTHON_VERSION/site-packages -+ if test -d $libdir/python$PYTHON_VERSION/vendor-packages - then -- PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages -+ PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/vendor-packages - else -- if test -d $with_python/lib/site-packages -+ if test -d $with_python/lib/vendor-packages - then -- PYTHON_SITE_PACKAGES=$with_python/lib/site-packages -+ PYTHON_SITE_PACKAGES=$with_python/lib/vendor-packages - else - PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"` - fi -diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am -index 95ebead..81222d9 100644 ---- a/python/tests/Makefile.am -+++ b/python/tests/Makefile.am -@@ -1,4 +1,4 @@ --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 ---- a/xml2-config.in -+++ b/xml2-config.in -@@ -40,8 +40,8 @@ while test $# -gt 0; do - case "$1" in - --prefix=*) - prefix=$optarg -- includedir=$prefix/include -- libdir=$prefix/lib -+ 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 18b0f85f4e8edaacf9b20e232dc96114c0b68fe0 Mon Sep 17 00:00:00 2001 -From: Jessica Hamilton -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..1065298 100644 ---- a/catalog.c -+++ b/catalog.c -@@ -32,6 +32,9 @@ - #include - #endif - #include -+#ifdef __HAIKU__ -+#include -+#endif - #include - #include - #include -@@ -70,10 +73,10 @@ - #define XML_URN_PUBID "urn:publicid:" - #define XML_CATAL_BREAK ((xmlChar *) -1) - #ifndef XML_XML_DEFAULT_CATALOG --#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog" -+#define XML_XML_DEFAULT_CATALOG "/boot/system/data/xml/catalog" - #endif - #ifndef XML_SGML_DEFAULT_CATALOG --#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) -+{ -+ if (typeflag == FTW_F) { -+ *__haikuNextEntry = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL, -+ NULL, BAD_CAST subpath, xmlCatalogDefaultPrefer, NULL); -+ if (*__haikuNextEntry != NULL) -+ __haikuNextEntry = &((*__haikuNextEntry)->next); -+ } -+ -+ return 0; -+} -+#endif -+ - /** - * xmlInitializeCatalogData: - * -@@ -3166,10 +3184,16 @@ xmlInitializeCatalog(void) { - cur++; - path = (char *) xmlStrndup((const xmlChar *)paths, cur - paths); - if (path != NULL) { -+#ifdef __HAIKU__ -+ __haikuNextEntry = nextent; -+ ftw(path, __haikuAddCatalog, 3); -+ nextent = __haikuNextEntry; -+#else - *nextent = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL, - NULL, BAD_CAST path, xmlCatalogDefaultPrefer, NULL); - if (*nextent != NULL) - nextent = &((*nextent)->next); -+#endif - xmlFree(path); - } - } --- -2.2.2 - diff --git a/dev-libs/libxml2/patches/libxml2-2.9.3.patchset b/dev-libs/libxml2/patches/libxml2-2.9.9.patchset similarity index 100% rename from dev-libs/libxml2/patches/libxml2-2.9.3.patchset rename to dev-libs/libxml2/patches/libxml2-2.9.9.patchset diff --git a/dev-libs/libxml2/patches/libxml2-trunk.diff b/dev-libs/libxml2/patches/libxml2-trunk.diff deleted file mode 100644 index f1f7122e7..000000000 --- a/dev-libs/libxml2/patches/libxml2-trunk.diff +++ /dev/null @@ -1,35 +0,0 @@ -Index: nanohttp.c -=================================================================== ---- nanohttp.c (revision 3738) -+++ nanohttp.c (working copy) -@@ -95,7 +95,7 @@ - * A couple portability macros - */ - #ifndef _WINSOCKAPI_ --#ifndef __BEOS__ -+#if !defined(__BEOS__) || defined(__HAIKU__) - #define closesocket(s) close(s) - #endif - #define SOCKET int -@@ -844,7 +844,7 @@ - status = ioctl(s, FIONBIO, &enable); - } - #else /* VMS */ --#if defined(__BEOS__) -+#if defined(__BEOS__) && !defined(__HAIKU__) - { - bool noblock = true; - status = setsockopt(s, SOL_SOCKET, SO_NONBLOCK, &noblock, sizeof(noblock)); -Index: nanoftp.c -=================================================================== ---- nanoftp.c (revision 3738) -+++ nanoftp.c (working copy) -@@ -89,7 +89,7 @@ - * A couple portability macros - */ - #ifndef _WINSOCKAPI_ --#ifndef __BEOS__ -+#if !defined(__BEOS__) || defined(__HAIKU__) - #define closesocket(s) close(s) - #endif - #define SOCKET int