8 files changed, 78 insertions, 138 deletions

diff --git a/net-p2p/libtorrent-rasterbar-14/Makefile b/net-p2p/libtorrent-rasterbar-14/Makefile
index ecf64016caa7..01a683918d9c 100644
--- a/net-p2p/libtorrent-rasterbar-14/Makefile
+++ b/net-p2p/libtorrent-rasterbar-14/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	libtorrent
-PORTVERSION=	0.10
+PORTVERSION=	0.11
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=libtorrent
 PKGNAMEPREFIX=	rb
 
-MAINTAINER=	johan@stromnet.org
+MAINTAINER=	johan@stromnet.se
 COMMENT=	A C++ library implementing a BitTorrent client
 
 LIB_DEPENDS=	boost_date_time.3:${PORTSDIR}/devel/boost \
diff --git a/net-p2p/libtorrent-rasterbar-14/distinfo b/net-p2p/libtorrent-rasterbar-14/distinfo
index 5c4a4b366674..74318f11702b 100644
--- a/net-p2p/libtorrent-rasterbar-14/distinfo
+++ b/net-p2p/libtorrent-rasterbar-14/distinfo
@@ -1,3 +1,3 @@
-MD5 (libtorrent-0.10.tar.gz) = 73de41c4782c120f56bce73d8f534d0b
-SHA256 (libtorrent-0.10.tar.gz) = b337eb174a26722ec4cdd4349e07bb5ef51eda7d8de1414c9d5ad5251c021edf
-SIZE (libtorrent-0.10.tar.gz) = 989448
+MD5 (libtorrent-0.11.tar.gz) = 56e9071b95a6e3f9377121f2fead3499
+SHA256 (libtorrent-0.11.tar.gz) = f350e0af6b42c2cdb1f19008b00fe5f0b70236817f532a94bcb1e3ef6ebba0d7
+SIZE (libtorrent-0.11.tar.gz) = 1130537
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-Makefile.in b/net-p2p/libtorrent-rasterbar-14/files/patch-Makefile.in
index 632f8b3cbd0e..3f2cd075f3d0 100644
--- a/net-p2p/libtorrent-rasterbar-14/files/patch-Makefile.in
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Fri Mar 24 21:28:28 2006
-+++ Makefile.in	Fri Mar 24 21:28:52 2006
-@@ -206,7 +206,7 @@
- m4/ac_cxx_namespaces.m4 m4/acx_pthread.m4 m4/ax_boost_date-time.m4 \
- m4/ax_boost_filesystem.m4 m4/ax_boost_thread.m4 src/file_win.cpp libtorrent.pc
+--- Makefile.in.orig	Wed Nov 29 13:16:17 2006
++++ Makefile.in	Wed Nov 29 13:16:22 2006
+@@ -235,7 +235,7 @@
+ debian/libtorrent0.install \
+ debian/rules
  
 -pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
