Attachment #175037 for bug #212046




# $FreeBSD$

PORTNAME=	bitmessage
PORTVERSION=	0.6.1
DISTVERSIONPREFIX=	v
CATEGORIES=	net-p2p


OPTIONS_DEFAULT=NATIVE_POW
NATIVE_POW_DESC=Native POW procedure
OPTIONS_SUB=	yes
REINPLACE_ARGS=	-i ''

.include <bsd.port.options.mk>

post-patch:
	${REINPLACE_CMD} -e 's|python2|${PYTHON_CMD}| ; s|share/man|man|' \
		${WRKSRC}/Makefile

	${REINPLACE_CMD} -e "s|\((CCFLAGS)\)|\1 -I${OPENSSLINC} |g" \
		-e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" \
		${WRKSRC}/src/bitmsghash/Makefile
	${REINPLACE_CMD} -e 's|python2|${PYTHON_CMD}| ; s|share/man|man|' ${WRKSRC}/Makefile ${WRKSRC}/src/depends.py
	${REINPLACE_CMD} -e 's|^#!.*$$|#!${PYTHON_CMD}|' \
		${WRKSRC}/compiletest.py ${WRKSRC}/src/bitmessagecli.py ${WRKSRC}/src/bitmessagemain.py \
		${WRKSRC}/src/depends.py \
		${WRKSRC}/src/bitmessageqt/migrationwizard.py ${WRKSRC}/src/bitmessageqt/newaddresswizard.py \
		${WRKSRC}/src/bitmessageqt/settingsmixin.py ${WRKSRC}/src/helper_msgcoding.py ${WRKSRC}/src/openclpow.py

do-build:
	@(cd ${WRKSRC} && \

		-d ${WRKSRC} -f ${WRKSRC} && \
	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
		-d ${WRKSRC} -f ${WRKSRC})
do-build-NATIVE_POW-on:
	@(cd ${WRKSRC} && \
		${ECHO_MSG} "===>  Compiling the proof-of-work (POW) routine" && \
		(cd src/bitmsghash && ${MAKE_CMD}))
.endif

