- Update to 1.3.3

PR:		134628
Submitted by:	Ports Fury
This commit is contained in:
Martin Wilke 2009-05-23 14:23:59 +00:00
parent 8eb6a4bceb
commit 2a7d54c78a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=234449
14 changed files with 228 additions and 74 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= libtorrent
PORTVERSION= 0.14.2
PORTREVISION= 2
PORTVERSION= 0.14.3
CATEGORIES= net-p2p
MASTER_SITES= SF
PKGNAMEPREFIX= rb
@ -32,7 +31,8 @@ CONFIGURE_ARGS= --disable-debug \
--with-boost-thread=boost_thread \
--with-boost-regex=boost_regex \
--with-boost-program-options=boost_program_options \
--with-asio=shipped
--with-asio=shipped \
--with-zlib=system
USE_LDCONFIG= yes
CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}

View File

@ -1,3 +1,3 @@
MD5 (libtorrent-rasterbar-0.14.2.tar.gz) = 97bb2db5ac21e9a81c96fc0e2abe6d29
SHA256 (libtorrent-rasterbar-0.14.2.tar.gz) = bf43ea3fbedc2839f66357c3f0bea5f05f563cd9ffd9f7c3c6d81f33374a466e
SIZE (libtorrent-rasterbar-0.14.2.tar.gz) = 1978048
MD5 (libtorrent-rasterbar-0.14.3.tar.gz) = 6ce3148f8fbddbdfa472ef3c4c4cae61
SHA256 (libtorrent-rasterbar-0.14.3.tar.gz) = c769c8b7f0cf87664fb26f9b43ef5d6e485a2c2c70fc75ef8a75c79e1114f4bb
SIZE (libtorrent-rasterbar-0.14.3.tar.gz) = 1985127

View File

@ -1,11 +0,0 @@
--- include/libtorrent/asio/detail/socket_ops.hpp.orig Wed Aug 8 03:43:42 2007
+++ include/libtorrent/asio/detail/socket_ops.hpp Mon Sep 10 12:46:17 2007
@@ -715,7 +715,7 @@
if (error)
ec = translate_netdb_error(error);
return retval;
-#elif defined(__MACH__) && defined(__APPLE__)
+#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
(void)(buffer);
(void)(buflength);
int error = 0;

View File

@ -1,19 +1,75 @@
--- src/storage.cpp.orig 2009-02-08 17:13:04.000000000 +0900
+++ src/storage.cpp 2009-04-19 05:32:24.000000000 +0900
@@ -82,9 +82,11 @@
#include <cstdio>
--- src/storage.cpp.orig 2009-04-13 02:37:54.000000000 +0900
+++ src/storage.cpp 2009-04-29 15:56:16.000000000 +0900
@@ -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
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__FreeBSD__)
// for getattrlist()
+#ifdef __APPLE__
#include <sys/attr.h>
+#endif
#include <unistd.h>
// for statfs()
#include <sys/param.h>
@@ -496,7 +498,7 @@
@@ -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
@@ -458,17 +458,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
@@ -501,16 +501,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
@@ -558,17 +558,17 @@
m_mapped_files->rename_file(index, new_filename);
#ifndef BOOST_NO_EXCEPTIONS
}
@ -22,3 +78,35 @@
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
@@ -591,15 +591,15 @@
#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)
{
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

View File

@ -290,7 +290,7 @@ include/libtorrent/xml_parse.hpp
lib/libtorrent-rasterbar.a
lib/libtorrent-rasterbar.la
lib/libtorrent-rasterbar.so
lib/libtorrent-rasterbar.so.2
lib/libtorrent-rasterbar.so.3
libdata/pkgconfig/libtorrent-rasterbar.pc
@dirrm include/libtorrent/kademlia
@dirrm include/libtorrent/extensions

View File

@ -6,7 +6,7 @@
#
PORTNAME= qbittorrent
PORTVERSION= 1.3.2
PORTVERSION= 1.3.3
CATEGORIES= net-p2p
MASTER_SITES= SF
@ -17,7 +17,7 @@ LIB_DEPENDS= ccext2-1.6.0:${PORTSDIR}/devel/commoncpp \
execinfo.1:${PORTSDIR}/devel/libexecinfo \
zzip.13:${PORTSDIR}/devel/zziplib \
curl.5:${PORTSDIR}/ftp/curl \
torrent-rasterbar.2:${PORTSDIR}/net-p2p/rblibtorrent-devel
torrent-rasterbar.3:${PORTSDIR}/net-p2p/rblibtorrent-devel
USE_QT_VER= 4
QT_COMPONENTS= corelib gui network xml \

View File

@ -1,3 +1,3 @@
MD5 (qbittorrent-1.3.2.tar.gz) = 680ea41e5601d5cd7990b303f9ad503c
SHA256 (qbittorrent-1.3.2.tar.gz) = f0d269424272ab1d6ce2a161ff7c01ff8ced63f5a7cf25616bbde02298329a5d
SIZE (qbittorrent-1.3.2.tar.gz) = 1660128
MD5 (qbittorrent-1.3.3.tar.gz) = 863f963beefc3c93dfe25ee6a6b0ed47
SHA256 (qbittorrent-1.3.3.tar.gz) = 3a8adf958a727e1fcc2fbdc03a0691209f0b60f75b6bb385c9c1aca27dceb964
SIZE (qbittorrent-1.3.3.tar.gz) = 1667700

View File

@ -6,7 +6,7 @@
#
PORTNAME= qbittorrent
PORTVERSION= 1.3.2
PORTVERSION= 1.3.3
CATEGORIES= net-p2p
MASTER_SITES= SF
@ -17,7 +17,7 @@ LIB_DEPENDS= ccext2-1.6.0:${PORTSDIR}/devel/commoncpp \
execinfo.1:${PORTSDIR}/devel/libexecinfo \
zzip.13:${PORTSDIR}/devel/zziplib \
curl.5:${PORTSDIR}/ftp/curl \
torrent-rasterbar.2:${PORTSDIR}/net-p2p/rblibtorrent-devel
torrent-rasterbar.3:${PORTSDIR}/net-p2p/rblibtorrent-devel
USE_QT_VER= 4
QT_COMPONENTS= corelib gui network xml \

View File

@ -1,3 +1,3 @@
MD5 (qbittorrent-1.3.2.tar.gz) = 680ea41e5601d5cd7990b303f9ad503c
SHA256 (qbittorrent-1.3.2.tar.gz) = f0d269424272ab1d6ce2a161ff7c01ff8ced63f5a7cf25616bbde02298329a5d
SIZE (qbittorrent-1.3.2.tar.gz) = 1660128
MD5 (qbittorrent-1.3.3.tar.gz) = 863f963beefc3c93dfe25ee6a6b0ed47
SHA256 (qbittorrent-1.3.3.tar.gz) = 3a8adf958a727e1fcc2fbdc03a0691209f0b60f75b6bb385c9c1aca27dceb964
SIZE (qbittorrent-1.3.3.tar.gz) = 1667700

View File

@ -6,8 +6,7 @@
#
PORTNAME= libtorrent
PORTVERSION= 0.14.2
PORTREVISION= 2
PORTVERSION= 0.14.3
CATEGORIES= net-p2p
MASTER_SITES= SF
PKGNAMEPREFIX= rb
@ -32,7 +31,8 @@ CONFIGURE_ARGS= --disable-debug \
--with-boost-thread=boost_thread \
--with-boost-regex=boost_regex \
--with-boost-program-options=boost_program_options \
--with-asio=shipped
--with-asio=shipped \
--with-zlib=system
USE_LDCONFIG= yes
CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}

