Fix build on FreeBSD 9.0.

* Add some conditional for FreeBSD.
* Fix for FreeBSD's kinfo_proc
* It seems that FreeBSD supports posix spawn, but xulrunner does not use it.
  (I am not famiiar with it..., this should be fixed.)
* FreeBSD 9.0 requires EXTRA_DSO_LDOPTS for nss an nspr like DragonFly 3.0.1.

13 files changed, 112 insertions, 64 deletions

diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index 95a70b40285..a2074338630 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2012/03/22 21:14:24 ryoon Exp $
+$NetBSD: distinfo,v 1.67 2012/04/01 15:18:45 ryoon Exp $
 
 SHA1 (firefox-11.0.source.tar.bz2) = 0b05f91b81803010502cf89f54c3d0187fb63d7e
 RMD160 (firefox-11.0.source.tar.bz2) = 13b7c7327063625904d00b58a6d6f15c04918e92
@@ -18,7 +18,7 @@ SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220
 SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7
 SHA1 (patch-ao) = 353d2098564c7b29849b6f5f4f80d9ac393b23f3
 SHA1 (patch-as) = 42d3e9ba41a00a9837666ccbe02b6fa75a794c0f
-SHA1 (patch-at) = d5e820c9ad87feb1827c948a1471127bc21fbd1b
+SHA1 (patch-at) = aba9b08cf70199f4f85f8b05d4f23f49715b7e38
 SHA1 (patch-au) = e59d5c28c676e03fb8bb38e28c06a4fd4d44ab55
 SHA1 (patch-av) = e22c544894123a6ab8fc428067716b9e68685771
 SHA1 (patch-aw) = 0772c244636f7973171c274c126fa8bfbbcf1acb
@@ -27,7 +27,7 @@ SHA1 (patch-ay) = 980c20007efef5f1798fb75be7fde0dcf3c61340
 SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4
 SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d
 SHA1 (patch-bd) = e09718d6492739a66dc5e21d3ed2cc1a404acd30
-SHA1 (patch-bf) = ef6d6ccbbfee2c72aef76c70695b202e346c5038
+SHA1 (patch-bf) = e9a80a7a663517977d38911c2246ba4de2e1a59b
 SHA1 (patch-bg) = 85d82348c43257eded6426ac84af9815619eb759
 SHA1 (patch-bi) = b190a1c338550b70b65c02f29639338708295075
 SHA1 (patch-build_autoconf_gcc-pr49911.m4) = 252dbdf1c319e17455b5225254281b656dbb397b
@@ -37,21 +37,21 @@ SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = b036f543f2e8502c216164e80aafe
 SHA1 (patch-ipc_chromium_Makefile.in) = 050bfd7911f72b677c12e6f51ba0783a3356a367
 SHA1 (patch-ipc_chromium_chromium-config.mk) = cca3892f4f114dea7d2987d52aee862ea9c3fc33
 SHA1 (patch-ipc_chromium_src_base_base__paths.h) = de42f64a1484ab6570637643ee79ec2e60d9ea01
-SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 4707d1753f5c951efa1d0ecb3e6e17dd200745aa
+SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 81da93780b9f07f4293114b4f01733572c03c893
 SHA1 (patch-ipc_chromium_src_base_file__util.h) = 9cdf3cad35412a65bc1f8ebbfb7d27ad2e8f6c49
 SHA1 (patch-ipc_chromium_src_base_file__util__bsd.cc) = e512d59c6cf9947532317678d009d03c575473bf
 SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 73768c9d4fa0729c92d9a4d3f835f89852065359
 SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = 43c2c98273ebab9417e3101069cc567234dfd3b9
 SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = eb6c8003375c047602fbe5d52497257f0bcdaa4d
 SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = 2463d67e22ea6debe211511e43547fea351012d1
-SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = ca70558dda0166bf898d3c1ccbb58d06212568ca
+SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = bab4319336845ed2ed6e88efd6c4ff54734417f2
 SHA1 (patch-ipc_chromium_src_base_process__util.h) = c08790eaf22b41e64067ab8d29d0c3a125355622
-SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 1adadd3b26e24fcd5c692daae108307c896b0c75
+SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 4990ad6060f97bc529cc3076c720c912dfafd24f
 SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 73b6de35552b97957442d69be25ace53faa6aae2
 SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = de14044b7e2a0085afa6b603bc76f59b6f24c47f
 SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = d5cd70bdc680f04120c58ec576227affd403c992
 SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prtime.cc) = 1143a8abfb69d0c236963037aa09d90e6fd6493a
-SHA1 (patch-ipc_chromium_src_build_build__config.h) = 8e43063b693d69bac425705d02f9214778814f79
+SHA1 (patch-ipc_chromium_src_build_build__config.h) = ee6c129fb214b82df3ab4b2d8ba39e5062302958
 SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = 27ac2b7dbe1b325ad833ffc2bf17003a5f6a6f88
 SHA1 (patch-ipc_chromium_src_chrome_common_ipc__message__utils.h) = fb31bc5e58615d0297c714e8ba500e51fd2813bc
 SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = b55156f1cb5a115a3dcec2d22195fc8763c97e00
@@ -73,7 +73,7 @@ SHA1 (patch-mi) = 1a031ea9be110822995094c84f77c3c68f5c2a39
 SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f
 SHA1 (patch-mk) = 5020178423260e37aa736f4fa4d5ec46ed48b7ea
 SHA1 (patch-ml) = ffec4dcae4a4e3683eebfc3e8aaafe15fa27443e
-SHA1 (patch-mm) = 9b99265bdcb39b917171ed13861afb3a6cd03eb6
+SHA1 (patch-mm) = 4f13d4cd2329f6a062ca31df89f3198f956f35ae
 SHA1 (patch-mn) = a59f31b58547657b96a45a2753aab93866940203
 SHA1 (patch-mp) = 18d2490b6bcd4f017cbf2734a920c3830bfe8856
 SHA1 (patch-netwerk_protocol_http_HttpChannelParent.cpp) = d6b370377d5c397eda9b79bf2093066e9af9a35b
@@ -83,11 +83,11 @@ SHA1 (patch-nsprpub_pr_include_md_prosdep.h) = ffbe93d98a2d0c6e9587bdf2b9ccfc81a
 SHA1 (patch-nsprpub_pr_src_md_unix_uxrng.c) = df081b19c517b034b0aa37c66fcd5ab8e5bcf67c
 SHA1 (patch-nsprpub_pr_src_pthreads_ptio.c) = f4f6e9b5e24de217665ad3a41ad4f1a24deeb519
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 9099113a3f783ef410d8fcce5cfc730b98a93bc7
-SHA1 (patch-pa) = 11d8ec21533250a962d846e1d06b6a61722fcd60
-SHA1 (patch-pb) = 9662aa24ed81760e9cdaffec17592cfe9bbbab22
-SHA1 (patch-pc) = a0fbd378e0209259c97c8e24c8eccc02b543e08f
-SHA1 (patch-pd) = e1b0d5b91c65cc3945eea3488ca0126a3461cea0
-SHA1 (patch-pg) = fbf4ae0f334b97f201d05f9bdfd8a2643aeb33ea
+SHA1 (patch-pa) = 6cef5b546a877d8fb09d24db16c8d4e7eb7f611e
+SHA1 (patch-pb) = db71748a82b7b9796e797d9cd747817e66e96b7a
+SHA1 (patch-pc) = c382946203ef4dda28ee1e49d3c6fbf53ee4a9f0
+SHA1 (patch-pd) = 97e4c26d7b72a3ad1cbc6da5cf14431074d178e6
+SHA1 (patch-pg) = 12b5dc13c798b7d4b7fe0bca487d0f43c0dec2a7
 SHA1 (patch-rc) = fb3ae1a38eabf3f7c47e86d8ff62f79496b9bf67
 SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = 0f4a691aacd5f58ab59ce7f11e22b4f6714e6938
 SHA1 (patch-toolkit_toolkit-tiers.mk) = 53bbd10f337907d4a74a661719ab6637090b74c8
