- Update to 0.6.1

PR:		212046
Submitted by:	yuri@rawbw.com (maintainer)
This commit is contained in:
Dmitry Marakasov 2016-10-06 15:51:59 +00:00
parent c5697ce63f
commit 7f8ce9410d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=423411
6 changed files with 38 additions and 41 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bitmessage
PORTVERSION= 0.6.0
PORTVERSION= 0.6.1
DISTVERSIONPREFIX= v
CATEGORIES= net-p2p
@ -29,32 +29,40 @@ OPTIONS_DEFINE= NATIVE_POW
OPTIONS_DEFAULT=NATIVE_POW
NATIVE_POW_DESC=Native POW procedure
OPTIONS_SUB= yes
.include <bsd.port.options.mk>
REINPLACE_ARGS= -i ''
post-patch:
${REINPLACE_CMD} -e 's|python2|${PYTHON_CMD}| ; s|share/man|man|' \
@${REINPLACE_CMD} -e 's|python2|${PYTHON_CMD}| ; s|share/man|man|' \
${WRKSRC}/Makefile
${REINPLACE_CMD} -e "s|\((CCFLAGS)\)|\1 -I${OPENSSLINC} |g" \
@${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} && \
${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-d ${WRKSRC} -f ${WRKSRC} && \
${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
-d ${WRKSRC} -f ${WRKSRC})
.if ${PORT_OPTIONS:MNATIVE_POW}
${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-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:
.if ${PORT_OPTIONS:MNATIVE_POW}
@${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>

View file

@ -1,2 +1,3 @@
SHA256 (Bitmessage-PyBitmessage-v0.6.0_GH0.tar.gz) = 3bee5ca3fe42a95a0bf1f9f7285904e18ae56b0189048968a5257676f25adc08
SIZE (Bitmessage-PyBitmessage-v0.6.0_GH0.tar.gz) = 923755
TIMESTAMP = 1471861326
SHA256 (Bitmessage-PyBitmessage-v0.6.1_GH0.tar.gz) = ceb6585c816bbcafc63cf3ea55b709ddf1dc1d48012509ef3c47dcdb553ed2b9
SIZE (Bitmessage-PyBitmessage-v0.6.1_GH0.tar.gz) = 962301

View file

@ -1,4 +1,4 @@
--- Makefile.orig 2016-05-02 19:51:46 UTC
--- Makefile.orig 2016-08-21 09:56:25 UTC
+++ Makefile
@@ -16,9 +16,9 @@ install:
mkdir -p ${DESTDIR}${PREFIX}
@ -26,7 +26,7 @@
+ 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 'exec /usr/local/bin/python2.7 bitmessagemain.py' >> ${DESTDIR}${PREFIX}/bin/${APP}
chmod +x ${DESTDIR}${PREFIX}/bin/${APP}
uninstall:
- rm -f ${PREFIX}/share/man/man1/${APP}.1.gz

View file

@ -1,4 +1,4 @@
--- src/bitmsghash/Makefile.orig 2016-05-02 19:51:46 UTC
--- src/bitmsghash/Makefile.orig 2016-08-21 09:56:25 UTC
+++ src/bitmsghash/Makefile
@@ -10,10 +10,10 @@ powtest:
./testpow.py

View file

@ -1,20 +0,0 @@
--- 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)

View file

@ -134,9 +134,6 @@ share/pybitmessage/bitmessageqt/wanlan.ui
share/pybitmessage/bitmessageqt/widgets.py
share/pybitmessage/bitmessageqt/widgets.pyc
share/pybitmessage/bitmessageqt/widgets.pyo
share/pybitmessage/bitmsghash/Makefile
share/pybitmessage/bitmsghash/bitmsghash.cl
share/pybitmessage/bitmsghash/bitmsghash.cpp
share/pybitmessage/build_osx.py
share/pybitmessage/build_osx.pyc
share/pybitmessage/build_osx.pyo
@ -170,6 +167,12 @@ share/pybitmessage/class_singleListener.pyo
share/pybitmessage/class_singleWorker.py
share/pybitmessage/class_singleWorker.pyc
share/pybitmessage/class_singleWorker.pyo
share/pybitmessage/class_smtpDeliver.py
share/pybitmessage/class_smtpDeliver.pyc
share/pybitmessage/class_smtpDeliver.pyo
share/pybitmessage/class_smtpServer.py
share/pybitmessage/class_smtpServer.pyc
share/pybitmessage/class_smtpServer.pyo
share/pybitmessage/class_sqlThread.py
share/pybitmessage/class_sqlThread.pyc
share/pybitmessage/class_sqlThread.pyo
@ -194,6 +197,9 @@ share/pybitmessage/helper_generic.pyo
share/pybitmessage/helper_inbox.py
share/pybitmessage/helper_inbox.pyc
share/pybitmessage/helper_inbox.pyo
share/pybitmessage/helper_msgcoding.py
share/pybitmessage/helper_msgcoding.pyc
share/pybitmessage/helper_msgcoding.pyo
share/pybitmessage/helper_search.py
share/pybitmessage/helper_search.pyc
share/pybitmessage/helper_search.pyo
@ -320,6 +326,8 @@ share/pybitmessage/translations/bitmessage_nl.ts
share/pybitmessage/translations/bitmessage_no.qm
share/pybitmessage/translations/bitmessage_no.ts
share/pybitmessage/translations/bitmessage_pl.ts
share/pybitmessage/translations/bitmessage_pl.qm
share/pybitmessage/translations/bitmessage_pt.qm
share/pybitmessage/translations/bitmessage_pt.ts
share/pybitmessage/translations/bitmessage_ru.qm
share/pybitmessage/translations/bitmessage_ru.ts