svn commit: r478858 - in head/devel: capstone3 capstone3/files py-capstone py-capstone/files

[Antoine Brodin]

Author: antoine
Date: Mon Sep  3 12:20:08 2018
New Revision: 478858
URL: https://svnweb.freebsd.org/changeset/ports/478858

Log:
  Update capstone3 and py-capstone to 3.0.5
  
  PR:		230347
  Approved by:	maintainer timeout (30 days)

Added:
  head/devel/capstone3/files/
  head/devel/capstone3/files/patch-Makefile   (contents, props changed)
  head/devel/py-capstone/files/patch-capstone_____init____.py   (contents, props changed)
Deleted:
  head/devel/py-capstone/files/patch-setup.py
Modified:
  head/devel/capstone3/Makefile
  head/devel/capstone3/distinfo
  head/devel/capstone3/pkg-plist
  head/devel/py-capstone/Makefile
  head/devel/py-capstone/distinfo

Modified: head/devel/capstone3/Makefile
==============================================================================
--- head/devel/capstone3/Makefile	Mon Sep  3 12:11:33 2018	(r478857)
+++ head/devel/capstone3/Makefile	Mon Sep  3 12:20:08 2018	(r478858)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	capstone
-PORTVERSION=	3.0.4
+PORTVERSION=	3.0.5
 CATEGORIES=	devel
 
 MAINTAINER=	oliver.pntr at 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

Modified: head/devel/capstone3/distinfo
==============================================================================
--- head/devel/capstone3/distinfo	Mon Sep  3 12:11:33 2018	(r478857)
+++ head/devel/capstone3/distinfo	Mon Sep  3 12:20:08 2018	(r478858)
@@ -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

Added: head/devel/capstone3/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/capstone3/files/patch-Makefile	Mon Sep  3 12:20:08 2018	(r478858)
@@ -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)

Modified: head/devel/capstone3/pkg-plist
==============================================================================
--- head/devel/capstone3/pkg-plist	Mon Sep  3 12:11:33 2018	(r478857)
+++ head/devel/capstone3/pkg-plist	Mon Sep  3 12:20:08 2018	(r478858)
@@ -1,3 +1,4 @@
+bin/cstool
 include/capstone/arm.h
 include/capstone/arm64.h
 include/capstone/capstone.h

Modified: head/devel/py-capstone/Makefile
==============================================================================
--- head/devel/py-capstone/Makefile	Mon Sep  3 12:11:33 2018	(r478857)
+++ head/devel/py-capstone/Makefile	Mon Sep  3 12:20:08 2018	(r478858)
@@ -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>

Modified: head/devel/py-capstone/distinfo
==============================================================================
--- head/devel/py-capstone/distinfo	Mon Sep  3 12:11:33 2018	(r478857)
+++ head/devel/py-capstone/distinfo	Mon Sep  3 12:20:08 2018	(r478858)
@@ -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

Added: head/devel/py-capstone/files/patch-capstone_____init____.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/py-capstone/files/patch-capstone_____init____.py	Mon Sep  3 12:20:08 2018	(r478858)
@@ -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'),
+               '',