textproc/*libxml2: Move patches and distinfo files under the main package

since the distfile is just one anyway.

5 files changed, 77 insertions, 2 deletions

diff --git a/textproc/libxml2/Makefile.common b/textproc/libxml2/Makefile.common
index 36dbf2be4e7..0f914c795bd 100644
--- a/textproc/libxml2/Makefile.common
+++ b/textproc/libxml2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2017/10/30 14:02:02 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.9 2017/10/31 13:15:44 fhajny Exp $
 #
 # used by textproc/libxml2/Makefile
 # used by textproc/py-libxml2/Makefile
@@ -10,3 +10,6 @@ MASTER_SITES+=	http://xmlsoft.org/sources/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://xmlsoft.org/
+
+DISTINFO_FILE=	${.CURDIR}/../../textproc/libxml2/distinfo
+PATCHDIR=	${.CURDIR}/../../textproc/libxml2/patches
diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo
index 80b2e234770..c42d3bb319d 100644
--- a/textproc/libxml2/distinfo
+++ b/textproc/libxml2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.118 2017/10/30 14:02:02 fhajny Exp $
+$NetBSD: distinfo,v 1.119 2017/10/31 13:15:44 fhajny Exp $
 
 SHA1 (libxml2-2.9.6.tar.gz) = 4ab4605fce0f82a004c3b2aeb368efc8f356e020
 RMD160 (libxml2-2.9.6.tar.gz) = 99616c77b5991a00e83abca708338cfa09beef29
@@ -10,3 +10,6 @@ SHA1 (patch-ac) = 34afe787f6012b460a85be993048e133907a1621
 SHA1 (patch-ad) = d65b7e3be9694147e96ce4bb70a1739e2279ba81
 SHA1 (patch-ae) = 4eede9719724f94402e850ee6d6043a74aaf62b2
 SHA1 (patch-encoding.c) = 6cf0a7d421828b9f40a4079ee85adb791c54d096
+SHA1 (patch-python_libxml.py) = 869a72ae5ba2e27e6d46552878890acb22337675
+SHA1 (patch-python_libxml__wrap.h) = d7dc1c23cbca3481dcc5c2ff5cbb764b0f97de56
+SHA1 (patch-python_setup.py) = 7771fd02ee6779463f1d3321f099d7e6d19cd1b1
diff --git a/textproc/libxml2/patches/patch-python_libxml.py b/textproc/libxml2/patches/patch-python_libxml.py
new file mode 100644
index 00000000000..35ec35e423c
--- /dev/null
+++ b/textproc/libxml2/patches/patch-python_libxml.py
@@ -0,0 +1,13 @@
+$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)
diff --git a/textproc/libxml2/patches/patch-python_libxml__wrap.h b/textproc/libxml2/patches/patch-python_libxml__wrap.h
new file mode 100644
index 00000000000..fdf77da09e9
--- /dev/null
+++ b/textproc/libxml2/patches/patch-python_libxml__wrap.h
@@ -0,0 +1,22 @@
+$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:
diff --git a/textproc/libxml2/patches/patch-python_setup.py b/textproc/libxml2/patches/patch-python_setup.py
new file mode 100644
index 00000000000..1fce4eb304e
--- /dev/null
+++ b/textproc/libxml2/patches/patch-python_setup.py
@@ -0,0 +1,34 @@
+$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")