diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/bittorrent-gui/Makefile | 21 | ||||
-rw-r--r-- | net/bittorrent-gui/PLIST | 51 | ||||
-rw-r--r-- | net/bittorrent/Makefile | 15 | ||||
-rw-r--r-- | net/bittorrent/Makefile.common | 8 | ||||
-rw-r--r-- | net/bittorrent/PLIST | 141 | ||||
-rw-r--r-- | net/bittorrent/distinfo | 14 | ||||
-rw-r--r-- | net/bittorrent/patches/patch-aa | 41 | ||||
-rw-r--r-- | net/bittorrent/patches/patch-ab | 14 | ||||
-rw-r--r-- | net/bittorrent/patches/patch-ac | 24 |
9 files changed, 226 insertions, 103 deletions
diff --git a/net/bittorrent-gui/Makefile b/net/bittorrent-gui/Makefile index bb98a143223..51b58833255 100644 --- a/net/bittorrent-gui/Makefile +++ b/net/bittorrent-gui/Makefile @@ -1,28 +1,29 @@ -# $NetBSD: Makefile,v 1.16 2006/02/05 23:10:22 joerg Exp $ -# +# $NetBSD: Makefile,v 1.17 2006/02/26 22:43:33 tron Exp $ .include "../../net/bittorrent/Makefile.common" PKGNAME= ${DISTNAME:S/BitTorrent/bittorrent-gui/} -PKGREVISION= 2 COMMENT+= (GTK+ GUI) -DEPENDS+= bittorrent>=4.0.3:../../net/bittorrent +DEPENDS+= bittorrent>=4.4.0:../../net/bittorrent -PYTHON_PATCH_SCRIPTS= btdownloadgui.py btmaketorrentgui.py +PYTHON_PATCH_SCRIPTS= bittorrent maketorrent CONFLICTS+= bittornado-gui-[0-9]* -INSTALLATION_DIRS= bin +ICONS_DIR= share/pixmaps/BitTorrent-${PKGVERSION}/icons +INSTALLATION_DIRS= bin ${ICONS_DIR} ${ICONS_DIR}/default ${ICONS_DIR}/old do-build: # empty do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/btdownloadgui.py ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/btmaketorrentgui.py ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/images/*.png ${PREFIX}/share/pixmaps/${DISTNAME}/ - ${INSTALL_DATA} ${WRKSRC}/images/*.ico ${PREFIX}/share/pixmaps/${DISTNAME}/ + ${INSTALL_SCRIPT} ${WRKSRC}/bittorrent ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/maketorrent ${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/images/icons/default/* \ + ${PREFIX}/${ICONS_DIR}/default + ${INSTALL_DATA} ${WRKSRC}/images/icons/old/* \ + ${PREFIX}/${ICONS_DIR}/old .include "../../lang/python/application.mk" .include "../../x11/py-gtk2/buildlink3.mk" diff --git a/net/bittorrent-gui/PLIST b/net/bittorrent-gui/PLIST index 3adee81036d..ffb1adbc713 100644 --- a/net/bittorrent-gui/PLIST +++ b/net/bittorrent-gui/PLIST @@ -1,13 +1,38 @@ -@comment $NetBSD: PLIST,v 1.5 2005/08/07 16:15:55 recht Exp $ -bin/btdownloadgui.py -bin/btmaketorrentgui.py -share/pixmaps/BitTorrent-${PKGVERSION}/bittorrent.ico -share/pixmaps/BitTorrent-${PKGVERSION}/broken.png -share/pixmaps/BitTorrent-${PKGVERSION}/finished.png -share/pixmaps/BitTorrent-${PKGVERSION}/info.png -share/pixmaps/BitTorrent-${PKGVERSION}/pause.png -share/pixmaps/BitTorrent-${PKGVERSION}/paused.png -share/pixmaps/BitTorrent-${PKGVERSION}/play.png -share/pixmaps/BitTorrent-${PKGVERSION}/queued.png -share/pixmaps/BitTorrent-${PKGVERSION}/remove.png -share/pixmaps/BitTorrent-${PKGVERSION}/running.png +@comment $NetBSD: PLIST,v 1.6 2006/02/26 22:43:33 tron Exp $ +bin/bittorrent +bin/maketorrent +share/pixmaps/BitTorrent-${PKGVERSION}/icons/default/abort.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/default/broken.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/default/finished.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/default/info.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/default/pause.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/default/paused.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/default/play.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/default/queued.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/default/remove.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/default/running.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/default/status-broken.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/default/status-natted.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/default/status-pre-natted.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/default/status-running.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/default/status-starting.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/default/status-stopped.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/default/trashcan.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/old/broken.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/old/finished.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/old/info.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/old/pause.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/old/paused.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/old/play.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/old/queued.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/old/remove.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/old/running.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/old/status-broken.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/old/status-natted.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/old/status-pre-natted.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/old/status-running.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/old/status-starting.png +share/pixmaps/BitTorrent-${PKGVERSION}/icons/old/status-stopped.png +@dirrm share/pixmaps/BitTorrent-${PKGVERSION}/icons/old +@dirrm share/pixmaps/BitTorrent-${PKGVERSION}/icons/default +@dirrm share/pixmaps/BitTorrent-${PKGVERSION}/icons diff --git a/net/bittorrent/Makefile b/net/bittorrent/Makefile index 77be0e08a35..b65b886d901 100644 --- a/net/bittorrent/Makefile +++ b/net/bittorrent/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.34 2006/02/05 23:10:22 joerg Exp $ +# $NetBSD: Makefile,v 1.35 2006/02/26 22:43:33 tron Exp $ .include "Makefile.common" PKGNAME= ${DISTNAME:S/BitT/bitt/} -PKGREVISION= 1 PYDISTUTILSPKG= yes @@ -12,18 +11,6 @@ CONFLICTS+= BitTornado-[0-9]* .include "../../mk/bsd.prefs.mk" -SUBST_CLASSES+= blibc -SUBST_STAGE.blibc= pre-configure -SUBST_FILES.blibc= BitTorrent/defaultargs.py - -# Enable the 'enable_bad_libc_workaround' on BSD by default. -.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" \ - || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" -SUBST_SED.blibc= -e s/%BSD_LIBC%/1/g -.else -SUBST_SED.blibc= -e s/%BSD_LIBC%/0/g -.endif - .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../devel/py-cursespanel/buildlink3.mk" diff --git a/net/bittorrent/Makefile.common b/net/bittorrent/Makefile.common index ace8de10bf0..b504303dc91 100644 --- a/net/bittorrent/Makefile.common +++ b/net/bittorrent/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.16 2005/09/30 14:05:38 adam Exp $ +# $NetBSD: Makefile.common,v 1.17 2006/02/26 22:43:33 tron Exp $ -DISTNAME= BitTorrent-4.0.4 +DISTNAME= BitTorrent-4.4.0 CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bittorrent/} +MASTER_SITES= ${HOMEPAGE}/dl/ -MAINTAINER= recht@NetBSD.org +MAINTAINER= tron@NetBSD.org HOMEPAGE= http://www.bittorrent.com/ COMMENT= File sharing tool diff --git a/net/bittorrent/PLIST b/net/bittorrent/PLIST index 89de68237a3..d0eb2e8a05f 100644 --- a/net/bittorrent/PLIST +++ b/net/bittorrent/PLIST @@ -1,13 +1,15 @@ -@comment $NetBSD: PLIST,v 1.12 2005/08/07 16:15:55 recht Exp $ -bin/btdownloadcurses.py -bin/btdownloadheadless.py -bin/btlaunchmany.py -bin/btlaunchmanycurses.py -bin/btmaketorrent.py -bin/btreannounce.py -bin/btrename.py -bin/btshowmetainfo.py -bin/bttrack.py +@comment $NetBSD: PLIST,v 1.13 2006/02/26 22:43:33 tron Exp $ +bin/bittorrent-console +bin/bittorrent-curses +bin/bittorrent-tracker +bin/changetracker-console +bin/launchmany-console +bin/launchmany-curses +bin/maketorrent-console +bin/torrentinfo-console +${PYSITELIB}/BitTorrent/BeautifulSupe.py +${PYSITELIB}/BitTorrent/BeautifulSupe.pyc +${PYSITELIB}/BitTorrent/BeautifulSupe.pyo ${PYSITELIB}/BitTorrent/Choker.py ${PYSITELIB}/BitTorrent/Choker.pyc ${PYSITELIB}/BitTorrent/Choker.pyo @@ -38,15 +40,30 @@ ${PYSITELIB}/BitTorrent/Encoder.pyo ${PYSITELIB}/BitTorrent/GUI.py ${PYSITELIB}/BitTorrent/GUI.pyc ${PYSITELIB}/BitTorrent/GUI.pyo +${PYSITELIB}/BitTorrent/GetTorrent.py +${PYSITELIB}/BitTorrent/GetTorrent.pyc +${PYSITELIB}/BitTorrent/GetTorrent.pyo ${PYSITELIB}/BitTorrent/HTTPHandler.py ${PYSITELIB}/BitTorrent/HTTPHandler.pyc ${PYSITELIB}/BitTorrent/HTTPHandler.pyo +${PYSITELIB}/BitTorrent/IPC.py +${PYSITELIB}/BitTorrent/IPC.pyc +${PYSITELIB}/BitTorrent/IPC.pyo +${PYSITELIB}/BitTorrent/LaunchPath.py +${PYSITELIB}/BitTorrent/LaunchPath.pyc +${PYSITELIB}/BitTorrent/LaunchPath.pyo ${PYSITELIB}/BitTorrent/NatCheck.py ${PYSITELIB}/BitTorrent/NatCheck.pyc ${PYSITELIB}/BitTorrent/NatCheck.pyo -${PYSITELIB}/BitTorrent/OpenPath.py -${PYSITELIB}/BitTorrent/OpenPath.pyc -${PYSITELIB}/BitTorrent/OpenPath.pyo +${PYSITELIB}/BitTorrent/NatTraversal.py +${PYSITELIB}/BitTorrent/NatTraversal.pyc +${PYSITELIB}/BitTorrent/NatTraversal.pyo +${PYSITELIB}/BitTorrent/NewVersion.py +${PYSITELIB}/BitTorrent/NewVersion.pyc +${PYSITELIB}/BitTorrent/NewVersion.pyo +${PYSITELIB}/BitTorrent/PeerID.py +${PYSITELIB}/BitTorrent/PeerID.pyc +${PYSITELIB}/BitTorrent/PeerID.pyo ${PYSITELIB}/BitTorrent/PiecePicker.py ${PYSITELIB}/BitTorrent/PiecePicker.pyc ${PYSITELIB}/BitTorrent/PiecePicker.pyo @@ -59,9 +76,18 @@ ${PYSITELIB}/BitTorrent/RateMeasure.pyo ${PYSITELIB}/BitTorrent/RawServer.py ${PYSITELIB}/BitTorrent/RawServer.pyc ${PYSITELIB}/BitTorrent/RawServer.pyo +${PYSITELIB}/BitTorrent/RawServer_magic.py +${PYSITELIB}/BitTorrent/RawServer_magic.pyc +${PYSITELIB}/BitTorrent/RawServer_magic.pyo +${PYSITELIB}/BitTorrent/RawServer_twisted.py +${PYSITELIB}/BitTorrent/RawServer_twisted.pyc +${PYSITELIB}/BitTorrent/RawServer_twisted.pyo ${PYSITELIB}/BitTorrent/Rerequester.py ${PYSITELIB}/BitTorrent/Rerequester.pyc ${PYSITELIB}/BitTorrent/Rerequester.pyo +${PYSITELIB}/BitTorrent/StatusLight.py +${PYSITELIB}/BitTorrent/StatusLight.pyc +${PYSITELIB}/BitTorrent/StatusLight.pyo ${PYSITELIB}/BitTorrent/Storage.py ${PYSITELIB}/BitTorrent/Storage.pyc ${PYSITELIB}/BitTorrent/Storage.pyo @@ -71,6 +97,9 @@ ${PYSITELIB}/BitTorrent/StorageWrapper.pyo ${PYSITELIB}/BitTorrent/TorrentQueue.py ${PYSITELIB}/BitTorrent/TorrentQueue.pyc ${PYSITELIB}/BitTorrent/TorrentQueue.pyo +${PYSITELIB}/BitTorrent/TrayIcon.py +${PYSITELIB}/BitTorrent/TrayIcon.pyc +${PYSITELIB}/BitTorrent/TrayIcon.pyo ${PYSITELIB}/BitTorrent/Uploader.py ${PYSITELIB}/BitTorrent/Uploader.pyc ${PYSITELIB}/BitTorrent/Uploader.pyo @@ -89,15 +118,18 @@ ${PYSITELIB}/BitTorrent/btformats.pyo ${PYSITELIB}/BitTorrent/configfile.py ${PYSITELIB}/BitTorrent/configfile.pyc ${PYSITELIB}/BitTorrent/configfile.pyo -${PYSITELIB}/BitTorrent/controlsocket.py -${PYSITELIB}/BitTorrent/controlsocket.pyc -${PYSITELIB}/BitTorrent/controlsocket.pyo ${PYSITELIB}/BitTorrent/defaultargs.py ${PYSITELIB}/BitTorrent/defaultargs.pyc ${PYSITELIB}/BitTorrent/defaultargs.pyo +${PYSITELIB}/BitTorrent/defer.py +${PYSITELIB}/BitTorrent/defer.pyc +${PYSITELIB}/BitTorrent/defer.pyo ${PYSITELIB}/BitTorrent/download.py ${PYSITELIB}/BitTorrent/download.pyc ${PYSITELIB}/BitTorrent/download.pyo +${PYSITELIB}/BitTorrent/language.py +${PYSITELIB}/BitTorrent/language.pyc +${PYSITELIB}/BitTorrent/language.pyo ${PYSITELIB}/BitTorrent/launchmanycore.py ${PYSITELIB}/BitTorrent/launchmanycore.pyc ${PYSITELIB}/BitTorrent/launchmanycore.pyo @@ -116,6 +148,9 @@ ${PYSITELIB}/BitTorrent/parsedir.pyo ${PYSITELIB}/BitTorrent/platform.py ${PYSITELIB}/BitTorrent/platform.pyc ${PYSITELIB}/BitTorrent/platform.pyo +${PYSITELIB}/BitTorrent/prefs.py +${PYSITELIB}/BitTorrent/prefs.pyc +${PYSITELIB}/BitTorrent/prefs.pyo ${PYSITELIB}/BitTorrent/selectpoll.py ${PYSITELIB}/BitTorrent/selectpoll.pyc ${PYSITELIB}/BitTorrent/selectpoll.pyo @@ -125,13 +160,87 @@ ${PYSITELIB}/BitTorrent/track.pyo ${PYSITELIB}/BitTorrent/zurllib.py ${PYSITELIB}/BitTorrent/zurllib.pyc ${PYSITELIB}/BitTorrent/zurllib.pyo +${PYSITELIB}/khashmir/KRateLimiter.py +${PYSITELIB}/khashmir/KRateLimiter.pyc +${PYSITELIB}/khashmir/KRateLimiter.pyo +${PYSITELIB}/khashmir/__init__.py +${PYSITELIB}/khashmir/__init__.pyc +${PYSITELIB}/khashmir/__init__.pyo +${PYSITELIB}/khashmir/actions.py +${PYSITELIB}/khashmir/actions.pyc +${PYSITELIB}/khashmir/actions.pyo +${PYSITELIB}/khashmir/cache.py +${PYSITELIB}/khashmir/cache.pyc +${PYSITELIB}/khashmir/cache.pyo +${PYSITELIB}/khashmir/const.py +${PYSITELIB}/khashmir/const.pyc +${PYSITELIB}/khashmir/const.pyo +${PYSITELIB}/khashmir/hammerlock.py +${PYSITELIB}/khashmir/hammerlock.pyc +${PYSITELIB}/khashmir/hammerlock.pyo +${PYSITELIB}/khashmir/inserter.py +${PYSITELIB}/khashmir/inserter.pyc +${PYSITELIB}/khashmir/inserter.pyo +${PYSITELIB}/khashmir/khash.py +${PYSITELIB}/khashmir/khash.pyc +${PYSITELIB}/khashmir/khash.pyo +${PYSITELIB}/khashmir/khashmir.py +${PYSITELIB}/khashmir/khashmir.pyc +${PYSITELIB}/khashmir/khashmir.pyo +${PYSITELIB}/khashmir/knet.py +${PYSITELIB}/khashmir/knet.pyc +${PYSITELIB}/khashmir/knet.pyo +${PYSITELIB}/khashmir/knode.py +${PYSITELIB}/khashmir/knode.pyc +${PYSITELIB}/khashmir/knode.pyo +${PYSITELIB}/khashmir/krpc.py +${PYSITELIB}/khashmir/krpc.pyc +${PYSITELIB}/khashmir/krpc.pyo +${PYSITELIB}/khashmir/kstore.py +${PYSITELIB}/khashmir/kstore.pyc +${PYSITELIB}/khashmir/kstore.pyo +${PYSITELIB}/khashmir/ktable.py +${PYSITELIB}/khashmir/ktable.pyc +${PYSITELIB}/khashmir/ktable.pyo +${PYSITELIB}/khashmir/node.py +${PYSITELIB}/khashmir/node.pyc +${PYSITELIB}/khashmir/node.pyo +${PYSITELIB}/khashmir/setup.py +${PYSITELIB}/khashmir/setup.pyc +${PYSITELIB}/khashmir/setup.pyo +${PYSITELIB}/khashmir/test.py +${PYSITELIB}/khashmir/test.pyc +${PYSITELIB}/khashmir/test.pyo +${PYSITELIB}/khashmir/test_khashmir.py +${PYSITELIB}/khashmir/test_khashmir.pyc +${PYSITELIB}/khashmir/test_khashmir.pyo +${PYSITELIB}/khashmir/test_krpc.py +${PYSITELIB}/khashmir/test_krpc.pyc +${PYSITELIB}/khashmir/test_krpc.pyo +${PYSITELIB}/khashmir/test_kstore.py +${PYSITELIB}/khashmir/test_kstore.pyc +${PYSITELIB}/khashmir/test_kstore.pyo +${PYSITELIB}/khashmir/unet.py +${PYSITELIB}/khashmir/unet.pyc +${PYSITELIB}/khashmir/unet.pyo +${PYSITELIB}/khashmir/util.py +${PYSITELIB}/khashmir/util.pyc +${PYSITELIB}/khashmir/util.pyo +${PYSITELIB}/khashmir/utkhashmir.py +${PYSITELIB}/khashmir/utkhashmir.pyc +${PYSITELIB}/khashmir/utkhashmir.pyo share/doc/BitTorrent-${PKGVERSION}/LICENSE.txt share/doc/BitTorrent-${PKGVERSION}/README.txt +share/doc/BitTorrent-${PKGVERSION}/TRACKERLESS.txt +share/doc/BitTorrent-${PKGVERSION}/credits-l10n.txt share/doc/BitTorrent-${PKGVERSION}/credits.txt +share/doc/BitTorrent-${PKGVERSION}/public.key share/doc/BitTorrent-${PKGVERSION}/redirdonate.html +share/pixmaps/BitTorrent-${PKGVERSION}/bittorrent.ico share/pixmaps/BitTorrent-${PKGVERSION}/logo/bittorrent_32.png share/pixmaps/BitTorrent-${PKGVERSION}/logo/bittorrent_96.png @dirrm share/pixmaps/BitTorrent-${PKGVERSION}/logo @dirrm share/pixmaps/BitTorrent-${PKGVERSION} @dirrm share/doc/BitTorrent-${PKGVERSION} +@dirrm ${PYSITELIB}/khashmir @dirrm ${PYSITELIB}/BitTorrent diff --git a/net/bittorrent/distinfo b/net/bittorrent/distinfo index 6da188a4cc4..804e4b7be41 100644 --- a/net/bittorrent/distinfo +++ b/net/bittorrent/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.19 2005/09/30 14:05:38 adam Exp $ +$NetBSD: distinfo,v 1.20 2006/02/26 22:43:33 tron Exp $ -SHA1 (BitTorrent-4.0.4.tar.gz) = 6e1dd9f8a779ebc934527150d9107522fc097384 -RMD160 (BitTorrent-4.0.4.tar.gz) = 7d321e6812eb23cf924131ddc171b71170a55caf -Size (BitTorrent-4.0.4.tar.gz) = 153911 bytes -SHA1 (patch-aa) = fad5fb4d6b6c4aed9988cd4484aad042a3de5cef -SHA1 (patch-ab) = 05edb06099345d97a647251eaf522c17e34d14fb -SHA1 (patch-ac) = d3f7df1824bb6f80905787dc9b01f72a052dc841 +SHA1 (BitTorrent-4.4.0.tar.gz) = 8ca3e52c8049ff29a6785da410d6aa80c6726882 +RMD160 (BitTorrent-4.4.0.tar.gz) = 9e743b3178142855d289743d4430598353fb4d3f +Size (BitTorrent-4.4.0.tar.gz) = 1255281 bytes +SHA1 (patch-aa) = f295a93a91a0a8ba428edf8b7fb9357e1eb624bd +SHA1 (patch-ab) = e392544d6f45b7639d2d7a2bbb86ff61e9bee3e9 +SHA1 (patch-ac) = f8aa299b7dc096b483f9199d9171bf2da088b8eb diff --git a/net/bittorrent/patches/patch-aa b/net/bittorrent/patches/patch-aa index 559647106bd..bd1b5edc37c 100644 --- a/net/bittorrent/patches/patch-aa +++ b/net/bittorrent/patches/patch-aa @@ -1,23 +1,24 @@ -$NetBSD: patch-aa,v 1.7 2005/06/19 02:49:23 salo Exp $ +$NetBSD: patch-aa,v 1.8 2006/02/26 22:43:33 tron Exp $ ---- setup.py.orig 2005-03-24 23:30:24.000000000 +0100 -+++ setup.py 2005-06-19 04:18:09.000000000 +0200 -@@ -19,15 +19,14 @@ +--- setup.py.orig 2006-01-31 20:17:46.000000000 +0000 ++++ setup.py 2006-02-26 22:22:55.000000000 +0000 +@@ -38,8 +38,8 @@ + os.rmdir('FOO') + # done detecting case-insensitive filesystem - import glob +-symlinks = ["bittorrent" , "bittorrent-curses", "bittorrent-console", +- "maketorrent", "maketorrent-console", ++symlinks = ["bittorrent-curses", "bittorrent-console", ++ "maketorrent-console", + "launchmany-curses", "launchmany-console", + "changetracker-console", + "torrentinfo-console", +@@ -70,8 +70,6 @@ --scripts = ["btdownloadgui.py", "btdownloadcurses.py", "btdownloadheadless.py", -- "btmaketorrentgui.py", "btmaketorrent.py", -+scripts = ["btdownloadcurses.py", "btdownloadheadless.py", -+ "btmaketorrent.py", - "btlaunchmany.py", "btlaunchmanycurses.py", - "bttrack.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py"] - - img_root, doc_root = BitTorrent.calc_unix_dirs() - --data_files = [ (img_root , glob.glob('images/*png')+['images/bittorrent.ico',]), -- (img_root+'/logo', glob.glob('images/logo/bittorrent_[0-9]*.png') ), -+data_files = [ (img_root+'/logo', glob.glob('images/logo/bittorrent_[0-9]*.png') ), - (doc_root , ['credits.txt', 'LICENSE.txt', - 'README.txt', 'redirdonate.html'] ), - ] + data_files = [ (img_root , glob.glob('images/*png')+['images/bittorrent.ico',]), + (img_root+'/logo', glob.glob('images/logo/bittorrent_[0-9]*.png' )), +- (img_root+'/icons/default', glob.glob('images/icons/default/*.png' )), +- (img_root+'/icons/old' , glob.glob('images/icons/old/*.png' )), + (doc_root , ['credits.txt', 'credits-l10n.txt', + 'LICENSE.txt', 'README.txt', + 'TRACKERLESS.txt', 'redirdonate.html', diff --git a/net/bittorrent/patches/patch-ab b/net/bittorrent/patches/patch-ab index b7b08668698..b20a994bd45 100644 --- a/net/bittorrent/patches/patch-ab +++ b/net/bittorrent/patches/patch-ab @@ -1,11 +1,11 @@ -$NetBSD: patch-ab,v 1.5 2005/08/07 16:15:55 recht Exp $ +$NetBSD: patch-ab,v 1.6 2006/02/26 22:43:33 tron Exp $ ---- btdownloadheadless.py.orig 2005-07-11 00:44:41.000000000 +0200 -+++ btdownloadheadless.py 2005-08-07 17:30:34.000000000 +0200 -@@ -151,6 +151,7 @@ - print 'share rating: ', self.shareRating - print 'seed status: ', self.seedStatus - print 'peer status: ', self.peerStatus +--- bittorrent-console.orig 2006-01-31 20:16:36.000000000 +0000 ++++ bittorrent-console 2006-02-26 15:28:20.000000000 +0000 +@@ -157,6 +157,7 @@ + print _("share rating: "), self.shareRating + print _("seed status: "), self.seedStatus + print _("peer status: "), self.peerStatus + sys.stdout.flush() def print_spew(self, spew): diff --git a/net/bittorrent/patches/patch-ac b/net/bittorrent/patches/patch-ac index debe773eaf5..0546608063f 100644 --- a/net/bittorrent/patches/patch-ac +++ b/net/bittorrent/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.5 2005/08/07 16:15:55 recht Exp $ +$NetBSD: patch-ac,v 1.6 2006/02/26 22:43:33 tron Exp $ ---- BitTorrent/defaultargs.py.orig 2005-08-07 17:46:58.000000000 +0200 -+++ BitTorrent/defaultargs.py 2005-08-07 17:47:24.000000000 +0200 -@@ -77,7 +77,7 @@ - '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', %BSD_LIBC%, - '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'), +--- BitTorrent/defaultargs.py.orig 2006-01-31 20:16:34.000000000 +0000 ++++ BitTorrent/defaultargs.py 2006-02-26 16:55:40.000000000 +0000 +@@ -31,7 +31,7 @@ + ### add your favorite here + BAD_LIBC_WORKAROUND_DEFAULT = MYFALSE + if os.name == 'posix': +- if os.uname()[0] in ['Darwin']: ++ if os.uname()[0] in ['Darwin', 'DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD']: + BAD_LIBC_WORKAROUND_DEFAULT = MYTRUE + + MIN_INCOMPLETE = 100 |