Index: Makefile =================================================================== RCS file: /cvs/ports/net/BitTorrent/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile 4 Aug 2004 19:14:30 -0000 1.5 +++ Makefile 3 Jun 2005 05:26:55 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.5 2004/08/04 19:14:30 xsa Exp $ COMMENT= "cooperative file distribution system implemented in Python" -DISTNAME= BitTorrent-3.4.2 +DISTNAME= BitTorrent-4.0.1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bittorrent/} @@ -16,9 +16,8 @@ MODULES= lang/python post-configure: - @perl -pi -e \ - 's,/usr/bin/env python,/usr/bin/env python${MODPY_VERSION},g' \ - ${WRKBUILD}/bt*.py + @perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},g' ${WRKBUILD}/bt*.py + @for file in ${WRKBUILD}/bt*.py; do mv $$file $${file%.py}; done post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/BitTorrent Index: distinfo =================================================================== RCS file: /cvs/ports/net/BitTorrent/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo 5 Jan 2005 17:14:37 -0000 1.4 +++ distinfo 3 Jun 2005 05:26:55 -0000 @@ -1,4 +1,4 @@ -MD5 (BitTorrent-3.4.2.tar.gz) = b854f25a33289565bcaeaded04955c1a -RMD160 (BitTorrent-3.4.2.tar.gz) = a024b4d72a5407ecb88c340150b5994eb43113d4 -SHA1 (BitTorrent-3.4.2.tar.gz) = 0560a13b5a5e9d148a6e4035c3d913ebe8e285c1 -SIZE (BitTorrent-3.4.2.tar.gz) = 198026 +MD5 (BitTorrent-4.0.1.tar.gz) = e890d856d43b3d0af14b28714bc5801a +RMD160 (BitTorrent-4.0.1.tar.gz) = 9ccec667802df40aa21c00be7930ac5ad4d65821 +SHA1 (BitTorrent-4.0.1.tar.gz) = 577db045897e02dcf8d3546f93a2525c5b7ba6cf +SIZE (BitTorrent-4.0.1.tar.gz) = 154427 Index: patches/patch-BitTorrent___init___py =================================================================== RCS file: patches/patch-BitTorrent___init___py diff -N patches/patch-BitTorrent___init___py --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-BitTorrent___init___py 3 Jun 2005 05:26:55 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- BitTorrent/__init__.py.orig Tue May 17 17:04:20 2005 ++++ BitTorrent/__init__.py Tue May 17 17:04:43 2005 +@@ -22,7 +22,7 @@ import os + import re + + def calc_unix_dirs(): +- appdir = '%s-%s'%(app_name, version) ++ appdir = app_name + ip = os.path.join('share', 'pixmaps', appdir) + dp = os.path.join('share', 'doc' , appdir) + return ip, dp Index: patches/patch-BitTorrent_defaultargs_py =================================================================== RCS file: patches/patch-BitTorrent_defaultargs_py diff -N patches/patch-BitTorrent_defaultargs_py --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-BitTorrent_defaultargs_py 3 Jun 2005 05:26:55 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- BitTorrent/defaultargs.py.orig Tue May 17 17:03:18 2005 ++++ BitTorrent/defaultargs.py Tue May 17 17:03:39 2005 +@@ -77,7 +77,7 @@ rare_options = [ + 'if nonzero, set the TOS option for peer connections to this value'), + ('filesystem_encoding', '', + "character encoding used on the local filesystem. If left empty, autodetected. Autodetection doesn't work under python versions older than 2.3"), +- ('enable_bad_libc_workaround', 0, ++ ('enable_bad_libc_workaround', 1, + 'enable workaround for a bug in BSD libc that makes file reads very slow.'), + ('tracker_proxy', '', + 'address of HTTP proxy to use for tracker connections'), Index: patches/patch-setup_py =================================================================== RCS file: /cvs/ports/net/BitTorrent/patches/patch-setup_py,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-setup_py --- patches/patch-setup_py 21 Aug 2003 03:39:57 -0000 1.1.1.1 +++ patches/patch-setup_py 3 Jun 2005 05:26:55 -0000 @@ -1,15 +1,18 @@ -$OpenBSD: patch-setup_py,v 1.1.1.1 2003/08/21 03:39:57 jolan Exp $ ---- setup.py.orig 2003-03-17 13:34:41.000000000 -0600 -+++ setup.py 2003-08-18 15:31:15.000000000 -0500 -@@ -18,9 +18,9 @@ setup( - - packages = ["BitTorrent"], +$OpenBSD$ +--- setup.py.orig Tue May 17 17:02:29 2005 ++++ setup.py Tue May 17 17:02:54 2005 +@@ -19,10 +19,10 @@ import BitTorrent + + import glob + +-scripts = ["btdownloadgui.py", "btdownloadcurses.py", "btdownloadheadless.py", +- "btmaketorrentgui.py", "btmaketorrent.py", +- "btlaunchmany.py", "btlaunchmanycurses.py", +- "bttrack.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py"] ++scripts = ["btdownloadgui", "btdownloadcurses", "btdownloadheadless", ++ "btmaketorrentgui", "btmaketorrent", ++ "btlaunchmany", "btlaunchmanycurses", ++ "bttrack", "btreannounce", "btrename", "btshowmetainfo"] + + img_root, doc_root = BitTorrent.calc_unix_dirs() -- scripts = ["btdownloadgui.py", "btdownloadheadless.py", "btdownloadlibrary.py", -+ scripts = ["btdownloadheadless.py", "btdownloadlibrary.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"] - ) Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/BitTorrent/pkg/PLIST,v retrieving revision 1.3 diff -u -r1.3 PLIST --- pkg/PLIST 15 Sep 2004 18:17:38 -0000 1.3 +++ pkg/PLIST 3 Jun 2005 05:26:55 -0000 @@ -1,35 +1,46 @@ -@comment $OpenBSD: PLIST,v 1.3 2004/09/15 18:17:38 espie Exp $ -bin/btcompletedir.py -bin/btdownloadcurses.py -bin/btdownloadheadless.py -bin/btdownloadlibrary.py -bin/btlaunchmany.py -bin/btlaunchmanycurses.py -bin/btmakemetafile.py -bin/btreannounce.py -bin/btrename.py -bin/btshowmetainfo.py -@comment bin/bttest.py -bin/bttrack.py +@comment $OpenBSD$ +bin/btdownloadcurses +bin/btdownloadgui +bin/btdownloadheadless +bin/btlaunchmany +bin/btlaunchmanycurses +bin/btmaketorrent +bin/btmaketorrentgui +bin/btreannounce +bin/btrename +bin/btshowmetainfo +bin/bttrack lib/python${MODPY_VERSION}/site-packages/BitTorrent/ lib/python${MODPY_VERSION}/site-packages/BitTorrent/Choker.py lib/python${MODPY_VERSION}/site-packages/BitTorrent/Choker.pyc +lib/python${MODPY_VERSION}/site-packages/BitTorrent/ClientIdentifier.py +lib/python${MODPY_VERSION}/site-packages/BitTorrent/ClientIdentifier.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/Connecter.py lib/python${MODPY_VERSION}/site-packages/BitTorrent/Connecter.pyc +lib/python${MODPY_VERSION}/site-packages/BitTorrent/ConvertedMetainfo.py +lib/python${MODPY_VERSION}/site-packages/BitTorrent/ConvertedMetainfo.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/CurrentRateMeasure.py lib/python${MODPY_VERSION}/site-packages/BitTorrent/CurrentRateMeasure.pyc +lib/python${MODPY_VERSION}/site-packages/BitTorrent/Desktop.py +lib/python${MODPY_VERSION}/site-packages/BitTorrent/Desktop.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/Downloader.py lib/python${MODPY_VERSION}/site-packages/BitTorrent/Downloader.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/DownloaderFeedback.py lib/python${MODPY_VERSION}/site-packages/BitTorrent/DownloaderFeedback.pyc -lib/python${MODPY_VERSION}/site-packages/BitTorrent/Encrypter.py -lib/python${MODPY_VERSION}/site-packages/BitTorrent/Encrypter.pyc +lib/python${MODPY_VERSION}/site-packages/BitTorrent/Encoder.py +lib/python${MODPY_VERSION}/site-packages/BitTorrent/Encoder.pyc +lib/python${MODPY_VERSION}/site-packages/BitTorrent/GUI.py +lib/python${MODPY_VERSION}/site-packages/BitTorrent/GUI.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/HTTPHandler.py lib/python${MODPY_VERSION}/site-packages/BitTorrent/HTTPHandler.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/NatCheck.py lib/python${MODPY_VERSION}/site-packages/BitTorrent/NatCheck.pyc +lib/python${MODPY_VERSION}/site-packages/BitTorrent/OpenPath.py +lib/python${MODPY_VERSION}/site-packages/BitTorrent/OpenPath.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/PiecePicker.py lib/python${MODPY_VERSION}/site-packages/BitTorrent/PiecePicker.pyc +lib/python${MODPY_VERSION}/site-packages/BitTorrent/RateLimiter.py +lib/python${MODPY_VERSION}/site-packages/BitTorrent/RateLimiter.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/RateMeasure.py lib/python${MODPY_VERSION}/site-packages/BitTorrent/RateMeasure.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/RawServer.py @@ -40,6 +51,8 @@ lib/python${MODPY_VERSION}/site-packages/BitTorrent/Storage.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/StorageWrapper.py lib/python${MODPY_VERSION}/site-packages/BitTorrent/StorageWrapper.pyc +lib/python${MODPY_VERSION}/site-packages/BitTorrent/TorrentQueue.py +lib/python${MODPY_VERSION}/site-packages/BitTorrent/TorrentQueue.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/Uploader.py lib/python${MODPY_VERSION}/site-packages/BitTorrent/Uploader.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/__init__.py @@ -50,20 +63,50 @@ lib/python${MODPY_VERSION}/site-packages/BitTorrent/bitfield.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/btformats.py lib/python${MODPY_VERSION}/site-packages/BitTorrent/btformats.pyc +lib/python${MODPY_VERSION}/site-packages/BitTorrent/configfile.py +lib/python${MODPY_VERSION}/site-packages/BitTorrent/configfile.pyc +lib/python${MODPY_VERSION}/site-packages/BitTorrent/controlsocket.py +lib/python${MODPY_VERSION}/site-packages/BitTorrent/controlsocket.pyc +lib/python${MODPY_VERSION}/site-packages/BitTorrent/defaultargs.py +lib/python${MODPY_VERSION}/site-packages/BitTorrent/defaultargs.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/download.py lib/python${MODPY_VERSION}/site-packages/BitTorrent/download.pyc -lib/python${MODPY_VERSION}/site-packages/BitTorrent/fakeopen.py -lib/python${MODPY_VERSION}/site-packages/BitTorrent/fakeopen.pyc +lib/python${MODPY_VERSION}/site-packages/BitTorrent/launchmanycore.py +lib/python${MODPY_VERSION}/site-packages/BitTorrent/launchmanycore.pyc +lib/python${MODPY_VERSION}/site-packages/BitTorrent/makemetafile.py +lib/python${MODPY_VERSION}/site-packages/BitTorrent/makemetafile.pyc +lib/python${MODPY_VERSION}/site-packages/BitTorrent/obsoletepythonsupport.py +lib/python${MODPY_VERSION}/site-packages/BitTorrent/obsoletepythonsupport.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/parseargs.py lib/python${MODPY_VERSION}/site-packages/BitTorrent/parseargs.pyc +lib/python${MODPY_VERSION}/site-packages/BitTorrent/parsedir.py +lib/python${MODPY_VERSION}/site-packages/BitTorrent/parsedir.pyc +lib/python${MODPY_VERSION}/site-packages/BitTorrent/platform.py +lib/python${MODPY_VERSION}/site-packages/BitTorrent/platform.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/selectpoll.py lib/python${MODPY_VERSION}/site-packages/BitTorrent/selectpoll.pyc -@comment lib/python${MODPY_VERSION}/site-packages/BitTorrent/testtest.py -@comment lib/python${MODPY_VERSION}/site-packages/BitTorrent/testtest.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/track.py lib/python${MODPY_VERSION}/site-packages/BitTorrent/track.pyc lib/python${MODPY_VERSION}/site-packages/BitTorrent/zurllib.py lib/python${MODPY_VERSION}/site-packages/BitTorrent/zurllib.pyc share/doc/BitTorrent/ +share/doc/BitTorrent/LICENSE.txt share/doc/BitTorrent/README.OpenBSD share/doc/BitTorrent/README.txt +share/doc/BitTorrent/credits.txt +share/doc/BitTorrent/redirdonate.html +share/pixmaps/ +share/pixmaps/BitTorrent/ +share/pixmaps/BitTorrent/bittorrent.ico +share/pixmaps/BitTorrent/broken.png +share/pixmaps/BitTorrent/finished.png +share/pixmaps/BitTorrent/info.png +share/pixmaps/BitTorrent/logo/ +share/pixmaps/BitTorrent/logo/bittorrent_32.png +share/pixmaps/BitTorrent/logo/bittorrent_96.png +share/pixmaps/BitTorrent/pause.png +share/pixmaps/BitTorrent/paused.png +share/pixmaps/BitTorrent/play.png +share/pixmaps/BitTorrent/queued.png +share/pixmaps/BitTorrent/remove.png +share/pixmaps/BitTorrent/running.png