From 4b7fa3a1b53f6b48e14566f1eaef8b98fdacff98 Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 30 Jan 2006 00:52:28 +0000 Subject: Update "libtorrent" package to version 0.8.3 and "rtorrent" package to version 0.4.3. Changes since 0.7.6/0.3.6: - New throttle implementation - Improved config file parser - Settings for using a http proxy and changing the process's umask. - Many more bug fixes and improvements --- net/libtorrent/Makefile | 12 ++++++-- net/libtorrent/PLIST | 4 ++- net/libtorrent/buildlink3.mk | 4 +-- net/libtorrent/distinfo | 9 +++--- net/libtorrent/patches/patch-ab | 12 -------- net/rtorrent/MESSAGE.BSD | 12 ++++++++ net/rtorrent/Makefile | 18 +++++++++-- net/rtorrent/distinfo | 9 +++--- net/rtorrent/patches/patch-aa | 67 +++++++++++++++++++++++++++++++++++++++++ 9 files changed, 119 insertions(+), 28 deletions(-) delete mode 100644 net/libtorrent/patches/patch-ab create mode 100644 net/rtorrent/MESSAGE.BSD create mode 100644 net/rtorrent/patches/patch-aa (limited to 'net') diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile index e451669af9f..ddf0439f5f2 100644 --- a/net/libtorrent/Makefile +++ b/net/libtorrent/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2006/01/12 20:32:04 adam Exp $ +# $NetBSD: Makefile,v 1.8 2006/01/30 00:52:28 tron Exp $ -DISTNAME= libtorrent-0.7.6 +DISTNAME= libtorrent-0.8.3 CATEGORIES= net MASTER_SITES= http://libtorrent.rakshasa.no/downloads/ @@ -15,6 +15,14 @@ CONFIGURE_ARGS+= --disable-debug CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} GCC_REQD+= 3.3 +.include "../../mk/compiler.mk" + +# See http://libtorrent.rakshasa.no/ticket/96 +.if !empty(CC_VERSION:Mgcc-4.*) +CXXFLAGS+= -fpermissive -fno-strength-reduce -fno-thread-jumps \ + -fno-inline -fforce-addr +.endif + .include "../../devel/libsigc++2/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/libtorrent/PLIST b/net/libtorrent/PLIST index 20d751ae80d..728ffc1b753 100644 --- a/net/libtorrent/PLIST +++ b/net/libtorrent/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2005/10/24 08:41:11 adam Exp $ +@comment $NetBSD: PLIST,v 1.3 2006/01/30 00:52:28 tron Exp $ include/torrent/bencode.h include/torrent/common.h include/torrent/download.h @@ -7,8 +7,10 @@ include/torrent/event.h include/torrent/exceptions.h include/torrent/http.h include/torrent/peer.h +include/torrent/path.h include/torrent/poll.h include/torrent/poll_epoll.h +include/torrent/poll_kqueue.h include/torrent/poll_select.h include/torrent/rate.h include/torrent/torrent.h diff --git a/net/libtorrent/buildlink3.mk b/net/libtorrent/buildlink3.mk index 64b8dd259c9..015abdd7fba 100644 --- a/net/libtorrent/buildlink3.mk +++ b/net/libtorrent/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2006/01/12 20:32:04 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2006/01/30 00:52:28 tron Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBTORRENT_BUILDLINK3_MK:= ${LIBTORRENT_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtorrent} BUILDLINK_PACKAGES+= libtorrent .if !empty(LIBTORRENT_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.libtorrent+= libtorrent>=0.7.0 +BUILDLINK_DEPENDS.libtorrent+= libtorrent>=0.8.0 BUILDLINK_PKGSRCDIR.libtorrent?= ../../net/libtorrent .endif # LIBTORRENT_BUILDLINK3_MK diff --git a/net/libtorrent/distinfo b/net/libtorrent/distinfo index be8220120c6..b00449e7c8b 100644 --- a/net/libtorrent/distinfo +++ b/net/libtorrent/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.5 2006/01/12 20:32:04 adam Exp $ +$NetBSD: distinfo,v 1.6 2006/01/30 00:52:28 tron Exp $ -SHA1 (libtorrent-0.7.6.tar.gz) = eac5cbbd60fd4086c947fd3cd3c102f05ccb6f40 -RMD160 (libtorrent-0.7.6.tar.gz) = 042dd53ad6fcea9ce89bdb943cbcde2860d7ff96 -Size (libtorrent-0.7.6.tar.gz) = 440246 bytes -SHA1 (patch-ab) = 414a0ebb75d3cc46bc106abb7671600962753859 +SHA1 (libtorrent-0.8.3.tar.gz) = 9f57d520732d5a367492e65825cab69a94a65844 +RMD160 (libtorrent-0.8.3.tar.gz) = 2a88aa5824efc343453a5c98923b38f5e3cc81d8 +Size (libtorrent-0.8.3.tar.gz) = 445167 bytes diff --git a/net/libtorrent/patches/patch-ab b/net/libtorrent/patches/patch-ab deleted file mode 100644 index 4637cfaab4c..00000000000 --- a/net/libtorrent/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2005/10/24 08:41:11 adam Exp $ - ---- src/data/file.cc.orig 2005-09-17 19:18:33.000000000 +0000 -+++ src/data/file.cc -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include - - #ifdef USE_XFS - #include diff --git a/net/rtorrent/MESSAGE.BSD b/net/rtorrent/MESSAGE.BSD new file mode 100644 index 00000000000..7167c8e72f7 --- /dev/null +++ b/net/rtorrent/MESSAGE.BSD @@ -0,0 +1,12 @@ +=========================================================================== +$NetBSD: MESSAGE.BSD,v 1.1 2006/01/30 00:52:28 tron Exp $ + +Please consider adding the following options to your ".rtorrent.rc": + +hash_max_tries = 5 +hash_interval = 10 +hash_read_ahead = 8 + +This will significantly improve the performance of hashing files. + +=========================================================================== diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile index 9100422bd5a..5da483caa46 100644 --- a/net/rtorrent/Makefile +++ b/net/rtorrent/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2006/01/12 20:41:37 adam Exp $ +# $NetBSD: Makefile,v 1.6 2006/01/30 00:52:28 tron Exp $ -DISTNAME= rtorrent-0.3.6 +DISTNAME= rtorrent-0.4.3 CATEGORIES= net MASTER_SITES= http://libtorrent.rakshasa.no/downloads/ @@ -14,6 +14,20 @@ USE_TOOLS+= gmake GNU_CONFIGURE= yes GCC_REQD+= 3.3 +.include "../../mk/bsd.prefs.mk" + +.if !empty(OPSYS:M*BSD) || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" +MESSAGE_SRC= ${PKGDIR}/MESSAGE.BSD +.endif + +.include "../../mk/compiler.mk" + +# See http://libtorrent.rakshasa.no/ticket/96 +.if !empty(CC_VERSION:Mgcc-4.*) +CXXFLAGS+= -fpermissive -fno-strength-reduce -fno-thread-jumps \ + -fno-inline -fforce-addr +.endif + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rtorrent ${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc \ diff --git a/net/rtorrent/distinfo b/net/rtorrent/distinfo index eee7328cd67..f76b0daddf8 100644 --- a/net/rtorrent/distinfo +++ b/net/rtorrent/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.4 2006/01/12 20:41:37 adam Exp $ +$NetBSD: distinfo,v 1.5 2006/01/30 00:52:28 tron Exp $ -SHA1 (rtorrent-0.3.6.tar.gz) = ec19c75250c064666cd656ca88d11f764f95f536 -RMD160 (rtorrent-0.3.6.tar.gz) = 19bf3ed28e92f0dc1eb940a4cce122635e26c4f0 -Size (rtorrent-0.3.6.tar.gz) = 223419 bytes +SHA1 (rtorrent-0.4.3.tar.gz) = 78a592505af265cca5a7d29930dfeeaa72138506 +RMD160 (rtorrent-0.4.3.tar.gz) = f44ec095ad3f045de819e1fd30998beff5721f5b +Size (rtorrent-0.4.3.tar.gz) = 233264 bytes +SHA1 (patch-aa) = c594b2c02d060dddc445878fe2be80b830d205d3 diff --git a/net/rtorrent/patches/patch-aa b/net/rtorrent/patches/patch-aa new file mode 100644 index 00000000000..16ba352de1f --- /dev/null +++ b/net/rtorrent/patches/patch-aa @@ -0,0 +1,67 @@ +$NetBSD: patch-aa,v 1.3 2006/01/30 00:52:28 tron Exp $ + +--- src/utils/variable_map.cc.orig 2006-01-17 16:26:38.000000000 +0000 ++++ src/utils/variable_map.cc 2006-01-30 00:02:39.000000000 +0000 +@@ -37,6 +37,7 @@ + #include "config.h" + + #include ++#include + #include + #include + #include +@@ -93,6 +94,11 @@ + return first; + } + ++static bool ++I_hate_C_Plus_Plus(char c) { ++ return std::isspace(c); ++} ++ + std::string::const_iterator + parse_unknown(std::string::const_iterator first, std::string::const_iterator last, torrent::Bencode* dest) { + if (*first == '"') { +@@ -108,7 +114,7 @@ + + } else { + // Add rak::or and check for ','. +- std::string::const_iterator next = std::find_if(first, last, std::ptr_fun(&std::isspace)); ++ std::string::const_iterator next = std::find_if(first, last, std::ptr_fun(&I_hate_C_Plus_Plus)); + + *dest = std::string(first, next); + return next; +@@ -117,13 +123,13 @@ + + std::string::const_iterator + parse_args(std::string::const_iterator first, std::string::const_iterator last, torrent::Bencode::List* dest) { +- first = std::find_if(first, last, std::not1(std::ptr_fun(&std::isspace))); ++ first = std::find_if(first, last, std::not1(std::ptr_fun(&I_hate_C_Plus_Plus))); + + while (first != last) { + dest->push_back(torrent::Bencode()); + + first = parse_unknown(first, last, &dest->back()); +- first = std::find_if(first, last, std::not1(std::ptr_fun(&std::isspace))); ++ first = std::find_if(first, last, std::not1(std::ptr_fun(&I_hate_C_Plus_Plus))); + + if (first != last && *first != ',') + throw torrent::input_error("A string with blanks must be quoted."); +@@ -135,7 +141,7 @@ + void + VariableMap::process_command(const std::string& command) { + std::string::const_iterator pos = command.begin(); +- pos = std::find_if(pos, command.end(), std::not1(std::ptr_fun(&std::isspace))); ++ pos = std::find_if(pos, command.end(), std::not1(std::ptr_fun(&I_hate_C_Plus_Plus))); + + if (pos == command.end() || *pos == '#') + return; +@@ -143,7 +149,7 @@ + // Replace with parse_unknown? + std::string key; + pos = parse_name(pos, command.end(), &key); +- pos = std::find_if(pos, command.end(), std::not1(std::ptr_fun(&std::isspace))); ++ pos = std::find_if(pos, command.end(), std::not1(std::ptr_fun(&I_hate_C_Plus_Plus))); + + if (pos == command.end() || *pos != '=') + throw torrent::input_error("Could not find '='."); -- cgit v1.2.3