Fix some dragonfly build issues.

6 files changed, 52 insertions, 8 deletions

diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index acb6a6500a1..dfa3f77c2ae 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2011/07/12 00:19:45 tnn Exp $
+$NetBSD: distinfo,v 1.47 2011/07/12 15:12:36 tnn Exp $
 
 SHA1 (firefox-5.0.source.tar.bz2) = 22b7b4751173c2142a0f09cca1aebc717d97b45a
 RMD160 (firefox-5.0.source.tar.bz2) = 93d97a01f572f3688b0065c903afc3d7f9260179
@@ -29,12 +29,13 @@ SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4
 SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d
 SHA1 (patch-bd) = e09718d6492739a66dc5e21d3ed2cc1a404acd30
 SHA1 (patch-be) = 723d74807830632ecd3b88e8271d91d73ac81be4
-SHA1 (patch-bf) = 9a2e7a40e7d6cf01df384bf5e71b15a7c3f94cc0
+SHA1 (patch-bf) = 66bac52db259d8edd7359267431a73bd19d25526
 SHA1 (patch-bg) = 85d82348c43257eded6426ac84af9815619eb759
 SHA1 (patch-bi) = a79369cf0c7370a8655fe414cdb7c8ddb4c2d495
 SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = fcb4313d2a77c73df717138e33a3bc74841f06c4
 SHA1 (patch-ipc_chromium_src_base_file__util.h) = 1385e427cc8c0c14cd67763aea85d78b99901de7
 SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = f3e0891320d2658db2bf33b57e6287f4380c855e
+SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = eb6c8003375c047602fbe5d52497257f0bcdaa4d
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = bfcea1298c2d2c7d65570be3a5529adbf711dea3
 SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 4d6e4724bc2473325fc9e62ab2321155a06c65d6
 SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = 15b35884249077eb879371b8b63d2f8aa4ee68b5
diff --git a/devel/xulrunner/patches/patch-bf b/devel/xulrunner/patches/patch-bf
index 60999e9fd37..903d29b919c 100644
--- a/devel/xulrunner/patches/patch-bf
+++ b/devel/xulrunner/patches/patch-bf
@@ -1,13 +1,22 @@
-$NetBSD: patch-bf,v 1.3 2011/07/11 12:46:14 tnn Exp $
+$NetBSD: patch-bf,v 1.4 2011/07/12 15:12:36 tnn Exp $
 
 --- js/src/jsnativestack.cpp.orig	2011-06-15 21:57:29.000000000 +0000
 +++ js/src/jsnativestack.cpp
+@@ -50,7 +50,7 @@
+ #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
+ # include <pthread.h>
+ 
+-# if defined(__FreeBSD__)
++# if defined(__FreeBSD__) || defined(__DragonFly__)
+ #  include <pthread_np.h>
+ # endif
+ 
 @@ -145,7 +145,7 @@ GetNativeStackBaseImpl()
      pthread_attr_init(&sattr);
  #  if defined(__OpenBSD__)
      stack_t ss;
 -#  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD)
-+#  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD) || defined(__NetBSD__) /* XXX tnn not sure why NETBSD isn't defined, it looks like it should be ... */
++#  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(__DragonFly__) || defined(NETBSD) || defined(__NetBSD__) /* XXX tnn not sure why NETBSD isn't defined, it looks like it should be ... */
      /* e.g. on FreeBSD 4.8 or newer, neundorf@kde.org */
      pthread_attr_get_np(thread, &sattr);
  #  else
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__file__posix.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__file__posix.cc
new file mode 100644
index 00000000000..70db25bc526
--- /dev/null
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__file__posix.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc,v 1.1 2011/07/12 15:12:36 tnn Exp $
+
+--- ipc/chromium/src/base/platform_file_posix.cc.orig	2011-06-15 21:57:27.000000000 +0000
++++ ipc/chromium/src/base/platform_file_posix.cc
+@@ -9,6 +9,7 @@
+ #ifdef ANDROID
+ #include <linux/stat.h>
+ #endif
++#include <sys/stat.h> /* for S_IRUSR */
+ 
+ #include "base/logging.h"
+ #include "base/string_util.h"
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index b7b32d6f816..30f41481014 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2011/07/12 00:19:45 tnn Exp $
+$NetBSD: distinfo,v 1.63 2011/07/12 15:12:36 tnn Exp $
 
 SHA1 (seamonkey-2.2.source.tar.bz2) = bb2181fbbb4aa16e51899b483acadb31f7e0cbbc
 RMD160 (seamonkey-2.2.source.tar.bz2) = cfad0460357c357df7a5936c0bd10374c18eac04
