Attachment #225734 for bug #256427




# $FreeBSD$

PORTNAME=	chiapos
DISTVERSION=	1.0.3
CATEGORIES=	finance python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}

MAINTAINER=	risner@stdio.com
COMMENT=	Chia proof of space plotting, proving, and verifying (wraps C++)

LICENSE=	APACHE20
LICENSE_FILE=	${WRKSRC}/LICENSE

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.5.0:devel/py-setuptools_scm@${PY_FLAVOR} \
		cmake:devel/cmake \
		pybind11:devel/pybind11

TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flake8:devel/py-flake8@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}mypy:devel/py-mypy@${PY_FLAVOR}

USES=		python:3.7+
USE_GITHUB=	nodefault
GH_TUPLE=	jarro2783:cxxopts:302302b30839505703d37fb82f536c53cf9172fa:c/src-ext/cxxopts \
		gulrak:filesystem:4e21ab305794f5309a1454b4ae82ab9a0f5e0d25:g/src-ext/gulrak
USE_PYTHON=	autoplist concurrent distutils

PYDISTUTILS_INSTALLARGS+=	--skip-build

post-extract:
# Remove extraneous unused files to prevent confusion
	@${RM} ${WRKSRC}/lib/FiniteStateEntropy/fetch-content-CMakeLists.txt
	@${RM} ${WRKSRC}/pyproject.toml

do-test: stage
	@(cd ${WRKSRC}; py.test ./tests -s -v)

.include <bsd.port.mk>

Added Link Here

(-)b/finance/py-chiapos/distinfo (+7 lines)
1	TIMESTAMP = 1623067298
2	SHA256 (chiapos-1.0.3.tar.gz) = d987b481a3acbff1e0d77eb713af8d99ecec2bd11c2c465528a5078a433686bd
3	SIZE (chiapos-1.0.3.tar.gz) = 1291513
4	SHA256 (jarro2783-cxxopts-302302b30839505703d37fb82f536c53cf9172fa_GH0.tar.gz) = 74e21646f3278243c9466665794d45410e63453ab7f3652acdae1d62efc4b21d
5	SIZE (jarro2783-cxxopts-302302b30839505703d37fb82f536c53cf9172fa_GH0.tar.gz) = 89640
6	SHA256 (gulrak-filesystem-4e21ab305794f5309a1454b4ae82ab9a0f5e0d25_GH0.tar.gz) = fef3e809d584b77fd3ec677bd0d40cbe6737bbb3dbb1570fe1b2025262ea82c2
7	SIZE (gulrak-filesystem-4e21ab305794f5309a1454b4ae82ab9a0f5e0d25_GH0.tar.gz) = 175696




--- CMakeLists.txt.orig	2021-05-28 02:40:44 UTC
+++ CMakeLists.txt
@@ -14,29 +14,8 @@ endif()
 project(chiapos C CXX ASM)
 
 # CMake 3.14+
-include(FetchContent)
+include(${CMAKE_INSTALL_PREFIX}/share/cmake/pybind11/pybind11Config.cmake)
 
