- Update to snapshot from 02.08.2006

- Removed the GeoIP configure check in the tarball as it doesn't work and
  failed to install the required GeoIP database
- Pet portlint
- Remove upstream applied patch

4 files changed, 8 insertions, 35 deletions

diff --git a/net-p2p/ktorrent-devel/Makefile b/net-p2p/ktorrent-devel/Makefile
index 25229b47beef..121d055d2e24 100644
--- a/net-p2p/ktorrent-devel/Makefile
+++ b/net-p2p/ktorrent-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ktorrent
-PORTVERSION=	20060731
+PORTVERSION=	20060802
 CATEGORIES=	net-p2p kde
 MASTER_SITES=	http://www.hitnet.rwth-aachen.de/~brueffer/distfiles/
 PKGNAMESUFFIX=	-devel
@@ -14,10 +14,10 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	BitTorrent client for KDE
 
-CONFLICTS=	ktorrent-[0.9]*
-
 LIB_DEPENDS=	gmp:${PORTSDIR}/math/libgmp4
 
+CONFLICTS=	ktorrent-[0.9]*
+
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_AUTOTOOLS=	libtool:15
diff --git a/net-p2p/ktorrent-devel/distinfo b/net-p2p/ktorrent-devel/distinfo
index b18eabf9a083..a6c045c0aeb8 100644
--- a/net-p2p/ktorrent-devel/distinfo
+++ b/net-p2p/ktorrent-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (ktorrent-20060731.tar.bz2) = f9ef9f4ff4881e2959db68983ba01ddf
-SHA256 (ktorrent-20060731.tar.bz2) = d4b404e3b516b41c2490ad9e8d24eb2cf8871e793dff8fdc4e35866a664bd1f2
-SIZE (ktorrent-20060731.tar.bz2) = 2048132
+MD5 (ktorrent-20060802.tar.bz2) = b1b01d4725b98d5f7924b241c000fd90
+SHA256 (ktorrent-20060802.tar.bz2) = 39b1f25221252c9b0beff618e3198d8e9fc7c7f389c3339f3f0382b02be569fb
+SIZE (ktorrent-20060802.tar.bz2) = 2047811
diff --git a/net-p2p/ktorrent-devel/files/patch-libktorrent-net-socket.cpp b/net-p2p/ktorrent-devel/files/patch-libktorrent-net-socket.cpp
deleted file mode 100644
index 9b4ad0babf74..000000000000
--- a/net-p2p/ktorrent-devel/files/patch-libktorrent-net-socket.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/libktorrent/net/socket.cpp.orig	Mon Jul 31 16:11:04 2006
-+++ src/libktorrent/net/socket.cpp	Mon Jul 31 17:53:08 2006
-@@ -32,7 +32,7 @@
- #ifdef Q_OS_LINUX
- #include <asm/ioctls.h>
- #endif
--#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN)
-+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && __FreeBSD_version < 600020)
- #define MSG_NOSIGNAL 0
- #endif
- #include <unistd.h>
-@@ -49,7 +49,7 @@
- 
- 	Socket::Socket(int fd) : m_fd(fd),m_state(IDLE)
- 	{
--#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN)
-+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && __FreeBSD_version < 600020)
- 		if (setsockopt(m_fd,SOL_SOCKET,SO_NOSIGPIPE,0L,0) < 0)
- 		{
- 			Out(SYS_CON|LOG_NOTICE) << QString("Failed to set the NOSIGPIPE option : %1").arg(strerror(errno)) << endl;
-@@ -65,7 +65,7 @@
- 			Out(SYS_GEN|LOG_IMPORTANT) << QString("Cannot create socket : %1").arg(strerror(errno)) << endl;
- 		}
- 		m_fd = fd;
-- #if defined(Q_OS_MACX) || defined(Q_OS_DARWIN)
-+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && __FreeBSD_version < 600020)
- 		if (setsockopt(m_fd,SOL_SOCKET,SO_NOSIGPIPE,0L,0) < 0)
- 		{
- 			Out(SYS_CON|LOG_NOTICE) << QString("Failed to set the NOSIGPIPE option : %1").arg(strerror(errno)) << endl;
diff --git a/net-p2p/ktorrent-devel/pkg-plist b/net-p2p/ktorrent-devel/pkg-plist
index e2c4776f48fd..1e826d0b469d 100644
--- a/net-p2p/ktorrent-devel/pkg-plist
+++ b/net-p2p/ktorrent-devel/pkg-plist
@@ -35,6 +35,7 @@ lib/libktorrent.so.0
 share/applications/kde/ktorrent.desktop
 share/applnk/Internet/ktorrent.desktop
 share/apps/ktorrent/geoip/FLAGS_LICENCE
+share/apps/ktorrent/geoip/GeoIP-LICENSE.txt
 share/apps/ktorrent/geoip/ad.png
 share/apps/ktorrent/geoip/ae.png
 share/apps/ktorrent/geoip/af.png
@@ -113,6 +114,7 @@ share/apps/ktorrent/geoip/ga.png
 share/apps/ktorrent/geoip/gb.png
 share/apps/ktorrent/geoip/gd.png
 share/apps/ktorrent/geoip/ge.png
+share/apps/ktorrent/geoip/geoip.dat
 share/apps/ktorrent/geoip/gf.png
 share/apps/ktorrent/geoip/gh.png
 share/apps/ktorrent/geoip/gi.png