8 files changed, 33 insertions, 35 deletions

diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile
index 0929d573aa7f..07a702f20387 100644
--- a/net-p2p/ktorrent/Makefile
+++ b/net-p2p/ktorrent/Makefile
@@ -6,18 +6,15 @@
 #
 
 PORTNAME=	ktorrent
-DISTVERSION=	4.1.3
-PORTREVISION=	1
+DISTVERSION=	4.2.0
 CATEGORIES=	net-p2p kde
 MASTER_SITES=	http://ktorrent.org/downloads/${DISTVERSION}/
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	BitTorrent client for KDE
 
-LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
-		qca.2:${PORTSDIR}/devel/qca \
-		tag.1:${PORTSDIR}/audio/taglib \
-		ktorrent.3:${PORTSDIR}/net-p2p/libktorrent
+LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib \
+		ktorrent.4:${PORTSDIR}/net-p2p/libktorrent
 
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4 pimlibs workspace
@@ -30,8 +27,10 @@ MAKE_JOBS_SAFE=	yes
 
 CONFLICTS_BUILD=	ktorrent-2*
 
-SHLIB_VER=	12.0.2
+SHLIB_VER=	13.0.0
 PLIST_SUB+=	SHLIB_VER=${SHLIB_VER} \
 		SHLIB_SHVER=${SHLIB_VER:R:R}
 
+CMAKE_ARGS+=	-DENABLE_KIO_MAGNET=1
+
 .include <bsd.port.mk>
diff --git a/net-p2p/ktorrent/distinfo b/net-p2p/ktorrent/distinfo
index dd8b0cdfe0e6..a70ff9850312 100644
--- a/net-p2p/ktorrent/distinfo
+++ b/net-p2p/ktorrent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ktorrent-4.1.3.tar.bz2) = 2f852f4ffdda976af38b85bf532e7d353dcf7b7dd7135a66af834543eb420646
-SIZE (ktorrent-4.1.3.tar.bz2) = 2959837
+SHA256 (ktorrent-4.2.0.tar.bz2) = f625b1dc116c94d97ce3b56a7a259b07d95f6592b709596319bf16bb06cf6422
+SIZE (ktorrent-4.2.0.tar.bz2) = 3083219
diff --git a/net-p2p/ktorrent/pkg-plist b/net-p2p/ktorrent/pkg-plist
index 0d7c588e8b4b..d79a81475f9c 100644
--- a/net-p2p/ktorrent/pkg-plist
+++ b/net-p2p/ktorrent/pkg-plist
@@ -223,6 +223,7 @@ share/locale/ar/LC_MESSAGES/ktorrent.mo
 share/locale/ast/LC_MESSAGES/ktorrent.mo
 share/locale/be/LC_MESSAGES/ktorrent.mo
 share/locale/bg/LC_MESSAGES/ktorrent.mo
+share/locale/bs/LC_MESSAGES/ktorrent.mo
 share/locale/ca/LC_MESSAGES/ktorrent.mo
 share/locale/ca@valencia/LC_MESSAGES/ktorrent.mo
 share/locale/cs/LC_MESSAGES/ktorrent.mo
@@ -246,6 +247,7 @@ share/locale/is/LC_MESSAGES/ktorrent.mo
 share/locale/it/LC_MESSAGES/ktorrent.mo
 share/locale/ja/LC_MESSAGES/ktorrent.mo
 share/locale/km/LC_MESSAGES/ktorrent.mo
+share/locale/ku/LC_MESSAGES/ktorrent.mo
 share/locale/lt/LC_MESSAGES/ktorrent.mo
 share/locale/lv/LC_MESSAGES/ktorrent.mo
 share/locale/mai/LC_MESSAGES/ktorrent.mo
@@ -264,6 +266,7 @@ share/locale/se/LC_MESSAGES/ktorrent.mo
 share/locale/si/LC_MESSAGES/ktorrent.mo
 share/locale/sk/LC_MESSAGES/ktorrent.mo
 share/locale/sl/LC_MESSAGES/ktorrent.mo
+share/locale/sq/LC_MESSAGES/ktorrent.mo
 share/locale/sr/LC_MESSAGES/ktorrent.mo
 share/locale/sr@ijekavian/LC_MESSAGES/ktorrent.mo
 share/locale/sr@ijekavianlatin/LC_MESSAGES/ktorrent.mo
diff --git a/net-p2p/libktorrent/Makefile b/net-p2p/libktorrent/Makefile
index 3eba2d39b5ed..f8917c99c73e 100644
--- a/net-p2p/libktorrent/Makefile
+++ b/net-p2p/libktorrent/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libktorrent
-DISTVERSION=	1.1.3
-PORTREVISION=	1
+DISTVERSION=	1.2.0
 CATEGORIES=	net-p2p kde
 MASTER_SITES=	http://ktorrent.org/downloads/${DISTVERSION:S,^1,4,}/
 
@@ -27,7 +26,7 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
-SHLIB_VER=	3.0.3
+SHLIB_VER=	4.0.0
 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 1d86e7c8f02a..5f64a4cec31f 100644
