Attachment #104193 for bug #144337

View | Details | Raw Unified | Return to bug 144337
Collapse All | Expand All





PORTNAME=	libtorrent-rasterbar
PORTVERSION=	0.14.8
PORTREVISION=	1
CATEGORIES=	net-p2p ipv6
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
MASTER_SITE_SUBDIR=

MAINTAINER=	dougb@FreeBSD.org
COMMENT=	A C++ library implementing a BitTorrent client

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0.6:${PORTSDIR}/devel/py-setuptools \
		boost-libs>=1.41.0_1:${PORTSDIR}/devel/boost-libs
LIB_DEPENDS=	boost_date_time.4:${PORTSDIR}/devel/boost-libs \
		boost_python.4:${PORTSDIR}/devel/boost-python-libs \
		GeoIP.5:${PORTSDIR}/net/GeoIP

CONFLICTS=	rblibtorrent-[0-9]* libtorrent-rasterbar*-0.15.*

MAKE_JOBS_SAFE=	yes
		GeoIP.5:${PORTSDIR}/net/GeoIP

USE_GNOME=	gnomehack
USE_OPENSSL=	yes
USE_PYTHON=	2.4+
USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:262 libtool:22
ACLOCAL_ARGS=	-I m4
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS=	--disable-debug \
		--enable-python-binding \
		--with-boost=${LOCALBASE} \
		--with-boost-asio=boost_system \
		--with-boost-filesystem=boost_filesystem \
		--with-boost-thread=boost_thread \
		--with-boost-regex=boost_regex \
		--with-boost-program-options=boost_program_options \
		--with-boost-python=boost_python \
		--with-boost-regex=boost_regex \
		--with-boost-system=boost_system \
		--with-boost-thread=boost_thread \
		--with-dht=on \
		--with-encryption=on \
		--with-libgeoip \
		--with-zlib=system
USE_LDCONFIG=	yes
INSTALLS_EGGINFO=	yes
PYDISTUTILS_EGGINFO=	python_libtorrent_rasterbar-${PORTVERSION}-py${PYTHON_VER}.egg-info

CPPFLAGS+=	${PTHREAD_CFLAGS}
LDFLAGS+=	${PTHREAD_LIBS}

.if !defined(NOPORTDOCS)
PORTDOCS=	*
.endif

.include <bsd.port.pre.mk>

.if ${OSVERSION} < 700000
BROKEN=		does not compile on FreeBSD versions prior to 7.x
.endif

##
# information available after <bsd.port.pre.mk>
##
# insure python paths are correctly identified
CONFIGURE_ENV+=	PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
		PYTHON_VERSION="${PYTHON_VERSION}"
# prefix PKGNAME with python- so that the egg info file is properly named. See post-patch target.
PYDISTUTILS_PKGNAME=	python-${PORTNAME}

