net-p2p/libtorrent-rasterbar-14||2012-07-01|Discontinued upstream, move to libtorrent-rasterbar-16

net-p2p/hrktorrent||2012-07-01|Relies on net-p2p/libtorrent-rasterbar-14, which has been discontinued
net-p2p/sharktorrent||2012-07-01|Relies on net-p2p/libtorrent-rasterbar-14, which has been discontinued

25 files changed, 3 insertions, 539 deletions

diff --git a/MOVED b/MOVED
index e1ad8f31998f..f7eb6b5da513 100644
--- a/MOVED
+++ b/MOVED
@@ -3534,3 +3534,6 @@ devel/py-sendfile|net/py-pysendfile|2012-06-24|Domain lapsed, forked
 www/joomla||2012-06-25|Unmaintained upstream, please use www/joomla25 instead.
 graphics/p5-chart|graphics/p5-Chart|2012-06-30|Move to a better place via repocopy
 textproc/libupskirt|textproc/libsoldout|2012-07-01|Move to respect upstream new name
+net-p2p/libtorrent-rasterbar-14||2012-07-01|Discontinued upstream, move to libtorrent-rasterbar-16
+net-p2p/hrktorrent||2012-07-01|Relies on net-p2p/libtorrent-rasterbar-14, which has been discontinued
+net-p2p/sharktorrent||2012-07-01|Relies on net-p2p/libtorrent-rasterbar-14, which has been discontinued
diff --git a/net-p2p/Makefile b/net-p2p/Makefile
index 074ce22d9a29..b27c482d08cd 100644
--- a/net-p2p/Makefile
+++ b/net-p2p/Makefile
@@ -34,7 +34,6 @@
     SUBDIR += gtk-gnutella
     SUBDIR += gtkhx
     SUBDIR += gtorrentviewer
-    SUBDIR += hrktorrent
     SUBDIR += i2p
     SUBDIR += jigdo
     SUBDIR += kmldonkey
@@ -46,7 +45,6 @@
     SUBDIR += libpdtp
     SUBDIR += libtorrent
     SUBDIR += libtorrent-devel
-    SUBDIR += libtorrent-rasterbar-14
     SUBDIR += libtorrent-rasterbar-15
     SUBDIR += libtorrent-rasterbar-15-python
     SUBDIR += libtorrent-rasterbar-16
@@ -94,7 +92,6 @@
     SUBDIR += rtgui
     SUBDIR += rtorrent
     SUBDIR += rtorrent-devel
-    SUBDIR += sharktorrent
     SUBDIR += solidcoin
     SUBDIR += squall
     SUBDIR += teknap