post-install:
	${RM}	${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/Makefile \
		${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.cpp \
		${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.cl
post-install-NATIVE_POW-on:
	@${RM} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.o
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.so
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)net-p2p/bitmessage/distinfo (-2 / +3 lines)
1	SHA256 (Bitmessage-PyBitmessage-v0.6.0_GH0.tar.gz) = 3bee5ca3fe42a95a0bf1f9f7285904e18ae56b0189048968a5257676f25adc08	1	TIMESTAMP = 1471861326
2	SIZE (Bitmessage-PyBitmessage-v0.6.0_GH0.tar.gz) = 923755	2	SHA256 (Bitmessage-PyBitmessage-v0.6.1_GH0.tar.gz) = ceb6585c816bbcafc63cf3ea55b709ddf1dc1d48012509ef3c47dcdb553ed2b9
		3	SIZE (Bitmessage-PyBitmessage-v0.6.1_GH0.tar.gz) = 962301

Lines 1-4 Link Here

(-)net-p2p/bitmessage/files/patch-Makefile (-2 / +2 lines)
1	--- Makefile.orig 2016-05-02 19:51:46 UTC	1	--- Makefile.orig 2016-08-21 09:56:25 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -16,9 +16,9 @@ install:	3	@@ -16,9 +16,9 @@ install:
4	mkdir -p ${DESTDIR}${PREFIX}	4	mkdir -p ${DESTDIR}${PREFIX}
Lines 26-32 Link Here
26	+ echo ' echo "BitMessage directory not found"' >> ${DESTDIR}${PREFIX}/bin/${APP}	26	+ echo ' echo "BitMessage directory not found"' >> ${DESTDIR}${PREFIX}/bin/${APP}
27	+ echo ' exit 1' >> ${DESTDIR}${PREFIX}/bin/${APP}	27	+ echo ' exit 1' >> ${DESTDIR}${PREFIX}/bin/${APP}
28	echo 'fi' >> ${DESTDIR}${PREFIX}/bin/${APP}	28	echo 'fi' >> ${DESTDIR}${PREFIX}/bin/${APP}
29	+ echo 'exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}	29	+ echo 'exec /usr/local/bin/python2.7 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
30	chmod +x ${DESTDIR}${PREFIX}/bin/${APP}	30	chmod +x ${DESTDIR}${PREFIX}/bin/${APP}
31	uninstall:	31	uninstall:
32	- rm -f ${PREFIX}/share/man/man1/${APP}.1.gz	32	- rm -f ${PREFIX}/share/man/man1/${APP}.1.gz

Lines 1-4 Link Here

(-)net-p2p/bitmessage/files/patch-src_bitmsghash_Makefile (-1 / +1 lines)
1	--- src/bitmsghash/Makefile.orig 2016-05-02 19:51:46 UTC	1	--- src/bitmsghash/Makefile.orig 2016-08-21 09:56:25 UTC
2	+++ src/bitmsghash/Makefile	2	+++ src/bitmsghash/Makefile
3	@@ -10,10 +10,10 @@ powtest:	3	@@ -10,10 +10,10 @@ powtest:
4	./testpow.py	4	./testpow.py




--- src/bitmsghash/bitmsghash.cpp.orig	2016-05-02 19:51:46 UTC
+++ src/bitmsghash/bitmsghash.cpp
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined (__DragonFly__)
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #endif
@@ -89,6 +89,8 @@ void getnumthreads()
 #else
 	if (sysctlbyname("hw.logicalcpu", &core_count, &len, 0, 0) == 0)
 		numthreads = core_count;
+	else if (sysctlbyname("hw.ncpu", &core_count, &len, 0, 0) == 0)
+		numthreads = core_count;
 #endif
 	for (unsigned int i = 0; i < len * 8; i++)
 #if defined(_WIN32)

Lines 134-142 Link Here

(-)net-p2p/bitmessage/pkg-plist (-3 / +11 lines)
134	share/pybitmessage/bitmessageqt/widgets.py	134	share/pybitmessage/bitmessageqt/widgets.py
135	share/pybitmessage/bitmessageqt/widgets.pyc	135	share/pybitmessage/bitmessageqt/widgets.pyc
136	share/pybitmessage/bitmessageqt/widgets.pyo	136	share/pybitmessage/bitmessageqt/widgets.pyo
137	share/pybitmessage/bitmsghash/Makefile
138	share/pybitmessage/bitmsghash/bitmsghash.cl
139	share/pybitmessage/bitmsghash/bitmsghash.cpp
140	share/pybitmessage/build_osx.py	137	share/pybitmessage/build_osx.py
141	share/pybitmessage/build_osx.pyc	138	share/pybitmessage/build_osx.pyc
142	share/pybitmessage/build_osx.pyo	139	share/pybitmessage/build_osx.pyo
Lines 170-175 Link Here
170	share/pybitmessage/class_singleWorker.py	167	share/pybitmessage/class_singleWorker.py
171	share/pybitmessage/class_singleWorker.pyc	168	share/pybitmessage/class_singleWorker.pyc
172	share/pybitmessage/class_singleWorker.pyo	169	share/pybitmessage/class_singleWorker.pyo
		170	share/pybitmessage/class_smtpDeliver.py
		171	share/pybitmessage/class_smtpDeliver.pyc
		172	share/pybitmessage/class_smtpDeliver.pyo
		173	share/pybitmessage/class_smtpServer.py
		174	share/pybitmessage/class_smtpServer.pyc
		175	share/pybitmessage/class_smtpServer.pyo
173	share/pybitmessage/class_sqlThread.py	176	share/pybitmessage/class_sqlThread.py
174	share/pybitmessage/class_sqlThread.pyc	177	share/pybitmessage/class_sqlThread.pyc
175	share/pybitmessage/class_sqlThread.pyo	178	share/pybitmessage/class_sqlThread.pyo
Lines 194-199 Link Here
194	share/pybitmessage/helper_inbox.py	197	share/pybitmessage/helper_inbox.py
195	share/pybitmessage/helper_inbox.pyc	198	share/pybitmessage/helper_inbox.pyc
196	share/pybitmessage/helper_inbox.pyo	199	share/pybitmessage/helper_inbox.pyo
		200	share/pybitmessage/helper_msgcoding.py
		201	share/pybitmessage/helper_msgcoding.pyc
		202	share/pybitmessage/helper_msgcoding.pyo
197	share/pybitmessage/helper_search.py	203	share/pybitmessage/helper_search.py
198	share/pybitmessage/helper_search.pyc	204	share/pybitmessage/helper_search.pyc
199	share/pybitmessage/helper_search.pyo	205	share/pybitmessage/helper_search.pyo
Lines 320-325 Link Here
320	share/pybitmessage/translations/bitmessage_no.qm	326	share/pybitmessage/translations/bitmessage_no.qm
321	share/pybitmessage/translations/bitmessage_no.ts	327	share/pybitmessage/translations/bitmessage_no.ts
322	share/pybitmessage/translations/bitmessage_pl.ts	328	share/pybitmessage/translations/bitmessage_pl.ts
		329	share/pybitmessage/translations/bitmessage_pl.qm
		330	share/pybitmessage/translations/bitmessage_pt.qm
323	share/pybitmessage/translations/bitmessage_pt.ts	331	share/pybitmessage/translations/bitmessage_pt.ts
324	share/pybitmessage/translations/bitmessage_ru.qm	332	share/pybitmessage/translations/bitmessage_ru.qm
325	share/pybitmessage/translations/bitmessage_ru.ts	333	share/pybitmessage/translations/bitmessage_ru.ts

Return to bug 212046

Lines 2-8 Link Here

(-)net-p2p/bitmessage/Makefile (-7 / +13 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= bitmessage	4	PORTNAME= bitmessage
5	PORTVERSION= 0.6.0	5	PORTVERSION= 0.6.1
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= net-p2p	7	CATEGORIES= net-p2p
8		8
Lines 29-37 Link Here
29	OPTIONS_DEFAULT=NATIVE_POW	29	OPTIONS_DEFAULT=NATIVE_POW
30	NATIVE_POW_DESC=Native POW procedure	30	NATIVE_POW_DESC=Native POW procedure
31	OPTIONS_SUB= yes	31	OPTIONS_SUB= yes
		32	REINPLACE_ARGS= -i ''
32		33
33	.include <bsd.port.options.mk>
34
35	post-patch:	34	post-patch:
36	${REINPLACE_CMD} -e 's\|python2\|${PYTHON_CMD}\| ; s\|share/man\|man\|' \	35	${REINPLACE_CMD} -e 's\|python2\|${PYTHON_CMD}\| ; s\|share/man\|man\|' \
37	${WRKSRC}/Makefile	36	${WRKSRC}/Makefile
Lines 38-43 Link Here
38	${REINPLACE_CMD} -e "s\|\((CCFLAGS)\)\|\1 -I${OPENSSLINC} \|g" \	37	${REINPLACE_CMD} -e "s\|\((CCFLAGS)\)\|\1 -I${OPENSSLINC} \|g" \
39	-e "s\|\(-lcrypto\)\|-L${OPENSSLLIB} \1\|g" \	38	-e "s\|\(-lcrypto\)\|-L${OPENSSLLIB} \1\|g" \
40	${WRKSRC}/src/bitmsghash/Makefile	39	${WRKSRC}/src/bitmsghash/Makefile
		40	${REINPLACE_CMD} -e 's\|python2\|${PYTHON_CMD}\| ; s\|share/man\|man\|' ${WRKSRC}/Makefile ${WRKSRC}/src/depends.py
		41	${REINPLACE_CMD} -e 's\|^#!.*$$\|#!${PYTHON_CMD}\|' \
		42	${WRKSRC}/compiletest.py ${WRKSRC}/src/bitmessagecli.py ${WRKSRC}/src/bitmessagemain.py \
		43	${WRKSRC}/src/depends.py \
		44	${WRKSRC}/src/bitmessageqt/migrationwizard.py ${WRKSRC}/src/bitmessageqt/newaddresswizard.py \
		45	${WRKSRC}/src/bitmessageqt/settingsmixin.py ${WRKSRC}/src/helper_msgcoding.py ${WRKSRC}/src/openclpow.py
41		46
42	do-build:	47	do-build:
43	@(cd ${WRKSRC} && \	48	@(cd ${WRKSRC} && \
Lines 45-60 Link Here
45	-d ${WRKSRC} -f ${WRKSRC} && \	50	-d ${WRKSRC} -f ${WRKSRC} && \
46	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \	51	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
47	-d ${WRKSRC} -f ${WRKSRC})	52	-d ${WRKSRC} -f ${WRKSRC})
48	.if ${PORT_OPTIONS:MNATIVE_POW}	53	do-build-NATIVE_POW-on:
49	@(cd ${WRKSRC} && \	54	@(cd ${WRKSRC} && \
50	${ECHO_MSG} "===> Compiling the proof-of-work (POW) routine" && \	55	${ECHO_MSG} "===> Compiling the proof-of-work (POW) routine" && \
51	(cd src/bitmsghash && ${MAKE_CMD}))	56	(cd src/bitmsghash && ${MAKE_CMD}))
52	.endif
53		57
54	post-install:	58	post-install:
55	.if ${PORT_OPTIONS:MNATIVE_POW}	59	${RM} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/Makefile \
		60	${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.cpp \
		61	${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.cl
		62	post-install-NATIVE_POW-on:
56	@${RM} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.o	63	@${RM} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.o
57	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.so	64	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.so
58	.endif
59		65
60	.include <bsd.port.mk>	66	.include <bsd.port.mk>

Lines 1-20 Link Here

(-)net-p2p/bitmessage/files/patch-src_bitmsghash_bitmsghash.cpp (-20 lines)
1	--- src/bitmsghash/bitmsghash.cpp.orig 2016-05-02 19:51:46 UTC
2	+++ src/bitmsghash/bitmsghash.cpp
3	@@ -11,7 +11,7 @@
4	#include <string.h>
5	#include <stdio.h>
6	#include <stdlib.h>
7	-#ifdef __APPLE__
8	+#if defined(__APPLE__) \|\| defined(__FreeBSD__) \|\| defined (__DragonFly__)
9	#include <sys/types.h>
10	#include <sys/sysctl.h>
11	#endif
12	@@ -89,6 +89,8 @@ void getnumthreads()
13	#else
14	if (sysctlbyname("hw.logicalcpu", &core_count, &len, 0, 0) == 0)
15	numthreads = core_count;
16	+ else if (sysctlbyname("hw.ncpu", &core_count, &len, 0, 0) == 0)
17	+ numthreads = core_count;
18	#endif
19	for (unsigned int i = 0; i < len * 8; i++)
20	#if defined(_WIN32)