diff --git a/devel/xulrunner/patches/patch-at b/devel/xulrunner/patches/patch-at
index 2be6b10d4d5..4b10831ddbd 100644
--- a/devel/xulrunner/patches/patch-at
+++ b/devel/xulrunner/patches/patch-at
@@ -1,12 +1,12 @@
-$NetBSD: patch-at,v 1.5 2012/03/06 12:34:08 ryoon Exp $
+$NetBSD: patch-at,v 1.6 2012/04/01 15:18:45 ryoon Exp $
 
---- gfx/qcms/qcmstypes.h.orig	2011-12-20 23:28:18.000000000 +0000
+--- gfx/qcms/qcmstypes.h.orig	2012-03-13 01:36:50.000000000 +0000
 +++ gfx/qcms/qcmstypes.h
 @@ -10,6 +10,8 @@
  #if defined (__SVR4) && defined (__sun)
  /* int_types.h gets included somehow, so avoid redefining the types differently */
  #include <sys/int_types.h>
-+#elif defined(__NetBSD__) || defined(__DragonFly__)
++#elif defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
 +#include <stdint.h>
  #elif defined (_AIX)
  #include <sys/types.h>
diff --git a/devel/xulrunner/patches/patch-bf b/devel/xulrunner/patches/patch-bf
index 7617de522ca..5e4479f7018 100644
--- a/devel/xulrunner/patches/patch-bf
+++ b/devel/xulrunner/patches/patch-bf
@@ -1,17 +1,26 @@
-$NetBSD: patch-bf,v 1.5 2011/08/18 18:31:10 tnn Exp $
+$NetBSD: patch-bf,v 1.6 2012/04/01 15:18:45 ryoon Exp $
 
---- js/src/jsnativestack.cpp.orig	2011-08-11 21:41:05.000000000 +0000
+--- js/src/jsnativestack.cpp.orig	2012-03-13 01:36:56.000000000 +0000
 +++ js/src/jsnativestack.cpp
-@@ -50,7 +50,7 @@
+@@ -50,10 +50,16 @@
  #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
  # include <pthread.h>
  
 -# if defined(__FreeBSD__) || defined(__OpenBSD__)
-+# if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++# if defined(__OpenBSD__) || defined(__DragonFly__)
  #  include <pthread_np.h>
  # endif
  
-@@ -145,7 +145,7 @@ GetNativeStackBaseImpl()
++# if defined(__FreeBSD__) 
++_Pragma("GCC visibility push(default)")
++#  include <pthread_np.h>
++_Pragma("GCC visibility pop")
++# endif
++
+ #else
+ # error "Unsupported platform"
+ 
+@@ -145,7 +151,7 @@ GetNativeStackBaseImpl()
      pthread_attr_init(&sattr);
  #  if defined(__OpenBSD__)
      stack_t ss;
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posic.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
index f3c6277012e..4972605c92b 100644
--- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
+++ b/devel/xulrunner/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.2 2012/03/06 12:34:09 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.3 2012/04/01 15:18:45 ryoon Exp $
 
---- ipc/chromium/src/base/debug_util_posix.cc.orig	2012-02-16 06:40:33.000000000 +0000
+--- ipc/chromium/src/base/debug_util_posix.cc.orig	2012-03-13 01:36:53.000000000 +0000
 +++ ipc/chromium/src/base/debug_util_posix.cc
 @@ -5,7 +5,7 @@
  #include "build/build_config.h"
@@ -11,20 +11,22 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.2 2012/03/06 12:3
  
  #include <errno.h>
  #include <fcntl.h>
-@@ -17,8 +17,11 @@
+@@ -17,8 +17,13 @@
  #include <unistd.h>
  #if MOZ_HAVE_EXECINFO_H
  #include <execinfo.h>
 -#include <sys/sysctl.h>
  #endif
