7 files changed, 70 insertions, 48 deletions

diff --git a/net/py-bittornado/Makefile b/net/py-bittornado/Makefile
index 30c6621a7281..cd0aa5a02083 100644
--- a/net/py-bittornado/Makefile
+++ b/net/py-bittornado/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	BitTornado
-PORTVERSION=	0.2.0
+PORTVERSION=	0.3.1
 PORTEPOCH=	1
 CATEGORIES?=	net python ipv6
 MASTER_SITES=	http://e.scarywater.net/bt/download/ \
@@ -14,7 +14,7 @@ MASTER_SITES=	http://e.scarywater.net/bt/download/ \
 		http://www.hypermax.net.au/~gamr/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	sw@gegenunendlich.de
+MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT?=	An extended BitTorrent peer-to-peer tool for distributing files
 
 CONFLICTS=	py??-*[Bb]it[Tt]orrent*
diff --git a/net/py-bittornado/distinfo b/net/py-bittornado/distinfo
index 6f6317dc4b93..4a09158402cc 100644
--- a/net/py-bittornado/distinfo
+++ b/net/py-bittornado/distinfo
@@ -1,2 +1,2 @@
-MD5 (BitTornado-0.2.0.tar.gz) = 14b40c51bd042bff1c89a71707eede3b
-SIZE (BitTornado-0.2.0.tar.gz) = 160275
+MD5 (BitTornado-0.3.1.tar.gz) = 2033bd80e5678a495609119578373091
+SIZE (BitTornado-0.3.1.tar.gz) = 173921
diff --git a/net/py-bittornado/files/extra-gui-patch-setup.py b/net/py-bittornado/files/extra-gui-patch-setup.py
index 4c802c689a23..55dbef22e429 100644
--- a/net/py-bittornado/files/extra-gui-patch-setup.py
+++ b/net/py-bittornado/files/extra-gui-patch-setup.py
@@ -1,18 +1,16 @@
 
 $FreeBSD$
 
---- setup.py.orig	Sun Apr  4 23:20:04 2004
-+++ setup.py	Sun Apr  4 23:21:13 2004
-@@ -23,8 +23,9 @@
-         "btdownloadcurses.py", "btcompletedirgui.py", "btlaunchmanycurses.py", 
-         "btmakemetafile.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py",
+--- setup.py.orig	Sun May 16 13:40:26 2004
++++ setup.py	Tue May 25 10:14:43 2004
+@@ -25,5 +25,9 @@
          "bttest.py",
--        'btmaketorrentgui.py', 'btcopyannounce.py', 'btsethttpseeds.py', 'bt-t-make.py',
--        'alloc.gif','black1.ico','black.ico','blue.ico','green1.ico','green.ico',
-+        'btmaketorrentgui.py', 'btcopyannounce.py', 'btsethttpseeds.py', 'bt-t-make.py'],
-+     data_files=[('share/BitTornado', 
-+        ['alloc.gif','black1.ico','black.ico','blue.ico','green1.ico','green.ico',
-         'icon_bt.ico','icon_done.ico','red.ico','white.ico',
--        'yellow1.ico','yellow.ico']
-+        'yellow1.ico','yellow.ico'])]
+         'btmaketorrentgui.py', 'btcopyannounce.py', 'btsethttpseeds.py',
+         'bt-t-make.py',
+-        ]
++        ],
++    data_files = [('share/BitTornado', 
++	['alloc.gif','black1.ico','black.ico','blue.ico','green1.ico','green.ico',
++          'icon_bt.ico','icon_done.ico','red.ico','white.ico',
++         'yellow1.ico','yellow.ico'])]
      )
