summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/libtorrent/Makefile5
-rw-r--r--net/libtorrent/PLIST17
-rw-r--r--net/libtorrent/distinfo8
-rw-r--r--net/rtorrent/Makefile8
-rw-r--r--net/rtorrent/PLIST3
-rw-r--r--net/rtorrent/distinfo11
-rw-r--r--net/rtorrent/patches/patch-af12
-rw-r--r--net/rtorrent/patches/patch-ag24
8 files changed, 63 insertions, 25 deletions
diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile
index b6fd6deea52..5021c90750c 100644
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2010/06/16 13:07:03 jakllsch Exp $
+# $NetBSD: Makefile,v 1.39 2011/07/30 17:06:33 tron Exp $
-DISTNAME= libtorrent-0.12.6
-PKGREVISION= 2
+DISTNAME= libtorrent-0.12.9
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE:=downloads/}
diff --git a/net/libtorrent/PLIST b/net/libtorrent/PLIST
index 52a11faf8dd..b8dadb00d70 100644
--- a/net/libtorrent/PLIST
+++ b/net/libtorrent/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:09:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2011/07/30 17:06:33 tron Exp $
include/torrent/bitfield.h
include/torrent/chunk_manager.h
include/torrent/common.h
@@ -6,6 +6,7 @@ include/torrent/connection_manager.h
include/torrent/data/block.h
include/torrent/data/block_list.h
include/torrent/data/block_transfer.h
+include/torrent/data/chunk_utils.h
include/torrent/data/file.h
include/torrent/data/file_list.h
include/torrent/data/file_list_iterator.h
@@ -15,14 +16,22 @@ include/torrent/data/piece.h
include/torrent/data/transfer_list.h
include/torrent/dht_manager.h
include/torrent/download.h
+include/torrent/download/choke_group.h
+include/torrent/download/choke_queue.h
+include/torrent/download/download_manager.h
+include/torrent/download/resource_manager.h
+include/torrent/download_info.h
include/torrent/error.h
include/torrent/event.h
include/torrent/exceptions.h
include/torrent/hash_string.h
include/torrent/http.h
include/torrent/object.h
+include/torrent/object_raw_bencode.h
+include/torrent/object_static_map.h
include/torrent/object_stream.h
include/torrent/path.h
+include/torrent/peer/choke_status.h
include/torrent/peer/client_info.h
include/torrent/peer/client_list.h
include/torrent/peer/connection_list.h
@@ -34,10 +43,14 @@ include/torrent/poll_epoll.h
include/torrent/poll_kqueue.h
include/torrent/poll_select.h
include/torrent/rate.h
-include/torrent/resume.h
+include/torrent/thread_base.h
include/torrent/throttle.h
include/torrent/torrent.h
include/torrent/tracker.h
include/torrent/tracker_list.h
+include/torrent/utils/extents.h
+include/torrent/utils/log_files.h
+include/torrent/utils/option_strings.h
+include/torrent/utils/resume.h
lib/libtorrent.la
lib/pkgconfig/libtorrent.pc
diff --git a/net/libtorrent/distinfo b/net/libtorrent/distinfo
index 11949adca52..5adba19766b 100644
--- a/net/libtorrent/distinfo
+++ b/net/libtorrent/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.27 2010/01/01 19:36:31 snj Exp $
+$NetBSD: distinfo,v 1.28 2011/07/30 17:06:33 tron Exp $
-SHA1 (libtorrent-0.12.6.tar.gz) = bf7082f98bd6281493cba94a456697fb88c2c21b
-RMD160 (libtorrent-0.12.6.tar.gz) = 62f0c9737d4ca9621c42d673ea997f9d36875530
-Size (libtorrent-0.12.6.tar.gz) = 594113 bytes
+SHA1 (libtorrent-0.12.9.tar.gz) = 176a836c6e685e4dad71ac08c0e09caaa5b7757c
+RMD160 (libtorrent-0.12.9.tar.gz) = a898e882da94977973d62f34a5dd82577fd83cf5
+Size (libtorrent-0.12.9.tar.gz) = 667864 bytes
SHA1 (patch-aa) = d864808b9e9524b3a7f72bcc1b465d4e6b2d4f4a
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index 12b86c98111..afef179bb61 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2011/07/28 23:14:46 tron Exp $
+# $NetBSD: Makefile,v 1.40 2011/07/30 17:06:33 tron Exp $
-DISTNAME= rtorrent-0.8.6
-PKGREVISION= 4
+DISTNAME= rtorrent-0.8.9
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE:=downloads/}
@@ -19,6 +18,9 @@ USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
GCC_REQD+= 3.3
+.include "../../mk/pthread.buildlink3.mk"
+LDFLAGS+= ${PTHREAD_LDFLAGS}
+
.include "options.mk"
.if !empty(OPSYS:M*BSD) || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly"
diff --git a/net/rtorrent/PLIST b/net/rtorrent/PLIST
index 8cf6b8ffbb8..901a535afc2 100644
--- a/net/rtorrent/PLIST
+++ b/net/rtorrent/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:09:42 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/07/30 17:06:33 tron Exp $
bin/rtorrent
-man/man1/rtorrent.1
share/examples/rtorrent/rtorrent.rc
diff --git a/net/rtorrent/distinfo b/net/rtorrent/distinfo
index fc1ac7bd536..5442e504983 100644
--- a/net/rtorrent/distinfo
+++ b/net/rtorrent/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.26 2011/03/01 07:44:52 tron Exp $
+$NetBSD: distinfo,v 1.27 2011/07/30 17:06:33 tron Exp $
-SHA1 (rtorrent-0.8.6.tar.gz) = ffce3959ba91738bb444d689db3db1e2375b14ce
-RMD160 (rtorrent-0.8.6.tar.gz) = 3d5109d4ee26c663b376e0b9f610ab6055c57ba9
-Size (rtorrent-0.8.6.tar.gz) = 521045 bytes
+SHA1 (rtorrent-0.8.9.tar.gz) = 0ac51c185e98b5a386e5f1a07bca9a9963e2d6ce
+RMD160 (rtorrent-0.8.9.tar.gz) = d79eacf6d63d13514c07c1c35a662fea5f35aef1
+Size (rtorrent-0.8.9.tar.gz) = 570904 bytes
SHA1 (patch-aa) = ef8edceb33f28e022e3d48706c30733ac3a730a3
SHA1 (patch-ab) = 87873bb32166d00398ab0ef6421a6fe85a55c914
SHA1 (patch-ac) = b62de9ce834aa0422ec173e694d07e88aa1e2f47
SHA1 (patch-ad) = 04fafec083c7cb27eb2f5ef7fbc5f6ab2e4e4a55
SHA1 (patch-ae) = 49cb5e84f3759febfc93df874a10c90cafc249d8
-SHA1 (patch-af) = 034b73f871aa09285b467502a1b524011f9eabdc
+SHA1 (patch-af) = 21459320ef99e0d28fffec69bd0aa3407bf7401f
+SHA1 (patch-ag) = 381b100d2ae711114b24c4de2a4bf612efe31766
diff --git a/net/rtorrent/patches/patch-af b/net/rtorrent/patches/patch-af
index 870f5d61e0f..f7ed794ec6b 100644
--- a/net/rtorrent/patches/patch-af
+++ b/net/rtorrent/patches/patch-af
@@ -1,11 +1,11 @@
-$NetBSD: patch-af,v 1.2 2011/03/01 07:44:53 tron Exp $
+$NetBSD: patch-af,v 1.3 2011/07/30 17:06:33 tron Exp $
Make this work with "ncurses" 5.8. Patch taken from here.
http://www.mail-archive.com/arch-general@archlinux.org/msg18728.html
---- src/display/canvas.h.orig 2009-11-12 08:03:47.000000000 +0000
-+++ src/display/canvas.h 2011-03-01 07:40:08.000000000 +0000
+--- src/display/canvas.h.orig 2011-04-07 13:36:10.000000000 +0100
++++ src/display/canvas.h 2011-07-30 16:40:10.000000000 +0100
@@ -37,6 +37,7 @@
#ifndef RTORRENT_DISPLAY_CANVAS_H
#define RTORRENT_DISPLAY_CANVAS_H
@@ -18,8 +18,8 @@ http://www.mail-archive.com/arch-general@archlinux.org/msg18728.html
public:
typedef std::vector<Attributes> attributes_list;
-- Canvas(int x = 0, int y = 0, int width = 0, int height = 0) :
-+ Canvas(int x = 0, int y = 0, int width = 1, int height = 1) :
- m_window(newwin(height, width, y, x)) {}
+- Canvas(int x = 0, int y = 0, int width = 0, int height = 0);
++ Canvas(int x = 0, int y = 0, int width = 0, int height = 1);
~Canvas() { delwin(m_window); }
+ void refresh() { wnoutrefresh(m_window); }
diff --git a/net/rtorrent/patches/patch-ag b/net/rtorrent/patches/patch-ag
new file mode 100644
index 00000000000..ba336770399
--- /dev/null
+++ b/net/rtorrent/patches/patch-ag
@@ -0,0 +1,24 @@
+$NetBSD: patch-ag,v 1.1 2011/07/30 17:06:33 tron Exp $
+
+Fix handling of command line options. Please look here for details:
+
+http://libtorrent.rakshasa.no/ticket/2657
+
+--- src/main.cc.orig 2011-06-12 07:43:04.000000000 +0100
++++ src/main.cc 2011-07-30 17:21:50.000000000 +0100
+@@ -822,13 +822,13 @@
+ }
+ #endif
+
+- int firstArg = parse_options(control, argc, argv);
+-
+ if (OptionParser::has_flag('n', argc, argv))
+ control->core()->push_log("Ignoring ~/.rtorrent.rc.");
+ else
+ rpc::parse_command_single(rpc::make_target(), "try_import = ~/.rtorrent.rc");
+
++ int firstArg = parse_options(control, argc, argv);
++
+ control->initialize();
+
+ // Load session torrents and perform scheduled tasks to ensure
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-30 19:49:35 +0000