Attachment 175037 Details for Bug 212046 – patch

[patch] patch

bitmessage.patch (text/plain), 7.15 KB, created by Yuri Victorovich on 2016-09-21 17:32:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2016-09-21 17:32:44 UTC

Size: 7.15 KB

patch

obsolete

>Index: net-p2p/bitmessage/Makefile
>===================================================================
>--- net-p2p/bitmessage/Makefile	(revision 421993)
>+++ net-p2p/bitmessage/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	bitmessage
>-PORTVERSION=	0.6.0
>+PORTVERSION=	0.6.1
> DISTVERSIONPREFIX=	v
> CATEGORIES=	net-p2p
> 
>@@ -29,9 +29,8 @@
> 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
>@@ -38,6 +37,12 @@
> 	${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} && \
>@@ -45,16 +50,17 @@
> 		-d ${WRKSRC} -f ${WRKSRC} && \
> 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
> 		-d ${WRKSRC} -f ${WRKSRC})
>-.if ${PORT_OPTIONS:MNATIVE_POW}
>+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>
>Index: net-p2p/bitmessage/distinfo
>===================================================================
>--- net-p2p/bitmessage/distinfo	(revision 421993)
>+++ net-p2p/bitmessage/distinfo	(working copy)
>@@ -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
>Index: net-p2p/bitmessage/files/patch-Makefile
>===================================================================
>--- net-p2p/bitmessage/files/patch-Makefile	(revision 421993)
>+++ net-p2p/bitmessage/files/patch-Makefile	(working copy)
>@@ -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
>Index: net-p2p/bitmessage/files/patch-src_bitmsghash_Makefile
>===================================================================
>--- net-p2p/bitmessage/files/patch-src_bitmsghash_Makefile	(revision 421993)
>+++ net-p2p/bitmessage/files/patch-src_bitmsghash_Makefile	(working copy)
>@@ -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
>Index: net-p2p/bitmessage/files/patch-src_bitmsghash_bitmsghash.cpp
>===================================================================
>--- net-p2p/bitmessage/files/patch-src_bitmsghash_bitmsghash.cpp	(revision 421993)
>+++ net-p2p/bitmessage/files/patch-src_bitmsghash_bitmsghash.cpp	(nonexistent)
>@@ -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)
>
>Property changes on: net-p2p/bitmessage/files/patch-src_bitmsghash_bitmsghash.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net-p2p/bitmessage/pkg-plist
>===================================================================
>--- net-p2p/bitmessage/pkg-plist	(revision 421993)
>+++ net-p2p/bitmessage/pkg-plist	(working copy)
>@@ -134,9 +134,6 @@
> 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_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_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_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

Flags:

yuri: maintainer-approval+

Actions: View | Diff

Attachments on bug 212046: 173933 | 174435 | 175037