Date: Sun, 19 Mar 2017 23:58:45 +0000 (UTC) From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436515 - in head/net-p2p/bitmessage: . files Message-ID: <201703192358.v2JNwjlW099712@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jrm Date: Sun Mar 19 23:58:44 2017 New Revision: 436515 URL: https://svnweb.freebsd.org/changeset/ports/436515 Log: net-p2p/bitmessage: Update to 0.6.2 Also: - add runtime dependencies on devel/py-qt4-core, net/py-qt4-network x11-toolkits/py-qt4-gui, devel/py-msgpack-python, and devel/py-pyopencl - use gmake - remove Makefile, src/bitmsghash_Makefile patches - add setup.py patch - add USE_PYTHON=distutils autoplist PR: 217856 Submitted by: yuri@rawbw.com (maintainer) Approved by: swills (mentor, implicit) Added: head/net-p2p/bitmessage/files/patch-setup.py (contents, props changed) Deleted: head/net-p2p/bitmessage/files/patch-Makefile head/net-p2p/bitmessage/files/patch-src_bitmsghash_Makefile head/net-p2p/bitmessage/pkg-plist Modified: head/net-p2p/bitmessage/Makefile head/net-p2p/bitmessage/distinfo Modified: head/net-p2p/bitmessage/Makefile ============================================================================== --- head/net-p2p/bitmessage/Makefile Sun Mar 19 22:14:03 2017 (r436514) +++ head/net-p2p/bitmessage/Makefile Sun Mar 19 23:58:44 2017 (r436515) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= bitmessage -PORTVERSION= 0.6.1 -PORTREVISION= 1 +PORTVERSION= 0.6.2 DISTVERSIONPREFIX= v CATEGORIES= net-p2p @@ -13,31 +12,26 @@ COMMENT= Secure P2P communications clien LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ + ${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:devel/py-qt4-core \ + ${PYTHON_PKGNAMEPREFIX}qt4-network>=${PYQT4_VERSION}:net/py-qt4-network \ + ${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:x11-toolkits/py-qt4-gui \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python \ + ${PYTHON_PKGNAMEPREFIX}pyopencl>0:devel/py-pyopencl USE_GITHUB= yes GH_ACCOUNT= Bitmessage GH_PROJECT= PyBitmessage -USES= python pyqt:4 ssl +USES= gmake python pyqt:4 ssl USE_PYQT= core_run gui_run network_run -NATIVE_POW_USES=gmake +USE_PYTHON= distutils autoplist INSTALLS_ICONS= yes - -OPTIONS_DEFINE= NATIVE_POW -OPTIONS_DEFAULT=NATIVE_POW -NATIVE_POW_DESC=Native POW procedure -OPTIONS_SUB= yes REINPLACE_ARGS= -i '' post-patch: - @${REINPLACE_CMD} -e 's|@PYTHON@|${PYTHON_CMD}|' \ - ${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|^#!.*$$|#!${PYTHON_CMD}|' \ - ${WRKSRC}/compiletest.py ${WRKSRC}/src/bitmessagecli.py ${WRKSRC}/src/bitmessagemain.py \ + ${WRKSRC}/build/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 @@ -49,18 +43,7 @@ do-build: ${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})) - 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 + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pybitmessage/bitmsghash/bitmsghash.so .include <bsd.port.mk> Modified: head/net-p2p/bitmessage/distinfo ============================================================================== --- head/net-p2p/bitmessage/distinfo Sun Mar 19 22:14:03 2017 (r436514) +++ head/net-p2p/bitmessage/distinfo Sun Mar 19 23:58:44 2017 (r436515) @@ -1,3 +1,3 @@ -TIMESTAMP = 1471861326 -SHA256 (Bitmessage-PyBitmessage-v0.6.1_GH0.tar.gz) = ceb6585c816bbcafc63cf3ea55b709ddf1dc1d48012509ef3c47dcdb553ed2b9 -SIZE (Bitmessage-PyBitmessage-v0.6.1_GH0.tar.gz) = 962301 +TIMESTAMP = 1489654811 +SHA256 (Bitmessage-PyBitmessage-v0.6.2_GH0.tar.gz) = bc209725ef7c1b913ec8560557e3e862a11f664bd8c5fd2eea5adcd915acc2c6 +SIZE (Bitmessage-PyBitmessage-v0.6.2_GH0.tar.gz) = 1053815 Added: head/net-p2p/bitmessage/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/bitmessage/files/patch-setup.py Sun Mar 19 23:58:44 2017 (r436515) @@ -0,0 +1,35 @@ +--- setup.py.orig 2017-03-01 12:12:31 UTC ++++ setup.py +@@ -117,13 +117,7 @@ def detectOS(): + def detectPrereqs(missing=False): + available = [] + for module in packageName.keys(): +- try: +- import_module(module) +- if not missing: +- available.append(module) +- except ImportError: +- if missing: +- available.append(module) ++ available.append(module) + return available + + +@@ -146,7 +140,7 @@ def compilerToPackages(): + if __name__ == "__main__": + detectOS.result = None + detectPrereqs.result = None +- if detectPrereqs(True) != [] and detectOS() in packageManager: ++ if False and detectPrereqs(True) != [] and detectOS() in packageManager: + if detectOS() is not None: + print "It looks like you're using %s. " \ + "It is highly recommended to use the package manager " \ +@@ -159,7 +153,7 @@ if __name__ == "__main__": + print "It looks like you're missing setuptools." + sys.exit() + +- if detectPrereqs(True) != []: ++ if False and detectPrereqs(True) != []: + print "Press Return to continue" + try: + nothing = raw_input()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703192358.v2JNwjlW099712>