- Fix build with new boost

Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
Reported by:	pavbot/erwinbot

38 files changed, 936 insertions, 16 deletions

diff --git a/net-p2p/libtorrent-rasterbar-14/Makefile b/net-p2p/libtorrent-rasterbar-14/Makefile
index 3a6fcdbe6561..ef5b475f82aa 100644
--- a/net-p2p/libtorrent-rasterbar-14/Makefile
+++ b/net-p2p/libtorrent-rasterbar-14/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libtorrent
 PORTVERSION=	0.14.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	rb
@@ -23,7 +23,8 @@ CONFLICTS=	rblibtorrent-[0-9]*
 
 USE_GNOME=	gnomehack
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:262 libtool:15
+ACLOCAL_ARGS=	-I m4
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-debug \
 		--disable-python-binding \
@@ -31,14 +32,16 @@ CONFIGURE_ARGS=	--disable-debug \
 		--with-boost-thread=boost_thread \
 		--with-boost-regex=boost_regex \
 		--with-boost-program-options=boost_program_options \
-		--with-asio=system
+		--with-asio=shipped
 USE_LDCONFIG=	yes
-USE_GCC=	4.2+
 
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 post-patch:
-	@${REINPLACE_CMD} -e '/if \[/s|==|=|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|g' \
+		${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e 's|^AM_CFLAGS|AM_CPPFLAGS|g ; \
+		 s|@BOOST_SYSTEM_LIB@||g' ${WRKSRC}/src/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-configure.in b/net-p2p/libtorrent-rasterbar-14/files/patch-configure.in
new file mode 100644
index 000000000000..9d7fd44316f5
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-configure.in
@@ -0,0 +1,39 @@
+--- configure.in.orig	2009-02-11 15:43:19.000000000 +0900
++++ configure.in	2009-04-19 02:16:36.000000000 +0900
+@@ -67,19 +67,6 @@
+ AM_CONDITIONAL([ENABLE_SHIPPED_ASIO], false)
+ 
+ dnl Check for boost libraries.
+-AX_BOOST_BASE([1.35],[
+-   AX_BOOST_SYSTEM
+-   dnl check that Boost.System was found:
+-   if test -z "$BOOST_SYSTEM_LIB"; then
+-      AC_MSG_ERROR([unable to find Boost.System library, currently this is required.])
+-   fi
+-
+-   AX_BOOST_ASIO
+-   dnl check that Boost.Asio was found:
+-   if test -z "$BOOST_ASIO_LIB"; then
+-      AC_MSG_ERROR([Unable to find Boost.Asio library, currently this is required.])
+-   fi
+-],[
+    AX_BOOST_BASE([1.34],[
+ 
+    dnl the user can choose which Asio library to use
+@@ -123,7 +110,6 @@
+     esac
+     AM_CONDITIONAL([ENABLE_SHIPPED_ASIO], [test x$enable_shipped_asio = "xyes"])
+ ])
+-])
+ 
+ AC_MSG_NOTICE([BOOST_CPPFLAGS=$BOOST_CPPFLAGS])
+ AC_MSG_NOTICE([BOOST_LDFLAGS=$BOOST_LDFLAGS])
+@@ -408,7 +394,7 @@
+ esac
+ 
+ dnl Set some defines if we are building a shared library
+-if [[ "x$enable_shared" == "xyes" ]]; then
++if [[ "x$enable_shared" = "xyes" ]]; then
+ 	AC_DEFINE(TORRENT_BUILDING_SHARED,,[Make sure the functions and classes are exported.])
+ 	COMPILETIME_OPTIONS+="-DTORRENT_LINKING_SHARED "
+ fi
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__chained_buffer.hpp b/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__chained_buffer.hpp
new file mode 100644
index 000000000000..19028a1e5e7c
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__chained_buffer.hpp
@@ -0,0 +1,20 @@
+--- include/libtorrent/chained_buffer.hpp.orig	2008-10-05 10:41:54.000000000 +0900
++++ include/libtorrent/chained_buffer.hpp	2009-04-19 05:13:19.000000000 +0900
+@@ -35,7 +35,7 @@
+ 
+ #include <boost/function.hpp>
+ #include <boost/version.hpp>
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/buffer.hpp>
+ #else
+ #include <boost/asio/buffer.hpp>
+@@ -45,7 +45,7 @@
+ 
+ namespace libtorrent
+ {
+-#if BOOST_VERSION >= 103500
++#if 0 // BOOST_VERSION >= 103500
+ 	namespace asio = boost::asio;
+ #endif
+ 	struct chained_buffer
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__error_code.hpp b/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__error_code.hpp
new file mode 100644
index 000000000000..d3bd0e6192a1
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__error_code.hpp
@@ -0,0 +1,20 @@
+--- include/libtorrent/error_code.hpp.orig	2008-10-05 10:41:54.000000000 +0900
++++ include/libtorrent/error_code.hpp	2009-04-19 05:15:39.000000000 +0900
+@@ -35,7 +35,7 @@
+ 
+ #include <boost/version.hpp>
+ 
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/error_code.hpp>
+ #else
+ #include <boost/system/error_code.hpp>
+@@ -53,7 +53,7 @@
+ 		};
+ 	}
+ 
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ 	typedef asio::error_code error_code;
+ 	inline asio::error::error_category get_posix_category() { return asio::error::system_category; }
+ 	inline asio::error::error_category get_system_category() { return asio::error::system_category; }
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__proxy_base.hpp b/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__proxy_base.hpp
new file mode 100644
index 000000000000..94af000ecdd2
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__proxy_base.hpp
@@ -0,0 +1,11 @@
+--- include/libtorrent/proxy_base.hpp.orig	2008-10-05 10:41:54.000000000 +0900
++++ include/libtorrent/proxy_base.hpp	2009-04-19 05:17:07.000000000 +0900
+@@ -38,7 +38,7 @@
+ #include <boost/bind.hpp>
+ #include <boost/lexical_cast.hpp>
+ #include <boost/function.hpp>
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/read.hpp>
+ #include <asio/write.hpp>
+ #else
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
new file mode 100644
index 000000000000..f1ae1b7a67c8
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__socket.hpp
@@ -0,0 +1,20 @@
+--- include/libtorrent/socket.hpp.orig	2009-02-08 17:13:07.000000000 +0900
++++ include/libtorrent/socket.hpp	2009-04-19 05:18:58.000000000 +0900
+@@ -47,7 +47,7 @@
+ 
+ #include <boost/version.hpp>
+ 
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/ip/tcp.hpp>
+ #include <asio/ip/udp.hpp>
+ #include <asio/io_service.hpp>
+@@ -82,7 +82,7 @@
+ namespace libtorrent
+ {
+ 
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ 	using asio::ip::tcp;
+ 	using asio::ip::udp;
+ 	using asio::async_write;
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__ssl_stream.hpp b/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__ssl_stream.hpp
new file mode 100644
index 000000000000..14ffbc74bf39
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__ssl_stream.hpp
@@ -0,0 +1,11 @@
+--- include/libtorrent/ssl_stream.hpp.orig	2008-10-21 17:07:26.000000000 +0900
++++ include/libtorrent/ssl_stream.hpp	2009-04-19 05:19:42.000000000 +0900
+@@ -34,7 +34,7 @@
+ #define TORRENT_SSL_STREAM_HPP_INCLUDED
+ 
+ #include "libtorrent/socket.hpp"
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/ssl.hpp>
+ #else
+ #include <boost/asio/ssl.hpp>
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__time.hpp b/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__time.hpp
new file mode 100644
index 000000000000..b74e4bec71d6
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__time.hpp
@@ -0,0 +1,29 @@
+--- include/libtorrent/time.hpp.orig	2008-11-30 04:31:36.000000000 +0900
++++ include/libtorrent/time.hpp	2009-04-19 23:13:40.000000000 +0900
+@@ -87,7 +87,7 @@
+ 
+ #else
+ 
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/time_traits.hpp>
+ #else
+ #include <boost/asio/time_traits.hpp>
+@@ -159,7 +159,7 @@
+ }
+ 
+ // asio time_traits
+-#if BOOST_VERSION >= 103500
++#if 0 // BOOST_VERSION >= 103500
+ namespace boost { 
+ #endif
+ namespace asio
+@@ -182,7 +182,7 @@
+ 		{ return boost::posix_time::microseconds(libtorrent::total_microseconds(d)); }
+ 	};
+ }
+-#if BOOST_VERSION >= 103500
++#if 0 // BOOST_VERSION >= 103500
+ }
+ #endif
+ 
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__variant_stream.hpp b/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__variant_stream.hpp
new file mode 100644
index 000000000000..b5444156d38e
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__variant_stream.hpp
@@ -0,0 +1,11 @@
+--- include/libtorrent/variant_stream.hpp.orig	2008-10-05 10:41:54.000000000 +0900
++++ include/libtorrent/variant_stream.hpp	2009-04-19 05:21:46.000000000 +0900
+@@ -21,7 +21,7 @@
+ # include <boost/type_traits/add_pointer.hpp>
+ # include <boost/noncopyable.hpp>
+ 
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/io_service.hpp>
+ #else
+ #include <boost/asio/io_service.hpp>
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src__broadcast_socket.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src__broadcast_socket.cpp
new file mode 100644
index 000000000000..7002819a4efe
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-src__broadcast_socket.cpp
@@ -0,0 +1,11 @@
+--- src/broadcast_socket.cpp.orig	2008-10-22 10:15:07.000000000 +0900
++++ src/broadcast_socket.cpp	2009-04-19 05:27:08.000000000 +0900
+@@ -32,7 +32,7 @@
+ 
+ #include <boost/version.hpp>
+ 
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/ip/host_name.hpp>
+ #include <asio/ip/multicast.hpp>
+ #else
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src__enum_net.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src__enum_net.cpp
new file mode 100644
index 000000000000..cedc99dab46f
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-src__enum_net.cpp
@@ -0,0 +1,11 @@
+--- src/enum_net.cpp.orig	2009-02-08 17:13:04.000000000 +0900
++++ src/enum_net.cpp	2009-04-19 05:28:22.000000000 +0900
+@@ -35,7 +35,7 @@
+ #include <vector>
+ #include "libtorrent/enum_net.hpp"
+ #include "libtorrent/broadcast_socket.hpp"
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/ip/host_name.hpp>
+ #else
+ #include <boost/asio/ip/host_name.hpp>
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src__error_code.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src__error_code.cpp
new file mode 100644
index 000000000000..d584a40c469d
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-src__error_code.cpp
@@ -0,0 +1,11 @@
+--- src/error_code.cpp.orig	2008-10-05 10:41:56.000000000 +0900
++++ src/error_code.cpp	2009-04-19 05:35:55.000000000 +0900
+@@ -32,7 +32,7 @@
+ 
+ #include <boost/version.hpp>
+ 
+-#if BOOST_VERSION >= 103500
++#if 0 // BOOST_VERSION >= 103500
+ 
+ #include "libtorrent/error_code.hpp"
+ 
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src__file_pool.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src__file_pool.cpp
new file mode 100644
index 000000000000..78a7af6ff9de
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-src__file_pool.cpp
@@ -0,0 +1,11 @@
+--- src/file_pool.cpp.orig	2009-02-08 17:13:04.000000000 +0900
++++ src/file_pool.cpp	2009-04-19 05:29:34.000000000 +0900
+@@ -62,7 +62,7 @@
+ 			{
+ 				// this means that another instance of the storage
+ 				// is using the exact same file.
+-#if BOOST_VERSION >= 103500
++#if 0 // BOOST_VERSION >= 103500
+ 				ec = error_code(errors::file_collision, libtorrent_category);
+ #endif
+ 				return boost::shared_ptr<file>();
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src__lsd.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src__lsd.cpp
new file mode 100644
index 000000000000..850bf0af0bac
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-src__lsd.cpp
@@ -0,0 +1,11 @@
+--- src/lsd.cpp.orig	2009-02-12 03:16:27.000000000 +0900
++++ src/lsd.cpp	2009-04-19 05:30:17.000000000 +0900
+@@ -41,7 +41,7 @@
+ 
+ #include <boost/bind.hpp>
+ #include <boost/ref.hpp>
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/ip/host_name.hpp>
+ #include <asio/ip/multicast.hpp>
+ #else
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src__natpmp.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src__natpmp.cpp
new file mode 100644
index 000000000000..b7cc1537de30
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-src__natpmp.cpp
@@ -0,0 +1,11 @@
+--- src/natpmp.cpp.orig	2009-02-08 17:13:04.000000000 +0900
++++ src/natpmp.cpp	2009-04-19 05:30:54.000000000 +0900
+@@ -35,7 +35,7 @@
+ #include <boost/version.hpp>
+ #include <boost/bind.hpp>
+ 
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/ip/host_name.hpp>
+ #else
+ #include <boost/asio/ip/host_name.hpp>
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src__storage.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src__storage.cpp
index ea0156332167..9b95f0595bf9 100644
--- a/net-p2p/libtorrent-rasterbar-14/files/patch-src__storage.cpp
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-src__storage.cpp
@@ -1,6 +1,6 @@
---- src/storage.cpp.orig	Sat Aug 25 15:26:43 2007
-+++ src/storage.cpp	Mon Sep 10 12:51:23 2007
-@@ -75,9 +75,11 @@
+--- src/storage.cpp.orig	2009-02-08 17:13:04.000000000 +0900
++++ src/storage.cpp	2009-04-19 05:32:24.000000000 +0900
+@@ -82,9 +82,11 @@
  #include <cstdio>
  #endif
  
@@ -13,3 +13,12 @@
  #include <unistd.h>
  // for statfs()
  #include <sys/param.h>
+@@ -496,7 +498,7 @@
+ 			m_mapped_files->rename_file(index, new_filename);
+ #ifndef BOOST_NO_EXCEPTIONS
+ 		}
+-#if BOOST_VERSION >= 103500
++#if 0 // BOOST_VERSION >= 103500
+ 		catch (boost::system::system_error& e)
+ 		{
+ 			set_error(old_name, e.code());
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src__udp_socket.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src__udp_socket.cpp
new file mode 100644
index 000000000000..c44d01c0d869
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-src__udp_socket.cpp
@@ -0,0 +1,11 @@
+--- src/udp_socket.cpp.orig	2009-02-08 17:13:04.000000000 +0900
++++ src/udp_socket.cpp	2009-04-19 05:33:12.000000000 +0900
+@@ -36,7 +36,7 @@
+ #include <stdlib.h>
+ #include <boost/bind.hpp>
+ #include <boost/array.hpp>
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/read.hpp>
+ #else
+ #include <boost/asio/read.hpp>
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src__upnp.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src__upnp.cpp
new file mode 100644
index 000000000000..d3ed06379061
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar-14/files/patch-src__upnp.cpp
@@ -0,0 +1,11 @@
+--- src/upnp.cpp.orig	2009-02-18 17:42:16.000000000 +0900
++++ src/upnp.cpp	2009-04-19 05:33:50.000000000 +0900
+@@ -43,7 +43,7 @@
+ 
+ #include <boost/bind.hpp>
+ #include <boost/ref.hpp>
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/ip/host_name.hpp>
+ #include <asio/ip/multicast.hpp>
+ #else
diff --git a/net-p2p/libtorrent-rasterbar-14/pkg-plist b/net-p2p/libtorrent-rasterbar-14/pkg-plist
index 3197d8dc6361..9e5579194c45 100644
--- a/net-p2p/libtorrent-rasterbar-14/pkg-plist
+++ b/net-p2p/libtorrent-rasterbar-14/pkg-plist
@@ -2,6 +2,195 @@ include/libtorrent/GeoIP.h
 include/libtorrent/alert.hpp
 include/libtorrent/alert_types.hpp
 include/libtorrent/assert.hpp
+include/libtorrent/asio.hpp
+include/libtorrent/asio/basic_datagram_socket.hpp
+include/libtorrent/asio/basic_deadline_timer.hpp
+include/libtorrent/asio/basic_io_object.hpp
+include/libtorrent/asio/basic_raw_socket.hpp
+include/libtorrent/asio/basic_serial_port.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_socket_streambuf.hpp
+include/libtorrent/asio/basic_stream_socket.hpp
+include/libtorrent/asio/basic_streambuf.hpp
+include/libtorrent/asio/buffer.hpp
+include/libtorrent/asio/buffered_read_stream.hpp
+include/libtorrent/asio/buffered_read_stream_fwd.hpp
+include/libtorrent/asio/buffered_stream.hpp
+include/libtorrent/asio/buffered_stream_fwd.hpp
+include/libtorrent/asio/buffered_write_stream.hpp
+include/libtorrent/asio/buffered_write_stream_fwd.hpp
+include/libtorrent/asio/buffers_iterator.hpp
+include/libtorrent/asio/completion_condition.hpp
+include/libtorrent/asio/datagram_socket_service.hpp
+include/libtorrent/asio/deadline_timer.hpp
+include/libtorrent/asio/deadline_timer_service.hpp
+include/libtorrent/asio/detail/bind_handler.hpp
+include/libtorrent/asio/detail/buffer_resize_guard.hpp
+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/descriptor_ops.hpp
+include/libtorrent/asio/detail/dev_poll_reactor.hpp
+include/libtorrent/asio/detail/dev_poll_reactor_fwd.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_base_from_member.hpp
+include/libtorrent/asio/detail/handler_invoke_helpers.hpp
+include/libtorrent/asio/detail/handler_queue.hpp
+include/libtorrent/asio/detail/hash_map.hpp
+include/libtorrent/asio/detail/indirect_handler_queue.hpp
+include/libtorrent/asio/detail/io_control.hpp
+include/libtorrent/asio/detail/kqueue_reactor.hpp
+include/libtorrent/asio/detail/kqueue_reactor_fwd.hpp
+include/libtorrent/asio/detail/local_free_on_block_exit.hpp
+include/libtorrent/asio/detail/mutex.hpp
+include/libtorrent/asio/detail/noncopyable.hpp
+include/libtorrent/asio/detail/null_event.hpp
+include/libtorrent/asio/detail/null_mutex.hpp
+include/libtorrent/asio/detail/null_signal_blocker.hpp
+include/libtorrent/asio/detail/null_thread.hpp
+include/libtorrent/asio/detail/null_tss_ptr.hpp
+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_descriptor_service.hpp
+include/libtorrent/asio/detail/reactive_serial_port_service.hpp
+include/libtorrent/asio/detail/reactive_socket_service.hpp
+include/libtorrent/asio/detail/reactor_op_queue.hpp
+include/libtorrent/asio/detail/resolver_service.hpp
+include/libtorrent/asio/detail/scoped_lock.hpp
+include/libtorrent/asio/detail/select_interrupter.hpp
+include/libtorrent/asio/detail/select_reactor.hpp
+include/libtorrent/asio/detail/select_reactor_fwd.hpp
+include/libtorrent/asio/detail/service_base.hpp
+include/libtorrent/asio/detail/service_id.hpp
+include/libtorrent/asio/detail/service_registry.hpp
+include/libtorrent/asio/detail/service_registry_fwd.hpp
+include/libtorrent/asio/detail/signal_blocker.hpp
+include/libtorrent/asio/detail/signal_init.hpp
+include/libtorrent/asio/detail/socket_holder.hpp
+include/libtorrent/asio/detail/socket_ops.hpp
+include/libtorrent/asio/detail/socket_option.hpp
+include/libtorrent/asio/detail/socket_select_interrupter.hpp
+include/libtorrent/asio/detail/socket_types.hpp
+include/libtorrent/asio/detail/strand_service.hpp
+include/libtorrent/asio/detail/task_io_service.hpp
+include/libtorrent/asio/detail/task_io_service_2lock.hpp
+include/libtorrent/asio/detail/task_io_service_fwd.hpp
+include/libtorrent/asio/detail/thread.hpp
+include/libtorrent/asio/detail/throw_error.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_handle_service.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_serial_port_service.hpp
+include/libtorrent/asio/detail/win_iocp_socket_service.hpp
+include/libtorrent/asio/detail/win_mutex.hpp
+include/libtorrent/asio/detail/win_signal_blocker.hpp
+include/libtorrent/asio/detail/win_thread.hpp
+include/libtorrent/asio/detail/win_tss_ptr.hpp
+include/libtorrent/asio/detail/wince_thread.hpp
+include/libtorrent/asio/detail/winsock_init.hpp
+include/libtorrent/asio/detail/wrapped_handler.hpp
+include/libtorrent/asio/error.hpp
+include/libtorrent/asio/error_code.hpp
+include/libtorrent/asio/handler_alloc_hook.hpp
+include/libtorrent/asio/handler_invoke_hook.hpp
+include/libtorrent/asio/impl/error_code.ipp
+include/libtorrent/asio/impl/io_service.ipp
+include/libtorrent/asio/impl/read.ipp
+include/libtorrent/asio/impl/read_at.ipp
+include/libtorrent/asio/impl/read_until.ipp
+include/libtorrent/asio/impl/serial_port_base.ipp
+include/libtorrent/asio/impl/write.ipp
+include/libtorrent/asio/impl/write_at.ipp
+include/libtorrent/asio/io_service.hpp
+include/libtorrent/asio/ip/address.hpp
+include/libtorrent/asio/ip/address_v4.hpp
+include/libtorrent/asio/ip/address_v6.hpp
+include/libtorrent/asio/ip/basic_endpoint.hpp
+include/libtorrent/asio/ip/basic_resolver.hpp
+include/libtorrent/asio/ip/basic_resolver_entry.hpp
+include/libtorrent/asio/ip/basic_resolver_iterator.hpp
+include/libtorrent/asio/ip/basic_resolver_query.hpp
+include/libtorrent/asio/ip/detail/socket_option.hpp
+include/libtorrent/asio/ip/host_name.hpp
+include/libtorrent/asio/ip/icmp.hpp
+include/libtorrent/asio/ip/multicast.hpp
+include/libtorrent/asio/ip/resolver_query_base.hpp
+include/libtorrent/asio/ip/resolver_service.hpp
+include/libtorrent/asio/ip/tcp.hpp
+include/libtorrent/asio/ip/udp.hpp
+include/libtorrent/asio/ip/unicast.hpp
+include/libtorrent/asio/ip/v6_only.hpp
+include/libtorrent/asio/is_read_buffered.hpp
+include/libtorrent/asio/is_write_buffered.hpp
+include/libtorrent/asio/local/basic_endpoint.hpp
+include/libtorrent/asio/local/connect_pair.hpp
+include/libtorrent/asio/local/datagram_protocol.hpp
+include/libtorrent/asio/local/stream_protocol.hpp
+include/libtorrent/asio/placeholders.hpp
+include/libtorrent/asio/posix/basic_descriptor.hpp
+include/libtorrent/asio/posix/basic_stream_descriptor.hpp
+include/libtorrent/asio/posix/descriptor_base.hpp
+include/libtorrent/asio/posix/stream_descriptor.hpp
+include/libtorrent/asio/posix/stream_descriptor_service.hpp
+include/libtorrent/asio/raw_socket_service.hpp
+include/libtorrent/asio/read.hpp
+include/libtorrent/asio/read_at.hpp
+include/libtorrent/asio/read_until.hpp
+include/libtorrent/asio/serial_port.hpp
+include/libtorrent/asio/serial_port_base.hpp
+include/libtorrent/asio/serial_port_service.hpp
+include/libtorrent/asio/socket_acceptor_service.hpp
+include/libtorrent/asio/socket_base.hpp
+include/libtorrent/asio/ssl/basic_context.hpp
+include/libtorrent/asio/ssl/context.hpp
+include/libtorrent/asio/ssl/context_base.hpp
+include/libtorrent/asio/ssl/context_service.hpp
+include/libtorrent/asio/ssl/detail/openssl_context_service.hpp
+include/libtorrent/asio/ssl/detail/openssl_init.hpp
+include/libtorrent/asio/ssl/detail/openssl_operation.hpp
+include/libtorrent/asio/ssl/detail/openssl_stream_service.hpp
+include/libtorrent/asio/ssl/detail/openssl_types.hpp
+include/libtorrent/asio/ssl/stream.hpp
+include/libtorrent/asio/ssl/stream_base.hpp
+include/libtorrent/asio/ssl/stream_service.hpp
+include/libtorrent/asio/ssl.hpp
+include/libtorrent/asio/strand.hpp
+include/libtorrent/asio/stream_socket_service.hpp
+include/libtorrent/asio/streambuf.hpp
+include/libtorrent/asio/system_error.hpp
+include/libtorrent/asio/thread.hpp
+include/libtorrent/asio/time_traits.hpp
+include/libtorrent/asio/version.hpp
+include/libtorrent/asio/windows/basic_handle.hpp
+include/libtorrent/asio/windows/basic_random_access_handle.hpp
+include/libtorrent/asio/windows/basic_stream_handle.hpp
+include/libtorrent/asio/windows/random_access_handle.hpp
+include/libtorrent/asio/windows/random_access_handle_service.hpp
+include/libtorrent/asio/windows/stream_handle.hpp
+include/libtorrent/asio/windows/stream_handle_service.hpp
+include/libtorrent/asio/write.hpp
+include/libtorrent/asio/write_at.hpp
 include/libtorrent/aux_/session_impl.hpp
 include/libtorrent/bandwidth_limit.hpp
 include/libtorrent/bandwidth_manager.hpp
@@ -106,4 +295,14 @@ libdata/pkgconfig/libtorrent-rasterbar.pc
 @dirrm include/libtorrent/kademlia
 @dirrm include/libtorrent/extensions
 @dirrm include/libtorrent/aux_
+@dirrm include/libtorrent/asio/windows
+@dirrm include/libtorrent/asio/ssl/detail
+@dirrm include/libtorrent/asio/ssl
+@dirrm include/libtorrent/asio/posix
+@dirrm include/libtorrent/asio/local
+@dirrm include/libtorrent/asio/ip/detail
+@dirrm include/libtorrent/asio/ip
+@dirrm include/libtorrent/asio/impl
+@dirrm include/libtorrent/asio/detail
+@dirrm include/libtorrent/asio
 @dirrm include/libtorrent
diff --git a/net-p2p/rblibtorrent-devel/Makefile b/net-p2p/rblibtorrent-devel/Makefile
index 3a6fcdbe6561..ef5b475f82aa 100644
--- a/net-p2p/rblibtorrent-devel/Makefile
+++ b/net-p2p/rblibtorrent-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libtorrent
 PORTVERSION=	0.14.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	rb
@@ -23,7 +23,8 @@ CONFLICTS=	rblibtorrent-[0-9]*
 
 USE_GNOME=	gnomehack
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:262 libtool:15
+ACLOCAL_ARGS=	-I m4
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-debug \
 		--disable-python-binding \
@@ -31,14 +32,16 @@ CONFIGURE_ARGS=	--disable-debug \
 		--with-boost-thread=boost_thread \
 		--with-boost-regex=boost_regex \
 		--with-boost-program-options=boost_program_options \
-		--with-asio=system
+		--with-asio=shipped
 USE_LDCONFIG=	yes
-USE_GCC=	4.2+
 
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 post-patch:
-	@${REINPLACE_CMD} -e '/if \[/s|==|=|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|g' \
+		${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e 's|^AM_CFLAGS|AM_CPPFLAGS|g ; \
+		 s|@BOOST_SYSTEM_LIB@||g' ${WRKSRC}/src/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/net-p2p/rblibtorrent-devel/files/patch-configure.in b/net-p2p/rblibtorrent-devel/files/patch-configure.in
new file mode 100644
index 000000000000..9d7fd44316f5
--- /dev/null
+++ b/net-p2p/rblibtorrent-devel/files/patch-configure.in
@@ -0,0 +1,39 @@
+--- configure.in.orig	2009-02-11 15:43:19.000000000 +0900
++++ configure.in	2009-04-19 02:16:36.000000000 +0900
+@@ -67,19 +67,6 @@
+ AM_CONDITIONAL([ENABLE_SHIPPED_ASIO], false)
+ 
+ dnl Check for boost libraries.
+-AX_BOOST_BASE([1.35],[
+-   AX_BOOST_SYSTEM
+-   dnl check that Boost.System was found:
+-   if test -z "$BOOST_SYSTEM_LIB"; then
+-      AC_MSG_ERROR([unable to find Boost.System library, currently this is required.])
+-   fi
+-
+-   AX_BOOST_ASIO
+-   dnl check that Boost.Asio was found:
+-   if test -z "$BOOST_ASIO_LIB"; then
+-      AC_MSG_ERROR([Unable to find Boost.Asio library, currently this is required.])
+-   fi
+-],[
+    AX_BOOST_BASE([1.34],[
+ 
+    dnl the user can choose which Asio library to use
+@@ -123,7 +110,6 @@
+     esac
+     AM_CONDITIONAL([ENABLE_SHIPPED_ASIO], [test x$enable_shipped_asio = "xyes"])
+ ])
+-])
+ 
+ AC_MSG_NOTICE([BOOST_CPPFLAGS=$BOOST_CPPFLAGS])
+ AC_MSG_NOTICE([BOOST_LDFLAGS=$BOOST_LDFLAGS])
+@@ -408,7 +394,7 @@
+ esac
+ 
+ dnl Set some defines if we are building a shared library
+-if [[ "x$enable_shared" == "xyes" ]]; then
++if [[ "x$enable_shared" = "xyes" ]]; then
+ 	AC_DEFINE(TORRENT_BUILDING_SHARED,,[Make sure the functions and classes are exported.])
+ 	COMPILETIME_OPTIONS+="-DTORRENT_LINKING_SHARED "
+ fi
diff --git a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__chained_buffer.hpp b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__chained_buffer.hpp
new file mode 100644
index 000000000000..19028a1e5e7c
--- /dev/null
+++ b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__chained_buffer.hpp
@@ -0,0 +1,20 @@
+--- include/libtorrent/chained_buffer.hpp.orig	2008-10-05 10:41:54.000000000 +0900
++++ include/libtorrent/chained_buffer.hpp	2009-04-19 05:13:19.000000000 +0900
+@@ -35,7 +35,7 @@
+ 
+ #include <boost/function.hpp>
+ #include <boost/version.hpp>
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/buffer.hpp>
+ #else
+ #include <boost/asio/buffer.hpp>
+@@ -45,7 +45,7 @@
+ 
+ namespace libtorrent
+ {
+-#if BOOST_VERSION >= 103500
++#if 0 // BOOST_VERSION >= 103500
+ 	namespace asio = boost::asio;
+ #endif
+ 	struct chained_buffer
diff --git a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__error_code.hpp b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__error_code.hpp
new file mode 100644
index 000000000000..d3bd0e6192a1
--- /dev/null
+++ b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__error_code.hpp
@@ -0,0 +1,20 @@
+--- include/libtorrent/error_code.hpp.orig	2008-10-05 10:41:54.000000000 +0900
++++ include/libtorrent/error_code.hpp	2009-04-19 05:15:39.000000000 +0900
+@@ -35,7 +35,7 @@
+ 
+ #include <boost/version.hpp>
+ 
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/error_code.hpp>
+ #else
+ #include <boost/system/error_code.hpp>
+@@ -53,7 +53,7 @@
+ 		};
+ 	}
+ 
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ 	typedef asio::error_code error_code;
+ 	inline asio::error::error_category get_posix_category() { return asio::error::system_category; }
+ 	inline asio::error::error_category get_system_category() { return asio::error::system_category; }
diff --git a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__proxy_base.hpp b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__proxy_base.hpp
new file mode 100644
index 000000000000..94af000ecdd2
--- /dev/null
+++ b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__proxy_base.hpp
@@ -0,0 +1,11 @@
+--- include/libtorrent/proxy_base.hpp.orig	2008-10-05 10:41:54.000000000 +0900
++++ include/libtorrent/proxy_base.hpp	2009-04-19 05:17:07.000000000 +0900
+@@ -38,7 +38,7 @@
+ #include <boost/bind.hpp>
+ #include <boost/lexical_cast.hpp>
+ #include <boost/function.hpp>
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/read.hpp>
+ #include <asio/write.hpp>
+ #else
diff --git a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__socket.hpp b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__socket.hpp
new file mode 100644
index 000000000000..f1ae1b7a67c8
--- /dev/null
+++ b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__socket.hpp
@@ -0,0 +1,20 @@
+--- include/libtorrent/socket.hpp.orig	2009-02-08 17:13:07.000000000 +0900
++++ include/libtorrent/socket.hpp	2009-04-19 05:18:58.000000000 +0900
+@@ -47,7 +47,7 @@
+ 
+ #include <boost/version.hpp>
+ 
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/ip/tcp.hpp>
+ #include <asio/ip/udp.hpp>
+ #include <asio/io_service.hpp>
+@@ -82,7 +82,7 @@
+ namespace libtorrent
+ {
+ 
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ 	using asio::ip::tcp;
+ 	using asio::ip::udp;
+ 	using asio::async_write;
diff --git a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__ssl_stream.hpp b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__ssl_stream.hpp
new file mode 100644
index 000000000000..14ffbc74bf39
--- /dev/null
+++ b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__ssl_stream.hpp
@@ -0,0 +1,11 @@
+--- include/libtorrent/ssl_stream.hpp.orig	2008-10-21 17:07:26.000000000 +0900
++++ include/libtorrent/ssl_stream.hpp	2009-04-19 05:19:42.000000000 +0900
+@@ -34,7 +34,7 @@
+ #define TORRENT_SSL_STREAM_HPP_INCLUDED
+ 
+ #include "libtorrent/socket.hpp"
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/ssl.hpp>
+ #else
+ #include <boost/asio/ssl.hpp>
diff --git a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__time.hpp b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__time.hpp
new file mode 100644
index 000000000000..b74e4bec71d6
--- /dev/null
+++ b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__time.hpp
@@ -0,0 +1,29 @@
+--- include/libtorrent/time.hpp.orig	2008-11-30 04:31:36.000000000 +0900
++++ include/libtorrent/time.hpp	2009-04-19 23:13:40.000000000 +0900
+@@ -87,7 +87,7 @@
+ 
+ #else
+ 
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/time_traits.hpp>
+ #else
+ #include <boost/asio/time_traits.hpp>
+@@ -159,7 +159,7 @@
+ }
+ 
+ // asio time_traits
+-#if BOOST_VERSION >= 103500
++#if 0 // BOOST_VERSION >= 103500
+ namespace boost { 
+ #endif
+ namespace asio
+@@ -182,7 +182,7 @@
+ 		{ return boost::posix_time::microseconds(libtorrent::total_microseconds(d)); }
+ 	};
+ }
+-#if BOOST_VERSION >= 103500
++#if 0 // BOOST_VERSION >= 103500
+ }
+ #endif
+ 
diff --git a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__variant_stream.hpp b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__variant_stream.hpp
new file mode 100644
index 000000000000..b5444156d38e
--- /dev/null
+++ b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__variant_stream.hpp
@@ -0,0 +1,11 @@
+--- include/libtorrent/variant_stream.hpp.orig	2008-10-05 10:41:54.000000000 +0900
++++ include/libtorrent/variant_stream.hpp	2009-04-19 05:21:46.000000000 +0900
+@@ -21,7 +21,7 @@
+ # include <boost/type_traits/add_pointer.hpp>
+ # include <boost/noncopyable.hpp>
+ 
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/io_service.hpp>
+ #else
+ #include <boost/asio/io_service.hpp>
diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__broadcast_socket.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__broadcast_socket.cpp
new file mode 100644
index 000000000000..7002819a4efe
--- /dev/null
+++ b/net-p2p/rblibtorrent-devel/files/patch-src__broadcast_socket.cpp
@@ -0,0 +1,11 @@
+--- src/broadcast_socket.cpp.orig	2008-10-22 10:15:07.000000000 +0900
++++ src/broadcast_socket.cpp	2009-04-19 05:27:08.000000000 +0900
+@@ -32,7 +32,7 @@
+ 
+ #include <boost/version.hpp>
+ 
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/ip/host_name.hpp>
+ #include <asio/ip/multicast.hpp>
+ #else
diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__enum_net.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__enum_net.cpp
new file mode 100644
index 000000000000..cedc99dab46f
--- /dev/null
+++ b/net-p2p/rblibtorrent-devel/files/patch-src__enum_net.cpp
@@ -0,0 +1,11 @@
+--- src/enum_net.cpp.orig	2009-02-08 17:13:04.000000000 +0900
++++ src/enum_net.cpp	2009-04-19 05:28:22.000000000 +0900
+@@ -35,7 +35,7 @@
+ #include <vector>
+ #include "libtorrent/enum_net.hpp"
+ #include "libtorrent/broadcast_socket.hpp"
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/ip/host_name.hpp>
+ #else
+ #include <boost/asio/ip/host_name.hpp>
diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__error_code.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__error_code.cpp
new file mode 100644
index 000000000000..d584a40c469d
--- /dev/null
+++ b/net-p2p/rblibtorrent-devel/files/patch-src__error_code.cpp
@@ -0,0 +1,11 @@
+--- src/error_code.cpp.orig	2008-10-05 10:41:56.000000000 +0900
++++ src/error_code.cpp	2009-04-19 05:35:55.000000000 +0900
+@@ -32,7 +32,7 @@
+ 
+ #include <boost/version.hpp>
+ 
+-#if BOOST_VERSION >= 103500
++#if 0 // BOOST_VERSION >= 103500
+ 
+ #include "libtorrent/error_code.hpp"
+ 
diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__file_pool.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__file_pool.cpp
new file mode 100644
index 000000000000..78a7af6ff9de
--- /dev/null
+++ b/net-p2p/rblibtorrent-devel/files/patch-src__file_pool.cpp
@@ -0,0 +1,11 @@
+--- src/file_pool.cpp.orig	2009-02-08 17:13:04.000000000 +0900
++++ src/file_pool.cpp	2009-04-19 05:29:34.000000000 +0900
+@@ -62,7 +62,7 @@
+ 			{
+ 				// this means that another instance of the storage
+ 				// is using the exact same file.
+-#if BOOST_VERSION >= 103500
++#if 0 // BOOST_VERSION >= 103500
+ 				ec = error_code(errors::file_collision, libtorrent_category);
+ #endif
+ 				return boost::shared_ptr<file>();
diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__lsd.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__lsd.cpp
new file mode 100644
index 000000000000..850bf0af0bac
--- /dev/null
+++ b/net-p2p/rblibtorrent-devel/files/patch-src__lsd.cpp
@@ -0,0 +1,11 @@
+--- src/lsd.cpp.orig	2009-02-12 03:16:27.000000000 +0900
++++ src/lsd.cpp	2009-04-19 05:30:17.000000000 +0900
+@@ -41,7 +41,7 @@
+ 
+ #include <boost/bind.hpp>
+ #include <boost/ref.hpp>
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/ip/host_name.hpp>
+ #include <asio/ip/multicast.hpp>
+ #else
diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__natpmp.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__natpmp.cpp
new file mode 100644
index 000000000000..b7cc1537de30
--- /dev/null
+++ b/net-p2p/rblibtorrent-devel/files/patch-src__natpmp.cpp
@@ -0,0 +1,11 @@
+--- src/natpmp.cpp.orig	2009-02-08 17:13:04.000000000 +0900
++++ src/natpmp.cpp	2009-04-19 05:30:54.000000000 +0900
+@@ -35,7 +35,7 @@
+ #include <boost/version.hpp>
+ #include <boost/bind.hpp>
+ 
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/ip/host_name.hpp>
+ #else
+ #include <boost/asio/ip/host_name.hpp>
diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__storage.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__storage.cpp
index ea0156332167..9b95f0595bf9 100644
--- a/net-p2p/rblibtorrent-devel/files/patch-src__storage.cpp
+++ b/net-p2p/rblibtorrent-devel/files/patch-src__storage.cpp
@@ -1,6 +1,6 @@
---- src/storage.cpp.orig	Sat Aug 25 15:26:43 2007
-+++ src/storage.cpp	Mon Sep 10 12:51:23 2007
-@@ -75,9 +75,11 @@
+--- src/storage.cpp.orig	2009-02-08 17:13:04.000000000 +0900
++++ src/storage.cpp	2009-04-19 05:32:24.000000000 +0900
+@@ -82,9 +82,11 @@
  #include <cstdio>
  #endif
  
@@ -13,3 +13,12 @@
  #include <unistd.h>
  // for statfs()
  #include <sys/param.h>
+@@ -496,7 +498,7 @@
+ 			m_mapped_files->rename_file(index, new_filename);
+ #ifndef BOOST_NO_EXCEPTIONS
+ 		}
+-#if BOOST_VERSION >= 103500
++#if 0 // BOOST_VERSION >= 103500
+ 		catch (boost::system::system_error& e)
+ 		{
+ 			set_error(old_name, e.code());
diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__udp_socket.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__udp_socket.cpp
new file mode 100644
index 000000000000..c44d01c0d869
--- /dev/null
+++ b/net-p2p/rblibtorrent-devel/files/patch-src__udp_socket.cpp
@@ -0,0 +1,11 @@
+--- src/udp_socket.cpp.orig	2009-02-08 17:13:04.000000000 +0900
++++ src/udp_socket.cpp	2009-04-19 05:33:12.000000000 +0900
+@@ -36,7 +36,7 @@
+ #include <stdlib.h>
+ #include <boost/bind.hpp>
+ #include <boost/array.hpp>
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/read.hpp>
+ #else
+ #include <boost/asio/read.hpp>
diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__upnp.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__upnp.cpp
new file mode 100644
index 000000000000..d3ed06379061
--- /dev/null
+++ b/net-p2p/rblibtorrent-devel/files/patch-src__upnp.cpp
@@ -0,0 +1,11 @@
+--- src/upnp.cpp.orig	2009-02-18 17:42:16.000000000 +0900
++++ src/upnp.cpp	2009-04-19 05:33:50.000000000 +0900
+@@ -43,7 +43,7 @@
+ 
+ #include <boost/bind.hpp>
+ #include <boost/ref.hpp>
+-#if BOOST_VERSION < 103500
++#if 1 // BOOST_VERSION < 103500
+ #include <asio/ip/host_name.hpp>
+ #include <asio/ip/multicast.hpp>
+ #else
diff --git a/net-p2p/rblibtorrent-devel/pkg-plist b/net-p2p/rblibtorrent-devel/pkg-plist
index 3197d8dc6361..9e5579194c45 100644
--- a/net-p2p/rblibtorrent-devel/pkg-plist
+++ b/net-p2p/rblibtorrent-devel/pkg-plist
@@ -2,6 +2,195 @@ include/libtorrent/GeoIP.h
 include/libtorrent/alert.hpp
 include/libtorrent/alert_types.hpp
 include/libtorrent/assert.hpp
+include/libtorrent/asio.hpp
+include/libtorrent/asio/basic_datagram_socket.hpp
+include/libtorrent/asio/basic_deadline_timer.hpp
+include/libtorrent/asio/basic_io_object.hpp
+include/libtorrent/asio/basic_raw_socket.hpp
+include/libtorrent/asio/basic_serial_port.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_socket_streambuf.hpp
+include/libtorrent/asio/basic_stream_socket.hpp
+include/libtorrent/asio/basic_streambuf.hpp
+include/libtorrent/asio/buffer.hpp
+include/libtorrent/asio/buffered_read_stream.hpp
+include/libtorrent/asio/buffered_read_stream_fwd.hpp
+include/libtorrent/asio/buffered_stream.hpp
+include/libtorrent/asio/buffered_stream_fwd.hpp
+include/libtorrent/asio/buffered_write_stream.hpp
+include/libtorrent/asio/buffered_write_stream_fwd.hpp
+include/libtorrent/asio/buffers_iterator.hpp
+include/libtorrent/asio/completion_condition.hpp
+include/libtorrent/asio/datagram_socket_service.hpp
+include/libtorrent/asio/deadline_timer.hpp
+include/libtorrent/asio/deadline_timer_service.hpp
+include/libtorrent/asio/detail/bind_handler.hpp
+include/libtorrent/asio/detail/buffer_resize_guard.hpp
+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/descriptor_ops.hpp
+include/libtorrent/asio/detail/dev_poll_reactor.hpp
+include/libtorrent/asio/detail/dev_poll_reactor_fwd.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_base_from_member.hpp
+include/libtorrent/asio/detail/handler_invoke_helpers.hpp
+include/libtorrent/asio/detail/handler_queue.hpp
+include/libtorrent/asio/detail/hash_map.hpp
+include/libtorrent/asio/detail/indirect_handler_queue.hpp
+include/libtorrent/asio/detail/io_control.hpp
+include/libtorrent/asio/detail/kqueue_reactor.hpp
+include/libtorrent/asio/detail/kqueue_reactor_fwd.hpp
+include/libtorrent/asio/detail/local_free_on_block_exit.hpp
+include/libtorrent/asio/detail/mutex.hpp
+include/libtorrent/asio/detail/noncopyable.hpp
+include/libtorrent/asio/detail/null_event.hpp
+include/libtorrent/asio/detail/null_mutex.hpp
+include/libtorrent/asio/detail/null_signal_blocker.hpp
+include/libtorrent/asio/detail/null_thread.hpp
+include/libtorrent/asio/detail/null_tss_ptr.hpp
+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_descriptor_service.hpp
+include/libtorrent/asio/detail/reactive_serial_port_service.hpp
+include/libtorrent/asio/detail/reactive_socket_service.hpp
+include/libtorrent/asio/detail/reactor_op_queue.hpp
+include/libtorrent/asio/detail/resolver_service.hpp
+include/libtorrent/asio/detail/scoped_lock.hpp
+include/libtorrent/asio/detail/select_interrupter.hpp
+include/libtorrent/asio/detail/select_reactor.hpp
+include/libtorrent/asio/detail/select_reactor_fwd.hpp
+include/libtorrent/asio/detail/service_base.hpp
+include/libtorrent/asio/detail/service_id.hpp
+include/libtorrent/asio/detail/service_registry.hpp
+include/libtorrent/asio/detail/service_registry_fwd.hpp
+include/libtorrent/asio/detail/signal_blocker.hpp
+include/libtorrent/asio/detail/signal_init.hpp
+include/libtorrent/asio/detail/socket_holder.hpp
+include/libtorrent/asio/detail/socket_ops.hpp
+include/libtorrent/asio/detail/socket_option.hpp
+include/libtorrent/asio/detail/socket_select_interrupter.hpp
+include/libtorrent/asio/detail/socket_types.hpp
+include/libtorrent/asio/detail/strand_service.hpp
+include/libtorrent/asio/detail/task_io_service.hpp
+include/libtorrent/asio/detail/task_io_service_2lock.hpp
+include/libtorrent/asio/detail/task_io_service_fwd.hpp
+include/libtorrent/asio/detail/thread.hpp
+include/libtorrent/asio/detail/throw_error.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_handle_service.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_serial_port_service.hpp
+include/libtorrent/asio/detail/win_iocp_socket_service.hpp
+include/libtorrent/asio/detail/win_mutex.hpp
+include/libtorrent/asio/detail/win_signal_blocker.hpp
+include/libtorrent/asio/detail/win_thread.hpp
+include/libtorrent/asio/detail/win_tss_ptr.hpp
+include/libtorrent/asio/detail/wince_thread.hpp
+include/libtorrent/asio/detail/winsock_init.hpp
+include/libtorrent/asio/detail/wrapped_handler.hpp
+include/libtorrent/asio/error.hpp
+include/libtorrent/asio/error_code.hpp
+include/libtorrent/asio/handler_alloc_hook.hpp
+include/libtorrent/asio/handler_invoke_hook.hpp
+include/libtorrent/asio/impl/error_code.ipp
+include/libtorrent/asio/impl/io_service.ipp
+include/libtorrent/asio/impl/read.ipp
+include/libtorrent/asio/impl/read_at.ipp
+include/libtorrent/asio/impl/read_until.ipp
+include/libtorrent/asio/impl/serial_port_base.ipp
+include/libtorrent/asio/impl/write.ipp
+include/libtorrent/asio/impl/write_at.ipp
+include/libtorrent/asio/io_service.hpp
+include/libtorrent/asio/ip/address.hpp
+include/libtorrent/asio/ip/address_v4.hpp
+include/libtorrent/asio/ip/address_v6.hpp
+include/libtorrent/asio/ip/basic_endpoint.hpp
+include/libtorrent/asio/ip/basic_resolver.hpp
+include/libtorrent/asio/ip/basic_resolver_entry.hpp
+include/libtorrent/asio/ip/basic_resolver_iterator.hpp
+include/libtorrent/asio/ip/basic_resolver_query.hpp
+include/libtorrent/asio/ip/detail/socket_option.hpp
+include/libtorrent/asio/ip/host_name.hpp
+include/libtorrent/asio/ip/icmp.hpp
+include/libtorrent/asio/ip/multicast.hpp
+include/libtorrent/asio/ip/resolver_query_base.hpp
+include/libtorrent/asio/ip/resolver_service.hpp
+include/libtorrent/asio/ip/tcp.hpp
+include/libtorrent/asio/ip/udp.hpp
+include/libtorrent/asio/ip/unicast.hpp
+include/libtorrent/asio/ip/v6_only.hpp
+include/libtorrent/asio/is_read_buffered.hpp
+include/libtorrent/asio/is_write_buffered.hpp
+include/libtorrent/asio/local/basic_endpoint.hpp
+include/libtorrent/asio/local/connect_pair.hpp
+include/libtorrent/asio/local/datagram_protocol.hpp
+include/libtorrent/asio/local/stream_protocol.hpp
+include/libtorrent/asio/placeholders.hpp
+include/libtorrent/asio/posix/basic_descriptor.hpp
+include/libtorrent/asio/posix/basic_stream_descriptor.hpp
+include/libtorrent/asio/posix/descriptor_base.hpp
+include/libtorrent/asio/posix/stream_descriptor.hpp
+include/libtorrent/asio/posix/stream_descriptor_service.hpp
+include/libtorrent/asio/raw_socket_service.hpp
+include/libtorrent/asio/read.hpp
+include/libtorrent/asio/read_at.hpp
+include/libtorrent/asio/read_until.hpp
+include/libtorrent/asio/serial_port.hpp
+include/libtorrent/asio/serial_port_base.hpp
+include/libtorrent/asio/serial_port_service.hpp
+include/libtorrent/asio/socket_acceptor_service.hpp
+include/libtorrent/asio/socket_base.hpp
+include/libtorrent/asio/ssl/basic_context.hpp
+include/libtorrent/asio/ssl/context.hpp
+include/libtorrent/asio/ssl/context_base.hpp
+include/libtorrent/asio/ssl/context_service.hpp
+include/libtorrent/asio/ssl/detail/openssl_context_service.hpp
+include/libtorrent/asio/ssl/detail/openssl_init.hpp
+include/libtorrent/asio/ssl/detail/openssl_operation.hpp
+include/libtorrent/asio/ssl/detail/openssl_stream_service.hpp
+include/libtorrent/asio/ssl/detail/openssl_types.hpp
+include/libtorrent/asio/ssl/stream.hpp
+include/libtorrent/asio/ssl/stream_base.hpp
+include/libtorrent/asio/ssl/stream_service.hpp
+include/libtorrent/asio/ssl.hpp
+include/libtorrent/asio/strand.hpp
+include/libtorrent/asio/stream_socket_service.hpp
+include/libtorrent/asio/streambuf.hpp
+include/libtorrent/asio/system_error.hpp
+include/libtorrent/asio/thread.hpp
+include/libtorrent/asio/time_traits.hpp
+include/libtorrent/asio/version.hpp
+include/libtorrent/asio/windows/basic_handle.hpp
+include/libtorrent/asio/windows/basic_random_access_handle.hpp
+include/libtorrent/asio/windows/basic_stream_handle.hpp
+include/libtorrent/asio/windows/random_access_handle.hpp
+include/libtorrent/asio/windows/random_access_handle_service.hpp
+include/libtorrent/asio/windows/stream_handle.hpp
+include/libtorrent/asio/windows/stream_handle_service.hpp
+include/libtorrent/asio/write.hpp
+include/libtorrent/asio/write_at.hpp
 include/libtorrent/aux_/session_impl.hpp
 include/libtorrent/bandwidth_limit.hpp
 include/libtorrent/bandwidth_manager.hpp
@@ -106,4 +295,14 @@ libdata/pkgconfig/libtorrent-rasterbar.pc
 @dirrm include/libtorrent/kademlia
 @dirrm include/libtorrent/extensions
 @dirrm include/libtorrent/aux_
+@dirrm include/libtorrent/asio/windows
+@dirrm include/libtorrent/asio/ssl/detail
+@dirrm include/libtorrent/asio/ssl
+@dirrm include/libtorrent/asio/posix
+@dirrm include/libtorrent/asio/local
+@dirrm include/libtorrent/asio/ip/detail
+@dirrm include/libtorrent/asio/ip
+@dirrm include/libtorrent/asio/impl
+@dirrm include/libtorrent/asio/detail
+@dirrm include/libtorrent/asio
 @dirrm include/libtorrent