deepstate: match the package (and dependencies) with pkgsrc

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: deepstate: match the package (and dependencies) with pkgsrc
From: Pierre Pronchery <khorben%defora.org@localhost>
Date: Tue, 29 Sep 2020 03:42:03 +0000
Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Tue Sep 29 05:42:03 2020 +0200
Changeset:	6019838788f4d1d93ab359c4e971fe1337c2487a

Modified Files:
	deepstate/Makefile
	py-deepstate/Makefile
	py-dpkt/Makefile
	py-eth-hash/Makefile
	py-eth-typing/Makefile
	py-eth-utils/Makefile
	py-manticore/Makefile

Log Message:
deepstate: match the package (and dependencies) with pkgsrc

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6019838788f4d1d93ab359c4e971fe1337c2487a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 deepstate/Makefile     |  6 +++---
 py-deepstate/Makefile  |  4 ++--
 py-dpkt/Makefile       |  9 ++++-----
 py-eth-hash/Makefile   | 10 +++++-----
 py-eth-typing/Makefile |  2 +-
 py-eth-utils/Makefile  | 16 ++++++++--------
 py-manticore/Makefile  | 12 ++++++------
 7 files changed, 29 insertions(+), 30 deletions(-)

diffs:
diff --git a/deepstate/Makefile b/deepstate/Makefile
index 3abfc2d815..d3a6d93913 100644
--- a/deepstate/Makefile
+++ b/deepstate/Makefile
@@ -4,13 +4,13 @@ USE_LANGUAGES=	c99 c++
 USE_CMAKE=	yes
 AUTO_MKDIRS=	yes
 
-DEPENDS+=	${PYPKGPREFIX}-angr-[0-9]*:../../wip/py-angr
+DEPENDS+=	${PYPKGPREFIX}-angr-[0-9]*:../../devel/py-angr
 DEPENDS+=	${PYPKGPREFIX}-cachetools-[0-9]*:../../devel/py-cachetools
 DEPENDS+=	${PYPKGPREFIX}-cparser-[0-9]*:../../devel/py-cparser
 DEPENDS+=	${PYPKGPREFIX}-decorator-[0-9]*:../../devel/py-decorator
 DEPENDS+=	${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
 DEPENDS+=	${PYPKGPREFIX}-gitpython-[0-9]*:../../devel/py-gitpython
-DEPENDS+=	${PYPKGPREFIX}-manticore-[0-9]*:../../wip/py-manticore
+DEPENDS+=	${PYPKGPREFIX}-manticore-[0-9]*:../../devel/py-manticore
 DEPENDS+=	${PYPKGPREFIX}-networkx-[0-9]*:../../math/py-networkx
 DEPENDS+=	${PYPKGPREFIX}-pefile-[0-9]*:../../sysutils/py-pefile
 DEPENDS+=	${PYPKGPREFIX}-ana-[0-9]*:../../wip/py-ana
@@ -20,7 +20,7 @@ DEPENDS+=	${PYPKGPREFIX}-cooldict-[0-9]*:../../wip/py-cooldict
 DEPENDS+=	${PYPKGPREFIX}-dpkt-[0-9]*:../../wip/py-dpkt
 #DEPENDS+=	${PYPKGPREFIX}-idalink-[0-9]*:../../wip/py-idalink
 DEPENDS+=	${PYPKGPREFIX}-mulpyplexer-[0-9]*:../../wip/py-mulpyplexer
-#DEPENDS+=	${PYPKGPREFIX}-progressbar-[0-9]*:../../wip/py-progressbar
+DEPENDS+=	${PYPKGPREFIX}-progressbar2-[0-9]*:../../devel/py-progressbar2
 DEPENDS+=	${PYPKGPREFIX}-rpyc-[0-9]*:../../wip/py-rpyc
 DEPENDS+=	${PYPKGPREFIX}-z3solver-[0-9]*:../../math/py-z3solver
 
diff --git a/py-deepstate/Makefile b/py-deepstate/Makefile
index 57b1d739ec..e74df054cd 100644
--- a/py-deepstate/Makefile
+++ b/py-deepstate/Makefile
@@ -14,12 +14,12 @@ DEPENDS+=	deepstate-libfuzzer>=${VERSION}:../../wip/deepstate-libfuzzer
 
 PYTHON_VERSIONS_ACCEPTED=	37 36
 
+CONFIGURE_DIRS=	build
 CMAKE_ARG_PATH=	${WRKSRC}
-CONFIGURE_DIRS=	${WRKSRC}/build
 PYSETUPSUBDIR=	build
 
 pre-configure:
-	${MKDIR} ${WRKSRC}/build
+	cd ${WRKSRC} && ${MKDIR} ${CONFIGURE_DIRS}
 
 .include "../../wip/deepstate/Makefile.common"
 .include "../../lang/python/egg.mk"
diff --git a/py-dpkt/Makefile b/py-dpkt/Makefile
index 0ef540c05e..4b4535eca9 100644
--- a/py-dpkt/Makefile
+++ b/py-dpkt/Makefile
@@ -1,12 +1,11 @@
 # $NetBSD$
 
-GITHUB_PROJECT=	dpkt
-GITHUB_TAG=	v1.9.4
-DISTNAME=	v1.9.4
-PKGNAME=	${PYPKGPREFIX}-${GITHUB_PROJECT}-${DISTNAME:S,^v,,}
+DISTNAME=	dpkt-1.9.4
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_GITHUB:=kbandla/}
-DIST_SUBDIR=	${GITHUB_PROJECT}
+GITHUB_PROJECT=	dpkt
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pettai%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/kbandla/dpkt
diff --git a/py-eth-hash/Makefile b/py-eth-hash/Makefile
index 5ac3bf1a86..322d71ca38 100644
--- a/py-eth-hash/Makefile
+++ b/py-eth-hash/Makefile
@@ -10,15 +10,15 @@ DIST_SUBDIR=	${GITHUB_PROJECT}
 
 MAINTAINER=	khorben%defora.org@localhost
 HOMEPAGE=	https://github.com/ethereum/eth-hash