-FetchContent_Declare(
-  pybind11-src
-  GIT_REPOSITORY https://github.com/pybind/pybind11.git
-  GIT_TAG        v2.6.2
-)
-FetchContent_MakeAvailable(pybind11-src)
-
-FetchContent_Declare(
-  cxxopts
-  GIT_REPOSITORY https://github.com/jarro2783/cxxopts.git
-  GIT_TAG        v2.2.1
-)
-FetchContent_MakeAvailable(cxxopts)
-
-FetchContent_Declare(
-  gulrak
-  GIT_REPOSITORY https://github.com/gulrak/filesystem.git
-  GIT_TAG        v1.5.6
-)
-FetchContent_MakeAvailable(gulrak)
-
 set(FSE_LIB ${CMAKE_CURRENT_SOURCE_DIR}/lib/FiniteStateEntropy/lib)
 set(FSE_FILES
     ${FSE_LIB}/fse_compress.c
@@ -48,8 +27,8 @@ set(FSE_FILES
 include_directories(
   ${INCLUDE_DIRECTORIES}
   ${CMAKE_CURRENT_SOURCE_DIR}/../lib/include
-  ${cxxopts_SOURCE_DIR}/include
-  ${gulrak_SOURCE_DIR}/include/ghc
+  ${CMAKE_CURRENT_SOURCE_DIR}/src-ext/cxxopts/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/src-ext/gulrak/include/ghc
   ${CMAKE_CURRENT_SOURCE_DIR}/../lib/FiniteStateEntropy/lib
   ${CMAKE_CURRENT_SOURCE_DIR}/src
   ${CMAKE_CURRENT_SOURCE_DIR}/test
@@ -144,6 +123,9 @@ add_executable(RunTests
     src/chacha8.c
     ${BLAKE3_SRC}
 )
+
+install(TARGETS ProofOfSpace DESTINATION bin)
+install(TARGETS RunTests DESTINATION bin)
 
 find_package(Threads REQUIRED)
 




--- setup.py.orig	2021-05-28 02:40:44 UTC
+++ setup.py
@@ -202,6 +202,7 @@ if platform.system() == "Windows":
 else:
     setup(
         name="chiapos",
+        version="1.0.3",
         author="Mariano Sorgente",
         author_email="mariano@chia.net",
         description="Chia proof of space plotting, proving, and verifying (wraps C++)",
@@ -209,7 +210,7 @@ else:
         python_requires=">=3.7",
         long_description=open("README.md").read(),
         long_description_content_type="text/markdown",
-        url="https://github.com/Chia-Network/chiavdf",
+        url="https://github.com/Chia-Network/chiapos",
         ext_modules=[CMakeExtension("chiapos", ".")],
         cmdclass=dict(build_ext=CMakeBuild),
         zip_safe=False,

Added Link Here

(-)b/finance/py-chiapos/pkg-descr (+11 lines)
1	Chia's proof of space is written in C++. Includes a plotter, prover, and
2	verifier. It exclusively runs on 64 bit architectures. Read the Proof of
3	Space document to learn about what proof of space is and how it works.
4
5	Notes:
6	Any ghc references are not Haskell related, rather a developer initials.
7	The HellmanAttacks example is experimental and incomplete upstream.
8
9	This port is for the Python module (library).
10
11	WWW: https://github.com/Chia-Network/chiapos

Return to bug 256427

Added Link Here

(-)b/finance/py-chiapos/Makefile (+39 lines)
1	# $FreeBSD$
2
3	PORTNAME= chiapos
4	DISTVERSION= 1.0.3
5	CATEGORIES= finance python
6	MASTER_SITES= CHEESESHOP
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
9
10	MAINTAINER= risner@stdio.com
11	COMMENT= Chia proof of space plotting, proving, and verifying (wraps C++)
12
13	LICENSE= APACHE20
14	LICENSE_FILE= ${WRKSRC}/LICENSE
15
16	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.5.0:devel/py-setuptools_scm@${PY_FLAVOR} \
17	cmake:devel/cmake \
18	pybind11:devel/pybind11
19
20	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8:devel/py-flake8@${PY_FLAVOR} \
21	${PYTHON_PKGNAMEPREFIX}mypy:devel/py-mypy@${PY_FLAVOR}
22
23	USES= python:3.7+
24	USE_GITHUB= nodefault
25	GH_TUPLE= jarro2783:cxxopts:302302b30839505703d37fb82f536c53cf9172fa:c/src-ext/cxxopts \
26	gulrak:filesystem:4e21ab305794f5309a1454b4ae82ab9a0f5e0d25:g/src-ext/gulrak
27	USE_PYTHON= autoplist concurrent distutils
28
29	PYDISTUTILS_INSTALLARGS+= --skip-build
30
31	post-extract:
32	# Remove extraneous unused files to prevent confusion
33	@${RM} ${WRKSRC}/lib/FiniteStateEntropy/fetch-content-CMakeLists.txt
34	@${RM} ${WRKSRC}/pyproject.toml
35
36	do-test: stage
37	@(cd ${WRKSRC}; py.test ./tests -s -v)
38
39	.include <bsd.port.mk>

Added Link Here

(-)b/finance/py-chiapos/files/patch-CMakeLists.txt (+54 lines)
1	--- CMakeLists.txt.orig 2021-05-28 02:40:44 UTC
2	+++ CMakeLists.txt
3	@@ -14,29 +14,8 @@ endif()
4	project(chiapos C CXX ASM)
5
6	# CMake 3.14+
7	-include(FetchContent)
8	+include(${CMAKE_INSTALL_PREFIX}/share/cmake/pybind11/pybind11Config.cmake)
9
10	-FetchContent_Declare(
11	- pybind11-src
12	- GIT_REPOSITORY https://github.com/pybind/pybind11.git
13	- GIT_TAG v2.6.2
14	-)
15	-FetchContent_MakeAvailable(pybind11-src)
16	-
17	-FetchContent_Declare(
18	- cxxopts
19	- GIT_REPOSITORY https://github.com/jarro2783/cxxopts.git
20	- GIT_TAG v2.2.1
21	-)
22	-FetchContent_MakeAvailable(cxxopts)
23	-
24	-FetchContent_Declare(
25	- gulrak
26	- GIT_REPOSITORY https://github.com/gulrak/filesystem.git
27	- GIT_TAG v1.5.6
28	-)
29	-FetchContent_MakeAvailable(gulrak)
30	-
31	set(FSE_LIB ${CMAKE_CURRENT_SOURCE_DIR}/lib/FiniteStateEntropy/lib)
32	set(FSE_FILES
33	${FSE_LIB}/fse_compress.c
34	@@ -48,8 +27,8 @@ set(FSE_FILES
35	include_directories(
36	${INCLUDE_DIRECTORIES}
37	${CMAKE_CURRENT_SOURCE_DIR}/../lib/include
38	- ${cxxopts_SOURCE_DIR}/include
39	- ${gulrak_SOURCE_DIR}/include/ghc
40	+ ${CMAKE_CURRENT_SOURCE_DIR}/src-ext/cxxopts/include
41	+ ${CMAKE_CURRENT_SOURCE_DIR}/src-ext/gulrak/include/ghc
42	${CMAKE_CURRENT_SOURCE_DIR}/../lib/FiniteStateEntropy/lib
43	${CMAKE_CURRENT_SOURCE_DIR}/src
44	${CMAKE_CURRENT_SOURCE_DIR}/test
45	@@ -144,6 +123,9 @@ add_executable(RunTests
46	src/chacha8.c
47	${BLAKE3_SRC}
48	)
49	+
50	+install(TARGETS ProofOfSpace DESTINATION bin)
51	+install(TARGETS RunTests DESTINATION bin)
52
53	find_package(Threads REQUIRED)
54

Added Link Here

(-)b/finance/py-chiapos/files/patch-setup.py (+19 lines)
1	--- setup.py.orig 2021-05-28 02:40:44 UTC
2	+++ setup.py
3	@@ -202,6 +202,7 @@ if platform.system() == "Windows":
4	else:
5	setup(
6	name="chiapos",
7	+ version="1.0.3",
8	author="Mariano Sorgente",
9	author_email="mariano@chia.net",
10	description="Chia proof of space plotting, proving, and verifying (wraps C++)",
11	@@ -209,7 +210,7 @@ else:
12	python_requires=">=3.7",
13	long_description=open("README.md").read(),
14	long_description_content_type="text/markdown",
15	- url="https://github.com/Chia-Network/chiavdf",
16	+ url="https://github.com/Chia-Network/chiapos",
17	ext_modules=[CMakeExtension("chiapos", ".")],
18	cmdclass=dict(build_ext=CMakeBuild),
19	zip_safe=False,