Update to 2.12

* Update Mozilla Lightning to 1.7 * Update Enigmail to 1.4.4 (functionality is not tested yet; should be updated) * Regen patches Changelog: SeaMonkey-specific changes None. Mozilla platform changes Added support for SPDY networking protocol v3. Implemented WebGL enhancements, including compressed textures for better performance. Optimized memory usage for add-ons. Implemented the CSS word-break property. Implemented high precision event timer. HTML5: Added native support for the Opus audio codec. HTML5: Added support for the source element media attribute. HTML5: Added support for the audio element and video element played attribute. Fixed several stability issues. Fixed in SeaMonkey 2.12 MFSA 2012-70 Location object security checks bypassed by chrome code MFSA 2012-69 Incorrect site SSL certificate data display MFSA 2012-68 DOMParser loads linked resources in extensions when parsing text/html MFSA 2012-65 Out-of-bounds read in format-number in XSLT MFSA 2012-64 Graphite 2 memory corruption MFSA 2012-63 SVG buffer overflow and use-after-free issues MFSA 2012-62 WebGL use-after-free and memory corruption MFSA 2012-61 Memory corruption with bitmap format images with negative height MFSA 2012-59 Location object can be shadowed using Object.defineProperty MFSA 2012-58 Use-after-free issues found using Address Sanitizer MFSA 2012-57 Miscellaneous memory safety hazards (rv:15.0/ rv:10.0.7)
author: ryoon <ryoon@pkgsrc.org> 2012-09-06 12:08:50 +0000
committer: ryoon <ryoon@pkgsrc.org> 2012-09-06 12:08:50 +0000
commit: b39190ba4cb82692a651c9bb50b6c2084edc9dd1 (patch)
tree: df2006c379778028c1badfa17c2096231017bb4c /www/seamonkey/patches
parent: 7d890f0b75eeecaf49645a757930580f0f787faf (diff)
download: pkgsrc-b39190ba4cb82692a651c9bb50b6c2084edc9dd1.tar.gz
129 files changed, 787 insertions, 1243 deletions
diff --git a/www/seamonkey/patches/patch-aa b/www/seamonkey/patches/patch-aa
index 4664d7747c1..a8c616f7a7a 100644
--- a/www/seamonkey/patches/patch-aa
+++ b/www/seamonkey/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-aa,v 1.10 2012/09/06 12:08:50 ryoon Exp $
 
---- mozilla/configure.in.orig	2012-04-23 06:27:25.000000000 +0000
+--- mozilla/configure.in.orig	2012-08-27 04:49:04.000000000 +0000
 +++ mozilla/configure.in
-@@ -2413,7 +2413,7 @@ case "$target" in
+@@ -2299,7 +2299,7 @@ case "$target" in
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.9 2012/04/28 22:48:06 ryoon Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -2421,6 +2421,9 @@ case "$target" in
+@@ -2307,6 +2307,9 @@ case "$target" in
      if test ! "$GNU_CC"; then
  	DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
      fi
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.9 2012/04/28 22:48:06 ryoon Exp $
      ;;
  
  ia64*-hpux*)
-@@ -3412,6 +3415,9 @@ dnl ====================================
+@@ -3309,6 +3312,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.9 2012/04/28 22:48:06 ryoon Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -4358,6 +4364,14 @@ if test -n "$YASM"; then
+@@ -4308,6 +4314,14 @@ if test -n "$YASM"; then
    _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
  fi
  
@@ -46,7 +46,7 @@ $NetBSD: patch-aa,v 1.9 2012/04/28 22:48:06 ryoon Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -5732,11 +5746,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
+@@ -5734,11 +5748,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
  
      dnl See if we have assembly on this platform.
      case "$OS_ARCH:$CPU_ARCH" in
@@ -60,7 +60,16 @@ $NetBSD: patch-aa,v 1.9 2012/04/28 22:48:06 ryoon Exp $
        VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
        VPX_X86_ASM=1
      ;;
