Attachment #169999 for bug #209278




# $FreeBSD$

PORTNAME=	bitmessage
PORTVERSION=	0.6.0
DISTVERSIONPREFIX=	v
PORTREVISION=	1
CATEGORIES=	net-p2p

MAINTAINER=	yuri@rawbw.com

COMMENT=	Secure P2P communications client

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/LICENSE

RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
		${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core \
		${PYTHON_PKGNAMEPREFIX}qt4-network>=${PYQT4_VERSION}:${PORTSDIR}/net/py-qt4-network \
		${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui

USE_GITHUB=	yes
GH_ACCOUNT=	Bitmessage
GH_PROJECT=	PyBitmessage

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

OPTIONS_DEFINE=	NATIVE_POW
OPTIONS_DEFAULT=NATIVE_POW
NATIVE_POW_DESC=Native POW procedure
OPTIONS_SUB=	yes

.include <bsd.port.options.mk>

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


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

post-install:
.if ${PORT_OPTIONS:MNATIVE_POW}
	@${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 / +2 lines)
1	SHA256 (Bitmessage-PyBitmessage-v0.4.4_GH0.tar.gz) = 2fe2b1ad4d7426c8777fb429129b7a07c717ea5f00cc3041a03ac19fd3259b3a	1	SHA256 (Bitmessage-PyBitmessage-v0.6.0_GH0.tar.gz) = 3bee5ca3fe42a95a0bf1f9f7285904e18ae56b0189048968a5257676f25adc08
2	SIZE (Bitmessage-PyBitmessage-v0.4.4_GH0.tar.gz) = 611490	2	SIZE (Bitmessage-PyBitmessage-v0.6.0_GH0.tar.gz) = 923755




--- Makefile.orig	2016-05-02 19:51:46 UTC
+++ Makefile
@@ -16,9 +16,9 @@ install:
 	mkdir -p ${DESTDIR}${PREFIX}
 	mkdir -p ${DESTDIR}${PREFIX}/bin
 	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share
-	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man
-	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man/man1
-	install -m 644 man/${APP}.1.gz ${DESTDIR}${PREFIX}/share/man/man1
+	mkdir -m 755 -p ${DESTDIR}${PREFIX}/man
+	mkdir -m 755 -p ${DESTDIR}${PREFIX}/man/man1
+	install -m 644 man/${APP}.1.gz ${DESTDIR}${PREFIX}/man/man1
 	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/${APP}
 	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/applications
 	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/pixmaps
@@ -35,16 +35,13 @@ install:
 	echo "if [ -d ${PREFIX}/share/${APP} ]; then" >> ${DESTDIR}${PREFIX}/bin/${APP}
 	echo "  cd ${PREFIX}/share/${APP}" >> ${DESTDIR}${PREFIX}/bin/${APP}
 	echo 'else' >> ${DESTDIR}${PREFIX}/bin/${APP}
-	echo "  cd /usr/share/pybitmessage" >> ${DESTDIR}${PREFIX}/bin/${APP}
-	echo 'fi' >> ${DESTDIR}${PREFIX}/bin/${APP}
-	echo 'if [ -d /opt/openssl-compat-bitcoin/lib ]; then' >> ${DESTDIR}${PREFIX}/bin/${APP}
-	echo '  LD_LIBRARY_PATH="/opt/openssl-compat-bitcoin/lib/" exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
-	echo 'else' >> ${DESTDIR}${PREFIX}/bin/${APP}
-	echo '  exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
+	echo ' echo "BitMessage directory not found"' >> ${DESTDIR}${PREFIX}/bin/${APP}
+	echo '  exit 1' >> ${DESTDIR}${PREFIX}/bin/${APP}
 	echo 'fi' >> ${DESTDIR}${PREFIX}/bin/${APP}
+	echo 'exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
+	echo 'python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
 	chmod +x ${DESTDIR}${PREFIX}/bin/${APP}
 uninstall:
-	rm -f ${PREFIX}/share/man/man1/${APP}.1.gz
+	rm -f ${PREFIX}/man/man1/${APP}.1.gz
 	rm -rf ${PREFIX}/share/${APP}
 	rm -f ${PREFIX}/bin/${APP}
 	rm -f ${PREFIX}/share/applications/${APP}.desktop




--- src/bitmsghash/Makefile.orig	2016-05-02 19:51:46 UTC
+++ src/bitmsghash/Makefile
@@ -10,10 +10,10 @@ powtest:
 	./testpow.py
 
 bitmsghash.so: bitmsghash.o
-	g++ bitmsghash.o -shared -fPIC -lpthread -lcrypto $(LDFLAGS) -o bitmsghash.so
+	${CC} bitmsghash.o -shared -fPIC -lpthread -lcrypto $(LDFLAGS) -o bitmsghash.so
 
 bitmsghash.o:
-	g++ -Wall -O3 -march=native -fPIC $(CCFLAGS) -c bitmsghash.cpp
+	${CC} -Wall -O3 -march=native -fPIC $(CCFLAGS) -c bitmsghash.cpp
 
 clean:
 	rm -f bitmsghash.o bitmsghash.so




--- 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__)
 #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 2-8 Link Here

(-)net-p2p/bitmessage/pkg-plist (-11 / +103 lines)
2	man/man1/pybitmessage.1.gz	2	man/man1/pybitmessage.1.gz
3	share/applications/pybitmessage.desktop	3	share/applications/pybitmessage.desktop
4	share/icons/hicolor/24x24/apps/pybitmessage.png	4	share/icons/hicolor/24x24/apps/pybitmessage.png
5	share/icons/hicolor/scalable/apps/pybitmessage.svg
6	share/pybitmessage/addresses.py	5	share/pybitmessage/addresses.py
7	share/pybitmessage/addresses.pyc	6	share/pybitmessage/addresses.pyc
8	share/pybitmessage/addresses.pyo	7	share/pybitmessage/addresses.pyo
Lines 12-17 Link Here
12	share/pybitmessage/api_client.py	11	share/pybitmessage/api_client.py
13	share/pybitmessage/api_client.pyc	12	share/pybitmessage/api_client.pyc
14	share/pybitmessage/api_client.pyo	13	share/pybitmessage/api_client.pyo
		14	share/pybitmessage/bitmessagecli.py
		15	share/pybitmessage/bitmessagecli.pyc
		16	share/pybitmessage/bitmessagecli.pyo
15	share/pybitmessage/bitmessagecurses/__init__.py	17	share/pybitmessage/bitmessagecurses/__init__.py
16	share/pybitmessage/bitmessagecurses/__init__.pyc	18	share/pybitmessage/bitmessagecurses/__init__.pyc
17	share/pybitmessage/bitmessagecurses/__init__.pyo	19	share/pybitmessage/bitmessagecurses/__init__.pyo
Lines 25-30 Link Here
25	share/pybitmessage/bitmessageqt/about.pyc	27	share/pybitmessage/bitmessageqt/about.pyc
26	share/pybitmessage/bitmessageqt/about.pyo	28	share/pybitmessage/bitmessageqt/about.pyo
27	share/pybitmessage/bitmessageqt/about.ui	29	share/pybitmessage/bitmessageqt/about.ui
		30	share/pybitmessage/bitmessageqt/account.py
		31	share/pybitmessage/bitmessageqt/account.pyc
		32	share/pybitmessage/bitmessageqt/account.pyo
28	share/pybitmessage/bitmessageqt/addaddressdialog.py	33	share/pybitmessage/bitmessageqt/addaddressdialog.py
29	share/pybitmessage/bitmessageqt/addaddressdialog.pyc	34	share/pybitmessage/bitmessageqt/addaddressdialog.pyc
30	share/pybitmessage/bitmessageqt/addaddressdialog.pyo	35	share/pybitmessage/bitmessageqt/addaddressdialog.pyo
Lines 38-47 Link Here
38	share/pybitmessage/bitmessageqt/bitmessageui.pyc	43	share/pybitmessage/bitmessageqt/bitmessageui.pyc
39	share/pybitmessage/bitmessageqt/bitmessageui.pyo	44	share/pybitmessage/bitmessageqt/bitmessageui.pyo
40	share/pybitmessage/bitmessageqt/bitmessageui.ui	45	share/pybitmessage/bitmessageqt/bitmessageui.ui
		46	share/pybitmessage/bitmessageqt/blacklist.py
		47	share/pybitmessage/bitmessageqt/blacklist.pyc
		48	share/pybitmessage/bitmessageqt/blacklist.pyo
		49	share/pybitmessage/bitmessageqt/blacklist.ui
41	share/pybitmessage/bitmessageqt/connect.py	50	share/pybitmessage/bitmessageqt/connect.py
42	share/pybitmessage/bitmessageqt/connect.pyc	51	share/pybitmessage/bitmessageqt/connect.pyc
43	share/pybitmessage/bitmessageqt/connect.pyo	52	share/pybitmessage/bitmessageqt/connect.pyo
44	share/pybitmessage/bitmessageqt/connect.ui	53	share/pybitmessage/bitmessageqt/connect.ui
		54	share/pybitmessage/bitmessageqt/dialogs.py
		55	share/pybitmessage/bitmessageqt/dialogs.pyc
		56	share/pybitmessage/bitmessageqt/dialogs.pyo
		57	share/pybitmessage/bitmessageqt/emailgateway.py
		58	share/pybitmessage/bitmessageqt/emailgateway.pyc
		59	share/pybitmessage/bitmessageqt/emailgateway.pyo
		60	share/pybitmessage/bitmessageqt/emailgateway.ui
		61	share/pybitmessage/bitmessageqt/foldertree.py
		62	share/pybitmessage/bitmessageqt/foldertree.pyc
		63	share/pybitmessage/bitmessageqt/foldertree.pyo
45	share/pybitmessage/bitmessageqt/help.py	64	share/pybitmessage/bitmessageqt/help.py
46	share/pybitmessage/bitmessageqt/help.pyc	65	share/pybitmessage/bitmessageqt/help.pyc
47	share/pybitmessage/bitmessageqt/help.pyo	66	share/pybitmessage/bitmessageqt/help.pyo
Lines 50-59 Link Here
50	share/pybitmessage/bitmessageqt/iconglossary.pyc	69	share/pybitmessage/bitmessageqt/iconglossary.pyc
51	share/pybitmessage/bitmessageqt/iconglossary.pyo	70	share/pybitmessage/bitmessageqt/iconglossary.pyo
52	share/pybitmessage/bitmessageqt/iconglossary.ui	71	share/pybitmessage/bitmessageqt/iconglossary.ui
		72	share/pybitmessage/bitmessageqt/languagebox.py
		73	share/pybitmessage/bitmessageqt/languagebox.pyc
		74	share/pybitmessage/bitmessageqt/languagebox.pyo
		75	share/pybitmessage/bitmessageqt/messagecompose.py
		76	share/pybitmessage/bitmessageqt/messagecompose.pyc
		77	share/pybitmessage/bitmessageqt/messagecompose.pyo
		78	share/pybitmessage/bitmessageqt/messageview.py
		79	share/pybitmessage/bitmessageqt/messageview.pyc
		80	share/pybitmessage/bitmessageqt/messageview.pyo
		81	share/pybitmessage/bitmessageqt/migrationwizard.py
		82	share/pybitmessage/bitmessageqt/migrationwizard.pyc
		83	share/pybitmessage/bitmessageqt/migrationwizard.pyo
		84	share/pybitmessage/bitmessageqt/networkstatus.py
		85	share/pybitmessage/bitmessageqt/networkstatus.pyc
		86	share/pybitmessage/bitmessageqt/networkstatus.pyo
		87	share/pybitmessage/bitmessageqt/networkstatus.ui
53	share/pybitmessage/bitmessageqt/newaddressdialog.py	88	share/pybitmessage/bitmessageqt/newaddressdialog.py
54	share/pybitmessage/bitmessageqt/newaddressdialog.pyc	89	share/pybitmessage/bitmessageqt/newaddressdialog.pyc
55	share/pybitmessage/bitmessageqt/newaddressdialog.pyo	90	share/pybitmessage/bitmessageqt/newaddressdialog.pyo
56	share/pybitmessage/bitmessageqt/newaddressdialog.ui	91	share/pybitmessage/bitmessageqt/newaddressdialog.ui
		92	share/pybitmessage/bitmessageqt/newaddresswizard.py
		93	share/pybitmessage/bitmessageqt/newaddresswizard.pyc
		94	share/pybitmessage/bitmessageqt/newaddresswizard.pyo
57	share/pybitmessage/bitmessageqt/newchandialog.py	95	share/pybitmessage/bitmessageqt/newchandialog.py
58	share/pybitmessage/bitmessageqt/newchandialog.pyc	96	share/pybitmessage/bitmessageqt/newchandialog.pyc
59	share/pybitmessage/bitmessageqt/newchandialog.pyo	97	share/pybitmessage/bitmessageqt/newchandialog.pyo
Lines 66-80 Link Here
66	share/pybitmessage/bitmessageqt/regenerateaddresses.pyc	104	share/pybitmessage/bitmessageqt/regenerateaddresses.pyc
67	share/pybitmessage/bitmessageqt/regenerateaddresses.pyo	105	share/pybitmessage/bitmessageqt/regenerateaddresses.pyo
68	share/pybitmessage/bitmessageqt/regenerateaddresses.ui	106	share/pybitmessage/bitmessageqt/regenerateaddresses.ui
		107	share/pybitmessage/bitmessageqt/retranslateui.py
		108	share/pybitmessage/bitmessageqt/retranslateui.pyc
		109	share/pybitmessage/bitmessageqt/retranslateui.pyo
		110	share/pybitmessage/bitmessageqt/safehtmlparser.py
		111	share/pybitmessage/bitmessageqt/safehtmlparser.pyc
		112	share/pybitmessage/bitmessageqt/safehtmlparser.pyo
69	share/pybitmessage/bitmessageqt/settings.py	113	share/pybitmessage/bitmessageqt/settings.py
70	share/pybitmessage/bitmessageqt/settings.pyc	114	share/pybitmessage/bitmessageqt/settings.pyc
71	share/pybitmessage/bitmessageqt/settings.pyo	115	share/pybitmessage/bitmessageqt/settings.pyo
72	share/pybitmessage/bitmessageqt/settings.ui	116	share/pybitmessage/bitmessageqt/settings.ui
		117	share/pybitmessage/bitmessageqt/settingsmixin.py
		118	share/pybitmessage/bitmessageqt/settingsmixin.pyc
		119	share/pybitmessage/bitmessageqt/settingsmixin.pyo
73	share/pybitmessage/bitmessageqt/specialaddressbehavior.py	120	share/pybitmessage/bitmessageqt/specialaddressbehavior.py
74	share/pybitmessage/bitmessageqt/specialaddressbehavior.pyc	121	share/pybitmessage/bitmessageqt/specialaddressbehavior.pyc
75	share/pybitmessage/bitmessageqt/specialaddressbehavior.pyo	122	share/pybitmessage/bitmessageqt/specialaddressbehavior.pyo
76	share/pybitmessage/bitmessageqt/specialaddressbehavior.ui	123	share/pybitmessage/bitmessageqt/specialaddressbehavior.ui
		124	share/pybitmessage/bitmessageqt/support.py
		125	share/pybitmessage/bitmessageqt/support.pyc
		126	share/pybitmessage/bitmessageqt/support.pyo
		127	share/pybitmessage/bitmessageqt/uisignaler.py
		128	share/pybitmessage/bitmessageqt/uisignaler.pyc
		129	share/pybitmessage/bitmessageqt/uisignaler.pyo
		130	share/pybitmessage/bitmessageqt/utils.py
		131	share/pybitmessage/bitmessageqt/utils.pyc
		132	share/pybitmessage/bitmessageqt/utils.pyo
77	share/pybitmessage/bitmessageqt/wanlan.ui	133	share/pybitmessage/bitmessageqt/wanlan.ui
		134	share/pybitmessage/bitmessageqt/widgets.py
		135	share/pybitmessage/bitmessageqt/widgets.pyc
		136	share/pybitmessage/bitmessageqt/widgets.pyo
		137	share/pybitmessage/bitmsghash/Makefile
		138	share/pybitmessage/bitmsghash/bitmsghash.cl
		139	share/pybitmessage/bitmsghash/bitmsghash.cpp
78	share/pybitmessage/build_osx.py	140	share/pybitmessage/build_osx.py
79	share/pybitmessage/build_osx.pyc	141	share/pybitmessage/build_osx.pyc
80	share/pybitmessage/build_osx.pyo	142	share/pybitmessage/build_osx.pyo
Lines 87-92 Link Here
87	share/pybitmessage/class_objectProcessor.py	149	share/pybitmessage/class_objectProcessor.py
88	share/pybitmessage/class_objectProcessor.pyc	150	share/pybitmessage/class_objectProcessor.pyc
89	share/pybitmessage/class_objectProcessor.pyo	151	share/pybitmessage/class_objectProcessor.pyo
		152	share/pybitmessage/class_objectProcessorQueue.py
		153	share/pybitmessage/class_objectProcessorQueue.pyc
		154	share/pybitmessage/class_objectProcessorQueue.pyo
90	share/pybitmessage/class_outgoingSynSender.py	155	share/pybitmessage/class_outgoingSynSender.py
91	share/pybitmessage/class_outgoingSynSender.pyc	156	share/pybitmessage/class_outgoingSynSender.pyc
92	share/pybitmessage/class_outgoingSynSender.pyo	157	share/pybitmessage/class_outgoingSynSender.pyo
Lines 114-119 Link Here
114	share/pybitmessage/defaultKnownNodes.py	179	share/pybitmessage/defaultKnownNodes.py
115	share/pybitmessage/defaultKnownNodes.pyc	180	share/pybitmessage/defaultKnownNodes.pyc
116	share/pybitmessage/defaultKnownNodes.pyo	181	share/pybitmessage/defaultKnownNodes.pyo
		182	share/pybitmessage/depends.py
		183	share/pybitmessage/depends.pyc
		184	share/pybitmessage/depends.pyo
117	share/pybitmessage/helper_bitcoin.py	185	share/pybitmessage/helper_bitcoin.py
118	share/pybitmessage/helper_bitcoin.pyc	186	share/pybitmessage/helper_bitcoin.pyc
119	share/pybitmessage/helper_bitcoin.pyo	187	share/pybitmessage/helper_bitcoin.pyo
Lines 126-131 Link Here
126	share/pybitmessage/helper_inbox.py	194	share/pybitmessage/helper_inbox.py
127	share/pybitmessage/helper_inbox.pyc	195	share/pybitmessage/helper_inbox.pyc
128	share/pybitmessage/helper_inbox.pyo	196	share/pybitmessage/helper_inbox.pyo
		197	share/pybitmessage/helper_search.py
		198	share/pybitmessage/helper_search.pyc
		199	share/pybitmessage/helper_search.pyo
129	share/pybitmessage/helper_sent.py	200	share/pybitmessage/helper_sent.py
130	share/pybitmessage/helper_sent.pyc	201	share/pybitmessage/helper_sent.pyc
131	share/pybitmessage/helper_sent.pyo	202	share/pybitmessage/helper_sent.pyo
Lines 135-140 Link Here
135	share/pybitmessage/helper_startup.py	206	share/pybitmessage/helper_startup.py
136	share/pybitmessage/helper_startup.pyc	207	share/pybitmessage/helper_startup.pyc
137	share/pybitmessage/helper_startup.pyo	208	share/pybitmessage/helper_startup.pyo
		209	share/pybitmessage/helper_threading.py
		210	share/pybitmessage/helper_threading.pyc
		211	share/pybitmessage/helper_threading.pyo
138	share/pybitmessage/highlevelcrypto.py	212	share/pybitmessage/highlevelcrypto.py
139	share/pybitmessage/highlevelcrypto.pyc	213	share/pybitmessage/highlevelcrypto.pyc
140	share/pybitmessage/highlevelcrypto.pyo	214	share/pybitmessage/highlevelcrypto.pyo
Lines 170-178 Link Here
170	share/pybitmessage/namecoin.py	244	share/pybitmessage/namecoin.py
171	share/pybitmessage/namecoin.pyc	245	share/pybitmessage/namecoin.pyc
172	share/pybitmessage/namecoin.pyo	246	share/pybitmessage/namecoin.pyo
		247	share/pybitmessage/openclpow.py
		248	share/pybitmessage/openclpow.pyc
		249	share/pybitmessage/openclpow.pyo
173	share/pybitmessage/proofofwork.py	250	share/pybitmessage/proofofwork.py
174	share/pybitmessage/proofofwork.pyc	251	share/pybitmessage/proofofwork.pyc
175	share/pybitmessage/proofofwork.pyo	252	share/pybitmessage/proofofwork.pyo
		253	share/pybitmessage/protocol.py
		254	share/pybitmessage/protocol.pyc
		255	share/pybitmessage/protocol.pyo
176	share/pybitmessage/pyelliptic/LICENSE	256	share/pybitmessage/pyelliptic/LICENSE
177	share/pybitmessage/pyelliptic/README.md	257	share/pybitmessage/pyelliptic/README.md
178	share/pybitmessage/pyelliptic/__init__.py	258	share/pybitmessage/pyelliptic/__init__.py
Lines 208-243 Link Here
208	share/pybitmessage/socks/__init__.py	288	share/pybitmessage/socks/__init__.py
209	share/pybitmessage/socks/__init__.pyc	289	share/pybitmessage/socks/__init__.pyc
210	share/pybitmessage/socks/__init__.pyo	290	share/pybitmessage/socks/__init__.pyo
		291	share/pybitmessage/sslkeys/cert.pem
		292	share/pybitmessage/sslkeys/key.pem
211	share/pybitmessage/tr.py	293	share/pybitmessage/tr.py
212	share/pybitmessage/tr.pyc	294	share/pybitmessage/tr.pyc
213	share/pybitmessage/tr.pyo	295	share/pybitmessage/tr.pyo
214	share/pybitmessage/translations/bitmessage_ar.pro	296	share/pybitmessage/translations/bitmessage.pro
215	share/pybitmessage/translations/bitmessage_ar.qm	297	share/pybitmessage/translations/bitmessage_ar.qm
216	share/pybitmessage/translations/bitmessage_ar.ts	298	share/pybitmessage/translations/bitmessage_ar.ts
217	share/pybitmessage/translations/bitmessage_de.pro	299	share/pybitmessage/translations/bitmessage_cs.qm
		300	share/pybitmessage/translations/bitmessage_cs.ts
		301	share/pybitmessage/translations/bitmessage_da.qm
		302	share/pybitmessage/translations/bitmessage_da.ts
218	share/pybitmessage/translations/bitmessage_de.qm	303	share/pybitmessage/translations/bitmessage_de.qm
219	share/pybitmessage/translations/bitmessage_de.ts	304	share/pybitmessage/translations/bitmessage_de.ts
220	share/pybitmessage/translations/bitmessage_en_pirate.pro	305	share/pybitmessage/translations/bitmessage_en.qm
		306	share/pybitmessage/translations/bitmessage_en.ts
221	share/pybitmessage/translations/bitmessage_en_pirate.qm	307	share/pybitmessage/translations/bitmessage_en_pirate.qm
222	share/pybitmessage/translations/bitmessage_en_pirate.ts	308	share/pybitmessage/translations/bitmessage_en_pirate.ts
223	share/pybitmessage/translations/bitmessage_eo.pro
224	share/pybitmessage/translations/bitmessage_eo.qm	309	share/pybitmessage/translations/bitmessage_eo.qm
225	share/pybitmessage/translations/bitmessage_eo.ts	310	share/pybitmessage/translations/bitmessage_eo.ts
226	share/pybitmessage/translations/bitmessage_fr.pro
227	share/pybitmessage/translations/bitmessage_fr.qm	311	share/pybitmessage/translations/bitmessage_fr.qm
228	share/pybitmessage/translations/bitmessage_fr.ts	312	share/pybitmessage/translations/bitmessage_fr.ts
229	share/pybitmessage/translations/bitmessage_ja.pro	313	share/pybitmessage/translations/bitmessage_it.qm
		314	share/pybitmessage/translations/bitmessage_it.ts
230	share/pybitmessage/translations/bitmessage_ja.qm	315	share/pybitmessage/translations/bitmessage_ja.qm
231	share/pybitmessage/translations/bitmessage_ja.ts	316	share/pybitmessage/translations/bitmessage_ja.ts
232	share/pybitmessage/translations/bitmessage_nl.pro	317	share/pybitmessage/translations/bitmessage_nb.ts
233	share/pybitmessage/translations/bitmessage_nl.qm	318	share/pybitmessage/translations/bitmessage_nl.qm
234	share/pybitmessage/translations/bitmessage_nl.ts	319	share/pybitmessage/translations/bitmessage_nl.ts
235	share/pybitmessage/translations/bitmessage_no.pro
236	share/pybitmessage/translations/bitmessage_no.qm	320	share/pybitmessage/translations/bitmessage_no.qm
237	share/pybitmessage/translations/bitmessage_no.ts	321	share/pybitmessage/translations/bitmessage_no.ts
238	share/pybitmessage/translations/bitmessage_ru.pro	322	share/pybitmessage/translations/bitmessage_pl.ts
		323	share/pybitmessage/translations/bitmessage_pt.ts
239	share/pybitmessage/translations/bitmessage_ru.qm	324	share/pybitmessage/translations/bitmessage_ru.qm
240	share/pybitmessage/translations/bitmessage_ru.ts	325	share/pybitmessage/translations/bitmessage_ru.ts
241	share/pybitmessage/translations/bitmessage_zh_cn.pro	326	share/pybitmessage/translations/bitmessage_sk.qm
		327	share/pybitmessage/translations/bitmessage_sk.ts
		328	share/pybitmessage/translations/bitmessage_sv.ts
242	share/pybitmessage/translations/bitmessage_zh_cn.qm	329	share/pybitmessage/translations/bitmessage_zh_cn.qm
243	share/pybitmessage/translations/bitmessage_zh_cn.ts	330	share/pybitmessage/translations/bitmessage_zh_cn.ts
		331	share/pybitmessage/upnp.py
		332	share/pybitmessage/upnp.pyc
		333	share/pybitmessage/upnp.pyo
		334	%%NATIVE_POW%%share/pybitmessage/bitmsghash/bitmsghash.so
		335	@dir share/icons/hicolor/scalable/apps

Return to bug 209278

Lines 2-10 Link Here

(-)net-p2p/bitmessage/Makefile (-6 / +26 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= bitmessage	4	PORTNAME= bitmessage
5	PORTVERSION= 0.4.4	5	PORTVERSION= 0.6.0
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 1
8	CATEGORIES= net-p2p	7	CATEGORIES= net-p2p
9		8
10	MAINTAINER= yuri@rawbw.com	9	MAINTAINER= yuri@rawbw.com
Lines 11-29 Link Here
11	COMMENT= Secure P2P communications client	10	COMMENT= Secure P2P communications client
12		11
13	LICENSE= MIT	12	LICENSE= MIT
		13	LICENSE_FILE= ${WRKSRC}/LICENSE
14		14
15	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \	15	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
16	${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:devel/py-qt4-core \	16	${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core \
17	${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:x11-toolkits/py-qt4-gui	17	${PYTHON_PKGNAMEPREFIX}qt4-network>=${PYQT4_VERSION}:${PORTSDIR}/net/py-qt4-network \
		18	${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
18		19
19	USE_GITHUB= yes	20	USE_GITHUB= yes
20	GH_ACCOUNT= Bitmessage	21	GH_ACCOUNT= Bitmessage
21	GH_PROJECT= PyBitmessage	22	GH_PROJECT= PyBitmessage
22		23
23	USES= python	24	USES= python pyqt:4
		25	NATIVE_POW_USES=gmake
24	USE_OPENSSL= yes	26	USE_OPENSSL= yes
25	INSTALLS_ICONS= yes	27	INSTALLS_ICONS= yes
26		28
		29	OPTIONS_DEFINE= NATIVE_POW
		30	OPTIONS_DEFAULT=NATIVE_POW
		31	NATIVE_POW_DESC=Native POW procedure
		32	OPTIONS_SUB= yes
		33
		34	.include <bsd.port.options.mk>
		35
27	post-patch:	36	post-patch:
28	${REINPLACE_CMD} -e 's\|python2\|${PYTHON_CMD}\| ; s\|share/man\|man\|' ${WRKSRC}/Makefile	37	${REINPLACE_CMD} -e 's\|python2\|${PYTHON_CMD}\| ; s\|share/man\|man\|' ${WRKSRC}/Makefile
29		38
Lines 33-37 Link Here
33	-d ${WRKSRC} -f ${WRKSRC} && \	42	-d ${WRKSRC} -f ${WRKSRC} && \
34	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \	43	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
35	-d ${WRKSRC} -f ${WRKSRC})	44	-d ${WRKSRC} -f ${WRKSRC})
		45	.if ${PORT_OPTIONS:MNATIVE_POW}
		46	@(cd ${WRKSRC} && \
		47	${ECHO_MSG} "===> Compiling the proof-of-work (POW) routine" && \
		48	(cd src/bitmsghash && ${MAKE_CMD}))
		49	.endif
36		50
		51	post-install:
		52	.if ${PORT_OPTIONS:MNATIVE_POW}
		53	@${RM} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.o
		54	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/share/pybitmessage/bitmsghash/bitmsghash.so
		55	.endif
		56
37	.include <bsd.port.mk>	57	.include <bsd.port.mk>

Lines 1-20 Link Here

(-)net-p2p/bitmessage/files/patch-Makefile (-15 / +31 lines)
1	--- ./Makefile.orig 2014-01-21 08:17:36.000000000 +0200	1	--- Makefile.orig 2016-05-02 19:51:46 UTC
2	+++ ./Makefile 2014-03-12 18:18:00.000000000 +0200	2	+++ Makefile
3	@@ -31,12 +31,13 @@	3	@@ -16,9 +16,9 @@ install:
4	install -m 644 desktop/can-icon.svg ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${APP}.svg	4	mkdir -p ${DESTDIR}${PREFIX}
5	cp -rf src/* ${DESTDIR}${PREFIX}/share/${APP}	5	mkdir -p ${DESTDIR}${PREFIX}/bin
6	echo '#!/bin/sh' > ${DESTDIR}${PREFIX}/bin/${APP}	6	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share
7	- echo 'if [ -d ${DESTDIR}/usr/local/share/${APP} ]; then' >> ${DESTDIR}${PREFIX}/bin/${APP}	7	- mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man
8	- echo ' cd ${DESTDIR}/usr/local/share/${APP}' >> ${DESTDIR}${PREFIX}/bin/${APP}	8	- mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man/man1
9	+ echo 'if [ -d ${PREFIX}/share/${APP} ]; then' >> ${DESTDIR}${PREFIX}/bin/${APP}	9	- install -m 644 man/${APP}.1.gz ${DESTDIR}${PREFIX}/share/man/man1
10	+ echo ' cd ${PREFIX}/share/${APP}' >> ${DESTDIR}${PREFIX}/bin/${APP}	10	+ mkdir -m 755 -p ${DESTDIR}${PREFIX}/man
		11	+ mkdir -m 755 -p ${DESTDIR}${PREFIX}/man/man1
		12	+ install -m 644 man/${APP}.1.gz ${DESTDIR}${PREFIX}/man/man1
		13	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/${APP}
		14	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/applications
		15	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/pixmaps
		16	@@ -35,16 +35,13 @@ install:
		17	echo "if [ -d ${PREFIX}/share/${APP} ]; then" >> ${DESTDIR}${PREFIX}/bin/${APP}
		18	echo " cd ${PREFIX}/share/${APP}" >> ${DESTDIR}${PREFIX}/bin/${APP}
11	echo 'else' >> ${DESTDIR}${PREFIX}/bin/${APP}	19	echo 'else' >> ${DESTDIR}${PREFIX}/bin/${APP}
12	- echo ' cd ${DESTDIR}/usr/share/pybitmessage' >> ${DESTDIR}${PREFIX}/bin/${APP}	20	- echo " cd /usr/share/pybitmessage" >> ${DESTDIR}${PREFIX}/bin/${APP}
13	+ echo ' echo "BitMessage directory not found"' >> ${DESTDIR}${PREFIX}/bin/${APP}	21	- echo 'fi' >> ${DESTDIR}${PREFIX}/bin/${APP}
		22	- echo 'if [ -d /opt/openssl-compat-bitcoin/lib ]; then' >> ${DESTDIR}${PREFIX}/bin/${APP}
		23	- echo ' LD_LIBRARY_PATH="/opt/openssl-compat-bitcoin/lib/" exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
		24	- echo 'else' >> ${DESTDIR}${PREFIX}/bin/${APP}
		25	- echo ' exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
		26	+ echo ' echo "BitMessage directory not found"' >> ${DESTDIR}${PREFIX}/bin/${APP}
14	+ echo ' exit 1' >> ${DESTDIR}${PREFIX}/bin/${APP}	27	+ echo ' exit 1' >> ${DESTDIR}${PREFIX}/bin/${APP}
15	echo 'fi' >> ${DESTDIR}${PREFIX}/bin/${APP}	28	echo 'fi' >> ${DESTDIR}${PREFIX}/bin/${APP}
16	- echo 'LD_LIBRARY_PATH="/opt/openssl-compat-bitcoin/lib/" exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}	29	+ echo 'exec python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
17	+ echo 'python2 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
18	chmod +x ${DESTDIR}${PREFIX}/bin/${APP}	30	chmod +x ${DESTDIR}${PREFIX}/bin/${APP}
19	uninstall:	31	uninstall:
20	rm -f ${PREFIX}/share/man/man1/${APP}.1.gz	32	- rm -f ${PREFIX}/share/man/man1/${APP}.1.gz
		33	+ rm -f ${PREFIX}/man/man1/${APP}.1.gz
		34	rm -rf ${PREFIX}/share/${APP}
		35	rm -f ${PREFIX}/bin/${APP}
		36	rm -f ${PREFIX}/share/applications/${APP}.desktop

Line 0 Link Here

(-)net-p2p/bitmessage/files/patch-src_bitmsghash_Makefile (+15 lines)
	1	--- src/bitmsghash/Makefile.orig 2016-05-02 19:51:46 UTC
	2	+++ src/bitmsghash/Makefile
	3	@@ -10,10 +10,10 @@ powtest:
	4	./testpow.py
	5
	6	bitmsghash.so: bitmsghash.o
	7	- g++ bitmsghash.o -shared -fPIC -lpthread -lcrypto $(LDFLAGS) -o bitmsghash.so
	8	+ ${CC} bitmsghash.o -shared -fPIC -lpthread -lcrypto $(LDFLAGS) -o bitmsghash.so
	9
	10	bitmsghash.o:
	11	- g++ -Wall -O3 -march=native -fPIC $(CCFLAGS) -c bitmsghash.cpp
	12	+ ${CC} -Wall -O3 -march=native -fPIC $(CCFLAGS) -c bitmsghash.cpp
	13
	14	clean:
	15	rm -f bitmsghash.o bitmsghash.so

Line 0 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__)
	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)