Update to seamonkey-2.2.

Based on the mozilla-5.0 branch. SeaMonkey 2.2 contains the following major changes relative to SeaMonkey 2.1: Windows: Bundled extensions/add-ons are no longer optional in SeaMonkey's installer. Archive options can now be changed from the Copies & Folders Account Settings pane. Mozilla platform changes CSS Animations are now supported. Improved canvas, JavaScript, memory, and networking performance. Improved standards support for HTML5, XHR, MathML, SMIL, and canvas. Improved spell checking for some locales. WebGL content can no longer load cross-domain textures. Background tabs have setTimeout and setInterval clamped to 1000ms to improve performance.
author: tnn <tnn@pkgsrc.org> 2011-07-11 20:46:35 +0000
committer: tnn <tnn@pkgsrc.org> 2011-07-11 20:46:35 +0000
commit: 51c03198d3696f0afe869eb95f10447509242fc2 (patch)
tree: e3ccc8e2df3a97e039799fabde69a1e0bfbccde8 /www/seamonkey/patches
parent: 2481ead05dd457e47316f63f1cf4b0629d7ff09e (diff)
download: pkgsrc-51c03198d3696f0afe869eb95f10447509242fc2.tar.gz
58 files changed, 647 insertions, 982 deletions
diff --git a/www/seamonkey/patches/patch-aa b/www/seamonkey/patches/patch-aa
index 2755f8124e1..f1481ae6b21 100644
--- a/www/seamonkey/patches/patch-aa
+++ b/www/seamonkey/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.3 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-aa,v 1.4 2011/07/11 20:46:36 tnn Exp $
 
---- mozilla/configure.in.orig	2009-10-16 17:13:35.000000000 +0200
+--- mozilla/configure.in.orig	2010-12-15 01:02:33.000000000 +0000
 +++ mozilla/configure.in
-@@ -1799,7 +1799,7 @@ case "$target" in
-     fi
+@@ -2076,7 +2076,7 @@ case "$target" in
+     MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
 -*-freebsd*)
@@ -11,17 +11,17 @@ $NetBSD: patch-aa,v 1.3 2010/03/16 10:59:10 tnn Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -1813,6 +1813,9 @@ case "$target" in
- #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
- #	MKSHLIB_UNFORCE_ALL=''
- #    fi
+@@ -2084,6 +2084,9 @@ case "$target" in
+     if test ! "$GNU_CC"; then
+ 	DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
+     fi
 +    if test "$LIBRUNPATH"; then
 +       DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
 +    fi
      ;; 
  
- *-hpux*)
-@@ -3043,6 +3046,9 @@ dnl ====================================
+ ia64*-hpux*)
+@@ -3380,6 +3383,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
@@ -31,8 +31,8 @@ $NetBSD: patch-aa,v 1.3 2010/03/16 10:59:10 tnn Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -4158,6 +4164,14 @@ else
-    fi
+@@ -4727,6 +4733,14 @@ if test -n "$YASM"; then
+   _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
  fi
  
 +if test -n "${LIBXUL_SDK_DIR}"; then
@@ -46,7 +46,7 @@ $NetBSD: patch-aa,v 1.3 2010/03/16 10:59:10 tnn Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -8375,7 +8389,8 @@ rm -f confdefs.h.save
+@@ -9383,7 +9397,8 @@ rm -f confdefs.h.save
  mv confdefs.h confdefs.h.save
  egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
  AC_OUTPUT_MAKE_DEFS()
@@ -56,9 +56,9 @@ $NetBSD: patch-aa,v 1.3 2010/03/16 10:59:10 tnn Exp $
  AC_SUBST(MOZ_DEFINES)
  rm -f confdefs.h
  mv confdefs.h.save confdefs.h
-@@ -8466,6 +8481,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
+@@ -9493,6 +9508,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
      AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output])