-+#if defined(OS_DRAGONFLY)
++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
 +#include <sys/user.h>
++#elif defined(OS_FREEBSD)
++#include <sys/proc.h>
 +#endif
 +#include <sys/sysctl.h>
  
  #include "base/basictypes.h"
  #include "base/eintr_wrapper.h"
-@@ -32,7 +35,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u
+@@ -32,7 +37,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u
    return false;
  }
  
@@ -33,12 +35,14 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.2 2012/03/06 12:3
  
  // Based on Apple's recommended method as described in
  // http://developer.apple.com/qa/qa2004/qa1361.html
-@@ -71,7 +74,11 @@ bool DebugUtil::BeingDebugged() {
+@@ -71,7 +76,13 @@ bool DebugUtil::BeingDebugged() {
  
    // This process is being debugged if the P_TRACED flag is set.
    is_set = true;
-+#if defined(__DragonFly__)
++#if defined(OS_DRAGONFLY)
 +  being_debugged = (info.kp_flags & P_TRACED) != 0;
++#elif defined(OS_FREEBSD)
++  being_debugged = (info.ki_flag & P_TRACED) != 0;
 +#else
    being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
 +#endif
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
index 194786eca3e..d189e49aab5 100644
--- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.3 2012/03/06 12:34:09 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/01 15:18:45 ryoon Exp $
 
---- ipc/chromium/src/base/platform_thread_posix.cc.orig	2012-02-16 06:40:33.000000000 +0000
+--- ipc/chromium/src/base/platform_thread_posix.cc.orig	2012-03-13 01:36:53.000000000 +0000
 +++ ipc/chromium/src/base/platform_thread_posix.cc
-@@ -9,9 +9,13 @@
+@@ -9,9 +9,18 @@
  
  #if defined(OS_MACOSX)
  #include <mach/mach.h>
@@ -13,10 +13,15 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.3 2012/03/06
  #include <unistd.h>
 +#elif defined(OS_DRAGONFLY)
 +#include <unistd.h>
++#elif defined(OS_FREEBSD)
++#include <sys/thr.h>
++_Pragma("GCC visibility push(default)")
++# include <pthread_np.h>
++_Pragma("GCC visibility pop")
  #endif
  
  #if defined(OS_MACOSX)
-@@ -33,6 +37,14 @@ PlatformThreadId PlatformThread::Current
+@@ -33,6 +42,18 @@ PlatformThreadId PlatformThread::Current
    // into the kernel.
  #if defined(OS_MACOSX)
    return mach_thread_self();
@@ -25,9 +30,13 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.3 2012/03/06
 +#elif defined(OS_DRAGONFLY)
 +  return lwp_gettid();
 +#elif defined(OS_FREEBSD)
-+  lwpid_t lwpid;
-+  thr_self( &lwpid );
-+  return lwpid;
++#  if __FreeBSD_cc_version > 900000
++    return pthread_getthreadid_np();
++#  else
++    lwpid_t lwpid;
++    thr_self( &lwpid );
++    return lwpid;
++#  endif
  #elif defined (__OpenBSD__)
    // TODO(BSD): find a better thread ID
    return (intptr_t)(pthread_self());
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc b/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
index 39efaf78190..9a6f3fc6008 100644
--- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
@@ -1,9 +1,8 @@
-$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.3 2012/03/15 08:30:06 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2012/04/01 15:18:45 ryoon Exp $
 
-
---- ipc/chromium/src/base/process_util_bsd.cc.orig	2012-03-08 18:52:15.229788000 +0100
-+++ ipc/chromium/src/base/process_util_bsd.cc	2012-03-11 10:59:50.559480000 +0100
-@@ -0,0 +1,309 @@
+--- ipc/chromium/src/base/process_util_bsd.cc.orig	2012-04-01 00:04:28.000000000 +0000
++++ ipc/chromium/src/base/process_util_bsd.cc
+@@ -0,0 +1,326 @@
 +// Copyright (c) 2008 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -16,8 +15,8 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.3 2012/03/15 08:3
 +#include <fcntl.h>
 +#include <unistd.h>
 +#include <string>
-+#if defined(OS_DRAGONFLY)
-+/* DragonFly, as of v3.0.1, does not explicitly mark symbols public */
++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
++/* DragonFly, as of v3.0.1, and FreeBSD 9.0-RELEASE do not explicitly mark symbols public */
 +#define PRE_SYS_INCLUDE		_Pragma("GCC visibility push(default)")
 +#define POST_SYS_INCLUDE	_Pragma("GCC visibility pop")
 +#else
@@ -31,9 +30,16 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.3 2012/03/15 08:3
 +#include <sys/types.h>
 +#include <sys/wait.h>
 +#if defined(OS_DRAGONFLY)
++PRE_SYS_INCLUDE
 +#include <sys/user.h>
++POST_SYS_INCLUDE
 +#define HAVE_POSIX_SPAWN	1
 +#endif
++#if defined(OS_FREEBSD)
++PRE_SYS_INCLUDE
++#include <sys/user.h>
++POST_SYS_INCLUDE
++#endif
 +
 +#include "base/debug_util.h"
 +#include "base/eintr_wrapper.h"
@@ -269,11 +275,12 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.3 2012/03/15 08:3
 +  kvm_t *kvm;
 +  std::string exe(WideToASCII(executable_name));
 +
-+#if defined(OS_DRAGONFLY)
++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
 +  kvm  = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL);
 +  struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), &numEntries);
 +  if (procs != NULL && numEntries > 0) {
 +    for (int i = 0; i < numEntries; i++) {
++#  if defined(OS_DRAGONFLY)
 +    if (exe != procs[i].kp_comm) continue;
 +      if (filter && !filter->Includes(procs[i].kp_pid, procs[i].kp_ppid)) continue;
 +      ProcessEntry e;
@@ -281,6 +288,15 @@ $NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.3 2012/03/15 08:3
 +      e.ppid = procs[i].kp_ppid;
 +      strlcpy(e.szExeFile, procs[i].kp_comm, sizeof e.szExeFile);
 +      content.push_back(e);
++#  elif defined(OS_FREEBSD)
++    if (exe != procs[i].ki_comm) continue;
++      if (filter && !filter->Includes(procs[i].ki_pid, procs[i].ki_ppid)) continue;
++      ProcessEntry e;
++      e.pid = procs[i].ki_pid;
++      e.ppid = procs[i].ki_ppid;
++      strlcpy(e.szExeFile, procs[i].ki_comm, sizeof e.szExeFile);
++      content.push_back(e);
++#  endif
 +#else
 +  kvm  = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
 +  struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries);
diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_build_build__config.h b/devel/xulrunner/patches/patch-ipc_chromium_src_build_build__config.h
index e4bae8177b5..5fa55d673c5 100644
--- a/devel/xulrunner/patches/patch-ipc_chromium_src_build_build__config.h
+++ b/devel/xulrunner/patches/patch-ipc_chromium_src_build_build__config.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.3 2012/03/06 12:34:09 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.4 2012/04/01 15:18:45 ryoon Exp $
 
---- ipc/chromium/src/build/build_config.h.orig	2011-12-20 23:28:19.000000000 +0000
+--- ipc/chromium/src/build/build_config.h.orig	2012-03-13 01:36:53.000000000 +0000
 +++ ipc/chromium/src/build/build_config.h
-@@ -19,6 +19,10 @@
+@@ -19,17 +19,23 @@
  #define OS_MACOSX 1
  #elif defined(__linux__) || defined(ANDROID)
  #define OS_LINUX 1
@@ -13,7 +13,12 @@ $NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.3 2012/03/06 12:34:09
  #elif defined(__OpenBSD__)
  #define OS_OPENBSD 1
  #elif defined(_WIN32)
-@@ -29,7 +33,7 @@
+ #define OS_WIN 1
++#elif defined(__FreeBSD__)
++#define OS_FREEBSD 1
+ #else
+ #error Please add support for your platform in build/build_config.h
+ #endif
  
  // For access to standard POSIX features, use OS_POSIX instead of a more
  // specific macro.
diff --git a/devel/xulrunner/patches/patch-mm b/devel/xulrunner/patches/patch-mm
index b87b27c54eb..2bc88c1075d 100644
--- a/devel/xulrunner/patches/patch-mm
+++ b/devel/xulrunner/patches/patch-mm
@@ -1,8 +1,8 @@
-$NetBSD: patch-mm,v 1.9 2012/03/21 10:40:25 drochner Exp $
+$NetBSD: patch-mm,v 1.10 2012/04/01 15:18:45 ryoon Exp $
 
 --- toolkit/library/Makefile.in.orig	2012-03-13 01:37:16.000000000 +0000
 +++ toolkit/library/Makefile.in
-@@ -554,6 +554,19 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -554,6 +554,24 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
  endif
  endif
  
@@ -11,6 +11,11 @@ $NetBSD: patch-mm,v 1.9 2012/03/21 10:40:25 drochner Exp $
 +EXTRA_DSO_LDOPTS += -lplc4 -lplds4 -lnspr4 -lnssutil3
 +endif
 +
++ifeq ($(OS_ARCH),FreeBSD)
++OS_LIBS += $(call EXPAND_LIBNAME,kvm)
++EXTRA_DSO_LDOPTS += -lplc4 -lplds4 -lnspr4 -lnssutil3
++endif
++
 +ifeq ($(OS_ARCH),NetBSD)
 +OS_LIBS += $(call EXPAND_LIBNAME,kvm)
 +EXTRA_DSO_LDOPTS += -lossaudio
diff --git a/devel/xulrunner/patches/patch-pa b/devel/xulrunner/patches/patch-pa
index ae2cfbf1ea1..e5742d8447c 100644
--- a/devel/xulrunner/patches/patch-pa
+++ b/devel/xulrunner/patches/patch-pa
@@ -1,11 +1,11 @@
-$NetBSD: patch-pa,v 1.3 2011/04/26 14:16:37 tnn Exp $
+$NetBSD: patch-pa,v 1.4 2012/04/01 15:18:45 ryoon Exp $
 
---- xulrunner/installer/mozilla-js.pc.in.orig	2010-11-04 19:20:39.000000000 +0000
+--- xulrunner/installer/mozilla-js.pc.in.orig	2012-03-13 01:37:21.000000000 +0000
 +++ xulrunner/installer/mozilla-js.pc.in
 @@ -6,5 +6,5 @@ Name: JavaScript
  Description: The Mozilla JavaScript Library
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
 -Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
-+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner %MOZ_JS_LINK%
++Libs: -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner %MOZ_JS_LINK%
  Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
diff --git a/devel/xulrunner/patches/patch-pb b/devel/xulrunner/patches/patch-pb
index a8e11a299e0..ceb1b83ca74 100644
--- a/devel/xulrunner/patches/patch-pb
+++ b/devel/xulrunner/patches/patch-pb
@@ -1,11 +1,11 @@
-$NetBSD: patch-pb,v 1.4 2011/04/26 14:16:37 tnn Exp $
+$NetBSD: patch-pb,v 1.5 2012/04/01 15:18:45 ryoon Exp $
 
---- xulrunner/installer/libxul.pc.in.orig	2010-11-04 19:20:39.000000000 +0000
+--- xulrunner/installer/libxul.pc.in.orig	2012-03-13 01:37:21.000000000 +0000
 +++ xulrunner/installer/libxul.pc.in
 @@ -7,5 +7,5 @@ Name: libxul
  Description: The Mozilla Runtime and Embedding Engine
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
 -Libs: -L${sdkdir}/lib %MOZ_XUL_LINK%
-+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner %MOZ_XUL_LINK%
++Libs: -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner %MOZ_XUL_LINK%
  Cflags: -I${includedir} %WCHAR_CFLAGS%
diff --git a/devel/xulrunner/patches/patch-pc b/devel/xulrunner/patches/patch-pc
index 896b6acab3a..672699b8b9b 100644
--- a/devel/xulrunner/patches/patch-pc
+++ b/devel/xulrunner/patches/patch-pc
@@ -1,6 +1,6 @@
-$NetBSD: patch-pc,v 1.3 2011/04/26 14:16:37 tnn Exp $
+$NetBSD: patch-pc,v 1.4 2012/04/01 15:18:45 ryoon Exp $
 
---- xulrunner/installer/libxul-embedding.pc.in.orig	2010-04-21 09:07:48.000000000 +0000
+--- xulrunner/installer/libxul-embedding.pc.in.orig	2012-03-13 01:37:21.000000000 +0000
 +++ xulrunner/installer/libxul-embedding.pc.in
 @@ -6,5 +6,6 @@ idldir=%idldir%
  Name: libxul-embedding
@@ -8,5 +8,5 @@ $NetBSD: patch-pc,v 1.3 2011/04/26 14:16:37 tnn Exp $
  Version: %MOZILLA_VERSION%
 -Libs: -L${sdkdir}/lib -lxpcomglue -ldl
 +# XXXtnn -ldl removed
-+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lxpcomglue
++Libs: -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lxpcomglue
  Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
diff --git a/devel/xulrunner/patches/patch-pd b/devel/xulrunner/patches/patch-pd
index 0a8ecfae39d..764312f766a 100644
--- a/devel/xulrunner/patches/patch-pd
+++ b/devel/xulrunner/patches/patch-pd
@@ -1,11 +1,11 @@
-$NetBSD: patch-pd,v 1.4 2011/04/26 14:16:37 tnn Exp $
+$NetBSD: patch-pd,v 1.5 2012/04/01 15:18:45 ryoon Exp $
 
---- xulrunner/installer/mozilla-nss.pc.in.orig	2009-10-29 23:11:24.000000000 +0100
+--- xulrunner/installer/mozilla-nss.pc.in.orig	2012-03-13 01:37:21.000000000 +0000
 +++ xulrunner/installer/mozilla-nss.pc.in
 @@ -6,5 +6,5 @@ Name: NSS
  Description: Mozilla Network Security Services
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
 -Libs: -L${sdkdir}/lib -lsmime3 -lssl3 -lnss3 -lnssutil3
-+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lsmime3 -lssl3 -lnss3 -lnssutil3
++Libs: -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lsmime3 -lssl3 -lnss3 -lnssutil3
  Cflags: -I${includedir}
diff --git a/devel/xulrunner/patches/patch-pg b/devel/xulrunner/patches/patch-pg
index 08a980fd8c8..63876e693ab 100644
--- a/devel/xulrunner/patches/patch-pg
+++ b/devel/xulrunner/patches/patch-pg
@@ -1,6 +1,6 @@
-$NetBSD: patch-pg,v 1.3 2011/04/26 14:16:37 tnn Exp $
+$NetBSD: patch-pg,v 1.4 2012/04/01 15:18:45 ryoon Exp $
 
---- xulrunner/installer/mozilla-nspr.pc.in.orig	2009-10-29 23:11:24.000000000 +0100
+--- xulrunner/installer/mozilla-nspr.pc.in.orig	2012-03-13 01:37:21.000000000 +0000
 +++ xulrunner/installer/mozilla-nspr.pc.in
 @@ -5,7 +5,5 @@ includedir=%includedir%
  Name: NSPR
@@ -10,5 +10,5 @@ $NetBSD: patch-pg,v 1.3 2011/04/26 14:16:37 tnn Exp $
 -Cflags: %FULL_NSPR_CFLAGS%
 -
 -
-+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lplds4 -lplc4 -lnspr4 -pthread
++Libs: -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lplds4 -lplc4 -lnspr4 -pthread
 +Cflags: -I${includedir}