diff options
author | recht <recht@pkgsrc.org> | 2005-08-07 16:15:55 +0000 |
---|---|---|
committer | recht <recht@pkgsrc.org> | 2005-08-07 16:15:55 +0000 |
commit | 2cdd5c7e23a49c833c59b602e2f50be9d66c3ea4 (patch) | |
tree | 9ee57a3ece7de2fed1bca50797bc20ab8645a2aa | |
parent | 8195f478d87524da7f9b707c938512c1c8f47a7e (diff) | |
download | pkgsrc-2cdd5c7e23a49c833c59b602e2f50be9d66c3ea4.tar.gz |
update to BitTorrent 4.0.3
Also enable the enable_bad_libc_workaround by default for NetBSD,
FreeBSD, OpenBSD and Darwin.
Changes in this release:
- Identify trackerless torrent files
- Not saving pause/play state across invocations of the GUI
- Small fixes to windows installer and corrupt config file recovery
- A number of small bug fixes
-rw-r--r-- | net/bittorrent-gui/Makefile | 4 | ||||
-rw-r--r-- | net/bittorrent-gui/PLIST | 22 | ||||
-rw-r--r-- | net/bittorrent/Makefile | 17 | ||||
-rw-r--r-- | net/bittorrent/Makefile.common | 5 | ||||
-rw-r--r-- | net/bittorrent/PLIST | 20 | ||||
-rw-r--r-- | net/bittorrent/distinfo | 11 | ||||
-rw-r--r-- | net/bittorrent/patches/patch-ab | 10 | ||||
-rw-r--r-- | net/bittorrent/patches/patch-ac | 13 |
8 files changed, 64 insertions, 38 deletions
diff --git a/net/bittorrent-gui/Makefile b/net/bittorrent-gui/Makefile index d193972878a..e0690eb5722 100644 --- a/net/bittorrent-gui/Makefile +++ b/net/bittorrent-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/08/06 10:55:06 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2005/08/07 16:15:55 recht Exp $ # .include "../../net/bittorrent/Makefile.common" @@ -7,7 +7,7 @@ PKGNAME= ${DISTNAME:S/BitTorrent/bittorrent-gui/} COMMENT+= (GTK+ GUI) -DEPENDS+= bittorrent>=4.0.2:../../net/bittorrent +DEPENDS+= bittorrent>=4.0.3:../../net/bittorrent PYTHON_PATCH_SCRIPTS= btdownloadgui.py btmaketorrentgui.py diff --git a/net/bittorrent-gui/PLIST b/net/bittorrent-gui/PLIST index fae2cb6bcaf..3adee81036d 100644 --- a/net/bittorrent-gui/PLIST +++ b/net/bittorrent-gui/PLIST @@ -1,13 +1,13 @@ -@comment $NetBSD: PLIST,v 1.4 2005/07/10 19:11:02 recht Exp $ +@comment $NetBSD: PLIST,v 1.5 2005/08/07 16:15:55 recht Exp $ bin/btdownloadgui.py bin/btmaketorrentgui.py -share/pixmaps/BitTorrent-4.0.2/bittorrent.ico -share/pixmaps/BitTorrent-4.0.2/broken.png -share/pixmaps/BitTorrent-4.0.2/finished.png -share/pixmaps/BitTorrent-4.0.2/info.png -share/pixmaps/BitTorrent-4.0.2/pause.png -share/pixmaps/BitTorrent-4.0.2/paused.png -share/pixmaps/BitTorrent-4.0.2/play.png -share/pixmaps/BitTorrent-4.0.2/queued.png -share/pixmaps/BitTorrent-4.0.2/remove.png -share/pixmaps/BitTorrent-4.0.2/running.png +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 diff --git a/net/bittorrent/Makefile b/net/bittorrent/Makefile index 5615727c193..09001fd5a71 100644 --- a/net/bittorrent/Makefile +++ b/net/bittorrent/Makefile @@ -1,15 +1,28 @@ -# $NetBSD: Makefile,v 1.29 2005/08/06 10:55:06 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2005/08/07 16:15:55 recht Exp $ # .include "Makefile.common" PKGNAME= ${DISTNAME:S/BitT/bitt/} -PKGREVISION= 1 PYDISTUTILSPKG= YES 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" +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 e3bcab8c4af..086effe9cbf 100644 --- a/net/bittorrent/Makefile.common +++ b/net/bittorrent/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.14 2005/07/26 13:50:58 gdt Exp $ +# $NetBSD: Makefile.common,v 1.15 2005/08/07 16:15:55 recht Exp $ # -DISTNAME= BitTorrent-4.0.2 +DISTNAME= BitTorrent-4.0.3 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bittorrent/} @@ -13,5 +13,4 @@ DISTINFO_FILE= ${.CURDIR}/../../net/bittorrent/distinfo FILESDIR= ${.CURDIR}/../../net/bittorrent/files PATCHDIR= ${.CURDIR}/../../net/bittorrent/patches - PYTHON_VERSIONS_ACCEPTED= 24 23 22 diff --git a/net/bittorrent/PLIST b/net/bittorrent/PLIST index 6e0873cca5f..89de68237a3 100644 --- a/net/bittorrent/PLIST +++ b/net/bittorrent/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2005/07/10 19:11:02 recht Exp $ +@comment $NetBSD: PLIST,v 1.12 2005/08/07 16:15:55 recht Exp $ bin/btdownloadcurses.py bin/btdownloadheadless.py bin/btlaunchmany.py @@ -125,13 +125,13 @@ ${PYSITELIB}/BitTorrent/track.pyo ${PYSITELIB}/BitTorrent/zurllib.py ${PYSITELIB}/BitTorrent/zurllib.pyc ${PYSITELIB}/BitTorrent/zurllib.pyo -share/doc/BitTorrent-4.0.2/LICENSE.txt -share/doc/BitTorrent-4.0.2/README.txt -share/doc/BitTorrent-4.0.2/credits.txt -share/doc/BitTorrent-4.0.2/redirdonate.html -share/pixmaps/BitTorrent-4.0.2/logo/bittorrent_32.png -share/pixmaps/BitTorrent-4.0.2/logo/bittorrent_96.png -@dirrm share/pixmaps/BitTorrent-4.0.2/logo -@dirrm share/pixmaps/BitTorrent-4.0.2 -@dirrm share/doc/BitTorrent-4.0.2 +share/doc/BitTorrent-${PKGVERSION}/LICENSE.txt +share/doc/BitTorrent-${PKGVERSION}/README.txt +share/doc/BitTorrent-${PKGVERSION}/credits.txt +share/doc/BitTorrent-${PKGVERSION}/redirdonate.html +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}/BitTorrent diff --git a/net/bittorrent/distinfo b/net/bittorrent/distinfo index 54a2f295f4d..757ed7793d5 100644 --- a/net/bittorrent/distinfo +++ b/net/bittorrent/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.17 2005/07/26 13:43:13 gdt Exp $ +$NetBSD: distinfo,v 1.18 2005/08/07 16:15:55 recht Exp $ -SHA1 (BitTorrent-4.0.2.tar.gz) = c45507be7f47fa90925ba57a1a5975c61380dc04 -RMD160 (BitTorrent-4.0.2.tar.gz) = feae7a846eb5f6b3c89d65f5f52fb34adc8f3086 -Size (BitTorrent-4.0.2.tar.gz) = 155062 bytes +SHA1 (BitTorrent-4.0.3.tar.gz) = 7b02cfa762c4b3ca4c34db592af4b68b33ac1a6b +RMD160 (BitTorrent-4.0.3.tar.gz) = 8c6c0302bf9fc6dc2fc0da857ece92dff0d713c1 +Size (BitTorrent-4.0.3.tar.gz) = 157027 bytes SHA1 (patch-aa) = fad5fb4d6b6c4aed9988cd4484aad042a3de5cef -SHA1 (patch-ab) = 615583322ff5c11a641305e2909eeac91b9db8b7 +SHA1 (patch-ab) = 05edb06099345d97a647251eaf522c17e34d14fb +SHA1 (patch-ac) = d3f7df1824bb6f80905787dc9b01f72a052dc841 diff --git a/net/bittorrent/patches/patch-ab b/net/bittorrent/patches/patch-ab index 71e57ebebbe..b7b08668698 100644 --- a/net/bittorrent/patches/patch-ab +++ b/net/bittorrent/patches/patch-ab @@ -1,12 +1,12 @@ -$NetBSD: patch-ab,v 1.4 2005/07/26 13:43:13 gdt Exp $ +$NetBSD: patch-ab,v 1.5 2005/08/07 16:15:55 recht Exp $ ---- btdownloadheadless.py.orig 2005-05-24 02:06:11.000000000 -0400 -+++ btdownloadheadless.py -@@ -151,6 +151,7 @@ class HeadlessDisplayer(object): +--- 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 -+ sys.stdout.flush() ++ sys.stdout.flush() def print_spew(self, spew): s = StringIO() diff --git a/net/bittorrent/patches/patch-ac b/net/bittorrent/patches/patch-ac new file mode 100644 index 00000000000..debe773eaf5 --- /dev/null +++ b/net/bittorrent/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.5 2005/08/07 16:15:55 recht 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'), |