-@@ -9102,6 +9116,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
+@@ -6140,7 +6154,7 @@ if test -n "$MOZ_CRASHREPORTER"; then
+     AC_MSG_ERROR([Breakpad tools do not support compiling on $HOST_OS_ARCH while targeting $OS_ARCH.  Use --disable-crashreporter.])
+   fi
+ 
+-  if test "$OS_ARCH" == "WINNT" -a -z "$HAVE_64BIT_OS"; then
++  if test "$OS_ARCH" = "WINNT" -a -z "$HAVE_64BIT_OS"; then
+     MOZ_CRASHREPORTER_INJECTOR=1
+     AC_DEFINE(MOZ_CRASHREPORTER_INJECTOR)
+   fi
+@@ -9248,6 +9262,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
      AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output])
      if test "$OS_ARCH" != "WINNT"; then
         NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs`
diff --git a/www/seamonkey/patches/patch-aa-toplevel b/www/seamonkey/patches/patch-aa-toplevel
index 959f5384c8a..0c008e719f9 100644
--- a/www/seamonkey/patches/patch-aa-toplevel
+++ b/www/seamonkey/patches/patch-aa-toplevel
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa-toplevel,v 1.7 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-aa-toplevel,v 1.8 2012/09/06 12:08:50 ryoon Exp $
 
---- configure.in.orig	2012-04-23 06:20:50.000000000 +0000
+--- configure.in.orig	2012-08-27 04:44:23.000000000 +0000
 +++ configure.in
-@@ -1950,7 +1950,7 @@ ld.])
+@@ -1865,7 +1865,7 @@ ld.])
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa-toplevel,v 1.7 2012/04/28 22:48:06 ryoon Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -1958,6 +1958,9 @@ ld.])
+@@ -1873,6 +1873,9 @@ ld.])
      if test ! "$GNU_CC"; then
  	DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
      fi
@@ -21,7 +21,7 @@ $NetBSD: patch-aa-toplevel,v 1.7 2012/04/28 22:48:06 ryoon Exp $
      ;; 
  
  ia64*-hpux*)
-@@ -3231,6 +3234,9 @@ dnl ====================================
+@@ -3106,6 +3109,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
diff --git a/www/seamonkey/patches/patch-ab b/www/seamonkey/patches/patch-ab
index e3ece8127ae..1e651ae83a1 100644
--- a/www/seamonkey/patches/patch-ab
+++ b/www/seamonkey/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.14 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ab,v 1.15 2012/09/06 12:08:50 ryoon Exp $
 
---- mozilla/nsprpub/pr/include/md/_netbsd.h.orig	2012-04-23 06:28:13.000000000 +0000
+--- mozilla/nsprpub/pr/include/md/_netbsd.h.orig	2012-08-27 04:49:27.000000000 +0000
 +++ mozilla/nsprpub/pr/include/md/_netbsd.h
-@@ -79,7 +79,7 @@
+@@ -47,7 +47,7 @@
  #define HAVE_DLL
  #define USE_DLFCN
  #define _PR_HAVE_SOCKADDR_LEN
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.14 2012/04/28 22:48:06 ryoon Exp $
  #define _PR_STAT_HAS_ST_ATIMESPEC
  #define _PR_POLL_AVAILABLE
  #define _PR_USE_POLL
-@@ -107,6 +107,8 @@
+@@ -75,6 +75,8 @@
  #define JB_SP_INDEX 2
  #elif defined(__mips__)
  #define JB_SP_INDEX 4
diff --git a/www/seamonkey/patches/patch-ac b/www/seamonkey/patches/patch-ac
index 8383c194f0c..983b42bfa2f 100644
--- a/www/seamonkey/patches/patch-ac
+++ b/www/seamonkey/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.10 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ac,v 1.11 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/nsprpub/configure.in.orig	2012-04-23 06:28:13.000000000 +0000
+--- mozilla/nsprpub/configure.in.orig	2012-08-27 04:49:27.000000000 +0000
 +++ mozilla/nsprpub/configure.in
-@@ -71,7 +71,7 @@ OBJDIR_NAME=.
+@@ -36,7 +36,7 @@ OBJDIR_NAME=.
  OBJDIR_SUFFIX=OBJ
  NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall'
  NOSUCHFILE=/no-such-file
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.10 2012/04/28 22:48:06 ryoon Exp $
  LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)'
  CYGWIN_WRAPPER=
  MACOS_SDK_DIR=
-@@ -1567,6 +1567,33 @@ tools are selected during the Xcode/Deve
+@@ -1519,6 +1519,33 @@ tools are selected during the Xcode/Deve
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
      MDCPUCFG_H=_freebsd.cfg
      PR_MD_CSRCS=freebsd.c
@@ -45,7 +45,7 @@ $NetBSD: patch-ac,v 1.10 2012/04/28 22:48:06 ryoon Exp $
      ;;
  
  *-hpux*)
-@@ -2154,6 +2181,7 @@ mips-nec-sysv*)
+@@ -2110,6 +2137,7 @@ mips-nec-sysv*)
      AC_DEFINE(XP_UNIX)
      AC_DEFINE(NETBSD)
      AC_DEFINE(HAVE_BSD_FLOCK)
@@ -53,7 +53,7 @@ $NetBSD: patch-ac,v 1.10 2012/04/28 22:48:06 ryoon Exp $
      if test -z "$USE_NSPR_THREADS"; then
          USE_PTHREADS=1
      fi
-@@ -2962,7 +2990,7 @@ if test -n "$USE_PTHREADS"; then
+@@ -2918,7 +2946,7 @@ if test -n "$USE_PTHREADS"; then
  	if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
  	    ac_cv_have_dash_pthread=yes
  		case "$target_os" in
@@ -62,7 +62,7 @@ $NetBSD: patch-ac,v 1.10 2012/04/28 22:48:06 ryoon Exp $
  # Freebsd doesn't use -pthread for compiles, it uses them for linking
              ;;
  	    *)
-@@ -3000,7 +3028,7 @@ if test -n "$USE_PTHREADS"; then
+@@ -2956,7 +2984,7 @@ if test -n "$USE_PTHREADS"; then
              _PTHREAD_LDFLAGS=
          fi
  	    ;;
@@ -71,7 +71,7 @@ $NetBSD: patch-ac,v 1.10 2012/04/28 22:48:06 ryoon Exp $
  	    AC_DEFINE(_REENTRANT)
  	    AC_DEFINE(_THREAD_SAFE)
  	    dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -3081,7 +3109,7 @@ case "$target" in
+@@ -3037,7 +3065,7 @@ case "$target" in
          AC_DEFINE(_PR_NEED_PTHREAD_INIT)
      fi
      ;;
diff --git a/www/seamonkey/patches/patch-ad b/www/seamonkey/patches/patch-ad
index e3020f95f8f..107e282e4d2 100644
--- a/www/seamonkey/patches/patch-ad
+++ b/www/seamonkey/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ad,v 1.8 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/xpcom/io/nsLocalFileUnix.h.orig	2012-04-23 06:28:29.000000000 +0000
+--- mozilla/xpcom/io/nsLocalFileUnix.h.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xpcom/io/nsLocalFileUnix.h
-@@ -86,7 +86,7 @@
+@@ -52,7 +52,7 @@
  #endif
  
  // so we can statfs on freebsd
diff --git a/www/seamonkey/patches/patch-ae b/www/seamonkey/patches/patch-ae
index f5747eb2e27..22907e77fd6 100644
--- a/www/seamonkey/patches/patch-ae
+++ b/www/seamonkey/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.9 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ae,v 1.10 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig	2012-04-23 06:28:14.000000000 +0000
+--- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig	2012-08-27 04:49:27.000000000 +0000
 +++ mozilla/nsprpub/pr/src/misc/prnetdb.c
-@@ -105,7 +105,7 @@ PRLock *_pr_dnsLock = NULL;
+@@ -73,7 +73,7 @@ PRLock *_pr_dnsLock = NULL;
          || defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \
  	|| (defined(HPUX10_10) && defined(_REENTRANT)) \
          || (defined(HPUX10_20) && defined(_REENTRANT)) \
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.9 2012/04/28 22:48:06 ryoon Exp $
  #define _PR_HAVE_GETPROTO_R
  #define _PR_HAVE_GETPROTO_R_INT
  #endif
-@@ -115,6 +115,11 @@ PRLock *_pr_dnsLock = NULL;
+@@ -83,6 +83,11 @@ PRLock *_pr_dnsLock = NULL;
  #define _PR_HAVE_5_ARG_GETPROTO_R
  #endif
  
@@ -23,7 +23,7 @@ $NetBSD: patch-ae,v 1.9 2012/04/28 22:48:06 ryoon Exp $
  /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */
  #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS))
  #define _PR_HAVE_GETPROTO_R
-@@ -332,7 +337,7 @@ _pr_QueryNetIfs(void)
+@@ -300,7 +305,7 @@ _pr_QueryNetIfs(void)
  }
  
  #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \
@@ -32,7 +32,7 @@ $NetBSD: patch-ae,v 1.9 2012/04/28 22:48:06 ryoon Exp $
  
  /*
   * Use the BSD getifaddrs function.
-@@ -2076,6 +2081,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
+@@ -2044,6 +2049,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
           */
          hints.ai_socktype = SOCK_STREAM;
  
@@ -44,7 +44,7 @@ $NetBSD: patch-ae,v 1.9 2012/04/28 22:48:06 ryoon Exp $
          rv = GETADDRINFO(hostname, NULL, &hints, &res);
  #ifdef AI_ADDRCONFIG
          if (rv == EAI_BADFLAGS && (hints.ai_flags & AI_ADDRCONFIG)) {
-@@ -2083,6 +2093,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
+@@ -2051,6 +2061,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
              rv = GETADDRINFO(hostname, NULL, &hints, &res);
          }
  #endif
diff --git a/www/seamonkey/patches/patch-af b/www/seamonkey/patches/patch-af
index 9a0e0379ea1..1b954ab1da8 100644
--- a/www/seamonkey/patches/patch-af
+++ b/www/seamonkey/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.7 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-af,v 1.8 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/config/mkdepend/imakemdep.h.orig	2012-04-23 06:27:25.000000000 +0000
+--- mozilla/config/mkdepend/imakemdep.h.orig	2012-08-27 04:49:04.000000000 +0000
 +++ mozilla/config/mkdepend/imakemdep.h
 @@ -235,7 +235,7 @@ in this Software without prior written a
  #ifdef _CRAY
diff --git a/www/seamonkey/patches/patch-ag b/www/seamonkey/patches/patch-ag
index a6d1f524e11..ce884d09830 100644
--- a/www/seamonkey/patches/patch-ag
+++ b/www/seamonkey/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.7 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ag,v 1.8 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/nsprpub/pr/include/md/_freebsd.h.orig	2012-04-23 06:28:13.000000000 +0000
+--- mozilla/nsprpub/pr/include/md/_freebsd.h.orig	2012-08-27 04:49:27.000000000 +0000
 +++ mozilla/nsprpub/pr/include/md/_freebsd.h
-@@ -79,7 +79,7 @@
+@@ -47,7 +47,7 @@
  #define _PR_HAVE_LARGE_OFF_T
  
  #if defined(_PR_PTHREADS)
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.7 2012/04/28 22:48:06 ryoon Exp $
  /*
   * libc_r before this version of FreeBSD doesn't have poll().
   * Although libc has poll(), it is not thread-safe so we can't
-@@ -88,7 +88,7 @@
+@@ -56,7 +56,7 @@
  #define _PR_POLL_AVAILABLE
  #endif
  #else
@@ -20,7 +20,7 @@ $NetBSD: patch-ag,v 1.7 2012/04/28 22:48:06 ryoon Exp $
  #define _PR_POLL_AVAILABLE
  #define _PR_USE_POLL
  #endif
-@@ -97,7 +97,7 @@
+@@ -65,7 +65,7 @@
  #define _PR_HAVE_SYSV_SEMAPHORES
  #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
  
diff --git a/www/seamonkey/patches/patch-ai b/www/seamonkey/patches/patch-ai
index a434e42d175..97eaab8e2c0 100644
--- a/www/seamonkey/patches/patch-ai
+++ b/www/seamonkey/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.7 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ai,v 1.8 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/dbm/src/mktemp.c.orig	2012-04-23 06:27:29.000000000 +0000
+--- mozilla/dbm/src/mktemp.c.orig	2012-08-27 04:49:07.000000000 +0000
 +++ mozilla/dbm/src/mktemp.c
 @@ -92,7 +92,7 @@ mktemp(char *path)
  static int 
diff --git a/www/seamonkey/patches/patch-aj b/www/seamonkey/patches/patch-aj
index 59fdaa855bb..7820dc698da 100644
--- a/www/seamonkey/patches/patch-aj
+++ b/www/seamonkey/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.7 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-aj,v 1.8 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp.orig	2012-04-23 06:28:16.000000000 +0000
+--- mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp.orig	2012-08-27 04:49:28.000000000 +0000
 +++ mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp
-@@ -408,6 +408,7 @@ nsresult nsProfileLock::LockWithSymlink(
+@@ -391,6 +391,7 @@ nsresult nsProfileLock::LockWithSymlink(
  #endif
                      sigfillset(&act.sa_mask);
  
@@ -10,7 +10,7 @@ $NetBSD: patch-aj,v 1.7 2012/04/28 22:48:06 ryoon Exp $
  #define CATCH_SIGNAL(signame)                                           \
  PR_BEGIN_MACRO                                                          \
    if (sigaction(signame, NULL, &oldact) == 0 &&                         \
-@@ -426,6 +427,7 @@ PR_BEGIN_MACRO                          
+@@ -409,6 +410,7 @@ PR_BEGIN_MACRO                          
                      CATCH_SIGNAL(SIGTERM);
  
  #undef CATCH_SIGNAL
diff --git a/www/seamonkey/patches/patch-ak b/www/seamonkey/patches/patch-ak
index 56a7886ab09..969729ae3bb 100644
--- a/www/seamonkey/patches/patch-ak
+++ b/www/seamonkey/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.8 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ak,v 1.9 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/js/src/ctypes/libffi/configure.orig	2012-04-23 06:27:40.000000000 +0000
+--- mozilla/js/src/ctypes/libffi/configure.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/js/src/ctypes/libffi/configure
 @@ -11278,7 +11278,7 @@ case "$host" in
    powerpc-*-aix* | rs6000-*-aix*)
diff --git a/www/seamonkey/patches/patch-al b/www/seamonkey/patches/patch-al
index d1fcd4dc1c5..240bcb11321 100644
--- a/www/seamonkey/patches/patch-al
+++ b/www/seamonkey/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.8 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-al,v 1.9 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/storage/src/mozStorageConnection.cpp.orig	2012-04-23 06:28:20.000000000 +0000
+--- mozilla/storage/src/mozStorageConnection.cpp.orig	2012-08-27 04:49:30.000000000 +0000
 +++ mozilla/storage/src/mozStorageConnection.cpp
-@@ -718,6 +718,11 @@ Connection::initialize(nsIFile *aDatabas
+@@ -680,6 +680,11 @@ Connection::initialize(nsIFile *aDatabas
        break;
    }
  
diff --git a/www/seamonkey/patches/patch-am b/www/seamonkey/patches/patch-am
index e7ed6838789..4d1418fa192 100644
--- a/www/seamonkey/patches/patch-am
+++ b/www/seamonkey/patches/patch-am
@@ -1,12 +1,12 @@
-$NetBSD: patch-am,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-am,v 1.5 2012/09/06 12:08:51 ryoon Exp $
 
 SHA1_Update conflicts with openssl which may be dynamically loaded
 at runtime via libcups or libgssapi so causing a crash due to using
 the wrong binding.  So rename here to avoid conflict.
 
---- mozilla/security/nss/lib/freebl/blapi.h.orig	2012-04-23 06:28:18.000000000 +0000
+--- mozilla/security/nss/lib/freebl/blapi.h.orig	2012-08-27 04:49:28.000000000 +0000
 +++ mozilla/security/nss/lib/freebl/blapi.h
-@@ -1038,6 +1038,8 @@ extern void SHA1_DestroyContext(SHA1Cont
+@@ -1043,6 +1043,8 @@ extern void SHA1_DestroyContext(SHA1Cont
  */
  extern void SHA1_Begin(SHA1Context *cx);
  
diff --git a/www/seamonkey/patches/patch-an b/www/seamonkey/patches/patch-an
index b9dca2977b1..788312f4b29 100644
--- a/www/seamonkey/patches/patch-an
+++ b/www/seamonkey/patches/patch-an
@@ -1,10 +1,10 @@
-$NetBSD: patch-an,v 1.6 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-an,v 1.7 2012/09/06 12:08:51 ryoon Exp $
 
 SHA1_Update conflicts with openssl which may be dynamically loaded
 at runtime via libcups or libgssapi so causing a crash due to using
 the wrong binding.  So rename here to avoid conflict.
 
---- mozilla/security/nss/lib/freebl/sha-fast-amd64-sun.s.orig	2012-04-23 06:28:18.000000000 +0000
+--- mozilla/security/nss/lib/freebl/sha-fast-amd64-sun.s.orig	2012-08-27 04:49:28.000000000 +0000
 +++ mozilla/security/nss/lib/freebl/sha-fast-amd64-sun.s
 @@ -1712,9 +1712,9 @@ shaCompress:
  .LFE7:
diff --git a/www/seamonkey/patches/patch-ao b/www/seamonkey/patches/patch-ao
index 9d38fb5327d..89c07c08ad5 100644
--- a/www/seamonkey/patches/patch-ao
+++ b/www/seamonkey/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.7 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ao,v 1.8 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/toolkit/mozapps/installer/packager.mk.orig	2012-04-23 06:28:24.000000000 +0000
+--- mozilla/toolkit/mozapps/installer/packager.mk.orig	2012-08-27 04:49:31.000000000 +0000
 +++ mozilla/toolkit/mozapps/installer/packager.mk
-@@ -859,8 +859,8 @@ endif
+@@ -905,8 +905,8 @@ endif
  	(cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
  	  (cd $(DESTDIR)$(installdir) && tar -xf -)
  	$(NSINSTALL) -D $(DESTDIR)$(bindir)
diff --git a/www/seamonkey/patches/patch-as b/www/seamonkey/patches/patch-as
index cf66816930f..327e9d323a6 100644
--- a/www/seamonkey/patches/patch-as
+++ b/www/seamonkey/patches/patch-as
@@ -1,10 +1,10 @@
-$NetBSD: patch-as,v 1.7 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-as,v 1.8 2012/09/06 12:08:51 ryoon Exp $
 
 Treat DragonFly like FreeBSD.
 
---- mozilla/js/src/configure.in.orig	2012-04-23 06:27:40.000000000 +0000
+--- mozilla/js/src/configure.in.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/js/src/configure.in
-@@ -823,7 +823,7 @@ EOF
+@@ -786,7 +786,7 @@ EOF
                  AC_LANG_RESTORE
              ])
  
@@ -13,7 +13,7 @@ Treat DragonFly like FreeBSD.
              AC_CACHE_CHECK(for |class __declspec(dllimport) exception| bug,
                             ac_cv_have_dllimport_exception_bug,
                  [
-@@ -2234,7 +2234,7 @@ case "$target" in
+@@ -1996,7 +1996,7 @@ case "$target" in
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
@@ -22,7 +22,7 @@ Treat DragonFly like FreeBSD.
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -3356,7 +3356,7 @@ then
+@@ -3122,7 +3122,7 @@ then
      fi
  
  	case "$target" in
@@ -31,7 +31,7 @@ Treat DragonFly like FreeBSD.
  			AC_DEFINE(_REENTRANT)
  			AC_DEFINE(_THREAD_SAFE)
  			dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -4263,7 +4263,7 @@ if test "$MOZ_MEMORY"; then
+@@ -4015,7 +4015,7 @@ if test "$MOZ_MEMORY"; then
    *-darwin*)
      AC_DEFINE(MOZ_MEMORY_DARWIN)
      ;;
diff --git a/www/seamonkey/patches/patch-at b/www/seamonkey/patches/patch-at
index 2d4de987654..c3c7769e698 100644
--- a/www/seamonkey/patches/patch-at
+++ b/www/seamonkey/patches/patch-at
@@ -1,6 +1,6 @@
-$NetBSD: patch-at,v 1.11 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-at,v 1.12 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/gfx/qcms/qcmstypes.h.orig	2012-04-23 06:27:35.000000000 +0000
+--- mozilla/gfx/qcms/qcmstypes.h.orig	2012-08-27 04:49:12.000000000 +0000
 +++ mozilla/gfx/qcms/qcmstypes.h
 @@ -10,6 +10,8 @@
  #if defined (__SVR4) && defined (__sun)
diff --git a/www/seamonkey/patches/patch-au b/www/seamonkey/patches/patch-au
index becb53368ff..9aac74385a3 100644
--- a/www/seamonkey/patches/patch-au
+++ b/www/seamonkey/patches/patch-au
@@ -1,12 +1,12 @@
-$NetBSD: patch-au,v 1.6 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-au,v 1.7 2012/09/06 12:08:51 ryoon Exp $
 
 - Fix device name on NetBSD
 - SOUND_VERSION just isn't a reliable way to detect features supported by
   particular OSS implementation.
 
---- mozilla/media/libsydneyaudio/src/sydney_audio_oss.c.orig	2012-04-23 06:28:07.000000000 +0000
+--- mozilla/media/libsydneyaudio/src/sydney_audio_oss.c.orig	2012-08-27 04:49:25.000000000 +0000
 +++ mozilla/media/libsydneyaudio/src/sydney_audio_oss.c
-@@ -55,7 +55,7 @@
+@@ -23,7 +23,7 @@
  // support only versions newer than 3.6.1
  #define SUPP_OSS_VERSION OSS_VERSION(3,0,1)
  
@@ -15,7 +15,7 @@ $NetBSD: patch-au,v 1.6 2012/04/28 22:48:06 ryoon Exp $
  #error Unsupported OSS Version
  #else
  
-@@ -205,7 +205,12 @@ sa_stream_create_pcm(
+@@ -173,7 +173,12 @@ sa_stream_create_pcm(
      return SA_ERROR_SYSTEM;
    }
  
diff --git a/www/seamonkey/patches/patch-av b/www/seamonkey/patches/patch-av
index cf8b8f4da82..cb46957231f 100644
--- a/www/seamonkey/patches/patch-av
+++ b/www/seamonkey/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.5 2012/07/19 17:33:29 ryoon Exp $
+$NetBSD: patch-av,v 1.6 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/xulrunner/app/nsXULRunnerApp.cpp.orig	2012-07-17 18:13:28.000000000 +0000
+--- mozilla/xulrunner/app/nsXULRunnerApp.cpp.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xulrunner/app/nsXULRunnerApp.cpp
-@@ -39,6 +39,27 @@
+@@ -6,6 +6,27 @@
  #include "nsXPCOMGlue.h"
  #include <stdio.h>
  #include <stdlib.h>
@@ -30,7 +30,7 @@ $NetBSD: patch-av,v 1.5 2012/07/19 17:33:29 ryoon Exp $
  #ifdef XP_WIN
  #include <windows.h>
  #define snprintf _snprintf
-@@ -284,6 +305,7 @@ private:
+@@ -251,6 +272,7 @@ private:
  
  int main(int argc, char* argv[])
  {
diff --git a/www/seamonkey/patches/patch-aw b/www/seamonkey/patches/patch-aw
index 412e514828e..2ab83e0e554 100644
--- a/www/seamonkey/patches/patch-aw
+++ b/www/seamonkey/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.6 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-aw,v 1.7 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/xulrunner/stub/nsXULStub.cpp.orig	2012-04-23 06:28:30.000000000 +0000
+--- mozilla/xulrunner/stub/nsXULStub.cpp.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xulrunner/stub/nsXULStub.cpp
-@@ -44,6 +44,29 @@
+@@ -11,6 +11,29 @@
  #include "nsILocalFile.h"
  
  #include <stdarg.h>
@@ -32,7 +32,7 @@ $NetBSD: patch-aw,v 1.6 2012/04/28 22:48:06 ryoon Exp $
  
  #ifdef XP_WIN
  #include <windows.h>
-@@ -202,7 +225,9 @@ main(int argc, char **argv)
+@@ -169,7 +192,9 @@ main(int argc, char **argv)
    char greDir[MAXPATHLEN];
    bool greFound = false;
  
diff --git a/www/seamonkey/patches/patch-ax b/www/seamonkey/patches/patch-ax
index 6912abd69cd..2ecdd7682a8 100644
--- a/www/seamonkey/patches/patch-ax
+++ b/www/seamonkey/patches/patch-ax
@@ -1,8 +1,8 @@
-$NetBSD: patch-ax,v 1.10 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ax,v 1.11 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/xpcom/base/nsStackWalk.cpp.orig	2012-04-23 06:28:29.000000000 +0000
+--- mozilla/xpcom/base/nsStackWalk.cpp.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xpcom/base/nsStackWalk.cpp
-@@ -54,7 +54,7 @@ struct CriticalAddress {
+@@ -23,7 +23,7 @@ struct CriticalAddress {
  };
  static CriticalAddress gCriticalAddress;
  
diff --git a/www/seamonkey/patches/patch-ay b/www/seamonkey/patches/patch-ay
index b745af821c0..4c73c95926e 100644
--- a/www/seamonkey/patches/patch-ay
+++ b/www/seamonkey/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.6 2012/06/14 11:27:34 ryoon Exp $
+$NetBSD: patch-ay,v 1.7 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/browser/app/nsBrowserApp.cpp.orig	2012-06-05 05:54:06.000000000 +0000
+--- mozilla/browser/app/nsBrowserApp.cpp.orig	2012-08-27 04:49:02.000000000 +0000
 +++ mozilla/browser/app/nsBrowserApp.cpp
-@@ -47,6 +47,31 @@
+@@ -14,6 +14,31 @@
  #include <sys/resource.h>
  #endif
  
@@ -34,7 +34,7 @@ $NetBSD: patch-ay,v 1.6 2012/06/14 11:27:34 ryoon Exp $
  #ifdef XP_MACOSX
  #include "MacQuirks.h"
  #endif
-@@ -197,6 +222,9 @@ int main(int argc, char* argv[])
+@@ -196,6 +221,9 @@ int main(int argc, char* argv[])
  #ifdef XP_MACOSX
    TriggerQuirks();
  #endif
diff --git a/www/seamonkey/patches/patch-az b/www/seamonkey/patches/patch-az
index 9559fd15750..5b25905fd64 100644
--- a/www/seamonkey/patches/patch-az
+++ b/www/seamonkey/patches/patch-az
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-az,v 1.5 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/nsprpub/pr/src/pthreads/ptthread.c.orig	2012-04-23 06:28:14.000000000 +0000
+--- mozilla/nsprpub/pr/src/pthreads/ptthread.c.orig	2012-08-27 04:49:27.000000000 +0000
 +++ mozilla/nsprpub/pr/src/pthreads/ptthread.c
-@@ -1070,12 +1070,12 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn
+@@ -1038,12 +1038,12 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn
      _exit(status);
  }
  
diff --git a/www/seamonkey/patches/patch-ba b/www/seamonkey/patches/patch-ba
index 8e863a594fb..5a44193b94e 100644
--- a/www/seamonkey/patches/patch-ba
+++ b/www/seamonkey/patches/patch-ba
@@ -1,10 +1,10 @@
-$NetBSD: patch-ba,v 1.8 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ba,v 1.9 2012/09/06 12:08:51 ryoon Exp $
 
 pthread_t may be 64-bit, avoid casting it.
 
---- mozilla/nsprpub/pr/include/private/pprthred.h.orig	2012-04-23 06:28:14.000000000 +0000
+--- mozilla/nsprpub/pr/include/private/pprthred.h.orig	2012-08-27 04:49:27.000000000 +0000
 +++ mozilla/nsprpub/pr/include/private/pprthred.h
-@@ -51,6 +51,8 @@
+@@ -19,6 +19,8 @@
  #include <os2.h>
  #endif
  
@@ -13,7 +13,7 @@ pthread_t may be 64-bit, avoid casting it.
  PR_BEGIN_EXTERN_C
  
  /*---------------------------------------------------------------------------
-@@ -91,7 +93,7 @@ NSPR_API(void) PR_DetachThread(void);
+@@ -59,7 +61,7 @@ NSPR_API(void) PR_DetachThread(void);
  ** Get the id of the named thread. Each thread is assigned a unique id
  ** when it is created or attached.
  */
diff --git a/www/seamonkey/patches/patch-bd b/www/seamonkey/patches/patch-bd
index 22809d3a337..fcda2bc488a 100644
--- a/www/seamonkey/patches/patch-bd
+++ b/www/seamonkey/patches/patch-bd
@@ -1,8 +1,8 @@
-$NetBSD: patch-bd,v 1.5 2012/07/19 17:33:29 ryoon Exp $
+$NetBSD: patch-bd,v 1.6 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/js/src/ctypes/CTypes.cpp.orig	2012-07-17 18:13:28.000000000 +0000
+--- mozilla/js/src/ctypes/CTypes.cpp.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/js/src/ctypes/CTypes.cpp
-@@ -38,6 +38,22 @@
+@@ -5,6 +5,23 @@
  
  #include "mozilla/FloatingPoint.h"
  
@@ -20,6 +20,7 @@ $NetBSD: patch-bd,v 1.5 2012/07/19 17:33:29 ryoon Exp $
 +#define int64_t int64_t
 +#define intptr_t intptr_t
 +#define uintptr_t uintptr_t
++#define off_t off_t
 +#endif
 +
  #include "CTypes.h"
diff --git a/www/seamonkey/patches/patch-bf b/www/seamonkey/patches/patch-bf
index 8502a50c827..b2f5ae70117 100644
--- a/www/seamonkey/patches/patch-bf
+++ b/www/seamonkey/patches/patch-bf
@@ -1,8 +1,8 @@
-$NetBSD: patch-bf,v 1.7 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-bf,v 1.8 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/js/src/jsnativestack.cpp.orig	2012-04-23 06:27:43.000000000 +0000
+--- mozilla/js/src/jsnativestack.cpp.orig	2012-08-27 04:49:16.000000000 +0000
 +++ mozilla/js/src/jsnativestack.cpp
-@@ -50,10 +50,16 @@
+@@ -19,10 +19,16 @@
  #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
  # include <pthread.h>
  
@@ -20,7 +20,7 @@ $NetBSD: patch-bf,v 1.7 2012/04/28 22:48:06 ryoon Exp $
  #else
  # error "Unsupported platform"
  
-@@ -145,7 +151,7 @@ GetNativeStackBaseImpl()
+@@ -114,7 +120,7 @@ GetNativeStackBaseImpl()
      pthread_attr_init(&sattr);
  #  if defined(__OpenBSD__)
      stack_t ss;
diff --git a/www/seamonkey/patches/patch-bg b/www/seamonkey/patches/patch-bg
index a18252de7be..54bc72ee20b 100644
--- a/www/seamonkey/patches/patch-bg
+++ b/www/seamonkey/patches/patch-bg
@@ -1,8 +1,8 @@
-$NetBSD: patch-bg,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-bg,v 1.5 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/storage/src/SQLiteMutex.h.orig	2012-04-23 06:28:20.000000000 +0000
+--- mozilla/storage/src/SQLiteMutex.h.orig	2012-08-27 04:49:29.000000000 +0000
 +++ mozilla/storage/src/SQLiteMutex.h
-@@ -141,15 +141,19 @@ public:
+@@ -108,15 +108,19 @@ public:
    void assertCurrentThreadOwns()
    {
      NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
diff --git a/www/seamonkey/patches/patch-bi b/www/seamonkey/patches/patch-bi
index fd87d73edd2..01ce580455b 100644
--- a/www/seamonkey/patches/patch-bi
+++ b/www/seamonkey/patches/patch-bi
@@ -1,6 +1,6 @@
-$NetBSD: patch-bi,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-bi,v 1.5 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/gfx/angle/src/compiler/osinclude.h.orig	2012-04-23 06:27:34.000000000 +0000
+--- mozilla/gfx/angle/src/compiler/osinclude.h.orig	2012-08-27 04:49:10.000000000 +0000
 +++ mozilla/gfx/angle/src/compiler/osinclude.h
 @@ -16,6 +16,7 @@
  #define ANGLE_OS_WIN
diff --git a/www/seamonkey/patches/patch-directory_c-sdk_ldap_include_portable.h b/www/seamonkey/patches/patch-directory_c-sdk_ldap_include_portable.h
index 1b772c4420e..bb81a8486ac 100644
--- a/www/seamonkey/patches/patch-directory_c-sdk_ldap_include_portable.h
+++ b/www/seamonkey/patches/patch-directory_c-sdk_ldap_include_portable.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.7 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.8 2012/09/06 12:08:51 ryoon Exp $
 
---- ldap/sdks/c-sdk/ldap/include/portable.h.orig	2012-04-23 06:28:48.000000000 +0000
+--- ldap/sdks/c-sdk/ldap/include/portable.h.orig	2012-08-27 04:49:45.000000000 +0000
 +++ ldap/sdks/c-sdk/ldap/include/portable.h
 @@ -122,8 +122,11 @@
   * some systems don't have the BSD re_comp and re_exec routines
diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_debug__util__posic.cc b/www/seamonkey/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
index cf8d00a79e3..7703fa00de1 100644
--- a/www/seamonkey/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
+++ b/www/seamonkey/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
@@ -1,32 +1,34 @@
-$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.5 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.6 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig	2012-04-23 06:27:38.000000000 +0000
+--- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/debug_util_posix.cc
 @@ -5,7 +5,7 @@
  #include "build/build_config.h"
  #include "base/debug_util.h"
  
 -#define MOZ_HAVE_EXECINFO_H (!defined(ANDROID) && !defined(__OpenBSD__))
-+#define MOZ_HAVE_EXECINFO_H (defined(__linux__) && !defined(ANDROID))
++#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && !defined(ANDROID))
  
  #include <errno.h>
  #include <fcntl.h>
-@@ -17,8 +17,13 @@
+@@ -17,9 +17,16 @@
  #include <unistd.h>
  #if MOZ_HAVE_EXECINFO_H
  #include <execinfo.h>
--#include <sys/sysctl.h>
++#endif
++
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ #include <sys/sysctl.h>
  #endif
+ 
 +#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 +37,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u
+ #include "base/logging.h"
+@@ -32,7 +39,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u
    return false;
  }
  
@@ -35,7 +37,7 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.5 2012/04/28 22:4
  
  // Based on Apple's recommended method as described in
  // http://developer.apple.com/qa/qa2004/qa1361.html
-@@ -71,7 +76,13 @@ bool DebugUtil::BeingDebugged() {
+@@ -71,7 +78,15 @@ bool DebugUtil::BeingDebugged() {
  
    // This process is being debugged if the P_TRACED flag is set.
    is_set = true;
@@ -43,6 +45,8 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.5 2012/04/28 22:4
 +  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;
 +#else
    being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
 +#endif
diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util.h b/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util.h
deleted file mode 100644
index 9c8a8a121b7..00000000000
--- a/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.4 2012/04/28 22:48:06 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/file_util.h.orig	2012-04-23 06:27:38.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/file_util.h
-@@ -16,8 +16,8 @@
- #include <sys/stat.h>
- #elif defined(OS_POSIX) 
- #include <sys/types.h>
--#include <fts.h>
- #include <sys/stat.h>
-+#include <fts.h>
- #endif
- 
- #include <stdio.h>
diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util__posix.cc b/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util__posix.cc
index f9f94318d1d..81efdfbe166 100644
--- a/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util__posix.cc
+++ b/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util__posix.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.5 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig	2012-04-23 06:27:38.000000000 +0000
+--- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/file_util_posix.cc
 @@ -31,7 +31,7 @@
  #include "base/time.h"
  
  // FreeBSD/OpenBSD lacks stat64, but its stat handles files >2GB just fine
 -#if defined(OS_FREEBSD) || defined(OS_OPENBSD)
-+#ifndef __linux__
++#ifndef OS_LINUX
  #define stat64 stat
  #endif
  
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
deleted file mode 100644
index efa2adfb7c9..00000000000
--- a/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__file__posix.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc,v 1.4 2012/04/28 22:48:06 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/platform_file_posix.cc.orig	2012-04-23 06:27:38.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/platform_file_posix.cc
-@@ -10,6 +10,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/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc b/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
index 111270c712b..990afc2b11e 100644
--- a/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
+++ b/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
@@ -1,42 +1,77 @@
-$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.6 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.7 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig	2012-04-23 06:27:38.000000000 +0000
+--- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc
-@@ -9,9 +9,18 @@
+@@ -9,16 +9,31 @@
  
  #if defined(OS_MACOSX)
  #include <mach/mach.h>
 +#elif defined(OS_NETBSD)
 +#include <lwp.h>
++#include <nspr/prthread.h>
  #elif defined(OS_LINUX)
  #include <sys/syscall.h>
- #include <unistd.h>
-+#elif defined(OS_DRAGONFLY)
-+#include <unistd.h>
+-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
+ #include <sys/prctl.h>
+-#elif !defined(__NetBSD__)
+-#include <pthread_np.h>
 +#elif defined(OS_FREEBSD)
++#include <sys/param.h>
++#if __FreeBSD_version > 802500
 +#include <sys/thr.h>
++#else
 +_Pragma("GCC visibility push(default)")
-+# include <pthread_np.h>
++extern "C" int thr_self(long *);
 +_Pragma("GCC visibility pop")
  #endif
++#endif
++
++#if !defined(OS_MACOSX)
+ #include <unistd.h>
+ #endif
  
++#if defined(OS_BSD) && !defined(OS_NETBSD)
++#include <pthread_np.h>
++#endif
++
  #if defined(OS_MACOSX)
-@@ -33,6 +42,18 @@ PlatformThreadId PlatformThread::Current
+ namespace base {
+ void InitThreading();
+@@ -38,9 +53,20 @@ PlatformThreadId PlatformThread::Current
    // into the kernel.
  #if defined(OS_MACOSX)
    return mach_thread_self();
+-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+-  // TODO(BSD): find a better thread ID
+-  return (intptr_t)(pthread_self());
 +#elif defined(OS_NETBSD)
 +  return _lwp_self();
 +#elif defined(OS_DRAGONFLY)
 +  return lwp_gettid();
 +#elif defined(OS_FREEBSD)
-+#  if __FreeBSD_cc_version > 900000
++#  if __FreeBSD_version > 900030
 +    return pthread_getthreadid_np();
 +#  else
-+    lwpid_t lwpid;
-+    thr_self( &lwpid );
++    long lwpid;
++    thr_self(&lwpid);
 +    return lwpid;
 +#  endif
- #elif defined (__OpenBSD__)
-   // TODO(BSD): find a better thread ID
-   return (intptr_t)(pthread_self());
++#elif defined(OS_OPENBSD)
++  return (intptr_t) (pthread_self());
+ #elif defined(OS_LINUX)
+   return syscall(__NR_gettid);
+ #endif
+@@ -83,10 +109,10 @@ void PlatformThread::SetName(const char*
+   // Note that glibc also has a 'pthread_setname_np' api, but it may not be
+   // available everywhere and it's only benefit over using prctl directly is
+   // that it can set the name of threads other than the current thread.
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#if defined(OS_BSD) && !defined(OS_NETBSD)
+   pthread_set_name_np(pthread_self(), name);
+-#elif defined(__NetBSD__)
+-  pthread_setname_np(pthread_self(), "%s", name);
++#elif defined(OS_NETBSD)
++  PR_SetCurrentThreadName(name);
+ #else
+   prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0); 
+ #endif
diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_sys__info__posix.cc b/www/seamonkey/patches/patch-ipc_chromium_src_base_sys__info__posix.cc
index cf2b649feec..c72998f40c0 100644
--- a/www/seamonkey/patches/patch-ipc_chromium_src_base_sys__info__posix.cc
+++ b/www/seamonkey/patches/patch-ipc_chromium_src_base_sys__info__posix.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.5 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.6 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/sys_info_posix.cc.orig	2012-04-23 06:27:38.000000000 +0000
+--- mozilla/ipc/chromium/src/base/sys_info_posix.cc.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/sys_info_posix.cc
 @@ -18,6 +18,11 @@
  #include <mach/mach_init.h>
diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h b/www/seamonkey/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h
index ab2e9c5ad75..c26af792346 100644
--- a/www/seamonkey/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h
+++ b/www/seamonkey/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h
@@ -1,13 +1,13 @@
-$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.5 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig	2012-04-23 06:27:38.000000000 +0000
+--- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h
 @@ -34,7 +34,7 @@
  #include "base/third_party/nspr/prcpucfg_win.h"
  #elif defined(__APPLE__)
  #include "base/third_party/nspr/prcpucfg_mac.h"
 -#elif defined(__linux__) || defined(ANDROID)
-+#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__DragonFly__)
++#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
  #include "base/third_party/nspr/prcpucfg_linux.h"
  #elif defined(__OpenBSD__)
  #include "base/third_party/nspr/prcpucfg_openbsd.h"
diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_build_build__config.h b/www/seamonkey/patches/patch-ipc_chromium_src_build_build__config.h
index 6d006977546..1ad9d1556a9 100644
--- a/www/seamonkey/patches/patch-ipc_chromium_src_build_build__config.h
+++ b/www/seamonkey/patches/patch-ipc_chromium_src_build_build__config.h
@@ -1,25 +1,31 @@
-$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.6 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.7 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/src/build/build_config.h.orig	2012-04-23 06:27:39.000000000 +0000
+--- mozilla/ipc/chromium/src/build/build_config.h.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/chromium/src/build/build_config.h
-@@ -19,17 +19,23 @@
+@@ -19,6 +19,12 @@
  #define OS_MACOSX 1
  #elif defined(__linux__) || defined(ANDROID)
  #define OS_LINUX 1
-+#elif defined(__NetBSD__)
-+#define OS_NETBSD 1
 +#elif defined(__DragonFly__)
 +#define OS_DRAGONFLY 1
++#elif defined(__FreeBSD__)
++#define OS_FREEBSD 1
++#elif defined(__NetBSD__)
++#define OS_NETBSD 1
  #elif defined(__OpenBSD__)
  #define OS_OPENBSD 1
  #elif defined(_WIN32)
- #define OS_WIN 1
-+#elif defined(__FreeBSD__)
-+#define OS_FREEBSD 1
- #else
+@@ -27,9 +33,16 @@
  #error Please add support for your platform in build/build_config.h
  #endif
  
++// For access to standard BSD features, use OS_BSD instead of a
++// more specific macro.
++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)	\
++  || defined(OS_NETBSD) || defined(OS_OPENBSD)
++#define OS_BSD 1
++#endif
++
  // For access to standard POSIX features, use OS_POSIX instead of a more
  // specific macro.
 -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD)
diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h b/www/seamonkey/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h
index 09053ac05ad..f241d40426b 100644
--- a/www/seamonkey/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h
+++ b/www/seamonkey/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h,v 1.5 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.h.orig	2012-04-23 06:27:39.000000000 +0000
+--- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.h.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.h
 @@ -95,7 +95,7 @@ class Channel::ChannelImpl : public Mess
    };
diff --git a/www/seamonkey/patches/patch-ldap_sdks_c-sdk_build.mk b/www/seamonkey/patches/patch-ldap_sdks_c-sdk_build.mk
index 8f5076c4a29..22eec430c05 100644
--- a/www/seamonkey/patches/patch-ldap_sdks_c-sdk_build.mk
+++ b/www/seamonkey/patches/patch-ldap_sdks_c-sdk_build.mk
@@ -1,6 +1,6 @@
-$NetBSD: patch-ldap_sdks_c-sdk_build.mk,v 1.1 2012/06/14 11:27:34 ryoon Exp $
+$NetBSD: patch-ldap_sdks_c-sdk_build.mk,v 1.2 2012/09/06 12:08:51 ryoon Exp $
 
---- ldap/sdks/c-sdk/build.mk.orig	2012-06-05 05:54:39.000000000 +0000
+--- ldap/sdks/c-sdk/build.mk.orig	2012-08-27 04:49:44.000000000 +0000
 +++ ldap/sdks/c-sdk/build.mk
 @@ -488,21 +488,21 @@ LINK_LIB        = $(RM) $@; $(AR) $(AR_F
  LINK_LIB2       = $(RM) $@; $(AR) $@ $(OBJS2); $(RANLIB) $@
diff --git a/www/seamonkey/patches/patch-ma b/www/seamonkey/patches/patch-ma
index 619487f008c..3b555768fd7 100644
--- a/www/seamonkey/patches/patch-ma
+++ b/www/seamonkey/patches/patch-ma
@@ -1,8 +1,8 @@
-$NetBSD: patch-ma,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ma,v 1.5 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/config/autoconf.mk.in.orig	2012-04-23 06:27:25.000000000 +0000
+--- mozilla/config/autoconf.mk.in.orig	2012-08-27 04:49:04.000000000 +0000
 +++ mozilla/config/autoconf.mk.in
-@@ -68,14 +68,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+@@ -37,14 +37,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
diff --git a/www/seamonkey/patches/patch-ma-toplevel b/www/seamonkey/patches/patch-ma-toplevel
index 4cc9e0ee643..fff0c351051 100644
--- a/www/seamonkey/patches/patch-ma-toplevel
+++ b/www/seamonkey/patches/patch-ma-toplevel
@@ -1,8 +1,8 @@
-$NetBSD: patch-ma-toplevel,v 1.5 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ma-toplevel,v 1.6 2012/09/06 12:08:51 ryoon Exp $
 
---- config/autoconf.mk.in.orig	2012-04-23 06:20:50.000000000 +0000
+--- config/autoconf.mk.in.orig	2012-08-27 04:44:23.000000000 +0000
 +++ config/autoconf.mk.in
-@@ -61,14 +61,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+@@ -30,14 +30,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
diff --git a/www/seamonkey/patches/patch-mail_app_Makefile.in b/www/seamonkey/patches/patch-mail_app_Makefile.in
index 497b01eb6a0..24aacb99276 100644
--- a/www/seamonkey/patches/patch-mail_app_Makefile.in
+++ b/www/seamonkey/patches/patch-mail_app_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-mail_app_Makefile.in,v 1.3 2012/06/14 11:27:34 ryoon Exp $
+$NetBSD: patch-mail_app_Makefile.in,v 1.4 2012/09/06 12:08:51 ryoon Exp $
 
---- mail/app/Makefile.in.orig	2012-06-05 05:50:26.000000000 +0000
+--- mail/app/Makefile.in.orig	2012-08-27 04:44:23.000000000 +0000
 +++ mail/app/Makefile.in
-@@ -96,6 +96,10 @@ LOCAL_INCLUDES += \
+@@ -63,6 +63,10 @@ LOCAL_INCLUDES += \
  DEFINES += -DXPCOM_GLUE
  STL_FLAGS=
  
diff --git a/www/seamonkey/patches/patch-mail_app_nsMailApp.cpp b/www/seamonkey/patches/patch-mail_app_nsMailApp.cpp
index a1db239faf9..f21a48c6823 100644
--- a/www/seamonkey/patches/patch-mail_app_nsMailApp.cpp
+++ b/www/seamonkey/patches/patch-mail_app_nsMailApp.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-mail_app_nsMailApp.cpp,v 1.2 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mail_app_nsMailApp.cpp,v 1.3 2012/09/06 12:08:51 ryoon Exp $
 
---- mail/app/nsMailApp.cpp.orig	2012-04-23 06:20:50.000000000 +0000
+--- mail/app/nsMailApp.cpp.orig	2012-08-27 04:44:23.000000000 +0000
 +++ mail/app/nsMailApp.cpp
-@@ -52,6 +52,27 @@
+@@ -19,6 +19,27 @@
  
  #include <stdio.h>
  #include <stdarg.h>
@@ -30,7 +30,7 @@ $NetBSD: patch-mail_app_nsMailApp.cpp,v 1.2 2012/04/28 22:48:06 ryoon Exp $
  
  #include "nsCOMPtr.h"
  #include "nsILocalFile.h"
-@@ -151,6 +172,7 @@ static int do_main(const char *exePath, 
+@@ -115,6 +136,7 @@ static int do_main(const char *exePath, 
  
  int main(int argc, char* argv[])
  {
diff --git a/www/seamonkey/patches/patch-mb b/www/seamonkey/patches/patch-mb
index 5c25acbf486..f4c87cf27aa 100644
--- a/www/seamonkey/patches/patch-mb
+++ b/www/seamonkey/patches/patch-mb
@@ -1,8 +1,8 @@
-$NetBSD: patch-mb,v 1.5 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mb,v 1.6 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2012-04-23 06:28:29.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -82,7 +82,7 @@ endif
+@@ -50,7 +50,7 @@ endif
  endif
  endif
  
@@ -11,7 +11,7 @@ $NetBSD: patch-mb,v 1.5 2012/04/28 22:48:06 ryoon Exp $
  ifeq (86,$(findstring 86,$(OS_TEST)))
  CPPSRCS		:= xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp
  endif
-@@ -91,7 +91,7 @@ endif
+@@ -59,7 +59,7 @@ endif
  # New code for Linux, et. al., with gcc
  # Migrate other platforms here after testing
  #
@@ -20,7 +20,7 @@ $NetBSD: patch-mb,v 1.5 2012/04/28 22:48:06 ryoon Exp $
  # Linux/x86-64
  ifeq (x86_64,$(OS_TEST))
  CPPSRCS		:= xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
-@@ -109,12 +109,6 @@ ASFILES		:= xptcstubs_asm_ipf64.s xptcin
+@@ -77,12 +77,6 @@ ASFILES		:= xptcstubs_asm_ipf64.s xptcin
  endif
  endif
  #
@@ -33,7 +33,7 @@ $NetBSD: patch-mb,v 1.5 2012/04/28 22:48:06 ryoon Exp $
  # Neutrino/Intel (uses the same unixish_x86 code)
  #
  ifeq ($(OS_TARGET),NTO)
-@@ -190,7 +184,7 @@ endif
+@@ -158,7 +152,7 @@ endif
  # NetBSD/ARM
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -42,7 +42,7 @@ $NetBSD: patch-mb,v 1.5 2012/04/28 22:48:06 ryoon Exp $
  CPPSRCS		:= xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
  endif
  endif
-@@ -247,7 +241,7 @@ endif
+@@ -215,7 +209,7 @@ endif
  # NetBSD/m68k
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -51,7 +51,7 @@ $NetBSD: patch-mb,v 1.5 2012/04/28 22:48:06 ryoon Exp $
  CPPSRCS		:= xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
  endif
  endif
-@@ -319,9 +313,10 @@ endif
+@@ -287,9 +281,10 @@ endif
  #
  # NetBSD/PPC
  #
@@ -63,7 +63,7 @@ $NetBSD: patch-mb,v 1.5 2012/04/28 22:48:06 ryoon Exp $
  endif
  
  #
-@@ -387,6 +382,13 @@ CPPSRCS		:= xptcinvoke_sparc64_openbsd.c
+@@ -355,6 +350,13 @@ CPPSRCS		:= xptcinvoke_sparc64_openbsd.c
  ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
  endif
  #
diff --git a/www/seamonkey/patches/patch-md b/www/seamonkey/patches/patch-md
index 1618fccffa0..cf8fd5a18ac 100644
--- a/www/seamonkey/patches/patch-md
+++ b/www/seamonkey/patches/patch-md
@@ -1,8 +1,8 @@
-$NetBSD: patch-md,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-md,v 1.5 2012/09/06 12:08:51 ryoon Exp $
 
 ???. from www/firefox/patch-ax.
 
---- mozilla/security/coreconf/SunOS5.mk.orig	2012-04-23 06:28:16.000000000 +0000
+--- mozilla/security/coreconf/SunOS5.mk.orig	2012-08-27 04:49:28.000000000 +0000
 +++ mozilla/security/coreconf/SunOS5.mk
 @@ -147,6 +147,10 @@ endif
  endif
diff --git a/www/seamonkey/patches/patch-me b/www/seamonkey/patches/patch-me
index f7d37a2a084..aea02b8c745 100644
--- a/www/seamonkey/patches/patch-me
+++ b/www/seamonkey/patches/patch-me
@@ -1,9 +1,9 @@
-$NetBSD: patch-me,v 1.7 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-me,v 1.8 2012/09/06 12:08:51 ryoon Exp $
 
 Add DragonFly support.
 Disable assembly routines in freebl on Linux (PR pkg/46056)
 
---- mozilla/security/nss/lib/freebl/Makefile.orig	2012-04-23 06:28:18.000000000 +0000
+--- mozilla/security/nss/lib/freebl/Makefile.orig	2012-08-27 04:49:28.000000000 +0000
 +++ mozilla/security/nss/lib/freebl/Makefile
 @@ -279,7 +279,7 @@ endif
  # to bind the blapi function references in FREEBLVector vector
diff --git a/www/seamonkey/patches/patch-mf b/www/seamonkey/patches/patch-mf
index 2a0870d9e02..68d9aa7dd4b 100644
--- a/www/seamonkey/patches/patch-mf
+++ b/www/seamonkey/patches/patch-mf
@@ -1,9 +1,9 @@
-$NetBSD: patch-mf,v 1.6 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mf,v 1.7 2012/09/06 12:08:51 ryoon Exp $
 
 Add DragonFly support.
 Make sure nss libraries have a run path defined.
 
---- mozilla/security/coreconf/config.mk.orig	2012-04-23 06:28:16.000000000 +0000
+--- mozilla/security/coreconf/config.mk.orig	2012-08-27 04:49:28.000000000 +0000
 +++ mozilla/security/coreconf/config.mk
 @@ -63,7 +63,7 @@ endif
  #######################################################################
diff --git a/www/seamonkey/patches/patch-mg b/www/seamonkey/patches/patch-mg
index a312bf7632f..7a0f74a3a02 100644
--- a/www/seamonkey/patches/patch-mg
+++ b/www/seamonkey/patches/patch-mg
@@ -1,8 +1,8 @@
-$NetBSD: patch-mg,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mg,v 1.5 2012/09/06 12:08:51 ryoon Exp $
 
 Add DragonFly support.
 
---- mozilla/security/coreconf/DragonFly.mk.orig	2012-04-27 17:20:00.000000000 +0000
+--- mozilla/security/coreconf/DragonFly.mk.orig	2012-09-02 13:39:10.000000000 +0000
 +++ mozilla/security/coreconf/DragonFly.mk
 @@ -0,0 +1,83 @@
 +#
diff --git a/www/seamonkey/patches/patch-mh b/www/seamonkey/patches/patch-mh
index f7fd7db3b6a..b4987b6ca98 100644
--- a/www/seamonkey/patches/patch-mh
+++ b/www/seamonkey/patches/patch-mh
@@ -1,6 +1,6 @@
-$NetBSD: patch-mh,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mh,v 1.5 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/security/nss/lib/Makefile.orig	2012-04-23 06:28:17.000000000 +0000
+--- mozilla/security/nss/lib/Makefile.orig	2012-08-27 04:49:28.000000000 +0000
 +++ mozilla/security/nss/lib/Makefile
 @@ -70,7 +70,7 @@ endif
  
diff --git a/www/seamonkey/patches/patch-mi b/www/seamonkey/patches/patch-mi
index 53a19f559f3..e00c0038372 100644
--- a/www/seamonkey/patches/patch-mi
+++ b/www/seamonkey/patches/patch-mi
@@ -1,10 +1,10 @@
-$NetBSD: patch-mi,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mi,v 1.5 2012/09/06 12:08:51 ryoon Exp $
 
 Add DragonFly support.
 
---- mozilla/config/config.mk.orig	2012-04-23 06:27:25.000000000 +0000
+--- mozilla/config/config.mk.orig	2012-08-27 04:49:04.000000000 +0000
 +++ mozilla/config/config.mk
-@@ -129,7 +129,7 @@ endif
+@@ -97,7 +97,7 @@ endif
  # but save the version to allow multiple versions of the same base
  # platform to be built in the same tree.
  #
diff --git a/www/seamonkey/patches/patch-mj b/www/seamonkey/patches/patch-mj
index 12a198ee6e3..7c8310848bd 100644
--- a/www/seamonkey/patches/patch-mj
+++ b/www/seamonkey/patches/patch-mj
@@ -1,8 +1,8 @@
-$NetBSD: patch-mj,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mj,v 1.5 2012/09/06 12:08:51 ryoon Exp $
 
 Add DragonFly support.
 
---- mozilla/security/coreconf/arch.mk.orig	2012-04-23 06:28:16.000000000 +0000
+--- mozilla/security/coreconf/arch.mk.orig	2012-08-27 04:49:28.000000000 +0000
 +++ mozilla/security/coreconf/arch.mk
 @@ -146,7 +146,7 @@ endif
  # IRIX 6.5-ALPHA-1289139620.
diff --git a/www/seamonkey/patches/patch-mk b/www/seamonkey/patches/patch-mk
index 946bc2b7bb2..7ee2b893ce4 100644
--- a/www/seamonkey/patches/patch-mk
+++ b/www/seamonkey/patches/patch-mk
@@ -1,8 +1,8 @@
-$NetBSD: patch-mk,v 1.7 2012/07/19 17:33:29 ryoon Exp $
+$NetBSD: patch-mk,v 1.8 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/config/rules.mk.orig	2012-07-18 11:34:55.000000000 +0000
+--- mozilla/config/rules.mk.orig	2012-08-27 04:49:04.000000000 +0000
 +++ mozilla/config/rules.mk
-@@ -556,6 +556,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+@@ -454,6 +454,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
  endif
  endif
  
@@ -15,7 +15,7 @@ $NetBSD: patch-mk,v 1.7 2012/07/19 17:33:29 ryoon Exp $
  ifeq ($(OS_ARCH),NetBSD)
  ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST)))
  ifeq ($(MODULE),layout)
-@@ -565,6 +571,10 @@ endif
+@@ -463,6 +469,10 @@ endif
  endif
  endif
  
@@ -26,21 +26,3 @@ $NetBSD: patch-mk,v 1.7 2012/07/19 17:33:29 ryoon Exp $
  #
  # HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag
  # which uses internal symbols first
-@@ -1452,7 +1462,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS
- 	$(PYTHON_PATH) \
- 	  $(PLY_INCLUDE) \
- 	  -I$(topsrcdir)/xpcom/idl-parser \
--	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
- 	@if test -n "$(findstring $*.h, $(EXPORTS))"; \
- 	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
- 
-@@ -1465,7 +1475,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DE
- 	  $(PLY_INCLUDE) \
- 	  -I$(topsrcdir)/xpcom/idl-parser \
- 	  -I$(topsrcdir)/xpcom/typelib/xpt/tools \
--	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
- 
- # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
- ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
diff --git a/www/seamonkey/patches/patch-ml b/www/seamonkey/patches/patch-ml
index 2d0de85cee9..1dba0ed5e02 100644
--- a/www/seamonkey/patches/patch-ml
+++ b/www/seamonkey/patches/patch-ml
@@ -1,10 +1,10 @@
-$NetBSD: patch-ml,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-ml,v 1.5 2012/09/06 12:08:51 ryoon Exp $
 
 Treat DragonFly like FreeBSD.
 
---- mozilla/js/src/Makefile.in.orig	2012-04-23 06:27:39.000000000 +0000
+--- mozilla/js/src/Makefile.in.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/js/src/Makefile.in
-@@ -739,6 +739,9 @@ endif # WINNT
+@@ -678,6 +678,9 @@ endif # _MSC_VER
  ifeq ($(OS_ARCH),FreeBSD)
  EXTRA_LIBS	+= -pthread
  endif
diff --git a/www/seamonkey/patches/patch-mm b/www/seamonkey/patches/patch-mm
index 9705d97dda6..72382822f0a 100644
--- a/www/seamonkey/patches/patch-mm
+++ b/www/seamonkey/patches/patch-mm
@@ -1,37 +1,25 @@
-$NetBSD: patch-mm,v 1.9 2012/07/19 17:33:29 ryoon Exp $
+$NetBSD: patch-mm,v 1.10 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/toolkit/library/Makefile.in.orig	2012-07-15 12:00:56.000000000 +0000
+--- mozilla/toolkit/library/Makefile.in.orig	2012-08-25 00:31:32.000000000 +0000
 +++ mozilla/toolkit/library/Makefile.in
-@@ -120,6 +120,7 @@ STATIC_LIBS += ipdlunittest_s
- endif
- 
- ifeq (Linux,$(OS_ARCH))
-+EXTRA_DSO_LDOPTS += -lnssutil3
- ifneq (Android,$(OS_TARGET))
- OS_LIBS += -lrt
- endif
-@@ -522,6 +523,24 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -535,6 +535,20 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
  endif
  endif
  
-+ifeq ($(OS_ARCH),DragonFly)
-+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
-+EXTRA_DSO_LDOPTS += -lplc4 -lplds4 -lnspr4 -lnssutil3
-+endif
-+
-+ifeq ($(OS_ARCH),FreeBSD)
++ifneq (,$(filter DragonFly FreeBSD,$(OS_ARCH)))
 +OS_LIBS += $(call EXPAND_LIBNAME,kvm)
 +EXTRA_DSO_LDOPTS += -lplc4 -lplds4 -lnspr4 -lnssutil3
 +endif
 +
++ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO))
 +ifeq ($(OS_ARCH),NetBSD)
-+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
 +EXTRA_DSO_LDOPTS += -lossaudio
 +endif
 +ifdef PKGSRC_PULSEAUDIO
 +EXTRA_DSO_LDOPTS += -lpulse
 +endif
++endif
 +
  ifeq ($(OS_ARCH),WINNT)
- OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32)
+ OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32 sensorsapi portabledeviceguids windowscodecs)
  ifdef MOZ_CRASHREPORTER
diff --git a/www/seamonkey/patches/patch-mn b/www/seamonkey/patches/patch-mn
index f86c69b29c1..88603dc623e 100644
--- a/www/seamonkey/patches/patch-mn
+++ b/www/seamonkey/patches/patch-mn
@@ -1,8 +1,8 @@
-$NetBSD: patch-mn,v 1.5 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mn,v 1.6 2012/09/06 12:08:51 ryoon Exp $
 
 Make sure we link correctly with sqlite3 from pkgsrc.
 
---- mozilla/security/nss/lib/softoken/config.mk.orig	2012-04-23 06:28:18.000000000 +0000
+--- mozilla/security/nss/lib/softoken/config.mk.orig	2012-08-27 04:49:29.000000000 +0000
 +++ mozilla/security/nss/lib/softoken/config.mk
 @@ -80,7 +80,7 @@ else
  # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
diff --git a/www/seamonkey/patches/patch-mozilla_build_autoconf_nss.m4 b/www/seamonkey/patches/patch-mozilla_build_autoconf_nss.m4
index 6df4b1af252..f917bf328cf 100644
--- a/www/seamonkey/patches/patch-mozilla_build_autoconf_nss.m4
+++ b/www/seamonkey/patches/patch-mozilla_build_autoconf_nss.m4
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_build_autoconf_nss.m4,v 1.3 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_build_autoconf_nss.m4,v 1.4 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/build/autoconf/nss.m4.orig	2012-04-23 06:27:25.000000000 +0000
+--- mozilla/build/autoconf/nss.m4.orig	2012-08-27 04:49:04.000000000 +0000
 +++ mozilla/build/autoconf/nss.m4
 @@ -22,18 +22,18 @@ AC_ARG_WITH(nss-exec-prefix,
  	if test -n "$nss_config_exec_prefix"; then
diff --git a/www/seamonkey/patches/patch-mozilla_config_system-headers b/www/seamonkey/patches/patch-mozilla_config_system-headers
new file mode 100644
index 00000000000..fd48df4e7fd
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_config_system-headers
@@ -0,0 +1,12 @@
+$NetBSD: patch-mozilla_config_system-headers,v 1.1 2012/09/06 12:08:51 ryoon Exp $
+
+--- mozilla/config/system-headers.orig	2012-08-27 04:49:04.000000000 +0000
++++ mozilla/config/system-headers
+@@ -1059,3 +1059,7 @@ gst/gst.h
+ gst/app/gstappsink.h
+ gst/app/gstappsrc.h
+ gst/video/video.h
++sys/thr.h
++sys/user.h
++kvm.h
++spawn.h
diff --git a/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp b/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp
index e5f02ee4022..9ca6b6dfbc6 100644
--- a/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp
+++ b/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp
@@ -1,8 +1,16 @@
-$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.3 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.4 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig	2012-04-23 06:27:30.000000000 +0000
+--- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig	2012-08-27 04:49:08.000000000 +0000
 +++ mozilla/dom/plugins/ipc/PluginModuleChild.cpp
-@@ -236,7 +236,7 @@ PluginModuleChild::Init(const std::strin
+@@ -5,6 +5,7 @@
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
+ #ifdef MOZ_WIDGET_QT
++#include <unistd.h> // for _exit()
+ #include <QtCore/QTimer>
+ #include "nsQAppInstance.h"
+ #include "NestedLoopTimer.h"
+@@ -192,7 +193,7 @@ PluginModuleChild::Init(const std::strin
  
      // TODO: use PluginPRLibrary here
  
@@ -11,7 +19,7 @@ $NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.3 2012/04/28 22
      mShutdownFunc =
          (NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown");
  
-@@ -1821,7 +1821,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
+@@ -1811,7 +1812,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
      PLUGIN_LOG_DEBUG_METHOD;
      AssertPluginThread();
  
@@ -20,7 +28,7 @@ $NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.3 2012/04/28 22
      return true;
  #elif defined(OS_WIN) || defined(OS_MACOSX)
      *_retval = mGetEntryPointsFunc(&mFunctions);
-@@ -1848,7 +1848,7 @@ PluginModuleChild::AnswerNP_Initialize(N
+@@ -1840,7 +1841,7 @@ PluginModuleChild::AnswerNP_Initialize(c
      SendBackUpXResources(FileDescriptor(xSocketFd, false/*don't close*/));
  #endif
  
diff --git a/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h b/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h
index 42be490735d..4abd245d046 100644
--- a/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h
+++ b/www/seamonkey/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.h,v 1.3 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.h,v 1.4 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/dom/plugins/ipc/PluginModuleChild.h.orig	2012-04-23 06:27:30.000000000 +0000
+--- mozilla/dom/plugins/ipc/PluginModuleChild.h.orig	2012-08-27 04:49:08.000000000 +0000
 +++ mozilla/dom/plugins/ipc/PluginModuleChild.h
-@@ -360,7 +360,7 @@ private:
+@@ -330,7 +330,7 @@ private:
  
      // we get this from the plugin
      NP_PLUGINSHUTDOWN mShutdownFunc;
diff --git a/www/seamonkey/patches/patch-mozilla_gfx_thebes_gfxPlatform.cpp b/www/seamonkey/patches/patch-mozilla_gfx_thebes_gfxPlatform.cpp
index 3f309163668..5962fbb2dd6 100644
--- a/www/seamonkey/patches/patch-mozilla_gfx_thebes_gfxPlatform.cpp
+++ b/www/seamonkey/patches/patch-mozilla_gfx_thebes_gfxPlatform.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_gfx_thebes_gfxPlatform.cpp,v 1.1 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_gfx_thebes_gfxPlatform.cpp,v 1.2 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/gfx/thebes/gfxPlatform.cpp.orig	2012-04-23 06:27:36.000000000 +0000
+--- mozilla/gfx/thebes/gfxPlatform.cpp.orig	2012-08-27 04:49:13.000000000 +0000
 +++ mozilla/gfx/thebes/gfxPlatform.cpp
-@@ -436,6 +436,7 @@ void SourceBufferDestroy(void *srcBuffer
+@@ -443,6 +443,7 @@ void SourceBufferDestroy(void *srcBuffer
    static_cast<SourceSurface*>(srcBuffer)->Release();
  }
  
@@ -10,7 +10,7 @@ $NetBSD: patch-mozilla_gfx_thebes_gfxPlatform.cpp,v 1.1 2012/04/28 22:48:06 ryoo
  void SourceSnapshotDetached(cairo_surface_t *nullSurf)
  {
    gfxImageSurface* origSurf =
-@@ -443,6 +444,7 @@ void SourceSnapshotDetached(cairo_surfac
+@@ -450,6 +451,7 @@ void SourceSnapshotDetached(cairo_surfac
  
    origSurf->SetData(&kSourceSurface, NULL, NULL);
  }
@@ -18,16 +18,16 @@ $NetBSD: patch-mozilla_gfx_thebes_gfxPlatform.cpp,v 1.1 2012/04/28 22:48:06 ryoo
  
  RefPtr<SourceSurface>
  gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
-@@ -512,6 +514,7 @@ gfxPlatform::GetSourceSurfaceForSurface(
-                                                      imgSurface->Stride(),
-                                                      format);
+@@ -544,6 +546,7 @@ gfxPlatform::GetSourceSurfaceForSurface(
+ 
+     }
  
 +    #ifdef MOZ_TREE_CAIRO
      cairo_surface_t *nullSurf =
  	cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
      cairo_surface_set_user_data(nullSurf,
-@@ -520,6 +523,7 @@ gfxPlatform::GetSourceSurfaceForSurface(
- 				NULL);
+@@ -552,6 +555,7 @@ gfxPlatform::GetSourceSurfaceForSurface(
+                                 NULL);
      cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
      cairo_surface_destroy(nullSurf);
 +    #endif
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_Makefile.in b/www/seamonkey/patches/patch-mozilla_ipc_chromium_Makefile.in
index 59429a6cf90..5b3e84b291b 100644
--- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_Makefile.in
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_ipc_chromium_Makefile.in,v 1.3 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_Makefile.in,v 1.4 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/Makefile.in.orig	2012-04-23 06:27:38.000000000 +0000
+--- mozilla/ipc/chromium/Makefile.in.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/chromium/Makefile.in
-@@ -275,6 +275,34 @@ endif
+@@ -243,6 +243,34 @@ endif
  
  endif # } OS_LINUX
  
@@ -10,7 +10,7 @@ $NetBSD: patch-mozilla_ipc_chromium_Makefile.in,v 1.3 2012/04/28 22:48:06 ryoon
 +
 +CPPSRCS += \
 +  atomicops_internals_x86_gcc.cc \
-+  file_util_bsd.cc \
++  file_util_linux.cc \
 +  process_util_bsd.cc \
 +  time_posix.cc \
 +  $(NULL)
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_chromium-config.mk b/www/seamonkey/patches/patch-mozilla_ipc_chromium_chromium-config.mk
index 91b91e46340..8ba8c18eb52 100644
--- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_chromium-config.mk
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_chromium-config.mk
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.5 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/chromium-config.mk.orig	2012-04-23 06:27:38.000000000 +0000
+--- mozilla/ipc/chromium/chromium-config.mk.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/chromium/chromium-config.mk
-@@ -56,17 +56,6 @@ LOCAL_INCLUDES += \
+@@ -24,17 +24,6 @@ LOCAL_INCLUDES += \
    -I$(DEPTH)/ipc/ipdl/_ipdlheaders \
    $(NULL)
  
@@ -20,7 +20,7 @@ $NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.4 2012/04/28 22:48:06
  ifeq ($(OS_ARCH),WINNT) # {
  OS_LIBS += $(call EXPAND_LIBNAME,psapi shell32 dbghelp)
  
-@@ -93,13 +82,64 @@ DEFINES += -DCOMPILER_MSVC
+@@ -61,13 +50,65 @@ DEFINES += -DCOMPILER_MSVC
  endif
  
  else # } {
@@ -74,6 +74,7 @@ $NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.4 2012/04/28 22:48:06
 +
 +OS_OPENBSD = 1
 +OS_BSD = 1
++OS_LIBS += $(call EXPAND_LIBNAME,kvm)
 +DEFINES += \
 +  -DOS_OPENBSD=1 \
 +  -DOS_BSD=1 \
@@ -88,7 +89,7 @@ $NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.4 2012/04/28 22:48:06
    $(NULL)
  
  # NB: to stop gcc warnings about exporting template instantiation
-@@ -107,4 +147,8 @@ OS_CXXFLAGS := $(filter-out -pedantic,$(
+@@ -75,4 +116,8 @@ OS_CXXFLAGS := $(filter-out -pedantic,$(
  
  endif # }
  endif # }
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_base__paths.h b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_base__paths.h
index 6893491797e..dde4b47c79e 100644
--- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_base__paths.h
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_base__paths.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_base__paths.h,v 1.3 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_base__paths.h,v 1.4 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/base_paths.h.orig	2012-04-23 06:27:38.000000000 +0000
+--- mozilla/ipc/chromium/src/base/base_paths.h.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/base_paths.h
 @@ -13,7 +13,7 @@
  #include "base/base_paths_win.h"
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h
new file mode 100644
index 00000000000..423048fdaf7
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h
@@ -0,0 +1,113 @@
+$NetBSD: patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h,v 1.1 2012/09/06 12:08:51 ryoon Exp $
+
+--- mozilla/ipc/chromium/src/base/dir_reader_bsd.h.orig	2012-09-02 13:39:11.000000000 +0000
++++ mozilla/ipc/chromium/src/base/dir_reader_bsd.h
+@@ -0,0 +1,108 @@
++// Copyright (c) 2010 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.
++
++// derived from dir_reader_linux.h
++
++#ifndef BASE_DIR_READER_BSD_H_
++#define BASE_DIR_READER_BSD_H_
++#pragma once
++
++#include <dirent.h>
++#include <errno.h>
++#include <fcntl.h>
++#include <stdint.h>
++#include <unistd.h>
++
++#include "base/logging.h"
++#include "base/eintr_wrapper.h"
++
++// See the comments in dir_reader_posix.h about this.
++
++namespace base {
++
++class DirReaderBSD {
++ public:
++  explicit DirReaderBSD(const char* directory_path)
++#ifdef O_DIRECTORY
++      : fd_(open(directory_path, O_RDONLY | O_DIRECTORY)),
++#else
++      : fd_(open(directory_path, O_RDONLY)),
++#endif
++        offset_(0),
++        size_(0) {
++    memset(buf_, 0, sizeof(buf_));
++  }
++
++  ~DirReaderBSD() {
++    if (fd_ >= 0) {
++      if (HANDLE_EINTR(close(fd_)))
++        DLOG(ERROR) << "Failed to close directory handle";
++    }
++  }
++
++  bool IsValid() const {
++    return fd_ >= 0;
++  }
++
++  // Move to the next entry returning false if the iteration is complete.
++  bool Next() {
++    if (size_) {
++      struct dirent* dirent = reinterpret_cast<struct dirent*>(&buf_[offset_]);
++      offset_ += dirent->d_reclen;
++    }
++
++    if (offset_ != size_)
++      return true;
++
++#ifdef OS_OPENBSD
++    const int r = getdirentries(fd_, buf_, sizeof(buf_), basep_);
++#else
++    const int r = getdents(fd_, buf_, sizeof(buf_));
++#endif
++    if (r == 0)
++      return false;
++    if (r == -1) {
++#ifdef OS_OPENBSD
++      DLOG(ERROR) << "getdirentries returned an error: " << errno;
++#else
++      DLOG(ERROR) << "getdents returned an error: " << errno;
++#endif
++      return false;
++    }
++    size_ = r;
++    offset_ = 0;
++    return true;
++  }
++
++  const char* name() const {
++    if (!size_)
++      return NULL;
++
++    const struct dirent* dirent =
++        reinterpret_cast<const struct dirent*>(&buf_[offset_]);
++    return dirent->d_name;
++  }
++
++  int fd() const {
++    return fd_;
++  }
++
++  static bool IsFallback() {
++    return false;
++  }
++
++ private:
++  const int fd_;
++  char buf_[512];
++#ifdef OS_OPENBSD
++  off_t *basep_;
++#endif
++  size_t offset_, size_;
++
++  DISALLOW_COPY_AND_ASSIGN(DirReaderBSD);
++};
++
++}  // namespace base
++
++#endif // BASE_DIR_READER_BSD_H_
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__posix.h b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__posix.h
new file mode 100644
index 00000000000..c7e5769997d
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__posix.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-mozilla_ipc_chromium_src_base_dir__reader__posix.h,v 1.1 2012/09/06 12:08:51 ryoon Exp $
+
+--- mozilla/ipc/chromium/src/base/dir_reader_posix.h.orig	2012-08-27 04:49:15.000000000 +0000
++++ mozilla/ipc/chromium/src/base/dir_reader_posix.h
+@@ -18,16 +18,20 @@
+ // seems worse than falling back to enumerating all file descriptors so we will
+ // probably never implement this on the Mac.
+ 
+-#if defined(OS_LINUX) && !defined(OS_OPENBSD)
++#if defined(OS_LINUX)
+ #include "base/dir_reader_linux.h"
++#elif defined(OS_BSD)
++#include "base/dir_reader_bsd.h"
+ #else
+ #include "base/dir_reader_fallback.h"
+ #endif
+ 
+ namespace base {
+ 
+-#if defined(OS_LINUX) && !defined(OS_OPENBSD)
++#if defined(OS_LINUX)
+ typedef DirReaderLinux DirReaderPosix;
++#elif defined(OS_BSD)
++typedef DirReaderBSD DirReaderPosix;
+ #else
+ typedef DirReaderFallback DirReaderPosix;
+ #endif
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc
deleted file mode 100644
index 4b351e4be48..00000000000
--- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc,v 1.3 2012/04/28 22:48:06 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/file_util_bsd.cc.orig	2012-04-27 17:19:59.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/file_util_bsd.cc
-@@ -0,0 +1,79 @@
-+// Copyright (c) 2006-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.
-+
-+// this is a derivative of file_util_linux.cc
-+
-+#include "base/file_util.h"
-+
-+#include <fcntl.h>
-+
-+#include <string>
-+#include <vector>
-+
-+#include "base/eintr_wrapper.h"
-+#include "base/file_path.h"
-+#include "base/string_util.h"
-+
-+namespace file_util {
-+
-+bool GetTempDir(FilePath* path) {
-+  const char* tmp = getenv("TMPDIR");
-+  if (tmp)
-+    *path = FilePath(tmp);
-+  else
-+    *path = FilePath("/tmp");
-+  return true;
-+}
-+
-+bool GetShmemTempDir(FilePath* path) {
-+  return GetTempDir(path);
-+}
-+
-+bool CopyFile(const FilePath& from_path, const FilePath& to_path) {
-+  int infile = open(from_path.value().c_str(), O_RDONLY);
-+  if (infile < 0)
-+    return false;
-+
-+  int outfile = creat(to_path.value().c_str(), 0666);
-+  if (outfile < 0) {
-+    close(infile);
-+    return false;
-+  }
-+
-+  const size_t kBufferSize = 32768;
-+  std::vector<char> buffer(kBufferSize);
-+  bool result = true;
-+
-+  while (result) {
-+    ssize_t bytes_read = HANDLE_EINTR(read(infile, &buffer[0], buffer.size()));
-+    if (bytes_read < 0) {
-+      result = false;
-+      break;
-+    }
-+    if (bytes_read == 0)
-+      break;
-+    // Allow for partial writes
-+    ssize_t bytes_written_per_read = 0;
-+    do {
-+      ssize_t bytes_written_partial = HANDLE_EINTR(write(
-+          outfile,
-+          &buffer[bytes_written_per_read],
-+          bytes_read - bytes_written_per_read));
-+      if (bytes_written_partial < 0) {
-+        result = false;
-+        break;
-+      }
-+      bytes_written_per_read += bytes_written_partial;
-+    } while (bytes_written_per_read < bytes_read);
-+  }
-+
-+  if (HANDLE_EINTR(close(infile)) < 0)
-+    result = false;
-+  if (HANDLE_EINTR(close(outfile)) < 0)
-+    result = false;
-+
-+  return result;
-+}
-+
-+}  // namespace file_util
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_file__util__linux.cc b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_file__util__linux.cc
new file mode 100644
index 00000000000..f12225c2395
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_file__util__linux.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_ipc_chromium_src_base_file__util__linux.cc,v 1.1 2012/09/06 12:08:51 ryoon Exp $
+
+--- mozilla/ipc/chromium/src/base/file_util_linux.cc.orig	2012-08-27 04:49:15.000000000 +0000
++++ mozilla/ipc/chromium/src/base/file_util_linux.cc
+@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) {
+ }
+ 
+ bool GetShmemTempDir(FilePath* path) {
+-#ifdef ANDROID
++#if defined(ANDROID) || defined(OS_BSD)
+   return GetTempDir(path);
+ #else
+   *path = FilePath("/dev/shm");
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc
index d1914201655..39e8d76eae4 100644
--- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_message__loop.cc,v 1.3 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_message__loop.cc,v 1.4 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/message_loop.cc.orig	2012-04-23 06:27:38.000000000 +0000
+--- mozilla/ipc/chromium/src/base/message_loop.cc.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/message_loop.cc
 @@ -19,7 +19,7 @@
  #if defined(OS_POSIX)
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h
index ba2044f6c0a..fdf87521e45 100644
--- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h
@@ -1,12 +1,16 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_platform__thread.h,v 1.3 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_platform__thread.h,v 1.4 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/platform_thread.h.orig	2012-04-23 06:27:38.000000000 +0000
+--- mozilla/ipc/chromium/src/base/platform_thread.h.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/platform_thread.h
-@@ -25,6 +25,8 @@ typedef pthread_t PlatformThreadHandle;
- #if defined(OS_LINUX)
+@@ -22,9 +22,11 @@ typedef void* PlatformThreadHandle;  // 
+ #elif defined(OS_POSIX)
+ #include <pthread.h>
+ typedef pthread_t PlatformThreadHandle;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_OPENBSD)
  #include <unistd.h>
  typedef pid_t PlatformThreadId;
-+#elif defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined (OS_NETBSD)
++#elif defined(OS_BSD)
 +typedef lwpid_t PlatformThreadId;
  #elif defined(OS_MACOSX)
  #include <mach/mach.h>
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util.h b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util.h
index d52d350abe4..bacec8e6ecc 100644
--- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util.h
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util.h,v 1.4 2012/06/14 11:27:34 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util.h,v 1.5 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/process_util.h.orig	2012-06-05 05:54:13.000000000 +0000
+--- mozilla/ipc/chromium/src/base/process_util.h.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/process_util.h
 @@ -280,6 +280,7 @@ class NamedProcessIterator {
    const ProcessEntry* NextProcessEntry();
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc
index ee458aaeca1..b5601346db6 100644
--- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.5 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.6 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig	2012-04-27 17:19:59.000000000 +0000
+--- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig	2012-08-31 13:56:11.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/process_util_bsd.cc
-@@ -0,0 +1,326 @@
+@@ -0,0 +1,321 @@
 +// 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.
@@ -11,36 +11,23 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.5 2012/04
 +
 +#include "base/process_util.h"
 +
-+#include <ctype.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <string>
-+#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
-+#define PRE_SYS_INCLUDE
-+#define POST_SYS_INCLUDE
-+#endif
-+PRE_SYS_INCLUDE
-+#include <kvm.h>
-+POST_SYS_INCLUDE
++#include <sys/param.h>
 +#include <sys/sysctl.h>
-+#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
++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
++_Pragma("GCC visibility push(default)")
++#include <kvm.h>
 +#include <sys/user.h>
-+POST_SYS_INCLUDE
++_Pragma("GCC visibility pop")
 +#endif
 +
++#include <ctype.h>
++#include <fcntl.h>
++#include <kvm.h>
++#include <unistd.h>
++
++#include <string>
++
 +#include "base/debug_util.h"
 +#include "base/eintr_wrapper.h"
 +#include "base/file_util.h"
@@ -48,17 +35,21 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.5 2012/04
 +#include "base/string_tokenizer.h"
 +#include "base/string_util.h"
 +
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#if __NetBSD_Version__ >= 600000000
++#if (defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0) \
++  || (defined(OS_NETBSD) && __NetBSD_Version__ >= 599006500)
 +#define HAVE_POSIX_SPAWN	1
 +#endif
++
++#ifndef __dso_public
++# ifdef __exported
++#  define __dso_public	__exported
++# else
++#  define __dso_public	__attribute__((__visibility__("default")))
++# endif
 +#endif
 +
 +#ifdef HAVE_POSIX_SPAWN
-+PRE_SYS_INCLUDE
 +#include <spawn.h>
-+POST_SYS_INCLUDE
 +extern "C" char **environ __dso_public;
 +#endif
 +
@@ -299,7 +290,11 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.5 2012/04
 +#  endif
 +#else
 +  kvm  = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
++#if defined(OS_OPENBSD)
++  struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc), &numEntries);
++#else
 +  struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries);
++#endif
 +  if (procs != NULL && numEntries > 0) {
 +    for (int i = 0; i < numEntries; i++) {
 +    if (exe != procs[i].p_comm) continue;
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc
index 55a8c4521de..95a0418ef85 100644
--- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__posix.cc,v 1.3 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__posix.cc,v 1.4 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/process_util_posix.cc.orig	2012-04-23 06:27:38.000000000 +0000
+--- mozilla/ipc/chromium/src/base/process_util_posix.cc.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/process_util_posix.cc
 @@ -116,6 +116,11 @@ void CloseSuperfluousFds(const base::Inj
  #elif defined(OS_MACOSX)
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_ref__counted.h b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_ref__counted.h
new file mode 100644
index 00000000000..2cd37d40c68
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_ref__counted.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_ipc_chromium_src_base_ref__counted.h,v 1.1 2012/09/06 12:08:51 ryoon Exp $
+
+--- mozilla/ipc/chromium/src/base/ref_counted.h.orig	2012-08-27 04:49:15.000000000 +0000
++++ mozilla/ipc/chromium/src/base/ref_counted.h
+@@ -28,7 +28,7 @@ class RefCountedBase {
+   bool in_dtor_;
+ #endif
+ 
+-  DFAKE_MUTEX(add_release_);
++  DFAKE_MUTEX(add_release_)
+ 
+   DISALLOW_COPY_AND_ASSIGN(RefCountedBase);
+ };
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc
index 9ac40aea341..4af49a3f75d 100644
--- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.3 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.4 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc.orig	2012-04-23 06:27:38.000000000 +0000
+--- mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc
-@@ -212,7 +212,7 @@ PR_ImplodeTime(const PRExplodedTime *exp
+@@ -180,7 +180,7 @@ PR_ImplodeTime(const PRExplodedTime *exp
      LL_ADD(retVal, retVal, temp);
  
      return retVal;
@@ -11,7 +11,7 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.3 2
      struct tm exp_tm = {0};
      exp_tm.tm_sec  = exploded->tm_sec;
      exp_tm.tm_min  = exploded->tm_min;
-@@ -245,6 +245,24 @@ PR_ImplodeTime(const PRExplodedTime *exp
+@@ -213,6 +213,24 @@ PR_ImplodeTime(const PRExplodedTime *exp
      result *= kSecondsToMicroseconds;
      result += exploded->tm_usec;
      return result;
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_time__posix.cc b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_time__posix.cc
new file mode 100644
index 00000000000..1e7a80ee510
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_base_time__posix.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_ipc_chromium_src_base_time__posix.cc,v 1.1 2012/09/06 12:08:51 ryoon Exp $
+
+--- mozilla/ipc/chromium/src/base/time_posix.cc.orig	2012-08-27 04:49:15.000000000 +0000
++++ mozilla/ipc/chromium/src/base/time_posix.cc
+@@ -167,7 +167,7 @@ TimeTicks TimeTicks::Now() {
+   // With numer and denom = 1 (the expected case), the 64-bit absolute time
+   // reported in nanoseconds is enough to last nearly 585 years.
+ 
+-#elif defined(__OpenBSD__) || defined(OS_POSIX) && \
++#elif defined(OS_OPENBSD) || defined(OS_POSIX) && \
+       defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
+ 
+   struct timespec ts;
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_file__descriptor__set__posix.h b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_file__descriptor__set__posix.h
new file mode 100644
index 00000000000..e06fd471bca
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_file__descriptor__set__posix.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_file__descriptor__set__posix.h,v 1.1 2012/09/06 12:08:51 ryoon Exp $
+
+--- mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h.orig	2012-08-27 04:49:15.000000000 +0000
++++ mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h
+@@ -30,7 +30,7 @@ class FileDescriptorSet : public base::R
+   // In debugging mode, it's a fatal error to try and add more than this number
+   // of descriptors to a FileDescriptorSet.
+   enum {
+-    MAX_DESCRIPTORS_PER_MESSAGE = 4,
++    MAX_DESCRIPTORS_PER_MESSAGE = 4
+   };
+ 
+   // ---------------------------------------------------------------------------
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__channel__posix.cc b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__channel__posix.cc
new file mode 100644
index 00000000000..f9d106b624f
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__channel__posix.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc__channel__posix.cc,v 1.1 2012/09/06 12:08:51 ryoon Exp $
+
+--- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc.orig	2012-08-27 04:49:15.000000000 +0000
++++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
+@@ -7,6 +7,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stddef.h>
++#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h
index 7500e038cf4..113d375a1a8 100644
--- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h
@@ -1,13 +1,13 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.3 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.4 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h.orig	2012-04-23 06:27:39.000000000 +0000
+--- mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h
 @@ -195,7 +195,7 @@ struct ParamTraits<unsigned long long> {
  };
  #endif
  
 -#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390))
-+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390))
++#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390))
  // There size_t is a synonym for |unsigned long| ...
  template <>
  struct ParamTraits<size_t> {
@@ -16,7 +16,7 @@ $NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.
  #endif  // defined(OS_MACOSX)
  
 -#if !(defined(OS_LINUX) && defined(ARCH_CPU_64_BITS))
-+#if !((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS))
++#if !((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS))
  // int64 is |long int| on 64-bit systems, uint64 is |unsigned long|
  template <>
  struct ParamTraits<int64> {
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h
index 290c421cb7e..0c501cbbce9 100644
--- a/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h
+++ b/www/seamonkey/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h,v 1.3 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h,v 1.4 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/chromium/src/chrome/common/transport_dib.h.orig	2012-04-23 06:27:39.000000000 +0000
+--- mozilla/ipc/chromium/src/chrome/common/transport_dib.h.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/chromium/src/chrome/common/transport_dib.h
 @@ -7,7 +7,7 @@
  
@@ -16,7 +16,7 @@ $NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h,v 1.3 201
    };
    typedef HandleAndSequenceNum Id;
 -#elif defined(OS_MACOSX)
-+#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
++#elif defined(OS_MACOSX) || defined(OS_BSD)
    typedef base::SharedMemoryHandle Handle;
    // On Mac, the inode number of the backing file is used as an id.
    typedef base::SharedMemoryId Id;
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp b/www/seamonkey/patches/patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp
index 960d8140fdb..c377979a1f3 100644
--- a/www/seamonkey/patches/patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp
+++ b/www/seamonkey/patches/patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp,v 1.3 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp,v 1.4 2012/09/06 12:08:51 ryoon Exp $
 
---- mozilla/ipc/glue/GeckoChildProcessHost.cpp.orig	2012-04-23 06:27:39.000000000 +0000
+--- mozilla/ipc/glue/GeckoChildProcessHost.cpp.orig	2012-08-27 04:49:15.000000000 +0000
 +++ mozilla/ipc/glue/GeckoChildProcessHost.cpp
-@@ -430,7 +430,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -410,7 +410,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
    // and passing wstrings from one config to the other is unsafe.  So
    // we split the logic here.
  
@@ -11,7 +11,7 @@ $NetBSD: patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp,v 1.3 2012/04/28 22:48
    base::environment_map newEnvVars;
    // XPCOM may not be initialized in some subprocesses.  We don't want
    // to initialize XPCOM just for the directory service, especially
-@@ -445,8 +445,8 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -425,8 +425,8 @@ GeckoChildProcessHost::PerformAsyncLaunc
        if (NS_SUCCEEDED(rv)) {
          nsCString path;
          greDir->GetNativePath(path);
@@ -22,7 +22,7 @@ $NetBSD: patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp,v 1.3 2012/04/28 22:48
          path += "/lib";
  #  endif  // MOZ_WIDGET_ANDROID
          const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
-@@ -557,7 +557,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -537,7 +537,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
    childArgv.push_back(pidstring);
  
  #if defined(MOZ_CRASHREPORTER)
@@ -31,7 +31,7 @@ $NetBSD: patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp,v 1.3 2012/04/28 22:48
    int childCrashFd, childCrashRemapFd;
    if (!CrashReporter::CreateNotificationPipeForChild(
          &childCrashFd, &childCrashRemapFd))
-@@ -594,7 +594,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -574,7 +574,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
  #endif
  
    base::LaunchApp(childArgv, mFileMap,
diff --git a/www/seamonkey/patches/patch-mozilla_ipc_glue_SharedMemorySysV.h b/www/seamonkey/patches/patch-mozilla_ipc_glue_SharedMemorySysV.h
new file mode 100644
index 00000000000..eb57555b29a
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_ipc_glue_SharedMemorySysV.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_ipc_glue_SharedMemorySysV.h,v 1.1 2012/09/06 12:08:51 ryoon Exp $
+
+--- mozilla/ipc/glue/SharedMemorySysV.h.orig	2012-08-27 04:49:15.000000000 +0000
++++ mozilla/ipc/glue/SharedMemorySysV.h
+@@ -8,7 +8,7 @@
+ #ifndef mozilla_ipc_SharedMemorySysV_h
+ #define mozilla_ipc_SharedMemorySysV_h
+ 
+-#if defined(OS_LINUX) && !defined(ANDROID)
++#if defined(OS_LINUX) && !defined(ANDROID) || defined(OS_BSD)
+ 
+ // SysV shared memory isn't available on Windows, but we define the
+ // following macro so that #ifdefs are clearer (compared to #ifdef
diff --git a/www/seamonkey/patches/patch-mozilla_js_src_config_rules.mk b/www/seamonkey/patches/patch-mozilla_js_src_config_rules.mk
deleted file mode 100644
index c9c8088d09c..00000000000
--- a/www/seamonkey/patches/patch-mozilla_js_src_config_rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-mozilla_js_src_config_rules.mk,v 1.2 2012/07/19 17:33:29 ryoon Exp $
-
---- mozilla/js/src/config/rules.mk.orig	2012-07-17 18:13:32.000000000 +0000
-+++ mozilla/js/src/config/rules.mk
-@@ -1452,7 +1452,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS
- 	$(PYTHON_PATH) \
- 	  $(PLY_INCLUDE) \
- 	  -I$(topsrcdir)/xpcom/idl-parser \
--	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
- 	@if test -n "$(findstring $*.h, $(EXPORTS))"; \
- 	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
- 
-@@ -1465,7 +1465,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DE
- 	  $(PLY_INCLUDE) \
- 	  -I$(topsrcdir)/xpcom/idl-parser \
- 	  -I$(topsrcdir)/xpcom/typelib/xpt/tools \
--	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
- 
- # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
- ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
diff --git a/www/seamonkey/patches/patch-mozilla_js_src_config_system-headers b/www/seamonkey/patches/patch-mozilla_js_src_config_system-headers
new file mode 100644
index 00000000000..e793a1a79e7
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_js_src_config_system-headers
@@ -0,0 +1,12 @@
+$NetBSD: patch-mozilla_js_src_config_system-headers,v 1.1 2012/09/06 12:08:52 ryoon Exp $
+
+--- mozilla/js/src/config/system-headers.orig	2012-08-27 04:49:15.000000000 +0000
++++ mozilla/js/src/config/system-headers
+@@ -1059,3 +1059,7 @@ gst/gst.h
+ gst/app/gstappsink.h
+ gst/app/gstappsrc.h
+ gst/video/video.h
++sys/thr.h
++sys/user.h
++kvm.h
++spawn.h
diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jscpucfg.h b/www/seamonkey/patches/patch-mozilla_js_src_jscpucfg.h
index 9c0b880b143..8c56284f6c1 100644
--- a/www/seamonkey/patches/patch-mozilla_js_src_jscpucfg.h
+++ b/www/seamonkey/patches/patch-mozilla_js_src_jscpucfg.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_js_src_jscpucfg.h,v 1.3 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_js_src_jscpucfg.h,v 1.4 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/js/src/jscpucfg.h.orig	2012-04-23 06:27:43.000000000 +0000
+--- mozilla/js/src/jscpucfg.h.orig	2012-08-27 04:49:16.000000000 +0000
 +++ mozilla/js/src/jscpucfg.h
-@@ -77,6 +77,21 @@
+@@ -44,6 +44,21 @@
  #  define IS_BIG_ENDIAN 1
  # endif
  
diff --git a/www/seamonkey/patches/patch-mozilla_js_src_jsgc.cpp b/www/seamonkey/patches/patch-mozilla_js_src_jsgc.cpp
new file mode 100644
index 00000000000..26b13c0993d
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_js_src_jsgc.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-mozilla_js_src_jsgc.cpp,v 1.1 2012/09/06 12:08:52 ryoon Exp $
+
+--- mozilla/js/src/jsgc.cpp.orig	2012-08-27 04:49:16.000000000 +0000
++++ mozilla/js/src/jsgc.cpp
+@@ -2635,8 +2635,12 @@ GetCPUCount()
+         GetSystemInfo(&sysinfo);
+         ncpus = unsigned(sysinfo.dwNumberOfProcessors);
+ # else
++#  ifdef _SC_NPROCESSORS_ONLN
+         long n = sysconf(_SC_NPROCESSORS_ONLN);
+         ncpus = (n > 0) ? unsigned(n) : 1;
++#  else
++       ncpus = 1;
++#  endif
+ # endif
+     }
+     return ncpus;
diff --git a/www/seamonkey/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp b/www/seamonkey/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp
index 5ef68972b69..265311bf26b 100644
--- a/www/seamonkey/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp
+++ b/www/seamonkey/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_js_src_methodjit_MethodJIT.cpp,v 1.3 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_js_src_methodjit_MethodJIT.cpp,v 1.4 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/js/src/methodjit/MethodJIT.cpp.orig	2012-04-23 06:27:43.000000000 +0000
+--- mozilla/js/src/methodjit/MethodJIT.cpp.orig	2012-08-27 04:49:16.000000000 +0000
 +++ mozilla/js/src/methodjit/MethodJIT.cpp
-@@ -167,7 +167,7 @@ PopActiveVMFrame(VMFrame &f)
+@@ -135,7 +135,7 @@ PopActiveVMFrame(VMFrame &f)
  
  JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0);
  
diff --git a/www/seamonkey/patches/patch-mozilla_js_src_yarr_pcre_pcre.h b/www/seamonkey/patches/patch-mozilla_js_src_yarr_pcre_pcre.h
deleted file mode 100644
index b627bcac062..00000000000
--- a/www/seamonkey/patches/patch-mozilla_js_src_yarr_pcre_pcre.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-mozilla_js_src_yarr_pcre_pcre.h,v 1.3 2012/04/28 22:48:06 ryoon Exp $
-
---- mozilla/js/src/yarr/pcre/pcre.h.orig	2012-04-23 06:27:49.000000000 +0000
-+++ mozilla/js/src/yarr/pcre/pcre.h
-@@ -46,7 +46,9 @@ POSSIBILITY OF SUCH DAMAGE.
- #include "assembler/wtf/Platform.h"
- #include "jsstr.h"
- #include "jsprvtd.h"
-+#if ENABLE_ASSEMBLER
- #include "jstl.h"
-+#endif
- 
- typedef jschar UChar;
- typedef JSLinearString UString;
diff --git a/www/seamonkey/patches/patch-mozilla_js_xpconnect_src_Makefile.in b/www/seamonkey/patches/patch-mozilla_js_xpconnect_src_Makefile.in
deleted file mode 100644
index 4fb1d46fd47..00000000000
--- a/www/seamonkey/patches/patch-mozilla_js_xpconnect_src_Makefile.in
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-mozilla_js_xpconnect_src_Makefile.in,v 1.1 2012/06/14 11:27:34 ryoon Exp $
-
---- mozilla/js/xpconnect/src/Makefile.in.orig	2012-06-05 05:54:16.000000000 +0000
-+++ mozilla/js/xpconnect/src/Makefile.in
-@@ -151,7 +151,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quicks
- 	  -I$(topsrcdir)/xpcom/idl-parser \
- 	  $(srcdir)/qsgen.py \
- 	  --idlpath=$(DEPTH)/dist/idl \
--	  --cachedir=$(DEPTH)/xpcom/idl-parser \
-+	  --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- 	  --header-output dom_quickstubs.h \
- 	  --stub-output dom_quickstubs.cpp \
- 	  --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \
-@@ -172,7 +172,7 @@ dombindings_gen.h: $(srcdir)/dombindings
- 	  -I$(topsrcdir)/xpcom/idl-parser \
- 	  $(srcdir)/dombindingsgen.py \
- 	  --idlpath=$(DEPTH)/dist/idl \
--	  --cachedir=$(DEPTH)/xpcom/idl-parser \
-+	  --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- 	  --header-output dombindings_gen.h \
- 	  $(srcdir)/dombindings.conf
- 
-@@ -189,7 +189,7 @@ dombindings_gen.cpp: $(srcdir)/dombindin
- 	  -I$(topsrcdir)/xpcom/idl-parser \
- 	  $(srcdir)/dombindingsgen.py \
- 	  --idlpath=$(DEPTH)/dist/idl \
--	  --cachedir=$(DEPTH)/xpcom/idl-parser \
-+	  --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- 	  --stub-output dombindings_gen.cpp \
- 	  --makedepend-output $(MDDEPDIR)/dombindingsgen.pp \
- 	  $(srcdir)/dombindings.conf
-@@ -208,7 +208,7 @@ DictionaryHelpers.h: $(srcdir)/dictionar
- 	  -I$(topsrcdir)/xpcom/idl-parser \
- 	  $(srcdir)/dictionary_helper_gen.py \
- 	  -I $(DEPTH)/dist/idl \
--	  --cachedir=$(DEPTH)/xpcom/idl-parser \
-+	  --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- 	  --header-output DictionaryHelpers.h \
- 	  $(srcdir)/dictionary_helper_gen.conf
- 
-@@ -223,7 +223,7 @@ DictionaryHelpers.cpp: $(srcdir)/diction
- 	  -I$(topsrcdir)/xpcom/idl-parser \
- 	  $(srcdir)/dictionary_helper_gen.py \
- 	  -I $(DEPTH)/dist/idl \
--	  --cachedir=$(DEPTH)/xpcom/idl-parser \
-+	  --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- 	  --header-output DictionaryHelpers.h \
- 	  --stub-output DictionaryHelpers.cpp \
- 	  --makedepend-output $(MDDEPDIR)/dictionary_helper_gen.pp \
diff --git a/www/seamonkey/patches/patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c b/www/seamonkey/patches/patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c
index aacf2172944..fb2d4604e9f 100644
--- a/www/seamonkey/patches/patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c
+++ b/www/seamonkey/patches/patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c,v 1.1 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c,v 1.2 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/media/libsydneyaudio/src/sydney_audio_pulseaudio.c.orig	2012-04-23 06:28:07.000000000 +0000
+--- mozilla/media/libsydneyaudio/src/sydney_audio_pulseaudio.c.orig	2012-08-27 04:49:25.000000000 +0000
 +++ mozilla/media/libsydneyaudio/src/sydney_audio_pulseaudio.c
-@@ -29,7 +29,9 @@
+@@ -6,7 +6,9 @@
  #include <stdio.h>
  #include <string.h>
  #include <pthread.h>
diff --git a/www/seamonkey/patches/patch-mozilla_media_libvpx_vpx_config.h b/www/seamonkey/patches/patch-mozilla_media_libvpx_vpx_config.h
index 9b38894fa4c..e9f0839ad22 100644
--- a/www/seamonkey/patches/patch-mozilla_media_libvpx_vpx_config.h
+++ b/www/seamonkey/patches/patch-mozilla_media_libvpx_vpx_config.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_media_libvpx_vpx_config.h,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_media_libvpx_vpx_config.h,v 1.5 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/media/libvpx/vpx_config.h.orig	2012-04-23 06:28:07.000000000 +0000
+--- mozilla/media/libvpx/vpx_config.h.orig	2012-08-27 04:49:25.000000000 +0000
 +++ mozilla/media/libvpx/vpx_config.h
-@@ -12,12 +12,12 @@
+@@ -16,12 +16,12 @@
  /* 32 bit MacOS. */
  #include "vpx_config_x86-darwin9-gcc.h"
  
diff --git a/www/seamonkey/patches/patch-mozilla_media_libvpx_vpx_config_c.c b/www/seamonkey/patches/patch-mozilla_media_libvpx_vpx_config_c.c
index d8b8fda1912..c9547aa7809 100644
--- a/www/seamonkey/patches/patch-mozilla_media_libvpx_vpx_config_c.c
+++ b/www/seamonkey/patches/patch-mozilla_media_libvpx_vpx_config_c.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_media_libvpx_vpx_config_c.c,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_media_libvpx_vpx_config_c.c,v 1.5 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/media/libvpx/vpx_config_c.c.orig	2012-04-23 06:28:07.000000000 +0000
+--- mozilla/media/libvpx/vpx_config_c.c.orig	2012-08-27 04:49:25.000000000 +0000
 +++ mozilla/media/libvpx/vpx_config_c.c
-@@ -12,12 +12,12 @@
+@@ -15,12 +15,12 @@
  /* 32 bit MacOS. */
  #include "vpx_config_x86-darwin9-gcc.c"
  
diff --git a/www/seamonkey/patches/patch-mozilla_memory_mozalloc_mozalloc.cpp b/www/seamonkey/patches/patch-mozilla_memory_mozalloc_mozalloc.cpp
deleted file mode 100644
index af80654801e..00000000000
--- a/www/seamonkey/patches/patch-mozilla_memory_mozalloc_mozalloc.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-mozilla_memory_mozalloc_mozalloc.cpp,v 1.1 2012/07/19 17:33:29 ryoon Exp $
-
-* Fix build on NetBSD with mozilla-jemalloc option (functionality is not tested)
-
---- mozilla/memory/mozalloc/mozalloc.cpp.orig	2012-07-15 12:00:39.000000000 +0000
-+++ mozilla/memory/mozalloc/mozalloc.cpp
-@@ -243,7 +243,7 @@ moz_malloc_usable_size(void *ptr)
- 
- #if defined(XP_MACOSX)
-     return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID))
-+#elif (defined(MOZ_MEMORY) && !defined(__NetBSD__)) || (defined(XP_LINUX) && !defined(ANDROID))
-     // Android bionic libc doesn't have malloc_usable_size.
-     return malloc_usable_size(ptr);
- #elif defined(XP_WIN)
diff --git a/www/seamonkey/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp b/www/seamonkey/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp
index a86e8b43fbe..410be96b806 100644
--- a/www/seamonkey/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp
+++ b/www/seamonkey/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp
@@ -1,18 +1,21 @@
-$NetBSD: patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp,v 1.3 2012/07/19 17:33:29 ryoon Exp $
+$NetBSD: patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp,v 1.4 2012/09/06 12:08:52 ryoon Exp $
 
 * Fix build with gcc<4.5, for example, DragonFly 3.0.1.
   See https://bugzilla.mozilla.org/show_bug.cgi?id=621446
 
---- mozilla/netwerk/protocol/http/HttpChannelParent.cpp.orig	2012-07-17 18:35:20.000000000 +0000
+--- mozilla/netwerk/protocol/http/HttpChannelParent.cpp.orig	2012-08-27 04:49:27.000000000 +0000
 +++ mozilla/netwerk/protocol/http/HttpChannelParent.cpp
-@@ -340,6 +340,10 @@ HttpChannelParent::RecvUpdateAssociatedC
- // Compiling this with GCC <= 4.4 fails with an internal compiler error
- #pragma GCC optimize ("O0")
- #endif
+@@ -299,6 +299,13 @@ HttpChannelParent::RecvUpdateAssociatedC
+   return true;
+ }
+ 
++// Compiling with a version of GCC <= 4.4 fails with an internal compiler
++// error.
 +#if !defined(__GNUC__) || \
 +  (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
 +#pragma GCC optimize ("O0")
 +#endif
- 
++
  bool
  HttpChannelParent::RecvRedirect2Verify(const nsresult& result, 
+                                        const RequestHeaderTuples& changedHeaders)
diff --git a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg b/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg
deleted file mode 100644
index b40349a1a23..00000000000
--- a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg
+++ /dev/null
@@ -1,199 +0,0 @@
-$NetBSD: patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg,v 1.3 2012/04/28 22:48:06 ryoon Exp $
-
---- mozilla/nsprpub/pr/include/md/_dragonfly.cfg.orig	2012-04-27 17:20:00.000000000 +0000
-+++ mozilla/nsprpub/pr/include/md/_dragonfly.cfg
-@@ -0,0 +1,194 @@
-+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is the Netscape Portable Runtime (NSPR).
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998-2000
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#ifndef nspr_cpucfg___
-+#define nspr_cpucfg___
-+
-+#ifndef XP_UNIX
-+#define XP_UNIX
-+#endif
-+
-+#define PR_AF_INET6 28  /* same as AF_INET6 */
-+
-+#ifndef HAVE_LONG_LONG
-+#define HAVE_LONG_LONG
-+#endif
-+
-+#if defined(__i386__)
-+
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#undef	HAVE_ALIGNED_DOUBLES
-+#undef	HAVE_ALIGNED_LONGLONGS
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   4
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   4
-+#define PR_BYTES_PER_DWORD  8
-+#define PR_BYTES_PER_WORD_LOG2   2
-+#define PR_BYTES_PER_DWORD_LOG2  3
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    32
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    32
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   5
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   5
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    4
-+#define PR_ALIGN_OF_INT64   4
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  4
-+#define PR_ALIGN_OF_POINTER 4
-+
-+#elif defined(__amd64__)
-+
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#define	HAVE_ALIGNED_DOUBLES
-+#define	HAVE_ALIGNED_LONGLONGS
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+#define PR_BYTES_PER_WORD_LOG2   3
-+#define PR_BYTES_PER_DWORD_LOG2  3
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    8
-+#define PR_ALIGN_OF_INT64   8
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD    8
-+
-+#else
-+
-+#error "Unknown CPU architecture"
-+
-+#endif
-+
-+#ifndef NO_NSPR_10_SUPPORT
-+
-+#define BYTES_PER_BYTE		PR_BYTES_PER_BYTE
-+#define BYTES_PER_SHORT 	PR_BYTES_PER_SHORT
-+#define BYTES_PER_INT 		PR_BYTES_PER_INT
-+#define BYTES_PER_INT64		PR_BYTES_PER_INT64
-+#define BYTES_PER_LONG		PR_BYTES_PER_LONG
-+#define BYTES_PER_FLOAT		PR_BYTES_PER_FLOAT
-+#define BYTES_PER_DOUBLE	PR_BYTES_PER_DOUBLE
-+#define BYTES_PER_WORD		PR_BYTES_PER_WORD
-+#define BYTES_PER_DWORD		PR_BYTES_PER_DWORD
-+
-+#define BITS_PER_BYTE		PR_BITS_PER_BYTE
-+#define BITS_PER_SHORT		PR_BITS_PER_SHORT
-+#define BITS_PER_INT		PR_BITS_PER_INT
-+#define BITS_PER_INT64		PR_BITS_PER_INT64
-+#define BITS_PER_LONG		PR_BITS_PER_LONG
-+#define BITS_PER_FLOAT		PR_BITS_PER_FLOAT
-+#define BITS_PER_DOUBLE		PR_BITS_PER_DOUBLE
-+#define BITS_PER_WORD		PR_BITS_PER_WORD
-+
-+#define BITS_PER_BYTE_LOG2	PR_BITS_PER_BYTE_LOG2
-+#define BITS_PER_SHORT_LOG2	PR_BITS_PER_SHORT_LOG2
-+#define BITS_PER_INT_LOG2	PR_BITS_PER_INT_LOG2
-+#define BITS_PER_INT64_LOG2	PR_BITS_PER_INT64_LOG2
-+#define BITS_PER_LONG_LOG2	PR_BITS_PER_LONG_LOG2
-+#define BITS_PER_FLOAT_LOG2	PR_BITS_PER_FLOAT_LOG2
-+#define BITS_PER_DOUBLE_LOG2 	PR_BITS_PER_DOUBLE_LOG2
-+#define BITS_PER_WORD_LOG2	PR_BITS_PER_WORD_LOG2
-+
-+#define ALIGN_OF_SHORT		PR_ALIGN_OF_SHORT
-+#define ALIGN_OF_INT		PR_ALIGN_OF_INT
-+#define ALIGN_OF_LONG		PR_ALIGN_OF_LONG
-+#define ALIGN_OF_INT64		PR_ALIGN_OF_INT64
-+#define ALIGN_OF_FLOAT		PR_ALIGN_OF_FLOAT
-+#define ALIGN_OF_DOUBLE		PR_ALIGN_OF_DOUBLE
-+#define ALIGN_OF_POINTER	PR_ALIGN_OF_POINTER
-+#define ALIGN_OF_WORD		PR_ALIGN_OF_WORD
-+
-+#define BYTES_PER_WORD_LOG2	PR_BYTES_PER_WORD_LOG2
-+#define BYTES_PER_DWORD_LOG2	PR_BYTES_PER_DWORD_LOG2
-+#define WORDS_PER_DWORD_LOG2	PR_WORDS_PER_DWORD_LOG2
-+
-+#endif /* NO_NSPR_10_SUPPORT */
-+
-+#endif /* nspr_cpucfg___ */
diff --git a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md___pth.h b/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md___pth.h
deleted file mode 100644
index 4d3b1e640b8..00000000000
--- a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md___pth.h
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-mozilla_nsprpub_pr_include_md___pth.h,v 1.3 2012/04/28 22:48:06 ryoon Exp $
-
---- mozilla/nsprpub/pr/include/md/_pth.h.orig	2012-04-23 06:28:13.000000000 +0000
-+++ mozilla/nsprpub/pr/include/md/_pth.h
-@@ -146,7 +146,7 @@
- #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt)   (dt) = (st)
- #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \
- 	|| defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
--	|| defined(HPUX) || defined(FREEBSD) \
-+	|| defined(HPUX) || defined(FREEBSD) || defined(__DragonFly__) \
- 	|| defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \
- 	|| defined(NTO) || defined(DARWIN) \
- 	|| defined(UNIXWARE) || defined(RISCOS)	|| defined(SYMBIAN)
-@@ -237,7 +237,7 @@
- #endif /* defined(_PR_DCETHREADS) */
- 
- #elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
--	|| defined(FREEBSD) || defined(SYMBIAN)
-+	|| defined(FREEBSD) || defined(SYMBIAN) || defined(__DragonFly__)
- #define PT_PRIO_MIN            sched_get_priority_min(SCHED_OTHER)
- #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
- #elif defined(NTO)
-@@ -296,6 +296,7 @@ extern int (*_PT_aix_yield_fcn)();
- #elif defined(HPUX) || defined(SOLARIS) \
- 	|| defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
- 	|| defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-+	|| defined(__DragonFly__) \
- 	|| defined(BSDI) || defined(NTO) || defined(DARWIN) \
- 	|| defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN)
- #define _PT_PTHREAD_YIELD()            	sched_yield()
diff --git a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md_prosdep.h b/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md_prosdep.h
deleted file mode 100644
index 6b129994216..00000000000
--- a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_include_md_prosdep.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-mozilla_nsprpub_pr_include_md_prosdep.h,v 1.3 2012/04/28 22:48:07 ryoon Exp $
-
---- mozilla/nsprpub/pr/include/md/prosdep.h.orig	2012-04-23 06:28:13.000000000 +0000
-+++ mozilla/nsprpub/pr/include/md/prosdep.h
-@@ -66,7 +66,7 @@ PR_BEGIN_EXTERN_C
- #if defined(AIX)
- #include "md/_aix.h"
- 
--#elif defined(FREEBSD)
-+#elif defined(FREEBSD) || defined(__DragonFly__)
- #include "md/_freebsd.h"
- 
- #elif defined(NETBSD)
diff --git a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c b/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c
deleted file mode 100644
index 574e86bce0d..00000000000
--- a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c,v 1.3 2012/04/28 22:48:07 ryoon Exp $
-
---- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig	2012-04-23 06:28:14.000000000 +0000
-+++ mozilla/nsprpub/pr/src/md/unix/uxrng.c
-@@ -126,7 +126,7 @@ GetHighResClock(void *buf, size_t maxbyt
- 
- #elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \
-     || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD) \
--    || defined(SYMBIAN))
-+    || defined(SYMBIAN)) || defined(__DragonFly__)
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
diff --git a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptio.c b/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptio.c
deleted file mode 100644
index b91487134e9..00000000000
--- a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptio.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-mozilla_nsprpub_pr_src_pthreads_ptio.c,v 1.3 2012/04/28 22:48:07 ryoon Exp $
-
---- mozilla/nsprpub/pr/src/pthreads/ptio.c.orig	2012-04-23 06:28:14.000000000 +0000
-+++ mozilla/nsprpub/pr/src/pthreads/ptio.c
-@@ -212,7 +212,8 @@ static PRBool _pr_ipv6_v6only_on_by_defa
-     || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-     || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-     || defined(BSDI) || defined(NTO) || defined(DARWIN) \
--    || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN)
-+    || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN) \
-+    || defined(__DragonFly__)
- #define _PRSelectFdSetArg_t fd_set *
- #else
- #error "Cannot determine architecture"
-@@ -3286,7 +3287,7 @@ static PRIOMethods _pr_socketpollfd_meth
-     || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \
-     || defined(OPENBSD) || defined(BSDI) || defined(NTO) \
-     || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS) \
--    || defined(SYMBIAN)
-+    || defined(SYMBIAN) || defined(__DragonFly__)
- #define _PR_FCNTL_FLAGS O_NONBLOCK
- #else
- #error "Can't determine architecture"
diff --git a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c b/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c
deleted file mode 100644
index 4683e2d2c80..00000000000
--- a/www/seamonkey/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c,v 1.3 2012/04/28 22:48:07 ryoon Exp $
-
---- mozilla/nsprpub/pr/src/pthreads/ptsynch.c.orig	2012-04-23 06:28:14.000000000 +0000
-+++ mozilla/nsprpub/pr/src/pthreads/ptsynch.c
-@@ -842,7 +842,7 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphor
-  */
- #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \
-     || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI) \
--    || defined(DARWIN) || defined(SYMBIAN)
-+    || defined(DARWIN) || defined(SYMBIAN) || defined(__DragonFly__)
- /* union semun is defined by including <sys/sem.h> */
- #else
- /* according to X/OPEN we have to define it ourselves */
diff --git a/www/seamonkey/patches/patch-mozilla_storage_src_Makefile.in b/www/seamonkey/patches/patch-mozilla_storage_src_Makefile.in
index 7908d024471..2c9393b9bf9 100644
--- a/www/seamonkey/patches/patch-mozilla_storage_src_Makefile.in
+++ b/www/seamonkey/patches/patch-mozilla_storage_src_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_storage_src_Makefile.in,v 1.2 2012/07/19 17:33:29 ryoon Exp $
+$NetBSD: patch-mozilla_storage_src_Makefile.in,v 1.3 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/storage/src/Makefile.in.orig	2012-07-17 18:13:34.000000000 +0000
+--- mozilla/storage/src/Makefile.in.orig	2012-08-27 04:49:29.000000000 +0000
 +++ mozilla/storage/src/Makefile.in
-@@ -67,6 +67,22 @@ DEFINES += -DMOZ_STORAGE_MEMORY
+@@ -34,6 +34,22 @@ DEFINES += -DMOZ_STORAGE_MEMORY
  endif
  endif
  
diff --git a/www/seamonkey/patches/patch-mozilla_xpcom_Makefile.in b/www/seamonkey/patches/patch-mozilla_xpcom_Makefile.in
index 26788f5abec..498f4c93934 100644
--- a/www/seamonkey/patches/patch-mozilla_xpcom_Makefile.in
+++ b/www/seamonkey/patches/patch-mozilla_xpcom_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_xpcom_Makefile.in,v 1.3 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-mozilla_xpcom_Makefile.in,v 1.4 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/xpcom/Makefile.in.orig	2012-04-23 06:28:29.000000000 +0000
+--- mozilla/xpcom/Makefile.in.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xpcom/Makefile.in
-@@ -67,6 +67,10 @@ DIRS		+= windbgdlg
+@@ -35,6 +35,10 @@ DIRS		+= windbgdlg
  endif
  endif
  
diff --git a/www/seamonkey/patches/patch-mozilla_xpcom_idl-parser_Makefile.in b/www/seamonkey/patches/patch-mozilla_xpcom_idl-parser_Makefile.in
index 7574502749d..a9bdbbca680 100644
--- a/www/seamonkey/patches/patch-mozilla_xpcom_idl-parser_Makefile.in
+++ b/www/seamonkey/patches/patch-mozilla_xpcom_idl-parser_Makefile.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-mozilla_xpcom_idl-parser_Makefile.in,v 1.2 2012/07/19 17:33:29 ryoon Exp $
+$NetBSD: patch-mozilla_xpcom_idl-parser_Makefile.in,v 1.3 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/xpcom/idl-parser/Makefile.in.orig	2012-07-17 18:13:35.000000000 +0000
+--- mozilla/xpcom/idl-parser/Makefile.in.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xpcom/idl-parser/Makefile.in
-@@ -61,7 +61,7 @@ export:: $(PARSER_SRCS) $(PLY_PROGS)
+@@ -29,7 +29,7 @@ include $(topsrcdir)/config/rules.mk
+ export:: $(PARSER_SRCS) $(PLY_PROGS)
  	$(PYTHON_PATH) \
  	  $(PLY_INCLUDE) \
- 	  -I$(topsrcdir)/xpcom/idl-parser \
--	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen
-+	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen
+-	  $(srcdir)/header.py --cachedir=. --regen
++	  $(srcdir)/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen
  
  check::
  	$(PYTHON_PATH) \
diff --git a/www/seamonkey/patches/patch-mozilla_xpcom_idl-parser_header.py b/www/seamonkey/patches/patch-mozilla_xpcom_idl-parser_header.py
deleted file mode 100644
index f867d576b58..00000000000
--- a/www/seamonkey/patches/patch-mozilla_xpcom_idl-parser_header.py
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-mozilla_xpcom_idl-parser_header.py,v 1.5 2012/06/14 11:27:34 ryoon Exp $
-
---- mozilla/xpcom/idl-parser/header.py.orig	2012-06-05 05:54:27.000000000 +0000
-+++ mozilla/xpcom/idl-parser/header.py
-@@ -505,10 +505,9 @@ if __name__ == '__main__':
-             print >>sys.stderr, "--regen useless without --cachedir"
-         # Delete the lex/yacc files.  Ply is too stupid to regenerate them
-         # properly
--        deadfiles = os.path.join(options.cachedir, "*.py*")
--        for filename in glob.glob(deadfiles):
--            print filename
--            os.remove(filename)
-+	for fileglobs in [os.path.join(options.cachedir, f) for f in ["xpidllex.py*", "xpidlyacc.py*"]]:
-+	    for filename in glob.glob(fileglobs):
-+		os.remove(filename)
- 
-     # Instantiate the parser.
-     p = xpidl.IDLParser(outputdir=options.cachedir)
diff --git a/www/seamonkey/patches/patch-mozilla_xpcom_typelib_xpidl_Makefile.in b/www/seamonkey/patches/patch-mozilla_xpcom_typelib_xpidl_Makefile.in
index ae1e4901896..133bb7fe7a3 100644
--- a/www/seamonkey/patches/patch-mozilla_xpcom_typelib_xpidl_Makefile.in
+++ b/www/seamonkey/patches/patch-mozilla_xpcom_typelib_xpidl_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_xpcom_typelib_xpidl_Makefile.in,v 1.1 2012/06/14 11:27:34 ryoon Exp $
+$NetBSD: patch-mozilla_xpcom_typelib_xpidl_Makefile.in,v 1.2 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/xpcom/typelib/xpidl/Makefile.in.orig	2012-06-05 05:54:27.000000000 +0000
+--- mozilla/xpcom/typelib/xpidl/Makefile.in.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xpcom/typelib/xpidl/Makefile.in
-@@ -48,8 +48,8 @@ SDK_BINARY = \
+@@ -16,8 +16,8 @@ SDK_BINARY = \
    $(topsrcdir)/xpcom/idl-parser/xpidl.py \
    $(topsrcdir)/xpcom/idl-parser/header.py \
    $(topsrcdir)/xpcom/idl-parser/typelib.py \
diff --git a/www/seamonkey/patches/patch-mp b/www/seamonkey/patches/patch-mp
index 63283d2fe02..af5167e5dde 100644
--- a/www/seamonkey/patches/patch-mp
+++ b/www/seamonkey/patches/patch-mp
@@ -1,8 +1,8 @@
-$NetBSD: patch-mp,v 1.6 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-mp,v 1.7 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2012-04-23 06:28:07.000000000 +0000
+--- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2012-08-27 04:49:25.000000000 +0000
 +++ mozilla/media/libsydneyaudio/src/Makefile.in
-@@ -104,6 +104,12 @@ ifeq ($(OS_ARCH),WINNT)
+@@ -72,6 +72,12 @@ ifeq ($(OS_ARCH),WINNT)
  OS_LIBS += winmm.lib
  endif
  
diff --git a/www/seamonkey/patches/patch-pa b/www/seamonkey/patches/patch-pa
index 5564454a768..1dc85c70bd9 100644
--- a/www/seamonkey/patches/patch-pa
+++ b/www/seamonkey/patches/patch-pa
@@ -1,6 +1,6 @@
-$NetBSD: patch-pa,v 1.5 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-pa,v 1.6 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/xulrunner/installer/mozilla-js.pc.in.orig	2012-04-23 06:28:30.000000000 +0000
+--- mozilla/xulrunner/installer/mozilla-js.pc.in.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xulrunner/installer/mozilla-js.pc.in
 @@ -6,5 +6,5 @@ Name: JavaScript
  Description: The Mozilla JavaScript Library
diff --git a/www/seamonkey/patches/patch-pb b/www/seamonkey/patches/patch-pb
index 738b2ed7ba1..68b85d88e5a 100644
--- a/www/seamonkey/patches/patch-pb
+++ b/www/seamonkey/patches/patch-pb
@@ -1,6 +1,6 @@
-$NetBSD: patch-pb,v 1.5 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-pb,v 1.6 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/xulrunner/installer/libxul.pc.in.orig	2012-04-23 06:28:30.000000000 +0000
+--- mozilla/xulrunner/installer/libxul.pc.in.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xulrunner/installer/libxul.pc.in
 @@ -7,5 +7,5 @@ Name: libxul
  Description: The Mozilla Runtime and Embedding Engine
diff --git a/www/seamonkey/patches/patch-pc b/www/seamonkey/patches/patch-pc
index 4f6c6e4edff..753e4202dd0 100644
--- a/www/seamonkey/patches/patch-pc
+++ b/www/seamonkey/patches/patch-pc
@@ -1,6 +1,6 @@
-$NetBSD: patch-pc,v 1.5 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-pc,v 1.6 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/xulrunner/installer/libxul-embedding.pc.in.orig	2012-04-23 06:28:30.000000000 +0000
+--- mozilla/xulrunner/installer/libxul-embedding.pc.in.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xulrunner/installer/libxul-embedding.pc.in
 @@ -6,5 +6,6 @@ idldir=%idldir%
  Name: libxul-embedding
diff --git a/www/seamonkey/patches/patch-pd b/www/seamonkey/patches/patch-pd
index 7b88ee6161b..fa0a521286b 100644
--- a/www/seamonkey/patches/patch-pd
+++ b/www/seamonkey/patches/patch-pd
@@ -1,6 +1,6 @@
-$NetBSD: patch-pd,v 1.5 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-pd,v 1.6 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/xulrunner/installer/mozilla-nss.pc.in.orig	2012-04-23 06:28:30.000000000 +0000
+--- mozilla/xulrunner/installer/mozilla-nss.pc.in.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xulrunner/installer/mozilla-nss.pc.in
 @@ -6,5 +6,5 @@ Name: NSS
  Description: Mozilla Network Security Services
diff --git a/www/seamonkey/patches/patch-pg b/www/seamonkey/patches/patch-pg
index b72a6948b15..503d9c94434 100644
--- a/www/seamonkey/patches/patch-pg
+++ b/www/seamonkey/patches/patch-pg
@@ -1,6 +1,6 @@
-$NetBSD: patch-pg,v 1.5 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-pg,v 1.6 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/xulrunner/installer/mozilla-nspr.pc.in.orig	2012-04-23 06:28:30.000000000 +0000
+--- mozilla/xulrunner/installer/mozilla-nspr.pc.in.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xulrunner/installer/mozilla-nspr.pc.in
 @@ -5,7 +5,5 @@ includedir=%includedir%
  Name: NSPR
diff --git a/www/seamonkey/patches/patch-rc b/www/seamonkey/patches/patch-rc
index fed00f0da10..af594ed34c2 100644
--- a/www/seamonkey/patches/patch-rc
+++ b/www/seamonkey/patches/patch-rc
@@ -1,8 +1,11 @@
-$NetBSD: patch-rc,v 1.5 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-rc,v 1.6 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/browser/branding/unofficial/locales/en-US/brand.dtd.orig	2012-04-23 06:27:23.000000000 +0000
+--- mozilla/browser/branding/unofficial/locales/en-US/brand.dtd.orig	2012-08-27 04:49:03.000000000 +0000
 +++ mozilla/browser/branding/unofficial/locales/en-US/brand.dtd
-@@ -1,4 +1,4 @@
+@@ -2,7 +2,7 @@
+    - License, v. 2.0. If a copy of the MPL was not distributed with this
+    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+ 
 -<!ENTITY  brandShortName        "Mozilla Developer Preview">
 -<!ENTITY  brandFullName         "Mozilla Developer Preview">
 +<!ENTITY  brandShortName        "Browser">
diff --git a/www/seamonkey/patches/patch-security_nss_cmd_shlibsign_sign.sh b/www/seamonkey/patches/patch-security_nss_cmd_shlibsign_sign.sh
deleted file mode 100644
index 295f838d0a7..00000000000
--- a/www/seamonkey/patches/patch-security_nss_cmd_shlibsign_sign.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-security_nss_cmd_shlibsign_sign.sh,v 1.4 2012/04/28 22:48:07 ryoon Exp $
-
-This tries to dlopen libsoftokn3.so which is linked against sqlite3,
-so we need a directory containing libsqlite3.so in the search path,
-beside the directory containing libsoftokn3.so itself.
-
---- mozilla/security/nss/cmd/shlibsign/sign.sh.orig	2012-04-23 06:28:17.000000000 +0000
-+++ mozilla/security/nss/cmd/shlibsign/sign.sh
-@@ -26,7 +26,7 @@ WIN*)
-     export LIBPATH
-     SHLIB_PATH=${1}/lib:${4}:$SHLIB_PATH
-     export SHLIB_PATH
--    LD_LIBRARY_PATH=${1}/lib:${4}:$LD_LIBRARY_PATH
-+    LD_LIBRARY_PATH=${1}/lib:${4}:${PREFIX}/lib:$LD_LIBRARY_PATH
-     export LD_LIBRARY_PATH
-     DYLD_LIBRARY_PATH=${1}/lib:${4}:$DYLD_LIBRARY_PATH
-     export DYLD_LIBRARY_PATH
diff --git a/www/seamonkey/patches/patch-suite_installer_Makefile.in b/www/seamonkey/patches/patch-suite_installer_Makefile.in
index 20c20ccb9ec..d782d2cf275 100644
--- a/www/seamonkey/patches/patch-suite_installer_Makefile.in
+++ b/www/seamonkey/patches/patch-suite_installer_Makefile.in
@@ -1,10 +1,8 @@
-$NetBSD: patch-suite_installer_Makefile.in,v 1.1 2012/06/14 11:27:34 ryoon Exp $
+$NetBSD: patch-suite_installer_Makefile.in,v 1.2 2012/09/06 12:08:52 ryoon Exp $
 
-* Fix install failure
-
---- suite/installer/Makefile.in.orig	2012-06-05 05:50:28.000000000 +0000
+--- suite/installer/Makefile.in.orig	2012-08-27 04:44:26.000000000 +0000
 +++ suite/installer/Makefile.in
-@@ -49,7 +49,7 @@ MOZ_PKG_REMOVALS = $(srcdir)/removed-fil
+@@ -16,7 +16,7 @@ MOZ_PKG_REMOVALS = $(srcdir)/removed-fil
  MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
  # Be fatal, except when building with XULRunner which already bundles some files.
  ifndef SYSTEM_LIBXUL
diff --git a/www/seamonkey/patches/patch-suite_installer_package-manifest.in b/www/seamonkey/patches/patch-suite_installer_package-manifest.in
new file mode 100644
index 00000000000..62b24eb7c64
--- /dev/null
+++ b/www/seamonkey/patches/patch-suite_installer_package-manifest.in
@@ -0,0 +1,19 @@
+$NetBSD: patch-suite_installer_package-manifest.in,v 1.1 2012/09/06 12:08:52 ryoon Exp $
+
+--- suite/installer/package-manifest.in.orig	2012-08-27 04:44:26.000000000 +0000
++++ suite/installer/package-manifest.in
+@@ -839,14 +839,11 @@ bin/libfreebl_32int64_3.so
+ @BINPATH@/extensions/inspector@mozilla.org/chrome.manifest
+ @BINPATH@/extensions/inspector@mozilla.org/chrome/inspector@JAREXT@
+ #ifdef MOZ_GTK2
+-@BINPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain16.xpm
+-@BINPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain.xpm
+ #elifdef XP_WIN32
+ @BINPATH@/extensions/inspector@mozilla.org/platform/WINNT/chrome/icons/default/winInspectorMain.ico
+ #elifdef XP_OS2
+ @BINPATH@/extensions/inspector@mozilla.org/platform/OS2/chrome/icons/default/winInspectorMain.ico
+ #endif
+-@BINPATH@/extensions/inspector@mozilla.org/components/components.list
+ @BINPATH@/extensions/inspector@mozilla.org/components/inspector-cmdline.js
+ @BINPATH@/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
+ #endif
diff --git a/www/seamonkey/patches/patch-toolkit_toolkit-tiers.mk b/www/seamonkey/patches/patch-toolkit_toolkit-tiers.mk
index dd181fb4a9b..a10b1122580 100644
--- a/www/seamonkey/patches/patch-toolkit_toolkit-tiers.mk
+++ b/www/seamonkey/patches/patch-toolkit_toolkit-tiers.mk
@@ -1,8 +1,8 @@
-$NetBSD: patch-toolkit_toolkit-tiers.mk,v 1.4 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-toolkit_toolkit-tiers.mk,v 1.5 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/toolkit/toolkit-tiers.mk.orig	2012-04-23 06:28:28.000000000 +0000
+--- mozilla/toolkit/toolkit-tiers.mk.orig	2012-08-27 04:49:32.000000000 +0000
 +++ mozilla/toolkit/toolkit-tiers.mk
-@@ -80,7 +80,7 @@ ifdef MOZ_UPDATER
+@@ -47,7 +47,7 @@ ifdef MOZ_UPDATER
  ifndef MOZ_NATIVE_BZ2
  tier_platform_dirs += modules/libbz2
  endif
diff --git a/www/seamonkey/patches/patch-xa b/www/seamonkey/patches/patch-xa
index 861b4a29580..56da0e3eeb1 100644
--- a/www/seamonkey/patches/patch-xa
+++ b/www/seamonkey/patches/patch-xa
@@ -1,8 +1,8 @@
-$NetBSD: patch-xa,v 1.4 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-xa,v 1.5 2012/09/06 12:08:52 ryoon Exp $
 
 NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_netbsd.s.orig	2012-04-27 17:20:00.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_netbsd.s.orig	2012-09-02 13:39:16.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_netbsd.s
 @@ -0,0 +1,112 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
diff --git a/www/seamonkey/patches/patch-xb b/www/seamonkey/patches/patch-xb
index 005ce566045..9b3c967ce21 100644
--- a/www/seamonkey/patches/patch-xb
+++ b/www/seamonkey/patches/patch-xb
@@ -1,8 +1,8 @@
-$NetBSD: patch-xb,v 1.4 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-xb,v 1.5 2012/09/06 12:08:52 ryoon Exp $
 
 NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_netbsd.cpp.orig	2012-04-27 17:20:00.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_netbsd.cpp.orig	2012-09-02 13:39:16.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_netbsd.cpp
 @@ -0,0 +1,84 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
diff --git a/www/seamonkey/patches/patch-xc b/www/seamonkey/patches/patch-xc
index 70202b555a5..3d13a9b75ed 100644
--- a/www/seamonkey/patches/patch-xc
+++ b/www/seamonkey/patches/patch-xc
@@ -1,8 +1,8 @@
-$NetBSD: patch-xc,v 1.4 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-xc,v 1.5 2012/09/06 12:08:52 ryoon Exp $
 
 NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_netbsd.s.orig	2012-04-27 17:20:00.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_netbsd.s.orig	2012-09-02 13:39:17.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_netbsd.s
 @@ -0,0 +1,66 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
diff --git a/www/seamonkey/patches/patch-xd b/www/seamonkey/patches/patch-xd
index 809091bbece..ffd0ccdc010 100644
--- a/www/seamonkey/patches/patch-xd
+++ b/www/seamonkey/patches/patch-xd
@@ -1,8 +1,8 @@
-$NetBSD: patch-xd,v 1.4 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-xd,v 1.5 2012/09/06 12:08:52 ryoon Exp $
 
 NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_netbsd.cpp.orig	2012-04-27 17:20:00.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_netbsd.cpp.orig	2012-09-02 13:39:17.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_netbsd.cpp
 @@ -0,0 +1,119 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
diff --git a/www/seamonkey/patches/patch-xe b/www/seamonkey/patches/patch-xe
index 982fddd7932..26e548673b1 100644
--- a/www/seamonkey/patches/patch-xe
+++ b/www/seamonkey/patches/patch-xe
@@ -1,10 +1,10 @@
-$NetBSD: patch-xe,v 1.4 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-xe,v 1.5 2012/09/06 12:08:52 ryoon Exp $
 
 NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ad.
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig	2012-04-23 06:28:29.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
-@@ -132,6 +132,15 @@ extern "C" {
+@@ -100,6 +100,15 @@ extern "C" {
      }
  }
  
@@ -20,7 +20,7 @@ NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ad.
  XPTC_PUBLIC_API(nsresult)
  XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
                     PRUint32 paramCount, nsXPTCVariant* params)
-@@ -139,30 +148,30 @@ XPTC_InvokeByIndex(nsISupports* that, PR
+@@ -107,30 +116,30 @@ XPTC_InvokeByIndex(nsISupports* that, PR
      PRUint32 result;
  
   __asm__ __volatile__(
diff --git a/www/seamonkey/patches/patch-xf b/www/seamonkey/patches/patch-xf
index 0daeba583c1..0a44056fd9e 100644
--- a/www/seamonkey/patches/patch-xf
+++ b/www/seamonkey/patches/patch-xf
@@ -1,10 +1,10 @@
-$NetBSD: patch-xf,v 1.4 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-xf,v 1.5 2012/09/06 12:08:52 ryoon Exp $
 
 NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ae.
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig	2012-04-23 06:28:29.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
-@@ -123,17 +123,27 @@ extern "C" {
+@@ -91,17 +91,27 @@ extern "C" {
      }
  }
  
diff --git a/www/seamonkey/patches/patch-xg b/www/seamonkey/patches/patch-xg
index 3c8bc6aeb9d..48aec9b0cdd 100644
--- a/www/seamonkey/patches/patch-xg
+++ b/www/seamonkey/patches/patch-xg
@@ -1,10 +1,10 @@
-$NetBSD: patch-xg,v 1.5 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-xg,v 1.6 2012/09/06 12:08:52 ryoon Exp $
 
 NetBSD/arm xptcall support code. From pkgsrc/www/firefox/patch-bm.
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp.orig	2012-04-23 06:28:29.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp
-@@ -118,18 +118,23 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -86,18 +86,23 @@ PrepareAndDispatch(nsXPTCStubBase* self,
   * so they are contiguous with values passed on the stack, and then calls
   * PrepareAndDispatch() to do the dirty work.
   */
diff --git a/www/seamonkey/patches/patch-xj b/www/seamonkey/patches/patch-xj
index ef4ce50ccd3..a192399eaa6 100644
--- a/www/seamonkey/patches/patch-xj
+++ b/www/seamonkey/patches/patch-xj
@@ -1,10 +1,10 @@
-$NetBSD: patch-xj,v 1.4 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-xj,v 1.5 2012/09/06 12:08:52 ryoon Exp $
 
 NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig	2012-04-23 06:28:29.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
-@@ -41,6 +41,7 @@
+@@ -6,6 +6,7 @@
  // Implement shared vtbl methods.
  
  #include "xptcprivate.h"
@@ -12,7 +12,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
  
  // The Linux/PPC ABI (aka PPC/SYSV ABI) passes the first 8 integral
  // parameters and the first 8 floating point parameters in registers
-@@ -71,7 +72,6 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -36,7 +37,6 @@ PrepareAndDispatch(nsXPTCStubBase* self,
  {
      nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
      nsXPTCMiniVariant* dispatchParams = NULL;
@@ -20,7 +20,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
      const nsXPTMethodInfo* info;
      PRUint32 paramCount;
      PRUint32 i;
-@@ -79,12 +79,7 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -44,12 +44,7 @@ PrepareAndDispatch(nsXPTCStubBase* self,
  
      NS_ASSERTION(self,"no self");
  
@@ -34,7 +34,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
      NS_ASSERTION(info,"no method info");
      if (! info)
          return NS_ERROR_UNEXPECTED;
-@@ -119,8 +114,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -84,8 +79,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
                  if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack
                  dp->val.d = *(double*) ap;
                  ap += 2;
@@ -45,7 +45,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
              }
              continue;
          }
-@@ -130,8 +127,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -95,8 +92,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
              else {
                  dp->val.f = *(float*) ap;
  		ap += 1;
@@ -56,7 +56,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
              }
              continue;
          }
-@@ -179,9 +178,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -144,9 +143,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
          }
      }
  
@@ -69,7 +69,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
  
      if (dispatchParams != paramBuffer)
          delete [] dispatchParams;
-@@ -195,7 +194,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -160,7 +159,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
  // however, it's quick, dirty, and'll break when the ABI changes on
  // us, which is what we want ;-).
  
@@ -80,7 +80,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
  __asm__ (                                                   \
          ".section \".text\" \n\t"                           \
          ".align 2 \n\t"                                     \
-@@ -206,6 +207,46 @@ __asm__ (                               
+@@ -171,6 +172,46 @@ __asm__ (                               
  	"li     11,"#n" \n\t"                               \
  	"b      SharedStub@local \n"                        \
  );
diff --git a/www/seamonkey/patches/patch-xk b/www/seamonkey/patches/patch-xk
index f4a6468ab43..5742f314b6a 100644
--- a/www/seamonkey/patches/patch-xk
+++ b/www/seamonkey/patches/patch-xk
@@ -1,94 +1,10 @@
-$NetBSD: patch-xk,v 1.4 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-xk,v 1.5 2012/09/06 12:08:52 ryoon Exp $
 
 NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig	2012-04-23 06:28:29.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s
-@@ -1,43 +1,43 @@
--# -*- Mode: Asm -*-
--#
--# ***** BEGIN LICENSE BLOCK *****
--# Version: MPL 1.1/GPL 2.0/LGPL 2.1
--#
--# The contents of this file are subject to the Mozilla Public License Version
--# 1.1 (the "License"); you may not use this file except in compliance with
--# the License. You may obtain a copy of the License at
--# http://www.mozilla.org/MPL/
--#
--# Software distributed under the License is distributed on an "AS IS" basis,
--# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
--# for the specific language governing rights and limitations under the
--# License.
--#
--# The Original Code is mozilla.org code.
--#
--# The Initial Developer of the Original Code is
--# Netscape Communications Corporation.
--# Portions created by the Initial Developer are Copyright (C) 1999
--# the Initial Developer. All Rights Reserved.
--#
--# Contributor(s):
--#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
--#   beard@netscape.com (Patrick Beard)
--#   waterson@netscape.com (Chris Waterson)
--#
--# Alternatively, the contents of this file may be used under the terms of
--# either the GNU General Public License Version 2 or later (the "GPL"), or
--# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
--# in which case the provisions of the GPL or the LGPL are applicable instead
--# of those above. If you wish to allow use of your version of this file only
--# under the terms of either the GPL or the LGPL, and not to allow others to
--# use your version of this file under the terms of the MPL, indicate your
--# decision by deleting the provisions above and replace them with the notice
--# and other provisions required by the GPL or the LGPL. If you do not delete
--# the provisions above, a recipient may use your version of this file under
--# the terms of any one of the MPL, the GPL or the LGPL.
--#
--# ***** END LICENSE BLOCK *****
-+// -*- Mode: Asm -*-
-+//
-+// ***** BEGIN LICENSE BLOCK *****
-+// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+//
-+// The contents of this file are subject to the Mozilla Public License Version
-+// 1.1 (the "License"); you may not use this file except in compliance with
-+// the License. You may obtain a copy of the License at
-+// http://www.mozilla.org/MPL/
-+//
-+// Software distributed under the License is distributed on an "AS IS" basis,
-+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+// for the specific language governing rights and limitations under the
-+// License.
-+//
-+// The Original Code is mozilla.org code.
-+//
-+// The Initial Developer of the Original Code is
-+// Netscape Communications Corporation.
-+// Portions created by the Initial Developer are Copyright (C) 1999
-+// the Initial Developer. All Rights Reserved.
-+//
-+// Contributor(s):
-+//   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+//   beard@netscape.com (Patrick Beard)
-+//   waterson@netscape.com (Chris Waterson)
-+//
-+// Alternatively, the contents of this file may be used under the terms of
-+// either the GNU General Public License Version 2 or later (the "GPL"), or
-+// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+// in which case the provisions of the GPL or the LGPL are applicable instead
-+// of those above. If you wish to allow use of your version of this file only
-+// under the terms of either the GPL or the LGPL, and not to allow others to
-+// use your version of this file under the terms of the MPL, indicate your
-+// decision by deleting the provisions above and replace them with the notice
-+// and other provisions required by the GPL or the LGPL. If you do not delete
-+// the provisions above, a recipient may use your version of this file under
-+// the terms of any one of the MPL, the GPL or the LGPL.
-+//
-+// ***** END LICENSE BLOCK *****
- 
- .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
- .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-@@ -60,23 +60,23 @@
+@@ -25,23 +25,23 @@
  	.type  SharedStub,@function
  
  SharedStub:
@@ -122,7 +38,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
  	stfd	f2,48(sp)
  	stfd	f3,56(sp)
  	stfd	f4,64(sp)
-@@ -85,21 +85,21 @@ SharedStub:
+@@ -50,21 +50,21 @@ SharedStub:
  	stfd	f7,88(sp)
  	stfd	f8,96(sp)
  
diff --git a/www/seamonkey/patches/patch-xl b/www/seamonkey/patches/patch-xl
index 91bad4608c0..0b29bd399ac 100644
--- a/www/seamonkey/patches/patch-xl
+++ b/www/seamonkey/patches/patch-xl
@@ -1,94 +1,10 @@
-$NetBSD: patch-xl,v 1.4 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-xl,v 1.5 2012/09/06 12:08:52 ryoon Exp $
 
 NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig	2012-04-23 06:28:29.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s
-@@ -1,43 +1,43 @@
--# -*- Mode: Asm -*-
--#
--# ***** BEGIN LICENSE BLOCK *****
--# Version: MPL 1.1/GPL 2.0/LGPL 2.1
--#
--# The contents of this file are subject to the Mozilla Public License Version
--# 1.1 (the "License"); you may not use this file except in compliance with
--# the License. You may obtain a copy of the License at
--# http://www.mozilla.org/MPL/
--#
--# Software distributed under the License is distributed on an "AS IS" basis,
--# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
--# for the specific language governing rights and limitations under the
--# License.
--#
--# The Original Code is mozilla.org code.
--#
--# The Initial Developer of the Original Code is
--# Netscape Communications Corporation.
--# Portions created by the Initial Developer are Copyright (C) 1999
--# the Initial Developer. All Rights Reserved.
--#
--# Contributor(s):
--#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
--#   beard@netscape.com (Patrick Beard)
--#   waterson@netscape.com (Chris Waterson)
--#
--# Alternatively, the contents of this file may be used under the terms of
--# either the GNU General Public License Version 2 or later (the "GPL"), or
--# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
--# in which case the provisions of the GPL or the LGPL are applicable instead
--# of those above. If you wish to allow use of your version of this file only
--# under the terms of either the GPL or the LGPL, and not to allow others to
--# use your version of this file under the terms of the MPL, indicate your
--# decision by deleting the provisions above and replace them with the notice
--# and other provisions required by the GPL or the LGPL. If you do not delete
--# the provisions above, a recipient may use your version of this file under
--# the terms of any one of the MPL, the GPL or the LGPL.
--#
--# ***** END LICENSE BLOCK *****
-+// -*- Mode: Asm -*-
-+//
-+// ***** BEGIN LICENSE BLOCK *****
-+// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+//
-+// The contents of this file are subject to the Mozilla Public License Version
-+// 1.1 (the "License"); you may not use this file except in compliance with
-+// the License. You may obtain a copy of the License at
-+// http://www.mozilla.org/MPL/
-+//
-+// Software distributed under the License is distributed on an "AS IS" basis,
-+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+// for the specific language governing rights and limitations under the
-+// License.
-+//
-+// The Original Code is mozilla.org code.
-+//
-+// The Initial Developer of the Original Code is
-+// Netscape Communications Corporation.
-+// Portions created by the Initial Developer are Copyright (C) 1999
-+// the Initial Developer. All Rights Reserved.
-+//
-+// Contributor(s):
-+//   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+//   beard@netscape.com (Patrick Beard)
-+//   waterson@netscape.com (Chris Waterson)
-+//
-+// Alternatively, the contents of this file may be used under the terms of
-+// either the GNU General Public License Version 2 or later (the "GPL"), or
-+// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+// in which case the provisions of the GPL or the LGPL are applicable instead
-+// of those above. If you wish to allow use of your version of this file only
-+// under the terms of either the GPL or the LGPL, and not to allow others to
-+// use your version of this file under the terms of the MPL, indicate your
-+// decision by deleting the provisions above and replace them with the notice
-+// and other provisions required by the GPL or the LGPL. If you do not delete
-+// the provisions above, a recipient may use your version of this file under
-+// the terms of any one of the MPL, the GPL or the LGPL.
-+//
-+// ***** END LICENSE BLOCK *****
- .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
- .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
- .set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
-@@ -55,41 +55,41 @@
+@@ -20,41 +20,41 @@
  		      
          .section ".text"
  	.align 2
@@ -155,7 +71,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
  	lfd     f2,40(r30)   
  	lfd     f3,48(r30)  
  	lfd     f4,56(r30)  
-@@ -98,18 +98,13 @@ XPTC_InvokeByIndex:
+@@ -63,18 +63,13 @@ XPTC_InvokeByIndex:
  	lfd     f7,80(r30)  
  	lfd     f8,88(r30)
  
@@ -180,7 +96,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
  	lwz     r5,8(r30)   
  	lwz     r6,12(r30)  
  	lwz     r7,16(r30)  
-@@ -117,13 +112,13 @@ XPTC_InvokeByIndex:
+@@ -82,13 +77,13 @@ XPTC_InvokeByIndex:
  	lwz     r9,24(r30)  
  	lwz     r10,28(r30)
  
diff --git a/www/seamonkey/patches/patch-xm b/www/seamonkey/patches/patch-xm
deleted file mode 100644
index 012606db860..00000000000
--- a/www/seamonkey/patches/patch-xm
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-xm,v 1.4 2012/04/28 22:48:07 ryoon Exp $
-
-NetBSD/ppc xptcall support code. Originally from pkgsrc/www/mozilla.
-
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig	2012-04-23 06:28:29.000000000 +0000
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
-@@ -40,9 +40,9 @@
- 
- // Platform specific code to invoke XPCOM methods on native objects
- 
--// The purpose of XPTC_InvokeByIndex() is to map a platform
-+// The purpose of NS_InvokeByIndex_P() is to map a platform
- // indepenpent call to the platform ABI. To do that,
--// XPTC_InvokeByIndex() has to determine the method to call via vtable
-+// NS_InvokeByIndex_P() has to determine the method to call via vtable
- // access. The parameters for the method are read from the
- // nsXPTCVariant* and prepared for the native ABI.  For the Linux/PPC
- // ABI this means that the first 8 integral and floating point
-@@ -104,8 +104,10 @@ invoke_copy_to_stack(PRUint32* d,
-                 if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack
-                 *((double*) d) = s->val.d;
-                 d += 2;
-+#if __GXX_ABI_VERSION < 100
- 		if (gpr < GPR_COUNT)
- 		    gpr += 2;
-+#endif
-             }
-         }
-         else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-@@ -114,8 +116,10 @@ invoke_copy_to_stack(PRUint32* d,
-             else {
-                 *((float*) d) = s->val.f;
- 		d += 1;
-+#if __GXX_ABI_VERSION < 100
- 		if (gpr < GPR_COUNT)
- 		    gpr += 1;
-+#endif
- 	    }
-         }
-         else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64
-@@ -142,6 +146,6 @@ invoke_copy_to_stack(PRUint32* d,
- }
- 
- extern "C"
--XPTC_PUBLIC_API(nsresult)
--XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+EXPORT_XPCOM_API(nsresult)
-+NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
-                    PRUint32 paramCount, nsXPTCVariant* params);
diff --git a/www/seamonkey/patches/patch-xn b/www/seamonkey/patches/patch-xn
index 92d70af08e4..d0aab066afe 100644
--- a/www/seamonkey/patches/patch-xn
+++ b/www/seamonkey/patches/patch-xn
@@ -1,53 +1,52 @@
-$NetBSD: patch-xn,v 1.4 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-xn,v 1.5 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s.orig	2012-04-23 06:28:29.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s
-@@ -42,8 +42,46 @@
+@@ -16,6 +16,47 @@
+ #include <sys/asm.h>
+ #endif
  
- /* This code is for MIPS using the O32 ABI. */
- 
--#include <sys/regdef.h>
--#include <sys/asm.h>
 +#ifdef __NetBSD__
 +# include <machine/regdef.h>
 +# include <machine/asm.h>
 +# ifndef fp
-+#  define	fp	s8
++#  define      fp      s8
 +# endif
 +# ifndef PTRLOG
 +#  if SZREG == 4
-+#   define	PTRLOG	2
++#   define     PTRLOG  2
 +#  else
-+#   define	PTRLOG	3
++#   define     PTRLOG  3
 +#  endif
 +# endif
 +# ifndef SETUP_GP
 +#  if defined(__mips_o32)
-+#   define	SETUP_GP	\
-+		.set push;	\
-+		.set noreorder;	\
-+		.cpload t9;	\
-+		.set pop
-+#   define	SAVE_GP(x)	\
-+		.cprestore x
++#   define     SETUP_GP        \
++               .set push;      \
++               .set noreorder; \
++               .cpload t9;     \
++               .set pop
++#   define     SAVE_GP(x)      \
++               .cprestore x
 +#  else
-+#   define	SETUP_GP
-+#   define	SAVE_GP(x)
++#   define     SETUP_GP
++#   define     SAVE_GP(x)
 +#  endif
 +# endif
 +# ifndef ALSZ
 +#  if defined(__mips_n32) || defined(__mips_n64)
-+#   define	ALSZ	15
-+#   define	ALMASK	~15
++#   define     ALSZ    15
++#   define     ALMASK  ~15
 +#  else
-+#   define	ALSZ	7
-+#   define	ALMASK	~7
++#   define     ALSZ    7
++#   define     ALMASK  ~7
 +#  endif
 +# endif
 +#else
 +# include <sys/regdef.h>
 +# include <sys/asm.h>
 +#endif
- 
++
  # NARGSAVE is the argument space in the callers frame, including extra
  # 'shadowed' space for the argument registers. The minimum of 4
+ # argument slots is sometimes predefined in the header files.
diff --git a/www/seamonkey/patches/patch-xo b/www/seamonkey/patches/patch-xo
index d7e67b27d46..94954879241 100644
--- a/www/seamonkey/patches/patch-xo
+++ b/www/seamonkey/patches/patch-xo
@@ -1,53 +1,52 @@
-$NetBSD: patch-xo,v 1.4 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-xo,v 1.5 2012/09/06 12:08:52 ryoon Exp $
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.orig	2012-04-23 06:28:29.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.orig	2012-08-27 04:49:34.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s
-@@ -26,8 +26,46 @@
+@@ -14,6 +14,47 @@
+ #include <sys/asm.h>
+ #endif
  
- /* This code is for MIPS using the O32 ABI. */
- 
--#include <sys/regdef.h>
--#include <sys/asm.h>
 +#ifdef __NetBSD__
 +# include <machine/regdef.h>
 +# include <machine/asm.h>
 +# ifndef fp
-+#  define	fp	s8
++#  define      fp      s8
 +# endif
 +# ifndef PTRLOG
 +#  if SZREG == 4
-+#   define	PTRLOG	2
++#   define     PTRLOG  2
 +#  else
-+#   define	PTRLOG	3
++#   define     PTRLOG  3
 +#  endif
 +# endif
 +# ifndef SETUP_GP
 +#  if defined(__mips_o32)
-+#   define	SETUP_GP	\
-+		.set push;	\
-+		.set noreorder;	\
-+		.cpload t9;	\
-+		.set pop
-+#   define	SAVE_GP(x)	\
-+		.cprestore x
++#   define     SETUP_GP        \
++               .set push;      \
++               .set noreorder; \
++               .cpload t9;     \
++               .set pop
++#   define     SAVE_GP(x)      \
++               .cprestore x
 +#  else
-+#   define	SETUP_GP
-+#   define	SAVE_GP(x)
++#   define     SETUP_GP
++#   define     SAVE_GP(x)
 +#  endif
 +# endif
 +# ifndef ALSZ
 +#  if defined(__mips_n32) || defined(__mips_n64)
-+#   define	ALSZ	15
-+#   define	ALMASK	~15
++#   define     ALSZ    15
++#   define     ALMASK  ~15
 +#  else
-+#   define	ALSZ	7
-+#   define	ALMASK	~7
++#   define     ALSZ    7
++#   define     ALMASK  ~7
 +#  endif
 +# endif
 +#else
 +# include <sys/regdef.h>
 +# include <sys/asm.h>
 +#endif
- 
++
  # NARGSAVE is the argument space in the callers frame, including extra
  # 'shadowed' space for the argument registers. The minimum of 4
+ # argument slots is sometimes predefined in the header files.
diff --git a/www/seamonkey/patches/patch-za b/www/seamonkey/patches/patch-za
deleted file mode 100644
index a3eb932c163..00000000000
--- a/www/seamonkey/patches/patch-za
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-za,v 1.7 2012/06/14 11:27:34 ryoon Exp $
-
---- suite/app/Makefile.in.orig	2012-06-05 05:50:28.000000000 +0000
-+++ suite/app/Makefile.in
-@@ -236,6 +236,10 @@ libs::
- 
- endif
- 
-+ifeq ($(OS_ARCH),NetBSD)
-+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
-+endif
-+
- ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
- # Anything below the above ifdef won't be included in mac builds. So be very
- # careful what you add here.
author	ryoon <ryoon@pkgsrc.org>	2012-09-06 12:08:50 +0000
committer	ryoon <ryoon@pkgsrc.org>	2012-09-06 12:08:50 +0000
commit	b39190ba4cb82692a651c9bb50b6c2084edc9dd1 (patch)
tree	df2006c379778028c1badfa17c2096231017bb4c /www/seamonkey/patches
parent	7d890f0b75eeecaf49645a757930580f0f787faf (diff)
download	pkgsrc-b39190ba4cb82692a651c9bb50b6c2084edc9dd1.tar.gz