++pkgconfigdir = $(libdir)/libdata/pkgconfig
  pkgconfig_DATA = libtorrent.pc
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-configure b/net-p2p/libtorrent-rasterbar-14/files/patch-configure
deleted file mode 100644
index ab3c784a2d73..000000000000
--- a/net-p2p/libtorrent-rasterbar-14/files/patch-configure
+++ /dev/null
@@ -1,52 +0,0 @@
---- configure.orig	Sun Feb  5 22:01:29 2006
-+++ configure	Sun Feb  5 22:03:10 2006
-@@ -20398,7 +20398,8 @@
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
--  BOOST_DATE_TIME_LIB=$ax_lib break
-+  BOOST_DATE_TIME_LIB=$ax_lib
-+  break
- fi
- 
-   done
-@@ -20558,7 +20559,8 @@
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
--  BOOST_FILESYSTEM_LIB=$ax_lib break
-+  BOOST_FILESYSTEM_LIB=$ax_lib
-+  break
- fi
- 
-   done
-@@ -20719,7 +20721,8 @@
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
--  BOOST_THREAD_LIB=$ax_lib break
-+  BOOST_THREAD_LIB=$ax_lib
-+  break
- fi
- 
-   done
-@@ -20880,7 +20880,8 @@
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
--  BOOST_REGEX_LIB=$ax_lib break
-+  BOOST_REGEX_LIB=$ax_lib
-+  break
- fi
- 
-   done
-@@ -21037,7 +21038,8 @@
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
--  BOOST_PROGRAM_OPTIONS_LIB=$ax_lib break
-+  BOOST_PROGRAM_OPTIONS_LIB=$ax_lib
-+  break
- fi
- 
-   done
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-include_libtorrent_asio_detail_socket_ops.hpp b/net-p2p/libtorrent-rasterbar-14/files/patch-include_libtorrent_asio_detail_socket_ops.hpp
index 35611ecb4084..0943e805c176 100644
--- a/net-p2p/libtorrent-rasterbar-14/files/patch-include_libtorrent_asio_detail_socket_ops.hpp
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-include_libtorrent_asio_detail_socket_ops.hpp
@@ -1,92 +1,92 @@
---- include/libtorrent/asio/detail/socket_ops.hpp	Sun Jun 11 18:51:07 2006
-+++ include/libtorrent/asio/detail/socket_ops.hpp	Sun Jul 23 13:54:19 2006
-@@ -63,7 +63,8 @@
+--- include/libtorrent/asio/detail/socket_ops.hpp.original	Tue Oct 24 00:50:21 2006
++++ include/libtorrent/asio/detail/socket_ops.hpp	Wed Nov 29 14:40:02 2006
+@@ -66,7 +66,7 @@
      socket_addr_len_type* addrlen)
  {
    set_error(0);
 -#if defined(__MACH__) && defined(__APPLE__)
-+//#if defined(__MACH__) && defined(__APPLE__)
-+#if (defined(__MACH__) && defined(__APPLE__)) || defined(__FreeBSD__)
++#if defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
    socket_type new_s = error_wrapper(::accept(s, addr, addrlen));
    if (new_s == invalid_socket)
      return new_s;
-@@ -266,7 +267,8 @@
+@@ -279,7 +279,7 @@
  #if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
    return error_wrapper(::WSASocket(af, type, protocol, 0, 0,
          WSA_FLAG_OVERLAPPED));
 -#elif defined(__MACH__) && defined(__APPLE__)
-+//#elif defined(__MACH__) && defined(__APPLE__)
-+#elif (defined(__MACH__) && defined(__APPLE__)) || defined(__FreeBSD__)
++#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
    socket_type s = error_wrapper(::socket(af, type, protocol));
    if (s == invalid_socket)
      return s;
-@@ -585,7 +587,7 @@
+@@ -561,7 +561,7 @@
+ }
+ 
+ #if defined(BOOST_WINDOWS) || defined(__CYGWIN__) \
+-  || defined(__MACH__) && defined(__APPLE__)
++  || defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
+ 
+ // The following functions are only needed for emulation of getaddrinfo and
+ // getnameinfo.
+@@ -604,7 +604,7 @@
          buffer, buflength, error));
    *error = translate_netdb_error(*error);
    return retval;
 -#elif defined(__MACH__) && defined(__APPLE__)
-+#elif (defined(__MACH__) && defined(__APPLE__)) || defined(__FreeBSD__)
++#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
    (void)(buffer);
    (void)(buflength);
    hostent* retval = error_wrapper(::getipnodebyaddr(addr, length, af, error));
-@@ -633,7 +635,7 @@
+@@ -652,7 +652,7 @@
          buflength, error));
    *error = translate_netdb_error(*error);
    return retval;
 -#elif defined(__MACH__) && defined(__APPLE__)
