Attachment 195837 Details for Bug 230347 – capstone.diff

[patch] capstone.diff

capstone.diff (text/plain), 5.70 KB, created by Antoine Brodin on 2018-08-04 12:32:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Brodin

Created: 2018-08-04 12:32:36 UTC

Size: 5.70 KB

patch

obsolete

>Index: devel/capstone3/Makefile
>===================================================================
>--- devel/capstone3/Makefile	(revision 476334)
>+++ devel/capstone3/Makefile	(working copy)
>@@ -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_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
>Index: devel/capstone3/distinfo
>===================================================================
>--- devel/capstone3/distinfo	(revision 476334)
>+++ devel/capstone3/distinfo	(working copy)
>@@ -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
>Index: devel/capstone3/files/patch-Makefile
>===================================================================
>--- devel/capstone3/files/patch-Makefile	(nonexistent)
>+++ devel/capstone3/files/patch-Makefile	(working copy)
>@@ -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)
>
>Property changes on: devel/capstone3/files/patch-Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/capstone3/pkg-plist
>===================================================================
>--- devel/capstone3/pkg-plist	(revision 476334)
>+++ devel/capstone3/pkg-plist	(working copy)
>@@ -1,3 +1,4 @@
>+bin/cstool
> include/capstone/arm.h
> include/capstone/arm64.h
> include/capstone/capstone.h
>Index: devel/py-capstone/Makefile
>===================================================================
>--- devel/py-capstone/Makefile	(revision 476340)
>+++ devel/py-capstone/Makefile	(working copy)
>@@ -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 @@
> 
> 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>
>Index: devel/py-capstone/distinfo
>===================================================================
>--- devel/py-capstone/distinfo	(revision 476340)
>+++ devel/py-capstone/distinfo	(working copy)
>@@ -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
>Index: devel/py-capstone/files/patch-capstone_____init____.py
>===================================================================
>--- devel/py-capstone/files/patch-capstone_____init____.py	(nonexistent)
>+++ devel/py-capstone/files/patch-capstone_____init____.py	(working copy)
>@@ -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'),
>+               '',
>
>Property changes on: devel/py-capstone/files/patch-capstone_____init____.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/py-capstone/files/patch-setup.py
>===================================================================
>--- devel/py-capstone/files/patch-setup.py	(revision 476340)
>+++ devel/py-capstone/files/patch-setup.py	(nonexistent)
>@@ -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)],
>- )
>
>Property changes on: devel/py-capstone/files/patch-setup.py
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 230347: 195837