--- a/net-p2p/libktorrent/distinfo
+++ b/net-p2p/libktorrent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libktorrent-1.1.3.tar.bz2) = b6a0c9f2e2a9ce0bb16cb3b82cac894ab43bdaaa95736a26f41778d7aae97b57
-SIZE (libktorrent-1.1.3.tar.bz2) = 922651
+SHA256 (libktorrent-1.2.0.tar.bz2) = 24801cd43dfb78a5b8f4c468283dc774ad4025f1bf71909d79344414a8ff8298
+SIZE (libktorrent-1.2.0.tar.bz2) = 919037
diff --git a/net-p2p/libktorrent/files/patch-src__net__address.cpp b/net-p2p/libktorrent/files/patch-src__net__address.cpp
new file mode 100644
index 000000000000..e379162cbed6
--- /dev/null
+++ b/net-p2p/libktorrent/files/patch-src__net__address.cpp
@@ -0,0 +1,10 @@
+--- ./src/net/address.cpp.orig	2012-02-28 17:35:19.000000000 +0000
++++ ./src/net/address.cpp	2012-03-06 13:36:25.728553394 +0000
+@@ -21,6 +21,7 @@
+ #include "address.h"
+ #include <arpa/inet.h>
+ #include <util/log.h>
++#include <sys/socket.h>
+ 
+ using namespace bt;
+ 
diff --git a/net-p2p/libktorrent/files/patch-src__net__socket.cpp b/net-p2p/libktorrent/files/patch-src__net__socket.cpp
deleted file mode 100644
index 8b459b5412f5..000000000000
--- a/net-p2p/libktorrent/files/patch-src__net__socket.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./src/net/socket.cpp.orig	2010-06-14 20:29:14.000000000 +0400
-+++ ./src/net/socket.cpp	2010-06-16 01:32:57.006817314 +0400
-@@ -54,6 +54,15 @@
- #define errno WSAGetLastError()
- #endif
- #include <kdebug.h>
-+
-+#ifndef SOL_IP
-+#define SOL_IP IPPROTO_IP
-+#endif
-+
-+#ifndef SOL_IPV6
-+#define SOL_IPV6 IPPROTO_IPV6
-+#endif
-+
- using namespace bt;
- 
- namespace net
diff --git a/net-p2p/libktorrent/pkg-plist b/net-p2p/libktorrent/pkg-plist
index 779dddecb342..9f49b36948bf 100644
--- a/net-p2p/libktorrent/pkg-plist
+++ b/net-p2p/libktorrent/pkg-plist
@@ -68,14 +68,15 @@ include/libktorrent/migrate/ccmigrate.h
 include/libktorrent/migrate/migrate.h
 include/libktorrent/mse/bigint.h
 include/libktorrent/mse/encryptedauthenticate.h
+include/libktorrent/mse/encryptedpacketsocket.h
 include/libktorrent/mse/encryptedserverauthenticate.h
 include/libktorrent/mse/functions.h
 include/libktorrent/mse/rc4encryptor.h
-include/libktorrent/mse/streamsocket.h
 include/libktorrent/net/address.h
-include/libktorrent/net/bufferedsocket.h
+include/libktorrent/net/addressresolver.h
 include/libktorrent/net/downloadthread.h
 include/libktorrent/net/networkthread.h
+include/libktorrent/net/packetsocket.h
 include/libktorrent/net/poll.h
 include/libktorrent/net/portlist.h
 include/libktorrent/net/reverseresolver.h
@@ -86,6 +87,8 @@ include/libktorrent/net/socketgroup.h
 include/libktorrent/net/socketmonitor.h
 include/libktorrent/net/socks.h
 include/libktorrent/net/speed.h
+include/libktorrent/net/streamsocket.h
+include/libktorrent/net/trafficshapedsocket.h
 include/libktorrent/net/uploadthread.h
 include/libktorrent/net/wakeuppipe.h
 include/libktorrent/peer/accessmanager.h
@@ -94,7 +97,6 @@ include/libktorrent/peer/authenticatebase.h
 include/libktorrent/peer/authenticationmonitor.h
 include/libktorrent/peer/chunkcounter.h
 include/libktorrent/peer/packetreader.h
-include/libktorrent/peer/packetwriter.h
 include/libktorrent/peer/peer.h
 include/libktorrent/peer/peerconnector.h
 include/libktorrent/peer/peerdownloader.h
@@ -134,6 +136,7 @@ include/libktorrent/upnp/upnprouter.h
 include/libktorrent/util/array.h
 include/libktorrent/util/autorotatelogjob.h
 include/libktorrent/util/bitset.h
+include/libktorrent/util/bufferpool.h
 include/libktorrent/util/circularbuffer.h
 include/libktorrent/util/compressfilejob.h
 include/libktorrent/util/constants.h
@@ -158,6 +161,7 @@ include/libktorrent/util/win32.h
 include/libktorrent/utp/connection.h
 include/libktorrent/utp/delaywindow.h
 include/libktorrent/utp/localwindow.h
+include/libktorrent/utp/packetbuffer.h
 include/libktorrent/utp/pollpipe.h
 include/libktorrent/utp/remotewindow.h
 include/libktorrent/utp/timevalue.h
@@ -174,6 +178,7 @@ share/locale/ar/LC_MESSAGES/libktorrent.mo
 share/locale/ast/LC_MESSAGES/libktorrent.mo
 share/locale/be/LC_MESSAGES/libktorrent.mo
 share/locale/bg/LC_MESSAGES/libktorrent.mo
+share/locale/bs/LC_MESSAGES/libktorrent.mo
 share/locale/ca/LC_MESSAGES/libktorrent.mo
 share/locale/ca@valencia/LC_MESSAGES/libktorrent.mo
 share/locale/cs/LC_MESSAGES/libktorrent.mo