post-patch:
	@${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|g' \
		${WRKSRC}/Makefile.am
	@${REINPLACE_CMD} -e 's|^AM_CFLAGS|AM_CPPFLAGS|g' \
		${WRKSRC}/src/Makefile.am
# add -rasterbar to the python bindings egg info file to insure proper naming
	@${REINPLACE_CMD} -E -e "s|(name[[:space:]]*=[[:space:]]*'python-libtorrent)'|\1-rasterbar'|" \
		${WRKSRC}/bindings/python/setup.py.in
		${WRKSRC}/libtorrent-rasterbar.pc

post-install:
.if !defined(NOPORTDOCS)

	${INSTALL_DATA} ${WRKSRC}/docs/*.jpg ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/docs/*.png ${DOCSDIR}
.endif
# fix installation permissions
	@${CHMOD} ${SHAREMODE} ${PYTHONPREFIX_SITELIBDIR}/libtorrent.so

.include <bsd.port.post.mk>




include/libtorrent/alert.hpp
include/libtorrent/alert_types.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/asio.hpp
include/libtorrent/assert.hpp
include/libtorrent/aux_/session_impl.hpp
include/libtorrent/bandwidth_limit.hpp

lib/libtorrent-rasterbar.la
lib/libtorrent-rasterbar.so
lib/libtorrent-rasterbar.so.5
%%PYTHON_SITELIBDIR%%/libtorrent.so
libdata/pkgconfig/libtorrent-rasterbar.pc
%%PORTDOCS%%%%DOCSDIR%%/Linkage.png
%%PORTDOCS%%%%DOCSDIR%%/acquasition.jpg
%%PORTDOCS%%%%DOCSDIR%%/arctic_thumb.png
%%PORTDOCS%%%%DOCSDIR%%/bitbuddy_thumb.jpg
%%PORTDOCS%%%%DOCSDIR%%/bitfox.png
%%PORTDOCS%%%%DOCSDIR%%/bitrocket_thumb.png
%%PORTDOCS%%%%DOCSDIR%%/bitscast_thumb.png
%%PORTDOCS%%%%DOCSDIR%%/bitslug_thumb.png
%%PORTDOCS%%%%DOCSDIR%%/btg_thumb.jpg
%%PORTDOCS%%%%DOCSDIR%%/bubba.png
%%PORTDOCS%%%%DOCSDIR%%/building.html
%%PORTDOCS%%%%DOCSDIR%%/client_test.html
%%PORTDOCS%%%%DOCSDIR%%/client_test.png
%%PORTDOCS%%%%DOCSDIR%%/deluge.png
%%PORTDOCS%%%%DOCSDIR%%/dht_extensions.html
%%PORTDOCS%%%%DOCSDIR%%/electric_sheep_thumb.jpg
%%PORTDOCS%%%%DOCSDIR%%/examples.html
%%PORTDOCS%%%%DOCSDIR%%/extension_protocol.html
%%PORTDOCS%%%%DOCSDIR%%/fatrat.png
%%PORTDOCS%%%%DOCSDIR%%/fdm.png
%%PORTDOCS%%%%DOCSDIR%%/features.html
%%PORTDOCS%%%%DOCSDIR%%/firetorrent.png
%%PORTDOCS%%%%DOCSDIR%%/flush.jpg
%%PORTDOCS%%%%DOCSDIR%%/halite_thumb.png
%%PORTDOCS%%%%DOCSDIR%%/im_thumb.jpg
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/leechcraft.png
%%PORTDOCS%%%%DOCSDIR%%/libtorrent_plugins.html
%%PORTDOCS%%%%DOCSDIR%%/lince.png
%%PORTDOCS%%%%DOCSDIR%%/make_torrent.html
%%PORTDOCS%%%%DOCSDIR%%/manual.html
%%PORTDOCS%%%%DOCSDIR%%/miro.jpg
%%PORTDOCS%%%%DOCSDIR%%/moopolice_thumb.gif
%%PORTDOCS%%%%DOCSDIR%%/projects.html
%%PORTDOCS%%%%DOCSDIR%%/pump.png
%%PORTDOCS%%%%DOCSDIR%%/python_binding.html
%%PORTDOCS%%%%DOCSDIR%%/qbittorrent_thumb.jpg
%%PORTDOCS%%%%DOCSDIR%%/running_tests.html
%%PORTDOCS%%%%DOCSDIR%%/style.css
%%PORTDOCS%%%%DOCSDIR%%/tvitty.jpg
%%PORTDOCS%%%%DOCSDIR%%/udp_tracker_protocol.html
%%PORTDOCS%%%%DOCSDIR%%/unicode_support.png
%%PORTDOCS%%%%DOCSDIR%%/ziptorrent_thumb.gif
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@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




--- configure.in.orig	2010-01-09 12:47:10.000000000 -0200
+++ configure.in	2010-02-26 21:34:51.000000000 -0300
@@ -419,7 +419,7 @@
 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
@@ -121,7 +108,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])
@@ -351,7 +337,7 @@
 esac
 
 dnl Use possibly specific python install params

 	PYTHON_INSTALL_PARAMS='--prefix=$(DESTDIR)$(prefix)'
 fi
 AC_SUBST(PYTHON_INSTALL_PARAMS)
@@ -481,7 +481,7 @@
 esac
 
 dnl Set some defines if we are building a shared library

 	AC_DEFINE(TORRENT_BUILDING_SHARED,,[Make sure the functions and classes are exported.])
 	COMPILETIME_OPTIONS+="-DTORRENT_LINKING_SHARED "
 fi
@@ -496,7 +496,7 @@
 	[case "$enableval" in
 		no)
 			AC_DEFINE(NDEBUG,,[Define to disable debugging])

 #			COMPILETIME_OPTIONS+="-DNDEBUG "
 			;;
 		yes)
@@ -509,7 +509,7 @@
 			AC_MSG_ERROR([Unknown --enable-debug option "$enableval". Use either "yes" or "no".])
 			;;
 	esac],




--- 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




--- 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; }

Removed Link Here

(-)files/patch-include__libtorrent__proxy_base.hpp (-11 lines)
1	--- include/libtorrent/proxy_base.hpp.orig 2008-10-05 10:41:54.000000000 +0900
2	+++ include/libtorrent/proxy_base.hpp 2009-04-19 05:17:07.000000000 +0900
3	@@ -38,7 +38,7 @@
4	#include <boost/bind.hpp>
5	#include <boost/lexical_cast.hpp>
6	#include <boost/function.hpp>
7	-#if BOOST_VERSION < 103500
8	+#if 1 // BOOST_VERSION < 103500
9	#include <asio/read.hpp>
10	#include <asio/write.hpp>
11	#else




--- 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;

Removed Link Here

(-)files/patch-include__libtorrent__ssl_stream.hpp (-11 lines)
1	--- include/libtorrent/ssl_stream.hpp.orig 2008-10-21 17:07:26.000000000 +0900
2	+++ include/libtorrent/ssl_stream.hpp 2009-04-19 05:19:42.000000000 +0900
3	@@ -34,7 +34,7 @@
4	#define TORRENT_SSL_STREAM_HPP_INCLUDED
5
6	#include "libtorrent/socket.hpp"
7	-#if BOOST_VERSION < 103500
8	+#if 1 // BOOST_VERSION < 103500
9	#include <asio/ssl.hpp>
10	#else
11	#include <boost/asio/ssl.hpp>




--- 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
 

Removed Link Here

(-)files/patch-include__libtorrent__variant_stream.hpp (-11 lines)
1	--- include/libtorrent/variant_stream.hpp.orig 2008-10-05 10:41:54.000000000 +0900
2	+++ include/libtorrent/variant_stream.hpp 2009-04-19 05:21:46.000000000 +0900
3	@@ -21,7 +21,7 @@
4	# include <boost/type_traits/add_pointer.hpp>
5	# include <boost/noncopyable.hpp>
6
7	-#if BOOST_VERSION < 103500
8	+#if 1 // BOOST_VERSION < 103500
9	#include <asio/io_service.hpp>
10	#else
11	#include <boost/asio/io_service.hpp>




--- m4/ax_python-fixed.m4.orig	2010-02-18 23:49:52.000000000 -0200
+++ m4/ax_python-fixed.m4	2010-02-19 00:17:47.000000000 -0200
@@ -58,38 +58,10 @@
 AC_DEFUN([AX_PYTHON],
 [AC_MSG_CHECKING(for python build information)
 AC_MSG_RESULT([])
-for python in python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
-# AC_CHECK_PROGS(PYTHON_BIN, [$python])
-PYTHON_BIN=$python
-ax_python_bin=$PYTHON_BIN
-if test x$ax_python_bin != x; then
-   AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no)
-   AC_CHECK_HEADER([$ax_python_bin/Python.h], ax_python_header=/usr/include/$ax_python_bin, ax_python_header=no)
-   if test $ax_python_lib != no; then
-     if test $ax_python_header != no; then
-       break;
-     fi
-   fi
-   AC_CHECK_HEADER([$ax_python_bin/Python.h], ax_python_header=/opt/local/include/$ax_python_bin, ax_python_header=no)
-   if test $ax_python_lib != no; then
-     if test $ax_python_header != no; then
-       break;
-     fi
-   fi
-fi
-done
-if test x$ax_python_bin = x; then
-   ax_python_bin=no
-fi
-if test x$ax_python_header = x; then
-   ax_python_header=no
-fi
-if test x$ax_python_lib = x; then
-   ax_python_lib=no
-fi
+ax_python_header=${PYTHON_INCLUDEDIR}
+ax_python_lib=python${PYTHON_VERSION}
 
 AC_MSG_RESULT([  results of the Python check:])
-AC_MSG_RESULT([    Binary:      $ax_python_bin])
 AC_MSG_RESULT([    Library:     $ax_python_lib])
 AC_MSG_RESULT([    Include Dir: $ax_python_header])
 

Removed Link Here

(-)files/patch-src__broadcast_socket.cpp (-11 lines)
1	--- src/broadcast_socket.cpp.orig 2008-10-22 10:15:07.000000000 +0900
2	+++ src/broadcast_socket.cpp 2009-04-19 05:27:08.000000000 +0900
3	@@ -32,7 +32,7 @@
4
5	#include <boost/version.hpp>
6
7	-#if BOOST_VERSION < 103500
8	+#if 1 // BOOST_VERSION < 103500
9	#include <asio/ip/host_name.hpp>
10	#include <asio/ip/multicast.hpp>
11	#else

Removed Link Here

(-)files/patch-src__enum_net.cpp (-11 lines)
1	--- src/enum_net.cpp.orig 2009-02-08 17:13:04.000000000 +0900
2	+++ src/enum_net.cpp 2009-04-19 05:28:22.000000000 +0900
3	@@ -35,7 +35,7 @@
4	#include <vector>
5	#include "libtorrent/enum_net.hpp"
6	#include "libtorrent/broadcast_socket.hpp"
7	-#if BOOST_VERSION < 103500
8	+#if 1 // BOOST_VERSION < 103500
9	#include <asio/ip/host_name.hpp>
10	#else
11	#include <boost/asio/ip/host_name.hpp>

Removed Link Here

(-)files/patch-src__error_code.cpp (-11 lines)
1	--- src/error_code.cpp.orig 2008-10-05 10:41:56.000000000 +0900
2	+++ src/error_code.cpp 2009-04-19 05:35:55.000000000 +0900
3	@@ -32,7 +32,7 @@
4
5	#include <boost/version.hpp>
6
7	-#if BOOST_VERSION >= 103500
8	+#if 0 // BOOST_VERSION >= 103500
9
10	#include "libtorrent/error_code.hpp"
11

Removed Link Here

(-)files/patch-src__file_pool.cpp (-11 lines)
1	--- src/file_pool.cpp.orig 2009-02-08 17:13:04.000000000 +0900
2	+++ src/file_pool.cpp 2009-04-19 05:29:34.000000000 +0900
3	@@ -62,7 +62,7 @@
4	{
5	// this means that another instance of the storage
6	// is using the exact same file.
7	-#if BOOST_VERSION >= 103500
8	+#if 0 // BOOST_VERSION >= 103500
9	ec = error_code(errors::file_collision, libtorrent_category);
10	#endif
11	return boost::shared_ptr<file>();

Removed Link Here

(-)files/patch-src__lsd.cpp (-11 lines)
1	--- src/lsd.cpp.orig 2009-02-12 03:16:27.000000000 +0900
2	+++ src/lsd.cpp 2009-04-19 05:30:17.000000000 +0900
3	@@ -41,7 +41,7 @@
4
5	#include <boost/bind.hpp>
6	#include <boost/ref.hpp>
7	-#if BOOST_VERSION < 103500
8	+#if 1 // BOOST_VERSION < 103500
9	#include <asio/ip/host_name.hpp>
10	#include <asio/ip/multicast.hpp>
11	#else

Removed Link Here

(-)files/patch-src__natpmp.cpp (-11 lines)
1	--- src/natpmp.cpp.orig 2009-02-08 17:13:04.000000000 +0900
2	+++ src/natpmp.cpp 2009-04-19 05:30:54.000000000 +0900
3	@@ -35,7 +35,7 @@
4	#include <boost/version.hpp>
5	#include <boost/bind.hpp>
6
7	-#if BOOST_VERSION < 103500
8	+#if 1 // BOOST_VERSION < 103500
9	#include <asio/ip/host_name.hpp>
10	#else
11	#include <boost/asio/ip/host_name.hpp>




--- src/storage.cpp.orig	2009-11-06 09:45:13.000000000 -0800
+++ src/storage.cpp	2009-11-21 23:12:53.000000000 -0800
@@ -53,7 +53,7 @@
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/member.hpp>
 #include <boost/multi_index/ordered_index.hpp>
-#if BOOST_VERSION >= 103500
+#if 0 // BOOST_VERSION >= 103500
 #include <boost/system/system_error.hpp>
 #endif
 
@@ -185,15 +185,15 @@
 		}
 #ifndef BOOST_NO_EXCEPTIONS
 		}
-#if BOOST_VERSION >= 103500
+#if 0 // BOOST_VERSION >= 103500
 		catch (boost::system::system_error& e)
 		{
 			ec = e.code();
 		}
 #else
-		catch (boost::filesystem::filesystem_error& e)
+		catch (std::exception& e)
 		{
-			ec = error_code(e.system_error(), get_system_category());
+			ec = error_code(errno, get_posix_category());
 		}
 #endif // BOOST_VERSION
 #endif // BOOST_NO_EXCEPTIONS
@@ -460,17 +460,17 @@
 			}
 #ifndef BOOST_NO_EXCEPTIONS
 			}
-#if BOOST_VERSION >= 103500
+#if 0 // BOOST_VERSION >= 103500
 			catch (boost::system::system_error& e)
 			{
 				set_error(m_save_path / file_iter->path, e.code());
 				return true;
 			}
 #else
-			catch (boost::filesystem::filesystem_error& e)
+			catch (std::exception& e)
 			{
 				set_error(m_save_path / file_iter->path
-					, error_code(e.system_error(), get_system_category()));
+					, error_code(errno, get_posix_category()));
 				return true;
 			}
 #endif // BOOST_VERSION
@@ -503,16 +503,16 @@
 #endif
 #ifndef BOOST_NO_EXCEPTIONS
 			}
-#if BOOST_VERSION >= 103500
+#if 0 // BOOST_VERSION >= 103500
 			catch (boost::system::system_error& e)
 			{
 				set_error(f, e.code());
 				return false;
 			}
 #else
-			catch (boost::filesystem::filesystem_error& e)
+			catch (std::exception& e)
 			{
-				set_error(f, error_code(e.system_error(), get_system_category()));
+				set_error(f, error_code(errno, get_posix_category()));
 				return false;
 			}
 #endif // BOOST_VERSION
@@ -560,17 +560,17 @@
 			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());
 			return true;
 		}
 #else
-		catch (boost::filesystem::filesystem_error& e)
+		catch (std::exception& e)
 		{
-			set_error(old_name, error_code(e.system_error()
-				, get_system_category()));
+			set_error(old_name, error_code(errno
+				, get_posix_category()));
 			return true;
 		}
 #endif // BOOST_VERSION
@@ -593,7 +593,7 @@
 #endif
 		{ fs::remove(safe_convert(p)); }
 #ifndef BOOST_NO_EXCEPTIONS
-#if BOOST_VERSION >= 103500
+#if 0 // BOOST_VERSION >= 103500
 		catch (boost::system::system_error& e)
 		{
 			// no such file or directory is not an error
@@ -601,9 +601,9 @@
 				set_error(p, e.code());
 		}
 #else
-		catch (boost::filesystem::filesystem_error& e)
+		catch (std::exception& e)
 		{
-			set_error(p, error_code(e.system_error(), get_system_category()));
+			set_error(p, errno, get_posix_category()));
 		}
 #endif // BOOST_VERSION
 #endif // BOOST_NO_EXCEPTIONS

Removed Link Here

(-)files/patch-src__udp_socket.cpp (-11 lines)
1	--- src/udp_socket.cpp.orig 2009-02-08 17:13:04.000000000 +0900
2	+++ src/udp_socket.cpp 2009-04-19 05:33:12.000000000 +0900
3	@@ -36,7 +36,7 @@
4	#include <stdlib.h>
5	#include <boost/bind.hpp>
6	#include <boost/array.hpp>
7	-#if BOOST_VERSION < 103500
8	+#if 1 // BOOST_VERSION < 103500
9	#include <asio/read.hpp>
10	#else
11	#include <boost/asio/read.hpp>

Removed Link Here

(-)files/patch-src__upnp.cpp (-11 lines)
1	--- src/upnp.cpp.orig 2009-02-18 17:42:16.000000000 +0900
2	+++ src/upnp.cpp 2009-04-19 05:33:50.000000000 +0900
3	@@ -43,7 +43,7 @@
4
5	#include <boost/bind.hpp>
6	#include <boost/ref.hpp>
7	-#if BOOST_VERSION < 103500
8	+#if 1 // BOOST_VERSION < 103500
9	#include <asio/ip/host_name.hpp>
10	#include <asio/ip/multicast.hpp>
11	#else

Return to bug 144337

Lines 7-62 Link Here

(-)Makefile (-18 / +42 lines)
7		7
8	PORTNAME= libtorrent-rasterbar	8	PORTNAME= libtorrent-rasterbar
9	PORTVERSION= 0.14.8	9	PORTVERSION= 0.14.8
		10	PORTREVISION= 1
10	CATEGORIES= net-p2p ipv6	11	CATEGORIES= net-p2p ipv6
11	MASTER_SITES= http://libtorrent.googlecode.com/files/	12	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
		13	MASTER_SITE_SUBDIR=
12		14
13	MAINTAINER= dougb@FreeBSD.org	15	MAINTAINER= dougb@FreeBSD.org
14	COMMENT= A C++ library implementing a BitTorrent client	16	COMMENT= A C++ library implementing a BitTorrent client
15		17
16	MAKE_JOBS_SAFE= yes	18	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0.6:${PORTSDIR}/devel/py-setuptools \
		19	boost-libs>=1.41.0_1:${PORTSDIR}/devel/boost-libs
		20	LIB_DEPENDS= boost_date_time.4:${PORTSDIR}/devel/boost-libs \
		21	boost_python.4:${PORTSDIR}/devel/boost-python-libs \
		22	GeoIP.5:${PORTSDIR}/net/GeoIP
17		23
18	CONFLICTS= rblibtorrent-[0-9]* libtorrent-rasterbar-0.15.	24	CONFLICTS= rblibtorrent-[0-9]* libtorrent-rasterbar-0.15.
19		25
20	LIB_DEPENDS= boost_date_time.4:${PORTSDIR}/devel/boost-libs \	26	MAKE_JOBS_SAFE= yes
21	GeoIP.5:${PORTSDIR}/net/GeoIP
22		27
23	USE_GNOME= gnomehack	28	USE_GNOME= gnomehack
24	USE_OPENSSL= yes	29	USE_OPENSSL= yes
		30	USE_PYTHON= 2.4+
25	USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:262 libtool:22	31	USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:262 libtool:22
26	ACLOCAL_ARGS= -I m4	32	ACLOCAL_ARGS= -I m4
27	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	33	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
28	CONFIGURE_ARGS= --disable-debug \	34	CONFIGURE_ARGS= --disable-debug \
29	--disable-python-binding \	35	--enable-python-binding \
30	--with-boost-system=boost_system \	36	--with-boost=${LOCALBASE} \
		37	--with-boost-asio=boost_system \
31	--with-boost-filesystem=boost_filesystem \	38	--with-boost-filesystem=boost_filesystem \
32	--with-boost-thread=boost_thread \
33	--with-boost-regex=boost_regex \
34	--with-boost-program-options=boost_program_options \	39	--with-boost-program-options=boost_program_options \
35	--with-asio=shipped \	40	--with-boost-python=boost_python \
		41	--with-boost-regex=boost_regex \
		42	--with-boost-system=boost_system \
		43	--with-boost-thread=boost_thread \
36	--with-dht=on \	44	--with-dht=on \
37	--with-encryption=on \	45	--with-encryption=on \
38	--with-libgeoip \	46	--with-libgeoip \
39	--with-zlib=system	47	--with-zlib=system
40	USE_LDCONFIG= yes	48	USE_LDCONFIG= yes
		49	INSTALLS_EGGINFO= yes
		50	PYDISTUTILS_EGGINFO= python_libtorrent_rasterbar-${PORTVERSION}-py${PYTHON_VER}.egg-info
41		51
42	CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}	52	CPPFLAGS+= ${PTHREAD_CFLAGS}
43	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}	53	LDFLAGS+= ${PTHREAD_LIBS}
		54
		55	.if !defined(NOPORTDOCS)
		56	PORTDOCS= *
		57	.endif
44		58
45	.include <bsd.port.pre.mk>	59	.include <bsd.port.pre.mk>
46		60
47	.if ${OSVERSION} < 700000	61	.if ${OSVERSION} < 700000
48	BROKEN= does not compile on 6.x	62	BROKEN= does not compile on FreeBSD versions prior to 7.x
49	.endif	63	.endif
50		64
		65	##
		66	# information available after <bsd.port.pre.mk>
		67	##
		68	# insure python paths are correctly identified
		69	CONFIGURE_ENV+= PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
		70	PYTHON_VERSION="${PYTHON_VERSION}"
		71	# prefix PKGNAME with python- so that the egg info file is properly named. See post-patch target.
		72	PYDISTUTILS_PKGNAME= python-${PORTNAME}
		73
51	post-patch:	74	post-patch:
52	@${REINPLACE_CMD} -e 's\|libdir)/pkgconfig\|prefix)/libdata/pkgconfig\|g' \	75	@${REINPLACE_CMD} -e 's\|libdir)/pkgconfig\|prefix)/libdata/pkgconfig\|g' \
53	${WRKSRC}/Makefile.am	76	${WRKSRC}/Makefile.am
54	@${REINPLACE_CMD} -e 's\|^AM_CFLAGS\|AM_CPPFLAGS\|g ; \	77	@${REINPLACE_CMD} -e 's\|^AM_CFLAGS\|AM_CPPFLAGS\|g' \
55	s\|@BOOST_SYSTEM_LIB@\|\|g' ${WRKSRC}/src/Makefile.am	78	${WRKSRC}/src/Makefile.am
56		79	# add -rasterbar to the python bindings egg info file to insure proper naming
57	post-configure:	80	@${REINPLACE_CMD} -E -e "s\|(name[[:space:]]=[[:space:]]'python-libtorrent)'\|\1-rasterbar'\|" \
58	@${REINPLACE_CMD} -e 's\|@BOOST_SYSTEM_LIB@\|-lboost_system\|' \	81	${WRKSRC}/bindings/python/setup.py.in
59	${WRKSRC}/libtorrent-rasterbar.pc
60		82
61	post-install:	83	post-install:
62	.if !defined(NOPORTDOCS)	84	.if !defined(NOPORTDOCS)
Lines 67-71 Link Here
67	${INSTALL_DATA} ${WRKSRC}/docs/*.jpg ${DOCSDIR}	89	${INSTALL_DATA} ${WRKSRC}/docs/*.jpg ${DOCSDIR}
68	${INSTALL_DATA} ${WRKSRC}/docs/*.png ${DOCSDIR}	90	${INSTALL_DATA} ${WRKSRC}/docs/*.png ${DOCSDIR}
69	.endif	91	.endif
		92	# fix installation permissions
		93	@${CHMOD} ${SHAREMODE} ${PYTHONPREFIX_SITELIBDIR}/libtorrent.so
70		94
71	.include <bsd.port.post.mk>	95	.include <bsd.port.post.mk>

Lines 1-194 Link Here

(-)pkg-plist (-243 / +1 lines)
1	include/libtorrent/alert.hpp	1	include/libtorrent/alert.hpp
2	include/libtorrent/alert_types.hpp	2	include/libtorrent/alert_types.hpp
3	include/libtorrent/asio/basic_datagram_socket.hpp
4	include/libtorrent/asio/basic_deadline_timer.hpp
5	include/libtorrent/asio/basic_io_object.hpp
6	include/libtorrent/asio/basic_raw_socket.hpp
7	include/libtorrent/asio/basic_serial_port.hpp
8	include/libtorrent/asio/basic_socket.hpp
9	include/libtorrent/asio/basic_socket_acceptor.hpp
10	include/libtorrent/asio/basic_socket_iostream.hpp
11	include/libtorrent/asio/basic_socket_streambuf.hpp
12	include/libtorrent/asio/basic_stream_socket.hpp
13	include/libtorrent/asio/basic_streambuf.hpp
14	include/libtorrent/asio/buffer.hpp
15	include/libtorrent/asio/buffered_read_stream.hpp
16	include/libtorrent/asio/buffered_read_stream_fwd.hpp
17	include/libtorrent/asio/buffered_stream.hpp
18	include/libtorrent/asio/buffered_stream_fwd.hpp
19	include/libtorrent/asio/buffered_write_stream.hpp
20	include/libtorrent/asio/buffered_write_stream_fwd.hpp
21	include/libtorrent/asio/buffers_iterator.hpp
22	include/libtorrent/asio/completion_condition.hpp
23	include/libtorrent/asio/datagram_socket_service.hpp
24	include/libtorrent/asio/deadline_timer.hpp
25	include/libtorrent/asio/deadline_timer_service.hpp
26	include/libtorrent/asio/detail/bind_handler.hpp
27	include/libtorrent/asio/detail/buffer_resize_guard.hpp
28	include/libtorrent/asio/detail/buffered_stream_storage.hpp
29	include/libtorrent/asio/detail/call_stack.hpp
30	include/libtorrent/asio/detail/const_buffers_iterator.hpp
31	include/libtorrent/asio/detail/consuming_buffers.hpp
32	include/libtorrent/asio/detail/deadline_timer_service.hpp
33	include/libtorrent/asio/detail/descriptor_ops.hpp
34	include/libtorrent/asio/detail/dev_poll_reactor.hpp
35	include/libtorrent/asio/detail/dev_poll_reactor_fwd.hpp
36	include/libtorrent/asio/detail/epoll_reactor.hpp
37	include/libtorrent/asio/detail/epoll_reactor_fwd.hpp
38	include/libtorrent/asio/detail/event.hpp
39	include/libtorrent/asio/detail/fd_set_adapter.hpp
40	include/libtorrent/asio/detail/handler_alloc_helpers.hpp
41	include/libtorrent/asio/detail/handler_base_from_member.hpp
42	include/libtorrent/asio/detail/handler_invoke_helpers.hpp
43	include/libtorrent/asio/detail/handler_queue.hpp
44	include/libtorrent/asio/detail/hash_map.hpp
45	include/libtorrent/asio/detail/indirect_handler_queue.hpp
46	include/libtorrent/asio/detail/io_control.hpp
47	include/libtorrent/asio/detail/kqueue_reactor.hpp
48	include/libtorrent/asio/detail/kqueue_reactor_fwd.hpp
49	include/libtorrent/asio/detail/local_free_on_block_exit.hpp
50	include/libtorrent/asio/detail/mutex.hpp
51	include/libtorrent/asio/detail/noncopyable.hpp
52	include/libtorrent/asio/detail/null_event.hpp
53	include/libtorrent/asio/detail/null_mutex.hpp
54	include/libtorrent/asio/detail/null_signal_blocker.hpp
55	include/libtorrent/asio/detail/null_thread.hpp
56	include/libtorrent/asio/detail/null_tss_ptr.hpp
57	include/libtorrent/asio/detail/old_win_sdk_compat.hpp
58	include/libtorrent/asio/detail/pipe_select_interrupter.hpp
59	include/libtorrent/asio/detail/pop_options.hpp
60	include/libtorrent/asio/detail/posix_event.hpp
61	include/libtorrent/asio/detail/posix_fd_set_adapter.hpp
62	include/libtorrent/asio/detail/posix_mutex.hpp
63	include/libtorrent/asio/detail/posix_signal_blocker.hpp
64	include/libtorrent/asio/detail/posix_thread.hpp
65	include/libtorrent/asio/detail/posix_tss_ptr.hpp
66	include/libtorrent/asio/detail/push_options.hpp
67	include/libtorrent/asio/detail/reactive_descriptor_service.hpp
68	include/libtorrent/asio/detail/reactive_serial_port_service.hpp
69	include/libtorrent/asio/detail/reactive_socket_service.hpp
70	include/libtorrent/asio/detail/reactor_op_queue.hpp
71	include/libtorrent/asio/detail/resolver_service.hpp
72	include/libtorrent/asio/detail/scoped_lock.hpp
73	include/libtorrent/asio/detail/select_interrupter.hpp
74	include/libtorrent/asio/detail/select_reactor.hpp
75	include/libtorrent/asio/detail/select_reactor_fwd.hpp
76	include/libtorrent/asio/detail/service_base.hpp
77	include/libtorrent/asio/detail/service_id.hpp
78	include/libtorrent/asio/detail/service_registry.hpp
79	include/libtorrent/asio/detail/service_registry_fwd.hpp
80	include/libtorrent/asio/detail/signal_blocker.hpp
81	include/libtorrent/asio/detail/signal_init.hpp
82	include/libtorrent/asio/detail/socket_holder.hpp
83	include/libtorrent/asio/detail/socket_ops.hpp
84	include/libtorrent/asio/detail/socket_option.hpp
85	include/libtorrent/asio/detail/socket_select_interrupter.hpp
86	include/libtorrent/asio/detail/socket_types.hpp
87	include/libtorrent/asio/detail/strand_service.hpp
88	include/libtorrent/asio/detail/task_io_service.hpp
89	include/libtorrent/asio/detail/task_io_service_2lock.hpp
90	include/libtorrent/asio/detail/task_io_service_fwd.hpp
91	include/libtorrent/asio/detail/thread.hpp
92	include/libtorrent/asio/detail/throw_error.hpp
93	include/libtorrent/asio/detail/timer_queue.hpp
94	include/libtorrent/asio/detail/timer_queue_base.hpp
95	include/libtorrent/asio/detail/tss_ptr.hpp
96	include/libtorrent/asio/detail/win_event.hpp
97	include/libtorrent/asio/detail/win_fd_set_adapter.hpp
98	include/libtorrent/asio/detail/win_iocp_handle_service.hpp
99	include/libtorrent/asio/detail/win_iocp_io_service.hpp
100	include/libtorrent/asio/detail/win_iocp_io_service_fwd.hpp
101	include/libtorrent/asio/detail/win_iocp_serial_port_service.hpp
102	include/libtorrent/asio/detail/win_iocp_socket_service.hpp
103	include/libtorrent/asio/detail/win_mutex.hpp
104	include/libtorrent/asio/detail/win_signal_blocker.hpp
105	include/libtorrent/asio/detail/win_thread.hpp
106	include/libtorrent/asio/detail/win_tss_ptr.hpp
107	include/libtorrent/asio/detail/wince_thread.hpp
108	include/libtorrent/asio/detail/winsock_init.hpp
109	include/libtorrent/asio/detail/wrapped_handler.hpp
110	include/libtorrent/asio/error.hpp
111	include/libtorrent/asio/error_code.hpp
112	include/libtorrent/asio/handler_alloc_hook.hpp
113	include/libtorrent/asio/handler_invoke_hook.hpp
114	include/libtorrent/asio/impl/error_code.ipp
115	include/libtorrent/asio/impl/io_service.ipp
116	include/libtorrent/asio/impl/read.ipp
117	include/libtorrent/asio/impl/read_at.ipp
118	include/libtorrent/asio/impl/read_until.ipp
119	include/libtorrent/asio/impl/serial_port_base.ipp
120	include/libtorrent/asio/impl/write.ipp
121	include/libtorrent/asio/impl/write_at.ipp
122	include/libtorrent/asio/io_service.hpp
123	include/libtorrent/asio/ip/address.hpp
124	include/libtorrent/asio/ip/address_v4.hpp
125	include/libtorrent/asio/ip/address_v6.hpp
126	include/libtorrent/asio/ip/basic_endpoint.hpp
127	include/libtorrent/asio/ip/basic_resolver.hpp
128	include/libtorrent/asio/ip/basic_resolver_entry.hpp
129	include/libtorrent/asio/ip/basic_resolver_iterator.hpp
130	include/libtorrent/asio/ip/basic_resolver_query.hpp
131	include/libtorrent/asio/ip/detail/socket_option.hpp
132	include/libtorrent/asio/ip/host_name.hpp
133	include/libtorrent/asio/ip/icmp.hpp
134	include/libtorrent/asio/ip/multicast.hpp
135	include/libtorrent/asio/ip/resolver_query_base.hpp
136	include/libtorrent/asio/ip/resolver_service.hpp
137	include/libtorrent/asio/ip/tcp.hpp
138	include/libtorrent/asio/ip/udp.hpp
139	include/libtorrent/asio/ip/unicast.hpp
140	include/libtorrent/asio/ip/v6_only.hpp
141	include/libtorrent/asio/is_read_buffered.hpp
142	include/libtorrent/asio/is_write_buffered.hpp
143	include/libtorrent/asio/local/basic_endpoint.hpp
144	include/libtorrent/asio/local/connect_pair.hpp
145	include/libtorrent/asio/local/datagram_protocol.hpp
146	include/libtorrent/asio/local/stream_protocol.hpp
147	include/libtorrent/asio/placeholders.hpp
148	include/libtorrent/asio/posix/basic_descriptor.hpp
149	include/libtorrent/asio/posix/basic_stream_descriptor.hpp
150	include/libtorrent/asio/posix/descriptor_base.hpp
151	include/libtorrent/asio/posix/stream_descriptor.hpp
152	include/libtorrent/asio/posix/stream_descriptor_service.hpp
153	include/libtorrent/asio/raw_socket_service.hpp
154	include/libtorrent/asio/read.hpp
155	include/libtorrent/asio/read_at.hpp
156	include/libtorrent/asio/read_until.hpp
157	include/libtorrent/asio/serial_port.hpp
158	include/libtorrent/asio/serial_port_base.hpp
159	include/libtorrent/asio/serial_port_service.hpp
160	include/libtorrent/asio/socket_acceptor_service.hpp
161	include/libtorrent/asio/socket_base.hpp
162	include/libtorrent/asio/ssl/basic_context.hpp
163	include/libtorrent/asio/ssl/context.hpp
164	include/libtorrent/asio/ssl/context_base.hpp
165	include/libtorrent/asio/ssl/context_service.hpp
166	include/libtorrent/asio/ssl/detail/openssl_context_service.hpp
167	include/libtorrent/asio/ssl/detail/openssl_init.hpp
168	include/libtorrent/asio/ssl/detail/openssl_operation.hpp
169	include/libtorrent/asio/ssl/detail/openssl_stream_service.hpp
170	include/libtorrent/asio/ssl/detail/openssl_types.hpp
171	include/libtorrent/asio/ssl/stream.hpp
172	include/libtorrent/asio/ssl/stream_base.hpp
173	include/libtorrent/asio/ssl/stream_service.hpp
174	include/libtorrent/asio/ssl.hpp
175	include/libtorrent/asio/strand.hpp
176	include/libtorrent/asio/stream_socket_service.hpp
177	include/libtorrent/asio/streambuf.hpp
178	include/libtorrent/asio/system_error.hpp
179	include/libtorrent/asio/thread.hpp
180	include/libtorrent/asio/time_traits.hpp
181	include/libtorrent/asio/version.hpp
182	include/libtorrent/asio/windows/basic_handle.hpp
183	include/libtorrent/asio/windows/basic_random_access_handle.hpp
184	include/libtorrent/asio/windows/basic_stream_handle.hpp
185	include/libtorrent/asio/windows/random_access_handle.hpp
186	include/libtorrent/asio/windows/random_access_handle_service.hpp
187	include/libtorrent/asio/windows/stream_handle.hpp
188	include/libtorrent/asio/windows/stream_handle_service.hpp
189	include/libtorrent/asio/write.hpp
190	include/libtorrent/asio/write_at.hpp
191	include/libtorrent/asio.hpp
192	include/libtorrent/assert.hpp	3	include/libtorrent/assert.hpp
193	include/libtorrent/aux_/session_impl.hpp	4	include/libtorrent/aux_/session_impl.hpp
194	include/libtorrent/bandwidth_limit.hpp	5	include/libtorrent/bandwidth_limit.hpp
Lines 290-351 Link Here
290	lib/libtorrent-rasterbar.la	101	lib/libtorrent-rasterbar.la
291	lib/libtorrent-rasterbar.so	102	lib/libtorrent-rasterbar.so
292	lib/libtorrent-rasterbar.so.5	103	lib/libtorrent-rasterbar.so.5
		104	%%PYTHON_SITELIBDIR%%/libtorrent.so
293	libdata/pkgconfig/libtorrent-rasterbar.pc	105	libdata/pkgconfig/libtorrent-rasterbar.pc
294	%%PORTDOCS%%%%DOCSDIR%%/Linkage.png
295	%%PORTDOCS%%%%DOCSDIR%%/acquasition.jpg
296	%%PORTDOCS%%%%DOCSDIR%%/arctic_thumb.png
297	%%PORTDOCS%%%%DOCSDIR%%/bitbuddy_thumb.jpg
298	%%PORTDOCS%%%%DOCSDIR%%/bitfox.png
299	%%PORTDOCS%%%%DOCSDIR%%/bitrocket_thumb.png
300	%%PORTDOCS%%%%DOCSDIR%%/bitscast_thumb.png
301	%%PORTDOCS%%%%DOCSDIR%%/bitslug_thumb.png
302	%%PORTDOCS%%%%DOCSDIR%%/btg_thumb.jpg
303	%%PORTDOCS%%%%DOCSDIR%%/bubba.png
304	%%PORTDOCS%%%%DOCSDIR%%/building.html
305	%%PORTDOCS%%%%DOCSDIR%%/client_test.html
306	%%PORTDOCS%%%%DOCSDIR%%/client_test.png
307	%%PORTDOCS%%%%DOCSDIR%%/deluge.png
308	%%PORTDOCS%%%%DOCSDIR%%/dht_extensions.html
309	%%PORTDOCS%%%%DOCSDIR%%/electric_sheep_thumb.jpg
310	%%PORTDOCS%%%%DOCSDIR%%/examples.html
311	%%PORTDOCS%%%%DOCSDIR%%/extension_protocol.html
312	%%PORTDOCS%%%%DOCSDIR%%/fatrat.png
313	%%PORTDOCS%%%%DOCSDIR%%/fdm.png
314	%%PORTDOCS%%%%DOCSDIR%%/features.html
315	%%PORTDOCS%%%%DOCSDIR%%/firetorrent.png
316	%%PORTDOCS%%%%DOCSDIR%%/flush.jpg
317	%%PORTDOCS%%%%DOCSDIR%%/halite_thumb.png
318	%%PORTDOCS%%%%DOCSDIR%%/im_thumb.jpg
319	%%PORTDOCS%%%%DOCSDIR%%/index.html
320	%%PORTDOCS%%%%DOCSDIR%%/leechcraft.png
321	%%PORTDOCS%%%%DOCSDIR%%/libtorrent_plugins.html
322	%%PORTDOCS%%%%DOCSDIR%%/lince.png
323	%%PORTDOCS%%%%DOCSDIR%%/make_torrent.html
324	%%PORTDOCS%%%%DOCSDIR%%/manual.html
325	%%PORTDOCS%%%%DOCSDIR%%/miro.jpg
326	%%PORTDOCS%%%%DOCSDIR%%/moopolice_thumb.gif
327	%%PORTDOCS%%%%DOCSDIR%%/projects.html
328	%%PORTDOCS%%%%DOCSDIR%%/pump.png
329	%%PORTDOCS%%%%DOCSDIR%%/python_binding.html
330	%%PORTDOCS%%%%DOCSDIR%%/qbittorrent_thumb.jpg
331	%%PORTDOCS%%%%DOCSDIR%%/running_tests.html
332	%%PORTDOCS%%%%DOCSDIR%%/style.css
333	%%PORTDOCS%%%%DOCSDIR%%/tvitty.jpg
334	%%PORTDOCS%%%%DOCSDIR%%/udp_tracker_protocol.html
335	%%PORTDOCS%%%%DOCSDIR%%/unicode_support.png
336	%%PORTDOCS%%%%DOCSDIR%%/ziptorrent_thumb.gif
337	%%PORTDOCS%%@dirrm %%DOCSDIR%%
338	@dirrm include/libtorrent/kademlia	106	@dirrm include/libtorrent/kademlia
339	@dirrm include/libtorrent/extensions	107	@dirrm include/libtorrent/extensions
340	@dirrm include/libtorrent/aux_	108	@dirrm include/libtorrent/aux_
341	@dirrm include/libtorrent/asio/windows
342	@dirrm include/libtorrent/asio/ssl/detail
343	@dirrm include/libtorrent/asio/ssl
344	@dirrm include/libtorrent/asio/posix
345	@dirrm include/libtorrent/asio/local
346	@dirrm include/libtorrent/asio/ip/detail
347	@dirrm include/libtorrent/asio/ip
348	@dirrm include/libtorrent/asio/impl
349	@dirrm include/libtorrent/asio/detail
350	@dirrm include/libtorrent/asio
351	@dirrm include/libtorrent	109	@dirrm include/libtorrent

Lines 1-34 Link Here

(-)files/patch-configure.in (-34 / +6 lines)
1	--- configure.in.orig 2009-08-05 11:29:42.000000000 +0900	1	--- configure.in.orig 2010-01-09 12:47:10.000000000 -0200
2	+++ configure.in 2009-08-29 03:28:28.000000000 +0900	2	+++ configure.in 2010-02-26 21:34:51.000000000 -0300
3	@@ -65,19 +65,6 @@	3	@@ -419,7 +419,7 @@
4	AM_CONDITIONAL([ENABLE_SHIPPED_ASIO], false)
5
6	dnl Check for boost libraries.
7	-AX_BOOST_BASE([1.35],[
8	- AX_BOOST_SYSTEM
9	- dnl check that Boost.System was found:
10	- if test -z "$BOOST_SYSTEM_LIB"; then
11	- AC_MSG_ERROR([unable to find Boost.System library, currently this is required.])
12	- fi
13	-
14	- AX_BOOST_ASIO
15	- dnl check that Boost.Asio was found:
16	- if test -z "$BOOST_ASIO_LIB"; then
17	- AC_MSG_ERROR([Unable to find Boost.Asio library, currently this is required.])
18	- fi
19	-],[
20	AX_BOOST_BASE([1.34],[
21
22	dnl the user can choose which Asio library to use
23	@@ -121,7 +108,6 @@
24	esac
25	AM_CONDITIONAL([ENABLE_SHIPPED_ASIO], [test x$enable_shipped_asio = "xyes"])
26	])
27	-])
28
29	AC_MSG_NOTICE([BOOST_CPPFLAGS=$BOOST_CPPFLAGS])
30	AC_MSG_NOTICE([BOOST_LDFLAGS=$BOOST_LDFLAGS])
31	@@ -351,7 +337,7 @@
32	esac	4	esac
33		5
34	dnl Use possibly specific python install params	6	dnl Use possibly specific python install params
Lines 37-43 Link Here
37	PYTHON_INSTALL_PARAMS='--prefix=$(DESTDIR)$(prefix)'	9	PYTHON_INSTALL_PARAMS='--prefix=$(DESTDIR)$(prefix)'
38	fi	10	fi
39	AC_SUBST(PYTHON_INSTALL_PARAMS)	11	AC_SUBST(PYTHON_INSTALL_PARAMS)
40	@@ -413,7 +399,7 @@	12	@@ -481,7 +481,7 @@
41	esac	13	esac
42		14
43	dnl Set some defines if we are building a shared library	15	dnl Set some defines if we are building a shared library
Lines 46-52 Link Here
46	AC_DEFINE(TORRENT_BUILDING_SHARED,,[Make sure the functions and classes are exported.])	18	AC_DEFINE(TORRENT_BUILDING_SHARED,,[Make sure the functions and classes are exported.])
47	COMPILETIME_OPTIONS+="-DTORRENT_LINKING_SHARED "	19	COMPILETIME_OPTIONS+="-DTORRENT_LINKING_SHARED "
48	fi	20	fi
49	@@ -425,7 +411,7 @@	21	@@ -496,7 +496,7 @@
50	[case "$enableval" in	22	[case "$enableval" in
51	no)	23	no)
52	AC_DEFINE(NDEBUG,,[Define to disable debugging])	24	AC_DEFINE(NDEBUG,,[Define to disable debugging])
Lines 55-61 Link Here
55	# COMPILETIME_OPTIONS+="-DNDEBUG "	27	# COMPILETIME_OPTIONS+="-DNDEBUG "
56	;;	28	;;
57	yes)	29	yes)
58	@@ -438,7 +424,7 @@	30	@@ -509,7 +509,7 @@
59	AC_MSG_ERROR([Unknown --enable-debug option "$enableval". Use either "yes" or "no".])	31	AC_MSG_ERROR([Unknown --enable-debug option "$enableval". Use either "yes" or "no".])
60	;;	32	;;
61	esac],	33	esac],

Removed Link Here

(-)files/patch-include__libtorrent__chained_buffer.hpp (-20 lines)
1	--- include/libtorrent/chained_buffer.hpp.orig 2008-10-05 10:41:54.000000000 +0900
2	+++ include/libtorrent/chained_buffer.hpp 2009-04-19 05:13:19.000000000 +0900
3	@@ -35,7 +35,7 @@
4
5	#include <boost/function.hpp>
6	#include <boost/version.hpp>
7	-#if BOOST_VERSION < 103500
8	+#if 1 // BOOST_VERSION < 103500
9	#include <asio/buffer.hpp>
10	#else
11	#include <boost/asio/buffer.hpp>
12	@@ -45,7 +45,7 @@
13
14	namespace libtorrent
15	{
16	-#if BOOST_VERSION >= 103500
17	+#if 0 // BOOST_VERSION >= 103500
18	namespace asio = boost::asio;
19	#endif
20	struct chained_buffer

Removed Link Here

(-)files/patch-include__libtorrent__error_code.hpp (-20 lines)
1	--- include/libtorrent/error_code.hpp.orig 2008-10-05 10:41:54.000000000 +0900
2	+++ include/libtorrent/error_code.hpp 2009-04-19 05:15:39.000000000 +0900
3	@@ -35,7 +35,7 @@
4
5	#include <boost/version.hpp>
6
7	-#if BOOST_VERSION < 103500
8	+#if 1 // BOOST_VERSION < 103500
9	#include <asio/error_code.hpp>
10	#else
11	#include <boost/system/error_code.hpp>
12	@@ -53,7 +53,7 @@
13	};
14	}
15
16	-#if BOOST_VERSION < 103500
17	+#if 1 // BOOST_VERSION < 103500
18	typedef asio::error_code error_code;
19	inline asio::error::error_category get_posix_category() { return asio::error::system_category; }
20	inline asio::error::error_category get_system_category() { return asio::error::system_category; }

Removed Link Here

(-)files/patch-include__libtorrent__socket.hpp (-20 lines)
1	--- include/libtorrent/socket.hpp.orig 2009-02-08 17:13:07.000000000 +0900
2	+++ include/libtorrent/socket.hpp 2009-04-19 05:18:58.000000000 +0900
3	@@ -47,7 +47,7 @@
4
5	#include <boost/version.hpp>
6
7	-#if BOOST_VERSION < 103500
8	+#if 1 // BOOST_VERSION < 103500
9	#include <asio/ip/tcp.hpp>
10	#include <asio/ip/udp.hpp>
11	#include <asio/io_service.hpp>
12	@@ -82,7 +82,7 @@
13	namespace libtorrent
14	{
15
16	-#if BOOST_VERSION < 103500
17	+#if 1 // BOOST_VERSION < 103500
18	using asio::ip::tcp;
19	using asio::ip::udp;
20	using asio::async_write;

Removed Link Here

(-)files/patch-include__libtorrent__time.hpp (-29 lines)
1	--- include/libtorrent/time.hpp.orig 2008-11-30 04:31:36.000000000 +0900
2	+++ include/libtorrent/time.hpp 2009-04-19 23:13:40.000000000 +0900
3	@@ -87,7 +87,7 @@
4
5	#else
6
7	-#if BOOST_VERSION < 103500
8	+#if 1 // BOOST_VERSION < 103500
9	#include <asio/time_traits.hpp>
10	#else
11	#include <boost/asio/time_traits.hpp>
12	@@ -159,7 +159,7 @@
13	}
14
15	// asio time_traits
16	-#if BOOST_VERSION >= 103500
17	+#if 0 // BOOST_VERSION >= 103500
18	namespace boost {
19	#endif
20	namespace asio
21	@@ -182,7 +182,7 @@
22	{ return boost::posix_time::microseconds(libtorrent::total_microseconds(d)); }
23	};
24	}
25	-#if BOOST_VERSION >= 103500
26	+#if 0 // BOOST_VERSION >= 103500
27	}
28	#endif
29

Added Link Here

(-)files/patch-m4__ax_python-fixed.m4 (+43 lines)
1	--- m4/ax_python-fixed.m4.orig 2010-02-18 23:49:52.000000000 -0200
2	+++ m4/ax_python-fixed.m4 2010-02-19 00:17:47.000000000 -0200
3	@@ -58,38 +58,10 @@
4	AC_DEFUN([AX_PYTHON],
5	[AC_MSG_CHECKING(for python build information)
6	AC_MSG_RESULT([])
7	-for python in python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
8	-# AC_CHECK_PROGS(PYTHON_BIN, [$python])
9	-PYTHON_BIN=$python
10	-ax_python_bin=$PYTHON_BIN
11	-if test x$ax_python_bin != x; then
12	- AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no)
13	- AC_CHECK_HEADER([$ax_python_bin/Python.h], ax_python_header=/usr/include/$ax_python_bin, ax_python_header=no)
14	- if test $ax_python_lib != no; then
15	- if test $ax_python_header != no; then
16	- break;
17	- fi
18	- fi
19	- AC_CHECK_HEADER([$ax_python_bin/Python.h], ax_python_header=/opt/local/include/$ax_python_bin, ax_python_header=no)
20	- if test $ax_python_lib != no; then
21	- if test $ax_python_header != no; then
22	- break;
23	- fi
24	- fi
25	-fi
26	-done
27	-if test x$ax_python_bin = x; then
28	- ax_python_bin=no
29	-fi
30	-if test x$ax_python_header = x; then
31	- ax_python_header=no
32	-fi
33	-if test x$ax_python_lib = x; then
34	- ax_python_lib=no
35	-fi
36	+ax_python_header=${PYTHON_INCLUDEDIR}
37	+ax_python_lib=python${PYTHON_VERSION}
38
39	AC_MSG_RESULT([ results of the Python check:])
40	-AC_MSG_RESULT([ Binary: $ax_python_bin])
41	AC_MSG_RESULT([ Library: $ax_python_lib])
42	AC_MSG_RESULT([ Include Dir: $ax_python_header])
43

Removed Link Here

(-)files/patch-src__storage.cpp (-114 lines)
1	--- src/storage.cpp.orig 2009-11-06 09:45:13.000000000 -0800
2	+++ src/storage.cpp 2009-11-21 23:12:53.000000000 -0800
3	@@ -53,7 +53,7 @@
4	#include <boost/multi_index_container.hpp>
5	#include <boost/multi_index/member.hpp>
6	#include <boost/multi_index/ordered_index.hpp>
7	-#if BOOST_VERSION >= 103500
8	+#if 0 // BOOST_VERSION >= 103500
9	#include <boost/system/system_error.hpp>
10	#endif
11
12	@@ -185,15 +185,15 @@
13	}
14	#ifndef BOOST_NO_EXCEPTIONS
15	}
16	-#if BOOST_VERSION >= 103500
17	+#if 0 // BOOST_VERSION >= 103500
18	catch (boost::system::system_error& e)
19	{
20	ec = e.code();
21	}
22	#else
23	- catch (boost::filesystem::filesystem_error& e)
24	+ catch (std::exception& e)
25	{
26	- ec = error_code(e.system_error(), get_system_category());
27	+ ec = error_code(errno, get_posix_category());
28	}
29	#endif // BOOST_VERSION
30	#endif // BOOST_NO_EXCEPTIONS
31	@@ -460,17 +460,17 @@
32	}
33	#ifndef BOOST_NO_EXCEPTIONS
34	}
35	-#if BOOST_VERSION >= 103500
36	+#if 0 // BOOST_VERSION >= 103500
37	catch (boost::system::system_error& e)
38	{
39	set_error(m_save_path / file_iter->path, e.code());
40	return true;
41	}
42	#else
43	- catch (boost::filesystem::filesystem_error& e)
44	+ catch (std::exception& e)
45	{
46	set_error(m_save_path / file_iter->path
47	- , error_code(e.system_error(), get_system_category()));
48	+ , error_code(errno, get_posix_category()));
49	return true;
50	}
51	#endif // BOOST_VERSION
52	@@ -503,16 +503,16 @@
53	#endif
54	#ifndef BOOST_NO_EXCEPTIONS
55	}
56	-#if BOOST_VERSION >= 103500
57	+#if 0 // BOOST_VERSION >= 103500
58	catch (boost::system::system_error& e)
59	{
60	set_error(f, e.code());
61	return false;
62	}
63	#else
64	- catch (boost::filesystem::filesystem_error& e)
65	+ catch (std::exception& e)
66	{
67	- set_error(f, error_code(e.system_error(), get_system_category()));
68	+ set_error(f, error_code(errno, get_posix_category()));
69	return false;
70	}
71	#endif // BOOST_VERSION
72	@@ -560,17 +560,17 @@
73	m_mapped_files->rename_file(index, new_filename);
74	#ifndef BOOST_NO_EXCEPTIONS
75	}
76	-#if BOOST_VERSION >= 103500
77	+#if 0 // BOOST_VERSION >= 103500
78	catch (boost::system::system_error& e)
79	{
80	set_error(old_name, e.code());
81	return true;
82	}
83	#else
84	- catch (boost::filesystem::filesystem_error& e)
85	+ catch (std::exception& e)
86	{
87	- set_error(old_name, error_code(e.system_error()
88	- , get_system_category()));
89	+ set_error(old_name, error_code(errno
90	+ , get_posix_category()));
91	return true;
92	}
93	#endif // BOOST_VERSION
94	@@ -593,7 +593,7 @@
95	#endif
96	{ fs::remove(safe_convert(p)); }
97	#ifndef BOOST_NO_EXCEPTIONS
98	-#if BOOST_VERSION >= 103500
99	+#if 0 // BOOST_VERSION >= 103500
100	catch (boost::system::system_error& e)
101	{
102	// no such file or directory is not an error
103	@@ -601,9 +601,9 @@
104	set_error(p, e.code());
105	}
106	#else
107	- catch (boost::filesystem::filesystem_error& e)
108	+ catch (std::exception& e)
109	{
110	- set_error(p, error_code(e.system_error(), get_system_category()));
111	+ set_error(p, errno, get_posix_category()));
112	}
113	#endif // BOOST_VERSION
114	#endif // BOOST_NO_EXCEPTIONS