Update to 12.0

* Remove unused option. * Update enigmail to 1.4.1 Changelog: * Global Search results now include message extracts in the results * Various security fixes * Various improvements to RSS feed subscription and general feed handling * Thunderbird now supports add-ons that provide different types of local mail storage
author: ryoon <ryoon@pkgsrc.org> 2012-04-28 16:56:58 +0000
committer: ryoon <ryoon@pkgsrc.org> 2012-04-28 16:56:58 +0000
commit: 36c61d43ad661838e2bad6105554727b4a0811de (patch)
tree: 075cd2b5b778a02dff5ed7eceecdd5bb9627aadd /mail/thunderbird/patches
parent: 1a87cc2f0a8a23082b22224dff1bf475e37c30fa (diff)
download: pkgsrc-36c61d43ad661838e2bad6105554727b4a0811de.tar.gz
113 files changed, 380 insertions, 372 deletions
diff --git a/mail/thunderbird/patches/patch-aa b/mail/thunderbird/patches/patch-aa
index 1a5cc230cf8..79c6a7174ec 100644
--- a/mail/thunderbird/patches/patch-aa
+++ b/mail/thunderbird/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-aa,v 1.11 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/configure.in.orig	2012-02-16 10:24:47.000000000 +0000
+--- mozilla/configure.in.orig	2012-04-20 22:39:56.000000000 +0000
 +++ mozilla/configure.in
-@@ -2328,7 +2328,7 @@ case "$target" in
+@@ -2413,7 +2413,7 @@ case "$target" in
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.10 2012/03/10 11:42:38 ryoon Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -2336,6 +2336,9 @@ case "$target" in
+@@ -2421,6 +2421,9 @@ case "$target" in
      if test ! "$GNU_CC"; then
  	DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
      fi
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.10 2012/03/10 11:42:38 ryoon Exp $
      ;;
  
  ia64*-hpux*)
-@@ -3377,6 +3380,9 @@ dnl ====================================
+@@ -3412,6 +3415,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.10 2012/03/10 11:42:38 ryoon Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -4330,6 +4336,14 @@ if test -n "$YASM"; then
+@@ -4358,6 +4364,14 @@ if test -n "$YASM"; then
    _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
  fi
  
@@ -46,43 +46,7 @@ $NetBSD: patch-aa,v 1.10 2012/03/10 11:42:38 ryoon Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -5616,20 +5630,20 @@ if test -n "$MOZ_WEBM"; then
-                      [MOZ_NATIVE_LIBVPX_DEC_TEST=1],
-                      ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found]))
-         if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then
--            AC_MSG_CHECKING([for libvpx version >= v0.9.7])
--            dnl We need at least v0.9.7 to fix several crash bugs (for which we
--            dnl had local patches prior to v0.9.7).
-+            AC_MSG_CHECKING([for libvpx version >= v1.0.0])
-+            dnl We need at least v1.0.0 to fix several crash bugs (for which we
-+            dnl had local patches prior to v1.0.0).
-             dnl
-             dnl This is a terrible test for the library version, but we don't
-             dnl have a good one. There is no version number in a public header,
-             dnl and testing the headers still doesn't guarantee we link against
-             dnl the right version. While we could call vpx_codec_version() at
-             dnl run-time, that would break cross-compiling. There are no
--            dnl additional exported symbols between the v0.9.7 release and the
--            dnl v0.9.6 one to check for.
-+            dnl additional exported decoder symbols between the v1.0.0 release
-+            dnl and the v0.9.7 one to check for.
-             AC_TRY_COMPILE([
-                 #include <vpx/vpx_decoder.h>
--                #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
-+                #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
-                     #error "test failed."
-                 #endif
-                 ],
-@@ -5639,7 +5653,7 @@ if test -n "$MOZ_WEBM"; then
-                  MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include"
-                  MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"],
-                 [AC_MSG_RESULT([no])
--                 AC_MSG_ERROR([--with-system-libvpx requested but it is not v0.9.7 or later])])
-+                 AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])])
-         fi
-         CFLAGS=$_SAVE_CFLAGS
-         LDFLAGS=$_SAVE_LDFLAGS
-@@ -5673,11 +5687,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
+@@ -5732,11 +5746,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
@@ -96,7 +60,7 @@ $NetBSD: patch-aa,v 1.10 2012/03/10 11:42:38 ryoon Exp $
        VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
        VPX_X86_ASM=1
      ;;
-@@ -8915,6 +8929,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
+@@ -9102,6 +9116,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/mail/thunderbird/patches/patch-aa-toplevel b/mail/thunderbird/patches/patch-aa-toplevel
index 2d5c35862ad..733cc322de9 100644
--- a/mail/thunderbird/patches/patch-aa-toplevel
+++ b/mail/thunderbird/patches/patch-aa-toplevel
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa-toplevel,v 1.5 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-aa-toplevel,v 1.6 2012/04/28 16:56:58 ryoon Exp $
 
---- configure.in.orig	2012-02-16 10:18:22.000000000 +0000
+--- configure.in.orig	2012-04-20 22:32:37.000000000 +0000
 +++ configure.in
-@@ -1945,7 +1945,7 @@ ld.])
+@@ -1950,7 +1950,7 @@ ld.])
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa-toplevel,v 1.5 2012/03/10 11:42:38 ryoon Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -1953,6 +1953,9 @@ ld.])
+@@ -1958,6 +1958,9 @@ ld.])
      if test ! "$GNU_CC"; then
  	DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
      fi
@@ -21,7 +21,7 @@ $NetBSD: patch-aa-toplevel,v 1.5 2012/03/10 11:42:38 ryoon Exp $
      ;; 
  
  ia64*-hpux*)
-@@ -3185,6 +3188,9 @@ dnl ====================================
+@@ -3231,6 +3234,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
diff --git a/mail/thunderbird/patches/patch-ab b/mail/thunderbird/patches/patch-ab
index 53a1044c7fe..66702af8e3b 100644
--- a/mail/thunderbird/patches/patch-ab
+++ b/mail/thunderbird/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.16 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-ab,v 1.17 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/nsprpub/pr/include/md/_netbsd.h.orig	2012-02-16 10:25:22.000000000 +0000
+--- mozilla/nsprpub/pr/include/md/_netbsd.h.orig	2012-04-20 22:40:20.000000000 +0000
 +++ mozilla/nsprpub/pr/include/md/_netbsd.h
 @@ -79,7 +79,7 @@
  #define HAVE_DLL
diff --git a/mail/thunderbird/patches/patch-ac b/mail/thunderbird/patches/patch-ac
index 938a157d7db..dba0660bff4 100644
--- a/mail/thunderbird/patches/patch-ac
+++ b/mail/thunderbird/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.13 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-ac,v 1.14 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/nsprpub/configure.in.orig	2012-02-16 10:25:22.000000000 +0000
+--- mozilla/nsprpub/configure.in.orig	2012-04-20 22:40:20.000000000 +0000
 +++ mozilla/nsprpub/configure.in
 @@ -71,7 +71,7 @@ OBJDIR_NAME=.
  OBJDIR_SUFFIX=OBJ
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.13 2012/03/10 11:42:38 ryoon Exp $
  LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)'
  CYGWIN_WRAPPER=
  MACOS_SDK_DIR=
-@@ -1527,6 +1527,33 @@ tools are selected during the Xcode/Deve
+@@ -1567,6 +1567,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.13 2012/03/10 11:42:38 ryoon Exp $
      ;;
  
  *-hpux*)
-@@ -2114,6 +2141,7 @@ mips-nec-sysv*)
+@@ -2154,6 +2181,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.13 2012/03/10 11:42:38 ryoon Exp $
      if test -z "$USE_NSPR_THREADS"; then
          USE_PTHREADS=1
      fi
-@@ -2919,7 +2947,7 @@ if test -n "$USE_PTHREADS"; then
+@@ -2962,7 +2990,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.13 2012/03/10 11:42:38 ryoon Exp $
  # Freebsd doesn't use -pthread for compiles, it uses them for linking
              ;;
  	    *)
-@@ -2957,7 +2985,7 @@ if test -n "$USE_PTHREADS"; then
+@@ -3000,7 +3028,7 @@ if test -n "$USE_PTHREADS"; then
              _PTHREAD_LDFLAGS=
          fi
  	    ;;
@@ -71,7 +71,7 @@ $NetBSD: patch-ac,v 1.13 2012/03/10 11:42:38 ryoon Exp $
  	    AC_DEFINE(_REENTRANT)
  	    AC_DEFINE(_THREAD_SAFE)
  	    dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -3038,7 +3066,7 @@ case "$target" in
+@@ -3081,7 +3109,7 @@ case "$target" in
          AC_DEFINE(_PR_NEED_PTHREAD_INIT)
      fi
      ;;
diff --git a/mail/thunderbird/patches/patch-ad b/mail/thunderbird/patches/patch-ad
index 20a643cfbf6..99a454edbf9 100644
--- a/mail/thunderbird/patches/patch-ad
+++ b/mail/thunderbird/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.7 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-ad,v 1.8 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/xpcom/io/nsLocalFileUnix.h.orig	2012-02-16 10:25:33.000000000 +0000
+--- mozilla/xpcom/io/nsLocalFileUnix.h.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xpcom/io/nsLocalFileUnix.h
 @@ -86,7 +86,7 @@
  #endif
diff --git a/mail/thunderbird/patches/patch-ae b/mail/thunderbird/patches/patch-ae
index 1d7f71f2e59..55235d3a628 100644
--- a/mail/thunderbird/patches/patch-ae
+++ b/mail/thunderbird/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.9 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-ae,v 1.10 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig	2012-02-16 10:25:22.000000000 +0000
+--- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig	2012-04-20 22:40:20.000000000 +0000
 +++ mozilla/nsprpub/pr/src/misc/prnetdb.c
 @@ -105,7 +105,7 @@ PRLock *_pr_dnsLock = NULL;
          || defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \
diff --git a/mail/thunderbird/patches/patch-af b/mail/thunderbird/patches/patch-af
index dc3105de346..f5727b473bf 100644
--- a/mail/thunderbird/patches/patch-af
+++ b/mail/thunderbird/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.9 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-af,v 1.10 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/config/mkdepend/imakemdep.h.orig	2012-02-16 10:24:47.000000000 +0000
+--- mozilla/config/mkdepend/imakemdep.h.orig	2012-04-20 22:39:56.000000000 +0000
 +++ mozilla/config/mkdepend/imakemdep.h
 @@ -235,7 +235,7 @@ in this Software without prior written a
  #ifdef _CRAY
diff --git a/mail/thunderbird/patches/patch-ag b/mail/thunderbird/patches/patch-ag
index 0796bc54677..428868cef0c 100644
--- a/mail/thunderbird/patches/patch-ag
+++ b/mail/thunderbird/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.9 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-ag,v 1.10 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/nsprpub/pr/include/md/_freebsd.h.orig	2012-02-16 10:25:22.000000000 +0000
+--- mozilla/nsprpub/pr/include/md/_freebsd.h.orig	2012-04-20 22:40:20.000000000 +0000
 +++ mozilla/nsprpub/pr/include/md/_freebsd.h
 @@ -79,7 +79,7 @@
  #define _PR_HAVE_LARGE_OFF_T
diff --git a/mail/thunderbird/patches/patch-ai b/mail/thunderbird/patches/patch-ai
index 5e4bfea2c48..602709d06c7 100644
--- a/mail/thunderbird/patches/patch-ai
+++ b/mail/thunderbird/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.8 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-ai,v 1.9 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/dbm/src/mktemp.c.orig	2012-02-16 10:24:52.000000000 +0000
+--- mozilla/dbm/src/mktemp.c.orig	2012-04-20 22:39:58.000000000 +0000
 +++ mozilla/dbm/src/mktemp.c
 @@ -92,7 +92,7 @@ mktemp(char *path)
  static int 
