Fix build on DragonFly and with modular Xorg.

4 files changed, 53 insertions, 8 deletions

diff --git a/net/ktorrent/Makefile b/net/ktorrent/Makefile
index 6f868e9e384..cce96ed19a4 100644
--- a/net/ktorrent/Makefile
+++ b/net/ktorrent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/01/08 22:10:38 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2007/01/13 18:54:24 joerg Exp $
 
 DISTNAME=	ktorrent-${KTORRENT_VER}
 PKGREVISION=	1
@@ -17,10 +17,14 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../devel/gmp/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../devel/gmp/buildlink3.mk"
-
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ktorrent/distinfo b/net/ktorrent/distinfo
index b487abd9fcd..f5f961d95f2 100644
--- a/net/ktorrent/distinfo
+++ b/net/ktorrent/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/01/03 17:37:22 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2007/01/13 18:54:24 joerg Exp $
 
 SHA1 (ktorrent-2.1beta1.tar.gz) = 433d0b6b8ef47d544f446d2b9026dfd455af8172
 RMD160 (ktorrent-2.1beta1.tar.gz) = 857b81de55ee117039a6577d3cbde5172edd7ae3
 Size (ktorrent-2.1beta1.tar.gz) = 3178912 bytes
-SHA1 (patch-aa) = fdcc454b7711138b020a278342d4d6f961f78f5d
+SHA1 (patch-aa) = 7f33855d20864ce5c97eedc8d897c5e7fa088d3d
+SHA1 (patch-ab) = d0b698d0215d7c7585435481ce4398e44abbf851
diff --git a/net/ktorrent/patches/patch-aa b/net/ktorrent/patches/patch-aa
index b76353a3a50..2fb136d352d 100644
--- a/net/ktorrent/patches/patch-aa
+++ b/net/ktorrent/patches/patch-aa
@@ -1,8 +1,35 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/01/03 17:37:22 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2007/01/13 18:54:24 joerg Exp $
 
---- libktorrent/net/socket.cpp.orig	2006-07-18 08:57:56.000000000 +0000
+--- libktorrent/net/socket.cpp.orig	2006-11-21 19:08:44.000000000 +0000
 +++ libktorrent/net/socket.cpp
-@@ -137,7 +137,11 @@ namespace net
+@@ -38,7 +38,7 @@
+ #include <sys/filio.h>
+ #endif
+ 
+-#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && __FreeBSD_version < 600020) || defined (Q_OS_SOLARIS)
++#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && !defined(__DragonFly__) && __FreeBSD_version < 600020) || defined (Q_OS_SOLARIS)
+ #define MSG_NOSIGNAL 0
+ #endif
+ 
+@@ -56,7 +56,7 @@ namespace net
+ 
+ 	Socket::Socket(int fd) : m_fd(fd),m_state(IDLE)
+ 	{
+-#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && __FreeBSD_version < 600020)
++#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && !defined(__DragonFly__) && __FreeBSD_version < 600020)
+ 		int val = 1; 
+ 		if (setsockopt(m_fd,SOL_SOCKET,SO_NOSIGPIPE,&val,sizeof(int)) < 0)
+ 		{
+@@ -73,7 +73,7 @@ namespace net
+ 			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) || (defined(Q_OS_FREEBSD) && __FreeBSD_version < 600020)
++#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && !defined(__DragonFly__) && __FreeBSD_version < 600020)
+ 		int val = 1;
+ 		if (setsockopt(m_fd,SOL_SOCKET,SO_NOSIGPIPE,&val,sizeof(int)) < 0)
+ 		{
+@@ -160,7 +160,11 @@ namespace net
  	
  	int Socket::send(const bt::Uint8* buf,int len)
  	{
diff --git a/net/ktorrent/patches/patch-ab b/net/ktorrent/patches/patch-ab
new file mode 100644
index 00000000000..acc34e113f3
--- /dev/null
+++ b/net/ktorrent/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/01/13 18:54:24 joerg Exp $
+
+--- plugins/webinterface/php_handler.cpp.orig	2007-01-13 18:37:18.000000000 +0000
++++ plugins/webinterface/php_handler.cpp
+@@ -19,6 +19,8 @@
+  ***************************************************************************/
+ #include "php_handler.h"
+ 
++#include <unistd.h>
++
+ using namespace kt;
+ PhpHandler::PhpHandler(PhpInterface *php):QObject()
+ {