diff --git a/net/py-bittornado/files/extra-nogui-patch-setup.py b/net/py-bittornado/files/extra-nogui-patch-setup.py
index 6ec62a70a9c6..72c7bc5350b1 100644
--- a/net/py-bittornado/files/extra-nogui-patch-setup.py
+++ b/net/py-bittornado/files/extra-nogui-patch-setup.py
@@ -1,22 +1,26 @@
---- setup.py.orig	Sat Apr  3 01:56:44 2004
-+++ setup.py	Wed Apr 14 15:57:49 2004
-@@ -18,13 +18,14 @@
+
+$FreeBSD$
+
+--- setup.py.orig	Sun May 16 13:40:26 2004
++++ setup.py	Tue May 25 10:21:43 2004
+@@ -18,12 +18,16 @@
      
      packages = ["BitTornado","BitTornado.BT1"],
  
--    scripts = ["btdownloadgui.py", "btdownloadheadless.py", "btdownloadlibrary.py", 
-+    scripts = ["btdownloadheadless.py", "btdownloadlibrary.py", 
+-    scripts = ["btdownloadgui.py", "btdownloadheadless.py", 
++    scripts = ["btdownloadheadless.py", 
          "bttrack.py", "btmakemetafile.py", "btlaunchmany.py", "btcompletedir.py",
 -        "btdownloadcurses.py", "btcompletedirgui.py", "btlaunchmanycurses.py", 
 +        "btdownloadcurses.py", "btlaunchmanycurses.py", 
          "btmakemetafile.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py",
          "bttest.py",
--        'btmaketorrentgui.py', 'btcopyannounce.py', 'btsethttpseeds.py', 'bt-t-make.py',
--        'alloc.gif','black1.ico','black.ico','blue.ico','green1.ico','green.ico',
-+        'btcopyannounce.py', 'btsethttpseeds.py', 'bt-t-make.py'],
-+     data_files=[('share/BitTornado', 
-+        ['alloc.gif','black1.ico','black.ico','blue.ico','green1.ico','green.ico',
-         'icon_bt.ico','icon_done.ico','red.ico','white.ico',
--        'yellow1.ico','yellow.ico']
-+        'yellow1.ico','yellow.ico'])]
+-        'btmaketorrentgui.py', 'btcopyannounce.py', 'btsethttpseeds.py',
++        'btcopyannounce.py', 'btsethttpseeds.py',
+         'bt-t-make.py',
+-        ]
++        ],
++    data_files = [('share/BitTornado', 
++	['alloc.gif','black1.ico','black.ico','blue.ico','green1.ico','green.ico',
++          'icon_bt.ico','icon_done.ico','red.ico','white.ico',
++         'yellow1.ico','yellow.ico'])]
      )
diff --git a/net/py-bittornado/files/patch-BitTornado_ConfigDir.py b/net/py-bittornado/files/patch-BitTornado_ConfigDir.py
new file mode 100644
index 000000000000..29b09ffbaf38
--- /dev/null
+++ b/net/py-bittornado/files/patch-BitTornado_ConfigDir.py
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- BitTornado/ConfigDir.py.orig	Tue May 25 09:55:49 2004
++++ BitTornado/ConfigDir.py	Tue May 25 09:56:59 2004
+@@ -15,7 +15,7 @@
+     True = 1
+     False = 0
+ 
+-OLDICONPATH = os.path.abspath(os.path.dirname(os.path.realpath(sys.argv[0])))
++OLDICONPATH="%%PREFIX%%/share/BitTornado"
+ 
+ DIRNAME = '.'+product_name
+ 
diff --git a/net/py-bittornado/files/patch-btdownloadgui.py b/net/py-bittornado/files/patch-btdownloadgui.py
deleted file mode 100644
index 196941630f62..000000000000
--- a/net/py-bittornado/files/patch-btdownloadgui.py
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- btdownloadgui.py.orig	Sun Apr  4 23:40:03 2004
-+++ btdownloadgui.py	Sun Apr  4 23:40:50 2004
-@@ -48,7 +48,7 @@
- 
- PROFILER = False
- 
--basepath=os.path.abspath(os.path.dirname(os.path.realpath(sys.argv[0])))
-+basepath="%%PREFIX%%/share/BitTornado"
- 
- def hours(n):
-     if n == -1:
diff --git a/net/py-bittornado/pkg-plist b/net/py-bittornado/pkg-plist
index bbb13ee33b60..83184dbd1dd1 100644
--- a/net/py-bittornado/pkg-plist
+++ b/net/py-bittornado/pkg-plist
@@ -5,7 +5,6 @@ bin/btcopyannounce.py
 bin/btdownloadcurses.py
 %%GUI%%bin/btdownloadgui.py
 bin/btdownloadheadless.py
