Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net-p2p/libtorrent-rasterbar-14/Makefile,v retrieving revision 1.35 diff -d -u -u -r1.35 Makefile --- Makefile 22 Feb 2010 00:53:08 -0000 1.35 +++ Makefile 27 Feb 2010 01:02:02 -0000 @@ -7,56 +7,78 @@ PORTNAME= libtorrent-rasterbar PORTVERSION= 0.14.8 +PORTREVISION= 1 CATEGORIES= net-p2p ipv6 -MASTER_SITES= http://libtorrent.googlecode.com/files/ +MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITE_SUBDIR= MAINTAINER= dougb@FreeBSD.org COMMENT= A C++ library implementing a BitTorrent client -MAKE_JOBS_SAFE= yes +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.* -LIB_DEPENDS= boost_date_time.4:${PORTSDIR}/devel/boost-libs \ - GeoIP.5:${PORTSDIR}/net/GeoIP +MAKE_JOBS_SAFE= yes 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 \ - --disable-python-binding \ - --with-boost-system=boost_system \ + --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-asio=shipped \ + --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= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} + +.if !defined(NOPORTDOCS) +PORTDOCS= * +.endif .include .if ${OSVERSION} < 700000 -BROKEN= does not compile on 6.x +BROKEN= does not compile on FreeBSD versions prior to 7.x .endif +## +# information available after +## +# 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 ; \ - s|@BOOST_SYSTEM_LIB@||g' ${WRKSRC}/src/Makefile.am - -post-configure: - @${REINPLACE_CMD} -e 's|@BOOST_SYSTEM_LIB@|-lboost_system|' \ - ${WRKSRC}/libtorrent-rasterbar.pc + @${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 post-install: .if !defined(NOPORTDOCS) @@ -67,5 +89,7 @@ ${INSTALL_DATA} ${WRKSRC}/docs/*.jpg ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/*.png ${DOCSDIR} .endif +# fix installation permissions + @${CHMOD} ${SHAREMODE} ${PYTHONPREFIX_SITELIBDIR}/libtorrent.so .include Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/net-p2p/libtorrent-rasterbar-14/pkg-plist,v retrieving revision 1.20 diff -d -u -u -r1.20 pkg-plist --- pkg-plist 21 Feb 2010 23:30:19 -0000 1.20 +++ pkg-plist 27 Feb 2010 01:02:02 -0000 @@ -1,194 +1,5 @@ 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 @@ -290,62 +101,9 @@ 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 Index: files/patch-configure.in =================================================================== RCS file: /home/pcvs/ports/net-p2p/libtorrent-rasterbar-14/files/patch-configure.in,v retrieving revision 1.3 diff -d -u -u -r1.3 patch-configure.in --- files/patch-configure.in 21 Feb 2010 23:30:19 -0000 1.3 +++ files/patch-configure.in 27 Feb 2010 01:02:02 -0000 @@ -1,34 +1,6 @@ ---- configure.in.orig 2009-08-05 11:29:42.000000000 +0900 -+++ configure.in 2009-08-29 03:28:28.000000000 +0900 -@@ -65,19 +65,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 -@@ -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 @@ +--- 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 @@ esac dnl Use possibly specific python install params @@ -37,7 +9,7 @@ PYTHON_INSTALL_PARAMS='--prefix=$(DESTDIR)$(prefix)' fi AC_SUBST(PYTHON_INSTALL_PARAMS) -@@ -413,7 +399,7 @@ +@@ -481,7 +481,7 @@ esac dnl Set some defines if we are building a shared library @@ -46,7 +18,7 @@ AC_DEFINE(TORRENT_BUILDING_SHARED,,[Make sure the functions and classes are exported.]) COMPILETIME_OPTIONS+="-DTORRENT_LINKING_SHARED " fi -@@ -425,7 +411,7 @@ +@@ -496,7 +496,7 @@ [case "$enableval" in no) AC_DEFINE(NDEBUG,,[Define to disable debugging]) @@ -55,7 +27,7 @@ # COMPILETIME_OPTIONS+="-DNDEBUG " ;; yes) -@@ -438,7 +424,7 @@ +@@ -509,7 +509,7 @@ AC_MSG_ERROR([Unknown --enable-debug option "$enableval". Use either "yes" or "no".]) ;; esac], Index: files/patch-include__libtorrent__chained_buffer.hpp =================================================================== RCS file: files/patch-include__libtorrent__chained_buffer.hpp diff -N files/patch-include__libtorrent__chained_buffer.hpp --- files/patch-include__libtorrent__chained_buffer.hpp 21 Feb 2010 23:30:19 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ ---- 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 - #include --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include - #else - #include -@@ -45,7 +45,7 @@ - - namespace libtorrent - { --#if BOOST_VERSION >= 103500 -+#if 0 // BOOST_VERSION >= 103500 - namespace asio = boost::asio; - #endif - struct chained_buffer Index: files/patch-include__libtorrent__error_code.hpp =================================================================== RCS file: files/patch-include__libtorrent__error_code.hpp diff -N files/patch-include__libtorrent__error_code.hpp --- files/patch-include__libtorrent__error_code.hpp 21 Feb 2010 23:30:19 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ ---- 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 - --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include - #else - #include -@@ -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; } Index: files/patch-include__libtorrent__proxy_base.hpp =================================================================== RCS file: files/patch-include__libtorrent__proxy_base.hpp diff -N files/patch-include__libtorrent__proxy_base.hpp --- files/patch-include__libtorrent__proxy_base.hpp 21 Feb 2010 23:30:19 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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 - #include - #include --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include - #include - #else Index: files/patch-include__libtorrent__socket.hpp =================================================================== RCS file: files/patch-include__libtorrent__socket.hpp diff -N files/patch-include__libtorrent__socket.hpp --- files/patch-include__libtorrent__socket.hpp 21 Feb 2010 23:30:19 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ ---- 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 - --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include - #include - #include -@@ -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; Index: files/patch-include__libtorrent__ssl_stream.hpp =================================================================== RCS file: files/patch-include__libtorrent__ssl_stream.hpp diff -N files/patch-include__libtorrent__ssl_stream.hpp --- files/patch-include__libtorrent__ssl_stream.hpp 21 Feb 2010 23:30:19 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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 - #else - #include Index: files/patch-include__libtorrent__time.hpp =================================================================== RCS file: files/patch-include__libtorrent__time.hpp diff -N files/patch-include__libtorrent__time.hpp --- files/patch-include__libtorrent__time.hpp 21 Feb 2010 23:30:19 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,29 +0,0 @@ ---- 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 - #else - #include -@@ -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 - Index: files/patch-include__libtorrent__variant_stream.hpp =================================================================== RCS file: files/patch-include__libtorrent__variant_stream.hpp diff -N files/patch-include__libtorrent__variant_stream.hpp --- files/patch-include__libtorrent__variant_stream.hpp 21 Feb 2010 23:30:19 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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 - # include - --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include - #else - #include Index: files/patch-m4__ax_python-fixed.m4 =================================================================== RCS file: files/patch-m4__ax_python-fixed.m4 diff -N files/patch-m4__ax_python-fixed.m4 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-m4__ax_python-fixed.m4 27 Feb 2010 01:02:02 -0000 @@ -0,0 +1,43 @@ +--- 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]) + Index: files/patch-src__broadcast_socket.cpp =================================================================== RCS file: files/patch-src__broadcast_socket.cpp diff -N files/patch-src__broadcast_socket.cpp --- files/patch-src__broadcast_socket.cpp 21 Feb 2010 23:30:19 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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 - --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include - #include - #else Index: files/patch-src__enum_net.cpp =================================================================== RCS file: files/patch-src__enum_net.cpp diff -N files/patch-src__enum_net.cpp --- files/patch-src__enum_net.cpp 21 Feb 2010 23:30:19 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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 - #include "libtorrent/enum_net.hpp" - #include "libtorrent/broadcast_socket.hpp" --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include - #else - #include Index: files/patch-src__error_code.cpp =================================================================== RCS file: files/patch-src__error_code.cpp diff -N files/patch-src__error_code.cpp --- files/patch-src__error_code.cpp 21 Feb 2010 23:30:19 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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 - --#if BOOST_VERSION >= 103500 -+#if 0 // BOOST_VERSION >= 103500 - - #include "libtorrent/error_code.hpp" - Index: files/patch-src__file_pool.cpp =================================================================== RCS file: files/patch-src__file_pool.cpp diff -N files/patch-src__file_pool.cpp --- files/patch-src__file_pool.cpp 21 Feb 2010 23:30:19 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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(); Index: files/patch-src__lsd.cpp =================================================================== RCS file: files/patch-src__lsd.cpp diff -N files/patch-src__lsd.cpp --- files/patch-src__lsd.cpp 21 Feb 2010 23:30:20 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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 - #include --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include - #include - #else Index: files/patch-src__natpmp.cpp =================================================================== RCS file: files/patch-src__natpmp.cpp diff -N files/patch-src__natpmp.cpp --- files/patch-src__natpmp.cpp 21 Feb 2010 23:30:20 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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 - #include - --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include - #else - #include Index: files/patch-src__storage.cpp =================================================================== RCS file: files/patch-src__storage.cpp diff -N files/patch-src__storage.cpp --- files/patch-src__storage.cpp 21 Feb 2010 23:30:20 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,114 +0,0 @@ ---- 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 - #include - #include --#if BOOST_VERSION >= 103500 -+#if 0 // BOOST_VERSION >= 103500 - #include - #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 Index: files/patch-src__udp_socket.cpp =================================================================== RCS file: files/patch-src__udp_socket.cpp diff -N files/patch-src__udp_socket.cpp --- files/patch-src__udp_socket.cpp 21 Feb 2010 23:30:20 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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 - #include - #include --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include - #else - #include Index: files/patch-src__upnp.cpp =================================================================== RCS file: files/patch-src__upnp.cpp diff -N files/patch-src__upnp.cpp --- files/patch-src__upnp.cpp 21 Feb 2010 23:30:20 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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 - #include --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include - #include - #else