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

to version 0.4.5. Changes since 0.8.3 respectively 0.4.3:
- Bind udp and http tracker requests to the address given with the "bind"
  option.
- Change the priority of a torrent with the '+' and '-' keys.
- The schedule option allows clock time for the start and interval
  sections.
- Made it safe to remove torrents being viewed/selected, making
  "remove_untied" usable.
- Added the ^O key to change a closed torrent's destination directory. A
  bit of a hack, and only works if the torrents hasn't been activated.
- Allow new settings to be applied with the ^P key. This can be tested
  with "print = foobar", which prints the string to the log.
- Added the "working_directory" option that calls 'chdir' for the process.
- Fixed a bug that caused crashes with small screen sizes.
- Enabled a session lock file by default. Made it remove stale locks
  if the hostname matches and the process id is not running.
- Added proper abstraction for creating timers from seconds, this
  fixes some overflow bugs when scheduling tasks like tracker timeouts.
- For every time all the trackers in the list has been unsuccessfully
  tried, increase the timeout by 20 seconds.
- Expand ~ in paths in the client. This should cover all uses of file
  paths, but I might have missed some.
- Added "import" and "try_import" options that loads an option
  file. The latter silently fails on non-existent files.
- Added "-O" flag that takes a single option, allowing ',' to be used.

5 files changed, 14 insertions, 84 deletions

diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile
index 0b019335f53..df135e998e1 100644
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/02/25 17:24:21 tron Exp $
 
-DISTNAME=	libtorrent-0.8.3
-PKGREVISION=	1
+DISTNAME=	libtorrent-0.8.5
 CATEGORIES=	net
 MASTER_SITES=	http://libtorrent.rakshasa.no/downloads/
 
-MAINTAINER=	imil@gcu.info
+MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://libtorrent.rakshasa.no/
 COMMENT=	BitTorrent library written in C++ for *nix
 
diff --git a/net/libtorrent/distinfo b/net/libtorrent/distinfo
index b00449e7c8b..cf580531f05 100644
--- a/net/libtorrent/distinfo
+++ b/net/libtorrent/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2006/01/30 00:52:28 tron Exp $
+$NetBSD: distinfo,v 1.7 2006/02/25 17:24:21 tron Exp $
 
-SHA1 (libtorrent-0.8.3.tar.gz) = 9f57d520732d5a367492e65825cab69a94a65844
-RMD160 (libtorrent-0.8.3.tar.gz) = 2a88aa5824efc343453a5c98923b38f5e3cc81d8
-Size (libtorrent-0.8.3.tar.gz) = 445167 bytes
+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
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index c9484f0c151..68ea68b163d 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:10:30 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/25 17:24:21 tron Exp $
 
-DISTNAME=	rtorrent-0.4.3
-PKGREVISION=	1
+DISTNAME=	rtorrent-0.4.5
 CATEGORIES=	net
 MASTER_SITES=	http://libtorrent.rakshasa.no/downloads/
 
-MAINTAINER=	imil@gcu.info
+MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://libtorrent.rakshasa.no/
 COMMENT=	Ncurses based torrent client with support for sessions
 
diff --git a/net/rtorrent/distinfo b/net/rtorrent/distinfo
index f76b0daddf8..eeadad0b602 100644
--- a/net/rtorrent/distinfo
+++ b/net/rtorrent/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2006/01/30 00:52:28 tron Exp $
+$NetBSD: distinfo,v 1.6 2006/02/25 17:24:21 tron Exp $
 
-SHA1 (rtorrent-0.4.3.tar.gz) = 78a592505af265cca5a7d29930dfeeaa72138506
-RMD160 (rtorrent-0.4.3.tar.gz) = f44ec095ad3f045de819e1fd30998beff5721f5b
-Size (rtorrent-0.4.3.tar.gz) = 233264 bytes
-SHA1 (patch-aa) = c594b2c02d060dddc445878fe2be80b830d205d3
+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
diff --git a/net/rtorrent/patches/patch-aa b/net/rtorrent/patches/patch-aa
deleted file mode 100644
index 16ba352de1f..00000000000
--- a/net/rtorrent/patches/patch-aa
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/01/30 00:52:28 tron Exp $
-
---- src/utils/variable_map.cc.orig	2006-01-17 16:26:38.000000000 +0000
-+++ src/utils/variable_map.cc	2006-01-30 00:02:39.000000000 +0000
-@@ -37,6 +37,7 @@
- #include "config.h"
- 
- #include <algorithm>
-+#include <cctype>
- #include <rak/functional.h>
- #include <torrent/exceptions.h>
- #include <torrent/bencode.h>
-@@ -93,6 +94,11 @@
-   return first;
- }
- 
-+static bool
-+I_hate_C_Plus_Plus(char c) {
-+    return std::isspace(c);
-+}
-+
- std::string::const_iterator
- parse_unknown(std::string::const_iterator first, std::string::const_iterator last, torrent::Bencode* dest) {
-   if (*first == '"') {
-@@ -108,7 +114,7 @@
- 
-   } else {
-     // Add rak::or and check for ','.
--    std::string::const_iterator next = std::find_if(first, last, std::ptr_fun(&std::isspace));
-+    std::string::const_iterator next = std::find_if(first, last, std::ptr_fun(&I_hate_C_Plus_Plus));
- 
-     *dest = std::string(first, next);
-     return next;
-@@ -117,13 +123,13 @@
- 
- std::string::const_iterator
- parse_args(std::string::const_iterator first, std::string::const_iterator last, torrent::Bencode::List* dest) {
--  first = std::find_if(first, last, std::not1(std::ptr_fun(&std::isspace)));
-+  first = std::find_if(first, last, std::not1(std::ptr_fun(&I_hate_C_Plus_Plus)));
- 
-   while (first != last) {
-     dest->push_back(torrent::Bencode());
- 
-     first = parse_unknown(first, last, &dest->back());
--    first = std::find_if(first, last, std::not1(std::ptr_fun(&std::isspace)));
-+    first = std::find_if(first, last, std::not1(std::ptr_fun(&I_hate_C_Plus_Plus)));
- 
-     if (first != last && *first != ',')
-       throw torrent::input_error("A string with blanks must be quoted.");
-@@ -135,7 +141,7 @@
- void
- VariableMap::process_command(const std::string& command) {
-   std::string::const_iterator pos = command.begin();
--  pos = std::find_if(pos, command.end(), std::not1(std::ptr_fun(&std::isspace)));
-+  pos = std::find_if(pos, command.end(), std::not1(std::ptr_fun(&I_hate_C_Plus_Plus)));
- 
-   if (pos == command.end() || *pos == '#')
-     return;
-@@ -143,7 +149,7 @@
-   // Replace with parse_unknown?
-   std::string key;
-   pos = parse_name(pos, command.end(), &key);
--  pos = std::find_if(pos, command.end(), std::not1(std::ptr_fun(&std::isspace)));
-+  pos = std::find_if(pos, command.end(), std::not1(std::ptr_fun(&I_hate_C_Plus_Plus)));
-   
-   if (pos == command.end() || *pos != '=')
-     throw torrent::input_error("Could not find '='.");