Fix building on DragonflyBSD as described in PR#43368

4 files changed, 42 insertions, 6 deletions

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 59acc393347..7802c8d4f59 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.46 2010/04/16 11:45:27 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2010/05/29 17:10:31 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-libs-${QTVERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	C++ X GUI toolkit
 
 # XXX this is to test what really gets installed when 'do-install' is disabled
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 894fb77d974..2b036e325a6 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2010/04/16 11:45:27 wiz Exp $
+$NetBSD: distinfo,v 1.44 2010/05/29 17:10:31 adam Exp $
 
 SHA1 (qt-everywhere-opensource-src-4.6.2.tar.gz) = 977c10b88a2230e96868edc78a9e3789c0fcbf70
 RMD160 (qt-everywhere-opensource-src-4.6.2.tar.gz) = 5f3fea120f2dba274c4150b02162bba40b65a872
@@ -27,6 +27,7 @@ SHA1 (patch-au) = d0bb72642d73aa716587e8ed3cff4dc37c415e12
 SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
 SHA1 (patch-aw) = 1e716a1f39cb4aee4872184f700f3e4b455463b6
 SHA1 (patch-ax) = 0c17ee0d865a39ed167b6134e73d12a57b9f84a9
-SHA1 (patch-ay) = d1e903fd7d4bf0f84d5151303db941702f02e5dc
+SHA1 (patch-ay) = 29f62543381febdaf054e2b43e7449676dc0ecb7
 SHA1 (patch-az) = 8c8cf4f77b28d092ce05ab2d4a8a87d1a22c61a1
 SHA1 (patch-ba) = 97f9f21909cf42d04d6c40f1e297791e592b6532
+SHA1 (patch-bb) = 9f82a7ac9f951a033af6ae78201ccd8d00004d42
diff --git a/x11/qt4-libs/patches/patch-ay b/x11/qt4-libs/patches/patch-ay
index 5146056bfb9..cf2240a0759 100644
--- a/x11/qt4-libs/patches/patch-ay
+++ b/x11/qt4-libs/patches/patch-ay
@@ -1,8 +1,30 @@
-$NetBSD: patch-ay,v 1.5 2010/03/11 00:07:24 wiz Exp $
+$NetBSD: patch-ay,v 1.6 2010/05/29 17:10:31 adam Exp $
 
 --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig	2010-02-11 15:55:20.000000000 +0000
 +++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-@@ -718,7 +718,7 @@
+@@ -86,6 +86,13 @@
+ #define WTF_PLATFORM_OPENBSD 1
+ #endif
+ 
++/* PLATFORM(DRAGONFLY) */
++/* Operating system level dependencies for OpenBSD systems that */
++/* should be used regardless of operating environment */
++#ifdef __DragonFly__
++#define WTF_PLATFORM_DRAGONFLY 1
++#endif
++
+ /* PLATFORM(SOLARIS) */
+ /* Operating system level dependencies for Solaris that should be used */
+ /* regardless of operating environment */
+@@ -141,6 +148,7 @@
+ /* should be used regardless of operating environment */
+ #if   PLATFORM(DARWIN)     \
+    || PLATFORM(FREEBSD)    \
++   || PLATFORM(DRAGONFLY)  \
+    || PLATFORM(SYMBIAN)    \
+    || PLATFORM(NETBSD)     \
+    || PLATFORM(SOLARIS)    \
+@@ -718,7 +726,7 @@
  #endif
  
  #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
diff --git a/x11/qt4-libs/patches/patch-bb b/x11/qt4-libs/patches/patch-bb
new file mode 100644
index 00000000000..ba75229a6cb
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.3 2010/05/29 17:10:31 adam Exp $
+
+--- src/3rdparty/javascriptcore/JavaScriptCore/config.h.orig	2010-05-29 13:27:36.000000000 +0000
++++ src/3rdparty/javascriptcore/JavaScriptCore/config.h
+@@ -53,7 +53,7 @@
+ 
+ #endif
+ 
+-#if PLATFORM(FREEBSD) || PLATFORM(OPENBSD)
++#if PLATFORM(FREEBSD) || PLATFORM(OPENBSD) || PLATFORM(DRAGONFLY)
+ #define HAVE_PTHREAD_NP_H 1
+ #endif
+