Update "libtorrent" package to version 0.10.1 and "rtorrent" package

to version 0.6.1. Changes since version 0.8.5 respectively 0.4.5 are:
- improved user interface (apparently also fixing redraw problems
  under DragonFly BSD)
- better diskspace handling
- show client names and versions in the peer list
- improved tracker communication
- lots of bug fixes

Based on patches provided by Jan 'Rumko' Kosir in private e-mail.

8 files changed, 31 insertions, 66 deletions

diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile
index fe0a7db796e..b7640bd0814 100644
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2006/05/29 06:36:06 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2006/09/13 21:04:19 tron Exp $
 
-DISTNAME=	libtorrent-0.8.5
-PKGREVISION=	1
+DISTNAME=	libtorrent-0.10.1
 CATEGORIES=	net
 MASTER_SITES=	http://libtorrent.rakshasa.no/downloads/
 
diff --git a/net/libtorrent/PLIST b/net/libtorrent/PLIST
index 728ffc1b753..275274ebb0d 100644
--- a/net/libtorrent/PLIST
+++ b/net/libtorrent/PLIST
@@ -1,20 +1,32 @@
-@comment $NetBSD: PLIST,v 1.3 2006/01/30 00:52:28 tron Exp $
-include/torrent/bencode.h
+@comment $NetBSD: PLIST,v 1.4 2006/09/13 21:04:19 tron Exp $
+include/torrent/bitfield.h
+include/torrent/block.h
+include/torrent/block_list.h
+include/torrent/block_transfer.h
+include/torrent/chunk_manager.h
 include/torrent/common.h
+include/torrent/connection_manager.h
 include/torrent/download.h
-include/torrent/entry.h
 include/torrent/event.h
 include/torrent/exceptions.h
+include/torrent/file.h
+include/torrent/file_list.h
 include/torrent/http.h
-include/torrent/peer.h
+include/torrent/object.h
+include/torrent/object_stream.h
 include/torrent/path.h
+include/torrent/peer.h
+include/torrent/piece.h
 include/torrent/poll.h
 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/torrent.h
 include/torrent/tracker.h
+include/torrent/tracker_list.h
+include/torrent/transfer_list.h
 lib/libtorrent.la
 lib/pkgconfig/libtorrent.pc
 @dirrm include/torrent