diff --git a/mail/thunderbird/patches/patch-aj b/mail/thunderbird/patches/patch-aj
index 2edc74dbe49..779488b0a94 100644
--- a/mail/thunderbird/patches/patch-aj
+++ b/mail/thunderbird/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.8 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-aj,v 1.9 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp.orig	2012-02-16 10:25:23.000000000 +0000
+--- mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp.orig	2012-04-20 22:40:21.000000000 +0000
 +++ mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp
 @@ -408,6 +408,7 @@ nsresult nsProfileLock::LockWithSymlink(
  #endif
diff --git a/mail/thunderbird/patches/patch-ak b/mail/thunderbird/patches/patch-ak
index bd2c0b58326..4ec7214e426 100644
--- a/mail/thunderbird/patches/patch-ak
+++ b/mail/thunderbird/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.8 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-ak,v 1.9 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/js/src/ctypes/libffi/configure.orig	2012-02-16 10:25:02.000000000 +0000
+--- mozilla/js/src/ctypes/libffi/configure.orig	2012-04-20 22:40:07.000000000 +0000
 +++ mozilla/js/src/ctypes/libffi/configure
-@@ -11277,7 +11277,7 @@ case "$host" in
+@@ -11278,7 +11278,7 @@ case "$host" in
    powerpc-*-aix* | rs6000-*-aix*)
  	TARGET=POWERPC_AIX; TARGETDIR=powerpc
  	;;
diff --git a/mail/thunderbird/patches/patch-al b/mail/thunderbird/patches/patch-al
index e42e2587950..8dc45e7b6bc 100644
--- a/mail/thunderbird/patches/patch-al
+++ b/mail/thunderbird/patches/patch-al
@@ -1,9 +1,9 @@
-$NetBSD: patch-al,v 1.9 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-al,v 1.10 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/storage/src/mozStorageConnection.cpp.orig	2012-02-16 10:25:26.000000000 +0000
+--- mozilla/storage/src/mozStorageConnection.cpp.orig	2012-04-20 22:40:23.000000000 +0000
 +++ mozilla/storage/src/mozStorageConnection.cpp
