Update to 2.5

Changes:	https://github.com/niltonvolpato/python-progressbar/commits/master

3 files changed, 4 insertions, 49 deletions

diff --git a/misc/py-progressbar/Makefile b/misc/py-progressbar/Makefile
index dc28a116cb58..4cc35ec9e262 100644
--- a/misc/py-progressbar/Makefile
+++ b/misc/py-progressbar/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	progressbar
-PORTVERSION=	2.3
-PORTREVISION=	2
+PORTVERSION=	2.5
 CATEGORIES=	misc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/misc/py-progressbar/distinfo b/misc/py-progressbar/distinfo
index dca4147c189c..e5e0457ce5db 100644
--- a/misc/py-progressbar/distinfo
+++ b/misc/py-progressbar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474489431
-SHA256 (progressbar-2.3.tar.gz) = b2d38a729785149e65323381d2e6fca0a5e9615a6d8bcf10bfa8adedfc481254
-SIZE (progressbar-2.3.tar.gz) = 9420
+TIMESTAMP = 1535388743
+SHA256 (progressbar-2.5.tar.gz) = 5d81cb529da2e223b53962afd6c8ca0f05c6670e40309a7219eacc36af9b6c63
+SIZE (progressbar-2.5.tar.gz) = 10046
diff --git a/misc/py-progressbar/files/patch-progressbar-widgets.py b/misc/py-progressbar/files/patch-progressbar-widgets.py
deleted file mode 100644
index 2a450e7047a3..000000000000
--- a/misc/py-progressbar/files/patch-progressbar-widgets.py
+++ /dev/null
@@ -1,44 +0,0 @@
---- progressbar/widgets.py.orig	2011-05-15 23:08:48 UTC
-+++ progressbar/widgets.py
-@@ -84,8 +84,8 @@ class Timer(Widget):
-     __slots__ = ('format',)
-     TIME_SENSITIVE = True
- 
--    def __init__(self, format='Elapsed Time: %s'):
--        self.format = format
-+    def __init__(self, _format='Elapsed Time: %s'):
-+        self.format = _format
- 
-     @staticmethod
-     def format_time(seconds):
-@@ -121,7 +121,7 @@ class ETA(Timer):
- class FileTransferSpeed(Widget):
-     'Widget for showing the transfer speed (useful for file transfers).'
- 
--    format = '%6.2f %s%s/s'
-+    _format = '%6.2f %s%s/s'
-     prefixes = ' kMGTPEZY'
-     __slots__ = ('unit', 'format')
- 
-@@ -170,8 +170,8 @@ class Counter(Widget):
- 
-     __slots__ = ('format',)
- 
--    def __init__(self, format='%d'):
--        self.format = format
-+    def __init__(self, _format='%d'):
-+        self.format = _format
- 
-     def update(self, pbar):
-         return self.format % pbar.currval
-@@ -198,8 +198,8 @@ class FormatLabel(Timer):
-     }
- 
-     __slots__ = ('format',)
--    def __init__(self, format):
--        self.format = format
-+    def __init__(self, _format):
-+        self.format = _format
- 
-     def update(self, pbar):
-         context = {}