Index: head/net-p2p/libtorrent-rasterbar/Makefile =================================================================== --- head/net-p2p/libtorrent-rasterbar/Makefile (revision 389249) +++ head/net-p2p/libtorrent-rasterbar/Makefile (revision 389250) @@ -1,92 +1,89 @@ # Created by: Doug Barton # $FreeBSD$ 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//}/ MAINTAINER= ports@FreeBSD.org COMMENT?= C++ library implementing a BitTorrent client LICENSE= BSD3CLAUSE LIB_DEPENDS?= libboost_date_time.so:${PORTSDIR}/devel/boost-libs \ libGeoIP.so:${PORTSDIR}/net/GeoIP -USES+= compiler:c++11-lang libtool pathfix pkgconfig iconv +USES+= compiler:c++11-lang iconv libtool pathfix pkgconfig USE_OPENSSL= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-static \ --enable-dht \ --enable-encryption \ --enable-pool-allocators \ --enable-deprecated-functions \ --with-boost=${LOCALBASE} \ --with-boost-system=boost_system \ --enable-geoip \ --with-libgeoip \ --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 -OPTIONS_DEFINE= DEBUG DOCS EXAMPLES STRIP -OPTIONS_DEFAULT= STRIP +OPTIONS_DEFINE= DEBUG DOCS EXAMPLES DEBUG_CONFIGURE_ENABLE= debug .include # Restrict to stable (even) versions, indicated by the second component. # With Versions 1.x not build yet net-p2p/qbittorrent PORTSCOUT= limit:^0.16\..* .if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "yes" && defined(USE_PYTHON) CONFIGURE_ARGS+= --enable-python-binding \ --with-boost-python=boost_python .else CONFIGURE_ARGS+= --disable-python-binding .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local/include|${PREFIX}/include|' \ ${WRKSRC}/Jamfile post-install: -.if ${PORT_OPTIONS:MSTRIP} ${STRIP_CMD} \ ${STAGEDIR}${PREFIX}/lib/libtorrent-rasterbar.so.${SHLIB_VER} -.else - ${STRIP_CMD} \ - ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages/libtorrent.so -.endif .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} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} \ ${STAGEDIR}${EXAMPLESDIR} .endif .include Index: head/net-p2p/libtorrent-rasterbar/distinfo =================================================================== --- head/net-p2p/libtorrent-rasterbar/distinfo (revision 389249) +++ head/net-p2p/libtorrent-rasterbar/distinfo (revision 389250) @@ -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 Index: head/net-p2p/libtorrent-rasterbar/files/patch-libressl =================================================================== --- head/net-p2p/libtorrent-rasterbar/files/patch-libressl (revision 389249) +++ head/net-p2p/libtorrent-rasterbar/files/patch-libressl (nonexistent) @@ -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 - { - Property changes on: head/net-p2p/libtorrent-rasterbar/files/patch-libressl ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp =================================================================== --- head/net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp (revision 389249) +++ head/net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp (revision 389250) @@ -1,15 +1,15 @@ ---- 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 -#ifndef __GLIBC__ -# define TORRENT_ICONV_ARG (const char**) -#endif #endif #define TORRENT_HAS_FALLOCATE 0 #define TORRENT_USE_IFADDRS 1 Index: head/net-p2p/libtorrent-rasterbar/files/patch-src_lazy__bdecode.cpp =================================================================== --- head/net-p2p/libtorrent-rasterbar/files/patch-src_lazy__bdecode.cpp (revision 389249) +++ head/net-p2p/libtorrent-rasterbar/files/patch-src_lazy__bdecode.cpp (revision 389250) @@ -1,12 +1,12 @@ ---- 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. */ +#define __STDC_LIMIT_MACROS +#include + #include "libtorrent/config.hpp" #include "libtorrent/lazy_entry.hpp" - #include "libtorrent/escape_string.hpp" + #include Index: head/net-p2p/libtorrent-rasterbar/files/patch-src_utp__stream.cpp =================================================================== --- head/net-p2p/libtorrent-rasterbar/files/patch-src_utp__stream.cpp (revision 389249) +++ head/net-p2p/libtorrent-rasterbar/files/patch-src_utp__stream.cpp (revision 389250) @@ -1,11 +1,11 @@ ---- 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" #include "libtorrent/utp_stream.hpp" #include "libtorrent/sliding_average.hpp" Index: head/net-p2p/libtorrent-rasterbar/pkg-plist =================================================================== --- head/net-p2p/libtorrent-rasterbar/pkg-plist (revision 389249) +++ head/net-p2p/libtorrent-rasterbar/pkg-plist (revision 389250) @@ -1,139 +1,247 @@ include/libtorrent/ConvertUTF.h 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 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/bandwidth_socket.hpp include/libtorrent/bencode.hpp include/libtorrent/bitfield.hpp include/libtorrent/bloom_filter.hpp include/libtorrent/broadcast_socket.hpp include/libtorrent/bt_peer_connection.hpp include/libtorrent/buffer.hpp include/libtorrent/build_config.hpp include/libtorrent/chained_buffer.hpp include/libtorrent/config.hpp include/libtorrent/connection_queue.hpp include/libtorrent/copy_ptr.hpp include/libtorrent/create_torrent.hpp include/libtorrent/deadline_timer.hpp include/libtorrent/debug.hpp 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 include/libtorrent/extensions/metadata_transfer.hpp include/libtorrent/extensions/smart_ban.hpp include/libtorrent/extensions/ut_metadata.hpp include/libtorrent/extensions/ut_pex.hpp include/libtorrent/file.hpp include/libtorrent/file_pool.hpp include/libtorrent/file_storage.hpp include/libtorrent/fingerprint.hpp include/libtorrent/gzip.hpp include/libtorrent/hasher.hpp include/libtorrent/http_connection.hpp include/libtorrent/http_parser.hpp include/libtorrent/http_seed_connection.hpp include/libtorrent/http_stream.hpp include/libtorrent/http_tracker_connection.hpp include/libtorrent/i2p_stream.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/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 include/libtorrent/kademlia/node_entry.hpp include/libtorrent/kademlia/node_id.hpp include/libtorrent/kademlia/observer.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/lazy_entry.hpp include/libtorrent/lsd.hpp include/libtorrent/magnet_uri.hpp include/libtorrent/max.hpp 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 include/libtorrent/peer_id.hpp include/libtorrent/peer_info.hpp include/libtorrent/peer_request.hpp include/libtorrent/piece_block_progress.hpp include/libtorrent/piece_picker.hpp include/libtorrent/policy.hpp include/libtorrent/proxy_base.hpp 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 include/libtorrent/socket_io.hpp include/libtorrent/socket_type.hpp include/libtorrent/socket_type_fwd.hpp include/libtorrent/socks5_stream.hpp include/libtorrent/ssl_stream.hpp include/libtorrent/stat.hpp 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 include/libtorrent/tommath.h include/libtorrent/tommath_class.h include/libtorrent/tommath_superclass.h include/libtorrent/torrent.hpp include/libtorrent/torrent_handle.hpp include/libtorrent/torrent_info.hpp include/libtorrent/tracker_manager.hpp include/libtorrent/udp_socket.hpp include/libtorrent/udp_tracker_connection.hpp include/libtorrent/union_endpoint.hpp include/libtorrent/upnp.hpp include/libtorrent/utf8.hpp include/libtorrent/utp_socket_manager.hpp include/libtorrent/utp_stream.hpp include/libtorrent/version.hpp include/libtorrent/web_connection_base.hpp include/libtorrent/web_peer_connection.hpp include/libtorrent/xml_parse.hpp lib/libtorrent-rasterbar.so 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 Index: head/net-p2p/qbittorrent/Makefile =================================================================== --- head/net-p2p/qbittorrent/Makefile (revision 389249) +++ head/net-p2p/qbittorrent/Makefile (revision 389250) @@ -1,72 +1,78 @@ # Created by: Doug Barton # $FreeBSD$ PORTNAME= qbittorrent -PORTVERSION= 3.1.12 -PORTREVISION?= 0 +PORTVERSION= 3.2.0 CATEGORIES= net-p2p ipv6 -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ +MASTER_SITES= GH MAINTAINER= ports@FreeBSD.org COMMENT?= Bittorrent client using Qt4 and libtorrent-rasterbar LICENSE= GPLv2 # ABI versions specified on purpose for libtorrent-rasterbar -LIB_DEPENDS= libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar +LIB_DEPENDS= libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar \ + libboost_system.so:${PORTSDIR}/devel/boost-libs -USES= execinfo pkgconfig tar:xz +USE_GITHUB= yes +GH_ACCOUNT= qBittorrent +GH_PROJECT= qBittorrent +GH_TAGNAME= release-${PORTVERSION} + +USES= compiler:c++11-lang execinfo pkgconfig tar:xz USE_QT4= corelib network qmake_build linguisttools_build moc_build \ rcc_build uic_build QT_NONSTANDARD= yes DESTDIRNAME= INSTALL_ROOT .if !defined(SLAVE_PORT) LIB_DEPENDS+= libGeoIP.so:${PORTSDIR}/net/GeoIP USES+= desktop-file-utils USE_QT4+= gui xml INSTALLS_ICONS= yes OPTIONS_DEFINE= DBUS .endif -SUB_FILES= pkg-message - PORTDOCS= AUTHORS Changelog README.md OPTIONS_DEFINE= DEBUG DOCS DBUS DEBUG_CONFIGURE_ENABLE= debug DBUS_CONFIGURE_ENABLE= qt-dbus +DBUS_USE= QT4=dbus +CONFIGURE_ENV+= zlib_CFLAGS=-I/usr/include +CONFIGURE_ENV+= zlib_LIBS=-lz +CONFIGURE_ARGS+= CXXFLAGS=-DBOOST_ASIO_DYN_LINK +USE_OPENSSL= yes + .include -.if ${PORT_OPTIONS:MDBUS} -USE_QT4+= dbus -.endif - do-configure: .if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "no" @cd ${WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} \ - ./configure --prefix=${PREFIX} + ./configure --prefix=${PREFIX} ${CONFIGURE_ARGS} .else @cd ${WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} \ - ./configure --prefix=${PREFIX} --disable-gui + ./configure --prefix=${PREFIX} ${CONFIGURE_ARGS} --disable-gui .endif post-install: .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .endif .if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "no" @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent ${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1/ .else @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent-nox ${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent-nox.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1/ .endif + @${RM} -rf ${STAGEDIR}${PREFIX}/share/man .include Index: head/net-p2p/qbittorrent/distinfo =================================================================== --- head/net-p2p/qbittorrent/distinfo (revision 389249) +++ head/net-p2p/qbittorrent/distinfo (revision 389250) @@ -1,2 +1,2 @@ -SHA256 (qbittorrent-3.1.12.tar.xz) = d5d5b27958297f0b14cf03af8dd24a0d2a990e108c9a7a6159e4a2fbb1111c83 -SIZE (qbittorrent-3.1.12.tar.xz) = 2465744 +SHA256 (qBittorrent-qBittorrent-3.2.0-release-3.2.0_GH0.tar.xz) = 1ca59b532c36c1c4e5b87ddfb13789104ecfbf79cd09afc3b05a5871011d0a75 +SIZE (qBittorrent-qBittorrent-3.2.0-release-3.2.0_GH0.tar.xz) = 4467597 Index: head/net-p2p/qbittorrent/files/patch-configure =================================================================== --- head/net-p2p/qbittorrent/files/patch-configure (nonexistent) +++ head/net-p2p/qbittorrent/files/patch-configure (revision 389250) @@ -0,0 +1,22 @@ +--- configure.orig 2015-05-10 01:20:19 UTC ++++ configure +@@ -4263,7 +4263,7 @@ fi + # Detect OS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OS is FreeBSD" >&5 + $as_echo_n "checking whether OS is FreeBSD... " >&6; } +-if test "x$host_os" = "x*FreeBSD*"; then : ++if expr "$host_os" : ".*freebsd.*" > /dev/null; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + LIBS="-lexecinfo $LIBS" +@@ -5808,8 +5808,8 @@ extract() { + return 1 + fi + +- # Convert " -" to "\n" if not between quotes +- string=$(echo " $*" | $SED -e 's: -:\n:g' -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g") ++ # Convert " -" to "\n" if not between quotes and remove possible leading white spaces ++ string=$(echo " $*" | tr ' -' '\n' | $SED -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g" -e 's/^[:space:]*//') + SAVEIFS=$IFS + IFS=$(printf "\n\b") + for i in $string; do Property changes on: head/net-p2p/qbittorrent/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-p2p/qbittorrent/pkg-descr =================================================================== --- head/net-p2p/qbittorrent/pkg-descr (revision 389249) +++ head/net-p2p/qbittorrent/pkg-descr (revision 389250) @@ -1,21 +1,23 @@ -qBittorrent is the closest open source (GNU GPL v2 licensed) equivalent to -popular uTorrent. It is based on the Qt4 toolkit and libtorrent-rasterbar. +qBittorrent is the open source bittorrent client in C++/Qt that uses +libtorrent-rasterbar. It aims to be a good alternative to all other +bittorrent clients. qBittorrent is fast, stable and provides unicode +support as well as many features. Features: - Well-integrated and extensible Search Engine - Simultaneous search in most famous BitTorrent search sites - Per-category-specific search requests (e.g. Books, Music, Movies) - All BitTorrent extensions: DHT, Peer Exchange, Full encryption, Magnet URI, uTP - Remote control through a Web user interface (nearly identical to the regular UI, all in Ajax) - Advanced control over trackers, peers, and torrents: queueing and prioritizing, content selection and prioritizing - UPnP/NAT-PMP port forwarding support - Available in ~25 languages (Unicode support) - uTorrent spoofing to bypass private trackers whitelisting - Advanced RSS support with download filters (inc. regex) - IP Filtering (eMule and PeerGuardian compatible) WWW: http://www.qbittorrent.org/ Index: head/net-p2p/qbittorrent/pkg-plist =================================================================== --- head/net-p2p/qbittorrent/pkg-plist (revision 389249) +++ head/net-p2p/qbittorrent/pkg-plist (revision 389250) @@ -1,15 +1,16 @@ bin/qbittorrent man/man1/qbittorrent.1.gz share/applications/qBittorrent.desktop share/icons/hicolor/128x128/apps/qbittorrent.png share/icons/hicolor/16x16/apps/qbittorrent.png share/icons/hicolor/192x192/apps/qbittorrent.png share/icons/hicolor/22x22/apps/qbittorrent.png share/icons/hicolor/24x24/apps/qbittorrent.png share/icons/hicolor/32x32/apps/qbittorrent.png share/icons/hicolor/36x36/apps/qbittorrent.png share/icons/hicolor/48x48/apps/qbittorrent.png share/icons/hicolor/64x64/apps/qbittorrent.png share/icons/hicolor/72x72/apps/qbittorrent.png share/icons/hicolor/96x96/apps/qbittorrent.png share/pixmaps/qbittorrent.png +share/appdata/qBittorrent.appdata.xml