aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net-p2p/py-bittornado-core/Makefile4
-rw-r--r--net-p2p/py-bittornado/Makefile23
-rw-r--r--net-p2p/py-bittornado/distinfo4
-rw-r--r--net-p2p/py-bittornado/files/extra-gui-patch-setup.py18
-rw-r--r--net-p2p/py-bittornado/files/extra-nogui-patch-setup.py18
-rw-r--r--net-p2p/py-bittornado/files/patch-btdownloadgui.py14
-rw-r--r--net-p2p/py-bittornado/pkg-descr24
-rw-r--r--net-p2p/py-bittornado/pkg-plist238
-rw-r--r--net/Makefile2
-rw-r--r--net/py-bittornado-core/Makefile4
-rw-r--r--net/py-bittornado/Makefile23
-rw-r--r--net/py-bittornado/distinfo4
-rw-r--r--net/py-bittornado/files/extra-gui-patch-setup.py18
-rw-r--r--net/py-bittornado/files/extra-nogui-patch-setup.py18
-rw-r--r--net/py-bittornado/files/patch-btdownloadgui.py14
-rw-r--r--net/py-bittornado/pkg-descr24
-rw-r--r--net/py-bittornado/pkg-plist238
17 files changed, 420 insertions, 268 deletions
diff --git a/net-p2p/py-bittornado-core/Makefile b/net-p2p/py-bittornado-core/Makefile
index 6a90e51d3f20..63267ab94c52 100644
--- a/net-p2p/py-bittornado-core/Makefile
+++ b/net-p2p/py-bittornado-core/Makefile
@@ -8,11 +8,11 @@
PKGNAMESUFFIX= -core
CATEGORIES= net python
-COMMENT= Experimental client 'core' for the BitTorrent P2P network
+COMMENT= An extended BitTorrent peer-to-peer core tool for distributing files
# build only the CORE
WITHOUT_GUI= yes
-MASTERDIR= ${.CURDIR}/../py-shadow-bittorrent
+MASTERDIR= ${.CURDIR}/../py-bittornado
.include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/py-bittornado/Makefile b/net-p2p/py-bittornado/Makefile
index d698415b9635..e3253dc9a28c 100644
--- a/net-p2p/py-bittornado/Makefile
+++ b/net-p2p/py-bittornado/Makefile
@@ -5,33 +5,33 @@
# $FreeBSD$
#
-PORTNAME= shadow-BitTorrent
-PORTVERSION= 5.8.11
-CATEGORIES?= net python
-MASTER_SITES= http://home.gil.com.au/~cbadsl/shadow/ \
- http://mediahost.inetsalestech.com/shadow/
+PORTNAME= BitTornado
+PORTVERSION= 0.2.0
+CATEGORIES?= net python ipv6
+MASTER_SITES= http://e.scarywater.net/bt/download/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= BitTorrent-experimental-S-${PORTVERSION}
MAINTAINER= sw@gegenunendlich.de
-COMMENT?= Experimental BitTorrent client with enhanced features
+COMMENT?= An extended BitTorrent peer-to-peer tool for distributing files
-CONFLICTS= py??-BitTorrent-*
+CONFLICTS= py??-*[Bb]it[Tt]orrent*
USE_PYTHON= yes
USE_PYDISTUTILS=yes
USE_REINPLACE= yes
-WRKSRC= ${WRKDIR}/bittorrent-CVS-shadowsclient
+WRKSRC= ${WRKDIR}/${PORTNAME}-CVS
DOC_FILES= BUILD.windows.txt FAQ.txt IMPORTANT-multitracker-readme.txt \
INSTALL.unix.txt LICENSE.txt README.txt \
README-experimental.txt credits.txt multitracker-spec.txt \
- webseed-spec.txt
+ README-Psyco.txt todo.txt webseed-spec.txt
+EXTRA_DOC_FILES= multitracker/README.txt
# required for GUI
.ifndef(WITHOUT_GUI)
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython
PLIST_SUB+= GUI=''
+EXTRA_PATCHES+= ${FILESDIR}/extra-gui-patch-setup.py
.else
EXTRA_PATCHES+= ${FILESDIR}/extra-nogui-patch-setup.py
PLIST_SUB+= GUI='@comment '
@@ -58,6 +58,9 @@ post-install:
.for file in ${DOC_FILES}
@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
+.for file in ${EXTRA_DOC_FILES}
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}/`${ECHO} ${file} | ${SED} -e 's|/|_|g'`
+.endfor
.endif
.include <bsd.port.mk>
diff --git a/net-p2p/py-bittornado/distinfo b/net-p2p/py-bittornado/distinfo
index a1812912e0fb..6f6317dc4b93 100644
--- a/net-p2p/py-bittornado/distinfo
+++ b/net-p2p/py-bittornado/distinfo
@@ -1,2 +1,2 @@
-MD5 (BitTorrent-experimental-S-5.8.11.tar.gz) = 1549187bd26f574127c444d272cc5881
-SIZE (BitTorrent-experimental-S-5.8.11.tar.gz) = 143004
+MD5 (BitTornado-0.2.0.tar.gz) = 14b40c51bd042bff1c89a71707eede3b
+SIZE (BitTornado-0.2.0.tar.gz) = 160275
diff --git a/net-p2p/py-bittornado/files/extra-gui-patch-setup.py b/net-p2p/py-bittornado/files/extra-gui-patch-setup.py
new file mode 100644
index 000000000000..4c802c689a23
--- /dev/null
+++ b/net-p2p/py-bittornado/files/extra-gui-patch-setup.py
@@ -0,0 +1,18 @@
+
+$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",
+ "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'])]
+ )
diff --git a/net-p2p/py-bittornado/files/extra-nogui-patch-setup.py b/net-p2p/py-bittornado/files/extra-nogui-patch-setup.py
index 5b7ef858a45e..6ec62a70a9c6 100644
--- a/net-p2p/py-bittornado/files/extra-nogui-patch-setup.py
+++ b/net-p2p/py-bittornado/files/extra-nogui-patch-setup.py
@@ -1,8 +1,8 @@
---- setup.py.old Mon Feb 23 10:55:55 2004
-+++ setup.py Mon Feb 23 10:57:25 2004
-@@ -18,10 +18,10 @@
+--- setup.py.orig Sat Apr 3 01:56:44 2004
++++ setup.py Wed Apr 14 15:57:49 2004
+@@ -18,13 +18,14 @@
- packages = ["BitTorrent"],
+ packages = ["BitTornado","BitTornado.BT1"],
- scripts = ["btdownloadgui.py", "btdownloadheadless.py", "btdownloadlibrary.py",
+ scripts = ["btdownloadheadless.py", "btdownloadlibrary.py",
@@ -11,6 +11,12 @@
+ "btdownloadcurses.py", "btlaunchmanycurses.py",
"btmakemetafile.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py",
"bttest.py",
-- 'btmaketorrentgui.py', 'btcopyannounce.py', 'btsethttpseeds.py', 'bt-t-make.py' ]
-+ 'btcopyannounce.py', 'btsethttpseeds.py', 'bt-t-make.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'])]
)
diff --git a/net-p2p/py-bittornado/files/patch-btdownloadgui.py b/net-p2p/py-bittornado/files/patch-btdownloadgui.py
new file mode 100644
index 000000000000..196941630f62
--- /dev/null
+++ b/net-p2p/py-bittornado/files/patch-btdownloadgui.py
@@ -0,0 +1,14 @@
+
+$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-p2p/py-bittornado/pkg-descr b/net-p2p/py-bittornado/pkg-descr
index bcceea200e4b..eb942c0c4d1f 100644
--- a/net-p2p/py-bittornado/pkg-descr
+++ b/net-p2p/py-bittornado/pkg-descr
@@ -1,14 +1,10 @@
-[ From the distribution's README-experimental.txt ]
-
-* Background file allocation - missing file space is allocated in
- the background, and hashes are checked only for pre-existing data
-
-* Multitracker addition - .torrent file can now specify multiple
- trackers
-
-* Preferences menu - lets you conveniently configure the GUI client
-
-* Status light - gives you important information about the torrent
- at a glance
-
-WWW: http://bt.degreez.net/
+BitTornado is a tool for distributing files. It's based on the BitTorrent
+tool but has many enhancement over it (it was also knows as SHADOWS
+experimental Bittorrent client):
+- multitracker support - to have redundant tracker
+- preferences menu for GUI client
+- webseed support to have better control of download
+- graphical torrent file maker
+- experimental IPv6 support
+
+WWW: http://www.bittornado.com
diff --git a/net-p2p/py-bittornado/pkg-plist b/net-p2p/py-bittornado/pkg-plist
index 30c96eceff50..bbb13ee33b60 100644
--- a/net-p2p/py-bittornado/pkg-plist
+++ b/net-p2p/py-bittornado/pkg-plist
@@ -16,114 +16,152 @@ bin/btsethttpseeds.py
bin/btshowmetainfo.py
bin/bttest.py
bin/bttrack.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConfigReader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConfigReader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConfigReader.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConnChoice.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConnChoice.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConnChoice.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPDownloader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPDownloader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPDownloader.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/PSYCO.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/PSYCO.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/PSYCO.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Statistics.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Statistics.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Statistics.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/T2T.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/T2T.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/T2T.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/download.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/download.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/download.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/subnetparse.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/subnetparse.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/subnetparse.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
-%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Choker.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Choker.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Choker.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Connecter.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Connecter.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Connecter.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Downloader.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Downloader.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Downloader.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/DownloaderFeedback.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/DownloaderFeedback.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/DownloaderFeedback.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Encrypter.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Encrypter.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Encrypter.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/HTTPDownloader.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/HTTPDownloader.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/HTTPDownloader.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/NatCheck.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/NatCheck.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/NatCheck.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/PiecePicker.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/PiecePicker.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/PiecePicker.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Rerequester.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Rerequester.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Rerequester.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Statistics.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Statistics.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Statistics.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Storage.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Storage.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Storage.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/StorageWrapper.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/StorageWrapper.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/StorageWrapper.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/T2T.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/T2T.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/T2T.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Uploader.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Uploader.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Uploader.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/__init__.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/__init__.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/__init__.pyo
+%%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/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/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/CurrentRateMeasure.py
+%%PYTHON_SITELIBDIR%%/BitTornado/CurrentRateMeasure.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/CurrentRateMeasure.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/HTTPHandler.py
+%%PYTHON_SITELIBDIR%%/BitTornado/HTTPHandler.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/HTTPHandler.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/PSYCO.py
+%%PYTHON_SITELIBDIR%%/BitTornado/PSYCO.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/PSYCO.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/RateLimiter.py
+%%PYTHON_SITELIBDIR%%/BitTornado/RateLimiter.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/RateLimiter.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/RateMeasure.py
+%%PYTHON_SITELIBDIR%%/BitTornado/RateMeasure.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/RateMeasure.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/RawServer.py
+%%PYTHON_SITELIBDIR%%/BitTornado/RawServer.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/RawServer.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/SocketHandler.py
+%%PYTHON_SITELIBDIR%%/BitTornado/SocketHandler.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/SocketHandler.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/ServerPortHandler.py
+%%PYTHON_SITELIBDIR%%/BitTornado/ServerPortHandler.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/ServerPortHandler.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/__init__.py
+%%PYTHON_SITELIBDIR%%/BitTornado/__init__.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/__init__.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/bencode.py
+%%PYTHON_SITELIBDIR%%/BitTornado/bencode.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/bencode.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/bitfield.py
+%%PYTHON_SITELIBDIR%%/BitTornado/bitfield.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/bitfield.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/parseargs.py
+%%PYTHON_SITELIBDIR%%/BitTornado/parseargs.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/parseargs.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/parsedir.py
+%%PYTHON_SITELIBDIR%%/BitTornado/parsedir.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/parsedir.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/selectpoll.py
+%%PYTHON_SITELIBDIR%%/BitTornado/selectpoll.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/selectpoll.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/subnetparse.py
+%%PYTHON_SITELIBDIR%%/BitTornado/subnetparse.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/subnetparse.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/zurllib.py
+%%PYTHON_SITELIBDIR%%/BitTornado/zurllib.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/zurllib.pyo
+share/BitTornado/alloc.gif
+share/BitTornado/black1.ico
+share/BitTornado/black.ico
+share/BitTornado/blue.ico
+share/BitTornado/green1.ico
+share/BitTornado/green.ico
+share/BitTornado/icon_bt.ico
+share/BitTornado/icon_done.ico
+share/BitTornado/red.ico
+share/BitTornado/white.ico
+share/BitTornado/yellow1.ico
+share/BitTornado/yellow.ico
%%PORTDOCS%%%%DOCSDIR%%/BUILD.windows.txt
%%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
%%PORTDOCS%%%%DOCSDIR%%/IMPORTANT-multitracker-readme.txt
%%PORTDOCS%%%%DOCSDIR%%/INSTALL.unix.txt
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
+%%PORTDOCS%%%%DOCSDIR%%/README-Psyco.txt
%%PORTDOCS%%%%DOCSDIR%%/README-experimental.txt
%%PORTDOCS%%%%DOCSDIR%%/README.txt
%%PORTDOCS%%%%DOCSDIR%%/credits.txt
%%PORTDOCS%%%%DOCSDIR%%/multitracker-spec.txt
+%%PORTDOCS%%%%DOCSDIR%%/multitracker_README.txt
+%%PORTDOCS%%%%DOCSDIR%%/todo.txt
%%PORTDOCS%%%%DOCSDIR%%/webseed-spec.txt
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
+@dirrm %%PYTHON_SITELIBDIR%%/BitTornado/BT1
+@dirrm %%PYTHON_SITELIBDIR%%/BitTornado
+@dirrm share/BitTornado/
diff --git a/net/Makefile b/net/Makefile
index b72aaf8fd66f..1af604242d7b 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -515,6 +515,8 @@
SUBDIR += pvm++
SUBDIR += pxe
SUBDIR += py-GeoIP
+ SUBDIR += py-bittornado
+ SUBDIR += py-bittornado-core
SUBDIR += py-bittorrent
SUBDIR += py-bittorrent-core
SUBDIR += py-fngrab
diff --git a/net/py-bittornado-core/Makefile b/net/py-bittornado-core/Makefile
index 6a90e51d3f20..63267ab94c52 100644
--- a/net/py-bittornado-core/Makefile
+++ b/net/py-bittornado-core/Makefile
@@ -8,11 +8,11 @@
PKGNAMESUFFIX= -core
CATEGORIES= net python
-COMMENT= Experimental client 'core' for the BitTorrent P2P network
+COMMENT= An extended BitTorrent peer-to-peer core tool for distributing files
# build only the CORE
WITHOUT_GUI= yes
-MASTERDIR= ${.CURDIR}/../py-shadow-bittorrent
+MASTERDIR= ${.CURDIR}/../py-bittornado
.include "${MASTERDIR}/Makefile"
diff --git a/net/py-bittornado/Makefile b/net/py-bittornado/Makefile
index d698415b9635..e3253dc9a28c 100644
--- a/net/py-bittornado/Makefile
+++ b/net/py-bittornado/Makefile
@@ -5,33 +5,33 @@
# $FreeBSD$
#
-PORTNAME= shadow-BitTorrent
-PORTVERSION= 5.8.11
-CATEGORIES?= net python
-MASTER_SITES= http://home.gil.com.au/~cbadsl/shadow/ \
- http://mediahost.inetsalestech.com/shadow/
+PORTNAME= BitTornado
+PORTVERSION= 0.2.0
+CATEGORIES?= net python ipv6
+MASTER_SITES= http://e.scarywater.net/bt/download/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= BitTorrent-experimental-S-${PORTVERSION}
MAINTAINER= sw@gegenunendlich.de
-COMMENT?= Experimental BitTorrent client with enhanced features
+COMMENT?= An extended BitTorrent peer-to-peer tool for distributing files
-CONFLICTS= py??-BitTorrent-*
+CONFLICTS= py??-*[Bb]it[Tt]orrent*
USE_PYTHON= yes
USE_PYDISTUTILS=yes
USE_REINPLACE= yes
-WRKSRC= ${WRKDIR}/bittorrent-CVS-shadowsclient
+WRKSRC= ${WRKDIR}/${PORTNAME}-CVS
DOC_FILES= BUILD.windows.txt FAQ.txt IMPORTANT-multitracker-readme.txt \
INSTALL.unix.txt LICENSE.txt README.txt \
README-experimental.txt credits.txt multitracker-spec.txt \
- webseed-spec.txt
+ README-Psyco.txt todo.txt webseed-spec.txt
+EXTRA_DOC_FILES= multitracker/README.txt
# required for GUI
.ifndef(WITHOUT_GUI)
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython
PLIST_SUB+= GUI=''
+EXTRA_PATCHES+= ${FILESDIR}/extra-gui-patch-setup.py
.else
EXTRA_PATCHES+= ${FILESDIR}/extra-nogui-patch-setup.py
PLIST_SUB+= GUI='@comment '
@@ -58,6 +58,9 @@ post-install:
.for file in ${DOC_FILES}
@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
+.for file in ${EXTRA_DOC_FILES}
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}/`${ECHO} ${file} | ${SED} -e 's|/|_|g'`
+.endfor
.endif
.include <bsd.port.mk>
diff --git a/net/py-bittornado/distinfo b/net/py-bittornado/distinfo
index a1812912e0fb..6f6317dc4b93 100644
--- a/net/py-bittornado/distinfo
+++ b/net/py-bittornado/distinfo
@@ -1,2 +1,2 @@
-MD5 (BitTorrent-experimental-S-5.8.11.tar.gz) = 1549187bd26f574127c444d272cc5881
-SIZE (BitTorrent-experimental-S-5.8.11.tar.gz) = 143004
+MD5 (BitTornado-0.2.0.tar.gz) = 14b40c51bd042bff1c89a71707eede3b
+SIZE (BitTornado-0.2.0.tar.gz) = 160275
diff --git a/net/py-bittornado/files/extra-gui-patch-setup.py b/net/py-bittornado/files/extra-gui-patch-setup.py
new file mode 100644
index 000000000000..4c802c689a23
--- /dev/null
+++ b/net/py-bittornado/files/extra-gui-patch-setup.py
@@ -0,0 +1,18 @@
+
+$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",
+ "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'])]
+ )
diff --git a/net/py-bittornado/files/extra-nogui-patch-setup.py b/net/py-bittornado/files/extra-nogui-patch-setup.py
index 5b7ef858a45e..6ec62a70a9c6 100644
--- a/net/py-bittornado/files/extra-nogui-patch-setup.py
+++ b/net/py-bittornado/files/extra-nogui-patch-setup.py
@@ -1,8 +1,8 @@
---- setup.py.old Mon Feb 23 10:55:55 2004
-+++ setup.py Mon Feb 23 10:57:25 2004
-@@ -18,10 +18,10 @@
+--- setup.py.orig Sat Apr 3 01:56:44 2004
++++ setup.py Wed Apr 14 15:57:49 2004
+@@ -18,13 +18,14 @@
- packages = ["BitTorrent"],
+ packages = ["BitTornado","BitTornado.BT1"],
- scripts = ["btdownloadgui.py", "btdownloadheadless.py", "btdownloadlibrary.py",
+ scripts = ["btdownloadheadless.py", "btdownloadlibrary.py",
@@ -11,6 +11,12 @@
+ "btdownloadcurses.py", "btlaunchmanycurses.py",
"btmakemetafile.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py",
"bttest.py",
-- 'btmaketorrentgui.py', 'btcopyannounce.py', 'btsethttpseeds.py', 'bt-t-make.py' ]
-+ 'btcopyannounce.py', 'btsethttpseeds.py', 'bt-t-make.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'])]
)
diff --git a/net/py-bittornado/files/patch-btdownloadgui.py b/net/py-bittornado/files/patch-btdownloadgui.py
new file mode 100644
index 000000000000..196941630f62
--- /dev/null
+++ b/net/py-bittornado/files/patch-btdownloadgui.py
@@ -0,0 +1,14 @@
+
+$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-descr b/net/py-bittornado/pkg-descr
index bcceea200e4b..eb942c0c4d1f 100644
--- a/net/py-bittornado/pkg-descr
+++ b/net/py-bittornado/pkg-descr
@@ -1,14 +1,10 @@
-[ From the distribution's README-experimental.txt ]
-
-* Background file allocation - missing file space is allocated in
- the background, and hashes are checked only for pre-existing data
-
-* Multitracker addition - .torrent file can now specify multiple
- trackers
-
-* Preferences menu - lets you conveniently configure the GUI client
-
-* Status light - gives you important information about the torrent
- at a glance
-
-WWW: http://bt.degreez.net/
+BitTornado is a tool for distributing files. It's based on the BitTorrent
+tool but has many enhancement over it (it was also knows as SHADOWS
+experimental Bittorrent client):
+- multitracker support - to have redundant tracker
+- preferences menu for GUI client
+- webseed support to have better control of download
+- graphical torrent file maker
+- experimental IPv6 support
+
+WWW: http://www.bittornado.com
diff --git a/net/py-bittornado/pkg-plist b/net/py-bittornado/pkg-plist
index 30c96eceff50..bbb13ee33b60 100644
--- a/net/py-bittornado/pkg-plist
+++ b/net/py-bittornado/pkg-plist
@@ -16,114 +16,152 @@ bin/btsethttpseeds.py
bin/btshowmetainfo.py
bin/bttest.py
bin/bttrack.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConfigReader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConfigReader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConfigReader.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConnChoice.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConnChoice.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/ConnChoice.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPDownloader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPDownloader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPDownloader.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/PSYCO.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/PSYCO.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/PSYCO.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Statistics.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Statistics.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Statistics.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/T2T.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/T2T.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/T2T.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/download.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/download.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/download.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyo
-%%PYTHON_SITELIBDIR%%/BitTorrent/subnetparse.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/subnetparse.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/subnetparse.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
-%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.py
-%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyc
-%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Choker.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Choker.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Choker.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Connecter.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Connecter.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Connecter.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Downloader.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Downloader.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Downloader.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/DownloaderFeedback.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/DownloaderFeedback.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/DownloaderFeedback.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Encrypter.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Encrypter.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Encrypter.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/HTTPDownloader.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/HTTPDownloader.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/HTTPDownloader.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/NatCheck.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/NatCheck.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/NatCheck.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/PiecePicker.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/PiecePicker.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/PiecePicker.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Rerequester.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Rerequester.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Rerequester.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Statistics.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Statistics.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Statistics.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Storage.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Storage.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Storage.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/StorageWrapper.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/StorageWrapper.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/StorageWrapper.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/T2T.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/T2T.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/T2T.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Uploader.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Uploader.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/Uploader.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/__init__.py
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/__init__.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/BT1/__init__.pyo
+%%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/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/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/CurrentRateMeasure.py
+%%PYTHON_SITELIBDIR%%/BitTornado/CurrentRateMeasure.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/CurrentRateMeasure.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/HTTPHandler.py
+%%PYTHON_SITELIBDIR%%/BitTornado/HTTPHandler.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/HTTPHandler.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/PSYCO.py
+%%PYTHON_SITELIBDIR%%/BitTornado/PSYCO.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/PSYCO.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/RateLimiter.py
+%%PYTHON_SITELIBDIR%%/BitTornado/RateLimiter.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/RateLimiter.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/RateMeasure.py
+%%PYTHON_SITELIBDIR%%/BitTornado/RateMeasure.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/RateMeasure.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/RawServer.py
+%%PYTHON_SITELIBDIR%%/BitTornado/RawServer.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/RawServer.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/SocketHandler.py
+%%PYTHON_SITELIBDIR%%/BitTornado/SocketHandler.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/SocketHandler.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/ServerPortHandler.py
+%%PYTHON_SITELIBDIR%%/BitTornado/ServerPortHandler.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/ServerPortHandler.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/__init__.py
+%%PYTHON_SITELIBDIR%%/BitTornado/__init__.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/__init__.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/bencode.py
+%%PYTHON_SITELIBDIR%%/BitTornado/bencode.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/bencode.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/bitfield.py
+%%PYTHON_SITELIBDIR%%/BitTornado/bitfield.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/bitfield.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/parseargs.py
+%%PYTHON_SITELIBDIR%%/BitTornado/parseargs.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/parseargs.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/parsedir.py
+%%PYTHON_SITELIBDIR%%/BitTornado/parsedir.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/parsedir.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/selectpoll.py
+%%PYTHON_SITELIBDIR%%/BitTornado/selectpoll.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/selectpoll.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/subnetparse.py
+%%PYTHON_SITELIBDIR%%/BitTornado/subnetparse.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/subnetparse.pyo
+%%PYTHON_SITELIBDIR%%/BitTornado/zurllib.py
+%%PYTHON_SITELIBDIR%%/BitTornado/zurllib.pyc
+%%PYTHON_SITELIBDIR%%/BitTornado/zurllib.pyo
+share/BitTornado/alloc.gif
+share/BitTornado/black1.ico
+share/BitTornado/black.ico
+share/BitTornado/blue.ico
+share/BitTornado/green1.ico
+share/BitTornado/green.ico
+share/BitTornado/icon_bt.ico
+share/BitTornado/icon_done.ico
+share/BitTornado/red.ico
+share/BitTornado/white.ico
+share/BitTornado/yellow1.ico
+share/BitTornado/yellow.ico
%%PORTDOCS%%%%DOCSDIR%%/BUILD.windows.txt
%%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
%%PORTDOCS%%%%DOCSDIR%%/IMPORTANT-multitracker-readme.txt
%%PORTDOCS%%%%DOCSDIR%%/INSTALL.unix.txt
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
+%%PORTDOCS%%%%DOCSDIR%%/README-Psyco.txt
%%PORTDOCS%%%%DOCSDIR%%/README-experimental.txt
%%PORTDOCS%%%%DOCSDIR%%/README.txt
%%PORTDOCS%%%%DOCSDIR%%/credits.txt
%%PORTDOCS%%%%DOCSDIR%%/multitracker-spec.txt
+%%PORTDOCS%%%%DOCSDIR%%/multitracker_README.txt
+%%PORTDOCS%%%%DOCSDIR%%/todo.txt
%%PORTDOCS%%%%DOCSDIR%%/webseed-spec.txt
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
+@dirrm %%PYTHON_SITELIBDIR%%/BitTornado/BT1
+@dirrm %%PYTHON_SITELIBDIR%%/BitTornado
+@dirrm share/BitTornado/