-@@ -632,6 +632,11 @@ Connection::initialize(nsIFile *aDatabas
-     (void)::NS_RegisterMemoryReporter(mMemoryReporters[i]);
+@@ -718,6 +718,11 @@ Connection::initialize(nsIFile *aDatabas
+       break;
    }
  
 +  // XXX tnn: the configure script demands that sqlite3 is compiled with
diff --git a/mail/thunderbird/patches/patch-am b/mail/thunderbird/patches/patch-am
index 2578d6a8719..33bff1f3b8a 100644
--- a/mail/thunderbird/patches/patch-am
+++ b/mail/thunderbird/patches/patch-am
@@ -1,10 +1,10 @@
-$NetBSD: patch-am,v 1.5 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-am,v 1.6 2012/04/28 16:56:58 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-02-16 10:25:24.000000000 +0000
+--- mozilla/security/nss/lib/freebl/blapi.h.orig	2012-04-20 22:40:22.000000000 +0000
 +++ mozilla/security/nss/lib/freebl/blapi.h
 @@ -1038,6 +1038,8 @@ extern void SHA1_DestroyContext(SHA1Cont
  */
diff --git a/mail/thunderbird/patches/patch-an b/mail/thunderbird/patches/patch-an
index c1ce3d69717..b9b27ba1780 100644
--- a/mail/thunderbird/patches/patch-an
+++ b/mail/thunderbird/patches/patch-an
@@ -1,10 +1,10 @@
-$NetBSD: patch-an,v 1.6 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-an,v 1.7 2012/04/28 16:56:58 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-02-16 10:25:25.000000000 +0000
+--- mozilla/security/nss/lib/freebl/sha-fast-amd64-sun.s.orig	2012-04-20 22:40:22.000000000 +0000
 +++ mozilla/security/nss/lib/freebl/sha-fast-amd64-sun.s
 @@ -1712,9 +1712,9 @@ shaCompress:
  .LFE7:
diff --git a/mail/thunderbird/patches/patch-ao b/mail/thunderbird/patches/patch-ao
index 2bbb07d0393..b0ba78286c1 100644
--- a/mail/thunderbird/patches/patch-ao
+++ b/mail/thunderbird/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.6 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-ao,v 1.7 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/toolkit/mozapps/installer/packager.mk.orig	2012-02-16 10:25:30.000000000 +0000
+--- mozilla/toolkit/mozapps/installer/packager.mk.orig	2012-04-20 22:40:25.000000000 +0000
 +++ mozilla/toolkit/mozapps/installer/packager.mk
-@@ -786,8 +786,8 @@ endif
+@@ -859,8 +859,8 @@ endif
  	(cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
  	  (cd $(DESTDIR)$(installdir) && tar -xf -)
  	$(NSINSTALL) -D $(DESTDIR)$(bindir)
diff --git a/mail/thunderbird/patches/patch-as b/mail/thunderbird/patches/patch-as
index 131bb6e8669..9c66b5eda7d 100644
--- a/mail/thunderbird/patches/patch-as
+++ b/mail/thunderbird/patches/patch-as
@@ -1,10 +1,10 @@
-$NetBSD: patch-as,v 1.10 2012/03/15 08:52:34 ryoon Exp $
+$NetBSD: patch-as,v 1.11 2012/04/28 16:56:58 ryoon Exp $
 
 Treat DragonFly like FreeBSD.
 
---- mozilla/js/src/configure.in.orig	2012-03-06 13:17:03.000000000 +0100
-+++ mozilla/js/src/configure.in	2012-03-07 10:10:42.000000000 +0100
-@@ -856,7 +856,7 @@
+--- mozilla/js/src/configure.in.orig	2012-04-20 22:40:07.000000000 +0000
++++ mozilla/js/src/configure.in
+@@ -823,7 +823,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,
                  [
-@@ -2259,7 +2259,7 @@
+@@ -2234,7 +2234,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"
-@@ -3368,7 +3368,7 @@
+@@ -3356,7 +3356,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.
-@@ -4275,7 +4275,7 @@
+@@ -4263,7 +4263,7 @@ if test "$MOZ_MEMORY"; then
    *-darwin*)
      AC_DEFINE(MOZ_MEMORY_DARWIN)
      ;;
diff --git a/mail/thunderbird/patches/patch-at b/mail/thunderbird/patches/patch-at
index 59e171973a2..b84c669f9fc 100644
--- a/mail/thunderbird/patches/patch-at
+++ b/mail/thunderbird/patches/patch-at
@@ -1,6 +1,6 @@
-$NetBSD: patch-at,v 1.8 2012/04/01 20:53:43 ryoon Exp $
+$NetBSD: patch-at,v 1.9 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/gfx/qcms/qcmstypes.h.orig	2012-03-13 02:43:07.000000000 +0000
+--- mozilla/gfx/qcms/qcmstypes.h.orig	2012-04-20 22:40:02.000000000 +0000
 +++ mozilla/gfx/qcms/qcmstypes.h
 @@ -10,6 +10,8 @@
  #if defined (__SVR4) && defined (__sun)
diff --git a/mail/thunderbird/patches/patch-au b/mail/thunderbird/patches/patch-au
index 419049e6234..a6c978f1cec 100644
--- a/mail/thunderbird/patches/patch-au
+++ b/mail/thunderbird/patches/patch-au
@@ -1,10 +1,10 @@
-$NetBSD: patch-au,v 1.4 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-au,v 1.5 2012/04/28 16:56:58 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-02-16 10:25:19.000000000 +0000
+--- mozilla/media/libsydneyaudio/src/sydney_audio_oss.c.orig	2012-04-20 22:40:17.000000000 +0000
 +++ mozilla/media/libsydneyaudio/src/sydney_audio_oss.c
 @@ -55,7 +55,7 @@
  // support only versions newer than 3.6.1
diff --git a/mail/thunderbird/patches/patch-av b/mail/thunderbird/patches/patch-av
index 3c9506b0cf1..b1ea9c944d7 100644
--- a/mail/thunderbird/patches/patch-av
+++ b/mail/thunderbird/patches/patch-av
@@ -1,6 +1,6 @@
-$NetBSD: patch-av,v 1.4 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-av,v 1.5 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/xulrunner/app/nsXULRunnerApp.cpp.orig	2012-02-16 10:25:33.000000000 +0000
+--- mozilla/xulrunner/app/nsXULRunnerApp.cpp.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xulrunner/app/nsXULRunnerApp.cpp
 @@ -37,6 +37,27 @@
  
diff --git a/mail/thunderbird/patches/patch-aw b/mail/thunderbird/patches/patch-aw
index fc04dc962a9..e991fd4399d 100644
--- a/mail/thunderbird/patches/patch-aw
+++ b/mail/thunderbird/patches/patch-aw
@@ -1,6 +1,6 @@
-$NetBSD: patch-aw,v 1.9 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-aw,v 1.10 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/xulrunner/stub/nsXULStub.cpp.orig	2012-02-16 10:25:33.000000000 +0000
+--- mozilla/xulrunner/stub/nsXULStub.cpp.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xulrunner/stub/nsXULStub.cpp
 @@ -44,6 +44,29 @@
  #include "nsILocalFile.h"
diff --git a/mail/thunderbird/patches/patch-ax b/mail/thunderbird/patches/patch-ax
index 0bf703ec849..f8a1abd4cf4 100644
--- a/mail/thunderbird/patches/patch-ax
+++ b/mail/thunderbird/patches/patch-ax
@@ -1,6 +1,6 @@
-$NetBSD: patch-ax,v 1.10 2012/03/15 08:52:34 ryoon Exp $
+$NetBSD: patch-ax,v 1.11 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/xpcom/base/nsStackWalk.cpp.orig	2012-03-13 02:43:49.000000000 +0000
+--- mozilla/xpcom/base/nsStackWalk.cpp.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xpcom/base/nsStackWalk.cpp
 @@ -54,7 +54,7 @@ struct CriticalAddress {
  };
diff --git a/mail/thunderbird/patches/patch-ay b/mail/thunderbird/patches/patch-ay
index 21400a89726..4f089eb3138 100644
--- a/mail/thunderbird/patches/patch-ay
+++ b/mail/thunderbird/patches/patch-ay
@@ -1,6 +1,6 @@
-$NetBSD: patch-ay,v 1.5 2012/03/15 08:52:34 ryoon Exp $
+$NetBSD: patch-ay,v 1.6 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/browser/app/nsBrowserApp.cpp.orig	2011-09-22 20:20:17.000000000 +0000
+--- mozilla/browser/app/nsBrowserApp.cpp.orig	2012-04-20 22:39:54.000000000 +0000
 +++ mozilla/browser/app/nsBrowserApp.cpp
 @@ -53,6 +53,30 @@
  #include <stdio.h>
@@ -33,7 +33,7 @@ $NetBSD: patch-ay,v 1.5 2012/03/15 08:52:34 ryoon Exp $
  
  #include "plstr.h"
  #include "prprf.h"
-@@ -215,6 +239,9 @@
+@@ -215,6 +239,9 @@ int main(int argc, char* argv[])
  #ifdef XP_MACOSX
    TriggerQuirks();
  #endif
diff --git a/mail/thunderbird/patches/patch-az b/mail/thunderbird/patches/patch-az
index 387d3a180e1..42820a57c3d 100644
--- a/mail/thunderbird/patches/patch-az
+++ b/mail/thunderbird/patches/patch-az
@@ -1,6 +1,6 @@
-$NetBSD: patch-az,v 1.3 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-az,v 1.4 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/nsprpub/pr/src/pthreads/ptthread.c.orig	2012-02-16 10:25:22.000000000 +0000
+--- mozilla/nsprpub/pr/src/pthreads/ptthread.c.orig	2012-04-20 22:40:20.000000000 +0000
 +++ mozilla/nsprpub/pr/src/pthreads/ptthread.c
 @@ -1070,12 +1070,12 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn
      _exit(status);
diff --git a/mail/thunderbird/patches/patch-ba b/mail/thunderbird/patches/patch-ba
index c65863fbed8..c8aee540dae 100644
--- a/mail/thunderbird/patches/patch-ba
+++ b/mail/thunderbird/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.10 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-ba,v 1.11 2012/04/28 16:56:58 ryoon Exp $
 
 pthread_t may be 64-bit, avoid casting it.
 
---- mozilla/nsprpub/pr/include/private/pprthred.h.orig	2012-02-16 10:25:22.000000000 +0000
+--- mozilla/nsprpub/pr/include/private/pprthred.h.orig	2012-04-20 22:40:20.000000000 +0000
 +++ mozilla/nsprpub/pr/include/private/pprthred.h
 @@ -51,6 +51,8 @@
  #include <os2.h>
diff --git a/mail/thunderbird/patches/patch-bd b/mail/thunderbird/patches/patch-bd
index b6eb05728d2..d09fc22fdba 100644
--- a/mail/thunderbird/patches/patch-bd
+++ b/mail/thunderbird/patches/patch-bd
@@ -1,6 +1,6 @@
-$NetBSD: patch-bd,v 1.2 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-bd,v 1.3 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/js/src/ctypes/CTypes.cpp.orig	2012-02-16 10:25:02.000000000 +0000
+--- mozilla/js/src/ctypes/CTypes.cpp.orig	2012-04-20 22:40:07.000000000 +0000
 +++ mozilla/js/src/ctypes/CTypes.cpp
 @@ -36,6 +36,22 @@
   *
diff --git a/mail/thunderbird/patches/patch-bf b/mail/thunderbird/patches/patch-bf
index 8a1223a431e..76b5bbce099 100644
--- a/mail/thunderbird/patches/patch-bf
+++ b/mail/thunderbird/patches/patch-bf
@@ -1,6 +1,6 @@
-$NetBSD: patch-bf,v 1.4 2012/04/01 20:53:43 ryoon Exp $
+$NetBSD: patch-bf,v 1.5 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/js/src/jsnativestack.cpp.orig	2012-03-13 02:43:15.000000000 +0000
+--- mozilla/js/src/jsnativestack.cpp.orig	2012-04-20 22:40:08.000000000 +0000
 +++ mozilla/js/src/jsnativestack.cpp
 @@ -50,10 +50,16 @@
  #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
diff --git a/mail/thunderbird/patches/patch-bg b/mail/thunderbird/patches/patch-bg
index 017d7eb189a..fda3234351f 100644
--- a/mail/thunderbird/patches/patch-bg
+++ b/mail/thunderbird/patches/patch-bg
@@ -1,6 +1,6 @@
-$NetBSD: patch-bg,v 1.3 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-bg,v 1.4 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/storage/src/SQLiteMutex.h.orig	2012-02-16 10:25:26.000000000 +0000
+--- mozilla/storage/src/SQLiteMutex.h.orig	2012-04-20 22:40:23.000000000 +0000
 +++ mozilla/storage/src/SQLiteMutex.h
 @@ -141,15 +141,19 @@ public:
    void assertCurrentThreadOwns()
diff --git a/mail/thunderbird/patches/patch-bi b/mail/thunderbird/patches/patch-bi
index 25ed2a84196..12653041709 100644
--- a/mail/thunderbird/patches/patch-bi
+++ b/mail/thunderbird/patches/patch-bi
@@ -1,12 +1,12 @@
-$NetBSD: patch-bi,v 1.2 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-bi,v 1.3 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/gfx/angle/src/compiler/osinclude.h.orig	2012-02-16 10:24:56.000000000 +0000
+--- mozilla/gfx/angle/src/compiler/osinclude.h.orig	2012-04-20 22:40:02.000000000 +0000
 +++ mozilla/gfx/angle/src/compiler/osinclude.h
 @@ -16,6 +16,7 @@
  #define ANGLE_OS_WIN
  #elif defined(__APPLE__) || defined(__linux__) || \
        defined(__FreeBSD__) || defined(__OpenBSD__) || \
 +      defined(__NetBSD__) || defined(__DragonFly__) || \
-       defined(__sun) || defined(ANDROID)
+       defined(__sun) || defined(ANDROID) || \
+       defined(__GLIBC__) || defined(__GNU__)
  #define ANGLE_OS_POSIX
- #else
diff --git a/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h b/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h
index b8763318de0..58d0f48f80a 100644
--- a/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h
+++ b/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.5 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.6 2012/04/28 16:56:58 ryoon Exp $
 
---- ldap/sdks/c-sdk/ldap/include/portable.h.orig	2012-02-16 10:25:44.000000000 +0000
+--- ldap/sdks/c-sdk/ldap/include/portable.h.orig	2012-04-20 22:40:33.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/mail/thunderbird/patches/patch-ipc_chromium_src_base_debug__util__posic.cc b/mail/thunderbird/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
index f415171ead9..d26659bd368 100644
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
+++ b/mail/thunderbird/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.3 2012/04/01 20:53:43 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.4 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig	2012-04-01 15:39:02.000000000 +0000
+--- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig	2012-04-20 22:40:05.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/debug_util_posix.cc
 @@ -5,7 +5,7 @@
  #include "build/build_config.h"
diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util.h b/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util.h
index 80af386f7bc..06c20bff782 100644
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util.h
+++ b/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.2 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.3 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/file_util.h.orig	2012-02-16 10:25:01.000000000 +0000
+--- mozilla/ipc/chromium/src/base/file_util.h.orig	2012-04-20 22:40:05.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/file_util.h
 @@ -16,8 +16,8 @@
  #include <sys/stat.h>
diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util__posix.cc b/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util__posix.cc
index 8c2134ac234..11295ccbdf9 100644
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util__posix.cc
+++ b/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util__posix.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.3 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig	2012-02-16 10:25:01.000000000 +0000
+--- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig	2012-04-20 22:40:05.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/file_util_posix.cc
 @@ -31,7 +31,7 @@
  #include "base/time.h"
diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__file__posix.cc b/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__file__posix.cc
index 49058781086..b21e49347f1 100644
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__file__posix.cc
+++ b/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__file__posix.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc,v 1.2 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc,v 1.3 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/platform_file_posix.cc.orig	2012-02-16 10:25:01.000000000 +0000
+--- mozilla/ipc/chromium/src/base/platform_file_posix.cc.orig	2012-04-20 22:40:05.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/platform_file_posix.cc
 @@ -10,6 +10,7 @@
  #ifdef ANDROID
diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc b/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
index 7368845a8be..3c7d1fc9bf7 100644
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
+++ b/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.3 2012/04/01 20:53:43 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig	2012-04-01 15:50:47.000000000 +0000
+--- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig	2012-04-20 22:40:05.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc
 @@ -9,9 +9,18 @@
  
diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_sys__info__posix.cc b/mail/thunderbird/patches/patch-ipc_chromium_src_base_sys__info__posix.cc
index 9ad72a3d6d0..5de51a92251 100644
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_sys__info__posix.cc
+++ b/mail/thunderbird/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.3 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.4 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/sys_info_posix.cc.orig	2012-02-16 10:25:01.000000000 +0000
+--- mozilla/ipc/chromium/src/base/sys_info_posix.cc.orig	2012-04-20 22:40:06.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/sys_info_posix.cc
 @@ -18,6 +18,11 @@
  #include <mach/mach_init.h>
diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h b/mail/thunderbird/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h
index 88bcb88a85e..58857086180 100644
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h
+++ b/mail/thunderbird/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.2 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.3 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig	2012-02-16 10:25:01.000000000 +0000
+--- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig	2012-04-20 22:40:06.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h
 @@ -34,7 +34,7 @@
  #include "base/third_party/nspr/prcpucfg_win.h"
diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_build_build__config.h b/mail/thunderbird/patches/patch-ipc_chromium_src_build_build__config.h
index fecaf6c9167..71cfe5f9ec6 100644
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_build_build__config.h
+++ b/mail/thunderbird/patches/patch-ipc_chromium_src_build_build__config.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.3 2012/04/01 20:53:43 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.4 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/ipc/chromium/src/build/build_config.h.orig	2012-03-13 02:43:11.000000000 +0000
+--- mozilla/ipc/chromium/src/build/build_config.h.orig	2012-04-20 22:40:06.000000000 +0000
 +++ mozilla/ipc/chromium/src/build/build_config.h
 @@ -19,17 +19,23 @@
  #define OS_MACOSX 1
diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h b/mail/thunderbird/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h
index d5104c242bd..885a0d5ed5e 100644
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h
+++ b/mail/thunderbird/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.2 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h,v 1.3 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.h.orig	2012-02-16 10:25:01.000000000 +0000
+--- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.h.orig	2012-04-20 22:40:06.000000000 +0000
 +++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.h
 @@ -95,7 +95,7 @@ class Channel::ChannelImpl : public Mess
    };
diff --git a/mail/thunderbird/patches/patch-ipc_glue_GeckoChildProcessHost.cpp b/mail/thunderbird/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
index 0366842941c..19339d232bb 100644
--- a/mail/thunderbird/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
+++ b/mail/thunderbird/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.1 2012/03/15 08:52:34 ryoon Exp $
+$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.2 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/ipc/glue/GeckoChildProcessHost.cpp.orig	2011-12-20 23:28:19.000000000 +0000
+--- mozilla/ipc/glue/GeckoChildProcessHost.cpp.orig	2012-04-20 22:40:07.000000000 +0000
 +++ mozilla/ipc/glue/GeckoChildProcessHost.cpp
-@@ -430,7 +430,7 @@
+@@ -430,7 +430,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-ipc_glue_GeckoChildProcessHost.cpp,v 1.1 2012/03/15 08:52:34 ryoo
    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 @@
+@@ -445,8 +445,8 @@ GeckoChildProcessHost::PerformAsyncLaunc
        if (NS_SUCCEEDED(rv)) {
          nsCString path;
          greDir->GetNativePath(path);
@@ -22,7 +22,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.1 2012/03/15 08:52:34 ryoo
          path += "/lib";
  #  endif  // MOZ_WIDGET_ANDROID
          const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
-@@ -557,7 +557,7 @@
+@@ -557,7 +557,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
    childArgv.push_back(pidstring);
  
  #if defined(MOZ_CRASHREPORTER)
@@ -31,7 +31,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.1 2012/03/15 08:52:34 ryoo
    int childCrashFd, childCrashRemapFd;
    if (!CrashReporter::CreateNotificationPipeForChild(
          &childCrashFd, &childCrashRemapFd))
-@@ -594,7 +594,7 @@
+@@ -594,7 +594,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
  #endif
  
    base::LaunchApp(childArgv, mFileMap,
@@ -40,4 +40,3 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.1 2012/03/15 08:52:34 ryoo
                    newEnvVars,
  #endif
                    false, &process, arch);
-
diff --git a/mail/thunderbird/patches/patch-js_src_jscpucfg.h b/mail/thunderbird/patches/patch-js_src_jscpucfg.h
index 4dbe7e91acc..ace5915bedf 100644
--- a/mail/thunderbird/patches/patch-js_src_jscpucfg.h
+++ b/mail/thunderbird/patches/patch-js_src_jscpucfg.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-js_src_jscpucfg.h,v 1.1 2012/03/15 08:52:34 ryoon Exp $
+$NetBSD: patch-js_src_jscpucfg.h,v 1.2 2012/04/28 16:56:58 ryoon Exp $
 
 
---- mozilla/js/src/jscpucfg.h.orig	2012-01-29 11:24:34.000000000 +0100
-+++ mozilla/js/src/jscpucfg.h	2012-02-08 12:35:20.000000000 +0100
+--- mozilla/js/src/jscpucfg.h.orig	2012-04-20 22:40:08.000000000 +0000
++++ mozilla/js/src/jscpucfg.h
 @@ -77,6 +77,21 @@
  #  define IS_BIG_ENDIAN 1
  # endif
@@ -25,4 +25,3 @@ $NetBSD: patch-js_src_jscpucfg.h,v 1.1 2012/03/15 08:52:34 ryoon Exp $
  #elif defined(JS_HAVE_ENDIAN_H)
  # include <endian.h>
  
-
diff --git a/mail/thunderbird/patches/patch-ma b/mail/thunderbird/patches/patch-ma
index dc59ca8c2ce..30463514eac 100644
--- a/mail/thunderbird/patches/patch-ma
+++ b/mail/thunderbird/patches/patch-ma
@@ -1,8 +1,8 @@
-$NetBSD: patch-ma,v 1.3 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-ma,v 1.4 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/config/autoconf.mk.in.orig	2012-02-16 10:24:47.000000000 +0000
+--- mozilla/config/autoconf.mk.in.orig	2012-04-20 22:39:55.000000000 +0000
 +++ mozilla/config/autoconf.mk.in
-@@ -62,14 +62,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+@@ -68,14 +68,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
diff --git a/mail/thunderbird/patches/patch-ma-toplevel b/mail/thunderbird/patches/patch-ma-toplevel
index ecae24c5128..60cc787dbf6 100644
--- a/mail/thunderbird/patches/patch-ma-toplevel
+++ b/mail/thunderbird/patches/patch-ma-toplevel
@@ -1,8 +1,8 @@
-$NetBSD: patch-ma-toplevel,v 1.3 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-ma-toplevel,v 1.4 2012/04/28 16:56:58 ryoon Exp $
 
---- config/autoconf.mk.in.orig	2012-02-16 10:18:22.000000000 +0000
+--- config/autoconf.mk.in.orig	2012-04-20 22:32:37.000000000 +0000
 +++ config/autoconf.mk.in
-@@ -60,14 +60,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+@@ -61,14 +61,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
diff --git a/mail/thunderbird/patches/patch-mb b/mail/thunderbird/patches/patch-mb
index 66fcd4455bd..49687e5a1b6 100644
--- a/mail/thunderbird/patches/patch-mb
+++ b/mail/thunderbird/patches/patch-mb
@@ -1,8 +1,8 @@
-$NetBSD: patch-mb,v 1.4 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-mb,v 1.5 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2012-02-16 10:25:33.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -84,7 +84,7 @@ endif
+@@ -82,7 +82,7 @@ endif
  endif
  endif
  
@@ -11,7 +11,7 @@ $NetBSD: patch-mb,v 1.4 2012/03/10 11:42:38 ryoon Exp $
  ifeq (86,$(findstring 86,$(OS_TEST)))
  CPPSRCS		:= xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp
  endif
-@@ -93,7 +93,7 @@ endif
+@@ -91,7 +91,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.4 2012/03/10 11:42:38 ryoon Exp $
  # Linux/x86-64
  ifeq (x86_64,$(OS_TEST))
  CPPSRCS		:= xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
-@@ -111,12 +111,6 @@ ASFILES		:= xptcstubs_asm_ipf64.s xptcin
+@@ -109,12 +109,6 @@ ASFILES		:= xptcstubs_asm_ipf64.s xptcin
  endif
  endif
  #
@@ -33,7 +33,7 @@ $NetBSD: patch-mb,v 1.4 2012/03/10 11:42:38 ryoon Exp $
  # Neutrino/Intel (uses the same unixish_x86 code)
  #
  ifeq ($(OS_TARGET),NTO)
-@@ -192,7 +186,7 @@ endif
+@@ -190,7 +184,7 @@ endif
  # NetBSD/ARM
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -42,7 +42,7 @@ $NetBSD: patch-mb,v 1.4 2012/03/10 11:42:38 ryoon Exp $
  CPPSRCS		:= xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
  endif
  endif
-@@ -249,7 +243,7 @@ endif
+@@ -247,7 +241,7 @@ endif
  # NetBSD/m68k
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -51,7 +51,7 @@ $NetBSD: patch-mb,v 1.4 2012/03/10 11:42:38 ryoon Exp $
  CPPSRCS		:= xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
  endif
  endif
-@@ -321,9 +315,10 @@ endif
+@@ -319,9 +313,10 @@ endif
  #
  # NetBSD/PPC
  #
@@ -63,7 +63,7 @@ $NetBSD: patch-mb,v 1.4 2012/03/10 11:42:38 ryoon Exp $
  endif
  
  #
-@@ -389,6 +384,13 @@ CPPSRCS		:= xptcinvoke_sparc64_openbsd.c
+@@ -387,6 +382,13 @@ CPPSRCS		:= xptcinvoke_sparc64_openbsd.c
  ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
  endif
  #
diff --git a/mail/thunderbird/patches/patch-md b/mail/thunderbird/patches/patch-md
index 7f3058ad348..ce799abd324 100644
--- a/mail/thunderbird/patches/patch-md
+++ b/mail/thunderbird/patches/patch-md
@@ -1,8 +1,8 @@
-$NetBSD: patch-md,v 1.3 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-md,v 1.4 2012/04/28 16:56:58 ryoon Exp $
 
 ???. from www/firefox/patch-ax.
 
---- mozilla/security/coreconf/SunOS5.mk.orig	2012-02-16 10:25:23.000000000 +0000
+--- mozilla/security/coreconf/SunOS5.mk.orig	2012-04-20 22:40:21.000000000 +0000
 +++ mozilla/security/coreconf/SunOS5.mk
 @@ -147,6 +147,10 @@ endif
  endif
diff --git a/mail/thunderbird/patches/patch-me b/mail/thunderbird/patches/patch-me
index 962976a4fa0..bc91e0454bb 100644
--- a/mail/thunderbird/patches/patch-me
+++ b/mail/thunderbird/patches/patch-me
@@ -1,10 +1,10 @@
-$NetBSD: patch-me,v 1.5 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-me,v 1.6 2012/04/28 16:56:58 ryoon Exp $
 
 Add DragonFly support.
 
---- mozilla/security/nss/lib/freebl/Makefile.orig	2012-02-16 10:25:24.000000000 +0000
+--- mozilla/security/nss/lib/freebl/Makefile.orig	2012-04-20 22:40:22.000000000 +0000
 +++ mozilla/security/nss/lib/freebl/Makefile
-@@ -275,7 +275,7 @@ endif
+@@ -279,7 +279,7 @@ endif
  # to bind the blapi function references in FREEBLVector vector
  # (ldvector.c) to the blapi functions defined in the freebl
  # shared libraries.
diff --git a/mail/thunderbird/patches/patch-mf b/mail/thunderbird/patches/patch-mf
index 1fc0ec5b403..721e1f218df 100644
--- a/mail/thunderbird/patches/patch-mf
+++ b/mail/thunderbird/patches/patch-mf
@@ -1,9 +1,9 @@
-$NetBSD: patch-mf,v 1.5 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-mf,v 1.6 2012/04/28 16:56:58 ryoon Exp $
 
 Add DragonFly support.
 Make sure nss libraries have a run path defined.
 
---- mozilla/security/coreconf/config.mk.orig	2012-02-16 10:25:23.000000000 +0000
+--- mozilla/security/coreconf/config.mk.orig	2012-04-20 22:40:21.000000000 +0000
 +++ mozilla/security/coreconf/config.mk
 @@ -63,7 +63,7 @@ endif
  #######################################################################
diff --git a/mail/thunderbird/patches/patch-mg b/mail/thunderbird/patches/patch-mg
index 6f812c6e305..6b18d4dd9e8 100644
--- a/mail/thunderbird/patches/patch-mg
+++ b/mail/thunderbird/patches/patch-mg
@@ -1,8 +1,8 @@
-$NetBSD: patch-mg,v 1.3 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-mg,v 1.4 2012/04/28 16:56:58 ryoon Exp $
 
 Add DragonFly support.
 
---- mozilla/security/coreconf/DragonFly.mk.orig	2012-03-09 12:27:39.000000000 +0000
+--- mozilla/security/coreconf/DragonFly.mk.orig	2012-04-26 21:04:05.000000000 +0000
 +++ mozilla/security/coreconf/DragonFly.mk
 @@ -0,0 +1,83 @@
 +#
diff --git a/mail/thunderbird/patches/patch-mh b/mail/thunderbird/patches/patch-mh
index 74a86bd575e..33553b73373 100644
--- a/mail/thunderbird/patches/patch-mh
+++ b/mail/thunderbird/patches/patch-mh
@@ -1,6 +1,6 @@
-$NetBSD: patch-mh,v 1.2 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-mh,v 1.3 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/security/nss/lib/Makefile.orig	2012-02-16 10:25:24.000000000 +0000
+--- mozilla/security/nss/lib/Makefile.orig	2012-04-20 22:40:21.000000000 +0000
 +++ mozilla/security/nss/lib/Makefile
 @@ -70,7 +70,7 @@ endif
  
diff --git a/mail/thunderbird/patches/patch-mi b/mail/thunderbird/patches/patch-mi
index 4740ee54ef9..d9f8fb255fd 100644
--- a/mail/thunderbird/patches/patch-mi
+++ b/mail/thunderbird/patches/patch-mi
@@ -1,8 +1,8 @@
-$NetBSD: patch-mi,v 1.3 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-mi,v 1.4 2012/04/28 16:56:58 ryoon Exp $
 
 Add DragonFly support.
 
---- mozilla/config/config.mk.orig	2012-02-16 10:24:47.000000000 +0000
+--- mozilla/config/config.mk.orig	2012-04-20 22:39:55.000000000 +0000
 +++ mozilla/config/config.mk
 @@ -129,7 +129,7 @@ endif
  # but save the version to allow multiple versions of the same base
diff --git a/mail/thunderbird/patches/patch-mj b/mail/thunderbird/patches/patch-mj
index 43e3ed1d8bf..9109b1d4b16 100644
--- a/mail/thunderbird/patches/patch-mj
+++ b/mail/thunderbird/patches/patch-mj
@@ -1,8 +1,8 @@
-$NetBSD: patch-mj,v 1.3 2012/03/10 11:42:38 ryoon Exp $
+$NetBSD: patch-mj,v 1.4 2012/04/28 16:56:58 ryoon Exp $
 
 Add DragonFly support.
 
---- mozilla/security/coreconf/arch.mk.orig	2012-02-16 10:25:23.000000000 +0000
+--- mozilla/security/coreconf/arch.mk.orig	2012-04-20 22:40:21.000000000 +0000
 +++ mozilla/security/coreconf/arch.mk
 @@ -146,7 +146,7 @@ endif
  # IRIX 6.5-ALPHA-1289139620.
diff --git a/mail/thunderbird/patches/patch-mk b/mail/thunderbird/patches/patch-mk
index 31af0d8b30d..3ddf907c7d3 100644
--- a/mail/thunderbird/patches/patch-mk
+++ b/mail/thunderbird/patches/patch-mk
@@ -1,10 +1,10 @@
-$NetBSD: patch-mk,v 1.3 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mk,v 1.4 2012/04/28 16:56:58 ryoon Exp $
 
 Treat DragonFly like FreeBSD.
 
---- mozilla/config/rules.mk.orig	2012-02-16 10:24:47.000000000 +0000
+--- mozilla/config/rules.mk.orig	2012-04-20 22:39:56.000000000 +0000
 +++ mozilla/config/rules.mk
-@@ -580,6 +580,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+@@ -601,6 +601,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
  endif
  endif
  
@@ -17,7 +17,7 @@ Treat DragonFly like FreeBSD.
  ifeq ($(OS_ARCH),NetBSD)
  ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST)))
  ifeq ($(MODULE),layout)
