Attachment #174435 for bug #212046




# $FreeBSD$

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


GH_PROJECT=	PyBitmessage

USES=		python pyqt:4
NATIVE_POW_USES=gmake ssl
USE_OPENSSL=	yes
INSTALLS_ICONS=	yes

OPTIONS_DEFINE=	NATIVE_POW

.include <bsd.port.options.mk>

post-patch:
	${REINPLACE_CMD} -e 's|python2|${PYTHON_CMD}| ; s|share/man|man|' ${WRKSRC}/Makefile ${WRKSRC}/src/depends.py
	${REINPLACE_CMD} -e 's|^#! python$$|#!/usr/bin/env python2|' ${WRKSRC}/src/depends.py
	${REINPLACE_CMD} -e 's|^#!/usr/bin/python2.7$$|#!/usr/bin/env python2|' \
		${WRKSRC}/compiletest.py ${WRKSRC}/src/bitmessagecli.py ${WRKSRC}/src/bitmessagemain.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} && \

.endif

post-install:
	${RM}	${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/Makefile \
		${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.cpp
.if ${PORT_OPTIONS:MNATIVE_POW}
	@${RM} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.o
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.so

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 (-2 / +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	137	share/pybitmessage/bitmsghash/bitmsghash.cl
139	share/pybitmessage/bitmsghash/bitmsghash.cpp
140	share/pybitmessage/build_osx.py	138	share/pybitmessage/build_osx.py
141	share/pybitmessage/build_osx.pyc	139	share/pybitmessage/build_osx.pyc
142	share/pybitmessage/build_osx.pyo	140	share/pybitmessage/build_osx.pyo
Lines 170-175 Link Here
170	share/pybitmessage/class_singleWorker.py	168	share/pybitmessage/class_singleWorker.py
171	share/pybitmessage/class_singleWorker.pyc	169	share/pybitmessage/class_singleWorker.pyc
172	share/pybitmessage/class_singleWorker.pyo	170	share/pybitmessage/class_singleWorker.pyo
		171	share/pybitmessage/class_smtpDeliver.py
		172	share/pybitmessage/class_smtpDeliver.pyc
		173	share/pybitmessage/class_smtpDeliver.pyo
		174	share/pybitmessage/class_smtpServer.py
		175	share/pybitmessage/class_smtpServer.pyc
		176	share/pybitmessage/class_smtpServer.pyo
173	share/pybitmessage/class_sqlThread.py	177	share/pybitmessage/class_sqlThread.py
174	share/pybitmessage/class_sqlThread.pyc	178	share/pybitmessage/class_sqlThread.pyc
175	share/pybitmessage/class_sqlThread.pyo	179	share/pybitmessage/class_sqlThread.pyo
Lines 194-199 Link Here
194	share/pybitmessage/helper_inbox.py	198	share/pybitmessage/helper_inbox.py
195	share/pybitmessage/helper_inbox.pyc	199	share/pybitmessage/helper_inbox.pyc
196	share/pybitmessage/helper_inbox.pyo	200	share/pybitmessage/helper_inbox.pyo
		201	share/pybitmessage/helper_msgcoding.py
		202	share/pybitmessage/helper_msgcoding.pyc
		203	share/pybitmessage/helper_msgcoding.pyo
197	share/pybitmessage/helper_search.py	204	share/pybitmessage/helper_search.py
198	share/pybitmessage/helper_search.pyc	205	share/pybitmessage/helper_search.pyc
199	share/pybitmessage/helper_search.pyo	206	share/pybitmessage/helper_search.pyo
Lines 320-325 Link Here
320	share/pybitmessage/translations/bitmessage_no.qm	327	share/pybitmessage/translations/bitmessage_no.qm
321	share/pybitmessage/translations/bitmessage_no.ts	328	share/pybitmessage/translations/bitmessage_no.ts
322	share/pybitmessage/translations/bitmessage_pl.ts	329	share/pybitmessage/translations/bitmessage_pl.ts
		330	share/pybitmessage/translations/bitmessage_pl.qm
		331	share/pybitmessage/translations/bitmessage_pt.qm
323	share/pybitmessage/translations/bitmessage_pt.ts	332	share/pybitmessage/translations/bitmessage_pt.ts
324	share/pybitmessage/translations/bitmessage_ru.qm	333	share/pybitmessage/translations/bitmessage_ru.qm
325	share/pybitmessage/translations/bitmessage_ru.ts	334	share/pybitmessage/translations/bitmessage_ru.ts

Return to bug 212046

Lines 2-8 Link Here

(-)net-p2p/bitmessage/Makefile (-4 / +10 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 22-29 Link Here
22	GH_PROJECT= PyBitmessage	22	GH_PROJECT= PyBitmessage
23		23
24	USES= python pyqt:4	24	USES= python pyqt:4
25	NATIVE_POW_USES=gmake	25	NATIVE_POW_USES=gmake ssl
26	USE_OPENSSL= yes
27	INSTALLS_ICONS= yes	26	INSTALLS_ICONS= yes
28		27
29	OPTIONS_DEFINE= NATIVE_POW	28	OPTIONS_DEFINE= NATIVE_POW
Lines 34-40 Link Here
34	.include <bsd.port.options.mk>	33	.include <bsd.port.options.mk>
35		34
36	post-patch:	35	post-patch:
37	${REINPLACE_CMD} -e 's\|python2\|${PYTHON_CMD}\| ; s\|share/man\|man\|' ${WRKSRC}/Makefile	36	${REINPLACE_CMD} -e 's\|python2\|${PYTHON_CMD}\| ; s\|share/man\|man\|' ${WRKSRC}/Makefile ${WRKSRC}/src/depends.py
		37	${REINPLACE_CMD} -e 's\|^#! python$$\|#!/usr/bin/env python2\|' ${WRKSRC}/src/depends.py
		38	${REINPLACE_CMD} -e 's\|^#!/usr/bin/python2.7$$\|#!/usr/bin/env python2\|' \
		39	${WRKSRC}/compiletest.py ${WRKSRC}/src/bitmessagecli.py ${WRKSRC}/src/bitmessagemain.py \
		40	${WRKSRC}/src/bitmessageqt/migrationwizard.py ${WRKSRC}/src/bitmessageqt/newaddresswizard.py \
		41	${WRKSRC}/src/bitmessageqt/settingsmixin.py ${WRKSRC}/src/helper_msgcoding.py ${WRKSRC}/src/openclpow.py
38		42
39	do-build:	43	do-build:
40	@(cd ${WRKSRC} && \	44	@(cd ${WRKSRC} && \
Lines 49-54 Link Here
49	.endif	53	.endif
50		54
51	post-install:	55	post-install:
		56	${RM} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/Makefile \
		57	${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.cpp
52	.if ${PORT_OPTIONS:MNATIVE_POW}	58	.if ${PORT_OPTIONS:MNATIVE_POW}
53	@${RM} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.o	59	@${RM} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.o
54	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.so	60	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.so

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)