diff --git a/net-p2p/libtorrent-rasterbar-14/Makefile b/net-p2p/libtorrent-rasterbar-14/Makefile index 8e65f92a18c8..22aba2e77cec 100644 --- a/net-p2p/libtorrent-rasterbar-14/Makefile +++ b/net-p2p/libtorrent-rasterbar-14/Makefile @@ -1,47 +1,47 @@ # New ports collection makefile for: rblibtorrent # Date created: 5 February 2006 # Whom: Johan Ström # # $FreeBSD$ # PORTNAME= libtorrent -PORTVERSION= 0.14.6 +PORTVERSION= 0.14.7 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} PKGNAMEPREFIX= rb PKGNAMESUFFIX= -devel DISTNAME= ${PORTNAME}-rasterbar-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A C++ library implementing a BitTorrent client (devel version) LIB_DEPENDS= boost_date_time.4:${PORTSDIR}/devel/boost-libs 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-filesystem=boost_filesystem \ --with-boost-thread=boost_thread \ --with-boost-regex=boost_regex \ --with-boost-program-options=boost_program_options \ --with-asio=shipped \ --with-zlib=system USE_LDCONFIG= yes CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} 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 .include diff --git a/net-p2p/libtorrent-rasterbar-14/distinfo b/net-p2p/libtorrent-rasterbar-14/distinfo index afa3b649b0f6..4c6cac07b2e1 100644 --- a/net-p2p/libtorrent-rasterbar-14/distinfo +++ b/net-p2p/libtorrent-rasterbar-14/distinfo @@ -1,3 +1,3 @@ -MD5 (libtorrent-rasterbar-0.14.6.tar.gz) = 1b5b91a5d0abb8cefef9f4195738e621 -SHA256 (libtorrent-rasterbar-0.14.6.tar.gz) = 98540fe765163e6f22d53462694aee4e4213606179974470ebe1d8adc02b5f56 -SIZE (libtorrent-rasterbar-0.14.6.tar.gz) = 1995813 +MD5 (libtorrent-rasterbar-0.14.7.tar.gz) = 6959f719245d82758235fd73d93373b2 +SHA256 (libtorrent-rasterbar-0.14.7.tar.gz) = 1ff89795c8433dfd9ba94d45f21048abcb73cf9f8b56eff9bdf34b5e3b41694b +SIZE (libtorrent-rasterbar-0.14.7.tar.gz) = 1938654 diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src__storage.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src__storage.cpp index 700b77976501..3bc14260d622 100644 --- a/net-p2p/libtorrent-rasterbar-14/files/patch-src__storage.cpp +++ b/net-p2p/libtorrent-rasterbar-14/files/patch-src__storage.cpp @@ -1,112 +1,114 @@ ---- src/storage.cpp.orig 2009-04-13 02:37:54.000000000 +0900 -+++ src/storage.cpp 2009-04-29 15:56:16.000000000 +0900 +--- 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 #include #include -#if BOOST_VERSION >= 103500 +#if 0 // BOOST_VERSION >= 103500 #include #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 -@@ -458,17 +458,17 @@ +@@ -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 -@@ -501,16 +501,16 @@ +@@ -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 -@@ -558,17 +558,17 @@ +@@ -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 -@@ -591,15 +591,15 @@ +@@ -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) { - set_error(p, e.code()); + // 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/Makefile b/net-p2p/rblibtorrent-devel/Makefile index 8e65f92a18c8..22aba2e77cec 100644 --- a/net-p2p/rblibtorrent-devel/Makefile +++ b/net-p2p/rblibtorrent-devel/Makefile @@ -1,47 +1,47 @@ # New ports collection makefile for: rblibtorrent # Date created: 5 February 2006 # Whom: Johan Ström # # $FreeBSD$ # PORTNAME= libtorrent -PORTVERSION= 0.14.6 +PORTVERSION= 0.14.7 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} PKGNAMEPREFIX= rb PKGNAMESUFFIX= -devel DISTNAME= ${PORTNAME}-rasterbar-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A C++ library implementing a BitTorrent client (devel version) LIB_DEPENDS= boost_date_time.4:${PORTSDIR}/devel/boost-libs 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-filesystem=boost_filesystem \ --with-boost-thread=boost_thread \ --with-boost-regex=boost_regex \ --with-boost-program-options=boost_program_options \ --with-asio=shipped \ --with-zlib=system USE_LDCONFIG= yes CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} 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 .include diff --git a/net-p2p/rblibtorrent-devel/distinfo b/net-p2p/rblibtorrent-devel/distinfo index afa3b649b0f6..4c6cac07b2e1 100644 --- a/net-p2p/rblibtorrent-devel/distinfo +++ b/net-p2p/rblibtorrent-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (libtorrent-rasterbar-0.14.6.tar.gz) = 1b5b91a5d0abb8cefef9f4195738e621 -SHA256 (libtorrent-rasterbar-0.14.6.tar.gz) = 98540fe765163e6f22d53462694aee4e4213606179974470ebe1d8adc02b5f56 -SIZE (libtorrent-rasterbar-0.14.6.tar.gz) = 1995813 +MD5 (libtorrent-rasterbar-0.14.7.tar.gz) = 6959f719245d82758235fd73d93373b2 +SHA256 (libtorrent-rasterbar-0.14.7.tar.gz) = 1ff89795c8433dfd9ba94d45f21048abcb73cf9f8b56eff9bdf34b5e3b41694b +SIZE (libtorrent-rasterbar-0.14.7.tar.gz) = 1938654 diff --git a/net-p2p/rblibtorrent-devel/files/patch-src__storage.cpp b/net-p2p/rblibtorrent-devel/files/patch-src__storage.cpp index 700b77976501..3bc14260d622 100644 --- a/net-p2p/rblibtorrent-devel/files/patch-src__storage.cpp +++ b/net-p2p/rblibtorrent-devel/files/patch-src__storage.cpp @@ -1,112 +1,114 @@ ---- src/storage.cpp.orig 2009-04-13 02:37:54.000000000 +0900 -+++ src/storage.cpp 2009-04-29 15:56:16.000000000 +0900 +--- 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 #include #include -#if BOOST_VERSION >= 103500 +#if 0 // BOOST_VERSION >= 103500 #include #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 -@@ -458,17 +458,17 @@ +@@ -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 -@@ -501,16 +501,16 @@ +@@ -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 -@@ -558,17 +558,17 @@ +@@ -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 -@@ -591,15 +591,15 @@ +@@ -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) { - set_error(p, e.code()); + // 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