-@@ -589,6 +595,10 @@ endif
+@@ -610,6 +616,10 @@ endif
  endif
  endif
  
diff --git a/mail/thunderbird/patches/patch-ml b/mail/thunderbird/patches/patch-ml
index 86f95108de8..630c7a87d90 100644
--- a/mail/thunderbird/patches/patch-ml
+++ b/mail/thunderbird/patches/patch-ml
@@ -1,10 +1,10 @@
-$NetBSD: patch-ml,v 1.3 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-ml,v 1.4 2012/04/28 16:56:58 ryoon Exp $
 
 Treat DragonFly like FreeBSD.
 
---- mozilla/js/src/Makefile.in.orig	2012-02-16 10:25:02.000000000 +0000
+--- mozilla/js/src/Makefile.in.orig	2012-04-20 22:40:07.000000000 +0000
 +++ mozilla/js/src/Makefile.in
-@@ -809,6 +809,9 @@ endif # WINNT
+@@ -739,6 +739,9 @@ endif # WINNT
  ifeq ($(OS_ARCH),FreeBSD)
  EXTRA_LIBS	+= -pthread
  endif
diff --git a/mail/thunderbird/patches/patch-mm b/mail/thunderbird/patches/patch-mm
index fc807155abc..d4f58611f4b 100644
--- a/mail/thunderbird/patches/patch-mm
+++ b/mail/thunderbird/patches/patch-mm
@@ -1,8 +1,8 @@
-$NetBSD: patch-mm,v 1.7 2012/04/01 20:53:43 ryoon Exp $
+$NetBSD: patch-mm,v 1.8 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/toolkit/library/Makefile.in.orig	2012-04-01 15:58:51.000000000 +0000
+--- mozilla/toolkit/library/Makefile.in.orig	2012-04-20 22:40:25.000000000 +0000
 +++ mozilla/toolkit/library/Makefile.in
