Fix build on recent NetBSD 6.99.16.

See http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/sysctl.h.diff?r1=1.204&r2=1.205&f=h&only_with_tag=MAIN&f=u

Tested on NetBSD/i386 5.2 and NetBSD/amd64 current.

Patch is provided from nonaka@. Thank you.

2 files changed, 30 insertions, 5 deletions

diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index 94c1c9270fc..49f1fb3ec72 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.87 2013/01/02 02:31:04 ryoon Exp $
+$NetBSD: distinfo,v 1.88 2013/01/04 17:16:54 ryoon Exp $
 
 SHA1 (firefox-17.0.1esr.source.tar.bz2) = 06373c132ca07a6e2dbb5fe1a2552519ba91ee37
 RMD160 (firefox-17.0.1esr.source.tar.bz2) = a85fc33defda9c514f46623672d61358397e58f1
@@ -43,7 +43,7 @@ SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = 775c13ca6a77b3f39f23e15fbbcf4b1cae4e94
 SHA1 (patch-ipc_chromium_Makefile.in) = c2d339b32050e772dea05790d61f291d9a52e06f
 SHA1 (patch-ipc_chromium_chromium-config.mk) = 24b1fe7cc7f3f14dd8a79f8eedf6f3638c304020
 SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 0b8e231055cde854f31b9aa44392692a53d806f0
-SHA1 (patch-ipc_chromium_src_base_debug__util__posix.cc) = 46bf793870b4fbc2c8594186eea6bd3c7db885e9
+SHA1 (patch-ipc_chromium_src_base_debug__util__posix.cc) = c00b594a40c4222261a0ad4f7ddbc804028aec16
 SHA1 (patch-ipc_chromium_src_base_dir__reader__bsd.h) = 767160e3099d7bd4eb58dc24ed207417acdf098a
 SHA1 (patch-ipc_chromium_src_base_dir__reader__posix.h) = d6dd15f644de3fa755f8c9be9190eb4092295091
 SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 96a5a0d4b61ec69b80db3c9ff212d7a7a3d506f6
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posix.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posix.cc
index 7a06cc4ce8d..418cbd88935 100644
--- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posix.cc
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posix.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-ipc_chromium_src_base_debug__util__posix.cc,v 1.1 2012/08/29 03:01:19 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_debug__util__posix.cc,v 1.2 2013/01/04 17:16:54 ryoon Exp $
 
 # Reported upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=753046
 
---- ipc/chromium/src/base/debug_util_posix.cc.orig	2012-08-24 22:55:37.000000000 +0000
+--- ipc/chromium/src/base/debug_util_posix.cc.orig	2012-11-29 04:44:15.000000000 +0000
 +++ ipc/chromium/src/base/debug_util_posix.cc
 @@ -5,7 +5,7 @@
  #include "build/build_config.h"
@@ -39,7 +39,30 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posix.cc,v 1.1 2012/08/29 03:0
  
  // Based on Apple's recommended method as described in
  // http://developer.apple.com/qa/qa2004/qa1361.html
-@@ -71,7 +78,15 @@ bool DebugUtil::BeingDebugged() {
+@@ -51,14 +58,22 @@ bool DebugUtil::BeingDebugged() {
+   // we're looking for information about a specific process ID.
+   int mib[] = {
+     CTL_KERN,
++#if defined(OS_NETBSD)
++    KERN_PROC2,
++#else
+     KERN_PROC,
++#endif
+     KERN_PROC_PID,
+     getpid()
+   };
+ 
+   // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE.  The source and
+   // binary interfaces may change.
++#if defined(OS_NETBSD)
++  struct kinfo_proc2 info;
++#else
+   struct kinfo_proc info;
++#endif
+   size_t info_size = sizeof(info);
+ 
+   int sysctl_result = sysctl(mib, arraysize(mib), &info, &info_size, NULL, 0);
+@@ -71,7 +86,17 @@ bool DebugUtil::BeingDebugged() {
  
    // This process is being debugged if the P_TRACED flag is set.
    is_set = true;
@@ -49,6 +72,8 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posix.cc,v 1.1 2012/08/29 03:0
 +  being_debugged = (info.ki_flag & P_TRACED) != 0;
 +#elif defined(OS_OPENBSD)
 +  being_debugged = (info.p_flag & P_TRACED) != 0;
++#elif defined(OS_NETBSD)
++  being_debugged = (info.p_flag & P_TRACED) != 0;
 +#else
    being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
 +#endif