- Update to 3.0

Some of the new features:

  * Thunderbird 3 is available in 49 languages - get your local version.
  * Tabbed Email.
  * The new search experience is much faster, and new search tools will
    help you narrow down your search.
  * A new Message Archive folder system will help you organize your email.
  * Lots of user experience improvements: main toolbar has been simplified,
    new search widget, new Mail Account Wizard, Smart Folders, Activity
    Manager, one-click Address Book, Attachment Reminder.

Thanks to:	 Andreas Tobler, Florian Smeets, miwi@

45 files changed, 528 insertions, 2049 deletions

diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile
index b127d82f6a29..459680c9c677 100644
--- a/mail/thunderbird3/Makefile
+++ b/mail/thunderbird3/Makefile
@@ -1,40 +1,49 @@
-# New ports collection makefile for:	mozilla-thunderbird
-# Date created:			4 September 2003
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
+# New ports collection makefile for:    mozilla-thunderbird
+# Date created:         4 September 2003
+# Whom:             Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/mail/thunderbird/Makefile,v 1.18 2009/01/02 21:16:20 mezz Exp $
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	2.0.0.23
-PORTREVISION=	1
+DISTVERSION=	3.0
 CATEGORIES=	mail ipv6
-MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
-DISTNAME=	${PORTNAME}-${DISTVERSION}-source
+MASTER_SITES=	${MASTER_SITE_MOZILLA}
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source/
+DISTNAME=	${PORTNAME}-${DISTVERSION}.source
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
-CONFLICTS=	lightning-0.[0-9]*
+BUILD_DEPENDS=	nspr>=4.8:${PORTSDIR}/devel/nspr
+
+USE_AUTOTOOLS=	autoconf:213
+LATEST_LINK=	thunderbird3
+USE_GECKO=	gecko
+CONFLICTS=	thunderbird-2* lightning-0.[0-9]*
+USE_MOZILLA=	-png -nss -dbm -jpeg -xft
+MOZ_TOOLKIT=	cairo-gtk2
+
+MAKE_JOBS_SAFE=	yes
 WANT_GNOME=	yes
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
+MAKE_ENV=	PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GECKO=	gecko
-WANT_PERL=	yes
 
-MOZ_EXTENSIONS=	wallet,spellcheck,xmlextras,webservices,auth,transformiix
-MOZ_PROTOCOLS=	http,ftp,file,jar,viewsource,res,data
+MOZILLA=	${PORTNAME}-${PORTVERSION}
+MOZILLA_EXEC_NAME=	${PORTNAME}
+MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data
 MOZ_GRAPHICS=	default,-xbm
 MOZ_OPTIONS=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
-		--enable-single-profile --disable-profilesharing \
-		--enable-application=mail --enable-official-branding
-MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1
-MOZ_EXPORT=	MOZ_THUNDERBIRD=1
+	--enable-single-profile --disable-profilesharing \
+	--enable-application=mail --enable-official-branding
+MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
+MOZ_EXPORT=		MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
+MOZILLA_PLIST_DIRS=	bin lib
+MOZ_PKGCONFIG_FILES=
 
 PORTNAME_ICON=	${PREFIX}/lib/${PORTNAME}/icons/default.xpm
 
@@ -45,41 +54,61 @@ OPTIONS=
 
 .include <bsd.port.pre.mk>
 
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED
-} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
+WRKSRC=		${WRKDIR}/comm-1.9.1
+MOZSRC:=	${WRKSRC}/mozilla
+
+.if ${OSVERSION} < 700000
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+EXTRA_PATCHES=	${FILESDIR}/releng6_pulseaudio
+.else
+EXTRA_PATCHES=	${FILESDIR}/liboggplay_oss
+.endif
+
+GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
+
+.if ${HAVE_GNOME:Mlibgnomeui}!=""
+USE_GNOME+=	libgnomeui
+MOZ_OPTIONS+=	--enable-gnomeui
+.else
+MOZ_OPTIONS+=	--disable-gnomeui
+.endif
 
-.if (${ARCH}=="sparc64" && ${OSVERSION} < 601101)
-IGNORE=	core dumps on ${ARCH}, kern.osreldate>=601101 needed
+.if defined(WITHOUT_DBUS)
+MOZ_OPTIONS+=	--disable-dbus
+.else
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 .endif
 
 post-extract::