-@@ -554,6 +554,24 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -549,6 +549,24 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
  endif
  endif
  
@@ -25,5 +25,5 @@ $NetBSD: patch-mm,v 1.7 2012/04/01 20:53:43 ryoon Exp $
 +endif
 +
  ifeq ($(OS_ARCH),WINNT)
- OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32 shlwapi psapi ws2_32 dbghelp)
+ OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg)
  ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
diff --git a/mail/thunderbird/patches/patch-mn b/mail/thunderbird/patches/patch-mn
index 126f135090a..562e5c3f17e 100644
--- a/mail/thunderbird/patches/patch-mn
+++ b/mail/thunderbird/patches/patch-mn
@@ -1,8 +1,8 @@
-$NetBSD: patch-mn,v 1.4 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mn,v 1.5 2012/04/28 16:56:58 ryoon Exp $
 
 Make sure we link correctly with sqlite3 from pkgsrc.
 
---- mozilla/security/nss/lib/softoken/config.mk.orig	2012-02-16 10:25:25.000000000 +0000
+--- mozilla/security/nss/lib/softoken/config.mk.orig	2012-04-20 22:40:22.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/mail/thunderbird/patches/patch-mozilla_build_autoconf_gcc-pr49911.m4 b/mail/thunderbird/patches/patch-mozilla_build_autoconf_gcc-pr49911.m4
deleted file mode 100644
index 439c5fa3aa7..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_build_autoconf_gcc-pr49911.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-mozilla_build_autoconf_gcc-pr49911.m4,v 1.1 2012/03/10 11:42:39 ryoon Exp $
-
---- mozilla/build/autoconf/gcc-pr49911.m4.orig	2012-02-16 10:24:47.000000000 +0000
-+++ mozilla/build/autoconf/gcc-pr49911.m4
-@@ -56,7 +56,7 @@ CXXFLAGS="$_SAVE_CXXFLAGS"
- 
- AC_LANG_RESTORE
- 
--if test "$ac_have_gcc_pr49911" == "yes"; then
-+if test "$ac_have_gcc_pr49911" = "yes"; then
-    AC_MSG_RESULT(yes)
-    CFLAGS="$CFLAGS -fno-tree-vrp"
-    CXXFLAGS="$CXXFLAGS -fno-tree-vrp"
diff --git a/mail/thunderbird/patches/patch-mozilla_build_autoconf_nss.m4 b/mail/thunderbird/patches/patch-mozilla_build_autoconf_nss.m4
index 83f4000ad7e..2ad5e0e0ab3 100644
--- a/mail/thunderbird/patches/patch-mozilla_build_autoconf_nss.m4
+++ b/mail/thunderbird/patches/patch-mozilla_build_autoconf_nss.m4
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_build_autoconf_nss.m4,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_build_autoconf_nss.m4,v 1.2 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/build/autoconf/nss.m4.orig	2012-02-16 10:24:47.000000000 +0000
+--- mozilla/build/autoconf/nss.m4.orig	2012-04-20 22:39:55.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/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp b/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp
index 109b20a0207..a61923e0e2a 100644
--- a/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp
+++ b/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.2 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig	2012-02-16 10:24:53.000000000 +0000
+--- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig	2012-04-20 22:39:59.000000000 +0000
 +++ mozilla/dom/plugins/ipc/PluginModuleChild.cpp
 @@ -236,7 +236,7 @@ PluginModuleChild::Init(const std::strin
  
@@ -11,7 +11,7 @@ $NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.1 2012/03/10 11
      mShutdownFunc =
          (NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown");
  
-@@ -1824,7 +1824,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
+@@ -1821,7 +1821,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
      PLUGIN_LOG_DEBUG_METHOD;
      AssertPluginThread();
  
@@ -20,7 +20,7 @@ $NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.1 2012/03/10 11
      return true;
  #elif defined(OS_WIN) || defined(OS_MACOSX)
      *_retval = mGetEntryPointsFunc(&mFunctions);
-@@ -1851,7 +1851,7 @@ PluginModuleChild::AnswerNP_Initialize(N
+@@ -1848,7 +1848,7 @@ PluginModuleChild::AnswerNP_Initialize(N
      SendBackUpXResources(FileDescriptor(xSocketFd, false/*don't close*/));
  #endif
  
diff --git a/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h b/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h
index 88273d00734..d66cdf98fa4 100644
--- a/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h
+++ b/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.h,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.h,v 1.2 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/dom/plugins/ipc/PluginModuleChild.h.orig	2012-02-16 10:24:53.000000000 +0000
+--- mozilla/dom/plugins/ipc/PluginModuleChild.h.orig	2012-04-20 22:39:59.000000000 +0000
 +++ mozilla/dom/plugins/ipc/PluginModuleChild.h
-@@ -358,7 +358,7 @@ private:
+@@ -360,7 +360,7 @@ private:
  
      // we get this from the plugin
      NP_PLUGINSHUTDOWN mShutdownFunc;
diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_thebes_gfxPlatform.cpp b/mail/thunderbird/patches/patch-mozilla_gfx_thebes_gfxPlatform.cpp
new file mode 100644
index 00000000000..b8317f28770
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_gfx_thebes_gfxPlatform.cpp
@@ -0,0 +1,36 @@
+$NetBSD: patch-mozilla_gfx_thebes_gfxPlatform.cpp,v 1.1 2012/04/28 16:56:58 ryoon Exp $
+
+--- mozilla/gfx/thebes/gfxPlatform.cpp.orig	2012-04-20 22:40:03.000000000 +0000
++++ mozilla/gfx/thebes/gfxPlatform.cpp
+@@ -436,6 +436,7 @@ void SourceBufferDestroy(void *srcBuffer
+   static_cast<SourceSurface*>(srcBuffer)->Release();
+ }
+ 
++#ifdef MOZ_TREE_CAIRO
+ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
+ {
+   gfxImageSurface* origSurf =
+@@ -443,6 +444,7 @@ void SourceSnapshotDetached(cairo_surfac
+ 
+   origSurf->SetData(&kSourceSurface, NULL, NULL);
+ }
++#endif
+ 
+ RefPtr<SourceSurface>
+ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
+@@ -512,6 +514,7 @@ gfxPlatform::GetSourceSurfaceForSurface(
+                                                      imgSurface->Stride(),
+                                                      format);
+ 
++    #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);
+     cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
+     cairo_surface_destroy(nullSurf);
++    #endif
+   }
+ 
+   srcBuffer->AddRef();
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in
index da8ff6576b2..8a16c107824 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_ipc_chromium_Makefile.in,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_Makefile.in,v 1.2 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/ipc/chromium/Makefile.in.orig	2012-02-16 10:25:01.000000000 +0000
+--- mozilla/ipc/chromium/Makefile.in.orig	2012-04-20 22:40:04.000000000 +0000
 +++ mozilla/ipc/chromium/Makefile.in
-@@ -278,6 +278,34 @@ endif
+@@ -275,6 +275,34 @@ endif
  
  endif # } OS_LINUX
  
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_chromium-config.mk b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_chromium-config.mk
index c44992743e4..5ca94a5654f 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_chromium-config.mk
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_chromium-config.mk
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.2 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/ipc/chromium/chromium-config.mk.orig	2012-02-16 10:25:01.000000000 +0000
+--- mozilla/ipc/chromium/chromium-config.mk.orig	2012-04-20 22:40:04.000000000 +0000
 +++ mozilla/ipc/chromium/chromium-config.mk
 @@ -56,17 +56,6 @@ LOCAL_INCLUDES += \
    -I$(DEPTH)/ipc/ipdl/_ipdlheaders \
@@ -20,7 +20,7 @@ $NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.1 2012/03/10 11:42:39
  ifeq ($(OS_ARCH),WINNT) # {
  OS_LIBS += $(call EXPAND_LIBNAME,psapi shell32 dbghelp)
  
-@@ -93,13 +82,62 @@ DEFINES += -DCOMPILER_MSVC
+@@ -93,13 +82,64 @@ DEFINES += -DCOMPILER_MSVC
  endif
  
  else # } {
@@ -41,6 +41,7 @@ $NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.1 2012/03/10 11:42:39
 +
 +OS_DRAGONFLY = 1
 +OS_BSD = 1
++OS_LIBS += $(call EXPAND_LIBNAME,kvm)
 +DEFINES += \
 +  -DOS_DRAGONFLY=1 \
 +  -DOS_BSD=1 \
@@ -51,6 +52,7 @@ $NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.1 2012/03/10 11:42:39
 +
 +OS_FREEBSD = 1
 +OS_BSD = 1
++OS_LIBS += $(call EXPAND_LIBNAME,kvm)
 +DEFINES += \
 +  -DOS_FREEBSD=1 \
 +  -DOS_BSD=1 \
@@ -86,7 +88,7 @@ $NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.1 2012/03/10 11:42:39
    $(NULL)
  
  # NB: to stop gcc warnings about exporting template instantiation
-@@ -107,4 +145,8 @@ OS_CXXFLAGS := $(filter-out -pedantic,$(
+@@ -107,4 +147,8 @@ OS_CXXFLAGS := $(filter-out -pedantic,$(
  
  endif # }
  endif # }
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_base__paths.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_base__paths.h
index 63e091505e8..05df6f85406 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_base__paths.h
+++ b/mail/thunderbird/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.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_base__paths.h,v 1.2 2012/04/28 16:56:58 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/base_paths.h.orig	2012-02-16 10:25:01.000000000 +0000
+--- mozilla/ipc/chromium/src/base/base_paths.h.orig	2012-04-20 22:40:04.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/base_paths.h
 @@ -13,7 +13,7 @@
  #include "base/base_paths_win.h"
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc
index acb6b59647c..572983684d3 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/file_util_bsd.cc.orig	2012-03-09 12:27:38.000000000 +0000
+--- mozilla/ipc/chromium/src/base/file_util_bsd.cc.orig	2012-04-26 21:04:05.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.
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc
index 3a52a676235..7178ad58fc7 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc
+++ b/mail/thunderbird/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.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_message__loop.cc,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/message_loop.cc.orig	2012-02-16 10:25:01.000000000 +0000
+--- mozilla/ipc/chromium/src/base/message_loop.cc.orig	2012-04-20 22:40:05.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/message_loop.cc
 @@ -19,7 +19,7 @@
  #if defined(OS_POSIX)
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h
index 2bcaf5a8c93..b265025e71c 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_platform__thread.h,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_platform__thread.h,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/platform_thread.h.orig	2012-02-16 10:25:01.000000000 +0000
+--- mozilla/ipc/chromium/src/base/platform_thread.h.orig	2012-04-20 22:40:05.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/platform_thread.h
 @@ -25,6 +25,8 @@ typedef pthread_t PlatformThreadHandle;
  #if defined(OS_LINUX)
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util.h
index 3ed2db45b05..8d40237d7ae 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util.h
+++ b/mail/thunderbird/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.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util.h,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/process_util.h.orig	2012-02-16 10:25:01.000000000 +0000
+--- mozilla/ipc/chromium/src/base/process_util.h.orig	2012-04-20 22:40:05.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/process_util.h
 @@ -14,7 +14,6 @@
  #include <windows.h>
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc
index f1c4914c15e..17eeb753577 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.2 2012/04/01 20:53:43 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.3 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig	2012-04-01 15:53:35.000000000 +0000
+--- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig	2012-04-26 21:04:05.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/process_util_bsd.cc
 @@ -0,0 +1,326 @@
 +// Copyright (c) 2008 The Chromium Authors. All rights reserved.
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc
index 6574d461b8c..c7b4aababfc 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc
+++ b/mail/thunderbird/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.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__posix.cc,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/process_util_posix.cc.orig	2012-02-16 10:25:01.000000000 +0000
+--- mozilla/ipc/chromium/src/base/process_util_posix.cc.orig	2012-04-20 22:40:05.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/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc
index d5b6a5e7869..c37194dcf20 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc.orig	2012-02-16 10:25:01.000000000 +0000
+--- mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc.orig	2012-04-20 22:40:06.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc
 @@ -212,7 +212,7 @@ PR_ImplodeTime(const PRExplodedTime *exp
      LL_ADD(retVal, retVal, temp);
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h
index 84808e5c79b..86ff94c39d3 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h.orig	2012-02-16 10:25:01.000000000 +0000
+--- mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h.orig	2012-04-20 22:40:06.000000000 +0000
 +++ mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h
 @@ -195,7 +195,7 @@ struct ParamTraits<unsigned long long> {
  };
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h
index d82848093d1..9d6350b882f 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h
+++ b/mail/thunderbird/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.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/ipc/chromium/src/chrome/common/transport_dib.h.orig	2012-02-16 10:25:01.000000000 +0000
+--- mozilla/ipc/chromium/src/chrome/common/transport_dib.h.orig	2012-04-20 22:40:06.000000000 +0000
 +++ mozilla/ipc/chromium/src/chrome/common/transport_dib.h
 @@ -7,7 +7,7 @@
  
diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_build_autoconf_gcc-pr49911.m4 b/mail/thunderbird/patches/patch-mozilla_js_src_build_autoconf_gcc-pr49911.m4
deleted file mode 100644
index 27e2dec7d1e..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_js_src_build_autoconf_gcc-pr49911.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-mozilla_js_src_build_autoconf_gcc-pr49911.m4,v 1.1 2012/03/10 11:42:39 ryoon Exp $
-
---- mozilla/js/src/build/autoconf/gcc-pr49911.m4.orig	2012-02-16 10:25:02.000000000 +0000
-+++ mozilla/js/src/build/autoconf/gcc-pr49911.m4
-@@ -56,7 +56,7 @@ CXXFLAGS="$_SAVE_CXXFLAGS"
- 
- AC_LANG_RESTORE
- 
--if test "$ac_have_gcc_pr49911" == "yes"; then
-+if test "$ac_have_gcc_pr49911" = "yes"; then
-    AC_MSG_RESULT(yes)
-    CFLAGS="$CFLAGS -fno-tree-vrp"
-    CXXFLAGS="$CXXFLAGS -fno-tree-vrp"
diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp
index 10811f580e1..6a3597e967b 100644
--- a/mail/thunderbird/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp
+++ b/mail/thunderbird/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_js_src_methodjit_MethodJIT.cpp,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_js_src_methodjit_MethodJIT.cpp,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/js/src/methodjit/MethodJIT.cpp.orig	2012-02-16 10:25:04.000000000 +0000
+--- mozilla/js/src/methodjit/MethodJIT.cpp.orig	2012-04-20 22:40:08.000000000 +0000
 +++ mozilla/js/src/methodjit/MethodJIT.cpp
-@@ -171,7 +171,7 @@ SetVMFrameRegs(VMFrame &f)
+@@ -167,7 +167,7 @@ PopActiveVMFrame(VMFrame &f)
  
  JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0);
  
diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_yarr_pcre_pcre.h b/mail/thunderbird/patches/patch-mozilla_js_src_yarr_pcre_pcre.h
index fdaa17ab7a8..16cb24ccda3 100644
--- a/mail/thunderbird/patches/patch-mozilla_js_src_yarr_pcre_pcre.h
+++ b/mail/thunderbird/patches/patch-mozilla_js_src_yarr_pcre_pcre.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_js_src_yarr_pcre_pcre.h,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_js_src_yarr_pcre_pcre.h,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/js/src/yarr/pcre/pcre.h.orig	2012-02-16 10:25:08.000000000 +0000
+--- mozilla/js/src/yarr/pcre/pcre.h.orig	2012-04-20 22:40:11.000000000 +0000
 +++ mozilla/js/src/yarr/pcre/pcre.h
 @@ -46,7 +46,9 @@ POSSIBILITY OF SUCH DAMAGE.
  #include "assembler/wtf/Platform.h"
diff --git a/mail/thunderbird/patches/patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c b/mail/thunderbird/patches/patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c
new file mode 100644
index 00000000000..0d08a4f6cad
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c,v 1.1 2012/04/28 16:56:59 ryoon Exp $
+
+--- mozilla/media/libsydneyaudio/src/sydney_audio_pulseaudio.c.orig	2012-04-20 22:40:17.000000000 +0000
++++ mozilla/media/libsydneyaudio/src/sydney_audio_pulseaudio.c
+@@ -29,7 +29,9 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <pthread.h>
++_Pragma("GCC visibility push(default)")
+ #include <pulse/pulseaudio.h>
++_Pragma("GCC visibility pop")
+ #include "sydney_audio.h"
+ 
+ /* Pulseaudio implementation based heavily on sydney_audio_alsa.c */
diff --git a/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config.h b/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config.h
index 9209dac885b..c0d4c4f5e0b 100644
--- a/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config.h
+++ b/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_media_libvpx_vpx__config.h,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_media_libvpx_vpx__config.h,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/media/libvpx/vpx_config.h.orig	2012-02-16 10:25:19.000000000 +0000
+--- mozilla/media/libvpx/vpx_config.h.orig	2012-04-20 22:40:18.000000000 +0000
 +++ mozilla/media/libvpx/vpx_config.h
 @@ -12,12 +12,12 @@
  /* 32 bit MacOS. */
diff --git a/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config__c.c b/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config__c.c
index 8b9c6daa0fc..b80f78a06b9 100644
--- a/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config__c.c
+++ b/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config__c.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_media_libvpx_vpx__config__c.c,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_media_libvpx_vpx__config__c.c,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/media/libvpx/vpx_config_c.c.orig	2012-02-16 10:25:19.000000000 +0000
+--- mozilla/media/libvpx/vpx_config_c.c.orig	2012-04-20 22:40:18.000000000 +0000
 +++ mozilla/media/libvpx/vpx_config_c.c
 @@ -12,12 +12,12 @@
  /* 32 bit MacOS. */
diff --git a/mail/thunderbird/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp b/mail/thunderbird/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp
index 6b5160d93dd..927dfdef3e2 100644
--- a/mail/thunderbird/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp
+++ b/mail/thunderbird/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp,v 1.1 2012/03/23 19:35:06 ryoon Exp $
+$NetBSD: patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp,v 1.2 2012/04/28 16:56:59 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-03-13 02:43:37.000000000 +0000
+--- mozilla/netwerk/protocol/http/HttpChannelParent.cpp.orig	2012-04-20 22:40:20.000000000 +0000
 +++ mozilla/netwerk/protocol/http/HttpChannelParent.cpp
-@@ -333,10 +333,15 @@ HttpChannelParent::RecvUpdateAssociatedC
+@@ -331,10 +331,15 @@ HttpChannelParent::RecvUpdateAssociatedC
    return true;
  }
  
diff --git a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg
index 514e930b1e6..311a4d6cc2a 100644
--- a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg
+++ b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/nsprpub/pr/include/md/_dragonfly.cfg.orig	2012-03-09 12:27:39.000000000 +0000
+--- mozilla/nsprpub/pr/include/md/_dragonfly.cfg.orig	2012-04-26 21:04:06.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 -*- */
diff --git a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md___pth.h b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md___pth.h
index d872d281126..279511b3e73 100644
--- a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md___pth.h
+++ b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md___pth.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_nsprpub_pr_include_md___pth.h,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_nsprpub_pr_include_md___pth.h,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/nsprpub/pr/include/md/_pth.h.orig	2012-02-16 10:25:22.000000000 +0000
+--- mozilla/nsprpub/pr/include/md/_pth.h.orig	2012-04-20 22:40:20.000000000 +0000
 +++ mozilla/nsprpub/pr/include/md/_pth.h
 @@ -146,7 +146,7 @@
  #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt)   (dt) = (st)
diff --git a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md_prosdep.h b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md_prosdep.h
index d8dbe0f81c7..a216318842c 100644
--- a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md_prosdep.h
+++ b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md_prosdep.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_nsprpub_pr_include_md_prosdep.h,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_nsprpub_pr_include_md_prosdep.h,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/nsprpub/pr/include/md/prosdep.h.orig	2012-02-16 10:25:22.000000000 +0000
+--- mozilla/nsprpub/pr/include/md/prosdep.h.orig	2012-04-20 22:40:20.000000000 +0000
 +++ mozilla/nsprpub/pr/include/md/prosdep.h
 @@ -66,7 +66,7 @@ PR_BEGIN_EXTERN_C
  #if defined(AIX)
diff --git a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c
index 036053da01f..e9a71a7bf03 100644
--- a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c
+++ b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig	2012-02-16 10:25:22.000000000 +0000
+--- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig	2012-04-20 22:40:20.000000000 +0000
 +++ mozilla/nsprpub/pr/src/md/unix/uxrng.c
 @@ -126,7 +126,7 @@ GetHighResClock(void *buf, size_t maxbyt
  
diff --git a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptio.c b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptio.c
index b09ba30cea7..1432cfbdac8 100644
--- a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptio.c
+++ b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptio.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_nsprpub_pr_src_pthreads_ptio.c,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_nsprpub_pr_src_pthreads_ptio.c,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/nsprpub/pr/src/pthreads/ptio.c.orig	2012-02-16 10:25:22.000000000 +0000
+--- mozilla/nsprpub/pr/src/pthreads/ptio.c.orig	2012-04-20 22:40:20.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__) \
diff --git a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c
index b440f559ebc..09a059dd826 100644
--- a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c
+++ b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/nsprpub/pr/src/pthreads/ptsynch.c.orig	2012-02-16 10:25:22.000000000 +0000
+--- mozilla/nsprpub/pr/src/pthreads/ptsynch.c.orig	2012-04-20 22:40:20.000000000 +0000
 +++ mozilla/nsprpub/pr/src/pthreads/ptsynch.c
 @@ -842,7 +842,7 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphor
   */
diff --git a/mail/thunderbird/patches/patch-mozilla_storage_src_Makefile.in b/mail/thunderbird/patches/patch-mozilla_storage_src_Makefile.in
new file mode 100644
index 00000000000..f549da329b4
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_storage_src_Makefile.in
@@ -0,0 +1,27 @@
+$NetBSD: patch-mozilla_storage_src_Makefile.in,v 1.1 2012/04/28 16:56:59 ryoon Exp $
+
+--- mozilla/storage/src/Makefile.in.orig	2012-04-20 22:40:23.000000000 +0000
++++ mozilla/storage/src/Makefile.in
+@@ -55,6 +55,22 @@ ifeq ($(OS_ARCH),Linux)
+ DEFINES += -DXP_LINUX
+ endif
+ 
++ifeq ($(OS_ARCH),DragonFly)
++DEFINES += -DXP_BSD
++endif
++
++ifeq ($(OS_ARCH),FreeBSD)
++DEFINES += -DXP_BSD
++endif
++
++ifeq ($(OS_ARCH),NetBSD)
++DEFINES += -DXP_BSD
++endif
++
++ifeq ($(OS_ARCH),FreeBSD)
++DEFINES += -DXP_BSD
++endif
++
+ EXPORTS_NAMESPACES = mozilla/storage
+ 
+ EXPORTS_mozilla/storage = \
diff --git a/mail/thunderbird/patches/patch-mozilla_storage_src_mozStorageService.cpp b/mail/thunderbird/patches/patch-mozilla_storage_src_mozStorageService.cpp
new file mode 100644
index 00000000000..9c4a68140e3
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_storage_src_mozStorageService.cpp
@@ -0,0 +1,25 @@
+$NetBSD: patch-mozilla_storage_src_mozStorageService.cpp,v 1.1 2012/04/28 16:56:59 ryoon Exp $
+
+--- mozilla/storage/src/mozStorageService.cpp.orig	2012-04-20 22:40:23.000000000 +0000
++++ mozilla/storage/src/mozStorageService.cpp
+@@ -515,7 +515,7 @@ sqlite3_vfs *ConstructTelemetryVFS();
+ 
+ #ifdef MOZ_MEMORY
+ 
+-#  if defined(XP_WIN) || defined(SOLARIS) || defined(ANDROID) || defined(XP_MACOSX)
++#  if defined(XP_WIN) || defined(SOLARIS) || defined(ANDROID) || defined(XP_MACOSX) || defined(XP_BSD)
+ #    include "jemalloc.h"
+ #  elif defined(XP_LINUX)
+ // jemalloc is directly linked into firefox-bin; libxul doesn't link
+@@ -565,7 +565,10 @@ static int sqliteMemSize(void *p)
+ 
+ static int sqliteMemRoundup(int n)
+ {
+-  n = je_malloc_usable_size_in_advance(n);
++  if (je_malloc_usable_size_in_advance)
++  {
++      n = je_malloc_usable_size_in_advance(n);
++  }
+ 
+   // jemalloc can return blocks of size 2 and 4, but SQLite requires that all
+   // allocations be 8-aligned.  So we round up sub-8 requests to 8.  This
diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in b/mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in
index e6b394ffb1e..a09fbe7fdc5 100644
--- a/mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in
+++ b/mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_xpcom_Makefile.in,v 1.1 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mozilla_xpcom_Makefile.in,v 1.2 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/xpcom/Makefile.in.orig	2012-02-16 10:25:32.000000000 +0000
+--- mozilla/xpcom/Makefile.in.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xpcom/Makefile.in
-@@ -68,6 +68,10 @@ DIRS		+= windbgdlg
+@@ -67,6 +67,10 @@ DIRS		+= windbgdlg
  endif
  endif
  
diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_header.py b/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_header.py
deleted file mode 100644
index 1198e9d6071..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_header.py
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-mozilla_xpcom_idl-parser_header.py,v 1.2 2012/03/10 11:42:39 ryoon Exp $
-
---- mozilla/xpcom/idl-parser/header.py.orig	2012-02-16 10:25:33.000000000 +0000
-+++ mozilla/xpcom/idl-parser/header.py
-@@ -521,6 +521,12 @@ if __name__ == '__main__':
-         outfd.close()
- 
-     if options.depfile is not None:
-+        dirname = os.path.dirname(options.depfile)
-+        if dirname:
-+            try:
-+                os.makedirs(dirname)
-+            except:
-+                pass
-         depfd = open(options.depfile, 'w')
-         deps = [dep.replace('\\', '/') for dep in idl.deps]
- 
diff --git a/mail/thunderbird/patches/patch-mozilla_xulrunner_app_Makefile.in b/mail/thunderbird/patches/patch-mozilla_xulrunner_app_Makefile.in
deleted file mode 100644
index dfa0ffa701a..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_xulrunner_app_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-mozilla_xulrunner_app_Makefile.in,v 1.1 2012/03/10 11:42:39 ryoon Exp $
-
---- mozilla/xulrunner/app/Makefile.in.orig	2012-02-16 10:25:33.000000000 +0000
-+++ mozilla/xulrunner/app/Makefile.in
-@@ -130,6 +130,10 @@ endif
- RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
- endif
- 
-+ifeq ($(OS_ARCH),NetBSD)
-+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
-+endif
-+
- include $(topsrcdir)/config/rules.mk
- 
- DEFINES += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
diff --git a/mail/thunderbird/patches/patch-mp b/mail/thunderbird/patches/patch-mp
index fe18070a4ae..19799ebf266 100644
--- a/mail/thunderbird/patches/patch-mp
+++ b/mail/thunderbird/patches/patch-mp
@@ -1,8 +1,8 @@
-$NetBSD: patch-mp,v 1.5 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-mp,v 1.6 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2012-02-16 10:25:19.000000000 +0000
+--- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2012-04-20 22:40:17.000000000 +0000
 +++ mozilla/media/libsydneyaudio/src/Makefile.in
-@@ -97,6 +97,12 @@ ifeq ($(OS_ARCH),WINNT)
+@@ -104,6 +104,12 @@ ifeq ($(OS_ARCH),WINNT)
  OS_LIBS += winmm.lib
  endif
  
diff --git a/mail/thunderbird/patches/patch-pa b/mail/thunderbird/patches/patch-pa
index 6e90dde9734..f9aeba1c7ac 100644
--- a/mail/thunderbird/patches/patch-pa
+++ b/mail/thunderbird/patches/patch-pa
@@ -1,11 +1,11 @@
-$NetBSD: patch-pa,v 1.5 2012/04/01 20:53:43 ryoon Exp $
+$NetBSD: patch-pa,v 1.6 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/xulrunner/installer/mozilla-js.pc.in.orig	2012-04-01 16:04:27.000000000 +0000
+--- mozilla/xulrunner/installer/mozilla-js.pc.in.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xulrunner/installer/mozilla-js.pc.in
 @@ -6,5 +6,5 @@ Name: JavaScript
  Description: The Mozilla JavaScript Library
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
 -Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
-+Libs: -Wl,-R${prefix}/lib/thunderbird -Wl,-R${prefix}/lib/thunderbird -L${prefix}/lib/thunderbird %MOZ_JS_LINK%
++Libs: -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner %MOZ_JS_LINK%
  Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
diff --git a/mail/thunderbird/patches/patch-pb b/mail/thunderbird/patches/patch-pb
index d2fc47d85e6..ad5100b04e0 100644
--- a/mail/thunderbird/patches/patch-pb
+++ b/mail/thunderbird/patches/patch-pb
@@ -1,11 +1,11 @@
-$NetBSD: patch-pb,v 1.5 2012/04/01 20:53:43 ryoon Exp $
+$NetBSD: patch-pb,v 1.6 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/xulrunner/installer/libxul.pc.in.orig	2012-04-01 16:07:35.000000000 +0000
+--- mozilla/xulrunner/installer/libxul.pc.in.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xulrunner/installer/libxul.pc.in
 @@ -7,5 +7,5 @@ Name: libxul
  Description: The Mozilla Runtime and Embedding Engine
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
 -Libs: -L${sdkdir}/lib %MOZ_XUL_LINK%
-+Libs: -Wl,-R${prefix}/lib/thunderbird -Wl,-R${prefix}/lib/thunderbird -L${prefix}/lib/thunderbird %MOZ_XUL_LINK%
++Libs: -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner %MOZ_XUL_LINK%
  Cflags: -I${includedir} %WCHAR_CFLAGS%
diff --git a/mail/thunderbird/patches/patch-pc b/mail/thunderbird/patches/patch-pc
index 4e5e78f3b69..5f9548a7783 100644
--- a/mail/thunderbird/patches/patch-pc
+++ b/mail/thunderbird/patches/patch-pc
@@ -1,6 +1,6 @@
-$NetBSD: patch-pc,v 1.5 2012/04/01 20:53:43 ryoon Exp $
+$NetBSD: patch-pc,v 1.6 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/xulrunner/installer/libxul-embedding.pc.in.orig	2012-04-01 16:10:27.000000000 +0000
+--- mozilla/xulrunner/installer/libxul-embedding.pc.in.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xulrunner/installer/libxul-embedding.pc.in
 @@ -6,5 +6,6 @@ idldir=%idldir%
  Name: libxul-embedding
@@ -8,5 +8,5 @@ $NetBSD: patch-pc,v 1.5 2012/04/01 20:53:43 ryoon Exp $
  Version: %MOZILLA_VERSION%
 -Libs: -L${sdkdir}/lib -lxpcomglue -ldl
 +# XXXtnn -ldl removed
-+Libs: -Wl,-R${prefix}/lib/thunderbird -Wl,-R${prefix}/lib/thunderbird -L${prefix}/lib/thunderbird -lxpcomglue
++Libs: -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lxpcomglue
  Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
diff --git a/mail/thunderbird/patches/patch-pd b/mail/thunderbird/patches/patch-pd
index e05c18409f8..ffdb6ab5452 100644
--- a/mail/thunderbird/patches/patch-pd
+++ b/mail/thunderbird/patches/patch-pd
@@ -1,11 +1,11 @@
-$NetBSD: patch-pd,v 1.5 2012/04/01 20:53:43 ryoon Exp $
+$NetBSD: patch-pd,v 1.6 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/xulrunner/installer/mozilla-nss.pc.in.orig	2012-04-01 16:12:31.000000000 +0000
+--- mozilla/xulrunner/installer/mozilla-nss.pc.in.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xulrunner/installer/mozilla-nss.pc.in
 @@ -6,5 +6,5 @@ Name: NSS
  Description: Mozilla Network Security Services
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
 -Libs: -L${sdkdir}/lib -lsmime3 -lssl3 -lnss3 -lnssutil3
-+Libs: -Wl,-R${prefix}/lib/thunderbird -Wl,-R${prefix}/lib/thunderbird -L${prefix}/lib/thunderbird -lsmime3 -lssl3 -lnss3 -lnssutil3
++Libs: -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lsmime3 -lssl3 -lnss3 -lnssutil3
  Cflags: -I${includedir}
diff --git a/mail/thunderbird/patches/patch-pg b/mail/thunderbird/patches/patch-pg
index fe7c66abe69..866a62688e9 100644
--- a/mail/thunderbird/patches/patch-pg
+++ b/mail/thunderbird/patches/patch-pg
@@ -1,6 +1,6 @@
-$NetBSD: patch-pg,v 1.5 2012/04/01 20:53:43 ryoon Exp $
+$NetBSD: patch-pg,v 1.6 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/xulrunner/installer/mozilla-nspr.pc.in.orig	2012-04-01 16:14:22.000000000 +0000
+--- mozilla/xulrunner/installer/mozilla-nspr.pc.in.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xulrunner/installer/mozilla-nspr.pc.in
 @@ -5,7 +5,5 @@ includedir=%includedir%
  Name: NSPR
@@ -10,5 +10,5 @@ $NetBSD: patch-pg,v 1.5 2012/04/01 20:53:43 ryoon Exp $
 -Cflags: %FULL_NSPR_CFLAGS%
 -
 -
-+Libs: -Wl,-R${prefix}/lib/thunderbird -Wl,-R${prefix}/lib/thunderbird -L${prefix}/lib/thunderbird -lplds4 -lplc4 -lnspr4 -pthread
++Libs: -Wl,-R${prefix}/lib/xulrunner -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lplds4 -lplc4 -lnspr4 -pthread
 +Cflags: -I${includedir}
diff --git a/mail/thunderbird/patches/patch-rc b/mail/thunderbird/patches/patch-rc
index dafed9d9411..0e3270da42c 100644
--- a/mail/thunderbird/patches/patch-rc
+++ b/mail/thunderbird/patches/patch-rc
@@ -1,6 +1,6 @@
-$NetBSD: patch-rc,v 1.4 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-rc,v 1.5 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/browser/branding/unofficial/locales/en-US/brand.dtd.orig	2012-02-16 10:24:45.000000000 +0000
+--- mozilla/browser/branding/unofficial/locales/en-US/brand.dtd.orig	2012-04-20 22:39:54.000000000 +0000
 +++ mozilla/browser/branding/unofficial/locales/en-US/brand.dtd
 @@ -1,4 +1,4 @@
 -<!ENTITY  brandShortName        "Mozilla Developer Preview">
diff --git a/mail/thunderbird/patches/patch-security_nss_cmd_shlibsign_sign.sh b/mail/thunderbird/patches/patch-security_nss_cmd_shlibsign_sign.sh
index 65a52fa6c72..2248384e37a 100644
--- a/mail/thunderbird/patches/patch-security_nss_cmd_shlibsign_sign.sh
+++ b/mail/thunderbird/patches/patch-security_nss_cmd_shlibsign_sign.sh
@@ -1,10 +1,10 @@
-$NetBSD: patch-security_nss_cmd_shlibsign_sign.sh,v 1.2 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-security_nss_cmd_shlibsign_sign.sh,v 1.3 2012/04/28 16:56:59 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-02-16 10:25:24.000000000 +0000
+--- mozilla/security/nss/cmd/shlibsign/sign.sh.orig	2012-04-20 22:40:21.000000000 +0000
 +++ mozilla/security/nss/cmd/shlibsign/sign.sh
 @@ -26,7 +26,7 @@ WIN*)
      export LIBPATH
diff --git a/mail/thunderbird/patches/patch-toolkit_toolkit-tiers.mk b/mail/thunderbird/patches/patch-toolkit_toolkit-tiers.mk
index 6abbb10424c..b06ee4d0e33 100644
--- a/mail/thunderbird/patches/patch-toolkit_toolkit-tiers.mk
+++ b/mail/thunderbird/patches/patch-toolkit_toolkit-tiers.mk
@@ -1,11 +1,11 @@
-$NetBSD: patch-toolkit_toolkit-tiers.mk,v 1.2 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-toolkit_toolkit-tiers.mk,v 1.3 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/toolkit/toolkit-tiers.mk.orig	2012-02-16 10:25:31.000000000 +0000
+--- mozilla/toolkit/toolkit-tiers.mk.orig	2012-04-20 22:40:26.000000000 +0000
 +++ mozilla/toolkit/toolkit-tiers.mk
-@@ -82,7 +82,7 @@ ifndef MOZ_NATIVE_BZ2
+@@ -80,7 +80,7 @@ ifdef MOZ_UPDATER
+ ifndef MOZ_NATIVE_BZ2
  tier_platform_dirs += modules/libbz2
  endif
- tier_platform_dirs += modules/libmar
 -tier_platform_dirs += other-licenses/bsdiff
 +#tier_platform_dirs += other-licenses/bsdiff
  endif
diff --git a/mail/thunderbird/patches/patch-xa b/mail/thunderbird/patches/patch-xa
index 687d73413b2..64a7290658d 100644
--- a/mail/thunderbird/patches/patch-xa
+++ b/mail/thunderbird/patches/patch-xa
@@ -1,8 +1,8 @@
-$NetBSD: patch-xa,v 1.3 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-xa,v 1.4 2012/04/28 16:56:59 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-03-09 12:27:39.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_netbsd.s.orig	2012-04-26 21:04:06.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/mail/thunderbird/patches/patch-xb b/mail/thunderbird/patches/patch-xb
index eadc729318b..651e3f2309c 100644
--- a/mail/thunderbird/patches/patch-xb
+++ b/mail/thunderbird/patches/patch-xb
@@ -1,8 +1,8 @@
-$NetBSD: patch-xb,v 1.3 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-xb,v 1.4 2012/04/28 16:56:59 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-03-09 12:27:39.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_netbsd.cpp.orig	2012-04-26 21:04:06.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/mail/thunderbird/patches/patch-xc b/mail/thunderbird/patches/patch-xc
index 0566a77ef09..ae749b7d97a 100644
--- a/mail/thunderbird/patches/patch-xc
+++ b/mail/thunderbird/patches/patch-xc
@@ -1,8 +1,8 @@
-$NetBSD: patch-xc,v 1.3 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-xc,v 1.4 2012/04/28 16:56:59 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-03-09 12:27:39.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_netbsd.s.orig	2012-04-26 21:04:06.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/mail/thunderbird/patches/patch-xd b/mail/thunderbird/patches/patch-xd
index 874225ad3e6..050537f53ec 100644
--- a/mail/thunderbird/patches/patch-xd
+++ b/mail/thunderbird/patches/patch-xd
@@ -1,8 +1,8 @@
-$NetBSD: patch-xd,v 1.3 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-xd,v 1.4 2012/04/28 16:56:59 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-03-09 12:27:39.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_netbsd.cpp.orig	2012-04-26 21:04:06.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/mail/thunderbird/patches/patch-xe b/mail/thunderbird/patches/patch-xe
index 0754cbac714..b27752ba92d 100644
--- a/mail/thunderbird/patches/patch-xe
+++ b/mail/thunderbird/patches/patch-xe
@@ -1,8 +1,8 @@
-$NetBSD: patch-xe,v 1.3 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-xe,v 1.4 2012/04/28 16:56:59 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-02-16 10:25:33.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
 @@ -132,6 +132,15 @@ extern "C" {
      }
diff --git a/mail/thunderbird/patches/patch-xf b/mail/thunderbird/patches/patch-xf
index 23c8067e405..4982af1e41f 100644
--- a/mail/thunderbird/patches/patch-xf
+++ b/mail/thunderbird/patches/patch-xf
@@ -1,8 +1,8 @@
-$NetBSD: patch-xf,v 1.3 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-xf,v 1.4 2012/04/28 16:56:59 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-02-16 10:25:33.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
 @@ -123,17 +123,27 @@ extern "C" {
      }
diff --git a/mail/thunderbird/patches/patch-xg b/mail/thunderbird/patches/patch-xg
index 3516d7d8d3a..1e7eee2d47d 100644
--- a/mail/thunderbird/patches/patch-xg
+++ b/mail/thunderbird/patches/patch-xg
@@ -1,8 +1,8 @@
-$NetBSD: patch-xg,v 1.3 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-xg,v 1.4 2012/04/28 16:56:59 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-02-16 10:25:33.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp
 @@ -118,18 +118,23 @@ PrepareAndDispatch(nsXPTCStubBase* self,
   * so they are contiguous with values passed on the stack, and then calls
diff --git a/mail/thunderbird/patches/patch-xj b/mail/thunderbird/patches/patch-xj
index 0faab4dba08..f9de2a2330c 100644
--- a/mail/thunderbird/patches/patch-xj
+++ b/mail/thunderbird/patches/patch-xj
@@ -1,8 +1,8 @@
-$NetBSD: patch-xj,v 1.3 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-xj,v 1.4 2012/04/28 16:56:59 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-02-16 10:25:33.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
 @@ -41,6 +41,7 @@
  // Implement shared vtbl methods.
diff --git a/mail/thunderbird/patches/patch-xk b/mail/thunderbird/patches/patch-xk
index ad9308da437..5414a76ee9b 100644
--- a/mail/thunderbird/patches/patch-xk
+++ b/mail/thunderbird/patches/patch-xk
@@ -1,8 +1,8 @@
-$NetBSD: patch-xk,v 1.3 2012/03/10 11:42:39 ryoon Exp $
+$NetBSD: patch-xk,v 1.4 2012/04/28 16:56:59 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-02-16 10:25:33.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s
 @@ -1,43 +1,43 @@
 -# -*- Mode: Asm -*-
diff --git a/mail/thunderbird/patches/patch-xl b/mail/thunderbird/patches/patch-xl
index 053c094b128..11916188e0e 100644
--- a/mail/thunderbird/patches/patch-xl
+++ b/mail/thunderbird/patches/patch-xl
@@ -1,8 +1,8 @@
-$NetBSD: patch-xl,v 1.3 2012/03/10 11:42:40 ryoon Exp $
+$NetBSD: patch-xl,v 1.4 2012/04/28 16:56:59 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-02-16 10:25:33.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s
 @@ -1,43 +1,43 @@
 -# -*- Mode: Asm -*-
diff --git a/mail/thunderbird/patches/patch-xm b/mail/thunderbird/patches/patch-xm
index 66d14a0f669..cf6e64290be 100644
--- a/mail/thunderbird/patches/patch-xm
+++ b/mail/thunderbird/patches/patch-xm
@@ -1,8 +1,8 @@
-$NetBSD: patch-xm,v 1.3 2012/03/10 11:42:40 ryoon Exp $
+$NetBSD: patch-xm,v 1.4 2012/04/28 16:56:59 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-02-16 10:25:33.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
 @@ -40,9 +40,9 @@
  
diff --git a/mail/thunderbird/patches/patch-xn b/mail/thunderbird/patches/patch-xn
index 7fb64585987..eb6fb23f694 100644
--- a/mail/thunderbird/patches/patch-xn
+++ b/mail/thunderbird/patches/patch-xn
@@ -1,6 +1,6 @@
-$NetBSD: patch-xn,v 1.2 2012/03/10 11:42:40 ryoon Exp $
+$NetBSD: patch-xn,v 1.3 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s.orig	2012-02-16 10:25:33.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s
 @@ -42,8 +42,46 @@
  
diff --git a/mail/thunderbird/patches/patch-xo b/mail/thunderbird/patches/patch-xo
index 13be2a8e8a3..c07c38f27b4 100644
--- a/mail/thunderbird/patches/patch-xo
+++ b/mail/thunderbird/patches/patch-xo
@@ -1,6 +1,6 @@
-$NetBSD: patch-xo,v 1.2 2012/03/10 11:42:40 ryoon Exp $
+$NetBSD: patch-xo,v 1.3 2012/04/28 16:56:59 ryoon Exp $
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.orig	2012-02-16 10:25:33.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.orig	2012-04-20 22:40:27.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s
 @@ -26,8 +26,46 @@
  
diff --git a/mail/thunderbird/patches/patch-zb b/mail/thunderbird/patches/patch-zb
index e155448235f..9076cd0f526 100644
--- a/mail/thunderbird/patches/patch-zb
+++ b/mail/thunderbird/patches/patch-zb
@@ -1,6 +1,6 @@
-$NetBSD: patch-zb,v 1.4 2012/03/10 11:42:40 ryoon Exp $
+$NetBSD: patch-zb,v 1.5 2012/04/28 16:56:59 ryoon Exp $
 
---- mail/app/Makefile.in.orig	2012-02-16 10:18:22.000000000 +0000
+--- mail/app/Makefile.in.orig	2012-04-20 22:32:37.000000000 +0000
 +++ mail/app/Makefile.in
 @@ -103,6 +103,10 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
  TK_LIBS := -framework Cocoa $(TK_LIBS)
diff --git a/mail/thunderbird/patches/patch-zc b/mail/thunderbird/patches/patch-zc
index c66279cba27..cc9cd4e4aa6 100644
--- a/mail/thunderbird/patches/patch-zc
+++ b/mail/thunderbird/patches/patch-zc
@@ -1,8 +1,8 @@
-$NetBSD: patch-zc,v 1.2 2012/03/10 11:42:40 ryoon Exp $
+$NetBSD: patch-zc,v 1.3 2012/04/28 16:56:59 ryoon Exp $
 
---- mail/app/nsMailApp.cpp.orig	2012-02-16 10:18:22.000000000 +0000
+--- mail/app/nsMailApp.cpp.orig	2012-04-20 22:32:37.000000000 +0000
 +++ mail/app/nsMailApp.cpp
-@@ -48,6 +48,27 @@
+@@ -52,6 +52,27 @@
  
  #include <stdio.h>
  #include <stdarg.h>
@@ -30,11 +30,11 @@ $NetBSD: patch-zc,v 1.2 2012/03/10 11:42:40 ryoon Exp $
  
  #include "nsCOMPtr.h"
  #include "nsILocalFile.h"
-@@ -147,6 +168,7 @@ static int do_main(const char *exePath, 
+@@ -151,6 +172,7 @@ static int do_main(const char *exePath, 
  
  int main(int argc, char* argv[])
  {
 +  netbsd_fixrlimit();
    char exePath[MAXPATHLEN];
  
-   nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath);
+ #ifdef XP_MACOSX
author	ryoon <ryoon@pkgsrc.org>	2012-04-28 16:56:58 +0000
committer	ryoon <ryoon@pkgsrc.org>	2012-04-28 16:56:58 +0000
commit	36c61d43ad661838e2bad6105554727b4a0811de (patch)
tree	075cd2b5b778a02dff5ed7eceecdd5bb9627aadd /mail/thunderbird/patches
parent	1a87cc2f0a8a23082b22224dff1bf475e37c30fa (diff)
download	pkgsrc-36c61d43ad661838e2bad6105554727b4a0811de.tar.gz