6 files changed, 55 insertions, 72 deletions

diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile
index a06280e1b2bd..1f50d8885b24 100644
--- a/net-p2p/ktorrent/Makefile
+++ b/net-p2p/ktorrent/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	ktorrent
-PORTVERSION=	4.0.5
-PORTREVISION=	1
+DISTVERSION=	4.1.0
 CATEGORIES=	net-p2p kde
-MASTER_SITES=	http://ktorrent.org/downloads/${PORTVERSION}/
+MASTER_SITES=	http://ktorrent.org/downloads/${DISTVERSION}/
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	BitTorrent client for KDE
@@ -17,10 +16,10 @@ COMMENT=	BitTorrent client for KDE
 LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
 		qca.2:${PORTSDIR}/devel/qca \
 		tag.1:${PORTSDIR}/audio/taglib \
-		ktorrent.2:${PORTSDIR}/net-p2p/libktorrent
+		ktorrent.3:${PORTSDIR}/net-p2p/libktorrent
 
 USE_BZIP2=	yes
-USE_KDE4=	kdelibs kdehier kdeprefix automoc4
+USE_KDE4=	kdelibs kdehier kdeprefix automoc4 pimlibs workspace
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
@@ -28,36 +27,8 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	SYNDICATION "Enable RSS/Atom plugin" on \
-		PLASMA "Enable Ktorrent Plasma applet" on
-
-.include <bsd.port.options.mk>
-
 .if exists(${LOCALBASE}/lib/libktorrent-2.2.8.so)
 IGNORE=	fails to build with net-p2p/ktorrent2 installed. Deinstall it first
 .endif
 
-.if !defined(WITHOUT_SYNDICATION)
-USE_KDE4+=	pimlibs
-PLIST_SUB+=	SYNDICATION=""
-.else
-CMAKE_ARGS+=	-DENABLE_SYNDICATION_PLUGIN=false
-PLIST_SUB+=	SYNDICATION="@comment "
-.endif
-
-.if !defined(WITHOUT_PLASMA)
-USE_KDE4+=	workspace
-PLIST_SUB+=	PLASMA=""
-.else
-PLIST_SUB+=	PLASMA="@comment "
-.endif
-
-pre-configure:
-.if defined(WITHOUT_PLASMA)
-	${REINPLACE_CMD} -e '/add_subdirectory(applet)/d' \
-		${WRKSRC}/plasma/CMakeLists.txt
-	${REINPLACE_CMD} -e '/^macro_kt_plugin.*shutdown/d' \
-		${WRKSRC}/plugins/CMakeLists.txt
-.endif
-
 .include <bsd.port.mk>
diff --git a/net-p2p/ktorrent/distinfo b/net-p2p/ktorrent/distinfo
index e9e005101b9a..9d4ba9ac8f74 100644
--- a/net-p2p/ktorrent/distinfo
+++ b/net-p2p/ktorrent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ktorrent-4.0.5.tar.bz2) = d6b199be0d24933da55c5eee8d13d22fda03b7098aca59e4468387c25206fecd
-SIZE (ktorrent-4.0.5.tar.bz2) = 2813499
+SHA256 (ktorrent-4.1.0.tar.bz2) = aa2b1133f7a42b6112ff9d55b2b441b9c8df041938e33c5246bb0d1da284aa6e
+SIZE (ktorrent-4.1.0.tar.bz2) = 2918327
diff --git a/net-p2p/ktorrent/pkg-plist b/net-p2p/ktorrent/pkg-plist
index 370b8805454c..9473347d0b29 100644
--- a/net-p2p/ktorrent/pkg-plist
+++ b/net-p2p/ktorrent/pkg-plist
@@ -1,6 +1,7 @@
 bin/ktmagnetdownloader
 bin/ktorrent
 bin/ktupnptest
+lib/kde4/kio_magnet.so
 lib/kde4/ktbwschedulerplugin.so
 lib/kde4/ktdownloadorderplugin.so
 lib/kde4/ktinfowidgetplugin.so