-     if test "$OS_ARCH" != "WINNT" && test "$OS_ARCH" != "WINCE"; then
+     if test "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "WINCE"; then
         NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs`
 +       AC_MSG_WARN([pkgsrc: adding run path to NSPR_LIBS for bundled NSPR.])
 +       NSPR_LIBS="-Wl,-R${prefix}/lib/\${MOZILLA_PKG_NAME} ${NSPR_LIBS}"
diff --git a/www/seamonkey/patches/patch-aa-toplevel b/www/seamonkey/patches/patch-aa-toplevel
index 6e109e638d8..9bd3018481d 100644
--- a/www/seamonkey/patches/patch-aa-toplevel
+++ b/www/seamonkey/patches/patch-aa-toplevel
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa-toplevel,v 1.1 2009/11/29 00:40:42 tnn Exp $
+$NetBSD: patch-aa-toplevel,v 1.2 2011/07/11 20:46:36 tnn Exp $
 
---- configure.in.orig	2009-10-25 15:29:01.000000000 +0100
+--- configure.in.orig	2011-07-06 08:40:27.000000000 +0000
 +++ configure.in
-@@ -1963,7 +1963,7 @@ case "$target" in
-     fi
+@@ -1974,7 +1974,7 @@ ld.])
+     MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
 -*-freebsd*)
@@ -11,17 +11,17 @@ $NetBSD: patch-aa-toplevel,v 1.1 2009/11/29 00:40:42 tnn Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -1977,6 +1977,9 @@ case "$target" in
- #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
- #	MKSHLIB_UNFORCE_ALL=''
- #    fi
+@@ -1982,6 +1982,9 @@ ld.])
+     if test ! "$GNU_CC"; then
+ 	DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
+     fi
 +    if test "$LIBRUNPATH"; then
 +       DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
 +    fi
      ;; 
  
- *-hpux*)
-@@ -3173,6 +3176,9 @@ dnl ====================================
+ ia64*-hpux*)
+@@ -3222,6 +3225,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
@@ -31,7 +31,7 @@ $NetBSD: patch-aa-toplevel,v 1.1 2009/11/29 00:40:42 tnn Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -4233,6 +4239,14 @@ else
+@@ -4333,6 +4339,14 @@ else
     fi
  fi
  
@@ -46,7 +46,7 @@ $NetBSD: patch-aa-toplevel,v 1.1 2009/11/29 00:40:42 tnn Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -7513,7 +7527,8 @@ rm -f confdefs.h.save
+@@ -7294,7 +7308,8 @@ rm -f confdefs.h.save
  mv confdefs.h confdefs.h.save
  egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
  AC_OUTPUT_MAKE_DEFS()
diff --git a/www/seamonkey/patches/patch-ab b/www/seamonkey/patches/patch-ab
index 806aebe8155..d626f33034e 100644
--- a/www/seamonkey/patches/patch-ab
+++ b/www/seamonkey/patches/patch-ab
@@ -1,21 +1,17 @@
-$NetBSD: patch-ab,v 1.10 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-ab,v 1.11 2011/07/11 20:46:36 tnn Exp $
 
---- mozilla/nsprpub/pr/include/md/_netbsd.h.orig	2009-06-29 18:15:06.000000000 +0200
+--- mozilla/nsprpub/pr/include/md/_netbsd.h.orig	2010-05-03 18:21:00.000000000 +0000
 +++ mozilla/nsprpub/pr/include/md/_netbsd.h
-@@ -94,6 +94,12 @@
- #define _PR_INET6_PROBE
- #endif
- 
-+#if __NetBSD_Version__ >= 106370000
-+/* NetBSD 1.6ZK */
-+#define _PR_HAVE_GETPROTO_R
-+#define _PR_HAVE_GETPROTO_R_INT
-+#endif
-+
- #define USE_SETJMP
- 
- #ifndef _PR_PTHREADS
-@@ -107,6 +113,8 @@
+@@ -79,7 +79,7 @@
+ #define HAVE_DLL
+ #define USE_DLFCN
+ #define _PR_HAVE_SOCKADDR_LEN
+-#define _PR_NO_LARGE_FILES
++#define _PR_HAVE_LARGE_OFF_T
+ #define _PR_STAT_HAS_ST_ATIMESPEC
+ #define _PR_POLL_AVAILABLE
+ #define _PR_USE_POLL
+@@ -107,6 +107,8 @@
  #define JB_SP_INDEX 2
  #elif defined(__mips__)
  #define JB_SP_INDEX 4
diff --git a/www/seamonkey/patches/patch-ac b/www/seamonkey/patches/patch-ac
index 32200c1dba0..33b1ba19be4 100644
--- a/www/seamonkey/patches/patch-ac
+++ b/www/seamonkey/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.6 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-ac,v 1.7 2011/07/11 20:46:36 tnn Exp $
 
---- mozilla/nsprpub/configure.in.orig	2009-06-29 18:15:05.000000000 +0200
+--- mozilla/nsprpub/configure.in.orig	2011-02-03 20:12:03.000000000 +0000
 +++ mozilla/nsprpub/configure.in
 @@ -71,7 +71,7 @@ OBJDIR_NAME=.
  OBJDIR_SUFFIX=OBJ
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.6 2010/03/16 10:59:10 tnn Exp $
  LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)'
  CYGWIN_WRAPPER=
  MACOS_SDK_DIR=
-@@ -1160,6 +1160,34 @@ tools are selected during the Xcode/Deve
+@@ -1311,6 +1311,34 @@ tools are selected during the Xcode/Deve
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
      MDCPUCFG_H=_freebsd.cfg
      PR_MD_CSRCS=freebsd.c
@@ -46,7 +46,7 @@ $NetBSD: patch-ac,v 1.6 2010/03/16 10:59:10 tnn Exp $
      ;;
  
  *-hpux*)
-@@ -1731,6 +1759,7 @@ mips-nec-sysv*)
+@@ -1925,6 +1953,7 @@ mips-nec-sysv*)
      AC_DEFINE(XP_UNIX)
      AC_DEFINE(NETBSD)
      AC_DEFINE(HAVE_BSD_FLOCK)
@@ -54,7 +54,7 @@ $NetBSD: patch-ac,v 1.6 2010/03/16 10:59:10 tnn Exp $
      if test -z "$USE_NSPR_THREADS"; then
          USE_PTHREADS=1
      fi
-@@ -2511,7 +2540,7 @@ if test -n "$USE_PTHREADS"; then
+@@ -2730,7 +2759,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
@@ -63,7 +63,7 @@ $NetBSD: patch-ac,v 1.6 2010/03/16 10:59:10 tnn Exp $
  # Freebsd doesn't use -pthread for compiles, it uses them for linking
              ;;
  	    *)
-@@ -2549,7 +2578,7 @@ if test -n "$USE_PTHREADS"; then
+@@ -2768,7 +2797,7 @@ if test -n "$USE_PTHREADS"; then
              _PTHREAD_LDFLAGS=
          fi
  	    ;;
@@ -72,7 +72,7 @@ $NetBSD: patch-ac,v 1.6 2010/03/16 10:59:10 tnn Exp $
  	    AC_DEFINE(_REENTRANT)
  	    AC_DEFINE(_THREAD_SAFE)
  	    dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -2630,7 +2659,7 @@ case "$target" in
+@@ -2849,7 +2878,7 @@ case "$target" in
          AC_DEFINE(_PR_NEED_PTHREAD_INIT)
      fi
      ;;
diff --git a/www/seamonkey/patches/patch-ad b/www/seamonkey/patches/patch-ad
index 0b0f5a75bc3..85cfc9af0e5 100644
--- a/www/seamonkey/patches/patch-ad
+++ b/www/seamonkey/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-ad,v 1.4 2011/07/11 20:46:36 tnn Exp $
 
 --- mozilla/xpcom/io/nsLocalFileUnix.h.orig	2009-06-29 18:15:32.000000000 +0200
 +++ mozilla/xpcom/io/nsLocalFileUnix.h
diff --git a/www/seamonkey/patches/patch-ae b/www/seamonkey/patches/patch-ae
index 2fbd43f2187..6b6de9c609f 100644
--- a/www/seamonkey/patches/patch-ae
+++ b/www/seamonkey/patches/patch-ae
@@ -1,7 +1,16 @@
-$NetBSD: patch-ae,v 1.3 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-ae,v 1.4 2011/07/11 20:46:36 tnn Exp $
 
---- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig	2009-06-29 18:15:07.000000000 +0200
+--- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig	2010-05-03 18:21:00.000000000 +0000
 +++ mozilla/nsprpub/pr/src/misc/prnetdb.c
+@@ -104,7 +104,7 @@ PRLock *_pr_dnsLock = NULL;
+         || defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \
+ 	|| (defined(HPUX10_10) && defined(_REENTRANT)) \
+         || (defined(HPUX10_20) && defined(_REENTRANT)) \
+-        || defined(OPENBSD)
++        || defined(OPENBSD) || defined(NETBSD)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_GETPROTO_R_INT
+ #endif
 @@ -114,6 +114,11 @@ PRLock *_pr_dnsLock = NULL;
  #define _PR_HAVE_5_ARG_GETPROTO_R
  #endif
diff --git a/www/seamonkey/patches/patch-aj b/www/seamonkey/patches/patch-aj
index 0c2cf457a3c..6975e514b8f 100644
--- a/www/seamonkey/patches/patch-aj
+++ b/www/seamonkey/patches/patch-aj
@@ -1,16 +1,16 @@
-$NetBSD: patch-aj,v 1.3 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-aj,v 1.4 2011/07/11 20:46:36 tnn Exp $
 
---- mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp.orig	2009-06-29 18:15:11.000000000 +0200
+--- mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp.orig	2010-12-15 01:03:34.000000000 +0000
 +++ mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp
-@@ -391,6 +391,7 @@ nsresult nsProfileLock::LockWithSymlink(
-                     act.sa_flags = 0;
+@@ -405,6 +405,7 @@ nsresult nsProfileLock::LockWithSymlink(
+ #endif
                      sigfillset(&act.sa_mask);
  
 +#ifndef DEBUG
  #define CATCH_SIGNAL(signame)                                           \
  PR_BEGIN_MACRO                                                          \
    if (sigaction(signame, NULL, &oldact) == 0 &&                         \
-@@ -409,6 +410,7 @@ PR_BEGIN_MACRO                          
+@@ -423,6 +424,7 @@ PR_BEGIN_MACRO                          
                      CATCH_SIGNAL(SIGTERM);
  
  #undef CATCH_SIGNAL
diff --git a/www/seamonkey/patches/patch-ak b/www/seamonkey/patches/patch-ak
index a976311d611..f8f5bdd7a8e 100644
--- a/www/seamonkey/patches/patch-ak
+++ b/www/seamonkey/patches/patch-ak
@@ -1,19 +1,13 @@
-$NetBSD: patch-ak,v 1.3 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-ak,v 1.4 2011/07/11 20:46:36 tnn Exp $
 
---- mozilla/toolkit/components/places/src/nsMorkHistoryImporter.cpp.orig	2009-06-29 18:15:22.000000000 +0200
-+++ mozilla/toolkit/components/places/src/nsMorkHistoryImporter.cpp
-@@ -148,9 +148,12 @@ AddToHistoryCB(const nsCSubstring &aRowI
-     }
- 
-     PRTime date;
--    if (PR_sscanf(values[kLastVisitColumn].get(), "%lld", &date) != 1) {
-+    long long ld;
-+    if (PR_sscanf(values[kLastVisitColumn].get(), "%lld", &ld) != 1) {
-       date = -1;
--    }
-+    } else {
-+      date = ld;
-+   }
- 
-     PRBool isTyped = values[kTypedColumn].EqualsLiteral("1");
-     PRInt32 transition = isTyped ?
+--- mozilla/js/src/ctypes/libffi/configure.orig	2010-03-16 01:02:50.000000000 +0000
++++ mozilla/js/src/ctypes/libffi/configure
+@@ -12232,7 +12232,7 @@ case "$host" in
+   powerpc-*-aix* | rs6000-*-aix*)
+ 	TARGET=POWERPC_AIX; TARGETDIR=powerpc
+ 	;;
+-  powerpc-*-freebsd*)
++  powerpc-*-freebsd* | powerpc-*-netbsd*)
+ 	TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
+ 	;;
+   powerpc*-*-rtems*)
diff --git a/www/seamonkey/patches/patch-al b/www/seamonkey/patches/patch-al
new file mode 100644
index 00000000000..d53695dd4d4
--- /dev/null
+++ b/www/seamonkey/patches/patch-al
@@ -0,0 +1,16 @@
+$NetBSD: patch-al,v 1.5 2011/07/11 20:46:36 tnn Exp $
+
+--- mozilla/storage/src/mozStorageConnection.cpp.orig	2011-06-15 21:57:54.000000000 +0000
++++ mozilla/storage/src/mozStorageConnection.cpp
+@@ -595,6 +595,11 @@ Connection::initialize(nsIFile *aDatabas
+     (void)::NS_RegisterMemoryReporter(mMemoryReporters[i]);
+   }
+ 
++  // XXX tnn: the configure script demands that sqlite3 is compiled with
++  // SECURE_DELETE on by default. sqlite3 in pkgsrc does not have that,
++  // so instead we enable secure_delete manually here.
++  (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING("PRAGMA secure_delete = 1;"));
++
+   return NS_OK;
+ }
+ 
diff --git a/www/seamonkey/patches/patch-ao b/www/seamonkey/patches/patch-ao
index a3d5ce5d67c..ed8d9f5c6b8 100644
--- a/www/seamonkey/patches/patch-ao
+++ b/www/seamonkey/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.3 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-ao,v 1.4 2011/07/11 20:46:36 tnn Exp $
 
---- mozilla/toolkit/mozapps/installer/packager.mk.orig	2009-06-29 18:15:27.000000000 +0200
+--- mozilla/toolkit/mozapps/installer/packager.mk.orig	2009-10-29 23:11:21.000000000 +0100
 +++ mozilla/toolkit/mozapps/installer/packager.mk
-@@ -449,8 +449,8 @@ endif
+@@ -441,8 +441,8 @@ endif
  	(cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
  	  (cd $(DESTDIR)$(installdir) && tar -xf -)
  	$(NSINSTALL) -D $(DESTDIR)$(bindir)
@@ -11,14 +11,5 @@ $NetBSD: patch-ao,v 1.3 2010/03/16 10:59:10 tnn Exp $
 +	$(RM) -f $(DESTDIR)$(bindir)/$(MOZILLA_PKG_NAME)
 +	ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)/$(MOZILLA_PKG_NAME)
  ifdef INSTALL_SDK # Here comes the hard part
- # include directory is stable (dist/sdk/include) and unstable (dist/include)
- 	$(NSINSTALL) -D $(DESTDIR)$(includedir)/stable
-@@ -458,7 +458,7 @@ ifdef INSTALL_SDK # Here comes the hard 
- 	(cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
- 	  (cd $(DESTDIR)$(includedir)/stable && tar -xf -)
- # The dist/include has module subdirectories that we need to flatten
--	find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
-+	find $(DIST)/include -type f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
- # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
- 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/stable 
- 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable
+ 	$(NSINSTALL) -D $(DESTDIR)$(includedir)
+ 	(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
diff --git a/www/seamonkey/patches/patch-ap b/www/seamonkey/patches/patch-ap
deleted file mode 100644
index c5a443cbb5c..00000000000
--- a/www/seamonkey/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.8 2010/09/09 11:12:27 tnn Exp $
-
---- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2010-08-24 21:32:05.000000000 +0000
-+++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h
-@@ -59,7 +59,7 @@
- 
- #include <sys/types.h>
- 
--#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX)
-+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) ||  defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__)
- typedef off_t oggz_off_t;
- #else
- typedef loff_t oggz_off_t;
diff --git a/www/seamonkey/patches/patch-aq b/www/seamonkey/patches/patch-aq
deleted file mode 100644
index fbb12cf1bea..00000000000
--- a/www/seamonkey/patches/patch-aq
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aq,v 1.4 2010/03/16 10:59:10 tnn Exp $
-
---- mozilla/media/liboggplay/src/liboggplay/std_semaphore.h.orig	2009-10-16 17:14:09.000000000 +0200
-+++ mozilla/media/liboggplay/src/liboggplay/std_semaphore.h
-@@ -74,9 +74,9 @@
-  * @retval non-zero on error 
-  */
- 
--#if defined(linux) || defined(SOLARIS) || defined(AIX) || defined(__FreeBSD__)
-+#if defined(linux) || defined(SOLARIS) || defined(AIX) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
- #include <semaphore.h>
--#if defined(__FreeBSD__) 
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #define SEM_CREATE(p,s) sem_init(&(p), 0, s)  
- #else
- #define SEM_CREATE(p,s) sem_init(&(p), 1, s)
diff --git a/www/seamonkey/patches/patch-ar b/www/seamonkey/patches/patch-ar
deleted file mode 100644
index f93b5f3693b..00000000000
--- a/www/seamonkey/patches/patch-ar
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2010/03/16 10:59:10 tnn Exp $
-
-Enable the sunaudio module to build on NetBSD.
-
---- mozilla/media/libsydneyaudio/src/sydney_audio_sunaudio.c.orig	2009-06-29 18:15:03.000000000 +0200
-+++ mozilla/media/libsydneyaudio/src/sydney_audio_sunaudio.c
-@@ -38,9 +38,14 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#if defined(__NetBSD__)
-+#include <sys/ioctl.h>
-+#include <sys/audioio.h>
-+#else
- #include <stropts.h>
- #include <sys/audio.h>
- #include <sys/mixer.h>
-+#endif
- #include <errno.h>
- #include <stdio.h>
- #include <pthread.h>
-@@ -197,7 +202,7 @@ sa_stream_open(sa_stream_t *s) 
-   s->default_rate = audio_info.play.sample_rate; 
-   s->default_precision =  audio_info.play.precision; 
- 
--  AUDIO_INITINFO(&audio_info)
-+  AUDIO_INITINFO(&audio_info);
- 
-   audio_info.play.sample_rate = s->rate;
-   audio_info.play.channels = s->n_channels;
-@@ -210,7 +215,7 @@ sa_stream_open(sa_stream_t *s) 
-   if (err== -1)
-     return SA_ERROR_NOT_SUPPORTED;
- 
--  AUDIO_INITINFO(&audio_info)
-+  AUDIO_INITINFO(&audio_info);
-   err=ioctl(fd,AUDIO_GETINFO,&audio_info);
-   if (err== -1)
-   {
diff --git a/www/seamonkey/patches/patch-as b/www/seamonkey/patches/patch-as
index 0f41a75558e..5737e4cbfff 100644
--- a/www/seamonkey/patches/patch-as
+++ b/www/seamonkey/patches/patch-as
@@ -1,11 +1,20 @@
-$NetBSD: patch-as,v 1.1 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-as,v 1.2 2011/07/11 20:46:36 tnn Exp $
 
 Treat DragonFly like FreeBSD.
 
---- mozilla/js/src/configure.in.orig	2009-06-29 18:14:51.000000000 +0200
+--- mozilla/js/src/configure.in.orig	2010-12-15 01:03:04.000000000 +0000
 +++ mozilla/js/src/configure.in
-@@ -1693,7 +1693,7 @@ case "$target" in
-     fi
+@@ -769,7 +769,7 @@ EOF
+                 AC_LANG_RESTORE
+             ])
+ 
+-        if test "$ac_cv_have_std__Throw" == "yes"; then
++        if test "$ac_cv_have_std__Throw" = "yes"; then
+             AC_CACHE_CHECK(for |class __declspec(dllimport) exception| bug,
+                            ac_cv_have_dllimport_exception_bug,
+                 [
+@@ -2059,7 +2059,7 @@ case "$target" in
+     MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
 -*-freebsd*)
@@ -13,21 +22,21 @@ 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"
-@@ -2504,7 +2504,7 @@ darwin*)
- solaris*)
+@@ -3018,7 +3018,7 @@ case "$target" in
+ *-solaris*)
      AC_DEFINE(AVMPLUS_UNIX)
      ;;
--freebsd*|kfreebsd*)
-+freebsd*|kfreebsd*|netbsd*|dragonfly*)
+-*-freebsd*|*-kfreebsd*)
++*-freebsd*|*-kfreebsd*|*-netbsd*|*-dragonfly*)
      AC_DEFINE(AVMPLUS_UNIX)
      ;;
- *cygwin*|*mingw*|*mks*|*msvc*|*wince)
-@@ -4185,7 +4185,7 @@ if test "$MOZ_MEMORY"; then
-   darwin*)
+ *-gnu*)
+@@ -4880,7 +4880,7 @@ if test "$MOZ_MEMORY"; then
+   *-darwin*)
      AC_DEFINE(MOZ_MEMORY_DARWIN)
      ;;
--  *freebsd*)
-+  *freebsd*|dragonfly*)
+-  *-*freebsd*)
++  *-*freebsd*|*-*dragonfly*)
      AC_DEFINE(MOZ_MEMORY_BSD)
      ;;
-   *linux*)
+   *-*linux*)
diff --git a/www/seamonkey/patches/patch-at b/www/seamonkey/patches/patch-at
index 675edf0329d..a2cb4631fd6 100644
--- a/www/seamonkey/patches/patch-at
+++ b/www/seamonkey/patches/patch-at
@@ -1,9 +1,8 @@
-$NetBSD: patch-at,v 1.5 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-at,v 1.6 2011/07/11 20:46:36 tnn Exp $
 
-Treat DragonFly like FreeBSD.
 Avoid silly redefinitions of standard types on NetBSD.
 
---- mozilla/gfx/qcms/qcmstypes.h.orig	2009-08-24 17:52:41.000000000 +0200
+--- mozilla/gfx/qcms/qcmstypes.h.orig	2010-11-04 19:20:39.000000000 +0000
 +++ mozilla/gfx/qcms/qcmstypes.h
 @@ -10,6 +10,8 @@
  #if defined (__SVR4) && defined (__sun)
@@ -11,15 +10,6 @@ Avoid silly redefinitions of standard types on NetBSD.
  #include <sys/int_types.h>
 +#elif defined(__NetBSD__)
 +#include <stdint.h>
- #else
- typedef PRInt8 int8_t;
- typedef PRUint8 uint8_t;
-@@ -23,7 +25,7 @@ typedef PRUint64 uint64_t;
- #ifdef __OS2__
- /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
- #include <stdlib.h>
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- /* FreeBSD typedefs uintptr_t in /usr/include/sys/types.h */
- #else
- typedef PRUptrdiff uintptr_t;
+ #elif defined (_AIX)
+ #include <sys/types.h>
+ #elif !defined(ANDROID)
diff --git a/www/seamonkey/patches/patch-au b/www/seamonkey/patches/patch-au
index b7a37d19e27..dbfcd8324dc 100644
--- a/www/seamonkey/patches/patch-au
+++ b/www/seamonkey/patches/patch-au
@@ -1,9 +1,10 @@
-$NetBSD: patch-au,v 1.1 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-au,v 1.2 2011/07/11 20:46:36 tnn Exp $
 
-SOUND_VERSION just isn't a reliable way to detect features supported by
-particular OSS implementation.
+- 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	2009-06-29 18:15:03.000000000 +0200
+--- mozilla/media/libsydneyaudio/src/sydney_audio_oss.c.orig	2010-07-21 00:52:30.000000000 +0000
 +++ mozilla/media/libsydneyaudio/src/sydney_audio_oss.c
 @@ -51,9 +51,9 @@
  // support only versions newer than 3.6.1
@@ -18,7 +19,20 @@ particular OSS implementation.
  
  typedef struct sa_buf sa_buf;
  struct sa_buf {
-@@ -716,4 +716,4 @@ UNSUPPORTED(int sa_stream_drain(sa_strea
+@@ -201,7 +201,12 @@ sa_stream_create_pcm(
+     return SA_ERROR_SYSTEM;
+   }
+ 
++#if defined(__NetBSD__)
++  /* XXX should use DEVOSSAUDIO provided by pkgsrc. */
++  s->output_unit  = "/dev/audio";
++#else
+   s->output_unit  = "/dev/dsp";
++#endif
+   s->output_fd    = -1;
+   s->thread_id    = 0;
+   s->playing      = 0;
+@@ -721,4 +726,4 @@ UNSUPPORTED(int sa_stream_drain(sa_strea
  
  const char *sa_strerror(int code) { return NULL; }
  
diff --git a/www/seamonkey/patches/patch-ax b/www/seamonkey/patches/patch-ax
index 7efbfbd9b5a..db81d3d5af5 100644
--- a/www/seamonkey/patches/patch-ax
+++ b/www/seamonkey/patches/patch-ax
@@ -1,13 +1,13 @@
-$NetBSD: patch-ax,v 1.6 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-ax,v 1.7 2011/07/11 20:46:36 tnn Exp $
 
---- mozilla/xpcom/base/nsStackWalk.cpp.orig	2009-08-24 17:53:27.000000000 +0200
+--- mozilla/xpcom/base/nsStackWalk.cpp.orig	2010-12-15 01:03:41.000000000 +0000
 +++ mozilla/xpcom/base/nsStackWalk.cpp
-@@ -1124,7 +1124,7 @@ NS_FormatCodeAddressDetails(void *aPC, c
+@@ -1137,7 +1137,7 @@ NS_FormatCodeAddressDetails(void *aPC, c
  #define __USE_GNU
  #endif
  
--#if defined(HAVE_LIBDL) || defined(XP_MACOSX)
-+#if defined(HAVE_LIBDL) || defined(XP_MACOSX) || defined(__NetBSD__)
+-#if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
++#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__NetBSD__)
  #include <dlfcn.h>
  #endif
  
diff --git a/www/seamonkey/patches/patch-bb b/www/seamonkey/patches/patch-bb
deleted file mode 100644
index 06b5770b2a7..00000000000
--- a/www/seamonkey/patches/patch-bb
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-bb,v 1.3 2010/03/16 10:59:10 tnn Exp $
-
-Fix build using Sun Studio C++.
-
---- mozilla/memory/jemalloc/jemalloc.h.orig	2009-12-02 04:29:06.000000000 +0000
-+++ mozilla/memory/jemalloc/jemalloc.h	2010-01-09 23:24:34.000000000 +0000
-@@ -1,3 +1,4 @@
-+#ifndef  __cplusplus
- #ifndef MOZ_MEMORY_WINDOWS
- #  include <stdbool.h>
- #else
-@@ -6,6 +7,7 @@
- #    define bool BOOL
- #  endif
- #endif
-+#endif
- 
- extern const char	*_malloc_options;
- 
diff --git a/www/seamonkey/patches/patch-bd b/www/seamonkey/patches/patch-bd
new file mode 100644
index 00000000000..6e9912fcdd1
--- /dev/null
+++ b/www/seamonkey/patches/patch-bd
@@ -0,0 +1,27 @@
+$NetBSD: patch-bd,v 1.1 2011/07/11 20:46:36 tnn Exp $
+
+--- mozilla/js/src/ctypes/CTypes.cpp.orig	2010-11-04 19:20:39.000000000 +0000
++++ mozilla/js/src/ctypes/CTypes.cpp
+@@ -36,6 +36,22 @@
+  *
+  * ***** END LICENSE BLOCK ***** */
+ 
++#if defined(__NetBSD__)
++#include <stdint.h>
++/* XXX why do we have those funky __ #defines in stdint.h? */
++#warning this is a retarded workaround
++#define uint8_t uint8_t
++#define uint16_t uint16_t
++#define uint32_t uint32_t
++#define uint64_t uint64_t
++#define int8_t int8_t
++#define int16_t int16_t
++#define int32_t int32_t
++#define int64_t int64_t
++#define intptr_t intptr_t
++#define uintptr_t uintptr_t
++#endif
++
+ #include "CTypes.h"
+ #include "Library.h"
+ #include "jsnum.h"
diff --git a/www/seamonkey/patches/patch-be b/www/seamonkey/patches/patch-be
new file mode 100644
index 00000000000..7d2227df8a1
--- /dev/null
+++ b/www/seamonkey/patches/patch-be
@@ -0,0 +1,16 @@
+$NetBSD: patch-be,v 1.1 2011/07/11 20:46:36 tnn Exp $
+
+Disable all sound support for now since it causes
+crashes and doesn't work correctly anyway ...
+
+--- mozilla/widget/src/gtk2/nsSound.cpp.orig	2010-08-06 01:09:23.000000000 +0000
++++ mozilla/widget/src/gtk2/nsSound.cpp
+@@ -138,6 +138,8 @@ nsSound::Init()
+ 
+     mInited = PR_TRUE;
+ 
++    return NS_OK;
++
+     if (!elib) {
+         elib = PR_LoadLibrary("libesd.so.0");
+     }
diff --git a/www/seamonkey/patches/patch-bf b/www/seamonkey/patches/patch-bf
new file mode 100644
index 00000000000..3a225757328
--- /dev/null
+++ b/www/seamonkey/patches/patch-bf
@@ -0,0 +1,13 @@
+$NetBSD: patch-bf,v 1.1 2011/07/11 20:46:36 tnn Exp $
+
+--- mozilla/js/src/jsnativestack.cpp.orig	2011-06-15 21:57:29.000000000 +0000
++++ mozilla/js/src/jsnativestack.cpp
+@@ -145,7 +145,7 @@ GetNativeStackBaseImpl()
+     pthread_attr_init(&sattr);
+ #  if defined(__OpenBSD__)
+     stack_t ss;
+-#  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD)
++#  elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD) || defined(__NetBSD__) /* XXX tnn not sure why NETBSD isn't defined, it looks like it should be ... */
+     /* e.g. on FreeBSD 4.8 or newer, neundorf@kde.org */
+     pthread_attr_get_np(thread, &sattr);
+ #  else
diff --git a/www/seamonkey/patches/patch-bg b/www/seamonkey/patches/patch-bg
new file mode 100644
index 00000000000..df412f59a3f
--- /dev/null
+++ b/www/seamonkey/patches/patch-bg
@@ -0,0 +1,24 @@
+$NetBSD: patch-bg,v 1.1 2011/07/11 20:46:36 tnn Exp $
+
+--- mozilla/storage/src/SQLiteMutex.h.orig	2010-05-28 13:22:58.000000000 +0000
++++ mozilla/storage/src/SQLiteMutex.h
+@@ -141,15 +141,19 @@ public:
+   void assertCurrentThreadOwns()
+   {
+     NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
++#if 0 /* XXX tnn: this breaks the debug build. */
+     NS_ASSERTION(sqlite3_mutex_held(mMutex),
+                  "Mutex is not held, but we expect it to be!");
++#endif
+   }
+ 
+   void assertNotCurrentThreadOwns()
+   {
+     NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
++#if 0 /* XXX tnn: this breaks the debug build. */
+     NS_ASSERTION(sqlite3_mutex_notheld(mMutex),
+                  "Mutex is held, but we expect it to not be!");
++#endif
+   }
+ #endif // ifndef DEBUG
+ 
diff --git a/www/seamonkey/patches/patch-bi b/www/seamonkey/patches/patch-bi
new file mode 100644
index 00000000000..d5cb4c78003
--- /dev/null
+++ b/www/seamonkey/patches/patch-bi
@@ -0,0 +1,13 @@
+$NetBSD: patch-bi,v 1.1 2011/07/11 20:46:36 tnn Exp $
+
+--- mozilla/gfx/angle/src/compiler/osinclude.h.orig	2010-12-15 01:02:57.000000000 +0000
++++ mozilla/gfx/angle/src/compiler/osinclude.h
+@@ -16,7 +16,7 @@
+ #define ANGLE_OS_WIN
+ #elif defined(__APPLE__) || defined(__linux__) || \
+       defined(__FreeBSD__) || defined(__OpenBSD__) || \
+-      defined(__sun)
++      defined(__sun) || defined(__NetBSD__) || defined(__DragonFly__)
+ #define ANGLE_OS_POSIX
+ #else
+ #error Unsupported platform.
diff --git a/www/seamonkey/patches/patch-directory_c-sdk_configure.in b/www/seamonkey/patches/patch-directory_c-sdk_configure.in
deleted file mode 100644
index 86e3cbf1ca9..00000000000
--- a/www/seamonkey/patches/patch-directory_c-sdk_configure.in
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Add DragonFly support.
-https://bugzilla.mozilla.org/show_bug.cgi?id=577298
-
---- directory/c-sdk/configure.in.orig	2009-10-06 21:43:08.000000000 +0000
-+++ directory/c-sdk/configure.in
-@@ -1233,6 +1233,16 @@ tools are selected during the Xcode/Deve
-     _DEBUG_FLAGS=
-     ;;
- 
-+*-dragonfly*)
-+    if test -z "$USE_NSPR_THREADS"; then
-+        USE_PTHREADS=1
-+    fi
-+    AC_DEFINE(XP_UNIX)
-+    AC_DEFINE(DRAGONFLY)
-+    DSO_CFLAGS=-fPIC
-+    DSO_LDOPTS='-shared'
-+	;;
-+
- *-freebsd*)
-     if test -z "$USE_NSPR_THREADS"; then
-         USE_PTHREADS=1
diff --git a/www/seamonkey/patches/patch-directory_c-sdk_ldap_include_portable.h b/www/seamonkey/patches/patch-directory_c-sdk_ldap_include_portable.h
index 0156efaf5ad..9054947e003 100644
--- a/www/seamonkey/patches/patch-directory_c-sdk_ldap_include_portable.h
+++ b/www/seamonkey/patches/patch-directory_c-sdk_ldap_include_portable.h
@@ -1,16 +1,13 @@
-$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.3 2010/07/21 11:48:05 tnn Exp $
+$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.4 2011/07/11 20:46:36 tnn Exp $
 
-Add DragonFly support.
-https://bugzilla.mozilla.org/show_bug.cgi?id=577298
-
---- directory/c-sdk/ldap/include/portable.h.orig	2006-10-03 20:43:40.000000000 +0000
-+++ directory/c-sdk/ldap/include/portable.h
+--- ldap/sdks/c-sdk/ldap/include/portable.h.orig	2011-07-06 08:51:23.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
   */
  #ifndef NEED_BSDREGEX
--#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
-+#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined(DRAGONFLY) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
+-#if ( defined( SYSV ) || defined( NETBSD ) || defined( FREEBSD ) || defined(__OpenBSD__) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
++#if ( defined( SYSV ) || defined( NETBSD ) || defined(DRAGONFLY) || defined( FREEBSD ) || defined(__OpenBSD__) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
  #define NEED_BSDREGEX
 +/* there are conflicting prototypes in unistd.h on DragonFly */
 +#define re_comp ldap_compat_re_comp
@@ -18,21 +15,3 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=577298
  #endif
  #endif
  
-@@ -295,7 +298,7 @@ typedef char GETHOSTBYNAME_buf_t [NSLDAP
- #elif defined(HPUX10)
- #define GETHOSTBYNAME_BUF_T struct hostent_data
- #define GETHOSTBYNAME( n, r, b, l, e )	nsldapi_compat_gethostbyname_r( n, r, (char *)&b, l, e )
--#elif defined(LINUX)
-+#elif defined(LINUX) || defined(DRAGONFLY)
- typedef char GETHOSTBYNAME_buf_t [NSLDAPI_NETDB_BUF_SIZE];
- #define GETHOSTBYNAME_BUF_T GETHOSTBYNAME_buf_t
- #define GETHOSTBYNAME( n, r, b, l, rp, e )  gethostbyname_r( n, r, b, l, rp, e )
-@@ -317,7 +320,7 @@ typedef char GETHOSTBYNAME_buf_t [NSLDAP
- 	|| defined(OSF1V4) || defined(AIX) || defined(UnixWare) \
-         || defined(hpux) || defined(HPUX11) || defined(NETBSD) \
-         || defined(IRIX6) || defined(FREEBSD) || defined(VMS) \
--        || defined(NTO) || defined(OPENBSD)
-+        || defined(NTO) || defined(OPENBSD) || defined(DRAGONFLY)
- #define NSLDAPI_CTIME( c, b, l )        ctime_r( c, b )
- #elif defined( OSF1V3 )
- #define NSLDAPI_CTIME( c, b, l )	(ctime_r( c, b, l ) ? NULL : b)
diff --git a/www/seamonkey/patches/patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in b/www/seamonkey/patches/patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in
deleted file mode 100644
index b28f2bf66ed..00000000000
--- a/www/seamonkey/patches/patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Add DragonFly support.
-https://bugzilla.mozilla.org/show_bug.cgi?id=577298
-
---- directory/c-sdk/ldap/libraries/libldap/Makefile.in.orig	2008-12-24 09:39:55.000000000 +0000
-+++ directory/c-sdk/ldap/libraries/libldap/Makefile.in
-@@ -262,6 +262,10 @@ ifeq ($(OS_ARCH), OpenBSD)
- EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -pthread
- endif
- 
-+ifeq ($(OS_ARCH), DragonFly)
-+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
-+endif
-+
- ifeq ($(HAVE_SASL), 1)
- EXTRA_LIBS += $(SASL_LINK)
- endif
diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_debug__util__posic.cc b/www/seamonkey/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
new file mode 100644
index 00000000000..587a62073aa
--- /dev/null
+++ b/www/seamonkey/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
@@ -0,0 +1,35 @@
+$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.1 2011/07/11 20:46:36 tnn Exp $
+
+--- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig	2011-06-15 21:57:27.000000000 +0000
++++ mozilla/ipc/chromium/src/base/debug_util_posix.cc
+@@ -11,10 +11,10 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-#ifndef ANDROID
++#ifdef __linux__
+ #include <execinfo.h>
+-#include <sys/sysctl.h>
+ #endif
++#include <sys/sysctl.h>
+ 
+ #include "base/basictypes.h"
+ #include "base/eintr_wrapper.h"
+@@ -119,7 +119,7 @@ StackTrace::StackTrace() {
+   const int kMaxCallers = 256;
+ 
+   void* callers[kMaxCallers];
+-#ifndef ANDROID
++#ifdef __GLIBC__
+   int count = backtrace(callers, kMaxCallers);
+ #else
+   int count = 0;
+@@ -138,7 +138,7 @@ StackTrace::StackTrace() {
+ 
+ void StackTrace::PrintBacktrace() {
+   fflush(stderr);
+-#ifndef ANDROID
++#ifdef __GLIBC__
+   backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO);
+ #endif
+ }
diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util.h b/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util.h
new file mode 100644
index 00000000000..b424ad824db
--- /dev/null
+++ b/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.1 2011/07/11 20:46:36 tnn Exp $
+
+--- mozilla/ipc/chromium/src/base/file_util.h.orig	2011-06-15 21:57:27.000000000 +0000
++++ mozilla/ipc/chromium/src/base/file_util.h
+@@ -15,8 +15,9 @@
+ #elif defined(ANDROID)
+ #include <sys/stat.h>
+ #elif defined(OS_POSIX) 
+-#include <fts.h>
++#include <sys/types.h>
+ #include <sys/stat.h>
++#include <fts.h>
+ #endif
+ 
+ #include <stdio.h>
diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util__posix.cc b/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util__posix.cc
new file mode 100644
index 00000000000..54e3a83547a
--- /dev/null
+++ b/www/seamonkey/patches/patch-ipc_chromium_src_base_file__util__posix.cc
@@ -0,0 +1,14 @@
+$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.1 2011/07/11 20:46:36 tnn Exp $
+
+--- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig	2011-06-15 21:57:27.000000000 +0000
++++ mozilla/ipc/chromium/src/base/file_util_posix.cc
+@@ -30,6 +30,9 @@
+ #include "base/string_util.h"
+ #include "base/time.h"
+ 
++#ifndef __linux__
++#define stat64 stat
++#endif
+ namespace file_util {
+ 
+ #if defined(GOOGLE_CHROME_BUILD)
diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc b/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
new file mode 100644
index 00000000000..50e43660b1f
--- /dev/null
+++ b/www/seamonkey/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
@@ -0,0 +1,24 @@
+$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.1 2011/07/11 20:46:36 tnn Exp $
+
+--- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig	2011-06-15 21:57:27.000000000 +0000
++++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc
+@@ -9,6 +9,8 @@
+ 
+ #if defined(OS_MACOSX)
+ #include <mach/mach.h>
++#elif defined(OS_NETBSD)
++#include <lwp.h>
+ #elif defined(OS_LINUX)
+ #include <sys/syscall.h>
+ #include <unistd.h>
+@@ -33,6 +35,10 @@ PlatformThreadId PlatformThread::Current
+   // into the kernel.
+ #if defined(OS_MACOSX)
+   return mach_thread_self();
++#elif defined(OS_NETBSD)
++  return _lwp_self();
++#elif defined(OS_DRAGONFLY)
++#error No DragonFly support. hint: look at FreeBSD ports.
+ #elif defined(OS_LINUX)
+   return syscall(__NR_gettid);
+ #endif
diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_sys__info__posix.cc b/www/seamonkey/patches/patch-ipc_chromium_src_base_sys__info__posix.cc
new file mode 100644
index 00000000000..912548bda3c
--- /dev/null
+++ b/www/seamonkey/patches/patch-ipc_chromium_src_base_sys__info__posix.cc
@@ -0,0 +1,37 @@
+$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.1 2011/07/11 20:46:36 tnn Exp $
+
+--- mozilla/ipc/chromium/src/base/sys_info_posix.cc.orig	2011-06-15 21:57:27.000000000 +0000
++++ mozilla/ipc/chromium/src/base/sys_info_posix.cc
+@@ -18,6 +18,11 @@
+ #include <mach/mach_init.h>
+ #endif
+ 
++#if defined(OS_NETBSD)
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#endif
++
+ #include "base/logging.h"
+ #include "base/string_util.h"
+ 
+@@ -52,6 +57,20 @@ int64 SysInfo::AmountOfPhysicalMemory() 
+   }
+ 
+   return static_cast<int64>(hostinfo.max_mem);
++#elif defined(OS_NETBSD)
++  int mib[2];
++  int rc;
++  int64_t memSize;
++  size_t len = sizeof(memSize);
++
++  mib[0] = CTL_HW;
++  mib[1] = HW_PHYSMEM64;
++  rc = sysctl( mib, 2, &memSize, &len, NULL, 0 );
++  if (-1 != rc)  {
++    return memSize;
++  }
++  return 0;
++
+ #else
+   long pages = sysconf(_SC_PHYS_PAGES);
+   long page_size = sysconf(_SC_PAGE_SIZE);
diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h b/www/seamonkey/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h
new file mode 100644
index 00000000000..ee79fa2f957
--- /dev/null
+++ b/www/seamonkey/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.1 2011/07/11 20:46:36 tnn Exp $
+
+--- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig	2011-06-15 21:57:27.000000000 +0000
++++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h
+@@ -34,7 +34,7 @@
+ #include "base/third_party/nspr/prcpucfg_win.h"
+ #elif defined(__APPLE__)
+ #include "base/third_party/nspr/prcpucfg_mac.h"
+-#elif defined(__linux__) || defined(ANDROID)
++#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__DragonFly__)
+ #include "base/third_party/nspr/prcpucfg_linux.h"
+ #else
+ #error Provide a prcpucfg.h appropriate for your platform
diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_build_build__config.h b/www/seamonkey/patches/patch-ipc_chromium_src_build_build__config.h
new file mode 100644
index 00000000000..ce9726ea4e1
--- /dev/null
+++ b/www/seamonkey/patches/patch-ipc_chromium_src_build_build__config.h
@@ -0,0 +1,34 @@
+$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.1 2011/07/11 20:46:36 tnn Exp $
+
+--- mozilla/ipc/chromium/src/build/build_config.h.orig	2011-06-15 21:57:27.000000000 +0000
++++ mozilla/ipc/chromium/src/build/build_config.h
+@@ -19,6 +19,10 @@
+ #define OS_MACOSX 1
+ #elif defined(__linux__) || defined(ANDROID)
+ #define OS_LINUX 1
++#elif defined(__NetBSD__)
++#define OS_NETBSD 1
++#elif defined(__DragonFly__)
++#define OS_DRAGONFLY 1
+ #elif defined(_WIN32)
+ #define OS_WIN 1
+ #else
+@@ -27,7 +31,7 @@
+ 
+ // For access to standard POSIX features, use OS_POSIX instead of a more
+ // specific macro.
+-#if defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_NETBSD) || defined(OS_DRAGONFLY)
+ #define OS_POSIX 1
+ #endif
+ 
+@@ -60,6 +64,9 @@
+ #elif defined(__ppc__)
+ #define ARCH_CPU_PPC 1
+ #define ARCH_CPU_32_BITS 1
++#elif defined(__sparc64__)
++#define ARCH_CPU_SPARC 1
++#define ARCH_CPU_64_BITS 1
+ #else
+ #error Please add support for your architecture in build/build_config.h
+ #endif
diff --git a/www/seamonkey/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h b/www/seamonkey/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h
new file mode 100644
index 00000000000..59f23b7ecd3
--- /dev/null
+++ b/www/seamonkey/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h,v 1.1 2011/07/11 20:46:36 tnn Exp $
+
+--- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.h.orig	2011-06-15 21:57:27.000000000 +0000
++++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.h
+@@ -92,7 +92,7 @@ class Channel::ChannelImpl : public Mess
+   };
+ 
+   // This is a control message buffer large enough to hold kMaxReadFDs
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_NETBSD)
+   // TODO(agl): OSX appears to have non-constant CMSG macros!
+   char input_cmsg_buf_[1024];
+ #else
diff --git a/www/seamonkey/patches/patch-ma-toplevel b/www/seamonkey/patches/patch-ma-toplevel
index 79cbdac5a7f..1a26a51accb 100644
--- a/www/seamonkey/patches/patch-ma-toplevel
+++ b/www/seamonkey/patches/patch-ma-toplevel
@@ -1,8 +1,8 @@
-$NetBSD: patch-ma-toplevel,v 1.1 2009/11/29 00:40:48 tnn Exp $
+$NetBSD: patch-ma-toplevel,v 1.2 2011/07/11 20:46:36 tnn Exp $
 
---- config/autoconf.mk.in.orig	2009-10-25 15:29:01.000000000 +0100
+--- config/autoconf.mk.in.orig	2011-07-06 08:40:27.000000000 +0000
 +++ config/autoconf.mk.in
-@@ -62,14 +62,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+@@ -60,14 +60,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
diff --git a/www/seamonkey/patches/patch-mb b/www/seamonkey/patches/patch-mb
index 923f91f43dc..1d908699500 100644
--- a/www/seamonkey/patches/patch-mb
+++ b/www/seamonkey/patches/patch-mb
@@ -1,32 +1,39 @@
-$NetBSD: patch-mb,v 1.1 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-mb,v 1.2 2011/07/11 20:46:36 tnn Exp $
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2009-06-29 18:15:32.000000000 +0200
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2011-06-15 21:58:01.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -64,14 +64,21 @@ include $(topsrcdir)/config/config.mk
- #
- # Lots of Unixish x86 flavors
- #
--ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS Darwin,$(OS_ARCH)))
-+ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD BSD_OS Darwin,$(OS_ARCH)))
-+ifeq (x86_64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+else
+@@ -97,7 +97,7 @@ endif
+ endif
+ endif
+ 
+-ifneq (,$(filter NetBSD OpenBSD BSD_OS GNU,$(OS_ARCH)))
++ifneq (,$(filter BSD_OS GNU,$(OS_ARCH)))
  ifeq (86,$(findstring 86,$(OS_TEST)))
  CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
-+endif
-+ifeq (amd64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+endif
-+endif
- ifeq (Darwin,$(OS_ARCH))
- DEFINES		+= -DKEEP_STACK_16_BYTE_ALIGNED
+ endif
+@@ -106,7 +106,7 @@ endif
+ # New code for Linux, et. al., with gcc
+ # Migrate other platforms here after testing
+ #
+-ifneq (,$(filter Linux FreeBSD GNU_%,$(OS_ARCH)))
++ifneq (,$(filter Linux NetBSD DragonFly FreeBSD OpenBSD GNU_%,$(OS_ARCH)))
+ # Linux/x86-64
+ ifeq (x86_64,$(OS_TEST))
+ CPPSRCS		:= xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
+@@ -124,12 +124,6 @@ ASFILES		:= xptcstubs_asm_ipf64.s xptcin
  endif
  endif
+ #
+-# OpenBSD/amd64
+-#
+-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64)
+-CPPSRCS		:= xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
 -endif
+-#
+ # Neutrino/Intel (uses the same unixish_x86 code)
  #
- # New code for Linux, et. al., with gcc
- # Migrate other platforms here after testing
-@@ -185,7 +192,7 @@ endif
+ ifeq ($(OS_TARGET),NTO)
+@@ -212,7 +206,7 @@ endif
  # NetBSD/ARM
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -35,7 +42,7 @@ $NetBSD: patch-mb,v 1.1 2010/03/16 10:59:10 tnn Exp $
  CPPSRCS		:= xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
  endif
  endif
-@@ -240,7 +247,7 @@ endif
+@@ -269,7 +263,7 @@ endif
  # NetBSD/m68k
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -44,7 +51,7 @@ $NetBSD: patch-mb,v 1.1 2010/03/16 10:59:10 tnn Exp $
  CPPSRCS		:= xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
  endif
  endif
-@@ -325,9 +332,10 @@ endif
+@@ -359,9 +353,10 @@ endif
  #
  # NetBSD/PPC
  #
@@ -56,7 +63,7 @@ $NetBSD: patch-mb,v 1.1 2010/03/16 10:59:10 tnn Exp $
  endif
  
  #
-@@ -399,6 +407,13 @@ CPPSRCS		:= xptcinvoke_sparc64_openbsd.c
+@@ -433,6 +428,13 @@ CPPSRCS		:= xptcinvoke_sparc64_openbsd.c
  ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
  endif
  #
diff --git a/www/seamonkey/patches/patch-me b/www/seamonkey/patches/patch-me
index 791bfa895bf..8ea8e7d089e 100644
--- a/www/seamonkey/patches/patch-me
+++ b/www/seamonkey/patches/patch-me
@@ -1,22 +1,10 @@
-$NetBSD: patch-me,v 1.2 2010/04/26 12:38:00 tnn Exp $
+$NetBSD: patch-me,v 1.3 2011/07/11 20:46:36 tnn Exp $
 
 Add DragonFly support.
-Disable assembly routines in freebl on Linux (PR pkg/43146)
 
---- mozilla/security/nss/lib/freebl/Makefile.orig	2010-03-17 18:33:57.000000000 +0000
+--- mozilla/security/nss/lib/freebl/Makefile.orig	2009-06-29 18:15:13.000000000 +0200
 +++ mozilla/security/nss/lib/freebl/Makefile
-@@ -154,7 +154,9 @@ ifeq ($(USE_N32),1)
- endif
- endif
- 
--ifeq ($(OS_TARGET),Linux)
-+# pkgsrc PR pkg/43146
-+#ifeq ($(OS_TARGET),Linux)
-+ifeq (true, false)
- ifeq ($(CPU_ARCH),x86_64)
-     ASFILES  = arcfour-amd64-gas.s mpi_amd64_gas.s
-     ASFLAGS += -march=opteron -m64 -fPIC -Wa,--noexecstack
-@@ -224,7 +226,7 @@ endif
+@@ -212,7 +212,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/www/seamonkey/patches/patch-mh b/www/seamonkey/patches/patch-mh
new file mode 100644
index 00000000000..0893ecee650
--- /dev/null
+++ b/www/seamonkey/patches/patch-mh
@@ -0,0 +1,13 @@
+$NetBSD: patch-mh,v 1.1 2011/07/11 20:46:36 tnn Exp $
+
+--- mozilla/security/nss/lib/Makefile.orig	2011-03-18 23:34:05.000000000 +0000
++++ mozilla/security/nss/lib/Makefile
+@@ -70,7 +70,7 @@ endif
+ 
+ ifndef MOZILLA_CLIENT
+ ifeq ($(OS_ARCH),Linux)
+-SYSINIT_SRCDIR = sysinit  # Add the sysinit directory to DIRS.
++#SYSINIT_SRCDIR = sysinit  # Add the sysinit directory to DIRS.
+ endif
+ endif
+ 
diff --git a/www/seamonkey/patches/patch-mk b/www/seamonkey/patches/patch-mk
index b537247517b..6cdde250a41 100644
--- a/www/seamonkey/patches/patch-mk
+++ b/www/seamonkey/patches/patch-mk
@@ -1,4 +1,4 @@
-$NetBSD: patch-mk,v 1.1 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-mk,v 1.2 2011/07/11 20:46:36 tnn Exp $
 
 Treat DragonFly like FreeBSD.
 
diff --git a/www/seamonkey/patches/patch-mm b/www/seamonkey/patches/patch-mm
index 821c33332bc..260181342a1 100644
--- a/www/seamonkey/patches/patch-mm
+++ b/www/seamonkey/patches/patch-mm
@@ -1,30 +1,18 @@
-$NetBSD: patch-mm,v 1.2 2010/09/09 11:12:27 tnn Exp $
+$NetBSD: patch-mm,v 1.3 2011/07/11 20:46:36 tnn Exp $
 
-Don't link with -lCstd on Solaris when using GCC. From Tim Zingelman.
-part of PR pkg/39085
-
---- mozilla/toolkit/library/Makefile.in.orig	2010-08-24 21:32:11.000000000 +0000
+--- mozilla/toolkit/library/Makefile.in.orig	2011-06-15 21:58:10.000000000 +0000
 +++ mozilla/toolkit/library/Makefile.in
-@@ -253,7 +253,10 @@ EXTRA_DSO_LDOPTS += -lbe -ltracker
- endif
- 
- ifeq ($(OS_ARCH),SunOS)
--EXTRA_DSO_LDOPTS += -lelf -ldemangle -lCstd
-+EXTRA_DSO_LDOPTS += -lelf -ldemangle
-+ifndef GNU_CC
-+EXTRA_DSO_LDOPTS += -lCstd
-+endif
- endif
- 
- ifeq ($(OS_ARCH),AIX)
-@@ -262,6 +265,10 @@ EXTRA_DSO_LDOPTS += -bbigtoc 
+@@ -216,6 +216,13 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
  endif
  endif
  
 +ifeq ($(OS_ARCH),NetBSD)
 +EXTRA_DSO_LDOPTS += -lossaudio
 +endif
++ifdef PKGSRC_PULSEAUDIO
++EXTRA_DSO_LDOPTS += -lpulse
++endif
 +
  ifeq ($(OS_ARCH),WINNT)
- EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32)
+ OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32 shlwapi psapi ws2_32 dbghelp)
  ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
diff --git a/www/seamonkey/patches/patch-mp b/www/seamonkey/patches/patch-mp
index 92a1e8f2262..c8c8e676bd6 100644
--- a/www/seamonkey/patches/patch-mp
+++ b/www/seamonkey/patches/patch-mp
@@ -1,29 +1,17 @@
-$NetBSD: patch-mp,v 1.2 2010/07/21 18:25:05 tnn Exp $
+$NetBSD: patch-mp,v 1.3 2011/07/11 20:46:36 tnn Exp $
 
---- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2010-07-13 19:10:28.000000000 +0000
+--- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2010-07-21 00:52:30.000000000 +0000
 +++ mozilla/media/libsydneyaudio/src/Makefile.in
-@@ -83,6 +83,24 @@ CSRCS         = \
-               $(NULL)
+@@ -97,6 +97,12 @@ ifeq ($(OS_ARCH),WINNT)
+ OS_LIBS += winmm.lib
  endif
  
-+ifeq ($(OS_ARCH),DragonFly)
-+CSRCS		= \
-+		sydney_audio_oss.c \
-+		$(NULL)
-+endif
-+
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS		= \
-+		sydney_audio_oss.c \
-+		$(NULL)
-+endif
-+
-+ifeq ($(OS_ARCH),NetBSD)
++ifdef PKGSRC_PULSEAUDIO
 +CSRCS		= \
-+		sydney_audio_oss.c \
++		sydney_audio_pulseaudio.c \
 +		$(NULL)
 +endif
 +
- ifeq ($(OS_ARCH),WINNT)
- OS_LIBS += winmm.lib
- endif
+ include $(topsrcdir)/config/rules.mk
+ 
+ LOCAL_INCLUDES += -I$(srcdir)/../include
diff --git a/www/seamonkey/patches/patch-na b/www/seamonkey/patches/patch-na
deleted file mode 100644
index c17401d28de..00000000000
--- a/www/seamonkey/patches/patch-na
+++ /dev/null
@@ -1,122 +0,0 @@
-$NetBSD: patch-na,v 1.1 2010/03/16 10:59:10 tnn Exp $
-
-# reported upstream as:
-#   https://bugzilla.mozilla.org/show_bug.cgi?id=512802
-
---- mozilla/js/src/jsscript.cpp.orig	2009-08-24 01:32:14.000000000 +0200
-+++ mozilla/js/src/jsscript.cpp	2009-08-24 01:36:20.000000000 +0200
-@@ -1370,19 +1370,49 @@ js_NewScript(JSContext *cx, uint32 lengt
-     size_t size, vectorSize;
-     JSScript *script;
-     uint8 *cursor;
-+#ifdef _LP64
-+#define LP64_ALIGN(V)  if ((V) & 7) (V) = (((V)|7) + 1)
-+#define LP64_ALIGNP(P)  if ((uintptr_t)(P) & 7) (P) = (uint8*)(((uintptr_t)(P)|7) + 1)
-+#else
-+#define LP64_ALIGN(V)
-+#define LP64_ALIGNP(V)
-+#endif
- 
--    size = sizeof(JSScript) +
--           sizeof(JSAtom *) * natoms +
--           length * sizeof(jsbytecode) +
--           nsrcnotes * sizeof(jssrcnote);
--    if (nobjects != 0)
--        size += sizeof(JSObjectArray) + nobjects * sizeof(JSObject *);
--    if (nupvars != 0)
--        size += sizeof(JSUpvarArray) + nupvars * sizeof(uint32);
--    if (nregexps != 0)
--        size += sizeof(JSObjectArray) + nregexps * sizeof(JSObject *);
--    if (ntrynotes != 0)
--        size += sizeof(JSTryNoteArray) + ntrynotes * sizeof(JSTryNote);
-+    size = sizeof(JSScript);
-+    if (nobjects != 0) {
-+	LP64_ALIGN(size);
-+        size += sizeof(JSObjectArray);
-+    }
-+    if (nupvars != 0) {
-+	LP64_ALIGN(size);
-+        size += sizeof(JSUpvarArray);
-+    }
-+    if (nregexps != 0) {
-+	LP64_ALIGN(size);
-+        size += sizeof(JSObjectArray);
-+    }
-+    if (ntrynotes != 0) {
-+	LP64_ALIGN(size);
-+        size += sizeof(JSTryNoteArray);
-+    }
-+    if (natoms != 0) {
-+	LP64_ALIGN(size);
-+	size += sizeof(JSAtom *) * natoms;
-+    }
-+    if (nobjects != 0) {
-+	LP64_ALIGN(size);
-+        size += nobjects * sizeof(JSObject *);
-+    }
-+    if (nupvars != 0) {
-+        size += nupvars * sizeof(uint32);
-+    }
-+    if (nregexps != 0) {
-+	LP64_ALIGN(size);
-+        size += nregexps * sizeof(JSObject *);
-+    }
-+    size += length * sizeof(jsbytecode) +
-+	nsrcnotes * sizeof(jssrcnote) +
-+	ntrynotes * sizeof(JSTryNote);
- 
-     script = (JSScript *) JS_malloc(cx, size);
-     if (!script)
-@@ -1393,23 +1423,28 @@ js_NewScript(JSContext *cx, uint32 lengt
- 
-     cursor = (uint8 *)script + sizeof(JSScript);
-     if (nobjects != 0) {
-+	LP64_ALIGNP(cursor);
-         script->objectsOffset = (uint8)(cursor - (uint8 *)script);
-         cursor += sizeof(JSObjectArray);
-     }
-     if (nupvars != 0) {
-+	LP64_ALIGNP(cursor);
-         script->upvarsOffset = (uint8)(cursor - (uint8 *)script);
-         cursor += sizeof(JSUpvarArray);
-     }
-     if (nregexps != 0) {
-+	LP64_ALIGNP(cursor);
-         script->regexpsOffset = (uint8)(cursor - (uint8 *)script);
-         cursor += sizeof(JSObjectArray);
-     }
-     if (ntrynotes != 0) {
-+	LP64_ALIGNP(cursor);
-         script->trynotesOffset = (uint8)(cursor - (uint8 *)script);
-         cursor += sizeof(JSTryNoteArray);
-     }
- 
-     if (natoms != 0) {
-+	LP64_ALIGNP(cursor);
-         script->atomMap.length = natoms;
-         script->atomMap.vector = (JSAtom **)cursor;
-         vectorSize = natoms * sizeof(script->atomMap.vector[0]);
-@@ -1423,6 +1458,7 @@ js_NewScript(JSContext *cx, uint32 lengt
-     }
- 
-     if (nobjects != 0) {
-+	LP64_ALIGNP(cursor);
-         JS_SCRIPT_OBJECTS(script)->length = nobjects;
-         JS_SCRIPT_OBJECTS(script)->vector = (JSObject **)cursor;
-         vectorSize = nobjects * sizeof(JS_SCRIPT_OBJECTS(script)->vector[0]);
-@@ -1431,6 +1467,7 @@ js_NewScript(JSContext *cx, uint32 lengt
-     }
- 
-     if (nupvars != 0) {
-+	LP64_ALIGNP(cursor);
-         JS_SCRIPT_UPVARS(script)->length = nupvars;
-         JS_SCRIPT_UPVARS(script)->vector = (uint32 *)cursor;
-         vectorSize = nupvars * sizeof(JS_SCRIPT_UPVARS(script)->vector[0]);
-@@ -1439,6 +1476,7 @@ js_NewScript(JSContext *cx, uint32 lengt
-     }
- 
-     if (nregexps != 0) {
-+	LP64_ALIGNP(cursor);
-         JS_SCRIPT_REGEXPS(script)->length = nregexps;
-         JS_SCRIPT_REGEXPS(script)->vector = (JSObject **)cursor;
-         vectorSize = nregexps * sizeof(JS_SCRIPT_REGEXPS(script)->vector[0]);
diff --git a/www/seamonkey/patches/patch-nd b/www/seamonkey/patches/patch-nd
deleted file mode 100644
index 0f39fdf193a..00000000000
--- a/www/seamonkey/patches/patch-nd
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-nd,v 1.1 2010/03/16 10:59:10 tnn Exp $
-
-# reported upstream as
-#   https://bugzilla.mozilla.org/show_bug.cgi?id=514002
-
---- mozilla/gfx/qcms/iccread.c.orig	2009-07-30 17:30:16.000000000 +0200
-+++ mozilla/gfx/qcms/iccread.c	2009-09-01 21:29:29.000000000 +0200
-@@ -23,6 +23,7 @@
- #include <math.h>
- #include <assert.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "qcmsint.h"
- 
- //XXX: use a better typename
-@@ -84,7 +85,9 @@ static uint32_t read_u32(struct mem_sour
- 		invalid_source(mem, "Invalid offset");
- 		return 0;
- 	} else {
--		return be32_to_cpu(*(__be32*)(mem->buf + offset));
-+		uint32_t v;
-+		memcpy(&v, mem->buf + offset, 4);
-+		return be32_to_cpu(v);
- 	}
- }
- 
-@@ -94,7 +97,9 @@ static uint16_t read_u16(struct mem_sour
- 		invalid_source(mem, "Invalid offset");
- 		return 0;
- 	} else {
--		return be16_to_cpu(*(__be16*)(mem->buf + offset));
-+		uint16_t v;
-+		memcpy(&v, mem->buf + offset, 2);
-+		return be16_to_cpu(v);
- 	}
- }
- 
diff --git a/www/seamonkey/patches/patch-pa b/www/seamonkey/patches/patch-pa
index 4520459181c..0ba6e64d61f 100644
--- a/www/seamonkey/patches/patch-pa
+++ b/www/seamonkey/patches/patch-pa
@@ -1,12 +1,11 @@
-$NetBSD: patch-pa,v 1.1 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-pa,v 1.2 2011/07/11 20:46:36 tnn Exp $
 
---- mozilla/xulrunner/installer/mozilla-js.pc.in.orig	2009-06-29 18:15:36.000000000 +0200
+--- mozilla/xulrunner/installer/mozilla-js.pc.in.orig	2010-11-04 19:20:39.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 -lmozjs
--Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
-+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lmozjs
-+Cflags: -I${includedir}/stable -I${includedir}/unstable -DXP_UNIX -DJS_THREADSAFE
+-Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
++Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner %MOZ_JS_LINK%
+ Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
diff --git a/www/seamonkey/patches/patch-pb b/www/seamonkey/patches/patch-pb
index e5e5f3d107a..aca92870ce3 100644
--- a/www/seamonkey/patches/patch-pb
+++ b/www/seamonkey/patches/patch-pb
@@ -1,11 +1,11 @@
-$NetBSD: patch-pb,v 1.1 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-pb,v 1.2 2011/07/11 20:46:36 tnn Exp $
 
---- mozilla/xulrunner/installer/libxul.pc.in.orig	2009-06-29 18:15:36.000000000 +0200
+--- mozilla/xulrunner/installer/libxul.pc.in.orig	2010-11-04 19:20:39.000000000 +0000
 +++ mozilla/xulrunner/installer/libxul.pc.in
-@@ -12,5 +12,5 @@ Name: libxul
+@@ -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 -lxpcomglue_s -lxul -lxpcom
-+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lxpcomglue_s -lxul -lxpcom
- Cflags: -I${includedir}/${includetype} %WCHAR_CFLAGS%
+-Libs: -L${sdkdir}/lib %MOZ_XUL_LINK%
++Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner %MOZ_XUL_LINK%
+ Cflags: -I${includedir} %WCHAR_CFLAGS%
diff --git a/www/seamonkey/patches/patch-pc b/www/seamonkey/patches/patch-pc
index 955b5095ff2..c89a17b3831 100644
--- a/www/seamonkey/patches/patch-pc
+++ b/www/seamonkey/patches/patch-pc
@@ -1,11 +1,12 @@
-$NetBSD: patch-pc,v 1.1 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-pc,v 1.2 2011/07/11 20:46:36 tnn Exp $
 
---- mozilla/xulrunner/installer/libxul-embedding.pc.in.orig	2009-06-29 18:15:36.000000000 +0200
+--- mozilla/xulrunner/installer/libxul-embedding.pc.in.orig	2010-04-21 09:07:48.000000000 +0000
 +++ mozilla/xulrunner/installer/libxul-embedding.pc.in
-@@ -11,5 +11,5 @@ includetype=stable
+@@ -6,5 +6,6 @@ idldir=%idldir%
  Name: libxul-embedding
  Description: Static library for version-independent embedding of the Mozilla runtime
  Version: %MOZILLA_VERSION%
--Libs: -L${sdkdir}/lib -lxpcomglue
+-Libs: -L${sdkdir}/lib -lxpcomglue -ldl
++# XXXtnn -ldl removed
 +Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lxpcomglue
- Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS%
+ Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
diff --git a/www/seamonkey/patches/patch-pd b/www/seamonkey/patches/patch-pd
index dc3231e9e9c..df2a232a47d 100644
--- a/www/seamonkey/patches/patch-pd
+++ b/www/seamonkey/patches/patch-pd
@@ -1,6 +1,6 @@
-$NetBSD: patch-pd,v 1.1 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-pd,v 1.2 2011/07/11 20:46:36 tnn Exp $
 
---- mozilla/xulrunner/installer/mozilla-nss.pc.in.orig	2009-10-16 17:14:30.000000000 +0200
+--- mozilla/xulrunner/installer/mozilla-nss.pc.in.orig	2009-10-29 23:11:24.000000000 +0100
 +++ mozilla/xulrunner/installer/mozilla-nss.pc.in
 @@ -6,5 +6,5 @@ Name: NSS
  Description: Mozilla Network Security Services
@@ -8,4 +8,4 @@ $NetBSD: patch-pd,v 1.1 2010/03/16 10:59:10 tnn Exp $
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
 -Libs: -L${sdkdir}/lib -lsmime3 -lssl3 -lnss3 -lnssutil3
 +Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lsmime3 -lssl3 -lnss3 -lnssutil3
- Cflags: -I${includedir}/stable
+ Cflags: -I${includedir}
diff --git a/www/seamonkey/patches/patch-pe b/www/seamonkey/patches/patch-pe
deleted file mode 100644
index dc72fa52bd6..00000000000
--- a/www/seamonkey/patches/patch-pe
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-pe,v 1.1 2010/03/16 10:59:10 tnn Exp $
-
---- mozilla/xulrunner/installer/libxul-unstable.pc.in.orig	2009-06-29 18:15:36.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul-unstable.pc.in
-@@ -8,5 +8,5 @@ Name: libxul
- Description: The Mozilla Runtime and Embedding Engine (unstable API)
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
--Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
-+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lxpcomglue_s -lxul -lxpcom
- Cflags: -I${includedir}/${includetype} %WCHAR_CFLAGS%
diff --git a/www/seamonkey/patches/patch-pf b/www/seamonkey/patches/patch-pf
deleted file mode 100644
index 46216305beb..00000000000
--- a/www/seamonkey/patches/patch-pf
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-pf,v 1.1 2010/03/16 10:59:10 tnn Exp $
-
---- mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.orig	2009-06-29 18:15:36.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in
-@@ -7,5 +7,5 @@ includetype=unstable
- Name: libxul-embedding-unstable
- Description: Static library for version-independent embedding of the Mozilla runtime (unstable API)
- Version: %MOZILLA_VERSION%
--Libs: -L${sdkdir}/lib -lxpcomglue
-+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lxpcomglue
- Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS%
diff --git a/www/seamonkey/patches/patch-pg b/www/seamonkey/patches/patch-pg
index 849e71901be..9db755ee691 100644
--- a/www/seamonkey/patches/patch-pg
+++ b/www/seamonkey/patches/patch-pg
@@ -1,6 +1,6 @@
-$NetBSD: patch-pg,v 1.1 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-pg,v 1.2 2011/07/11 20:46:36 tnn Exp $
 
---- mozilla/xulrunner/installer/mozilla-nspr.pc.in.orig	2009-06-29 18:15:36.000000000 +0200
+--- mozilla/xulrunner/installer/mozilla-nspr.pc.in.orig	2009-10-29 23:11:24.000000000 +0100
 +++ mozilla/xulrunner/installer/mozilla-nspr.pc.in
 @@ -5,7 +5,5 @@ includedir=%includedir%
  Name: NSPR
@@ -11,4 +11,4 @@ $NetBSD: patch-pg,v 1.1 2010/03/16 10:59:10 tnn Exp $
 -
 -
 +Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lplds4 -lplc4 -lnspr4 -pthread
-+Cflags: -I${includedir}/stable
++Cflags: -I${includedir}
diff --git a/www/seamonkey/patches/patch-ra b/www/seamonkey/patches/patch-ra
deleted file mode 100644
index 33c68bf0aab..00000000000
--- a/www/seamonkey/patches/patch-ra
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ra,v 1.1 2010/03/16 10:59:10 tnn Exp $
-
---- mozilla/browser/branding/unofficial/locales/browserconfig.properties.orig	2009-08-24 17:52:36.000000000 +0200
-+++ mozilla/browser/branding/unofficial/locales/browserconfig.properties
-@@ -1,3 +1,3 @@
- # Do NOT localize or otherwise change these values
--browser.startup.homepage=http://www.mozilla.org/projects/shiretoko/
-+browser.startup.homepage=http://www.google.com/firefox
- 
diff --git a/www/seamonkey/patches/patch-rc b/www/seamonkey/patches/patch-rc
index 6594e57a239..200a8cb3e3f 100644
--- a/www/seamonkey/patches/patch-rc
+++ b/www/seamonkey/patches/patch-rc
@@ -1,12 +1,11 @@
-$NetBSD: patch-rc,v 1.1 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-rc,v 1.2 2011/07/11 20:46:36 tnn Exp $
 
---- mozilla/browser/branding/unofficial/locales/en-US/brand.dtd.orig	2009-08-24 17:52:36.000000000 +0200
+--- mozilla/browser/branding/unofficial/locales/en-US/brand.dtd.orig	2011-01-22 00:24:21.000000000 +0000
 +++ mozilla/browser/branding/unofficial/locales/en-US/brand.dtd
-@@ -1,5 +1,5 @@
--<!ENTITY  brandShortName        "Shiretoko">
--<!ENTITY  brandFullName         "Shiretoko">
+@@ -1,4 +1,4 @@
+-<!ENTITY  brandShortName        "Mozilla Developer Preview">
+-<!ENTITY  brandFullName         "Mozilla Developer Preview">
 +<!ENTITY  brandShortName        "Browser">
 +<!ENTITY  brandFullName         "Browser">
  <!ENTITY  vendorShortName       "mozilla.org">
- <!ENTITY  logoCopyright         " ">
- 
+ <!ENTITY  trademarkInfo.part1   " ">
diff --git a/www/seamonkey/patches/patch-toolkit_toolkit-tiers.mk b/www/seamonkey/patches/patch-toolkit_toolkit-tiers.mk
new file mode 100644
index 00000000000..a97f9bec041
--- /dev/null
+++ b/www/seamonkey/patches/patch-toolkit_toolkit-tiers.mk
@@ -0,0 +1,13 @@
+$NetBSD: patch-toolkit_toolkit-tiers.mk,v 1.1 2011/07/11 20:46:36 tnn Exp $
+
+--- mozilla/toolkit/toolkit-tiers.mk.orig	2011-06-15 21:57:56.000000000 +0000
++++ mozilla/toolkit/toolkit-tiers.mk
+@@ -90,7 +90,7 @@ 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
+ 
+ tier_platform_dirs	+= gfx/qcms
diff --git a/www/seamonkey/patches/patch-xg b/www/seamonkey/patches/patch-xg
index aa78e6bc7e7..53814dce9d0 100644
--- a/www/seamonkey/patches/patch-xg
+++ b/www/seamonkey/patches/patch-xg
@@ -1,4 +1,4 @@
-$NetBSD: patch-xg,v 1.1 2010/03/16 10:59:10 tnn Exp $
+$NetBSD: patch-xg,v 1.2 2011/07/11 20:46:36 tnn Exp $
 
 NetBSD/arm xptcall support code. From pkgsrc/www/firefox/patch-bm.
 
diff --git a/www/seamonkey/patches/patch-xh b/www/seamonkey/patches/patch-xh
deleted file mode 100644
index 55413b5a883..00000000000
--- a/www/seamonkey/patches/patch-xh
+++ /dev/null
@@ -1,181 +0,0 @@
-$NetBSD: patch-xh,v 1.1 2010/03/16 10:59:10 tnn Exp $
-
-NetBSD/amd64 xptcall support code. Originally from pkgsrc/www/mozilla.
-
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp.orig	2009-06-30 22:20:24.000000000 +0200
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp
-@@ -0,0 +1,174 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+// Platform specific code to invoke XPCOM methods on native objects
-+
-+#include "xptcprivate.h"
-+
-+// 6 integral parameters are passed in registers
-+const PRUint32 GPR_COUNT = 6;
-+
-+// 8 floating point parameters are passed in SSE registers
-+const PRUint32 FPR_COUNT = 8;
-+
-+// Remember that these 'words' are 64-bit long
-+static inline void
-+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s,
-+                   PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack)
-+{
-+    nr_gpr = 1; // skip one GP register for 'that'
-+    nr_fpr = 0;
-+    nr_stack = 0;
-+
-+    /* Compute number of eightbytes of class MEMORY.  */
-+    for (uint32 i = 0; i < paramCount; i++, s++) {
-+        if (!s->IsPtrData()
-+            && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) {
-+            if (nr_fpr < FPR_COUNT)
-+                nr_fpr++;
-+            else
-+                nr_stack++;
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                nr_gpr++;
-+            else
-+                nr_stack++;
-+        }
-+    }
-+}
-+
-+static void
-+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s,
-+                     PRUint64 * gpregs, double * fpregs)
-+{
-+    PRUint32 nr_gpr = 1; // skip one GP register for 'that'
-+    PRUint32 nr_fpr = 0;
-+    PRUint64 value;
-+
-+    for (uint32 i = 0; i < paramCount; i++, s++) {
-+        if (s->IsPtrData())
-+            value = (PRUint64) s->ptr;
-+        else {
-+            switch (s->type) {
-+            case nsXPTType::T_FLOAT:                                break;
-+            case nsXPTType::T_DOUBLE:                               break;
-+            case nsXPTType::T_I8:     value = s->val.i8;            break;
-+            case nsXPTType::T_I16:    value = s->val.i16;           break;
-+            case nsXPTType::T_I32:    value = s->val.i32;           break;
-+            case nsXPTType::T_I64:    value = s->val.i64;           break;
-+            case nsXPTType::T_U8:     value = s->val.u8;            break;
-+            case nsXPTType::T_U16:    value = s->val.u16;           break;
-+            case nsXPTType::T_U32:    value = s->val.u32;           break;
-+            case nsXPTType::T_U64:    value = s->val.u64;           break;
-+            case nsXPTType::T_BOOL:   value = s->val.b;             break;
-+            case nsXPTType::T_CHAR:   value = s->val.c;             break;
-+            case nsXPTType::T_WCHAR:  value = s->val.wc;            break;
-+            default:                  value = (PRUint64) s->val.p;  break;
-+            }
-+        }
-+
-+        if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
-+            if (nr_fpr < FPR_COUNT)
-+                fpregs[nr_fpr++] = s->val.d;
-+            else {
-+                *((double *)d) = s->val.d;
-+                d++;
-+            }
-+        }
-+        else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-+            if (nr_fpr < FPR_COUNT)
-+                // The value in %xmm register is already prepared to
-+                // be retrieved as a float. Therefore, we pass the
-+                // value verbatim, as a double without conversion.
-+                fpregs[nr_fpr++] = s->val.d;
-+            else {
-+                *((float *)d) = s->val.f;
-+                d++;
-+            }
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                gpregs[nr_gpr++] = value;
-+            else
-+                *d++ = value;
-+        }
-+    }
-+}
-+
-+extern "C"
-+XPTC_PUBLIC_API(nsresult)
-+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex,
-+                   PRUint32 paramCount, nsXPTCVariant * params)
-+{
-+    PRUint32 nr_gpr, nr_fpr, nr_stack;
-+    invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack);
-+    
-+    // Stack, if used, must be 16-bytes aligned
-+    if (nr_stack)
-+        nr_stack = (nr_stack + 1) & ~1;
-+
-+    // Load parameters to stack, if necessary
-+    PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8);
-+    PRUint64 gpregs[GPR_COUNT];
-+    double fpregs[FPR_COUNT];
-+    invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs);
-+
-+    // Load FPR registers from fpregs[]
-+    register double d0 asm("xmm0");
-+    register double d1 asm("xmm1");
-+    register double d2 asm("xmm2");
-+    register double d3 asm("xmm3");
-+    register double d4 asm("xmm4");
-+    register double d5 asm("xmm5");
-+    register double d6 asm("xmm6");
-+    register double d7 asm("xmm7");
-+
-+    switch (nr_fpr) {
-+#define ARG_FPR(N) \
-+    case N+1: d##N = fpregs[N];
-+        ARG_FPR(7);
-+        ARG_FPR(6);
-+        ARG_FPR(5);
-+        ARG_FPR(4);
-+        ARG_FPR(3);
-+        ARG_FPR(2);
-+        ARG_FPR(1);
-+        ARG_FPR(0);
-+    case 0:;
-+#undef ARG_FPR
-+    }
-+    
-+    // Load GPR registers from gpregs[]
-+    register PRUint64 a0 asm("rdi");
-+    register PRUint64 a1 asm("rsi");
-+    register PRUint64 a2 asm("rdx");
-+    register PRUint64 a3 asm("rcx");
-+    register PRUint64 a4 asm("r8");
-+    register PRUint64 a5 asm("r9");
-+    
-+    switch (nr_gpr) {
-+#define ARG_GPR(N) \
-+    case N+1: a##N = gpregs[N];
-+        ARG_GPR(5);
-+        ARG_GPR(4);
-+        ARG_GPR(3);
-+        ARG_GPR(2);
-+        ARG_GPR(1);
-+    case 1: a0 = (PRUint64) that;
-+    case 0:;
-+#undef ARG_GPR
-+    }
-+
-+    // Ensure that assignments to SSE registers won't be optimized away
-+    asm("" ::
-+        "x" (d0), "x" (d1), "x" (d2), "x" (d3),
-+        "x" (d4), "x" (d5), "x" (d6), "x" (d7));
-+    
-+    // Get pointer to method
-+    PRUint64 methodAddress = *((PRUint64 *)that);
-+    methodAddress += 8 * methodIndex;
-+    methodAddress = *((PRUint64 *)methodAddress);
-+    
-+    typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64);
-+    PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5);
-+    return result;
-+}
diff --git a/www/seamonkey/patches/patch-xi b/www/seamonkey/patches/patch-xi
deleted file mode 100644
index 5d8c6c1c404..00000000000
--- a/www/seamonkey/patches/patch-xi
+++ /dev/null
@@ -1,213 +0,0 @@
-$NetBSD: patch-xi,v 1.1 2010/03/16 10:59:10 tnn Exp $
-
-NetBSD/amd64 xptcall support code. Originally from pkgsrc/www/mozilla.
-
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp.orig	2009-06-30 22:20:24.000000000 +0200
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp
-@@ -0,0 +1,206 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+
-+// Implement shared vtbl methods.
-+
-+#include "xptcprivate.h"
-+
-+// The Linux/x86-64 ABI passes the first 6 integral parameters and the
-+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx,
-+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the
-+// caller.  The rest of the parameters are passed in the callers stack
-+// area.
-+
-+const PRUint32 PARAM_BUFFER_COUNT   = 16;
-+const PRUint32 GPR_COUNT            = 6;
-+const PRUint32 FPR_COUNT            = 8;
-+
-+// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
-+//
-+// - 'args[]' contains the arguments passed on stack
-+// - 'gpregs[]' contains the arguments passed in integer registers
-+// - 'fpregs[]' contains the arguments passed in floating point registers
-+// 
-+// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
-+// and then the method gets called.
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex,
-+                   PRUint64 * args, PRUint64 * gpregs, double *fpregs)
-+{
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint32 paramCount;
-+    PRUint32 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+    if (! iface_info)
-+        return NS_ERROR_UNEXPECTED;
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no method info");
-+    if (! info)
-+        return NS_ERROR_UNEXPECTED;
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+    if (! dispatchParams)
-+        return NS_ERROR_OUT_OF_MEMORY;
-+
-+    PRUint64* ap = args;
-+    PRUint32 nr_gpr = 1;    // skip one GPR register for 'that'
-+    PRUint32 nr_fpr = 0;
-+    PRUint64 value;
-+
-+    for(i = 0; i < paramCount; i++) {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+	
-+        if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
-+            if (nr_fpr < FPR_COUNT)
-+                dp->val.d = fpregs[nr_fpr++];
-+            else
-+                dp->val.d = *(double*) ap++;
-+            continue;
-+        }
-+        else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
-+            if (nr_fpr < FPR_COUNT)
-+                // The value in %xmm register is already prepared to
-+                // be retrieved as a float. Therefore, we pass the
-+                // value verbatim, as a double without conversion.
-+                dp->val.d = *(double*) ap++;
-+            else
-+                dp->val.f = *(float*) ap++;
-+            continue;
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                value = gpregs[nr_gpr++];
-+            else
-+                value = *ap++;
-+        }
-+
-+        if (param.IsOut() || !type.IsArithmetic()) {
-+            dp->val.p = (void*) value;
-+            continue;
-+        }
-+
-+        switch (type) {
-+        case nsXPTType::T_I8:      dp->val.i8  = (PRInt8)   value; break;
-+        case nsXPTType::T_I16:     dp->val.i16 = (PRInt16)  value; break;
-+        case nsXPTType::T_I32:     dp->val.i32 = (PRInt32)  value; break;
-+        case nsXPTType::T_I64:     dp->val.i64 = (PRInt64)  value; break;
-+        case nsXPTType::T_U8:      dp->val.u8  = (PRUint8)  value; break;
-+        case nsXPTType::T_U16:     dp->val.u16 = (PRUint16) value; break;
-+        case nsXPTType::T_U32:     dp->val.u32 = (PRUint32) value; break;
-+        case nsXPTType::T_U64:     dp->val.u64 = (PRUint64) value; break;
-+        case nsXPTType::T_BOOL:    dp->val.b   = (PRBool)   value; break;
-+        case nsXPTType::T_CHAR:    dp->val.c   = (char)     value; break;
-+        case nsXPTType::T_WCHAR:   dp->val.wc  = (wchar_t)  value; break;
-+
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if (dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+// Linux/x86-64 uses gcc >= 3.1
-+#define STUB_ENTRY(n) \
-+asm(".section	\".text\"\n\t" \
-+    ".align	2\n\t" \
-+    ".if	" #n " < 10\n\t" \
-+    ".globl	_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-+    ".type	_ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \
-+    ".elseif	" #n " < 100\n\t" \
-+    ".globl	_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-+    ".type	_ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \
-+    ".elseif    " #n " < 1000\n\t" \
-+    ".globl     _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-+    ".type      _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \
-+    ".else\n\t" \
-+    ".err	\"stub number " #n " >= 1000 not yet supported\"\n\t" \
-+    ".endif\n\t" \
-+    "movl	$" #n ", %eax\n\t" \
-+    "jmp	SharedStub\n\t" \
-+    ".if	" #n " < 10\n\t" \
-+    ".size	_ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-+    ".elseif	" #n " < 100\n\t" \
-+    ".size	_ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-+    ".else\n\t" \
-+    ".size	_ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-+    ".endif");
-+
-+// static nsresult SharedStub(PRUint32 methodIndex)
-+asm(".section   \".text\"\n\t"
-+    ".align     2\n\t"
-+    ".type      SharedStub,@function\n\t"
-+    "SharedStub:\n\t"
-+    // make room for gpregs (48), fpregs (64)
-+    "pushq      %rbp\n\t"
-+    "movq       %rsp,%rbp\n\t"
-+    "subq       $112,%rsp\n\t"
-+    // save GP registers
-+    "movq       %rdi,-112(%rbp)\n\t"
-+    "movq       %rsi,-104(%rbp)\n\t"
-+    "movq       %rdx, -96(%rbp)\n\t"
-+    "movq       %rcx, -88(%rbp)\n\t"
-+    "movq       %r8 , -80(%rbp)\n\t"
-+    "movq       %r9 , -72(%rbp)\n\t"
-+    "leaq       -112(%rbp),%rcx\n\t"
-+    // save FP registers
-+    "movsd      %xmm0,-64(%rbp)\n\t"
-+    "movsd      %xmm1,-56(%rbp)\n\t"
-+    "movsd      %xmm2,-48(%rbp)\n\t"
-+    "movsd      %xmm3,-40(%rbp)\n\t"
-+    "movsd      %xmm4,-32(%rbp)\n\t"
-+    "movsd      %xmm5,-24(%rbp)\n\t"
-+    "movsd      %xmm6,-16(%rbp)\n\t"
-+    "movsd      %xmm7, -8(%rbp)\n\t"
-+    "leaq       -64(%rbp),%r8\n\t"
-+    // rdi has the 'self' pointer already
-+    "movl       %eax,%esi\n\t"
-+    "leaq       16(%rbp),%rdx\n\t"
-+    "call       PrepareAndDispatch\n\t"
-+    "leave\n\t"
-+    "ret\n\t"
-+    ".size      SharedStub,.-SharedStub");
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#else
-+#error "can't find a compiler to use"
-+#endif /* __GNUC__ */
diff --git a/www/seamonkey/patches/patch-xn b/www/seamonkey/patches/patch-xn
new file mode 100644
index 00000000000..27a58586f7b
--- /dev/null
+++ b/www/seamonkey/patches/patch-xn
@@ -0,0 +1,53 @@
+$NetBSD: patch-xn,v 1.1 2011/07/11 20:46:36 tnn Exp $
+
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s.orig	2010-03-31 05:56:51.000000000 -0400
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s	2010-03-31 06:28:51.000000000 -0400
+@@ -42,8 +42,46 @@
+ 
+ /* This code is for MIPS using the O32 ABI. */
+ 
+-#include <sys/regdef.h>
+-#include <sys/asm.h>
++#ifdef __NetBSD__
++# include <machine/regdef.h>
++# include <machine/asm.h>
++# ifndef fp
++#  define	fp	s8
++# endif
++# ifndef PTRLOG
++#  if SZREG == 4
++#   define	PTRLOG	2
++#  else
++#   define	PTRLOG	3
++#  endif
++# endif
++# ifndef SETUP_GP
++#  if defined(__mips_o32)
++#   define	SETUP_GP	\
++		.set push;	\
++		.set noreorder;	\
++		.cpload t9;	\
++		.set pop
++#   define	SAVE_GP(x)	\
++		.cprestore x
++#  else
++#   define	SETUP_GP
++#   define	SAVE_GP(x)
++#  endif
++# endif
++# ifndef ALSZ
++#  if defined(__mips_n32) || defined(__mips_n64)
++#   define	ALSZ	15
++#   define	ALMASK	~15
++#  else
++#   define	ALSZ	7
++#   define	ALMASK	~7
++#  endif
++# endif
++#else
++# include <sys/regdef.h>
++# include <sys/asm.h>
++#endif
+ 
+ # NARGSAVE is the argument space in the callers frame, including extra
+ # 'shadowed' space for the argument registers. The minimum of 4
diff --git a/www/seamonkey/patches/patch-xo b/www/seamonkey/patches/patch-xo
new file mode 100644
index 00000000000..931528ad141
--- /dev/null
+++ b/www/seamonkey/patches/patch-xo
@@ -0,0 +1,53 @@
+$NetBSD: patch-xo,v 1.1 2011/07/11 20:46:36 tnn Exp $
+
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.orig	2010-03-31 06:23:31.000000000 -0400
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s	2010-03-31 06:28:23.000000000 -0400
+@@ -26,8 +26,46 @@
+ 
+ /* This code is for MIPS using the O32 ABI. */
+ 
+-#include <sys/regdef.h>
+-#include <sys/asm.h>
++#ifdef __NetBSD__
++# include <machine/regdef.h>
++# include <machine/asm.h>
++# ifndef fp
++#  define	fp	s8
++# endif
++# ifndef PTRLOG
++#  if SZREG == 4
++#   define	PTRLOG	2
++#  else
++#   define	PTRLOG	3
++#  endif
++# endif
++# ifndef SETUP_GP
++#  if defined(__mips_o32)
++#   define	SETUP_GP	\
++		.set push;	\
++		.set noreorder;	\
++		.cpload t9;	\
++		.set pop
++#   define	SAVE_GP(x)	\
++		.cprestore x
++#  else
++#   define	SETUP_GP
++#   define	SAVE_GP(x)
++#  endif
++# endif
++# ifndef ALSZ
++#  if defined(__mips_n32) || defined(__mips_n64)
++#   define	ALSZ	15
++#   define	ALMASK	~15
++#  else
++#   define	ALSZ	7
++#   define	ALMASK	~7
++#  endif
++# endif
++#else
++# include <sys/regdef.h>
++# include <sys/asm.h>
++#endif
+ 
+ # NARGSAVE is the argument space in the callers frame, including extra
+ # 'shadowed' space for the argument registers. The minimum of 4
author	tnn <tnn@pkgsrc.org>	2011-07-11 20:46:35 +0000
committer	tnn <tnn@pkgsrc.org>	2011-07-11 20:46:35 +0000
commit	51c03198d3696f0afe869eb95f10447509242fc2 (patch)
tree	e3ccc8e2df3a97e039799fabde69a1e0bfbccde8 /www/seamonkey/patches
parent	2481ead05dd457e47316f63f1cf4b0629d7ff09e (diff)
download	pkgsrc-51c03198d3696f0afe869eb95f10447509242fc2.tar.gz