On November 11, 2007 07:23:15 pm Brad wrote:
> Here is an update to KTorrent 2.2.2.
Here is an update to KTorrent 2.2.3.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ktorrent/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 8 Nov 2007 21:13:10 -0000 1.3
+++ Makefile 16 Nov 2007 09:39:24 -0000
@@ -4,9 +4,8 @@ SHARED_ONLY= Yes
COMMENT= BitTorrent client for KDE
-VERSION= 2.1.4
+VERSION= 2.2.3
DISTNAME= ktorrent-${VERSION}
-PKGNAME= ${DISTNAME}p0
CATEGORIES= net x11 x11/kde
MASTER_SITES= ${HOMEPAGE}downloads/${VERSION}/
@@ -20,9 +19,9 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= art_lgpl_2 jpeg ICE SM X11 Xau Xdmcp Xext Xrender c m
pcre \
- pcreposix png pthread stdc++ util z idn iconv fam rpcsvc
+ pcreposix png pthread stdc++ util z idn iconv intl fam
rpcsvc
-LIB_DEPENDS=
kdecore.>=6,DCOP,kdefx,kdeprint,kdesu,kparts,kdeui,khtml,kio,kjs,kmdi,kutils,kwalletclient::x11/kde/libs3
\
+LIB_DEPENDS=
kdecore.>=6,DCOP,kdefx,kdeprint,kdesu,kparts,kdeui,khtml,kio,kjs,kutils,kwalletclient::x11/kde/libs3
\
gmp.>=4.::devel/gmp
MODULES= x11/kde
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/ktorrent/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 19 Jul 2007 02:59:44 -0000 1.1.1.1
+++ distinfo 16 Nov 2007 09:39:39 -0000
@@ -1,5 +1,5 @@
-MD5 (ktorrent-2.1.4.tar.gz) = adPX32IAcQGBWU2hmrjCSA==
-RMD160 (ktorrent-2.1.4.tar.gz) = goYBLl+8C9gn1ctwx4leVGDyGgs=
-SHA1 (ktorrent-2.1.4.tar.gz) = RUmS7F8LT2fmJHTPhjotZtvXfyg=
-SHA256 (ktorrent-2.1.4.tar.gz) = 1JL3WAHBgCAumcqcnN/wtU4vXY5K4t3cy/GqwhgnbEg=
-SIZE (ktorrent-2.1.4.tar.gz) = 3631999
+MD5 (ktorrent-2.2.3.tar.gz) = f/Rn7pRD+fpjdpzYpkCTLg==
+RMD160 (ktorrent-2.2.3.tar.gz) = zopuFv2NSCgZTvYNpF/sUh9Pma0=
+SHA1 (ktorrent-2.2.3.tar.gz) = N6p1TV30Cc6YfktwDTxptGF11Kg=
+SHA256 (ktorrent-2.2.3.tar.gz) = JBrM+glMRkBjzA8X4n880ry49vRt+S9MqOrF+QZOj8I=
+SIZE (ktorrent-2.2.3.tar.gz) = 3842249
Index: patches/patch-libktorrent_net_address_cpp
===================================================================
RCS file: patches/patch-libktorrent_net_address_cpp
diff -N patches/patch-libktorrent_net_address_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libktorrent_net_address_cpp 8 Nov 2007 23:09:08 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- libktorrent/net/address.cpp.orig Sat Sep 29 01:31:27 2007
++++ libktorrent/net/address.cpp Sat Sep 29 01:31:39 2007
+@@ -17,6 +17,7 @@
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+ ***************************************************************************/
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include "address.h"
Index: patches/patch-libktorrent_net_socket_cpp
===================================================================
RCS file: /cvs/ports/net/ktorrent/patches/patch-libktorrent_net_socket_cpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-libktorrent_net_socket_cpp
--- patches/patch-libktorrent_net_socket_cpp 19 Jul 2007 02:59:44 -0000
1.1.1.1
+++ patches/patch-libktorrent_net_socket_cpp 16 Nov 2007 09:43:01 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-libktorrent_net_socket_cpp,v 1.1.1.1 2007/07/19 02:59:44
deanna Exp $
---- libktorrent/net/socket.cpp.orig Sun Apr 22 07:25:46 2007
-+++ libktorrent/net/socket.cpp Mon May 7 17:45:09 2007
+--- libktorrent/net/socket.cpp.orig Tue Nov 13 14:36:49 2007
++++ libktorrent/net/socket.cpp Fri Nov 16 04:42:46 2007
@@ -38,7 +38,7 @@
#include <sys/filio.h>
#endif
@@ -10,12 +10,12 @@ $OpenBSD: patch-libktorrent_net_socket_c
#define MSG_NOSIGNAL 0
#endif
-@@ -258,7 +258,7 @@ namespace net
+@@ -260,7 +260,7 @@ namespace net
- bool Socket::setTOS(char type_of_service)
+ bool Socket::setTOS(unsigned char type_of_service)
{
-#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) &&
__FreeBSD_version < 600020) || defined(Q_OS_NETBSD) || defined(Q_OS_BSD4)
+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) &&
__FreeBSD_version < 600020) || defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD) ||
defined(Q_OS_BSD4)
- int c = type_of_service;
+ unsigned int c = type_of_service;
#else
- char c = type_of_service;
+ unsigned char c = type_of_service;
Index: patches/patch-libktorrent_net_speed_cpp
===================================================================
RCS file: patches/patch-libktorrent_net_speed_cpp
diff -N patches/patch-libktorrent_net_speed_cpp
--- patches/patch-libktorrent_net_speed_cpp 8 Nov 2007 21:13:10 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libktorrent_net_speed_cpp,v 1.1 2007/11/08 21:13:10 todd Exp $
---- libktorrent/net/speed.cpp.orig Mon Nov 5 18:12:45 2007
-+++ libktorrent/net/speed.cpp Mon Nov 5 18:13:31 2007
-@@ -47,7 +47,7 @@ namespace net
- while (i != dlrate.end())
- {
- QPair<Uint32,TimeStamp> & p = *i;
-- if (now - p.second > SPEED_INTERVAL)
-+ if (now - p.second > SPEED_INTERVAL || now < p.second)
- {
- if (bytes >= p.first) // make sure we don't
wrap around
- bytes -= p.first; // subtract bytes
Index: patches/patch-libktorrent_util_fileops_cpp
===================================================================
RCS file: patches/patch-libktorrent_util_fileops_cpp
diff -N patches/patch-libktorrent_util_fileops_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libktorrent_util_fileops_cpp 8 Nov 2007 23:09:08 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- libktorrent/util/fileops.cpp.orig Mon Aug 27 12:45:55 2007
++++ libktorrent/util/fileops.cpp Sat Sep 29 02:31:07 2007
+@@ -62,7 +62,6 @@ typedef int64_t __s64;
+ #endif
+
+
+-#include <sys/statvfs.h>
+
+
+ namespace bt
Index: patches/patch-plugins_stats_ChartDrawer_cc
===================================================================
RCS file: patches/patch-plugins_stats_ChartDrawer_cc
diff -N patches/patch-plugins_stats_ChartDrawer_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-plugins_stats_ChartDrawer_cc 8 Nov 2007 23:09:08 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- plugins/stats/ChartDrawer.cc.orig Sat Sep 29 01:47:32 2007
++++ plugins/stats/ChartDrawer.cc Sat Sep 29 02:03:26 2007
+@@ -272,6 +272,8 @@ void ChartDrawer::AddValue(const size_t idx, const dou
+
+ #ifdef USE_SOLARIS
+ if(isnand(val) || (isinf(val)))
++#elif defined __OpenBSD__
++ if(isnan(val) || (isinf(val)))
+ #else
+ if(std::isnan(val) || (std::isinf(val)))
+ #endif
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/ktorrent/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 19 Jul 2007 02:59:44 -0000 1.1.1.1
+++ pkg/PLIST 16 Nov 2007 10:00:09 -0000
@@ -20,11 +20,13 @@ ${KDE}/ktschedulerplugin.la
${KDE}/ktschedulerplugin.so
${KDE}/ktsearchplugin.la
${KDE}/ktsearchplugin.so
[EMAIL PROTECTED] ${KDE}/ktstatsplugin.la
[EMAIL PROTECTED] ${KDE}/ktstatsplugin.so
${KDE}/ktupnpplugin.la
${KDE}/ktupnpplugin.so
${KDE}/ktwebinterfaceplugin.la
${KDE}/ktwebinterfaceplugin.so
-lib/libktorrent-2.1.4.so
+lib/libktorrent-2.2.2.so
lib/libktorrent.la
lib/libktorrent.so
share/applications/kde/ktorrent.desktop
@@ -342,14 +344,20 @@ share/apps/ktorrent/www/coldmilk/rest.ph
share/apps/ktorrent/www/coldmilk/shutdown.php
share/apps/ktorrent/www/coldmilk/style.css
share/apps/ktorrent/www/default/
+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
@@ -376,6 +384,7 @@ share/config.kcfg/ktrssfeedplugin.kcfg
share/config.kcfg/ktscanfolderplugin.kcfg
share/config.kcfg/ktschedulerplugin.kcfg
share/config.kcfg/ktsearchplugin.kcfg
[EMAIL PROTECTED] share/config.kcfg/ktstatsplugin.kcfg
share/config.kcfg/ktupnpplugin.kcfg
share/config.kcfg/ktwebinterfaceplugin.kcfg
share/icons/hicolor/128x128/apps/ktorrent.png
@@ -406,21 +415,14 @@ share/locale/el/LC_MESSAGES/ktorrent.mo
share/locale/en_GB/LC_MESSAGES/ktorrent.mo
share/locale/es/LC_MESSAGES/ktorrent.mo
share/locale/et/LC_MESSAGES/ktorrent.mo
-share/locale/eu/LC_MESSAGES/ktorrent.mo
share/locale/fa/LC_MESSAGES/ktorrent.mo
-share/locale/fi/LC_MESSAGES/ktorrent.mo
share/locale/fr/LC_MESSAGES/ktorrent.mo
-share/locale/ga/LC_MESSAGES/ktorrent.mo
share/locale/gl/LC_MESSAGES/ktorrent.mo
-share/locale/hr/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/km/
-share/locale/km/LC_MESSAGES/
-share/locale/km/LC_MESSAGES/ktorrent.mo
+share/locale/ka/LC_MESSAGES/ktorrent.mo
share/locale/lt/LC_MESSAGES/ktorrent.mo
-share/locale/mk/LC_MESSAGES/ktorrent.mo
share/locale/ms/LC_MESSAGES/ktorrent.mo
share/locale/nb/LC_MESSAGES/ktorrent.mo
share/locale/nds/
@@ -449,6 +451,7 @@ share/services/ktrssfeedplugin.desktop
share/services/ktscanfolderplugin.desktop
share/services/ktschedulerplugin.desktop
share/services/ktsearchplugin.desktop
[EMAIL PROTECTED] share/services/ktstatsplugin.desktop
share/services/ktupnpplugin.desktop
share/services/ktwebinterfaceplugin.desktop
share/services/ktzeroconfplugin.desktop