-bin/btdownloadlibrary.py
 bin/btlaunchmany.py
 bin/btlaunchmanycurses.py
 bin/btmakemetafile.py
@@ -31,6 +30,9 @@ bin/bttrack.py
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/Encrypter.py
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/Encrypter.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/Encrypter.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/FileSelector.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/FileSelector.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/FileSelector.pyo
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/HTTPDownloader.py
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/HTTPDownloader.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/HTTPDownloader.pyo
@@ -52,6 +54,9 @@ bin/bttrack.py
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/StorageWrapper.py
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/StorageWrapper.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/StorageWrapper.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/StreamCheck.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/StreamCheck.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/StreamCheck.pyo
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/T2T.py
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/T2T.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/T2T.pyo
@@ -64,24 +69,30 @@ bin/bttrack.py
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/btformats.py
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/btformats.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/btformats.pyo
-%%PYTHON_SITELIBDIR%%/BitTornado/BT1/download.py
-%%PYTHON_SITELIBDIR%%/BitTornado/BT1/download.pyc
-%%PYTHON_SITELIBDIR%%/BitTornado/BT1/download.pyo
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/fakeopen.py
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/fakeopen.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/fakeopen.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/makemetafile.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/makemetafile.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/makemetafile.pyo
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/testtest.py
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/testtest.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/testtest.pyo
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/track.py
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/track.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/track.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/ConfigDir.py
+%%PYTHON_SITELIBDIR%%/BitTornado/ConfigDir.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/ConfigDir.pyo
 %%PYTHON_SITELIBDIR%%/BitTornado/ConfigReader.py
 %%PYTHON_SITELIBDIR%%/BitTornado/ConfigReader.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/ConfigReader.pyo
 %%PYTHON_SITELIBDIR%%/BitTornado/ConnChoice.py
 %%PYTHON_SITELIBDIR%%/BitTornado/ConnChoice.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/ConnChoice.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/CreateIcons.py
+%%PYTHON_SITELIBDIR%%/BitTornado/CreateIcons.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/CreateIcons.pyo
 %%PYTHON_SITELIBDIR%%/BitTornado/CurrentRateMeasure.py
 %%PYTHON_SITELIBDIR%%/BitTornado/CurrentRateMeasure.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/CurrentRateMeasure.pyo
@@ -115,12 +126,21 @@ bin/bttrack.py
 %%PYTHON_SITELIBDIR%%/BitTornado/bitfield.py
 %%PYTHON_SITELIBDIR%%/BitTornado/bitfield.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/bitfield.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/clock.py
+%%PYTHON_SITELIBDIR%%/BitTornado/clock.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/clock.pyo
 %%PYTHON_SITELIBDIR%%/BitTornado/download_bt1.py
 %%PYTHON_SITELIBDIR%%/BitTornado/download_bt1.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/download_bt1.pyo
 %%PYTHON_SITELIBDIR%%/BitTornado/launchmanycore.py
 %%PYTHON_SITELIBDIR%%/BitTornado/launchmanycore.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/launchmanycore.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/inifile.py
+%%PYTHON_SITELIBDIR%%/BitTornado/inifile.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/inifile.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/natpunch.py
+%%PYTHON_SITELIBDIR%%/BitTornado/natpunch.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/natpunch.pyo
 %%PYTHON_SITELIBDIR%%/BitTornado/parseargs.py
 %%PYTHON_SITELIBDIR%%/BitTornado/parseargs.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/parseargs.pyo