diff -ruN net-p2p/libtorrent-rasterbar/Makefile net-p2p/libtorrent-rasterbar/Makefile --- net-p2p/libtorrent-rasterbar/Makefile 2015-05-21 04:12:09.874907000 -0700 +++ net-p2p/libtorrent-rasterbar/Makefile 2015-06-09 12:51:29.312655000 -0700 @@ -2,8 +2,7 @@ # $FreeBSD: head/net-p2p/libtorrent-rasterbar/Makefile 384087 2015-04-16 07:33:11Z tijl $ PORTNAME= libtorrent-rasterbar -PORTVERSION= 0.16.19 -PORTREVISION= 1 +PORTVERSION= 1.0.4 CATEGORIES?= net-p2p ipv6 MASTER_SITES= SF/${PORTNAME:S/-rasterbar//}/${PORTNAME:S/-rasterbar//}/ @@ -32,17 +31,19 @@ --with-libiconv \ --with-openssl=${OPENSSLBASE} -SHLIB_VER= 7 +SHLIB_VER= 8 PLIST_SUB+= SHLIB_VER="${SHLIB_VER}" -PORTDOCS= * - DOCSRCDIR1= ${WRKSRC} DOC_FILES1= AUTHORS ChangeLog README DOCSRCDIR2= ${WRKSRC}/docs DOCSDIR2= ${DOCSDIR}/docs -DOC_FILES2= * +DOC_FILES2= *.* + +DOCSRCDIR3= ${WRKSRC}/docs/img +DOCSDIR3= ${DOCSDIR}/docs/img +DOC_FILES3= * PORTEXAMPLES= *.cpp @@ -79,8 +80,10 @@ .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR2} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR3} ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} + ${INSTALL_DATA} ${DOC_FILES3:S|^|${DOCSRCDIR3}/|} ${STAGEDIR}${DOCSDIR3} .endif .if ${PORT_OPTIONS:MEXAMPLES} diff -ruN net-p2p/libtorrent-rasterbar/distinfo net-p2p/libtorrent-rasterbar/distinfo --- net-p2p/libtorrent-rasterbar/distinfo 2015-05-21 04:12:09.883181000 -0700 +++ net-p2p/libtorrent-rasterbar/distinfo 2015-06-09 12:51:29.314952000 -0700 @@ -1,2 +1,2 @@ -SHA256 (libtorrent-rasterbar-0.16.19.tar.gz) = 9ebd3fa8accfa27d0c81cdbbe15d7b411ea1deec34ac6325dec7197f05d82982 -SIZE (libtorrent-rasterbar-0.16.19.tar.gz) = 3030253 +SHA256 (libtorrent-rasterbar-1.0.4.tar.gz) = 1f567823133b1493b9717afc8334eed691bf0ab452d4a2e0f644989f13ce9db0 +SIZE (libtorrent-rasterbar-1.0.4.tar.gz) = 3297242 diff -ruN net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp --- net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp 2015-05-21 04:12:09.892951000 -0700 +++ net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp 2015-06-09 12:51:29.308469000 -0700 @@ -1,9 +1,9 @@ ---- include/libtorrent/config.hpp.orig 2014-08-15 06:51:56 UTC +--- include/libtorrent/config.hpp.orig 2014-12-05 01:00:07 UTC +++ include/libtorrent/config.hpp -@@ -184,12 +184,6 @@ POSSIBILITY OF SUCH DAMAGE. - // execinfo.h is available in the MacOS X 10.5 SDK. - #define TORRENT_USE_EXECINFO MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 - #endif +@@ -166,12 +166,6 @@ POSSIBILITY OF SUCH DAMAGE. + + #endif // __APPLE__ + -#else -// FreeBSD has a reasonable iconv signature -// unless we're on glibc diff -ruN net-p2p/libtorrent-rasterbar/files/patch-libressl net-p2p/libtorrent-rasterbar/files/patch-libressl --- net-p2p/libtorrent-rasterbar/files/patch-libressl 2015-05-21 04:12:09.912705000 -0700 +++ net-p2p/libtorrent-rasterbar/files/patch-libressl 1969-12-31 16:00:00.000000000 -0800 @@ -1,38 +0,0 @@ ---- src/torrent.cpp (revision 10629) -+++ src/torrent.cpp (revision 10630) -@@ -82,6 +82,7 @@ - #ifdef TORRENT_USE_OPENSSL - #include "libtorrent/ssl_stream.hpp" - #include -+#include - #if BOOST_VERSION >= 104700 - #include - #endif // BOOST_VERSION -Index: src/peer_connection.cpp -=================================================================== ---- src/peer_connection.cpp (revision 10629) -+++ src/peer_connection.cpp (revision 10630) -@@ -65,6 +65,10 @@ - #include - #endif - -+#ifdef TORRENT_USE_OPENSSL -+#include -+#endif -+ - //#define TORRENT_CORRUPT_DATA - - using boost::shared_ptr; -Index: src/session_impl.cpp -=================================================================== ---- src/session_impl.cpp (revision 10629) -+++ src/session_impl.cpp (revision 10630) -@@ -149,6 +149,7 @@ - #ifdef TORRENT_USE_OPENSSL - - #include -+#include - - namespace - { - diff -ruN net-p2p/libtorrent-rasterbar/files/patch-src_lazy__bdecode.cpp net-p2p/libtorrent-rasterbar/files/patch-src_lazy__bdecode.cpp --- net-p2p/libtorrent-rasterbar/files/patch-src_lazy__bdecode.cpp 2015-05-21 04:12:09.916750000 -0700 +++ net-p2p/libtorrent-rasterbar/files/patch-src_lazy__bdecode.cpp 2015-06-09 12:51:29.307328000 -0700 @@ -1,4 +1,4 @@ ---- src/lazy_bdecode.cpp.orig 2014-04-04 02:51:48.000000000 +0000 +--- src/lazy_bdecode.cpp.orig 2014-12-05 01:00:07 UTC +++ src/lazy_bdecode.cpp @@ -30,6 +30,9 @@ POSSIBILITY OF SUCH DAMAGE. @@ -9,4 +9,4 @@ + #include "libtorrent/config.hpp" #include "libtorrent/lazy_entry.hpp" - #include "libtorrent/escape_string.hpp" + #include diff -ruN net-p2p/libtorrent-rasterbar/files/patch-src_torrent.cpp net-p2p/libtorrent-rasterbar/files/patch-src_torrent.cpp --- net-p2p/libtorrent-rasterbar/files/patch-src_torrent.cpp 1969-12-31 16:00:00.000000000 -0800 +++ net-p2p/libtorrent-rasterbar/files/patch-src_torrent.cpp 2015-06-09 12:51:29.309628000 -0700 @@ -0,0 +1,10 @@ +--- src/torrent.cpp.orig 2015-02-21 22:46:26 UTC ++++ src/torrent.cpp +@@ -82,7 +82,6 @@ POSSIBILITY OF SUCH DAMAGE. + #ifdef TORRENT_USE_OPENSSL + #include "libtorrent/ssl_stream.hpp" + #include +-#include + #if BOOST_VERSION >= 104700 + #include + #endif // BOOST_VERSION diff -ruN net-p2p/libtorrent-rasterbar/files/patch-src_utp__stream.cpp net-p2p/libtorrent-rasterbar/files/patch-src_utp__stream.cpp --- net-p2p/libtorrent-rasterbar/files/patch-src_utp__stream.cpp 2015-05-21 04:12:09.915339000 -0700 +++ net-p2p/libtorrent-rasterbar/files/patch-src_utp__stream.cpp 2015-06-09 12:51:29.306186000 -0700 @@ -1,9 +1,9 @@ ---- src/utp_stream.cpp.orig 2013-09-20 12:07:06.000000000 +0000 +--- src/utp_stream.cpp.orig 2014-12-05 01:00:07 UTC +++ src/utp_stream.cpp @@ -30,6 +30,8 @@ POSSIBILITY OF SUCH DAMAGE. */ - + +#define __STDC_LIMIT_MACROS +#include #include "libtorrent/config.hpp" diff -ruN net-p2p/libtorrent-rasterbar/pkg-plist net-p2p/libtorrent-rasterbar/pkg-plist --- net-p2p/libtorrent-rasterbar/pkg-plist 2015-05-21 04:12:09.859998000 -0700 +++ net-p2p/libtorrent-rasterbar/pkg-plist 2015-06-09 12:51:29.311310000 -0700 @@ -2,6 +2,8 @@ include/libtorrent/add_torrent_params.hpp include/libtorrent/address.hpp include/libtorrent/alert.hpp +include/libtorrent/alert_dispatcher.hpp +include/libtorrent/alert_manager.hpp include/libtorrent/alert_types.hpp include/libtorrent/alloca.hpp include/libtorrent/allocator.hpp @@ -28,11 +30,13 @@ include/libtorrent/disk_buffer_holder.hpp include/libtorrent/disk_buffer_pool.hpp include/libtorrent/disk_io_thread.hpp +include/libtorrent/ed25519.hpp include/libtorrent/entry.hpp include/libtorrent/enum_net.hpp include/libtorrent/error.hpp include/libtorrent/error_code.hpp include/libtorrent/escape_string.hpp +include/libtorrent/export.hpp include/libtorrent/extensions.hpp include/libtorrent/extensions/logger.hpp include/libtorrent/extensions/lt_trackers.hpp @@ -60,8 +64,13 @@ include/libtorrent/io_service.hpp include/libtorrent/io_service_fwd.hpp include/libtorrent/ip_filter.hpp +include/libtorrent/ip_voter.hpp +include/libtorrent/kademlia/dht_observer.hpp include/libtorrent/kademlia/dht_tracker.hpp include/libtorrent/kademlia/find_data.hpp +include/libtorrent/kademlia/get_item.hpp +include/libtorrent/kademlia/get_peers.hpp +include/libtorrent/kademlia/item.hpp include/libtorrent/kademlia/logging.hpp include/libtorrent/kademlia/msg.hpp include/libtorrent/kademlia/node.hpp @@ -79,7 +88,6 @@ include/libtorrent/natpmp.hpp include/libtorrent/packet_buffer.hpp include/libtorrent/parse_url.hpp -include/libtorrent/pch.hpp include/libtorrent/pe_crypto.hpp include/libtorrent/peer.hpp include/libtorrent/peer_connection.hpp @@ -93,12 +101,12 @@ include/libtorrent/ptime.hpp include/libtorrent/puff.hpp include/libtorrent/random.hpp -include/libtorrent/rsa.hpp include/libtorrent/rss.hpp include/libtorrent/session.hpp include/libtorrent/session_settings.hpp include/libtorrent/session_status.hpp include/libtorrent/settings.hpp +include/libtorrent/sha1_hash.hpp include/libtorrent/size_type.hpp include/libtorrent/sliding_average.hpp include/libtorrent/socket.hpp @@ -111,7 +119,6 @@ include/libtorrent/storage.hpp include/libtorrent/storage_defs.hpp include/libtorrent/string_util.hpp -include/libtorrent/struct_debug.hpp include/libtorrent/thread.hpp include/libtorrent/time.hpp include/libtorrent/timestamp_history.hpp @@ -137,3 +144,104 @@ lib/libtorrent-rasterbar.so.%%SHLIB_VER%% lib/libtorrent-rasterbar.so.%%SHLIB_VER%%.0.0 libdata/pkgconfig/libtorrent-rasterbar.pc +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/docs/building.html +%%PORTDOCS%%%%DOCSDIR%%/docs/building.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/client_test.html +%%PORTDOCS%%%%DOCSDIR%%/docs/client_test.png +%%PORTDOCS%%%%DOCSDIR%%/docs/client_test.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/complete_bit_prefixes.png +%%PORTDOCS%%%%DOCSDIR%%/docs/contributing.html +%%PORTDOCS%%%%DOCSDIR%%/docs/contributing.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/cwnd.png +%%PORTDOCS%%%%DOCSDIR%%/docs/cwnd_thumb.png +%%PORTDOCS%%%%DOCSDIR%%/docs/delays.png +%%PORTDOCS%%%%DOCSDIR%%/docs/delays_thumb.png +%%PORTDOCS%%%%DOCSDIR%%/docs/dht_extensions.html +%%PORTDOCS%%%%DOCSDIR%%/docs/dht_extensions.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/dht_rss.html +%%PORTDOCS%%%%DOCSDIR%%/docs/dht_rss.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/dht_sec.html +%%PORTDOCS%%%%DOCSDIR%%/docs/dht_sec.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/dht_store.html +%%PORTDOCS%%%%DOCSDIR%%/docs/dht_store.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/disk_access.png +%%PORTDOCS%%%%DOCSDIR%%/docs/disk_access_elevator.png +%%PORTDOCS%%%%DOCSDIR%%/docs/disk_access_no_elevator.png +%%PORTDOCS%%%%DOCSDIR%%/docs/disk_buffer.png +%%PORTDOCS%%%%DOCSDIR%%/docs/disk_buffer_before_optimization.png +%%PORTDOCS%%%%DOCSDIR%%/docs/disk_buffer_sample.png +%%PORTDOCS%%%%DOCSDIR%%/docs/disk_io.png +%%PORTDOCS%%%%DOCSDIR%%/docs/examples.html +%%PORTDOCS%%%%DOCSDIR%%/docs/examples.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/extension_protocol.html +%%PORTDOCS%%%%DOCSDIR%%/docs/extension_protocol.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/features.html +%%PORTDOCS%%%%DOCSDIR%%/docs/features.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/hacking.diagram +%%PORTDOCS%%%%DOCSDIR%%/docs/hacking.html +%%PORTDOCS%%%%DOCSDIR%%/docs/hacking.png +%%PORTDOCS%%%%DOCSDIR%%/docs/hash_distribution.png +%%PORTDOCS%%%%DOCSDIR%%/docs/im_thumb.jpg +%%PORTDOCS%%%%DOCSDIR%%/docs/img/bg.png +%%PORTDOCS%%%%DOCSDIR%%/docs/img/blue_bottom.png +%%PORTDOCS%%%%DOCSDIR%%/docs/img/blue_top.png +%%PORTDOCS%%%%DOCSDIR%%/docs/img/dotline.gif +%%PORTDOCS%%%%DOCSDIR%%/docs/img/minus.gif +%%PORTDOCS%%%%DOCSDIR%%/docs/img/orange.png +%%PORTDOCS%%%%DOCSDIR%%/docs/index.html +%%PORTDOCS%%%%DOCSDIR%%/docs/index.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/ip_id_v4.png +%%PORTDOCS%%%%DOCSDIR%%/docs/ip_id_v6.png +%%PORTDOCS%%%%DOCSDIR%%/docs/manual-ref.html +%%PORTDOCS%%%%DOCSDIR%%/docs/manual-ref.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/merkle_tree.png +%%PORTDOCS%%%%DOCSDIR%%/docs/our_delay_base.png +%%PORTDOCS%%%%DOCSDIR%%/docs/our_delay_base_thumb.png +%%PORTDOCS%%%%DOCSDIR%%/docs/projects.html +%%PORTDOCS%%%%DOCSDIR%%/docs/projects.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/python_binding.html +%%PORTDOCS%%%%DOCSDIR%%/docs/python_binding.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/read_disk_buffers.diagram +%%PORTDOCS%%%%DOCSDIR%%/docs/read_disk_buffers.png +%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Alerts.html +%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Bencoding.html +%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Core.html +%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Create_Torrents.html +%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Custom_Storage.html +%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Error_Codes.html +%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Filter.html +%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Plugins.html +%%PORTDOCS%%%%DOCSDIR%%/docs/reference-RSS.html +%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Session.html +%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Settings.html +%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Storage.html +%%PORTDOCS%%%%DOCSDIR%%/docs/reference-String.html +%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Time.html +%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Utility.html +%%PORTDOCS%%%%DOCSDIR%%/docs/reference.html +%%PORTDOCS%%%%DOCSDIR%%/docs/rst.css +%%PORTDOCS%%%%DOCSDIR%%/docs/session_stats_peers.png +%%PORTDOCS%%%%DOCSDIR%%/docs/storage.png +%%PORTDOCS%%%%DOCSDIR%%/docs/streaming.html +%%PORTDOCS%%%%DOCSDIR%%/docs/streaming.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/style.css +%%PORTDOCS%%%%DOCSDIR%%/docs/todo.html +%%PORTDOCS%%%%DOCSDIR%%/docs/troubleshooting.dot +%%PORTDOCS%%%%DOCSDIR%%/docs/troubleshooting.html +%%PORTDOCS%%%%DOCSDIR%%/docs/troubleshooting.png +%%PORTDOCS%%%%DOCSDIR%%/docs/troubleshooting.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/troubleshooting_thumb.png +%%PORTDOCS%%%%DOCSDIR%%/docs/tuning.html +%%PORTDOCS%%%%DOCSDIR%%/docs/tuning.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/udp_tracker_protocol.html +%%PORTDOCS%%%%DOCSDIR%%/docs/udp_tracker_protocol.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/utp.html +%%PORTDOCS%%%%DOCSDIR%%/docs/utp.rst +%%PORTDOCS%%%%DOCSDIR%%/docs/utp_stack.diagram +%%PORTDOCS%%%%DOCSDIR%%/docs/utp_stack.png +%%PORTDOCS%%%%DOCSDIR%%/docs/write_disk_buffers.diagram +%%PORTDOCS%%%%DOCSDIR%%/docs/write_disk_buffers.png +%%PORTDOCS%%%%DOCSDIR%%/docs/ziptorrent_thumb.gif