From ccc015def841e0324cc3a84926e5704f97e42edb Mon Sep 17 00:00:00 2001 From: Mikhail Teterin Date: Thu, 4 Dec 2014 22:01:50 +0000 Subject: Upgrade from 1.4.8 to 1.10.4. Stop compiling things (tests, examples), which we aren't going to use or install. Instead of LIB-depending on boost, include RUN-dependency on one of boost's header-files. Because we are no longer compiling, we don't need boost installed at package-building time. PR: 195531 Approved by: maintainer timeout (see PR) --- net/asio/Makefile | 11 +- net/asio/distinfo | 4 +- net/asio/files/patch-configure | 9 ++ .../patch-include__asio__impl__error_code.ipp | 10 -- net/asio/pkg-plist | 137 +++++++++++++++++++-- 5 files changed, 140 insertions(+), 31 deletions(-) create mode 100644 net/asio/files/patch-configure delete mode 100644 net/asio/files/patch-include__asio__impl__error_code.ipp (limited to 'net/asio') diff --git a/net/asio/Makefile b/net/asio/Makefile index 071e1a05b6a1..cec5c91d53c0 100644 --- a/net/asio/Makefile +++ b/net/asio/Makefile @@ -2,19 +2,18 @@ # $FreeBSD$ PORTNAME= asio -PORTVERSION= 1.4.8 -PORTREVISION= 2 +PORTVERSION= 1.10.4 CATEGORIES= net devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20(Stable)/ MAINTAINER= acm@FreeBSD.org COMMENT= Cross-platform C++ library for network and low-level I/O programming -LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs +RUN_DEPENDS= ${LOCALBASE}/include/boost/chrono/system_clocks.hpp:${PORTSDIR}/devel/boost-libs GNU_CONFIGURE= yes -USES= gmake - -CONFIGURE_ARGS= --with-boost=${LOCALBASE}/include +USES= gmake tar:bz2 +NO_BUILD= yes +INSTALL_TARGET= install-data .include diff --git a/net/asio/distinfo b/net/asio/distinfo index ccb52fad339f..2f491d0593a2 100644 --- a/net/asio/distinfo +++ b/net/asio/distinfo @@ -1,2 +1,2 @@ -SHA256 (asio-1.4.8.tar.gz) = ab877300b69584e475d31aaaf8ac37d80f6b6788e9024d2a172829b9de0663c2 -SIZE (asio-1.4.8.tar.gz) = 1335918 +SHA256 (asio-1.10.4.tar.bz2) = 313b0d69bd5fd528a6748fec2f24c56ab143310302c903efe5f0728232b7b14a +SIZE (asio-1.10.4.tar.bz2) = 1270594 diff --git a/net/asio/files/patch-configure b/net/asio/files/patch-configure new file mode 100644 index 000000000000..a5e1adc7369a --- /dev/null +++ b/net/asio/files/patch-configure @@ -0,0 +1,9 @@ +Since we aren't compiling anything for the port, don't look for boost: +--- configure 2014-10-01 20:10:53.000000000 -0400 ++++ configure 2014-11-30 12:32:04.000000000 -0500 +@@ -5026,5 +5026,4 @@ + echo "Can't find boost headers. Please check the location of the boost" + echo "distribution and rerun configure using the --with-boost=DIR option." +- exit 1 + + fi diff --git a/net/asio/files/patch-include__asio__impl__error_code.ipp b/net/asio/files/patch-include__asio__impl__error_code.ipp deleted file mode 100644 index f021343bfbde..000000000000 --- a/net/asio/files/patch-include__asio__impl__error_code.ipp +++ /dev/null @@ -1,10 +0,0 @@ ---- include/asio/impl/error_code.ipp.orig 2011-02-22 10:25:34.000000000 +0300 -+++ include/asio/impl/error_code.ipp 2014-11-27 20:24:00.000000000 +0300 -@@ -16,6 +16,7 @@ - #endif // defined(_MSC_VER) && (_MSC_VER >= 1200) - - #include "asio/detail/config.hpp" -+#include - #include "asio/detail/local_free_on_block_exit.hpp" - #include "asio/detail/socket_types.hpp" - #include "asio/error.hpp" diff --git a/net/asio/pkg-plist b/net/asio/pkg-plist index 4dceea2c3cd5..e8b737b15b9e 100644 --- a/net/asio/pkg-plist +++ b/net/asio/pkg-plist @@ -1,9 +1,12 @@ include/asio.hpp +include/asio/async_result.hpp include/asio/basic_datagram_socket.hpp include/asio/basic_deadline_timer.hpp include/asio/basic_io_object.hpp include/asio/basic_raw_socket.hpp +include/asio/basic_seq_packet_socket.hpp include/asio/basic_serial_port.hpp +include/asio/basic_signal_set.hpp include/asio/basic_socket.hpp include/asio/basic_socket_acceptor.hpp include/asio/basic_socket_iostream.hpp @@ -11,6 +14,7 @@ include/asio/basic_socket_streambuf.hpp include/asio/basic_stream_socket.hpp include/asio/basic_streambuf.hpp include/asio/basic_streambuf_fwd.hpp +include/asio/basic_waitable_timer.hpp include/asio/buffer.hpp include/asio/buffered_read_stream.hpp include/asio/buffered_read_stream_fwd.hpp @@ -20,44 +24,58 @@ include/asio/buffered_write_stream.hpp include/asio/buffered_write_stream_fwd.hpp include/asio/buffers_iterator.hpp include/asio/completion_condition.hpp +include/asio/connect.hpp +include/asio/coroutine.hpp include/asio/datagram_socket_service.hpp include/asio/deadline_timer.hpp include/asio/deadline_timer_service.hpp +include/asio/detail/addressof.hpp +include/asio/detail/array.hpp include/asio/detail/array_fwd.hpp +include/asio/detail/assert.hpp +include/asio/detail/atomic_count.hpp include/asio/detail/base_from_completion_cond.hpp include/asio/detail/bind_handler.hpp include/asio/detail/buffer_resize_guard.hpp include/asio/detail/buffer_sequence_adapter.hpp include/asio/detail/buffered_stream_storage.hpp include/asio/detail/call_stack.hpp +include/asio/detail/chrono_time_traits.hpp include/asio/detail/completion_handler.hpp include/asio/detail/config.hpp include/asio/detail/consuming_buffers.hpp +include/asio/detail/cstdint.hpp +include/asio/detail/date_time_fwd.hpp include/asio/detail/deadline_timer_service.hpp +include/asio/detail/dependent_type.hpp include/asio/detail/descriptor_ops.hpp include/asio/detail/descriptor_read_op.hpp include/asio/detail/descriptor_write_op.hpp include/asio/detail/dev_poll_reactor.hpp -include/asio/detail/dev_poll_reactor_fwd.hpp include/asio/detail/epoll_reactor.hpp -include/asio/detail/epoll_reactor_fwd.hpp include/asio/detail/event.hpp include/asio/detail/eventfd_select_interrupter.hpp include/asio/detail/fd_set_adapter.hpp include/asio/detail/fenced_block.hpp +include/asio/detail/function.hpp include/asio/detail/gcc_arm_fenced_block.hpp include/asio/detail/gcc_hppa_fenced_block.hpp include/asio/detail/gcc_sync_fenced_block.hpp include/asio/detail/gcc_x86_fenced_block.hpp include/asio/detail/handler_alloc_helpers.hpp +include/asio/detail/handler_cont_helpers.hpp include/asio/detail/handler_invoke_helpers.hpp +include/asio/detail/handler_tracking.hpp +include/asio/detail/handler_type_requirements.hpp include/asio/detail/hash_map.hpp +include/asio/detail/impl/buffer_sequence_adapter.ipp include/asio/detail/impl/descriptor_ops.ipp include/asio/detail/impl/dev_poll_reactor.hpp include/asio/detail/impl/dev_poll_reactor.ipp include/asio/detail/impl/epoll_reactor.hpp include/asio/detail/impl/epoll_reactor.ipp include/asio/detail/impl/eventfd_select_interrupter.ipp +include/asio/detail/impl/handler_tracking.ipp include/asio/detail/impl/kqueue_reactor.hpp include/asio/detail/impl/kqueue_reactor.ipp include/asio/detail/impl/pipe_select_interrupter.ipp @@ -73,6 +91,7 @@ include/asio/detail/impl/select_reactor.hpp include/asio/detail/impl/select_reactor.ipp include/asio/detail/impl/service_registry.hpp include/asio/detail/impl/service_registry.ipp +include/asio/detail/impl/signal_set_service.ipp include/asio/detail/impl/socket_ops.ipp include/asio/detail/impl/socket_select_interrupter.ipp include/asio/detail/impl/strand_service.hpp @@ -80,7 +99,7 @@ include/asio/detail/impl/strand_service.ipp include/asio/detail/impl/task_io_service.hpp include/asio/detail/impl/task_io_service.ipp include/asio/detail/impl/throw_error.ipp -include/asio/detail/impl/timer_queue.ipp +include/asio/detail/impl/timer_queue_ptime.ipp include/asio/detail/impl/timer_queue_set.ipp include/asio/detail/impl/win_event.ipp include/asio/detail/impl/win_iocp_handle_service.ipp @@ -89,12 +108,18 @@ include/asio/detail/impl/win_iocp_io_service.ipp include/asio/detail/impl/win_iocp_serial_port_service.ipp include/asio/detail/impl/win_iocp_socket_service_base.ipp include/asio/detail/impl/win_mutex.ipp +include/asio/detail/impl/win_object_handle_service.ipp +include/asio/detail/impl/win_static_mutex.ipp include/asio/detail/impl/win_thread.ipp include/asio/detail/impl/win_tss_ptr.ipp +include/asio/detail/impl/winrt_ssocket_service_base.ipp +include/asio/detail/impl/winrt_timer_scheduler.hpp +include/asio/detail/impl/winrt_timer_scheduler.ipp include/asio/detail/impl/winsock_init.ipp include/asio/detail/io_control.hpp +include/asio/detail/keyword_tss_ptr.hpp include/asio/detail/kqueue_reactor.hpp -include/asio/detail/kqueue_reactor_fwd.hpp +include/asio/detail/limits.hpp include/asio/detail/local_free_on_block_exit.hpp include/asio/detail/macos_fenced_block.hpp include/asio/detail/mutex.hpp @@ -102,7 +127,10 @@ include/asio/detail/noncopyable.hpp include/asio/detail/null_event.hpp include/asio/detail/null_fenced_block.hpp include/asio/detail/null_mutex.hpp +include/asio/detail/null_reactor.hpp include/asio/detail/null_signal_blocker.hpp +include/asio/detail/null_socket_service.hpp +include/asio/detail/null_static_mutex.hpp include/asio/detail/null_thread.hpp include/asio/detail/null_tss_ptr.hpp include/asio/detail/object_pool.hpp @@ -115,6 +143,7 @@ include/asio/detail/posix_event.hpp include/asio/detail/posix_fd_set_adapter.hpp include/asio/detail/posix_mutex.hpp include/asio/detail/posix_signal_blocker.hpp +include/asio/detail/posix_static_mutex.hpp include/asio/detail/posix_thread.hpp include/asio/detail/posix_tss_ptr.hpp include/asio/detail/push_options.hpp @@ -125,6 +154,7 @@ include/asio/detail/reactive_socket_accept_op.hpp include/asio/detail/reactive_socket_connect_op.hpp include/asio/detail/reactive_socket_recv_op.hpp include/asio/detail/reactive_socket_recvfrom_op.hpp +include/asio/detail/reactive_socket_recvmsg_op.hpp include/asio/detail/reactive_socket_send_op.hpp include/asio/detail/reactive_socket_sendto_op.hpp include/asio/detail/reactive_socket_service.hpp @@ -139,35 +169,46 @@ include/asio/detail/resolve_op.hpp include/asio/detail/resolver_service.hpp include/asio/detail/resolver_service_base.hpp include/asio/detail/scoped_lock.hpp +include/asio/detail/scoped_ptr.hpp include/asio/detail/select_interrupter.hpp include/asio/detail/select_reactor.hpp -include/asio/detail/select_reactor_fwd.hpp include/asio/detail/service_registry.hpp -include/asio/detail/service_registry_fwd.hpp include/asio/detail/shared_ptr.hpp include/asio/detail/signal_blocker.hpp +include/asio/detail/signal_handler.hpp include/asio/detail/signal_init.hpp +include/asio/detail/signal_op.hpp +include/asio/detail/signal_set_service.hpp include/asio/detail/socket_holder.hpp include/asio/detail/socket_ops.hpp include/asio/detail/socket_option.hpp include/asio/detail/socket_select_interrupter.hpp include/asio/detail/socket_types.hpp include/asio/detail/solaris_fenced_block.hpp +include/asio/detail/static_mutex.hpp +include/asio/detail/std_event.hpp +include/asio/detail/std_mutex.hpp +include/asio/detail/std_static_mutex.hpp +include/asio/detail/std_thread.hpp include/asio/detail/strand_service.hpp include/asio/detail/task_io_service.hpp -include/asio/detail/task_io_service_fwd.hpp include/asio/detail/task_io_service_operation.hpp +include/asio/detail/task_io_service_thread_info.hpp include/asio/detail/thread.hpp +include/asio/detail/thread_info_base.hpp include/asio/detail/throw_error.hpp -include/asio/detail/timer_op.hpp +include/asio/detail/throw_exception.hpp include/asio/detail/timer_queue.hpp include/asio/detail/timer_queue_base.hpp -include/asio/detail/timer_queue_fwd.hpp +include/asio/detail/timer_queue_ptime.hpp include/asio/detail/timer_queue_set.hpp include/asio/detail/timer_scheduler.hpp include/asio/detail/timer_scheduler_fwd.hpp include/asio/detail/tss_ptr.hpp +include/asio/detail/type_traits.hpp +include/asio/detail/variadic_templates.hpp include/asio/detail/wait_handler.hpp +include/asio/detail/wait_op.hpp include/asio/detail/weak_ptr.hpp include/asio/detail/win_event.hpp include/asio/detail/win_fd_set_adapter.hpp @@ -176,30 +217,59 @@ include/asio/detail/win_iocp_handle_read_op.hpp include/asio/detail/win_iocp_handle_service.hpp include/asio/detail/win_iocp_handle_write_op.hpp include/asio/detail/win_iocp_io_service.hpp -include/asio/detail/win_iocp_io_service_fwd.hpp include/asio/detail/win_iocp_null_buffers_op.hpp include/asio/detail/win_iocp_operation.hpp include/asio/detail/win_iocp_overlapped_op.hpp include/asio/detail/win_iocp_overlapped_ptr.hpp include/asio/detail/win_iocp_serial_port_service.hpp include/asio/detail/win_iocp_socket_accept_op.hpp +include/asio/detail/win_iocp_socket_connect_op.hpp include/asio/detail/win_iocp_socket_recv_op.hpp include/asio/detail/win_iocp_socket_recvfrom_op.hpp +include/asio/detail/win_iocp_socket_recvmsg_op.hpp include/asio/detail/win_iocp_socket_send_op.hpp include/asio/detail/win_iocp_socket_service.hpp include/asio/detail/win_iocp_socket_service_base.hpp +include/asio/detail/win_iocp_thread_info.hpp include/asio/detail/win_mutex.hpp +include/asio/detail/win_object_handle_service.hpp +include/asio/detail/win_static_mutex.hpp include/asio/detail/win_thread.hpp include/asio/detail/win_tss_ptr.hpp include/asio/detail/wince_thread.hpp +include/asio/detail/winrt_async_manager.hpp +include/asio/detail/winrt_async_op.hpp +include/asio/detail/winrt_resolve_op.hpp +include/asio/detail/winrt_resolver_service.hpp +include/asio/detail/winrt_socket_connect_op.hpp +include/asio/detail/winrt_socket_recv_op.hpp +include/asio/detail/winrt_socket_send_op.hpp +include/asio/detail/winrt_ssocket_service.hpp +include/asio/detail/winrt_ssocket_service_base.hpp +include/asio/detail/winrt_timer_scheduler.hpp +include/asio/detail/winrt_utils.hpp include/asio/detail/winsock_init.hpp include/asio/detail/wrapped_handler.hpp include/asio/error.hpp include/asio/error_code.hpp +include/asio/generic/basic_endpoint.hpp +include/asio/generic/datagram_protocol.hpp +include/asio/generic/detail/endpoint.hpp +include/asio/generic/detail/impl/endpoint.ipp +include/asio/generic/raw_protocol.hpp +include/asio/generic/seq_packet_protocol.hpp +include/asio/generic/stream_protocol.hpp include/asio/handler_alloc_hook.hpp +include/asio/handler_continuation_hook.hpp include/asio/handler_invoke_hook.hpp +include/asio/handler_type.hpp +include/asio/high_resolution_timer.hpp +include/asio/impl/buffered_read_stream.hpp +include/asio/impl/buffered_write_stream.hpp +include/asio/impl/connect.hpp include/asio/impl/error.ipp include/asio/impl/error_code.ipp +include/asio/impl/handler_alloc_hook.ipp include/asio/impl/io_service.hpp include/asio/impl/io_service.ipp include/asio/impl/read.hpp @@ -207,8 +277,10 @@ include/asio/impl/read_at.hpp include/asio/impl/read_until.hpp include/asio/impl/serial_port_base.hpp include/asio/impl/serial_port_base.ipp +include/asio/impl/spawn.hpp include/asio/impl/src.cpp include/asio/impl/src.hpp +include/asio/impl/use_future.hpp include/asio/impl/write.hpp include/asio/impl/write_at.hpp include/asio/io_service.hpp @@ -258,34 +330,72 @@ include/asio/raw_socket_service.hpp include/asio/read.hpp include/asio/read_at.hpp include/asio/read_until.hpp +include/asio/seq_packet_socket_service.hpp include/asio/serial_port.hpp include/asio/serial_port_base.hpp include/asio/serial_port_service.hpp +include/asio/signal_set.hpp +include/asio/signal_set_service.hpp include/asio/socket_acceptor_service.hpp include/asio/socket_base.hpp +include/asio/spawn.hpp include/asio/ssl.hpp include/asio/ssl/basic_context.hpp include/asio/ssl/context.hpp include/asio/ssl/context_base.hpp include/asio/ssl/context_service.hpp -include/asio/ssl/detail/openssl_context_service.hpp +include/asio/ssl/detail/buffered_handshake_op.hpp +include/asio/ssl/detail/engine.hpp +include/asio/ssl/detail/handshake_op.hpp +include/asio/ssl/detail/impl/engine.ipp +include/asio/ssl/detail/impl/openssl_init.ipp +include/asio/ssl/detail/io.hpp include/asio/ssl/detail/openssl_init.hpp -include/asio/ssl/detail/openssl_operation.hpp -include/asio/ssl/detail/openssl_stream_service.hpp include/asio/ssl/detail/openssl_types.hpp +include/asio/ssl/detail/password_callback.hpp +include/asio/ssl/detail/read_op.hpp +include/asio/ssl/detail/shutdown_op.hpp +include/asio/ssl/detail/stream_core.hpp +include/asio/ssl/detail/verify_callback.hpp +include/asio/ssl/detail/write_op.hpp +include/asio/ssl/error.hpp +include/asio/ssl/impl/context.hpp +include/asio/ssl/impl/context.ipp +include/asio/ssl/impl/error.ipp +include/asio/ssl/impl/rfc2818_verification.ipp +include/asio/ssl/impl/src.hpp +include/asio/ssl/old/basic_context.hpp +include/asio/ssl/old/context_service.hpp +include/asio/ssl/old/detail/openssl_context_service.hpp +include/asio/ssl/old/detail/openssl_operation.hpp +include/asio/ssl/old/detail/openssl_stream_service.hpp +include/asio/ssl/old/stream.hpp +include/asio/ssl/old/stream_service.hpp +include/asio/ssl/rfc2818_verification.hpp include/asio/ssl/stream.hpp include/asio/ssl/stream_base.hpp include/asio/ssl/stream_service.hpp +include/asio/ssl/verify_context.hpp +include/asio/ssl/verify_mode.hpp +include/asio/steady_timer.hpp include/asio/strand.hpp include/asio/stream_socket_service.hpp include/asio/streambuf.hpp include/asio/system_error.hpp +include/asio/system_timer.hpp include/asio/thread.hpp include/asio/time_traits.hpp +include/asio/unyield.hpp +include/asio/use_future.hpp include/asio/version.hpp +include/asio/wait_traits.hpp +include/asio/waitable_timer_service.hpp include/asio/windows/basic_handle.hpp +include/asio/windows/basic_object_handle.hpp include/asio/windows/basic_random_access_handle.hpp include/asio/windows/basic_stream_handle.hpp +include/asio/windows/object_handle.hpp +include/asio/windows/object_handle_service.hpp include/asio/windows/overlapped_ptr.hpp include/asio/windows/random_access_handle.hpp include/asio/windows/random_access_handle_service.hpp @@ -293,3 +403,4 @@ include/asio/windows/stream_handle.hpp include/asio/windows/stream_handle_service.hpp include/asio/write.hpp include/asio/write_at.hpp +include/asio/yield.hpp -- cgit v1.2.3