@@ -11,29 +12,29 @@ lib/kde4/ktmediaplayerplugin.so
 lib/kde4/ktscanfolderplugin.so
 lib/kde4/ktscriptingplugin.so
 lib/kde4/ktsearchplugin.so
-%%PLASMA%%lib/kde4/ktshutdownplugin.so
+lib/kde4/ktshutdownplugin.so
 lib/kde4/ktstatsplugin.so
-%%SYNDICATION%%lib/kde4/ktsyndicationplugin.so
+lib/kde4/ktsyndicationplugin.so
 lib/kde4/ktupnpplugin.so
 lib/kde4/ktwebinterfaceplugin.so
 lib/kde4/ktzeroconfplugin.so
-%%PLASMA%%lib/kde4/plasma_applet_ktorrent.so
+lib/kde4/plasma_applet_ktorrent.so
 lib/kde4/plasma_engine_ktorrent.so
 lib/libktcore.so
-lib/libktcore.so.11
-lib/libktcore.so.11.0.4
-lib/libktupnp.so
-lib/libktupnp.so.4
-lib/libktupnp.so.4.0.2
+lib/libktcore.so.12
+lib/libktcore.so.12.0.0
 share/applications/kde4/ktorrent.desktop
+share/apps/ktorrent/ktbwschedulerpluginui.rc
 share/apps/ktorrent/ktdownloadorderpluginui.rc
 share/apps/ktorrent/ktmagnetgeneratorpluginui.rc
 share/apps/ktorrent/ktmediaplayerpluginui.rc
 share/apps/ktorrent/ktorrent.notifyrc
 share/apps/ktorrent/ktorrentui.rc
+share/apps/ktorrent/ktscriptingpluginui.rc
 share/apps/ktorrent/ktsearchpluginui.rc
-%%PLASMA%%share/apps/ktorrent/ktshutdownpluginui.rc
-%%SYNDICATION%%share/apps/ktorrent/ktsyndicationpluginui.rc
+share/apps/ktorrent/ktshutdownpluginui.rc
+share/apps/ktorrent/ktsyndicationpluginui.rc
+share/apps/ktorrent/kttorrentactivityui.rc
 share/apps/ktorrent/opensearch/bitenova/opensearch.xml
 share/apps/ktorrent/opensearch/bittorrent/opensearch.xml
 share/apps/ktorrent/opensearch/btjunkie/opensearch.xml
@@ -103,9 +104,13 @@ share/apps/ktorrent/www/mobile/interface.html
 share/apps/ktorrent/www/mobile/login.html
 share/apps/ktorrent/www/mobile/mobile.css
 share/apps/ktorrent/www/mobile/mobile.js
+share/config.kcfg/magnetsettings.kcfg
+share/doc/HTML/en/ktorrent/common
+share/doc/HTML/en/ktorrent/index.cache.bz2
+share/doc/HTML/en/ktorrent/index.docbook
 share/icons/hicolor/128x128/apps/ktorrent.png
-%%SYNDICATION%%share/icons/hicolor/16x16/actions/kt-add-feeds.png
-%%SYNDICATION%%share/icons/hicolor/16x16/actions/kt-add-filters.png
+share/icons/hicolor/16x16/actions/kt-add-feeds.png
+share/icons/hicolor/16x16/actions/kt-add-filters.png
 share/icons/hicolor/16x16/actions/kt-change-tracker.png
 share/icons/hicolor/16x16/actions/kt-check-data.png
 share/icons/hicolor/16x16/actions/kt-chunks.png
@@ -113,8 +118,8 @@ share/icons/hicolor/16x16/actions/kt-info-widget.png
 share/icons/hicolor/16x16/actions/kt-magnet.png
 share/icons/hicolor/16x16/actions/kt-pause.png
 share/icons/hicolor/16x16/actions/kt-queue-manager.png
