aboutsummaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/dbmail22/Makefile141
-rw-r--r--mail/dbmail22/distinfo2
-rw-r--r--mail/dbmail22/files/dbmail-imapd.sh.in32
-rw-r--r--mail/dbmail22/files/dbmail-lmtpd.sh.in32
-rw-r--r--mail/dbmail22/files/dbmail-pop3d.sh.in32
-rw-r--r--mail/dbmail22/files/dbmail-timsieved.sh.in32
-rw-r--r--mail/dbmail22/files/pkg-message.in29
-rw-r--r--mail/dbmail22/pkg-descr24
-rw-r--r--mail/dbmail22/pkg-plist61
-rw-r--r--mail/linux-thunderbird/Makefile2
-rw-r--r--mail/linux-thunderbird/distinfo4
-rw-r--r--mail/linux-thunderbird/pkg-plist6
-rw-r--r--mail/mutt14/Makefile225
-rw-r--r--mail/mutt14/distinfo6
-rw-r--r--mail/mutt14/files/extra-patch-doc-ref12
-rw-r--r--mail/mutt14/files/patch-0263
-rw-r--r--mail/mutt14/files/patch-0313
-rw-r--r--mail/mutt14/files/patch-0587
-rw-r--r--mail/mutt14/files/patch-0810
-rw-r--r--mail/mutt14/files/patch-aclocal.m411
-rw-r--r--mail/mutt14/files/patch-configure.in11
-rw-r--r--mail/mutt14/files/patch-contrib-Makefile.in11
-rw-r--r--mail/mutt14/files/patch-doc-mutt.man34
-rw-r--r--mail/mutt14/files/patch-examples50
-rw-r--r--mail/mutt14/files/patch-init.c39
-rw-r--r--mail/mutt14/files/patch-m4-gssapi.m433
-rw-r--r--mail/mutt14/files/patch-mktemp15
-rw-r--r--mail/mutt14/files/patch-threadcomplete73
-rw-r--r--mail/mutt14/files/patch-z22
-rw-r--r--mail/mutt14/pkg-descr12
-rw-r--r--mail/mutt14/pkg-plist79
-rw-r--r--mail/mutt14/pkg-plist.htmlfiles346
-rw-r--r--mail/postfix28/Makefile380
-rw-r--r--mail/postfix28/distinfo6
-rw-r--r--mail/postfix28/files/patch-makedefs13
-rw-r--r--mail/postfix28/files/patch-src::util::sys_defs.h11
-rw-r--r--mail/postfix28/files/pkg-install.in98
-rw-r--r--mail/postfix28/files/pkg-message.in27
-rw-r--r--mail/postfix28/files/postfix.sh.in47
-rw-r--r--mail/postfix28/pkg-descr15
-rw-r--r--mail/postfix28/pkg-plist245
-rw-r--r--mail/thunderbird-esr-i18n/Makefile88
-rw-r--r--mail/thunderbird-esr-i18n/distinfo84
-rw-r--r--mail/thunderbird-esr-i18n/pkg-descr3
-rw-r--r--mail/thunderbird-esr/Makefile164
-rw-r--r--mail/thunderbird-esr/distinfo2
-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.in121
-rw-r--r--mail/thunderbird-esr/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc10
-rw-r--r--mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util.h13
-rw-r--r--mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc11
-rw-r--r--mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_posix.cc11
-rw-r--r--mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_file_posix.cc10
-rw-r--r--mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_thread_posix.cc12
-rw-r--r--mail/thunderbird-esr/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h11
-rw-r--r--mail/thunderbird-esr/files/patch-ipc-chromium-src-build-build_config.h11
-rw-r--r--mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in13
-rw-r--r--mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in14
-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_autoconf.mk.in31
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-configure.in86
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-db-sqlite3-src-Makefile.in11
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-Makefile.in14
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h11
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in30
-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-config_config.mk10
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in48
-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.in15
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h11
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.c16
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.h16
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk40
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp10
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c43
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in12
-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/patch-mozilla__content__base__public__nsContentUtils.h11
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp14
-rw-r--r--mail/thunderbird-esr/files/patch-mozilla_toolkit_xre_glxtest.cpp25
-rw-r--r--mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.cfg100
-rw-r--r--mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.h30
-rw-r--r--mail/thunderbird-esr/files/thunderbird.desktop.in11
-rw-r--r--mail/thunderbird-esr/pkg-descr6
-rw-r--r--mail/thunderbird-i18n/Makefile7
-rw-r--r--mail/thunderbird-i18n/distinfo168
-rw-r--r--mail/thunderbird/Makefile2
-rw-r--r--mail/thunderbird/distinfo4
-rw-r--r--mail/thunderbird/files/patch-configure.in33
-rw-r--r--mail/thunderbird/files/patch-ipc-chromium-src-base-file_util.h13
-rw-r--r--mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-dir_reader_linux.h45
97 files changed, 157 insertions, 3906 deletions
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
deleted file mode 100644
index 63cd45e405a0..000000000000
--- a/mail/dbmail22/Makefile
+++ /dev/null
@@ -1,141 +0,0 @@
-# New ports collection makefile for: dbmail
-# Date created: 07/26/2003
-# Whom: Clement Laforet <sheepkiller@cultdeadsheep.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= dbmail
-PORTVERSION= 2.2.17
-CATEGORIES= mail
-MASTER_SITES= http://www.dbmail.org/download/2.2/
-
-MAINTAINER= mark_sf@kikg.ifmo.ru
-COMMENT= An SQL database-based mail system (POP3 and IMAP)
-
-LIB_DEPENDS= gmime-2.0.4:${PORTSDIR}/mail/gmime2
-
-CONFLICTS= dbmail-*-2.0.* dbmail-2.1.*
-
-OPTIONS= MYSQL "Build with MySQL support" on \
- POSTGRESQL "Build with PostgreSQL support" off \
- SQLITE "Build with SQLite support" off \
- SIEVE "Build w. support for Sieve mail sorting language" off \
- LDAP "Build with support for LDAP authentication" off
-
-USE_AUTOTOOLS= libtool
-USE_GMAKE= YES
-USE_LDCONFIG= ${PREFIX}/lib/dbmail
-USE_RC_SUBR= dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh
-USE_GNOME= glib20 pkgconfig
-USE_OPENSSL= YES
-
-CFLAGS+= -fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
-CONFIGURE_ARGS+= --with-pkglibdir=${LOCALBASE}/lib/dbmail
-MAKE_ARGS+= mandir=${MANPREFIX}/man
-
-PORTDOCS= AUTHORS BUGS COPYING INSTALL NEWS README \
- README.aliases README.exim README.ldap \
- README.postfix README.qmail README.sieve \
- README.smtp README.solaris README.usermap \
- THANKS
-MAN1= dbmail-smtp.1 dbmail.1
-MAN5= dbmail.conf.5
-MAN8= dbmail-export.8 dbmail-imapd.8 dbmail-lmtpd.8 \
- dbmail-pop3d.8 dbmail-sievecmd.8 dbmail-timsieved.8 \
- dbmail-users.8 dbmail-util.8
-MANCOMPRESSED= no
-SUB_FILES= pkg-message
-
-PLIST_SUB+= PORTNAME=${PORTNAME}
-.if defined(NOPORTDOCS)
-PLIST_SUB+= PORTDOCS="@comment "
-.else
-PLIST_SUB+= PORTDOCS=""
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_MYSQL)
-CONFIGURE_ARGS+=--with-mysql
-USE_MYSQL= YES
-DATABASE+= mysql
-PLIST_SUB+= MYSQL=""
-.else
-PLIST_SUB+= MYSQL="@comment "
-.endif
-
-.if defined(WITH_POSTGRESQL)
-CONFIGURE_ARGS+=--with-pgsql
-USE_PGSQL= yes
-DATABASE+= postgresql
-PLIST_SUB+= PGSQL=""
-.else
-PLIST_SUB+= PGSQL="@comment "
-.endif
-
-.if defined(WITH_SQLITE)
-CONFIGURE_ARGS+=--with-sqlite
-USE_SQLITE= yes
-DATABASE+= sqlite
-PLIST_SUB+= SQLITE=""
-.else
-PLIST_SUB+= SQLITE="@comment "
-.endif
-
-.if defined(WITH_SIEVE)
-CONFIGURE_ARGS+=--with-sieve=${LOCALBASE}/include
-LIB_DEPENDS+= sieve.1:${PORTSDIR}/mail/libsieve
-PLIST_SUB+= SIEVE=""
-.else
-PLIST_SUB+= SIEVE="@comment "
-.endif
-
-.if defined(WITH_LDAP)
-CONFIGURE_ARGS+=--with-auth-ldap=${LOCALBASE}/include
-USE_OPENLDAP= yes
-PLIST_SUB+= LDAP=""
-.else
-PLIST_SUB+= LDAP="@comment "
-.endif
-
-.if defined(WITHOUT_MYSQL) && !defined(WITH_POSTGRESQL) && !defined(WITH_SQLITE)
-IGNORE="requires at least one database backend selected. Run 'make config'"
-.endif
-
-post-patch:
- @${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr
- @${FIND} ${WRKSRC} -name *.orig -type f | ${XARGS} ${RM} -fr
-
-post-configure:
- @${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \
- ${WRKSRC}/dbmail.h
-
-# remove leftovers which are not removed by some revisions of port
-# fixes the `Shared object "libpgsqldbmail.so.0" not found, required by "libdbmail.so.0"' error.
-pre-install:
- @for f in 'a' 'la' 'so' 'so.0'; do \
- if [ -f ${PREFIX}/lib/libdbmail.$$f ] ; then \
- ${RM} ${PREFIX}/lib/libdbmail.$$f; \
- fi; \
- done
-
-post-install:
- @${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist
- @if [ ! -f ${PREFIX}/etc/dbmail.conf ] ; then \
- ${CP} -p ${PREFIX}/etc/dbmail.conf-dist ${PREFIX}/etc/dbmail.conf; \
- fi
- @${MKDIR} ${DATADIR}
- @for f in ${DATABASE}; do \
- ${MKDIR} ${DATADIR}/$$f ; \
- ${INSTALL_DATA} ${WRKSRC}/sql/$$f/* ${DATADIR}/$$f; \
- done
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/dbmail22/distinfo b/mail/dbmail22/distinfo
deleted file mode 100644
index 5ab7e452d652..000000000000
--- a/mail/dbmail22/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (dbmail-2.2.17.tar.gz) = 11d457b0114047185aff4249afb6b91baf843b393e73ecbb147549960d7eaefd
-SIZE (dbmail-2.2.17.tar.gz) = 896838
diff --git a/mail/dbmail22/files/dbmail-imapd.sh.in b/mail/dbmail22/files/dbmail-imapd.sh.in
deleted file mode 100644
index 66d4e34fa0af..000000000000
--- a/mail/dbmail22/files/dbmail-imapd.sh.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dbmail-imapd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dbmail-imapd:
-#
-# dbmail_imapd_enable="YES"
-# dbmail_imapd_flags="<set as needed>"
-#
-# See dbmail-imapd(8) for flags
-#
-
-. /etc/rc.subr
-
-name=dbmail_imapd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/dbmail-imapd
-pidfile=/var/run/dbmail-imapd.pid
-required_files=%%PREFIX%%/etc/dbmail.conf
-
-# read settings, set default values
-load_rc_config "$name"
-: ${dbmail_imapd_enable="NO"}
-
-run_rc_command "$1"
diff --git a/mail/dbmail22/files/dbmail-lmtpd.sh.in b/mail/dbmail22/files/dbmail-lmtpd.sh.in
deleted file mode 100644
index 97677ad4b1f6..000000000000
--- a/mail/dbmail22/files/dbmail-lmtpd.sh.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dbmail-lmtpd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dbmail-lmtpd:
-#
-# dbmail_lmtpd_enable="YES"
-# dbmail_lmtpd_flags="<set as needed>"
-#
-# See dbmail-lmtpd(8) for flags
-#
-
-. /etc/rc.subr
-
-name=dbmail_lmtpd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/dbmail-lmtpd
-pidfile=/var/run/dbmail-lmtpd.pid
-required_files=%%PREFIX%%/etc/dbmail.conf
-
-# read settings, set default values
-load_rc_config "$name"
-: ${dbmail_lmtpd_enable="NO"}
-
-run_rc_command "$1"
diff --git a/mail/dbmail22/files/dbmail-pop3d.sh.in b/mail/dbmail22/files/dbmail-pop3d.sh.in
deleted file mode 100644
index 2430180a14c5..000000000000
--- a/mail/dbmail22/files/dbmail-pop3d.sh.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dbmail-pop3d
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dbmail-pop3d:
-#
-# dbmail_pop3d_enable="YES"
-# dbmail_pop3d_flags="<set as needed>"
-#
-# See dbmail-pop3d(8) for flags
-#
-
-. /etc/rc.subr
-
-name=dbmail_pop3d
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/dbmail-pop3d
-pidfile=/var/run/dbmail-pop3d.pid
-required_files=%%PREFIX%%/etc/dbmail.conf
-
-# read settings, set default values
-load_rc_config "$name"
-: ${dbmail_pop3d_enable="NO"}
-
-run_rc_command "$1"
diff --git a/mail/dbmail22/files/dbmail-timsieved.sh.in b/mail/dbmail22/files/dbmail-timsieved.sh.in
deleted file mode 100644
index 5db24fffb623..000000000000
--- a/mail/dbmail22/files/dbmail-timsieved.sh.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: dbmail-timsieved
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable dbmail-timsieved:
-#
-# dbmail_timsieved_enable="YES"
-# dbmail_timsieved_flags="<set as needed>"
-#
-# See dbmail-timsieved(8) for flags
-#
-
-. /etc/rc.subr
-
-name=dbmail_timsieved
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/dbmail-timsieved
-pidfile=/var/run/dbmail-timsieved.pid
-required_files=%%PREFIX%%/etc/dbmail.conf
-
-# read settings, set default values
-load_rc_config "$name"
-: ${dbmail_timsieved_enable="NO"}
-
-run_rc_command "$1"
diff --git a/mail/dbmail22/files/pkg-message.in b/mail/dbmail22/files/pkg-message.in
deleted file mode 100644
index 8e9dfc1a7650..000000000000
--- a/mail/dbmail22/files/pkg-message.in
+++ /dev/null
@@ -1,29 +0,0 @@
-
-IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!
-
- *) Don't forget to update the database using a script from
- %%DATADIR%%/
- *) Many programs have been renamed and their arguments changed.
- *) Read the upgrading notes.
- *) Don't be careless with this upgrade or mail will be lost!
- *) dbmail can be controled by setting dbmail_imapd_enable,
- dbmail_lmtpd_enable, and/or dbmail_pop3d_enable in
- /etc/rc.conf.
-
-
-NOTE FOR ADMINS UPGRADING FROM 2.0.X -> 2.2.X :
- *) Update database using a script
- %%DATADIR%%/mysql/migrate_from_2.0_to_2.2.mysql or
- %%DATADIR%%/postgresql/migrate_from_2.0_to_2.2.pgsql
- *) Run `dbmail-util -by'
- *) Edit configuration file
- `[DBMAIL]' section must have `driver=mysql/pgsql' and
- `authdriver=sql/ldap'.
-
-NOTE FOR ADMINS UPGRADING FROM 2.1.X -> 2.2 :
-
- *) Update database using a script
- %%DATADIR%%/mysql/2_1_7-2_2_0.mysql (if you're using MySQL)
- %%DATADIR%%/postgresql/2_1_7-2_2_0.pgsql (PostgreSQL)
- %%DATADIR%%/sqlite/2_1_7-2_2_0.sqlite (SQLite3)
- *) Run `dbmail-util -by'
diff --git a/mail/dbmail22/pkg-descr b/mail/dbmail22/pkg-descr
deleted file mode 100644
index 5c1648e0e4a6..000000000000
--- a/mail/dbmail22/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-Dbmail is the name of a group of programs that enable the possibility of
-storing and retrieving mail messages from a database (currently MySQL,
-PostgreSQL or SQLite).
-
-* Scalability.
- Dbmail is as scalable as the database system that is used for the mail
- storage. In theory millions of accounts can be managed using dbmail. One
- could, for example, run 4 different servers with the pop3 daemon each
- connecting to the same database (cluster) server.
-* Manageability.
- Dbmail is based upon a database. Dbmail can be managed by changing settings
- in the database (f.e. using PHP/Perl/SQL), without needing shell access.
-* Speed.
- Dbmail uses very efficient, database specific queries for retrieving mail
- information. This is much faster then parsing a filesystem.
-* Security.
- Dbmail has got nothing to do with the filesystem or interaction with other
- programs in the Unix environment which need special permissions. Dbmail is
- as secure as the database it's based upon.
-* Flexibility.
- Changes on a Dbmail system (adding of users, changing passwords etc.) are
- effective immediately.
-
-WWW: http://www.dbmail.org/
diff --git a/mail/dbmail22/pkg-plist b/mail/dbmail22/pkg-plist
deleted file mode 100644
index cb010c553592..000000000000
--- a/mail/dbmail22/pkg-plist
+++ /dev/null
@@ -1,61 +0,0 @@
-@unexec if cmp -s %D/etc/dbmail.conf-dist %D/etc/dbmail.conf; then rm -f %D/etc/dbmail.conf; fi
-etc/dbmail.conf-dist
-@exec if [ ! -f %D/etc/dbmail.conf ] ; then cp -p %D/%F %B/dbmail.conf; fi
-@exec mkdir -p %D/lib/dbmail
-%%LDAP%%lib/dbmail/libauth_ldap.a
-%%LDAP%%lib/dbmail/libauth_ldap.la
-%%LDAP%%lib/dbmail/libauth_ldap.so
-%%LDAP%%lib/dbmail/libauth_ldap.so.0
-lib/dbmail/libauth_sql.a
-lib/dbmail/libauth_sql.la
-lib/dbmail/libauth_sql.so
-lib/dbmail/libauth_sql.so.0
-lib/dbmail/libdbmail.a
-lib/dbmail/libdbmail.la
-lib/dbmail/libdbmail.so
-lib/dbmail/libdbmail.so.0
-%%MYSQL%%lib/dbmail/libmysql.a
-%%MYSQL%%lib/dbmail/libmysql.la
-%%MYSQL%%lib/dbmail/libmysql.so
-%%MYSQL%%lib/dbmail/libmysql.so.0
-%%PGSQL%%lib/dbmail/libpgsql.a
-%%PGSQL%%lib/dbmail/libpgsql.la
-%%PGSQL%%lib/dbmail/libpgsql.so
-%%PGSQL%%lib/dbmail/libpgsql.so.0
-%%SIEVE%%lib/dbmail/libsort_sieve.a
-%%SIEVE%%lib/dbmail/libsort_sieve.la
-%%SIEVE%%lib/dbmail/libsort_sieve.so
-%%SIEVE%%lib/dbmail/libsort_sieve.so.0
-%%SQLITE%%lib/dbmail/libsqlite.a
-%%SQLITE%%lib/dbmail/libsqlite.la
-%%SQLITE%%lib/dbmail/libsqlite.so
-%%SQLITE%%lib/dbmail/libsqlite.so.0
-@dirrm lib/dbmail
-sbin/dbmail-export
-sbin/dbmail-imapd
-sbin/dbmail-lmtpd
-sbin/dbmail-pop3d
-%%SIEVE%%sbin/dbmail-sievecmd
-sbin/dbmail-smtp
-%%SIEVE%%sbin/dbmail-timsieved
-sbin/dbmail-users
-sbin/dbmail-util
-@exec mkdir -p %D/share/%%PORTNAME%%
-%%MYSQL%%@exec mkdir -p %D/share/PORTNAME/%%PORTNAME%%/mysql
-%%MYSQL%%share/%%PORTNAME%%/mysql/2_1_7-2_2_0.mysql
-%%MYSQL%%share/%%PORTNAME%%/mysql/create_tables.mysql
-%%MYSQL%%share/%%PORTNAME%%/mysql/migrate_from_1.x_to_2.0_innodb.mysql
-%%MYSQL%%share/%%PORTNAME%%/mysql/migrate_from_2.0_to_2.2.mysql
-%%MYSQL%%share/%%PORTNAME%%/mysql/update_headervalue_01.mysql
-%%MYSQL%%@dirrm share/%%PORTNAME%%/mysql
-%%PGSQL%%@exec mkdir -p %D/share/PORTNAME/%%PORTNAME%%/postgresql
-%%PGSQL%%share/%%PORTNAME%%/postgresql/2_1_7-2_2_0.pgsql
-%%PGSQL%%share/%%PORTNAME%%/postgresql/create_tables.pgsql
-%%PGSQL%%share/%%PORTNAME%%/postgresql/migrate_from_1.x_to_2.0.pgsql
-%%PGSQL%%share/%%PORTNAME%%/postgresql/migrate_from_2.0_to_2.2.pgsql
-%%PGSQL%%@dirrm share/%%PORTNAME%%/postgresql
-%%SQLITE%%@exec mkdir -p %D/share/PORTNAME/%%PORTNAME%%/sqlite
-%%SQLITE%%share/%%PORTNAME%%/sqlite/2_1_7-2_2_0.sqlite
-%%SQLITE%%share/%%PORTNAME%%/sqlite/create_tables.sqlite
-%%SQLITE%%@dirrm share/%%PORTNAME%%/sqlite
-@dirrm share/%%PORTNAME%%
diff --git a/mail/linux-thunderbird/Makefile b/mail/linux-thunderbird/Makefile
index f47f9b708734..95627b29915c 100644
--- a/mail/linux-thunderbird/Makefile
+++ b/mail/linux-thunderbird/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= thunderbird
-PORTVERSION= 8.0
+PORTVERSION= 9.0
CATEGORIES= mail
MASTER_SITE_SUBDIR?= ${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US
diff --git a/mail/linux-thunderbird/distinfo b/mail/linux-thunderbird/distinfo
index a51c2a8e1a70..fe98807fbcdc 100644
--- a/mail/linux-thunderbird/distinfo
+++ b/mail/linux-thunderbird/distinfo
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-8.0.tar.bz2) = b8a54c480d5c09df1da7411b9f54b9f2c9b02eb563e5842d6856431f5a261752
-SIZE (thunderbird-8.0.tar.bz2) = 18055050
+SHA256 (thunderbird-9.0.tar.bz2) = 91c6aea70c070230b045ca506ba8d79a27759e54f01362b7296ed605d1f9786c
+SIZE (thunderbird-9.0.tar.bz2) = 19036574
diff --git a/mail/linux-thunderbird/pkg-plist b/mail/linux-thunderbird/pkg-plist
index 03fc910fcfb6..8431de260859 100644
--- a/mail/linux-thunderbird/pkg-plist
+++ b/mail/linux-thunderbird/pkg-plist
@@ -19,6 +19,7 @@ lib/%%APP_NAME%%/defaults/messenger/mailViews.dat
lib/%%APP_NAME%%/defaults/pref/channel-prefs.js
lib/%%APP_NAME%%/dictionaries/en-US.aff
lib/%%APP_NAME%%/dictionaries/en-US.dic
+lib/%%APP_NAME%%/distribution/extensions/tbtestpilot@labs.mozilla.com.xpi
lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
@@ -40,8 +41,10 @@ lib/%%APP_NAME%%/hyphenation/hyph_fr.dic
lib/%%APP_NAME%%/hyphenation/hyph_gl.dic
lib/%%APP_NAME%%/hyphenation/hyph_hr.dic
lib/%%APP_NAME%%/hyphenation/hyph_hsb.dic
+lib/%%APP_NAME%%/hyphenation/hyph_hu.dic
lib/%%APP_NAME%%/hyphenation/hyph_ia.dic
lib/%%APP_NAME%%/hyphenation/hyph_is.dic
+lib/%%APP_NAME%%/hyphenation/hyph_it.dic
lib/%%APP_NAME%%/hyphenation/hyph_kmr.dic
lib/%%APP_NAME%%/hyphenation/hyph_la.dic
lib/%%APP_NAME%%/hyphenation/hyph_lt.dic
@@ -54,6 +57,7 @@ lib/%%APP_NAME%%/hyphenation/hyph_ru.dic
lib/%%APP_NAME%%/hyphenation/hyph_sh.dic
lib/%%APP_NAME%%/hyphenation/hyph_sl.dic
lib/%%APP_NAME%%/hyphenation/hyph_sv.dic
+lib/%%APP_NAME%%/hyphenation/hyph_tr.dic
lib/%%APP_NAME%%/hyphenation/hyph_uk.dic
lib/%%APP_NAME%%/icons/updater.png
lib/%%APP_NAME%%/isp/SpamAssassin.sfd
@@ -104,6 +108,8 @@ lib/%%APP_NAME%%/updater.ini
@dirrm lib/%%APP_NAME%%/hyphenation
@dirrm lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
@dirrm lib/%%APP_NAME%%/extensions
+@dirrm lib/%%APP_NAME%%/distribution/extensions
+@dirrm lib/%%APP_NAME%%/distribution
@dirrm lib/%%APP_NAME%%/dictionaries
@dirrm lib/%%APP_NAME%%/defaults/pref
@dirrm lib/%%APP_NAME%%/defaults/messenger
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
deleted file mode 100644
index 06adbe725b19..000000000000
--- a/mail/mutt14/Makefile
+++ /dev/null
@@ -1,225 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for: mutt w/pgp hooks
-# Date created: Thur July 25, 1996
-# Whom: David O'Brien (obrien@NUXI.com)
-#
-# $FreeBSD$
-#
-
-PORTNAME= mutt
-PORTVERSION= 1.4.2.3
-PORTREVISION?= 6
-CATEGORIES+= mail ipv6
-MASTER_SITES= ftp://ftp.mutt.org/mutt/ \
- ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
- ftp://ftp.demon.co.uk/pub/mirrors/mutt/ \
- ftp://ftp.parodius.com/pub/mutt/
-
-PATCHVERSION?= ${PORTVERSION}
-PATCHVERSION= 1.4.2.2
-PATCH_SITES= http://www.mutt.org.ua/download/mutt-${PATCHVERSION}/:vvv \
- http://www2.mutt.org.ua/download/mutt-${PATCHVERSION}/:vvv \
- http://www3.mutt.org.ua/download/mutt-${PATCHVERSION}/:vvv \
- ftp://ftp.mutt.org.ua/pub/mutt/mutt-${PATCHVERSION}/:vvv \
- ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${PATCHVERSION}/:vvv
-PATCHFILES= patch-${PATCHVERSION}.rr.compressed.gz:vvv \
- patch-${PATCHVERSION}.vvv.initials.gz:vvv
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER?= udo.schweigert@siemens.com
-COMMENT?= The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.)
-
-CONFLICTS?= ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-devel-[0-9]* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]*
-
-OPTIONS= NLS "Native Language Support via gettext utilities" on \
- SLANG "Adds display/screen management via S-Lang" off \
- NCURSES "Adds ncurses console graphics support" off \
- SGML_DOCS "Enable mutt SGML documentation" off \
- LOCALES_FIX "Enable locales fixes" off \
- MUTT_XFACE "Adds mutt X-Face" off \
- MUTT_FLOCK "Enable mutt flock" on \
- MUTT_ICONV "Enable mutt iconv" on \
- GSSAPI "GSSAPI (Kerberos) support" on
-
-USE_OPENSSL= yes
-USE_NCURSES= yes
-
-.include <bsd.port.pre.mk>
-
-RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
-.if defined(PACKAGE_BUILDING) && !defined (MUTT_LITE)
-WITH_SLANG= yes
-BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
-RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell \
- urlview:${PORTSDIR}/textproc/urlview
-.endif
-
-.if defined (MUTT_LITE)
-PKGNAMESUFFIX= -lite
-WITH_SGML_DOCS:=no
-.elif ${ARCH} == "alpha"
-# coredump in sgmls
-WITH_SGML_DOCS:=no
-.endif
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
-USE_ICONV= yes
-.if defined(WITHOUT_MUTT_ICONV)
-IGNORE= the WITHOUT_MUTT_ICONV knob of the mutt port only works if \
- WITHOUT_NLS is also given
-.endif
-.elif !defined(WITHOUT_MUTT_ICONV)
-USE_ICONV= yes
-.endif
-
-.if defined(WITH_SLANG)
-LIB_DEPENDS+= slang.2:${PORTSDIR}/devel/libslang2
-.elif defined(WITH_NCURSES)
-WITH_NCURSES_PORT= yes
-.endif
-.if !defined (MUTT_LITE)
-.if defined(WITH_MUTT_CYRUS_SASL)
-IGNORE= the SASL support for mutt has been withdrawn. Please use the mutt-devel port instead
-.endif
-.if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no"
-BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat
-.endif
-.if defined(WITH_MUTT_XFACE)
-PATCH_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/news/slrnface:extract
-RUN_DEPENDS+= slrnface:${PORTSDIR}/news/slrnface
-.endif
-.endif
-
-DIST_SUBDIR= mutt
-WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
-GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake autoconf
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include"
-CONFIGURE_ARGS= --enable-pop --enable-imap --disable-fcntl \
- --with-ssl=${OPENSSLBASE} --sysconfdir=${PREFIX}/etc \
- --with-sharedir=${PREFIX}/share/mutt \
- --with-docdir=${DOCSDIR} --with-charmaps \
- --enable-compressed
-.if defined(MUTT_CONFIGURE_ARGS)
-CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS}
-.endif
-.if defined(WITHOUT_MUTT_FLOCK)
-CONFIGURE_ARGS+= --disable-flock
-.else
-CONFIGURE_ARGS+= --enable-flock
-.endif
-.if defined(WITH_LOCALES_FIX)
-CONFIGURE_ARGS+= --enable-locales-fix
-.endif
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
-.else
-PLIST_SUB+= NLS=""
-.endif
-.if defined(WITHOUT_MUTT_ICONV) && defined(WITHOUT_NLS)
-CONFIGURE_ARGS+= --disable-iconv
-.else
-CONFIGURE_ARGS+= --with-libiconv-prefix=${PREFIX}
-.endif
-.if defined(WITH_SLANG)
-CONFIGURE_ARGS+= --with-slang=${PREFIX}
-.elif defined(WITH_NCURSES)
-CONFIGURE_ARGS+= --with-curses=${NCURSESBASE}
-CFLAGS+= -I${NCURSESINC}
-.endif
-.if !defined(WITHOUT_GSSAPI)
-.if exists(${LOCALBASE}/bin/gss-client)
-LIB_DEPENDS+= gssapi_krb5:${PORTSDIR}/security/krb5
-CONFIGURE_ARGS+= --with-gss=${LOCALBASE}
-.elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a)
-CONFIGURE_ARGS+= --with-gss
-USE_KRB5_SYS=YES
-.endif
-.endif
-MAN1= mutt.1 mutt_dotlock.1
-MAN5= mbox.5 muttrc.5
-
-post-patch::
- @${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
- ${WRKSRC}/contrib/gpg.rc
- @${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
- ${WRKSRC}/contrib/pgp6.rc
- @${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \
- ${WRKSRC}/contrib/Makefile.in
-
-.if defined(WITH_MUTT_XFACE)
-post-patch::
- @${ECHO} "===> Applying XFACE patch"
- slrnface_dir=`${FIND} ${PORTSDIR}/news/slrnface/work -type d \
- -name slrnface-\*`; \
- cd ${BUILD_WRKSRC}; ${PATCH} ${PATCH_ARGS} < $$slrnface_dir/mutt.patch
-.endif
-
-pre-configure::
- @(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
-.if defined(USE_KRB5_SYS)
- @${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h.in
- @${REINPLACE_CMD} -e 's|<gssapi/gssapi\.h>|<gssapi.h>|' \
- ${WRKSRC}/imap/auth_gss.c
-.endif
-
-# XXX
-# this should be done automagically by aclocal but ....
-# for now, this will have to do
-pre-build:
- @${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \
- -e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \
- -e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \
- -e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \
- ${BUILD_WRKSRC}/Makefile
-
-.if !defined(NOPORTDOCS)
-post-build:
- @${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
- @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
- @${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \
- -e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
- -e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
- ${WRKSRC}/doc/mutt.man
- @${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \
- -e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
- -e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
- ${WRKSRC}/doc/muttrc.man
-.if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no"
-PLIST:= ${WRKDIR}/PLIST
-pre-install:
- @${CAT} ${PKGDIR}/pkg-plist.htmlfiles > ${PLIST}
- @${CAT} ${PKGDIR}/pkg-plist >> ${PLIST}
-.endif
-.endif
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/etc/Muttrc.dist
-.if !defined(NOPORTDOCS)
- @${ECHO} "===> Installing Mutt documentation"
- @${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}
- @cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
- ${DOCSDIR}
-.if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no"
- ${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m 0755 \
- -d ${DOCSDIR}/html
- ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
- ${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${DOCSDIR}
-.endif
-.endif
-
-.if defined(WITH_MUTT_XFACE)
- @${ECHO} ""
- @${ECHO} "************************************************************"
- @${ECHO} " To enable the XFACE support in mutt you also have to add"
- @${ECHO} " set xface=yes"
- @${ECHO} " to your ~/.muttrc"
- @${ECHO} " Additional information is provided by news/slrnface"
- @${ECHO} "************************************************************"
- @${ECHO} ""
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo
deleted file mode 100644
index 3931ad280756..000000000000
--- a/mail/mutt14/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-SHA256 (mutt/mutt-1.4.2.3.tar.gz) = 1a4920e5efccd6a83932af4223cb568956158f62e9f595798acc4004aca6ace5
-SIZE (mutt/mutt-1.4.2.3.tar.gz) = 2646433
-SHA256 (mutt/patch-1.4.2.2.rr.compressed.gz) = 3f70a8b666e1dd5342acb418aac8cb4a1ab68559b389346052bb1078a3b8dfee
-SIZE (mutt/patch-1.4.2.2.rr.compressed.gz) = 10191
-SHA256 (mutt/patch-1.4.2.2.vvv.initials.gz) = 2ab42c9bd369bacf7cad603e242e110c9adfdf18f477ce065fef8dbfbd1a8474
-SIZE (mutt/patch-1.4.2.2.vvv.initials.gz) = 690
diff --git a/mail/mutt14/files/extra-patch-doc-ref b/mail/mutt14/files/extra-patch-doc-ref
deleted file mode 100644
index 99222e0bceb0..000000000000
--- a/mail/mutt14/files/extra-patch-doc-ref
+++ /dev/null
@@ -1,12 +0,0 @@
---- doc/mutt.man.orig Mon Jul 13 12:50:38 1998
-+++ doc/mutt.man Thu Oct 1 22:15:40 1998
-@@ -20,7 +20,8 @@
- .SH DESCRIPTION
- Mutt is a small but very powerful text based program for reading electronic
- mail under unix operating systems, including support color terminals, MIME,
--and a threaded sorting mode.
-+and a threaded sorting mode. Details of how to use all of this is
-+available in \fI${DOCSDIR}\fP.
- .SH OPTIONS
- .IP "-a \fIfile\fP"
- Attach a file to your message using MIME.
diff --git a/mail/mutt14/files/patch-02 b/mail/mutt14/files/patch-02
deleted file mode 100644
index 3717189e334f..000000000000
--- a/mail/mutt14/files/patch-02
+++ /dev/null
@@ -1,63 +0,0 @@
---- doc/Makefile.in.orig Tue Nov 6 11:12:31 2001
-+++ doc/Makefile.in Fri Jun 21 12:00:28 2002
-@@ -60,13 +60,19 @@
- topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \
- README NEWS TODO README.SECURITY README.SSL
-
--all: muttrc.man try-html try-txt
-+all: muttrc.man try-html try-txt try-latin1
-
- try-html: ../makedoc
-- test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-+ rm -f *.html && $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-+ touch $@
-
- try-txt: ../makedoc
-- test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+ $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+ touch $@
-+
-+try-latin1:
-+ $(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./
-+ touch $@
-
- install: all instdoc
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -86,10 +92,10 @@
- $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
- done
- $(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
-- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
-- for file in manual*.html ; do \
-- $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
-- done
-+ # $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
-+ # for file in manual*.html ; do \
-+ # $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
-+ # done
-
- uninstall:
- -rm -f $(DESTDIR)$(mandir)/man1/mutt.1
-@@ -99,14 +105,18 @@
-
- check:
- manual.txt: manual.sgml
-- if sgml2txt -c latin manual ; then \
-- uniq < manual.txt | expand > _manual.txt ; \
-- rm manual.txt ; \
-+ if sgmlfmt -f ascii manual; then \
-+ uniq < manual.ascii | expand > _manual.txt ; \
-+ rm -f manual.txt manual.ascii; \
- mv _manual.txt manual.txt ;\
- fi
-
- manual.html: manual.sgml
-- sgml2html manual || true
-+ @# sgml2html manual || true
-+ sgmlfmt -f html manual || true
-+
-+manual.latin1: manual.sgml
-+ sgmlfmt -f latin1 manual || true
-
- manual.ps: manual.sgml
- sgml2latex --output=ps manual || true
diff --git a/mail/mutt14/files/patch-03 b/mail/mutt14/files/patch-03
deleted file mode 100644
index b870f7f7aaec..000000000000
--- a/mail/mutt14/files/patch-03
+++ /dev/null
@@ -1,13 +0,0 @@
---- doc/manual.sgml.orig Tue May 9 17:15:26 2000
-+++ doc/manual.sgml Fri May 12 11:05:40 2000
-@@ -1,5 +1,8 @@
--<!doctype linuxdoc system>
--
-+<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
-+<!ENTITY dquot "&#34;">
-+]>
-+<linuxdoc>
-+
- <article>
-
- <title>The Mutt E-Mail Client
diff --git a/mail/mutt14/files/patch-05 b/mail/mutt14/files/patch-05
deleted file mode 100644
index 13a52d9daa40..000000000000
--- a/mail/mutt14/files/patch-05
+++ /dev/null
@@ -1,87 +0,0 @@
---- curs_lib.c.old Wed Sep 1 19:39:20 1999
-+++ curs_lib.c Sun Sep 26 23:47:03 1999
-@@ -156,6 +156,16 @@
- def = 0;
- break;
- }
-+ else if (tolower(ch.ch) == 'y')
-+ {
-+ def = 1;
-+ break;
-+ }
-+ else if (tolower(ch.ch) == 'n')
-+ {
-+ def = 0;
-+ break;
-+ }
- else
- {
- BEEP();
-@@ -413,8 +423,9 @@
- {
- event_t ch;
- int choice;
-- char *p;
-+ char *p, *nletters;
-
-+ nletters = _(letters);
- mvaddstr (LINES - 1, 0, prompt);
- clrtoeol ();
- FOREVER
-@@ -428,6 +439,12 @@
- }
- else
- {
-+ p = strchr (nletters, ch.ch);
-+ if (p)
-+ {
-+ choice = p - nletters + 1;
-+ break;
-+ }
- p = strchr (letters, ch.ch);
- if (p)
- {
---- browser.c.orig Fri Sep 24 01:08:08 1999
-+++ browser.c Sun Sep 26 23:46:25 1999
-@@ -750,7 +750,7 @@
- switch (mutt_multi_choice ((reverse) ?
- _("Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? ") :
- _("Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "),
-- _("dazn")))
-+ N_("dazn")))
- {
- case -1: /* abort */
- resort = 0;
---- commands.c.orig Wed Jul 7 02:56:24 1999
-+++ commands.c Sun Sep 26 23:46:25 1999
-@@ -337,7 +337,7 @@
- switch (mutt_multi_choice (reverse ?
- _("Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: ") :
- _("Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "),
-- _("dfrsotuzc")))
-+ N_("dfrsotuzc")))
- {
- case -1: /* abort - don't resort */
- return -1;
---- compose.c.orig Mon Feb 12 18:02:38 2001
-+++ compose.c Fri Mar 30 17:04:09 2001
-@@ -130,7 +130,7 @@
- char input_signas[SHORT_STRING];
-
- switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "),
-- _("esabf")))
-+ N_("esabf")))
- {
- case 1: /* (e)ncrypt */
- bits |= PGPENCRYPT;
---- muttlib.c.orig Sun Apr 9 14:39:02 2000
-+++ muttlib.c Fri May 12 11:26:58 2000
-@@ -671,7 +671,7 @@
- if (*append == 0 && access (fname, F_OK) == 0)
- {
- switch (mutt_multi_choice
-- (_("File exists, (o)verwrite, (a)ppend, or (c)ancel?"), _("oac")))
-+ (_("File exists, (o)verwrite, (a)ppend, or (c)ancel?"), N_("oac")))
- {
- case -1: /* abort */
- case 3: /* cancel */
diff --git a/mail/mutt14/files/patch-08 b/mail/mutt14/files/patch-08
deleted file mode 100644
index 3e50cbd13779..000000000000
--- a/mail/mutt14/files/patch-08
+++ /dev/null
@@ -1,10 +0,0 @@
---- Muttrc.orig Sat May 13 08:30:44 2000
-+++ Muttrc Sat May 13 08:32:05 2000
-@@ -629,6 +629,7 @@
- # Type: boolean
- # Default: yes
- #
-+set followup_to=no
- #
- # Controls whether or not the Mail-Followup-To header field is
- # generated when sending mail. When set, Mutt will generate this
diff --git a/mail/mutt14/files/patch-aclocal.m4 b/mail/mutt14/files/patch-aclocal.m4
deleted file mode 100644
index 6635a1a90fa6..000000000000
--- a/mail/mutt14/files/patch-aclocal.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- aclocal.m4.orig Fri Jul 28 11:50:25 2000
-+++ aclocal.m4 Wed Dec 5 12:10:16 2001
-@@ -62,4 +62,4 @@
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-+AM_MISSING_PROG(ACLOCAL, aclocal14, $missing_dir)
-+AM_MISSING_PROG(AUTOCONF, autoconf213, $missing_dir)
-+AM_MISSING_PROG(AUTOMAKE, automake14, $missing_dir)
-+AM_MISSING_PROG(AUTOHEADER, autoheader213, $missing_dir)
diff --git a/mail/mutt14/files/patch-configure.in b/mail/mutt14/files/patch-configure.in
deleted file mode 100644
index 4e27667bfdd9..000000000000
--- a/mail/mutt14/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig Mon Nov 11 14:11:26 2002
-+++ configure.in Mon Nov 11 14:12:09 2002
-@@ -625,7 +625,7 @@
- fi])
-
- if test x$GCC = xyes -a $mutt_cv_warnings = yes; then
-- CFLAGS="-Wall -pedantic $CFLAGS"
-+ CFLAGS="-Wall $CFLAGS"
- fi
-
- AC_ARG_ENABLE(nfs-fix, [ --enable-nfs-fix Work around an NFS with broken attributes caching ],
diff --git a/mail/mutt14/files/patch-contrib-Makefile.in b/mail/mutt14/files/patch-contrib-Makefile.in
deleted file mode 100644
index 71e216bd607c..000000000000
--- a/mail/mutt14/files/patch-contrib-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/Makefile.in.orig Mon Jun 4 19:14:31 2001
-+++ contrib/Makefile.in Mon Mar 21 08:12:59 2005
-@@ -20,7 +20,7 @@
-
- subdir = contrib
-
--SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
-+SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
- sample.muttrc sample.mailcap sample.muttrc-tlr
-
- DISTFILES = Makefile.in language.txt language50.txt \
diff --git a/mail/mutt14/files/patch-doc-mutt.man b/mail/mutt14/files/patch-doc-mutt.man
deleted file mode 100644
index 46e086721a76..000000000000
--- a/mail/mutt14/files/patch-doc-mutt.man
+++ /dev/null
@@ -1,34 +0,0 @@
---- doc/mutt.man.orig Wed Jul 24 10:41:31 2002
-+++ doc/mutt.man Sun Oct 26 11:06:36 2003
-@@ -136,9 +136,9 @@
- User's personal mapping between MIME types and file extensions.
- .IP "/etc/mime.types"
- System mapping between MIME types and file extensions.
--.IP "/usr/local/bin/mutt_dotlock"
-+.IP "${PREFIX}/bin/mutt_dotlock"
- The privileged dotlocking program.
--.IP "/usr/local/doc/mutt/manual.txt"
-+.IP "${DOCSDIR}/manual.txt"
- The Mutt manual.
- .SH BUGS
- .PP
---- doc/muttrc.man Sun Oct 26 11:09:09 2003
-+++ doc/muttrc.man Sun Oct 26 11:08:48 2003
-@@ -990,7 +972,7 @@
- .B dotlock_program
- .nf
- Type: path
--Default: \(lq/usr/local/bin/mutt_dotlock\(rq
-+Default: \(lq${PREFIX}/bin/mutt_dotlock\(rq
- .fi
- .IP
- Contains the path of the mutt_dotlock (8) binary to be used by
-@@ -3970,7 +3952,7 @@
- instead of a raw socket. You may be able to use this to set up
- preauthenticated connections to your IMAP/POP3 server. Example:
- .IP
--tunnel=\(rqssh -q mailhost.net /usr/local/libexec/imapd\(rq
-+tunnel=\(rqssh -q mailhost.net ${PREFIX}/libexec/imapd\(rq
- .IP
- NOTE: For this example to work you must be able to log in to the remote
- machine without having to enter a password.
diff --git a/mail/mutt14/files/patch-examples b/mail/mutt14/files/patch-examples
deleted file mode 100644
index 2d24771033f7..000000000000
--- a/mail/mutt14/files/patch-examples
+++ /dev/null
@@ -1,50 +0,0 @@
---- contrib/Makefile.in.orig Mon Jun 4 19:14:31 2001
-+++ contrib/Makefile.in Wed Mar 26 11:45:15 2003
-@@ -12,6 +12,7 @@
- mandir = @mandir@
- srcdir = @srcdir@
- docdir = @docdir@
-+samplesdir = @samplesdir@
- top_srcdir = @top_srcdir@
- top_builddir = ..
- INSTALL = @INSTALL@
-@@ -37,12 +38,12 @@
- check:
-
- install:
-- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(samplesdir) $(DESTDIR)$(samplesdir)/iconv
- for f in $(SAMPLES) ; do \
-- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ; \
-+ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(samplesdir); \
- done
- for f in $(srcdir)/iconv/*.rc ; do \
-- $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv ; \
-+ $(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv ; \
- done
-
- # Nothing needs to be done - uninstall in doc removes samples as well.
---- init.h.orig Wed Mar 26 11:50:36 2003
-+++ init.h Wed Mar 26 12:54:37 2003
-@@ -1347,8 +1347,8 @@
- ** .pp
- ** For examples on how to configure these formats for the various versions
- ** of PGP which are floating around, see the pgp*.rc and gpg.rc files in
-- ** the samples/ subdirectory which has been installed on your system
-- ** alongside the documentation.
-+ ** the share/examples/mutt subdirectory which has been installed on your
-+ ** system.
- */
- { "pgp_getkeys_command", DT_STR, R_NONE, UL &PgpGetkeysCommand, 0},
- /*
---- Makefile.am.orig Wed Mar 26 13:13:10 2003
-+++ Makefile.am Wed Mar 26 13:25:40 2003
-@@ -13,7 +13,7 @@
-
- bin_SCRIPTS = muttbug flea
-
--BUILT_SOURCES = keymap_defs.h patchlist.c
-+BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc
-
- bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
- mutt_SOURCES = $(BUILT_SOURCES) \
diff --git a/mail/mutt14/files/patch-init.c b/mail/mutt14/files/patch-init.c
deleted file mode 100644
index 389b682cfa11..000000000000
--- a/mail/mutt14/files/patch-init.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- init.c.orig Wed Jul 24 10:41:29 2002
-+++ init.c Sat May 3 08:46:29 2003
-@@ -1707,7 +1707,11 @@
- void mutt_init (int skip_sys_rc, LIST *commands)
- {
- struct passwd *pw;
-+#if __FreeBSD_version < 500000
-+ char nodename[STRING];
-+#else
- struct utsname utsname;
-+#endif
- char *p, buffer[STRING], error[STRING];
- int i, default_rc = 0, need_pause = 0;
- BUFFER err;
-@@ -1765,16 +1769,21 @@
- #endif
-
- /* And about the host... */
-+#if __FreeBSD_version < 500000
-+ gethostname(nodename, sizeof (nodename));
-+#else
- uname (&utsname);
-+ strfcpy (nodename, utsname.nodename, sizeof (nodename));
-+#endif
- /* some systems report the FQDN instead of just the hostname */
-- if ((p = strchr (utsname.nodename, '.')))
-+ if ((p = strchr (nodename, '.')))
- {
-- Hostname = mutt_substrdup (utsname.nodename, p);
-+ Hostname = mutt_substrdup (nodename, p);
- p++;
- strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
- }
- else
-- Hostname = safe_strdup (utsname.nodename);
-+ Hostname = safe_strdup (nodename);
-
- #ifndef DOMAIN
- #define DOMAIN buffer
diff --git a/mail/mutt14/files/patch-m4-gssapi.m4 b/mail/mutt14/files/patch-m4-gssapi.m4
deleted file mode 100644
index 2425cde4f2b8..000000000000
--- a/mail/mutt14/files/patch-m4-gssapi.m4
+++ /dev/null
@@ -1,33 +0,0 @@
---- m4/gssapi.m4.orig Wed Apr 17 19:05:04 2002
-+++ m4/gssapi.m4 Mon Oct 16 10:59:34 2006
-@@ -6,10 +6,13 @@
- dnl if it is set and not "yes".
- dnl Defines GSSAPI_CFLAGS and GSSAPI_LIBS if found.
- dnl Defines GSSAPI_IMPL to "Heimdal", "MIT", or "OldMIT", or "none" if not found
--AC_DEFUN(MUTT_AM_PATH_GSSAPI,
-+AC_DEFUN([MUTT_AM_PATH_GSSAPI],
- [
- GSSAPI_PREFIX=[$]$1
- GSSAPI_IMPL="none"
-+ saved_CPPFLAGS="$CPPFLAGS"
-+ saved_LDFLAGS="$LDFLAGS"
-+ saved_LIBS="$LIBS"
- dnl First try krb5-config
- if test "$GSSAPI_PREFIX" != "yes"
- then
-@@ -24,14 +27,11 @@
- GSSAPI_LIBS="$MUTTLIBS `$KRB5CFGPATH --libs gssapi`"
- case "`$KRB5CFGPATH --version`" in
- "Kerberos 5 "*) GSSAPI_IMPL="MIT";;
-- [hH]eimdal*) GSSAPI_IMPL="Heimdal";;
-+ ?eimdal*) GSSAPI_IMPL="Heimdal";;
- *) GSSAPI_IMPL="Unknown";;
- esac
- else
- dnl No krb5-config, run the old code
-- saved_CPPFLAGS="$CPPFLAGS"
-- saved_LDFLAGS="$LDFLAGS"
-- saved_LIBS="$LIBS"
- if test "$GSSAPI_PREFIX" != "yes"
- then
- GSSAPI_CFLAGS="-I$GSSAPI_PREFIX/include"
diff --git a/mail/mutt14/files/patch-mktemp b/mail/mutt14/files/patch-mktemp
deleted file mode 100644
index 8fc82de528d7..000000000000
--- a/mail/mutt14/files/patch-mktemp
+++ /dev/null
@@ -1,15 +0,0 @@
---- muttlib.c.orig Fri May 7 17:30:35 2004
-+++ muttlib.c Fri May 7 17:32:13 2004
-@@ -656,7 +656,11 @@
-
- void mutt_mktemp (char *s)
- {
-- snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-%d-%d", NONULL (Tempdir), NONULL(Hostname), (int) getpid (), Counter++);
-+ char t[7];
-+ snprintf (t, 7, "-%05d", Counter++);
-+ snprintf (s, _POSIX_PATH_MAX-6, "%s/mutt-%s-XXXXXXXX", NONULL(Tempdir), NONULL(Hostname));
-+ mktemp (s);
-+ strncat(s, t, 6);
- unlink (s);
- }
-
diff --git a/mail/mutt14/files/patch-threadcomplete b/mail/mutt14/files/patch-threadcomplete
deleted file mode 100644
index e4f56f261382..000000000000
--- a/mail/mutt14/files/patch-threadcomplete
+++ /dev/null
@@ -1,73 +0,0 @@
-written by Nicolas Rachinsky <nr@rachinsky.de>
-http://www.rachinsky.de
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published
-by the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
---- mutt-1.3.28.ori/mutt.h Thu Mar 14 19:22:25 2002
-+++ mutt.h Fri Mar 15 00:22:41 2002
-@@ -198,6 +198,7 @@
- M_LIMIT,
- M_EXPIRED,
- M_SUPERSEDED,
-+ M_THREADCOMPLETE,
-
- /* actions for mutt_pattern_comp/mutt_pattern_exec */
- M_AND,
---- mutt-1.3.28.ori/pattern.c Thu Mar 14 19:22:26 2002
-+++ pattern.c Fri Mar 15 00:23:52 2002
-@@ -50,6 +50,7 @@
- }
- Flags[] =
- {
-+ { 'a', M_THREADCOMPLETE, 0, NULL },
- { 'A', M_ALL, 0, NULL },
- { 'b', M_BODY, M_FULL_MSG, eat_regexp },
- { 'B', M_WHOLE_MSG, M_FULL_MSG, eat_regexp },
-@@ -957,6 +958,27 @@
- return alladdr;
- }
-
-+static int match_threadcomplete(int flag,THREAD *t,int left,int up,int right,int down)
-+{
-+ int a=0;
-+ HEADER *h=NULL;
-+
-+ if(! t)return 0;
-+ h=t->message;
-+ if(! flag && h && h->tagged)return 1;
-+ if(flag && h && ! h->tagged) return 1;
-+
-+ if(up)a=match_threadcomplete(flag,t->parent,1,1,1,0);
-+ if(a)return a;
-+ if(right && t->parent)a=match_threadcomplete(flag,t->next,0,0,1,1);
-+ if(a)return a;
-+ if(left && t->parent)a=match_threadcomplete(flag,t->prev,1,0,0,1);
-+ if(a)return a;
-+ if(down)a=match_threadcomplete(flag,t->child,1,0,1,1);
-+ if(a)return a;
-+ return 0;
-+}
-+
- /* flags
- M_MATCH_FULL_ADDRESS match both personal and machine address */
- int
-@@ -1053,6 +1075,8 @@
- return (pat->not ^ (h->env->x_label && regexec (pat->rx, h->env->x_label, 0, NULL, 0) == 0));
- case M_DUPLICATED:
- return (pat->not ^ (h->thread && h->thread->duplicate_thread));
-+ case M_THREADCOMPLETE:
-+ return ((h->thread && match_threadcomplete(pat->not,h->thread,1,1,1,1)));
- }
- mutt_error (_("error: unknown op %d (report this error)."), pat->op);
- return (-1);
---- PATCHES~ Tue Nov 6 19:59:33 2001
-+++ PATCHES Tue Nov 6 19:59:42 2001
-@@ -1,0 +1 @@
-+1.3.28.nr.threadcomplete
diff --git a/mail/mutt14/files/patch-z b/mail/mutt14/files/patch-z
deleted file mode 100644
index 08a7dfbebe7b..000000000000
--- a/mail/mutt14/files/patch-z
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.am.orig2 Thu Jan 6 15:45:58 2005
-+++ Makefile.am Thu Jan 6 15:47:48 2005
-@@ -11,7 +11,7 @@
-
- SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
-
--bin_SCRIPTS = muttbug flea
-+bin_SCRIPTS =
-
- BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc
-
---- doc/Makefile.in.orig2 Thu Jan 6 15:45:57 2005
-+++ doc/Makefile.in Thu Jan 6 15:53:52 2005
-@@ -78,8 +78,6 @@
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5
- ./instdoc $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/mutt.1
-- ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
-- echo ".so $(mandir)/man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1
- ./instdoc $(srcdir)/dotlock.man \
- $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
- ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
diff --git a/mail/mutt14/pkg-descr b/mail/mutt14/pkg-descr
deleted file mode 100644
index 68d853aebed8..000000000000
--- a/mail/mutt14/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Mutt -- "The Mongrel of Mail User Agents" (part Elm, part Pine, part mh,
-part slrn, part everything else) is an interactive screen-oriented mailer
-program that supersedes Elm, Pine, mail and mailx.
-
-Features include color support, message threading, MIME support (including
-RFC1522 support for encoded headers), customizable key bindings, POP3,
-Delivery Status Notification (DSN) support, and PGP/MIME.
-
-WWW: http://www.mutt.org/
-Mutt User Information: http://www.math.fu-berlin.de/~guckes/mutt/
-
- -- David (obrien@cs.ucdavis.edu)
diff --git a/mail/mutt14/pkg-plist b/mail/mutt14/pkg-plist
deleted file mode 100644
index 28f0c9f55b73..000000000000
--- a/mail/mutt14/pkg-plist
+++ /dev/null
@@ -1,79 +0,0 @@
-@comment $FreeBSD$
-bin/mutt
-bin/mutt_dotlock
-bin/pgpewrap
-bin/pgpring
-@unexec if cmp -s %D/etc/Muttrc.dist %D/etc/Muttrc; then rm -f %D/etc/Muttrc; fi
-etc/Muttrc.dist
-@exec if [ ! -f %D/etc/Muttrc ]; then cp %D/etc/Muttrc.dist %D/etc/Muttrc; fi
-%%DOCSDIR%%/COPYRIGHT
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/GPL
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/PGP-Notes.txt
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.SECURITY
-%%DOCSDIR%%/README.SSL
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/applying-patches.txt
-%%DOCSDIR%%/devel-notes.txt
-%%DOCSDIR%%/manual.txt
-%%DOCSDIR%%/patch-notes.txt
-%%EXAMPLESDIR%%/Mush.rc
-%%EXAMPLESDIR%%/Pine.rc
-%%EXAMPLESDIR%%/Tin.rc
-%%EXAMPLESDIR%%/gpg.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-3.2.5.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-4.1.5.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-4.2.0.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-4.3.2.rc
-%%EXAMPLESDIR%%/iconv/iconv.freebsd-3.3.rc
-%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.3.rc
-%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.90.rc
-%%EXAMPLESDIR%%/iconv/iconv.hpux-10.01.rc
-%%EXAMPLESDIR%%/iconv/iconv.hpux-10.20.rc
-%%EXAMPLESDIR%%/iconv/iconv.hpux-11.00.rc
-%%EXAMPLESDIR%%/iconv/iconv.irix-6.5.rc
-%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0a.rc
-%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0d.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.4.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.5.1.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc
-%%EXAMPLESDIR%%/pgp2.rc
-%%EXAMPLESDIR%%/pgp6.rc
-%%EXAMPLESDIR%%/sample.mailcap
-%%EXAMPLESDIR%%/sample.muttrc
-%%EXAMPLESDIR%%/sample.muttrc-tlr
-%%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/da/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/de/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/el/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/es/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/et/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/id/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/it/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo
-@dirrm %%EXAMPLESDIR%%/iconv
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%
diff --git a/mail/mutt14/pkg-plist.htmlfiles b/mail/mutt14/pkg-plist.htmlfiles
deleted file mode 100644
index 11dd8b54283a..000000000000
--- a/mail/mutt14/pkg-plist.htmlfiles
+++ /dev/null
@@ -1,346 +0,0 @@
-%%DOCSDIR%%/html/manual.html
-%%DOCSDIR%%/html/manual1.html
-%%DOCSDIR%%/html/manual10.html
-%%DOCSDIR%%/html/manual100.html
-%%DOCSDIR%%/html/manual101.html
-%%DOCSDIR%%/html/manual102.html
-%%DOCSDIR%%/html/manual103.html
-%%DOCSDIR%%/html/manual104.html
-%%DOCSDIR%%/html/manual105.html
-%%DOCSDIR%%/html/manual106.html
-%%DOCSDIR%%/html/manual107.html
-%%DOCSDIR%%/html/manual108.html
-%%DOCSDIR%%/html/manual109.html
-%%DOCSDIR%%/html/manual11.html
-%%DOCSDIR%%/html/manual110.html
-%%DOCSDIR%%/html/manual111.html
-%%DOCSDIR%%/html/manual112.html
-%%DOCSDIR%%/html/manual113.html
-%%DOCSDIR%%/html/manual114.html
-%%DOCSDIR%%/html/manual115.html
-%%DOCSDIR%%/html/manual116.html
-%%DOCSDIR%%/html/manual117.html
-%%DOCSDIR%%/html/manual118.html
-%%DOCSDIR%%/html/manual119.html
-%%DOCSDIR%%/html/manual12.html
-%%DOCSDIR%%/html/manual120.html
-%%DOCSDIR%%/html/manual121.html
-%%DOCSDIR%%/html/manual122.html
-%%DOCSDIR%%/html/manual123.html
-%%DOCSDIR%%/html/manual124.html
-%%DOCSDIR%%/html/manual125.html
-%%DOCSDIR%%/html/manual126.html
-%%DOCSDIR%%/html/manual127.html
-%%DOCSDIR%%/html/manual128.html
-%%DOCSDIR%%/html/manual129.html
-%%DOCSDIR%%/html/manual13.html
-%%DOCSDIR%%/html/manual130.html
-%%DOCSDIR%%/html/manual131.html
-%%DOCSDIR%%/html/manual132.html
-%%DOCSDIR%%/html/manual133.html
-%%DOCSDIR%%/html/manual134.html
-%%DOCSDIR%%/html/manual135.html
-%%DOCSDIR%%/html/manual136.html
-%%DOCSDIR%%/html/manual137.html
-%%DOCSDIR%%/html/manual138.html
-%%DOCSDIR%%/html/manual139.html
-%%DOCSDIR%%/html/manual14.html
-%%DOCSDIR%%/html/manual140.html
-%%DOCSDIR%%/html/manual141.html
-%%DOCSDIR%%/html/manual142.html
-%%DOCSDIR%%/html/manual143.html
-%%DOCSDIR%%/html/manual144.html
-%%DOCSDIR%%/html/manual145.html
-%%DOCSDIR%%/html/manual146.html
-%%DOCSDIR%%/html/manual147.html
-%%DOCSDIR%%/html/manual148.html
-%%DOCSDIR%%/html/manual149.html
-%%DOCSDIR%%/html/manual15.html
-%%DOCSDIR%%/html/manual150.html
-%%DOCSDIR%%/html/manual151.html
-%%DOCSDIR%%/html/manual152.html
-%%DOCSDIR%%/html/manual153.html
-%%DOCSDIR%%/html/manual154.html
-%%DOCSDIR%%/html/manual155.html
-%%DOCSDIR%%/html/manual156.html
-%%DOCSDIR%%/html/manual157.html
-%%DOCSDIR%%/html/manual158.html
-%%DOCSDIR%%/html/manual159.html
-%%DOCSDIR%%/html/manual16.html
-%%DOCSDIR%%/html/manual160.html
-%%DOCSDIR%%/html/manual161.html
-%%DOCSDIR%%/html/manual162.html
-%%DOCSDIR%%/html/manual163.html
-%%DOCSDIR%%/html/manual164.html
-%%DOCSDIR%%/html/manual165.html
-%%DOCSDIR%%/html/manual166.html
-%%DOCSDIR%%/html/manual167.html
-%%DOCSDIR%%/html/manual168.html
-%%DOCSDIR%%/html/manual169.html
-%%DOCSDIR%%/html/manual17.html
-%%DOCSDIR%%/html/manual170.html
-%%DOCSDIR%%/html/manual171.html
-%%DOCSDIR%%/html/manual172.html
-%%DOCSDIR%%/html/manual173.html
-%%DOCSDIR%%/html/manual174.html
-%%DOCSDIR%%/html/manual175.html
-%%DOCSDIR%%/html/manual176.html
-%%DOCSDIR%%/html/manual177.html
-%%DOCSDIR%%/html/manual178.html
-%%DOCSDIR%%/html/manual179.html
-%%DOCSDIR%%/html/manual18.html
-%%DOCSDIR%%/html/manual180.html
-%%DOCSDIR%%/html/manual181.html
-%%DOCSDIR%%/html/manual182.html
-%%DOCSDIR%%/html/manual183.html
-%%DOCSDIR%%/html/manual184.html
-%%DOCSDIR%%/html/manual185.html
-%%DOCSDIR%%/html/manual186.html
-%%DOCSDIR%%/html/manual187.html
-%%DOCSDIR%%/html/manual188.html
-%%DOCSDIR%%/html/manual189.html
-%%DOCSDIR%%/html/manual19.html
-%%DOCSDIR%%/html/manual190.html
-%%DOCSDIR%%/html/manual191.html
-%%DOCSDIR%%/html/manual192.html
-%%DOCSDIR%%/html/manual193.html
-%%DOCSDIR%%/html/manual194.html
-%%DOCSDIR%%/html/manual195.html
-%%DOCSDIR%%/html/manual196.html
-%%DOCSDIR%%/html/manual197.html
-%%DOCSDIR%%/html/manual198.html
-%%DOCSDIR%%/html/manual199.html
-%%DOCSDIR%%/html/manual2.html
-%%DOCSDIR%%/html/manual20.html
-%%DOCSDIR%%/html/manual200.html
-%%DOCSDIR%%/html/manual201.html
-%%DOCSDIR%%/html/manual202.html
-%%DOCSDIR%%/html/manual203.html
-%%DOCSDIR%%/html/manual204.html
-%%DOCSDIR%%/html/manual205.html
-%%DOCSDIR%%/html/manual206.html
-%%DOCSDIR%%/html/manual207.html
-%%DOCSDIR%%/html/manual208.html
-%%DOCSDIR%%/html/manual209.html
-%%DOCSDIR%%/html/manual21.html
-%%DOCSDIR%%/html/manual210.html
-%%DOCSDIR%%/html/manual211.html
-%%DOCSDIR%%/html/manual212.html
-%%DOCSDIR%%/html/manual213.html
-%%DOCSDIR%%/html/manual214.html
-%%DOCSDIR%%/html/manual215.html
-%%DOCSDIR%%/html/manual216.html
-%%DOCSDIR%%/html/manual217.html
-%%DOCSDIR%%/html/manual218.html
-%%DOCSDIR%%/html/manual219.html
-%%DOCSDIR%%/html/manual22.html
-%%DOCSDIR%%/html/manual220.html
-%%DOCSDIR%%/html/manual221.html
-%%DOCSDIR%%/html/manual222.html
-%%DOCSDIR%%/html/manual223.html
-%%DOCSDIR%%/html/manual224.html
-%%DOCSDIR%%/html/manual225.html
-%%DOCSDIR%%/html/manual226.html
-%%DOCSDIR%%/html/manual227.html
-%%DOCSDIR%%/html/manual228.html
-%%DOCSDIR%%/html/manual229.html
-%%DOCSDIR%%/html/manual23.html
-%%DOCSDIR%%/html/manual230.html
-%%DOCSDIR%%/html/manual231.html
-%%DOCSDIR%%/html/manual232.html
-%%DOCSDIR%%/html/manual233.html
-%%DOCSDIR%%/html/manual234.html
-%%DOCSDIR%%/html/manual235.html
-%%DOCSDIR%%/html/manual236.html
-%%DOCSDIR%%/html/manual237.html
-%%DOCSDIR%%/html/manual238.html
-%%DOCSDIR%%/html/manual239.html
-%%DOCSDIR%%/html/manual24.html
-%%DOCSDIR%%/html/manual240.html
-%%DOCSDIR%%/html/manual241.html
-%%DOCSDIR%%/html/manual242.html
-%%DOCSDIR%%/html/manual243.html
-%%DOCSDIR%%/html/manual244.html
-%%DOCSDIR%%/html/manual245.html
-%%DOCSDIR%%/html/manual246.html
-%%DOCSDIR%%/html/manual247.html
-%%DOCSDIR%%/html/manual248.html
-%%DOCSDIR%%/html/manual249.html
-%%DOCSDIR%%/html/manual25.html
-%%DOCSDIR%%/html/manual250.html
-%%DOCSDIR%%/html/manual251.html
-%%DOCSDIR%%/html/manual252.html
-%%DOCSDIR%%/html/manual253.html
-%%DOCSDIR%%/html/manual254.html
-%%DOCSDIR%%/html/manual255.html
-%%DOCSDIR%%/html/manual256.html
-%%DOCSDIR%%/html/manual257.html
-%%DOCSDIR%%/html/manual258.html
-%%DOCSDIR%%/html/manual259.html
-%%DOCSDIR%%/html/manual26.html
-%%DOCSDIR%%/html/manual260.html
-%%DOCSDIR%%/html/manual261.html
-%%DOCSDIR%%/html/manual262.html
-%%DOCSDIR%%/html/manual263.html
-%%DOCSDIR%%/html/manual264.html
-%%DOCSDIR%%/html/manual265.html
-%%DOCSDIR%%/html/manual266.html
-%%DOCSDIR%%/html/manual267.html
-%%DOCSDIR%%/html/manual268.html
-%%DOCSDIR%%/html/manual269.html
-%%DOCSDIR%%/html/manual27.html
-%%DOCSDIR%%/html/manual270.html
-%%DOCSDIR%%/html/manual271.html
-%%DOCSDIR%%/html/manual272.html
-%%DOCSDIR%%/html/manual273.html
-%%DOCSDIR%%/html/manual274.html
-%%DOCSDIR%%/html/manual275.html
-%%DOCSDIR%%/html/manual276.html
-%%DOCSDIR%%/html/manual277.html
-%%DOCSDIR%%/html/manual278.html
-%%DOCSDIR%%/html/manual279.html
-%%DOCSDIR%%/html/manual28.html
-%%DOCSDIR%%/html/manual280.html
-%%DOCSDIR%%/html/manual281.html
-%%DOCSDIR%%/html/manual282.html
-%%DOCSDIR%%/html/manual283.html
-%%DOCSDIR%%/html/manual284.html
-%%DOCSDIR%%/html/manual285.html
-%%DOCSDIR%%/html/manual286.html
-%%DOCSDIR%%/html/manual287.html
-%%DOCSDIR%%/html/manual288.html
-%%DOCSDIR%%/html/manual289.html
-%%DOCSDIR%%/html/manual29.html
-%%DOCSDIR%%/html/manual290.html
-%%DOCSDIR%%/html/manual291.html
-%%DOCSDIR%%/html/manual292.html
-%%DOCSDIR%%/html/manual293.html
-%%DOCSDIR%%/html/manual294.html
-%%DOCSDIR%%/html/manual295.html
-%%DOCSDIR%%/html/manual296.html
-%%DOCSDIR%%/html/manual297.html
-%%DOCSDIR%%/html/manual298.html
-%%DOCSDIR%%/html/manual299.html
-%%DOCSDIR%%/html/manual3.html
-%%DOCSDIR%%/html/manual30.html
-%%DOCSDIR%%/html/manual300.html
-%%DOCSDIR%%/html/manual301.html
-%%DOCSDIR%%/html/manual302.html
-%%DOCSDIR%%/html/manual303.html
-%%DOCSDIR%%/html/manual304.html
-%%DOCSDIR%%/html/manual305.html
-%%DOCSDIR%%/html/manual306.html
-%%DOCSDIR%%/html/manual307.html
-%%DOCSDIR%%/html/manual308.html
-%%DOCSDIR%%/html/manual309.html
-%%DOCSDIR%%/html/manual31.html
-%%DOCSDIR%%/html/manual310.html
-%%DOCSDIR%%/html/manual311.html
-%%DOCSDIR%%/html/manual312.html
-%%DOCSDIR%%/html/manual313.html
-%%DOCSDIR%%/html/manual314.html
-%%DOCSDIR%%/html/manual315.html
-%%DOCSDIR%%/html/manual316.html
-%%DOCSDIR%%/html/manual317.html
-%%DOCSDIR%%/html/manual318.html
-%%DOCSDIR%%/html/manual319.html
-%%DOCSDIR%%/html/manual32.html
-%%DOCSDIR%%/html/manual320.html
-%%DOCSDIR%%/html/manual321.html
-%%DOCSDIR%%/html/manual322.html
-%%DOCSDIR%%/html/manual323.html
-%%DOCSDIR%%/html/manual324.html
-%%DOCSDIR%%/html/manual325.html
-%%DOCSDIR%%/html/manual326.html
-%%DOCSDIR%%/html/manual327.html
-%%DOCSDIR%%/html/manual328.html
-%%DOCSDIR%%/html/manual329.html
-%%DOCSDIR%%/html/manual33.html
-%%DOCSDIR%%/html/manual330.html
-%%DOCSDIR%%/html/manual331.html
-%%DOCSDIR%%/html/manual332.html
-%%DOCSDIR%%/html/manual333.html
-%%DOCSDIR%%/html/manual334.html
-%%DOCSDIR%%/html/manual335.html
-%%DOCSDIR%%/html/manual336.html
-%%DOCSDIR%%/html/manual337.html
-%%DOCSDIR%%/html/manual338.html
-%%DOCSDIR%%/html/manual339.html
-%%DOCSDIR%%/html/manual34.html
-%%DOCSDIR%%/html/manual340.html
-%%DOCSDIR%%/html/manual341.html
-%%DOCSDIR%%/html/manual342.html
-%%DOCSDIR%%/html/manual35.html
-%%DOCSDIR%%/html/manual36.html
-%%DOCSDIR%%/html/manual37.html
-%%DOCSDIR%%/html/manual38.html
-%%DOCSDIR%%/html/manual39.html
-%%DOCSDIR%%/html/manual4.html
-%%DOCSDIR%%/html/manual40.html
-%%DOCSDIR%%/html/manual41.html
-%%DOCSDIR%%/html/manual42.html
-%%DOCSDIR%%/html/manual43.html
-%%DOCSDIR%%/html/manual44.html
-%%DOCSDIR%%/html/manual45.html
-%%DOCSDIR%%/html/manual46.html
-%%DOCSDIR%%/html/manual47.html
-%%DOCSDIR%%/html/manual48.html
-%%DOCSDIR%%/html/manual49.html
-%%DOCSDIR%%/html/manual5.html
-%%DOCSDIR%%/html/manual50.html
-%%DOCSDIR%%/html/manual51.html
-%%DOCSDIR%%/html/manual52.html
-%%DOCSDIR%%/html/manual53.html
-%%DOCSDIR%%/html/manual54.html
-%%DOCSDIR%%/html/manual55.html
-%%DOCSDIR%%/html/manual56.html
-%%DOCSDIR%%/html/manual57.html
-%%DOCSDIR%%/html/manual58.html
-%%DOCSDIR%%/html/manual59.html
-%%DOCSDIR%%/html/manual6.html
-%%DOCSDIR%%/html/manual60.html
-%%DOCSDIR%%/html/manual61.html
-%%DOCSDIR%%/html/manual62.html
-%%DOCSDIR%%/html/manual63.html
-%%DOCSDIR%%/html/manual64.html
-%%DOCSDIR%%/html/manual65.html
-%%DOCSDIR%%/html/manual66.html
-%%DOCSDIR%%/html/manual67.html
-%%DOCSDIR%%/html/manual68.html
-%%DOCSDIR%%/html/manual69.html
-%%DOCSDIR%%/html/manual7.html
-%%DOCSDIR%%/html/manual70.html
-%%DOCSDIR%%/html/manual71.html
-%%DOCSDIR%%/html/manual72.html
-%%DOCSDIR%%/html/manual73.html
-%%DOCSDIR%%/html/manual74.html
-%%DOCSDIR%%/html/manual75.html
-%%DOCSDIR%%/html/manual76.html
-%%DOCSDIR%%/html/manual77.html
-%%DOCSDIR%%/html/manual78.html
-%%DOCSDIR%%/html/manual79.html
-%%DOCSDIR%%/html/manual8.html
-%%DOCSDIR%%/html/manual80.html
-%%DOCSDIR%%/html/manual81.html
-%%DOCSDIR%%/html/manual82.html
-%%DOCSDIR%%/html/manual83.html
-%%DOCSDIR%%/html/manual84.html
-%%DOCSDIR%%/html/manual85.html
-%%DOCSDIR%%/html/manual86.html
-%%DOCSDIR%%/html/manual87.html
-%%DOCSDIR%%/html/manual88.html
-%%DOCSDIR%%/html/manual89.html
-%%DOCSDIR%%/html/manual9.html
-%%DOCSDIR%%/html/manual90.html
-%%DOCSDIR%%/html/manual91.html
-%%DOCSDIR%%/html/manual92.html
-%%DOCSDIR%%/html/manual93.html
-%%DOCSDIR%%/html/manual94.html
-%%DOCSDIR%%/html/manual95.html
-%%DOCSDIR%%/html/manual96.html
-%%DOCSDIR%%/html/manual97.html
-%%DOCSDIR%%/html/manual98.html
-%%DOCSDIR%%/html/manual99.html
-%%DOCSDIR%%/html/manual_toc.html
-%%DOCSDIR%%/manual.latin1
-@dirrm %%DOCSDIR%%/html
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
deleted file mode 100644
index 8bbb619a3694..000000000000
--- a/mail/postfix28/Makefile
+++ /dev/null
@@ -1,380 +0,0 @@
-# New ports collection makefile for: postfix
-# Date created: 18 Mar 1999
-# Whom: torstenb
-#
-# $FreeBSD$
-#
-
-PORTNAME= postfix
-PORTVERSION= 2.8.7
-PORTEPOCH= 1
-CATEGORIES= mail ipv6
-MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
- ftp://ftp.tux.org/pub/net/postfix/official/ \
- ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
- ftp://ftp.samurai.com/pub/postfix/official/ \
- ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR= . old related/postfix
-DIST_SUBDIR= ${PORTNAME}
-
-MAINTAINER= sahil@FreeBSD.org
-COMMENT= A secure alternative to widely-used Sendmail
-
-VDAVERSION= 2.8.5
-CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-79].* postfix-base-2.[0-79].* \
- postfix-current-2.* postfix-current-base-2.* sendmail-8.* \
- sendmail+*-8.* smail-3.* zmailer-2.*
-
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-IS_INTERACTIVE= yes
-.endif
-
-USERS= postfix
-GROUPS= mail maildrop postfix
-MAKE_JOBS_SAFE= yes
-USE_SUBMAKE= yes
-USE_PERL5_BUILD=yes
-SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
-
-# back compat pull in settings from POSTFIX_OPTIONS for convenience when
-# make config is run (happens first time port is built, too)
-.for o in SASL2 SASLKRB5 SASLKRB5MIT TLS BDB MySQL PgSQL OpenLDAP CDB NIS VDA Test SPF
-STATUS_${o}=off
-.endfor
-.if defined(POSTFIX_OPTIONS)
-. for o in ${POSTFIX_OPTIONS}
-STATUS_${o}=on
-. endfor
-.endif
-
-OPTIONS= PCRE "Perl Compatible Regular Expressions" on \
- SASL2 "Cyrus SASLv2 (Simple Auth. and Sec. Layer)" ${STATUS_SASL2} \
- DOVECOT "Dovecot 1.x SASL authentication method" off \
- DOVECOT2 "Dovecot 2.x SASL authentication method" off \
- SASLKRB5 "If your SASL req. Kerberos5, select this" ${STATUS_SASLKRB5} \
- SASLKMIT "If your SASL req. MIT Kerberos5, select this" ${STATUS_SASLKRB5MIT} \
- TLS "Enable SSL and TLS support" ${STATUS_TLS} \
- BDB "Berkeley DB (uses WITH_BDB_VER)" ${STATUS_BDB} \
- MYSQL "MySQL maps (uses WITH_MYSQL_VER)" ${STATUS_MySQL} \
- PGSQL "PostgreSQL maps (uses DEFAULT_PGSQL_VER)" ${STATUS_PgSQL} \
- SQLITE "SQLite maps" off \
- OPENLDAP "OpenLDAP maps (uses WITH_OPENLDAP_VER)" ${STATUS_OpenLDAP} \
- LDAP_SASL "Enable OpenLDAP client-to-server SASL auth" off \
- CDB "CDB maps lookups" ${STATUS_CDB} \
- NIS "NIS maps lookups" ${STATUS_NIS} \
- VDA "VDA (Virtual Delivery Agent 32Bit)" ${STATUS_VDA} \
- TEST "SMTP/LMTP test server and generator" ${STATUS_Test} \
- SPF "SPF support (via libspf2 1.2.x)" ${STATUS_SPF} \
- INST_BASE "Install into /usr and /etc/postfix" off
-
-.include <bsd.port.options.mk>
-
-MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
- postlock.1 postlog.1 postmap.1 postmulti.1 postqueue.1 postsuper.1 \
- sendmail.1 qshape.1
-
-MAN5= access.5 aliases.5 bounce.5 canonical.5 cidr_table.5 generic.5 \
- header_checks.5 ldap_table.5 master.5 mysql_table.5 nisplus_table.5 \
- pcre_table.5 pgsql_table.5 postconf.5 postfix-wrapper.5 regexp_table.5 \
- relocated.5 sqlite_table.5 tcp_table.5 transport.5 virtual.5
-
-MAN8= anvil.8 bounce.8 cleanup.8 discard.8 dnsblog.8 error.8 flush.8 local.8 master.8 \
- oqmgr.8 pickup.8 pipe.8 postscreen.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 showq.8 \
- smtp.8 smtpd.8 spawn.8 tlsmgr.8 tlsproxy.8 trivial-rewrite.8 verify.8 virtual.8
-
-MLINKS= sendmail.1 mailq.1 \
- sendmail.1 newaliases.1 \
- header_checks.5 body_checks.5 \
- bounce.8 defer.8 \
- bounce.8 trace.8 \
- smtp.8 lmtp.8
-
-HTML1= body_checks.5.html bounce.5.html postfix-power.png \
- scache.8.html tlsmgr.8.html
-
-.if ${OSVERSION} >= 800037
-KRB5_EXTR= -lhx509
-.endif
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+= DEBUG=
-.endif
-
-MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}"
-
-POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
- -DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \
- -DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
- -DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
- -DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" \
- -DDEF_MAILQ_PATH=\\\"${PREFIX}/bin/mailq\\\" \
- -DDEF_MANPAGE_DIR=\\\"${MANPREFIX}/man\\\" \
- -DDEF_README_DIR=\\\"${READMEDIR}\\\" \
- -DDEF_HTML_DIR=\\\"${READMEDIR}\\\" \
- -DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\" \
- -DDEF_DATA_DIR=\\\"/var/db/postfix\\\" \
- -DDEF_MAIL_OWNER=\\\"postfix\\\" \
- -DDEF_SGID_GROUP=\\\"maildrop\\\" \
-
-# Default requirement for postfix rc script
-_REQUIRE= LOGIN cleanvar
-
-.if defined(WITH_PCRE)
-LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre
-.else
-POSTFIX_CCARGS+= -DNO_PCRE
-.endif
-
-.if defined(WITH_SASL2)
-LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-POSTFIX_CCARGS+= -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
-POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
-.endif
-
-.if defined(WITH_DOVECOT) && defined(WITH_DOVECOT2)
-BROKEN= Select only one Dovecot option
-.endif
-
-.if defined(WITH_DOVECOT) || defined(WITH_DOVECOT2)
-.if defined(WITH_DOVECOT)
-RUN_DEPENDS+= dovecot:${PORTSDIR}/mail/dovecot
-.else
-RUN_DEPENDS+= dovecot:${PORTSDIR}/mail/dovecot2
-.endif
-POSTFIX_CCARGS+= -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
-_REQUIRE+= dovecot
-.endif
-
-.if defined(WITH_SASLKRB5)
-.if defined(WITH_SASLKMIT)
-BROKEN= Select only one SASL Kerberos option
-.endif
-POSTFIX_AUXLIBS+= -lkrb5 ${KRB5_EXTR} -lcrypto -lcrypt -lcom_err -lasn1 -lroken
-.endif
-
-.if defined(WITH_SASLKMIT)
-.if defined(WITH_SASLKRB5)
-BROKEN= Select only one SASL Kerberos option
-.endif
-LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5
-POSTFIX_AUXLIBS+= -Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err
-.endif
-
-.if defined(WITH_TLS)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-POSTFIX_CCARGS+= -DUSE_TLS -I${OPENSSLINC}
-POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
-.endif
-
-.if defined(WITH_SPF)
-LIB_DEPENDS+= spf2.3:${PORTSDIR}/mail/libspf2
-PATCH_SITES+= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= mm
-PATCHFILES+= postfix-2.8.0-libspf2-1.2.x-0.patch.gz
-PATCH_DIST_STRIP= -p1
-POSTFIX_CCARGS+= -DHAVE_NS_TYPE -DHAS_SPF -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lspf2
-PLIST_SUB+= SPF=""
-.else
-PLIST_SUB+= SPF="@comment "
-.endif
-
-.if defined(WITH_BDB)
-USE_BDB= yes
-POSTFIX_CCARGS+= -I${BDB_INCLUDE_DIR}
-POSTFIX_AUXLIBS+= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME}
-.endif
-
-.if defined(WITH_MYSQL)
-USE_MYSQL= yes
-POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lcrypt -lm
-_REQUIRE+= mysql
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PGSQL= yes
-POSTFIX_CCARGS+= -DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include
-POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt
-_REQUIRE+= postgresql
-.endif
-
-.if defined(WITH_SQLITE)
-USE_SQLITE= yes
-POSTFIX_CCARGS+= -DHAS_SQLITE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsqlite3
-.endif
-
-.if defined(WITH_OPENLDAP)
-USE_OPENLDAP= yes
-.if defined(WITH_OPENLDAP_VER)
-WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER}
-.endif
-POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lldap -llber
-_REQUIRE+= slapd
-.if defined(WITH_LDAP_SASL)
-POSTFIX_CCARGS+= -DUSE_LDAP_SASL
-.endif
-.endif
-
-.if defined(WITH_CDB)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libcdb.a:${PORTSDIR}/databases/tinycdb
-POSTFIX_CCARGS+= -DHAS_CDB -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lcdb
-.endif
-
-.if defined(WITH_NIS)
-POSTFIX_CCARGS+= -DHAS_NIS
-_REQUIRE+= ypserv
-.endif
-
-.if defined(WITH_VDA)
-PATCH_SITES+= http://vda.sourceforge.net/VDA/:vda
-PATCHFILES+= postfix-vda-v10-${VDAVERSION}.patch:vda
-PATCH_DIST_STRIP= -p1
-PLIST_SUB+= VDA=""
-.else
-PLIST_SUB+= VDA="@comment "
-.endif
-
-.if defined(WITH_TEST)
-BINTEST= qmqp-sink qmqp-source smtp-sink smtp-source
-MANTEST= qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1
-MAN1+= ${MANTEST}
-PLIST_SUB+= TEST=""
-.else
-PLIST_SUB+= TEST="@comment "
-.endif
-
-.if defined(WITH_INST_BASE)
-PKGNAMESUFFIX= -base
-PREFIX= /usr
-ETCDIR= /etc/postfix
-USE_RCORDER= postfix.sh
-PLIST_SUB+= BASE=""
-.else
-USE_RC_SUBR= postfix.sh
-PLIST_SUB+= BASE="@comment "
-.endif
-
-PLIST_SUB+= PFETC=${ETCDIR}
-
-.if defined(NOPORTDOCS)
-READMEDIR= no
-.else
-READMEDIR= ${DOCSDIR}
-.endif
-
-DAEMONDIR= ${PREFIX}/libexec/postfix
-
-SUB_LIST+= REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" DAEMONDIR="${DAEMONDIR}"
-SUB_FILES+= pkg-install pkg-message
-
-# sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man
-REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!;\
- s!(_directory = )/usr/!\1${PREFIX}/!g;\
- s!^(data_directory = /var/)lib/!\1db/!g;\
- s!^\#(mynetworks_style = host)!\1!g;\
- s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g;\
- s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\
- s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
- s!^(setgid_group =)!\1 maildrop!g;\
- s!^(manpage_directory =)!\1 ${MANPREFIX}/man!g;\
- s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
- \!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
- s!(:|= )/etc/postfix!\1$$config_directory!g;\
- s!/etc/postfix!${ETCDIR}!g;\
- s!^(sample_directory =)!\1 ${ETCDIR}!g;\
- s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
-
-pre-patch:
-.if defined(POSTFIX_OPTIONS)
- @${ECHO_MSG}
- @${ECHO_MSG}
- @${ECHO_MSG}
- @${ECHO_MSG} "***** ALERT *****"
- @${ECHO_MSG} "POSTFIX_OPTIONS is no longer supported,"
- @${ECHO_MSG} "${PORTNAME} uses options, consider running"
- @${ECHO_MSG} "# make config"
- @${ECHO_MSG}
- @${ECHO_MSG}
- @${ECHO_MSG}
- @sleep 10
-.endif
-
-.if defined(WITH_SASL2) && !defined(WITH_MYSQL) && exists(${LOCALBASE}/lib/libsasl2.a)
- @if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \
- ${ECHO_MSG}; \
- ${ECHO_MSG} "Your SASL2 library it's compiled with MYSQL"; \
- ${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \
- ${ECHO_MSG} "select MYSQL OPTION in config menu."; \
- ${ECHO_MSG} "# make clean config"; \
- ${ECHO_MSG}; \
- sleep 5; \
- fi
-.endif
-
- @${ECHO} '<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>' \
- > ${WRKSRC}/html/body_checks.5.html
- @${REINPLACE_CMD} -E -e 's![[:<:]]perl[[:>:]]!${PERL}!' \
- ${WRKSRC}/src/bounce/Makefile.in
- @${REINPLACE_CMD} -E -e 's!^(#define DEF_SGID_GROUP[^"]+)"postdrop"$$!\1"maildrop"!' \
- ${WRKSRC}/src/global/mail_params.h
- @${FIND} -X ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man \
- -type f -a ! \( -name INSTALL -o -name aliases \) | ${XARGS} \
- ${REINPLACE_CMD} -E -e '${REINPLACE}'
-
-post-patch:
-.for f in ${HTML1}
- @${ECHO} '$$html_directory/$f:f:root:-:644' \
- >> ${WRKSRC}/conf/postfix-files
-.endfor
-.if defined(WITH_SPF)
- @${ECHO} '$$readme_directory/SPF_README:f:root:-:644' \
- >> ${WRKSRC}/conf/postfix-files
- @${REINPLACE_CMD} -E -e '${REINPLACE}' \
- ${WRKSRC}/README_FILES/SPF_README
-.endif
-.if defined(WITH_VDA)
- @${ECHO} '$$readme_directory/VDA_README:f:root:-:644' \
- >> ${WRKSRC}/conf/postfix-files
- @${REINPLACE_CMD} -E -e '${REINPLACE}' \
- ${WRKSRC}/README_FILES/VDA_README
-.endif
-
-do-configure:
- (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
- CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
- ${ECHO} "all: default" >> Makefile)
-
-do-install:
- @cd ${WRKSRC} && ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
- config_directory=${ETCDIR} \
- command_directory=${PREFIX}/sbin \
- daemon_directory=${DAEMONDIR} \
- html_directory=${READMEDIR} \
- mailq_path=${PREFIX}/bin/mailq \
- manpage_directory=${MANPREFIX}/man \
- newaliases_path=${PREFIX}/bin/newaliases \
- readme_directory=${READMEDIR} \
- sendmail_path=${PREFIX}/sbin/sendmail
- ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
- ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${PREFIX}/bin/qshape
- ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${MANPREFIX}/man/man1
-.for f in ${BINTEST}
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin
-.endfor
-.for f in ${MANTEST}
- ${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MANPREFIX}/man/man1
-.endfor
-
-post-install:
- @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
- # Fix compressed man pages
- @${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${DAEMONDIR}/postfix-files
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo
deleted file mode 100644
index 29a0f4d0273e..000000000000
--- a/mail/postfix28/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-SHA256 (postfix/postfix-2.8.7.tar.gz) = 5c13465ab47414e9aa2e857851eff1a3f020cebd056e0dde6094ece3552806e5
-SIZE (postfix/postfix-2.8.7.tar.gz) = 3647643
-SHA256 (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = e5c38e5bc226cab109c02a4e530ab1aefd3bb06f2169f3e052bdf83d2727aacc
-SIZE (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = 8191
-SHA256 (postfix/postfix-vda-v10-2.8.5.patch) = 0106e0bfdea8bb3888e8f33e7cb4b1530d171abbf2d3ac91567f91240e4b6b5a
-SIZE (postfix/postfix-vda-v10-2.8.5.patch) = 56777
diff --git a/mail/postfix28/files/patch-makedefs b/mail/postfix28/files/patch-makedefs
deleted file mode 100644
index 5e222a30f2f7..000000000000
--- a/mail/postfix28/files/patch-makedefs
+++ /dev/null
@@ -1,13 +0,0 @@
---- makedefs.orig 2011-06-15 22:36:37.000000000 +0000
-+++ makedefs 2011-11-06 00:37:30.699815339 +0000
-@@ -146,6 +146,10 @@
- ;;
- FreeBSD.8*) SYSTYPE=FREEBSD8
- ;;
-+ FreeBSD.9*) SYSTYPE=FREEBSD9
-+ ;;
-+ FreeBSD.10*) SYSTYPE=FREEBSD10
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- OpenBSD.3*) SYSTYPE=OPENBSD3
diff --git a/mail/postfix28/files/patch-src::util::sys_defs.h b/mail/postfix28/files/patch-src::util::sys_defs.h
deleted file mode 100644
index a13c320759ff..000000000000
--- a/mail/postfix28/files/patch-src::util::sys_defs.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/util/sys_defs.h.orig 2011-03-01 19:35:19.000000000 -0500
-+++ src/util/sys_defs.h 2011-03-01 19:36:54.000000000 -0500
-@@ -25,7 +25,7 @@
- */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
- || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
-- || defined(FREEBSD8) \
-+ || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \
- || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
- || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
- || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
diff --git a/mail/postfix28/files/pkg-install.in b/mail/postfix28/files/pkg-install.in
deleted file mode 100644
index b21747697e6a..000000000000
--- a/mail/postfix28/files/pkg-install.in
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/files/pkg-install.in,v 1.5 2011-07-26 01:49:28 sahil Exp $
-#
-
-# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
-# will make the port/package use defaults which make postfix replace
-# sendmail as much as possible.
-
-PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-ETCDIR=${ETCDIR:=%%ETCDIR%%}
-DAEMONDIR=${DAEMONDIR:=%%DAEMONDIR%%}
-READMEDIR=${READMEDIR:=%%READMEDIR%%}
-BATCH=${BATCH:=no}
-POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
-MC=/etc/mail/mailer.conf
-
-if [ "${POSTFIX_DEFAULT_MTA}" = "no" ]; then
- DEFAULT_REPLACE_MAILERCONF=n
-else
- DEFAULT_REPLACE_MAILERCONF=y
-fi
-
-if [ -x /usr/sbin/nologin ]; then
- NOLOGIN=/usr/sbin/nologin
-else
- NOLOGIN=/sbin/nologin
-fi
-
-ask() {
- local question default answer
-
- question=$1
- default=$2
- if [ -z "${PACKAGE_BUILDING}" -a "${BATCH}" = "no" ]; then
- read -p "${question} [${default}]? " answer
- fi
- if [ -z "${answer}" ]; then
- answer=${default}
- fi
- echo ${answer}
-}
-
-yesno() {
- local question default answer
-
- question=$1
- default=$2
- while :; do
- answer=$(ask "${question}" "${default}")
- case "${answer}" in
- [Yy]*) return 0;;
- [Nn]*) return 1;;
- esac
- echo "Please answer yes or no."
- done
-}
-
-
-if [ "$2" = "POST-INSTALL" ]; then
- SAMPLES="main.cf master.cf"
- for file in $SAMPLES
- do
- if [ ! -f ${ETCDIR}/$file ]; then
- cp ${DAEMONDIR}/$file ${ETCDIR}/
- fi
- done
-
- /bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \
- daemon_directory=${DAEMONDIR} \
- html_directory=${READMEDIR} \
- readme_directory=${READMEDIR} \
- upgrade-package
-fi
-
-
-if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" ]; then
- egrep -q "^sendmail.*${PREFIX}/sbin/sendmail" ${MC} && \
- egrep -q "^send-mail.*${PREFIX}/sbin/sendmail" ${MC} && \
- egrep -q "^mailq.*${PREFIX}/sbin/sendmail" ${MC} && \
- egrep -q "^newaliases.*${PREFIX}/sbin/sendmail" ${MC}
- ret=$?
- if [ ${ret} -ne 0 ]; then
- if yesno "Would you like to activate Postfix in ${MC}" ${DEFAULT_REPLACE_MAILERCONF}; then
- /bin/mv -f ${MC} ${MC}.old
- echo "#" > ${MC}
- echo -n "# Execute the Postfix sendmail program" >> ${MC}
- echo ", named ${PREFIX}/sbin/sendmail" >> ${MC}
- echo "#" >> ${MC}
- echo "sendmail ${PREFIX}/sbin/sendmail" >> ${MC}
- echo "send-mail ${PREFIX}/sbin/sendmail" >> ${MC}
- echo "mailq ${PREFIX}/sbin/sendmail" >> ${MC}
- echo "newaliases ${PREFIX}/sbin/sendmail" >> ${MC}
- fi
- else
- echo "Postfix already activated in ${MC}"
- fi
-fi
diff --git a/mail/postfix28/files/pkg-message.in b/mail/postfix28/files/pkg-message.in
deleted file mode 100644
index ff8879440a18..000000000000
--- a/mail/postfix28/files/pkg-message.in
+++ /dev/null
@@ -1,27 +0,0 @@
-To enable postfix startup script please add postfix_enable="YES" in
-your rc.conf
-
-If you not need sendmail anymore, please add in your rc.conf:
-
-sendmail_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_outbound_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-And you can disable some sendmail specific daily maintenance routines in your
-/etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-If /etc/periodic.conf does not exist please create it and add those values.
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file. This is accomplished by adding postfix to group mail and
-making the %%PREFIX%%/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from Postfix 2.6 or earlier, review the RELEASE_NOTES to
-familiarize yourself with new features and incompatabilities.
diff --git a/mail/postfix28/files/postfix.sh.in b/mail/postfix28/files/postfix.sh.in
deleted file mode 100644
index 849e6c1f9bd6..000000000000
--- a/mail/postfix28/files/postfix.sh.in
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: postfix mail
-# REQUIRE: %%REQUIRE%%
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable postfix:
-# postfix_enable (bool): Set it to "YES" to enable postfix.
-# Default is "NO".
-# postfix_pidfile (path): Set full path to master.pid.
-# Default is "/var/spool/postfix/pid/master.pid".
-# postfix_procname (command): Set command that start master. Used to verify if
-# postfix is running.
-# Default is "%%PREFIX%%/libexec/postfix/master".
-# postfix_flags (str): Flags passed to postfix-script on startup.
-# Default is "".
-#
-
-. /etc/rc.subr
-
-name="postfix"
-rcvar=${name}_enable
-
-load_rc_config $name
-
-: ${postfix_enable:="NO"}
-: ${postfix_pidfile:="/var/spool/postfix/pid/master.pid"}
-: ${postfix_procname:="%%PREFIX%%/libexec/postfix/master"}
-
-start_cmd=${name}_start
-stop_cmd=${name}_stop
-extra_commands="reload"
-
-pidfile=${postfix_pidfile}
-procname=${postfix_procname}
-
-postfix_start() {
- %%PREFIX%%/sbin/postfix ${postfix_flags} start
-}
-
-postfix_stop() {
- %%PREFIX%%/sbin/postfix ${postfix_flags} stop
-}
-
-run_rc_command "$1"
diff --git a/mail/postfix28/pkg-descr b/mail/postfix28/pkg-descr
deleted file mode 100644
index 58c625e46973..000000000000
--- a/mail/postfix28/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at the same
-time being sendmail compatible enough to not upset existing users. Thus, the
-outside has a sendmail-ish flavor, but the inside is completely different.
-
-Some feautures:
-
-Connection cache for SMTP, DSN status notifications, IP version 6, Plug-in
-support for multiple SASL implementations (Cyrus, Dovecot), TLS encryption and
-authentication, Configurable status notification message text, Access control
-per client/sender/recipient/etc, Content filter (built-in, external before
-queue, external after queue), Berkeley DB database, LDAP database, MySQL
-database, PostgreSQL database, Maildir and mailbox format, Virtual domains,
-VERP envelope return addresses and others.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix28/pkg-plist b/mail/postfix28/pkg-plist
deleted file mode 100644
index 4918bf0c90d2..000000000000
--- a/mail/postfix28/pkg-plist
+++ /dev/null
@@ -1,245 +0,0 @@
-@unexec if cmp -s %D/libexec/postfix/main.cf %%PFETC%%/main.cf; then rm -f %%PFETC%%/main.cf; fi
-@unexec if cmp -s %D/libexec/postfix/master.cf %%PFETC%%/master.cf; then rm -f %%PFETC%%/master.cf; fi
-libexec/postfix/anvil
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/discard
-libexec/postfix/dnsblog
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/main.cf
-libexec/postfix/master
-libexec/postfix/master.cf
-libexec/postfix/nqmgr
-libexec/postfix/oqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/post-install
-libexec/postfix/postfix-files
-libexec/postfix/postfix-script
-libexec/postfix/postfix-wrapper
-libexec/postfix/postmulti-script
-libexec/postfix/postscreen
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/scache
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/tlsproxy
-libexec/postfix/trivial-rewrite
-libexec/postfix/verify
-libexec/postfix/virtual
-libexec/postfix/tlsmgr
-@dirrm libexec/postfix
-bin/mailq
-bin/newaliases
-bin/qshape
-bin/rmail
-%%TEST%%bin/qmqp-sink
-%%TEST%%bin/qmqp-source
-%%TEST%%bin/smtp-sink
-%%TEST%%bin/smtp-source
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postmulti
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-%%PORTDOCS%%%%DOCSDIR%%/AAAREADME
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DB_README
-%%PORTDOCS%%%%DOCSDIR%%/DB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DSN_README
-%%PORTDOCS%%%%DOCSDIR%%/DSN_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/MILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README
-%%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/POSTSCREEN_README
-%%PORTDOCS%%%%DOCSDIR%%/POSTSCREEN_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SOHO_README
-%%PORTDOCS%%%%DOCSDIR%%/SOHO_README.html
-%%SPF%%%%PORTDOCS%%%%DOCSDIR%%/SPF_README
-%%PORTDOCS%%%%DOCSDIR%%/SQLITE_README
-%%PORTDOCS%%%%DOCSDIR%%/SQLITE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/STRESS_README
-%%PORTDOCS%%%%DOCSDIR%%/STRESS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README
-%%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
-%%VDA%%%%PORTDOCS%%%%DOCSDIR%%/VDA_README
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html
-%%PORTDOCS%%%%DOCSDIR%%/access.5.html
-%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
-%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html
-%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/bounce.5.html
-%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
-%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
-%%PORTDOCS%%%%DOCSDIR%%/discard.8.html
-%%PORTDOCS%%%%DOCSDIR%%/dnsblog.8.html
-%%PORTDOCS%%%%DOCSDIR%%/error.8.html
-%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
-%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/local.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
-%%PORTDOCS%%%%DOCSDIR%%/master.5.html
-%%PORTDOCS%%%%DOCSDIR%%/master.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
-%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
-%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html
-%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg
-%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png
-%%PORTDOCS%%%%DOCSDIR%%/postfix-wrapper.5.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postmulti.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postscreen.8.html
-%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
-%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
-%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
-%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
-%%PORTDOCS%%%%DOCSDIR%%/scache.8.html
-%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
-%%PORTDOCS%%%%DOCSDIR%%/sqlite_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/tcp_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/tlsproxy.8.html
-%%PORTDOCS%%%%DOCSDIR%%/trace.8.html
-%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
-%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
-%%PORTDOCS%%%%DOCSDIR%%/verify.8.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
-%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/generic.5.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%BASE%%@cwd /
-etc/postfix/LICENSE
-etc/postfix/TLS_LICENSE
-etc/postfix/bounce.cf.default
-etc/postfix/main.cf.default
-etc/postfix/makedefs.out
-@dirrmtry etc/postfix
diff --git a/mail/thunderbird-esr-i18n/Makefile b/mail/thunderbird-esr-i18n/Makefile
deleted file mode 100644
index cbc10fff10e7..000000000000
--- a/mail/thunderbird-esr-i18n/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-# New ports collection makefile for: thunderbird-i18n
-# Date created: 29 May 2006
-# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= thunderbird-i18n
-PORTVERSION= 8.0
-CATEGORIES= mail
-MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/linux-i686/xpi
-PKGNAMEPREFIX=
-DISTFILES= ${THUNDERBIRD_I18N_:S/$/.xpi/}
-DIST_SUBDIR= xpi/${DISTNAME}
-
-MAINTAINER= gecko@FreeBSD.org
-COMMENT= Localized interface for Thunderbird
-
-EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip
-
-.ifndef WITHOUT_SWITCHER
-RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
-.endif
-
-NO_BUILD= yes
-USE_THUNDERBIRD= 80
-USE_XPI= thunderbird linux-thunderbird
-
-THUNDERBIRD_I18N_ALL= ar br ca cs da de en-GB en-US es-AR es-ES et eu fi fr \
- fy-NL ga-IE gd gl he hu is it ja ko lt nb-NO nl nn-NO \
- pl pt-BR pt-PT rm ru si sk sl sq sv-SE ta-LK tr uk zh-TW
-
-.ifdef PACKAGE_BUILDING
-THUNDERBIRD_I18N?= all
-.else
-THUNDERBIRD_I18N?= es-ES pt-BR ru ja de fr ko it
-.endif
-
-.if ${THUNDERBIRD_I18N} == all
-THUNDERBIRD_I18N_= ${THUNDERBIRD_I18N_ALL}
-.endif
-THUNDERBIRD_I18N_?= ${THUNDERBIRD_I18N}
-
-WDIR= langpack-*@thunderbird.mozilla.org
-
-XPI_DISTNAMES= ${THUNDERBIRD_I18N_}
-.for dist in ${XPI_DISTNAMES}
-XPI_ID_${dist}= langpack-${dist}@thunderbird.mozilla.org
-XPI_FILES_${dist}= chrome.manifest install.rdf chrome/${dist}.jar
-XPI_DIRS_${dist}= chrome
-.endfor
-
-do-extract:
- @${RM} -rf ${WRKDIR}
- @${MKDIR} ${WRKDIR} ${WRKSRC}
- @for lang in ${THUNDERBIRD_I18N_}; do \
- if ! (${EXTRACT_CMD} ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org);\
- then \
- exit 1; \
- fi; \
- cd ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org/chrome/$$lang; \
- ${LOCALBASE}/bin/zip -r ../$$lang.jar locale; \
- cd ..; ${RM} -rf $$lang; cd ..; \
- ${REINPLACE_CMD} -i "" "s,chrome/$$lang,jar:chrome/$$lang.jar!," chrome.manifest; \
- done
-
-do-install:
- @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL}
- @${CP} -R ${WRKSRC}/ ${XPI_LIBDIR}/
- @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/
- @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/
- @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; }
- @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A}
- @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \
- ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A}
- @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -fR $$_dir/${WDIR} ; }' ${_A}
- @${ECHO_CMD} '@unexec ${RMDIR} ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A}
-
-post-patch:
- ${FIND} ${WRKSRC} -name install.rdf -print0 | \
- ${XARGS} -0L1 ${REINPLACE_CMD} -i '' '/<?xml/,$$!d'
-
-list-langs:
- @fetch -o- "http://releases.mozilla.org/pub/mozilla.org/${MASTER_SITE_SUBDIR}"|\
- perl -ne 'if(/.*href="([a-zA-Z-]+).xpi.*/){print "$$1 "}'
-
-.include "${.CURDIR}/../../www/xpi-adblock/Makefile.xpi"
-.include <bsd.port.mk>
diff --git a/mail/thunderbird-esr-i18n/distinfo b/mail/thunderbird-esr-i18n/distinfo
deleted file mode 100644
index 59d687838d7a..000000000000
--- a/mail/thunderbird-esr-i18n/distinfo
+++ /dev/null
@@ -1,84 +0,0 @@
-SHA256 (xpi/thunderbird-i18n-8.0/ar.xpi) = ac50815d26c950b51a930239facf46c1225f8c052dc7610106fa74573b187b96
-SIZE (xpi/thunderbird-i18n-8.0/ar.xpi) = 429682
-SHA256 (xpi/thunderbird-i18n-8.0/br.xpi) = bfe0a405db47e62cf4f2037f10592f37e6f4804ff141c98f03a708c8b76886c9
-SIZE (xpi/thunderbird-i18n-8.0/br.xpi) = 407854
-SHA256 (xpi/thunderbird-i18n-8.0/ca.xpi) = f9cbd66875016bf18e84d0ffcae1b394d020c6166f1626b95cdb04ea431c20b8
-SIZE (xpi/thunderbird-i18n-8.0/ca.xpi) = 407844
-SHA256 (xpi/thunderbird-i18n-8.0/cs.xpi) = 1fd879a3802d455a10db9b94c74449663920b6dd9e7dec487c9a782898fc4c6e
-SIZE (xpi/thunderbird-i18n-8.0/cs.xpi) = 410932
-SHA256 (xpi/thunderbird-i18n-8.0/da.xpi) = db28f6e245304488923e153e5e692b3ade8d736bc42c2fd8c1af065c973370ef
-SIZE (xpi/thunderbird-i18n-8.0/da.xpi) = 353524
-SHA256 (xpi/thunderbird-i18n-8.0/de.xpi) = d8047dafbcf85f520ec268c633e0a704bd276b0e46d972302d54356f558883f2
-SIZE (xpi/thunderbird-i18n-8.0/de.xpi) = 409617
-SHA256 (xpi/thunderbird-i18n-8.0/en-GB.xpi) = 77a53b255f1a526166415eb2c7398a6d7a07a23f46d2737714bfbded8972bb8f
-SIZE (xpi/thunderbird-i18n-8.0/en-GB.xpi) = 384202
-SHA256 (xpi/thunderbird-i18n-8.0/en-US.xpi) = a594e5ed42cf96ab7f3523e6ee929ab48d61e254affdc0c69191e3fda375e831
-SIZE (xpi/thunderbird-i18n-8.0/en-US.xpi) = 383791
-SHA256 (xpi/thunderbird-i18n-8.0/es-AR.xpi) = 3d23032bc87e257a749ce7a877897ee4e05c64930ebec9e743eec07c52ac26dc
-SIZE (xpi/thunderbird-i18n-8.0/es-AR.xpi) = 402208
-SHA256 (xpi/thunderbird-i18n-8.0/es-ES.xpi) = 9e4d21fa3b1387977ae4a6bf69395b48de8560e0330ee964c210a06fbf0c0327
-SIZE (xpi/thunderbird-i18n-8.0/es-ES.xpi) = 345966
-SHA256 (xpi/thunderbird-i18n-8.0/et.xpi) = 7e866bb4f163e8aac567266414e20877bb9c6d0525d6621d717cdef1a9715ed2
-SIZE (xpi/thunderbird-i18n-8.0/et.xpi) = 402614
-SHA256 (xpi/thunderbird-i18n-8.0/eu.xpi) = af1a9e5cd29befc818ab5b93ce3b5058766f80fe0feeaedd261a702e56d1853c
-SIZE (xpi/thunderbird-i18n-8.0/eu.xpi) = 398556
-SHA256 (xpi/thunderbird-i18n-8.0/fi.xpi) = e2c94b11072377e3ce6758a6f3b607e03fa7a0073e167b31ee097e0363b6c50c
-SIZE (xpi/thunderbird-i18n-8.0/fi.xpi) = 403666
-SHA256 (xpi/thunderbird-i18n-8.0/fr.xpi) = 5384e5e75061ab504ea3f6284d9f6232826f596d6785c392e795dbf27a2139b2
-SIZE (xpi/thunderbird-i18n-8.0/fr.xpi) = 406258
-SHA256 (xpi/thunderbird-i18n-8.0/fy-NL.xpi) = fbf0e7e59f36aa2770ddc129b0da453c5ccec1fc26ab08c1d37bb2ea1baec890
-SIZE (xpi/thunderbird-i18n-8.0/fy-NL.xpi) = 406182
-SHA256 (xpi/thunderbird-i18n-8.0/ga-IE.xpi) = 6f193c7ab8d86e01bd305cb480ce4d1d3c40952b29d451ad53a87f7d25c399db
-SIZE (xpi/thunderbird-i18n-8.0/ga-IE.xpi) = 414791
-SHA256 (xpi/thunderbird-i18n-8.0/gd.xpi) = a79cd6a967aa6023953e1b24cf784e5600b05bd77f081c11fa1ab53c145f19e8
-SIZE (xpi/thunderbird-i18n-8.0/gd.xpi) = 417258
-SHA256 (xpi/thunderbird-i18n-8.0/gl.xpi) = bd164a1c8b5a1fa7514323a6fad15f43765c42886ab46cd0995edf29e19ec25e
-SIZE (xpi/thunderbird-i18n-8.0/gl.xpi) = 401200
-SHA256 (xpi/thunderbird-i18n-8.0/he.xpi) = 15049fbc3a1d41d4c69013ab18679994e6530a65c47051388dd51ec605e82562
-SIZE (xpi/thunderbird-i18n-8.0/he.xpi) = 429157
-SHA256 (xpi/thunderbird-i18n-8.0/hu.xpi) = 2ba9485a7d3ed1fc7962f5776ab02856a7b6c847345b03fd54c6bb80e10a8e08
-SIZE (xpi/thunderbird-i18n-8.0/hu.xpi) = 418308
-SHA256 (xpi/thunderbird-i18n-8.0/is.xpi) = 60110ee7c61ccfeca0560a49eacb50423f73f183a964f58b74ae37d8e564443c
-SIZE (xpi/thunderbird-i18n-8.0/is.xpi) = 404491
-SHA256 (xpi/thunderbird-i18n-8.0/it.xpi) = 61c243264edee5bb95bc947b0732401f189b184863d2640128e00a19fac426b2
-SIZE (xpi/thunderbird-i18n-8.0/it.xpi) = 338611
-SHA256 (xpi/thunderbird-i18n-8.0/ja.xpi) = 1ffc9c291893601172be91f50b25b651c18ea008def94b858a12147872da2ce9
-SIZE (xpi/thunderbird-i18n-8.0/ja.xpi) = 450381
-SHA256 (xpi/thunderbird-i18n-8.0/ko.xpi) = b7063cad1f6ebe4c21dce881eb748a88aa906d23f248593d9bb53ba14381efba
-SIZE (xpi/thunderbird-i18n-8.0/ko.xpi) = 362650
-SHA256 (xpi/thunderbird-i18n-8.0/lt.xpi) = fcd2c44bdebe7866f087b088ce5103366e2241bc341cc24b771684bc1d06d253
-SIZE (xpi/thunderbird-i18n-8.0/lt.xpi) = 527185
-SHA256 (xpi/thunderbird-i18n-8.0/nb-NO.xpi) = 83b800ea6ddcf098f309a8e71f3de741973d0177c145be9b8bf896d23df5204d
-SIZE (xpi/thunderbird-i18n-8.0/nb-NO.xpi) = 399860
-SHA256 (xpi/thunderbird-i18n-8.0/nl.xpi) = bce99a6e95ae72bf6040d38c7fdfc5cd222b3362dd97e79e5af90f2e752adfcf
-SIZE (xpi/thunderbird-i18n-8.0/nl.xpi) = 399870
-SHA256 (xpi/thunderbird-i18n-8.0/nn-NO.xpi) = 7e93e1e0ed7c6e942c6858b4e003be1e9a7180822a251436cc8349be1784d5f9
-SIZE (xpi/thunderbird-i18n-8.0/nn-NO.xpi) = 401462
-SHA256 (xpi/thunderbird-i18n-8.0/pl.xpi) = 040b62774df7f1e66b8af5d42031ac3bcd148c3646ee7815504aa2cc89322c4a
-SIZE (xpi/thunderbird-i18n-8.0/pl.xpi) = 386210
-SHA256 (xpi/thunderbird-i18n-8.0/pt-BR.xpi) = 669f7ad7db9b02e8dd9e41be42cac56ff9a2826c971f656d17f0fee0a22bc397
-SIZE (xpi/thunderbird-i18n-8.0/pt-BR.xpi) = 408964
-SHA256 (xpi/thunderbird-i18n-8.0/pt-PT.xpi) = b2ff74fa2f888b8e29ae158d55ded0ce7660498460930ff0697f17e6e481a91f
-SIZE (xpi/thunderbird-i18n-8.0/pt-PT.xpi) = 405968
-SHA256 (xpi/thunderbird-i18n-8.0/rm.xpi) = 0110cfd35cd8354930ba5511ccde62539e75e69d31f4d428a20bd8aa113cfaef
-SIZE (xpi/thunderbird-i18n-8.0/rm.xpi) = 406577
-SHA256 (xpi/thunderbird-i18n-8.0/ru.xpi) = a412dd6f6763972727007d76f837b5f1d8dd32ec35afc9490a3722437330dee6
-SIZE (xpi/thunderbird-i18n-8.0/ru.xpi) = 400687
-SHA256 (xpi/thunderbird-i18n-8.0/si.xpi) = fce2b953375d5b6fcf58d94bc4b676ae843103b5899fd3f5af5c5f7275e75631
-SIZE (xpi/thunderbird-i18n-8.0/si.xpi) = 448334
-SHA256 (xpi/thunderbird-i18n-8.0/sk.xpi) = e09edb3471eb06d3e21d85cbf2b889ccb041680150b28f43db2f46ae21ba6dff
-SIZE (xpi/thunderbird-i18n-8.0/sk.xpi) = 416338
-SHA256 (xpi/thunderbird-i18n-8.0/sl.xpi) = 91c6151d3c9c74ff937539c2c59a4f04f381403d72e43402a9466fffbdda5a71
-SIZE (xpi/thunderbird-i18n-8.0/sl.xpi) = 402625
-SHA256 (xpi/thunderbird-i18n-8.0/sq.xpi) = f14b7ca5d4049ee6218fd6377759bd6cfc32d37d180204510737ad4814c56893
-SIZE (xpi/thunderbird-i18n-8.0/sq.xpi) = 351703
-SHA256 (xpi/thunderbird-i18n-8.0/sv-SE.xpi) = c7cc27527961c0435fa8bb1563fe04edee234188b0abe001e10159c48bda8a2b
-SIZE (xpi/thunderbird-i18n-8.0/sv-SE.xpi) = 470499
-SHA256 (xpi/thunderbird-i18n-8.0/ta-LK.xpi) = a49d999804b2925dc87b5fd990cbd373489b007bfd67a862ca1f775eb5448c04
-SIZE (xpi/thunderbird-i18n-8.0/ta-LK.xpi) = 466437
-SHA256 (xpi/thunderbird-i18n-8.0/tr.xpi) = 984f7bcae3a51a3dcbe83b2098037c43fe929d14713f8b0818c362122f507a2d
-SIZE (xpi/thunderbird-i18n-8.0/tr.xpi) = 405974
-SHA256 (xpi/thunderbird-i18n-8.0/uk.xpi) = cdf663bdc0f85857cd41ead2c058abf01f6542089da94ada9f5a2bcf95214dbe
-SIZE (xpi/thunderbird-i18n-8.0/uk.xpi) = 456674
-SHA256 (xpi/thunderbird-i18n-8.0/zh-TW.xpi) = a6c78df16a242b1731709fdacae8fcfde630fe10469abfd6a696b46076e9059a
-SIZE (xpi/thunderbird-i18n-8.0/zh-TW.xpi) = 423019
diff --git a/mail/thunderbird-esr-i18n/pkg-descr b/mail/thunderbird-esr-i18n/pkg-descr
deleted file mode 100644
index e5842d14f281..000000000000
--- a/mail/thunderbird-esr-i18n/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Language packs for Thunderbird
-
-WWW: http://www.mozilla.org/projects/l10n/
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
deleted file mode 100644
index 666fcc22a6a0..000000000000
--- a/mail/thunderbird-esr/Makefile
+++ /dev/null
@@ -1,164 +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= 8.0
-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.7:${PORTSDIR}/devel/nspr \
- cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
- unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
- event-1.4:${PORTSDIR}/devel/libevent
-
-CONFLICTS_BUILD= spidermonkey-*
-
-USE_AUTOTOOLS= autoconf213
-USE_GECKO= gecko
-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_GL= gl
-
-MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data,wyciwyg,websocket
-MOZ_GRAPHICS= default,-xbm
-MOZ_OPTIONS= --program-transform-name='s/thunderbird/${MOZILLA}/' \
- --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
- --enable-single-profile --disable-profilesharing \
- --enable-application=mail --enable-official-branding \
- --disable-updater --disable-necko-wifi \
- --with-system-libevent=${LOCALBASE}
-MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
-MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
-MOZ_PKGCONFIG_FILES=
-
-PORTNAME_ICON= ${MOZILLA}.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= LIGHTNING "Enable calendar extension" off
-
-.include <bsd.port.pre.mk>
-
-WRKSRC= ${WRKDIR}/comm-release
-MOZSRC:= ${WRKSRC}/mozilla
-
-.if ${ARCH} == powerpc64
-.if ${OSVERSION} < 900033
-BROKEN= Needs binutils 2.17.50 to build
-.else
-CONFIGURE_ENV+= UNAME_m="powerpc64"
-CFLAGS+= -mminimal-toc
-.endif
-.endif
-
-.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.4:${PORTSDIR}/devel/libnotify
-.endif
-
-.if ${ARCH} == amd64 || ${ARCH} == i386
-BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
-.endif
-
-.if defined(WITH_LIGHTNING)
-MOZ_OPTIONS+= --enable-calendar
-MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar
-LIGHTNING_DIR= share/lightning
-XPI_FILE= ${MOZSRC}/dist/xpi-stage/lightning.xpi
-XPI_LIBDIR= ${PREFIX}/lib/xpi
-XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103}
-XPI_ID= lightning@thunderbird.mozilla.org
-.else
-MOZ_OPTIONS+= --disable-calendar
-.endif
-
-post-extract:
- @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \
- <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
-
-post-patch:
- @${GREP} -Flr \"/proc ${MOZSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \
- -e 's|/proc/self/fd|/dev/fd|' \
- -e 's|/proc["/]|/compat/linux&|'
- @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
- ${MOZSRC}/storage/build/Makefile.in \
- ${MOZSRC}/toolkit/library/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:
- ${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}
-.if defined(WITH_LIGHTNING)
- @${MKDIR} ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/thunderbird
- @(cd ${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE})
- @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${XPI_ID}
- @${REINPLACE_CMD} -i "" "s/${XPI_ORIG_ID}/${XPI_ID}/" ${XPI_LIBDIR}/${XPI_ID}/install.rdf
- @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${XPI_ID}
- @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${LOCALBASE}/lib/thunderbird/extensions 2>/dev/null || true
- @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/thunderbird 2>/dev/null || true
- @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -not -type d) | ${SORT} | \
- ${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST}
- @${ECHO_CMD} 'lib/xpi/symlinks/thunderbird/${XPI_ID}' >> ${TMPPLIST}
- @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${XPI_ID} ${LOCALBASE}/lib/thunderbird/extensions 2>/dev/null || true' >> ${TMPPLIST}
- @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/thunderbird/extensions/${XPI_ID}' >> ${TMPPLIST}
- @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -type d) | ${SORT} -r | \
- ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST}
- @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/thunderbird 2>/dev/null || true' >> ${TMPPLIST}
- @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks 2>/dev/null || true' >> ${TMPPLIST}
- @${ECHO_CMD} '@unexec rmdir %D/lib/xpi 2>/dev/null || true' >> ${TMPPLIST}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo
deleted file mode 100644
index 39f5d2ac7dd1..000000000000
--- a/mail/thunderbird-esr/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (thunderbird-8.0.source.tar.bz2) = f728bd2dbc04e6c3a096d79a9ee320740f53794a28be307da8655c8fd90f77f5
-SIZE (thunderbird-8.0.source.tar.bz2) = 89435206
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 56c07e868572..000000000000
--- a/mail/thunderbird-esr/files/patch-configure.in
+++ /dev/null
@@ -1,121 +0,0 @@
---- configure.in.orig 2011-07-15 07:42:33.000000000 +0200
-+++ configure.in 2011-07-22 13:43:44.000000000 +0200
-@@ -1438,7 +1438,7 @@
- CPU_ARCH=sparc
- ;;
-
--x86_64 | ia64)
-+amd64 | x86_64 | ia64)
- CPU_ARCH="$OS_TEST"
- ;;
-
-@@ -1458,7 +1458,7 @@
- dnl ===============================================================
- INTEL_ARCHITECTURE=
- case "$OS_TEST" in
-- x86_64|i?86)
-+ amd64|x86_64|i?86)
- INTEL_ARCHITECTURE=1
- esac
-
-@@ -1781,7 +1781,7 @@
- esac
-
- case "${host_cpu}" in
-- x86_64)
-+ amd64 | x86_64)
- HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_"
- ;;
- esac
-@@ -2437,6 +2437,9 @@
- x86_64-*)
- AC_DEFINE(_AMD64_)
- ;;
-+ amd64*)
-+ AC_DEFINE(_AMD64_)
-+ ;;
- *)
- AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
- ;;
-@@ -2508,7 +2511,7 @@
- else
- DLL_SUFFIX=".so.1.0"
- fi
-- MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/X11R6)/lib'
-+ MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/local)/lib'
- DSO_CFLAGS=''
- DSO_PIC_CFLAGS='-fPIC'
- DSO_LDOPTS='-shared -fPIC'
-@@ -3326,11 +3329,11 @@
- ;;
- *)
- MOZ_CHECK_PTHREADS(pthreads,
-- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads",
-+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthreads",
- MOZ_CHECK_PTHREADS(pthread,
-- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread",
-+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
- MOZ_CHECK_PTHREADS(c_r,
-- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r",
-+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
- MOZ_CHECK_PTHREADS(c,
- USE_PTHREADS=1
- )
-@@ -3405,18 +3408,18 @@
- *-*-freebsd*)
- AC_DEFINE(_REENTRANT)
- AC_DEFINE(_THREAD_SAFE)
-- dnl -pthread links in -lc_r, so don't specify it explicitly.
-+ dnl -pthread links in -pthread, so don't specify it explicitly.
- if test "$ac_cv_have_dash_pthread" = "yes"; then
- _PTHREAD_LDFLAGS="-pthread"
- else
-- _PTHREAD_LDFLAGS="-lc_r"
-+ _PTHREAD_LDFLAGS="-pthread"
- fi
- ;;
-
- *-*-openbsd*|*-*-bsdi*)
- AC_DEFINE(_REENTRANT)
- AC_DEFINE(_THREAD_SAFE)
-- dnl -pthread links in -lc_r, so don't specify it explicitly.
-+ dnl -pthread links in -pthread, so don't specify it explicitly.
- if test "$ac_cv_have_dash_pthread" = "yes"; then
- _PTHREAD_LDFLAGS="-pthread"
- fi
-@@ -3591,7 +3594,7 @@
- ac_cv_func_iconv,
- [AC_TRY_LINK([
- #include <stdlib.h>
-- #include <iconv.h>
-+ #include "/usr/local/include/iconv.h"
- ],
- [
- iconv_t h = iconv_open("", "");
-@@ -3612,7 +3615,7 @@
- ac_cv_func_const_iconv,
- [AC_TRY_COMPILE([
- #include <stdlib.h>
-- #include <iconv.h>
-+ #include "/usr/local/include/iconv.h"
- ],
- [
- const char *input = "testing";
-@@ -4409,7 +4412,7 @@
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
-
--if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
-+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
- ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
- ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
- fi
-@@ -5966,7 +5969,7 @@
- i*86)
- MOZ_CRT_CPU_ARCH=intel
- ;;
-- x86_64)
-+ amd64 | x86_64)
- MOZ_CRT_CPU_ARCH=amd64
- ;;
- *)
diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc
deleted file mode 100644
index ffb56ac25100..000000000000
--- a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc~
-+++ mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc
-@@ -39,6 +39,7 @@
- * ***** END LICENSE BLOCK ***** */
-
- #include "base/atomicops.h"
-+#include "base/lock.h"
-
- namespace base {
- namespace subtle {
diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util.h b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util.h
deleted file mode 100644
index 81a4693140a8..000000000000
--- a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- mozilla/ipc/chromium/src/base/file_util.h~
-+++ mozilla/ipc/chromium/src/base/file_util.h
-@@ -15,8 +15,9 @@
- #elif defined(ANDROID)
- #include <sys/stat.h>
- #elif defined(OS_POSIX)
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <fts.h>
--#include <sys/stat.h>
- #endif
-
- #include <stdio.h>
diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc
deleted file mode 100644
index d0cc3b14e68b..000000000000
--- a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/ipc/chromium/src/base/file_util_linux.cc~
-+++ mozilla/ipc/chromium/src/base/file_util_linux.cc
-@@ -28,7 +28,7 @@ bool GetShmemTempDir(FilePath* path) {
- #ifdef ANDROID
- return GetTempDir(path);
- #else
-- *path = FilePath("/dev/shm");
-+ *path = FilePath("/tmp");
- return true;
- #endif
- }
diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_posix.cc b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_posix.cc
deleted file mode 100644
index 3c722016e77b..000000000000
--- a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_posix.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/ipc/chromium/src/base/file_util_posix.cc~
-+++ mozilla/ipc/chromium/src/base/file_util_posix.cc
-@@ -30,6 +30,8 @@
- #include "base/string_util.h"
- #include "base/time.h"
-
-+#define stat64 stat
-+
- namespace file_util {
-
- #if defined(GOOGLE_CHROME_BUILD)
diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_file_posix.cc b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_file_posix.cc
deleted file mode 100644
index 14e333ca339b..000000000000
--- a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_file_posix.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/ipc/chromium/src/base/platform_file_posix.cc~
-+++ mozilla/ipc/chromium/src/base/platform_file_posix.cc
-@@ -9,6 +9,7 @@
- #ifdef ANDROID
- #include <linux/stat.h>
- #endif
-+#include <sys/stat.h>
-
- #include "base/logging.h"
- #include "base/string_util.h"
diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_thread_posix.cc b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_thread_posix.cc
deleted file mode 100644
index 3445b281bc48..000000000000
--- a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_thread_posix.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2011-04-27 09:34:28.000000000 +0200
-+++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc 2011-04-27 19:47:36.344446266 +0200
-@@ -34,7 +33,8 @@
- #if defined(OS_MACOSX)
- return mach_thread_self();
- #elif defined(OS_LINUX)
-- return syscall(__NR_gettid);
-+ // TODO(BSD): find a better thread ID
-+ return reinterpret_cast<int64>(pthread_self());
- #endif
- }
-
diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h
deleted file mode 100644
index ca7b24fa4860..000000000000
--- a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h~
-+++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h
-@@ -34,7 +34,7 @@
- #include "base/third_party/nspr/prcpucfg_win.h"
- #elif defined(__APPLE__)
- #include "base/third_party/nspr/prcpucfg_mac.h"
--#elif defined(__linux__) || defined(ANDROID)
-+#elif defined(__FreeBSD__) || defined(ANDROID)
- #include "base/third_party/nspr/prcpucfg_linux.h"
- #else
- #error Provide a prcpucfg.h appropriate for your platform
diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-build-build_config.h b/mail/thunderbird-esr/files/patch-ipc-chromium-src-build-build_config.h
deleted file mode 100644
index e7540d38eceb..000000000000
--- a/mail/thunderbird-esr/files/patch-ipc-chromium-src-build-build_config.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/ipc/chromium/src/build/build_config.h~
-+++ mozilla/ipc/chromium/src/build/build_config.h
-@@ -17,7 +17,7 @@
- // A set of macros to use for platform detection.
- #if defined(__APPLE__)
- #define OS_MACOSX 1
--#elif defined(__linux__) || defined(ANDROID)
-+#elif defined(__FreeBSD__) || defined(ANDROID)
- #define OS_LINUX 1
- #elif defined(_WIN32)
- #define OS_WIN 1
diff --git a/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in b/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in
deleted file mode 100644
index 63f7b76052c3..000000000000
--- a/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100
-+++ ldap/sdks/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-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in b/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
deleted file mode 100644
index df2e10326632..000000000000
--- a/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200
-+++ ldap/sdks/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-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_autoconf.mk.in b/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in
deleted file mode 100644
index 2cd507fbf7a8..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in
+++ /dev/null
@@ -1,31 +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@
-@@ -275,7 +275,7 @@
- OS_CPPFLAGS = @CPPFLAGS@
- OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@
- OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@
--OS_LDFLAGS = @LDFLAGS@
-+OS_LDFLAGS = @LDFLAGS@ -lc
-
- OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
- OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
-
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 4ccc7bfe5017..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-configure.in
+++ /dev/null
@@ -1,86 +0,0 @@
---- mozilla/configure.in.orig 2010-11-04 21:05:18.000000000 +0100
-+++ mozilla/configure.in 2010-11-09 12:59:28.000000000 +0100
-@@ -1549,7 +1549,7 @@
- CPU_ARCH=sparc
- ;;
-
--x86_64 | ia64)
-+amd64 | x86_64 | ia64)
- CPU_ARCH="$OS_TEST"
- ;;
-
-@@ -1567,7 +1567,7 @@ dnl Set INTEL_ARCHITECTURE if we're comp
- dnl ===============================================================
- INTEL_ARCHITECTURE=
- case "$OS_TEST" in
-- x86_64|i?86)
-+ amd64|x86_64|i?86)
- INTEL_ARCHITECTURE=1
- esac
-
-@@ -3803,19 +3803,21 @@
- AC_CHECK_FUNCS(localtime_r strtok_r)
-
- dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt
--_SAVE_LDFLAGS=$LDFLAGS
--LDFLAGS="$LDFLAGS -lrt"
--AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt,
-+_SAVE_LIBS=$LIBS
-+AC_SEARCH_LIBS(clock_gettime, rt)
-+AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
- ac_cv_have_clock_monotonic,
- [AC_TRY_LINK([#include <time.h>],
- [ struct timespec ts;
- clock_gettime(CLOCK_MONOTONIC, &ts); ],
- ac_cv_have_clock_monotonic=yes,
- ac_cv_have_clock_monotonic=no)])
--LDFLAGS=$_SAVE_LDFLAGS
-+LIBS=$_SAVE_LIBS
- if test "$ac_cv_have_clock_monotonic" = "yes"; then
- HAVE_CLOCK_MONOTONIC=1
-- REALTIME_LIBS=-lrt
-+ if test "$ac_cv_search_clock_gettime" != "none required"; then
-+ REALTIME_LIBS=$ac_cv_search_clock_gettime
-+ fi
- AC_DEFINE(HAVE_CLOCK_MONOTONIC)
- AC_SUBST(HAVE_CLOCK_MONOTONIC)
- AC_SUBST(REALTIME_LIBS)
-@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
-
--if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
-+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
- ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
- ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
- fi
-@@ -6022,6 +6024,14 @@
- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
- VPX_X86_ASM=1
- ;;
-+ FreeBSD:i386)
-+ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
-+ VPX_X86_ASM=1
-+ ;;
-+ FreeBSD:amd64)
-+ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
-+ VPX_X86_ASM=1
-+ ;;
- SunOS:x86)
- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
- VPX_X86_ASM=1
-@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
- LIBJPEG_TURBO_X64_ASM=1
- ;;
-+ FreeBSD:i386)
-+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
-+ LIBJPEG_TURBO_X86_ASM=1
-+ ;;
-+ FreeBSD:amd64)
-+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
-+ LIBJPEG_TURBO_X64_ASM=1
-+ ;;
- SunOS:i?86)
- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
- LIBJPEG_TURBO_X86_ASM=1
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-gfx-qcms-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-Makefile.in
deleted file mode 100644
index bad2cf563256..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- mozilla/gfx/qcms/Makefile.in.orig 2010-11-25 20:10:32.000000000 +0100
-+++ mozilla/gfx/qcms/Makefile.in 2010-11-25 20:10:06.000000000 +0100
-@@ -44,6 +44,11 @@
- endif
- endif
- endif
-+ifeq ($(OS_TEST),amd64)
-+ CSRCS += transform-sse2.c transform-sse1.c
-+ SSE1_FLAGS=-msse
-+ SSE2_FLAGS=-msse2
-+endif
-
- FORCE_STATIC_LIB = 1
- # This library is used by other shared libs
diff --git a/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h b/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h
deleted file mode 100644
index 7a23c9dd3820..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100
-+++ mozilla/gfx/qcms/qcmstypes.h 2010-11-22 12:02:42.000000000 +0100
-@@ -25,7 +25,7 @@
- #ifdef __OS2__
- /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
- #include <stdlib.h>
--#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
-+#elif !defined(__intptr_t_defined) && !defined(_INTPTR_T_DECLARED)
- typedef PRUptrdiff uintptr_t;
- #endif
- #endif
diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in
deleted file mode 100644
index f203d1dce232..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- mozilla/js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200
-+++ mozilla/js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200
-@@ -416,7 +416,7 @@
- # END enclude sources for V8 dtoa
- #############################################
-
--ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
-+ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU)))
-
- VPATH += $(srcdir)/assembler \
- $(srcdir)/assembler/wtf \
-@@ -469,6 +469,9 @@
- else
- #CPPSRCS += only_on_x86.cpp
- endif
-+ifeq (amd64, $(TARGET_CPU))
-+#CPPSRCS += only_on_x86_64.cpp
-+endif
- endif
- ifeq (arm, $(TARGET_CPU))
- #CPPSRCS += only_on_arm.cpp
-@@ -793,7 +796,7 @@
- endif # WINNT
-
- ifeq ($(OS_ARCH),FreeBSD)
--EXTRA_LIBS += -pthread
-+EXTRA_LIBS += -pthread -lc
- endif
- ifeq ($(OS_ARCH),IRIX)
- ifdef USE_N32
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-config_config.mk b/mail/thunderbird-esr/files/patch-mozilla-js-src-config_config.mk
deleted file mode 100644
index c5b42ad3457c..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-js-src-config_config.mk
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla/js/src/config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200
-+++ mozilla/js/src/config/config.mk 2009-08-09 20:50:05.000000000 +0200
-@@ -506,6 +506,7 @@
- -I$(srcdir) \
- -I. \
- -I$(DIST)/include -I$(DIST)/include/nsprpub \
-+ -I%%LOCALBASE%%/include \
- $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
- $(OS_INCLUDES) \
- $(NULL)
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 6600b16b2f46..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in
+++ /dev/null
@@ -1,48 +0,0 @@
---- mozilla/js/src/configure.in.orig 2011-09-28 14:41:24.000000000 +0200
-+++ mozilla/js/src/configure.in 2011-10-01 16:02:43.000000000 +0200
-@@ -1533,7 +1533,7 @@
- CPU_ARCH=sparc
- ;;
-
--x86_64 | ia64)
-+amd64 | x86_64 | ia64)
- CPU_ARCH="$OS_TEST"
- ;;
-
-@@ -1555,7 +1555,7 @@
- dnl ===============================================================
- INTEL_ARCHITECTURE=
- case "$OS_TEST" in
-- x86_64|i?86)
-+ amd64|x86_64|i?86)
- INTEL_ARCHITECTURE=1
- esac
-
-@@ -2743,6 +2743,16 @@
- AC_DEFINE(JS_CPU_X86)
- AC_DEFINE(JS_NUNBOX32)
- ;;
-+amd64*-*)
-+ ENABLE_TRACEJIT=1
-+ NANOJIT_ARCH=X64
-+ ENABLE_METHODJIT=1
-+ ENABLE_MONOIC=1
-+ ENABLE_POLYIC=1
-+ ENABLE_POLYIC_TYPED_ARRAY=1
-+ AC_DEFINE(JS_CPU_X64)
-+ AC_DEFINE(JS_PUNBOX64)
-+ ;;
- x86_64*-*)
- ENABLE_TRACEJIT=1
- NANOJIT_ARCH=X64
-@@ -2827,6 +2837,10 @@
- i?86-*)
- AC_DEFINE(AVMPLUS_IA32)
- ;;
-+amd64*-*)
-+ AC_DEFINE(AVMPLUS_AMD64)
-+ AC_DEFINE(AVMPLUS_64BIT)
-+ ;;
- x86_64*-*)
- AC_DEFINE(AVMPLUS_AMD64)
- AC_DEFINE(AVMPLUS_64BIT)
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 6356b9f6e9d7..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-layout-generic-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- mozilla/layout/generic/Makefile.in.orig 2011-07-06 05:09:28.000000000 +0200
-+++ mozilla/layout/generic/Makefile.in 2011-07-06 21:49:25.105659269 +0200
-@@ -159,9 +159,10 @@
- -I$(srcdir)/../../content/html/content/src \
- -I$(srcdir)/../../dom/base \
- -I$(srcdir)/../../dom/plugins/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-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-media-libvpx-vpx_config.c b/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.c
deleted file mode 100644
index b97d147914fe..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- mozilla/media/libvpx/vpx_config_c.c~
-+++ mozilla/media/libvpx/vpx_config_c.c
-@@ -12,11 +12,11 @@
- /* 32 bit MacOS. */
- #include "vpx_config_x86-darwin9-gcc.c"
-
--#elif defined(__linux__) && defined(__i386__)
-+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__)
- /* 32 bit Linux. */
- #include "vpx_config_x86-linux-gcc.c"
-
--#elif defined(__linux__) && defined(__x86_64__)
-+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__)
- /* 64 bit Linux. */
- #include "vpx_config_x86_64-linux-gcc.c"
-
diff --git a/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.h b/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.h
deleted file mode 100644
index b4ba5cd8986a..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- mozilla/media/libvpx/vpx_config.h~
-+++ mozilla/media/libvpx/vpx_config.h
-@@ -12,11 +12,11 @@
- /* 32 bit MacOS. */
- #include "vpx_config_x86-darwin9-gcc.h"
-
--#elif defined(__linux__) && defined(__i386__)
-+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__)
- /* 32 bit Linux. */
- #include "vpx_config_x86-linux-gcc.h"
-
--#elif defined(__linux__) && defined(__x86_64__)
-+#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__)
- /* 64 bit Linux. */
- #include "vpx_config_x86_64-linux-gcc.h"
-
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 dc4e96c7c439..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk
+++ /dev/null
@@ -1,40 +0,0 @@
---- mozilla/security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000
-+++ mozilla/security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000
-@@ -49,8 +49,20 @@
- ifeq ($(CPU_ARCH),pc98)
- CPU_ARCH = x86
- endif
--ifeq ($(CPU_ARCH),amd64)
--CPU_ARCH = x86_64
-+ifeq ($(OS_TEST),alpha)
-+CPU_ARCH = alpha
-+endif
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH = amd64
-+endif
-+ifeq ($(OS_TEST),ia64)
-+CPU_ARCH = ia64
-+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 +90,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 +99,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-security_nss_lib_freebl_mpi_mpcpucache.c b/mail/thunderbird-esr/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c
deleted file mode 100644
index e79b29942155..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- mozilla/security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 23:13:08.000000000 +0100
-+++ mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 23:18:46.000000000 +0100
-@@ -733,6 +733,32 @@
- #endif
-
- #if defined(__ppc64__)
-+#if defined(__FreeBSD__)
-+#include <sys/stddef.h>
-+#include <sys/sysctl.h>
-+
-+#include <machine/cpu.h>
-+#include <machine/md_var.h>
-+
-+unsigned long
-+s_mpi_getProcessorLineSize()
-+{
-+ static int cacheline_size = 0;
-+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE };
-+ int clen;
-+
-+ if (cacheline_size > 0)
-+ return cacheline_size;
-+
-+ clen = sizeof(cacheline_size);
-+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]),
-+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size)
-+ return 128; /* guess */
-+
-+ return cacheline_size;
-+}
-+#else /* __FreeBSD__ */
-+
- /*
- * Sigh, The PPC has some really nice features to help us determine cache
- * size, since it had lots of direct control functions to do so. The POWER
-@@ -786,6 +812,7 @@
- return 0;
- }
-
-+#endif /* __FreeBSD__ */
- #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1
- #endif
-
diff --git a/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in
deleted file mode 100644
index f222b6dca9e9..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla/toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500
-+++ mozilla/toolkit/library/Makefile.in 2010-01-11 12:15:05.000000000 -0500
-@@ -181,7 +181,7 @@
- export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS)
- $(INSTALL) $^ .
-
--EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%%
-
- ifdef MOZ_ENABLE_LIBXUL
- include $(srcdir)/libxul-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 e896cec90613..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 2011-05-28 15:26:21.000000000 +0200
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-06-03 18:39:42.769434047 +0200
-@@ -74,6 +74,9 @@
- # NOTE: MODULE_OPTIMIZE_FLAGS must be set before including config.mk
- MODULE_OPTIMIZE_FLAGS=-O3
- endif
-+ifeq (x86_64,$(OS_TEST))
-+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+endif
- endif
- endif
-
-@@ -117,7 +120,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
-@@ -129,6 +132,12 @@
- ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64)
- 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
-+#
- #
- # Neutrino/Intel (uses the same unixish_x86 code)
- #
-@@ -184,9 +193,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
- #
-@@ -341,7 +356,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
-@@ -419,6 +434,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/patch-mozilla__content__base__public__nsContentUtils.h b/mail/thunderbird-esr/files/patch-mozilla__content__base__public__nsContentUtils.h
deleted file mode 100644
index 358d40c1f988..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla__content__base__public__nsContentUtils.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200
-+++ mozilla/content/base/public/nsContentUtils.h 2011-07-07 10:46:12.000000000 +0200
-@@ -54,7 +54,7 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
-+#if !defined(__amd64__) && !defined(__i386__)
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #else
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
diff --git a/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp b/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
deleted file mode 100644
index ff88de2ba2df..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla__xpcom__threads__nsThreadManager.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./mozilla/xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200
-+++ ./mozilla/xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200
-@@ -89,6 +89,11 @@
- nsresult
- nsThreadManager::Init()
- {
-+#ifdef NS_TLS && (__FreeBSD_version < 802513 \
-+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
-+ if (!gTLSThreadID)
-+ gTLSThreadID = mozilla::threads::Generic;
-+#endif
- if (!mThreadsByPRThread.Init())
- return NS_ERROR_OUT_OF_MEMORY;
-
diff --git a/mail/thunderbird-esr/files/patch-mozilla_toolkit_xre_glxtest.cpp b/mail/thunderbird-esr/files/patch-mozilla_toolkit_xre_glxtest.cpp
deleted file mode 100644
index f338b4bdedb5..000000000000
--- a/mail/thunderbird-esr/files/patch-mozilla_toolkit_xre_glxtest.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- mozilla/toolkit/xre/glxtest.cpp.orig 2011-08-19 18:57:10.604870746 +0300
-+++ mozilla/toolkit/xre/glxtest.cpp 2011-08-19 18:59:43.620447963 +0300
-@@ -51,6 +51,8 @@
- // which runs the glxtest() static function. This creates a X connection, a GLX context, calls glGetString, and writes that
- // to the 'write' end of the pipe.
-
-+#include <sys/types.h>
-+#include <sys/wait.h>
- #include <cstdio>
- #include <cstdlib>
- #include <unistd.h>
-@@ -224,6 +226,7 @@
- void fire_glxtest_process()
- {
- int pfd[2];
-+ int status;
- if (pipe(pfd) == -1) {
- perror("pipe");
- exit(EXIT_FAILURE);
-@@ -244,4 +247,5 @@
- close(pfd[1]);
- mozilla::widget::glxtest_pipe = pfd[0];
- mozilla::widget::glxtest_pid = pid;
-+ waitpid(pid, &status, 0);
- }
diff --git a/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.cfg b/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.cfg
deleted file mode 100644
index e98cce3e3d8f..000000000000
--- a/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.cfg
+++ /dev/null
@@ -1,100 +0,0 @@
---- mozilla/nsprpub/pr/include/md/_freebsd.cfg.orig 2010-12-23 17:34:06.000000000 +0100
-+++ mozilla/nsprpub/pr/include/md/_freebsd.cfg 2010-12-23 17:34:44.000000000 +0100
-@@ -283,6 +283,97 @@
- #define PR_ALIGN_OF_POINTER 8
- #define PR_ALIGN_OF_WORD 8
-
-+#elif defined(__powerpc64__)
-+
-+#undef IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 8
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 8
-+#define PR_BYTES_PER_DWORD 8
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 64
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 64
-+
-+#define PR_BITS_PER_BYTE_LOG2 3
-+#define PR_BITS_PER_SHORT_LOG2 4
-+#define PR_BITS_PER_INT_LOG2 5
-+#define PR_BITS_PER_INT64_LOG2 6
-+#define PR_BITS_PER_LONG_LOG2 6
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 6
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 8
-+#define PR_ALIGN_OF_INT64 8
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_DOUBLE 8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD 8
-+
-+#define PR_BYTES_PER_WORD_LOG2 3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#elif defined(__powerpc__)
-+
-+#undef IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 4
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 4
-+#define PR_BYTES_PER_DWORD 8
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 32
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 32
-+
-+#define PR_BITS_PER_BYTE_LOG2 3
-+#define PR_BITS_PER_SHORT_LOG2 4
-+#define PR_BITS_PER_INT_LOG2 5
-+#define PR_BITS_PER_INT64_LOG2 6
-+#define PR_BITS_PER_LONG_LOG2 5
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 5
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 4
-+#define PR_ALIGN_OF_INT64 8
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_DOUBLE 8
-+#define PR_ALIGN_OF_POINTER 4
-+#define PR_ALIGN_OF_WORD 4
-+
-+#define PR_BYTES_PER_WORD_LOG2 2
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
- #else
-
- #error "Unknown CPU architecture"
diff --git a/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.h b/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.h
deleted file mode 100644
index 2be831a3ec9c..000000000000
--- a/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.h
+++ /dev/null
@@ -1,30 +0,0 @@
---- mozilla/nsprpub/pr/include/md/_freebsd.h.orig 2010-12-23 17:34:13.000000000 +0100
-+++ mozilla/nsprpub/pr/include/md/_freebsd.h 2010-12-23 17:34:46.000000000 +0100
-@@ -57,6 +57,10 @@
- #define _PR_SI_ARCHITECTURE "ia64"
- #elif defined(__amd64__)
- #define _PR_SI_ARCHITECTURE "amd64"
-+#elif defined(__powerpc64__)
-+#define _PR_SI_ARCHITECTURE "powerpc64"
-+#elif defined(__powerpc__)
-+#define _PR_SI_ARCHITECTURE "powerpc"
- #else
- #error "Unknown CPU architecture"
- #endif
-@@ -106,6 +110,16 @@
- #define _PR_IPV6_V6ONLY_PROBE
- #endif
-
-+#if (__FreeBSD_version >= 700016) || (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103)
-+#if defined(_PR_PTHREADS)
-+#define _PR_HAVE_GETPROTO_R
-+#define _PR_HAVE_5_ARG_GETPROTO_R
-+#define _PR_HAVE_GETHOST_R
-+#define _PR_HAVE_GETHOST_R_INT
-+#define _PR_HAVE_THREADSAFE_GETHOST
-+#endif
-+#endif
-+
- #define USE_SETJMP
-
- #ifndef _PR_PTHREADS
diff --git a/mail/thunderbird-esr/files/thunderbird.desktop.in b/mail/thunderbird-esr/files/thunderbird.desktop.in
deleted file mode 100644
index 790a064ec01d..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=@MOZILLA@ %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/
diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile
index cbc10fff10e7..2af5203c662d 100644
--- a/mail/thunderbird-i18n/Makefile
+++ b/mail/thunderbird-i18n/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= thunderbird-i18n
-PORTVERSION= 8.0
+PORTVERSION= 9.0
CATEGORIES= mail
-MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/linux-i686/xpi
+MASTER_SITE_SUBDIR= thunderbird/nightly/${PORTVERSION}-candidates/build1//linux-i686/xpi
+#MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/linux-i686/xpi
PKGNAMEPREFIX=
DISTFILES= ${THUNDERBIRD_I18N_:S/$/.xpi/}
DIST_SUBDIR= xpi/${DISTNAME}
@@ -23,7 +24,7 @@ RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-swit
.endif
NO_BUILD= yes
-USE_THUNDERBIRD= 80
+USE_THUNDERBIRD= 90
USE_XPI= thunderbird linux-thunderbird
THUNDERBIRD_I18N_ALL= ar br ca cs da de en-GB en-US es-AR es-ES et eu fi fr \
diff --git a/mail/thunderbird-i18n/distinfo b/mail/thunderbird-i18n/distinfo
index 59d687838d7a..5a9ca8162a27 100644
--- a/mail/thunderbird-i18n/distinfo
+++ b/mail/thunderbird-i18n/distinfo
@@ -1,84 +1,84 @@
-SHA256 (xpi/thunderbird-i18n-8.0/ar.xpi) = ac50815d26c950b51a930239facf46c1225f8c052dc7610106fa74573b187b96
-SIZE (xpi/thunderbird-i18n-8.0/ar.xpi) = 429682
-SHA256 (xpi/thunderbird-i18n-8.0/br.xpi) = bfe0a405db47e62cf4f2037f10592f37e6f4804ff141c98f03a708c8b76886c9
-SIZE (xpi/thunderbird-i18n-8.0/br.xpi) = 407854
-SHA256 (xpi/thunderbird-i18n-8.0/ca.xpi) = f9cbd66875016bf18e84d0ffcae1b394d020c6166f1626b95cdb04ea431c20b8
-SIZE (xpi/thunderbird-i18n-8.0/ca.xpi) = 407844
-SHA256 (xpi/thunderbird-i18n-8.0/cs.xpi) = 1fd879a3802d455a10db9b94c74449663920b6dd9e7dec487c9a782898fc4c6e
-SIZE (xpi/thunderbird-i18n-8.0/cs.xpi) = 410932
-SHA256 (xpi/thunderbird-i18n-8.0/da.xpi) = db28f6e245304488923e153e5e692b3ade8d736bc42c2fd8c1af065c973370ef
-SIZE (xpi/thunderbird-i18n-8.0/da.xpi) = 353524
-SHA256 (xpi/thunderbird-i18n-8.0/de.xpi) = d8047dafbcf85f520ec268c633e0a704bd276b0e46d972302d54356f558883f2
-SIZE (xpi/thunderbird-i18n-8.0/de.xpi) = 409617
-SHA256 (xpi/thunderbird-i18n-8.0/en-GB.xpi) = 77a53b255f1a526166415eb2c7398a6d7a07a23f46d2737714bfbded8972bb8f
-SIZE (xpi/thunderbird-i18n-8.0/en-GB.xpi) = 384202
-SHA256 (xpi/thunderbird-i18n-8.0/en-US.xpi) = a594e5ed42cf96ab7f3523e6ee929ab48d61e254affdc0c69191e3fda375e831
-SIZE (xpi/thunderbird-i18n-8.0/en-US.xpi) = 383791
-SHA256 (xpi/thunderbird-i18n-8.0/es-AR.xpi) = 3d23032bc87e257a749ce7a877897ee4e05c64930ebec9e743eec07c52ac26dc
-SIZE (xpi/thunderbird-i18n-8.0/es-AR.xpi) = 402208
-SHA256 (xpi/thunderbird-i18n-8.0/es-ES.xpi) = 9e4d21fa3b1387977ae4a6bf69395b48de8560e0330ee964c210a06fbf0c0327
-SIZE (xpi/thunderbird-i18n-8.0/es-ES.xpi) = 345966
-SHA256 (xpi/thunderbird-i18n-8.0/et.xpi) = 7e866bb4f163e8aac567266414e20877bb9c6d0525d6621d717cdef1a9715ed2
-SIZE (xpi/thunderbird-i18n-8.0/et.xpi) = 402614
-SHA256 (xpi/thunderbird-i18n-8.0/eu.xpi) = af1a9e5cd29befc818ab5b93ce3b5058766f80fe0feeaedd261a702e56d1853c
-SIZE (xpi/thunderbird-i18n-8.0/eu.xpi) = 398556
-SHA256 (xpi/thunderbird-i18n-8.0/fi.xpi) = e2c94b11072377e3ce6758a6f3b607e03fa7a0073e167b31ee097e0363b6c50c
-SIZE (xpi/thunderbird-i18n-8.0/fi.xpi) = 403666
-SHA256 (xpi/thunderbird-i18n-8.0/fr.xpi) = 5384e5e75061ab504ea3f6284d9f6232826f596d6785c392e795dbf27a2139b2
-SIZE (xpi/thunderbird-i18n-8.0/fr.xpi) = 406258
-SHA256 (xpi/thunderbird-i18n-8.0/fy-NL.xpi) = fbf0e7e59f36aa2770ddc129b0da453c5ccec1fc26ab08c1d37bb2ea1baec890
-SIZE (xpi/thunderbird-i18n-8.0/fy-NL.xpi) = 406182
-SHA256 (xpi/thunderbird-i18n-8.0/ga-IE.xpi) = 6f193c7ab8d86e01bd305cb480ce4d1d3c40952b29d451ad53a87f7d25c399db
-SIZE (xpi/thunderbird-i18n-8.0/ga-IE.xpi) = 414791
-SHA256 (xpi/thunderbird-i18n-8.0/gd.xpi) = a79cd6a967aa6023953e1b24cf784e5600b05bd77f081c11fa1ab53c145f19e8
-SIZE (xpi/thunderbird-i18n-8.0/gd.xpi) = 417258
-SHA256 (xpi/thunderbird-i18n-8.0/gl.xpi) = bd164a1c8b5a1fa7514323a6fad15f43765c42886ab46cd0995edf29e19ec25e
-SIZE (xpi/thunderbird-i18n-8.0/gl.xpi) = 401200
-SHA256 (xpi/thunderbird-i18n-8.0/he.xpi) = 15049fbc3a1d41d4c69013ab18679994e6530a65c47051388dd51ec605e82562
-SIZE (xpi/thunderbird-i18n-8.0/he.xpi) = 429157
-SHA256 (xpi/thunderbird-i18n-8.0/hu.xpi) = 2ba9485a7d3ed1fc7962f5776ab02856a7b6c847345b03fd54c6bb80e10a8e08
-SIZE (xpi/thunderbird-i18n-8.0/hu.xpi) = 418308
-SHA256 (xpi/thunderbird-i18n-8.0/is.xpi) = 60110ee7c61ccfeca0560a49eacb50423f73f183a964f58b74ae37d8e564443c
-SIZE (xpi/thunderbird-i18n-8.0/is.xpi) = 404491
-SHA256 (xpi/thunderbird-i18n-8.0/it.xpi) = 61c243264edee5bb95bc947b0732401f189b184863d2640128e00a19fac426b2
-SIZE (xpi/thunderbird-i18n-8.0/it.xpi) = 338611
-SHA256 (xpi/thunderbird-i18n-8.0/ja.xpi) = 1ffc9c291893601172be91f50b25b651c18ea008def94b858a12147872da2ce9
-SIZE (xpi/thunderbird-i18n-8.0/ja.xpi) = 450381
-SHA256 (xpi/thunderbird-i18n-8.0/ko.xpi) = b7063cad1f6ebe4c21dce881eb748a88aa906d23f248593d9bb53ba14381efba
-SIZE (xpi/thunderbird-i18n-8.0/ko.xpi) = 362650
-SHA256 (xpi/thunderbird-i18n-8.0/lt.xpi) = fcd2c44bdebe7866f087b088ce5103366e2241bc341cc24b771684bc1d06d253
-SIZE (xpi/thunderbird-i18n-8.0/lt.xpi) = 527185
-SHA256 (xpi/thunderbird-i18n-8.0/nb-NO.xpi) = 83b800ea6ddcf098f309a8e71f3de741973d0177c145be9b8bf896d23df5204d
-SIZE (xpi/thunderbird-i18n-8.0/nb-NO.xpi) = 399860
-SHA256 (xpi/thunderbird-i18n-8.0/nl.xpi) = bce99a6e95ae72bf6040d38c7fdfc5cd222b3362dd97e79e5af90f2e752adfcf
-SIZE (xpi/thunderbird-i18n-8.0/nl.xpi) = 399870
-SHA256 (xpi/thunderbird-i18n-8.0/nn-NO.xpi) = 7e93e1e0ed7c6e942c6858b4e003be1e9a7180822a251436cc8349be1784d5f9
-SIZE (xpi/thunderbird-i18n-8.0/nn-NO.xpi) = 401462
-SHA256 (xpi/thunderbird-i18n-8.0/pl.xpi) = 040b62774df7f1e66b8af5d42031ac3bcd148c3646ee7815504aa2cc89322c4a
-SIZE (xpi/thunderbird-i18n-8.0/pl.xpi) = 386210
-SHA256 (xpi/thunderbird-i18n-8.0/pt-BR.xpi) = 669f7ad7db9b02e8dd9e41be42cac56ff9a2826c971f656d17f0fee0a22bc397
-SIZE (xpi/thunderbird-i18n-8.0/pt-BR.xpi) = 408964
-SHA256 (xpi/thunderbird-i18n-8.0/pt-PT.xpi) = b2ff74fa2f888b8e29ae158d55ded0ce7660498460930ff0697f17e6e481a91f
-SIZE (xpi/thunderbird-i18n-8.0/pt-PT.xpi) = 405968
-SHA256 (xpi/thunderbird-i18n-8.0/rm.xpi) = 0110cfd35cd8354930ba5511ccde62539e75e69d31f4d428a20bd8aa113cfaef
-SIZE (xpi/thunderbird-i18n-8.0/rm.xpi) = 406577
-SHA256 (xpi/thunderbird-i18n-8.0/ru.xpi) = a412dd6f6763972727007d76f837b5f1d8dd32ec35afc9490a3722437330dee6
-SIZE (xpi/thunderbird-i18n-8.0/ru.xpi) = 400687
-SHA256 (xpi/thunderbird-i18n-8.0/si.xpi) = fce2b953375d5b6fcf58d94bc4b676ae843103b5899fd3f5af5c5f7275e75631
-SIZE (xpi/thunderbird-i18n-8.0/si.xpi) = 448334
-SHA256 (xpi/thunderbird-i18n-8.0/sk.xpi) = e09edb3471eb06d3e21d85cbf2b889ccb041680150b28f43db2f46ae21ba6dff
-SIZE (xpi/thunderbird-i18n-8.0/sk.xpi) = 416338
-SHA256 (xpi/thunderbird-i18n-8.0/sl.xpi) = 91c6151d3c9c74ff937539c2c59a4f04f381403d72e43402a9466fffbdda5a71
-SIZE (xpi/thunderbird-i18n-8.0/sl.xpi) = 402625
-SHA256 (xpi/thunderbird-i18n-8.0/sq.xpi) = f14b7ca5d4049ee6218fd6377759bd6cfc32d37d180204510737ad4814c56893
-SIZE (xpi/thunderbird-i18n-8.0/sq.xpi) = 351703
-SHA256 (xpi/thunderbird-i18n-8.0/sv-SE.xpi) = c7cc27527961c0435fa8bb1563fe04edee234188b0abe001e10159c48bda8a2b
-SIZE (xpi/thunderbird-i18n-8.0/sv-SE.xpi) = 470499
-SHA256 (xpi/thunderbird-i18n-8.0/ta-LK.xpi) = a49d999804b2925dc87b5fd990cbd373489b007bfd67a862ca1f775eb5448c04
-SIZE (xpi/thunderbird-i18n-8.0/ta-LK.xpi) = 466437
-SHA256 (xpi/thunderbird-i18n-8.0/tr.xpi) = 984f7bcae3a51a3dcbe83b2098037c43fe929d14713f8b0818c362122f507a2d
-SIZE (xpi/thunderbird-i18n-8.0/tr.xpi) = 405974
-SHA256 (xpi/thunderbird-i18n-8.0/uk.xpi) = cdf663bdc0f85857cd41ead2c058abf01f6542089da94ada9f5a2bcf95214dbe
-SIZE (xpi/thunderbird-i18n-8.0/uk.xpi) = 456674
-SHA256 (xpi/thunderbird-i18n-8.0/zh-TW.xpi) = a6c78df16a242b1731709fdacae8fcfde630fe10469abfd6a696b46076e9059a
-SIZE (xpi/thunderbird-i18n-8.0/zh-TW.xpi) = 423019
+SHA256 (xpi/thunderbird-i18n-9.0/ar.xpi) = b88dc90335f47cce9bd3b3d7f0cc1761750b0da69a7cf6878380e03c06e34267
+SIZE (xpi/thunderbird-i18n-9.0/ar.xpi) = 434061
+SHA256 (xpi/thunderbird-i18n-9.0/br.xpi) = bdad71ec53c45773380c92cea543c75360b3f12c85fd154a78f3adb4d5a65c37
+SIZE (xpi/thunderbird-i18n-9.0/br.xpi) = 411787
+SHA256 (xpi/thunderbird-i18n-9.0/ca.xpi) = 7633e8e0ff6956930dd73595eb6d03506807b805140e53d0dc2293fb060b837b
+SIZE (xpi/thunderbird-i18n-9.0/ca.xpi) = 411848
+SHA256 (xpi/thunderbird-i18n-9.0/cs.xpi) = f410a259b5a4ba20e0cb9c486e02aeb4d2ad0e10f3243e5bd2e3db6e2c93d357
+SIZE (xpi/thunderbird-i18n-9.0/cs.xpi) = 415080
+SHA256 (xpi/thunderbird-i18n-9.0/da.xpi) = 2096a2eca235b306854cc3fc2ba278691aba287561b884dbf2a1deb1fa82495a
+SIZE (xpi/thunderbird-i18n-9.0/da.xpi) = 359198
+SHA256 (xpi/thunderbird-i18n-9.0/de.xpi) = c04c06ae7fc96ccc40eb46863a4b056d4cad0ac7cfb06abbdc52390caa33ff90
+SIZE (xpi/thunderbird-i18n-9.0/de.xpi) = 413690
+SHA256 (xpi/thunderbird-i18n-9.0/en-GB.xpi) = 033ad3a9e018894df8e1c46ddf0244b279eb515125c5c2143d9aaf04f8fe5a8c
+SIZE (xpi/thunderbird-i18n-9.0/en-GB.xpi) = 388497
+SHA256 (xpi/thunderbird-i18n-9.0/en-US.xpi) = 60d31195134043c416965cd0d18948f91573df91bc2dc6092e24582bee6983bc
+SIZE (xpi/thunderbird-i18n-9.0/en-US.xpi) = 387317
+SHA256 (xpi/thunderbird-i18n-9.0/es-AR.xpi) = dade5c5c3ac97416c047c26a369101994c9668d1bc075ad4c83045e72c1bc0a9
+SIZE (xpi/thunderbird-i18n-9.0/es-AR.xpi) = 406257
+SHA256 (xpi/thunderbird-i18n-9.0/es-ES.xpi) = 05b0247b8fd1b0a78a52b8214b9319c167a3c51188af64441ac176de9e9cf7ac
+SIZE (xpi/thunderbird-i18n-9.0/es-ES.xpi) = 350318
+SHA256 (xpi/thunderbird-i18n-9.0/et.xpi) = 0c99e009320ae82b817b4e60e85200d89e133cd02b6f45f397be3174ca90ef22
+SIZE (xpi/thunderbird-i18n-9.0/et.xpi) = 406523
+SHA256 (xpi/thunderbird-i18n-9.0/eu.xpi) = 002a419b322c809201b02491060f431799f5e1225ebaa3542880caa21994c8ad
+SIZE (xpi/thunderbird-i18n-9.0/eu.xpi) = 402325
+SHA256 (xpi/thunderbird-i18n-9.0/fi.xpi) = 745dc02ce7a90eece0cc73279663a5de219a453a4bfe3e591e6562291d65f392
+SIZE (xpi/thunderbird-i18n-9.0/fi.xpi) = 407656
+SHA256 (xpi/thunderbird-i18n-9.0/fr.xpi) = 968b5fcd19b34905fb30706999518421b5f33369bb552c589be8a9babf4cacc0
+SIZE (xpi/thunderbird-i18n-9.0/fr.xpi) = 410408
+SHA256 (xpi/thunderbird-i18n-9.0/fy-NL.xpi) = 210140b24b3d10d4e3f9d162c831cf65cf63d67a9dbbad91a3985654e5f99a37
+SIZE (xpi/thunderbird-i18n-9.0/fy-NL.xpi) = 410230
+SHA256 (xpi/thunderbird-i18n-9.0/ga-IE.xpi) = 59282df27abd893433584ebdb6f447e57836150ef2de0d34e59b1e92eeef7622
+SIZE (xpi/thunderbird-i18n-9.0/ga-IE.xpi) = 418964
+SHA256 (xpi/thunderbird-i18n-9.0/gd.xpi) = 84d2aebe83a16508f894e942d4f9d730ec84abff3ed632efacf1eb78a31191de
+SIZE (xpi/thunderbird-i18n-9.0/gd.xpi) = 421640
+SHA256 (xpi/thunderbird-i18n-9.0/gl.xpi) = bf638128b5e84f19b7cf08faf71dc4aab0863c4aafce2345b68667873cdb3626
+SIZE (xpi/thunderbird-i18n-9.0/gl.xpi) = 405083
+SHA256 (xpi/thunderbird-i18n-9.0/he.xpi) = 1d00f60ca78a370a41cacb4c8222e2a760442ecd815dc0bbd35fe70cfe84008f
+SIZE (xpi/thunderbird-i18n-9.0/he.xpi) = 433194
+SHA256 (xpi/thunderbird-i18n-9.0/hu.xpi) = bd740d15cceab282ee85313755b697baa85e5b3b42f0e40423b999a96b34f8b9
+SIZE (xpi/thunderbird-i18n-9.0/hu.xpi) = 422491
+SHA256 (xpi/thunderbird-i18n-9.0/is.xpi) = b9d45c9af9e3e50c2c1737c9683c57d739e13b8d7aabe993649348271799a20c
+SIZE (xpi/thunderbird-i18n-9.0/is.xpi) = 408517
+SHA256 (xpi/thunderbird-i18n-9.0/it.xpi) = 45a7dc02055a56b78af0adfd1b19cbed262e559e7c507d86de2d2f611c2611d3
+SIZE (xpi/thunderbird-i18n-9.0/it.xpi) = 342810
+SHA256 (xpi/thunderbird-i18n-9.0/ja.xpi) = 550923b532e889081137e3fbcbf179411a168269d60c6f0aee986ed3a8116f6d
+SIZE (xpi/thunderbird-i18n-9.0/ja.xpi) = 454770
+SHA256 (xpi/thunderbird-i18n-9.0/ko.xpi) = f2fb256aa6c3b0bdfd7dc05187fcc82d0614ec6c085b687fa3923cc30556a68a
+SIZE (xpi/thunderbird-i18n-9.0/ko.xpi) = 367944
+SHA256 (xpi/thunderbird-i18n-9.0/lt.xpi) = 87b7bec85cbccc1549415a0b6f2798fd44fd472336a73e43cf286ff0d17261fa
+SIZE (xpi/thunderbird-i18n-9.0/lt.xpi) = 532804
+SHA256 (xpi/thunderbird-i18n-9.0/nb-NO.xpi) = 7193f869c533494a84e35b637e90a9cd93114d2d35d76930d1e3d30aac37bbbc
+SIZE (xpi/thunderbird-i18n-9.0/nb-NO.xpi) = 403653
+SHA256 (xpi/thunderbird-i18n-9.0/nl.xpi) = 7fa31270bfef12329c7239a3767df17b01b76b131d2f613ebe2c823089628095
+SIZE (xpi/thunderbird-i18n-9.0/nl.xpi) = 403894
+SHA256 (xpi/thunderbird-i18n-9.0/nn-NO.xpi) = 99b166daad6c1369461b73b1aab60ebc4f599a1ddc0e4b6e806cea60dc542a72
+SIZE (xpi/thunderbird-i18n-9.0/nn-NO.xpi) = 405231
+SHA256 (xpi/thunderbird-i18n-9.0/pl.xpi) = 6ea7602e2f96a73859562e4a460bcf5fe424a693a10086294423e7d964668c34
+SIZE (xpi/thunderbird-i18n-9.0/pl.xpi) = 390106
+SHA256 (xpi/thunderbird-i18n-9.0/pt-BR.xpi) = ad8de025a4eda498453b50bee461ac97467124d91cd8f59a2487791a93d88096
+SIZE (xpi/thunderbird-i18n-9.0/pt-BR.xpi) = 412877
+SHA256 (xpi/thunderbird-i18n-9.0/pt-PT.xpi) = b86c188792870f6cb6c0ed8715353d98865178aef3fb04870e4717d2b19a47b4
+SIZE (xpi/thunderbird-i18n-9.0/pt-PT.xpi) = 409931
+SHA256 (xpi/thunderbird-i18n-9.0/rm.xpi) = fbe1c3a58c99bb3f5f532345a0581f1ac79525a05f3039e2a12aa91843da17b3
+SIZE (xpi/thunderbird-i18n-9.0/rm.xpi) = 410499
+SHA256 (xpi/thunderbird-i18n-9.0/ru.xpi) = 82843d85bcb3dd9796978c5d315111143a0f58d94af1a5aa125e2bb40026ae70
+SIZE (xpi/thunderbird-i18n-9.0/ru.xpi) = 406089
+SHA256 (xpi/thunderbird-i18n-9.0/si.xpi) = 4f91f8e163758d342757c11824d5dc28079715ea8098246d43d6abc85ad325d3
+SIZE (xpi/thunderbird-i18n-9.0/si.xpi) = 451806
+SHA256 (xpi/thunderbird-i18n-9.0/sk.xpi) = ea556ff8267676cf2c63ab8507987d9caa108664d62e6a453610bb4bfda35c30
+SIZE (xpi/thunderbird-i18n-9.0/sk.xpi) = 420587
+SHA256 (xpi/thunderbird-i18n-9.0/sl.xpi) = 1d611725706d6a7a6d7ea23d6ff1c42818d24f76779a54266fb1d8b7d4404950
+SIZE (xpi/thunderbird-i18n-9.0/sl.xpi) = 406469
+SHA256 (xpi/thunderbird-i18n-9.0/sq.xpi) = 8345fe9195247fe172385f238d852e4ce7b1a3c6e8b91410ef017f295d41c685
+SIZE (xpi/thunderbird-i18n-9.0/sq.xpi) = 355950
+SHA256 (xpi/thunderbird-i18n-9.0/sv-SE.xpi) = e77b9c3e9d18c8d3ba061e422ddb8866f1a585a29c697b0ce5c2bef5e07a314f
+SIZE (xpi/thunderbird-i18n-9.0/sv-SE.xpi) = 474265
+SHA256 (xpi/thunderbird-i18n-9.0/ta-LK.xpi) = 55c243d2d4d156e6dfb9156d877bc808536adea0d04b8bdba549bb3dda947384
+SIZE (xpi/thunderbird-i18n-9.0/ta-LK.xpi) = 469046
+SHA256 (xpi/thunderbird-i18n-9.0/tr.xpi) = 5fb4d782f5b262ddc56aacaf244794856422ef51cc43d31dc6d83e488df971bf
+SIZE (xpi/thunderbird-i18n-9.0/tr.xpi) = 411360
+SHA256 (xpi/thunderbird-i18n-9.0/uk.xpi) = e2fa6cc548f9f1ee89591cfcf9f654fa2b7b3714e3124657ab4ac04dfcbd31b5
+SIZE (xpi/thunderbird-i18n-9.0/uk.xpi) = 460380
+SHA256 (xpi/thunderbird-i18n-9.0/zh-TW.xpi) = 656a8989885d80c083b991c1d500f464606d03bf4749f4ee42babc8072aeba13
+SIZE (xpi/thunderbird-i18n-9.0/zh-TW.xpi) = 427199
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 666fcc22a6a0..987f409a4688 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= thunderbird
-DISTVERSION= 8.0
+DISTVERSION= 9.0
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 39f5d2ac7dd1..6aeac63722d0 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-8.0.source.tar.bz2) = f728bd2dbc04e6c3a096d79a9ee320740f53794a28be307da8655c8fd90f77f5
-SIZE (thunderbird-8.0.source.tar.bz2) = 89435206
+SHA256 (thunderbird-9.0.source.tar.bz2) = 6f6c40b1c1e3c3cbf3de4dbd9465a5383b0596cb9a97ba8eee7daaade52aa40c
+SIZE (thunderbird-9.0.source.tar.bz2) = 96194907
diff --git a/mail/thunderbird/files/patch-configure.in b/mail/thunderbird/files/patch-configure.in
index 56c07e868572..4e91d33a273a 100644
--- a/mail/thunderbird/files/patch-configure.in
+++ b/mail/thunderbird/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig 2011-07-15 07:42:33.000000000 +0200
-+++ configure.in 2011-07-22 13:43:44.000000000 +0200
-@@ -1438,7 +1438,7 @@
+--- configure.in.orig 2011-12-19 14:48:06.000000000 +0100
++++ configure.in 2011-12-19 15:51:19.000000000 +0100
+@@ -1410,7 +1410,7 @@
CPU_ARCH=sparc
;;
@@ -9,7 +9,7 @@
CPU_ARCH="$OS_TEST"
;;
-@@ -1458,7 +1458,7 @@
+@@ -1430,7 +1430,7 @@
dnl ===============================================================
INTEL_ARCHITECTURE=
case "$OS_TEST" in
@@ -18,7 +18,7 @@
INTEL_ARCHITECTURE=1
esac
-@@ -1781,7 +1781,7 @@
+@@ -1753,7 +1753,7 @@
esac
case "${host_cpu}" in
@@ -27,7 +27,7 @@
HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_"
;;
esac
-@@ -2437,6 +2437,9 @@
+@@ -2415,6 +2415,9 @@
x86_64-*)
AC_DEFINE(_AMD64_)
;;
@@ -37,7 +37,7 @@
*)
AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
;;
-@@ -2508,7 +2511,7 @@
+@@ -2486,7 +2489,7 @@
else
DLL_SUFFIX=".so.1.0"
fi
@@ -46,7 +46,7 @@
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
-@@ -3326,11 +3329,11 @@
+@@ -3304,11 +3307,11 @@
;;
*)
MOZ_CHECK_PTHREADS(pthreads,
@@ -61,7 +61,7 @@
MOZ_CHECK_PTHREADS(c,
USE_PTHREADS=1
)
-@@ -3405,18 +3408,18 @@
+@@ -3383,18 +3386,18 @@
*-*-freebsd*)
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
@@ -83,7 +83,7 @@
if test "$ac_cv_have_dash_pthread" = "yes"; then
_PTHREAD_LDFLAGS="-pthread"
fi
-@@ -3591,7 +3594,7 @@
+@@ -3569,7 +3572,7 @@
ac_cv_func_iconv,
[AC_TRY_LINK([
#include <stdlib.h>
@@ -92,7 +92,7 @@
],
[
iconv_t h = iconv_open("", "");
-@@ -3612,7 +3615,7 @@
+@@ -3590,7 +3593,7 @@
ac_cv_func_const_iconv,
[AC_TRY_COMPILE([
#include <stdlib.h>
@@ -101,7 +101,7 @@
],
[
const char *input = "testing";
-@@ -4409,7 +4412,7 @@
+@@ -4383,7 +4386,7 @@
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
@@ -110,12 +110,3 @@
ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
fi
-@@ -5966,7 +5969,7 @@
- i*86)
- MOZ_CRT_CPU_ARCH=intel
- ;;
-- x86_64)
-+ amd64 | x86_64)
- MOZ_CRT_CPU_ARCH=amd64
- ;;
- *)
diff --git a/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util.h b/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util.h
deleted file mode 100644
index 81a4693140a8..000000000000
--- a/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- mozilla/ipc/chromium/src/base/file_util.h~
-+++ mozilla/ipc/chromium/src/base/file_util.h
-@@ -15,8 +15,9 @@
- #elif defined(ANDROID)
- #include <sys/stat.h>
- #elif defined(OS_POSIX)
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <fts.h>
--#include <sys/stat.h>
- #endif
-
- #include <stdio.h>
diff --git a/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-dir_reader_linux.h b/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-dir_reader_linux.h
new file mode 100644
index 000000000000..5c4e5b79f3d1
--- /dev/null
+++ b/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-dir_reader_linux.h
@@ -0,0 +1,45 @@
+--- mozilla/ipc/chromium/src/base/dir_reader_linux.h.orig 2011-12-16 21:29:22.000000000 +0100
++++ mozilla/ipc/chromium/src/base/dir_reader_linux.h 2011-12-19 21:00:27.000000000 +0100
+@@ -9,6 +9,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stdint.h>
++#include <sys/dirent.h>
+ #include <sys/syscall.h>
+ #include <unistd.h>
+
+@@ -19,6 +20,8 @@
+
+ namespace base {
+
++#define linux_dirent struct dirent
++#if 0
+ struct linux_dirent {
+ uint64_t d_ino;
+ int64_t d_off;
+@@ -26,11 +29,16 @@
+ unsigned char d_type;
+ char d_name[0];
+ };
++#endif
+
+ class DirReaderLinux {
+ public:
+ explicit DirReaderLinux(const char* directory_path)
++#ifdef O_DIRECTORY
+ : fd_(open(directory_path, O_RDONLY | O_DIRECTORY)),
++#else
++ : fd_(open(directory_path, O_RDONLY)),
++#endif
+ offset_(0),
+ size_(0) {
+ memset(buf_, 0, sizeof(buf_));
+@@ -57,7 +65,7 @@
+ if (offset_ != size_)
+ return true;
+
+- const int r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_));
++ const int r = syscall(SYS_getdents, fd_, buf_, sizeof(buf_));
+ if (r == 0)
+ return false;
+ if (r == -1) {