diff --git a/net-p2p/hrktorrent/Makefile b/net-p2p/hrktorrent/Makefile
deleted file mode 100644
index eadf96605c3b..000000000000
--- a/net-p2p/hrktorrent/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Ports collection makefile for:	hrktorrent
-# Date created:				Jun 29, 2008
-# Whom:					hrkfrd@gmail.com
-#
-# $FreeBSD$
-#
-
-PORTNAME=	hrktorrent
-PORTVERSION=	0.3.5
-PORTREVISION=	1
-CATEGORIES=	net-p2p
-MASTER_SITES=	http://50hz.ws/hrktorrent/
-
-MAINTAINER=	hrkfdn@gmail.com
-COMMENT=	A light console torrent client using rasterbar's libtorrent
-
-DEPRECATED=	Depends on net-p2p/libtorrent-rasterbar-14, which is DEPRECATED
-EXPIRATION_DATE=	2012-06-30
-
-LIB_DEPENDS=	torrent-rasterbar.5:${PORTSDIR}/net-p2p/libtorrent-rasterbar-14
-
-USE_GNOME=	pkgconfig
-USE_BZIP2=	yes
-
-PLIST_FILES=	bin/hrktorrent \
-		share/examples/hrktorrent/hrktorrent.rc
-PLIST_DIRS=	share/examples/hrktorrent
-
-MAN1=		hrktorrent.1
-MANCOMPRESSED=	no
-
-SUB_FILES=	pkg-message
-
-post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/hrktorrent
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/net-p2p/hrktorrent/distinfo b/net-p2p/hrktorrent/distinfo
deleted file mode 100644
index 35804df1fb50..000000000000
--- a/net-p2p/hrktorrent/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (hrktorrent-0.3.5.tar.bz2) = b9cdc75fb0f07963e7938ecc7c088271c9a29471cde0ce5c9739656793d19fa8
-SIZE (hrktorrent-0.3.5.tar.bz2) = 8950
diff --git a/net-p2p/hrktorrent/files/patch-hrktorrent.h b/net-p2p/hrktorrent/files/patch-hrktorrent.h
deleted file mode 100644
index 0da691e1b860..000000000000
--- a/net-p2p/hrktorrent/files/patch-hrktorrent.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- hrktorrent.h.orig	2010-12-14 18:09:28.000000000 +0300
-+++ hrktorrent.h	2010-12-14 18:09:40.000000000 +0300
-@@ -6,6 +6,7 @@
- #include <iterator>
- #include <exception>
- 
-+#include <signal.h>
- #include <sys/mman.h>
- #include <sys/types.h>
- #include <sys/stat.h>
diff --git a/net-p2p/hrktorrent/files/pkg-message.in b/net-p2p/hrktorrent/files/pkg-message.in
deleted file mode 100644
index 8ec57fad6541..000000000000
--- a/net-p2p/hrktorrent/files/pkg-message.in
+++ /dev/null
@@ -1,7 +0,0 @@
-=================================================================
-A default hrktorrent.rc config has been installed to:
- %%EXAMPLESDIR%%/hrktorrent.rc
-Copy it to ~/.hrktorrent/ and modify it. 
-To use the IPFilter, move the rulefile the same dir and name it:
- ipfilter.dat.
-=================================================================
diff --git a/net-p2p/hrktorrent/pkg-descr b/net-p2p/hrktorrent/pkg-descr
deleted file mode 100644
index 5c72fbf8045b..000000000000
--- a/net-p2p/hrktorrent/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-hrktorrent is a light console torrent client using rasterbar's libtorrent.
-It supports the IPFilter and DHT implementation of libtorrent.
-It is aimed to be light and fast.
-
-WWW: http://henrik.unit5.ca/hrktorrent/
diff --git a/net-p2p/libtorrent-rasterbar-14/Makefile b/net-p2p/libtorrent-rasterbar-14/Makefile
deleted file mode 100644
index 7b17d0c4d6b7..000000000000
--- a/net-p2p/libtorrent-rasterbar-14/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-# New ports collection makefile for:	libtorrent-rasterbar-14
-# Date created:				14 February 2010
-# Whom:					dougb@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libtorrent-rasterbar
-PORTVERSION=	0.14.12
-PORTREVISION=	2
-CATEGORIES=	net-p2p ipv6
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-PROJECTHOST=	libtorrent
-
-MAINTAINER=	dougb@FreeBSD.org
-COMMENT=	A C++ library implementing a BitTorrent client
-
-DEPRECATED=	Upstream development stopped, time to move on
-EXPIRATION_DATE=	2012-06-30
-
-LIB_DEPENDS=	boost_date_time.4:${PORTSDIR}/devel/boost-libs \
-		GeoIP.5:${PORTSDIR}/net/GeoIP
-
-MAKE_JOBS_SAFE=	yes
-
-CONFLICTS=	libtorrent-rasterbar-0.1[2356789].*
-
-USE_GNOME=	gnomehack
-USE_OPENSSL=	yes
-USE_AUTOTOOLS=	aclocal automake autoconf libtool
-ACLOCAL_ARGS=	-I m4
-CONFIGURE_ARGS=	--disable-debug \
-		--disable-python-binding \
-		--disable-examples \
-		--with-boost-regex=no \
-		--with-boost-program-options=no \
-		--with-boost=${LOCALBASE} \
-		--with-boost-asio=boost_system \
-		--with-boost-system=boost_system \
-		--with-boost-filesystem=boost_filesystem \
-		--with-boost-thread=boost_thread \
-		--with-dht=on \
-		--with-encryption=on \
-		--with-libgeoip \
-		--with-zlib=system
-USE_LDCONFIG=	yes
-
-CPPFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=	*
-.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' \
-		 ${WRKSRC}/src/Makefile.am
-	@${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Dist
-	@${SED} -e 's#COMPILETIME_OPTIONS+="#COMPILETIME_OPTIONS="$$COMPILETIME_OPTIONS #g' \
-		${WRKSRC}/configure.Dist > ${WRKSRC}/configure
-
-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-14/distinfo b/net-p2p/libtorrent-rasterbar-14/distinfo
deleted file mode 100644
index d3d254047f3e..000000000000
--- a/net-p2p/libtorrent-rasterbar-14/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (libtorrent-rasterbar-0.14.12.tar.gz) = 046e2b83fb796f0cd2d7183dc31b978d6dd028e8c084fac1ec5dc93bc7ac1f40
-SIZE (libtorrent-rasterbar-0.14.12.tar.gz) = 1989687
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-configure.in b/net-p2p/libtorrent-rasterbar-14/files/patch-configure.in
deleted file mode 100644
index dc9b8e0c1f3f..000000000000
--- a/net-p2p/libtorrent-rasterbar-14/files/patch-configure.in
+++ /dev/null
@@ -1,38 +0,0 @@
---- configure.in.orig	2010-01-09 12:47:10.000000000 -0200
-+++ configure.in	2010-02-26 21:34:51.000000000 -0300
-@@ -419,7 +419,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)
-@@ -481,7 +481,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
-@@ -496,7 +496,7 @@
- 	[case "$enableval" in
- 		no)
- 			AC_DEFINE(NDEBUG,,[Define to disable debugging])
--			DEBUGFLAGS="-Os"
-+			DEBUGFLAGS=""
- #			COMPILETIME_OPTIONS+="-DNDEBUG "
- 			;;
- 		yes)
-@@ -509,7 +509,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/libtorrent-rasterbar-14/files/patch-include-libtorrent-create_torrent.hpp b/net-p2p/libtorrent-rasterbar-14/files/patch-include-libtorrent-create_torrent.hpp
deleted file mode 100644
index 1a5ede745a3f..000000000000
--- a/net-p2p/libtorrent-rasterbar-14/files/patch-include-libtorrent-create_torrent.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/libtorrent/create_torrent.hpp.orig	2012-01-27 21:05:27.000000000 +0300
-+++ include/libtorrent/create_torrent.hpp	2012-01-27 21:05:56.000000000 +0300
-@@ -152,7 +152,7 @@
- #if BOOST_VERSION < 103600
- 					std::string leaf = i->path().leaf();
- #else
--					std::string leaf = i->path().filename();
-+					std::string leaf = i->path().filename().string();
- #endif
- 					if (leaf == ".." || leaf == ".") continue;
- 					add_files_impl(fs, p, l / leaf, pred);
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-include-libtorrent-debug.hpp b/net-p2p/libtorrent-rasterbar-14/files/patch-include-libtorrent-debug.hpp
deleted file mode 100644
index 112b73bb973e..000000000000
--- a/net-p2p/libtorrent-rasterbar-14/files/patch-include-libtorrent-debug.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/libtorrent/debug.hpp.orig	2012-01-27 20:16:02.000000000 +0300
-+++ include/libtorrent/debug.hpp	2012-01-27 20:16:23.000000000 +0300
-@@ -64,7 +64,7 @@
- 			try
- 			{
- #endif
--				fs::path dir(fs::complete(logpath / ("libtorrent_logs" + boost::lexical_cast<std::string>(instance))));
-+				fs::path dir(fs::absolute(logpath / ("libtorrent_logs" + boost::lexical_cast<std::string>(instance))));
- 				if (!fs::exists(dir)) fs::create_directories(dir);
- 				m_file.open((dir / filename).string().c_str(), std::ios_base::out | (append ? std::ios_base::app : std::ios_base::out));
- 				*this << "\n\n\n*** starting log ***\n";
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-include_libtorrent_udp_socket.hpp b/net-p2p/libtorrent-rasterbar-14/files/patch-include_libtorrent_udp_socket.hpp
deleted file mode 100644
index f0e6903a97da..000000000000
--- a/net-p2p/libtorrent-rasterbar-14/files/patch-include_libtorrent_udp_socket.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/libtorrent/udp_socket.hpp.orig	2010-12-10 20:38:45.000000000 +0300
-+++ include/libtorrent/udp_socket.hpp	2010-12-10 20:39:05.000000000 +0300
-@@ -37,6 +37,7 @@
- #include "libtorrent/session_settings.hpp"
- #include "libtorrent/buffer.hpp"
- 
-+#include <list>
- #include <vector>
- #include <boost/function.hpp>
- #include <boost/thread/mutex.hpp>
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src-create_torrent.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src-create_torrent.cpp
deleted file mode 100644
index f3be87da0a67..000000000000
--- a/net-p2p/libtorrent-rasterbar-14/files/patch-src-create_torrent.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/create_torrent.cpp.orig	2010-01-19 04:42:35.000000000 +0300
-+++ src/create_torrent.cpp	2012-01-27 21:04:43.000000000 +0300
-@@ -217,7 +217,7 @@
- 					for (fs::path::iterator j = boost::next(i->path.begin());
- 						j != i->path.end(); ++j)
- 					{
--						path_e.list().push_back(entry(*j));
-+                                                path_e.list().push_back(entry((*j).string()));
- 					}
- 				}
- 			}
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src-file.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src-file.cpp
deleted file mode 100644
index 8f739d6d5f7b..000000000000
--- a/net-p2p/libtorrent-rasterbar-14/files/patch-src-file.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/file.cpp.orig	2012-01-27 20:46:48.000000000 +0300
-+++ src/file.cpp	2012-01-27 20:47:10.000000000 +0300
-@@ -207,7 +207,7 @@
- 			| S_IRGRP | S_IWGRP
- 			| S_IROTH | S_IWOTH;
- 
--		m_fd = ::open(path.external_file_string().c_str()
-+		m_fd = ::open(path.native().c_str()
- 			, map_open_mode(mode.m_mask), permissions);
- 
- 		if (m_fd == -1)
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src-file_storage.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src-file_storage.cpp
deleted file mode 100644
index 8005b61ef6c6..000000000000
--- a/net-p2p/libtorrent-rasterbar-14/files/patch-src-file_storage.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/file_storage.cpp.orig	2012-01-27 20:52:46.000000000 +0300
-+++ src/file_storage.cpp	2012-01-27 20:54:50.000000000 +0300
-@@ -147,9 +147,9 @@
- 		else
- 		{
- 			if (m_files.empty())
--				m_name = *file.begin();
-+                                m_name = (*file.begin()).string();
- 		}
--		TORRENT_ASSERT(m_name == *file.begin());
-+		TORRENT_ASSERT(m_name == (*file.begin()).string());
- 		file_entry e;
- 		m_files.push_back(e);
- 		m_files.back().size = size;
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src-logger.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src-logger.cpp
deleted file mode 100644
index 98b98117a919..000000000000
--- a/net-p2p/libtorrent-rasterbar-14/files/patch-src-logger.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/logger.cpp.orig	2012-01-27 20:49:39.000000000 +0300
-+++ src/logger.cpp	2012-01-27 20:49:56.000000000 +0300
-@@ -63,7 +63,7 @@
- 	{
- 		logger_peer_plugin(std::string const& filename)
- 		{
--			fs::path dir(fs::complete("libtorrent_ext_logs"));
-+			fs::path dir(fs::absolute("libtorrent_ext_logs"));
- 			if (!fs::exists(dir)) fs::create_directories(dir);
- 			m_file.open((dir / filename).string().c_str(), std::ios_base::out | std::ios_base::out);
- 			m_file << "\n\n\n";
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src-storage.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src-storage.cpp
deleted file mode 100644
index d018605a9f9f..000000000000
--- a/net-p2p/libtorrent-rasterbar-14/files/patch-src-storage.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
---- src/storage.cpp.orig	2010-09-06 03:59:03.000000000 +0400
-+++ src/storage.cpp	2012-01-27 20:39:22.000000000 +0300
-@@ -161,7 +161,7 @@
- 	template <class Path>
- 	void recursive_copy(Path const& old_path, Path const& new_path, error_code& ec)
- 	{
--		using boost::filesystem::basic_directory_iterator;
-+		using boost::filesystem::directory_iterator;
- #ifndef BOOST_NO_EXCEPTIONS
- 		try {
- #endif
-@@ -169,7 +169,7 @@
- 		if (is_directory(old_path))
- 		{
- 			create_directory(new_path);
--			for (basic_directory_iterator<Path> i(old_path), end; i != end; ++i)
-+			for (directory_iterator i(old_path), end; i != end; ++i)
- 			{
- #if BOOST_VERSION < 103600
- 				recursive_copy(i->path(), new_path / i->path().leaf(), ec);
-@@ -202,13 +202,13 @@
- 	template <class Path>
- 	void recursive_remove(Path const& old_path)
- 	{
--		using boost::filesystem::basic_directory_iterator;
-+		using boost::filesystem::directory_iterator;
- #ifndef BOOST_NO_EXCEPTIONS
- 		try {
- #endif
- 		if (is_directory(old_path))
- 		{
--			for (basic_directory_iterator<Path> i(old_path), end; i != end; ++i)
-+			for (directory_iterator i(old_path), end; i != end; ++i)
- 				recursive_remove(i->path());
- 			remove(old_path);
- 		}
-@@ -301,7 +301,7 @@
- 				|| (!compact_mode && size < s->first))
- 			{
- 				if (error) *error = "filesize mismatch for file '"
--					+ i->path.external_file_string()
-+					+ i->path.native()
- 					+ "', size: " + boost::lexical_cast<std::string>(size)
- 					+ ", expected to be " + boost::lexical_cast<std::string>(s->first)
- 					+ " bytes";
-@@ -314,7 +314,7 @@
- 				(!compact_mode && (time > s->second + 5 * 60 || time < s->second - 1)))
- 			{
- 				if (error) *error = "timestamp mismatch for file '"
--					+ i->path.external_file_string()
-+					+ i->path.native()
- 					+ "', modification date: " + boost::lexical_cast<std::string>(time)
- 					+ ", expected to have modification date "
- 					+ boost::lexical_cast<std::string>(s->second);
-@@ -334,7 +334,7 @@
- 			if (mapped) m_mapped_files.reset(new file_storage(*mapped));
- 
- 			TORRENT_ASSERT(m_files.begin() != m_files.end());
--			m_save_path = fs::complete(path);
-+			m_save_path = fs::absolute(path);
- 			TORRENT_ASSERT(m_save_path.is_complete());
- 		}
- 
-@@ -781,7 +781,7 @@
- 			{
- 				if (i->size != fs->first)
- 				{
--					error = "file size for '" + i->path.external_file_string()
-+					error = "file size for '" + i->path.native()
- 						+ "' was expected to be "
- 						+ boost::lexical_cast<std::string>(i->size) + " bytes";
- 					return false;
-@@ -828,7 +828,7 @@
- 		for (file_storage::iterator i = f.begin()
- 			, end(f.end()); i != end; ++i)
- 		{
--			to_move.insert(to_move.begin(), *i->path.begin());
-+                        to_move.insert(to_move.begin(), (*i->path.begin()).string());
- 		}
- 
- 		for (std::set<std::string>::const_iterator i = to_move.begin()
-@@ -1461,7 +1461,7 @@
- 	{
- 		if (m_storage->move_storage(save_path))
- 		{
--			m_save_path = fs::complete(save_path);
-+			m_save_path = fs::absolute(save_path);
- 			return 0;
- 		}
- 		return -1;
diff --git a/net-p2p/libtorrent-rasterbar-14/files/patch-src-torrent_info.cpp b/net-p2p/libtorrent-rasterbar-14/files/patch-src-torrent_info.cpp
deleted file mode 100644
index 82632ed24b04..000000000000
--- a/net-p2p/libtorrent-rasterbar-14/files/patch-src-torrent_info.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/torrent_info.cpp.orig	2012-01-27 20:42:54.000000000 +0300
-+++ src/torrent_info.cpp	2012-01-27 20:44:06.000000000 +0300
-@@ -199,7 +199,7 @@
- 		fs::path new_path;
- 		for (fs::path::const_iterator i = p.begin(); i != p.end(); ++i)
- 		{
--			if (!valid_path_element(*i)) continue;
-+                        if (!valid_path_element((*i).string())) continue;
- 			new_path /= *i;
- 		}
- 		TORRENT_ASSERT(!new_path.is_complete());
diff --git a/net-p2p/libtorrent-rasterbar-14/pkg-descr b/net-p2p/libtorrent-rasterbar-14/pkg-descr
deleted file mode 100644
index ac21ec4847b2..000000000000
--- a/net-p2p/libtorrent-rasterbar-14/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-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.
-
-The main goals of libtorrent are:
-
-* 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!
-
-WWW: http://www.rasterbar.com/products/libtorrent/index.html
diff --git a/net-p2p/libtorrent-rasterbar-14/pkg-plist b/net-p2p/libtorrent-rasterbar-14/pkg-plist
deleted file mode 100644
index 0192e50d3a9b..000000000000
--- a/net-p2p/libtorrent-rasterbar-14/pkg-plist
+++ /dev/null
@@ -1,108 +0,0 @@
-include/libtorrent/alert.hpp
-include/libtorrent/alert_types.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
-@dirrm include/libtorrent/kademlia
-@dirrm include/libtorrent/extensions
-@dirrm include/libtorrent/aux_
-@dirrm include/libtorrent
diff --git a/net-p2p/sharktorrent/Makefile b/net-p2p/sharktorrent/Makefile
deleted file mode 100644
index 03afed4e646e..000000000000
--- a/net-p2p/sharktorrent/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# New ports collection makefile for:	sharktorrent
-# Date created:				2007-04-25
-# Whom:					alepulver
-#
-# $FreeBSD$
-#
-
-PORTNAME=	sharktorrent
-PORTVERSION=	0.1.8.4
-PORTREVISION=	2
-CATEGORIES=	net-p2p
-MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-${PORTVERSION}-beta-src
-
-MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	C++ Bittorrent client using wxWidgets, libtorrent and boost
-
-DEPRECATED=	Depends on net-p2p/libtorrent-rasterbar-14, which is DEPRECATED
-EXPIRATION_DATE=	2012-06-30
-
-LIB_DEPENDS=	boost_filesystem.4:${PORTSDIR}/devel/boost-libs \
-		torrent-rasterbar.5:${PORTSDIR}/net-p2p/libtorrent-rasterbar-14
-
-USE_QT4=	qmake_build moc_build rcc_build corelib gui network
-MAKE_JOBS_SAFE=	yes
-
-PLIST_FILES=	bin/sharktorrent
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-post-patch:
-	${REINPLACE_CMD} -e 's|/opt|${LOCALBASE}|; s|-mt||' \
-		${WRKSRC}/src/src.pro
-
-do-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS} sharktorrent.pro
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/net-p2p/sharktorrent/distinfo b/net-p2p/sharktorrent/distinfo
deleted file mode 100644
index 305cfa655bfb..000000000000
--- a/net-p2p/sharktorrent/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (sharktorrent-0.1.8.4-beta-src.tar.gz) = cdadfd209c8de3415e5bfd4b406315320015f78a95c46cfff4c1e69e97b7d4fe
-SIZE (sharktorrent-0.1.8.4-beta-src.tar.gz) = 156638
diff --git a/net-p2p/sharktorrent/files/patch-src-stsession.cpp b/net-p2p/sharktorrent/files/patch-src-stsession.cpp
deleted file mode 100644
index 4dab388e4d58..000000000000
--- a/net-p2p/sharktorrent/files/patch-src-stsession.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/stsession.cpp.orig	2009-07-06 01:40:21.000000000 +0400
-+++ src/stsession.cpp	2010-02-17 19:01:03.000000000 +0300
-@@ -501,7 +501,7 @@
- 	for (std::vector<peer_info>::const_iterator i = peers.begin();

- 						i != peers.end(); ++i, _icount++)

- 	{

--		asio::ip::address _address =  i->ip.address();

-+		libtorrent::asio::ip::address _address =  i->ip.address();

- 

- 		m_map_peers[_icount].append( QString("%1").arg(_icount)  );

- 		m_map_peers[_icount].append( QString(_address.to_string().c_str()) );

diff --git a/net-p2p/sharktorrent/pkg-descr b/net-p2p/sharktorrent/pkg-descr
deleted file mode 100644
index a52786ef998a..000000000000
--- a/net-p2p/sharktorrent/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-sharktorrent is an open source/freeware bittorrent client written in c++. It
-uses wxWidgets, libtorrent and boost.
-
-WWW: http://sharktorrent.com/