@@ -30,13 +30,14 @@ SHA1 (patch-az) = 0e04c1c740ad3f1462a6cda4a3832378acefb600
 SHA1 (patch-ba) = fd28f3b24848e7221078ef692eef7ccae8625987
 SHA1 (patch-bd) = c2296fe47f6f9e38d424ef27ca367a257188e2d1
 SHA1 (patch-be) = 8783683729e40b5deec2e33fbc50e63e1357aea3
-SHA1 (patch-bf) = 1286afe7d7858d287f0368cff2262d5ad1c4725e
+SHA1 (patch-bf) = 5afeb2f5f0103727f3e1b60c7a5dadcc4aa5a264
 SHA1 (patch-bg) = b30ecac3ee44d749a3eb125bbcd5e24e31b23243
 SHA1 (patch-bi) = c47064c71c6fc960a1a9afb735f249f3f7d0d09d
 SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = 5f9f69ac57da0c830f2fa33e82057a1eb5907249
 SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = bc98be56df67b1a3c2b1174613f0d6c3134a2c8e
 SHA1 (patch-ipc_chromium_src_base_file__util.h) = 51dc4a5a32da8e7d7eb3c026e3ebaae7858564cf
 SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = ce60e80e3ddc417c1fa867f6f4258aece166fc51
+SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = 3c83eeb7f40416b61a799ca55b223a93353f7f6a
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = a68ba3b5b891bed422c751a924a7d1b792211db1
 SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 2dc6cd2bac4bc45406709090369f2901090d855f
 SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = 648804b5b2cccba36ac14e693f5dac16c55dcb32
diff --git a/www/seamonkey/patches/patch-bf b/www/seamonkey/patches/patch-bf
index 3a225757328..9209b37f03e 100644
--- a/www/seamonkey/patches/patch-bf
+++ b/www/seamonkey/patches/patch-bf
@@ -1,13 +1,22 @@
-$NetBSD: patch-bf,v 1.1 2011/07/11 20:46:36 tnn Exp $
+$NetBSD: patch-bf,v 1.2 2011/07/12 15:12:36 tnn Exp $
 
 --- mozilla/js/src/jsnativestack.cpp.orig	2011-06-15 21:57:29.000000000 +0000
 +++ mozilla/js/src/jsnativestack.cpp
+@@ -50,7 +50,7 @@
+ #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
+ # include <pthread.h>
+ 
+-# if defined(__FreeBSD__)
++# if defined(__FreeBSD__) || defined(__DragonFly__)
+ #  include <pthread_np.h>
+ # endif
+ 
 @@ -145,7 +145,7 @@ GetNativeStackBaseImpl()
      pthread_attr_init(&sattr);
  #  if defined(__OpenBSD__)
      stack_t ss;
 -#  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD)
-+#  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD) || defined(__NetBSD__) /* XXX tnn not sure why NETBSD isn't defined, it looks like it should be ... */
++#  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(__DragonFly__) || defined(NETBSD) || defined(__NetBSD__) /* XXX tnn not sure why NETBSD isn't defined, it looks like it should be ... */
      /* e.g. on FreeBSD 4.8 or newer, neundorf@kde.org */
      pthread_attr_get_np(thread, &sattr);
  #  else
diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__file__posix.cc b/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__file__posix.cc
new file mode 100644
index 00000000000..1238eaa38c6
--- /dev/null
+++ b/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__file__posix.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc,v 1.1 2011/07/12 15:12:36 tnn Exp $
+
+--- mozilla/ipc/chromium/src/base/platform_file_posix.cc.orig	2011-06-15 21:57:27.000000000 +0000
++++ mozilla/ipc/chromium/src/base/platform_file_posix.cc
+@@ -9,6 +9,7 @@
+ #ifdef ANDROID
+ #include <linux/stat.h>
+ #endif
++#include <sys/stat.h> /* for S_IRUSR */
+ 
+ #include "base/logging.h"
+ #include "base/string_util.h"