View File

@ -1,3 +1,3 @@
MD5 (libtorrent-rasterbar-0.14.2.tar.gz) = 97bb2db5ac21e9a81c96fc0e2abe6d29
SHA256 (libtorrent-rasterbar-0.14.2.tar.gz) = bf43ea3fbedc2839f66357c3f0bea5f05f563cd9ffd9f7c3c6d81f33374a466e
SIZE (libtorrent-rasterbar-0.14.2.tar.gz) = 1978048
MD5 (libtorrent-rasterbar-0.14.3.tar.gz) = 6ce3148f8fbddbdfa472ef3c4c4cae61
SHA256 (libtorrent-rasterbar-0.14.3.tar.gz) = c769c8b7f0cf87664fb26f9b43ef5d6e485a2c2c70fc75ef8a75c79e1114f4bb
SIZE (libtorrent-rasterbar-0.14.3.tar.gz) = 1985127

View File

@ -1,11 +0,0 @@
--- include/libtorrent/asio/detail/socket_ops.hpp.orig Wed Aug 8 03:43:42 2007
+++ include/libtorrent/asio/detail/socket_ops.hpp Mon Sep 10 12:46:17 2007
@@ -715,7 +715,7 @@
if (error)
ec = translate_netdb_error(error);
return retval;
-#elif defined(__MACH__) && defined(__APPLE__)
+#elif defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__)
(void)(buffer);
(void)(buflength);
int error = 0;

View File

@ -1,19 +1,75 @@
--- src/storage.cpp.orig 2009-02-08 17:13:04.000000000 +0900
+++ src/storage.cpp 2009-04-19 05:32:24.000000000 +0900
@@ -82,9 +82,11 @@
#include <cstdio>
--- src/storage.cpp.orig 2009-04-13 02:37:54.000000000 +0900
+++ src/storage.cpp 2009-04-29 15:56:16.000000000 +0900
@@ -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
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__FreeBSD__)
// for getattrlist()
+#ifdef __APPLE__
#include <sys/attr.h>
+#endif
#include <unistd.h>
// for statfs()
#include <sys/param.h>
@@ -496,7 +498,7 @@
@@ -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
@@ -458,17 +458,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
@@ -501,16 +501,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
@@ -558,17 +558,17 @@
m_mapped_files->rename_file(index, new_filename);
#ifndef BOOST_NO_EXCEPTIONS
}
@ -22,3 +78,35 @@
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
@@ -591,15 +591,15 @@
#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)
{
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

View File

@ -290,7 +290,7 @@ include/libtorrent/xml_parse.hpp
lib/libtorrent-rasterbar.a
lib/libtorrent-rasterbar.la
lib/libtorrent-rasterbar.so
lib/libtorrent-rasterbar.so.2
lib/libtorrent-rasterbar.so.3
libdata/pkgconfig/libtorrent-rasterbar.pc
@dirrm include/libtorrent/kademlia
@dirrm include/libtorrent/extensions