Update to version 2.2.4

PR:		ports/118964
Submitted by:	Yarodin <yarodin@gmail.com>

10 files changed, 30 insertions, 102 deletions

diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile
index 303c21615968..967207769d41 100644
--- a/net-p2p/ktorrent/Makefile
+++ b/net-p2p/ktorrent/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ktorrent
-PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTVERSION=	2.2.4
 CATEGORIES=	net-p2p kde
 MASTER_SITES=	http://ktorrent.org/downloads/${PORTVERSION}/ \
 		http://www.brueffer.de/distfiles/
diff --git a/net-p2p/ktorrent/distinfo b/net-p2p/ktorrent/distinfo
index 29a9500e3943..279a718690fa 100644
--- a/net-p2p/ktorrent/distinfo
+++ b/net-p2p/ktorrent/distinfo
@@ -1,3 +1,3 @@
-MD5 (ktorrent-2.2.2.tar.gz) = f3bd4cdcb45cefcd85599907781c6e21
-SHA256 (ktorrent-2.2.2.tar.gz) = 1be155d62b4533386dccb12de8dc3a28c1020c08c7c25223e1d31856d8b5e16b
-SIZE (ktorrent-2.2.2.tar.gz) = 3820959
+MD5 (ktorrent-2.2.4.tar.gz) = 51baa9ad846290ae9ad492b6a664709a
+SHA256 (ktorrent-2.2.4.tar.gz) = 5a75a9955124b5f02c387318737a0e8720132d939980557148c2686914354e9e
+SIZE (ktorrent-2.2.4.tar.gz) = 3843873
diff --git a/net-p2p/ktorrent/files/patch-apps-ktorrent-fileselectdlg.cpp b/net-p2p/ktorrent/files/patch-apps-ktorrent-fileselectdlg.cpp
deleted file mode 100644
index f57f053e75c9..000000000000
--- a/net-p2p/ktorrent/files/patch-apps-ktorrent-fileselectdlg.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
---- apps/ktorrent/fileselectdlg.cpp	2007/10/07 11:30:13	722461
-+++ apps/ktorrent/fileselectdlg.cpp	2007/10/07 11:32:52	722462
-@@ -94,11 +94,20 @@
- void FileSelectDlg::accept()
- {
- 	QStringList pe_ex;
-+	
-+	QString dn = m_downloadLocation->url();
-+	if (!dn.endsWith(bt::DirSeparator()))
-+		dn += bt::DirSeparator();
- 
- 	for (Uint32 i = 0;i < tc->getNumFiles();i++)
- 	{
- 		kt::TorrentFileInterface & file = tc->getTorrentFile(i);
- 
-+		// check for preexsting files
-+		QString path = dn + tc->getStats().torrent_name + bt::DirSeparator() + file.getPath();
-+		if (bt::Exists(path))
-+			file.setPreExisting(true);
-+		
- 		if (file.doNotDownload() && file.isPreExistingFile())
- 		{
- 			// we have excluded a preexsting file
-@@ -136,10 +145,7 @@
- 	}
- 	
- 	//Setup custom download location
--	QString dn = m_downloadLocation->url();
- 	QString ddir = tc->getDataDir();
--	if (!dn.endsWith(bt::DirSeparator()))
--		dn += bt::DirSeparator();
- 	if (!ddir.endsWith(bt::DirSeparator()))
- 		ddir += bt::DirSeparator();
- 	
diff --git a/net-p2p/ktorrent/files/patch-libktorrent-util-fileops.cpp b/net-p2p/ktorrent/files/patch-libktorrent-util-fileops.cpp
deleted file mode 100644
index bb0df257e008..000000000000
--- a/net-p2p/ktorrent/files/patch-libktorrent-util-fileops.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- libktorrent/util/fileops.cpp.orig	2007-10-22 18:18:51.000000000 +0200
-+++ libktorrent/util/fileops.cpp	2007-10-22 18:35:28.000000000 +0200
-@@ -425,7 +425,7 @@
- 		if (statvfs(path.local8Bit(), &stfs) == 0)
- #endif
- 		{
--			bytes_free = ((Uint64)stfs.f_bavail) * ((Uint64)stfs.f_bsize);
-+			bytes_free = ((Uint64)stfs.f_bavail) * ((Uint64)stfs.f_frsize);
- 			return true;
- 		}
- 		else
diff --git a/net-p2p/ktorrent/pkg-plist b/net-p2p/ktorrent/pkg-plist
index 5bfc12378d4e..7b86cfa57377 100644
--- a/net-p2p/ktorrent/pkg-plist
+++ b/net-p2p/ktorrent/pkg-plist
@@ -36,7 +36,7 @@ lib/kde3/ktupnpplugin.so
 lib/kde3/ktwebinterfaceplugin.a
 lib/kde3/ktwebinterfaceplugin.la
 lib/kde3/ktwebinterfaceplugin.so
-lib/libktorrent-2.2.2.so
+lib/libktorrent-2.2.4.so
 lib/libktorrent.a
 lib/libktorrent.la
 lib/libktorrent.so
@@ -313,6 +313,10 @@ share/apps/ktorrent/ktschedulerpluginui.rc
 share/apps/ktorrent/www/coldmilk/favicon.ico
 share/apps/ktorrent/www/coldmilk/icon.png
 share/apps/ktorrent/www/coldmilk/icons/16x16/edit_user.png
+share/apps/ktorrent/www/coldmilk/icons/16x16/high_priority.png
+share/apps/ktorrent/www/coldmilk/icons/16x16/low_priority.png
+share/apps/ktorrent/www/coldmilk/icons/16x16/normal_priority.png
+share/apps/ktorrent/www/coldmilk/icons/16x16/only_seed.png
 share/apps/ktorrent/www/coldmilk/icons/22x22/exit.png
 share/apps/ktorrent/www/coldmilk/icons/22x22/ktstart_all.png
 share/apps/ktorrent/www/coldmilk/icons/22x22/ktstop_all.png
@@ -335,14 +339,20 @@ share/apps/ktorrent/www/coldmilk/page_update.js
 share/apps/ktorrent/www/coldmilk/rest.php
 share/apps/ktorrent/www/coldmilk/shutdown.php
 share/apps/ktorrent/www/coldmilk/style.css
+share/apps/ktorrent/www/default/details.php
 share/apps/ktorrent/www/default/favicon.ico
 share/apps/ktorrent/www/default/grad1.jpg
 share/apps/ktorrent/www/default/grad2.jpg
 share/apps/ktorrent/www/default/header_tile.png
+share/apps/ktorrent/www/default/high_priority.png
 share/apps/ktorrent/www/default/icon.png
 share/apps/ktorrent/www/default/interface.php
 share/apps/ktorrent/www/default/ktorrentwebinterfacelogo.png
 share/apps/ktorrent/www/default/login.html
+share/apps/ktorrent/www/default/low_priority.png
+share/apps/ktorrent/www/default/menu_bg.png
+share/apps/ktorrent/www/default/normal_priority.png
+share/apps/ktorrent/www/default/only_seed.png
 share/apps/ktorrent/www/default/remove.png
 share/apps/ktorrent/www/default/shutdown.php
 share/apps/ktorrent/www/default/start.png
diff --git a/net-p2p/ktorrent2/Makefile b/net-p2p/ktorrent2/Makefile
index 303c21615968..967207769d41 100644
--- a/net-p2p/ktorrent2/Makefile
+++ b/net-p2p/ktorrent2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ktorrent
-PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTVERSION=	2.2.4
 CATEGORIES=	net-p2p kde
 MASTER_SITES=	http://ktorrent.org/downloads/${PORTVERSION}/ \
 		http://www.brueffer.de/distfiles/
diff --git a/net-p2p/ktorrent2/distinfo b/net-p2p/ktorrent2/distinfo
index 29a9500e3943..279a718690fa 100644
--- a/net-p2p/ktorrent2/distinfo
+++ b/net-p2p/ktorrent2/distinfo
@@ -1,3 +1,3 @@
-MD5 (ktorrent-2.2.2.tar.gz) = f3bd4cdcb45cefcd85599907781c6e21
-SHA256 (ktorrent-2.2.2.tar.gz) = 1be155d62b4533386dccb12de8dc3a28c1020c08c7c25223e1d31856d8b5e16b
-SIZE (ktorrent-2.2.2.tar.gz) = 3820959
+MD5 (ktorrent-2.2.4.tar.gz) = 51baa9ad846290ae9ad492b6a664709a
+SHA256 (ktorrent-2.2.4.tar.gz) = 5a75a9955124b5f02c387318737a0e8720132d939980557148c2686914354e9e
+SIZE (ktorrent-2.2.4.tar.gz) = 3843873
diff --git a/net-p2p/ktorrent2/files/patch-apps-ktorrent-fileselectdlg.cpp b/net-p2p/ktorrent2/files/patch-apps-ktorrent-fileselectdlg.cpp
deleted file mode 100644
index f57f053e75c9..000000000000
--- a/net-p2p/ktorrent2/files/patch-apps-ktorrent-fileselectdlg.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
---- apps/ktorrent/fileselectdlg.cpp	2007/10/07 11:30:13	722461
-+++ apps/ktorrent/fileselectdlg.cpp	2007/10/07 11:32:52	722462
-@@ -94,11 +94,20 @@
- void FileSelectDlg::accept()
- {
- 	QStringList pe_ex;
-+	
-+	QString dn = m_downloadLocation->url();
-+	if (!dn.endsWith(bt::DirSeparator()))
-+		dn += bt::DirSeparator();
- 
- 	for (Uint32 i = 0;i < tc->getNumFiles();i++)
- 	{
- 		kt::TorrentFileInterface & file = tc->getTorrentFile(i);
- 
-+		// check for preexsting files
-+		QString path = dn + tc->getStats().torrent_name + bt::DirSeparator() + file.getPath();
-+		if (bt::Exists(path))
-+			file.setPreExisting(true);
-+		
- 		if (file.doNotDownload() && file.isPreExistingFile())
- 		{
- 			// we have excluded a preexsting file
-@@ -136,10 +145,7 @@
- 	}
- 	
- 	//Setup custom download location
--	QString dn = m_downloadLocation->url();
- 	QString ddir = tc->getDataDir();
--	if (!dn.endsWith(bt::DirSeparator()))
--		dn += bt::DirSeparator();
- 	if (!ddir.endsWith(bt::DirSeparator()))
- 		ddir += bt::DirSeparator();
- 	
diff --git a/net-p2p/ktorrent2/files/patch-libktorrent-util-fileops.cpp b/net-p2p/ktorrent2/files/patch-libktorrent-util-fileops.cpp
deleted file mode 100644
index bb0df257e008..000000000000
--- a/net-p2p/ktorrent2/files/patch-libktorrent-util-fileops.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- libktorrent/util/fileops.cpp.orig	2007-10-22 18:18:51.000000000 +0200
-+++ libktorrent/util/fileops.cpp	2007-10-22 18:35:28.000000000 +0200
-@@ -425,7 +425,7 @@
- 		if (statvfs(path.local8Bit(), &stfs) == 0)
- #endif
- 		{
--			bytes_free = ((Uint64)stfs.f_bavail) * ((Uint64)stfs.f_bsize);
-+			bytes_free = ((Uint64)stfs.f_bavail) * ((Uint64)stfs.f_frsize);
- 			return true;
- 		}
- 		else
diff --git a/net-p2p/ktorrent2/pkg-plist b/net-p2p/ktorrent2/pkg-plist
index 5bfc12378d4e..7b86cfa57377 100644
--- a/net-p2p/ktorrent2/pkg-plist
+++ b/net-p2p/ktorrent2/pkg-plist
@@ -36,7 +36,7 @@ lib/kde3/ktupnpplugin.so
 lib/kde3/ktwebinterfaceplugin.a
 lib/kde3/ktwebinterfaceplugin.la
 lib/kde3/ktwebinterfaceplugin.so
-lib/libktorrent-2.2.2.so
+lib/libktorrent-2.2.4.so
 lib/libktorrent.a
 lib/libktorrent.la
 lib/libktorrent.so
@@ -313,6 +313,10 @@ share/apps/ktorrent/ktschedulerpluginui.rc
 share/apps/ktorrent/www/coldmilk/favicon.ico
 share/apps/ktorrent/www/coldmilk/icon.png
 share/apps/ktorrent/www/coldmilk/icons/16x16/edit_user.png
+share/apps/ktorrent/www/coldmilk/icons/16x16/high_priority.png
+share/apps/ktorrent/www/coldmilk/icons/16x16/low_priority.png
+share/apps/ktorrent/www/coldmilk/icons/16x16/normal_priority.png
+share/apps/ktorrent/www/coldmilk/icons/16x16/only_seed.png
 share/apps/ktorrent/www/coldmilk/icons/22x22/exit.png
 share/apps/ktorrent/www/coldmilk/icons/22x22/ktstart_all.png
 share/apps/ktorrent/www/coldmilk/icons/22x22/ktstop_all.png
@@ -335,14 +339,20 @@ share/apps/ktorrent/www/coldmilk/page_update.js
 share/apps/ktorrent/www/coldmilk/rest.php
 share/apps/ktorrent/www/coldmilk/shutdown.php
 share/apps/ktorrent/www/coldmilk/style.css
+share/apps/ktorrent/www/default/details.php
 share/apps/ktorrent/www/default/favicon.ico
 share/apps/ktorrent/www/default/grad1.jpg
 share/apps/ktorrent/www/default/grad2.jpg
 share/apps/ktorrent/www/default/header_tile.png
+share/apps/ktorrent/www/default/high_priority.png
 share/apps/ktorrent/www/default/icon.png
 share/apps/ktorrent/www/default/interface.php
 share/apps/ktorrent/www/default/ktorrentwebinterfacelogo.png
 share/apps/ktorrent/www/default/login.html
+share/apps/ktorrent/www/default/low_priority.png
+share/apps/ktorrent/www/default/menu_bg.png
+share/apps/ktorrent/www/default/normal_priority.png
+share/apps/ktorrent/www/default/only_seed.png
 share/apps/ktorrent/www/default/remove.png
 share/apps/ktorrent/www/default/shutdown.php
 share/apps/ktorrent/www/default/start.png