-%%SYNDICATION%%share/icons/hicolor/16x16/actions/kt-remove-feeds.png
-%%SYNDICATION%%share/icons/hicolor/16x16/actions/kt-remove-filters.png
+share/icons/hicolor/16x16/actions/kt-remove-feeds.png
+share/icons/hicolor/16x16/actions/kt-remove-filters.png
 share/icons/hicolor/16x16/actions/kt-remove.png
 share/icons/hicolor/16x16/actions/kt-restore-defaults.png
 share/icons/hicolor/16x16/actions/kt-set-max-download-speed.png
@@ -128,13 +133,13 @@ share/icons/hicolor/16x16/actions/kt-stop-all.png
 share/icons/hicolor/16x16/actions/kt-stop.png
 share/icons/hicolor/16x16/actions/kt-upnp.png
 share/icons/hicolor/16x16/apps/ktorrent.png
-%%SYNDICATION%%share/icons/hicolor/22x22/actions/kt-add-feeds.png
-%%SYNDICATION%%share/icons/hicolor/22x22/actions/kt-add-filters.png
+share/icons/hicolor/22x22/actions/kt-add-feeds.png
+share/icons/hicolor/22x22/actions/kt-add-filters.png
 share/icons/hicolor/22x22/actions/kt-encrypted.png
 share/icons/hicolor/22x22/actions/kt-magnet.png
 share/icons/hicolor/22x22/actions/kt-pause.png
-%%SYNDICATION%%share/icons/hicolor/22x22/actions/kt-remove-feeds.png
-%%SYNDICATION%%share/icons/hicolor/22x22/actions/kt-remove-filters.png
+share/icons/hicolor/22x22/actions/kt-remove-feeds.png
+share/icons/hicolor/22x22/actions/kt-remove-filters.png
 share/icons/hicolor/22x22/actions/kt-remove.png
 share/icons/hicolor/22x22/actions/kt-set-max-download-speed.png
 share/icons/hicolor/22x22/actions/kt-set-max-upload-speed.png
@@ -144,14 +149,14 @@ share/icons/hicolor/22x22/actions/kt-start.png
 share/icons/hicolor/22x22/actions/kt-stop-all.png
 share/icons/hicolor/22x22/actions/kt-stop.png
 share/icons/hicolor/22x22/apps/ktorrent.png
-%%SYNDICATION%%share/icons/hicolor/32x32/actions/kt-add-feeds.png
-%%SYNDICATION%%share/icons/hicolor/32x32/actions/kt-add-filters.png
+share/icons/hicolor/32x32/actions/kt-add-feeds.png
+share/icons/hicolor/32x32/actions/kt-add-filters.png
 share/icons/hicolor/32x32/actions/kt-info-widget.png
 share/icons/hicolor/32x32/actions/kt-magnet.png
 share/icons/hicolor/32x32/actions/kt-pause.png
 share/icons/hicolor/32x32/actions/kt-queue-manager.png
-%%SYNDICATION%%share/icons/hicolor/32x32/actions/kt-remove-feeds.png
-%%SYNDICATION%%share/icons/hicolor/32x32/actions/kt-remove-filters.png
+share/icons/hicolor/32x32/actions/kt-remove-feeds.png
+share/icons/hicolor/32x32/actions/kt-remove-filters.png
 share/icons/hicolor/32x32/actions/kt-remove.png
 share/icons/hicolor/32x32/actions/kt-set-max-download-speed.png
 share/icons/hicolor/32x32/actions/kt-set-max-upload-speed.png
@@ -186,11 +191,11 @@ share/icons/hicolor/48x48/actions/kt-upnp.png
 share/icons/hicolor/48x48/apps/ktorrent.png
 share/icons/hicolor/64x64/actions/kt-magnet.png
 share/icons/hicolor/64x64/apps/ktorrent.png
-%%SYNDICATION%%share/icons/hicolor/scalable/actions/kt-add-feeds.svgz
-%%SYNDICATION%%share/icons/hicolor/scalable/actions/kt-add-filters.svgz
+share/icons/hicolor/scalable/actions/kt-add-feeds.svgz
+share/icons/hicolor/scalable/actions/kt-add-filters.svgz
 share/icons/hicolor/scalable/actions/kt-magnet.svgz
