[pkgsrc/trunk]: pkgsrc/textproc textproc/*libxml2: Move patches and distinfo ...

[fhajny <fhajny%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/793a878424cf
branches:  trunk
changeset: 371016:793a878424cf
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Tue Oct 31 13:15:44 2017 +0000

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

diffstat:

 textproc/libxml2/Makefile.common                     |   5 ++-
 textproc/libxml2/distinfo                            |   5 ++-
 textproc/libxml2/patches/patch-python_libxml.py      |  13 +++++++
 textproc/libxml2/patches/patch-python_libxml__wrap.h |  22 ++++++++++++
 textproc/libxml2/patches/patch-python_setup.py       |  34 ++++++++++++++++++++
 textproc/py-libxml2/Makefile                         |   6 +-
 textproc/py-libxml2/distinfo                         |   9 -----
 textproc/py-libxml2/patches/patch-aa                 |  13 -------
 textproc/py-libxml2/patches/patch-ab                 |  34 --------------------
 textproc/py-libxml2/patches/patch-ac                 |  22 ------------
 10 files changed, 80 insertions(+), 83 deletions(-)

diffs (232 lines):

diff -r 4dacee9af9b8 -r 793a878424cf textproc/libxml2/Makefile.common
--- a/textproc/libxml2/Makefile.common  Tue Oct 31 13:01:36 2017 +0000
+++ b/textproc/libxml2/Makefile.common  Tue Oct 31 13:15:44 2017 +0000
@@ -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 @@
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://xmlsoft.org/
+
+DISTINFO_FILE= ${.CURDIR}/../../textproc/libxml2/distinfo
+PATCHDIR=      ${.CURDIR}/../../textproc/libxml2/patches
diff -r 4dacee9af9b8 -r 793a878424cf textproc/libxml2/distinfo
--- a/textproc/libxml2/distinfo Tue Oct 31 13:01:36 2017 +0000
+++ b/textproc/libxml2/distinfo Tue Oct 31 13:15:44 2017 +0000
@@ -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-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 -r 4dacee9af9b8 -r 793a878424cf textproc/libxml2/patches/patch-python_libxml.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/libxml2/patches/patch-python_libxml.py   Tue Oct 31 13:15:44 2017 +0000
@@ -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 -r 4dacee9af9b8 -r 793a878424cf textproc/libxml2/patches/patch-python_libxml__wrap.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/libxml2/patches/patch-python_libxml__wrap.h      Tue Oct 31 13:15:44 2017 +0000
@@ -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 -r 4dacee9af9b8 -r 793a878424cf textproc/libxml2/patches/patch-python_setup.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/libxml2/patches/patch-python_setup.py    Tue Oct 31 13:15:44 2017 +0000
@@ -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")
diff -r 4dacee9af9b8 -r 793a878424cf textproc/py-libxml2/Makefile
--- a/textproc/py-libxml2/Makefile      Tue Oct 31 13:01:36 2017 +0000
+++ b/textproc/py-libxml2/Makefile      Tue Oct 31 13:15:44 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2017/09/10 20:50:07 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2017/10/31 13:15:44 fhajny Exp $
 
 .include "../../textproc/libxml2/Makefile.common"
 
@@ -9,13 +9,13 @@
 
 USE_GCC_RUNTIME=       yes
 
-WRKSRC=                ${WRKDIR}/${DISTNAME}/python
+PYSETUPSUBDIR= python
 NO_CONFIGURE=  YES
 
 SUBST_CLASSES+=                setup
 SUBST_MESSAGE.setup=   Fixing hardcoded paths.
 SUBST_STAGE.setup=     pre-build
-SUBST_FILES.setup=     setup.py
+SUBST_FILES.setup=     python/setup.py
 SUBST_SED.setup=       -e "/ROOT/s,'/usr','${BUILDLINK_PREFIX.libxml2}',g"
 SUBST_SED.setup+=      -e "/^\"/s,/usr/include,${BUILDLINK_PREFIX.iconv}/include,g"
 SUBST_SED.setup+=      -e "/^\"/s,/usr/local/include,${BUILDLINK_PREFIX.iconv}/include,g"
diff -r 4dacee9af9b8 -r 793a878424cf textproc/py-libxml2/distinfo
--- a/textproc/py-libxml2/distinfo      Tue Oct 31 13:01:36 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.38 2017/10/31 09:08:27 jperkin Exp $
-
-SHA1 (libxml2-2.9.6.tar.gz) = 4ab4605fce0f82a004c3b2aeb368efc8f356e020
-RMD160 (libxml2-2.9.6.tar.gz) = 99616c77b5991a00e83abca708338cfa09beef29
-SHA512 (libxml2-2.9.6.tar.gz) = 5ef80f895374bd5dd3bcd5f00c715795f026bf45d998f8f762c0cdb739b8755e01de40cf853d98a3826eacef95c4adebe4777db11020e8d98d0bda921f55a0ed
-Size (libxml2-2.9.6.tar.gz) = 5469624 bytes
-SHA1 (patch-aa) = 54ce6f91dd29144f22247d15093d6d273f5f433b
-SHA1 (patch-ab) = 6e10620cf21df24a08b7d46990b47b7f33df827c
-SHA1 (patch-ac) = 4d14006810239491ecda6967dee2087eb382ba08
diff -r 4dacee9af9b8 -r 793a878424cf textproc/py-libxml2/patches/patch-aa
--- a/textproc/py-libxml2/patches/patch-aa      Tue Oct 31 13:01:36 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/11/25 18:37:43 minskim Exp $
-
---- libxml.py.orig     2004-09-28 05:59:58.000000000 -0500
-+++ 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 -r 4dacee9af9b8 -r 793a878424cf textproc/py-libxml2/patches/patch-ab
--- a/textproc/py-libxml2/patches/patch-ab      Tue Oct 31 13:01:36 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2015/10/23 20:01:08 tnn 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.
-
---- setup.py.orig      2014-10-16 07:35:21.000000000 +0000
-+++ 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")
diff -r 4dacee9af9b8 -r 793a878424cf textproc/py-libxml2/patches/patch-ac
--- a/textproc/py-libxml2/patches/patch-ac      Tue Oct 31 13:01:36 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2014/10/20 19:11:23 drochner Exp $
-
-fix for Python-2.6
-
---- libxml_wrap.h.orig 2014-10-03 09:00:54.000000000 +0000
-+++ 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: