- Update to 2.1.1

PR:		199679
Submitted by:	kyuupichan@gmail.com(maintainer)

4 files changed, 21 insertions, 20 deletions

diff --git a/finance/electrum/Makefile b/finance/electrum/Makefile
index 1184f4b5d6f8..ffad06530831 100644
--- a/finance/electrum/Makefile
+++ b/finance/electrum/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	electrum
-PORTVERSION=	2.0.4
-PORTREVISION=	1
+PORTVERSION=	2.1.1
 CATEGORIES=	finance python
-MASTER_SITES=	http://download.electrum.org/
+MASTER_SITES=	https://download.electrum.org/ http://download.electrum.org/
 DISTNAME=	Electrum-${PORTVERSION}
 
 MAINTAINER=	kyuupichan@gmail.com
@@ -19,18 +18,15 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}slowaes>0:${PORTSDIR}/security/py-slowaes \
 		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.10.3:${PORTSDIR}/x11-toolkits/py-qt4-gui \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:${PORTSDIR}/www/py-requests \
 		${PYTHON_PKGNAMEPREFIX}qrcode>=5.1:${PORTSDIR}/textproc/py-qrcode \
-		${PYTHON_PKGNAMEPREFIX}asn1>=0.1.7:${PORTSDIR}/devel/py-asn1 \
-		${PYTHON_PKGNAMEPREFIX}asn1-modules>=0.0.5:${PORTSDIR}/devel/py-asn1-modules \
 		${PYTHON_PKGNAMEPREFIX}tlslite>=0.4.6:${PORTSDIR}/security/py-tlslite \
 		${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:${PORTSDIR}/security/py-pbkdf2 \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=2.6.0:${PORTSDIR}/devel/py-protobuf
 
-USES=		desktop-file-utils gettext python:-2.7
+USES=		desktop-file-utils python:-2.7
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	Electrum
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
-		${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/finance/electrum/distinfo b/finance/electrum/distinfo
index ba3beaa3cf8e..f4754098bc5a 100644
--- a/finance/electrum/distinfo
+++ b/finance/electrum/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Electrum-2.0.4.tar.gz) = b77f70efbe337387dd9654c660b96dc5608ff7a76fe8fdc573d747e17fce3b61
-SIZE (Electrum-2.0.4.tar.gz) = 1799318
+SHA256 (Electrum-2.1.1.tar.gz) = 958c7113072aa4a00a7e58a6e325d952fc35896a8678952cf6487636f74164e0
+SIZE (Electrum-2.1.1.tar.gz) = 1778994
diff --git a/finance/electrum/files/patch-setup.py b/finance/electrum/files/patch-setup.py
index 35e4e15d8e73..a2ad06a63418 100644
--- a/finance/electrum/files/patch-setup.py
+++ b/finance/electrum/files/patch-setup.py
@@ -1,13 +1,11 @@
---- setup.py.orig	2015-03-14 13:27:54 UTC
+--- setup.py.orig	2015-04-25 02:55:24 UTC
 +++ setup.py
-@@ -17,8 +17,8 @@ if sys.version_info[:3] < (2, 7, 0):
- 
+@@ -18,7 +18,7 @@ if sys.version_info[:3] < (2, 7, 0):
  
  data_files = []
--if platform.system() == 'Linux' or platform.system() == 'FreeBSD':
+ if platform.system() in [ 'Linux', 'FreeBSD', 'DragonFly']:
 -    usr_share = os.path.join(sys.prefix, "share")
-+if True:
 +    usr_share = '%%PREFIX%%/share'
      data_files += [
          (os.path.join(usr_share, 'applications/'), ['electrum.desktop']),
-         (os.path.join(usr_share, 'app-install', 'icons/'), ['icons/electrum.png'])
+         (os.path.join(usr_share, 'pixmaps/'), ['icons/electrum.png'])
diff --git a/finance/electrum/pkg-plist b/finance/electrum/pkg-plist
index 88d64d4f4ca3..5cddcf0cb419 100644
--- a/finance/electrum/pkg-plist
+++ b/finance/electrum/pkg-plist
@@ -1,12 +1,15 @@
 bin/electrum
-share/app-install/icons/electrum.png
 share/applications/electrum.desktop
+share/pixmaps/electrum.png
 %%PYTHON_SITELIBDIR%%/electrum/__init__.py
 %%PYTHON_SITELIBDIR%%/electrum/__init__.pyc
 %%PYTHON_SITELIBDIR%%/electrum/__init__.pyo
 %%PYTHON_SITELIBDIR%%/electrum/account.py
 %%PYTHON_SITELIBDIR%%/electrum/account.pyc
 %%PYTHON_SITELIBDIR%%/electrum/account.pyo
+%%PYTHON_SITELIBDIR%%/electrum/asn1tinydecoder.py
+%%PYTHON_SITELIBDIR%%/electrum/asn1tinydecoder.pyc
+%%PYTHON_SITELIBDIR%%/electrum/asn1tinydecoder.pyo
 %%PYTHON_SITELIBDIR%%/electrum/bitcoin.py
 %%PYTHON_SITELIBDIR%%/electrum/bitcoin.pyc
 %%PYTHON_SITELIBDIR%%/electrum/bitcoin.pyo
@@ -29,6 +32,7 @@ share/applications/electrum.desktop
 %%PYTHON_SITELIBDIR%%/electrum/interface.pyc
 %%PYTHON_SITELIBDIR%%/electrum/interface.pyo
 %%PYTHON_SITELIBDIR%%/electrum/locale/ar_SA/LC_MESSAGES/electrum.mo
+%%PYTHON_SITELIBDIR%%/electrum/locale/bg_BG/LC_MESSAGES/electrum.mo
 %%PYTHON_SITELIBDIR%%/electrum/locale/cs_CZ/LC_MESSAGES/electrum.mo
 %%PYTHON_SITELIBDIR%%/electrum/locale/da_DK/LC_MESSAGES/electrum.mo
 %%PYTHON_SITELIBDIR%%/electrum/locale/de_DE/LC_MESSAGES/electrum.mo
@@ -131,6 +135,9 @@ share/applications/electrum.desktop
 %%PYTHON_SITELIBDIR%%/electrum_gui/qt/__init__.py
 %%PYTHON_SITELIBDIR%%/electrum_gui/qt/__init__.pyc
 %%PYTHON_SITELIBDIR%%/electrum_gui/qt/__init__.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/address_dialog.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/address_dialog.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/address_dialog.pyo
 %%PYTHON_SITELIBDIR%%/electrum_gui/qt/amountedit.py
 %%PYTHON_SITELIBDIR%%/electrum_gui/qt/amountedit.pyc
 %%PYTHON_SITELIBDIR%%/electrum_gui/qt/amountedit.pyo
@@ -140,6 +147,9 @@ share/applications/electrum.desktop
 %%PYTHON_SITELIBDIR%%/electrum_gui/qt/history_widget.py
 %%PYTHON_SITELIBDIR%%/electrum_gui/qt/history_widget.pyc
 %%PYTHON_SITELIBDIR%%/electrum_gui/qt/history_widget.pyo
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/history_widget_lite.py
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/history_widget_lite.pyc
+%%PYTHON_SITELIBDIR%%/electrum_gui/qt/history_widget_lite.pyo
 %%PYTHON_SITELIBDIR%%/electrum_gui/qt/icons_rc.py
 %%PYTHON_SITELIBDIR%%/electrum_gui/qt/icons_rc.pyc
 %%PYTHON_SITELIBDIR%%/electrum_gui/qt/icons_rc.pyo
@@ -206,9 +216,6 @@ share/applications/electrum.desktop
 %%PYTHON_SITELIBDIR%%/electrum_plugins/btchipwallet.py
 %%PYTHON_SITELIBDIR%%/electrum_plugins/btchipwallet.pyc
 %%PYTHON_SITELIBDIR%%/electrum_plugins/btchipwallet.pyo
-%%PYTHON_SITELIBDIR%%/electrum_plugins/coinbase_buyback.py
-%%PYTHON_SITELIBDIR%%/electrum_plugins/coinbase_buyback.pyc
-%%PYTHON_SITELIBDIR%%/electrum_plugins/coinbase_buyback.pyo
 %%PYTHON_SITELIBDIR%%/electrum_plugins/cosigner_pool.py
 %%PYTHON_SITELIBDIR%%/electrum_plugins/cosigner_pool.pyc
 %%PYTHON_SITELIBDIR%%/electrum_plugins/cosigner_pool.pyo