-%%SYNDICATION%%share/icons/hicolor/scalable/actions/kt-remove-feeds.svgz
-%%SYNDICATION%%share/icons/hicolor/scalable/actions/kt-remove-filters.svgz
+share/icons/hicolor/scalable/actions/kt-remove-feeds.svgz
+share/icons/hicolor/scalable/actions/kt-remove-filters.svgz
 share/icons/hicolor/scalable/actions/kt-set-max-download-speed.svgz
 share/icons/hicolor/scalable/actions/kt-set-max-upload-speed.svgz
 share/icons/hicolor/scalable/actions/kt-speed-limits.svgz
@@ -204,14 +209,14 @@ share/kde4/services/ktmediaplayerplugin.desktop
 share/kde4/services/ktscanfolderplugin.desktop
 share/kde4/services/ktscriptingplugin.desktop
 share/kde4/services/ktsearchplugin.desktop
-%%PLASMA%%share/kde4/services/ktshutdownplugin.desktop
+share/kde4/services/ktshutdownplugin.desktop
 share/kde4/services/ktstatsplugin.desktop
-%%SYNDICATION%%share/kde4/services/ktsyndicationplugin.desktop
+share/kde4/services/ktsyndicationplugin.desktop
 share/kde4/services/ktupnpplugin.desktop
 share/kde4/services/ktwebinterfaceplugin.desktop
 share/kde4/services/ktzeroconfplugin.desktop
 share/kde4/services/magnet.protocol
-%%PLASMA%%share/kde4/services/plasma-applet-ktorrent.desktop
+share/kde4/services/plasma-applet-ktorrent.desktop
 share/kde4/services/plasma-dataengine-ktorrent.desktop
 share/kde4/servicetypes/ktorrentplugin.desktop
 share/locale/ar/LC_MESSAGES/ktorrent.mo
@@ -270,6 +275,7 @@ share/locale/zh_CN/LC_MESSAGES/ktorrent.mo
 share/locale/zh_TW/LC_MESSAGES/ktorrent.mo
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
+@dirrm share/doc/HTML/en/ktorrent
 @dirrm share/apps/ktorrent/www/mobile
 @dirrm share/apps/ktorrent/www/default
 @dirrm share/apps/ktorrent/www/common
diff --git a/net-p2p/libktorrent/Makefile b/net-p2p/libktorrent/Makefile
index c77696b03971..b4abf8d1c839 100644
--- a/net-p2p/libktorrent/Makefile
+++ b/net-p2p/libktorrent/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	libktorrent
-PORTVERSION=	1.0.5
-DISTVERSIONSUFFIX=	-3
+DISTVERSION=	1.1.0
 CATEGORIES=	net-p2p kde
-MASTER_SITES=	http://ktorrent.org/downloads/${PORTVERSION:S,^1,4,}/
+MASTER_SITES=	http://ktorrent.org/downloads/${DISTVERSION:S,^1,4,}/
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Torrent library split from KTorrent
diff --git a/net-p2p/libktorrent/distinfo b/net-p2p/libktorrent/distinfo
index 6723820b9c28..b3e131ee521b 100644
--- a/net-p2p/libktorrent/distinfo
+++ b/net-p2p/libktorrent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libktorrent-1.0.5-3.tar.bz2) = 5b1d8cb866c5837960241588eaf227dd364c31a2f35be889f69cd7ce47bc836c
-SIZE (libktorrent-1.0.5-3.tar.bz2) = 872674
+SHA256 (libktorrent-1.1.0.tar.bz2) = e6c76aa174ac9ffafc547a8842c838f0733c3a859a5da1898e54a2cea8392344
+SIZE (libktorrent-1.1.0.tar.bz2) = 959358
diff --git a/net-p2p/libktorrent/pkg-plist b/net-p2p/libktorrent/pkg-plist
index cd9b051fbb90..5c4f6af99203 100644
--- a/net-p2p/libktorrent/pkg-plist
+++ b/net-p2p/libktorrent/pkg-plist
@@ -4,7 +4,6 @@ include/libktorrent/bcodec/bnode.h
 include/libktorrent/bcodec/value.h
 include/libktorrent/datachecker/datachecker.h
 include/libktorrent/datachecker/datacheckerjob.h
