textproc/*libxml2: Move patches and distinfo files under the main package
since the distfile is just one anyway.


(fhajny)

$NetBSD: patch-python_libxml.py,v 1.1 2017/10/31 13:15:44 fhajny Exp $

--- python/libxml.py.orig	2004-09-28 05:59:58.000000000 -0500
+++ python/libxml.py
@@ -281,7 +281,7 @@ class xmlCore:
     # defined as python2 properties
     # 
     import sys
-    if float(sys.version[0:3]) < 2.2:
+    if float(sys.version[0:3].replace('p', '.')) < 2.2:
         def __getattr__(self, attr):
             if attr == "parent":
                 ret = libxml2mod.parent(self._o)

$NetBSD: patch-python_libxml__wrap.h,v 1.1 2017/10/31 13:15:44 fhajny Exp $

fix for Python-2.6

--- python/libxml_wrap.h.orig	2014-10-03 09:00:54.000000000 +0000
+++ python/libxml_wrap.h
@@ -28,7 +28,6 @@
  * and don't use Capsule but CObjects
  */
 #if PY_VERSION_HEX < 0x02070000
-#ifndef PyBytes_Check
 #define PyBytes_Check PyString_Check
 #define PyBytes_Size PyString_Size
 #define PyBytes_AsString PyString_AsString
@@ -40,7 +39,6 @@
 #define PyCapsule_CheckExact PyCObject_Check
 #define PyCapsule_GetPointer(o, n) PyCObject_GetDesc((o))
 #endif
-#endif
 
 /**
  * ATTRIBUTE_UNUSED:

$NetBSD: patch-python_setup.py,v 1.1 2017/10/31 13:15:44 fhajny Exp $

Trust pkgsrc to know which iconv to use.
It will be either in the buildlink directory, or in the compiler's
default search path.

--- python/setup.py.orig	2014-10-16 07:35:21.000000000 +0000
+++ python/setup.py
@@ -56,11 +56,7 @@ else:
 # - iconv.h
 # - libxslt/xsltconfig.h
 includes_dir = [
-"/usr/include",
-"/usr/local/include",
-"/opt/include",
-os.path.join(ROOT,'include'),
-HOME
+os.path.join(ROOT,'include')
 ];
 
 xml_includes=""
@@ -73,11 +69,7 @@ if xml_includes == "":
     print("failed to find headers for libxml2: update includes_dir")
     sys.exit(1)
 
-iconv_includes=""
-for dir in includes_dir:
-    if not missing(dir + "/iconv.h"):
-        iconv_includes=dir
-        break;
+iconv_includes=os.path.join(ROOT,'include')
 
 if iconv_includes == "":
     print("failed to find headers for libiconv: update includes_dir")