-COMMENT=	eth-hash: The Ethereum hashing function, keccak256, sometimes (erroneously) called sha3
+COMMENT=	Ethereum keccak256 hashing function, sometimes (erroneously) called sha3
 LICENSE=	mit
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-bumpversion-[0-9]*:../../wip/py-bumpversion
-BUILD_DEPENDS+=	# TODO: pytest-xdist>=0
-BUILD_DEPENDS+=	# TODO: pytest-watch>=4.1.0,<5
+BUILD_DEPENDS+=	${PYPKGPREFIX}-bumpversion-[0-9]*:../../devel/py-bumpversion
+#BUILD_DEPENDS+=	# TODO: pytest-xdist>=0
+#BUILD_DEPENDS+=	# TODO: pytest-watch>=4.1.0,<5
 BUILD_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 BUILD_DEPENDS+=	${PYPKGPREFIX}-ipython-[0-9]*:../../devel/py-ipython
-BUILD_DEPENDS+=	# TODO: pytest==3.3.2>=0
+#BUILD_DEPENDS+=	# TODO: pytest==3.3.2>=0
 BUILD_DEPENDS+=	${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
 BUILD_DEPENDS+=	${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8
 BUILD_DEPENDS+=	${PYPKGPREFIX}-isort-[0-9]*:../../devel/py-isort
diff --git a/py-eth-typing/Makefile b/py-eth-typing/Makefile
index 22d5394d71..dc9b3ff357 100644
--- a/py-eth-typing/Makefile
+++ b/py-eth-typing/Makefile
@@ -13,7 +13,7 @@ HOMEPAGE=	https://github.com/ethereum/eth-typing
 COMMENT=	eth-typing: Common type annotations for ethereum python packages
 LICENSE=	mit
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-bumpversion-[0-9]*:../../wip/py-bumpversion
+BUILD_DEPENDS+=	${PYPKGPREFIX}-bumpversion-[0-9]*:../../devel/py-bumpversion
 BUILD_DEPENDS+=	# TODO: pytest-watch>=4.1.0,<5
 BUILD_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 BUILD_DEPENDS+=	${PYPKGPREFIX}-twine-[0-9]*:../../net/py-twine
diff --git a/py-eth-utils/Makefile b/py-eth-utils/Makefile
index cf8c7b56b8..a75d04c029 100644
--- a/py-eth-utils/Makefile
+++ b/py-eth-utils/Makefile
@@ -16,20 +16,20 @@ LICENSE=	mit
 BUILD_DEPENDS+=	${PYPKGPREFIX}-twine-[0-9]*:../../net/py-twine
 BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-rtd-theme-[0-9]*:../../textproc/py-sphinx-rtd-theme
-BUILD_DEPENDS+=	# TODO: towncrier>=19.2.0,<20
-BUILD_DEPENDS+=	${PYPKGPREFIX}-black-[0-9]*:../../wip/py-black
+#BUILD_DEPENDS+=	# TODO: towncrier>=19.2.0,<20
+BUILD_DEPENDS+=	${PYPKGPREFIX}-black-[0-9]*:../../textproc/py-black
 BUILD_DEPENDS+=	${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8
 BUILD_DEPENDS+=	${PYPKGPREFIX}-isort-[0-9]*:../../devel/py-isort
 BUILD_DEPENDS+=	${PYPKGPREFIX}-mypy-[0-9]*:../../lang/py-mypy
-BUILD_DEPENDS+=	# TODO: pytest>=3.4.1,<4.0.0
+#BUILD_DEPENDS+=	# TODO: pytest>=3.4.1,<4.0.0
 BUILD_DEPENDS+=	${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
-BUILD_DEPENDS+=	# TODO: pytest>=3.4.1,<4.0.0
-BUILD_DEPENDS+=	# TODO: pytest-pythonpath>=0.3,<1.0
-BUILD_DEPENDS+=	${PYPKGPREFIX}-bumpversion-[0-9]*:../../wip/py-bumpversion
+#BUILD_DEPENDS+=	# TODO: pytest>=3.4.1,<4.0.0
+#BUILD_DEPENDS+=	# TODO: pytest-pythonpath>=0.3,<1.0
+BUILD_DEPENDS+=	${PYPKGPREFIX}-bumpversion-[0-9]*:../../devel/py-bumpversion
 BUILD_DEPENDS+=	${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
 BUILD_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
-DEPENDS+=	${PYPKGPREFIX}-eth-hash-[0-9]*:../../wip/py-eth-hash
-DEPENDS+=	${PYPKGPREFIX}-eth-typing-[0-9]*:../../wip/py-eth-typing
+DEPENDS+=	${PYPKGPREFIX}-eth-hash-[0-9]*:../../finance/py-eth-hash
+DEPENDS+=	${PYPKGPREFIX}-eth-typing-[0-9]*:../../finance/py-eth-typing
 DEPENDS+=	${PYPKGPREFIX}-toolz-[0-9]*:../../devel/py-toolz
 DEPENDS+=	${PYPKGPREFIX}-cytoolz-[0-9]*:../../wip/py-cytoolz
 
diff --git a/py-manticore/Makefile b/py-manticore/Makefile
index 2f2963a58f..9c5c6e9cad 100644
--- a/py-manticore/Makefile
+++ b/py-manticore/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.10 2018/05/06 22:20:22 khorben Exp $
 
-.include "../../wip/py-angr/version.mk"
+.include "../../devel/py-angr/version.mk"
 
 DISTNAME=	manticore-${GITHUB_TAG}
 PKGNAME=	${PYPKGPREFIX}-${EGG_NAME}
@@ -14,17 +14,17 @@ HOMEPAGE=	https://github.com/trailofbits/manticore/
 COMMENT=	Symbolic execution tool for analysis of binaries and smart contracts
 LICENSE=	gnu-agpl-v3
 
-DEPENDS+=	${PYPKGPREFIX}-angr>=${ANGR_VERSION}:../../wip/py-angr
+DEPENDS+=	${PYPKGPREFIX}-angr>=${ANGR_VERSION}:../../devel/py-angr
 DEPENDS+=	${PYPKGPREFIX}-capstone-[0-9]*:../../devel/py-capstone
-DEPENDS+=	${PYPKGPREFIX}-rlp-[0-9]*:../../wip/py-rlp
+DEPENDS+=	${PYPKGPREFIX}-rlp-[0-9]*:../../devel/py-rlp
 DEPENDS+=	${PYPKGPREFIX}-ply-[0-9]*:../../devel/py-ply
 DEPENDS+=	${PYPKGPREFIX}-pyelftools-[0-9]*:../../devel/py-pyelftools
 DEPENDS+=	${PYPKGPREFIX}-pysha3-[0-9]*:../../devel/py-pysha3
 DEPENDS+=	${PYPKGPREFIX}-unicorn-[0-9]*:../../emulators/py-unicorn
-DEPENDS+=	${PYPKGPREFIX}-crytic-compile-[0-9]*:../../wip/py-crytic-compile
-DEPENDS+=	${PYPKGPREFIX}-pyevmasm-[0-9]*:../../wip/py-pyevmasm
+DEPENDS+=	${PYPKGPREFIX}-crytic-compile-[0-9]*:../../finance/py-crytic-compile
+DEPENDS+=	${PYPKGPREFIX}-pyevmasm-[0-9]*:../../finance/py-pyevmasm
 DEPENDS+=	${PYPKGPREFIX}-z3solver-[0-9]*:../../math/py-z3solver
-DEPENDS+=	${PYPKGPREFIX}-prettytable-[0-9]*:../../wip/py-prettytable
+DEPENDS+=	${PYPKGPREFIX}-prettytable-[0-9]*:../../textproc/py-prettytable
 DEPENDS+=	${PYPKGPREFIX}-wasm-[0-9]*:../../wip/py-wasm
 DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
Prev by Date: lemonbar: Import lemonbar-v1.3 as wip/lemonbar
Next by Date: deepstate: remove the packages imported to pkgsrc
Previous by Thread: lemonbar: Import lemonbar-v1.3 as wip/lemonbar
Next by Thread: deepstate: remove the packages imported to pkgsrc
Indexes:
Home | Main Index | Thread Index | Old Index