[pkgsrc/trunk]: pkgsrc/devel Don't build capstone locally in the Python binding.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/de0e58bb1157
branches:  trunk
changeset: 377951:de0e58bb1157
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Mar 24 17:10:42 2018 +0000

description:
Don't build capstone locally in the Python binding.

diffstat:

 devel/capstone/Makefile.common                                        |   3 +-
 devel/capstone/distinfo                                               |   4 +-
 devel/capstone/patches/patch-bindings_python_capstone_____init____.py |  13 +++++++
 devel/capstone/patches/patch-bindings_python_setup.py                 |  18 ++++++++++
 devel/py-capstone/Makefile                                            |   5 +-
 devel/py-capstone/PLIST                                               |  14 +++----
 6 files changed, 45 insertions(+), 12 deletions(-)

diffs (116 lines):

diff -r fb13a36897b1 -r de0e58bb1157 devel/capstone/Makefile.common
--- a/devel/capstone/Makefile.common    Sat Mar 24 17:10:07 2018 +0000
+++ b/devel/capstone/Makefile.common    Sat Mar 24 17:10:42 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2018/02/23 02:42:06 khorben Exp $
+# $NetBSD: Makefile.common,v 1.3 2018/03/24 17:10:42 joerg Exp $
 #
 # used by devel/py-capstone/Makefile
 
@@ -10,3 +10,4 @@
 HOMEPAGE=      http://www.capstone-engine.org/
 
 DISTINFO_FILE= ${.CURDIR}/../../devel/capstone/distinfo
+PATCHDIR=      ${.CURDIR}/../../devel/capstone/patches
diff -r fb13a36897b1 -r de0e58bb1157 devel/capstone/distinfo
--- a/devel/capstone/distinfo   Sat Mar 24 17:10:07 2018 +0000
+++ b/devel/capstone/distinfo   Sat Mar 24 17:10:42 2018 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.10 2018/02/23 02:42:06 khorben Exp $
+$NetBSD: distinfo,v 1.11 2018/03/24 17:10:42 joerg Exp $
 
 SHA1 (capstone-3.0.5rc2.tar.gz) = 52052e754c4f92128d16d5b028b85f646547f091
 RMD160 (capstone-3.0.5rc2.tar.gz) = 960473fc8f4b7113adc291b768e668e27a7c8b56
 SHA512 (capstone-3.0.5rc2.tar.gz) = 31bafdb0b3183d0c054a4244cc135db9a3c3dc5cb2e2af706bfede0d53cca8cba81d74b74ef9a4adbfd6c79cc408864dd80b8203791e17bd6c98bb69ea4f6894
 Size (capstone-3.0.5rc2.tar.gz) = 2829338 bytes
+SHA1 (patch-bindings_python_capstone_____init____.py) = a634a7fb27da8c9a391504d42801180293ec767c
+SHA1 (patch-bindings_python_setup.py) = 8d209df5d7ed4b2cc8283394fd1ec9659ab86a72
 SHA1 (patch-cstool_Makefile) = 94c029a1f667ceffad787f056c332c11001344df
diff -r fb13a36897b1 -r de0e58bb1157 devel/capstone/patches/patch-bindings_python_capstone_____init____.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/capstone/patches/patch-bindings_python_capstone_____init____.py     Sat Mar 24 17:10:42 2018 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-bindings_python_capstone_____init____.py,v 1.1 2018/03/24 17:10:42 joerg Exp $
+
+--- bindings/python/capstone/__init__.py.orig  2017-03-02 14:21:24.000000000 +0000
++++ bindings/python/capstone/__init__.py
+@@ -214,7 +214,7 @@ else:
+ _found = False
+ 
+ def _load_lib(path):
+-    lib_file = join(path, _lib)
++    lib_file = join(sys.prefix, 'lib', _lib)
+     try:
+         return ctypes.cdll.LoadLibrary(lib_file)
+     except OSError:
diff -r fb13a36897b1 -r de0e58bb1157 devel/capstone/patches/patch-bindings_python_setup.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/capstone/patches/patch-bindings_python_setup.py     Sat Mar 24 17:10:42 2018 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-bindings_python_setup.py,v 1.1 2018/03/24 17:10:42 joerg Exp $
+
+--- bindings/python/setup.py.orig      2018-03-24 13:56:27.958002410 +0000
++++ bindings/python/setup.py
+@@ -129,11 +129,9 @@ def build_libraries():
+         # Do not build tests & static library
+         os.system('cmake -DCMAKE_BUILD_TYPE=RELEASE -DCAPSTONE_BUILD_TESTS=0 -DCAPSTONE_BUILD_STATIC=0 -G "NMake Makefiles" ..')
+         os.system("nmake")
+-    else:   # Unix incl. cygwin
+-        os.system("CAPSTONE_BUILD_CORE_ONLY=yes bash ./make.sh")
+ 
+-    shutil.copy(LIBRARY_FILE, LIBS_DIR)
+-    if STATIC_LIBRARY_FILE: shutil.copy(STATIC_LIBRARY_FILE, LIBS_DIR)
++    #shutil.copy(LIBRARY_FILE, LIBS_DIR)
++    #if STATIC_LIBRARY_FILE: shutil.copy(STATIC_LIBRARY_FILE, LIBS_DIR)
+     os.chdir(cwd)
+ 
+ 
diff -r fb13a36897b1 -r de0e58bb1157 devel/py-capstone/Makefile
--- a/devel/py-capstone/Makefile        Sat Mar 24 17:10:07 2018 +0000
+++ b/devel/py-capstone/Makefile        Sat Mar 24 17:10:42 2018 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2018/02/23 02:42:06 khorben Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/24 17:10:42 joerg Exp $
 
 .include "../../devel/capstone/Makefile.common"
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES+=   python
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -13,5 +14,5 @@
 PYSETUPSUBDIR= bindings/python
 
 .include "../../devel/capstone/buildlink3.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fb13a36897b1 -r de0e58bb1157 devel/py-capstone/PLIST
--- a/devel/py-capstone/PLIST   Sat Mar 24 17:10:07 2018 +0000
+++ b/devel/py-capstone/PLIST   Sat Mar 24 17:10:42 2018 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2018/02/23 02:42:06 khorben Exp $
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
-${PYSITELIB}/${EGG_FILE}/zip-safe
+@comment $NetBSD: PLIST,v 1.3 2018/03/24 17:10:42 joerg Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/zip-safe
 ${PYSITELIB}/capstone/__init__.py
 ${PYSITELIB}/capstone/__init__.pyc
 ${PYSITELIB}/capstone/__init__.pyo
@@ -29,8 +29,6 @@
 ${PYSITELIB}/capstone/include/capstone/systemz.h
 ${PYSITELIB}/capstone/include/capstone/x86.h
 ${PYSITELIB}/capstone/include/capstone/xcore.h
-${PYSITELIB}/capstone/lib/libcapstone.a
-${PYSITELIB}/capstone/lib/libcapstone.so
 ${PYSITELIB}/capstone/mips.py
 ${PYSITELIB}/capstone/mips.pyc
 ${PYSITELIB}/capstone/mips.pyo