6 files changed, 10 insertions, 80 deletions

diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile
index 52ec958ca4fe..d04db0b66528 100644
--- a/net-p2p/ktorrent/Makefile
+++ b/net-p2p/ktorrent/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ktorrent
-DISTVERSION=	4.3.0
-PORTREVISION=	1
+DISTVERSION=	4.3.1
 CATEGORIES=	net-p2p kde
 MASTER_SITES=	http://ktorrent.org/downloads/${DISTVERSION}/
 
@@ -23,7 +22,7 @@ MAKE_JOBS_SAFE=	yes
 
 CONFLICTS_BUILD=	ktorrent-2*
 
-SHLIB_VER=	14.0.0
+SHLIB_VER=	15.0.0
 PLIST_SUB+=	SHLIB_VER=${SHLIB_VER} \
 		SHLIB_SHVER=${SHLIB_VER:R:R}
 
diff --git a/net-p2p/ktorrent/distinfo b/net-p2p/ktorrent/distinfo
index 3847cfcae789..75698c3ef2e9 100644
--- a/net-p2p/ktorrent/distinfo
+++ b/net-p2p/ktorrent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ktorrent-4.3.0.tar.bz2) = 6e3a7d12d351cad0e40b87562556f07ce9ee1378048f99073c6bac7b971483ed
-SIZE (ktorrent-4.3.0.tar.bz2) = 2983013
+SHA256 (ktorrent-4.3.1.tar.bz2) = 66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1
+SIZE (ktorrent-4.3.1.tar.bz2) = 2943708
diff --git a/net-p2p/ktorrent/files/patch-ktorrent__core.cpp b/net-p2p/ktorrent/files/patch-ktorrent__core.cpp
deleted file mode 100644
index c5f146054f64..000000000000
--- a/net-p2p/ktorrent/files/patch-ktorrent__core.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./ktorrent/core.cpp.orig	2012-09-01 08:59:57.000000000 +0000
-+++ ./ktorrent/core.cpp	2012-09-23 19:02:36.644549119 +0000
-@@ -1206,26 +1206,6 @@
- 
- 	bool Core::checkMissingFiles(TorrentInterface* tc)
- 	{
--		QStringList not_mounted;
--		while(!tc->isStorageMounted(not_mounted))
--		{
--			QString msg = i18n("One or more storage volumes are not mounted. In order to start this torrent, they need to be mounted.");
--			KGuiItem retry(i18n("Retry"), "emblem-mounted");
--			if(KMessageBox::warningContinueCancelList(gui, msg, not_mounted, QString(), retry) == KMessageBox::Continue)
--			{
--				not_mounted.clear();
--				continue;
--			}
--			else
--			{
--				if(not_mounted.size() == 1)
--					tc->handleError(i18n("Storage volume %1 is not mounted", not_mounted.first()));
--				else
--					tc->handleError(i18n("Storage volumes %1 are not mounted", not_mounted.join(", ")));
--				return false;
--			}
--		}
--
- 		QStringList missing;
- 		if(!tc->hasMissingFiles(missing))
- 			return true;
diff --git a/net-p2p/libktorrent/Makefile b/net-p2p/libktorrent/Makefile
index 7b801a4621af..192227be248c 100644
--- a/net-p2p/libktorrent/Makefile
+++ b/net-p2p/libktorrent/Makefile
@@ -1,15 +1,15 @@
 # $FreeBSD$
 
 PORTNAME=	libktorrent
-DISTVERSION=	1.3.0
-PORTREVISION=	2
+DISTVERSION=	1.3.1
 CATEGORIES=	net-p2p kde
 MASTER_SITES=	http://ktorrent.org/downloads/${DISTVERSION:C,^1,4,:C,-.*,,}/
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Torrent library split from KTorrent
 
-LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp \
+LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
+		gmp:${PORTSDIR}/math/gmp \
 		qca:${PORTSDIR}/devel/qca \
 		boost_thread:${PORTSDIR}/devel/boost-libs
 
@@ -21,7 +21,7 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
-SHLIB_VER=	5.0.0
+SHLIB_VER=	5.0.1
 PLIST_SUB+=	SHLIB_VER=${SHLIB_VER} \
 		SHLIB_SHVER=${SHLIB_VER:R:R}
 
diff --git a/net-p2p/libktorrent/distinfo b/net-p2p/libktorrent/distinfo
index bd2a8df18ea0..ab9a2a8e2f53 100644
--- a/net-p2p/libktorrent/distinfo
+++ b/net-p2p/libktorrent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libktorrent-1.3.0.tar.bz2) = 8ac79a937dfc9f6617dc584d9b3bbe01295333f759dae8dd29db309d56d9f144
-SIZE (libktorrent-1.3.0.tar.bz2) = 884917
+SHA256 (libktorrent-1.3.1.tar.bz2) = 2fe11ccb4bf2028c3da11e52cde890f1b3a90560e548eac89a4f8e1558b09725
+SIZE (libktorrent-1.3.1.tar.bz2) = 863105
diff --git a/net-p2p/libktorrent/files/patch-src__net__serversocket.cpp b/net-p2p/libktorrent/files/patch-src__net__serversocket.cpp
deleted file mode 100644
index 7ca43adf20be..000000000000
--- a/net-p2p/libktorrent/files/patch-src__net__serversocket.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 881ef5274f281f52eab974a72e6c9a3c74157ead
-Author: Joris Guisson <joris.guisson@gmail.com>
-Date:   Thu Jan 3 18:51:13 2013 +0100
-
-    Fix bug causing UDP connections not to get established on FreeBSD because FIONREAD returns the size of the data and the peer address
-    
-    REVIEW: 108076
-
-diff --git a/src/net/serversocket.cpp b/src/net/serversocket.cpp
-index 5d39433..399b4b1 100644
---- ./src/net/serversocket.cpp
-+++ ./src/net/serversocket.cpp
-@@ -133,9 +133,10 @@ namespace net
- 		{
- 			// The first packet may be 0 bytes in size
- 			Buffer::Ptr buf = d->pool->get(ba < 1500 ? 1500 : ba);
--			if (d->sock->recvFrom(buf->get(), ba, addr) == (int)ba && ba > 0)
-+			int bytes_read = d->sock->recvFrom(buf->get(), ba, addr);
-+			if (bytes_read <= (int)ba && ba > 0)
- 			{
--				buf->setSize(ba);
-+                buf->setSize(bytes_read);
- 				d->dhandler->dataReceived(buf, addr);
- 			}
- 			first = false;
-@@ -154,7 +155,6 @@ namespace net
- 			d->rsn->setEnabled(on);
- 	}
- 
--	
- 	void ServerSocket::readyToWrite(int)
- 	{
- 		d->dhandler->readyToWrite(this);
-@@ -186,6 +186,5 @@ namespace net
- 			return false;
- 	}
- 
--
- }
-