diff options
35 files changed, 316 insertions, 855 deletions
@@ -4324,3 +4324,4 @@ x11-toolkits/swt31|x11-toolkits/swt|2010-02-07|Superseded by x11-toolkits/swt sysutils/smartmontools-devel|sysutils/smartmontools|2010-02-10|Removed, use sysutils/smartmontools instead ports-mgmt/portbrowser||2010-02-16|No longer maintained editors/openoffice.org-2-RC||2010-02-19|Removed +net-p2p/rblibtorrent-devel|net-p2p/libtorrent-rasterbar-14|2010-02-21|No longer devel, recognize project name @@ -5,6 +5,20 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20100221: + AFFECTS: users of rblibtorrent-devel + AUTHOR: dougb@FreeBSD.org + + The port name has changed to libtorrent-rasterbar-14 + + If you use portmaster: + + portmaster -o net-p2p/libtorrent-rasterbar-14 net-p2p/rblibtorrent-devel + + If you use portupgrade: + + portupgrade -o net-p2p/libtorrent-rasterbar-14 net-p2p/rblibtorrent-devel + 20100216: AFFECTS: users of sysutils/bacula-server, sysutils/bacula-client AUTHOR: dvl@FreeBSD.org diff --git a/games/springlobby/Makefile b/games/springlobby/Makefile index a2d55d5ff0b9..48ca9250f57c 100644 --- a/games/springlobby/Makefile +++ b/games/springlobby/Makefile @@ -40,7 +40,7 @@ PLIST_SUB+= NLS="@comment " .endif .if !defined(WITHOUT_TORRENT) -LIB_DEPENDS+= torrent-rasterbar.5:${PORTSDIR}/net-p2p/rblibtorrent-devel +LIB_DEPENDS+= torrent-rasterbar.5:${PORTSDIR}/net-p2p/libtorrent-rasterbar-14 .else CMAKE_ARGS+= -DOPTION_TORRENT_SYSTEM:BOOL=OFF .endif diff --git a/net-p2p/Makefile b/net-p2p/Makefile index f8b933e27526..299507754d39 100644 --- a/net-p2p/Makefile +++ b/net-p2p/Makefile @@ -62,6 +62,8 @@ SUBDIR += libpdtp SUBDIR += libtorrent SUBDIR += libtorrent-devel + SUBDIR += libtorrent-rasterbar-14 + SUBDIR += libtorrent-rasterbar-15 SUBDIR += limewire SUBDIR += linux-agsatellite SUBDIR += linux-edonkey-core @@ -102,10 +104,10 @@ SUBDIR += py-vertex SUBDIR += pyslsk SUBDIR += qbittorrent + SUBDIR += qbittorrent-22 SUBDIR += qtella SUBDIR += qtorrent SUBDIR += rblibtorrent - SUBDIR += rblibtorrent-devel SUBDIR += rtgui SUBDIR += rtorrent SUBDIR += rtorrent-devel diff --git a/net-p2p/hrktorrent/Makefile b/net-p2p/hrktorrent/Makefile index c2d58192028c..c94eea55947d 100644 --- a/net-p2p/hrktorrent/Makefile +++ b/net-p2p/hrktorrent/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://50hz.ws/hrktorrent/ MAINTAINER= hrkfdn@gmail.com COMMENT= A light console torrent client using rasterbar's libtorrent -LIB_DEPENDS= torrent-rasterbar.5:${PORTSDIR}/net-p2p/rblibtorrent-devel +LIB_DEPENDS= torrent-rasterbar.5:${PORTSDIR}/net-p2p/libtorrent-rasterbar-14 USE_GNOME= pkgconfig USE_BZIP2= yes diff --git a/net-p2p/libtorrent-rasterbar-14/Makefile b/net-p2p/libtorrent-rasterbar-14/Makefile index f32635581062..a654821efbfc 100644 --- a/net-p2p/libtorrent-rasterbar-14/Makefile +++ b/net-p2p/libtorrent-rasterbar-14/Makefile @@ -1,29 +1,25 @@ -# New ports collection makefile for: rblibtorrent -# Date created: 5 February 2006 -# Whom: Johan Ström <johan@stromnet.org> +# New ports collection makefile for: libtorrent-rasterbar-14 +# Date created: 14 February 2010 +# Whom: dougb@FreeBSD.org # # $FreeBSD$ # -PORTNAME= libtorrent +PORTNAME= libtorrent-rasterbar PORTVERSION= 0.14.8 -PORTREVISION= 3 CATEGORIES= net-p2p ipv6 MASTER_SITES= http://libtorrent.googlecode.com/files/ -PKGNAMEPREFIX= rb -PKGNAMESUFFIX= -devel -DISTNAME= ${PORTNAME}-rasterbar-${PORTVERSION} MAINTAINER= dougb@FreeBSD.org -COMMENT= A C++ library implementing a BitTorrent client (devel version) +COMMENT= A C++ library implementing a BitTorrent client MAKE_JOBS_SAFE= yes +CONFLICTS= rblibtorrent-[0-9]* libtorrent-rasterbar*-0.15.* + LIB_DEPENDS= boost_date_time.4:${PORTSDIR}/devel/boost-libs \ GeoIP.5:${PORTSDIR}/net/GeoIP -CONFLICTS= rblibtorrent-[0-9]* - USE_GNOME= gnomehack USE_OPENSSL= yes USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:262 libtool:22 diff --git a/net-p2p/libtorrent-rasterbar-15/Makefile b/net-p2p/libtorrent-rasterbar-15/Makefile new file mode 100644 index 000000000000..3fb5e791df77 --- /dev/null +++ b/net-p2p/libtorrent-rasterbar-15/Makefile @@ -0,0 +1,55 @@ +# New ports collection makefile for: libtorrent-rasterbar-15 +# Date created: 14 February 2010 +# Whom: dougb@FreeBSD.org +# +# $FreeBSD$ +# + +PORTNAME= libtorrent-rasterbar +PORTVERSION= 0.15.r4252 +CATEGORIES= net-p2p ipv6 +MASTER_SITES= http://heanet.dl.sourceforge.net/project/qbittorrent/qbittorrent-unstable/ +PKGNAMESUFFIX= -devel +DISTVERSION= 0.15.svn.r4252 + +MAINTAINER= dougb@FreeBSD.org +COMMENT= A C++ library implementing a BitTorrent client (devel version) + +MAKE_JOBS_SAFE= yes + +CONFLICTS= rblibtorrent-[0-9]* libtorrent-rasterbar-0.14.* + +LIB_DEPENDS= boost_date_time.4:${PORTSDIR}/devel/boost-libs \ + GeoIP.5:${PORTSDIR}/net/GeoIP + +USE_GNOME= gnomehack +USE_OPENSSL= yes + +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_ARGS= --disable-debug \ + --enable-dht \ + --enable-encryption \ + --enable-pool-allocators \ + --disable-deprecated-functions \ + --with-boost-system=boost_system \ + --with-boost-filesystem=boost_filesystem \ + --with-boost-thread=boost_thread \ + --enable-geoip \ + --with-libgeoip \ + --with-zlib=system \ + --disable-python-binding + +USE_LDCONFIG= yes + +post-install: +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/*.css ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/*.gif ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/*.jpg ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/*.png ${DOCSDIR} +.endif + +.include <bsd.port.mk> diff --git a/net-p2p/libtorrent-rasterbar-15/distinfo b/net-p2p/libtorrent-rasterbar-15/distinfo new file mode 100644 index 000000000000..8de8211c93a0 --- /dev/null +++ b/net-p2p/libtorrent-rasterbar-15/distinfo @@ -0,0 +1,3 @@ +MD5 (libtorrent-rasterbar-0.15.svn.r4252.tar.gz) = 236268a97d04f397d1de7d3e422bbaf0 +SHA256 (libtorrent-rasterbar-0.15.svn.r4252.tar.gz) = 49dfe3c3027e7dd939b0eac471a3fdf038863a5d046e0fb953be06446638ded5 +SIZE (libtorrent-rasterbar-0.15.svn.r4252.tar.gz) = 2867504 diff --git a/net-p2p/libtorrent-rasterbar-15/files/patch-src_file.cpp b/net-p2p/libtorrent-rasterbar-15/files/patch-src_file.cpp new file mode 100644 index 000000000000..81215189e332 --- /dev/null +++ b/net-p2p/libtorrent-rasterbar-15/files/patch-src_file.cpp @@ -0,0 +1,20 @@ +--- src/file.cpp.orig 2010-02-14 17:25:41.000000000 -0800 ++++ src/file.cpp 2010-02-14 17:26:10.000000000 -0800 +@@ -930,12 +930,12 @@ + return false; + } + #else +- int ret = posix_fallocate(m_fd, 0, s); +- if (ret != 0) +- { +- ec = error_code(ret, get_posix_category()); ++ // int ret = posix_fallocate(m_fd, 0, s); ++ // if (ret != 0) ++ // { ++ // ec = error_code(ret, get_posix_category()); + return false; +- } ++ // } + #endif + } + #endif diff --git a/net-p2p/rblibtorrent-devel/pkg-descr b/net-p2p/libtorrent-rasterbar-15/pkg-descr index ac21ec4847b2..f59169567953 100644 --- a/net-p2p/rblibtorrent-devel/pkg-descr +++ b/net-p2p/libtorrent-rasterbar-15/pkg-descr @@ -1,12 +1,11 @@ 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. +featured 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-15/pkg-plist b/net-p2p/libtorrent-rasterbar-15/pkg-plist new file mode 100644 index 000000000000..e3a044042582 --- /dev/null +++ b/net-p2p/libtorrent-rasterbar-15/pkg-plist @@ -0,0 +1,173 @@ +include/libtorrent/ConvertUTF.h +include/libtorrent/alert.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/bencode.hpp +include/libtorrent/bitfield.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/create_torrent.hpp +include/libtorrent/debug.hpp +include/libtorrent/disk_buffer_holder.hpp +include/libtorrent/disk_io_thread.hpp +include/libtorrent/entry.hpp +include/libtorrent/enum_net.hpp +include/libtorrent/error_code.hpp +include/libtorrent/escape_string.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/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 +include/libtorrent/kademlia/closest_nodes.hpp +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/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/natpmp.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/random_sample.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/socks5_stream.hpp +include/libtorrent/ssl_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_socket.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-rasterbar.a +lib/libtorrent-rasterbar.la +lib/libtorrent-rasterbar.so +lib/libtorrent-rasterbar.so.6 +libdata/pkgconfig/libtorrent-rasterbar.pc +%%PORTDOCS%%%%DOCSDIR%%/Linkage.png +%%PORTDOCS%%%%DOCSDIR%%/acquasition.jpg +%%PORTDOCS%%%%DOCSDIR%%/arctic_thumb.png +%%PORTDOCS%%%%DOCSDIR%%/bitbuddy_thumb.jpg +%%PORTDOCS%%%%DOCSDIR%%/bitfox.png +%%PORTDOCS%%%%DOCSDIR%%/bitrocket_thumb.png +%%PORTDOCS%%%%DOCSDIR%%/bitscast_thumb.png +%%PORTDOCS%%%%DOCSDIR%%/bitslug_thumb.png +%%PORTDOCS%%%%DOCSDIR%%/btg_thumb.jpg +%%PORTDOCS%%%%DOCSDIR%%/bubba.png +%%PORTDOCS%%%%DOCSDIR%%/building.html +%%PORTDOCS%%%%DOCSDIR%%/client_test.html +%%PORTDOCS%%%%DOCSDIR%%/client_test.png +%%PORTDOCS%%%%DOCSDIR%%/deluge.png +%%PORTDOCS%%%%DOCSDIR%%/dht_extensions.html +%%PORTDOCS%%%%DOCSDIR%%/disk_access.png +%%PORTDOCS%%%%DOCSDIR%%/disk_access_elevator.png +%%PORTDOCS%%%%DOCSDIR%%/disk_access_no_elevator.png +%%PORTDOCS%%%%DOCSDIR%%/disk_buffer.png +%%PORTDOCS%%%%DOCSDIR%%/disk_buffer_before_optimization.png +%%PORTDOCS%%%%DOCSDIR%%/disk_buffer_sample.png +%%PORTDOCS%%%%DOCSDIR%%/disk_io.png +%%PORTDOCS%%%%DOCSDIR%%/electric_sheep_thumb.jpg +%%PORTDOCS%%%%DOCSDIR%%/examples.html +%%PORTDOCS%%%%DOCSDIR%%/extension_protocol.html +%%PORTDOCS%%%%DOCSDIR%%/fatrat.png +%%PORTDOCS%%%%DOCSDIR%%/fdm.png +%%PORTDOCS%%%%DOCSDIR%%/features.html +%%PORTDOCS%%%%DOCSDIR%%/firetorrent.png +%%PORTDOCS%%%%DOCSDIR%%/flush.jpg +%%PORTDOCS%%%%DOCSDIR%%/halite_thumb.png +%%PORTDOCS%%%%DOCSDIR%%/im_thumb.jpg +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/leechcraft.png +%%PORTDOCS%%%%DOCSDIR%%/libtorrent_plugins.html +%%PORTDOCS%%%%DOCSDIR%%/libtorrent_screen.png +%%PORTDOCS%%%%DOCSDIR%%/limewire.png +%%PORTDOCS%%%%DOCSDIR%%/lince.png +%%PORTDOCS%%%%DOCSDIR%%/make_torrent.html +%%PORTDOCS%%%%DOCSDIR%%/manual.html +%%PORTDOCS%%%%DOCSDIR%%/merkle_tree.png +%%PORTDOCS%%%%DOCSDIR%%/miro.jpg +%%PORTDOCS%%%%DOCSDIR%%/moopolice_thumb.gif +%%PORTDOCS%%%%DOCSDIR%%/projects.html +%%PORTDOCS%%%%DOCSDIR%%/pump.png +%%PORTDOCS%%%%DOCSDIR%%/python_binding.html +%%PORTDOCS%%%%DOCSDIR%%/qbittorrent_thumb.jpg +%%PORTDOCS%%%%DOCSDIR%%/read_disk_buffers.png +%%PORTDOCS%%%%DOCSDIR%%/running_tests.html +%%PORTDOCS%%%%DOCSDIR%%/session_stats_peers.png +%%PORTDOCS%%%%DOCSDIR%%/storage.png +%%PORTDOCS%%%%DOCSDIR%%/style.css +%%PORTDOCS%%%%DOCSDIR%%/tonidoplug.png +%%PORTDOCS%%%%DOCSDIR%%/tuning.html +%%PORTDOCS%%%%DOCSDIR%%/tvblob.jpg +%%PORTDOCS%%%%DOCSDIR%%/tvitty.jpg +%%PORTDOCS%%%%DOCSDIR%%/udp_tracker_protocol.html +%%PORTDOCS%%%%DOCSDIR%%/unicode_support.png +%%PORTDOCS%%%%DOCSDIR%%/write_disk_buffers.png +%%PORTDOCS%%%%DOCSDIR%%/ziptorrent_thumb.gif +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm include/libtorrent/aux_ +@dirrm include/libtorrent/extensions +@dirrm include/libtorrent/kademlia +@dirrm include/libtorrent diff --git a/net-p2p/qbittorrent-22/Makefile b/net-p2p/qbittorrent-22/Makefile index c6b49b11019a..bd365f24035b 100644 --- a/net-p2p/qbittorrent-22/Makefile +++ b/net-p2p/qbittorrent-22/Makefile @@ -1,25 +1,28 @@ -# New ports collection makefile for: qbittorrent -# Date created: 2007-04-01 -# Whom: alepulver +# New ports collection makefile for: qbittorrent-22 +# Date created: 14 February 2010 +# Whom: dougb@FreeBSD.org # # $FreeBSD$ # PORTNAME= qbittorrent -PORTVERSION= 2.1.5 +PORTVERSION= 2.2.0.b4 CATEGORIES= net-p2p ipv6 -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} - +MASTER_SITES= http://heanet.dl.sourceforge.net/project/qbittorrent/qbittorrent-unstable/ MAINTAINER= dougb@FreeBSD.org -COMMENT= Bittorrent client using Qt4 and libtorrent-rasterbar +COMMENT= Bittorrent client using Qt4 and libtorrent-rasterbar (devel) +PKGNAMESUFFIX= -devel +DISTVERSION= 2.2.0beta4 LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ - GeoIP.5:${PORTSDIR}/net/GeoIP \ - torrent-rasterbar.5:${PORTSDIR}/net-p2p/rblibtorrent-devel + GeoIP.5:${PORTSDIR}/net/GeoIP MAKE_JOBS_SAFE= yes -OPTIONS= NOTIFY "Enable libnotify support" on +CONFLICTS= qbittorrent-2.1.* + +OPTIONS= NOTIFY "Enable libnotify support" on \ + LT_15 "Use 0.15 (devel) version of libtorrent-rasterbar" on USE_QT_VER= 4 QT_COMPONENTS= corelib gui network xml \ @@ -39,6 +42,12 @@ LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+= --disable-libnotify .endif +.if !defined(WITHOUT_LT_15) +LIB_DEPENDS+= torrent-rasterbar.6:${PORTSDIR}/net-p2p/libtorrent-rasterbar-15 +.else +LIB_DEPENDS+= torrent-rasterbar.5:${PORTSDIR}/net-p2p/libtorrent-rasterbar-14 +.endif + post-patch: @${REINPLACE_CMD} -e 's|$$$$PREFIX/share/man|${MANPREFIX}/man|' \ ${WRKSRC}/src/src.pro diff --git a/net-p2p/qbittorrent-22/distinfo b/net-p2p/qbittorrent-22/distinfo index a635d63eeb46..89ff9df0f756 100644 --- a/net-p2p/qbittorrent-22/distinfo +++ b/net-p2p/qbittorrent-22/distinfo @@ -1,3 +1,3 @@ -MD5 (qbittorrent-2.1.5.tar.gz) = 22ed5e6713a319cc71997f4243888f8e -SHA256 (qbittorrent-2.1.5.tar.gz) = 5a50429f287e5c159c45839c9721800a4242d84bf4dd1f245e325bcedccd1a5c -SIZE (qbittorrent-2.1.5.tar.gz) = 2415266 +MD5 (qbittorrent-2.2.0beta4.tar.gz) = eb1308e8118310453828a4168677fdea +SHA256 (qbittorrent-2.2.0beta4.tar.gz) = 853838d8e1f53a13a13a52626f85d529e387007bea426042e6b1d374c8a4c268 +SIZE (qbittorrent-2.2.0beta4.tar.gz) = 2439921 diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile index c6b49b11019a..9aa5804f7be7 100644 --- a/net-p2p/qbittorrent/Makefile +++ b/net-p2p/qbittorrent/Makefile @@ -14,12 +14,14 @@ MAINTAINER= dougb@FreeBSD.org COMMENT= Bittorrent client using Qt4 and libtorrent-rasterbar LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ - GeoIP.5:${PORTSDIR}/net/GeoIP \ - torrent-rasterbar.5:${PORTSDIR}/net-p2p/rblibtorrent-devel + GeoIP.5:${PORTSDIR}/net/GeoIP MAKE_JOBS_SAFE= yes -OPTIONS= NOTIFY "Enable libnotify support" on +CONFLICTS= qbittorrent*-2.2.* + +OPTIONS= NOTIFY "Enable libnotify support" on \ + LT_15 "Use 0.15 (devel) version of libtorrent-rasterbar" off USE_QT_VER= 4 QT_COMPONENTS= corelib gui network xml \ @@ -39,6 +41,12 @@ LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+= --disable-libnotify .endif +.if defined(WITH_LT_15) +LIB_DEPENDS+= torrent-rasterbar.6:${PORTSDIR}/net-p2p/libtorrent-rasterbar-15 +.else +LIB_DEPENDS+= torrent-rasterbar.5:${PORTSDIR}/net-p2p/libtorrent-rasterbar-14 +.endif + post-patch: @${REINPLACE_CMD} -e 's|$$$$PREFIX/share/man|${MANPREFIX}/man|' \ ${WRKSRC}/src/src.pro diff --git a/net-p2p/rblibtorrent-devel/Makefile b/net-p2p/rblibtorrent-devel/Makefile deleted file mode 100644 index f32635581062..000000000000 --- a/net-p2p/rblibtorrent-devel/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# New ports collection makefile for: rblibtorrent -# Date created: 5 February 2006 -# Whom: Johan Ström <johan@stromnet.org> -# -# $FreeBSD$ -# - -PORTNAME= libtorrent -PORTVERSION= 0.14.8 -PORTREVISION= 3 -CATEGORIES= net-p2p ipv6 -MASTER_SITES= http://libtorrent.googlecode.com/files/ -PKGNAMEPREFIX= rb -PKGNAMESUFFIX= -devel -DISTNAME= ${PORTNAME}-rasterbar-${PORTVERSION} - -MAINTAINER= dougb@FreeBSD.org -COMMENT= A C++ library implementing a BitTorrent client (devel version) - -MAKE_JOBS_SAFE= yes - -LIB_DEPENDS= boost_date_time.4:${PORTSDIR}/devel/boost-libs \ - GeoIP.5:${PORTSDIR}/net/GeoIP - -CONFLICTS= rblibtorrent-[0-9]* - -USE_GNOME= gnomehack -USE_OPENSSL= yes -USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:262 libtool:22 -ACLOCAL_ARGS= -I m4 -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --disable-debug \ - --disable-python-binding \ - --with-boost-system=boost_system \ - --with-boost-filesystem=boost_filesystem \ - --with-boost-thread=boost_thread \ - --with-boost-regex=boost_regex \ - --with-boost-program-options=boost_program_options \ - --with-asio=shipped \ - --with-dht=on \ - --with-encryption=on \ - --with-libgeoip \ - --with-zlib=system -USE_LDCONFIG= yes - -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 700000 -BROKEN= does not compile on 6.x -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|g' \ - ${WRKSRC}/Makefile.am - @${REINPLACE_CMD} -e 's|^AM_CFLAGS|AM_CPPFLAGS|g ; \ - s|@BOOST_SYSTEM_LIB@||g' ${WRKSRC}/src/Makefile.am - -post-configure: - @${REINPLACE_CMD} -e 's|@BOOST_SYSTEM_LIB@|-lboost_system|' \ - ${WRKSRC}/libtorrent-rasterbar.pc - -post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/*.css ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/*.gif ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/*.jpg ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/*.png ${DOCSDIR} -.endif - -.include <bsd.port.post.mk> diff --git a/net-p2p/rblibtorrent-devel/distinfo b/net-p2p/rblibtorrent-devel/distinfo deleted file mode 100644 index 579b10d4d1f0..000000000000 --- a/net-p2p/rblibtorrent-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (libtorrent-rasterbar-0.14.8.tar.gz) = 3fae9934b74e2ddf2c50c1f0ec320d75 -SHA256 (libtorrent-rasterbar-0.14.8.tar.gz) = 1d9f00133ebd0d082308f1a92a59eafc0d718e3aeb3dadac10f1e1d3d2e01600 -SIZE (libtorrent-rasterbar-0.14.8.tar.gz) = 2000424 diff --git a/net-p2p/rblibtorrent-devel/files/patch-configure.in b/net-p2p/rblibtorrent-devel/files/patch-configure.in deleted file mode 100644 index 8c9d4d668051..000000000000 --- a/net-p2p/rblibtorrent-devel/files/patch-configure.in +++ /dev/null @@ -1,66 +0,0 @@ ---- configure.in.orig 2009-08-05 11:29:42.000000000 +0900 -+++ configure.in 2009-08-29 03:28:28.000000000 +0900 -@@ -65,19 +65,6 @@ - AM_CONDITIONAL([ENABLE_SHIPPED_ASIO], false) - - dnl Check for boost libraries. --AX_BOOST_BASE([1.35],[ -- AX_BOOST_SYSTEM -- dnl check that Boost.System was found: -- if test -z "$BOOST_SYSTEM_LIB"; then -- AC_MSG_ERROR([unable to find Boost.System library, currently this is required.]) -- fi -- -- AX_BOOST_ASIO -- dnl check that Boost.Asio was found: -- if test -z "$BOOST_ASIO_LIB"; then -- AC_MSG_ERROR([Unable to find Boost.Asio library, currently this is required.]) -- fi --],[ - AX_BOOST_BASE([1.34],[ - - dnl the user can choose which Asio library to use -@@ -121,7 +108,6 @@ - esac - AM_CONDITIONAL([ENABLE_SHIPPED_ASIO], [test x$enable_shipped_asio = "xyes"]) - ]) --]) - - AC_MSG_NOTICE([BOOST_CPPFLAGS=$BOOST_CPPFLAGS]) - AC_MSG_NOTICE([BOOST_LDFLAGS=$BOOST_LDFLAGS]) -@@ -351,7 +337,7 @@ - esac - - dnl Use possibly specific python install params --if [[ "x$PYTHON_INSTALL_PARAMS" == "x" ]]; then -+if [[ "x$PYTHON_INSTALL_PARAMS" = "x" ]]; then - PYTHON_INSTALL_PARAMS='--prefix=$(DESTDIR)$(prefix)' - fi - AC_SUBST(PYTHON_INSTALL_PARAMS) -@@ -413,7 +399,7 @@ - esac - - dnl Set some defines if we are building a shared library --if [[ "x$enable_shared" == "xyes" ]]; then -+if [[ "x$enable_shared" = "xyes" ]]; then - AC_DEFINE(TORRENT_BUILDING_SHARED,,[Make sure the functions and classes are exported.]) - COMPILETIME_OPTIONS+="-DTORRENT_LINKING_SHARED " - fi -@@ -425,7 +411,7 @@ - [case "$enableval" in - no) - AC_DEFINE(NDEBUG,,[Define to disable debugging]) -- DEBUGFLAGS="-Os" -+ DEBUGFLAGS="" - # COMPILETIME_OPTIONS+="-DNDEBUG " - ;; - yes) -@@ -438,7 +424,7 @@ - AC_MSG_ERROR([Unknown --enable-debug option "$enableval". Use either "yes" or "no".]) - ;; - esac], -- [DEBUGFLAGS="-Os" -+ [DEBUGFLAGS="" - AC_DEFINE(NDEBUG,,[Define to disable debugging]) - # COMPILETIME_OPTIONS+="-DNDEBUG " - ] diff --git a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__chained_buffer.hpp b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__chained_buffer.hpp deleted file mode 100644 index 19028a1e5e7c..000000000000 --- a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__chained_buffer.hpp +++ /dev/null @@ -1,20 +0,0 @@ ---- include/libtorrent/chained_buffer.hpp.orig 2008-10-05 10:41:54.000000000 +0900 -+++ include/libtorrent/chained_buffer.hpp 2009-04-19 05:13:19.000000000 +0900 -@@ -35,7 +35,7 @@ - - #include <boost/function.hpp> - #include <boost/version.hpp> --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include <asio/buffer.hpp> - #else - #include <boost/asio/buffer.hpp> -@@ -45,7 +45,7 @@ - - namespace libtorrent - { --#if BOOST_VERSION >= 103500 -+#if 0 // BOOST_VERSION >= 103500 - namespace asio = boost::asio; - #endif - struct chained_buffer diff --git a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__error_code.hpp b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__error_code.hpp deleted file mode 100644 index d3bd0e6192a1..000000000000 --- a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__error_code.hpp +++ /dev/null @@ -1,20 +0,0 @@ ---- include/libtorrent/error_code.hpp.orig 2008-10-05 10:41:54.000000000 +0900 -+++ include/libtorrent/error_code.hpp 2009-04-19 05:15:39.000000000 +0900 -@@ -35,7 +35,7 @@ - - #include <boost/version.hpp> - --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include <asio/error_code.hpp> - #else - #include <boost/system/error_code.hpp> -@@ -53,7 +53,7 @@ - }; - } - --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - typedef asio::error_code error_code; - inline asio::error::error_category get_posix_category() { return asio::error::system_category; } - inline asio::error::error_category get_system_category() { return asio::error::system_category; } diff --git a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__proxy_base.hpp b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__proxy_base.hpp deleted file mode 100644 index 94af000ecdd2..000000000000 --- a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__proxy_base.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- include/libtorrent/proxy_base.hpp.orig 2008-10-05 10:41:54.000000000 +0900 -+++ include/libtorrent/proxy_base.hpp 2009-04-19 05:17:07.000000000 +0900 -@@ -38,7 +38,7 @@ - #include <boost/bind.hpp> - #include <boost/lexical_cast.hpp> - #include <boost/function.hpp> --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include <asio/read.hpp> - #include <asio/write.hpp> - #else diff --git a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__socket.hpp b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__socket.hpp deleted file mode 100644 index f1ae1b7a67c8..000000000000 --- a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__socket.hpp +++ /dev/null @@ -1,20 +0,0 @@ ---- include/libtorrent/socket.hpp.orig 2009-02-08 17:13:07.000000000 +0900 -+++ include/libtorrent/socket.hpp 2009-04-19 05:18:58.000000000 +0900 -@@ -47,7 +47,7 @@ - - #include <boost/version.hpp> - --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include <asio/ip/tcp.hpp> - #include <asio/ip/udp.hpp> - #include <asio/io_service.hpp> -@@ -82,7 +82,7 @@ - namespace libtorrent - { - --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - using asio::ip::tcp; - using asio::ip::udp; - using asio::async_write; diff --git a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__ssl_stream.hpp b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__ssl_stream.hpp deleted file mode 100644 index 14ffbc74bf39..000000000000 --- a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__ssl_stream.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- include/libtorrent/ssl_stream.hpp.orig 2008-10-21 17:07:26.000000000 +0900 -+++ include/libtorrent/ssl_stream.hpp 2009-04-19 05:19:42.000000000 +0900 -@@ -34,7 +34,7 @@ - #define TORRENT_SSL_STREAM_HPP_INCLUDED - - #include "libtorrent/socket.hpp" --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include <asio/ssl.hpp> - #else - #include <boost/asio/ssl.hpp> diff --git a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__time.hpp b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__time.hpp deleted file mode 100644 index b74e4bec71d6..000000000000 --- a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__time.hpp +++ /dev/null @@ -1,29 +0,0 @@ ---- include/libtorrent/time.hpp.orig 2008-11-30 04:31:36.000000000 +0900 -+++ include/libtorrent/time.hpp 2009-04-19 23:13:40.000000000 +0900 -@@ -87,7 +87,7 @@ - - #else - --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include <asio/time_traits.hpp> - #else - #include <boost/asio/time_traits.hpp> -@@ -159,7 +159,7 @@ - } - - // asio time_traits --#if BOOST_VERSION >= 103500 -+#if 0 // BOOST_VERSION >= 103500 - namespace boost { - #endif - namespace asio -@@ -182,7 +182,7 @@ - { return boost::posix_time::microseconds(libtorrent::total_microseconds(d)); } - }; - } --#if BOOST_VERSION >= 103500 -+#if 0 // BOOST_VERSION >= 103500 - } - #endif - diff --git a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__variant_stream.hpp b/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__variant_stream.hpp deleted file mode 100644 index b5444156d38e..000000000000 --- a/net-p2p/rblibtorrent-devel/files/patch-include__libtorrent__variant_stream.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- include/libtorrent/variant_stream.hpp.orig 2008-10-05 10:41:54.000000000 +0900 -+++ include/libtorrent/variant_stream.hpp 2009-04-19 05:21:46.000000000 +0900 -@@ -21,7 +21,7 @@ - # include <boost/type_traits/add_pointer.hpp> - # include <boost/noncopyable.hpp> - --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include <asio/io_service.hpp> - #else - #include <boost/asio/io_service.hpp> diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__broadcast_socket.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__broadcast_socket.cpp deleted file mode 100644 index 7002819a4efe..000000000000 --- a/net-p2p/rblibtorrent-devel/files/patch-src__broadcast_socket.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/broadcast_socket.cpp.orig 2008-10-22 10:15:07.000000000 +0900 -+++ src/broadcast_socket.cpp 2009-04-19 05:27:08.000000000 +0900 -@@ -32,7 +32,7 @@ - - #include <boost/version.hpp> - --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include <asio/ip/host_name.hpp> - #include <asio/ip/multicast.hpp> - #else diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__enum_net.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__enum_net.cpp deleted file mode 100644 index cedc99dab46f..000000000000 --- a/net-p2p/rblibtorrent-devel/files/patch-src__enum_net.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/enum_net.cpp.orig 2009-02-08 17:13:04.000000000 +0900 -+++ src/enum_net.cpp 2009-04-19 05:28:22.000000000 +0900 -@@ -35,7 +35,7 @@ - #include <vector> - #include "libtorrent/enum_net.hpp" - #include "libtorrent/broadcast_socket.hpp" --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include <asio/ip/host_name.hpp> - #else - #include <boost/asio/ip/host_name.hpp> diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__error_code.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__error_code.cpp deleted file mode 100644 index d584a40c469d..000000000000 --- a/net-p2p/rblibtorrent-devel/files/patch-src__error_code.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/error_code.cpp.orig 2008-10-05 10:41:56.000000000 +0900 -+++ src/error_code.cpp 2009-04-19 05:35:55.000000000 +0900 -@@ -32,7 +32,7 @@ - - #include <boost/version.hpp> - --#if BOOST_VERSION >= 103500 -+#if 0 // BOOST_VERSION >= 103500 - - #include "libtorrent/error_code.hpp" - diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__file_pool.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__file_pool.cpp deleted file mode 100644 index 78a7af6ff9de..000000000000 --- a/net-p2p/rblibtorrent-devel/files/patch-src__file_pool.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/file_pool.cpp.orig 2009-02-08 17:13:04.000000000 +0900 -+++ src/file_pool.cpp 2009-04-19 05:29:34.000000000 +0900 -@@ -62,7 +62,7 @@ - { - // this means that another instance of the storage - // is using the exact same file. --#if BOOST_VERSION >= 103500 -+#if 0 // BOOST_VERSION >= 103500 - ec = error_code(errors::file_collision, libtorrent_category); - #endif - return boost::shared_ptr<file>(); diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__lsd.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__lsd.cpp deleted file mode 100644 index 850bf0af0bac..000000000000 --- a/net-p2p/rblibtorrent-devel/files/patch-src__lsd.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lsd.cpp.orig 2009-02-12 03:16:27.000000000 +0900 -+++ src/lsd.cpp 2009-04-19 05:30:17.000000000 +0900 -@@ -41,7 +41,7 @@ - - #include <boost/bind.hpp> - #include <boost/ref.hpp> --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include <asio/ip/host_name.hpp> - #include <asio/ip/multicast.hpp> - #else diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__natpmp.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__natpmp.cpp deleted file mode 100644 index b7cc1537de30..000000000000 --- a/net-p2p/rblibtorrent-devel/files/patch-src__natpmp.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/natpmp.cpp.orig 2009-02-08 17:13:04.000000000 +0900 -+++ src/natpmp.cpp 2009-04-19 05:30:54.000000000 +0900 -@@ -35,7 +35,7 @@ - #include <boost/version.hpp> - #include <boost/bind.hpp> - --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include <asio/ip/host_name.hpp> - #else - #include <boost/asio/ip/host_name.hpp> diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__storage.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__storage.cpp deleted file mode 100644 index 3bc14260d622..000000000000 --- a/net-p2p/rblibtorrent-devel/files/patch-src__storage.cpp +++ /dev/null @@ -1,114 +0,0 @@ ---- src/storage.cpp.orig 2009-11-06 09:45:13.000000000 -0800 -+++ src/storage.cpp 2009-11-21 23:12:53.000000000 -0800 -@@ -53,7 +53,7 @@ - #include <boost/multi_index_container.hpp> - #include <boost/multi_index/member.hpp> - #include <boost/multi_index/ordered_index.hpp> --#if BOOST_VERSION >= 103500 -+#if 0 // BOOST_VERSION >= 103500 - #include <boost/system/system_error.hpp> - #endif - -@@ -185,15 +185,15 @@ - } - #ifndef BOOST_NO_EXCEPTIONS - } --#if BOOST_VERSION >= 103500 -+#if 0 // BOOST_VERSION >= 103500 - catch (boost::system::system_error& e) - { - ec = e.code(); - } - #else -- catch (boost::filesystem::filesystem_error& e) -+ catch (std::exception& e) - { -- ec = error_code(e.system_error(), get_system_category()); -+ ec = error_code(errno, get_posix_category()); - } - #endif // BOOST_VERSION - #endif // BOOST_NO_EXCEPTIONS -@@ -460,17 +460,17 @@ - } - #ifndef BOOST_NO_EXCEPTIONS - } --#if BOOST_VERSION >= 103500 -+#if 0 // BOOST_VERSION >= 103500 - catch (boost::system::system_error& e) - { - set_error(m_save_path / file_iter->path, e.code()); - return true; - } - #else -- catch (boost::filesystem::filesystem_error& e) -+ catch (std::exception& e) - { - set_error(m_save_path / file_iter->path -- , error_code(e.system_error(), get_system_category())); -+ , error_code(errno, get_posix_category())); - return true; - } - #endif // BOOST_VERSION -@@ -503,16 +503,16 @@ - #endif - #ifndef BOOST_NO_EXCEPTIONS - } --#if BOOST_VERSION >= 103500 -+#if 0 // BOOST_VERSION >= 103500 - catch (boost::system::system_error& e) - { - set_error(f, e.code()); - return false; - } - #else -- catch (boost::filesystem::filesystem_error& e) -+ catch (std::exception& e) - { -- set_error(f, error_code(e.system_error(), get_system_category())); -+ set_error(f, error_code(errno, get_posix_category())); - return false; - } - #endif // BOOST_VERSION -@@ -560,17 +560,17 @@ - m_mapped_files->rename_file(index, new_filename); - #ifndef BOOST_NO_EXCEPTIONS - } --#if BOOST_VERSION >= 103500 -+#if 0 // BOOST_VERSION >= 103500 - catch (boost::system::system_error& e) - { - set_error(old_name, e.code()); - return true; - } - #else -- catch (boost::filesystem::filesystem_error& e) -+ catch (std::exception& e) - { -- set_error(old_name, error_code(e.system_error() -- , get_system_category())); -+ set_error(old_name, error_code(errno -+ , get_posix_category())); - return true; - } - #endif // BOOST_VERSION -@@ -593,7 +593,7 @@ - #endif - { fs::remove(safe_convert(p)); } - #ifndef BOOST_NO_EXCEPTIONS --#if BOOST_VERSION >= 103500 -+#if 0 // BOOST_VERSION >= 103500 - catch (boost::system::system_error& e) - { - // no such file or directory is not an error -@@ -601,9 +601,9 @@ - set_error(p, e.code()); - } - #else -- catch (boost::filesystem::filesystem_error& e) -+ catch (std::exception& e) - { -- set_error(p, error_code(e.system_error(), get_system_category())); -+ set_error(p, errno, get_posix_category())); - } - #endif // BOOST_VERSION - #endif // BOOST_NO_EXCEPTIONS diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__udp_socket.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__udp_socket.cpp deleted file mode 100644 index c44d01c0d869..000000000000 --- a/net-p2p/rblibtorrent-devel/files/patch-src__udp_socket.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/udp_socket.cpp.orig 2009-02-08 17:13:04.000000000 +0900 -+++ src/udp_socket.cpp 2009-04-19 05:33:12.000000000 +0900 -@@ -36,7 +36,7 @@ - #include <stdlib.h> - #include <boost/bind.hpp> - #include <boost/array.hpp> --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include <asio/read.hpp> - #else - #include <boost/asio/read.hpp> diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__upnp.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__upnp.cpp deleted file mode 100644 index d3ed06379061..000000000000 --- a/net-p2p/rblibtorrent-devel/files/patch-src__upnp.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/upnp.cpp.orig 2009-02-18 17:42:16.000000000 +0900 -+++ src/upnp.cpp 2009-04-19 05:33:50.000000000 +0900 -@@ -43,7 +43,7 @@ - - #include <boost/bind.hpp> - #include <boost/ref.hpp> --#if BOOST_VERSION < 103500 -+#if 1 // BOOST_VERSION < 103500 - #include <asio/ip/host_name.hpp> - #include <asio/ip/multicast.hpp> - #else diff --git a/net-p2p/rblibtorrent-devel/pkg-plist b/net-p2p/rblibtorrent-devel/pkg-plist deleted file mode 100644 index 3b98e0a170e0..000000000000 --- a/net-p2p/rblibtorrent-devel/pkg-plist +++ /dev/null @@ -1,351 +0,0 @@ -include/libtorrent/alert.hpp -include/libtorrent/alert_types.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_raw_socket.hpp -include/libtorrent/asio/basic_serial_port.hpp -include/libtorrent/asio/basic_socket.hpp -include/libtorrent/asio/basic_socket_acceptor.hpp -include/libtorrent/asio/basic_socket_iostream.hpp -include/libtorrent/asio/basic_socket_streambuf.hpp -include/libtorrent/asio/basic_stream_socket.hpp -include/libtorrent/asio/basic_streambuf.hpp -include/libtorrent/asio/buffer.hpp -include/libtorrent/asio/buffered_read_stream.hpp -include/libtorrent/asio/buffered_read_stream_fwd.hpp -include/libtorrent/asio/buffered_stream.hpp -include/libtorrent/asio/buffered_stream_fwd.hpp -include/libtorrent/asio/buffered_write_stream.hpp -include/libtorrent/asio/buffered_write_stream_fwd.hpp -include/libtorrent/asio/buffers_iterator.hpp -include/libtorrent/asio/completion_condition.hpp -include/libtorrent/asio/datagram_socket_service.hpp -include/libtorrent/asio/deadline_timer.hpp -include/libtorrent/asio/deadline_timer_service.hpp -include/libtorrent/asio/detail/bind_handler.hpp -include/libtorrent/asio/detail/buffer_resize_guard.hpp -include/libtorrent/asio/detail/buffered_stream_storage.hpp -include/libtorrent/asio/detail/call_stack.hpp -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/descriptor_ops.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_base_from_member.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/indirect_handler_queue.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 -include/libtorrent/asio/detail/null_mutex.hpp -include/libtorrent/asio/detail/null_signal_blocker.hpp -include/libtorrent/asio/detail/null_thread.hpp -include/libtorrent/asio/detail/null_tss_ptr.hpp -include/libtorrent/asio/detail/old_win_sdk_compat.hpp -include/libtorrent/asio/detail/pipe_select_interrupter.hpp -include/libtorrent/asio/detail/pop_options.hpp -include/libtorrent/asio/detail/posix_event.hpp -include/libtorrent/asio/detail/posix_fd_set_adapter.hpp -include/libtorrent/asio/detail/posix_mutex.hpp -include/libtorrent/asio/detail/posix_signal_blocker.hpp -include/libtorrent/asio/detail/posix_thread.hpp -include/libtorrent/asio/detail/posix_tss_ptr.hpp -include/libtorrent/asio/detail/push_options.hpp -include/libtorrent/asio/detail/reactive_descriptor_service.hpp -include/libtorrent/asio/detail/reactive_serial_port_service.hpp -include/libtorrent/asio/detail/reactive_socket_service.hpp -include/libtorrent/asio/detail/reactor_op_queue.hpp -include/libtorrent/asio/detail/resolver_service.hpp -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 -include/libtorrent/asio/detail/socket_ops.hpp -include/libtorrent/asio/detail/socket_option.hpp -include/libtorrent/asio/detail/socket_select_interrupter.hpp -include/libtorrent/asio/detail/socket_types.hpp -include/libtorrent/asio/detail/strand_service.hpp -include/libtorrent/asio/detail/task_io_service.hpp -include/libtorrent/asio/detail/task_io_service_2lock.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 -include/libtorrent/asio/detail/win_event.hpp -include/libtorrent/asio/detail/win_fd_set_adapter.hpp -include/libtorrent/asio/detail/win_iocp_handle_service.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_serial_port_service.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 -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_at.ipp -include/libtorrent/asio/impl/read_until.ipp -include/libtorrent/asio/impl/serial_port_base.ipp -include/libtorrent/asio/impl/write.ipp -include/libtorrent/asio/impl/write_at.ipp -include/libtorrent/asio/io_service.hpp -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 -include/libtorrent/asio/ip/detail/socket_option.hpp -include/libtorrent/asio/ip/host_name.hpp -include/libtorrent/asio/ip/icmp.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/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/local/basic_endpoint.hpp -include/libtorrent/asio/local/connect_pair.hpp -include/libtorrent/asio/local/datagram_protocol.hpp -include/libtorrent/asio/local/stream_protocol.hpp -include/libtorrent/asio/placeholders.hpp -include/libtorrent/asio/posix/basic_descriptor.hpp -include/libtorrent/asio/posix/basic_stream_descriptor.hpp -include/libtorrent/asio/posix/descriptor_base.hpp -include/libtorrent/asio/posix/stream_descriptor.hpp -include/libtorrent/asio/posix/stream_descriptor_service.hpp -include/libtorrent/asio/raw_socket_service.hpp -include/libtorrent/asio/read.hpp -include/libtorrent/asio/read_at.hpp -include/libtorrent/asio/read_until.hpp -include/libtorrent/asio/serial_port.hpp -include/libtorrent/asio/serial_port_base.hpp -include/libtorrent/asio/serial_port_service.hpp -include/libtorrent/asio/socket_acceptor_service.hpp -include/libtorrent/asio/socket_base.hpp -include/libtorrent/asio/ssl/basic_context.hpp -include/libtorrent/asio/ssl/context.hpp -include/libtorrent/asio/ssl/context_base.hpp -include/libtorrent/asio/ssl/context_service.hpp -include/libtorrent/asio/ssl/detail/openssl_context_service.hpp -include/libtorrent/asio/ssl/detail/openssl_init.hpp -include/libtorrent/asio/ssl/detail/openssl_operation.hpp -include/libtorrent/asio/ssl/detail/openssl_stream_service.hpp -include/libtorrent/asio/ssl/detail/openssl_types.hpp -include/libtorrent/asio/ssl/stream.hpp -include/libtorrent/asio/ssl/stream_base.hpp -include/libtorrent/asio/ssl/stream_service.hpp -include/libtorrent/asio/ssl.hpp -include/libtorrent/asio/strand.hpp -include/libtorrent/asio/stream_socket_service.hpp -include/libtorrent/asio/streambuf.hpp -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/windows/basic_handle.hpp -include/libtorrent/asio/windows/basic_random_access_handle.hpp -include/libtorrent/asio/windows/basic_stream_handle.hpp -include/libtorrent/asio/windows/random_access_handle.hpp -include/libtorrent/asio/windows/random_access_handle_service.hpp -include/libtorrent/asio/windows/stream_handle.hpp -include/libtorrent/asio/windows/stream_handle_service.hpp -include/libtorrent/asio/write.hpp -include/libtorrent/asio/write_at.hpp -include/libtorrent/asio.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/bitfield.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/create_torrent.hpp -include/libtorrent/debug.hpp -include/libtorrent/disk_buffer_holder.hpp -include/libtorrent/disk_io_thread.hpp -include/libtorrent/entry.hpp -include/libtorrent/enum_net.hpp -include/libtorrent/error_code.hpp -include/libtorrent/escape_string.hpp -include/libtorrent/extensions/logger.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/extensions.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_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 -include/libtorrent/kademlia/closest_nodes.hpp -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/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/natpmp.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/random_sample.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/ssl_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_socket.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-rasterbar.a -lib/libtorrent-rasterbar.la -lib/libtorrent-rasterbar.so -lib/libtorrent-rasterbar.so.5 -libdata/pkgconfig/libtorrent-rasterbar.pc -%%PORTDOCS%%%%DOCSDIR%%/Linkage.png -%%PORTDOCS%%%%DOCSDIR%%/acquasition.jpg -%%PORTDOCS%%%%DOCSDIR%%/arctic_thumb.png -%%PORTDOCS%%%%DOCSDIR%%/bitbuddy_thumb.jpg -%%PORTDOCS%%%%DOCSDIR%%/bitfox.png -%%PORTDOCS%%%%DOCSDIR%%/bitrocket_thumb.png -%%PORTDOCS%%%%DOCSDIR%%/bitscast_thumb.png -%%PORTDOCS%%%%DOCSDIR%%/bitslug_thumb.png -%%PORTDOCS%%%%DOCSDIR%%/btg_thumb.jpg -%%PORTDOCS%%%%DOCSDIR%%/bubba.png -%%PORTDOCS%%%%DOCSDIR%%/building.html -%%PORTDOCS%%%%DOCSDIR%%/client_test.html -%%PORTDOCS%%%%DOCSDIR%%/client_test.png -%%PORTDOCS%%%%DOCSDIR%%/deluge.png -%%PORTDOCS%%%%DOCSDIR%%/dht_extensions.html -%%PORTDOCS%%%%DOCSDIR%%/electric_sheep_thumb.jpg -%%PORTDOCS%%%%DOCSDIR%%/examples.html -%%PORTDOCS%%%%DOCSDIR%%/extension_protocol.html -%%PORTDOCS%%%%DOCSDIR%%/fatrat.png -%%PORTDOCS%%%%DOCSDIR%%/fdm.png -%%PORTDOCS%%%%DOCSDIR%%/features.html -%%PORTDOCS%%%%DOCSDIR%%/firetorrent.png -%%PORTDOCS%%%%DOCSDIR%%/flush.jpg -%%PORTDOCS%%%%DOCSDIR%%/halite_thumb.png -%%PORTDOCS%%%%DOCSDIR%%/im_thumb.jpg -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/leechcraft.png -%%PORTDOCS%%%%DOCSDIR%%/libtorrent_plugins.html -%%PORTDOCS%%%%DOCSDIR%%/lince.png -%%PORTDOCS%%%%DOCSDIR%%/make_torrent.html -%%PORTDOCS%%%%DOCSDIR%%/manual.html -%%PORTDOCS%%%%DOCSDIR%%/miro.jpg -%%PORTDOCS%%%%DOCSDIR%%/moopolice_thumb.gif -%%PORTDOCS%%%%DOCSDIR%%/projects.html -%%PORTDOCS%%%%DOCSDIR%%/pump.png -%%PORTDOCS%%%%DOCSDIR%%/python_binding.html -%%PORTDOCS%%%%DOCSDIR%%/qbittorrent_thumb.jpg -%%PORTDOCS%%%%DOCSDIR%%/running_tests.html -%%PORTDOCS%%%%DOCSDIR%%/style.css -%%PORTDOCS%%%%DOCSDIR%%/tvitty.jpg -%%PORTDOCS%%%%DOCSDIR%%/udp_tracker_protocol.html -%%PORTDOCS%%%%DOCSDIR%%/unicode_support.png -%%PORTDOCS%%%%DOCSDIR%%/ziptorrent_thumb.gif -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm include/libtorrent/kademlia -@dirrm include/libtorrent/extensions -@dirrm include/libtorrent/aux_ -@dirrm include/libtorrent/asio/windows -@dirrm include/libtorrent/asio/ssl/detail -@dirrm include/libtorrent/asio/ssl -@dirrm include/libtorrent/asio/posix -@dirrm include/libtorrent/asio/local -@dirrm include/libtorrent/asio/ip/detail -@dirrm include/libtorrent/asio/ip -@dirrm include/libtorrent/asio/impl -@dirrm include/libtorrent/asio/detail -@dirrm include/libtorrent/asio -@dirrm include/libtorrent diff --git a/net-p2p/sharktorrent/Makefile b/net-p2p/sharktorrent/Makefile index afba842f4b60..e5ae5011c491 100644 --- a/net-p2p/sharktorrent/Makefile +++ b/net-p2p/sharktorrent/Makefile @@ -15,7 +15,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= C++ Bittorrent client using wxWidgets, libtorrent and boost LIB_DEPENDS= boost_filesystem.4:${PORTSDIR}/devel/boost-libs \ - torrent-rasterbar.5:${PORTSDIR}/net-p2p/rblibtorrent-devel + torrent-rasterbar.5:${PORTSDIR}/net-p2p/libtorrent-rasterbar-14 USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build corelib gui network |