-+#elif (defined(__MACH__) && defined(__APPLE__)) || defined(__FreeBSD__)
++#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
    (void)(buffer);
    (void)(buflength);
    hostent* retval = error_wrapper(::getipnodebyname(
-@@ -660,7 +662,8 @@
+@@ -679,7 +679,7 @@
  
  inline void freehostent(hostent* h)
  {
 -#if defined(__MACH__) && defined(__APPLE__)
-+//#if defined(__MACH__) && defined(__APPLE__)
-+#if (defined(__MACH__) && defined(__APPLE__)) || defined(__FreeBSD__)
++#if defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
    if (h)
      ::freehostent(h);
  #else
-@@ -1137,7 +1140,11 @@
-       case NO_RECOVERY:
-         return EAI_FAIL;
-       case NO_DATA:
-+#if defined(__FreeBSD__)
-+        return EAI_NONAME;
-+#else
-         return EAI_NODATA;
-+#endif
-       default:
-         return EAI_NONAME;
-       }
-@@ -1277,7 +1284,8 @@
+@@ -1372,7 +1372,7 @@
+ }
+ 
+ #endif // defined(BOOST_WINDOWS) || defined(__CYGWIN__)
+-       //   || defined(__MACH__) && defined(__APPLE__)
++       //   || defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
+ 
+ inline int translate_addrinfo_error(int error)
+ {
+@@ -1425,7 +1425,7 @@
    int error = getaddrinfo_emulation(host, service, hints, result);
    return translate_addrinfo_error(error);
  # endif
 -#elif defined(__MACH__) && defined(__APPLE__)
-+//#elif defined(__MACH__) && defined(__APPLE__)
-+#elif (defined(__MACH__) && defined(__APPLE__)) || defined(__FreeBSD__)
++#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
    int error = getaddrinfo_emulation(host, service, hints, result);
    return translate_addrinfo_error(error);
  #else
-@@ -1305,7 +1313,8 @@
+@@ -1453,7 +1453,7 @@
    }
    freeaddrinfo_emulation(ai);
  # endif
 -#elif defined(__MACH__) && defined(__APPLE__)
-+//#elif defined(__MACH__) && defined(__APPLE__)
-+#elif (defined(__MACH__) && defined(__APPLE__)) || defined(__FreeBSD__)
++#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
    freeaddrinfo_emulation(ai);
  #else
    ::freeaddrinfo(ai);
-@@ -1466,7 +1475,8 @@
+@@ -1488,7 +1488,7 @@
        host, hostlen, serv, servlen, flags);
    return translate_addrinfo_error(error);
  # endif
 -#elif defined(__MACH__) && defined(__APPLE__)
