svn commit: r418316 - in head: . devel devel/capstone devel/capstone3 devel/capstone4 devel/py-capstone

[Kurt Jaeger]

Author: pi
Date: Sun Jul 10 12:57:26 2016
New Revision: 418316
URL: https://svnweb.freebsd.org/changeset/ports/418316

Log:
  devel/capstone: move to capstone3, introduce capstone4
  
  - update py-capstone to use capstone3
  
  PR:		206941
  Submitted by:	oleksii.tsai at gmail.com
  Approved by:	oliver.pntr at gmail.com (maintainer timeout)

Added:
  head/devel/capstone3/
     - copied from r418315, head/devel/capstone/
  head/devel/capstone4/
     - copied from r418314, head/devel/capstone/
Deleted:
  head/devel/capstone/
Modified:
  head/MOVED
  head/devel/Makefile
  head/devel/capstone3/Makefile
  head/devel/capstone4/Makefile
  head/devel/capstone4/distinfo
  head/devel/capstone4/pkg-plist
  head/devel/py-capstone/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sun Jul 10 12:47:32 2016	(r418315)
+++ head/MOVED	Sun Jul 10 12:57:26 2016	(r418316)
@@ -8609,3 +8609,4 @@ sysutils/moosefs-master|sysutils/moosefs
 sysutils/moosefs-metalogger|sysutils/moosefs2-metalogger|2016-07-07|Moved to a numbered port name
 sysutils/moosefs-netdump|sysutils/moosefs2-netdump|2016-07-07|Moved to a numbered port name
 devel/gmake-lite|devel/gmake|2016-07-08|No longer needed
+devel/capstone|devel/capstone3|2016-07-10|Moved to a numbered port name to make place for capstone4

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Sun Jul 10 12:47:32 2016	(r418315)
+++ head/devel/Makefile	Sun Jul 10 12:57:26 2016	(r418316)
@@ -208,7 +208,8 @@
     SUBDIR += c2mdoc
     SUBDIR += caf
     SUBDIR += calibrator
-    SUBDIR += capstone
+    SUBDIR += capstone3
+    SUBDIR += capstone4
     SUBDIR += cargo
     SUBDIR += cask
     SUBDIR += catch

Modified: head/devel/capstone3/Makefile
==============================================================================
--- head/devel/capstone/Makefile	Sun Jul 10 12:47:32 2016	(r418315)
+++ head/devel/capstone3/Makefile	Sun Jul 10 12:57:26 2016	(r418316)
@@ -10,6 +10,8 @@ COMMENT=	Multi-platform, multi-architect
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
+CONFLICTS=	capstone4
+
 USES=		gmake
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes

Modified: head/devel/capstone4/Makefile
==============================================================================
--- head/devel/capstone/Makefile	Sun Jul 10 12:39:29 2016	(r418314)
+++ head/devel/capstone4/Makefile	Sun Jul 10 12:57:26 2016	(r418316)
@@ -1,19 +1,23 @@
 # $FreeBSD$
 
 PORTNAME=	capstone
-PORTVERSION=	3.0.4
+PORTVERSION=	4.0
 CATEGORIES=	devel
+PKGNAMESUFFIX=	4
 
-MAINTAINER=	oliver.pntr at gmail.com
+MAINTAINER=	oleksii.tsai at gmail.com
 COMMENT=	Multi-platform, multi-architecture disassembly framework
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
+CONFLICTS=	capstone3
+
 USES=		gmake
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	aquynh
+GH_TAGNAME=	9031b17
 
 MAKE_ENV+=	INSTALL_LIB="${INSTALL_LIB}" \
 		INSTALL_DATA="${INSTALL_DATA}"
@@ -21,4 +25,14 @@ MAKE_ENV+=	INSTALL_LIB="${INSTALL_LIB}" 
 TEST_ENV=	${MAKE_ENV} LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib
 TEST_TARGET=	check
 
+post-patch:
+	${REINPLACE_CMD} -i '' \
+		-e 's|DESTDIR ?=|DESTDIR = ${STAGEDIR}|' \
+		-e 's|LIBDIR ?=.*|LIBDIR = ${PREFIX}/lib|' \
+		${WRKSRC}/Makefile
+
+post-install:
+	${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||g' \
+		${STAGEDIR}/${PREFIX}/libdata/pkgconfig/capstone.pc
+
 .include <bsd.port.mk>

Modified: head/devel/capstone4/distinfo
==============================================================================
--- head/devel/capstone/distinfo	Sun Jul 10 12:39:29 2016	(r418314)
+++ head/devel/capstone4/distinfo	Sun Jul 10 12:57:26 2016	(r418316)
@@ -1,2 +1,2 @@
-SHA256 (aquynh-capstone-3.0.4_GH0.tar.gz) = 5d6dadf5864c56f8de66c66088fa68e849d0bff6577865a4f81b6f23112b14f2
-SIZE (aquynh-capstone-3.0.4_GH0.tar.gz) = 2800818
+SHA256 (aquynh-capstone-4.0-9031b17_GH0.tar.gz) = 7ac67cebb971e373e15e57fe863ae191ab1de8c454d02995f3a6996c2b92bdf7
+SIZE (aquynh-capstone-4.0-9031b17_GH0.tar.gz) = 3209182

Modified: head/devel/capstone4/pkg-plist
==============================================================================
--- head/devel/capstone/pkg-plist	Sun Jul 10 12:39:29 2016	(r418314)
+++ head/devel/capstone4/pkg-plist	Sun Jul 10 12:57:26 2016	(r418316)
@@ -1,6 +1,7 @@
 include/capstone/arm.h
 include/capstone/arm64.h
 include/capstone/capstone.h
+include/capstone/m68k.h
 include/capstone/mips.h
 include/capstone/platform.h
 include/capstone/ppc.h
@@ -10,5 +11,5 @@ include/capstone/x86.h
 include/capstone/xcore.h
 lib/libcapstone.a
 lib/libcapstone.so
-lib/libcapstone.so.3
+lib/libcapstone.so.4
 libdata/pkgconfig/capstone.pc

Modified: head/devel/py-capstone/Makefile
==============================================================================
--- head/devel/py-capstone/Makefile	Sun Jul 10 12:47:32 2016	(r418315)
+++ head/devel/py-capstone/Makefile	Sun Jul 10 12:57:26 2016	(r418316)
@@ -3,6 +3,7 @@
 
 PORTNAME=	capstone
 PORTVERSION=	3.0.4
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ COMMENT=	Python bindings for the Capston
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-LIB_DEPENDS=	libcapstone.so:devel/capstone
+LIB_DEPENDS=	libcapstone.so:devel/capstone3
 
 USES=		python
 USE_PYTHON=	autoplist distutils