Attachment 88111 Details for Bug 124858 – rblibtorrent.diff

[patch] rblibtorrent.diff

rblibtorrent.diff (text/plain), 9.99 KB, created by Alejandro Pulver on 2008-06-21 23:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alejandro Pulver

Created: 2008-06-21 23:50:00 UTC

Size: 9.99 KB

patch

obsolete

>Index: rblibtorrent/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/net-p2p/rblibtorrent/Makefile,v
>retrieving revision 1.9
>diff -u -r1.9 Makefile
>--- rblibtorrent/Makefile	29 Aug 2007 00:52:50 -0000	1.9
>+++ rblibtorrent/Makefile	21 Jun 2008 22:19:54 -0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	libtorrent
>-PORTVERSION=	0.12
>-PORTREVISION=	1
>+PORTVERSION=	0.13
> CATEGORIES=	net-p2p
> MASTER_SITES=	SF
> PKGNAMEPREFIX=	rb
>@@ -27,4 +26,14 @@
> 		libtorrent-devel-[0-9]* \
> 		rblibtorrent-devel-[0-9]*
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.pre.mk>
>+
>+.if ${OSVERSION} < 600000
>+BROKEN=		does not build on FreeBSD 5.x
>+.endif
>+
>+post-install:
>+	@cd ${PREFIX}/lib && ${LN} -sf libtorrent-0.13.so libtorrent.so.1 && \
>+		${LN} -sf libtorrent.so.1 libtorrent.so
>+
>+.include <bsd.port.post.mk>
>Index: rblibtorrent/distinfo
>===================================================================
>RCS file: /home/pcvs/ports/net-p2p/rblibtorrent/distinfo,v
>retrieving revision 1.4
>diff -u -r1.4 distinfo
>--- rblibtorrent/distinfo	5 Jun 2007 06:05:15 -0000	1.4
>+++ rblibtorrent/distinfo	21 Jun 2008 22:19:54 -0000
>@@ -1,3 +1,3 @@
>-MD5 (libtorrent-0.12.tar.gz) = a09a37e6fc74d152821c00c3cb15d248
>-SHA256 (libtorrent-0.12.tar.gz) = 0663f9adaa9d90334ebf78eb6f5b31074ff533d7bec5d3325ff98baad5b7df07
>-SIZE (libtorrent-0.12.tar.gz) = 1176469
>+MD5 (libtorrent-0.13.tar.gz) = 571a91a98c7426321681dd9f767a87de
>+SHA256 (libtorrent-0.13.tar.gz) = b187e6af2d2adc90417f991431fab5b0d6e61d71d0164345fad940a79cc45ee2
>+SIZE (libtorrent-0.13.tar.gz) = 1502517
>Index: rblibtorrent/pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/net-p2p/rblibtorrent/pkg-plist,v
>retrieving revision 1.8
>diff -u -r1.8 pkg-plist
>--- rblibtorrent/pkg-plist	14 Mar 2008 16:00:08 -0000	1.8
>+++ rblibtorrent/pkg-plist	21 Jun 2008 22:19:54 -0000
>@@ -1,6 +1,5 @@
> include/libtorrent/alert.hpp
> include/libtorrent/alert_types.hpp
>-include/libtorrent/allocate_resources.hpp
> include/libtorrent/asio.hpp
> include/libtorrent/asio/basic_datagram_socket.hpp
> include/libtorrent/asio/basic_deadline_timer.hpp
>@@ -29,12 +28,15 @@
> 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/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_invoke_helpers.hpp
>+include/libtorrent/asio/detail/handler_queue.hpp
> include/libtorrent/asio/detail/hash_map.hpp
> include/libtorrent/asio/detail/io_control.hpp
> include/libtorrent/asio/detail/kqueue_reactor.hpp
>@@ -87,12 +89,12 @@
> include/libtorrent/asio/detail/win_fd_set_adapter.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_operation.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
>@@ -120,6 +122,8 @@
> 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/placeholders.hpp
>@@ -146,16 +150,24 @@
> 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/write.hpp
>-include/libtorrent/aux_/allocate_resources_impl.hpp
>+include/libtorrent/assert.hpp
> include/libtorrent/aux_/session_impl.hpp
>+include/libtorrent/bandwidth_limit.hpp
> include/libtorrent/bandwidth_manager.hpp
>+include/libtorrent/bandwidth_queue_entry.hpp
> include/libtorrent/bencode.hpp
>+include/libtorrent/broadcast_socket.hpp
> include/libtorrent/bt_peer_connection.hpp
> include/libtorrent/buffer.hpp
>+include/libtorrent/chained_buffer.hpp
> include/libtorrent/config.hpp
>+include/libtorrent/connection_queue.hpp
> include/libtorrent/debug.hpp
>+include/libtorrent/disk_io_thread.hpp
> include/libtorrent/entry.hpp
>+include/libtorrent/enum_net.hpp
> include/libtorrent/escape_string.hpp
> include/libtorrent/extensions.hpp
> include/libtorrent/extensions/logger.hpp
>@@ -165,8 +177,12 @@
> include/libtorrent/file_pool.hpp
> include/libtorrent/fingerprint.hpp
> include/libtorrent/hasher.hpp
>+include/libtorrent/http_connection.hpp
>+include/libtorrent/http_stream.hpp
> include/libtorrent/http_tracker_connection.hpp
> include/libtorrent/identify_client.hpp
>+include/libtorrent/instantiate_connection.hpp
>+include/libtorrent/intrusive_ptr_base.hpp
> include/libtorrent/invariant_check.hpp
> include/libtorrent/io.hpp
> include/libtorrent/ip_filter.hpp
>@@ -174,14 +190,20 @@
> include/libtorrent/kademlia/dht_tracker.hpp
> include/libtorrent/kademlia/find_data.hpp
> include/libtorrent/kademlia/logging.hpp
>+include/libtorrent/kademlia/msg.hpp
> include/libtorrent/kademlia/node.hpp
> include/libtorrent/kademlia/node_entry.hpp
> include/libtorrent/kademlia/node_id.hpp
>+include/libtorrent/kademlia/observer.hpp
> include/libtorrent/kademlia/packet_iterator.hpp
> include/libtorrent/kademlia/refresh.hpp
> include/libtorrent/kademlia/routing_table.hpp
> include/libtorrent/kademlia/rpc_manager.hpp
> include/libtorrent/kademlia/traversal_algorithm.hpp
>+include/libtorrent/lsd.hpp
>+include/libtorrent/natpmp.hpp
>+include/libtorrent/pch.hpp
>+include/libtorrent/pe_crypto.hpp
> include/libtorrent/peer.hpp
> include/libtorrent/peer_connection.hpp
> include/libtorrent/peer_id.hpp
>@@ -190,23 +212,31 @@
> include/libtorrent/piece_block_progress.hpp
> include/libtorrent/piece_picker.hpp
> include/libtorrent/policy.hpp
>+include/libtorrent/proxy_base.hpp
> include/libtorrent/random_sample.hpp
>-include/libtorrent/resource_request.hpp
> include/libtorrent/session.hpp
> include/libtorrent/session_settings.hpp
> include/libtorrent/session_status.hpp
> include/libtorrent/size_type.hpp
> include/libtorrent/socket.hpp
>+include/libtorrent/socket_type.hpp
>+include/libtorrent/socks4_stream.hpp
>+include/libtorrent/socks5_stream.hpp
> include/libtorrent/stat.hpp
> include/libtorrent/storage.hpp
>+include/libtorrent/time.hpp
> include/libtorrent/torrent.hpp
> include/libtorrent/torrent_handle.hpp
> include/libtorrent/torrent_info.hpp
> include/libtorrent/tracker_manager.hpp
> include/libtorrent/udp_tracker_connection.hpp
>+include/libtorrent/upnp.hpp
> include/libtorrent/utf8.hpp
>+include/libtorrent/variant_stream.hpp
> include/libtorrent/version.hpp
> include/libtorrent/web_peer_connection.hpp
>+include/libtorrent/xml_parse.hpp
>+lib/libtorrent-0.13.so
> lib/libtorrent.a
> lib/libtorrent.la
> lib/libtorrent.so
>Index: rblibtorrent/files/patch-Makefile.in
>===================================================================
>RCS file: /home/pcvs/ports/net-p2p/rblibtorrent/files/patch-Makefile.in,v
>retrieving revision 1.3
>diff -u -r1.3 patch-Makefile.in
>--- rblibtorrent/files/patch-Makefile.in	1 Dec 2006 14:50:36 -0000	1.3
>+++ rblibtorrent/files/patch-Makefile.in	21 Jun 2008 22:19:54 -0000
>@@ -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
>+ 
>Index: rblibtorrent/files/patch-socket_ops.hpp
>===================================================================
>RCS file: /home/pcvs/ports/net-p2p/rblibtorrent/files/patch-socket_ops.hpp,v
>retrieving revision 1.1
>diff -u -r1.1 patch-socket_ops.hpp
>--- rblibtorrent/files/patch-socket_ops.hpp	5 Jun 2007 06:05:16 -0000	1.1
>+++ rblibtorrent/files/patch-socket_ops.hpp	21 Jun 2008 22:19:54 -0000
>@@ -1,10 +1,11 @@
>---- include/libtorrent/asio/detail/socket_ops.hpp      Wed May 16 00:35:55 2007
>-+++ include/libtorrent/asio/detail/socket_ops.hpp.orig Wed May 16 00:35:45 2007
>-66c66
>-< #if defined(__MACH__) && defined(__APPLE__)
>----
>-> #if defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
>-298c298
>-< #elif defined(__MACH__) && defined(__APPLE__)
>----
>-> #elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__) 
>+--- include/libtorrent/asio/detail/socket_ops.hpp.orig	Wed Aug  8 03:43:42 2007
>++++ include/libtorrent/asio/detail/socket_ops.hpp	Mon Sep 10 12:46:17 2007
>+@@ -715,7 +715,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;
>Index: rblibtorrent/files/patch-src__storage.cpp
>===================================================================
>RCS file: rblibtorrent/files/patch-src__storage.cpp
>diff -N rblibtorrent/files/patch-src__storage.cpp
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ rblibtorrent/files/patch-src__storage.cpp	21 Jun 2008 22:19:54 -0000
>@@ -0,0 +1,15 @@
>+--- src/storage.cpp.orig	Sat Aug 25 15:26:43 2007
>++++ src/storage.cpp	Mon Sep 10 12:51:23 2007
>+@@ -75,9 +75,11 @@
>+ #include <cstdio>
>+ #endif
>+ 
>+-#if defined(__APPLE__)
>++#if defined(__APPLE__) || defined(__FreeBSD__)
>+ // for getattrlist()
>++#ifdef __APPLE__
>+ #include <sys/attr.h>
>++#endif
>+ #include <unistd.h>
>+ // for statfs()
>+ #include <sys/param.h>

Actions: View | Diff

Attachments on bug 124858: 88111