keystone py-keystone: updated to 0.9.2

Version 0.9.2

This version fixes some important bugs inside the core of Keystone, added some new bindings & made some minor improvements. All users of Keystone are encouraged to upgrade to v0.9.1.

7 files changed, 42 insertions, 16 deletions

diff --git a/emulators/keystone/Makefile b/emulators/keystone/Makefile
index d2b459ff9e8..89dc0c44470 100644
--- a/emulators/keystone/Makefile
+++ b/emulators/keystone/Makefile
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2019/04/25 07:32:52 maya Exp $
+# $NetBSD: Makefile,v 1.6 2021/02/10 10:35:13 adam Exp $
 
-PKGREVISION= 1
 .include "Makefile.common"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Multi-platform and multi-arch assembler framework
 
 USE_CMAKE=	yes
-USE_LANGUAGES=	c c++
 LICENSE=	gnu-gpl-v2
 
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=ON
diff --git a/emulators/keystone/Makefile.common b/emulators/keystone/Makefile.common
index 855b14067a1..95c4857671e 100644
--- a/emulators/keystone/Makefile.common
+++ b/emulators/keystone/Makefile.common
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile.common,v 1.4 2020/01/26 17:31:09 rillig Exp $
+# $NetBSD: Makefile.common,v 1.5 2021/02/10 10:35:13 adam Exp $
 #
 # used by emulators/py-keystone/Makefile
 
-DISTNAME=	keystone-0.9.1
+DISTNAME=	keystone-0.9.2
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=keystone-engine/}
 
 HOMEPAGE=	https://www.keystone-engine.org/
 
 DISTINFO_FILE=	${.CURDIR}/../../emulators/keystone/distinfo
+PATCHDIR=	${.CURDIR}/../../emulators/keystone/patches
+
+USE_LANGUAGES=	c c++
diff --git a/emulators/keystone/PLIST b/emulators/keystone/PLIST
index 94cb249920b..ac507f20b0f 100644
--- a/emulators/keystone/PLIST
+++ b/emulators/keystone/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2018/02/19 00:52:28 kamil Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/02/10 10:35:13 adam Exp $
 bin/kstool
 include/keystone/arm.h
 include/keystone/arm64.h
+include/keystone/evm.h
 include/keystone/hexagon.h
 include/keystone/keystone.h
 include/keystone/mips.h
diff --git a/emulators/keystone/distinfo b/emulators/keystone/distinfo
index c012a20f364..0dd9fc75cba 100644
--- a/emulators/keystone/distinfo
+++ b/emulators/keystone/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2018/02/19 00:52:28 kamil Exp $
+$NetBSD: distinfo,v 1.3 2021/02/10 10:35:13 adam Exp $
 
-SHA1 (keystone-0.9.1.tar.gz) = 0ac37259154af91dd58cfc2dc5a5ecf8e801d3d3
-RMD160 (keystone-0.9.1.tar.gz) = 8ddd3674623ca107c05ff9400deff47ef6b882ad
-SHA512 (keystone-0.9.1.tar.gz) = 3bd9c3793d5862a0a8628b52da381625e62445f661dbd5ed715723e7d9db01ce3f9586e5ca0a5cc71e8ceb6c912050f5c28e3ccd540e72c8abcfd2f0d1bbae17
-Size (keystone-0.9.1.tar.gz) = 4326151 bytes
+SHA1 (keystone-0.9.2.tar.gz) = 2d90381bbac53da0feced9ccecb9d9ef32523fef
+RMD160 (keystone-0.9.2.tar.gz) = 041dd925eb0f1eb96bf2e3b9782aaab31e597323
+SHA512 (keystone-0.9.2.tar.gz) = 5d4dd30410410bc7848e75a2e31e8ecef6241ad25e21963aa7a07bbea21d95b75e235c80573129014102684c9647710ace3c0776a8401844d7e4b45cab7bd04b
+Size (keystone-0.9.2.tar.gz) = 4433222 bytes
+SHA1 (patch-llvm_CMakeLists.txt) = e2526c7d655121c4ea5d3a0e20a260ee3b3b408e
diff --git a/emulators/keystone/patches/patch-llvm_CMakeLists.txt b/emulators/keystone/patches/patch-llvm_CMakeLists.txt
new file mode 100644
index 00000000000..c5871a14006
--- /dev/null
+++ b/emulators/keystone/patches/patch-llvm_CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD: patch-llvm_CMakeLists.txt,v 1.1 2021/02/10 10:35:13 adam Exp $
+
+On Darwin, use correct install_name.
+
+--- llvm/CMakeLists.txt.orig	2021-02-09 13:03:37.000000000 +0000
++++ llvm/CMakeLists.txt
+@@ -455,8 +455,6 @@ set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LL
+ 
+ set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+ if (APPLE)
+-  set(CMAKE_INSTALL_NAME_DIR "@rpath")
+-  set(CMAKE_INSTALL_RPATH "@executable_path/../lib")
+ else(UNIX)
+   if(NOT DEFINED CMAKE_INSTALL_RPATH)
+     set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}")
diff --git a/emulators/py-keystone/Makefile b/emulators/py-keystone/Makefile
index 5639bfcb186..0dbc4d8b1fb 100644
--- a/emulators/py-keystone/Makefile
+++ b/emulators/py-keystone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/02/19 00:52:28 kamil Exp $
+# $NetBSD: Makefile,v 1.4 2021/02/10 10:35:13 adam Exp $
 
 .include "../../emulators/keystone/Makefile.common"
 
@@ -11,8 +11,8 @@ LICENSE=	modified-bsd
 
 PYSETUPSUBDIR=	bindings/python
 
-EGG_NAME=	${DISTNAME:R}
+EGG_NAME=	keystone_engine-${PKGVERSION_NOREV}
 
 .include "../../emulators/keystone/buildlink3.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/py-keystone/PLIST b/emulators/py-keystone/PLIST
index 25545736dd8..7e016d34fa7 100644
--- a/emulators/py-keystone/PLIST
+++ b/emulators/py-keystone/PLIST
@@ -1,5 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2016/06/11 21:06:48 kamil Exp $
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.2 2021/02/10 10:35:13 adam 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}/keystone/__init__.py
 ${PYSITELIB}/keystone/__init__.pyc
 ${PYSITELIB}/keystone/__init__.pyo
@@ -9,6 +13,9 @@ ${PYSITELIB}/keystone/arm64_const.pyo
 ${PYSITELIB}/keystone/arm_const.py
 ${PYSITELIB}/keystone/arm_const.pyc
 ${PYSITELIB}/keystone/arm_const.pyo
+${PYSITELIB}/keystone/evm_const.py
+${PYSITELIB}/keystone/evm_const.pyc
+${PYSITELIB}/keystone/evm_const.pyo
 ${PYSITELIB}/keystone/hexagon_const.py
 ${PYSITELIB}/keystone/hexagon_const.pyc
 ${PYSITELIB}/keystone/hexagon_const.pyo
@@ -18,6 +25,7 @@ ${PYSITELIB}/keystone/keystone.pyo
 ${PYSITELIB}/keystone/keystone_const.py
 ${PYSITELIB}/keystone/keystone_const.pyc
 ${PYSITELIB}/keystone/keystone_const.pyo
+${PYSITELIB}/keystone/libkeystone.so
 ${PYSITELIB}/keystone/mips_const.py
 ${PYSITELIB}/keystone/mips_const.pyc
 ${PYSITELIB}/keystone/mips_const.pyo