diff --git a/net/libtorrent/buildlink3.mk b/net/libtorrent/buildlink3.mk
index dd47d3f21bf..63bd6adbace 100644
--- a/net/libtorrent/buildlink3.mk
+++ b/net/libtorrent/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/09/13 21:04:19 tron Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBTORRENT_BUILDLINK3_MK:=	${LIBTORRENT_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	libtorrent
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtorrent
 
 .if !empty(LIBTORRENT_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libtorrent+=		libtorrent>=0.8.0
-BUILDLINK_ABI_DEPENDS.libtorrent+=	libtorrent>=0.8.5nb1
+BUILDLINK_API_DEPENDS.libtorrent+=	libtorrent>=0.10.0
+BUILDLINK_ABI_DEPENDS.libtorrent+=	libtorrent>=0.10.0
 BUILDLINK_PKGSRCDIR.libtorrent?=	../../net/libtorrent
 .endif	# LIBTORRENT_BUILDLINK3_MK
 
diff --git a/net/libtorrent/distinfo b/net/libtorrent/distinfo
index c2b2dbf8ba0..3c8f3d43a2b 100644
--- a/net/libtorrent/distinfo
+++ b/net/libtorrent/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.8 2006/03/03 15:30:53 tron Exp $
+$NetBSD: distinfo,v 1.9 2006/09/13 21:04:19 tron Exp $
 
-SHA1 (libtorrent-0.8.5.tar.gz) = 2c58bb7cbded9024468d660e5ee204d51c999dec
-RMD160 (libtorrent-0.8.5.tar.gz) = 0a45e6442ea0d4d1e6204e0fbc090f7906be6348
-Size (libtorrent-0.8.5.tar.gz) = 448000 bytes
-SHA1 (patch-aa) = c4357114764205be1c1b12f2563522cdb658abcf
-SHA1 (patch-ab) = 9d4e39cf8f0244efb07ab2569fd9d45f69828d77
+SHA1 (libtorrent-0.10.1.tar.gz) = 0eb15edc789bbd549a505c5c9a54279ac352c538
+RMD160 (libtorrent-0.10.1.tar.gz) = 1cc40a2543e075658012b00f9709550de0c0a8d0
+Size (libtorrent-0.10.1.tar.gz) = 447888 bytes
diff --git a/net/libtorrent/patches/patch-aa b/net/libtorrent/patches/patch-aa
deleted file mode 100644
index 9ef25b1575f..00000000000
--- a/net/libtorrent/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/03/03 15:30:53 tron Exp $
-
---- src/protocol/peer_connection_leech.cc.orig	2006-02-09 16:05:05.000000000 +0000
-+++ src/protocol/peer_connection_leech.cc	2006-03-03 15:11:38.000000000 +0000
-@@ -204,7 +204,7 @@
-     }
- 
-   case ProtocolBase::REQUEST:
--    if (buf->remaining() < 13)
-+    if (buf->remaining() < 12)
-       break;
- 
-     if (!m_up->choked()) {
-@@ -260,7 +260,7 @@
-     }
- 
-   case ProtocolBase::CANCEL:
--    if (buf->remaining() < 13)
-+    if (buf->remaining() < 12)
-       break;
- 
-     read_cancel_piece(m_down->read_request());
diff --git a/net/libtorrent/patches/patch-ab b/net/libtorrent/patches/patch-ab
deleted file mode 100644
index a5158a1f2c0..00000000000
--- a/net/libtorrent/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2006/03/03 15:30:53 tron Exp $
-
---- src/protocol/peer_connection_seed.cc.orig	2006-02-09 16:05:05.000000000 +0000
-+++ src/protocol/peer_connection_seed.cc	2006-03-03 15:11:38.000000000 +0000
-@@ -168,7 +168,7 @@
-     }
- 
-   case ProtocolBase::REQUEST:
--    if (buf->remaining() < 13)
-+    if (buf->remaining() < 12)
-       break;
- 
-     if (!m_up->choked()) {
-@@ -185,7 +185,7 @@
-     throw network_error("Received a piece but the connection is strictly for seeding.");
- 
-   case ProtocolBase::CANCEL:
--    if (buf->remaining() < 13)
-+    if (buf->remaining() < 12)
-       break;
- 
-     read_cancel_piece(m_down->read_request());
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index 46e74abba01..7b7c0986252 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2006/07/22 04:46:17 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2006/09/13 21:04:20 tron Exp $
 
-DISTNAME=	rtorrent-0.4.5
+DISTNAME=	rtorrent-0.6.1
 CATEGORIES=	net
 MASTER_SITES=	http://libtorrent.rakshasa.no/downloads/
 
diff --git a/net/rtorrent/distinfo b/net/rtorrent/distinfo
index eeadad0b602..57c1839678c 100644
--- a/net/rtorrent/distinfo
+++ b/net/rtorrent/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2006/02/25 17:24:21 tron Exp $
+$NetBSD: distinfo,v 1.7 2006/09/13 21:04:20 tron Exp $
 
-SHA1 (rtorrent-0.4.5.tar.gz) = 127ac447bfa283aa28670daed7f744635245c579
-RMD160 (rtorrent-0.4.5.tar.gz) = 37d07de0f9f19d91886cf1949db61b7bbe2be868
-Size (rtorrent-0.4.5.tar.gz) = 391183 bytes
+SHA1 (rtorrent-0.6.1.tar.gz) = 4defe3a47ce84b8e2be6041b504015019eda606b
+RMD160 (rtorrent-0.6.1.tar.gz) = 71a2e4cf5522d0e3a42e1d3293e4d8ff960252b1
+Size (rtorrent-0.6.1.tar.gz) = 411058 bytes