aboutsummaryrefslogtreecommitdiff
path: root/mail/thunderbird-esr
diff options
context:
space:
mode:
Diffstat (limited to 'mail/thunderbird-esr')
-rw-r--r--mail/thunderbird-esr/Makefile121
-rw-r--r--mail/thunderbird-esr/distinfo2
-rw-r--r--mail/thunderbird-esr/files/liboggplay_oss15
-rw-r--r--mail/thunderbird-esr/files/moz_pis_S50cleanhome34
-rw-r--r--mail/thunderbird-esr/files/patch-config-autoconf.mk.in21
-rw-r--r--mail/thunderbird-esr/files/patch-configure.in11
-rw-r--r--mail/thunderbird-esr/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in13
-rw-r--r--mail/thunderbird-esr/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in14
-rw-r--r--mail/thunderbird-esr/files/patch-directory_xpcom_base_src_Makefile.in13
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-build-autoconf-config.sub12
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-config-mkdepend-Makefile.in10
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-config-rules.mk13
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in21
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-configure.in11
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-content-xslt-public-txDouble.h20
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-db-sqlite3-src-Makefile.in11
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-js-src-build-autoconf-config.sub12
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-js-src-config-mkdepend-Makefile.in11
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in22
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-js-src-jslock.cpp18
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp28
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-layout-generic-Makefile.in14
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h11
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h11
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk33
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp10
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-storage-build-Makefile.in10
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-Makefile.in8
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp10
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc11
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in76
-rw-r--r--mail/thunderbird-esr/files/releng6_pulseaudio66
-rw-r--r--mail/thunderbird-esr/files/thunderbird.desktop.in11
-rw-r--r--mail/thunderbird-esr/pkg-descr6
34 files changed, 0 insertions, 710 deletions
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
deleted file mode 100644
index 99db2d545c1b..000000000000
--- a/mail/thunderbird-esr/Makefile
+++ /dev/null
@@ -1,121 +0,0 @@
-# New ports collection makefile for: mozilla-thunderbird
-# Date created: 4 September 2003
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= thunderbird
-DISTVERSION= 3.1.7
-CATEGORIES= mail ipv6
-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
-
-BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr
-
-USE_AUTOTOOLS= autoconf213
-USE_GECKO= gecko
-CONFLICTS_INSTALL= thunderbird-3.0*
-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
-
-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 \
- --disable-updater --disable-necko-wifi
-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= ${PORTNAME}.png
-PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
-
-SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
-MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
-
-OPTIONS=
-
-.include <bsd.port.pre.mk>
-
-WRKSRC= ${WRKDIR}/comm-1.9.2
-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 defined(WITHOUT_DBUS)
-MOZ_OPTIONS+= --disable-dbus --disable-libnotify
-.else
-LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
- notify.1:${PORTSDIR}/devel/libnotify
-.endif
-
-post-extract::
- ${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
- <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
-
-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}|' \
- ${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
- ${RM} -f ${FAKEDIR}/bin/*.bak
- ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
-
-pre-install:
- @${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
- @${ECHO_CMD} 'share/pixmaps/${PORTNAME_ICON}' >> ${PLIST}
- @${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST}
-
-post-install:
- ${MKDIR} ${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications
- ${LN} -sf ${PORTNAME_ICON_SRC} ${PREFIX}/share/pixmaps/${PORTNAME_ICON}
-
-.include <bsd.port.post.mk>
diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo
deleted file mode 100644
index c6ebbd83cb2a..000000000000
--- a/mail/thunderbird-esr/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (thunderbird-3.1.7.source.tar.bz2) = 800fe263b3889d4e602ff48889036ad56e940fc792894aca10fa07db28b6e662
-SIZE (thunderbird-3.1.7.source.tar.bz2) = 65948060
diff --git a/mail/thunderbird-esr/files/liboggplay_oss b/mail/thunderbird-esr/files/liboggplay_oss
deleted file mode 100644
index e43b0725eea2..000000000000
--- a/mail/thunderbird-esr/files/liboggplay_oss
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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/thunderbird-esr/files/moz_pis_S50cleanhome b/mail/thunderbird-esr/files/moz_pis_S50cleanhome
deleted file mode 100644
index 348592392043..000000000000
--- a/mail/thunderbird-esr/files/moz_pis_S50cleanhome
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-
-# S50cleanhome
-# a script to polite ${HOME}/${MOZ_PIS_USER_DIR}
-
-# We run in our own subshell
-
-# First, verify protocol
-[ "$1" != "start" ] && exit 1
-[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1
-[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1
-[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1
-[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1
-
-# Try to polite ${HOME}/${MOZ_PIS_USER_DIR}
-
-# This must be really needed?
-# rm -f "${$HOME}/${MOZ_PIS_USER_DIR}/pluginreg.dat"
-
-# Try to polite profile dirs
-if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then
- sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \
- "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \
- | while read dir
- do
- [ ! -d "${dir}" ] && continue
- # at last, debian do this, we do for new builds
- # rm -f "${dir}/XUL.mfasl"
- # make reclaculate compreg.dat, xpti.dat for new builds
- [ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] &&
- rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl"
- done
-fi
diff --git a/mail/thunderbird-esr/files/patch-config-autoconf.mk.in b/mail/thunderbird-esr/files/patch-config-autoconf.mk.in
deleted file mode 100644
index 877c48294fc6..000000000000
--- a/mail/thunderbird-esr/files/patch-config-autoconf.mk.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200
-+++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200
-@@ -57,14 +57,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/thunderbird-esr/files/patch-configure.in b/mail/thunderbird-esr/files/patch-configure.in
deleted file mode 100644
index ae9642b9fffd..000000000000
--- a/mail/thunderbird-esr/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/thunderbird-esr/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in b/mail/thunderbird-esr/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in
deleted file mode 100644
index b71a03a4567b..000000000000
--- a/mail/thunderbird-esr/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/thunderbird-esr/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in b/mail/thunderbird-esr/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in
deleted file mode 100644
index ebf7f94ace1e..000000000000
--- a/mail/thunderbird-esr/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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/thunderbird-esr/files/patch-directory_xpcom_base_src_Makefile.in b/mail/thunderbird-esr/files/patch-directory_xpcom_base_src_Makefile.in
deleted file mode 100644
index f56d7b17f104..000000000000
--- a/mail/thunderbird-esr/files/patch-directory_xpcom_base_src_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/thunderbird-esr/files/patch-mozilla-build-autoconf-config.sub b/mail/thunderbird-esr/files/patch-mozilla-build-autoconf-config.sub
deleted file mode 100644
index 12a704ade44b..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-build-autoconf-config.sub
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla/build/autoconf/config.sub.orig 2010-01-05 12:26:13.000000000 +0100
-+++ mozilla/build/autoconf/config.sub 2010-01-05 12:26:46.000000000 +0100
-@@ -403,9 +403,6 @@
- amd64)
- basic_machine=x86_64-pc
- ;;
-- amd64-*)
-- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-- ;;
- amdahl)
- basic_machine=580-amdahl
- os=-sysv
diff --git a/mail/thunderbird-esr/files/patch-mozilla-config-mkdepend-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-config-mkdepend-Makefile.in
deleted file mode 100644
index 3b649d0f16b7..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-config-mkdepend-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/thunderbird-esr/files/patch-mozilla-config-rules.mk b/mail/thunderbird-esr/files/patch-mozilla-config-rules.mk
deleted file mode 100644
index bbe6fec94311..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-config-rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
-
- ifeq ($(OS_ARCH),FreeBSD)
--ifdef IS_COMPONENT
--EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
--endif
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
- endif
-
- ifeq ($(OS_ARCH),NetBSD)
diff --git a/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in b/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in
deleted file mode 100644
index 763f8ebfa6de..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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/thunderbird-esr/files/patch-mozilla-configure.in b/mail/thunderbird-esr/files/patch-mozilla-configure.in
deleted file mode 100644
index f08b95aa5c20..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/thunderbird-esr/files/patch-mozilla-content-xslt-public-txDouble.h b/mail/thunderbird-esr/files/patch-mozilla-content-xslt-public-txDouble.h
deleted file mode 100644
index c53f725c80ed..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-content-xslt-public-txDouble.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/thunderbird-esr/files/patch-mozilla-db-sqlite3-src-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-db-sqlite3-src-Makefile.in
deleted file mode 100644
index 24a7d6206604..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-db-sqlite3-src-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/thunderbird-esr/files/patch-mozilla-js-src-build-autoconf-config.sub b/mail/thunderbird-esr/files/patch-mozilla-js-src-build-autoconf-config.sub
deleted file mode 100644
index 2cb48a88c0e9..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-js-src-build-autoconf-config.sub
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla/js/src/build/autoconf/config.sub.orig 2010-01-08 09:52:25.000000000 +0100
-+++ mozilla/js/src/build/autoconf/config.sub 2010-01-08 09:52:33.000000000 +0100
-@@ -403,9 +403,6 @@
- amd64)
- basic_machine=x86_64-pc
- ;;
-- amd64-*)
-- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-- ;;
- amdahl)
- basic_machine=580-amdahl
- os=-sysv
diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-config-mkdepend-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
deleted file mode 100644
index 6129066e1afd..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/js/src/config/mkdepend/Makefile.in.orig 2010-01-19 21:27:45.000000000 +0100
-+++ mozilla/js/src/config/mkdepend/Makefile.in 2010-01-20 21:55:56.000000000 +0100
-@@ -71,7 +71,7 @@
-
- include $(topsrcdir)/config/rules.mk
-
--HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
-
- ifdef GNU_CC
- _GCCDIR = $(shell $(CC) -print-file-name=include)
diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in b/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in
deleted file mode 100644
index fe78e75474bb..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- mozilla/js/src/configure.in.orig 2010-05-12 21:05:58.000000000 +0200
-+++ mozilla/js/src/configure.in 2010-06-22 16:17:20.000000000 +0200
-@@ -1218,7 +1218,7 @@
- CPU_ARCH=sparc
- ;;
-
--x86_64 | ia64)
-+amd64 | x86_64 | ia64)
- CPU_ARCH="$OS_TEST"
- ;;
- esac
-@@ -2466,10 +2466,6 @@
- ENABLE_JIT=1
- NANOJIT_ARCH=ARM
- ;;
--sparc*-*)
-- ENABLE_JIT=1
-- NANOJIT_ARCH=Sparc
-- ;;
- esac
-
- MOZ_ARG_DISABLE_BOOL(jit,
diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-jslock.cpp b/mail/thunderbird-esr/files/patch-mozilla-js-src-jslock.cpp
deleted file mode 100644
index 03f5c60cccf8..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-js-src-jslock.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- mozilla/js/src/jslock.cpp.orig 2010-01-23 20:35:45.000000000 +0100
-+++ mozilla/js/src/jslock.cpp 2010-01-23 20:37:35.000000000 +0100
-@@ -160,8 +160,13 @@
- unsigned int res;
-
- __asm__ __volatile__ (
-- "stbar\n"
-- "cas [%1],%2,%3\n"
-+ "membar #StoreLoad | #LoadLoad\n"
-+# if defined (__sparc64__)
-+ "casx [%1],%2,%3\n"
-+# else
-+ "cas [%1],%2,%3\n" /* 32-bit version */
-+# endif
-+ "membar #StoreLoad | #LoadLoad\n"
- "cmp %2,%3\n"
- "be,a 1f\n"
- "mov 1,%0\n"
diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp b/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp
deleted file mode 100644
index c52535eaca09..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnum.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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/thunderbird-esr/files/patch-mozilla-layout-generic-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-layout-generic-Makefile.in
deleted file mode 100644
index afdc6fd8ae0f..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-layout-generic-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- mozilla/layout/generic/Makefile.in.orig 2010-01-20 18:57:00.000000000 +0100
-+++ mozilla/layout/generic/Makefile.in 2010-01-20 18:57:48.000000000 +0100
-@@ -191,9 +191,10 @@
- -I$(srcdir)/../../content/base/src \
- -I$(srcdir)/../../content/html/content/src \
- -I$(srcdir)/../../dom/base \
-- $(MOZ_CAIRO_CFLAGS) \
- $(NULL)
-
-+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
-+
- ifdef MOZ_ENABLE_GTK2
- CXXFLAGS += $(MOZ_GTK2_CFLAGS)
- endif
diff --git a/mail/thunderbird-esr/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h b/mail/thunderbird-esr/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h
deleted file mode 100644
index 726dc875e37f..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig 2010-09-06 11:33:54.000000000 +0200
-+++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h 2010-09-06 11:34:16.000000000 +0200
-@@ -59,7 +59,7 @@
-
- #include <sys/types.h>
-
--#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX)
-+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) || defined (__FreeBSD__)
- typedef off_t oggz_off_t;
- #else
- typedef loff_t oggz_off_t;
diff --git a/mail/thunderbird-esr/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h b/mail/thunderbird-esr/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h
deleted file mode 100644
index e2c52f080518..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk b/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk
deleted file mode 100644
index 39272d788b83..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk
+++ /dev/null
@@ -1,33 +0,0 @@
---- mozilla/security/coreconf/FreeBSD.mk.orig 2010-04-30 19:44:32.000000000 +0000
-+++ mozilla/security/coreconf/FreeBSD.mk 2010-05-10 13:04:45.000000000 +0000
-@@ -52,6 +52,15 @@
- ifeq ($(CPU_ARCH),amd64)
- CPU_ARCH = x86_64
- endif
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH = amd64
-+endif
-+ifeq ($(OS_TEST),powerpc)
-+CPU_ARCH = powerpc
-+endif
-+ifeq ($(OS_TEST),sparc64)
-+CPU_ARCH = sparc64
-+endif
-
- OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-@@ -78,7 +87,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
-@@ -87,4 +96,4 @@
-
- G++INCLUDES = -I/usr/include/g++
-
--INCLUDES += -I/usr/X11R6/include
-+#INCLUDES += -I/usr/local/include
diff --git a/mail/thunderbird-esr/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp b/mail/thunderbird-esr/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp
deleted file mode 100644
index 272a02bdb9e0..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/thunderbird-esr/files/patch-mozilla-storage-build-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-storage-build-Makefile.in
deleted file mode 100644
index 44ed0d3e7318..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-storage-build-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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) \
- $(MOZ_JS_LIBS) \
-+ %%PTHREAD_LIBS%% \
- $(NULL)
-
- include $(topsrcdir)/config/rules.mk
diff --git a/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-Makefile.in
deleted file mode 100644
index 224a65d1efe0..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp b/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
deleted file mode 100644
index 4d2bca2ca692..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/xpcom/base/nsStackWalk.cpp.orig 2010-09-12 19:34:04.012503905 +0300
-+++ mozilla/xpcom/base/nsStackWalk.cpp 2010-09-12 19:34:41.294462134 +0300
-@@ -41,6 +41,7 @@
- /* API for getting a stack trace of the C/C++ stack on the current thread */
-
- #include "nsStackWalk.h"
-+#include <dlfcn.h>
-
- #if defined(_WIN32) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64)) && !defined(WINCE) // WIN32 x86 stack walking code
-
diff --git a/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
deleted file mode 100644
index a146f07811fd..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- */
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- NS_IMETHOD Stub3();
- NS_IMETHOD Stub4();
- NS_IMETHOD Stub5();
diff --git a/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
deleted file mode 100644
index a6fb01850aaa..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ /dev/null
@@ -1,76 +0,0 @@
---- 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/thunderbird-esr/files/releng6_pulseaudio b/mail/thunderbird-esr/files/releng6_pulseaudio
deleted file mode 100644
index 37203b52a5ee..000000000000
--- a/mail/thunderbird-esr/files/releng6_pulseaudio
+++ /dev/null
@@ -1,66 +0,0 @@
---- 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 2010-01-19 20:28:10.000000000 +0000
-+++ mozilla/toolkit/library/Makefile.in 2010-01-25 09:38:40.000000000 +0000
-@@ -235,12 +235,12 @@
- endif
-
- ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(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 \
diff --git a/mail/thunderbird-esr/files/thunderbird.desktop.in b/mail/thunderbird-esr/files/thunderbird.desktop.in
deleted file mode 100644
index b8730d2f50ea..000000000000
--- a/mail/thunderbird-esr/files/thunderbird.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Thunderbird
-GenericName=Mail Client
-Comment=Mail client and News Reader
-Exec=thunderbird %U
-Icon=@PORTNAME_ICON@
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Application;Network;
diff --git a/mail/thunderbird-esr/pkg-descr b/mail/thunderbird-esr/pkg-descr
deleted file mode 100644
index 9ef9a8246af4..000000000000
--- a/mail/thunderbird-esr/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Mozilla Thunderbird is a redesign of the Mozilla mail component with the goal
-of becoming a cross-platform stand alone mail application using the XUL
-user interface language. See the Mozilla Thunderbird project page for
-more details.
-
-WWW: http://www.mozilla.com/thunderbird/