CVS commit: pkgsrc/textproc

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Tue Oct 31 13:15:44 UTC 2017

Modified Files:
        pkgsrc/textproc/libxml2: Makefile.common distinfo
        pkgsrc/textproc/py-libxml2: Makefile
Added Files:
        pkgsrc/textproc/libxml2/patches: patch-python_libxml.py
            patch-python_libxml__wrap.h patch-python_setup.py
Removed Files:
        pkgsrc/textproc/py-libxml2: distinfo
        pkgsrc/textproc/py-libxml2/patches: patch-aa patch-ab patch-ac

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


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/libxml2/Makefile.common
cvs rdiff -u -r1.118 -r1.119 pkgsrc/textproc/libxml2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/libxml2/patches/patch-python_libxml.py \
    pkgsrc/textproc/libxml2/patches/patch-python_libxml__wrap.h \
    pkgsrc/textproc/libxml2/patches/patch-python_setup.py
cvs rdiff -u -r1.56 -r1.57 pkgsrc/textproc/py-libxml2/Makefile
cvs rdiff -u -r1.38 -r0 pkgsrc/textproc/py-libxml2/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/textproc/py-libxml2/patches/patch-aa \
    pkgsrc/textproc/py-libxml2/patches/patch-ac
cvs rdiff -u -r1.4 -r0 pkgsrc/textproc/py-libxml2/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/libxml2/Makefile.common
diff -u pkgsrc/textproc/libxml2/Makefile.common:1.8 pkgsrc/textproc/libxml2/Makefile.common:1.9
--- pkgsrc/textproc/libxml2/Makefile.common:1.8 Mon Oct 30 14:02:02 2017
+++ pkgsrc/textproc/libxml2/Makefile.common     Tue Oct 31 13:15:44 2017
@@ -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/source
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://xmlsoft.org/
+
+DISTINFO_FILE= ${.CURDIR}/../../textproc/libxml2/distinfo
+PATCHDIR=      ${.CURDIR}/../../textproc/libxml2/patches

Index: pkgsrc/textproc/libxml2/distinfo
diff -u pkgsrc/textproc/libxml2/distinfo:1.118 pkgsrc/textproc/libxml2/distinfo:1.119
--- pkgsrc/textproc/libxml2/distinfo:1.118      Mon Oct 30 14:02:02 2017
+++ pkgsrc/textproc/libxml2/distinfo    Tue Oct 31 13:15:44 2017
@@ -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) = 34afe787f6012b460a85be
 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

Index: pkgsrc/textproc/py-libxml2/Makefile
diff -u pkgsrc/textproc/py-libxml2/Makefile:1.56 pkgsrc/textproc/py-libxml2/Makefile:1.57
--- pkgsrc/textproc/py-libxml2/Makefile:1.56    Sun Sep 10 20:50:07 2017
+++ pkgsrc/textproc/py-libxml2/Makefile Tue Oct 31 13:15:44 2017
@@ -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 @@ LICENSE=      modified-bsd
 
 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"

Added files:

Index: pkgsrc/textproc/libxml2/patches/patch-python_libxml.py
diff -u /dev/null pkgsrc/textproc/libxml2/patches/patch-python_libxml.py:1.1
--- /dev/null   Tue Oct 31 13:15:44 2017
+++ pkgsrc/textproc/libxml2/patches/patch-python_libxml.py      Tue Oct 31 13:15:44 2017
@@ -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)
Index: pkgsrc/textproc/libxml2/patches/patch-python_libxml__wrap.h
diff -u /dev/null pkgsrc/textproc/libxml2/patches/patch-python_libxml__wrap.h:1.1
--- /dev/null   Tue Oct 31 13:15:44 2017
+++ pkgsrc/textproc/libxml2/patches/patch-python_libxml__wrap.h Tue Oct 31 13:15:44 2017
@@ -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:
Index: pkgsrc/textproc/libxml2/patches/patch-python_setup.py
diff -u /dev/null pkgsrc/textproc/libxml2/patches/patch-python_setup.py:1.1
--- /dev/null   Tue Oct 31 13:15:44 2017
+++ pkgsrc/textproc/libxml2/patches/patch-python_setup.py       Tue Oct 31 13:15:44 2017
@@ -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")