-	@${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
-		<${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop
+	${SED} -e 's|@MOZILLA_ICON@|${MOZILLA_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
+		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
+		<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
+	${LN} -s  ${WRKSRC}/mail ${WRKSRC}/mozilla/mail
 
 post-patch:
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+		${MOZSRC}/storage/build/Makefile.in \
+		${MOZSRC}/db/sqlite3/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/security/manager/ssl/src/Makefile.in
-	@${REINPLACE_CMD} -e 's|--without-nss||' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
-		${WRKSRC}/storage/build/Makefile.in
-	@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \
-		-e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
-		${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
-	@${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \
-		'/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
-		/dom.disable_window_open_feature.toolbar/s/false/true/'
-	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
-		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
+		${MOZSRC}/security/manager/ssl/src/Makefile.in \
+		${MOZSRC}/js/src/config/mkdepend/Makefile.in \
+		${MOZSRC}/js/src/config/config.mk
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
+		s|-lpthread|${PTHREAD_LIBS}|g ; \
+		s|echo aout|echo elf|g ; \
+		s|/usr/X11R6|${LOCALBASE}|g' \
+		${MOZSRC}/js/src/configure
+
+pre-configure:
+	(cd ${WRKSRC} && ${AUTOCONF})
+	(cd ${MOZSRC} && ${AUTOCONF})
+	(cd ${MOZSRC}/js/src/ && ${AUTOCONF})
 
 port-pre-install:
 	${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
-	${FAKEDIR}/bin/thunderbird-config ${FAKEDIR}/bin/thunderbird
+	${FAKEDIR}/bin/thunderbird
 	${RM} -f ${FAKEDIR}/bin/*.bak
-	${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
-	${CP} -RL ${WRKSRC}/dist/bin/isp \
-		${FAKEDIR}/lib/${PORTNAME}
+	${MKDIR} ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults
 
 pre-install:
 	@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
@@ -87,8 +116,6 @@ pre-install:
 
 post-install:
 	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \
-		${PORTNAME_ICON}
+	${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications
 
 .include <bsd.port.post.mk>
diff --git a/mail/thunderbird3/distinfo b/mail/thunderbird3/distinfo
index 08056d6de217..318eb6b28d41 100644
--- a/mail/thunderbird3/distinfo
+++ b/mail/thunderbird3/distinfo
@@ -1,3 +1,3 @@
-MD5 (thunderbird-2.0.0.23-source.tar.bz2) = 2e118fcf752ee60ce994f1471f9632d1
-SHA256 (thunderbird-2.0.0.23-source.tar.bz2) = 2c5007dfa1d094d8f089d42208e77d673e811a49980b7df77b04ed1606d30d21
-SIZE (thunderbird-2.0.0.23-source.tar.bz2) = 38860245
+MD5 (thunderbird-3.0.source.tar.bz2) = 9a564ac2489b1b0f9348dc298b913f6c
+SHA256 (thunderbird-3.0.source.tar.bz2) = 750fc955e4474eef9ec36e8193df2811bcafb2b8cf27ecc0ebe65cec2eb33067
+SIZE (thunderbird-3.0.source.tar.bz2) = 60022838
diff --git a/mail/thunderbird3/files/liboggplay_oss b/mail/thunderbird3/files/liboggplay_oss
new file mode 100644
index 000000000000..e43b0725eea2
--- /dev/null
+++ b/mail/thunderbird3/files/liboggplay_oss
@@ -0,0 +1,15 @@
+--- mozilla/media/libsydneyaudio/src/Makefile.in_orgi	2009-04-10 12:12:45.000000000 +0200
++++ mozilla/media/libsydneyaudio/src/Makefile.in	2009-04-10 12:13:12.000000000 +0200
+@@ -45,6 +45,12 @@
+ LIBRARY_NAME	= sydneyaudio
+ FORCE_STATIC_LIB= 1
+ 
++ifeq ($(OS_ARCH),FreeBSD)
++CSRCS		= \
++		sydney_audio_oss.c \
++		$(NULL)
++endif
++
+ ifeq ($(OS_ARCH),Linux)
+ CSRCS		= \
+ 		sydney_audio_alsa.c \
diff --git a/mail/thunderbird3/files/patch-Double.cpp b/mail/thunderbird3/files/patch-Double.cpp
deleted file mode 100644
index ac04c24a6ac1..000000000000
--- a/mail/thunderbird3/files/patch-Double.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- extensions/transformiix/source/base/Double.cpp.orig	2006-06-22 12:13:00.000000000 -0700
-+++ extensions/transformiix/source/base/Double.cpp	2008-04-21 14:04:37.540570448 -0700
-@@ -52,10 +52,10 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
--#else
-+#if defined(__i386__) || defined(__amd64__)
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#else
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
-@@ -115,22 +115,31 @@
- #define TX_DOUBLE_HI32_EXPMASK   0x7ff00000
- #define TX_DOUBLE_HI32_MANTMASK  0x000fffff
- 
-+union ui32dun {
-+    PRUint32 i[2];
-+    double d;
-+};
-+
- //-- Initialize Double related constants
- #ifdef IS_BIG_ENDIAN
--const PRUint32 nanMask[2] =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
--                                0xffffffff};
--const PRUint32 infMask[2] =    {TX_DOUBLE_HI32_EXPMASK, 0};
--const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
-+const union ui32dun nanMask =
-+    {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}};
-+const union ui32dun infMask =
-+    {{TX_DOUBLE_HI32_EXPMASK, 0}};
-+const union ui32dun negInfMask =
-+    {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}};
- #else
--const PRUint32 nanMask[2] =    {0xffffffff,
--                                TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
--const PRUint32 infMask[2] =    {0, TX_DOUBLE_HI32_EXPMASK};
--const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
-+const union ui32dun nanMask =
-+    {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}};
-+const union ui32dun infMask =
-+    {{0, TX_DOUBLE_HI32_EXPMASK}};
-+const union ui32dun negInfMask =
-+    {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}};
- #endif
- 
--const double Double::NaN = *((double*)nanMask);
--const double Double::POSITIVE_INFINITY = *((double*)infMask);
--const double Double::NEGATIVE_INFINITY = *((double*)negInfMask);
-+const double Double::NaN = nanMask.d;
-+const double Double::POSITIVE_INFINITY = infMask.d;
-+const double Double::NEGATIVE_INFINITY = negInfMask.d;
- 
- /*
-  * Determines whether the given double represents positive or negative
diff --git a/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh
deleted file mode 100644
index dab3551bf701..000000000000
--- a/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/unix/run-mozilla.sh.orig	Mon Dec 15 18:27:28 2003
-+++ build/unix/run-mozilla.sh	Fri Feb 27 11:54:10 2004
-@@ -355,7 +355,7 @@
- fi
- ##
- ## Set LD_LIBRARY_PATH
--LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
-+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/thunderbird:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
- if [ -n "$LD_LIBRARYN32_PATH" ]
- then
- 	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
diff --git a/mail/thunderbird3/files/patch-config-mkdepend-imakemdep.h b/mail/thunderbird3/files/patch-config-mkdepend-imakemdep.h
deleted file mode 100644
index b688e664475d..000000000000
--- a/mail/thunderbird3/files/patch-config-mkdepend-imakemdep.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/mkdepend/imakemdep.h	Fri Sep  4 21:22:25 1998
-+++ config/mkdepend/imakemdep.h	Thu Oct 16 22:43:25 2003
-@@ -278,4 +278,7 @@
- 	"-D__i386__",
- # endif
-+# if defined(__amd64__) || defined(__x86_64__)
-+	"-D__amd64__ -D__x86_64__",
-+# endif
- # ifdef __GNUC__
- 	"-traditional",
diff --git a/mail/thunderbird3/files/patch-config_autoconf.mk.in b/mail/thunderbird3/files/patch-config_autoconf.mk.in
deleted file mode 100644
index 29fe7f8fbde0..000000000000
--- a/mail/thunderbird3/files/patch-config_autoconf.mk.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- config/autoconf.mk.in.orig	Thu Jul 14 00:50:06 2005
-+++ config/autoconf.mk.in	Thu Jul 14 00:50:40 2005
-@@ -50,13 +50,13 @@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/%%MOZILLA%%
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
- idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- 
--mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)/%%MOZILLA%%
- mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir	= $(mredir)/lib
- 
diff --git a/mail/thunderbird3/files/patch-configure b/mail/thunderbird3/files/patch-configure
deleted file mode 100644
index 6e0564d4bb0d..000000000000
--- a/mail/thunderbird3/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	2008-10-19 18:21:23.000000000 +0200
-+++ configure	2009-07-23 09:44:48.000000000 +0200
-@@ -5408,7 +5408,7 @@
-     CPU_ARCH=sparc
-     ;;
- 
--x86_64 | sparc | ppc | ia64)
-+amd64 | x86_64 | sparc | ppc | ia64)
-     CPU_ARCH="$OS_TEST"
-     ;;
- esac
-@@ -20065,7 +20065,7 @@
- LIBS_PATH=
- for lib_arg in $NSPR_LIBS $TK_LIBS; do
-   case $lib_arg in
--    -L* ) LIBS_PATH="${LIBS_PATH:+$LIBS_PATH:}"`expr $lib_arg : "-L\(.*\)"` ;;
-+    -L* ) LIBS_PATH="${LIBS_PATH:+$LIBS_PATH:}"`expr -- $lib_arg : "-L\(.*\)"` ;;
-       * ) ;;
-   esac
- done
diff --git a/mail/thunderbird3/files/patch-configure.in b/mail/thunderbird3/files/patch-configure.in
new file mode 100644
index 000000000000..ae9642b9fffd
--- /dev/null
+++ b/mail/thunderbird3/files/patch-configure.in
@@ -0,0 +1,11 @@
+--- configure.in.orig	2009-08-14 11:24:58.206076928 +0200
++++ configure.in	2009-08-14 11:25:29.601293359 +0200
+@@ -5680,7 +5680,7 @@
+     CPU_ARCH=sparc
+     ;;
+ 
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+     CPU_ARCH="$OS_TEST"
+     ;;
+ esac
diff --git a/mail/thunderbird3/files/patch-db-sqlite3-src-Makefile.in b/mail/thunderbird3/files/patch-db-sqlite3-src-Makefile.in
deleted file mode 100644
index 40562345842c..000000000000
--- a/mail/thunderbird3/files/patch-db-sqlite3-src-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- db/sqlite3/src/Makefile.in.orig	2009-08-22 00:49:32.000000000 +0200
-+++ db/sqlite3/src/Makefile.in	2009-08-22 00:51:29.000000000 +0200
-@@ -113,6 +113,10 @@
- ##SIMPLE_PROGRAMS = sqlite-shell
- endif
- 
-+ifeq ($(OS_ARCH),FreeBSD)
-+EXTRA_LIBS	+= -lpthread
-+endif
-+
- include $(topsrcdir)/config/rules.mk
- 
- sqlite-shell.$(OBJ_SUFFIX): shell.c
diff --git a/mail/thunderbird3/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in b/mail/thunderbird3/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in
new file mode 100644
index 000000000000..b71a03a4567b
--- /dev/null
+++ b/mail/thunderbird3/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in
@@ -0,0 +1,13 @@
+--- directory/c-sdk/ldap/libraries/libldap/Makefile.in.orig	2009-11-10 09:56:42.000000000 +0100
++++ directory/c-sdk/ldap/libraries/libldap/Makefile.in	2009-11-10 09:58:15.000000000 +0100
+@@ -254,6 +254,10 @@
+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe
+ endif
+ 
++ifeq ($(OS_ARCH), FreeBSD)
++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
++endif
++
+ ifeq ($(OS_ARCH), NetBSD)
+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
+ endif
diff --git a/mail/thunderbird3/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in b/mail/thunderbird3/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in
new file mode 100644
index 000000000000..ebf7f94ace1e
--- /dev/null
+++ b/mail/thunderbird3/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in
@@ -0,0 +1,14 @@
+--- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig	2008-09-11 16:38:35.000000000 +0200
++++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in	2009-12-09 08:53:46.000000000 +0100
+@@ -147,6 +147,11 @@
+ CUSTOM_LIBS=1
+ endif
+ 
++ifeq ($(OS_ARCH), FreeBSD)
++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
++CUSTOM_LIBS=1
++endif
++
+ # no extra libs on HP-UX
+ ifeq ($(OS_ARCH), HP-UX)
+ CUSTOM_LIBS=1
diff --git a/mail/thunderbird3/files/patch-directory_xpcom_base_src_Makefile.in b/mail/thunderbird3/files/patch-directory_xpcom_base_src_Makefile.in
new file mode 100644
index 000000000000..f56d7b17f104
--- /dev/null
+++ b/mail/thunderbird3/files/patch-directory_xpcom_base_src_Makefile.in
@@ -0,0 +1,13 @@
+--- directory/xpcom/base/src/Makefile.in.orig	2009-11-22 03:44:31.000000000 +0100
++++ directory/xpcom/base/src/Makefile.in	2009-11-26 13:06:53.000000000 +0100
+@@ -97,6 +97,10 @@
+ 		$(NULL)
+ endif
+ 
++ifeq ($(OS_ARCH), FreeBSD)
++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
++endif
++
+ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(LDAP_LIBS)
+ 
+ include $(topsrcdir)/config/rules.mk
diff --git a/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
deleted file mode 100644
index 41c462d74f62..000000000000
--- a/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig	Wed Nov 19 01:20:47 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp	Tue Feb 10 02:52:26 2004
-@@ -323,11 +323,11 @@
-   prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly",
-                           &mStartLinksOnlyPref);
- 
--  PRBool isSoundEnabled = PR_TRUE;
-+  mIsSoundEnabled = PR_TRUE;
-   prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound",
--                           &isSoundEnabled);
-+                           &mIsSoundEnabled);
-   nsXPIDLCString soundStr;
--  if (isSoundEnabled) {
-+  if (mIsSoundEnabled && mIsSoundEnabled) {
-     prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL",
-                              getter_Copies(soundStr));
-   }
-@@ -758,7 +758,7 @@
-     }
-     else {
-       // No find string to backspace in!
--      if (mIsBackspaceProtectOn) {
-+      if (mIsBackspaceProtectOn && mIsSoundEnabled) {
-         // This flag should be on only if the last key was a backspace.
-         // It keeps us from accidentally hitting backspace too many times and
-         // going back in history when we really just wanted to clear 
-@@ -1012,7 +1012,9 @@
- 
-     // Error sound (don't fire when backspace is pressed, they're 
-     // trying to correct the mistake!)
--    PlayNotFoundSound();
-+    if (mIsSoundEnabled) {
-+      PlayNotFoundSound();
-+    }
- 
-     // Remove bad character from buffer, so we can continue typing from
-     // last matched character
-@@ -1059,7 +1061,7 @@
- void
- nsTypeAheadFind::PlayNotFoundSound()
- {
--  if (mNotFoundSoundURL.IsEmpty())    // no sound
-+  if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled)    // no sound
-     return;
-   if (!mSoundInterface) {
-     mSoundInterface = do_CreateInstance("@mozilla.org/sound;1");
diff --git a/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
deleted file mode 100644
index 07ad43b4334d..000000000000
--- a/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig	Fri May 23 22:00:33 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.h	Mon Feb  9 22:21:43 2004
-@@ -194,6 +194,9 @@
- 
-   nsCString mNotFoundSoundURL;
- 
-+  // Move the sound enabled boolean out for all methods to access.
-+  PRBool mIsSoundEnabled;
-+
-   // PRBool's are used instead of PRPackedBool's where the address of the
-   // boolean variable is getting passed into a method. For example:
-   // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref);
diff --git a/mail/thunderbird3/files/patch-js_src_Makefile.in b/mail/thunderbird3/files/patch-js_src_Makefile.in
deleted file mode 100644
index fb0bd7f1986b..000000000000
--- a/mail/thunderbird3/files/patch-js_src_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- js/src/Makefile.in.orig	Wed Oct 18 09:23:09 2006
-+++ js/src/Makefile.in	Wed Oct 18 09:27:27 2006
-@@ -244,6 +244,7 @@
- endif
- 
- LDFLAGS		+= $(pathsubst -l%,$(NSPR_STATIC_PATH)/%.a,$(NSPR_LIBS))
-+LDFLAGS		+= -lc
- 
- # BeOS and HP-UX do not require the extra linking of "-lm"
- ifeq (,$(filter BeOS HP-UX WINNT WINCE OpenVMS,$(OS_ARCH)))
diff --git a/mail/thunderbird3/files/patch-mail_app_mozilla.in b/mail/thunderbird3/files/patch-mail_app_mozilla.in
deleted file mode 100644
index 7fcb98bd28d7..000000000000
--- a/mail/thunderbird3/files/patch-mail_app_mozilla.in
+++ /dev/null
@@ -1,124 +0,0 @@
---- mail/app/mozilla.in.orig	Mon Apr  4 15:08:49 2005
-+++ mail/app/mozilla.in	Fri Jun 10 06:18:49 2005
-@@ -49,51 +49,82 @@
- ## the mozilla-bin binary to work.
- ##
- 
-+#
-+# MOZ_PIS, "Mozilla Plugable Init Scripts"
-+# MOZ_PIS_ is the name space used
-+# These variables and there meaning are specified in
-+# mozilla/xpfe/bootstrap/init.d/README
- moz_pis_startstop_scripts()
- {
--  MOZ_USER_DIR="%MOZ_USER_DIR%"
--  # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts"
--  # These variables and there meaning are specified in
--  # mozilla/xpfe/bootstrap/init.d/README
--  MOZ_PIS_API=2
--  MOZ_PIS_MOZBINDIR="${dist_bin}"
--  MOZ_PIS_SESSION_PID="$$"
--  MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
--  export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
--  
--  case "${1}" in
--    "start")
--      for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do
--        if [ -x "${curr_pis}" ] ; then
--          case "${curr_pis}" in
--            *.sh) .  "${curr_pis}"         ;;
--            *)       "${curr_pis}" "start" ;;
--          esac
--        fi
--      done
--      ;;
--    "stop")
--      for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do
--        if [ -x "${curr_pis}" ] ; then
--          case "${curr_pis}" in
--            *.sh) . "${curr_pis}"        ;;
--            *)      "${curr_pis}" "stop" ;;
--          esac
--        fi
--      done
--      ;;
--    *)
--      echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts."
--      exit 1
--      ;;
--  esac
-+    MOZ_PIS_API=2
-+    MOZ_PIS_MOZBINDIR="${dist_bin}"
-+    MOZ_PIS_SESSION_PID="$$"
-+    MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
-+    export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
-+
-+    case "${1}" in
-+	"start")
-+	    for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \
-+			    "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do
-+		if [ -x "${curr_pis}" ]; then
-+		    case "${curr_pis}" in
-+			*.sh)
-+			    . "${curr_pis}"
-+			    ;;
-+			*)
-+			    ${curr_pis} "start"
-+			    ;;
-+		    esac
-+		fi
-+	    done
-+	    ;;
-+	"stop")
-+	    for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \
-+			    "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do
-+		if [ -x "${curr_pis}" ]; then
-+		    case "${curr_pis}" in
-+			*.sh)
-+			    . "${curr_pis}"
-+			    ;;
-+			*)
-+			    ${curr_pis} "stop"
-+			    ;;
-+		    esac
-+		fi
-+	    done
-+	    ;;
-+	*)
-+	    echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2
-+	    exit 1
-+	    ;;
-+    esac
- }
- 
--#uncomment for debugging
-+# uncomment for debugging
- #set -x
- 
--moz_libdir=%MOZAPPDIR%
--MRE_HOME=%MREDIR%
-+#
-+# variables
-+#
-+#location="new-tab"
-+#MOZILLA_UILOCALE="en-US"
-+#MOZILLA_UIREGION="US"
-+
-+#
-+# working definitions
-+#
-+MOZ_USER_DIR="%MOZ_USER_DIR%"
-+moz_libdir="%MOZAPPDIR%"
-+MRE_HOME="%MREDIR%"
-+
-+debugging=		# set the debugging level
-+here=`pwd`
-+
-+if [ ! -d "${MRE_HOME}" ]; then
-+    # use moz_libdir as MRE_HOME
-+    MRE_HOME="${moz_libdir}"
-+fi
-+export	MRE_HOME
- 
- # Use run-mozilla.sh in the current dir if it exists
- # If not, then start resolving symlinks until we find run-mozilla.sh
diff --git a/mail/thunderbird3/files/patch-mozilla-config-mkdepend-Makefile.in b/mail/thunderbird3/files/patch-mozilla-config-mkdepend-Makefile.in
new file mode 100644
index 000000000000..3b649d0f16b7
--- /dev/null
+++ b/mail/thunderbird3/files/patch-mozilla-config-mkdepend-Makefile.in
@@ -0,0 +1,10 @@
+--- mozilla/config/mkdepend/Makefile.in.orig	Sun Dec 12 07:36:57 2004
++++ mozilla/config/mkdepend/Makefile.in	Sun Dec 12 07:37:55 2004
+@@ -57,6 +57,7 @@
+ include $(topsrcdir)/config/rules.mk
+ 
+ HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= $(XCFLAGS)
+ 
+ ifdef GNU_CC
+ _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/mail/thunderbird3/files/patch-config-rules.mk b/mail/thunderbird3/files/patch-mozilla-config-rules.mk
index 8ab35f5a8326..bbe6fec94311 100644
--- a/mail/thunderbird3/files/patch-config-rules.mk
+++ b/mail/thunderbird3/files/patch-mozilla-config-rules.mk
@@ -1,5 +1,5 @@
---- config/rules.mk.orig	Thu Sep 14 14:07:03 2006
-+++ config/rules.mk	Wed Oct 18 11:00:09 2006
+--- mozilla/config/rules.mk.orig	Thu Sep 14 14:07:03 2006
++++ mozilla/config/rules.mk	Wed Oct 18 11:00:09 2006
 @@ -442,9 +442,7 @@
  endif
  
diff --git a/mail/thunderbird3/files/patch-mozilla-config_autoconf.mk.in b/mail/thunderbird3/files/patch-mozilla-config_autoconf.mk.in
new file mode 100644
index 000000000000..763f8ebfa6de
--- /dev/null
+++ b/mail/thunderbird3/files/patch-mozilla-config_autoconf.mk.in
@@ -0,0 +1,21 @@
+--- mozilla/config/autoconf.mk.in.orig	2007-08-28 12:02:43.000000000 -0400
++++ mozilla/config/autoconf.mk.in	2007-09-26 14:21:51.000000000 -0400
+@@ -58,14 +58,14 @@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/%%MOZILLA%%
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+-idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= $(datadir)/idl/%%MOZILLA%%
+ 
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/%%MOZILLA%%
++sdkdir		= $(libdir)/%%MOZILLA%%
+ 
+ DIST		= $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@
diff --git a/mail/thunderbird3/files/patch-mozilla-configure.in b/mail/thunderbird3/files/patch-mozilla-configure.in
new file mode 100644
index 000000000000..f08b95aa5c20
--- /dev/null
+++ b/mail/thunderbird3/files/patch-mozilla-configure.in
@@ -0,0 +1,11 @@
+--- mozilla/configure.in.orig	2009-08-14 11:24:58.206076928 +0200
++++ mozilla/configure.in	2009-08-14 11:25:29.601293359 +0200
+@@ -5680,7 +5680,7 @@
+     CPU_ARCH=sparc
+     ;;
+ 
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+     CPU_ARCH="$OS_TEST"
+     ;;
+ esac
diff --git a/mail/thunderbird3/files/patch-mozilla-content-xslt-public-txDouble.h b/mail/thunderbird3/files/patch-mozilla-content-xslt-public-txDouble.h
new file mode 100644
index 000000000000..c53f725c80ed
--- /dev/null
+++ b/mail/thunderbird3/files/patch-mozilla-content-xslt-public-txDouble.h
@@ -0,0 +1,20 @@
+--- mozilla/content/xslt/public/txDouble.h.orig	Fri Oct 13 00:00:29 2006
++++ mozilla/content/xslt/public/txDouble.h	Fri Oct 13 00:00:53 2006
+@@ -41,7 +41,7 @@
+ #define __txdouble_h__
+ 
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+-#ifdef __FreeBSD__
++/* #ifdef __FreeBSD__
+ #include <ieeefp.h>
+ #ifdef __alpha__
+ fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
+@@ -50,7 +50,7 @@
+ #endif
+ fp_except_t oldmask = fpsetmask(~allmask);
+ #endif
+-
++*/
+ /**
+  * Macros to workaround math-bugs bugs in various platforms
+  */
diff --git a/mail/thunderbird3/files/patch-mozilla-db-sqlite3-src-Makefile.in b/mail/thunderbird3/files/patch-mozilla-db-sqlite3-src-Makefile.in
new file mode 100644
index 000000000000..24a7d6206604
--- /dev/null
+++ b/mail/thunderbird3/files/patch-mozilla-db-sqlite3-src-Makefile.in
@@ -0,0 +1,11 @@
+--- mozilla/db/sqlite3/src/Makefile.in.orig	2008-06-19 11:03:17.000000000 -0500
++++ mozilla/db/sqlite3/src/Makefile.in	2008-06-19 11:04:15.000000000 -0500
+@@ -45,6 +45,8 @@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
++OS_CFLAGS	 = -I../../../dist/include/sqlite3
++OS_LIBS		 = %%PTHREAD_LIBS%%
+ MODULE           = sqlite3
+ LIBRARY_NAME     = sqlite3
+ FORCE_SHARED_LIB = 1
diff --git a/mail/thunderbird3/files/patch-mozilla-js-src-config-config.mk b/mail/thunderbird3/files/patch-mozilla-js-src-config-config.mk
new file mode 100644
index 000000000000..a7cc0b915aeb
--- /dev/null
+++ b/mail/thunderbird3/files/patch-mozilla-js-src-config-config.mk
@@ -0,0 +1,11 @@
+--- mozilla/js/src/config/config.mk.orgi	2009-04-21 15:12:51.000000000 +0200
++++ mozilla/js/src/config/config.mk	2009-04-21 15:15:37.000000000 +0200
+@@ -490,7 +490,7 @@
+ INCLUDES	= $(LOCAL_INCLUDES) $(REQ_INCLUDES) $(REQ_INCLUDES_SDK) -I$(PUBLIC) $(OS_INCLUDES)
+ 
+ ifndef MOZILLA_INTERNAL_API
+-INCLUDES	+= -I$(LIBXUL_DIST)/sdk/include
++INCLUDES	+= -I$(LIBXUL_DIST)/sdk/include -I%%LOCALBASE%%/include
+ endif
+ 
+ include $(topsrcdir)/config/static-checking-config.mk
diff --git a/mail/thunderbird3/files/patch-mozilla-js-src-config-mkdepend-Makefile.in b/mail/thunderbird3/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
new file mode 100644
index 000000000000..898c898fdbd9
--- /dev/null
+++ b/mail/thunderbird3/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
@@ -0,0 +1,11 @@
+--- mozilla/js/src/config/mkdepend/Makefile.in.orig	2009-03-05 22:31:53.000000000 +0100
++++ mozilla/js/src/config/mkdepend/Makefile.in	2009-04-21 14:10:27.000000000 +0200
+@@ -72,7 +72,7 @@
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+-HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
+ 
+ ifdef GNU_CC
+ _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/mail/thunderbird3/files/patch-mozilla-js-src-configure.in b/mail/thunderbird3/files/patch-mozilla-js-src-configure.in
new file mode 100644
index 000000000000..9d6f049f2362
--- /dev/null
+++ b/mail/thunderbird3/files/patch-mozilla-js-src-configure.in
@@ -0,0 +1,13 @@
+--- mozilla/js/src/configure.in.orig	2009-09-17 11:09:10.000000000 +0200
++++ mozilla/js/src/configure.in	2009-09-17 11:09:33.000000000 +0200
+@@ -2467,10 +2467,6 @@
+     ENABLE_JIT=1
+     NANOJIT_ARCH=ARM
+     ;;
+-sparc*-*)
+-    ENABLE_JIT=1
+-    NANOJIT_ARCH=Sparc
+-    ;;
+ esac
+ 
+ MOZ_ARG_DISABLE_BOOL(jit,
diff --git a/mail/thunderbird3/files/patch-mozilla-js-src-jsnum.cpp b/mail/thunderbird3/files/patch-mozilla-js-src-jsnum.cpp
new file mode 100644
index 000000000000..c52535eaca09
--- /dev/null
+++ b/mail/thunderbird3/files/patch-mozilla-js-src-jsnum.cpp
@@ -0,0 +1,28 @@
+--- mozilla/js/src/jsnum.cpp.orig	Sun Nov  5 18:37:07 2006
++++ mozilla/js/src/jsnum.cpp	Sun Nov  5 18:42:31 2006
+@@ -45,6 +45,9 @@
+ #if defined(XP_WIN) || defined(XP_OS2)
+ #include <float.h>
+ #endif
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
+ #include <locale.h>
+ #include <limits.h>
+ #include <math.h>
+@@ -532,7 +535,15 @@ static jsdouble NaN;
+ 
+ #else
+ 
++#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
++#include <fenv.h>
++#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT))
++
++#else
++
+ #define FIX_FPU() ((void)0)
++
++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
+ 
+ #endif
+ 
diff --git a/mail/thunderbird3/files/patch-mozilla-layout-generic-Makefile.in b/mail/thunderbird3/files/patch-mozilla-layout-generic-Makefile.in
new file mode 100644
index 000000000000..e3084b750b7b
--- /dev/null
+++ b/mail/thunderbird3/files/patch-mozilla-layout-generic-Makefile.in
@@ -0,0 +1,14 @@
+--- mozilla/layout/generic/Makefile.in.orig	2008-06-19 12:29:06.000000000 -0500
++++ mozilla/layout/generic/Makefile.in	2008-06-19 12:30:04.000000000 -0500
+@@ -188,9 +188,10 @@
+ 		-I$(srcdir)/../../content/base/src \
+ 		-I$(srcdir)/../../content/html/content/src \
+ 		-I$(srcdir)/../../dom/src/base \
+-		$(MOZ_CAIRO_CFLAGS) \
+ 		$(NULL)
+ 
++CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
++
+ ifdef MOZ_ENABLE_GTK2
+ CXXFLAGS += $(MOZ_GTK2_CFLAGS)
+ endif
diff --git a/mail/thunderbird3/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h b/mail/thunderbird3/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h
new file mode 100644
index 000000000000..63d98af1dfa6
--- /dev/null
+++ b/mail/thunderbird3/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h
@@ -0,0 +1,11 @@
+--- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2009-09-16 02:56:44.000000000 +0200
++++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h	2009-09-24 13:04:49.000000000 +0200
+@@ -59,7 +59,7 @@
+ 
+ #include <sys/types.h>
+ 
+-#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
++#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (__FreeBSD__)
+ typedef off_t oggz_off_t;
+ #else
+ typedef loff_t oggz_off_t;
diff --git a/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h b/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h
new file mode 100644
index 000000000000..e2c52f080518
--- /dev/null
+++ b/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h
@@ -0,0 +1,11 @@
+--- mozilla/media/libsydneyaudio/include/sydney_audio.h.orgi	2009-04-10 12:24:01.000000000 +0200
++++ mozilla/media/libsydneyaudio/include/sydney_audio.h	2009-04-10 12:24:30.000000000 +0200
+@@ -73,7 +73,7 @@
+ #   endif
+ #elif defined(WIN32)
+ #   define SA_LITTLE_ENDIAN 1
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__FreeBSD__)
+ #   if defined(__BIG_ENDIAN__)
+ #       define SA_BIG_ENDIAN 1
+ #   else
diff --git a/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk b/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk
new file mode 100644
index 000000000000..7de268b435df
--- /dev/null
+++ b/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk
@@ -0,0 +1,38 @@
+--- mozilla/security/coreconf/FreeBSD.mk.orig	2009-09-16 02:57:02.000000000 +0200
++++ mozilla/security/coreconf/FreeBSD.mk	2009-09-30 16:44:43.000000000 +0200
+@@ -45,8 +45,20 @@
+ ifeq ($(OS_TEST),alpha)
+ CPU_ARCH		= alpha
+ else
++ifeq ($(OS_TEST),amd64)
++CPU_ARCH		= amd64
++else
++ifeq ($(OS_TEST),powerpc)
++CPU_ARCH		= powerpc
++else
++ifeq ($(OS_TEST),sparc64)
++CPU_ARCH		= sparc64
++else
+ CPU_ARCH		= x86
+ endif
++endif
++endif
++endif
+ 
+ OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+ 
+@@ -73,7 +85,7 @@
+ DLL_SUFFIX		= so.1.0
+ endif
+ 
+-MKSHLIB			= $(CC) $(DSO_LDOPTS)
++MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
+ ifdef MAPFILE
+ 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
+ endif
+@@ -82,4 +94,4 @@
+ 
+ G++INCLUDES		= -I/usr/include/g++
+ 
+-INCLUDES		+= -I/usr/X11R6/include
++#INCLUDES		+= -I/usr/local/include
diff --git a/mail/thunderbird3/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp b/mail/thunderbird3/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp
new file mode 100644
index 000000000000..272a02bdb9e0
--- /dev/null
+++ b/mail/thunderbird3/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp
@@ -0,0 +1,10 @@
+--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig	Mon May 29 23:10:54 2006
++++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp	Mon May 29 23:12:22 2006
+@@ -110,6 +110,7 @@
+ #include "nss.h"
+ #include "pk11func.h"
+ #include "ssl.h"
++#define NSS_ENABLE_ECC 1
+ #include "sslproto.h"
+ #include "secmod.h"
+ #include "sechash.h"
diff --git a/mail/thunderbird3/files/patch-storage_build_Makefile.in b/mail/thunderbird3/files/patch-mozilla-storage-build-Makefile.in
index 18202a5a61d8..44ed0d3e7318 100644
--- a/mail/thunderbird3/files/patch-storage_build_Makefile.in
+++ b/mail/thunderbird3/files/patch-mozilla-storage-build-Makefile.in
@@ -1,5 +1,5 @@
---- storage/build/Makefile.in.orig	Tue Feb 21 11:18:56 2006
-+++ storage/build/Makefile.in	Sun Nov  5 16:16:06 2006
+--- mozilla/storage/build/Makefile.in.orig	Tue Feb 21 11:18:56 2006
++++ mozilla/storage/build/Makefile.in	Sun Nov  5 16:16:06 2006
 @@ -77,6 +77,7 @@
  	$(EXTRA_DSO_LIBS) \
  	$(MOZ_COMPONENT_LIBS) \
diff --git a/mail/thunderbird3/files/patch-mozilla-toolkit-mozapps-installer-packager.mk b/mail/thunderbird3/files/patch-mozilla-toolkit-mozapps-installer-packager.mk
new file mode 100644
index 000000000000..c5eea9f5fed9
--- /dev/null
+++ b/mail/thunderbird3/files/patch-mozilla-toolkit-mozapps-installer-packager.mk
@@ -0,0 +1,11 @@
+--- mozilla/toolkit/mozapps/installer/packager.mk.orig	2007-09-26 13:45:01.000000000 -0400
++++ mozilla/toolkit/mozapps/installer/packager.mk	2007-09-26 13:47:29.000000000 -0400
+@@ -409,7 +409,7 @@
+ 	(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 -o -type l -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
diff --git a/mail/thunderbird3/files/patch-mozilla-toolkit-xre-Makefile.in b/mail/thunderbird3/files/patch-mozilla-toolkit-xre-Makefile.in
new file mode 100644
index 000000000000..224a65d1efe0
--- /dev/null
+++ b/mail/thunderbird3/files/patch-mozilla-toolkit-xre-Makefile.in
@@ -0,0 +1,8 @@
+--- mozilla/toolkit/xre/Makefile.in.orig	2007-09-10 10:31:53.000000000 -0400
++++ mozilla/toolkit/xre/Makefile.in	2007-09-10 10:35:00.000000000 -0400
+@@ -263,5 +263,3 @@
+ libs:: platform.ini
+ 	$(INSTALL) $^ $(DIST)/bin
+ 
+-install::
+-	$(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)
diff --git a/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
index ac8cab896d48..a146f07811fd 100644
--- a/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
+++ b/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
@@ -1,5 +1,5 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Mon May  3 13:05:12 2004
+--- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig	Tue Mar 16 03:07:25 2004
++++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc	Tue Jun 15 12:52:36 2004
 @@ -8,7 +8,7 @@
  *  1 is AddRef
  *  2 is Release
diff --git a/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
new file mode 100644
index 000000000000..a6fb01850aaa
--- /dev/null
+++ b/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
@@ -0,0 +1,76 @@
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2009-03-05 22:32:55.000000000 +0100
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2009-04-21 14:15:46.135700268 +0200
+@@ -70,6 +70,9 @@
+ ifeq (Darwin,$(OS_ARCH))
+ DEFINES		+= -DKEEP_STACK_16_BYTE_ALIGNED
+ endif
++ifeq (x86_64,$(OS_TEST))
++CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
++endif
+ endif
+ endif
+ #
+@@ -87,7 +90,7 @@
+ endif
+ endif
+ # IA64 Linux
+-ifneq (,$(filter Linux,$(OS_ARCH)))
++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
+ ifneq (,$(findstring ia64,$(OS_TEST)))
+ CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
+ ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
+@@ -100,6 +103,12 @@
+ CPPSRCS		:= xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
+ endif
+ #
++# FreeBSD/amd64
++#
++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64)
++CPPSRCS         := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
++endif
++#
+ # BeOS/Intel (uses the same unixish_x86 code)
+ #
+ ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
+@@ -150,9 +159,15 @@
+ ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
+ endif
+ #
++# FreeBSD/Alpha
++#
++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
++CPPSRCS		:= xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
++endif
++#
+ # Linux/Alpha
+ #
+-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
+ CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
+ endif
+ #
+@@ -307,7 +322,7 @@
+ #
+ # Linux/PPC
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
++ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
+ ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
+ AS		:= $(CC) -c -x assembler-with-cpp
+@@ -385,6 +400,15 @@
+ ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
+ endif
+ #
++# FreeBSD/SPARC64
++#
++ifeq ($(OS_ARCH),FreeBSD)
++ifneq (,$(findstring sparc,$(OS_TEST)))
++CPPSRCS		:= xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
++ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
++endif
++endif
++#
+ # OpenBSD/SPARC
+ #
+ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc)
diff --git a/mail/thunderbird3/files/patch-security-coreconf-FreeBSD.mk b/mail/thunderbird3/files/patch-security-coreconf-FreeBSD.mk
deleted file mode 100644
index 0f7a04a0279f..000000000000
--- a/mail/thunderbird3/files/patch-security-coreconf-FreeBSD.mk
+++ /dev/null
@@ -1,24 +0,0 @@
---- security/coreconf/FreeBSD.mk.orig	Mon Sep 25 18:26:23 2006
-+++ security/coreconf/FreeBSD.mk	Mon Sep 25 18:27:03 2006
-@@ -45,8 +45,12 @@
- ifeq ($(OS_TEST),alpha)
- CPU_ARCH		= alpha
- else
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH		= amd64
-+else
- CPU_ARCH		= x86
- endif
-+endif
- 
- OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
- 
-@@ -73,7 +77,7 @@
- DLL_SUFFIX		= so.1.0
- endif
- 
--MKSHLIB			= $(CC) $(DSO_LDOPTS)
-+MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
- ifdef MAPFILE
- 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
- endif
diff --git a/mail/thunderbird3/files/patch-sysnss b/mail/thunderbird3/files/patch-sysnss
deleted file mode 100644
index cd1e26811ad1..000000000000
--- a/mail/thunderbird3/files/patch-sysnss
+++ /dev/null
@@ -1,180 +0,0 @@
---- Makefile.in	Tue Sep 14 16:59:40 2004
-+++ Makefile.in	Tue Aug  2 08:26:55 2005
-@@ -102,6 +102,4 @@
- # tier 1 -  3rd party individual libraries
- #
--tier_1_dirs	+= dbm
--
- ifndef MOZ_NATIVE_JPEG
- tier_1_dirs	+= jpeg
---- security/manager/ssl/src/Makefile.in.orig	Mon Aug 14 19:22:52 2006
-+++ security/manager/ssl/src/Makefile.in	Thu Aug 31 15:17:20 2006
-@@ -124,19 +124,19 @@
- 		  pipboot \
- 		  $(NULL)
- 
--EXTRA_DEPS = $(NSS_DEP_LIBS)
- 
- DEFINES += -DNSS_ENABLE_ECC
- 
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += $(NSS_CFLAGS)
-+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss
- 
- EXTRA_DSO_LDOPTS += \
- 		$(MOZ_UNICHARUTIL_LIBS) \
- 		$(MOZ_COMPONENT_LIBS) \
- 		$(MOZ_JS_LIBS) \
- 		$(NSS_LIBS) \
-+		$(LOCAL_INCLUDES) \
- 		$(NULL)
- 
- include $(topsrcdir)/config/rules.mk
---- security/manager/Makefile.in.orig	2009-08-07 22:37:51.000000000 +0200
-+++ security/manager/Makefile.in	2009-08-21 10:41:53.000000000 +0200
-@@ -56,24 +56,13 @@
- 	SOFTOKEN3_LIB \
- 	SOFTOKEN3_CHK \
- 	NSSDBM3_LIB \
--	LOADABLE_ROOT_MODULE \
- 	HAVE_FREEBL_LIBS \
- 	HAVE_FREEBL_LIBS_32 \
- 	HAVE_FREEBL_LIBS_32INT64 \
- 	HAVE_FREEBL_LIBS_64 \
- 	$(NULL)
--
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
- endif
- 
--NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
--NSSUTIL3_LIB = $(DLL_PREFIX)nssutil3$(DLL_SUFFIX)
--SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
--SSL3_LIB =  $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
--SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
--SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
--NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX)
--
- # Default
- HAVE_FREEBL_LIBS = 1
- 
-@@ -222,11 +211,6 @@
- .nss.cleaned: .nss.checkout
- ifndef MOZ_NATIVE_NSS
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- 	touch $@
- endif
- 
-@@ -253,49 +237,6 @@
- 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
- endif
- ifndef MOZ_NATIVE_NSS
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
--ifdef HAVE_FREEBL_LIBS
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_32
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_32INT64
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_64
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
--endif
- endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
-@@ -306,44 +247,6 @@
- 
- install::
- ifndef MOZ_NATIVE_NSS
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
--ifdef HAVE_FREEBL_LIBS
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
--endif
--ifdef HAVE_FREEBL_LIBS_32
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
--endif
--ifdef HAVE_FREEBL_LIBS_32INT64
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
--endif
--ifdef HAVE_FREEBL_LIBS_64
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
--endif
- endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
-@@ -360,12 +263,6 @@
- 	$(MAKE) -C pki $@
- endif
- ifndef MOZ_NATIVE_NSS
--	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- endif
- 
- echo-requires-recursive::
diff --git a/mail/thunderbird3/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/mail/thunderbird3/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
deleted file mode 100644
index 7f8e55f536df..000000000000
--- a/mail/thunderbird3/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig	Fri Dec 24 04:30:00 2004
-+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp	Fri Dec 24 04:34:05 2004
-@@ -143,7 +143,7 @@
-     PR_END_MACRO
- 
-   // Attempt to open libgconf
--  gconfLib = LoadVersionedLibrary("gconf-2", ".4");
-+  gconfLib = PR_LoadLibrary("libgconf-2.so");
-   ENSURE_LIB(gconfLib);
- 
-   GET_LIB_FUNCTION(gconf, gconf_client_get_default);
-@@ -151,7 +151,7 @@
-   GET_LIB_FUNCTION(gconf, gconf_client_get_bool);
- 
-   // Attempt to open libgnome
--  gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
-+  gnomeLib = PR_LoadLibrary("libgnome-2.so");
-   ENSURE_LIB(gnomeLib);
- 
-   GET_LIB_FUNCTION(gnome, gnome_url_show);
-@@ -160,7 +160,7 @@
-   GET_LIB_FUNCTION(gnome, gnome_program_get);
- 
-   // Attempt to open libgnomevfs
--  vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
-+  vfsLib = PR_LoadLibrary("libgnomevfs-2.so");
-   ENSURE_LIB(vfsLib);
- 
-   GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name);
diff --git a/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
deleted file mode 100644
index 4ddde92ca506..000000000000
--- a/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ /dev/null
@@ -1,69 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2008-02-19 22:11:34.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	2009-09-11 23:18:37.000000000 +0200
-@@ -66,6 +66,9 @@
- 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
- #
- # OpenBSD/amd64
-@@ -88,7 +91,7 @@
- endif
- endif
- # IA64 Linux
--ifneq (,$(filter Linux,$(OS_ARCH)))
-+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH)))
- ifneq (,$(findstring ia64,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
- ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -151,9 +154,15 @@
- CPPSRCS		:= xptcinvoke_openbsd_alpha.cpp xptcstubs_openbsd_alpha.cpp
- endif
- #
-+# FreeBSD/Alpha
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha)
-+CPPSRCS		:= xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp
-+endif
-+#
- # Linux/Alpha
- #
--ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
-+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST)))                           
- CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
- endif
- #
-@@ -293,6 +302,14 @@
- endif
- 
- #
-+# FreeBSD/PPC
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDpowerpc)
-+CPPSRCS         := xptcinvoke_ppc_freebsd.cpp xptcstubs_ppc_freebsd.cpp
-+ASFILES         := xptcinvoke_asm_ppc_freebsd.s xptcstubs_asm_ppc_freebsd.s
-+endif
-+
-+#
- # Linux/PPC
- #
- ifeq ($(OS_ARCH)$(OS_TEST),Linuxppc)
-@@ -364,6 +381,15 @@
- ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
- endif
- #
-+# FreeBSD/SPARC64
-+#
-+ifeq ($(OS_ARCH),FreeBSD)
-+ifneq (,$(findstring sparc,$(OS_TEST)))
-+CPPSRCS		:= xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
-+ASFILES		:= xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
-+endif
-+endif
-+#
- # Solaris/SPARC
- #
- ifeq ($(OS_ARCH),SunOS)
diff --git a/mail/thunderbird3/files/patch-xptcall-alpha b/mail/thunderbird3/files/patch-xptcall-alpha
deleted file mode 100644
index 29631a98e61e..000000000000
--- a/mail/thunderbird3/files/patch-xptcall-alpha
+++ /dev/null
@@ -1,459 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp	Tue May 27 01:37:00 2003
-@@ -0,0 +1,184 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is 
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+__asm__("invoke_copy_to_stack") __attribute__((unused));
-+
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+    const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
-+
-+    for(PRUint32 i = 0; i < paramCount; i++, d++, s++)
-+    {
-+        if(s->IsPtrData())
-+        {
-+            *d = (PRUint64)s->ptr;
-+            continue;
-+        }
-+        switch(s->type)
-+        {
-+        case nsXPTType::T_I8     : *d = (PRUint64)s->val.i8;     break;
-+        case nsXPTType::T_I16    : *d = (PRUint64)s->val.i16;    break;
-+        case nsXPTType::T_I32    : *d = (PRUint64)s->val.i32;    break;
-+        case nsXPTType::T_I64    : *d = (PRUint64)s->val.i64;    break;
-+        case nsXPTType::T_U8     : *d = (PRUint64)s->val.u8;     break;
-+        case nsXPTType::T_U16    : *d = (PRUint64)s->val.u16;    break;
-+        case nsXPTType::T_U32    : *d = (PRUint64)s->val.u32;    break;
-+        case nsXPTType::T_U64    : *d = (PRUint64)s->val.u64;    break;
-+        case nsXPTType::T_FLOAT  :
-+            if(i < NUM_ARG_REGS)
-+            {
-+                // convert floats to doubles if they are to be passed
-+                // via registers so we can just deal with doubles later
-+                union { PRUint64 u64; double d; } t;
-+                t.d = (double)s->val.f;
-+                *d = t.u64;
-+            }
-+            else
-+                // otherwise copy to stack normally
-+                *d = (PRUint64)s->val.u32;
-+            break;
-+        case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64;    break;
-+        case nsXPTType::T_BOOL   : *d = (PRUint64)s->val.b;      break;
-+        case nsXPTType::T_CHAR   : *d = (PRUint64)s->val.c;      break;
-+        case nsXPTType::T_WCHAR  : *d = (PRUint64)s->val.wc;     break;
-+        default:
-+            // all the others are plain pointer types
-+            *d = (PRUint64)s->val.p;
-+            break;
-+        }
-+    }
-+}
-+
-+/*
-+ * XPTC_PUBLIC_API(nsresult)
-+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+ *                    PRUint32 paramCount, nsXPTCVariant* params, void* vt)
-+ */
-+__asm__(
-+    "#### XPTC_InvokeByIndex ####\n"
-+".text\n\t"
-+    ".align 5\n\t"
-+    ".globl XPTC_InvokeByIndex\n\t"
-+    ".ent XPTC_InvokeByIndex\n"
-+"XPTC_InvokeByIndex:\n\t"
-+    ".frame $15,32,$26,0\n\t"
-+    ".mask 0x4008000,-32\n\t"
-+    "ldgp $29,0($27)\n"
-+"$XPTC_InvokeByIndex..ng:\n\t"
-+    "subq $30,32,$30\n\t"
-+    "stq $26,0($30)\n\t"
-+    "stq $15,8($30)\n\t"
-+    "bis $30,$30,$15\n\t"
-+    ".prologue 1\n\t"
-+
-+    /*
-+     * Allocate enough stack space to hold the greater of 6 or "paramCount"+1
-+     * parameters. (+1 for "this" pointer)  Room for at least 6 parameters
-+     * is required for storage of those passed via registers.
-+     */
-+
-+    "bis $31,5,$2\n\t"      /* count = MAX(5, "paramCount") */
-+    "cmplt $2,$18,$1\n\t"
-+    "cmovne $1,$18,$2\n\t"
-+    "s8addq $2,16,$1\n\t"   /* room for count+1 params (8 bytes each) */
-+    "bic $1,15,$1\n\t"      /* stack space is rounded up to 0 % 16 */
-+    "subq $30,$1,$30\n\t"
-+
-+    "stq $16,0($30)\n\t"    /* save "that" (as "this" pointer) */
-+    "stq $17,16($15)\n\t"   /* save "methodIndex" */
-+
-+    "addq $30,8,$16\n\t"    /* pass stack pointer */
-+    "bis $18,$18,$17\n\t"   /* pass "paramCount" */
-+    "bis $19,$19,$18\n\t"   /* pass "params" */
-+    "bsr $26,$invoke_copy_to_stack..ng\n\t"     /* call invoke_copy_to_stack */
-+
-+    /*
-+     * Copy the first 6 parameters to registers and remove from stack frame.
-+     * Both the integer and floating point registers are set for each parameter
-+     * except the first which is the "this" pointer.  (integer only)
-+     * The floating point registers are all set as doubles since the
-+     * invoke_copy_to_stack function should have converted the floats.
-+     */
-+    "ldq $16,0($30)\n\t"    /* integer registers */
-+    "ldq $17,8($30)\n\t"
-+    "ldq $18,16($30)\n\t"
-+    "ldq $19,24($30)\n\t"
-+    "ldq $20,32($30)\n\t"
-+    "ldq $21,40($30)\n\t"
-+    "ldt $f17,8($30)\n\t"   /* floating point registers */
-+    "ldt $f18,16($30)\n\t"
-+    "ldt $f19,24($30)\n\t"
-+    "ldt $f20,32($30)\n\t"
-+    "ldt $f21,40($30)\n\t"
-+
-+    "addq $30,48,$30\n\t"   /* remove params from stack */
-+
-+    /*
-+     * Call the virtual function with the constructed stack frame.
-+     */
-+    "bis $16,$16,$1\n\t"    /* load "this" */
-+    "ldq $2,16($15)\n\t"    /* load "methodIndex" */
-+    "ldq $1,0($1)\n\t"      /* load vtable */
-+#if 0
-+    "s8addq $2,16,$2\n\t"   /* vtable index = "methodIndex" * 8 + 16 */
-+#else
-+    "mulq $2, 8, $2\n\t"
-+    "addq $2, 0, $2\n\t"   /* vtable index = "methodIndex" * 16 + 24 */
-+#endif
-+    "addq $1,$2,$1\n\t"
-+    "ldq $27,0($1)\n\t"     /* load address of function */
-+    "jsr $26,($27),0\n\t"   /* call virtual function */
-+    "ldgp $29,0($26)\n\t"
-+
-+    "bis $15,$15,$30\n\t"
-+    "ldq $26,0($30)\n\t"
-+    "ldq $15,8($30)\n\t"
-+    "addq $30,32,$30\n\t"
-+    "ret $31,($26),1\n\t"
-+    ".end XPTC_InvokeByIndex"
-+    );
-+
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig	Tue May 27 01:37:30 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp	Tue May 27 01:37:04 2003
-@@ -0,0 +1,269 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is 
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1999
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Implement shared vtbl methods. */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include <sys/types.h>
-+#include <machine/cpu.h>
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+__asm__("PrepareAndDispatch") __attribute__((unused));
-+
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+{
-+    const PRUint8 PARAM_BUFFER_COUNT = 16;
-+    const PRUint8 NUM_ARG_REGS = 6-1;        // -1 for "this" pointer
-+
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint8 paramCount;
-+    PRUint8 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no interface info");
-+
-+    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");
-+
-+    // args[0] to args[NUM_ARG_REGS] hold floating point register values
-+    PRUint64* ap = args + NUM_ARG_REGS;
-+    for(i = 0; i < paramCount; i++, ap++)
-+    {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+        if(param.IsOut() || !type.IsArithmetic())
-+        {
-+            dp->val.p = (void*) *ap;
-+            continue;
-+        }
-+        // else
-+        switch(type)
-+        {
-+        case nsXPTType::T_I8     : dp->val.i8  = (PRInt8)    *ap;    break;
-+        case nsXPTType::T_I16    : dp->val.i16 = (PRInt16)   *ap;    break;
-+        case nsXPTType::T_I32    : dp->val.i32 = (PRInt32)   *ap;    break;
-+        case nsXPTType::T_I64    : dp->val.i64 = (PRInt64)   *ap;    break;
-+        case nsXPTType::T_U8     : dp->val.u8  = (PRUint8)   *ap;    break;
-+        case nsXPTType::T_U16    : dp->val.u16 = (PRUint16)  *ap;    break;
-+        case nsXPTType::T_U32    : dp->val.u32 = (PRUint32)  *ap;    break;
-+        case nsXPTType::T_U64    : dp->val.u64 = (PRUint64)  *ap;    break;
-+        case nsXPTType::T_FLOAT  :
-+            if(i < NUM_ARG_REGS)
-+            {
-+                // floats passed via registers are stored as doubles
-+                // in the first NUM_ARG_REGS entries in args
-+                dp->val.u64 = (PRUint64) args[i];
-+                dp->val.f = (float) dp->val.d;    // convert double to float
-+            }
-+            else
-+                dp->val.u32 = (PRUint32) *ap;
-+            break;
-+        case nsXPTType::T_DOUBLE :
-+            // doubles passed via registers are also stored
-+            // in the first NUM_ARG_REGS entries in args
-+            dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap;
-+            break;
-+        case nsXPTType::T_BOOL   : dp->val.b   = (PRBool)    *ap;    break;
-+        case nsXPTType::T_CHAR   : dp->val.c   = (char)      *ap;    break;
-+        case nsXPTType::T_WCHAR  : dp->val.wc  = (PRUnichar) *ap;    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;
-+}
-+
-+/*
-+ * SharedStub()
-+ *  Collects arguments and calls PrepareAndDispatch.  The "methodIndex" is
-+ *  passed to this function via $1 to preserve the argument registers.
-+ */
-+__asm__(
-+    "#### SharedStub ####\n"
-+".text\n\t"
-+    ".align 5\n\t"
-+    ".ent SharedStub\n"
-+"SharedStub:\n\t"
-+    ".frame $30,96,$26,0\n\t"
-+    ".mask 0x4000000,-96\n\t"
-+    "ldgp $29,0($27)\n"
-+"$SharedStub..ng:\n\t"
-+    "subq $30,96,$30\n\t"
-+    "stq $26,0($30)\n\t"
-+    ".prologue 1\n\t"
-+
-+    /*
-+     * Store arguments passed via registers to the stack.
-+     * Floating point registers are stored as doubles and converted
-+     * to floats in PrepareAndDispatch if necessary.
-+     */
-+    "stt $f17,16($30)\n\t"   /* floating point registers */
-+    "stt $f18,24($30)\n\t"
-+    "stt $f19,32($30)\n\t"
-+    "stt $f20,40($30)\n\t"
-+    "stt $f21,48($30)\n\t"
-+    "stq $17,56($30)\n\t"    /* integer registers */
-+    "stq $18,64($30)\n\t"
-+    "stq $19,72($30)\n\t"
-+    "stq $20,80($30)\n\t"
-+    "stq $21,88($30)\n\t"
-+
-+    /*
-+     * Call PrepareAndDispatch function.
-+     */
-+    "bis $1,$1,$17\n\t"      /* pass "methodIndex" */
-+    "addq $30,16,$18\n\t"    /* pass "args" */
-+    "bsr $26,$PrepareAndDispatch..ng\n\t"
-+
-+    "ldq $26,0($30)\n\t"
-+    "addq $30,96,$30\n\t"
-+    "ret $31,($26),1\n\t"
-+    ".end SharedStub"
-+    );
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \
-+    ); \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \
-+    ); \
-+__asm__( \
-+    "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+    ".align 5\n\t" \
-+    ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \
-+    ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \
-+    ".frame $30,0,$26,0\n\t" \
-+    "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \
-+    ".prologue 1\n\t" \
-+    "lda $1,"#n"\n\t" \
-+    "br $31,$SharedStub..ng\n\t" \
-+    ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \
-+    );
-+#else
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+    nsresult result; \
-+__asm__ __volatile__( \
-+    "ldah    $29,0($27)\n\t" \
-+    "lda     $29,0($29)\n\t" \
-+    "lda $1, "#n"\n\t" \
-+    "br $31, $SharedStub..ng\n\t" \
-+    "mov $0, %0\n\t" \
-+    : "=r" (result) \
-+    ); \
-+    return result; \
-+}
-+#endif
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
diff --git a/mail/thunderbird3/files/patch-xptcall-powerpc b/mail/thunderbird3/files/patch-xptcall-powerpc
deleted file mode 100644
index ee6d3be4555a..000000000000
--- a/mail/thunderbird3/files/patch-xptcall-powerpc
+++ /dev/null
@@ -1,584 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_freebsd.s.orig	2009-09-11 23:18:37.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_freebsd.s	2009-09-19 21:18:53.000000000 +0200
-@@ -0,0 +1,110 @@
-+# -*- Mode: Asm -*-
-+#
-+# The contents of this file are subject to the Netscape Public
-+# License Version 1.1 (the "License"); you may not use this file
-+# except in compliance with the License. You may obtain a copy of
-+# the License at http://www.mozilla.org/NPL/
-+#
-+# Software distributed under the License is distributed on an "AS
-+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+# implied. See the License for the specific language governing
-+# rights and limitations under the License.
-+#
-+# The Original Code is mozilla.org code.
-+#
-+# The Initial Developer of the Original Code is Netscape
-+# Communications Corporation.  Portions created by Netscape are
-+# Copyright (C) 1999 Netscape Communications Corporation. All
-+# Rights Reserved.
-+#
-+# Contributor(s):
-+#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+#   beard@netscape.com (Patrick Beard)
-+#   waterson@netscape.com (Chris Waterson)
-+#
-+.set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
-+.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-+.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
-+.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
-+.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
-+.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
-+.set r30,30; .set r31,31
-+.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
-+.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
-+.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
-+.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
-+.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
-+.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
-+.set f30,30; .set f31,31
-+		      
-+        .section ".text"
-+	.align 2
-+	.globl XPTC_InvokeByIndex
-+	.type  XPTC_InvokeByIndex,@function
-+
-+#
-+# XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+#                    PRUint32 paramCount, nsXPTCVariant* params)
-+#
-+
-+XPTC_InvokeByIndex:
-+	stwu    sp,-32(sp)			# setup standard stack frame
-+	mflr    r0				# save LR
-+	stw     r3,8(sp)			# r3 <= that
-+	stw     r4,12(sp)			# r4 <= methodIndex
-+	stw     r30,16(sp)
-+	stw     r31,20(sp)
-+
-+	stw     r0,36(sp)			# store LR backchain
-+	mr      r31,sp
-+
-+	rlwinm  r10,r5,3,0,27			# r10 = (ParamCount * 2 * 4) & ~0x0f
-+	addi    r0,r10,96			# reserve stack for GPR and FPR register save area r0 = r10 + 96
-+	lwz     r9,0(sp)			# r9 = backchain
-+	neg     r0,r0
-+	stwux   r9,sp,r0			# reserve stack sapce and save SP backchain
-+	
-+	addi    r3,sp,8				# r3 <= args
-+	mr      r4,r5				# r4 <= paramCount
-+	mr      r5,r6				# r5 <= params
-+	add     r6,r3,r10			# r6 <= gpregs ( == args + r10 )
-+	mr      r30,r6				# store in r30 for use later...
-+	addi    r7,r6,32			# r7 <= fpregs ( == gpregs + 32 )
-+
-+	bl      invoke_copy_to_stack@local	# (args, paramCount, params, gpregs, fpregs)
-+
-+	lfd     f1,32(r30)			# load FP registers with method parameters
-+	lfd     f2,40(r30)   
-+	lfd     f3,48(r30)  
-+	lfd     f4,56(r30)  
-+	lfd     f5,64(r30)  
-+	lfd     f6,72(r30)  
-+	lfd     f7,80(r30)  
-+	lfd     f8,88(r30)
-+
-+	lwz     r3,8(r31)			# r3 <= that
-+	lwz     r4,12(r31)			# r4 <= methodIndex
-+	lwz     r5,0(r3)			# r5 <= vtable ( == *that )
-+	
-+	slwi    r4,r4,2				# convert to offset ( *= 4 )
-+	lwzx    r0,r5,r4			# r0 <= methodpointer ( == vtable + offset )
-+
-+        lwz     r4,4(r30)			# load GP regs with method parameters
-+	lwz     r5,8(r30)   
-+	lwz     r6,12(r30)  
-+	lwz     r7,16(r30)  
-+	lwz     r8,20(r30)  
-+	lwz     r9,24(r30)  
-+	lwz     r10,28(r30)
-+
-+	mtlr    r0				# copy methodpointer to LR    
-+	blrl					# call method
-+	
-+	lwz     r30,16(r31)			# restore r30 & r31
-+	lwz     r31,20(r31)
-+	
-+	lwz     r11,0(sp)			# clean up the stack
-+	lwz     r0,4(r11)
-+	mtlr    r0
-+	mr      sp,r11
-+	blr
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_freebsd.cpp.orig	2009-09-11 23:18:37.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_freebsd.cpp	2009-09-19 21:22:23.000000000 +0200
-@@ -0,0 +1,141 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+ *   beard@netscape.com (Patrick Beard)
-+ *   waterson@netscape.com (Chris Waterson)
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either of the GNU General Public License Version 2 or later (the "GPL"),
-+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+// Platform specific code to invoke XPCOM methods on native objects
-+
-+// The purpose of XPTC_InvokeByIndex() is to map a platform
-+// indepenpent call to the platform ABI. To do that,
-+// XPTC_InvokeByIndex() has to determine the method to call via vtable
-+// access. The parameters for the method are read from the
-+// nsXPTCVariant* and prepared for th native ABI.  For the Linux/PPC
-+// ABI this means that the first 8 integral and floating point
-+// parameters are passed in registers.
-+
-+#include "xptcprivate.h"
-+
-+// 8 integral parameters are passed in registers
-+#define GPR_COUNT     8
-+
-+// 8 floating point parameters are passed in registers, floats are
-+// promoted to doubles when passed in registers
-+#define FPR_COUNT     8
-+
-+extern "C" PRUint32
-+invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+  return PRUint32(((paramCount * 2) + 3) & ~3);
-+}
-+
-+extern "C" void
-+invoke_copy_to_stack(PRUint32* d,
-+                     PRUint32 paramCount,
-+                     nsXPTCVariant* s, 
-+                     PRUint32* gpregs,
-+                     double* fpregs)
-+{
-+    PRUint32 gpr = 1; // skip one GP reg for 'that'
-+    PRUint32 fpr = 0;
-+    PRUint32 tempu32;
-+    PRUint64 tempu64;
-+    
-+    for(uint32 i = 0; i < paramCount; i++, s++) {
-+        if(s->IsPtrData())
-+            tempu32 = (PRUint32) s->ptr;
-+        else {
-+            switch(s->type) {
-+            case nsXPTType::T_FLOAT:                                  break;
-+            case nsXPTType::T_DOUBLE:                                 break;
-+            case nsXPTType::T_I8:     tempu32 = s->val.i8;            break;
-+            case nsXPTType::T_I16:    tempu32 = s->val.i16;           break;
-+            case nsXPTType::T_I32:    tempu32 = s->val.i32;           break;
-+            case nsXPTType::T_I64:    tempu64 = s->val.i64;           break;
-+            case nsXPTType::T_U8:     tempu32 = s->val.u8;            break;
-+            case nsXPTType::T_U16:    tempu32 = s->val.u16;           break;
-+            case nsXPTType::T_U32:    tempu32 = s->val.u32;           break;
-+            case nsXPTType::T_U64:    tempu64 = s->val.u64;           break;
-+            case nsXPTType::T_BOOL:   tempu32 = s->val.b;             break;
-+            case nsXPTType::T_CHAR:   tempu32 = s->val.c;             break;
-+            case nsXPTType::T_WCHAR:  tempu32 = s->val.wc;            break;
-+            default:                  tempu32 = (PRUint32) s->val.p;  break;
-+            }
-+        }
-+
-+        if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
-+            if (fpr < FPR_COUNT)
-+                fpregs[fpr++]    = s->val.d;
-+            else {
-+                if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack
-+                *((double*) d) = s->val.d;
-+                d += 2;
-+            }
-+        }
-+        else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-+            if (fpr < FPR_COUNT)
-+                fpregs[fpr++]   = s->val.f; // if passed in registers, floats are promoted to doubles
-+            else
-+                *((float*) d++) = s->val.f;
-+        }
-+        else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64
-+                                     || s->type == nsXPTType::T_U64)) {
-+            if ((gpr + 1) < GPR_COUNT) {
-+                if (gpr & 1) gpr++; // longlongs are aligned in odd/even register pairs, eg. r5/r6
-+                *((PRUint64*) &gpregs[gpr]) = tempu64;
-+                gpr += 2;
-+            }
-+            else {
-+                if ((PRUint32) d & 4) d++; // longlongs are 8-byte aligned on stack
-+                *((PRUint64*) d)            = tempu64;
-+                d += 2;
-+            }
-+        }
-+        else {
-+            if (gpr < GPR_COUNT)
-+                gpregs[gpr++] = tempu32;
-+            else
-+                *d++          = tempu32;
-+        }
-+        
-+    }
-+}
-+
-+extern "C"
-+XPTC_PUBLIC_API(nsresult)
-+XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+                   PRUint32 paramCount, nsXPTCVariant* params);
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_freebsd.s.orig	2009-09-11 23:18:37.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_freebsd.s	2009-09-11 23:18:37.000000000 +0200
-@@ -0,0 +1,89 @@
-+# -*- Mode: Asm -*-
-+#
-+# The contents of this file are subject to the Netscape Public
-+# License Version 1.1 (the "License"); you may not use this file
-+# except in compliance with the License. You may obtain a copy of
-+# the License at http://www.mozilla.org/NPL/
-+#
-+# Software distributed under the License is distributed on an "AS
-+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+# implied. See the License for the specific language governing
-+# rights and limitations under the License.
-+#
-+# The Original Code is mozilla.org code.
-+#
-+# The Initial Developer of the Original Code is Netscape
-+# Communications Corporation.  Portions created by Netscape are
-+# Copyright (C) 1999 Netscape Communications Corporation. All
-+# Rights Reserved.
-+#
-+# Contributor(s): 
-+#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+#   beard@netscape.com (Patrick Beard)
-+#   waterson@netscape.com (Chris Waterson)
-+#
-+
-+.set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
-+.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-+.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
-+.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
-+.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
-+.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
-+.set r30,30; .set r31,31
-+.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
-+.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
-+.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
-+.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
-+.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
-+.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
-+.set f30,30; .set f31,31
-+
-+        .section ".text"
-+        .align 2
-+	.globl SharedStub
-+	.type  SharedStub,@function
-+
-+SharedStub:
-+        stwu	sp,-112(sp)			# room for 
-+						# linkage (8),
-+						# gprData (32),
-+						# fprData (64), 
-+						# stack alignment(8)
-+        mflr	r0
-+	stw	r0,116(sp)			# save LR backchain
-+
-+	stw	r4,12(sp)			# save GP registers
-+	stw	r5,16(sp)			# (n.b. that we don't save r3
-+	stw	r6,20(sp)			# because PrepareAndDispatch() is savvy)
-+	stw	r7,24(sp)
-+	stw	r8,28(sp)
-+	stw	r9,32(sp)
-+	stw	r10,36(sp)
-+
-+	stfd	f1,40(sp)			# save FP registers
-+	stfd	f2,48(sp)
-+	stfd	f3,56(sp)
-+	stfd	f4,64(sp)
-+	stfd	f5,72(sp)
-+	stfd	f6,80(sp)
-+	stfd	f7,88(sp)
-+	stfd	f8,96(sp)
-+
-+						# r3 has the 'self' pointer already
-+	
-+	mr      r4,r11				# r4 <= methodIndex selector, passed
-+						# via r11 in the nsXPTCStubBase::StubXX() call
-+	
-+	addi	r5,sp,120			# r5 <= pointer to callers args area,
-+						# beyond r3-r10/f1-f8 mapped range
-+	
-+	addi	r6,sp,8				# r6 <= gprData
-+	addi	r7,sp,40			# r7 <= fprData
-+      
-+	bl	PrepareAndDispatch@local	# Go!
-+    
-+	lwz	r0,116(sp)			# restore LR
-+	mtlr	r0
-+	la	sp,112(sp)			# clean up the stack
-+	blr
-+
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_freebsd.cpp.orig	2009-09-11 23:18:38.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_freebsd.cpp	2009-09-19 21:48:12.000000000 +0200
-@@ -0,0 +1,232 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1999
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+ *   beard@netscape.com (Patrick Beard)
-+ *   waterson@netscape.com (Chris Waterson)
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either of the GNU General Public License Version 2 or later (the "GPL"),
-+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+// Implement shared vtbl methods.
-+
-+#include "xptcprivate.h"
-+
-+// The PPC/SYSV ABI passes the first 8 integral
-+// parameters and the first 8 floating point parameters in registers
-+// (r3-r10 and f1-f8), no stack space is allocated for these by the
-+// caller.  The rest of the parameters are passed in the callers stack
-+// area. The stack pointer has to retain 16-byte alignment, longlongs
-+// and doubles are aligned on 8-byte boundaries.
-+
-+#define PARAM_BUFFER_COUNT     16
-+#define GPR_COUNT               8
-+#define FPR_COUNT               8
-+
-+// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
-+//
-+// - 'args[]' contains the arguments passed on stack
-+// - 'gprData[]' contains the arguments passed in integer registers
-+// - 'fprData[]' 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,
-+                   PRUint32* args,
-+                   PRUint32 *gprData,
-+                   double *fprData)
-+{
-+    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;
-+
-+    PRUint32* ap = args;
-+    PRUint32 gpr = 1;    // skip one GPR register
-+    PRUint32 fpr = 0;
-+    PRUint32 tempu32;
-+    PRUint64 tempu64;
-+
-+    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 (fpr < FPR_COUNT)
-+                dp->val.d = fprData[fpr++];
-+            else {
-+                if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack
-+                dp->val.d = *(double*) ap;
-+                ap += 2;
-+            }
-+            continue;
-+        }
-+        else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
-+            if (fpr < FPR_COUNT)
-+                dp->val.f = (float) fprData[fpr++]; // in registers floats are passed as doubles
-+            else
-+                dp->val.f = *(float*) ap++;
-+            continue;
-+        }
-+        else if (!param.IsOut() && (type == nsXPTType::T_I64
-+                                    || type == nsXPTType::T_U64)) {
-+            if (gpr & 1) gpr++; // longlongs are aligned in odd/even register pairs, eg. r5/r6
-+            if ((gpr + 1) < GPR_COUNT) {
-+                tempu64 = *(PRUint64*) &gprData[gpr];
-+                gpr += 2;
-+            }
-+            else {
-+                if ((PRUint32) ap & 4) ap++; // longlongs are 8-byte aligned on stack
-+                tempu64 = *(PRUint64*) ap;
-+                ap += 2;
-+            }
-+        }
-+        else {
-+            if (gpr < GPR_COUNT)
-+                tempu32 = gprData[gpr++];
-+            else
-+                tempu32 = *ap++;
-+        }
-+
-+        if(param.IsOut() || !type.IsArithmetic()) {
-+            dp->val.p = (void*) tempu32;
-+            continue;
-+        }
-+
-+        switch(type) {
-+        case nsXPTType::T_I8:      dp->val.i8  = (PRInt8)   tempu32; break;
-+        case nsXPTType::T_I16:     dp->val.i16 = (PRInt16)  tempu32; break;
-+        case nsXPTType::T_I32:     dp->val.i32 = (PRInt32)  tempu32; break;
-+        case nsXPTType::T_I64:     dp->val.i64 = (PRInt64)  tempu64; break;
-+        case nsXPTType::T_U8:      dp->val.u8  = (PRUint8)  tempu32; break;
-+        case nsXPTType::T_U16:     dp->val.u16 = (PRUint16) tempu32; break;
-+        case nsXPTType::T_U32:     dp->val.u32 = (PRUint32) tempu32; break;
-+        case nsXPTType::T_U64:     dp->val.u64 = (PRUint64) tempu64; break;
-+        case nsXPTType::T_BOOL:    dp->val.b   = (PRBool)   tempu32; break;
-+        case nsXPTType::T_CHAR:    dp->val.c   = (char)     tempu32; break;
-+        case nsXPTType::T_WCHAR:   dp->val.wc  = (wchar_t)  tempu32; 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;
-+}
-+
-+// Load r11 with the constant 'n' and branch to SharedStub().
-+
-+// As G++3 ABI contains the length of the functionname in the mangled
-+// name, it is difficult to get a generic assembler mechanism like
-+// in the G++ 2.95 case.
-+// Create names would be like:
-+// _ZN14nsXPTCStubBase5Stub1Ev
-+// _ZN14nsXPTCStubBase6Stub12Ev
-+// _ZN14nsXPTCStubBase7Stub123Ev
-+// _ZN14nsXPTCStubBase8Stub1234Ev
-+// etc.
-+// Use assembler directives to get the names right...
-+
-+# define STUB_ENTRY(n)							\
-+__asm__ (								\
-+	".align	2 \n\t"							\
-+	".if	"#n" < 10 \n\t"						\
-+	".globl	_ZN14nsXPTCStubBase5Stub"#n"Ev \n\t"			\
-+	".type	_ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n"		\
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t"					\
-+									\
-+	".elseif "#n" < 100 \n\t"					\
-+	".globl	_ZN14nsXPTCStubBase6Stub"#n"Ev \n\t"			\
-+	".type	_ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n"		\
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t"					\
-+									\
-+	".elseif "#n" < 1000 \n\t"					\
-+	".globl	_ZN14nsXPTCStubBase7Stub"#n"Ev \n\t"			\
-+	".type	_ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n"		\
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t"					\
-+									\
-+	".else \n\t"							\
-+	".err	\"stub number "#n" >= 1000 not yet supported\"\n"	\
-+	".endif \n\t"							\
-+									\
-+	"li	11,"#n" \n\t"						\
-+	"b	SharedStub@local \n"					\
-+);
-+
-+#define SENTINEL_ENTRY(n)                            \
-+nsresult nsXPTCStubBase::Sentinel##n()               \
-+{                                                    \
-+  NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+  return NS_ERROR_NOT_IMPLEMENTED;                   \
-+}
-+
-+#include "xptcstubsdef.inc"
diff --git a/mail/thunderbird3/files/patch-xptcall-sparc64 b/mail/thunderbird3/files/patch-xptcall-sparc64
deleted file mode 100644
index 9599a8a71336..000000000000
--- a/mail/thunderbird3/files/patch-xptcall-sparc64
+++ /dev/null
@@ -1,327 +0,0 @@
---- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp	Mon May 26 04:12:55 2003
-@@ -0,0 +1,123 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ */
-+
-+/* Implement shared vtbl methods. */
-+
-+#include "xptcprivate.h"
-+
-+#if defined(sparc) || defined(__sparc__)
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args)
-+{
-+
-+#define PARAM_BUFFER_COUNT     16
-+
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint8 paramCount;
-+    PRUint8 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no interface info");
-+
-+    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");
-+
-+    PRUint64* ap = args;
-+    for(i = 0; i < paramCount; i++, ap++)
-+    {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+        if(param.IsOut() || !type.IsArithmetic())
-+        {
-+            dp->val.p = (void*) *ap;
-+            continue;
-+        }
-+        // else
-+        switch(type)
-+        {
-+        case nsXPTType::T_I8     : dp->val.i8  = *((PRInt64*)  ap);      break;
-+        case nsXPTType::T_I16    : dp->val.i16 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_I32    : dp->val.i32 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_DOUBLE : dp->val.d   = *((double*) ap);        break;
-+        case nsXPTType::T_U64    : dp->val.u64 = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_I64    : dp->val.i64 = *((PRInt64*) ap);       break;
-+        case nsXPTType::T_U8     : dp->val.u8  = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_U16    : dp->val.u16 = *((PRUint64*)ap);       break;
-+        case nsXPTType::T_U32    : dp->val.u32 = *((PRUint64*)ap);       break;
-+        case nsXPTType::T_FLOAT  : dp->val.f   = ((float*)   ap)[1];     break;
-+        case nsXPTType::T_BOOL   : dp->val.b   = *((PRInt64*)  ap);      break;
-+        case nsXPTType::T_CHAR   : dp->val.c   = *((PRUint64*) ap);      break;
-+        case nsXPTType::T_WCHAR  : dp->val.wc  = *((PRInt64*) ap);       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;
-+}
-+
-+extern "C" int SharedStub(int, int*);
-+
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+	int dummy; /* defeat tail-call optimization */ \
-+	return SharedStub(n, &dummy); \
-+}
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#endif /* sparc || __sparc__ */
---- /dev/null	Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s	Mon May 26 04:06:09 2003
-@@ -0,0 +1,104 @@
-+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ *   Chris Seawood <cls@seawood.org>
-+ */
-+
-+/*
-+    Platform specific code to invoke XPCOM methods on native objects
-+    for sparcv9 Solaris.
-+
-+    See the SPARC Compliance Definition (SCD) Chapter 3
-+    for more information about what is going on here, including
-+    the use of BIAS (0x7ff).
-+    The SCD is available from http://www.sparc.com/.
-+*/
-+
-+        .global XPTC_InvokeByIndex
-+        .type   XPTC_InvokeByIndex, #function
-+
-+/*
-+    XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+                   PRUint32 paramCount, nsXPTCVariant* params);
-+    
-+*/
-+XPTC_InvokeByIndex:
-+        save    %sp,-(128 + 64),%sp ! room for the register window and
-+                                    ! struct pointer, rounded up to 0 % 64
-+        sll     %i2,4,%l0           ! assume the worst case
-+                                    ! paramCount * 2 * 8 bytes
-+        cmp     %l0, 0              ! are there any args? If not,
-+        be      .invoke             ! no need to copy args to stack
-+         nop
-+
-+        sub     %sp,%l0,%sp         ! create the additional stack space
-+        add     %sp,0x7ff+136,%o0   ! step past the register window, the
-+                                    ! struct result pointer and the 'this' slot
-+        mov     %i2,%o1             ! paramCount
-+        call    invoke_copy_to_stack
-+        mov     %i3,%o2             ! params
-+
-+!
-+!   load arguments from stack into the outgoing registers
-+!   BIAS is 0x7ff (2047)
-+!
-+
-+!   load the %o1..5 64bit (extended word) output registers registers 
-+        ldx     [%sp + 0x7ff + 136],%o1    ! %i1
-+        ldx     [%sp + 0x7ff + 144],%o2    ! %i2
-+        ldx     [%sp + 0x7ff + 152],%o3    ! %i3
-+        ldx     [%sp + 0x7ff + 160],%o4    ! %i4
-+        ldx     [%sp + 0x7ff + 168],%o5    ! %i5
-+
-+!   load the even number double registers starting with %d2
-+        ldd     [%sp + 0x7ff + 136],%f2
-+        ldd     [%sp + 0x7ff + 144],%f4
-+        ldd     [%sp + 0x7ff + 152],%f6
-+        ldd     [%sp + 0x7ff + 160],%f8
-+        ldd     [%sp + 0x7ff + 168],%f10
-+        ldd     [%sp + 0x7ff + 176],%f12
-+        ldd     [%sp + 0x7ff + 184],%f14
-+        ldd     [%sp + 0x7ff + 192],%f16
-+        ldd     [%sp + 0x7ff + 200],%f18
-+        ldd     [%sp + 0x7ff + 208],%f20
-+        ldd     [%sp + 0x7ff + 216],%f22
-+        ldd     [%sp + 0x7ff + 224],%f24
-+        ldd     [%sp + 0x7ff + 232],%f26
-+        ldd     [%sp + 0x7ff + 240],%f28
-+        ldd     [%sp + 0x7ff + 248],%f30
-+
-+!
-+!   calculate the target address from the vtable
-+!
-+.invoke:
-+        sll     %i1,3,%l0           ! index *= 8
-+!       add     %l0,16,%l0          ! there are 2 extra entries in the vTable (16bytes)
-+        ldx     [%i0],%l1           ! *that --> address of vtable
-+        ldx     [%l0 + %l1],%l0     ! that->vtable[index * 8 + 16] --> address
-+
-+        jmpl    %l0,%o7             ! call the routine
-+        mov     %i0,%o0             ! move 'this' pointer to out register
-+
-+        mov     %o0,%i0             ! propagate return value
-+        ret
-+        restore
-+
-+        .size    XPTC_InvokeByIndex, .-XPTC_InvokeByIndex
---- /dev/null	Mon May 26 14:00:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp	Mon May 26 14:00:49 2003
-@@ -0,0 +1,91 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ * 
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ * 
-+ * The Original Code is mozilla.org code.
-+ * 
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ * 
-+ * Contributor(s): 
-+ *   Stuart Parmenter <pavlov@netscape.com>
-+ *   Chris Seawood <cls@seawood.org>
-+ */
-+
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+#include "xptcprivate.h"
-+
-+#if !defined(__sparc) && !defined(__sparc__)
-+#error "This code is for Sparc only"
-+#endif
-+
-+/* Prototype specifies unmangled function name */
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s);
-+
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+  /*
-+    We need to copy the parameters for this function to locals and use them
-+    from there since the parameters occupy the same stack space as the stack
-+    we're trying to populate.
-+  */
-+  PRUint64 *l_d = d;
-+  nsXPTCVariant *l_s = s;
-+  PRUint64 l_paramCount = paramCount;
-+  PRUint64 regCount = 0;  // return the number of registers to load from the stack
-+
-+  for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++)
-+  {
-+    if (regCount < 5) regCount++;
-+
-+    if (l_s->IsPtrData())
-+    {
-+      *l_d = (PRUint64)l_s->ptr;
-+      continue;
-+    }
-+    switch (l_s->type)
-+    {
-+      case nsXPTType::T_I8    : *((PRInt64*)l_d)     = l_s->val.i8;    break;
-+      case nsXPTType::T_I16   : *((PRInt64*)l_d)     = l_s->val.i16;   break;
-+      case nsXPTType::T_I32   : *((PRInt64*)l_d)     = l_s->val.i32;   break;
-+      case nsXPTType::T_I64   : *((PRInt64*)l_d)     = l_s->val.i64;   break;
-+      
-+      case nsXPTType::T_U8    : *((PRUint64*)l_d)    = l_s->val.u8;    break;
-+      case nsXPTType::T_U16   : *((PRUint64*)l_d)    = l_s->val.u16;   break;
-+      case nsXPTType::T_U32   : *((PRUint64*)l_d)    = l_s->val.u32;   break;
-+      case nsXPTType::T_U64   : *((PRUint64*)l_d)    = l_s->val.u64;   break;
-+
-+      /* in the case of floats, we want to put the bits in to the
-+         64bit space right justified... floats in the paramter array on
-+         sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip
-+         the space that would be occupied by %f0, %f2, etc.
-+      */
-+      case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f;     break;
-+      case nsXPTType::T_DOUBLE: *((double*)l_d)      = l_s->val.d;     break;
-+      case nsXPTType::T_BOOL  : *((PRInt64*)l_d)     = l_s->val.b;     break;
-+      case nsXPTType::T_CHAR  : *((PRUint64*)l_d)    = l_s->val.c;     break;
-+      case nsXPTType::T_WCHAR : *((PRInt64*)l_d)     = l_s->val.wc;    break;
-+
-+      default:
-+        // all the others are plain pointer types
-+        *((void**)l_d) = l_s->val.p;
-+        break;
-+    }
-+  }
-+  
-+  return regCount;
-+}
diff --git a/mail/thunderbird3/files/releng6_pulseaudio b/mail/thunderbird3/files/releng6_pulseaudio
new file mode 100644
index 000000000000..2b82f93201ca
--- /dev/null
+++ b/mail/thunderbird3/files/releng6_pulseaudio
@@ -0,0 +1,66 @@
+--- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2009-08-20 21:43:41.000000000 +0200
++++ mozilla/media/libsydneyaudio/src/Makefile.in	2009-08-20 21:44:17.000000000 +0200
+@@ -45,6 +45,12 @@
+ LIBRARY_NAME	= sydneyaudio
+ FORCE_STATIC_LIB= 1
+ 
++ifeq ($(OS_ARCH),FreeBSD)
++CSRCS		= \
++		sydney_audio_pulseaudio.c \
++		$(NULL)
++endif
++
+ ifeq ($(OS_ARCH),Linux)
+ CSRCS		= \
+ 		sydney_audio_alsa.c \
+--- mozilla/toolkit/library/Makefile.in.orig	2009-08-20 21:45:20.000000000 +0200
++++ mozilla/toolkit/library/Makefile.in	2009-08-20 21:46:25.000000000 +0200
+@@ -228,12 +228,12 @@
+ endif
+ 
+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc
+ EXTRA_DSO_LDOPTS += $(FT2_LIBS)
+ endif
+ 
+ ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
+-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0
++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc
+ EXTRA_DSO_LDOPTS += $(FT2_LIBS)
+ endif
+ 
+--- mozilla/js/src/Makefile.in.orig	2009-08-21 00:34:43.000000000 +0200
++++ mozilla/js/src/Makefile.in	2009-08-21 00:36:59.000000000 +0200
+@@ -427,7 +427,7 @@
+ endif # WINNT
+ 
+ ifeq ($(OS_ARCH),FreeBSD)
+-EXTRA_LIBS	+= -pthread
++EXTRA_LIBS	+= -pthread -lpulse -lc
+ endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32
+--- config/rules.mk.orig	2009-08-22 15:30:16.000000000 +0200
++++ config/rules.mk	2009-08-22 15:30:46.000000000 +0200
+@@ -583,6 +583,7 @@
+ ifdef IS_COMPONENT
+ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+ endif
++EXTRA_LIBS	+= -pthread -lpulse -lc
+ endif
+ 
+ ifeq ($(OS_ARCH),NetBSD)
+--- mozilla/layout/build/Makefile.in.orig	2009-08-22 01:00:21.000000000 +0200
++++ mozilla/layout/build/Makefile.in	2009-08-22 01:00:57.000000000 +0200
+@@ -269,6 +269,10 @@
+ endif
+ endif
+ 
++ifeq ($(OS_ARCH),FreeBSD)
++EXTRA_LIBS	+= -lpulse
++endif
++
+ include $(topsrcdir)/config/rules.mk
+ 
+ LOCAL_INCLUDES	+= -I$(srcdir)/../base \