Update capstone3 and py-capstone to 3.0.5

PR:		230347
Approved by:	maintainer timeout (30 days)

8 files changed, 37 insertions, 31 deletions

diff --git a/devel/capstone3/Makefile b/devel/capstone3/Makefile
index 4910aa27e2db..6c0dee288423 100644
--- a/devel/capstone3/Makefile
+++ b/devel/capstone3/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	capstone
-PORTVERSION=	3.0.4
+PORTVERSION=	3.0.5
 CATEGORIES=	devel
 
 MAINTAINER=	oliver.pntr@gmail.com
@@ -17,8 +17,9 @@ USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	aquynh
 
-MAKE_ENV+=	INSTALL_LIB="${INSTALL_LIB}" \
-		INSTALL_DATA="${INSTALL_DATA}"
+MAKE_ENV+=	INSTALL_BIN="${INSTALL_PROGRAM}" \
+		INSTALL_DATA="${INSTALL_DATA}" \
+		INSTALL_LIB="${INSTALL_LIB}"
 
 TEST_ENV=	${MAKE_ENV} LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib
 TEST_TARGET=	check
diff --git a/devel/capstone3/distinfo b/devel/capstone3/distinfo
index c59304332f77..ae6237ff319e 100644
--- a/devel/capstone3/distinfo
+++ b/devel/capstone3/distinfo
@@ -1,2 +1,3 @@
-SHA256 (aquynh-capstone-3.0.4_GH0.tar.gz) = 5d6dadf5864c56f8de66c66088fa68e849d0bff6577865a4f81b6f23112b14f2
-SIZE (aquynh-capstone-3.0.4_GH0.tar.gz) = 2800818
+TIMESTAMP = 1533370077
+SHA256 (aquynh-capstone-3.0.5_GH0.tar.gz) = 913dd695e7c5a2b972a6f427cb31f2e93677ec1c38f39dda37d18a91c70b6df1
+SIZE (aquynh-capstone-3.0.5_GH0.tar.gz) = 2886717
diff --git a/devel/capstone3/files/patch-Makefile b/devel/capstone3/files/patch-Makefile
new file mode 100644
index 000000000000..5d2b48ce09a7
--- /dev/null
+++ b/devel/capstone3/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	2018-07-18 16:17:10 UTC
++++ Makefile
+@@ -395,7 +395,7 @@ endif
+ 	mkdir -p $(PKGCFGDIR)
+ 	$(INSTALL_DATA) $(PKGCFGF) $(PKGCFGDIR)/
+ 	mkdir -p $(BINDIR)
+-	$(INSTALL_LIB) cstool/cstool $(BINDIR)
++	$(INSTALL_BIN) cstool/cstool $(BINDIR)
+ 
+ uninstall:
+ 	rm -rf $(INCDIR)/$(LIBNAME)
diff --git a/devel/capstone3/pkg-plist b/devel/capstone3/pkg-plist
index 4425c5aa533d..2ac880836287 100644
--- a/devel/capstone3/pkg-plist
+++ b/devel/capstone3/pkg-plist
@@ -1,3 +1,4 @@
+bin/cstool
 include/capstone/arm.h
 include/capstone/arm64.h
 include/capstone/capstone.h
diff --git a/devel/py-capstone/Makefile b/devel/py-capstone/Makefile
index 07299c5b026f..b29009bce45d 100644
--- a/devel/py-capstone/Makefile
+++ b/devel/py-capstone/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	capstone
-PORTVERSION=	3.0.4
-PORTREVISION=	1
+PORTVERSION=	3.0.5
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,5 +18,9 @@ LIB_DEPENDS=	libcapstone.so:devel/capstone3
 
 USES=		python
 USE_PYTHON=	autoplist distutils
+MAKE_ENV+=	LIBCAPSTONE_PATH= # Prevent bundled libcapstone from being built
+
+post-patch:
+	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/capstone/__init__.py
 
 .include <bsd.port.mk>
diff --git a/devel/py-capstone/distinfo b/devel/py-capstone/distinfo
index 589754de273f..01fd6f8af2c2 100644
--- a/devel/py-capstone/distinfo
+++ b/devel/py-capstone/distinfo
@@ -1,2 +1,3 @@
-SHA256 (python/capstone-3.0.4.tar.gz) = 945d3b8c3646a1c3914824c416439e2cf2df8969dd722c8979cdcc23b40ad225
-SIZE (python/capstone-3.0.4.tar.gz) = 3175587
+TIMESTAMP = 1533371042
+SHA256 (python/capstone-3.0.5.tar.gz) = 8d5f71b4c42d1552d2253bfd8e8366460de19f01236c3dc485bf24baffee60dd
+SIZE (python/capstone-3.0.5.tar.gz) = 1616487
diff --git a/devel/py-capstone/files/patch-capstone_____init____.py b/devel/py-capstone/files/patch-capstone_____init____.py
new file mode 100644
index 000000000000..ee467307a16a
--- /dev/null
+++ b/devel/py-capstone/files/patch-capstone_____init____.py
@@ -0,0 +1,10 @@
+--- capstone/__init__.py.orig	2018-07-18 16:17:10 UTC
++++ capstone/__init__.py
+@@ -236,6 +236,7 @@ _cs = None
+ # - last-gasp attempt at some hardcoded paths on darwin and linux
+ 
+ _path_list = [os.getenv('LIBCAPSTONE_PATH', None),
++              '%%LOCALBASE%%/lib',
+               pkg_resources.resource_filename(__name__, 'lib'),
+               join(split(__file__)[0], 'lib'),
+               '',
diff --git a/devel/py-capstone/files/patch-setup.py b/devel/py-capstone/files/patch-setup.py
deleted file mode 100644
index 36b947dc5097..000000000000
--- a/devel/py-capstone/files/patch-setup.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Do not bundle libcapstone.so
-
---- setup.py.orig	2015-07-15 07:43:18 UTC
-+++ setup.py
-@@ -175,17 +175,4 @@ setup(
-         'Programming Language :: Python :: 3',
-     ],
-     requires=['ctypes'],
--    cmdclass=dict(
--        build_clib=custom_build_clib,
--        sdist=custom_sdist,
--    ),
--
--    libraries=[(
--        'capstone', dict(
--            package='capstone',
--            sources=dummy_src()
--        ),
--    )],
--
--    data_files=[(SITE_PACKAGES, SETUP_DATA_FILES)],
- )