-include/libktorrent/datachecker/datacheckerlistener.h
 include/libktorrent/datachecker/datacheckerthread.h
 include/libktorrent/datachecker/multidatachecker.h
 include/libktorrent/datachecker/singledatachecker.h
@@ -80,6 +79,7 @@ include/libktorrent/net/networkthread.h
 include/libktorrent/net/poll.h
 include/libktorrent/net/portlist.h
 include/libktorrent/net/reverseresolver.h
+include/libktorrent/net/serversocket.h
 include/libktorrent/net/socket.h
 include/libktorrent/net/socketdevice.h
 include/libktorrent/net/socketgroup.h
@@ -103,6 +103,7 @@ include/libktorrent/peer/peermanager.h
 include/libktorrent/peer/peerprotocolextension.h
 include/libktorrent/peer/peeruploader.h
 include/libktorrent/peer/serverauthenticate.h
+include/libktorrent/peer/superseeder.h
 include/libktorrent/peer/utmetadata.h
 include/libktorrent/peer/utpex.h
 include/libktorrent/torrent/advancedchokealgorithm.h
@@ -118,6 +119,7 @@ include/libktorrent/torrent/torrent.h
 include/libktorrent/torrent/torrentcontrol.h
 include/libktorrent/torrent/torrentcreator.h
 include/libktorrent/torrent/torrentfile.h
+include/libktorrent/torrent/torrentfilestream.h
 include/libktorrent/torrent/torrentstats.h
 include/libktorrent/torrent/uploader.h
 include/libktorrent/tracker/httpannouncejob.h
@@ -127,6 +129,8 @@ include/libktorrent/tracker/tracker.h
 include/libktorrent/tracker/trackermanager.h
 include/libktorrent/tracker/udptracker.h
 include/libktorrent/tracker/udptrackersocket.h
+include/libktorrent/upnp/upnpmcastsocket.h
+include/libktorrent/upnp/upnprouter.h
 include/libktorrent/util/array.h
 include/libktorrent/util/autorotatelogjob.h
 include/libktorrent/util/bitset.h
@@ -143,8 +147,10 @@ include/libktorrent/util/log.h
 include/libktorrent/util/logsystemmanager.h
 include/libktorrent/util/pipe.h
 include/libktorrent/util/ptrmap.h
+include/libktorrent/util/resourcemanager.h
 include/libktorrent/util/sha1hash.h
 include/libktorrent/util/sha1hashgen.h
+include/libktorrent/util/signalcatcher.h
 include/libktorrent/util/timer.h
 include/libktorrent/util/urlencoder.h
 include/libktorrent/util/waitjob.h
@@ -161,8 +167,8 @@ include/libktorrent/utp/utpserverthread.h
 include/libktorrent/utp/utpsocket.h
 include/libktorrent/version.h
 lib/libktorrent.so
-lib/libktorrent.so.2
-lib/libktorrent.so.2.0.4
+lib/libktorrent.so.3
+lib/libktorrent.so.3.0.0
 share/apps/cmake/modules/FindKTorrent.cmake
 share/locale/ar/LC_MESSAGES/libktorrent.mo
 share/locale/ast/LC_MESSAGES/libktorrent.mo
@@ -222,6 +228,7 @@ share/locale/zh_TW/LC_MESSAGES/libktorrent.mo
 @dirrmtry share/locale/si
 @dirrm include/libktorrent/utp
 @dirrm include/libktorrent/util
+@dirrm include/libktorrent/upnp
 @dirrm include/libktorrent/tracker
 @dirrm include/libktorrent/torrent
 @dirrm include/libktorrent/peer