Index: head/finance/electrum/Makefile =================================================================== --- head/finance/electrum/Makefile (revision 464359) +++ head/finance/electrum/Makefile (revision 464360) @@ -1,63 +1,63 @@ # Created by: Neil Booth # $FreeBSD$ PORTNAME= electrum -PORTVERSION= 3.1.0 +PORTVERSION= 3.1.1 CATEGORIES= finance python MASTER_SITES= https://download.electrum.org/${PORTVERSION}/ \ http://download.electrum.org/${PORTVERSION}/ DISTNAME= Electrum-${PORTVERSION} MAINTAINER= ehaupt@FreeBSD.org COMMENT= Easy to use Bitcoin client LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonrpclib-pelix>0:devel/py-jsonrpclib-pelix@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py-pbkdf2@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=2.6.0:devel/py-protobuf@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyaes>0:security/py-pyaes@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qrcode>=5.1:textproc/py-qrcode@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests@${FLAVOR} CONFLICTS_INSTALL= electrum2-* USES= desktop-file-utils pyqt:5 python:3.4+ USE_PYQT= gui_run sip widgets USE_PYTHON= autoplist distutils optsuffix PYDISTUTILS_PKGNAME= Electrum NO_ARCH= yes OPTIONS_SUB= yes OPTIONS_DEFINE= LEDGER TREZOR OPTIONS_DEFAULT=LEDGER TREZOR LEDGER_DESC= Enable LEDGER Bitcoin hardware wallet support TREZOR_DESC= Enable TREZOR Bitcoin hardware wallet support LEDGER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}btchip-python>0:security/py-btchip-python@${FLAVOR} TREZOR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}trezor>0:security/py-trezor@${FLAVOR} LEDGER_PLIST_FILES= "@sample etc/devd/ledger_wallet.conf.sample" TREZOR_PLIST_FILES= "@sample etc/devd/trezor_wallet.conf.sample" LEDGER_SUB_FILES= pkg-message-hwwallet TREZOR_SUB_FILES= pkg-message-hwwallet post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/setup.py post-install-LEDGER-on: ${INSTALL_DATA} ${FILESDIR}/ledger_wallet.conf.sample \ ${STAGEDIR}${PREFIX}/etc/devd post-install-TREZOR-on: ${INSTALL_DATA} ${FILESDIR}/trezor_wallet.conf.sample \ ${STAGEDIR}${PREFIX}/etc/devd .include Index: head/finance/electrum/distinfo =================================================================== --- head/finance/electrum/distinfo (revision 464359) +++ head/finance/electrum/distinfo (revision 464360) @@ -1,3 +1,3 @@ -TIMESTAMP = 1520325647 -SHA256 (Electrum-3.1.0.tar.gz) = e8f87fc2c36086e550c543e9fc0eac978c3bce85826c353c4f85248427f580c1 -SIZE (Electrum-3.1.0.tar.gz) = 2727509 +TIMESTAMP = 1520916612 +SHA256 (Electrum-3.1.1.tar.gz) = 3195679f898bd763c6db32f46bbdf59fa5a211fd3013507f5c7aab25d9b94337 +SIZE (Electrum-3.1.1.tar.gz) = 2722902 Index: head/finance/electrum/files/patch-setup.py =================================================================== --- head/finance/electrum/files/patch-setup.py (revision 464359) +++ head/finance/electrum/files/patch-setup.py (revision 464360) @@ -1,15 +1,24 @@ ---- setup.py.orig 2017-03-23 01:56:41 UTC +--- setup.py.orig 2018-03-12 17:25:11 UTC +++ setup.py -@@ -21,12 +21,6 @@ if platform.system() in ['Linux', 'FreeB +@@ -27,12 +27,6 @@ if platform.system() in ['Linux', 'FreeB parser.add_argument('--root=', dest='root_path', metavar='dir', default='/') opts, _ = parser.parse_known_args(sys.argv[1:]) usr_share = os.path.join(sys.prefix, "share") - if not os.access(opts.root_path + usr_share, os.W_OK) and \ - not os.access(opts.root_path, os.W_OK): - if 'XDG_DATA_HOME' in os.environ.keys(): - usr_share = os.environ['XDG_DATA_HOME'] - else: - usr_share = os.path.expanduser('~/.local/share') data_files += [ (os.path.join(usr_share, 'applications/'), ['electrum.desktop']), (os.path.join(usr_share, 'pixmaps/'), ['icons/electrum.png']) +@@ -86,8 +80,3 @@ setup( + url="https://electrum.org", + long_description="""Lightweight Bitcoin Wallet""" + ) +- +-# Optional modules (not required to run Electrum) +-import pip +-opt_modules = requirements_hw + ['pycryptodomex'] +-[ pip.main(['install', m]) for m in opt_modules ]