* Reset PKGREVISION.

* Fix build on recent NetBSD current.

3 files changed, 35 insertions, 7 deletions

diff --git a/devel/xulrunner10/Makefile b/devel/xulrunner10/Makefile
index c70dfff4a5b..5fbf1936e09 100644
--- a/devel/xulrunner10/Makefile
+++ b/devel/xulrunner10/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2012/12/12 11:12:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2013/01/10 12:31:59 ryoon Exp $
 
 .include "dist.mk"
 PKGNAME=	xulrunner10-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-PKGREVISION=	1
 CATEGORIES=	devel www
 
 MAINTAINER=	tnn@NetBSD.org
diff --git a/devel/xulrunner10/distinfo b/devel/xulrunner10/distinfo
index 015326030b4..0af13365562 100644
--- a/devel/xulrunner10/distinfo
+++ b/devel/xulrunner10/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2013/01/10 12:01:02 is Exp $
+$NetBSD: distinfo,v 1.12 2013/01/10 12:31:59 ryoon Exp $
 
 SHA1 (firefox-10.0.12esr.source.tar.bz2) = d9086cabf06e04ef5200a8731288c0df27eb84d7
 RMD160 (firefox-10.0.12esr.source.tar.bz2) = b112325fa37435d62e5e2737f2e87caf58f25b3c
@@ -37,7 +37,7 @@ SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 927c08622eae442bcf0bb40253d80
 SHA1 (patch-ipc_chromium_Makefile.in) = 0bdad52dfb4ef6d4440147395c70f75b2a990a1c
 SHA1 (patch-ipc_chromium_chromium-config.mk) = ef9eb54c84b3b88818b136dc7ce4f67bf057c079
 SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 99f2ed0597e8b1fd2b791f54948eecc8bd712260
-SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 56b8d6614fa9a49e4b850be04ba755d6f48f10ab
+SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 7e17052441aef7997ae3c4bef3a26538a334fed4
 SHA1 (patch-ipc_chromium_src_base_file__util.h) = e84b723a4a6965c6e7e3867a147841269287fb1d
 SHA1 (patch-ipc_chromium_src_base_file__util__bsd.cc) = 6f3be0c99789031f1ec1a452260b827b09578848
 SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 39b5d75daedc20e2074946d68df9606d5da85b7a
diff --git a/devel/xulrunner10/patches/patch-ipc_chromium_src_base_debug__util__posic.cc b/devel/xulrunner10/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
index 026b2e25e73..e4da60d14a1 100644
--- a/devel/xulrunner10/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
+++ b/devel/xulrunner10/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.1.1.1 2012/03/15 08:58:28 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.2 2013/01/10 12:32:00 ryoon Exp $
 
---- ipc/chromium/src/base/debug_util_posix.cc.orig	2012-03-09 22:20:16.000000000 +0000
+--- ipc/chromium/src/base/debug_util_posix.cc.orig	2013-01-03 17:43:14.000000000 +0000
 +++ ipc/chromium/src/base/debug_util_posix.cc
 @@ -5,7 +5,7 @@
  #include "build/build_config.h"
@@ -33,12 +33,41 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.1.1.1 2012/03/15
  
  // Based on Apple's recommended method as described in
  // http://developer.apple.com/qa/qa2004/qa1361.html
-@@ -71,7 +74,11 @@ bool DebugUtil::BeingDebugged() {
+@@ -51,14 +54,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 +82,17 @@ bool DebugUtil::BeingDebugged() {
  
    // This process is being debugged if the P_TRACED flag is set.
    is_set = true;
 +#if defined(__DragonFly__)
 +  being_debugged = (info.kp_flags & P_TRACED) != 0;
++#elif defined(OS_FREEBSD)
++  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