- Update to version 1.2rc1 for stability reasons

- Add SHA256

Requested by:	Beech Rintoul

8 files changed, 77 insertions, 59 deletions

diff --git a/net-p2p/ktorrent2/Makefile b/net-p2p/ktorrent2/Makefile
index 039026d8a879..aed787a5178f 100644
--- a/net-p2p/ktorrent2/Makefile
+++ b/net-p2p/ktorrent2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ktorrent
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.2.r1
 CATEGORIES=	net kde
-MASTER_SITES=	http://ktorrent.pwsp.net/downloads/${PORTVERSION}/
+MASTER_SITES=	http://ktorrent.pwsp.net/downloads/${PORTVERSION:S/.r/rc/}/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	BitTorrent client for KDE
diff --git a/net-p2p/ktorrent2/distinfo b/net-p2p/ktorrent2/distinfo
index 7e4ef6e3662f..456c40f9fab8 100644
--- a/net-p2p/ktorrent2/distinfo
+++ b/net-p2p/ktorrent2/distinfo
@@ -1,2 +1,3 @@
-MD5 (ktorrent-1.1.tar.gz) = d282e2cef75f2e4cf4bf5a84e0f45d3c
-SIZE (ktorrent-1.1.tar.gz) = 1354288
+MD5 (ktorrent-1.2rc1.tar.gz) = c5dbd27aa19e2c8f8dbe210c9e36b469
+SHA256 (ktorrent-1.2rc1.tar.gz) = 2eed6994cbcfbb0c4f11d73f376a64ff42969f66ed3751729e122cd19d6a1106
+SIZE (ktorrent-1.2rc1.tar.gz) = 1445299
diff --git a/net-p2p/ktorrent2/files/patch-Makefile.in b/net-p2p/ktorrent2/files/patch-Makefile.in
new file mode 100644
index 000000000000..825e37187ee6
--- /dev/null
+++ b/net-p2p/ktorrent2/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun Jan  8 02:08:59 2006
++++ Makefile.in	Sun Jan  8 02:09:12 2006
+@@ -257,7 +257,7 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-SUBDIRS = libktorrent apps plugins
++SUBDIRS = libktorrent apps plugins translations
+ EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/net-p2p/ktorrent2/files/patch-apps-ktcachecheck-cachecheck.cpp b/net-p2p/ktorrent2/files/patch-apps-ktcachecheck-cachecheck.cpp
new file mode 100644
index 000000000000..2736b2b67087
--- /dev/null
+++ b/net-p2p/ktorrent2/files/patch-apps-ktcachecheck-cachecheck.cpp
@@ -0,0 +1,10 @@
+--- apps/ktcachecheck/cachecheck.cpp.orig	Sun Jan  8 02:45:26 2006
++++ apps/ktcachecheck/cachecheck.cpp	Sun Jan  8 02:46:29 2006
+@@ -18,6 +18,7 @@
+  *   51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.             *
+  ***************************************************************************/
+ #include <iostream>
++#include <string>
+ #include <util/log.h>
+ #include <util/error.h>
+ #include <util/functions.h>
diff --git a/net-p2p/ktorrent2/files/patch-libktorrent-util-sha1hash.cpp b/net-p2p/ktorrent2/files/patch-libktorrent-util-sha1hash.cpp
new file mode 100644
index 000000000000..f91d52dd3907
--- /dev/null
+++ b/net-p2p/ktorrent2/files/patch-libktorrent-util-sha1hash.cpp
@@ -0,0 +1,11 @@
+--- libktorrent/util/sha1hash.cpp.orig	Sun Jan  8 02:28:06 2006
++++ libktorrent/util/sha1hash.cpp	Sun Jan  8 02:29:24 2006
+@@ -17,6 +17,8 @@
+  *   Free Software Foundation, Inc.,                                       *
+  *   51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.             *
+  ***************************************************************************/
++#include <stdio.h>
++
+ #include <qurl.h>
+ #include <string.h>
+ #include <algorithm>
diff --git a/net-p2p/ktorrent2/files/patch-libtorrent-chunkmanager.cpp b/net-p2p/ktorrent2/files/patch-libtorrent-chunkmanager.cpp
deleted file mode 100644
index 0ff4cec92e7c..000000000000
--- a/net-p2p/ktorrent2/files/patch-libtorrent-chunkmanager.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
---- libtorrent/chunkmanager.cpp.orig	Mon Oct 10 20:06:38 2005
-+++ libtorrent/chunkmanager.cpp	Mon Oct 10 20:10:53 2005
-@@ -315,8 +315,11 @@
- 
- 	void ChunkManager::prioritise(Uint32 from,Uint32 to)
- 	{
--		if (from > to)
--			std::swap(from,to);
-+		if (from > to) {
-+			Uint32 tmp = from;
-+			from = to;
-+			to = tmp;
-+		}
- 
- 		Uint32 i = from;
- 		while (i <= to && i < chunks.count())
-@@ -329,8 +332,11 @@
- 
- 	void ChunkManager::exclude(Uint32 from,Uint32 to)
- 	{
--		if (from > to)
--			std::swap(from,to);
-+		if (from > to) {
-+			Uint32 tmp = from;
-+			from = to;
-+			to = tmp;
-+		}
- 
- 		Uint32 i = from;
- 		while (i <= to && i < chunks.count())
-@@ -347,8 +353,11 @@
- 
- 	void ChunkManager::include(Uint32 from,Uint32 to)
- 	{
--		if (from > to)
--			std::swap(from,to);
-+		if (from > to) {
-+			Uint32 tmp = from;
-+			from = to;
-+			to = tmp;
-+		}
- 
- 		Uint32 i = from;
- 		while (i <= to && i < chunks.count())
diff --git a/net-p2p/ktorrent2/files/patch-libtorrent-udptrackersocket.cpp b/net-p2p/ktorrent2/files/patch-libtorrent-udptrackersocket.cpp
deleted file mode 100644
index 8461fcf2851c..000000000000
--- a/net-p2p/ktorrent2/files/patch-libtorrent-udptrackersocket.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- libtorrent/udptrackersocket.cpp.orig	Mon Oct 10 20:18:17 2005
-+++ libtorrent/udptrackersocket.cpp	Mon Oct 10 20:19:22 2005
-@@ -17,6 +17,7 @@
-  *   Free Software Foundation, Inc.,                                       *
-  *   51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.             *
-  ***************************************************************************/
-+#include <sys/time.h>
- #include <stdlib.h>
- #include <libutil/array.h>
- #include <qsocketdevice.h>
diff --git a/net-p2p/ktorrent2/pkg-plist b/net-p2p/ktorrent2/pkg-plist
index 8072146dc79a..8c22f17cd089 100644
--- a/net-p2p/ktorrent2/pkg-plist
+++ b/net-p2p/ktorrent2/pkg-plist
@@ -1,6 +1,21 @@
 bin/ktcachecheck
 bin/ktorrent
 bin/kttorinfo
+lib/kde3/ktinfowidgetplugin.la
+lib/kde3/ktinfowidgetplugin.so
+lib/kde3/ktipfilterplugin.la
+lib/kde3/ktipfilterplugin.so
+lib/kde3/ktlogviewerplugin.la
+lib/kde3/ktlogviewerplugin.so
+lib/kde3/ktpartfileimportplugin.la
+lib/kde3/ktpartfileimportplugin.so
+lib/kde3/ktsearchplugin.la
+lib/kde3/ktsearchplugin.so
+lib/kde3/ktupnpplugin.la
+lib/kde3/ktupnpplugin.so
+lib/libktorrent.la
+lib/libktorrent.so
+lib/libktorrent.so.0
 share/applications/kde/ktorrent.desktop
 share/applnk/Internet/ktorrent.desktop
 share/apps/ktorrent/icons/hicolor/128x128/apps/ktorrent.png
@@ -12,12 +27,21 @@ share/apps/ktorrent/icons/hicolor/22x22/actions/ktstop.png
 share/apps/ktorrent/icons/hicolor/22x22/actions/ktstop_all.png
 share/apps/ktorrent/icons/hicolor/22x22/apps/ktorrent.png
 share/apps/ktorrent/icons/hicolor/32x32/apps/ktorrent.png
+share/apps/ktorrent/icons/hicolor/48x48/actions/ktplugins.png
 share/apps/ktorrent/icons/hicolor/48x48/apps/ktorrent.png
+share/apps/ktorrent/icons/hicolor/64x64/actions/ktinfowidget.png
+share/apps/ktorrent/icons/hicolor/64x64/actions/ktqueuemanager.png
+share/apps/ktorrent/icons/hicolor/64x64/actions/ktupnp.png
 share/apps/ktorrent/icons/hicolor/64x64/apps/ktorrent.png
 share/apps/ktorrent/icons/hicolor/64x64/filesystems/ktprefdownloads.png
 share/apps/ktorrent/icons/hicolor/scalable/apps/ktorrent.svgz
 share/apps/ktorrent/ktorrentui.rc
+share/apps/ktorrent/ktpartfileimportpluginui.rc
+share/config.kcfg/ktinfowidgetplugin.kcfg
+share/config.kcfg/ktipfilterplugin.kcfg
 share/config.kcfg/ktorrent.kcfg
+share/config.kcfg/ktsearchplugin.kcfg
+share/config.kcfg/ktupnpplugin.kcfg
 share/icons/hicolor/128x128/apps/ktorrent.png
 share/icons/hicolor/16x16/apps/ktorrent.png
 share/icons/hicolor/22x22/apps/ktorrent.png
@@ -25,6 +49,7 @@ share/icons/hicolor/32x32/apps/ktorrent.png
 share/icons/hicolor/48x48/apps/ktorrent.png
 share/icons/hicolor/64x64/apps/ktorrent.png
 share/icons/hicolor/scalable/apps/ktorrent.svgz
+share/locale/bg/LC_MESSAGES/ktorrent.mo
 share/locale/br/LC_MESSAGES/ktorrent.mo
 share/locale/cs/LC_MESSAGES/ktorrent.mo
 share/locale/cy/LC_MESSAGES/ktorrent.mo
@@ -36,7 +61,9 @@ share/locale/es/LC_MESSAGES/ktorrent.mo
 share/locale/et/LC_MESSAGES/ktorrent.mo
 share/locale/fr/LC_MESSAGES/ktorrent.mo
 share/locale/ga/LC_MESSAGES/ktorrent.mo
+share/locale/hu/LC_MESSAGES/ktorrent.mo
 share/locale/it/LC_MESSAGES/ktorrent.mo
+share/locale/ja/LC_MESSAGES/ktorrent.mo
 share/locale/lt/LC_MESSAGES/ktorrent.mo
 share/locale/nl/LC_MESSAGES/ktorrent.mo
 share/locale/pa/LC_MESSAGES/ktorrent.mo
@@ -44,18 +71,28 @@ share/locale/pl/LC_MESSAGES/ktorrent.mo
 share/locale/pt/LC_MESSAGES/ktorrent.mo
 share/locale/pt_BR/LC_MESSAGES/ktorrent.mo
 share/locale/ru/LC_MESSAGES/ktorrent.mo
+share/locale/rw/LC_MESSAGES/ktorrent.mo
 share/locale/sr/LC_MESSAGES/ktorrent.mo
 share/locale/sr@Latn/LC_MESSAGES/ktorrent.mo
 share/locale/sv/LC_MESSAGES/ktorrent.mo
 share/locale/tr/LC_MESSAGES/ktorrent.mo
 share/locale/uk/LC_MESSAGES/ktorrent.mo
 share/locale/zh_CN/LC_MESSAGES/ktorrent.mo
+share/services/ktinfowidgetplugin.desktop
+share/services/ktipfilterplugin.desktop
+share/services/ktlogviewerplugin.desktop
+share/services/ktpartfileimportplugin.desktop
+share/services/ktsearchplugin.desktop
+share/services/ktupnpplugin.desktop
+share/servicetypes/ktorrentplugin.desktop
 @unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
 @unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/uk 2>/dev/null || true
 @unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/sr 2>/dev/null || true
+@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/rw 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt 2>/dev/null || true
 @unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
@@ -68,8 +105,10 @@ share/locale/zh_CN/LC_MESSAGES/ktorrent.mo
 @dirrm share/apps/ktorrent/icons/hicolor/scalable
 @dirrm share/apps/ktorrent/icons/hicolor/64x64/filesystems
 @dirrm share/apps/ktorrent/icons/hicolor/64x64/apps
+@dirrm share/apps/ktorrent/icons/hicolor/64x64/actions
 @dirrm share/apps/ktorrent/icons/hicolor/64x64
 @dirrm share/apps/ktorrent/icons/hicolor/48x48/apps
+@dirrm share/apps/ktorrent/icons/hicolor/48x48/actions
 @dirrm share/apps/ktorrent/icons/hicolor/48x48
 @dirrm share/apps/ktorrent/icons/hicolor/32x32/apps
 @dirrm share/apps/ktorrent/icons/hicolor/32x32