-+//#elif defined(__MACH__) && defined(__APPLE__)
-+#elif (defined(__MACH__) && defined(__APPLE__)) || defined(__FreeBSD__)
++#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
    using namespace std; // For memcpy.
    sockaddr_storage_type tmp_addr;
    memcpy(&tmp_addr, addr, addrlen);
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-include_libtorrent_asio_error.hpp b/net-p2p/libtorrent-rasterbar-14/files/patch-include_libtorrent_asio_error.hpp
deleted file mode 100644
index a26b5106e3ef..000000000000
--- a/net-p2p/libtorrent-rasterbar-14/files/patch-include_libtorrent_asio_error.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/libtorrent/asio/error.hpp	Sun Jun 11 18:51:03 2006
-+++ include/libtorrent/asio/error.hpp	Sun Jul 23 13:49:29 2006
-@@ -272,7 +272,7 @@
-     default:
- #if defined(__sun) || defined(__QNX__)
-       return strerror(code_);
--#elif defined(__MACH__) && defined(__APPLE__)
-+#elif (defined(__MACH__) && defined(__APPLE__)) || defined(__FreeBSD__)
-       try
-       {
-         char buf[256] = "";
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-include_libtorrent_socket.hpp b/net-p2p/libtorrent-rasterbar-14/files/patch-include_libtorrent_socket.hpp
deleted file mode 100644
index 8dc4b5544cde..000000000000
--- a/net-p2p/libtorrent-rasterbar-14/files/patch-include_libtorrent_socket.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/libtorrent/socket.hpp.orig	Thu Aug  3 01:39:59 2006
-+++ include/libtorrent/socket.hpp	Thu Aug  3 01:40:02 2006
-@@ -75,7 +75,7 @@
- 	using boost::asio::ipv4::host;
- 	using boost::asio::deadline_timer;
- */
--	namespace asio = ::asio;
-+//	namespace asio = ::asio;
- 
- 	using asio::ip::tcp;
- 	using asio::ip::udp;
diff --git a/net-p2p/libtorrent-rasterbar-14/pkg-plist b/net-p2p/libtorrent-rasterbar-14/pkg-plist
index c493179ba339..6b2b3a198b76 100644
--- a/net-p2p/libtorrent-rasterbar-14/pkg-plist
+++ b/net-p2p/libtorrent-rasterbar-14/pkg-plist
@@ -1,14 +1,3 @@
-bin/client_test
-bin/dump_torrent
-bin/make_torrent
-bin/simple_client
-bin/test_bencoding
-bin/test_buffer
-bin/test_hasher
-bin/test_ip_filter
-bin/test_metadata_extension
-bin/test_piece_picker
-bin/test_storage
 include/libtorrent/alert.hpp
 include/libtorrent/alert_types.hpp
 include/libtorrent/allocate_resources.hpp
@@ -20,8 +9,7 @@ include/libtorrent/asio/basic_resolver.hpp
 include/libtorrent/asio/basic_socket.hpp
 include/libtorrent/asio/basic_socket_acceptor.hpp
 include/libtorrent/asio/basic_socket_iostream.hpp
-include/libtorrent/asio/basic_socketbuf.hpp
-include/libtorrent/asio/basic_strand.hpp
+include/libtorrent/asio/basic_socket_streambuf.hpp
 include/libtorrent/asio/basic_stream_socket.hpp
 include/libtorrent/asio/basic_streambuf.hpp
 include/libtorrent/asio/buffer.hpp
@@ -41,11 +29,13 @@ include/libtorrent/asio/detail/buffered_stream_storage.hpp
 include/libtorrent/asio/detail/call_stack.hpp
 include/libtorrent/asio/detail/const_buffers_iterator.hpp
 include/libtorrent/asio/detail/consuming_buffers.hpp
+include/libtorrent/asio/detail/deadline_timer_service.hpp
 include/libtorrent/asio/detail/epoll_reactor.hpp
 include/libtorrent/asio/detail/epoll_reactor_fwd.hpp
 include/libtorrent/asio/detail/event.hpp
 include/libtorrent/asio/detail/fd_set_adapter.hpp
 include/libtorrent/asio/detail/handler_alloc_helpers.hpp
+include/libtorrent/asio/detail/handler_invoke_helpers.hpp
 include/libtorrent/asio/detail/hash_map.hpp
 include/libtorrent/asio/detail/io_control.hpp
 include/libtorrent/asio/detail/kqueue_reactor.hpp
@@ -61,15 +51,14 @@ include/libtorrent/asio/detail/old_win_sdk_compat.hpp
 include/libtorrent/asio/detail/pipe_select_interrupter.hpp
 include/libtorrent/asio/detail/pop_options.hpp
 include/libtorrent/asio/detail/posix_event.hpp
+include/libtorrent/asio/detail/posix_fd_set_adapter.hpp
 include/libtorrent/asio/detail/posix_mutex.hpp
 include/libtorrent/asio/detail/posix_signal_blocker.hpp
 include/libtorrent/asio/detail/posix_thread.hpp
 include/libtorrent/asio/detail/posix_tss_ptr.hpp
 include/libtorrent/asio/detail/push_options.hpp
-include/libtorrent/asio/detail/reactive_deadline_timer_service.hpp
 include/libtorrent/asio/detail/reactive_socket_service.hpp
 include/libtorrent/asio/detail/reactor_op_queue.hpp
-include/libtorrent/asio/detail/reactor_timer_queue.hpp
 include/libtorrent/asio/detail/resolver_service.hpp
 include/libtorrent/asio/detail/scoped_lock.hpp
 include/libtorrent/asio/detail/select_interrupter.hpp
@@ -87,8 +76,11 @@ include/libtorrent/asio/detail/strand_service.hpp
 include/libtorrent/asio/detail/task_io_service.hpp
 include/libtorrent/asio/detail/task_io_service_fwd.hpp
 include/libtorrent/asio/detail/thread.hpp
+include/libtorrent/asio/detail/timer_queue.hpp
+include/libtorrent/asio/detail/timer_queue_base.hpp
 include/libtorrent/asio/detail/tss_ptr.hpp
 include/libtorrent/asio/detail/win_event.hpp
+include/libtorrent/asio/detail/win_fd_set_adapter.hpp
 include/libtorrent/asio/detail/win_iocp_io_service.hpp
 include/libtorrent/asio/detail/win_iocp_io_service_fwd.hpp
 include/libtorrent/asio/detail/win_iocp_operation.hpp
@@ -103,6 +95,7 @@ include/libtorrent/asio/detail/wrapped_handler.hpp
 include/libtorrent/asio/error.hpp
 include/libtorrent/asio/error_handler.hpp
 include/libtorrent/asio/handler_alloc_hook.hpp
+include/libtorrent/asio/handler_invoke_hook.hpp
 include/libtorrent/asio/impl/io_service.ipp
 include/libtorrent/asio/impl/read.ipp
 include/libtorrent/asio/impl/read_until.ipp
@@ -143,13 +136,14 @@ include/libtorrent/asio/ssl/stream.hpp
 include/libtorrent/asio/ssl/stream_base.hpp
 include/libtorrent/asio/ssl/stream_service.hpp
 include/libtorrent/asio/strand.hpp
-include/libtorrent/asio/strand_service.hpp
 include/libtorrent/asio/stream_socket_service.hpp
 include/libtorrent/asio/streambuf.hpp
 include/libtorrent/asio/system_exception.hpp
 include/libtorrent/asio/thread.hpp
 include/libtorrent/asio/time_traits.hpp
 include/libtorrent/asio/write.hpp
+include/libtorrent/aux_/allocate_resources_impl.hpp
+include/libtorrent/aux_/session_impl.hpp
 include/libtorrent/bencode.hpp
 include/libtorrent/bt_peer_connection.hpp
 include/libtorrent/buffer.hpp
@@ -165,6 +159,18 @@ include/libtorrent/identify_client.hpp
 include/libtorrent/invariant_check.hpp
 include/libtorrent/io.hpp
 include/libtorrent/ip_filter.hpp
+include/libtorrent/kademlia/closest_nodes.hpp
+include/libtorrent/kademlia/dht_tracker.hpp
+include/libtorrent/kademlia/find_data.hpp
+include/libtorrent/kademlia/logging.hpp
+include/libtorrent/kademlia/node.hpp
+include/libtorrent/kademlia/node_entry.hpp
+include/libtorrent/kademlia/node_id.hpp
+include/libtorrent/kademlia/packet_iterator.hpp
+include/libtorrent/kademlia/refresh.hpp
+include/libtorrent/kademlia/routing_table.hpp
+include/libtorrent/kademlia/rpc_manager.hpp
+include/libtorrent/kademlia/traversal_algorithm.hpp
 include/libtorrent/peer.hpp
 include/libtorrent/peer_connection.hpp
 include/libtorrent/peer_id.hpp
@@ -173,9 +179,11 @@ include/libtorrent/peer_request.hpp
 include/libtorrent/piece_block_progress.hpp
 include/libtorrent/piece_picker.hpp
 include/libtorrent/policy.hpp
+include/libtorrent/random_sample.hpp
 include/libtorrent/resource_request.hpp
 include/libtorrent/session.hpp
 include/libtorrent/session_settings.hpp
+include/libtorrent/session_status.hpp
 include/libtorrent/size_type.hpp
 include/libtorrent/socket.hpp
 include/libtorrent/stat.hpp
@@ -188,11 +196,17 @@ include/libtorrent/udp_tracker_connection.hpp
 include/libtorrent/utf8.hpp
 include/libtorrent/version.hpp
 include/libtorrent/web_peer_connection.hpp
+lib/libdata/pkgconfig/libtorrent.pc
 lib/libtorrent.a
 lib/libtorrent.la
 lib/libtorrent.so
 lib/libtorrent.so.1
-libdata/pkgconfig/libtorrent.pc
+share/nls/POSIX
+share/nls/en_US.US-ASCII
+@dirrm lib/libdata/pkgconfig
+@dirrm lib/libdata
+@dirrm include/libtorrent/kademlia
+@dirrm include/libtorrent/aux_
 @dirrm include/libtorrent/asio/ssl/detail
 @dirrm include/libtorrent/asio/ssl
 @dirrm include/libtorrent/asio/ip/detail