diff options
author | Alejandro Pulver <alepulver@FreeBSD.org> | 2007-04-18 00:34:08 +0000 |
---|---|---|
committer | Alejandro Pulver <alepulver@FreeBSD.org> | 2007-04-18 00:34:08 +0000 |
commit | da9996385bcfdada28a3a01779d0012dfe33b40d (patch) | |
tree | d14d2518c625c7f779f8e5d46084a37d25032b5e | |
parent | MASTER_SITES has been changed. (diff) |
- Complete repocopy of net-p2p/rblibtorrent to net-p2p/rblibtorrent-devel and
update.
- Add CONFLICTS to libtorrent, libtorrent-devel and rblibtorrent.
PR: ports/111392
Submitted by: alepulver (myself)
Notes
Notes:
svn path=/head/; revision=190257
-rw-r--r-- | net-p2p/Makefile | 1 | ||||
-rw-r--r-- | net-p2p/libtorrent-devel/Makefile | 4 | ||||
-rw-r--r-- | net-p2p/libtorrent-rasterbar-14/Makefile | 28 | ||||
-rw-r--r-- | net-p2p/libtorrent-rasterbar-14/distinfo | 6 | ||||
-rw-r--r-- | net-p2p/libtorrent-rasterbar-14/files/patch-Makefile.in | 10 | ||||
-rw-r--r-- | net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__asio__detail__socket_ops.hpp | 47 | ||||
-rw-r--r-- | net-p2p/libtorrent-rasterbar-14/pkg-descr | 14 | ||||
-rw-r--r-- | net-p2p/libtorrent-rasterbar-14/pkg-plist | 22 | ||||
-rw-r--r-- | net-p2p/libtorrent/Makefile | 4 | ||||
-rw-r--r-- | net-p2p/rblibtorrent-devel/Makefile | 28 | ||||
-rw-r--r-- | net-p2p/rblibtorrent-devel/distinfo | 6 | ||||
-rw-r--r-- | net-p2p/rblibtorrent-devel/files/patch-Makefile.in | 10 | ||||
-rw-r--r-- | net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__asio__detail__socket_ops.hpp | 47 | ||||
-rw-r--r-- | net-p2p/rblibtorrent-devel/pkg-descr | 14 | ||||
-rw-r--r-- | net-p2p/rblibtorrent-devel/pkg-plist | 22 | ||||
-rw-r--r-- | net-p2p/rblibtorrent/Makefile | 4 |
16 files changed, 190 insertions, 77 deletions
diff --git a/net-p2p/Makefile b/net-p2p/Makefile index e6d4b452debd..969253ee1935 100644 --- a/net-p2p/Makefile +++ b/net-p2p/Makefile @@ -110,6 +110,7 @@ SUBDIR += qtella SUBDIR += qtorrent SUBDIR += rblibtorrent + SUBDIR += rblibtorrent-devel SUBDIR += rtorrent SUBDIR += rtorrent-devel SUBDIR += squall diff --git a/net-p2p/libtorrent-devel/Makefile b/net-p2p/libtorrent-devel/Makefile index 93b868bfd4fd..c3d7fb448e35 100644 --- a/net-p2p/libtorrent-devel/Makefile +++ b/net-p2p/libtorrent-devel/Makefile @@ -18,7 +18,9 @@ MD5_FILE= ${.CURDIR}/distinfo PLIST= ${.CURDIR}/pkg-plist DESCR= ${MASTERDIR}/pkg-descr -CONFLICTS= libtorrent-[0-9]* +CONFLICTS= libtorrent-[0-9]* \ + rblibtorrent-[0-9]* \ + rblibtorrent-devel-[0-9]* EXTRA_PATCHES= ${.CURDIR}/files/devel-* diff --git a/net-p2p/libtorrent-rasterbar-14/Makefile b/net-p2p/libtorrent-rasterbar-14/Makefile index 64ec889d5c99..1fa132acd411 100644 --- a/net-p2p/libtorrent-rasterbar-14/Makefile +++ b/net-p2p/libtorrent-rasterbar-14/Makefile @@ -6,32 +6,26 @@ # PORTNAME= libtorrent -PORTVERSION= 0.11 -PORTREVISION= 1 +DISTVERSION= 0.12rc3 CATEGORIES= net-p2p -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=libtorrent +MASTER_SITES= http://www.rasterbar.com/products/libtorrent/ PKGNAMEPREFIX= rb +PKGNAMESUFFIX= -devel -MAINTAINER= johan@stromnet.se +MAINTAINER= alepulver@FreeBSD.org COMMENT= A C++ library implementing a BitTorrent client -LIB_DEPENDS= boost_date_time.3:${PORTSDIR}/devel/boost \ - boost_filesystem.3:${PORTSDIR}/devel/boost \ - boost_thread.3:${PORTSDIR}/devel/boost +LIB_DEPENDS= boost_date_time.3:${PORTSDIR}/devel/boost GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-debug -CONFIGURE_ENV= CXXFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/rc[[:digit:]]//} -CONFLICTS= libtorrent-[0-9]* +CONFLICTS= libtorrent-[0-9]* \ + libtorrent-devel-[0-9]* \ + rblibtorrent-[0-9]* -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -IGNORE= is unsupported on FreeBSD < 5 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-p2p/libtorrent-rasterbar-14/distinfo b/net-p2p/libtorrent-rasterbar-14/distinfo index 74318f11702b..a84d1b390238 100644 --- a/net-p2p/libtorrent-rasterbar-14/distinfo +++ b/net-p2p/libtorrent-rasterbar-14/distinfo @@ -1,3 +1,3 @@ -MD5 (libtorrent-0.11.tar.gz) = 56e9071b95a6e3f9377121f2fead3499 -SHA256 (libtorrent-0.11.tar.gz) = f350e0af6b42c2cdb1f19008b00fe5f0b70236817f532a94bcb1e3ef6ebba0d7 -SIZE (libtorrent-0.11.tar.gz) = 1130537 +MD5 (libtorrent-0.12rc3.tar.gz) = aa6d0cf9d30592857c99531cd73f0dcd +SHA256 (libtorrent-0.12rc3.tar.gz) = 3d99e12edb01044ed50c51ae1f60f28dae43e28f7d52c179add0a8cc158d7740 +SIZE (libtorrent-0.12rc3.tar.gz) = 1180260 diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-Makefile.in b/net-p2p/libtorrent-rasterbar-14/files/patch-Makefile.in index 1b322cd1715d..129802603f60 100644 --- a/net-p2p/libtorrent-rasterbar-14/files/patch-Makefile.in +++ b/net-p2p/libtorrent-rasterbar-14/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Nov 29 13:16:17 2006 -+++ Makefile.in Wed Nov 29 13:16:22 2006 -@@ -235,7 +235,7 @@ +--- Makefile.in.orig Fri Apr 13 14:33:14 2007 ++++ Makefile.in Sun Apr 15 23:04:20 2007 +@@ -260,7 +260,7 @@ debian/libtorrent0.install \ debian/rules -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig pkgconfig_DATA = libtorrent.pc - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive + all: all-recursive + diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__asio__detail__socket_ops.hpp b/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__asio__detail__socket_ops.hpp new file mode 100644 index 000000000000..bb6239745181 --- /dev/null +++ b/net-p2p/libtorrent-rasterbar-14/files/patch-include__libtorrent__asio__detail__socket_ops.hpp @@ -0,0 +1,47 @@ +--- include/libtorrent/asio/detail/socket_ops.hpp.orig Wed Mar 7 15:04:00 2007 ++++ include/libtorrent/asio/detail/socket_ops.hpp Mon Apr 16 16:05:17 2007 +@@ -63,7 +63,7 @@ + socket_addr_len_type* addrlen, asio::error_code& ec) + { + clear_error(ec); +-#if defined(__MACH__) && defined(__APPLE__) ++#if defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__) + socket_type new_s = error_wrapper(::accept(s, addr, addrlen), ec); + if (new_s == invalid_socket) + return new_s; +@@ -295,7 +295,7 @@ + } + + return s; +-#elif defined(__MACH__) && defined(__APPLE__) ++#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__) + socket_type s = error_wrapper(::socket(af, type, protocol), ec); + if (s == invalid_socket) + return s; +@@ -654,7 +654,7 @@ + if (error) + ec = translate_netdb_error(error); + return retval; +-#elif defined(__MACH__) && defined(__APPLE__) ++#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__) + (void)(buffer); + (void)(buflength); + int error = 0; +@@ -708,7 +708,7 @@ + if (error) + ec = translate_netdb_error(error); + return retval; +-#elif defined(__MACH__) && defined(__APPLE__) ++#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__) + (void)(buffer); + (void)(buflength); + int error = 0; +@@ -739,7 +739,7 @@ + + inline void freehostent(hostent* h) + { +-#if defined(__MACH__) && defined(__APPLE__) ++#if defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__) + if (h) + ::freehostent(h); + #else diff --git a/net-p2p/libtorrent-rasterbar-14/pkg-descr b/net-p2p/libtorrent-rasterbar-14/pkg-descr index 814d0c42687a..a27e81c1a5d3 100644 --- a/net-p2p/libtorrent-rasterbar-14/pkg-descr +++ b/net-p2p/libtorrent-rasterbar-14/pkg-descr @@ -1,12 +1,12 @@ -libtorrent is a C++ library that aims to be a good alternative to -all the other bittorrent implementations around. -It is a library and not a full featured client, although it comes -with a working example client. +libtorrent is a C++ library that aims to be a good alternative to all the +other bittorrent implementations around. It is a library and not a full +featured client, although it comes with a working example client. The main goals of libtorrent are: - * to be cpu efficient - * to be memory efficient - * to be very easy to use + +* to be cpu efficient +* to be memory efficient +* to be very easy to use Note that this is NOT the same library as the libtorrent port! diff --git a/net-p2p/libtorrent-rasterbar-14/pkg-plist b/net-p2p/libtorrent-rasterbar-14/pkg-plist index fca1337deebc..b288f6ebee40 100644 --- a/net-p2p/libtorrent-rasterbar-14/pkg-plist +++ b/net-p2p/libtorrent-rasterbar-14/pkg-plist @@ -5,7 +5,6 @@ include/libtorrent/asio.hpp include/libtorrent/asio/basic_datagram_socket.hpp include/libtorrent/asio/basic_deadline_timer.hpp include/libtorrent/asio/basic_io_object.hpp -include/libtorrent/asio/basic_resolver.hpp include/libtorrent/asio/basic_socket.hpp include/libtorrent/asio/basic_socket_acceptor.hpp include/libtorrent/asio/basic_socket_iostream.hpp @@ -40,6 +39,7 @@ include/libtorrent/asio/detail/hash_map.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 @@ -64,7 +64,10 @@ 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 @@ -76,6 +79,7 @@ include/libtorrent/asio/detail/strand_service.hpp include/libtorrent/asio/detail/task_io_service.hpp include/libtorrent/asio/detail/task_io_service_fwd.hpp include/libtorrent/asio/detail/thread.hpp +include/libtorrent/asio/detail/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 @@ -85,7 +89,6 @@ include/libtorrent/asio/detail/win_iocp_io_service.hpp include/libtorrent/asio/detail/win_iocp_io_service_fwd.hpp include/libtorrent/asio/detail/win_iocp_operation.hpp include/libtorrent/asio/detail/win_iocp_socket_service.hpp -include/libtorrent/asio/detail/win_local_free_on_block_exit.hpp include/libtorrent/asio/detail/win_mutex.hpp include/libtorrent/asio/detail/win_signal_blocker.hpp include/libtorrent/asio/detail/win_thread.hpp @@ -93,9 +96,10 @@ include/libtorrent/asio/detail/win_tss_ptr.hpp include/libtorrent/asio/detail/winsock_init.hpp include/libtorrent/asio/detail/wrapped_handler.hpp include/libtorrent/asio/error.hpp -include/libtorrent/asio/error_handler.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_until.ipp @@ -105,6 +109,7 @@ 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 @@ -112,6 +117,7 @@ include/libtorrent/asio/ip/detail/socket_option.hpp include/libtorrent/asio/ip/host_name.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/is_read_buffered.hpp @@ -119,7 +125,6 @@ include/libtorrent/asio/is_write_buffered.hpp include/libtorrent/asio/placeholders.hpp include/libtorrent/asio/read.hpp include/libtorrent/asio/read_until.hpp -include/libtorrent/asio/resolver_service.hpp include/libtorrent/asio/socket_acceptor_service.hpp include/libtorrent/asio/socket_base.hpp include/libtorrent/asio/ssl.hpp @@ -138,12 +143,13 @@ include/libtorrent/asio/ssl/stream_service.hpp include/libtorrent/asio/strand.hpp include/libtorrent/asio/stream_socket_service.hpp include/libtorrent/asio/streambuf.hpp -include/libtorrent/asio/system_exception.hpp +include/libtorrent/asio/system_error.hpp include/libtorrent/asio/thread.hpp include/libtorrent/asio/time_traits.hpp include/libtorrent/asio/write.hpp include/libtorrent/aux_/allocate_resources_impl.hpp include/libtorrent/aux_/session_impl.hpp +include/libtorrent/bandwidth_manager.hpp include/libtorrent/bencode.hpp include/libtorrent/bt_peer_connection.hpp include/libtorrent/buffer.hpp @@ -151,7 +157,12 @@ include/libtorrent/config.hpp include/libtorrent/debug.hpp include/libtorrent/entry.hpp include/libtorrent/escape_string.hpp +include/libtorrent/extensions.hpp +include/libtorrent/extensions/logger.hpp +include/libtorrent/extensions/metadata_transfer.hpp +include/libtorrent/extensions/ut_pex.hpp include/libtorrent/file.hpp +include/libtorrent/file_pool.hpp include/libtorrent/fingerprint.hpp include/libtorrent/hasher.hpp include/libtorrent/http_tracker_connection.hpp @@ -202,6 +213,7 @@ lib/libtorrent.so lib/libtorrent.so.1 libdata/pkgconfig/libtorrent.pc @dirrm include/libtorrent/kademlia +@dirrm include/libtorrent/extensions @dirrm include/libtorrent/aux_ @dirrm include/libtorrent/asio/ssl/detail @dirrm include/libtorrent/asio/ssl diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile index e19c842d9bbe..598df51a3eee 100644 --- a/net-p2p/libtorrent/Makefile +++ b/net-p2p/libtorrent/Makefile @@ -18,7 +18,9 @@ COMMENT?= BitTorrent Library written in C++ LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 -CONFLICTS?= libtorrent-devel-[0-9]* +CONFLICTS?= libtorrent-devel-[0-9]* \ + rblibtorrent-[0-9]* \ + rblibtorrent-devel-[0-9]* USE_AUTOTOOLS= libtool:15 USE_GCC= 3.4 diff --git a/net-p2p/rblibtorrent-devel/Makefile b/net-p2p/rblibtorrent-devel/Makefile index 64ec889d5c99..1fa132acd411 100644 --- a/net-p2p/rblibtorrent-devel/Makefile +++ b/net-p2p/rblibtorrent-devel/Makefile @@ -6,32 +6,26 @@ # PORTNAME= libtorrent -PORTVERSION= 0.11 -PORTREVISION= 1 +DISTVERSION= 0.12rc3 CATEGORIES= net-p2p -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR=libtorrent +MASTER_SITES= http://www.rasterbar.com/products/libtorrent/ PKGNAMEPREFIX= rb +PKGNAMESUFFIX= -devel -MAINTAINER= johan@stromnet.se +MAINTAINER= alepulver@FreeBSD.org COMMENT= A C++ library implementing a BitTorrent client -LIB_DEPENDS= boost_date_time.3:${PORTSDIR}/devel/boost \ - boost_filesystem.3:${PORTSDIR}/devel/boost \ - boost_thread.3:${PORTSDIR}/devel/boost +LIB_DEPENDS= boost_date_time.3:${PORTSDIR}/devel/boost GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-debug -CONFIGURE_ENV= CXXFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/rc[[:digit:]]//} -CONFLICTS= libtorrent-[0-9]* +CONFLICTS= libtorrent-[0-9]* \ + libtorrent-devel-[0-9]* \ + rblibtorrent-[0-9]* -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -IGNORE= is unsupported on FreeBSD < 5 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-p2p/rblibtorrent-devel/distinfo b/net-p2p/rblibtorrent-devel/distinfo index 74318f11702b..a84d1b390238 100644 --- a/net-p2p/rblibtorrent-devel/distinfo +++ b/net-p2p/rblibtorrent-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (libtorrent-0.11.tar.gz) = 56e9071b95a6e3f9377121f2fead3499 -SHA256 (libtorrent-0.11.tar.gz) = f350e0af6b42c2cdb1f19008b00fe5f0b70236817f532a94bcb1e3ef6ebba0d7 -SIZE (libtorrent-0.11.tar.gz) = 1130537 +MD5 (libtorrent-0.12rc3.tar.gz) = aa6d0cf9d30592857c99531cd73f0dcd +SHA256 (libtorrent-0.12rc3.tar.gz) = 3d99e12edb01044ed50c51ae1f60f28dae43e28f7d52c179add0a8cc158d7740 +SIZE (libtorrent-0.12rc3.tar.gz) = 1180260 diff --git a/net-p2p/rblibtorrent-devel/files/patch-Makefile.in b/net-p2p/rblibtorrent-devel/files/patch-Makefile.in index 1b322cd1715d..129802603f60 100644 --- a/net-p2p/rblibtorrent-devel/files/patch-Makefile.in +++ b/net-p2p/rblibtorrent-devel/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Wed Nov 29 13:16:17 2006 -+++ Makefile.in Wed Nov 29 13:16:22 2006 -@@ -235,7 +235,7 @@ +--- Makefile.in.orig Fri Apr 13 14:33:14 2007 ++++ Makefile.in Sun Apr 15 23:04:20 2007 +@@ -260,7 +260,7 @@ debian/libtorrent0.install \ debian/rules -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig pkgconfig_DATA = libtorrent.pc - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive + all: all-recursive + diff --git a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__asio__detail__socket_ops.hpp b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__asio__detail__socket_ops.hpp new file mode 100644 index 000000000000..bb6239745181 --- /dev/null +++ b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__asio__detail__socket_ops.hpp @@ -0,0 +1,47 @@ +--- include/libtorrent/asio/detail/socket_ops.hpp.orig Wed Mar 7 15:04:00 2007 ++++ include/libtorrent/asio/detail/socket_ops.hpp Mon Apr 16 16:05:17 2007 +@@ -63,7 +63,7 @@ + socket_addr_len_type* addrlen, asio::error_code& ec) + { + clear_error(ec); +-#if defined(__MACH__) && defined(__APPLE__) ++#if defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__) + socket_type new_s = error_wrapper(::accept(s, addr, addrlen), ec); + if (new_s == invalid_socket) + return new_s; +@@ -295,7 +295,7 @@ + } + + return s; +-#elif defined(__MACH__) && defined(__APPLE__) ++#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__) + socket_type s = error_wrapper(::socket(af, type, protocol), ec); + if (s == invalid_socket) + return s; +@@ -654,7 +654,7 @@ + if (error) + ec = translate_netdb_error(error); + return retval; +-#elif defined(__MACH__) && defined(__APPLE__) ++#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__) + (void)(buffer); + (void)(buflength); + int error = 0; +@@ -708,7 +708,7 @@ + if (error) + ec = translate_netdb_error(error); + return retval; +-#elif defined(__MACH__) && defined(__APPLE__) ++#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__) + (void)(buffer); + (void)(buflength); + int error = 0; +@@ -739,7 +739,7 @@ + + inline void freehostent(hostent* h) + { +-#if defined(__MACH__) && defined(__APPLE__) ++#if defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__) + if (h) + ::freehostent(h); + #else diff --git a/net-p2p/rblibtorrent-devel/pkg-descr b/net-p2p/rblibtorrent-devel/pkg-descr index 814d0c42687a..a27e81c1a5d3 100644 --- a/net-p2p/rblibtorrent-devel/pkg-descr +++ b/net-p2p/rblibtorrent-devel/pkg-descr @@ -1,12 +1,12 @@ -libtorrent is a C++ library that aims to be a good alternative to -all the other bittorrent implementations around. -It is a library and not a full featured client, although it comes -with a working example client. +libtorrent is a C++ library that aims to be a good alternative to all the +other bittorrent implementations around. It is a library and not a full +featured client, although it comes with a working example client. The main goals of libtorrent are: - * to be cpu efficient - * to be memory efficient - * to be very easy to use + +* to be cpu efficient +* to be memory efficient +* to be very easy to use Note that this is NOT the same library as the libtorrent port! diff --git a/net-p2p/rblibtorrent-devel/pkg-plist b/net-p2p/rblibtorrent-devel/pkg-plist index fca1337deebc..b288f6ebee40 100644 --- a/net-p2p/rblibtorrent-devel/pkg-plist +++ b/net-p2p/rblibtorrent-devel/pkg-plist @@ -5,7 +5,6 @@ include/libtorrent/asio.hpp include/libtorrent/asio/basic_datagram_socket.hpp include/libtorrent/asio/basic_deadline_timer.hpp include/libtorrent/asio/basic_io_object.hpp -include/libtorrent/asio/basic_resolver.hpp include/libtorrent/asio/basic_socket.hpp include/libtorrent/asio/basic_socket_acceptor.hpp include/libtorrent/asio/basic_socket_iostream.hpp @@ -40,6 +39,7 @@ include/libtorrent/asio/detail/hash_map.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 @@ -64,7 +64,10 @@ 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 @@ -76,6 +79,7 @@ include/libtorrent/asio/detail/strand_service.hpp include/libtorrent/asio/detail/task_io_service.hpp include/libtorrent/asio/detail/task_io_service_fwd.hpp include/libtorrent/asio/detail/thread.hpp +include/libtorrent/asio/detail/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 @@ -85,7 +89,6 @@ include/libtorrent/asio/detail/win_iocp_io_service.hpp include/libtorrent/asio/detail/win_iocp_io_service_fwd.hpp include/libtorrent/asio/detail/win_iocp_operation.hpp include/libtorrent/asio/detail/win_iocp_socket_service.hpp -include/libtorrent/asio/detail/win_local_free_on_block_exit.hpp include/libtorrent/asio/detail/win_mutex.hpp include/libtorrent/asio/detail/win_signal_blocker.hpp include/libtorrent/asio/detail/win_thread.hpp @@ -93,9 +96,10 @@ include/libtorrent/asio/detail/win_tss_ptr.hpp include/libtorrent/asio/detail/winsock_init.hpp include/libtorrent/asio/detail/wrapped_handler.hpp include/libtorrent/asio/error.hpp -include/libtorrent/asio/error_handler.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_until.ipp @@ -105,6 +109,7 @@ 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 @@ -112,6 +117,7 @@ include/libtorrent/asio/ip/detail/socket_option.hpp include/libtorrent/asio/ip/host_name.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/is_read_buffered.hpp @@ -119,7 +125,6 @@ include/libtorrent/asio/is_write_buffered.hpp include/libtorrent/asio/placeholders.hpp include/libtorrent/asio/read.hpp include/libtorrent/asio/read_until.hpp -include/libtorrent/asio/resolver_service.hpp include/libtorrent/asio/socket_acceptor_service.hpp include/libtorrent/asio/socket_base.hpp include/libtorrent/asio/ssl.hpp @@ -138,12 +143,13 @@ include/libtorrent/asio/ssl/stream_service.hpp include/libtorrent/asio/strand.hpp include/libtorrent/asio/stream_socket_service.hpp include/libtorrent/asio/streambuf.hpp -include/libtorrent/asio/system_exception.hpp +include/libtorrent/asio/system_error.hpp include/libtorrent/asio/thread.hpp include/libtorrent/asio/time_traits.hpp include/libtorrent/asio/write.hpp include/libtorrent/aux_/allocate_resources_impl.hpp include/libtorrent/aux_/session_impl.hpp +include/libtorrent/bandwidth_manager.hpp include/libtorrent/bencode.hpp include/libtorrent/bt_peer_connection.hpp include/libtorrent/buffer.hpp @@ -151,7 +157,12 @@ include/libtorrent/config.hpp include/libtorrent/debug.hpp include/libtorrent/entry.hpp include/libtorrent/escape_string.hpp +include/libtorrent/extensions.hpp +include/libtorrent/extensions/logger.hpp +include/libtorrent/extensions/metadata_transfer.hpp +include/libtorrent/extensions/ut_pex.hpp include/libtorrent/file.hpp +include/libtorrent/file_pool.hpp include/libtorrent/fingerprint.hpp include/libtorrent/hasher.hpp include/libtorrent/http_tracker_connection.hpp @@ -202,6 +213,7 @@ lib/libtorrent.so lib/libtorrent.so.1 libdata/pkgconfig/libtorrent.pc @dirrm include/libtorrent/kademlia +@dirrm include/libtorrent/extensions @dirrm include/libtorrent/aux_ @dirrm include/libtorrent/asio/ssl/detail @dirrm include/libtorrent/asio/ssl diff --git a/net-p2p/rblibtorrent/Makefile b/net-p2p/rblibtorrent/Makefile index 64ec889d5c99..31d0eb9e403e 100644 --- a/net-p2p/rblibtorrent/Makefile +++ b/net-p2p/rblibtorrent/Makefile @@ -26,7 +26,9 @@ CONFIGURE_ARGS= --disable-debug CONFIGURE_ENV= CXXFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CONFLICTS= libtorrent-[0-9]* +CONFLICTS= libtorrent-[0-9]* \ + libtorrent-devel-[0-9]* \ + rblibtorrent-devel-[0-9]* .include <bsd.port.pre.mk> |