Update to 4.0.1

5 files changed, 11 insertions, 34 deletions

diff --git a/net/py-bittorrent/Makefile b/net/py-bittorrent/Makefile
index 2b8f67877931..86a4ccfabf7a 100644
--- a/net/py-bittorrent/Makefile
+++ b/net/py-bittorrent/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	BitTorrent
-PORTVERSION=	4.0.0
-PORTREVISION=	1
+PORTVERSION=	4.0.1
 PORTEPOCH=	1
 CATEGORIES?=	net python
 MASTER_SITES=	http://www.bittorrent.com/dl/
@@ -75,7 +74,6 @@ EXTRA_PATCHES+= \
 		${FILESDIR}/extra-psyco-patch-btreannouce.py \
 		${FILESDIR}/extra-psyco-patch-btrename.py \
 		${FILESDIR}/extra-psyco-patch-btshowmetainfo.py \
-		${FILESDIR}/extra-psyco-patch-bttest.py \
 		${FILESDIR}/extra-psyco-patch-bttrack.py
 
 PLIST_FILES+=	\
diff --git a/net/py-bittorrent/distinfo b/net/py-bittorrent/distinfo
index 3db708d4382e..7cdeea842373 100644
--- a/net/py-bittorrent/distinfo
+++ b/net/py-bittorrent/distinfo
@@ -1,2 +1,2 @@
-MD5 (BitTorrent-4.0.0.tar.gz) = 67f449df351b66f408b72b6bd196952f
-SIZE (BitTorrent-4.0.0.tar.gz) = 148649
+MD5 (BitTorrent-4.0.1.tar.gz) = e890d856d43b3d0af14b28714bc5801a
+SIZE (BitTorrent-4.0.1.tar.gz) = 154427
diff --git a/net/py-bittorrent/files/extra-nogui-patch-setup.py b/net/py-bittorrent/files/extra-nogui-patch-setup.py
index 3da017766e09..bdfd37a28162 100644
--- a/net/py-bittorrent/files/extra-nogui-patch-setup.py
+++ b/net/py-bittorrent/files/extra-nogui-patch-setup.py
@@ -1,18 +1,16 @@
 --- setup.py.orig	Sat Mar 12 10:01:45 2005
 +++ setup.py	Sat Mar 12 10:14:21 2005
-@@ -19,9 +19,9 @@
+@@ -19,7 +19,7 @@
  
  import glob
  
--scripts = ["btdownloadgui.py", "btdownloadcurses.py", "btdownloadheadless.py", 
+-scripts = ["btdownloadgui.py", "btdownloadcurses.py", "btdownloadheadless.py",
 -           "btmaketorrentgui.py", "btmaketorrent.py",
-+scripts = ["btdownloadcurses.py", "btdownloadheadless.py", 
++scripts = ["btdownloadcurses.py", "btdownloadheadless.py",
 +           "btmaketorrent.py",
             "btlaunchmany.py", "btlaunchmanycurses.py", 
-            "bttrack.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py",
-            "bttest.py"]
-
-@@ -28,4 +28,3 @@
+            "bttrack.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py"]
+@@ -27,4 +27,3 @@
  img_root, doc_root = BitTorrent.calc_unix_dirs()
  
 -data_files = [ (img_root        , glob.glob('images/*png')+['images/bittorrent.ico',]),
diff --git a/net/py-bittorrent/files/extra-psyco-patch-bttest.py b/net/py-bittorrent/files/extra-psyco-patch-bttest.py
deleted file mode 100644
index 0694d2950f13..000000000000
--- a/net/py-bittorrent/files/extra-psyco-patch-bttest.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- bttest.py.orig	Fri Mar 11 23:17:05 2005
-+++ bttest.py	Fri Mar 11 23:17:12 2005
-@@ -12,6 +12,15 @@
- 
- # Written by Bram Cohen
- 
-+from BitTorrent import PSYCO
-+if PSYCO.psyco:
-+    try:
-+       import psyco
-+       assert psyco.__version__ >= 0x010300f0
-+       psyco.full()
-+    except:
-+       pass
-+
- from BitTorrent import testtest
- import bttrack
- import btmakemetafile
diff --git a/net/py-bittorrent/pkg-plist b/net/py-bittorrent/pkg-plist
index bd70ff26a63d..9f94dc34f183 100644
--- a/net/py-bittorrent/pkg-plist
+++ b/net/py-bittorrent/pkg-plist
@@ -6,7 +6,6 @@ bin/btmaketorrent.py
 bin/btreannounce.py
 bin/btrename.py
 bin/btshowmetainfo.py
-bin/bttest.py
 bin/bttrack.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/Choker.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyc
@@ -113,12 +112,12 @@ bin/bttrack.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/parsedir.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/parsedir.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/parsedir.pyo
+%%PYTHON_SITELIBDIR%%/BitTorrent/platform.py
+%%PYTHON_SITELIBDIR%%/BitTorrent/platform.pyc
+%%PYTHON_SITELIBDIR%%/BitTorrent/platform.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/testtest.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/testtest.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/testtest.pyo
 %%PYTHON_SITELIBDIR%%/BitTorrent/track.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/track.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/track.pyo