- Update to snapshot from 23.10.2007

- Update mastersite
- Add major lib version to gmp dependency [1]
- Fix usage of statvfs(3) which caused way off calculations of remaining disk
  space
- Remove upstream applied relocation of $(all_includes) in Makefile.in's

PR:		ports/114394 [1]
Submitted by:	Kjell Tore Ullavik <ktullavik@gmail.com> [1]

4 files changed, 24 insertions, 15 deletions

diff --git a/net-p2p/ktorrent-devel/Makefile b/net-p2p/ktorrent-devel/Makefile
index 9fcf4d5f07d8..6b6e32779865 100644
--- a/net-p2p/ktorrent-devel/Makefile
+++ b/net-p2p/ktorrent-devel/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	ktorrent
-PORTVERSION=	20070311
-PORTREVISION=	1
+PORTVERSION=	20071023
 CATEGORIES=	net-p2p kde
-MASTER_SITES=	http://www.hitnet.rwth-aachen.de/~brueffer/distfiles/
+MASTER_SITES=	http://www.brueffer.de/distfiles/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	BitTorrent client for KDE
 
-LIB_DEPENDS=	gmp:${PORTSDIR}/math/libgmp4
+LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
 
 CONFLICTS=	ktorrent-[0.9]*
 
@@ -27,10 +26,5 @@ USE_GMAKE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|zeroconf||' ${WRKSRC}/src/plugins/Makefile.in
-	@${FIND} ${WRKSRC} -name Makefile.in | \
-		${XARGS} ${REINPLACE_CMD} \
-		-e '/^INCLUDES =/{:loop' -e '/\\$$/{N;bloop' \
-		-e '};/$$(all_includes)/{s///;s/$$/ $$(all_includes)/' \
-		-e '}' -e '}'
 
 .include <bsd.port.mk>
diff --git a/net-p2p/ktorrent-devel/distinfo b/net-p2p/ktorrent-devel/distinfo
index 21ae479cd51d..1a885fee9e34 100644
--- a/net-p2p/ktorrent-devel/distinfo
+++ b/net-p2p/ktorrent-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (ktorrent-20070311.tar.bz2) = ffa5d574706e9fdc56d0d749ba05e630
-SHA256 (ktorrent-20070311.tar.bz2) = 08bcccdf724f7d5a73c06bf934ff6020e839231e28638a8b176ab89b6557b854
-SIZE (ktorrent-20070311.tar.bz2) = 2687757
+MD5 (ktorrent-20071023.tar.bz2) = c413c86611ef5ec76550ad733d38eb74
+SHA256 (ktorrent-20071023.tar.bz2) = 74439c52c755d003c29bef94652bf9b8c1f3694b3703753e2181ef6299627082
+SIZE (ktorrent-20071023.tar.bz2) = 2619673
diff --git a/net-p2p/ktorrent-devel/files/patch-libktorrent-util-fileops.cpp b/net-p2p/ktorrent-devel/files/patch-libktorrent-util-fileops.cpp
new file mode 100644
index 000000000000..5291e2e47e10
--- /dev/null
+++ b/net-p2p/ktorrent-devel/files/patch-libktorrent-util-fileops.cpp
@@ -0,0 +1,11 @@
+--- src/libktorrent/util/fileops.cpp.orig	2007-10-22 18:18:51.000000000 +0200
++++ src/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-devel/pkg-plist b/net-p2p/ktorrent-devel/pkg-plist
index 8ab5d3efc19d..ca953d576638 100644
--- a/net-p2p/ktorrent-devel/pkg-plist
+++ b/net-p2p/ktorrent-devel/pkg-plist
@@ -3,7 +3,6 @@ bin/ktorrent
 bin/ktshell
 bin/kttorinfo
 bin/ktupnptest
-bin/ktutester
 lib/kde3/ktinfowidgetplugin.a
 lib/kde3/ktinfowidgetplugin.la
 lib/kde3/ktinfowidgetplugin.so
@@ -28,13 +27,16 @@ lib/kde3/ktschedulerplugin.so
 lib/kde3/ktsearchplugin.a
 lib/kde3/ktsearchplugin.la
 lib/kde3/ktsearchplugin.so
+lib/kde3/ktstatsplugin.a
+lib/kde3/ktstatsplugin.la
+lib/kde3/ktstatsplugin.so
 lib/kde3/ktupnpplugin.a
 lib/kde3/ktupnpplugin.la
 lib/kde3/ktupnpplugin.so
 lib/kde3/ktwebinterfaceplugin.a
 lib/kde3/ktwebinterfaceplugin.la
 lib/kde3/ktwebinterfaceplugin.so
-lib/libktorrent-3.5.6.so
+lib/libktorrent-3.5.8.so
 lib/libktorrent.a
 lib/libktorrent.la
 lib/libktorrent.so
@@ -365,6 +367,7 @@ share/config.kcfg/ktrssfeedplugin.kcfg
 share/config.kcfg/ktscanfolderplugin.kcfg
 share/config.kcfg/ktschedulerplugin.kcfg
 share/config.kcfg/ktsearchplugin.kcfg
+share/config.kcfg/ktstatsplugin.kcfg
 share/config.kcfg/ktupnpplugin.kcfg
 share/config.kcfg/ktwebinterfaceplugin.kcfg
 share/icons/hicolor/128x128/apps/ktorrent.png
@@ -395,7 +398,6 @@ share/locale/es/LC_MESSAGES/ktorrent.mo
 share/locale/et/LC_MESSAGES/ktorrent.mo
 share/locale/fa/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/hu/LC_MESSAGES/ktorrent.mo
 share/locale/it/LC_MESSAGES/ktorrent.mo
@@ -403,6 +405,7 @@ share/locale/ja/LC_MESSAGES/ktorrent.mo
 share/locale/ka/LC_MESSAGES/ktorrent.mo
 share/locale/lt/LC_MESSAGES/ktorrent.mo
 share/locale/ms/LC_MESSAGES/ktorrent.mo
+share/locale/nb/LC_MESSAGES/ktorrent.mo
 share/locale/nds/LC_MESSAGES/ktorrent.mo
 share/locale/nl/LC_MESSAGES/ktorrent.mo
 share/locale/pa/LC_MESSAGES/ktorrent.mo
@@ -427,6 +430,7 @@ share/services/ktrssfeedplugin.desktop
 share/services/ktscanfolderplugin.desktop
 share/services/ktschedulerplugin.desktop
 share/services/ktsearchplugin.desktop
+share/services/ktstatsplugin.desktop
 share/services/ktupnpplugin.desktop
 share/services/ktwebinterfaceplugin.desktop
 share/servicetypes/ktorrentplugin.desktop