summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--mail/assp/files/510.assp.in44
-rw-r--r--mail/cyrus-imapd24/Makefile247
-rw-r--r--mail/cyrus-imapd24/distinfo3
-rw-r--r--mail/cyrus-imapd24/files/extra-patch-cmulocal::ucdsnmp.m427
-rw-r--r--mail/cyrus-imapd24/files/extra-patch-configure.in13
-rw-r--r--mail/cyrus-imapd24/files/imapd.conf418
-rw-r--r--mail/cyrus-imapd24/files/imapd.sh.in42
-rw-r--r--mail/cyrus-imapd24/files/patch-Makefile.in25
-rw-r--r--mail/cyrus-imapd24/files/patch-configure48
-rw-r--r--mail/cyrus-imapd24/files/patch-imap::Makefile.in33
-rw-r--r--mail/cyrus-imapd24/files/patch-imtest::imtest.c15
-rw-r--r--mail/cyrus-imapd24/files/patch-lib::Makefile.in13
-rw-r--r--mail/cyrus-imapd24/files/patch-lib::imapoptions22
-rw-r--r--mail/cyrus-imapd24/files/patch-lib::libcyr_cfg.c13
-rw-r--r--mail/cyrus-imapd24/files/patch-man::Makefile.in21
-rw-r--r--mail/cyrus-imapd24/files/patch-master::Makefile.in26
-rw-r--r--mail/cyrus-imapd24/files/patch-notifyd::Makefile.in13
-rw-r--r--mail/cyrus-imapd24/files/patch-perl::imap::Makefile.PL15
-rw-r--r--mail/cyrus-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL15
-rw-r--r--mail/cyrus-imapd24/files/patch-sieve::Makefile.in23
-rw-r--r--mail/cyrus-imapd24/files/patch-timsieved::Makefile.in13
-rw-r--r--mail/cyrus-imapd24/files/patch-tools::mkimap38
-rw-r--r--mail/cyrus-imapd24/pkg-deinstall60
-rw-r--r--mail/cyrus-imapd24/pkg-descr21
-rw-r--r--mail/cyrus-imapd24/pkg-install61
-rw-r--r--mail/cyrus-imapd24/pkg-message8
-rw-r--r--mail/cyrus-imapd24/pkg-plist115
-rw-r--r--mail/dbmail22/Makefile141
-rw-r--r--mail/dbmail22/distinfo3
-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.in17
-rw-r--r--mail/dbmail22/pkg-descr24
-rw-r--r--mail/dbmail22/pkg-plist61
-rw-r--r--mail/horde4-imp/Makefile117
-rw-r--r--mail/horde4-imp/distinfo3
-rw-r--r--mail/horde4-imp/files/patch-ab28
-rw-r--r--mail/horde4-imp/files/patch-ac11
-rw-r--r--mail/horde4-imp/files/patch-config::conf.xml29
-rw-r--r--mail/horde4-imp/files/pkg-message.in22
-rw-r--r--mail/horde4-imp/pkg-descr4
-rw-r--r--mail/horde4-imp/pkg-plist736
-rw-r--r--mail/horde4-ingo/Makefile33
-rw-r--r--mail/horde4-ingo/distinfo3
-rw-r--r--mail/horde4-ingo/files/patch-lib_Script_procmail.php21
-rw-r--r--mail/horde4-ingo/pkg-descr7
-rw-r--r--mail/horde4-ingo/pkg-plist264
-rw-r--r--mail/horde4-turba/Makefile27
-rw-r--r--mail/horde4-turba/distinfo3
-rw-r--r--mail/horde4-turba/files/patch-config::sources.php.dist210
-rw-r--r--mail/horde4-turba/files/pkg-message.in21
-rw-r--r--mail/horde4-turba/pkg-descr10
-rw-r--r--mail/horde4-turba/pkg-plist370
-rw-r--r--mail/milter-greylist/files/milter-greylist.in34
-rw-r--r--mail/milter-greylist/files/pkg-message.in20
-rw-r--r--mail/mutt14/Makefile213
-rw-r--r--mail/mutt14/distinfo9
-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/postfix25/Makefile306
-rw-r--r--mail/postfix25/distinfo6
-rw-r--r--mail/postfix25/files/patch-conf::main.cf80
-rw-r--r--mail/postfix25/files/patch-conf::post-install11
-rw-r--r--mail/postfix25/files/patch-conf__postfix-files11
-rw-r--r--mail/postfix25/files/patch-makedefs13
-rw-r--r--mail/postfix25/files/patch-src::global::mail_params.h29
-rw-r--r--mail/postfix25/files/patch-src__smtpd__smtpd.c36
-rw-r--r--mail/postfix25/files/postfix.sh.in48
-rw-r--r--mail/postfix25/pkg-descr15
-rw-r--r--mail/postfix25/pkg-install167
-rw-r--r--mail/postfix25/pkg-message25
-rw-r--r--mail/postfix25/pkg-plist240
-rw-r--r--mail/postfix26/Makefile306
-rw-r--r--mail/postfix26/distinfo6
-rw-r--r--mail/postfix26/files/patch-conf::main.cf80
-rw-r--r--mail/postfix26/files/patch-conf::post-install11
-rw-r--r--mail/postfix26/files/patch-conf__postfix-files11
-rw-r--r--mail/postfix26/files/patch-makedefs13
-rw-r--r--mail/postfix26/files/patch-src::global::mail_params.h29
-rw-r--r--mail/postfix26/files/patch-src__smtpd__smtpd.c36
-rw-r--r--mail/postfix26/files/postfix.sh.in48
-rw-r--r--mail/postfix26/pkg-descr15
-rw-r--r--mail/postfix26/pkg-install167
-rw-r--r--mail/postfix26/pkg-message25
-rw-r--r--mail/postfix26/pkg-plist240
-rw-r--r--mail/postfix27/Makefile306
-rw-r--r--mail/postfix27/distinfo6
-rw-r--r--mail/postfix27/files/patch-conf::main.cf80
-rw-r--r--mail/postfix27/files/patch-conf::post-install11
-rw-r--r--mail/postfix27/files/patch-conf__postfix-files11
-rw-r--r--mail/postfix27/files/patch-makedefs13
-rw-r--r--mail/postfix27/files/patch-src::global::mail_params.h29
-rw-r--r--mail/postfix27/files/patch-src__smtpd__smtpd.c36
-rw-r--r--mail/postfix27/files/postfix.sh.in48
-rw-r--r--mail/postfix27/pkg-descr15
-rw-r--r--mail/postfix27/pkg-install167
-rw-r--r--mail/postfix27/pkg-message25
-rw-r--r--mail/postfix27/pkg-plist240
-rw-r--r--mail/postfix28/Makefile306
-rw-r--r--mail/postfix28/distinfo6
-rw-r--r--mail/postfix28/files/patch-conf::main.cf80
-rw-r--r--mail/postfix28/files/patch-conf::post-install11
-rw-r--r--mail/postfix28/files/patch-conf__postfix-files11
-rw-r--r--mail/postfix28/files/patch-makedefs13
-rw-r--r--mail/postfix28/files/patch-src::global::mail_params.h29
-rw-r--r--mail/postfix28/files/patch-src__smtpd__smtpd.c36
-rw-r--r--mail/postfix28/files/postfix.sh.in48
-rw-r--r--mail/postfix28/pkg-descr15
-rw-r--r--mail/postfix28/pkg-install167
-rw-r--r--mail/postfix28/pkg-message25
-rw-r--r--mail/postfix28/pkg-plist240
-rw-r--r--mail/rubygem-tmail/Makefile40
-rw-r--r--mail/rubygem-tmail/distinfo3
-rw-r--r--mail/rubygem-tmail/pkg-descr5
-rw-r--r--mail/rubygem-tmail/pkg-plist69
-rw-r--r--mail/sylpheed3/Makefile138
-rw-r--r--mail/sylpheed3/distinfo3
-rw-r--r--mail/sylpheed3/files/patch-libsylph-defs.h22
-rw-r--r--mail/sylpheed3/files/patch-src-printing.c22
-rw-r--r--mail/sylpheed3/pkg-descr12
-rw-r--r--mail/sylpheed3/pkg-plist119
-rw-r--r--mail/thunderbird-esr-i18n/Makefile80
-rw-r--r--mail/thunderbird-esr-i18n/distinfo111
-rw-r--r--mail/thunderbird-esr-i18n/pkg-descr3
-rw-r--r--mail/thunderbird-esr/Makefile93
-rw-r--r--mail/thunderbird-esr/distinfo3
-rw-r--r--mail/thunderbird-esr/files/moz_pis_S50cleanhome34
-rw-r--r--mail/thunderbird-esr/files/patch-Double.cpp59
-rw-r--r--mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh11
-rw-r--r--mail/thunderbird-esr/files/patch-config-mkdepend-imakemdep.h10
-rw-r--r--mail/thunderbird-esr/files/patch-config-rules.mk13
-rw-r--r--mail/thunderbird-esr/files/patch-config_autoconf.mk.in18
-rw-r--r--mail/thunderbird-esr/files/patch-configure11
-rw-r--r--mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp46
-rw-r--r--mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h12
-rw-r--r--mail/thunderbird-esr/files/patch-js_src_Makefile.in10
-rw-r--r--mail/thunderbird-esr/files/patch-mail_app_mozilla.in124
-rw-r--r--mail/thunderbird-esr/files/patch-security-coreconf-FreeBSD.mk24
-rw-r--r--mail/thunderbird-esr/files/patch-storage_build_Makefile.in10
-rw-r--r--mail/thunderbird-esr/files/patch-sysnss175
-rw-r--r--mail/thunderbird-esr/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp29
-rw-r--r--mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc11
-rw-r--r--mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in54
-rw-r--r--mail/thunderbird-esr/files/patch-xptcall-alpha459
-rw-r--r--mail/thunderbird-esr/files/patch-xptcall-sparc64327
-rw-r--r--mail/thunderbird-esr/files/thunderbird.desktop.in11
-rw-r--r--mail/thunderbird-esr/pkg-descr6
-rw-r--r--mail/thunderbird3-i18n/Makefile80
-rw-r--r--mail/thunderbird3-i18n/distinfo111
-rw-r--r--mail/thunderbird3-i18n/pkg-descr3
-rw-r--r--mail/thunderbird3/Makefile93
-rw-r--r--mail/thunderbird3/distinfo3
-rw-r--r--mail/thunderbird3/files/moz_pis_S50cleanhome34
-rw-r--r--mail/thunderbird3/files/patch-Double.cpp59
-rw-r--r--mail/thunderbird3/files/patch-build_unix_run-mozilla.sh11
-rw-r--r--mail/thunderbird3/files/patch-config-mkdepend-imakemdep.h10
-rw-r--r--mail/thunderbird3/files/patch-config-rules.mk13
-rw-r--r--mail/thunderbird3/files/patch-config_autoconf.mk.in18
-rw-r--r--mail/thunderbird3/files/patch-configure11
-rw-r--r--mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp46
-rw-r--r--mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h12
-rw-r--r--mail/thunderbird3/files/patch-js_src_Makefile.in10
-rw-r--r--mail/thunderbird3/files/patch-mail_app_mozilla.in124
-rw-r--r--mail/thunderbird3/files/patch-security-coreconf-FreeBSD.mk24
-rw-r--r--mail/thunderbird3/files/patch-storage_build_Makefile.in10
-rw-r--r--mail/thunderbird3/files/patch-sysnss175
-rw-r--r--mail/thunderbird3/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp29
-rw-r--r--mail/thunderbird3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc11
-rw-r--r--mail/thunderbird3/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in54
-rw-r--r--mail/thunderbird3/files/patch-xptcall-alpha459
-rw-r--r--mail/thunderbird3/files/patch-xptcall-sparc64327
-rw-r--r--mail/thunderbird3/files/thunderbird.desktop.in11
-rw-r--r--mail/thunderbird3/pkg-descr6
191 files changed, 0 insertions, 12751 deletions
diff --git a/mail/assp/files/510.assp.in b/mail/assp/files/510.assp.in
deleted file mode 100644
index f5964e4d38a4..000000000000
--- a/mail/assp/files/510.assp.in
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Update ASSP Spam and ClamAV databases
-
-cd %%ASSP_HOME%%
-
-[ -f nightly.log ] && mv nightly.log nightly.log.old
-
-if [ ! -f %%PREFIX%%/lib/assp/rebuildspamdb.pl ]
-then
- echo "%%PREFIX%%/lib/assp/rebuildspamdb.pl does not exist"
- rc_spamdb=2
-else
- echo ""
- echo "Running ASSP rebuildspamdb.pl (output to nightly.log)"
- echo "Running ASSP rebuildspamdb.pl:" >>nightly.log
- %%PERL%% %%PREFIX%%/lib/assp/rebuildspamdb.pl >>nightly.log && rc_spamdb=0 || rc_spamdb=3
-fi
-
-if [ ! -f %%PREFIX%%/lib/assp/freshclam.sh ]
-then
- # existence of freshclam.sh is optional, dependent
- # on the WITH_CLAMAV setting, so not an error if not there
- rc_clamav=0
-else
- echo ""
- echo "Fetching ASSP ClamAV virus database updates:"
- export PATH=$PATH:%%LOCALBASE%%/bin
- sh %%PREFIX%%/lib/assp/freshclam.sh && rc_clamav=0 || rc_clamav=3
-fi
-
-. %%RC_SUBR%%
-name=assp
-rcvar=`set_rcvar`
-load_rc_config $name
-: ${assp_logexpire="45"}
-
-echo ""
-echo "Removing old ASSP log files:"
-find . -name '*.maillog.txt' -mtime +$assp_logexpire -exec ls -l {} \; -exec rm {} \;
-
-exit $(($rc_spamdb|$rc_clamav))
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
deleted file mode 100644
index 30b38ddcf7af..000000000000
--- a/mail/cyrus-imapd24/Makefile
+++ /dev/null
@@ -1,247 +0,0 @@
-# New ports collection makefile for: cyrus-imapd
-# Date created: Dec 10th 2005
-# Whom: ume@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME= cyrus-imapd
-PORTVERSION= 2.3.12p2
-PORTREVISION= 1
-CATEGORIES= mail ipv6
-MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
- http://ftp.andrew.cmu.edu/pub/cyrus/ \
- http://www.transit.hanse.de/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
-
-MAINTAINER= ume@FreeBSD.org
-COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols
-
-LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-RUN_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
- ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-
-CONFLICTS= cyrus-1.* cyrus-imapd-2.[^3].*
-
-LATEST_LINK= ${PORTNAME}23
-
-USE_RC_SUBR= imapd.sh
-USE_OPENSSL= yes
-USE_PERL5= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \
- --with-cyrus-prefix=${PREFIX}/cyrus \
- --with-cyrus-user=${CYRUS_USER} \
- --with-cyrus-group=${CYRUS_GROUP} \
- --with-sasl=${LOCALBASE} \
- --with-bdb=${BDB_LIB_NAME} \
- --with-com_err \
- --with-openssl=${OPENSSLBASE} \
- --with-perl=${PERL5}
-
-OPTIONS= BDB "Use Berkeley DB" on \
- DRAC "Enable DRAC support" off \
- IDLED "Enable IMAP idled support" off \
- LDAP_PTLOADER "Enable LDAP ptloader" off \
- LISTEXT "Enable IMAP List extensions" off \
- MURDER "Enable IMAP Murder support" off \
- NETSCAPEHACK "Enable X-NETSCAPE extensions" off \
- NNTP "Enable NNTP support" off \
- REPLICATION "Enable replication" off \
- SNMP_4 "Enable SNMP support using net-snmp v4" off \
- SNMP_5 "Enable SNMP support using net-snmp v5" off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_BDB)
-BDB_LIB_NAME= no
-.else
-USE_BDB= yes
-INVALID_BDB_VER=2
-CONFIGURE_ARGS+=--with-bdb-incdir=${BDB_INCLUDE_DIR} \
- --with-bdb-libdir=${LOCALBASE}/lib
-.endif
-
-.if defined(WITH_NNTP)
-CONFIGURE_ARGS+=--enable-nntp
-PLIST_SUB+= NNTP=""
-.else
-PLIST_SUB+= NNTP="@comment "
-.endif
-
-.if defined(WITH_MURDER)
-CONFIGURE_ARGS+=--enable-murder
-CFLAGS+= ${PTHREAD_CFLAGS}
-MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS}
-PLIST_SUB+= MURDER=""
-.else
-PLIST_SUB+= MURDER="@comment "
-.endif
-
-.if defined(WITH_IDLED)
-CONFIGURE_ARGS+=--enable-idled
-PLIST_SUB+= IDLED=""
-.else
-PLIST_SUB+= IDLED="@comment "
-.endif
-
-.if defined(WITH_REPLICATION)
-CONFIGURE_ARGS+=--enable-replication
-PLIST_SUB+= REPLICATION=""
-.else
-PLIST_SUB+= REPLICATION="@comment "
-.endif
-
-.if defined(WITH_LISTEXT)
-CONFIGURE_ARGS+=--enable-listext
-.endif
-
-.if defined(WITH_NETSCAPEHACK)
-CONFIGURE_ARGS+=--enable-netscapehack
-.endif
-
-.if defined(WITH_DRAC)
-EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \
- ${FILESDIR}/extra-patch-configure.in
-USE_AUTOTOOLS= autoconf:261 autoheader:261
-CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
-.endif
-
-.if defined(WITH_SNMP_4) && defined(WITH_SNMP_5)
-BROKEN= Multiple net-snmp versions selected. Run 'make config' again!
-.endif
-.if defined(WITH_SNMP_4)
-LIB_DEPENDS+= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
-.elif defined(WITH_SNMP_5)
-LIB_DEPENDS+= netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp
-.endif
-.if defined(WITH_SNMP_4) || defined(WITH_SNMP_5)
-CONFIGURE_ARGS+=--with-snmp=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--with-snmp=no
-.endif
-
-.if defined(WITH_LDAP_PTLOADER)
-USE_OPENLDAP= yes
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
-PLIST_SUB+= LDAP_PTLOADER=""
-.else
-PLIST_SUB+= LDAP_PTLOADER="@comment "
-.endif
-
-.if (!defined(MAKE_KERBEROS5) && ${OSVERSION} <= 500105) || \
- !exists(/usr/lib/libkrb5.a)
-CONFIGURE_ARGS+=--disable-gssapi
-.endif
-
-CYRUS_USER?= cyrus
-CYRUS_GROUP?= cyrus
-
-MAN1= cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
- nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1
-MAN3= imclient.3
-MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5
-CYRUS_MAN3= Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
- Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
-CYRUS_MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
- cyr_dbtool.8 cyr_expire.8 cyr_synclog.8 ctl_mboxlist.8 \
- cvt_cyrusdb.8 deliver.8 fetchnews.8 fud.8 idled.8 imapd.8 \
- ipurge.8 lmtpd.8 make_md5.8 make_sha1.8 master.8 mbexamine.8 \
- mbpath.8 notifyd.8 pop3d.8 quota.8 reconstruct.8 rmnews.8 \
- smmapd.8 squatter.8 sync_client.8 sync_reset.8 sync_server.8 \
- syncnews.8 timsieved.8 tls_prune.8 unexpunge.8
-
-DOCS= altnamespace anoncvs bugs changes faq feedback index \
- install install-admin-mb install-auth install-compile \
- install-configure install-murder install-netnews \
- install-perf install-prereq install-replication \
- install-sieve install-snmpmon install-testing \
- install-upgrade install-virtdomains mailing-list man \
- notes os overview questions readme sieve sieve-protocol \
- specs
-
-CONFS= cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \
- small.conf
-
-PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
-PKGINSTALL= ${WRKDIR}/pkg-install
-
-post-patch:
- @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
- -e "s|%%PREFIX%%|${PREFIX}|g" \
- -e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
- ${.CURDIR}/pkg-install > ${PKGINSTALL}
- @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
- -e "s|%%PREFIX%%|${PREFIX}|g" \
- -e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
- ${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
- @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
- -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
- -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
- ${WRKSRC}/tools/mkimap
- @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
- -e "s|/usr/sieve|/var/imap/sieve|g" \
- ${WRKSRC}/tools/masssievec
-.if defined(WITH_DRAC)
- @${RM} -rf ${WRKSRC}/autom4te.cache
-.endif
-
-post-install:
-.for f in ${CYRUS_MAN3}
- @${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f}
- @${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \
- >>${TMPPLIST}
-.endfor
-.for f in ${CYRUS_MAN8}
- @${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f}
- @${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST}
-.endfor
- @${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
- @${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
- @${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}/man
- @${MKDIR} ${DOCSDIR}/text
-.for f in ${DOCS}
- @${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR}
- @${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST}
-.endfor
-.for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
- @if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \
- ${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \
- ${DOCSDIR}/man/${f}.html; \
- ${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \
- >>${TMPPLIST}; \
- fi
-.endfor
-.for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png
- @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
- @${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST}
-.endfor
-.for f in ${DOCS}
- @${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text
- @${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST}
-.endfor
- @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
- @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
- @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
-.endif
- @${MKDIR} ${EXAMPLESDIR}
- @${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EXAMPLESDIR}
-.for f in ${CONFS}
- @${INSTALL_DATA} ${WRKSRC}/master/conf/${f} ${EXAMPLESDIR}
- @${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST}
-.endfor
- @${ECHO_CMD} @dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,} \
- >>${TMPPLIST}
- @${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
- ${PREFIX}/cyrus/bin/mkimap
- @${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
- ${PREFIX}/cyrus/bin/masssievec
- @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
- POST-INSTALL
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
deleted file mode 100644
index 7e1d5feb6e49..000000000000
--- a/mail/cyrus-imapd24/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (cyrus-imapd-2.3.12p2.tar.gz) = ee2c300687994e4982c6af6aa154c742
-SHA256 (cyrus-imapd-2.3.12p2.tar.gz) = c4ea8af68d2b14d93f662fc97f805450ef0cb98ddb986b2b7330cb4aba93c4c4
-SIZE (cyrus-imapd-2.3.12p2.tar.gz) = 2305996
diff --git a/mail/cyrus-imapd24/files/extra-patch-cmulocal::ucdsnmp.m4 b/mail/cyrus-imapd24/files/extra-patch-cmulocal::ucdsnmp.m4
deleted file mode 100644
index 829d92d23585..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-cmulocal::ucdsnmp.m4
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: cmulocal/ucdsnmp.m4
-diff -u cmulocal/ucdsnmp.m4.orig cmulocal/ucdsnmp.m4
---- cmulocal/ucdsnmp.m4.orig Tue May 25 10:27:58 2004
-+++ cmulocal/ucdsnmp.m4 Sat Dec 10 16:34:09 2005
-@@ -31,9 +31,12 @@
-
- if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
- CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
-- LIB_UCDSNMP=$SNMP_LIBS
-+ LIB_UCDSNMP="$SNMP_LIBS -lwrap"
-+ PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'`
-+ LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}"
- AC_DEFINE(HAVE_NETSNMP,1,[Do we have Net-SNMP support?])
- AC_SUBST(LIB_UCDSNMP)
-+ AC_SUBST(LDFLAGS_UCDSNMP)
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
-@@ -59,7 +62,7 @@
- LIB_UCDSNMP=""
- if test "$with_snmp" != no; then
- AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?])
-- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
- AC_CHECK_LIB(rpm, rpmdbOpen,
- LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
- fi
diff --git a/mail/cyrus-imapd24/files/extra-patch-configure.in b/mail/cyrus-imapd24/files/extra-patch-configure.in
deleted file mode 100644
index 1a89d771ee93..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-configure.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: configure.in
-diff -u configure.in.orig configure.in
---- configure.in.orig Sat May 29 04:59:21 2004
-+++ configure.in Sat May 29 05:03:04 2004
-@@ -933,7 +933,7 @@
- dnl add perl cccdlflags when building libraries -- this ensures that the
- dnl libraries will be compiled as PIC if perl requires PIC objects
- dnl -- this is needed on NetBSD, but seems to cause problems on atleast Solaris --
--dnl eval `${PERL} -V:cccdlflags`
-+ eval `${PERL} -V:cccdlflags`
- PERL_CCCDLFLAGS="$cccdlflags"
- AC_SUBST(PERL_CCCDLFLAGS)
- fi
diff --git a/mail/cyrus-imapd24/files/imapd.conf b/mail/cyrus-imapd24/files/imapd.conf
deleted file mode 100644
index 3c73402c12de..000000000000
--- a/mail/cyrus-imapd24/files/imapd.conf
+++ /dev/null
@@ -1,418 +0,0 @@
-#
-# $FreeBSD$
-#
-# Sample configurations file for Cyrus IMAPd
-# Most lines in this file are commented; in this case the default is used.
-# The commented lines (usually) contain the default value
-
-# The pathname of the IMAP configuration directory
-#
-configdirectory: /var/imap
-
-# The partition name used by default for new mailboxes
-#
-#defaultpartition: default
-
-# The directory for the different partitions
-#
-partition-default: /var/spool/imap
-
-# Use the UNIX separator character '/' for delimiting levels of
-# mailbox hierarchy. The default is to use the netnews separator
-# character '.'.
-#unixhierarchysep: no
-
-# Use the alternate IMAP namespace, where personal folders reside at
-# the same level in the hierarchy as INBOX.
-#
-#altnamespace: no
-
-# If using the alternate IMAP namespace, the prefix for the other
-# users namespace. The hierarchy delimiter will be automatically
-# appended.
-#
-#userprefix: Other Users
-
-# If using the alternate IMAP namespace, the prefix for the shared
-# namespace. The hierarchy delimiter will be automatically appended.
-#
-#sharedprefix: Shared Folders
-
-# The umask value used by various Cyrus IMAP programs
-#
-#umask: 077
-
-# This is the hostname visible in the greeting messages of the POP,
-# IMAP and LMTP daemons. If it is unset, then the result returned from
-# gethostname(2) is used.
-#
-#servername: <result returned by gethostname(2)>
-
-# Whether to allow anonymous logins
-#
-#allowanonymouslogin: no
-
-# Allow the use of cleartext passwords on the wire.
-#
-#allowplaintext: yes
-
-# The percent of quota utilization over which the server generates
-# warnings.
-#
-#quotawarn: 90
-
-# The length of the IMAP server's inactivity autologout timer, in minutes.
-# The minimum value is 30, the default.
-#
-#timeout: 30
-
-# The interval (in seconds) for polling the mailbox for changes while
-# running the IDLE command. This option is used when idled can not be
-# contacted or when polling is used exclusively. The minimum value is
-# 1. A value of 0 will disable polling (and disable IDLE if polling
-# is the only method available).
-#
-#imapidlepoll: 60
-
-# If enabled, the server responds to an ID command with a parameter
-# list containing: version, vendor, support-url, os, os-version,
-# command, arguments, environment. Otherwise the server returns NIL.
-#
-#imapidresponse: yes
-
-# Set the length of the POP server's inactivity autologout timer, in
-# minutes. The minimum value is 10, the default.
-#
-#poptimeout: 10
-
-# Set the minimum amount of time the server forces users to wait between
-# successive POP logins, in minutes. The default is 0.
-#
-#popminpoll: 0
-
-# The number of days advertised as being the minimum a message may be
-# left on the POP server before it is deleted (via the CAPA command,
-# defined in the POP3 Extension Mechanism, which some clients may
-# support). "NEVER", the default, may be specified with a negative
-# number. The Cyrus POP3 server never deletes mail, no matter what
-# the value of this parameter is. However, if a site implements a
-# less liberal policy, it needs to change this parameter accordingly.
-#
-#popexpiretime: 0
-
-# The list of userids with administrative rights. Separate each userid
-# with a space. We recommend that administrator userids be separate from
-# standard userids. Sites using Kerberos authentication may use separate
-# "admin" instances.
-#
-#admins: <none>
-
-# A list of users and groups that are allowed to proxy for other
-# users, seperated by spaces. Any user listed in this will be allowed
-# to login for any other user: use with caution.
-#
-#proxyservers: <none>
-
-# The Access Control List (ACL) placed on a newly-created (non-user)
-# mailbox that does not have a parent mailbox.
-#
-#defaultacl: anyone lrs
-
-# The pathname of the news spool directory. Only used if the partition-news
-# configuration option is set.
-#
-#newsspool: <no default>
-
-# Prefix to be prepended to newsgroup names to make the corresponding IMAP
-# mailbox names.
-#
-#newsprefix: <none>
-
-# If nonzero, normal users may create their own IMAP accounts by creating
-# the mailbox INBOX. The user's quota is set to the value if it is positive,
-# otherwise the user has unlimited quota.
-#
-#autocreatequota: 0
-
-# Include notations in the protocol telemetry logs indicating the number
-# of seconds since the last command or response.
-#
-#logtimestamps: no
-
-# Number of seconds to pause after a successful plaintext login. For systems
-# that support strong authentication, this permits users to perceive a cost
-# of using plaintext passwords.
-#
-#plaintextloginpause: 0
-
-# The pathname of srvtab file containing the server's private key.
-# This option is passed to the SASL library and overrides its default
-# setting.
-#
-#srvtab: /etc/srvtab
-
-# The list of remote realms whose users may log in using cross-realm
-# authentications. Seperate each realm name by a space. This option is
-# only used when the server is compiled with Kerberos authentication.
-#
-#loginrealms: <none>
-
-# If enabled, any authentication identity which has a rights on a user's
-# INBOX may log in as that user. This option is only used when the server
-# is compiled with Kerberos authentication.
-#
-#loginuseacl: no
-
-# If enabled, lmtpd attempts to only write one copy of a message per
-# partition and create hard links, resulting in a potentially large
-# disk savings.
-#
-#singleinstancestore: yes
-
-# If enabled, lmtpd will suppress delivery of a message to a mailbox
-# if a message with the same message-id (or resent-message-id) is
-# recorded as having already been delivered to the mailbox. Records
-# the mailbox and message-id/resent-message-id of all successful
-# deliveries.
-#
-#duplicatesuppression: yes
-
-# If enabled, lmtpd rejects messages with 8-bit characters in the
-# headers. Otherwise, 8-bit characters are changed to `X'. (A proper
-# soultion to non-ASCII characters in headers is offered by RFC 2047
-# and its predecessors.)
-#
-#reject8bit: no
-
-# Maximum incoming LMTP message size. If set, lmtpd will reject
-# messages larger than maxmessagesize bytes. The default is to allow
-# messages of any size.
-#
-#maxmessagesize: <unlimited>
-
-# Userid used to deliver messages to shared folders. For example, if
-# set to "bb", email sent to "bb+shared.blah" would be delivered to
-# the "shared.blah" folder. By default, an email address of
-# "+shared.blah" would be used.
-#postuser: <none>
-
-# If enabled at compile time, this specifies a URL to reply when
-# Netscape asks the server where the mail administration HTTP server
-# is. The default is a site at CMU with a hopefully informative
-# message; administrators should set this to a local resource with
-# some information of greater use.
-#
-#netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html
-
-# Notifyd(8) method to use for "MAIL" notifications. If not set,
-# "MAIL" notifications are disabled.
-#
-#mailnotifier: <no default>
-
-# Notifyd(8) method to use for "SIEVE" notifications. If not set,
-# "SIEVE" notifications are disabled.
-#
-# This method is only used when no method is specified in the script.
-#
-#sievenotifier: <no default>
-
-# If enabled, lmtpd will look for Sieve scripts in user's home
-# directories: ~user/.sieve.
-#
-sieveusehomedir: false
-
-# If sieveusehomedir is false, this directory is searched for Sieve scripts.
-# The active Sieve script is s called "default", placed in the users sieve
-# sieve directory (ie. /var/imap/sieve/u/user).
-#
-sievedir: /var/imap/sieve
-
-# The pathname of the sendmail executable. Sieve uses sendmail for
-# sending rejections, redirects and vaca- tion responses.
-#
-#sendmail: /usr/sbin/sendmail
-
-# Username that is used as the 'From' address in rejection MDNs
-# produced by sieve.
-#
-#postmaster: postmaster
-
-# If enabled, the partitions will also be hashed, in addition to the hashing
-# done on configuration directories. This is recommended if one partition has
-# a very bushy mailbox tree.
-#
-#hashimapspool: false
-
-# Maximum size (in kilobytes) any sieve script can be, enforced at
-# submission by timsieved(8).
-#
-#sieve_maxscriptsize: 32
-
-# Maximum number of sieve scripts any user may have, enforced at
-# submission by timsieved(8).
-#
-#sieve_maxscripts: 5
-
-# The cyrusdb backend to use for mailbox annotations.
-# Allowed values: berkeley, skiplist
-#
-#annotation_db: skiplist
-
-# The cyrusdb backend to use for the duplicate delivery suppression
-# and sieve.
-# Allowed values: berkeley, berkeley-nosync, skiplist
-#
-#duplicate_db: berkeley-nosync
-
-# The cyrusdb backend to use for the mailbox list.
-# Allowed values: flat, berkeley, skiplist
-#
-#mboxlist_db: skiplist
-
-# The cyrusdb backend to use for the pts cache.
-# Allowed values: berkeley, skiplist
-#
-#ptscache_db: berkeley
-
-# The cyrusdb backend to use for the seen state.
-# Allowed values: flat, berkeley, skiplist
-#
-#seenstate_db: skiplist
-
-# The cyrusdb backend to use for the imap status cache.
-# Allowed values: berkeley, berkeley-nosync, berkeley-hash,
-# berkeley-hash-nosync, skiplist
-#
-#statuscache_db: berkeley-nosync
-
-# The cyrusdb backend to use for the subscriptions list.
-# Allowed values: flat, berkeley, skiplist
-#
-#subscription_db: flat
-
-# The cyrusdb backend to use for the TLS cache.
-# Allowed values: berkeley, berkeley-nosync, skiplist
-#
-#tlscache_db: berkeley-nosync
-
-# Maximum SSF (security strength factor) that the server will allow a
-# client to negotiate.
-#
-#sasl_maximum_layer: 256
-
-# The minimum SSF that the server will allow a client to negotiate. A
-# value of 1 requires integrity protection; any higher value requires
-# some amount of encryption.
-#
-#sasl_minimum_layer: 0
-
-# The mechanism used by the server to verify plaintext passwords. Possible
-# values include "auxprop" or "saslauthd"
-#
-sasl_pwcheck_method: auxprop
-
-# If enabled, the SASL library will automatically create authentication
-# secrets when given a plaintext password. See the SASL documentation.
-#
-#sasl_auto_transition: no
-
-# Whitespace separated list of mechanisms to allow (e.g. 'plain otp').
-# Used to restrict the mechanisms to a subset of the installed
-# plugins. The default is all available.
-#
-#sasl_mech_list: cram-md5 digest-md5
-
-# Location of the opiekeys file
-#
-#sasl_opiekeys: /etc/opiekeys
-
-# File containing the global certificate used for ALL services (imap,
-# pop3, lmtp).
-#
-#tls_cert_file: <none>
-
-# File containing the private key belonging to the global server
-# certificate.
-#
-#tls_key_file: <none>
-
-# File containing the certificate used for imap ONLY. If not
-# specified, the global certificate is used. A value of "disabled"
-# will disable SSL/TLS for imap.
-#
-#imap_tls_cert_file: <none>
-
-# File containing the private key belonging to the imap-specific
-# server certificate. If not specified, the global private key is
-# used. A value of "disabled" will disable SSL/TLS for imap.
-#
-#imap_tls_key_file: <none>
-
-# File containing the certificate used for pop3 ONLY. If not
-# specified, the global certificate is used. A value of "disabled"
-# will disable SSL/TLS for pop3.
-#
-#pop3_tls_cert_file: <none>
-
-# File containing the private key belonging to the pop3-specific
-# server certificate. If not specified, the global private key is
-# used. A value of "disabled" will disable SSL/TLS for pop3.
-#
-#pop3_tls_key_file: <none>
-
-# File containing the certificate used for lmtp ONLY. If not
-# specified, the global certificate is used. A value of "disabled"
-# will disable TLS for lmtp.
-#
-#lmtp_tls_cert_file: <none>
-
-# File containing the private key belonging to the lmtp-specific
-# server certificate. If not specified, the global private key is
-# used. A value of "disabled" will disable TLS for lmtp.
-#
-#lmtp_tls_key_file: <none>
-
-# File containing the certificate used for sieve ONLY. If not
-# specified, the global certificate is used. A value of "disabled"
-# will disable TLS for sieve.
-#
-#sieve_tls_cert_file: <none>
-
-# File containing the private key belonging to the sieve-specific
-# server certificate. If not specified, the global private key is
-# used. A value of "disabled" will disable TLS for sieve.
-#
-#sieve_tls_key_file: <none>
-
-# File containing one or more Certificate Authority (CA) certificates.
-#
-#tls_ca_file: <none>
-
-# Path to directory with certificates of CAs.
-#
-#tls_ca_path: <none>
-
-# The length of time (in minutes) that a TLS session will be cached
-# for later reuse. The maximum value is 1440 (24 hours), the default.
-# A value of 0 will disable session caching.
-#
-#tls_session_timeout: 1440
-
-# The right that a user needs to delete a mailbox.
-#
-#deleteright: c
-
-# Unix domain socket that lmtpd listens on, used by deliver(8).
-#
-#lmtpsocket: /var/imap/socket/lmtp
-
-# Unix domain socket that idled listens on.
-#
-#idlesocket: /var/imap/socket/idle
-
-# Unix domain socket that the new mail notification daemon listens on.
-#
-#notifysocket: /var/imap/socket/notify
-
-#
-# EOF
diff --git a/mail/cyrus-imapd24/files/imapd.sh.in b/mail/cyrus-imapd24/files/imapd.sh.in
deleted file mode 100644
index b8dd83bd4a01..000000000000
--- a/mail/cyrus-imapd24/files/imapd.sh.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# Start or stop cyrus-imapd
-# $FreeBSD$
-
-# PROVIDE: cyrus_imapd
-# REQUIRE: DAEMON
-# BEFORE: mail
-# KEYWORD: shutdown
-#
-# NOTE for FreeBSD 5.0+:
-# If you want this script to start with the base rc scripts
-# move imapd.sh to /etc/rc.d/cyrus_imapd
-
-prefix=%%PREFIX%%
-
-# Define these cyrus_imapd_* variables in one of these files:
-# /etc/rc.conf
-# /etc/rc.conf.local
-# /etc/rc.conf.d/cyrus_imapd
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd
-#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd
-[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program
-
-. %%RC_SUBR%%
-
-name="cyrus_imapd"
-rcvar=`set_rcvar`
-command="${prefix}/cyrus/bin/master"
-pidfile="/var/run/cyrus-master.pid"
-required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf"
-stop_postcmd="cyrus_imapd_poststop"
-
-cyrus_imapd_poststop() {
- /bin/rm -f ${pidfile}
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/cyrus-imapd24/files/patch-Makefile.in b/mail/cyrus-imapd24/files/patch-Makefile.in
deleted file mode 100644
index 71800e59efb8..000000000000
--- a/mail/cyrus-imapd24/files/patch-Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: Makefile.in
-diff -u Makefile.in.orig Makefile.in
---- Makefile.in.orig Sat May 15 05:59:10 2004
-+++ Makefile.in Wed May 19 00:23:11 2004
-@@ -97,13 +97,13 @@
- touch distcvs
-
- install::
-- $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/bin
-- $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/lib
-- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/include/cyrus
-- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man1
-- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man3
-- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man5
-- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man8
-+ $(INSTALL) -d ${DESTDIR}$(exec_prefix)/bin
-+ $(INSTALL) -d ${DESTDIR}$(exec_prefix)/lib
-+ $(INSTALL) -d ${DESTDIR}$(prefix)/include/cyrus
-+ $(INSTALL) -d ${DESTDIR}$(mandir)/man1
-+ $(INSTALL) -d ${DESTDIR}$(mandir)/man3
-+ $(INSTALL) -d ${DESTDIR}$(mandir)/man5
-+ $(INSTALL) -d ${DESTDIR}$(cyrus_prefix)/man/man8
- @for d in $(SUBDIRS); \
- do \
- (cd $$d; echo "### Making" install "in" `pwd`; \
diff --git a/mail/cyrus-imapd24/files/patch-configure b/mail/cyrus-imapd24/files/patch-configure
deleted file mode 100644
index 73908ab528cf..000000000000
--- a/mail/cyrus-imapd24/files/patch-configure
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig Tue May 23 22:57:47 2006
-+++ configure Wed May 24 00:01:31 2006
-@@ -310,6 +310,7 @@
- #endif"
-
- ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS CMU_LIB_SUBDIR LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
-+ac_subst_vars="${ac_subst_vars} LDFLAGS_UCDSNMP"
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -16716,6 +16718,7 @@
- EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
- PERL_SUBDIRS="imap"
- PERL="${with_perl}"
-+ eval `${PERL} -V:cccdlflags`
- PERL_CCCDLFLAGS="$cccdlflags"
-
- fi
-@@ -17736,7 +17739,9 @@
-
- if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
- CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
-- LIB_UCDSNMP=$SNMP_LIBS
-+ LIB_UCDSNMP="$SNMP_LIBS -lwrap"
-+ PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'`
-+ LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}"
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_NETSNMP 1
-@@ -17985,7 +17990,7 @@
- #define HAVE_UCDSNMP 1
- _ACEOF
-
-- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
- echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
- echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6
- if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
-@@ -18810,6 +18815,7 @@
- s,@LIB_WRAP@,$LIB_WRAP,;t t
- s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t
- s,@LIB_UCDSNMP@,$LIB_UCDSNMP,;t t
-+s,@LDFLAGS_UCDSNMP@,$LDFLAGS_UCDSNMP,;t t
- s,@LIB_RT@,$LIB_RT,;t t
- s,@IMAP_COM_ERR_LIBS@,$IMAP_COM_ERR_LIBS,;t t
- s,@IMAP_LIBS@,$IMAP_LIBS,;t t
diff --git a/mail/cyrus-imapd24/files/patch-imap::Makefile.in b/mail/cyrus-imapd24/files/patch-imap::Makefile.in
deleted file mode 100644
index 163deb2807c3..000000000000
--- a/mail/cyrus-imapd24/files/patch-imap::Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: imap/Makefile.in
-diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig Fri Nov 18 00:46:14 2005
-+++ imap/Makefile.in Sat Dec 10 16:46:31 2005
-@@ -130,10 +130,10 @@
-
-
- install:
-- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
-+ $(INSTALL) -d ${DESTDIR}$(service_path)
- for file in $(PROGS); \
- do \
-- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
-+ $(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
- done
- ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd
- ln -f $(DESTDIR)$(service_path)/imapd $(DESTDIR)$(service_path)/proxyd
-@@ -219,13 +219,13 @@
- $(CC) $(LDFLAGS) -o mupdate \
- $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- mutex_pthread.o tls.o libimap.a \
-- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
-
- mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
- libimap.a $(DEPLIBS)
- $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
- $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
-- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+ mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
-
- pop3d: pop3d.o proxy.o backend.o tls.o mutex_fake.o libimap.a \
- $(DEPLIBS) $(SERVICE)
diff --git a/mail/cyrus-imapd24/files/patch-imtest::imtest.c b/mail/cyrus-imapd24/files/patch-imtest::imtest.c
deleted file mode 100644
index 30b84fb9556a..000000000000
--- a/mail/cyrus-imapd24/files/patch-imtest::imtest.c
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: imtest/imtest.c
-diff -u imtest/imtest.c.orig imtest/imtest.c
---- imtest/imtest.c.orig Sun Jul 13 05:10:56 2003
-+++ imtest/imtest.c Fri Jul 18 00:52:29 2003
-@@ -419,8 +420,8 @@
- }
-
-
--char *var_tls_CAfile="";
--char *var_tls_CApath="";
-+static char *var_tls_CAfile="";
-+static char *var_tls_CApath="";
- /*
- * This is the setup routine for the SSL client.
- *
diff --git a/mail/cyrus-imapd24/files/patch-lib::Makefile.in b/mail/cyrus-imapd24/files/patch-lib::Makefile.in
deleted file mode 100644
index 543ece89f131..000000000000
--- a/mail/cyrus-imapd24/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Makefile.in
-diff -u lib/Makefile.in.orig lib/Makefile.in
---- lib/Makefile.in.orig Thu Mar 11 06:25:39 2004
-+++ lib/Makefile.in Wed May 19 00:34:19 2004
-@@ -102,7 +102,7 @@
- all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a
-
- install:
-- $(srcdir)/../install-sh -d $(DESTDIR)$(libdir)
-+ $(INSTALL) -d $(DESTDIR)$(libdir)
- $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir)
- $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir)
- $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a
diff --git a/mail/cyrus-imapd24/files/patch-lib::imapoptions b/mail/cyrus-imapd24/files/patch-lib::imapoptions
deleted file mode 100644
index c46c80a342a0..000000000000
--- a/mail/cyrus-imapd24/files/patch-lib::imapoptions
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: lib/imapoptions
-diff -u lib/imapoptions.orig lib/imapoptions
---- lib/imapoptions.orig Thu Mar 20 04:00:39 2003
-+++ lib/imapoptions Fri Mar 21 15:27:44 2003
-@@ -454,7 +454,7 @@
- /* The mechanism used by the server to verify plaintext passwords.
- Possible values include "auxprop", "saslauthd", and "pwcheck". */
-
--{ "sendmail", "/usr/lib/sendmail", STRING }
-+{ "sendmail", "/usr/sbin/sendmail", STRING }
- /* The pathname of the sendmail executable. Sieve invokes sendmail
- for sending rejections, redirects and vacation responses. */
-
-@@ -475,7 +475,7 @@
- /* Maximum number of sieve scripts any user may have, enforced at
- submission by timsieved(8). */
-
--{ "sievedir", "/usr/sieve", STRING }
-+{ "sievedir", "/var/imap/sieve", STRING }
- /* If sieveusehomedir is false, this directory is searched for Sieve
- scripts. */
-
diff --git a/mail/cyrus-imapd24/files/patch-lib::libcyr_cfg.c b/mail/cyrus-imapd24/files/patch-lib::libcyr_cfg.c
deleted file mode 100644
index 5cbb64001209..000000000000
--- a/mail/cyrus-imapd24/files/patch-lib::libcyr_cfg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/libcyr_cfg.c
-diff -u -p lib/libcyr_cfg.c.orig lib/libcyr_cfg.c
---- lib/libcyr_cfg.c.orig Wed Mar 10 00:05:58 2004
-+++ lib/libcyr_cfg.c Fri Feb 25 00:06:44 2005
-@@ -52,7 +52,7 @@
- #include "libcyr_cfg.h"
- #include "cyrusdb.h"
-
--#if defined(__GNUC__) && __GNUC__ > 1
-+#if defined(__GNUC__) && __GNUC__ > 1 && !defined(__INTEL_COMPILER)
- /* We can use the GCC union constructor extension */
- #define CFGVAL(t,v) (union cyrus_config_value)((t)(v))
- #else
diff --git a/mail/cyrus-imapd24/files/patch-man::Makefile.in b/mail/cyrus-imapd24/files/patch-man::Makefile.in
deleted file mode 100644
index 1b0061897d43..000000000000
--- a/mail/cyrus-imapd24/files/patch-man::Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: man/Makefile.in
-diff -u man/Makefile.in.orig man/Makefile.in
---- man/Makefile.in.orig Wed May 11 00:02:35 2005
-+++ man/Makefile.in Sat Dec 10 15:26:05 2005
-@@ -50,6 +50,7 @@
- SHELL = /bin/sh
-
- prefix = @prefix@
-+cyrus_prefix = @cyrus_prefix@
-
- mandir = @mandir@
-
-@@ -95,7 +96,7 @@
- done
- for file in $(MAN8); \
- do \
-- $(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man8 || exit 1; \
-+ $(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \
- done
-
- clean:
diff --git a/mail/cyrus-imapd24/files/patch-master::Makefile.in b/mail/cyrus-imapd24/files/patch-master::Makefile.in
deleted file mode 100644
index c828109f247e..000000000000
--- a/mail/cyrus-imapd24/files/patch-master::Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: master/Makefile.in
-diff -u master/Makefile.in.orig master/Makefile.in
---- master/Makefile.in.orig Sat May 29 03:03:05 2004
-+++ master/Makefile.in Wed Jul 21 04:13:16 2004
-@@ -58,7 +58,7 @@
- DEPLIBS = @DEPLIBS@
-
- CFLAGS = @CFLAGS@
--LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
-+LDFLAGS = @LDFLAGS_UCDSNMP@ @LDFLAGS@ @COM_ERR_LDFLAGS@
- LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
-
- SHELL = /bin/sh
-@@ -76,10 +76,10 @@
- all: $(PROGS) $(LOBJS)
-
- install:
-- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
-+ $(INSTALL) -d ${DESTDIR}$(service_path)
- for file in $(PROGS); \
- do \
-- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
-+ $(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \
- done
-
- .c.o:
diff --git a/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in b/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in
deleted file mode 100644
index d49703fa25b4..000000000000
--- a/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: notifyd/Makefile.in
-diff -u notifyd/Makefile.in.orig notifyd/Makefile.in
---- notifyd/Makefile.in.orig Wed Nov 12 13:02:10 2003
-+++ notifyd/Makefile.in Fri Feb 13 18:41:07 2004
-@@ -79,7 +79,7 @@
- all: notifyd
-
- install:
-- $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path)
-+ $(INSTALL) -s -m 755 notifyd $(DESTDIR)$(service_path)
-
- OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o
-
diff --git a/mail/cyrus-imapd24/files/patch-perl::imap::Makefile.PL b/mail/cyrus-imapd24/files/patch-perl::imap::Makefile.PL
deleted file mode 100644
index 66140bf53219..000000000000
--- a/mail/cyrus-imapd24/files/patch-perl::imap::Makefile.PL
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: perl/imap/Makefile.PL
-diff -u perl/imap/Makefile.PL.orig perl/imap/Makefile.PL
---- perl/imap/Makefile.PL.orig Thu Oct 23 03:50:18 2003
-+++ perl/imap/Makefile.PL Sun Dec 12 04:20:10 2004
-@@ -70,3 +70,10 @@
- 'INC' => "-I../../lib $SASL_INC $OPENSSL_INC",
- 'EXE_FILES' => [cyradm],
- );
-+
-+package MY;
-+sub install {
-+ my $inherited = shift->SUPER::install(@_);
-+ $inherited =~ s/(install :: all pure_install) doc_install/$1/;
-+ $inherited;
-+}
diff --git a/mail/cyrus-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL b/mail/cyrus-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL
deleted file mode 100644
index bde3d77b763e..000000000000
--- a/mail/cyrus-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: perl/sieve/managesieve/Makefile.PL
-diff -u perl/sieve/managesieve/Makefile.PL.orig perl/sieve/managesieve/Makefile.PL
---- perl/sieve/managesieve/Makefile.PL.orig Thu Oct 23 03:50:27 2003
-+++ perl/sieve/managesieve/Makefile.PL Sun Dec 12 04:21:55 2004
-@@ -64,3 +64,10 @@
- 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
- 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC",
- );
-+
-+package MY;
-+sub install {
-+ my $inherited = shift->SUPER::install(@_);
-+ $inherited =~ s/(install :: all pure_install) doc_install/$1/;
-+ $inherited;
-+}
diff --git a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
deleted file mode 100644
index 99d494cf81d4..000000000000
--- a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: sieve/Makefile.in
-diff -u sieve/Makefile.in.orig sieve/Makefile.in
---- sieve/Makefile.in.orig Sat May 29 03:03:09 2004
-+++ sieve/Makefile.in Sat May 29 04:53:11 2004
-@@ -34,6 +34,7 @@
- YACC = @YACC@
- YFLAGS = -d
- LEX = @LEX@
-+INSTALL = @INSTALL@
- RANLIB = @RANLIB@
- COMPILE_ET = @COMPILE_ET@
-
-@@ -60,8 +61,8 @@
- dist: $(BUILT_SOURCES)
-
- install: sievec
-- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
-- $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
-+ $(INSTALL) -d ${DESTDIR}$(service_path)
-+ $(INSTALL) -s -c -m 755 sievec $(DESTDIR)$(service_path) || exit
-
- test: $(DEPLIBS) libsieve.a test.o
- $(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)
diff --git a/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in b/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in
deleted file mode 100644
index 4e0bc2841c2c..000000000000
--- a/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: timsieved/Makefile.in
-diff -u timsieved/Makefile.in.orig timsieved/Makefile.in
---- timsieved/Makefile.in.orig Wed Nov 12 13:02:14 2003
-+++ timsieved/Makefile.in Fri Feb 13 18:51:17 2004
-@@ -79,7 +79,7 @@
- all: timsieved
-
- install:
-- $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path)
-+ $(INSTALL) -s -m 755 timsieved $(DESTDIR)$(service_path)
-
- OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \
- ../imap/tls.o
diff --git a/mail/cyrus-imapd24/files/patch-tools::mkimap b/mail/cyrus-imapd24/files/patch-tools::mkimap
deleted file mode 100644
index 9ee1539e3776..000000000000
--- a/mail/cyrus-imapd24/files/patch-tools::mkimap
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: tools/mkimap
-diff -u tools/mkimap.orig tools/mkimap
---- tools/mkimap.orig Fri Dec 2 07:30:22 2005
-+++ tools/mkimap Sat Dec 10 14:08:11 2005
-@@ -90,6 +90,9 @@
-
- $imapdconf = shift || "/etc/imapd.conf";
-
-+$cyrus_user = $ENV{CYRUS_USER} || "%%CYRUS_USER%%";
-+$cyrus_group = $ENV{CYRUS_GROUP} || "%%CYRUS_GROUP%%";
-+
- push @configs, $imapdconf;
-
- while ($conf = shift @configs) {
-@@ -100,6 +103,7 @@
-
- print "configuring $d...\n";
-
-+mkdir $d, 0755;
- chdir $d or die "couldn't change to $d";
-
- mkdir "proc", 0755 || warn "can't create $d/proc: $!";
-@@ -110,12 +114,15 @@
- mkdir "ptclient", 0755 || warn "can't create $d/ptclient: $!";
- mkdir "sync", 0755 || warn "can't create $d/sync: $!";
-
-+system "/usr/sbin/chown -R $cyrus_user:$cyrus_group .";
-+
- while ($part = shift @parts) {
- print "creating $part...\n";
- mkdir $part, 0755 || warn "can't create $part: $!";
- chdir $part or die "couldn't change to partition $part";
- mkdir "stage.", 0755 || warn "can't create $part/stage.: $!";
- mkdir "sync.", 0755 || warn "can't create $part/sync.: $!";
-+ system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $part";
- }
-
- print "done\n";
diff --git a/mail/cyrus-imapd24/pkg-deinstall b/mail/cyrus-imapd24/pkg-deinstall
deleted file mode 100644
index e0dd1b8bb7fc..000000000000
--- a/mail/cyrus-imapd24/pkg-deinstall
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Created by: hetzels@westbend.net
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-checkfile() {
- diff -bBqw $1 $2 >/dev/null 2>&1
- case $? in
- 0) # config file exists, but is the same
- rm $1
- ;;
- 1) # config file exists and differs
- ;;
- *) # no config file exists
- ;;
- esac
-}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
- USER=${CYRUS_USER}
- PW=/usr/sbin/pw
- if [ -x /usr/sbin/nologin ]; then
- shell=/usr/sbin/nologin
- elif [ -x /sbin/nologin ]; then
- shell=/sbin/nologin
- else
- shell=/nonexistent
- fi
- uhome=/nonexistent
-
- if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
- echo "*** Failed to update user \`${USER}'."
- else
- echo "*** Updated user \`${USER}'."
- fi
-}
-
-case $2 in
- DEINSTALL)
- cd ${PKG_PREFIX}
- checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
- checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
- ;;
- POST-DEINSTALL)
- modify_cyrus_user
- ;;
-
-esac
diff --git a/mail/cyrus-imapd24/pkg-descr b/mail/cyrus-imapd24/pkg-descr
deleted file mode 100644
index 64e5e4bcbcc2..000000000000
--- a/mail/cyrus-imapd24/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-The Cyrus IMAP (Internet Message Access Protocol) server provides access to
-personal mail and system-wide bulletin boards through the IMAP protocol.
-The Cyrus IMAP server is a scaleable enterprise mail system designed for use
-from small to large enterprise environments using standards-based
-technologies.
-
-A full Cyrus IMAP implementation allows a seamless mail and bulletin board
-environment to be set up across multiple servers. It differs from other
-IMAP server implementations in that it is run on "sealed" servers, where
-users are not normally permitted to log in. The mailbox database is stored
-in parts of the filesystem that are private to the Cyrus IMAP system. All
-user access to mail is through software using the IMAP, POP3, or KPOP
-protocols.
-
-The private mailbox database design gives the server large advantages in
-efficiency, scalability, and administratability. Multiple concurrent
-read/write connections to the same mailbox are permitted. The server
-supports access control lists on mailboxes and storage quotas on mailbox
-hierarchies.
-
-WWW: http://cyrusimap.web.cmu.edu/
diff --git a/mail/cyrus-imapd24/pkg-install b/mail/cyrus-imapd24/pkg-install
deleted file mode 100644
index d2ba72f75349..000000000000
--- a/mail/cyrus-imapd24/pkg-install
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
- USER=${CYRUS_USER}
- PW=/usr/sbin/pw
- shell=/bin/csh
- uhome=${PKG_PREFIX}/cyrus
-
- if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then
- echo "*** Failed to update user \`${USER}'."
- else
- echo "*** Updated user \`${USER}'."
- fi
-}
-
-
-checkfile() {
- diff -bBqw $1 $2 >/dev/null 2>&1
- case $? in
- 0) # config file exists, but is the same
- ;;
- 1) # config file exists and differs
- echo "** Make sure $1 is in sync with this version";
- echo " of the port. See $1.dist for details.";
- ;;
- *) # no config file exists, copy it
- install -c -m 644 $2 $1
- ;;
- esac
-}
-
-case $2 in
- PRE-INSTALL)
- ;;
-
- POST-INSTALL)
- modify_cyrus_user
- cd ${PKG_PREFIX}
- checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf
- checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf
- if grep 'sieve' /etc/services; then
- echo
- else
- echo
- echo "** Please add an entry for the sieve protocol (2000/tcp)"
- echo " to /etc/services"
- echo
- fi
- ;;
-esac
diff --git a/mail/cyrus-imapd24/pkg-message b/mail/cyrus-imapd24/pkg-message
deleted file mode 100644
index ff816e46e925..000000000000
--- a/mail/cyrus-imapd24/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-****************************************************************************
-
-To setup mail spool, modify /usr/local/etc/imapd.conf appropriately,
-then run /usr/local/cyrus/bin/mkimap.
-To run Cyrus IMAPd from startup, add cyrus_imapd_enable="YES" in your
-/etc/rc.conf.
-
-****************************************************************************
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
deleted file mode 100644
index 7e35fe26d09f..000000000000
--- a/mail/cyrus-imapd24/pkg-plist
+++ /dev/null
@@ -1,115 +0,0 @@
-bin/cyradm
-bin/imtest
-bin/installsieve
-bin/lmtptest
-bin/mupdatetest
-bin/nntptest
-bin/pop3test
-bin/sieveshell
-bin/sivtest
-bin/smtptest
-bin/synctest
-cyrus/bin/arbitron
-cyrus/bin/chk_cyrus
-cyrus/bin/ctl_cyrusdb
-cyrus/bin/ctl_deliver
-cyrus/bin/ctl_mboxlist
-cyrus/bin/cvt_cyrusdb
-cyrus/bin/cyr_dbtool
-cyrus/bin/cyr_expire
-cyrus/bin/cyr_synclog
-cyrus/bin/cyrdump
-cyrus/bin/deliver
-%%NNTP%%cyrus/bin/fetchnews
-cyrus/bin/fud
-%%IDLED%%cyrus/bin/idled
-cyrus/bin/imapd
-cyrus/bin/ipurge
-cyrus/bin/lmtpd
-cyrus/bin/lmtpproxyd
-%%REPLICATION%%cyrus/bin/make_md5
-%%REPLICATION%%cyrus/bin/make_sha1
-cyrus/bin/masssievec
-cyrus/bin/master
-cyrus/bin/mbexamine
-cyrus/bin/mbpath
-cyrus/bin/mkimap
-%%MURDER%%cyrus/bin/mupdate
-%%NNTP%%cyrus/bin/nntpd
-cyrus/bin/notifyd
-cyrus/bin/pop3d
-cyrus/bin/pop3proxyd
-cyrus/bin/proxyd
-%%LDAP_PTLOADER%%cyrus/bin/ptdump
-%%LDAP_PTLOADER%%cyrus/bin/ptexpire
-%%LDAP_PTLOADER%%cyrus/bin/ptloader
-cyrus/bin/quota
-cyrus/bin/reconstruct
-cyrus/bin/sievec
-cyrus/bin/smmapd
-cyrus/bin/squatter
-%%REPLICATION%%cyrus/bin/sync_client
-%%REPLICATION%%cyrus/bin/sync_reset
-%%REPLICATION%%cyrus/bin/sync_server
-cyrus/bin/timsieved
-cyrus/bin/tls_prune
-cyrus/bin/unexpunge
-include/cyrus/acl.h
-include/cyrus/assert.h
-include/cyrus/auth.h
-include/cyrus/bsearch.h
-include/cyrus/byteorder64.h
-include/cyrus/charset.h
-include/cyrus/cyrusdb.h
-include/cyrus/glob.h
-include/cyrus/gmtoff.h
-include/cyrus/hash.h
-include/cyrus/hmac-md5.h
-include/cyrus/imapopts.h
-include/cyrus/imapurl.h
-include/cyrus/imclient.h
-include/cyrus/imparse.h
-include/cyrus/iptostring.h
-include/cyrus/libconfig.h
-include/cyrus/libcyr_cfg.h
-include/cyrus/lock.h
-include/cyrus/lsort.h
-include/cyrus/map.h
-include/cyrus/md5.h
-include/cyrus/mkgmtime.h
-include/cyrus/mpool.h
-include/cyrus/nonblock.h
-include/cyrus/parseaddr.h
-include/cyrus/prot.h
-include/cyrus/retry.h
-include/cyrus/rfc822date.h
-include/cyrus/strhash.h
-include/cyrus/stristr.h
-include/cyrus/sysexits.h
-include/cyrus/util.h
-include/cyrus/xmalloc.h
-include/cyrus/xstrlcat.h
-include/cyrus/xstrlcpy.h
-lib/libcyrus_min.a
-lib/libcyrus.a
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
-%%EXAMPLESDIR%%/imapd.conf
-@dirrm cyrus/bin
-@dirrm include/cyrus
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
deleted file mode 100644
index f08423f4e749..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.10
-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:15
-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+= LDFLAGS="${LDFLAGS}" 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 3d46dc15c191..000000000000
--- a/mail/dbmail22/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (dbmail-2.2.10.tar.gz) = cd255326f410848e27e0a82a43fa2424
-SHA256 (dbmail-2.2.10.tar.gz) = f890167073498d87ea0ce374af2cf0498cfd7aa1af7aeb330726d1910de951b6
-SIZE (dbmail-2.2.10.tar.gz) = 900636
diff --git a/mail/dbmail22/files/dbmail-imapd.sh.in b/mail/dbmail22/files/dbmail-imapd.sh.in
deleted file mode 100644
index 82505e96d9b0..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"
-#
-# See dbmail-imapd(8) for flags
-#
-
-. %%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"}
-: ${dbmail_imapd_flags=""}
-
-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 f1133f43a70e..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"
-#
-# See dbmail-lmtpd(8) for flags
-#
-
-. %%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"}
-: ${dbmail_lmtpd_flags=""}
-
-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 d787f6a668e7..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"
-#
-# See dbmail-pop3d(8) for flags
-#
-
-. %%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"}
-: ${dbmail_pop3d_flags=""}
-
-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 26b5888cba6d..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"
-#
-# See dbmail-timsieved(8) for flags
-#
-
-. %%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"}
-: ${dbmail_timsieved_flags=""}
-
-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 14a762a71a8f..000000000000
--- a/mail/dbmail22/files/pkg-message.in
+++ /dev/null
@@ -1,17 +0,0 @@
-
-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/horde4-imp/Makefile b/mail/horde4-imp/Makefile
deleted file mode 100644
index 8e37c3bfe0ea..000000000000
--- a/mail/horde4-imp/Makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# Ports collection makefile for: imp3
-# Date created: Mon Oct 08, 2001
-# Whom: Thierry Thomas (<thierry@thomas.as>)
-#
-# $FreeBSD$
-#
-
-PORTNAME= imp
-PORTVERSION= 4.2
-PORTREVISION= 2
-CATEGORIES= mail www
-
-MAINTAINER= beech@FreeBSD.org
-COMMENT= Webmail system for IMAP/POP3 mailboxes
-
-DISTFILES= ${PORTNAME}-h3-4.2-rc2${EXTRACT_SUFX}
-WRKSRC= ${WRKDIR}/${PORTNAME}-h3-4.2-rc2
-
-#-----------------------------------------------------------------------
-# You may define these options:
-#
-# - WITHOUT_LDAP : if you do not need OpenLDAP;
-#
-# - WITHOUT_SMIME : disable S/MIME;
-#
-# - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree;
-#
-# - WITHOUT_ASPELL : for spelling bees...
-#
-# - WITH_ISPELL : if you prefer ispell;
-#
-# - NOCRYPT : if crypto is restricted in your country;
-#
-# - WITHOUT_SSL : if you have not installed c-client WITH_SSL;
-#
-# - WITH_VALID_CERT : if you own a valid SSL certificate;
-#
-# - WITH_HTML : enable HTML composition mode;
-#-----------------------------------------------------------------------
-
-RUN_DEPENDS+= ${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL
-
-USE_PHP= imap
-. if !defined(WITHOUT_LDAP)
-USE_PHP+= ldap
-. endif
-
-.if !defined(WITHOUT_SMIME)
-USE_PHP+= openssl
-.endif
-
-.if !defined(NOCRYPT)
-RUN_DEPENDS+= ${PEARDIR}/Mail/mimeDecode.php:${PORTSDIR}/mail/pear-Mail_mimeDecode \
- ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
-.endif
-
-.if !defined(WITHOUT_ASPELL)
-RUN_DEPENDS+= ${LOCALBASE}/bin/aspell:${PORTSDIR}/textproc/aspell
-.elif defined(WITH_ISPELL)
-RUN_DEPENDS+= ${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell
-.endif
-
-.if defined(WITH_HTML)
-RUN_DEPENDS+= ${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
-.endif
-
-CONFLICTS= imp-3.*
-USE_HORDE= base
-USE_GETTEXT= yes
-PORTDOCS= README CHANGES CREDITS INSTALL \
- RELEASE_NOTES TODO UPGRADING
-
-pre-configure:
-.if !defined(WITHOUT_ASPELL)
- @${REINPLACE_CMD} -e "s:%%ASPELL%%:${LOCALBASE}/bin/aspell:" \
- ${WRKSRC}/config/conf.xml
-.elif defined(WITH_ISPELL)
- @${REINPLACE_CMD} -e "s:%%ASPELL%%:${LOCALBASE}/bin/ispell:" \
- ${WRKSRC}/config/conf.xml
-.else
- @${REINPLACE_CMD} -e "s:%%ASPELL%%::" ${WRKSRC}/config/conf.xml
-.endif
-.if !defined(NOCRYPT)
- @${REINPLACE_CMD} -e "s:%%GPG%%:${LOCALBASE}/bin/gpg:" \
- ${WRKSRC}/config/conf.xml
-.else
- @${REINPLACE_CMD} -e "s:%%GPG%%::" ${WRKSRC}/config/conf.xml
-.endif
- @${REINPLACE_CMD} -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':" \
- ${WRKSRC}/lib/MIME/Headers.php
- @${REINPLACE_CMD} -e "s:example.com:${HOSTNAME}:g" \
- ${WRKSRC}/config/servers.php.dist
-.if defined(WITHOUT_SSL)
- @${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/notls:;s:%%IMAPPORT%%:143:" \
- ${WRKSRC}/config/servers.php.dist
-.else
- @${REINPLACE_CMD} -e "s:%%IMAPPORT%%:993:" ${WRKSRC}/config/servers.php.dist
-. if defined(WITH_VALID_CERT)
- @${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl:" ${WRKSRC}/config/servers.php.dist
-. else
- @${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl/novalidate-cert:" \
- ${WRKSRC}/config/servers.php.dist
-. endif
-.endif
-
-pre-install:
-.if !defined(BATCH) && !defined(WITHOUT_SSL)
- @if ! ${GREP} -q -e 'CCLIENT_SSLENABLED "yes"' ${PORTREV_H}; then \
- ${ECHO_MSG} "" ; \
- ${ECHO_MSG} "Please configure c-client with SSL support." ; \
- ${ECHO_MSG} "" ; \
- ${FALSE} ; \
- fi
-.endif
-
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
-.include <bsd.port.mk>
diff --git a/mail/horde4-imp/distinfo b/mail/horde4-imp/distinfo
deleted file mode 100644
index 27749cf28794..000000000000
--- a/mail/horde4-imp/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (imp-h3-4.2-rc2.tar.gz) = f71b54aa1a0fd6b7bb10b26f22d0d5f0
-SHA256 (imp-h3-4.2-rc2.tar.gz) = befced47bb51893dce967fc7a46d5cc9e3d6ad951426f86678322c59b559f3ac
-SIZE (imp-h3-4.2-rc2.tar.gz) = 4934340
diff --git a/mail/horde4-imp/files/patch-ab b/mail/horde4-imp/files/patch-ab
deleted file mode 100644
index 70f53f65a58c..000000000000
--- a/mail/horde4-imp/files/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
---- config/servers.php.dist.orig Tue Feb 7 08:50:24 2006
-+++ config/servers.php.dist Wed Mar 8 22:01:53 2006
-@@ -204,14 +204,21 @@
-
- /* Example configurations: */
-
-+/* FreeBSD port note: see also
-+<http://wiki.horde.org/ImpUWIMAPNamespaces>
-+<http://wiki.horde.org/ImpImapConfig>
-+*/
-+
- $servers['imap'] = array(
- 'name' => 'IMAP Server',
-- 'server' => 'imap.example.com',
-+// 'server' => 'imap.example.com',
-+ 'server' => 'localhost',
- 'hordeauth' => false,
-- 'protocol' => 'imap/notls',
-- 'port' => 143,
-+ 'protocol' => '%%PROTOCOL%%',
-+ 'port' => %%IMAPPORT%%,
- 'maildomain' => 'example.com',
-- 'smtphost' => 'smtp.example.com',
-+// 'smtphost' => 'smtp.example.com',
-+ 'smtphost' => 'localhost',
- 'smtpport' => 25,
- 'realm' => '',
- 'preferred' => '',
diff --git a/mail/horde4-imp/files/patch-ac b/mail/horde4-imp/files/patch-ac
deleted file mode 100644
index 68730ef6fde4..000000000000
--- a/mail/horde4-imp/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/prefs.php.dist.orig Fri Oct 29 19:04:12 2004
-+++ config/prefs.php.dist Thu Nov 11 21:49:05 2004
-@@ -1071,7 +1071,7 @@
- // 'value' => "source_one\tsource_two"
- // refer to turba/config/sources.php for possible source values
- $_prefs['search_sources'] = array(
-- 'value' => "",
-+ 'value' => 'localsql',
- 'locked' => false,
- 'shared' => false,
- 'type' => 'implicit');
diff --git a/mail/horde4-imp/files/patch-config::conf.xml b/mail/horde4-imp/files/patch-config::conf.xml
deleted file mode 100644
index 09d8f92142cb..000000000000
--- a/mail/horde4-imp/files/patch-config::conf.xml
+++ /dev/null
@@ -1,29 +0,0 @@
---- config/conf.xml.orig 2008-01-02 22:07:57.000000000 -0900
-+++ config/conf.xml 2008-03-03 10:49:08.000000000 -0900
-@@ -9,7 +9,7 @@
- <case name="aspell" desc="aspell (command line)">
- <configsection name="params">
- <configstring name="path" required="false" desc="Enter the location of
-- the aspell binary" />
-+ the aspell binary">%%ASPELL%%</configstring>
- </configsection>
- </case>
- </configswitch>
-@@ -19,7 +19,7 @@
- <configstring name="gnupg" required="false" desc="If you want users to have
- the option of using the GNU Privacy Guard program to decrypt/encrypt PGP
- files, enter the location of the 'gpg' binary here. If this is empty this
-- feature will be disabled."/>
-+ feature will be disabled.">%%GPG%%</configstring>
- <configmultienum name="gnupg_keyserver" required="false" desc="The address
- of the public PGP keyserver(s) to use.">pgp.mit.edu
- <values>
-@@ -33,7 +33,7 @@
- <configstring name="openssl_cafile" required="false" desc="The location of
- the root certificates bundle, e.g. /etc/ssl/certs. See
- http://www.php.net/manual/en/ref.openssl.php#openssl.cert.verification for
-- details."/>
-+ details.">/usr/local/etc/ssl.crt/ca-bundle.crt</configstring>
- <configstring name="openssl_binary" required="false" desc="The location of
- the OpenSSL binary on your system, e.g. /usr/bin/openssl. This program is
- REQUIRED to import personal S/MIME certificate information, as there is no
diff --git a/mail/horde4-imp/files/pkg-message.in b/mail/horde4-imp/files/pkg-message.in
deleted file mode 100644
index 9a3de8c83b0c..000000000000
--- a/mail/horde4-imp/files/pkg-message.in
+++ /dev/null
@@ -1,22 +0,0 @@
-************************************************************************
-IMP has been installed in %%HORDIR%%/ with your blank
-configuration files.
-
-Horde must be configured and the tables created; if not, see
-`pkg_info -Dx horde-base'.
-
-Then, you have to tune the configuration files located in
-%%HORCFG%%/, especially the file servers.php
-to define your mailserver.
-
-Then, you must login to Horde as a Horde Administrator to finish the
-configuration. Please read %%DOCSDIR%%/INSTALL.
-
-Warning: if you are upgrading from IMP 4.0.x, please read
-%%DOCSDIR%%/UPGRADING.
-
-To secure your installation, it is at least recommended that you change
-the default database password used by horde and imp.
-Then, you might change the 'session.save_path' setting in php.ini to a
-directory only readable and writeable by your webserver.
-************************************************************************
diff --git a/mail/horde4-imp/pkg-descr b/mail/horde4-imp/pkg-descr
deleted file mode 100644
index b085871c38de..000000000000
--- a/mail/horde4-imp/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-IMP is the Internet Messaging Program. It is written in PHP and provides
-webmail access to IMAP and POP3 accounts.
-
-WWW: http://www.horde.org/imp/
diff --git a/mail/horde4-imp/pkg-plist b/mail/horde4-imp/pkg-plist
deleted file mode 100644
index dda5cd3f903a..000000000000
--- a/mail/horde4-imp/pkg-plist
+++ /dev/null
@@ -1,736 +0,0 @@
-%%HORDIR%%/acl.php
-%%HORDIR%%/attachment.php
-%%HORDIR%%/cache.php
-%%HORDIR%%/compose.php
-%%HORDIR%%/config/.htaccess
-%%HORDIR%%/config/conf.xml
-%%HORDIR%%/config/filter.txt.dist
-%%HORDIR%%/config/header.php.dist
-%%HORDIR%%/config/hooks.php.dist
-%%HORDIR%%/config/menu.php.dist
-%%HORDIR%%/config/mime_drivers.php.dist
-%%HORDIR%%/config/motd.php.dist
-%%HORDIR%%/config/prefs.php.dist
-%%HORDIR%%/config/servers.php.dist
-%%HORDIR%%/config/spelling.php.dist
-%%HORDIR%%/config/trailer.txt.dist
-%%HORDIR%%/contacts.php
-%%HORDIR%%/fetchmail.php
-%%HORDIR%%/fetchmailprefs.php
-%%HORDIR%%/filterprefs.php
-%%HORDIR%%/folders.php
-%%HORDIR%%/imple.php
-%%HORDIR%%/index.php
-%%HORDIR%%/js/KeyNavList.js
-%%HORDIR%%/js/SpellChecker.js
-%%HORDIR%%/js/acl.js
-%%HORDIR%%/js/addressesBlocks.js
-%%HORDIR%%/js/builder.js
-%%HORDIR%%/js/compose.js
-%%HORDIR%%/js/contacts.js
-%%HORDIR%%/js/controls.js
-%%HORDIR%%/js/dragdrop.js
-%%HORDIR%%/js/effects.js
-%%HORDIR%%/js/fetchmailprefs.js
-%%HORDIR%%/js/folders.js
-%%HORDIR%%/js/ieEscGuard.js
-%%HORDIR%%/js/login.js
-%%HORDIR%%/js/mailbox.js
-%%HORDIR%%/js/message.js
-%%HORDIR%%/js/popup.js
-%%HORDIR%%/js/prototype.js
-%%HORDIR%%/js/redbox.js
-%%HORDIR%%/js/scriptaculous.js
-%%HORDIR%%/js/search.js
-%%HORDIR%%/js/slider.js
-%%HORDIR%%/js/src/KeyNavList.js
-%%HORDIR%%/js/src/SpellChecker.js
-%%HORDIR%%/js/src/acl.js
-%%HORDIR%%/js/src/addressesBlocks.js
-%%HORDIR%%/js/src/builder.js
-%%HORDIR%%/js/src/compose.js
-%%HORDIR%%/js/src/contacts.js
-%%HORDIR%%/js/src/controls.js
-%%HORDIR%%/js/src/dragdrop.js
-%%HORDIR%%/js/src/effects.js
-%%HORDIR%%/js/src/fetchmailprefs.js
-%%HORDIR%%/js/src/folders.js
-%%HORDIR%%/js/src/ieEscGuard.js
-%%HORDIR%%/js/src/login.js
-%%HORDIR%%/js/src/mailbox.js
-%%HORDIR%%/js/src/message.js
-%%HORDIR%%/js/src/popup.js
-%%HORDIR%%/js/src/prototype.js
-%%HORDIR%%/js/src/redbox.js
-%%HORDIR%%/js/src/scriptaculous.js
-%%HORDIR%%/js/src/search.js
-%%HORDIR%%/js/src/slider.js
-%%HORDIR%%/js/src/stripe.js
-%%HORDIR%%/js/src/tables.js
-%%HORDIR%%/js/src/unblockImages.js
-%%HORDIR%%/js/stripe.js
-%%HORDIR%%/js/tables.js
-%%HORDIR%%/js/unblockImages.js
-%%HORDIR%%/lib/.htaccess
-%%HORDIR%%/lib/Auth/imp.php
-%%HORDIR%%/lib/Block/summary.php
-%%HORDIR%%/lib/Block/tree_folders.php
-%%HORDIR%%/lib/Compose.php
-%%HORDIR%%/lib/Crypt/PGP.php
-%%HORDIR%%/lib/Crypt/SMIME.php
-%%HORDIR%%/lib/Fetchmail.php
-%%HORDIR%%/lib/Fetchmail/imap.php
-%%HORDIR%%/lib/Filter.php
-%%HORDIR%%/lib/Folder.php
-%%HORDIR%%/lib/IMAP.php
-%%HORDIR%%/lib/IMAP/ACL.php
-%%HORDIR%%/lib/IMAP/ACL/rfc2086.php
-%%HORDIR%%/lib/IMAP/ACL/rfc4314.php
-%%HORDIR%%/lib/IMAP/Cache.php
-%%HORDIR%%/lib/IMAP/Client.php
-%%HORDIR%%/lib/IMAP/MailboxCache.php
-%%HORDIR%%/lib/IMAP/Search.php
-%%HORDIR%%/lib/IMAP/Sort.php
-%%HORDIR%%/lib/IMAP/Thread.php
-%%HORDIR%%/lib/IMAP/Tree.php
-%%HORDIR%%/lib/IMP.php
-%%HORDIR%%/lib/Identity/imp.php
-%%HORDIR%%/lib/Imple.php
-%%HORDIR%%/lib/Imple/ContactAutoCompleter.php
-%%HORDIR%%/lib/Imple/SpellChecker.php
-%%HORDIR%%/lib/JSON.php
-%%HORDIR%%/lib/MIME/Contents.php
-%%HORDIR%%/lib/MIME/Headers.php
-%%HORDIR%%/lib/MIME/Viewer/alternative.php
-%%HORDIR%%/lib/MIME/Viewer/appledouble.php
-%%HORDIR%%/lib/MIME/Viewer/enriched.php
-%%HORDIR%%/lib/MIME/Viewer/html.php
-%%HORDIR%%/lib/MIME/Viewer/images.php
-%%HORDIR%%/lib/MIME/Viewer/itip.php
-%%HORDIR%%/lib/MIME/Viewer/multipart.php
-%%HORDIR%%/lib/MIME/Viewer/notification.php
-%%HORDIR%%/lib/MIME/Viewer/partial.php
-%%HORDIR%%/lib/MIME/Viewer/pgp.php
-%%HORDIR%%/lib/MIME/Viewer/pkcs7.php
-%%HORDIR%%/lib/MIME/Viewer/plain.php
-%%HORDIR%%/lib/MIME/Viewer/related.php
-%%HORDIR%%/lib/MIME/Viewer/rfc822.php
-%%HORDIR%%/lib/MIME/Viewer/smil.php
-%%HORDIR%%/lib/MIME/Viewer/status.php
-%%HORDIR%%/lib/MIME/Viewer/tnef.php
-%%HORDIR%%/lib/MIME/Viewer/zip.php
-%%HORDIR%%/lib/Mailbox.php
-%%HORDIR%%/lib/Maillog.php
-%%HORDIR%%/lib/Maintenance/Task/delete_attachments_monthly.php
-%%HORDIR%%/lib/Maintenance/Task/delete_sentmail_monthly.php
-%%HORDIR%%/lib/Maintenance/Task/fetchmail_login.php
-%%HORDIR%%/lib/Maintenance/Task/purge_sentmail.php
-%%HORDIR%%/lib/Maintenance/Task/purge_spam.php
-%%HORDIR%%/lib/Maintenance/Task/purge_trash.php
-%%HORDIR%%/lib/Maintenance/Task/rename_sentmail_monthly.php
-%%HORDIR%%/lib/Maintenance/Task/tos_agreement.php
-%%HORDIR%%/lib/Maintenance/imp.php
-%%HORDIR%%/lib/Message.php
-%%HORDIR%%/lib/Notification/Listener/status.php
-%%HORDIR%%/lib/Quota.php
-%%HORDIR%%/lib/Quota/command.php
-%%HORDIR%%/lib/Quota/imap.php
-%%HORDIR%%/lib/Quota/logfile.php
-%%HORDIR%%/lib/Quota/maildir.php
-%%HORDIR%%/lib/Quota/mdaemon.php
-%%HORDIR%%/lib/Quota/mercury32.php
-%%HORDIR%%/lib/Quota/sql.php
-%%HORDIR%%/lib/Search.php
-%%HORDIR%%/lib/Sentmail.php
-%%HORDIR%%/lib/Sentmail/sql.php
-%%HORDIR%%/lib/Session.php
-%%HORDIR%%/lib/Spam.php
-%%HORDIR%%/lib/SpellChecker.php
-%%HORDIR%%/lib/SpellChecker/aspell.php
-%%HORDIR%%/lib/Template.php
-%%HORDIR%%/lib/UI/Compose.php
-%%HORDIR%%/lib/UI/Mailbox.php
-%%HORDIR%%/lib/UI/Message.php
-%%HORDIR%%/lib/api.php
-%%HORDIR%%/lib/base.php
-%%HORDIR%%/lib/prefs.php
-%%HORDIR%%/lib/tests/mime_viewer_html.phpt
-%%HORDIR%%/lib/version.php
-%%HORDIR%%/locale/.htaccess
-%%HORDIR%%/locale/ar_OM/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/ar_SY/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/bg_BG/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/bs_BA/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/ca_ES/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/ca_ES/help.xml
-%%HORDIR%%/locale/cs_CZ/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/cs_CZ/help.xml
-%%HORDIR%%/locale/da_DK/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/da_DK/help.xml
-%%HORDIR%%/locale/de_DE/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/de_DE/help.xml
-%%HORDIR%%/locale/el_GR/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/el_GR/help.xml
-%%HORDIR%%/locale/en_US/help.xml
-%%HORDIR%%/locale/es_ES/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/es_ES/help.xml
-%%HORDIR%%/locale/et_EE/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/et_EE/help.xml
-%%HORDIR%%/locale/fa_IR/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/fa_IR/help.xml
-%%HORDIR%%/locale/fi_FI/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/fi_FI/help.xml
-%%HORDIR%%/locale/fr_FR/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/fr_FR/help.xml
-%%HORDIR%%/locale/gl_ES/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/he_IL/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/hu_HU/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/hu_HU/help.xml
-%%HORDIR%%/locale/id_ID/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/is_IS/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/it_IT/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/it_IT/help.xml
-%%HORDIR%%/locale/ja_JP/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/km_KH/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/ko_KR/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/ko_KR/help.xml
-%%HORDIR%%/locale/lt_LT/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/lv_LV/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/mk_MK/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/nb_NO/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/nb_NO/help.xml
-%%HORDIR%%/locale/nl_NL/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/nl_NL/help.xml
-%%HORDIR%%/locale/nn_NO/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/pl_PL/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/pl_PL/help.xml
-%%HORDIR%%/locale/pt_BR/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/pt_BR/help.xml
-%%HORDIR%%/locale/pt_PT/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/pt_PT/help.xml
-%%HORDIR%%/locale/ro_RO/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/ru_RU/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/ru_RU/help.xml
-%%HORDIR%%/locale/sk_SK/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/sk_SK/help.xml
-%%HORDIR%%/locale/sl_SI/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/sv_SE/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/sv_SE/help.xml
-%%HORDIR%%/locale/th_TH/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/tr_TR/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/tr_TR/help.xml
-%%HORDIR%%/locale/uk_UA/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/uk_UA/help.xml
-%%HORDIR%%/locale/zh_CN/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/zh_CN/help.xml
-%%HORDIR%%/locale/zh_TW/LC_MESSAGES/imp.mo
-%%HORDIR%%/locale/zh_TW/help.xml
-%%HORDIR%%/login.php
-%%HORDIR%%/mailbox.php
-%%HORDIR%%/message.php
-%%HORDIR%%/pgp.php
-%%HORDIR%%/po/.htaccess
-%%HORDIR%%/po/README
-%%HORDIR%%/po/ar_OM.po
-%%HORDIR%%/po/ar_SY.po
-%%HORDIR%%/po/bg_BG.po
-%%HORDIR%%/po/bs_BA.po
-%%HORDIR%%/po/ca_ES.po
-%%HORDIR%%/po/cs_CZ.po
-%%HORDIR%%/po/da_DK.po
-%%HORDIR%%/po/de_DE.po
-%%HORDIR%%/po/el_GR.po
-%%HORDIR%%/po/es_ES.po
-%%HORDIR%%/po/et_EE.po
-%%HORDIR%%/po/fa_IR.po
-%%HORDIR%%/po/fi_FI.po
-%%HORDIR%%/po/fr_FR.po
-%%HORDIR%%/po/gl_ES.po
-%%HORDIR%%/po/he_IL.po
-%%HORDIR%%/po/hu_HU.po
-%%HORDIR%%/po/id_ID.po
-%%HORDIR%%/po/imp.pot
-%%HORDIR%%/po/is_IS.po
-%%HORDIR%%/po/it_IT.po
-%%HORDIR%%/po/ja_JP.po
-%%HORDIR%%/po/km_KH.po
-%%HORDIR%%/po/ko_KR.po
-%%HORDIR%%/po/lt_LT.po
-%%HORDIR%%/po/lv_LV.po
-%%HORDIR%%/po/mk_MK.po
-%%HORDIR%%/po/nb_NO.po
-%%HORDIR%%/po/nl_NL.po
-%%HORDIR%%/po/nn_NO.po
-%%HORDIR%%/po/pl_PL.po
-%%HORDIR%%/po/pt_BR.po
-%%HORDIR%%/po/pt_PT.po
-%%HORDIR%%/po/ro_RO.po
-%%HORDIR%%/po/ru_RU.po
-%%HORDIR%%/po/sk_SK.po
-%%HORDIR%%/po/sl_SI.po
-%%HORDIR%%/po/sv_SE.po
-%%HORDIR%%/po/th_TH.po
-%%HORDIR%%/po/tr_TR.po
-%%HORDIR%%/po/uk_UA.po
-%%HORDIR%%/po/zh_CN.po
-%%HORDIR%%/po/zh_TW.po
-%%HORDIR%%/redirect.php
-%%HORDIR%%/rss.php
-%%HORDIR%%/saveimage.php
-%%HORDIR%%/scripts/.htaccess
-%%HORDIR%%/scripts/Imp.reg
-%%HORDIR%%/scripts/bounce_spam.php
-%%HORDIR%%/scripts/custom_login.php
-%%HORDIR%%/scripts/sql/imp.sql
-%%HORDIR%%/scripts/sql/imp.xml
-%%HORDIR%%/scripts/upgrades/convert_vfolders.php
-%%HORDIR%%/search.php
-%%HORDIR%%/smime.php
-%%HORDIR%%/stationery.php
-%%HORDIR%%/templates/.htaccess
-%%HORDIR%%/templates/acl/acl.html
-%%HORDIR%%/templates/common-header.inc
-%%HORDIR%%/templates/compose/compose.html
-%%HORDIR%%/templates/compose/redirect.html
-%%HORDIR%%/templates/compose/success.html
-%%HORDIR%%/templates/contacts/contacts.html
-%%HORDIR%%/templates/fetchmail/fetchmail.html
-%%HORDIR%%/templates/fetchmail/fetchmailprefs.html
-%%HORDIR%%/templates/filters/prefs.html
-%%HORDIR%%/templates/folders/actions.html
-%%HORDIR%%/templates/folders/folders.html
-%%HORDIR%%/templates/folders/folders_confirm.html
-%%HORDIR%%/templates/folders/folders_size.html
-%%HORDIR%%/templates/folders/head.html
-%%HORDIR%%/templates/folders/import.html
-%%HORDIR%%/templates/javascript/addressesBlocks.js
-%%HORDIR%%/templates/javascript/popup.js
-%%HORDIR%%/templates/javascript_defs.php
-%%HORDIR%%/templates/login/login.html
-%%HORDIR%%/templates/login/mobile.inc
-%%HORDIR%%/templates/login/recompose.html
-%%HORDIR%%/templates/mailbox/actions.html
-%%HORDIR%%/templates/mailbox/actions_deleted.html
-%%HORDIR%%/templates/mailbox/empty_mailbox.html
-%%HORDIR%%/templates/mailbox/header.html
-%%HORDIR%%/templates/mailbox/mailbox.html
-%%HORDIR%%/templates/mailbox/message_footers.html
-%%HORDIR%%/templates/mailbox/message_headers.html
-%%HORDIR%%/templates/mailbox/navbar.html
-%%HORDIR%%/templates/mailbox/searchfolder.html
-%%HORDIR%%/templates/menu.html
-%%HORDIR%%/templates/message/message.html
-%%HORDIR%%/templates/message/navbar_actions.html
-%%HORDIR%%/templates/message/navbar_navigate.html
-%%HORDIR%%/templates/message/navbar_top.html
-%%HORDIR%%/templates/newmsg/alert.html
-%%HORDIR%%/templates/pgp/import_key.html
-%%HORDIR%%/templates/pgp/passphrase.html
-%%HORDIR%%/templates/pgp/pgp.html
-%%HORDIR%%/templates/prefs/encryptselect.inc
-%%HORDIR%%/templates/prefs/folderselect.inc
-%%HORDIR%%/templates/prefs/initialpageselect.inc
-%%HORDIR%%/templates/prefs/sentmailselect.inc
-%%HORDIR%%/templates/prefs/soundselect.inc
-%%HORDIR%%/templates/prefs/sourceselect.inc
-%%HORDIR%%/templates/prefs/spamselect.inc
-%%HORDIR%%/templates/prefs/trashselect.inc
-%%HORDIR%%/templates/quota/quota.html
-%%HORDIR%%/templates/rss/mailbox.rss
-%%HORDIR%%/templates/saveimage/saveimage.html
-%%HORDIR%%/templates/search/search.html
-%%HORDIR%%/templates/smime/import_key.html
-%%HORDIR%%/templates/smime/passphrase.html
-%%HORDIR%%/templates/smime/smime.html
-%%HORDIR%%/templates/stationery/stationery.html
-%%HORDIR%%/templates/thread/thread.html
-%%HORDIR%%/test.php
-%%HORDIR%%/themes/azur/screen.css
-%%HORDIR%%/themes/bluemoon/screen.css
-%%HORDIR%%/themes/bluewhite/screen.css
-%%HORDIR%%/themes/brown/screen.css
-%%HORDIR%%/themes/burntorange/screen.css
-%%HORDIR%%/themes/cherry/screen.css
-%%HORDIR%%/themes/cornflower/screen.css
-%%HORDIR%%/themes/fadetogreen/screen.css
-%%HORDIR%%/themes/feed-rss.xsl
-%%HORDIR%%/themes/gennevilliers/screen.css
-%%HORDIR%%/themes/graphics/addressbook_add.png
-%%HORDIR%%/themes/graphics/addressbook_browse.png
-%%HORDIR%%/themes/graphics/apple.png
-%%HORDIR%%/themes/graphics/attachment.png
-%%HORDIR%%/themes/graphics/audio/doorbell.wav
-%%HORDIR%%/themes/graphics/audio/gnid3.wav
-%%HORDIR%%/themes/graphics/audio/jetsndb.wav
-%%HORDIR%%/themes/graphics/audio/reminder.wav
-%%HORDIR%%/themes/graphics/audio/theetone.wav
-%%HORDIR%%/themes/graphics/compose.png
-%%HORDIR%%/themes/graphics/empty_spam.png
-%%HORDIR%%/themes/graphics/empty_trash.png
-%%HORDIR%%/themes/graphics/encrypted.png
-%%HORDIR%%/themes/graphics/expand.png
-%%HORDIR%%/themes/graphics/favicon.ico
-%%HORDIR%%/themes/graphics/fetchmail.png
-%%HORDIR%%/themes/graphics/filters.png
-%%HORDIR%%/themes/graphics/folders/drafts.png
-%%HORDIR%%/themes/graphics/folders/folder.png
-%%HORDIR%%/themes/graphics/folders/folder_create.png
-%%HORDIR%%/themes/graphics/folders/folder_delete.png
-%%HORDIR%%/themes/graphics/folders/folder_edit.png
-%%HORDIR%%/themes/graphics/folders/folder_open.png
-%%HORDIR%%/themes/graphics/folders/inbox.png
-%%HORDIR%%/themes/graphics/folders/sent.png
-%%HORDIR%%/themes/graphics/folders/spam.png
-%%HORDIR%%/themes/graphics/folders/trash.png
-%%HORDIR%%/themes/graphics/imp.png
-%%HORDIR%%/themes/graphics/loading.gif
-%%HORDIR%%/themes/graphics/mail_answered.png
-%%HORDIR%%/themes/graphics/mail_clearflag.png
-%%HORDIR%%/themes/graphics/mail_deleted.png
-%%HORDIR%%/themes/graphics/mail_draft.png
-%%HORDIR%%/themes/graphics/mail_flagged.png
-%%HORDIR%%/themes/graphics/mail_forwarded.png
-%%HORDIR%%/themes/graphics/mail_personal.png
-%%HORDIR%%/themes/graphics/mail_priority_high.png
-%%HORDIR%%/themes/graphics/mail_priority_low.png
-%%HORDIR%%/themes/graphics/mail_seen.png
-%%HORDIR%%/themes/graphics/mail_unseen.png
-%%HORDIR%%/themes/graphics/manage_attachments.png
-%%HORDIR%%/themes/graphics/mime/binary.png
-%%HORDIR%%/themes/graphics/mime/compressed.png
-%%HORDIR%%/themes/graphics/mime/encryption.png
-%%HORDIR%%/themes/graphics/mime/html.png
-%%HORDIR%%/themes/graphics/mime/image.png
-%%HORDIR%%/themes/graphics/mime/itip.png
-%%HORDIR%%/themes/graphics/mime/mail.png
-%%HORDIR%%/themes/graphics/mime/text.png
-%%HORDIR%%/themes/graphics/mini-error.png
-%%HORDIR%%/themes/graphics/newmail.png
-%%HORDIR%%/themes/graphics/popdown.png
-%%HORDIR%%/themes/graphics/redbox_spinner.gif
-%%HORDIR%%/themes/graphics/shared.png
-%%HORDIR%%/themes/graphics/signed.png
-%%HORDIR%%/themes/graphics/spacer_red.png
-%%HORDIR%%/themes/graphics/spellcheck.png
-%%HORDIR%%/themes/green/screen.css
-%%HORDIR%%/themes/grey/screen.css
-%%HORDIR%%/themes/ideas/screen.css
-%%HORDIR%%/themes/lavander/screen.css
-%%HORDIR%%/themes/luc/screen.css
-%%HORDIR%%/themes/lucblue/screen.css
-%%HORDIR%%/themes/mozilla/screen.css
-%%HORDIR%%/themes/postnuke/screen.css
-%%HORDIR%%/themes/rtl.css
-%%HORDIR%%/themes/screen.css
-%%HORDIR%%/themes/silver/graphics/addressbook_add.png
-%%HORDIR%%/themes/silver/graphics/addressbook_browse.png
-%%HORDIR%%/themes/silver/graphics/apple.png
-%%HORDIR%%/themes/silver/graphics/attachment.png
-%%HORDIR%%/themes/silver/graphics/audio/doorbell.wav
-%%HORDIR%%/themes/silver/graphics/audio/gnid3.wav
-%%HORDIR%%/themes/silver/graphics/audio/jetsndb.wav
-%%HORDIR%%/themes/silver/graphics/audio/reminder.wav
-%%HORDIR%%/themes/silver/graphics/audio/theetone.wav
-%%HORDIR%%/themes/silver/graphics/compose.png
-%%HORDIR%%/themes/silver/graphics/empty_spam.png
-%%HORDIR%%/themes/silver/graphics/empty_trash.png
-%%HORDIR%%/themes/silver/graphics/encrypted.png
-%%HORDIR%%/themes/silver/graphics/expand.png
-%%HORDIR%%/themes/silver/graphics/favicon.ico
-%%HORDIR%%/themes/silver/graphics/fetchmail.png
-%%HORDIR%%/themes/silver/graphics/filters.png
-%%HORDIR%%/themes/silver/graphics/folders/drafts.png
-%%HORDIR%%/themes/silver/graphics/folders/folder.png
-%%HORDIR%%/themes/silver/graphics/folders/folder_create.png
-%%HORDIR%%/themes/silver/graphics/folders/folder_delete.png
-%%HORDIR%%/themes/silver/graphics/folders/folder_edit.png
-%%HORDIR%%/themes/silver/graphics/folders/folder_open.png
-%%HORDIR%%/themes/silver/graphics/folders/inbox.png
-%%HORDIR%%/themes/silver/graphics/folders/sent.png
-%%HORDIR%%/themes/silver/graphics/folders/spam.png
-%%HORDIR%%/themes/silver/graphics/folders/trash.png
-%%HORDIR%%/themes/silver/graphics/imp.png
-%%HORDIR%%/themes/silver/graphics/loading.gif
-%%HORDIR%%/themes/silver/graphics/mail_answered.png
-%%HORDIR%%/themes/silver/graphics/mail_clearflag.png
-%%HORDIR%%/themes/silver/graphics/mail_deleted.png
-%%HORDIR%%/themes/silver/graphics/mail_draft.png
-%%HORDIR%%/themes/silver/graphics/mail_flagged.png
-%%HORDIR%%/themes/silver/graphics/mail_forwarded.png
-%%HORDIR%%/themes/silver/graphics/mail_personal.png
-%%HORDIR%%/themes/silver/graphics/mail_priority_high.png
-%%HORDIR%%/themes/silver/graphics/mail_priority_low.png
-%%HORDIR%%/themes/silver/graphics/mail_seen.png
-%%HORDIR%%/themes/silver/graphics/mail_unseen.png
-%%HORDIR%%/themes/silver/graphics/manage_attachments.png
-%%HORDIR%%/themes/silver/graphics/mime/binary.png
-%%HORDIR%%/themes/silver/graphics/mime/compressed.png
-%%HORDIR%%/themes/silver/graphics/mime/encryption.png
-%%HORDIR%%/themes/silver/graphics/mime/html.png
-%%HORDIR%%/themes/silver/graphics/mime/image.png
-%%HORDIR%%/themes/silver/graphics/mime/itip.png
-%%HORDIR%%/themes/silver/graphics/mime/mail.png
-%%HORDIR%%/themes/silver/graphics/mime/text.png
-%%HORDIR%%/themes/silver/graphics/mini-error.png
-%%HORDIR%%/themes/silver/graphics/newmail.png
-%%HORDIR%%/themes/silver/graphics/popdown.png
-%%HORDIR%%/themes/silver/graphics/redbox_spinner.gif
-%%HORDIR%%/themes/silver/graphics/shared.png
-%%HORDIR%%/themes/silver/graphics/signed.png
-%%HORDIR%%/themes/silver/graphics/spacer_red.png
-%%HORDIR%%/themes/silver/graphics/spellcheck.png
-%%HORDIR%%/themes/silver/screen.css
-%%HORDIR%%/themes/silver/themed_graphics
-%%HORDIR%%/themes/simplex/screen.css
-%%HORDIR%%/themes/sun/screen.css
-%%HORDIR%%/themes/tango-blue/graphics/addressbook-blue.png
-%%HORDIR%%/themes/tango-blue/graphics/addressbook-red.png
-%%HORDIR%%/themes/tango-blue/graphics/addressbook_add.png
-%%HORDIR%%/themes/tango-blue/graphics/addressbook_browse.png
-%%HORDIR%%/themes/tango-blue/graphics/apple.png
-%%HORDIR%%/themes/tango-blue/graphics/attachment.png
-%%HORDIR%%/themes/tango-blue/graphics/audio/doorbell.wav
-%%HORDIR%%/themes/tango-blue/graphics/audio/gnid3.wav
-%%HORDIR%%/themes/tango-blue/graphics/audio/jetsndb.wav
-%%HORDIR%%/themes/tango-blue/graphics/audio/reminder.wav
-%%HORDIR%%/themes/tango-blue/graphics/audio/theetone.wav
-%%HORDIR%%/themes/tango-blue/graphics/az.png
-%%HORDIR%%/themes/tango-blue/graphics/compose.png
-%%HORDIR%%/themes/tango-blue/graphics/empty_spam.png
-%%HORDIR%%/themes/tango-blue/graphics/empty_trash.png
-%%HORDIR%%/themes/tango-blue/graphics/encrypted.png
-%%HORDIR%%/themes/tango-blue/graphics/expand.png
-%%HORDIR%%/themes/tango-blue/graphics/favicon.ico
-%%HORDIR%%/themes/tango-blue/graphics/fetchmail.png
-%%HORDIR%%/themes/tango-blue/graphics/filters.png
-%%HORDIR%%/themes/tango-blue/graphics/folders/drafts.png
-%%HORDIR%%/themes/tango-blue/graphics/folders/folder.png
-%%HORDIR%%/themes/tango-blue/graphics/folders/folder_open.png
-%%HORDIR%%/themes/tango-blue/graphics/folders/inbox.png
-%%HORDIR%%/themes/tango-blue/graphics/folders/sent.png
-%%HORDIR%%/themes/tango-blue/graphics/folders/spam.png
-%%HORDIR%%/themes/tango-blue/graphics/folders/trash.png
-%%HORDIR%%/themes/tango-blue/graphics/forward.png
-%%HORDIR%%/themes/tango-blue/graphics/imp.png
-%%HORDIR%%/themes/tango-blue/graphics/loading.gif
-%%HORDIR%%/themes/tango-blue/graphics/mail_answered.png
-%%HORDIR%%/themes/tango-blue/graphics/mail_deleted.png
-%%HORDIR%%/themes/tango-blue/graphics/mail_draft.png
-%%HORDIR%%/themes/tango-blue/graphics/mail_flagged.png
-%%HORDIR%%/themes/tango-blue/graphics/mail_personal.png
-%%HORDIR%%/themes/tango-blue/graphics/mail_priority_high.png
-%%HORDIR%%/themes/tango-blue/graphics/mail_priority_low.png
-%%HORDIR%%/themes/tango-blue/graphics/mail_unseen.png
-%%HORDIR%%/themes/tango-blue/graphics/manage_attachments.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/audio.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/binary.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/compressed.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/deb.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/encryption.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/html.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/icalendar.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/image.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/itip.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/mail.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/msexcel.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/mspowerpoint.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/msword.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/ooo_calc.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/ooo_draw.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/ooo_impress.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/ooo_math.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/ooo_writer.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/pdf.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/php.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/rpm.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/script-js.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/source-c.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/source-cpp.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/source-h.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/source-java.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/source-python.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/text.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/vcard.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/video.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/xml.png
-%%HORDIR%%/themes/tango-blue/graphics/newmail.png
-%%HORDIR%%/themes/tango-blue/graphics/reply.png
-%%HORDIR%%/themes/tango-blue/graphics/shared.png
-%%HORDIR%%/themes/tango-blue/graphics/signed.png
-%%HORDIR%%/themes/tango-blue/graphics/spacer_red.png
-%%HORDIR%%/themes/tango-blue/graphics/spellcheck.png
-%%HORDIR%%/themes/tango-blue/graphics/za.png
-%%HORDIR%%/themes/tango-blue/screen.css
-%%HORDIR%%/themes/tango-blue/themed_graphics
-%%HORDIR%%/thread.php
-%%HORDIR%%/view.php
-@dirrm %%HORDIR%%/themes/tango-blue/graphics/mime
-@dirrm %%HORDIR%%/themes/tango-blue/graphics/folders
-@dirrm %%HORDIR%%/themes/tango-blue/graphics/audio
-@dirrm %%HORDIR%%/themes/tango-blue/graphics
-@dirrm %%HORDIR%%/themes/tango-blue
-@dirrm %%HORDIR%%/themes/sun
-@dirrm %%HORDIR%%/themes/simplex
-@dirrm %%HORDIR%%/themes/silver/graphics/mime
-@dirrm %%HORDIR%%/themes/silver/graphics/folders
-@dirrm %%HORDIR%%/themes/silver/graphics/audio
-@dirrm %%HORDIR%%/themes/silver/graphics
-@dirrm %%HORDIR%%/themes/silver
-@dirrm %%HORDIR%%/themes/postnuke
-@dirrm %%HORDIR%%/themes/mozilla
-@dirrm %%HORDIR%%/themes/lucblue
-@dirrm %%HORDIR%%/themes/luc
-@dirrm %%HORDIR%%/themes/lavander
-@dirrm %%HORDIR%%/themes/ideas
-@dirrm %%HORDIR%%/themes/grey
-@dirrm %%HORDIR%%/themes/green
-@dirrm %%HORDIR%%/themes/graphics/mime
-@dirrm %%HORDIR%%/themes/graphics/folders
-@dirrm %%HORDIR%%/themes/graphics/audio
-@dirrm %%HORDIR%%/themes/graphics
-@dirrm %%HORDIR%%/themes/gennevilliers
-@dirrm %%HORDIR%%/themes/fadetogreen
-@dirrm %%HORDIR%%/themes/cornflower
-@dirrm %%HORDIR%%/themes/cherry
-@dirrm %%HORDIR%%/themes/burntorange
-@dirrm %%HORDIR%%/themes/brown
-@dirrm %%HORDIR%%/themes/bluewhite
-@dirrm %%HORDIR%%/themes/bluemoon
-@dirrm %%HORDIR%%/themes/azur
-@dirrm %%HORDIR%%/themes
-@dirrm %%HORDIR%%/templates/thread
-@dirrm %%HORDIR%%/templates/stationery
-@dirrm %%HORDIR%%/templates/smime
-@dirrm %%HORDIR%%/templates/search
-@dirrm %%HORDIR%%/templates/saveimage
-@dirrm %%HORDIR%%/templates/rss
-@dirrm %%HORDIR%%/templates/quota
-@dirrm %%HORDIR%%/templates/prefs
-@dirrm %%HORDIR%%/templates/pgp
-@dirrm %%HORDIR%%/templates/newmsg
-@dirrm %%HORDIR%%/templates/message
-@dirrm %%HORDIR%%/templates/mailbox
-@dirrm %%HORDIR%%/templates/login
-@dirrm %%HORDIR%%/templates/javascript
-@dirrm %%HORDIR%%/templates/folders
-@dirrm %%HORDIR%%/templates/filters
-@dirrm %%HORDIR%%/templates/fetchmail
-@dirrm %%HORDIR%%/templates/contacts
-@dirrm %%HORDIR%%/templates/compose
-@dirrm %%HORDIR%%/templates/acl
-@dirrm %%HORDIR%%/templates
-@dirrm %%HORDIR%%/scripts/upgrades
-@dirrm %%HORDIR%%/scripts/sql
-@dirrm %%HORDIR%%/scripts
-@dirrm %%HORDIR%%/po
-@dirrm %%HORDIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_TW
-@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_CN
-@dirrm %%HORDIR%%/locale/uk_UA/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/uk_UA
-@dirrm %%HORDIR%%/locale/tr_TR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/tr_TR
-@dirrm %%HORDIR%%/locale/th_TH/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/th_TH
-@dirrm %%HORDIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sv_SE
-@dirrm %%HORDIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sl_SI
-@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sk_SK
-@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ru_RU
-@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ro_RO
-@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_PT
-@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_BR
-@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pl_PL
-@dirrm %%HORDIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nn_NO
-@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nl_NL
-@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nb_NO
-@dirrm %%HORDIR%%/locale/mk_MK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/mk_MK
-@dirrm %%HORDIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lv_LV
-@dirrm %%HORDIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lt_LT
-@dirrm %%HORDIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ko_KR
-@dirrm %%HORDIR%%/locale/km_KH/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/km_KH
-@dirrm %%HORDIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ja_JP
-@dirrm %%HORDIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/it_IT
-@dirrm %%HORDIR%%/locale/is_IS/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/is_IS
-@dirrm %%HORDIR%%/locale/id_ID/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/id_ID
-@dirrm %%HORDIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/hu_HU
-@dirrm %%HORDIR%%/locale/he_IL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/he_IL
-@dirrm %%HORDIR%%/locale/gl_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/gl_ES
-@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fr_FR
-@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fi_FI
-@dirrm %%HORDIR%%/locale/fa_IR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fa_IR
-@dirrm %%HORDIR%%/locale/et_EE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/et_EE
-@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/es_ES
-@dirrm %%HORDIR%%/locale/en_US
-@dirrm %%HORDIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/el_GR
-@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/de_DE
-@dirrm %%HORDIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/da_DK
-@dirrm %%HORDIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/cs_CZ
-@dirrm %%HORDIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ca_ES
-@dirrm %%HORDIR%%/locale/bs_BA/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/bs_BA
-@dirrm %%HORDIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/bg_BG
-@dirrm %%HORDIR%%/locale/ar_SY/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ar_SY
-@dirrm %%HORDIR%%/locale/ar_OM/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ar_OM
-@dirrm %%HORDIR%%/locale
-@dirrm %%HORDIR%%/lib/tests
-@dirrm %%HORDIR%%/lib/UI
-@dirrm %%HORDIR%%/lib/SpellChecker
-@dirrm %%HORDIR%%/lib/Sentmail
-@dirrm %%HORDIR%%/lib/Quota
-@dirrm %%HORDIR%%/lib/Notification/Listener
-@dirrm %%HORDIR%%/lib/Notification
-@dirrm %%HORDIR%%/lib/Maintenance/Task
-@dirrm %%HORDIR%%/lib/Maintenance
-@dirrm %%HORDIR%%/lib/MIME/Viewer
-@dirrm %%HORDIR%%/lib/MIME
-@dirrm %%HORDIR%%/lib/Imple
-@dirrm %%HORDIR%%/lib/Identity
-@dirrm %%HORDIR%%/lib/IMAP/ACL
-@dirrm %%HORDIR%%/lib/IMAP
-@dirrm %%HORDIR%%/lib/Fetchmail
-@dirrm %%HORDIR%%/lib/Crypt
-@dirrm %%HORDIR%%/lib/Block
-@dirrm %%HORDIR%%/lib/Auth
-@dirrm %%HORDIR%%/lib
-@dirrm %%HORDIR%%/js/src
-@dirrm %%HORDIR%%/js
-@dirrmtry %%HORDIR%%/config
-@dirrmtry %%HORDIR%%
-@dirrmtry %%HORBAS%%
diff --git a/mail/horde4-ingo/Makefile b/mail/horde4-ingo/Makefile
deleted file mode 100644
index 37f813df125e..000000000000
--- a/mail/horde4-ingo/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# Ports collection makefile for: Ingo
-# Date created: Dec 3, 2004
-# Whom: Thierry Thomas (<thierry@pompo.net>)
-#
-# $FreeBSD$
-#
-
-PORTNAME= ingo
-PORTVERSION= 1.2
-DISTVERSIONSUFFIX= -rc2
-CATEGORIES= mail www
-
-MAINTAINER= beech@FreeBSD.org
-COMMENT= Email-filter management application
-
-#-----------------------------------------------------------------------
-# You may define this option:
-#
-# - WITH_SIEVE : if you run timsieved (with Cyrus).
-#
-#-----------------------------------------------------------------------
-
-.if defined(WITH_SIEVE) || exists(${LOCALBASE}/cyrus/bin/timsieved)
-RUN_DEPENDS+= ${PEARDIR}/Net/Sieve.php:${PORTSDIR}/net/pear-Net_Sieve
-.endif
-
-USE_PHP= imap
-USE_HORDE= base pkg-message
-USE_GETTEXT= yes
-PORTDOCS= README CHANGES CREDITS INSTALL RELEASE_NOTES TODO
-
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
-.include <bsd.port.mk>
diff --git a/mail/horde4-ingo/distinfo b/mail/horde4-ingo/distinfo
deleted file mode 100644
index 139041f8b661..000000000000
--- a/mail/horde4-ingo/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ingo-h3-1.2-rc2.tar.gz) = e281ee9abd11eee907b0e67f2ff36d3f
-SHA256 (ingo-h3-1.2-rc2.tar.gz) = b4b0aa60d4d3a0fe158532b4f8b9c1e0f1416ea0a6ae6cf1a3fe5fb67258b72d
-SIZE (ingo-h3-1.2-rc2.tar.gz) = 1702873
diff --git a/mail/horde4-ingo/files/patch-lib_Script_procmail.php b/mail/horde4-ingo/files/patch-lib_Script_procmail.php
deleted file mode 100644
index b81c2f3f18f6..000000000000
--- a/mail/horde4-ingo/files/patch-lib_Script_procmail.php
+++ /dev/null
@@ -1,21 +0,0 @@
---- lib/Script/procmail.php.orig 2007-08-21 17:51:56.000000000 -0800
-+++ lib/Script/procmail.php 2007-12-04 00:37:57.000000000 -0900
-@@ -434,9 +434,15 @@
- $this->_action[] = '{';
- foreach ($params['action-value']['addresses'] as $address) {
- if (!empty($address)) {
-- $this->_action[] = ' FILEDATE=`test -f \'.vacation.' . $address . '\' && '
-- . 'ls -lcn --time-style=+%s \'.vacation.' . $address . '\' | '
-- . 'awk \'{ print $6 + (' . $days * 86400 . ') }\'`';
-+/***** This bit does not work with FreeBSD
-+* $this->_action[] = ' FILEDATE=`test -f \'.vacation.' . $address . '\' && '
-+* . 'ls -lcn --time-style=+%s \'.vacation.' . $address . '\' | '
-+* . 'awk \'{ print $6 + (' . $days * 86400 . ') }\'`';
-+*/
-+ $this->_action[] = ' FDATE=`ls -lcnT \'.vacation.' . $address
-+ . '\' 2> /dev/null | awk \'{ print $6, $7, $8, $9; }\'`';
-+ $this->_action[] = ' FILEDATE=`date -j -f "%b %d %H:%M:%S %Y" "$FDATE" +%s '
-+ . ' | awk \'{ print $1 + (' . $days * 86400 . ') }\'`';
- $this->_action[] = ' DATE=`date +%s`';
- $this->_action[] = ' DUMMY=`test -f \'.vacation.' . $address . '\' && '
- . 'test $FILEDATE -le $DATE && '
diff --git a/mail/horde4-ingo/pkg-descr b/mail/horde4-ingo/pkg-descr
deleted file mode 100644
index 382bea7a8f2d..000000000000
--- a/mail/horde4-ingo/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Ingo is an email-filter management application.
-
-It is fully internationalized, integrated with Horde and the IMP Webmail
-client, and supports both server-side (Sieve, procmail) and client-side
-(IMAP) rule creation.
-
-WWW: http://horde.org/ingo/
diff --git a/mail/horde4-ingo/pkg-plist b/mail/horde4-ingo/pkg-plist
deleted file mode 100644
index c667c6c1fc86..000000000000
--- a/mail/horde4-ingo/pkg-plist
+++ /dev/null
@@ -1,264 +0,0 @@
-%%HORDIR%%/blacklist.php
-%%HORDIR%%/config/.htaccess
-%%HORDIR%%/config/backends.php.dist
-%%HORDIR%%/config/conf.xml
-%%HORDIR%%/config/fields.php.dist
-%%HORDIR%%/config/hooks.php.dist
-%%HORDIR%%/config/prefs.php.dist
-%%HORDIR%%/filters.php
-%%HORDIR%%/forward.php
-%%HORDIR%%/index.php
-%%HORDIR%%/js/prototype.js
-%%HORDIR%%/js/src/prototype.js
-%%HORDIR%%/js/src/stripe.js
-%%HORDIR%%/js/stripe.js
-%%HORDIR%%/lib/Block/overview.php
-%%HORDIR%%/lib/Driver.php
-%%HORDIR%%/lib/Driver/ldap.php
-%%HORDIR%%/lib/Driver/null.php
-%%HORDIR%%/lib/Driver/sivtest.php
-%%HORDIR%%/lib/Driver/timsieved.php
-%%HORDIR%%/lib/Driver/vfs.php
-%%HORDIR%%/lib/IMAP/Search.php
-%%HORDIR%%/lib/Ingo.php
-%%HORDIR%%/lib/Script.php
-%%HORDIR%%/lib/Script/imap.php
-%%HORDIR%%/lib/Script/imap/live.php
-%%HORDIR%%/lib/Script/imap/mock.php
-%%HORDIR%%/lib/Script/maildrop.php
-%%HORDIR%%/lib/Script/procmail.php
-%%HORDIR%%/lib/Script/sieve.php
-%%HORDIR%%/lib/Session.php
-%%HORDIR%%/lib/Storage.php
-%%HORDIR%%/lib/Storage/mock.php
-%%HORDIR%%/lib/Storage/prefs.php
-%%HORDIR%%/lib/Storage/sql.php
-%%HORDIR%%/lib/Template.php
-%%HORDIR%%/lib/UI/VarRenderer/ingo.php
-%%HORDIR%%/lib/api.php
-%%HORDIR%%/lib/base.php
-%%HORDIR%%/lib/tests/MaildropTest.php
-%%HORDIR%%/lib/tests/ProcmailTest.php
-%%HORDIR%%/lib/tests/ScriptTest.php
-%%HORDIR%%/lib/tests/SieveTest.php
-%%HORDIR%%/lib/tests/TestBase.php
-%%HORDIR%%/lib/tests/_data/from_spammer
-%%HORDIR%%/lib/tests/_data/not_from_spammer
-%%HORDIR%%/lib/version.php
-%%HORDIR%%/locale/ca_ES/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/ca_ES/help.xml
-%%HORDIR%%/locale/cs_CZ/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/da_DK/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/de_DE/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/de_DE/help.xml
-%%HORDIR%%/locale/el_GR/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/en_US/help.xml
-%%HORDIR%%/locale/es_ES/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/es_ES/help.xml
-%%HORDIR%%/locale/et_EE/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/fi_FI/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/fi_FI/help.xml
-%%HORDIR%%/locale/fr_FR/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/fr_FR/help.xml
-%%HORDIR%%/locale/hu_HU/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/it_IT/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/ja_JP/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/ko_KR/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/lt_LT/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/lv_LV/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/lv_LV/help.xml
-%%HORDIR%%/locale/nb_NO/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/nl_NL/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/pl_PL/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/pt_BR/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/pt_PT/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/ro_RO/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/sl_SI/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/sv_SE/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/tr_TR/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/uk_UA/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/zh_CN/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/zh_TW/LC_MESSAGES/ingo.mo
-%%HORDIR%%/po/README
-%%HORDIR%%/po/ca_ES.po
-%%HORDIR%%/po/cs_CZ.po
-%%HORDIR%%/po/da_DK.po
-%%HORDIR%%/po/de_DE.po
-%%HORDIR%%/po/el_GR.po
-%%HORDIR%%/po/es_ES.po
-%%HORDIR%%/po/et_EE.po
-%%HORDIR%%/po/fi_FI.po
-%%HORDIR%%/po/fr_FR.po
-%%HORDIR%%/po/hu_HU.po
-%%HORDIR%%/po/ingo.pot
-%%HORDIR%%/po/it_IT.po
-%%HORDIR%%/po/ja_JP.po
-%%HORDIR%%/po/ko_KR.po
-%%HORDIR%%/po/lt_LT.po
-%%HORDIR%%/po/lv_LV.po
-%%HORDIR%%/po/nb_NO.po
-%%HORDIR%%/po/nl_NL.po
-%%HORDIR%%/po/pl_PL.po
-%%HORDIR%%/po/pt_BR.po
-%%HORDIR%%/po/pt_PT.po
-%%HORDIR%%/po/ro_RO.po
-%%HORDIR%%/po/sl_SI.po
-%%HORDIR%%/po/sv_SE.po
-%%HORDIR%%/po/tr_TR.po
-%%HORDIR%%/po/uk_UA.po
-%%HORDIR%%/po/zh_CN.po
-%%HORDIR%%/po/zh_TW.po
-%%HORDIR%%/rule.php
-%%HORDIR%%/script.php
-%%HORDIR%%/scripts/.htaccess
-%%HORDIR%%/scripts/convert_imp_filters.php
-%%HORDIR%%/scripts/ingo-postfix-policyd
-%%HORDIR%%/scripts/sql/ingo.oci8.sql
-%%HORDIR%%/scripts/sql/ingo.sql
-%%HORDIR%%/scripts/upgrades/convert_prefs_to_sql.php
-%%HORDIR%%/spam.php
-%%HORDIR%%/templates/blacklist/blacklist.inc
-%%HORDIR%%/templates/common-header.inc
-%%HORDIR%%/templates/filters/filter-none.inc
-%%HORDIR%%/templates/filters/filter.html
-%%HORDIR%%/templates/filters/footer.inc
-%%HORDIR%%/templates/filters/header.inc
-%%HORDIR%%/templates/filters/settings.inc
-%%HORDIR%%/templates/javascript/new_folder.js
-%%HORDIR%%/templates/menu.inc
-%%HORDIR%%/templates/rule/filter.inc
-%%HORDIR%%/templates/rule/footer.inc
-%%HORDIR%%/templates/rule/header.inc
-%%HORDIR%%/templates/script/activate.inc
-%%HORDIR%%/templates/script/footer.inc
-%%HORDIR%%/templates/script/header.inc
-%%HORDIR%%/templates/script/script.inc
-%%HORDIR%%/templates/whitelist/whitelist.inc
-%%HORDIR%%/test.php
-%%HORDIR%%/themes/graphics/blacklist.png
-%%HORDIR%%/themes/graphics/copy.png
-%%HORDIR%%/themes/graphics/disable.png
-%%HORDIR%%/themes/graphics/enable.png
-%%HORDIR%%/themes/graphics/favicon.ico
-%%HORDIR%%/themes/graphics/forward.png
-%%HORDIR%%/themes/graphics/ingo.png
-%%HORDIR%%/themes/graphics/script.png
-%%HORDIR%%/themes/graphics/spam.png
-%%HORDIR%%/themes/graphics/vacation.png
-%%HORDIR%%/themes/graphics/whitelist.png
-%%HORDIR%%/themes/screen.css
-%%HORDIR%%/themes/silver/graphics/blacklist.png
-%%HORDIR%%/themes/silver/graphics/copy.png
-%%HORDIR%%/themes/silver/graphics/disable.png
-%%HORDIR%%/themes/silver/graphics/enable.png
-%%HORDIR%%/themes/silver/graphics/favicon.ico
-%%HORDIR%%/themes/silver/graphics/forward.png
-%%HORDIR%%/themes/silver/graphics/ingo.png
-%%HORDIR%%/themes/silver/graphics/script.png
-%%HORDIR%%/themes/silver/graphics/spam.png
-%%HORDIR%%/themes/silver/graphics/vacation.png
-%%HORDIR%%/themes/silver/graphics/whitelist.png
-%%HORDIR%%/themes/silver/themed_graphics
-%%HORDIR%%/themes/tango-blue/graphics/blacklist.png
-%%HORDIR%%/themes/tango-blue/graphics/copy.png
-%%HORDIR%%/themes/tango-blue/graphics/disable.png
-%%HORDIR%%/themes/tango-blue/graphics/enable.png
-%%HORDIR%%/themes/tango-blue/graphics/favicon.ico
-%%HORDIR%%/themes/tango-blue/graphics/forward.png
-%%HORDIR%%/themes/tango-blue/graphics/ingo.png
-%%HORDIR%%/themes/tango-blue/graphics/script.png
-%%HORDIR%%/themes/tango-blue/graphics/spam.png
-%%HORDIR%%/themes/tango-blue/graphics/vacation.png
-%%HORDIR%%/themes/tango-blue/graphics/whitelist.png
-%%HORDIR%%/themes/tango-blue/themed_graphics
-%%HORDIR%%/vacation.php
-%%HORDIR%%/whitelist.php
-@dirrm %%HORDIR%%/themes/tango-blue/graphics
-@dirrm %%HORDIR%%/themes/tango-blue
-@dirrm %%HORDIR%%/themes/silver/graphics
-@dirrm %%HORDIR%%/themes/silver
-@dirrm %%HORDIR%%/themes/graphics
-@dirrm %%HORDIR%%/themes
-@dirrm %%HORDIR%%/templates/whitelist
-@dirrm %%HORDIR%%/templates/script
-@dirrm %%HORDIR%%/templates/rule
-@dirrm %%HORDIR%%/templates/javascript
-@dirrm %%HORDIR%%/templates/filters
-@dirrm %%HORDIR%%/templates/blacklist
-@dirrm %%HORDIR%%/templates
-@dirrm %%HORDIR%%/scripts/upgrades
-@dirrm %%HORDIR%%/scripts/sql
-@dirrm %%HORDIR%%/scripts
-@dirrm %%HORDIR%%/po
-@dirrm %%HORDIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_TW
-@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_CN
-@dirrm %%HORDIR%%/locale/uk_UA/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/uk_UA
-@dirrm %%HORDIR%%/locale/tr_TR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/tr_TR
-@dirrm %%HORDIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sv_SE
-@dirrm %%HORDIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sl_SI
-@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ro_RO
-@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_PT
-@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_BR
-@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pl_PL
-@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nl_NL
-@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nb_NO
-@dirrm %%HORDIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lv_LV
-@dirrm %%HORDIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lt_LT
-@dirrm %%HORDIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ko_KR
-@dirrm %%HORDIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ja_JP
-@dirrm %%HORDIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/it_IT
-@dirrm %%HORDIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/hu_HU
-@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fr_FR
-@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fi_FI
-@dirrm %%HORDIR%%/locale/et_EE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/et_EE
-@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/es_ES
-@dirrm %%HORDIR%%/locale/en_US
-@dirrm %%HORDIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/el_GR
-@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/de_DE
-@dirrm %%HORDIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/da_DK
-@dirrm %%HORDIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/cs_CZ
-@dirrm %%HORDIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ca_ES
-@dirrm %%HORDIR%%/locale
-@dirrm %%HORDIR%%/lib/tests/_data
-@dirrm %%HORDIR%%/lib/tests
-@dirrm %%HORDIR%%/lib/UI/VarRenderer
-@dirrm %%HORDIR%%/lib/UI
-@dirrm %%HORDIR%%/lib/Storage
-@dirrm %%HORDIR%%/lib/Script/imap
-@dirrm %%HORDIR%%/lib/Script
-@dirrm %%HORDIR%%/lib/IMAP
-@dirrm %%HORDIR%%/lib/Driver
-@dirrm %%HORDIR%%/lib/Block
-@dirrm %%HORDIR%%/lib
-@dirrm %%HORDIR%%/js/src
-@dirrm %%HORDIR%%/js
-@dirrmtry %%HORDIR%%/config
-@dirrmtry %%HORDIR%%
-@dirrmtry %%HORBAS%%
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
deleted file mode 100644
index 3282a017c37a..000000000000
--- a/mail/horde4-turba/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Ports collection makefile for: turba
-# Date created: Sat Nov 16, 2001
-# Whom: Thierry Thomas (<thierry@thomas.as>)
-#
-# $FreeBSD$
-#
-
-PORTNAME= turba
-PORTVERSION= 2.2
-DISTVERSIONSUFFIX= -rc3
-CATEGORIES= mail www
-
-MAINTAINER= beech@FreeBSD.org
-COMMENT= Contact management application
-
-USE_HORDE= base
-USE_PHP= ldap
-USE_GETTEXT= yes
-
-PORTDOCS= README CHANGES CREDITS INSTALL LDAP RELEASE_NOTES TODO UPGRADING
-
-pre-patch:
- @${REINPLACE_CMD} -e "s:/usr/bin/ldapadd:${LOCALBASE}/bin/ldapadd:" \
- ${WRKSRC}/scripts/ldap/addou.pl
-
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
-.include <bsd.port.mk>
diff --git a/mail/horde4-turba/distinfo b/mail/horde4-turba/distinfo
deleted file mode 100644
index af3a09b619c2..000000000000
--- a/mail/horde4-turba/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (turba-h3-2.2-rc3.tar.gz) = 2c44c85510b7b24599a725ca0271fc25
-SHA256 (turba-h3-2.2-rc3.tar.gz) = 0641a5f9603b80f4eb6b5b9932179ce03251ba115be8bc5103e8ba8cf432b822
-SIZE (turba-h3-2.2-rc3.tar.gz) = 2158573
diff --git a/mail/horde4-turba/files/patch-config::sources.php.dist b/mail/horde4-turba/files/patch-config::sources.php.dist
deleted file mode 100644
index aeb73b0e369d..000000000000
--- a/mail/horde4-turba/files/patch-config::sources.php.dist
+++ /dev/null
@@ -1,210 +0,0 @@
---- config/sources.php.dist.orig 2007-11-19 08:05:01.000000000 -0900
-+++ config/sources.php.dist 2007-12-03 23:35:17.000000000 -0900
-@@ -636,105 +636,108 @@
- // configuration at all - in case we don't have at least a 3.0.6 Horde
- // install. (In that case, be sure to change the params array below to suit
- // your needs.
--if (!empty($GLOBALS['conf']['imsp']['enabled']) ||
-- !isset($GLOBALS['conf']['imsp']['enabled'])) {
-- // First, get the user name to login to IMSP server with.
-- $_imsp_auth_user = $GLOBALS['prefs']->getValue('imsp_auth_user');
-- $_imsp_auth_pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
-- if (!strlen($_imsp_auth_user)) {
-- $_imsp_auth_user = Auth::getBareAuth();
-- $_imsp_auth_pass = Auth::getCredential('password');
-- }
-- $cfgSources['imsp'] = array(
-- 'title' => _("IMSP"),
-- 'type' => 'imsp',
-- 'params' => array(
-- 'server' => $GLOBALS['conf']['imsp']['server'],
-- 'port' => $GLOBALS['conf']['imsp']['port'],
-- 'auth_method' => $GLOBALS['conf']['imsp']['auth_method'],
-- // socket, command, and auth_mechanism are for imtest driver.
-- 'socket' => isset($GLOBALS['conf']['imsp']['socket']) ?
-- $GLOBALS['conf']['imsp']['socket'] . $_imsp_auth_user . '.sck' :
-- '',
-- 'command' => isset($GLOBALS['conf']['imsp']['command']) ?
-- $GLOBALS['conf']['imsp']['command'] : '' ,
-- 'auth_mechanism' => isset($GLOBALS['conf']['imsp']['auth_mechanism']) ?
-- $GLOBALS['conf']['imsp']['auth_mechanism'] : '',
-- 'username' => $_imsp_auth_user,
-- 'password' => $_imsp_auth_pass,
-- 'name' => $_imsp_auth_user,
-- 'group_id_field' => 'group',
-- 'group_id_value' => 'group',
-- 'contact_ownership' => false,
-- // Dynamically generated acl rights for current user.
-- 'my_rights' => '',
-- ),
-- 'map' => array(
-- '__key' => 'name',
-- '__type' => '__type',
-- '__members' => '__members',
-- '__owner' => '__owner',
-- '__uid' => '__uid',
-- 'name' => 'fullname',
-- 'email' => 'email',
-- 'alias' => 'alias',
-- 'company' => 'company',
-- 'notes' => 'notes',
-- 'workPhone' => 'phone-work',
-- 'fax' => 'fax',
-- 'homePhone' => 'phone-home',
-- 'cellPhone' => 'cellphone',
-- 'freebusyUrl' => 'freebusyUrl'
-- ),
-- 'search' => array(
-- 'name',
-- 'email',
-- 'alias',
-- 'company',
-- 'homePhone'
-- ),
-- 'strict' => array(),
-- 'export' => true,
-- 'browse' => true,
-- 'use_shares' => false,
-- );
--
-- /**
-- * Get any other address books this user might be privy to.
-- * The values for attributes such as 'export' and 'browse' for books
-- * that are added below will be the same as the values set in the default
-- * book above. Any entries defined explicitly in cfgSources[]
-- * will override any entries gathered dynamically below.
-- */
-- if (empty($cfgSources['imsp']['use_shares'])) {
-- require_once 'Net/IMSP/Utils.php';
-- $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']);
--
-- if (!is_a($result, 'PEAR_Error')) {
-- $resultCount = count($result);
-- for ($i = 0; $i < $resultCount; $i++) {
-- // Make sure we didn't define this source explicitly,
-- // but set the acls from the server regardless.
-- $dup = false;
-- foreach ($cfgSources as $key => $thisSource) {
-- if (($thisSource['type'] == 'imsp') &&
-- ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
--
-- $dup = true;
-- $acl = $result[$i]['params']['my_rights'];
-- $cfgSources[$key]['params']['my_rights'] = $acl;
-- break;
-- }
-- }
-- if (!$dup) {
-- $cfgSources[$result[$i]['params']['name']] = $result[$i];
-- }
-- }
-- } else {
-- $notification->push($result);
-- }
-- }
--}
-+//UNCOMMENTIFIMSPif (!empty($GLOBALS['conf']['imsp']['enabled']) ||
-+//UNCOMMENTIFIMSP !isset($GLOBALS['conf']['imsp']['enabled'])) {
-+//UNCOMMENTIFIMSP // First, get the user name to login to IMSP server with.
-+//UNCOMMENTIFIMSP $uid = $GLOBALS['prefs']->getValue('imsp_auth_user');
-+//UNCOMMENTIFIMSP $pass = $GLOBALS['prefs']->getValue('imsp_auth_pass');
-+//UNCOMMENTIFIMSP if (!strlen($uid)) {
-+//UNCOMMENTIFIMSP $uid = Auth::getBareAuth();
-+//UNCOMMENTIFIMSP $pass = Auth::getCredential('password');
-+//UNCOMMENTIFIMSP }
-+//UNCOMMENTIFIMSP // Note we always use the horde username to append to the key even if we
-+//UNCOMMENTIFIMSP // have an alternate username set in prefs. This is to prevent the
-+//UNCOMMENTIFIMSP // (fringe) case where an IMSP username for one user might be a valid
-+//UNCOMMENTIFIMSP // horde username for another user.
-+//UNCOMMENTIFIMSP $cfgKey = 'IMSP_' . Auth::getAuth();
-+//UNCOMMENTIFIMSP $cfgSources[$cfgKey] = array(
-+//UNCOMMENTIFIMSP 'title' => _("IMSP"),
-+//UNCOMMENTIFIMSP 'type' => 'imsp',
-+//UNCOMMENTIFIMSP 'params' => array(
-+//UNCOMMENTIFIMSP 'server' => $GLOBALS['conf']['imsp']['server'],
-+//UNCOMMENTIFIMSP 'port' => $GLOBALS['conf']['imsp']['port'],
-+//UNCOMMENTIFIMSP 'auth_method' => $GLOBALS['conf']['imsp']['auth_method'],
-+//UNCOMMENTIFIMSP // socket, command, and auth_mechanism are for imtest driver.
-+//UNCOMMENTIFIMSP 'socket' => isset($GLOBALS['conf']['imsp']['socket']) ?
-+//UNCOMMENTIFIMSP $GLOBALS['conf']['imsp']['socket'] . $uid . '.sck' :
-+//UNCOMMENTIFIMSP '',
-+//UNCOMMENTIFIMSP 'command' => isset($GLOBALS['conf']['imsp']['command']) ?
-+//UNCOMMENTIFIMSP $GLOBALS['conf']['imsp']['command'] : '' ,
-+//UNCOMMENTIFIMSP 'auth_mechanism' => isset($GLOBALS['conf']['imsp']['auth_mechanism']) ?
-+//UNCOMMENTIFIMSP $GLOBALS['conf']['imsp']['auth_mechanism'] : '',
-+//UNCOMMENTIFIMSP 'username' => $uid,
-+//UNCOMMENTIFIMSP 'password' => $pass,
-+//UNCOMMENTIFIMSP 'name' => $uid,
-+//UNCOMMENTIFIMSP 'group_id_field' => 'group',
-+//UNCOMMENTIFIMSP 'group_id_value' => 'group',
-+//UNCOMMENTIFIMSP 'contact_ownership' => false,
-+//UNCOMMENTIFIMSP // Dynamically generated acl rights for current user.
-+//UNCOMMENTIFIMSP 'my_rights' => '',
-+//UNCOMMENTIFIMSP // Flags this as the user's 'root' IMSP address book.
-+//UNCOMMENTIFIMSP 'is_root' => true
-+//UNCOMMENTIFIMSP ),
-+//UNCOMMENTIFIMSP 'map' => array(
-+//UNCOMMENTIFIMSP '__key' => 'name',
-+//UNCOMMENTIFIMSP '__type' => '__type',
-+//UNCOMMENTIFIMSP '__members' => '__members',
-+//UNCOMMENTIFIMSP '__owner' => '__owner',
-+//UNCOMMENTIFIMSP '__uid' => '__uid',
-+//UNCOMMENTIFIMSP 'name' => 'fullname',
-+//UNCOMMENTIFIMSP 'email' => 'email',
-+//UNCOMMENTIFIMSP 'alias' => 'alias',
-+//UNCOMMENTIFIMSP 'company' => 'company',
-+//UNCOMMENTIFIMSP 'notes' => 'notes',
-+//UNCOMMENTIFIMSP 'workPhone' => 'phone-work',
-+//UNCOMMENTIFIMSP 'fax' => 'fax',
-+//UNCOMMENTIFIMSP 'homePhone' => 'phone-home',
-+//UNCOMMENTIFIMSP 'cellPhone' => 'cellphone',
-+//UNCOMMENTIFIMSP 'freebusyUrl' => 'freebusyUrl'
-+//UNCOMMENTIFIMSP ),
-+//UNCOMMENTIFIMSP 'search' => array(
-+//UNCOMMENTIFIMSP 'name',
-+//UNCOMMENTIFIMSP 'email',
-+//UNCOMMENTIFIMSP 'alias',+//UNCOMMENTIFIMSP 'company',
-+//UNCOMMENTIFIMSP 'homePhone'
-+//UNCOMMENTIFIMSP ),
-+//UNCOMMENTIFIMSP 'strict' => array(),
-+//UNCOMMENTIFIMSP 'export' => true,
-+//UNCOMMENTIFIMSP 'browse' => true,
-+//UNCOMMENTIFIMSP );
-+//UNCOMMENTIFIMSP
-+//UNCOMMENTIFIMSP /**
-+//UNCOMMENTIFIMSP * Get any other address books this user might be privy to.
-+//UNCOMMENTIFIMSP * The values for attributes such as 'export' and 'browse' for books
-+//UNCOMMENTIFIMSP * that are added below will be the same as the values set in the default
-+//UNCOMMENTIFIMSP * book above. Any entries defined explicitly in cfgSources[]
-+//UNCOMMENTIFIMSP * will override any entries gathered dynamically below.
-+//UNCOMMENTIFIMSP */
-+//UNCOMMENTIFIMSP require_once 'Net/IMSP/Utils.php';
-+//UNCOMMENTIFIMSP $result = Net_IMSP_Utils::getAllBooks($cfgSources[$cfgKey]);
-+//UNCOMMENTIFIMSP $count = 2;
-+//UNCOMMENTIFIMSP if (!is_a($result, 'PEAR_Error')) {
-+//UNCOMMENTIFIMSP $resultCount = count($result);
-+//UNCOMMENTIFIMSP for ($i = 0; $i < $resultCount; $i++) {
-+//UNCOMMENTIFIMSP // Make sure we didn't define this source explicitly,
-+//UNCOMMENTIFIMSP // but set the acls from the server regardless.
-+//UNCOMMENTIFIMSP $dup = false;
-+//UNCOMMENTIFIMSP foreach ($cfgSources as $key => $thisSource) {
-+//UNCOMMENTIFIMSP if (($thisSource['type'] == 'imsp') &&
-+//UNCOMMENTIFIMSP ($thisSource['params']['name'] == $result[$i]['params']['name'])) {
-+//UNCOMMENTIFIMSP
-+//UNCOMMENTIFIMSP $dup = true;
-+//UNCOMMENTIFIMSP $acl = $result[$i]['params']['my_rights'];
-+//UNCOMMENTIFIMSP $cfgSources[$key]['params']['my_rights'] = $acl;
-+//UNCOMMENTIFIMSP break;
-+//UNCOMMENTIFIMSP }
-+//UNCOMMENTIFIMSP }
-+//UNCOMMENTIFIMSP if (!$dup) {
-+//UNCOMMENTIFIMSP $cfgSources[sprintf('IMSP_%d', $count++)] = $result[$i];
-+//UNCOMMENTIFIMSP }
-+//UNCOMMENTIFIMSP }
-+//UNCOMMENTIFIMSP } else {
-+//UNCOMMENTIFIMSP $notification->push($result);
-+//UNCOMMENTIFIMSP }
-+//UNCOMMENTIFIMSP}
- /* End IMSP sources. */
-
- /* Begin Kolab sources. */
diff --git a/mail/horde4-turba/files/pkg-message.in b/mail/horde4-turba/files/pkg-message.in
deleted file mode 100644
index fac46bfb9f28..000000000000
--- a/mail/horde4-turba/files/pkg-message.in
+++ /dev/null
@@ -1,21 +0,0 @@
-************************************************************************
-Turba has been installed in %%HORDIR%% with your blank
-configuration files.
-
-Horde must be configured; if not, see `pkg_info -Dx horde'.
-
-Then, you might have to tune the configuration files located in
-%%HORCFG%%/, specially the file sources.php.
-
-Warning: if you don't use some source, deactivate it, or you could
-******** experience bad response times!
- When upgrading from Turba 2.0.x, please read UPGRADING.
-
-Then, you must login to Horde as a Horde Administrator to finish the
-configuration.
-
-You have to create a table in your database; please see
-%%HORDIR%%/scripts/.
-You might create a LDAP schema: please see the doc LDAP.
-
-************************************************************************
diff --git a/mail/horde4-turba/pkg-descr b/mail/horde4-turba/pkg-descr
deleted file mode 100644
index 7ad5e825db08..000000000000
--- a/mail/horde4-turba/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Turba is the Horde contact management application. It makes heavy use
-of the Horde framework to provide integration with other applications.
-
-Turba is a fairly complete basic contact management application.
-SQL and LDAP backends are available.
-You can define the fields in your addressbooks in a very flexible way,
-just by changing the config files.
-And there are Horde API functions to add and search for contacts.
-
-WWW: http://horde.org/turba/
diff --git a/mail/horde4-turba/pkg-plist b/mail/horde4-turba/pkg-plist
deleted file mode 100644
index 29c830b771a3..000000000000
--- a/mail/horde4-turba/pkg-plist
+++ /dev/null
@@ -1,370 +0,0 @@
-%%HORDIR%%/add.php
-%%HORDIR%%/addressbooks/create.php
-%%HORDIR%%/addressbooks/delete.php
-%%HORDIR%%/addressbooks/edit.php
-%%HORDIR%%/addressbooks/index.php
-%%HORDIR%%/browse.php
-%%HORDIR%%/config/.htaccess
-%%HORDIR%%/config/attributes.php.dist
-%%HORDIR%%/config/conf.xml
-%%HORDIR%%/config/hooks.php.dist
-%%HORDIR%%/config/menu.php.dist
-%%HORDIR%%/config/mime_drivers.php.dist
-%%HORDIR%%/config/prefs.php.dist
-%%HORDIR%%/config/sources.php.dist
-%%HORDIR%%/contact.php
-%%HORDIR%%/data.php
-%%HORDIR%%/delete.php
-%%HORDIR%%/deletefile.php
-%%HORDIR%%/edit.php
-%%HORDIR%%/index.php
-%%HORDIR%%/js/QuickFinder.js
-%%HORDIR%%/js/contact_tabs.js
-%%HORDIR%%/js/effects.js
-%%HORDIR%%/js/prototype.js
-%%HORDIR%%/js/redbox.js
-%%HORDIR%%/js/scriptaculous.js
-%%HORDIR%%/js/src/QuickFinder.js
-%%HORDIR%%/js/src/contact_tabs.js
-%%HORDIR%%/js/src/effects.js
-%%HORDIR%%/js/src/prototype.js
-%%HORDIR%%/js/src/redbox.js
-%%HORDIR%%/js/src/scriptaculous.js
-%%HORDIR%%/js/src/tables.js
-%%HORDIR%%/js/tables.js
-%%HORDIR%%/lib/.htaccess
-%%HORDIR%%/lib/Block/minisearch.php
-%%HORDIR%%/lib/Block/tree_menu.php
-%%HORDIR%%/lib/Data/ldif.php
-%%HORDIR%%/lib/Driver.php
-%%HORDIR%%/lib/Driver/favourites.php
-%%HORDIR%%/lib/Driver/group.php
-%%HORDIR%%/lib/Driver/imsp.php
-%%HORDIR%%/lib/Driver/kolab.php
-%%HORDIR%%/lib/Driver/ldap.php
-%%HORDIR%%/lib/Driver/null.php
-%%HORDIR%%/lib/Driver/prefs.php
-%%HORDIR%%/lib/Driver/share.php
-%%HORDIR%%/lib/Driver/sql.php
-%%HORDIR%%/lib/Driver/vbook.php
-%%HORDIR%%/lib/Forms/AddContact.php
-%%HORDIR%%/lib/Forms/Contact.php
-%%HORDIR%%/lib/Forms/CreateAddressBook.php
-%%HORDIR%%/lib/Forms/DeleteAddressBook.php
-%%HORDIR%%/lib/Forms/EditAddressBook.php
-%%HORDIR%%/lib/Forms/EditContact.php
-%%HORDIR%%/lib/Group.php
-%%HORDIR%%/lib/List.php
-%%HORDIR%%/lib/ListView.php
-%%HORDIR%%/lib/Maintenance/Task/upgradelists.php
-%%HORDIR%%/lib/Maintenance/Task/upgradeprefs.php
-%%HORDIR%%/lib/Object.php
-%%HORDIR%%/lib/Object/Group.php
-%%HORDIR%%/lib/Turba.php
-%%HORDIR%%/lib/Views/Browse.php
-%%HORDIR%%/lib/Views/Contact.php
-%%HORDIR%%/lib/Views/DeleteContact.php
-%%HORDIR%%/lib/Views/EditContact.php
-%%HORDIR%%/lib/api.php
-%%HORDIR%%/lib/base.php
-%%HORDIR%%/lib/prefs.php
-%%HORDIR%%/lib/tests/ApiTest.php
-%%HORDIR%%/lib/tests/BrowsePageTest.php
-%%HORDIR%%/lib/tests/DriverTest.php
-%%HORDIR%%/lib/tests/GroupTest.php
-%%HORDIR%%/lib/tests/ListTest.php
-%%HORDIR%%/lib/tests/ListViewTest.php
-%%HORDIR%%/lib/tests/TestBase.php
-%%HORDIR%%/lib/tests/ViewBrowseTest.php
-%%HORDIR%%/lib/tests/import.ldif
-%%HORDIR%%/lib/tests/importCRLF.ldif
-%%HORDIR%%/lib/tests/ldif_exportFile.phpt
-%%HORDIR%%/lib/tests/ldif_importFile.phpt
-%%HORDIR%%/lib/tests/ldif_importFileCRLF.phpt
-%%HORDIR%%/lib/tests/tohash.phpt
-%%HORDIR%%/lib/tests/tovcard.phpt
-%%HORDIR%%/lib/version.php
-%%HORDIR%%/locale/.htaccess
-%%HORDIR%%/locale/ar_SY/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/bg_BG/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/ca_ES/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/ca_ES/help.xml
-%%HORDIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/da_DK/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/de_DE/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/de_DE/help.xml
-%%HORDIR%%/locale/el_GR/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/en_US/help.xml
-%%HORDIR%%/locale/es_ES/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/es_ES/help.xml
-%%HORDIR%%/locale/et_EE/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/fa_IR/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/fa_IR/help.xml
-%%HORDIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/fi_FI/help.xml
-%%HORDIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/fr_FR/help.xml
-%%HORDIR%%/locale/gl_ES/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/hu_HU/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/is_IS/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/it_IT/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/ja_JP/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/ko_KR/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/lt_LT/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/lv_LV/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/mk_MK/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/nb_NO/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/nl_NL/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/nn_NO/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/pl_PL/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/pt_BR/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/pt_BR/help.xml
-%%HORDIR%%/locale/pt_PT/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/pt_PT/help.xml
-%%HORDIR%%/locale/ro_RO/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/ru_RU/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/sk_SK/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/sk_SK/help.xml
-%%HORDIR%%/locale/sl_SI/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/sv_SE/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/tr_TR/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/tr_TR/help.xml
-%%HORDIR%%/locale/uk_UA/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/zh_CN/LC_MESSAGES/turba.mo
-%%HORDIR%%/locale/zh_TW/LC_MESSAGES/turba.mo
-%%HORDIR%%/minisearch.php
-%%HORDIR%%/po/.htaccess
-%%HORDIR%%/po/README
-%%HORDIR%%/po/ar_SY.po
-%%HORDIR%%/po/bg_BG.po
-%%HORDIR%%/po/ca_ES.po
-%%HORDIR%%/po/cs_CZ.po
-%%HORDIR%%/po/da_DK.po
-%%HORDIR%%/po/de_DE.po
-%%HORDIR%%/po/el_GR.po
-%%HORDIR%%/po/es_ES.po
-%%HORDIR%%/po/et_EE.po
-%%HORDIR%%/po/fa_IR.po
-%%HORDIR%%/po/fi_FI.po
-%%HORDIR%%/po/fr_FR.po
-%%HORDIR%%/po/gl_ES.po
-%%HORDIR%%/po/hu_HU.po
-%%HORDIR%%/po/is_IS.po
-%%HORDIR%%/po/it_IT.po
-%%HORDIR%%/po/ja_JP.po
-%%HORDIR%%/po/ko_KR.po
-%%HORDIR%%/po/lt_LT.po
-%%HORDIR%%/po/lv_LV.po
-%%HORDIR%%/po/mk_MK.po
-%%HORDIR%%/po/nb_NO.po
-%%HORDIR%%/po/nl_NL.po
-%%HORDIR%%/po/nn_NO.po
-%%HORDIR%%/po/pl_PL.po
-%%HORDIR%%/po/pt_BR.po
-%%HORDIR%%/po/pt_PT.po
-%%HORDIR%%/po/ro_RO.po
-%%HORDIR%%/po/ru_RU.po
-%%HORDIR%%/po/sk_SK.po
-%%HORDIR%%/po/sl_SI.po
-%%HORDIR%%/po/sv_SE.po
-%%HORDIR%%/po/tr_TR.po
-%%HORDIR%%/po/turba.pot
-%%HORDIR%%/po/uk_UA.po
-%%HORDIR%%/po/zh_CN.po
-%%HORDIR%%/po/zh_TW.po
-%%HORDIR%%/scripts/.htaccess
-%%HORDIR%%/scripts/Turba.reg
-%%HORDIR%%/scripts/import_squirrelmail_abook.php
-%%HORDIR%%/scripts/import_vcards.php
-%%HORDIR%%/scripts/ldap/addou
-%%HORDIR%%/scripts/ldap/addou.pl
-%%HORDIR%%/scripts/ldap/core.schema.patch
-%%HORDIR%%/scripts/ldap/rfc2739.schema
-%%HORDIR%%/scripts/sql/test.xml
-%%HORDIR%%/scripts/sql/turba.mssql.sql
-%%HORDIR%%/scripts/sql/turba.oci8.sql
-%%HORDIR%%/scripts/sql/turba.pgsql.sql
-%%HORDIR%%/scripts/sql/turba.sql
-%%HORDIR%%/scripts/sql/turba.xml
-%%HORDIR%%/scripts/sql/turba_weddingguests.sql
-%%HORDIR%%/scripts/upgrades/1.1_to_1.2.sql
-%%HORDIR%%/scripts/upgrades/1.2_to_2.0.oci8.sql
-%%HORDIR%%/scripts/upgrades/1.2_to_2.0.sql
-%%HORDIR%%/scripts/upgrades/2.1_to_2.2_sql_schema.php
-%%HORDIR%%/scripts/upgrades/2007-06-17_flatten_shares.php
-%%HORDIR%%/scripts/upgrades/create_default_histories.php
-%%HORDIR%%/scripts/upgrades/public_to_horde_share.php
-%%HORDIR%%/search.php
-%%HORDIR%%/templates/.htaccess
-%%HORDIR%%/templates/addressbook_list.php
-%%HORDIR%%/templates/block/minisearch.inc
-%%HORDIR%%/templates/browse/actions.inc
-%%HORDIR%%/templates/browse/column_footers.inc
-%%HORDIR%%/templates/browse/column_headers.inc
-%%HORDIR%%/templates/browse/contactrow.inc
-%%HORDIR%%/templates/browse/header.inc
-%%HORDIR%%/templates/browse/javascript.inc
-%%HORDIR%%/templates/browse/row.inc
-%%HORDIR%%/templates/browse/search.inc
-%%HORDIR%%/templates/browse/search_criteria.inc
-%%HORDIR%%/templates/browse/search_vbook.inc
-%%HORDIR%%/templates/common-header.inc
-%%HORDIR%%/templates/data/export.inc
-%%HORDIR%%/templates/data/import.inc
-%%HORDIR%%/templates/list/alphaPager.inc
-%%HORDIR%%/templates/list/numPager.inc
-%%HORDIR%%/templates/menu.inc
-%%HORDIR%%/templates/prefs/addressbookselect.inc
-%%HORDIR%%/templates/prefs/columnselect.inc
-%%HORDIR%%/templates/prefs/imsp_opt.inc
-%%HORDIR%%/test.php
-%%HORDIR%%/themes/bluewhite/screen.css
-%%HORDIR%%/themes/graphics/az.png
-%%HORDIR%%/themes/graphics/az_secondary.png
-%%HORDIR%%/themes/graphics/contact.png
-%%HORDIR%%/themes/graphics/favicon.ico
-%%HORDIR%%/themes/graphics/group.png
-%%HORDIR%%/themes/graphics/menu/browse.png
-%%HORDIR%%/themes/graphics/menu/new.png
-%%HORDIR%%/themes/graphics/new.png
-%%HORDIR%%/themes/graphics/redbox_spinner.gif
-%%HORDIR%%/themes/graphics/search.png
-%%HORDIR%%/themes/graphics/turba.png
-%%HORDIR%%/themes/graphics/za.png
-%%HORDIR%%/themes/graphics/za_secondary.png
-%%HORDIR%%/themes/ideas/screen.css
-%%HORDIR%%/themes/screen.css
-%%HORDIR%%/themes/silver/graphics/az_secondary.png
-%%HORDIR%%/themes/silver/graphics/contact.png
-%%HORDIR%%/themes/silver/graphics/favicon.ico
-%%HORDIR%%/themes/silver/graphics/group.png
-%%HORDIR%%/themes/silver/graphics/menu/browse.png
-%%HORDIR%%/themes/silver/graphics/menu/new.png
-%%HORDIR%%/themes/silver/graphics/new.png
-%%HORDIR%%/themes/silver/graphics/turba.png
-%%HORDIR%%/themes/silver/graphics/za_secondary.png
-%%HORDIR%%/themes/silver/themed_graphics
-%%HORDIR%%/themes/tango-blue/graphics/az_secondary.png
-%%HORDIR%%/themes/tango-blue/graphics/contact.png
-%%HORDIR%%/themes/tango-blue/graphics/favicon.ico
-%%HORDIR%%/themes/tango-blue/graphics/group.png
-%%HORDIR%%/themes/tango-blue/graphics/menu/browse.png
-%%HORDIR%%/themes/tango-blue/graphics/menu/new.png
-%%HORDIR%%/themes/tango-blue/graphics/new.png
-%%HORDIR%%/themes/tango-blue/graphics/turba.png
-%%HORDIR%%/themes/tango-blue/graphics/za_secondary.png
-%%HORDIR%%/themes/tango-blue/themed_graphics
-%%HORDIR%%/vcard.php
-%%HORDIR%%/view.php
-@dirrm %%HORDIR%%/themes/tango-blue/graphics/menu
-@dirrm %%HORDIR%%/themes/tango-blue/graphics
-@dirrm %%HORDIR%%/themes/tango-blue
-@dirrm %%HORDIR%%/themes/silver/graphics/menu
-@dirrm %%HORDIR%%/themes/silver/graphics
-@dirrm %%HORDIR%%/themes/silver
-@dirrm %%HORDIR%%/themes/ideas
-@dirrm %%HORDIR%%/themes/graphics/menu
-@dirrm %%HORDIR%%/themes/graphics
-@dirrm %%HORDIR%%/themes/bluewhite
-@dirrm %%HORDIR%%/themes
-@dirrm %%HORDIR%%/templates/prefs
-@dirrm %%HORDIR%%/templates/list
-@dirrm %%HORDIR%%/templates/data
-@dirrm %%HORDIR%%/templates/browse
-@dirrm %%HORDIR%%/templates/block
-@dirrm %%HORDIR%%/templates
-@dirrm %%HORDIR%%/scripts/upgrades
-@dirrm %%HORDIR%%/scripts/sql
-@dirrm %%HORDIR%%/scripts/ldap
-@dirrm %%HORDIR%%/scripts
-@dirrm %%HORDIR%%/po
-@dirrm %%HORDIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_TW
-@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_CN
-@dirrm %%HORDIR%%/locale/uk_UA/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/uk_UA
-@dirrm %%HORDIR%%/locale/tr_TR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/tr_TR
-@dirrm %%HORDIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sv_SE
-@dirrm %%HORDIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sl_SI
-@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sk_SK
-@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ru_RU
-@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ro_RO
-@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_PT
-@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_BR
-@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pl_PL
-@dirrm %%HORDIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nn_NO
-@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nl_NL
-@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nb_NO
-@dirrm %%HORDIR%%/locale/mk_MK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/mk_MK
-@dirrm %%HORDIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lv_LV
-@dirrm %%HORDIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lt_LT
-@dirrm %%HORDIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ko_KR
-@dirrm %%HORDIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ja_JP
-@dirrm %%HORDIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/it_IT
-@dirrm %%HORDIR%%/locale/is_IS/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/is_IS
-@dirrm %%HORDIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/hu_HU
-@dirrm %%HORDIR%%/locale/gl_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/gl_ES
-@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fr_FR
-@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fi_FI
-@dirrm %%HORDIR%%/locale/fa_IR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fa_IR
-@dirrm %%HORDIR%%/locale/et_EE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/et_EE
-@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/es_ES
-@dirrm %%HORDIR%%/locale/en_US
-@dirrm %%HORDIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/el_GR
-@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/de_DE
-@dirrm %%HORDIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/da_DK
-@dirrm %%HORDIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/cs_CZ
-@dirrm %%HORDIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ca_ES
-@dirrm %%HORDIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/bg_BG
-@dirrm %%HORDIR%%/locale/ar_SY/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ar_SY
-@dirrm %%HORDIR%%/locale
-@dirrm %%HORDIR%%/lib/tests
-@dirrm %%HORDIR%%/lib/Views
-@dirrm %%HORDIR%%/lib/Object
-@dirrm %%HORDIR%%/lib/Maintenance/Task
-@dirrm %%HORDIR%%/lib/Maintenance
-@dirrm %%HORDIR%%/lib/Forms
-@dirrm %%HORDIR%%/lib/Driver
-@dirrm %%HORDIR%%/lib/Data
-@dirrm %%HORDIR%%/lib/Block
-@dirrm %%HORDIR%%/lib
-@dirrm %%HORDIR%%/js/src
-@dirrm %%HORDIR%%/js
-@dirrm %%HORDIR%%/addressbooks
-@dirrmtry %%HORDIR%%/config
-@dirrmtry %%HORDIR%%
-@dirrmtry %%HORBAS%%
diff --git a/mail/milter-greylist/files/milter-greylist.in b/mail/milter-greylist/files/milter-greylist.in
deleted file mode 100644
index 3ce90bbb90da..000000000000
--- a/mail/milter-greylist/files/milter-greylist.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-# PROVIDE: miltergreylist
-# REQUIRE: LOGIN
-# BEFORE: sendmail
-# KEYWORD: milter-greylist
-
-# Define these miltergreylist_* variables in one of these files:
-# /etc/rc.conf
-# /etc/rc.conf.local
-# /etc/rc.conf.d/miltergreylist
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-
-. %%RC_SUBR%%
-
-name="miltergreylist"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-miltergreylist_enable=${miltergreylist_enable-"NO"}
-miltergreylist_runas=${miltergreylist_runas-"mailnull"}
-miltergreylist_pidfile=${miltergreylist_pidfile-"/var/run/milter-greylist.pid"}
-miltergreylist_sockfile=${miltergreylist_sockfile-"/var/milter-greylist/milter-greylist.sock"}
-miltergreylist_cfgfile=${miltergreylist_cfgfile-"%%PREFIX%%/etc/mail/greylist.conf"}
-miltergreylist_flags=${miltergreylist_flags-"-P $miltergreylist_pidfile \
--f $miltergreylist_cfgfile -p $miltergreylist_sockfile -u $miltergreylist_runas"}
-
-command="%%PREFIX%%/libexec/milter-greylist"
-
-run_rc_command "$1"
diff --git a/mail/milter-greylist/files/pkg-message.in b/mail/milter-greylist/files/pkg-message.in
deleted file mode 100644
index 2f6bb34b68fb..000000000000
--- a/mail/milter-greylist/files/pkg-message.in
+++ /dev/null
@@ -1,20 +0,0 @@
-===> IMPORTANT NOTE
-
- A sample configuration file has been installed in %%PREFIX%%/etc/mail
- directory. Copy and edit it to suit your needs before launching
- milter-greylist.
-
- Add following lines
-
-dnl j,{if_addr},{cert_subject},i,{auth_authen} are already enabled by default
-define(`confMILTER_MACROS_HELO', confMILTER_MACROS_HELO``, {verify}'')
-define(`confMILTER_MACROS_ENVRCPT', confMILTER_MACROS_ENVRCPT``, {greylist}'')
-INPUT_MAIL_FILTER(`greylist', `S=local:/var/milter-greylist/milter-greylist.sock, F=T, T=R:30s')
-
- to your /etc/mail/<your_host>.mc configuration.
-
- To run milter-greylist from startup, add miltergreylist_enable="YES"
- in your /etc/rc.conf or your /etc/rc.conf.local
-
- See %%DOCSDIR%%/README for operation details.
-
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
deleted file mode 100644
index 5244d703bfa0..000000000000
--- a/mail/mutt14/Makefile
+++ /dev/null
@@ -1,213 +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= 2
-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= mutt-devel-*
-.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
-USE_GMAKE= yes
-.endif
-.if defined (MUTT_LITE)
-PKGNAMESUFFIX= -lite
-WITH_SGML_DOCS:=no
-.elif ${MACHINE_ARCH} != "alpha"
-# coredump in sgmls
-WITH_SGML_DOCS?=yes
-.endif
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
-USE_ICONV= yes
-.if defined(WITHOUT_MUTT_ICONV)
-.error 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.1:${PORTSDIR}/devel/libslang
-.elif defined(WITH_NCURSES_PORT)
-LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
-.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$//}
-USE_OPENSSL= yes
-GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:19 autoconf:261
-CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
-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_PORT)
-CONFIGURE_ARGS+= --with-curses=${PREFIX}
-CFLAGS+= -I${PREFIX}/include/ncurses -I${PREFIX}/include
-.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) && (${OSVERSION} > 500105)) || 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 a7ad1656dcc4..000000000000
--- a/mail/mutt14/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 (mutt/mutt-1.4.2.3.tar.gz) = dcb94661827dd090fa813e73e122ea0c
-SHA256 (mutt/mutt-1.4.2.3.tar.gz) = 1a4920e5efccd6a83932af4223cb568956158f62e9f595798acc4004aca6ace5
-SIZE (mutt/mutt-1.4.2.3.tar.gz) = 2646433
-MD5 (mutt/patch-1.4.2.2.rr.compressed.gz) = 32eeaeaefa82dc869a5af9a32e7279e2
-SHA256 (mutt/patch-1.4.2.2.rr.compressed.gz) = 3f70a8b666e1dd5342acb418aac8cb4a1ab68559b389346052bb1078a3b8dfee
-SIZE (mutt/patch-1.4.2.2.rr.compressed.gz) = 10191
-MD5 (mutt/patch-1.4.2.2.vvv.initials.gz) = b6618c8c0007ca0114b98f6c1174d1e6
-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/postfix25/Makefile b/mail/postfix25/Makefile
deleted file mode 100644
index 57d6738a2f7a..000000000000
--- a/mail/postfix25/Makefile
+++ /dev/null
@@ -1,306 +0,0 @@
-# New ports collection makefile for: postfix
-# Date created: 18 Mar 1999
-# Whom: torstenb
-#
-# $FreeBSD$
-#
-
-PORTNAME= postfix
-PORTVERSION= 2.5.1
-PORTREVISION= 2
-PORTEPOCH= 1
-CATEGORIES= mail ipv6
-MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
- ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
- 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
-DISTNAME= postfix-${PORTVERSION}
-DIST_SUBDIR= ${PORTNAME}
-
-# blanket approval for version updates: mnag@FreeBSD.org
-MAINTAINER= vivek@khera.org
-COMMENT= A secure alternative to widely-used Sendmail
-
-CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-46-9].* postfix-current-2.* \
- sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
-
-USE_SUBMAKE= yes
-USE_PERL5_BUILD=yes
-USE_RC_SUBR= postfix.sh
-
-# 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 SASLKRB SASLKRB5 SASLKRB5MIT TLS BDB MySQL PgSQL OpenLDAP CDB NIS VDA Test
-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 SASL authentication method" off \
- SASLKRB "If your SASL req. Kerberos select this option" ${STATUS_SASLKRB} \
- SASLKRB5 "If your SASL req. Kerberos5 select this option" ${STATUS_SASLKRB5} \
- SASLKMIT "If your SASL req. MIT Kerberos5 select this option" ${STATUS_SASLKRB5MIT} \
- TLS "Enable SSL and TLS support" ${STATUS_TLS} \
- BDB "Berkeley DB (choose version with WITH_BDB_VER)" ${STATUS_BDB} \
- MYSQL "MySQL maps (choose version with WITH_MYSQL_VER)" ${STATUS_MySQL} \
- PGSQL "PostgreSQL maps (choose with DEFAULT_PGSQL_VER)" ${STATUS_PgSQL} \
- OPENLDAP "OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)" ${STATUS_OpenLDAP} \
- CDB "CDB maps lookups" ${STATUS_CDB} \
- NIS "NIS maps lookups" ${STATUS_NIS} \
- VDA "VDA (Virtual Delivery Agent)" ${STATUS_VDA} \
- TEST "SMTP/LMTP test server and generator" ${STATUS_Test}
-
-MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
- postlock.1 postlog.1 postmap.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 regexp_table.5 relocated.5 \
- tcp_table.5 transport.5 virtual.5
-
-MAN8= anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 local.8 master.8 \
- oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 showq.8 \
- smtp.8 smtpd.8 spawn.8 tlsmgr.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
-
-CONF1= access aliases canonical generic header_checks main.cf master.cf \
- relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+= DEBUG=
-.endif
-
-MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}"
-
-SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
- TOUCH="${TOUCH}" \
- MKDIR="${MKDIR}"
-
-.include <bsd.port.pre.mk>
-
-# 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)
-RUN_DEPENDS+= dovecot:${PORTSDIR}/mail/dovecot
-POSTFIX_CCARGS+= -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
-.endif
-
-.if defined(WITH_SASLKRB)
-.if defined(WITH_SASLKRB5) || defined(WITH_SASLKMIT)
-BROKEN= Select only one SASL Kerberos option
-.endif
-POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err
-.endif
-
-.if defined(WITH_SASLKRB5)
-.if defined(WITH_SASLKRB) || defined(WITH_SASLKMIT)
-BROKEN= Select only one SASL Kerberos option
-.endif
-POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken
-.endif
-
-.if defined(WITH_SASLKMIT)
-.if defined(WITH_SASLKRB) || 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_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_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
-.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/
-PATCHFILES+= postfix-2.5.1-vda-ng.patch.gz
-PATCH_DIST_STRIP= -p1
-.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+= SUB_TEST=""
-.else
-PLIST_SUB+= SUB_TEST="@comment "
-.endif
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-SUB_LIST+= REQUIRE="${_REQUIRE}"
-
-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
- @${FIND} -P ${WRKSRC}/man -type f | ${XARGS} \
- ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g"
- @${FIND} -P ${WRKSRC}/README_FILES -type f | ${XARGS} \
- ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g"
- @${FIND} -P ${WRKSRC}/conf -type f | ${XARGS} \
- ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g"
-
-post-patch:
-# All files modified with ${FILESDIR}/patch-* to use !!PREFIX!! need REINPLACE. Put below.
- @${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" \
- ${WRKSRC}/conf/main.cf ${WRKSRC}/src/global/mail_params.h
- @${REINPLACE_CMD} -e "s|perl|${PERL}|" ${WRKSRC}/src/bounce/Makefile.in
-
-do-configure:
- (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
- CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
- ${ECHO} "all: default" >> Makefile)
-
-pre-install:
- @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
- cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
- config_directory=${PREFIX}/etc/postfix \
- data_directory=/var/db/postfix \
- daemon_directory=${PREFIX}/libexec/postfix \
- command_directory=${PREFIX}/sbin \
- queue_directory=/var/spool/postfix \
- sendmail_path=${PREFIX}/sbin/sendmail \
- newaliases_path=${PREFIX}/bin/newaliases \
- mailq_path=${PREFIX}/bin/mailq \
- mail_owner=postfix \
- setgid_group=maildrop \
- manpage_directory=${MANPREFIX}/man \
- sample_directory=${PREFIX}/etc/postfix \
- readme_directory=${READMEDIR}
-
- ${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
-
- @${MKDIR} ${PREFIX}/etc/postfix/dist
-.for f in ${CONF1}
- ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist
-.endfor
-
-.if !defined(NOPORTDOCS)
- ${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
- @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
- ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.endif
-
-post-install:
- @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# Fix compressed man pages
- @${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files
- @${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo
deleted file mode 100644
index be41168d0f37..000000000000
--- a/mail/postfix25/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (postfix/postfix-2.5.1.tar.gz) = 95a559c509081fdd07d78eafd4f4c3b4
-SHA256 (postfix/postfix-2.5.1.tar.gz) = bad7ed98d1bbc8fd27d4b4d6d65a8dfe21794c109bc923e5fe45abea5b484037
-SIZE (postfix/postfix-2.5.1.tar.gz) = 3153629
-MD5 (postfix/postfix-2.5.1-vda-ng.patch.gz) = bba9426f8ae9d8603861ce782f117760
-SHA256 (postfix/postfix-2.5.1-vda-ng.patch.gz) = aae719707cea7257081cff915730a596a22e1415c625c574417018700760f423
-SIZE (postfix/postfix-2.5.1-vda-ng.patch.gz) = 12348
diff --git a/mail/postfix25/files/patch-conf::main.cf b/mail/postfix25/files/patch-conf::main.cf
deleted file mode 100644
index 14976bcaa09c..000000000000
--- a/mail/postfix25/files/patch-conf::main.cf
+++ /dev/null
@@ -1,80 +0,0 @@
---- conf/main.cf.orig 2007-12-18 11:50:25.000000000 -0200
-+++ conf/main.cf 2008-02-29 22:35:12.000000000 -0300
-@@ -33,19 +33,19 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = !!PREFIX!!/sbin
-
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
-
- # The data_directory parameter specifies the location of Postfix-writable
- # data files (caches, random numbers). This directory must be owned
- # by the mail_owner account (see below).
- #
--data_directory = /var/lib/postfix
-+data_directory = /var/db/postfix
-
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -244,7 +244,7 @@
- #
- #mynetworks_style = class
- #mynetworks_style = subnet
--#mynetworks_style = host
-+mynetworks_style = host
-
- # Alternatively, you can specify the mynetworks list by hand, in
- # which case Postfix ignores the mynetworks_style setting.
-@@ -615,37 +615,37 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- #
--sendmail_path =
-+sendmail_path = !!PREFIX!!/sbin/sendmail
-
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = !!PREFIX!!/bin/newaliases
-
- # mailq_path: The full pathname of the Postfix mailq command. This
- # is the Sendmail-compatible mail queue listing command.
- #
--mailq_path =
-+mailq_path = !!PREFIX!!/bin/mailq
-
- # setgid_group: The group for mail submission and queue management
- # commands. This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
-
- # html_directory: The location of the Postfix HTML documentation.
- #
--html_directory =
-+html_directory = no
-
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = !!PREFIX!!/man
-
- # sample_directory: The location of the Postfix sample configuration files.
- # This parameter is obsolete as of Postfix 2.1.
- #
--sample_directory =
-+sample_directory = !!PREFIX!!/etc/postfix
-
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix25/files/patch-conf::post-install b/mail/postfix25/files/patch-conf::post-install
deleted file mode 100644
index 78401de5bdf3..000000000000
--- a/mail/postfix25/files/patch-conf::post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/post-install.orig Thu Feb 24 08:06:08 2005
-+++ conf/post-install Sat Mar 5 11:53:42 2005
-@@ -185,7 +185,7 @@
-
- umask 022
-
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS="
- "
diff --git a/mail/postfix25/files/patch-conf__postfix-files b/mail/postfix25/files/patch-conf__postfix-files
deleted file mode 100644
index bbd19c09b38d..000000000000
--- a/mail/postfix25/files/patch-conf__postfix-files
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/postfix-files.orig 2008-01-24 00:13:49.000000000 +0000
-+++ conf/postfix-files 2008-02-29 20:53:24.000000000 +0000
-@@ -42,7 +42,7 @@
- # permissions, so that running "make install" fixes any glitches.
- #
- $config_directory:d:root:-:755:u
--$data_directory:d:$mail_owner:-:700:u
-+$data_directory:d:$mail_owner:-:700:uc
- $daemon_directory:d:root:-:755:u
- $queue_directory:d:root:-:755:uc
- $sample_directory:d:root:-:755:o
diff --git a/mail/postfix25/files/patch-makedefs b/mail/postfix25/files/patch-makedefs
deleted file mode 100644
index 5b231457530b..000000000000
--- a/mail/postfix25/files/patch-makedefs
+++ /dev/null
@@ -1,13 +0,0 @@
---- makedefs.orig 2007-03-24 10:30:18.000000000 -0300
-+++ makedefs 2007-10-22 16:18:48.000000000 -0200
-@@ -130,6 +130,10 @@
- ;;
- FreeBSD.6*) SYSTYPE=FREEBSD6
- ;;
-+ FreeBSD.7*) SYSTYPE=FREEBSD6
-+ ;;
-+ FreeBSD.8*) SYSTYPE=FREEBSD6
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- OpenBSD.3*) SYSTYPE=OPENBSD3
diff --git a/mail/postfix25/files/patch-src::global::mail_params.h b/mail/postfix25/files/patch-src::global::mail_params.h
deleted file mode 100644
index 52ea5e9e5c35..000000000000
--- a/mail/postfix25/files/patch-src::global::mail_params.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/global/mail_params.h.orig Fri Feb 11 21:53:21 2005
-+++ src/global/mail_params.h Sat Mar 5 11:53:42 2005
-@@ -64,7 +64,7 @@
- extern gid_t var_owner_gid;
-
- #define VAR_SGID_GROUP "setgid_group"
--#define DEF_SGID_GROUP "postdrop"
-+#define DEF_SGID_GROUP "maildrop"
- extern char *var_sgid_group;
- extern gid_t var_sgid_gid;
-
-@@ -221,7 +221,7 @@
- */
- #define VAR_DAEMON_DIR "daemon_directory"
- #ifndef DEF_DAEMON_DIR
--#define DEF_DAEMON_DIR "/usr/libexec/postfix"
-+#define DEF_DAEMON_DIR "!!PREFIX!!/libexec/postfix"
- #endif
- extern char *var_daemon_dir;
-
-@@ -250,7 +250,7 @@
- */
- #define VAR_CONFIG_DIR "config_directory"
- #ifndef DEF_CONFIG_DIR
--#define DEF_CONFIG_DIR "/etc/postfix"
-+#define DEF_CONFIG_DIR "!!PREFIX!!/etc/postfix"
- #endif
- extern char *var_config_dir;
-
diff --git a/mail/postfix25/files/patch-src__smtpd__smtpd.c b/mail/postfix25/files/patch-src__smtpd__smtpd.c
deleted file mode 100644
index f08cfea86de9..000000000000
--- a/mail/postfix25/files/patch-src__smtpd__smtpd.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/smtpd/smtpd.c.orig 2008-03-24 16:38:05.000000000 -0300
-+++ src/smtpd/smtpd.c 2008-03-24 16:48:38.000000000 -0300
-@@ -2108,14 +2108,14 @@
- if (smtpd_milters != 0
- && SMTPD_STAND_ALONE(state) == 0
- && (state->saved_flags & MILTER_SKIP_FLAGS) == 0) {
-+ PUSH_STRING(saved_sender, state->sender, STR(state->addr_buf));
- err = milter_mail_event(smtpd_milters,
- milter_argv(state, argc - 2, argv + 2));
- if (err != 0) {
- /* Log reject etc. with correct sender information. */
-- PUSH_STRING(saved_sender, state->sender, STR(state->addr_buf));
- err = check_milter_reply(state, err);
-- POP_STRING(saved_sender, state->sender);
- }
-+ POP_STRING(saved_sender, state->sender);
- if (err != 0) {
- /* XXX Reset access map side effects. */
- mail_reset(state);
-@@ -2362,14 +2362,14 @@
- }
- if (smtpd_milters != 0
- && (state->saved_flags & MILTER_SKIP_FLAGS) == 0) {
-+ PUSH_STRING(saved_rcpt, state->recipient, STR(state->addr_buf));
- err = milter_rcpt_event(smtpd_milters,
- milter_argv(state, argc - 2, argv + 2));
- if (err != 0) {
- /* Log reject etc. with correct recipient information. */
-- PUSH_STRING(saved_rcpt, state->recipient, STR(state->addr_buf));
- err = check_milter_reply(state, err);
-- POP_STRING(saved_rcpt, state->recipient);
- }
-+ POP_STRING(saved_rcpt, state->recipient);
- if (err != 0) {
- smtpd_chat_reply(state, "%s", err);
- return (-1);
diff --git a/mail/postfix25/files/postfix.sh.in b/mail/postfix25/files/postfix.sh.in
deleted file mode 100644
index 2b07d6c85c1d..000000000000
--- a/mail/postfix25/files/postfix.sh.in
+++ /dev/null
@@ -1,48 +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 "".
-#
-
-. %%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"}
-: ${postfix_flags=""}
-
-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/postfix25/pkg-descr b/mail/postfix25/pkg-descr
deleted file mode 100644
index 58c625e46973..000000000000
--- a/mail/postfix25/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/postfix25/pkg-install b/mail/postfix25/pkg-install
deleted file mode 100644
index 4d847638d846..000000000000
--- a/mail/postfix25/pkg-install
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# 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.
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
-
-if [ x${POSTFIX_DEFAULT_MTA} = xno ]; 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 x${BATCH} = xno ]; then
- read -p "${question} [${default}]? " answer
- fi
- if [ x${answer} = x ]; 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 [ x"$2" = xPRE-INSTALL ]; then
- USER=postfix
- UID=125
- GROUP=postfix
- GID=125
- GROUP2=maildrop
- GID2=126
-
- if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
- echo "You already have a group \"${GROUP}\", so I will use it."
- else
- if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then
- echo "Added group \"${GROUP}\"."
- else
- echo "Adding group \"${GROUP}\" failed..."
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
- if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
- echo "You already have a group \"${GROUP2}\", so I will use it."
- else
- if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
- echo "Added group \"${GROUP2}\"."
- else
- echo "Adding group \"${GROUP2}\" failed..."
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
- if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
- echo "You already have a user \"${USER}\", so I will use it."
- else
- if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
- if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
- echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
- else
- echo "You need user \"${USER}\" added to group \"mail\"."
- if yesno "Would you like me to add it" y; then
- /usr/sbin/pw groupmod mail -m ${USER} || exit
- echo "Done."
- else
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
- if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then
- for file in ${PKG_PREFIX}/etc/postfix/dist/*; do
- if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then
- cp $file ${PKG_PREFIX}/etc/postfix/
- fi
- done
- fi
-
- /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
- config_directory=${PKG_PREFIX}/etc/postfix \
- data_directory=/var/db/postfix \
- daemon_directory=${PKG_PREFIX}/libexec/postfix \
- command_directory=${PKG_PREFIX}/sbin \
- queue_directory=/var/spool/postfix \
- sendmail_path=${PKG_PREFIX}/sbin/sendmail \
- newaliases_path=${PKG_PREFIX}/bin/newaliases \
- mailq_path=${PKG_PREFIX}/bin/mailq \
- mail_owner=postfix \
- setgid_group=maildrop \
- manpage_directory=${PKG_PREFIX}/man \
- sample_directory=${PKG_PREFIX}/etc/postfix \
- readme_directory=no \
- upgrade-package
-fi
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-
-replace() {
- local orig repl
-
- orig=$1
- repl=$2
- if [ -e ${orig} ]; then
- /bin/mv -f ${orig} ${orig}.OFF
- /bin/chmod 0 ${orig}.OFF
- fi
- if [ -e ${repl} ]; then
- /bin/ln -s ${repl} ${orig}
- fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
- if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
- /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
- echo "#" > /etc/mail/mailer.conf
- echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
- echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- echo "#" >> /etc/mail/mailer.conf
- echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- fi
-fi
diff --git a/mail/postfix25/pkg-message b/mail/postfix25/pkg-message
deleted file mode 100644
index 3b23f15a2cac..000000000000
--- a/mail/postfix25/pkg-message
+++ /dev/null
@@ -1,25 +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 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 /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix25/pkg-plist b/mail/postfix25/pkg-plist
deleted file mode 100644
index b0e26b6fe95b..000000000000
--- a/mail/postfix25/pkg-plist
+++ /dev/null
@@ -1,240 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi
-@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi
-etc/postfix/LICENSE
-etc/postfix/TLS_LICENSE
-etc/postfix/bounce.cf.default
-etc/postfix/main.cf.default
-etc/postfix/makedefs.out
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/dist/main.cf
-etc/postfix/dist/master.cf
-etc/postfix/dist/access
-etc/postfix/dist/aliases
-etc/postfix/dist/canonical
-etc/postfix/dist/header_checks
-etc/postfix/dist/relocated
-etc/postfix/dist/transport
-etc/postfix/dist/virtual
-etc/postfix/dist/generic
-libexec/postfix/anvil
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/discard
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/oqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-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/trivial-rewrite
-libexec/postfix/verify
-libexec/postfix/virtual
-libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-%%SUB_TEST%%bin/qmqp-sink
-%%SUB_TEST%%bin/qmqp-source
-%%SUB_TEST%%bin/smtp-sink
-%%SUB_TEST%%bin/smtp-source
-bin/rmail
-bin/qshape
-bin/newaliases
-bin/mailq
-%%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%%/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%%/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.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
-%%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%%/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.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.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%%/tcp_table.5.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%%
-@dirrm libexec/postfix
-@dirrm etc/postfix/dist
-@dirrmtry etc/postfix
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
deleted file mode 100644
index 57d6738a2f7a..000000000000
--- a/mail/postfix26/Makefile
+++ /dev/null
@@ -1,306 +0,0 @@
-# New ports collection makefile for: postfix
-# Date created: 18 Mar 1999
-# Whom: torstenb
-#
-# $FreeBSD$
-#
-
-PORTNAME= postfix
-PORTVERSION= 2.5.1
-PORTREVISION= 2
-PORTEPOCH= 1
-CATEGORIES= mail ipv6
-MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
- ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
- 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
-DISTNAME= postfix-${PORTVERSION}
-DIST_SUBDIR= ${PORTNAME}
-
-# blanket approval for version updates: mnag@FreeBSD.org
-MAINTAINER= vivek@khera.org
-COMMENT= A secure alternative to widely-used Sendmail
-
-CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-46-9].* postfix-current-2.* \
- sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
-
-USE_SUBMAKE= yes
-USE_PERL5_BUILD=yes
-USE_RC_SUBR= postfix.sh
-
-# 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 SASLKRB SASLKRB5 SASLKRB5MIT TLS BDB MySQL PgSQL OpenLDAP CDB NIS VDA Test
-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 SASL authentication method" off \
- SASLKRB "If your SASL req. Kerberos select this option" ${STATUS_SASLKRB} \
- SASLKRB5 "If your SASL req. Kerberos5 select this option" ${STATUS_SASLKRB5} \
- SASLKMIT "If your SASL req. MIT Kerberos5 select this option" ${STATUS_SASLKRB5MIT} \
- TLS "Enable SSL and TLS support" ${STATUS_TLS} \
- BDB "Berkeley DB (choose version with WITH_BDB_VER)" ${STATUS_BDB} \
- MYSQL "MySQL maps (choose version with WITH_MYSQL_VER)" ${STATUS_MySQL} \
- PGSQL "PostgreSQL maps (choose with DEFAULT_PGSQL_VER)" ${STATUS_PgSQL} \
- OPENLDAP "OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)" ${STATUS_OpenLDAP} \
- CDB "CDB maps lookups" ${STATUS_CDB} \
- NIS "NIS maps lookups" ${STATUS_NIS} \
- VDA "VDA (Virtual Delivery Agent)" ${STATUS_VDA} \
- TEST "SMTP/LMTP test server and generator" ${STATUS_Test}
-
-MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
- postlock.1 postlog.1 postmap.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 regexp_table.5 relocated.5 \
- tcp_table.5 transport.5 virtual.5
-
-MAN8= anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 local.8 master.8 \
- oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 showq.8 \
- smtp.8 smtpd.8 spawn.8 tlsmgr.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
-
-CONF1= access aliases canonical generic header_checks main.cf master.cf \
- relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+= DEBUG=
-.endif
-
-MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}"
-
-SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
- TOUCH="${TOUCH}" \
- MKDIR="${MKDIR}"
-
-.include <bsd.port.pre.mk>
-
-# 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)
-RUN_DEPENDS+= dovecot:${PORTSDIR}/mail/dovecot
-POSTFIX_CCARGS+= -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
-.endif
-
-.if defined(WITH_SASLKRB)
-.if defined(WITH_SASLKRB5) || defined(WITH_SASLKMIT)
-BROKEN= Select only one SASL Kerberos option
-.endif
-POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err
-.endif
-
-.if defined(WITH_SASLKRB5)
-.if defined(WITH_SASLKRB) || defined(WITH_SASLKMIT)
-BROKEN= Select only one SASL Kerberos option
-.endif
-POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken
-.endif
-
-.if defined(WITH_SASLKMIT)
-.if defined(WITH_SASLKRB) || 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_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_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
-.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/
-PATCHFILES+= postfix-2.5.1-vda-ng.patch.gz
-PATCH_DIST_STRIP= -p1
-.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+= SUB_TEST=""
-.else
-PLIST_SUB+= SUB_TEST="@comment "
-.endif
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-SUB_LIST+= REQUIRE="${_REQUIRE}"
-
-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
- @${FIND} -P ${WRKSRC}/man -type f | ${XARGS} \
- ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g"
- @${FIND} -P ${WRKSRC}/README_FILES -type f | ${XARGS} \
- ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g"
- @${FIND} -P ${WRKSRC}/conf -type f | ${XARGS} \
- ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g"
-
-post-patch:
-# All files modified with ${FILESDIR}/patch-* to use !!PREFIX!! need REINPLACE. Put below.
- @${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" \
- ${WRKSRC}/conf/main.cf ${WRKSRC}/src/global/mail_params.h
- @${REINPLACE_CMD} -e "s|perl|${PERL}|" ${WRKSRC}/src/bounce/Makefile.in
-
-do-configure:
- (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
- CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
- ${ECHO} "all: default" >> Makefile)
-
-pre-install:
- @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
- cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
- config_directory=${PREFIX}/etc/postfix \
- data_directory=/var/db/postfix \
- daemon_directory=${PREFIX}/libexec/postfix \
- command_directory=${PREFIX}/sbin \
- queue_directory=/var/spool/postfix \
- sendmail_path=${PREFIX}/sbin/sendmail \
- newaliases_path=${PREFIX}/bin/newaliases \
- mailq_path=${PREFIX}/bin/mailq \
- mail_owner=postfix \
- setgid_group=maildrop \
- manpage_directory=${MANPREFIX}/man \
- sample_directory=${PREFIX}/etc/postfix \
- readme_directory=${READMEDIR}
-
- ${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
-
- @${MKDIR} ${PREFIX}/etc/postfix/dist
-.for f in ${CONF1}
- ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist
-.endfor
-
-.if !defined(NOPORTDOCS)
- ${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
- @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
- ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.endif
-
-post-install:
- @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# Fix compressed man pages
- @${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files
- @${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo
deleted file mode 100644
index be41168d0f37..000000000000
--- a/mail/postfix26/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (postfix/postfix-2.5.1.tar.gz) = 95a559c509081fdd07d78eafd4f4c3b4
-SHA256 (postfix/postfix-2.5.1.tar.gz) = bad7ed98d1bbc8fd27d4b4d6d65a8dfe21794c109bc923e5fe45abea5b484037
-SIZE (postfix/postfix-2.5.1.tar.gz) = 3153629
-MD5 (postfix/postfix-2.5.1-vda-ng.patch.gz) = bba9426f8ae9d8603861ce782f117760
-SHA256 (postfix/postfix-2.5.1-vda-ng.patch.gz) = aae719707cea7257081cff915730a596a22e1415c625c574417018700760f423
-SIZE (postfix/postfix-2.5.1-vda-ng.patch.gz) = 12348
diff --git a/mail/postfix26/files/patch-conf::main.cf b/mail/postfix26/files/patch-conf::main.cf
deleted file mode 100644
index 14976bcaa09c..000000000000
--- a/mail/postfix26/files/patch-conf::main.cf
+++ /dev/null
@@ -1,80 +0,0 @@
---- conf/main.cf.orig 2007-12-18 11:50:25.000000000 -0200
-+++ conf/main.cf 2008-02-29 22:35:12.000000000 -0300
-@@ -33,19 +33,19 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = !!PREFIX!!/sbin
-
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
-
- # The data_directory parameter specifies the location of Postfix-writable
- # data files (caches, random numbers). This directory must be owned
- # by the mail_owner account (see below).
- #
--data_directory = /var/lib/postfix
-+data_directory = /var/db/postfix
-
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -244,7 +244,7 @@
- #
- #mynetworks_style = class
- #mynetworks_style = subnet
--#mynetworks_style = host
-+mynetworks_style = host
-
- # Alternatively, you can specify the mynetworks list by hand, in
- # which case Postfix ignores the mynetworks_style setting.
-@@ -615,37 +615,37 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- #
--sendmail_path =
-+sendmail_path = !!PREFIX!!/sbin/sendmail
-
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = !!PREFIX!!/bin/newaliases
-
- # mailq_path: The full pathname of the Postfix mailq command. This
- # is the Sendmail-compatible mail queue listing command.
- #
--mailq_path =
-+mailq_path = !!PREFIX!!/bin/mailq
-
- # setgid_group: The group for mail submission and queue management
- # commands. This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
-
- # html_directory: The location of the Postfix HTML documentation.
- #
--html_directory =
-+html_directory = no
-
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = !!PREFIX!!/man
-
- # sample_directory: The location of the Postfix sample configuration files.
- # This parameter is obsolete as of Postfix 2.1.
- #
--sample_directory =
-+sample_directory = !!PREFIX!!/etc/postfix
-
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix26/files/patch-conf::post-install b/mail/postfix26/files/patch-conf::post-install
deleted file mode 100644
index 78401de5bdf3..000000000000
--- a/mail/postfix26/files/patch-conf::post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/post-install.orig Thu Feb 24 08:06:08 2005
-+++ conf/post-install Sat Mar 5 11:53:42 2005
-@@ -185,7 +185,7 @@
-
- umask 022
-
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS="
- "
diff --git a/mail/postfix26/files/patch-conf__postfix-files b/mail/postfix26/files/patch-conf__postfix-files
deleted file mode 100644
index bbd19c09b38d..000000000000
--- a/mail/postfix26/files/patch-conf__postfix-files
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/postfix-files.orig 2008-01-24 00:13:49.000000000 +0000
-+++ conf/postfix-files 2008-02-29 20:53:24.000000000 +0000
-@@ -42,7 +42,7 @@
- # permissions, so that running "make install" fixes any glitches.
- #
- $config_directory:d:root:-:755:u
--$data_directory:d:$mail_owner:-:700:u
-+$data_directory:d:$mail_owner:-:700:uc
- $daemon_directory:d:root:-:755:u
- $queue_directory:d:root:-:755:uc
- $sample_directory:d:root:-:755:o
diff --git a/mail/postfix26/files/patch-makedefs b/mail/postfix26/files/patch-makedefs
deleted file mode 100644
index 5b231457530b..000000000000
--- a/mail/postfix26/files/patch-makedefs
+++ /dev/null
@@ -1,13 +0,0 @@
---- makedefs.orig 2007-03-24 10:30:18.000000000 -0300
-+++ makedefs 2007-10-22 16:18:48.000000000 -0200
-@@ -130,6 +130,10 @@
- ;;
- FreeBSD.6*) SYSTYPE=FREEBSD6
- ;;
-+ FreeBSD.7*) SYSTYPE=FREEBSD6
-+ ;;
-+ FreeBSD.8*) SYSTYPE=FREEBSD6
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- OpenBSD.3*) SYSTYPE=OPENBSD3
diff --git a/mail/postfix26/files/patch-src::global::mail_params.h b/mail/postfix26/files/patch-src::global::mail_params.h
deleted file mode 100644
index 52ea5e9e5c35..000000000000
--- a/mail/postfix26/files/patch-src::global::mail_params.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/global/mail_params.h.orig Fri Feb 11 21:53:21 2005
-+++ src/global/mail_params.h Sat Mar 5 11:53:42 2005
-@@ -64,7 +64,7 @@
- extern gid_t var_owner_gid;
-
- #define VAR_SGID_GROUP "setgid_group"
--#define DEF_SGID_GROUP "postdrop"
-+#define DEF_SGID_GROUP "maildrop"
- extern char *var_sgid_group;
- extern gid_t var_sgid_gid;
-
-@@ -221,7 +221,7 @@
- */
- #define VAR_DAEMON_DIR "daemon_directory"
- #ifndef DEF_DAEMON_DIR
--#define DEF_DAEMON_DIR "/usr/libexec/postfix"
-+#define DEF_DAEMON_DIR "!!PREFIX!!/libexec/postfix"
- #endif
- extern char *var_daemon_dir;
-
-@@ -250,7 +250,7 @@
- */
- #define VAR_CONFIG_DIR "config_directory"
- #ifndef DEF_CONFIG_DIR
--#define DEF_CONFIG_DIR "/etc/postfix"
-+#define DEF_CONFIG_DIR "!!PREFIX!!/etc/postfix"
- #endif
- extern char *var_config_dir;
-
diff --git a/mail/postfix26/files/patch-src__smtpd__smtpd.c b/mail/postfix26/files/patch-src__smtpd__smtpd.c
deleted file mode 100644
index f08cfea86de9..000000000000
--- a/mail/postfix26/files/patch-src__smtpd__smtpd.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/smtpd/smtpd.c.orig 2008-03-24 16:38:05.000000000 -0300
-+++ src/smtpd/smtpd.c 2008-03-24 16:48:38.000000000 -0300
-@@ -2108,14 +2108,14 @@
- if (smtpd_milters != 0
- && SMTPD_STAND_ALONE(state) == 0
- && (state->saved_flags & MILTER_SKIP_FLAGS) == 0) {
-+ PUSH_STRING(saved_sender, state->sender, STR(state->addr_buf));
- err = milter_mail_event(smtpd_milters,
- milter_argv(state, argc - 2, argv + 2));
- if (err != 0) {
- /* Log reject etc. with correct sender information. */
-- PUSH_STRING(saved_sender, state->sender, STR(state->addr_buf));
- err = check_milter_reply(state, err);
-- POP_STRING(saved_sender, state->sender);
- }
-+ POP_STRING(saved_sender, state->sender);
- if (err != 0) {
- /* XXX Reset access map side effects. */
- mail_reset(state);
-@@ -2362,14 +2362,14 @@
- }
- if (smtpd_milters != 0
- && (state->saved_flags & MILTER_SKIP_FLAGS) == 0) {
-+ PUSH_STRING(saved_rcpt, state->recipient, STR(state->addr_buf));
- err = milter_rcpt_event(smtpd_milters,
- milter_argv(state, argc - 2, argv + 2));
- if (err != 0) {
- /* Log reject etc. with correct recipient information. */
-- PUSH_STRING(saved_rcpt, state->recipient, STR(state->addr_buf));
- err = check_milter_reply(state, err);
-- POP_STRING(saved_rcpt, state->recipient);
- }
-+ POP_STRING(saved_rcpt, state->recipient);
- if (err != 0) {
- smtpd_chat_reply(state, "%s", err);
- return (-1);
diff --git a/mail/postfix26/files/postfix.sh.in b/mail/postfix26/files/postfix.sh.in
deleted file mode 100644
index 2b07d6c85c1d..000000000000
--- a/mail/postfix26/files/postfix.sh.in
+++ /dev/null
@@ -1,48 +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 "".
-#
-
-. %%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"}
-: ${postfix_flags=""}
-
-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/postfix26/pkg-descr b/mail/postfix26/pkg-descr
deleted file mode 100644
index 58c625e46973..000000000000
--- a/mail/postfix26/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/postfix26/pkg-install b/mail/postfix26/pkg-install
deleted file mode 100644
index 4d847638d846..000000000000
--- a/mail/postfix26/pkg-install
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# 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.
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
-
-if [ x${POSTFIX_DEFAULT_MTA} = xno ]; 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 x${BATCH} = xno ]; then
- read -p "${question} [${default}]? " answer
- fi
- if [ x${answer} = x ]; 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 [ x"$2" = xPRE-INSTALL ]; then
- USER=postfix
- UID=125
- GROUP=postfix
- GID=125
- GROUP2=maildrop
- GID2=126
-
- if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
- echo "You already have a group \"${GROUP}\", so I will use it."
- else
- if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then
- echo "Added group \"${GROUP}\"."
- else
- echo "Adding group \"${GROUP}\" failed..."
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
- if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
- echo "You already have a group \"${GROUP2}\", so I will use it."
- else
- if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
- echo "Added group \"${GROUP2}\"."
- else
- echo "Adding group \"${GROUP2}\" failed..."
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
- if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
- echo "You already have a user \"${USER}\", so I will use it."
- else
- if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
- if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
- echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
- else
- echo "You need user \"${USER}\" added to group \"mail\"."
- if yesno "Would you like me to add it" y; then
- /usr/sbin/pw groupmod mail -m ${USER} || exit
- echo "Done."
- else
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
- if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then
- for file in ${PKG_PREFIX}/etc/postfix/dist/*; do
- if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then
- cp $file ${PKG_PREFIX}/etc/postfix/
- fi
- done
- fi
-
- /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
- config_directory=${PKG_PREFIX}/etc/postfix \
- data_directory=/var/db/postfix \
- daemon_directory=${PKG_PREFIX}/libexec/postfix \
- command_directory=${PKG_PREFIX}/sbin \
- queue_directory=/var/spool/postfix \
- sendmail_path=${PKG_PREFIX}/sbin/sendmail \
- newaliases_path=${PKG_PREFIX}/bin/newaliases \
- mailq_path=${PKG_PREFIX}/bin/mailq \
- mail_owner=postfix \
- setgid_group=maildrop \
- manpage_directory=${PKG_PREFIX}/man \
- sample_directory=${PKG_PREFIX}/etc/postfix \
- readme_directory=no \
- upgrade-package
-fi
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-
-replace() {
- local orig repl
-
- orig=$1
- repl=$2
- if [ -e ${orig} ]; then
- /bin/mv -f ${orig} ${orig}.OFF
- /bin/chmod 0 ${orig}.OFF
- fi
- if [ -e ${repl} ]; then
- /bin/ln -s ${repl} ${orig}
- fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
- if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
- /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
- echo "#" > /etc/mail/mailer.conf
- echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
- echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- echo "#" >> /etc/mail/mailer.conf
- echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- fi
-fi
diff --git a/mail/postfix26/pkg-message b/mail/postfix26/pkg-message
deleted file mode 100644
index 3b23f15a2cac..000000000000
--- a/mail/postfix26/pkg-message
+++ /dev/null
@@ -1,25 +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 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 /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix26/pkg-plist b/mail/postfix26/pkg-plist
deleted file mode 100644
index b0e26b6fe95b..000000000000
--- a/mail/postfix26/pkg-plist
+++ /dev/null
@@ -1,240 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi
-@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi
-etc/postfix/LICENSE
-etc/postfix/TLS_LICENSE
-etc/postfix/bounce.cf.default
-etc/postfix/main.cf.default
-etc/postfix/makedefs.out
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/dist/main.cf
-etc/postfix/dist/master.cf
-etc/postfix/dist/access
-etc/postfix/dist/aliases
-etc/postfix/dist/canonical
-etc/postfix/dist/header_checks
-etc/postfix/dist/relocated
-etc/postfix/dist/transport
-etc/postfix/dist/virtual
-etc/postfix/dist/generic
-libexec/postfix/anvil
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/discard
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/oqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-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/trivial-rewrite
-libexec/postfix/verify
-libexec/postfix/virtual
-libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-%%SUB_TEST%%bin/qmqp-sink
-%%SUB_TEST%%bin/qmqp-source
-%%SUB_TEST%%bin/smtp-sink
-%%SUB_TEST%%bin/smtp-source
-bin/rmail
-bin/qshape
-bin/newaliases
-bin/mailq
-%%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%%/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%%/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.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
-%%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%%/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.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.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%%/tcp_table.5.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%%
-@dirrm libexec/postfix
-@dirrm etc/postfix/dist
-@dirrmtry etc/postfix
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
deleted file mode 100644
index 57d6738a2f7a..000000000000
--- a/mail/postfix27/Makefile
+++ /dev/null
@@ -1,306 +0,0 @@
-# New ports collection makefile for: postfix
-# Date created: 18 Mar 1999
-# Whom: torstenb
-#
-# $FreeBSD$
-#
-
-PORTNAME= postfix
-PORTVERSION= 2.5.1
-PORTREVISION= 2
-PORTEPOCH= 1
-CATEGORIES= mail ipv6
-MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
- ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
- 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
-DISTNAME= postfix-${PORTVERSION}
-DIST_SUBDIR= ${PORTNAME}
-
-# blanket approval for version updates: mnag@FreeBSD.org
-MAINTAINER= vivek@khera.org
-COMMENT= A secure alternative to widely-used Sendmail
-
-CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-46-9].* postfix-current-2.* \
- sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
-
-USE_SUBMAKE= yes
-USE_PERL5_BUILD=yes
-USE_RC_SUBR= postfix.sh
-
-# 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 SASLKRB SASLKRB5 SASLKRB5MIT TLS BDB MySQL PgSQL OpenLDAP CDB NIS VDA Test
-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 SASL authentication method" off \
- SASLKRB "If your SASL req. Kerberos select this option" ${STATUS_SASLKRB} \
- SASLKRB5 "If your SASL req. Kerberos5 select this option" ${STATUS_SASLKRB5} \
- SASLKMIT "If your SASL req. MIT Kerberos5 select this option" ${STATUS_SASLKRB5MIT} \
- TLS "Enable SSL and TLS support" ${STATUS_TLS} \
- BDB "Berkeley DB (choose version with WITH_BDB_VER)" ${STATUS_BDB} \
- MYSQL "MySQL maps (choose version with WITH_MYSQL_VER)" ${STATUS_MySQL} \
- PGSQL "PostgreSQL maps (choose with DEFAULT_PGSQL_VER)" ${STATUS_PgSQL} \
- OPENLDAP "OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)" ${STATUS_OpenLDAP} \
- CDB "CDB maps lookups" ${STATUS_CDB} \
- NIS "NIS maps lookups" ${STATUS_NIS} \
- VDA "VDA (Virtual Delivery Agent)" ${STATUS_VDA} \
- TEST "SMTP/LMTP test server and generator" ${STATUS_Test}
-
-MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
- postlock.1 postlog.1 postmap.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 regexp_table.5 relocated.5 \
- tcp_table.5 transport.5 virtual.5
-
-MAN8= anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 local.8 master.8 \
- oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 showq.8 \
- smtp.8 smtpd.8 spawn.8 tlsmgr.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
-
-CONF1= access aliases canonical generic header_checks main.cf master.cf \
- relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+= DEBUG=
-.endif
-
-MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}"
-
-SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
- TOUCH="${TOUCH}" \
- MKDIR="${MKDIR}"
-
-.include <bsd.port.pre.mk>
-
-# 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)
-RUN_DEPENDS+= dovecot:${PORTSDIR}/mail/dovecot
-POSTFIX_CCARGS+= -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
-.endif
-
-.if defined(WITH_SASLKRB)
-.if defined(WITH_SASLKRB5) || defined(WITH_SASLKMIT)
-BROKEN= Select only one SASL Kerberos option
-.endif
-POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err
-.endif
-
-.if defined(WITH_SASLKRB5)
-.if defined(WITH_SASLKRB) || defined(WITH_SASLKMIT)
-BROKEN= Select only one SASL Kerberos option
-.endif
-POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken
-.endif
-
-.if defined(WITH_SASLKMIT)
-.if defined(WITH_SASLKRB) || 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_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_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
-.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/
-PATCHFILES+= postfix-2.5.1-vda-ng.patch.gz
-PATCH_DIST_STRIP= -p1
-.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+= SUB_TEST=""
-.else
-PLIST_SUB+= SUB_TEST="@comment "
-.endif
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-SUB_LIST+= REQUIRE="${_REQUIRE}"
-
-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
- @${FIND} -P ${WRKSRC}/man -type f | ${XARGS} \
- ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g"
- @${FIND} -P ${WRKSRC}/README_FILES -type f | ${XARGS} \
- ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g"
- @${FIND} -P ${WRKSRC}/conf -type f | ${XARGS} \
- ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g"
-
-post-patch:
-# All files modified with ${FILESDIR}/patch-* to use !!PREFIX!! need REINPLACE. Put below.
- @${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" \
- ${WRKSRC}/conf/main.cf ${WRKSRC}/src/global/mail_params.h
- @${REINPLACE_CMD} -e "s|perl|${PERL}|" ${WRKSRC}/src/bounce/Makefile.in
-
-do-configure:
- (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
- CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
- ${ECHO} "all: default" >> Makefile)
-
-pre-install:
- @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
- cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
- config_directory=${PREFIX}/etc/postfix \
- data_directory=/var/db/postfix \
- daemon_directory=${PREFIX}/libexec/postfix \
- command_directory=${PREFIX}/sbin \
- queue_directory=/var/spool/postfix \
- sendmail_path=${PREFIX}/sbin/sendmail \
- newaliases_path=${PREFIX}/bin/newaliases \
- mailq_path=${PREFIX}/bin/mailq \
- mail_owner=postfix \
- setgid_group=maildrop \
- manpage_directory=${MANPREFIX}/man \
- sample_directory=${PREFIX}/etc/postfix \
- readme_directory=${READMEDIR}
-
- ${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
-
- @${MKDIR} ${PREFIX}/etc/postfix/dist
-.for f in ${CONF1}
- ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist
-.endfor
-
-.if !defined(NOPORTDOCS)
- ${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
- @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
- ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.endif
-
-post-install:
- @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# Fix compressed man pages
- @${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files
- @${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo
deleted file mode 100644
index be41168d0f37..000000000000
--- a/mail/postfix27/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (postfix/postfix-2.5.1.tar.gz) = 95a559c509081fdd07d78eafd4f4c3b4
-SHA256 (postfix/postfix-2.5.1.tar.gz) = bad7ed98d1bbc8fd27d4b4d6d65a8dfe21794c109bc923e5fe45abea5b484037
-SIZE (postfix/postfix-2.5.1.tar.gz) = 3153629
-MD5 (postfix/postfix-2.5.1-vda-ng.patch.gz) = bba9426f8ae9d8603861ce782f117760
-SHA256 (postfix/postfix-2.5.1-vda-ng.patch.gz) = aae719707cea7257081cff915730a596a22e1415c625c574417018700760f423
-SIZE (postfix/postfix-2.5.1-vda-ng.patch.gz) = 12348
diff --git a/mail/postfix27/files/patch-conf::main.cf b/mail/postfix27/files/patch-conf::main.cf
deleted file mode 100644
index 14976bcaa09c..000000000000
--- a/mail/postfix27/files/patch-conf::main.cf
+++ /dev/null
@@ -1,80 +0,0 @@
---- conf/main.cf.orig 2007-12-18 11:50:25.000000000 -0200
-+++ conf/main.cf 2008-02-29 22:35:12.000000000 -0300
-@@ -33,19 +33,19 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = !!PREFIX!!/sbin
-
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
-
- # The data_directory parameter specifies the location of Postfix-writable
- # data files (caches, random numbers). This directory must be owned
- # by the mail_owner account (see below).
- #
--data_directory = /var/lib/postfix
-+data_directory = /var/db/postfix
-
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -244,7 +244,7 @@
- #
- #mynetworks_style = class
- #mynetworks_style = subnet
--#mynetworks_style = host
-+mynetworks_style = host
-
- # Alternatively, you can specify the mynetworks list by hand, in
- # which case Postfix ignores the mynetworks_style setting.
-@@ -615,37 +615,37 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- #
--sendmail_path =
-+sendmail_path = !!PREFIX!!/sbin/sendmail
-
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = !!PREFIX!!/bin/newaliases
-
- # mailq_path: The full pathname of the Postfix mailq command. This
- # is the Sendmail-compatible mail queue listing command.
- #
--mailq_path =
-+mailq_path = !!PREFIX!!/bin/mailq
-
- # setgid_group: The group for mail submission and queue management
- # commands. This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
-
- # html_directory: The location of the Postfix HTML documentation.
- #
--html_directory =
-+html_directory = no
-
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = !!PREFIX!!/man
-
- # sample_directory: The location of the Postfix sample configuration files.
- # This parameter is obsolete as of Postfix 2.1.
- #
--sample_directory =
-+sample_directory = !!PREFIX!!/etc/postfix
-
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix27/files/patch-conf::post-install b/mail/postfix27/files/patch-conf::post-install
deleted file mode 100644
index 78401de5bdf3..000000000000
--- a/mail/postfix27/files/patch-conf::post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/post-install.orig Thu Feb 24 08:06:08 2005
-+++ conf/post-install Sat Mar 5 11:53:42 2005
-@@ -185,7 +185,7 @@
-
- umask 022
-
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS="
- "
diff --git a/mail/postfix27/files/patch-conf__postfix-files b/mail/postfix27/files/patch-conf__postfix-files
deleted file mode 100644
index bbd19c09b38d..000000000000
--- a/mail/postfix27/files/patch-conf__postfix-files
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/postfix-files.orig 2008-01-24 00:13:49.000000000 +0000
-+++ conf/postfix-files 2008-02-29 20:53:24.000000000 +0000
-@@ -42,7 +42,7 @@
- # permissions, so that running "make install" fixes any glitches.
- #
- $config_directory:d:root:-:755:u
--$data_directory:d:$mail_owner:-:700:u
-+$data_directory:d:$mail_owner:-:700:uc
- $daemon_directory:d:root:-:755:u
- $queue_directory:d:root:-:755:uc
- $sample_directory:d:root:-:755:o
diff --git a/mail/postfix27/files/patch-makedefs b/mail/postfix27/files/patch-makedefs
deleted file mode 100644
index 5b231457530b..000000000000
--- a/mail/postfix27/files/patch-makedefs
+++ /dev/null
@@ -1,13 +0,0 @@
---- makedefs.orig 2007-03-24 10:30:18.000000000 -0300
-+++ makedefs 2007-10-22 16:18:48.000000000 -0200
-@@ -130,6 +130,10 @@
- ;;
- FreeBSD.6*) SYSTYPE=FREEBSD6
- ;;
-+ FreeBSD.7*) SYSTYPE=FREEBSD6
-+ ;;
-+ FreeBSD.8*) SYSTYPE=FREEBSD6
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- OpenBSD.3*) SYSTYPE=OPENBSD3
diff --git a/mail/postfix27/files/patch-src::global::mail_params.h b/mail/postfix27/files/patch-src::global::mail_params.h
deleted file mode 100644
index 52ea5e9e5c35..000000000000
--- a/mail/postfix27/files/patch-src::global::mail_params.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/global/mail_params.h.orig Fri Feb 11 21:53:21 2005
-+++ src/global/mail_params.h Sat Mar 5 11:53:42 2005
-@@ -64,7 +64,7 @@
- extern gid_t var_owner_gid;
-
- #define VAR_SGID_GROUP "setgid_group"
--#define DEF_SGID_GROUP "postdrop"
-+#define DEF_SGID_GROUP "maildrop"
- extern char *var_sgid_group;
- extern gid_t var_sgid_gid;
-
-@@ -221,7 +221,7 @@
- */
- #define VAR_DAEMON_DIR "daemon_directory"
- #ifndef DEF_DAEMON_DIR
--#define DEF_DAEMON_DIR "/usr/libexec/postfix"
-+#define DEF_DAEMON_DIR "!!PREFIX!!/libexec/postfix"
- #endif
- extern char *var_daemon_dir;
-
-@@ -250,7 +250,7 @@
- */
- #define VAR_CONFIG_DIR "config_directory"
- #ifndef DEF_CONFIG_DIR
--#define DEF_CONFIG_DIR "/etc/postfix"
-+#define DEF_CONFIG_DIR "!!PREFIX!!/etc/postfix"
- #endif
- extern char *var_config_dir;
-
diff --git a/mail/postfix27/files/patch-src__smtpd__smtpd.c b/mail/postfix27/files/patch-src__smtpd__smtpd.c
deleted file mode 100644
index f08cfea86de9..000000000000
--- a/mail/postfix27/files/patch-src__smtpd__smtpd.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/smtpd/smtpd.c.orig 2008-03-24 16:38:05.000000000 -0300
-+++ src/smtpd/smtpd.c 2008-03-24 16:48:38.000000000 -0300
-@@ -2108,14 +2108,14 @@
- if (smtpd_milters != 0
- && SMTPD_STAND_ALONE(state) == 0
- && (state->saved_flags & MILTER_SKIP_FLAGS) == 0) {
-+ PUSH_STRING(saved_sender, state->sender, STR(state->addr_buf));
- err = milter_mail_event(smtpd_milters,
- milter_argv(state, argc - 2, argv + 2));
- if (err != 0) {
- /* Log reject etc. with correct sender information. */
-- PUSH_STRING(saved_sender, state->sender, STR(state->addr_buf));
- err = check_milter_reply(state, err);
-- POP_STRING(saved_sender, state->sender);
- }
-+ POP_STRING(saved_sender, state->sender);
- if (err != 0) {
- /* XXX Reset access map side effects. */
- mail_reset(state);
-@@ -2362,14 +2362,14 @@
- }
- if (smtpd_milters != 0
- && (state->saved_flags & MILTER_SKIP_FLAGS) == 0) {
-+ PUSH_STRING(saved_rcpt, state->recipient, STR(state->addr_buf));
- err = milter_rcpt_event(smtpd_milters,
- milter_argv(state, argc - 2, argv + 2));
- if (err != 0) {
- /* Log reject etc. with correct recipient information. */
-- PUSH_STRING(saved_rcpt, state->recipient, STR(state->addr_buf));
- err = check_milter_reply(state, err);
-- POP_STRING(saved_rcpt, state->recipient);
- }
-+ POP_STRING(saved_rcpt, state->recipient);
- if (err != 0) {
- smtpd_chat_reply(state, "%s", err);
- return (-1);
diff --git a/mail/postfix27/files/postfix.sh.in b/mail/postfix27/files/postfix.sh.in
deleted file mode 100644
index 2b07d6c85c1d..000000000000
--- a/mail/postfix27/files/postfix.sh.in
+++ /dev/null
@@ -1,48 +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 "".
-#
-
-. %%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"}
-: ${postfix_flags=""}
-
-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/postfix27/pkg-descr b/mail/postfix27/pkg-descr
deleted file mode 100644
index 58c625e46973..000000000000
--- a/mail/postfix27/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/postfix27/pkg-install b/mail/postfix27/pkg-install
deleted file mode 100644
index 4d847638d846..000000000000
--- a/mail/postfix27/pkg-install
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# 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.
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
-
-if [ x${POSTFIX_DEFAULT_MTA} = xno ]; 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 x${BATCH} = xno ]; then
- read -p "${question} [${default}]? " answer
- fi
- if [ x${answer} = x ]; 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 [ x"$2" = xPRE-INSTALL ]; then
- USER=postfix
- UID=125
- GROUP=postfix
- GID=125
- GROUP2=maildrop
- GID2=126
-
- if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
- echo "You already have a group \"${GROUP}\", so I will use it."
- else
- if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then
- echo "Added group \"${GROUP}\"."
- else
- echo "Adding group \"${GROUP}\" failed..."
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
- if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
- echo "You already have a group \"${GROUP2}\", so I will use it."
- else
- if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
- echo "Added group \"${GROUP2}\"."
- else
- echo "Adding group \"${GROUP2}\" failed..."
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
- if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
- echo "You already have a user \"${USER}\", so I will use it."
- else
- if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
- if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
- echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
- else
- echo "You need user \"${USER}\" added to group \"mail\"."
- if yesno "Would you like me to add it" y; then
- /usr/sbin/pw groupmod mail -m ${USER} || exit
- echo "Done."
- else
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
- if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then
- for file in ${PKG_PREFIX}/etc/postfix/dist/*; do
- if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then
- cp $file ${PKG_PREFIX}/etc/postfix/
- fi
- done
- fi
-
- /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
- config_directory=${PKG_PREFIX}/etc/postfix \
- data_directory=/var/db/postfix \
- daemon_directory=${PKG_PREFIX}/libexec/postfix \
- command_directory=${PKG_PREFIX}/sbin \
- queue_directory=/var/spool/postfix \
- sendmail_path=${PKG_PREFIX}/sbin/sendmail \
- newaliases_path=${PKG_PREFIX}/bin/newaliases \
- mailq_path=${PKG_PREFIX}/bin/mailq \
- mail_owner=postfix \
- setgid_group=maildrop \
- manpage_directory=${PKG_PREFIX}/man \
- sample_directory=${PKG_PREFIX}/etc/postfix \
- readme_directory=no \
- upgrade-package
-fi
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-
-replace() {
- local orig repl
-
- orig=$1
- repl=$2
- if [ -e ${orig} ]; then
- /bin/mv -f ${orig} ${orig}.OFF
- /bin/chmod 0 ${orig}.OFF
- fi
- if [ -e ${repl} ]; then
- /bin/ln -s ${repl} ${orig}
- fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
- if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
- /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
- echo "#" > /etc/mail/mailer.conf
- echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
- echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- echo "#" >> /etc/mail/mailer.conf
- echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- fi
-fi
diff --git a/mail/postfix27/pkg-message b/mail/postfix27/pkg-message
deleted file mode 100644
index 3b23f15a2cac..000000000000
--- a/mail/postfix27/pkg-message
+++ /dev/null
@@ -1,25 +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 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 /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix27/pkg-plist b/mail/postfix27/pkg-plist
deleted file mode 100644
index b0e26b6fe95b..000000000000
--- a/mail/postfix27/pkg-plist
+++ /dev/null
@@ -1,240 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi
-@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi
-etc/postfix/LICENSE
-etc/postfix/TLS_LICENSE
-etc/postfix/bounce.cf.default
-etc/postfix/main.cf.default
-etc/postfix/makedefs.out
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/dist/main.cf
-etc/postfix/dist/master.cf
-etc/postfix/dist/access
-etc/postfix/dist/aliases
-etc/postfix/dist/canonical
-etc/postfix/dist/header_checks
-etc/postfix/dist/relocated
-etc/postfix/dist/transport
-etc/postfix/dist/virtual
-etc/postfix/dist/generic
-libexec/postfix/anvil
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/discard
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/oqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-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/trivial-rewrite
-libexec/postfix/verify
-libexec/postfix/virtual
-libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-%%SUB_TEST%%bin/qmqp-sink
-%%SUB_TEST%%bin/qmqp-source
-%%SUB_TEST%%bin/smtp-sink
-%%SUB_TEST%%bin/smtp-source
-bin/rmail
-bin/qshape
-bin/newaliases
-bin/mailq
-%%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%%/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%%/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.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
-%%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%%/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.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.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%%/tcp_table.5.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%%
-@dirrm libexec/postfix
-@dirrm etc/postfix/dist
-@dirrmtry etc/postfix
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
deleted file mode 100644
index 57d6738a2f7a..000000000000
--- a/mail/postfix28/Makefile
+++ /dev/null
@@ -1,306 +0,0 @@
-# New ports collection makefile for: postfix
-# Date created: 18 Mar 1999
-# Whom: torstenb
-#
-# $FreeBSD$
-#
-
-PORTNAME= postfix
-PORTVERSION= 2.5.1
-PORTREVISION= 2
-PORTEPOCH= 1
-CATEGORIES= mail ipv6
-MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
- ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
- 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
-DISTNAME= postfix-${PORTVERSION}
-DIST_SUBDIR= ${PORTNAME}
-
-# blanket approval for version updates: mnag@FreeBSD.org
-MAINTAINER= vivek@khera.org
-COMMENT= A secure alternative to widely-used Sendmail
-
-CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-46-9].* postfix-current-2.* \
- sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
-
-USE_SUBMAKE= yes
-USE_PERL5_BUILD=yes
-USE_RC_SUBR= postfix.sh
-
-# 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 SASLKRB SASLKRB5 SASLKRB5MIT TLS BDB MySQL PgSQL OpenLDAP CDB NIS VDA Test
-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 SASL authentication method" off \
- SASLKRB "If your SASL req. Kerberos select this option" ${STATUS_SASLKRB} \
- SASLKRB5 "If your SASL req. Kerberos5 select this option" ${STATUS_SASLKRB5} \
- SASLKMIT "If your SASL req. MIT Kerberos5 select this option" ${STATUS_SASLKRB5MIT} \
- TLS "Enable SSL and TLS support" ${STATUS_TLS} \
- BDB "Berkeley DB (choose version with WITH_BDB_VER)" ${STATUS_BDB} \
- MYSQL "MySQL maps (choose version with WITH_MYSQL_VER)" ${STATUS_MySQL} \
- PGSQL "PostgreSQL maps (choose with DEFAULT_PGSQL_VER)" ${STATUS_PgSQL} \
- OPENLDAP "OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)" ${STATUS_OpenLDAP} \
- CDB "CDB maps lookups" ${STATUS_CDB} \
- NIS "NIS maps lookups" ${STATUS_NIS} \
- VDA "VDA (Virtual Delivery Agent)" ${STATUS_VDA} \
- TEST "SMTP/LMTP test server and generator" ${STATUS_Test}
-
-MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
- postlock.1 postlog.1 postmap.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 regexp_table.5 relocated.5 \
- tcp_table.5 transport.5 virtual.5
-
-MAN8= anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 local.8 master.8 \
- oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 showq.8 \
- smtp.8 smtpd.8 spawn.8 tlsmgr.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
-
-CONF1= access aliases canonical generic header_checks main.cf master.cf \
- relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+= DEBUG=
-.endif
-
-MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}"
-
-SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
- TOUCH="${TOUCH}" \
- MKDIR="${MKDIR}"
-
-.include <bsd.port.pre.mk>
-
-# 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)
-RUN_DEPENDS+= dovecot:${PORTSDIR}/mail/dovecot
-POSTFIX_CCARGS+= -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
-.endif
-
-.if defined(WITH_SASLKRB)
-.if defined(WITH_SASLKRB5) || defined(WITH_SASLKMIT)
-BROKEN= Select only one SASL Kerberos option
-.endif
-POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err
-.endif
-
-.if defined(WITH_SASLKRB5)
-.if defined(WITH_SASLKRB) || defined(WITH_SASLKMIT)
-BROKEN= Select only one SASL Kerberos option
-.endif
-POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken
-.endif
-
-.if defined(WITH_SASLKMIT)
-.if defined(WITH_SASLKRB) || 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_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_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
-.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/
-PATCHFILES+= postfix-2.5.1-vda-ng.patch.gz
-PATCH_DIST_STRIP= -p1
-.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+= SUB_TEST=""
-.else
-PLIST_SUB+= SUB_TEST="@comment "
-.endif
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-SUB_LIST+= REQUIRE="${_REQUIRE}"
-
-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
- @${FIND} -P ${WRKSRC}/man -type f | ${XARGS} \
- ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g"
- @${FIND} -P ${WRKSRC}/README_FILES -type f | ${XARGS} \
- ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g"
- @${FIND} -P ${WRKSRC}/conf -type f | ${XARGS} \
- ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g"
-
-post-patch:
-# All files modified with ${FILESDIR}/patch-* to use !!PREFIX!! need REINPLACE. Put below.
- @${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" \
- ${WRKSRC}/conf/main.cf ${WRKSRC}/src/global/mail_params.h
- @${REINPLACE_CMD} -e "s|perl|${PERL}|" ${WRKSRC}/src/bounce/Makefile.in
-
-do-configure:
- (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
- CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
- ${ECHO} "all: default" >> Makefile)
-
-pre-install:
- @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
- cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
- config_directory=${PREFIX}/etc/postfix \
- data_directory=/var/db/postfix \
- daemon_directory=${PREFIX}/libexec/postfix \
- command_directory=${PREFIX}/sbin \
- queue_directory=/var/spool/postfix \
- sendmail_path=${PREFIX}/sbin/sendmail \
- newaliases_path=${PREFIX}/bin/newaliases \
- mailq_path=${PREFIX}/bin/mailq \
- mail_owner=postfix \
- setgid_group=maildrop \
- manpage_directory=${MANPREFIX}/man \
- sample_directory=${PREFIX}/etc/postfix \
- readme_directory=${READMEDIR}
-
- ${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
-
- @${MKDIR} ${PREFIX}/etc/postfix/dist
-.for f in ${CONF1}
- ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist
-.endfor
-
-.if !defined(NOPORTDOCS)
- ${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
- @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
- ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.endif
-
-post-install:
- @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# Fix compressed man pages
- @${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files
- @${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo
deleted file mode 100644
index be41168d0f37..000000000000
--- a/mail/postfix28/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (postfix/postfix-2.5.1.tar.gz) = 95a559c509081fdd07d78eafd4f4c3b4
-SHA256 (postfix/postfix-2.5.1.tar.gz) = bad7ed98d1bbc8fd27d4b4d6d65a8dfe21794c109bc923e5fe45abea5b484037
-SIZE (postfix/postfix-2.5.1.tar.gz) = 3153629
-MD5 (postfix/postfix-2.5.1-vda-ng.patch.gz) = bba9426f8ae9d8603861ce782f117760
-SHA256 (postfix/postfix-2.5.1-vda-ng.patch.gz) = aae719707cea7257081cff915730a596a22e1415c625c574417018700760f423
-SIZE (postfix/postfix-2.5.1-vda-ng.patch.gz) = 12348
diff --git a/mail/postfix28/files/patch-conf::main.cf b/mail/postfix28/files/patch-conf::main.cf
deleted file mode 100644
index 14976bcaa09c..000000000000
--- a/mail/postfix28/files/patch-conf::main.cf
+++ /dev/null
@@ -1,80 +0,0 @@
---- conf/main.cf.orig 2007-12-18 11:50:25.000000000 -0200
-+++ conf/main.cf 2008-02-29 22:35:12.000000000 -0300
-@@ -33,19 +33,19 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = !!PREFIX!!/sbin
-
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
-
- # The data_directory parameter specifies the location of Postfix-writable
- # data files (caches, random numbers). This directory must be owned
- # by the mail_owner account (see below).
- #
--data_directory = /var/lib/postfix
-+data_directory = /var/db/postfix
-
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -244,7 +244,7 @@
- #
- #mynetworks_style = class
- #mynetworks_style = subnet
--#mynetworks_style = host
-+mynetworks_style = host
-
- # Alternatively, you can specify the mynetworks list by hand, in
- # which case Postfix ignores the mynetworks_style setting.
-@@ -615,37 +615,37 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- #
--sendmail_path =
-+sendmail_path = !!PREFIX!!/sbin/sendmail
-
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = !!PREFIX!!/bin/newaliases
-
- # mailq_path: The full pathname of the Postfix mailq command. This
- # is the Sendmail-compatible mail queue listing command.
- #
--mailq_path =
-+mailq_path = !!PREFIX!!/bin/mailq
-
- # setgid_group: The group for mail submission and queue management
- # commands. This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
-
- # html_directory: The location of the Postfix HTML documentation.
- #
--html_directory =
-+html_directory = no
-
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = !!PREFIX!!/man
-
- # sample_directory: The location of the Postfix sample configuration files.
- # This parameter is obsolete as of Postfix 2.1.
- #
--sample_directory =
-+sample_directory = !!PREFIX!!/etc/postfix
-
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix28/files/patch-conf::post-install b/mail/postfix28/files/patch-conf::post-install
deleted file mode 100644
index 78401de5bdf3..000000000000
--- a/mail/postfix28/files/patch-conf::post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/post-install.orig Thu Feb 24 08:06:08 2005
-+++ conf/post-install Sat Mar 5 11:53:42 2005
-@@ -185,7 +185,7 @@
-
- umask 022
-
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS="
- "
diff --git a/mail/postfix28/files/patch-conf__postfix-files b/mail/postfix28/files/patch-conf__postfix-files
deleted file mode 100644
index bbd19c09b38d..000000000000
--- a/mail/postfix28/files/patch-conf__postfix-files
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/postfix-files.orig 2008-01-24 00:13:49.000000000 +0000
-+++ conf/postfix-files 2008-02-29 20:53:24.000000000 +0000
-@@ -42,7 +42,7 @@
- # permissions, so that running "make install" fixes any glitches.
- #
- $config_directory:d:root:-:755:u
--$data_directory:d:$mail_owner:-:700:u
-+$data_directory:d:$mail_owner:-:700:uc
- $daemon_directory:d:root:-:755:u
- $queue_directory:d:root:-:755:uc
- $sample_directory:d:root:-:755:o
diff --git a/mail/postfix28/files/patch-makedefs b/mail/postfix28/files/patch-makedefs
deleted file mode 100644
index 5b231457530b..000000000000
--- a/mail/postfix28/files/patch-makedefs
+++ /dev/null
@@ -1,13 +0,0 @@
---- makedefs.orig 2007-03-24 10:30:18.000000000 -0300
-+++ makedefs 2007-10-22 16:18:48.000000000 -0200
-@@ -130,6 +130,10 @@
- ;;
- FreeBSD.6*) SYSTYPE=FREEBSD6
- ;;
-+ FreeBSD.7*) SYSTYPE=FREEBSD6
-+ ;;
-+ FreeBSD.8*) SYSTYPE=FREEBSD6
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- OpenBSD.3*) SYSTYPE=OPENBSD3
diff --git a/mail/postfix28/files/patch-src::global::mail_params.h b/mail/postfix28/files/patch-src::global::mail_params.h
deleted file mode 100644
index 52ea5e9e5c35..000000000000
--- a/mail/postfix28/files/patch-src::global::mail_params.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/global/mail_params.h.orig Fri Feb 11 21:53:21 2005
-+++ src/global/mail_params.h Sat Mar 5 11:53:42 2005
-@@ -64,7 +64,7 @@
- extern gid_t var_owner_gid;
-
- #define VAR_SGID_GROUP "setgid_group"
--#define DEF_SGID_GROUP "postdrop"
-+#define DEF_SGID_GROUP "maildrop"
- extern char *var_sgid_group;
- extern gid_t var_sgid_gid;
-
-@@ -221,7 +221,7 @@
- */
- #define VAR_DAEMON_DIR "daemon_directory"
- #ifndef DEF_DAEMON_DIR
--#define DEF_DAEMON_DIR "/usr/libexec/postfix"
-+#define DEF_DAEMON_DIR "!!PREFIX!!/libexec/postfix"
- #endif
- extern char *var_daemon_dir;
-
-@@ -250,7 +250,7 @@
- */
- #define VAR_CONFIG_DIR "config_directory"
- #ifndef DEF_CONFIG_DIR
--#define DEF_CONFIG_DIR "/etc/postfix"
-+#define DEF_CONFIG_DIR "!!PREFIX!!/etc/postfix"
- #endif
- extern char *var_config_dir;
-
diff --git a/mail/postfix28/files/patch-src__smtpd__smtpd.c b/mail/postfix28/files/patch-src__smtpd__smtpd.c
deleted file mode 100644
index f08cfea86de9..000000000000
--- a/mail/postfix28/files/patch-src__smtpd__smtpd.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/smtpd/smtpd.c.orig 2008-03-24 16:38:05.000000000 -0300
-+++ src/smtpd/smtpd.c 2008-03-24 16:48:38.000000000 -0300
-@@ -2108,14 +2108,14 @@
- if (smtpd_milters != 0
- && SMTPD_STAND_ALONE(state) == 0
- && (state->saved_flags & MILTER_SKIP_FLAGS) == 0) {
-+ PUSH_STRING(saved_sender, state->sender, STR(state->addr_buf));
- err = milter_mail_event(smtpd_milters,
- milter_argv(state, argc - 2, argv + 2));
- if (err != 0) {
- /* Log reject etc. with correct sender information. */
-- PUSH_STRING(saved_sender, state->sender, STR(state->addr_buf));
- err = check_milter_reply(state, err);
-- POP_STRING(saved_sender, state->sender);
- }
-+ POP_STRING(saved_sender, state->sender);
- if (err != 0) {
- /* XXX Reset access map side effects. */
- mail_reset(state);
-@@ -2362,14 +2362,14 @@
- }
- if (smtpd_milters != 0
- && (state->saved_flags & MILTER_SKIP_FLAGS) == 0) {
-+ PUSH_STRING(saved_rcpt, state->recipient, STR(state->addr_buf));
- err = milter_rcpt_event(smtpd_milters,
- milter_argv(state, argc - 2, argv + 2));
- if (err != 0) {
- /* Log reject etc. with correct recipient information. */
-- PUSH_STRING(saved_rcpt, state->recipient, STR(state->addr_buf));
- err = check_milter_reply(state, err);
-- POP_STRING(saved_rcpt, state->recipient);
- }
-+ POP_STRING(saved_rcpt, state->recipient);
- if (err != 0) {
- smtpd_chat_reply(state, "%s", err);
- return (-1);
diff --git a/mail/postfix28/files/postfix.sh.in b/mail/postfix28/files/postfix.sh.in
deleted file mode 100644
index 2b07d6c85c1d..000000000000
--- a/mail/postfix28/files/postfix.sh.in
+++ /dev/null
@@ -1,48 +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 "".
-#
-
-. %%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"}
-: ${postfix_flags=""}
-
-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-install b/mail/postfix28/pkg-install
deleted file mode 100644
index 4d847638d846..000000000000
--- a/mail/postfix28/pkg-install
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# 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.
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
-
-if [ x${POSTFIX_DEFAULT_MTA} = xno ]; 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 x${BATCH} = xno ]; then
- read -p "${question} [${default}]? " answer
- fi
- if [ x${answer} = x ]; 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 [ x"$2" = xPRE-INSTALL ]; then
- USER=postfix
- UID=125
- GROUP=postfix
- GID=125
- GROUP2=maildrop
- GID2=126
-
- if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
- echo "You already have a group \"${GROUP}\", so I will use it."
- else
- if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then
- echo "Added group \"${GROUP}\"."
- else
- echo "Adding group \"${GROUP}\" failed..."
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
- if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
- echo "You already have a group \"${GROUP2}\", so I will use it."
- else
- if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
- echo "Added group \"${GROUP2}\"."
- else
- echo "Adding group \"${GROUP2}\" failed..."
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
- if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
- echo "You already have a user \"${USER}\", so I will use it."
- else
- if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
- if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
- echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
- else
- echo "You need user \"${USER}\" added to group \"mail\"."
- if yesno "Would you like me to add it" y; then
- /usr/sbin/pw groupmod mail -m ${USER} || exit
- echo "Done."
- else
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
- if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then
- for file in ${PKG_PREFIX}/etc/postfix/dist/*; do
- if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then
- cp $file ${PKG_PREFIX}/etc/postfix/
- fi
- done
- fi
-
- /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
- config_directory=${PKG_PREFIX}/etc/postfix \
- data_directory=/var/db/postfix \
- daemon_directory=${PKG_PREFIX}/libexec/postfix \
- command_directory=${PKG_PREFIX}/sbin \
- queue_directory=/var/spool/postfix \
- sendmail_path=${PKG_PREFIX}/sbin/sendmail \
- newaliases_path=${PKG_PREFIX}/bin/newaliases \
- mailq_path=${PKG_PREFIX}/bin/mailq \
- mail_owner=postfix \
- setgid_group=maildrop \
- manpage_directory=${PKG_PREFIX}/man \
- sample_directory=${PKG_PREFIX}/etc/postfix \
- readme_directory=no \
- upgrade-package
-fi
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-
-replace() {
- local orig repl
-
- orig=$1
- repl=$2
- if [ -e ${orig} ]; then
- /bin/mv -f ${orig} ${orig}.OFF
- /bin/chmod 0 ${orig}.OFF
- fi
- if [ -e ${repl} ]; then
- /bin/ln -s ${repl} ${orig}
- fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
- if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
- /bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
- echo "#" > /etc/mail/mailer.conf
- echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
- echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- echo "#" >> /etc/mail/mailer.conf
- echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
- fi
-fi
diff --git a/mail/postfix28/pkg-message b/mail/postfix28/pkg-message
deleted file mode 100644
index 3b23f15a2cac..000000000000
--- a/mail/postfix28/pkg-message
+++ /dev/null
@@ -1,25 +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 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 /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix28/pkg-plist b/mail/postfix28/pkg-plist
deleted file mode 100644
index b0e26b6fe95b..000000000000
--- a/mail/postfix28/pkg-plist
+++ /dev/null
@@ -1,240 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi
-@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi
-etc/postfix/LICENSE
-etc/postfix/TLS_LICENSE
-etc/postfix/bounce.cf.default
-etc/postfix/main.cf.default
-etc/postfix/makedefs.out
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/dist/main.cf
-etc/postfix/dist/master.cf
-etc/postfix/dist/access
-etc/postfix/dist/aliases
-etc/postfix/dist/canonical
-etc/postfix/dist/header_checks
-etc/postfix/dist/relocated
-etc/postfix/dist/transport
-etc/postfix/dist/virtual
-etc/postfix/dist/generic
-libexec/postfix/anvil
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/discard
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/oqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-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/trivial-rewrite
-libexec/postfix/verify
-libexec/postfix/virtual
-libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-%%SUB_TEST%%bin/qmqp-sink
-%%SUB_TEST%%bin/qmqp-source
-%%SUB_TEST%%bin/smtp-sink
-%%SUB_TEST%%bin/smtp-source
-bin/rmail
-bin/qshape
-bin/newaliases
-bin/mailq
-%%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%%/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%%/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.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
-%%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%%/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.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.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%%/tcp_table.5.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%%
-@dirrm libexec/postfix
-@dirrm etc/postfix/dist
-@dirrmtry etc/postfix
diff --git a/mail/rubygem-tmail/Makefile b/mail/rubygem-tmail/Makefile
deleted file mode 100644
index 3fdb0689797d..000000000000
--- a/mail/rubygem-tmail/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# New ports collection makefile for: Ruby-TMail
-# Date created: 22 Aug 2000
-# Whom: Akinori MUSHA aka knu <knu@idaemons.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= tmail
-PORTVERSION= 0.10.8
-CATEGORIES= mail ruby
-MASTER_SITES= http://www.loveruby.net/archive/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTNAME}
-PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-DIST_SUBDIR= ruby
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= A RFC2822/MIME compliant mail manipulating library for Ruby
-
-USE_RUBY= yes
-USE_RUBY_SETUP= yes
-USE_RUBY_FEATURES= racc-runtime
-
-DOCS_EN= Incompatibilities README.en doc.en/* \
- *ChangeLog BUGS TODO
-DOCS_JA= Incompatibilities.ja README.ja doc.ja/*
-
-do-install:
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${RUBY_MODEXAMPLESDIR}
- ${CP} -R ${WRKSRC}/sample/ ${RUBY_MODEXAMPLESDIR}/
- ${MKDIR} ${RUBY_MODDOCDIR}/ja
-.for f in ${DOCS_EN}
- ${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
-.endfor
-.for f in ${DOCS_JA}
- ${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/rubygem-tmail/distinfo b/mail/rubygem-tmail/distinfo
deleted file mode 100644
index cccc305d32f2..000000000000
--- a/mail/rubygem-tmail/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ruby/tmail-0.10.8.tar.gz) = abd5916459691aec669f1bbf78e201d3
-SHA256 (ruby/tmail-0.10.8.tar.gz) = ac6daa85ba25d713ccba7e1f75d41af88175e5b0419b8397fa359d3f4e2e1d1c
-SIZE (ruby/tmail-0.10.8.tar.gz) = 125752
diff --git a/mail/rubygem-tmail/pkg-descr b/mail/rubygem-tmail/pkg-descr
deleted file mode 100644
index 659655c1c621..000000000000
--- a/mail/rubygem-tmail/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-TMail is a mail manipulating library for Ruby, with RFC822 and MIME
-multipart support.
-
-Author: Minero Aoki <aamine@loveruby.net>
-WWW: http://www.loveruby.net/en/tmail.html
diff --git a/mail/rubygem-tmail/pkg-plist b/mail/rubygem-tmail/pkg-plist
deleted file mode 100644
index 2349b7f9d884..000000000000
--- a/mail/rubygem-tmail/pkg-plist
+++ /dev/null
@@ -1,69 +0,0 @@
-%%RUBY_SITEARCHLIBDIR%%/tmail/base64.so
-%%RUBY_SITEARCHLIBDIR%%/tmail/scanner_c.so
-%%RUBY_SITELIBDIR%%/tmail.rb
-@dirrm %%RUBY_SITEARCHLIBDIR%%/tmail
-%%RUBY_SITELIBDIR%%/tmail/address.rb
-%%RUBY_SITELIBDIR%%/tmail/base64.rb
-%%RUBY_SITELIBDIR%%/tmail/compat.rb
-%%RUBY_SITELIBDIR%%/tmail/config.rb
-%%RUBY_SITELIBDIR%%/tmail/encode.rb
-%%RUBY_SITELIBDIR%%/tmail/header.rb
-%%RUBY_SITELIBDIR%%/tmail/info.rb
-%%RUBY_SITELIBDIR%%/tmail/loader.rb
-%%RUBY_SITELIBDIR%%/tmail/mail.rb
-%%RUBY_SITELIBDIR%%/tmail/mailbox.rb
-%%RUBY_SITELIBDIR%%/tmail/mbox.rb
-%%RUBY_SITELIBDIR%%/tmail/net.rb
-%%RUBY_SITELIBDIR%%/tmail/obsolete.rb
-%%RUBY_SITELIBDIR%%/tmail/parser.rb
-%%RUBY_SITELIBDIR%%/tmail/port.rb
-%%RUBY_SITELIBDIR%%/tmail/scanner.rb
-%%RUBY_SITELIBDIR%%/tmail/scanner_r.rb
-%%RUBY_SITELIBDIR%%/tmail/stringio.rb
-%%RUBY_SITELIBDIR%%/tmail/textutils.rb
-%%RUBY_SITELIBDIR%%/tmail/tmail.rb
-%%RUBY_SITELIBDIR%%/tmail/utils.rb
-@dirrm %%RUBY_SITELIBDIR%%/tmail
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/extract-attachements.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/from-check.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/multipart.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/parse-bench.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/parse-test.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sendmail.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/multipart
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/normal
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/sendtest
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/simple
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/test
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/data
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/0ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/BUGS
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Incompatibilities
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/address.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/basics.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/config.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/details.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mail.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mailbox.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/port.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/tmail.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/usage.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Incompatibilities.ja
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/address.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/basics.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/config.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/details.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mail.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mailbox.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/port.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/tmail.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/usage.html
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
deleted file mode 100644
index 66b9731970bd..000000000000
--- a/mail/sylpheed3/Makefile
+++ /dev/null
@@ -1,138 +0,0 @@
-# New ports collection makefile for: sylpheed
-# Date created: 15 June 2000
-# Whom: shigeri <shigeri@m10.alpha-net.ne.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME= sylpheed
-PORTVERSION= 2.4.8
-CATEGORIES= mail ipv6
-MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/
-
-MAINTAINER= oliver@FreeBSD.org
-COMMENT= A lightweight, featureful, and fast GTK+ based e-mail client
-
-RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
-
-USE_BZIP2= yes
-USE_GETTEXT= yes
-USE_GMAKE= yes
-USE_ICONV= yes
-USE_GNOME= gtk20
-GNU_CONFIGURE= yes
-
-# Sylpheed needs pthread if GnomeVFS is installed (GtkFileChooser uses it)
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS= --enable-ipv6 \
- --prefix=${PREFIX} \
- --with-libintl-prefix=${LOCALBASE} \
- --program-transform-name=''
-
-CONFLICTS= sylpheed-1.[0-8]* sylpheed-gtk2-[0-9]*
-
-OPTIONS= GPGME "Enable GnuPG support using GPGME." off \
- COMPFACE "Enable X-Face support." off \
- JPILOT "Enable JPilot support." off \
- LDAP "Enable LDAP support." off \
- SSL "Enable OpenSSL support." on \
- GTKSPELL "Enable Spell checking support" on \
- ONIGURUMA "Enable Oniguruma support" off
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_SSL)
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-CONFIGURE_ARGS+=--enable-ssl
-.else
-CONFIGURE_ARGS+=--disable-ssl
-.endif
-
-.if defined(WITH_GPGME)
-LIB_DEPENDS+= gpgme.17:${PORTSDIR}/security/gpgme
-RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg
-CONFIGURE_ARGS+=--enable-gpgme
-.else
-CONFIGURE_ARGS+=--disable-gpgme
-.endif
-
-.if defined(WITH_COMPFACE)
-LIB_DEPENDS+= compface.1:${PORTSDIR}/mail/faces
-CONFIGURE_ARGS+=--enable-compface
-.else
-CONFIGURE_ARGS+=--disable-compface
-.endif
-
-.if defined(WITH_JPILOT)
-LIB_DEPENDS+= pisock.9:${PORTSDIR}/palm/pilot-link
-RUN_DEPENDS+= jpilot:${PORTSDIR}/palm/jpilot
-CONFIGURE_ARGS+=--enable-jpilot
-.else
-CONFIGURE_ARGS+=--disable-jpilot
-.endif
-
-.if defined(WITH_LDAP)
-USE_OPENLDAP= yes
-CONFIGURE_ARGS+=--enable-ldap
-.else
-CONFIGURE_ARGS+=--disable-ldap
-.endif
-
-.if defined(WITH_GTKSPELL)
-LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell
-CONFIGURE_ARGS+=--enable-gtkspell
-.else
-CONFIGURE_ARGS+=--disable-gtkspell
-.endif
-
-.if defined(WITH_ONIGURUMA)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libonig.a:${PORTSDIR}/devel/oniguruma
-CONFIGURE_ARGS+=--enable-oniguruma
-.else
-CONFIGURE_ARGS+=--disable-oniguruma
-.endif
-
-MAKEFILES= Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \
- faq/en/Makefile.in faq/es/Makefile.in faq/fr/Makefile.in \
- faq/it/Makefile.in manual/Makefile.in manual/en/Makefile.in \
- manual/ja/Makefile.in src/Makefile.in libsylph/Makefile.in \
- src/icons/Makefile.in
-
-post-patch:
- @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
- s|-lresolv||g; s|-lpisock\"|-liconv &|g; ' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g' \
- ${WRKSRC}/libsylph/procmime.c
-
- # to prevent breaking cc of ldif.c because of a base64.h in PREFIX/include
- @${REINPLACE_CMD} -e 's|^\(DEFS.*\.\.\)$$|\1 -I../libsylph|' \
- ${WRKSRC}/src/Makefile.in
-
-.if defined(NOPORTDOCS)
- @${REINPLACE_CMD} -e 's|^SUBDIRS = ac libsylph src po manual faq$$|SUBDIRS = ac libsylph src po|g' \
- ${WRKSRC}/Makefile.in
-.else
-.for i in ${MAKEFILES}
- @${REINPLACE_CMD} -e 's|^faqdir = @faqdir@$$|faqdir = ${DOCSDIR}/faq|g; \
- s|^manualdir = @manualdir@$$|manualdir = ${DOCSDIR}/manual|g' \
- ${WRKSRC}/${i}
-.endfor
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for i in ChangeLog INSTALL README TODO
- @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/${i}.ja ${DOCSDIR}
-.endfor
-.endif
- @${MKDIR} ${PREFIX}/share/pixmaps
- @${MKDIR} ${PREFIX}/share/applications
- @${INSTALL_DATA} ${WRKSRC}/sylpheed.png ${PREFIX}/share/pixmaps/
- @${INSTALL_DATA} ${WRKSRC}/sylpheed.desktop ${PREFIX}/share/applications/
-
-.include <bsd.port.post.mk>
diff --git a/mail/sylpheed3/distinfo b/mail/sylpheed3/distinfo
deleted file mode 100644
index fbd37a22d206..000000000000
--- a/mail/sylpheed3/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (sylpheed-2.4.8.tar.bz2) = 97fcbaa1e278849408ab1d628d4d1af7
-SHA256 (sylpheed-2.4.8.tar.bz2) = cc0173e68851cef51a5f8b7e15fe481b42d840d01a0dfbb300f2a6f1fd748b64
-SIZE (sylpheed-2.4.8.tar.bz2) = 2759841
diff --git a/mail/sylpheed3/files/patch-libsylph-defs.h b/mail/sylpheed3/files/patch-libsylph-defs.h
deleted file mode 100644
index 7881004694d3..000000000000
--- a/mail/sylpheed3/files/patch-libsylph-defs.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- libsylph/defs.h.orig Tue Sep 13 16:55:49 2005
-+++ libsylph/defs.h Mon Sep 19 03:23:15 2005
-@@ -81,8 +81,8 @@
- #else
- # define DEFAULT_SIGNATURE ".signature"
- #endif
--#define DEFAULT_INC_PATH "/usr/bin/mh/inc"
--#define DEFAULT_INC_PROGRAM "inc"
-+#define DEFAULT_INC_PATH ""
-+#define DEFAULT_INC_PROGRAM ""
- /* #define DEFAULT_INC_PATH "/usr/bin/imget" */
- /* #define DEFAULT_INC_PROGRAM "imget" */
- #define DEFAULT_SENDMAIL_CMD "/usr/sbin/sendmail -t -i"
-@@ -91,7 +91,7 @@
- #ifdef _PATH_MAILDIR
- # define DEFAULT_SPOOL_PATH _PATH_MAILDIR
- #else
--# define DEFAULT_SPOOL_PATH "/var/spool/mail"
-+# define DEFAULT_SPOOL_PATH "/var/mail"
- #endif
-
- #define BUFFSIZE 8192
diff --git a/mail/sylpheed3/files/patch-src-printing.c b/mail/sylpheed3/files/patch-src-printing.c
deleted file mode 100644
index f13f0b756bfd..000000000000
--- a/mail/sylpheed3/files/patch-src-printing.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/printing.c.orig Wed Dec 27 15:50:14 2006
-+++ src/printing.c Wed Dec 27 16:28:28 2006
-@@ -149,8 +149,6 @@
-
- desc = pango_font_description_from_string(prefs_common_get()->textfont);
- size = pango_font_description_get_size(desc);
-- pango_font_description_free(desc);
-- desc = gtkut_get_default_font_desc();
- pango_font_description_set_size(desc, size);
- pango_layout_set_font_description(layout, desc);
- pango_font_description_free(desc);
-@@ -406,10 +404,6 @@
- }
- g_print("count = %d\n", count);
-
-- desc = gtkut_get_default_font_desc();
-- pango_font_description_set_size(desc, font_size);
-- pango_layout_set_font_description(layout, desc);
-- pango_font_description_free(desc);
- g_snprintf(buf, sizeof(buf), "- %d -", pinfo->page_nr_per_msg + 1);
- pango_layout_set_text(layout, buf, -1);
- pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
diff --git a/mail/sylpheed3/pkg-descr b/mail/sylpheed3/pkg-descr
deleted file mode 100644
index 3107ae5ca582..000000000000
--- a/mail/sylpheed3/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Sylpheed is an e-mail client (and news reader) based on GTK+ 2, running on
-X Window System, and aiming for:
- * Quick response
- * Graceful, and sophisticated interface
- * Easy configuration, intuitive operation
- * Abundant features
-
-Currently, many features are supported including POP3, IMAP, NNTP,
-multiple accounts, threading, filtering, MIME attachments, APOP, SMTP
-AUTH, SSL, IPv6, GnuPG, internalization, and more.
-
-WWW: http://sylpheed.good-day.net/
diff --git a/mail/sylpheed3/pkg-plist b/mail/sylpheed3/pkg-plist
deleted file mode 100644
index e3bbc6b4b9f9..000000000000
--- a/mail/sylpheed3/pkg-plist
+++ /dev/null
@@ -1,119 +0,0 @@
-bin/sylpheed
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.ja
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.ja
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.ja
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/TODO.ja
-share/applications/sylpheed.desktop
-share/locale/be/LC_MESSAGES/sylpheed.mo
-share/locale/cs/LC_MESSAGES/sylpheed.mo
-share/locale/bg/LC_MESSAGES/sylpheed.mo
-share/locale/da/LC_MESSAGES/sylpheed.mo
-share/locale/de/LC_MESSAGES/sylpheed.mo
-share/locale/el/LC_MESSAGES/sylpheed.mo
-share/locale/es/LC_MESSAGES/sylpheed.mo
-share/locale/et/LC_MESSAGES/sylpheed.mo
-share/locale/fr/LC_MESSAGES/sylpheed.mo
-share/locale/gl/LC_MESSAGES/sylpheed.mo
-share/locale/hr/LC_MESSAGES/sylpheed.mo
-share/locale/hu/LC_MESSAGES/sylpheed.mo
-share/locale/it/LC_MESSAGES/sylpheed.mo
-share/locale/ja/LC_MESSAGES/sylpheed.mo
-share/locale/ko/LC_MESSAGES/sylpheed.mo
-share/locale/lt/LC_MESSAGES/sylpheed.mo
-share/locale/nl/LC_MESSAGES/sylpheed.mo
-share/locale/pl/LC_MESSAGES/sylpheed.mo
-share/locale/pt_BR/LC_MESSAGES/sylpheed.mo
-share/locale/ro/LC_MESSAGES/sylpheed.mo
-share/locale/ru/LC_MESSAGES/sylpheed.mo
-share/locale/sk/LC_MESSAGES/sylpheed.mo
-share/locale/sl/LC_MESSAGES/sylpheed.mo
-share/locale/sr/LC_MESSAGES/sylpheed.mo
-share/locale/sv/LC_MESSAGES/sylpheed.mo
-share/locale/tr/LC_MESSAGES/sylpheed.mo
-share/locale/uk/LC_MESSAGES/sylpheed.mo
-share/locale/vi/LC_MESSAGES/sylpheed.mo
-share/locale/zh_CN/LC_MESSAGES/sylpheed.mo
-share/locale/zh_TW/LC_MESSAGES/sylpheed.mo
-share/pixmaps/sylpheed.png
-%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-1.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-2.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-3.html
-%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-1.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-10.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-11.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-12.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-13.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-14.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-15.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-16.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-17.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-18.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-19.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-20.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-4.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-5.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-6.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-7.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-8.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-9.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-1.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-10.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-11.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-12.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-13.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-14.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-15.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-16.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-17.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-18.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-19.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-20.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-21.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-22.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-23.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-24.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-4.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-5.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-6.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-7.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-8.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-9.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.sgml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/ja
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/en
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/it
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/fr
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/es
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/en
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/de
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
diff --git a/mail/thunderbird-esr-i18n/Makefile b/mail/thunderbird-esr-i18n/Makefile
deleted file mode 100644
index 08d0da756d3d..000000000000
--- a/mail/thunderbird-esr-i18n/Makefile
+++ /dev/null
@@ -1,80 +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= 2.0.0.14
-CATEGORIES= mail
-MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/linux-i686/xpi
-PKGNAMEPREFIX=
-DISTFILES= ${THUNDERBIRD_I18N_:S/$/.xpi/}
-DIST_SUBDIR= xpi/${DISTNAME}
-
-MAINTAINER= infofarmer@FreeBSD.org
-COMMENT= Localized interface for Thunderbird
-
-.ifndef WITHOUT_SWITCHER
-RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
-.endif
-
-NO_BUILD= yes
-USE_XPI= *thunderbird
-
-THUNDERBIRD_I18N_ALL= af be bg ca cs da de el en-GB es-AR es-ES eu fi fr ga-IE \
- he hu it ja ko lt mk nb-NO nl nn-NO pa-IN pl pt-BR \
- pt-PT ru sk sl sv-SE tr uk zh-CN zh-TW
-.ifdef PACKAGE_BUILDING
-THUNDERBIRD_I18N?= all
-.else
-THUNDERBIRD_I18N?= zh-CN es-ES pt-BR ru ja de fr pa-IN 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 chrome/chromelist.txt
-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 \
- 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} ; { ${RM} -f $$_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 6754fd4468f7..000000000000
--- a/mail/thunderbird-esr-i18n/distinfo
+++ /dev/null
@@ -1,111 +0,0 @@
-MD5 (xpi/thunderbird-i18n-2.0.0.14/af.xpi) = 8abd235f8e9424a480bb405335378052
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/af.xpi) = 19e53210571813d535bcf82a16d113dac128a682894ffdec2d327f5a77557c44
-SIZE (xpi/thunderbird-i18n-2.0.0.14/af.xpi) = 177928
-MD5 (xpi/thunderbird-i18n-2.0.0.14/be.xpi) = 41d6524bd0332d379cc611f80b881ce8
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/be.xpi) = 38893491714332190e1e437d2b32fb43381a0431642d0f355501967ccfd006d2
-SIZE (xpi/thunderbird-i18n-2.0.0.14/be.xpi) = 184809
-MD5 (xpi/thunderbird-i18n-2.0.0.14/bg.xpi) = 905f5f8d2c66f01e45f0749a2b3200b6
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/bg.xpi) = 21d011527c3559a449eeb30d1c2f4382134c118449dcb1801589cd36bbde341e
-SIZE (xpi/thunderbird-i18n-2.0.0.14/bg.xpi) = 196474
-MD5 (xpi/thunderbird-i18n-2.0.0.14/ca.xpi) = 6295db083b0a8c9cae9092974e0818a5
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/ca.xpi) = 3ae09fea20813e72313a7d6b9d37f0ba1ba3c8fe28af0379886724455cac120a
-SIZE (xpi/thunderbird-i18n-2.0.0.14/ca.xpi) = 184224
-MD5 (xpi/thunderbird-i18n-2.0.0.14/cs.xpi) = dd1a5ea4d231716a84f141c97ed64250
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/cs.xpi) = 98662802a343cd9883ede48205deb1c798c3146e24eee7ca83cad3396287f1f1
-SIZE (xpi/thunderbird-i18n-2.0.0.14/cs.xpi) = 186154
-MD5 (xpi/thunderbird-i18n-2.0.0.14/da.xpi) = a4706cac43ea80719e70f8bcbf67b078
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/da.xpi) = 6cc0207f4163b357db82af8aca6bdb02fd9e4cf858682652edc31d063fe0bd85
-SIZE (xpi/thunderbird-i18n-2.0.0.14/da.xpi) = 179128
-MD5 (xpi/thunderbird-i18n-2.0.0.14/de.xpi) = 778cceddb518a83fee186cc88ffac101
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/de.xpi) = 1390b462c3b23db48927d762d6c0e85e6c42155e8f06988689921bf72e707a2b
-SIZE (xpi/thunderbird-i18n-2.0.0.14/de.xpi) = 159069
-MD5 (xpi/thunderbird-i18n-2.0.0.14/el.xpi) = e0b5d08e76c2805a2558dc8a9bcec38e
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/el.xpi) = 48b74e0c82b730451cb82fabfc98f1ff972b1a0bb43b748b5de8bb1607a56456
-SIZE (xpi/thunderbird-i18n-2.0.0.14/el.xpi) = 183063
-MD5 (xpi/thunderbird-i18n-2.0.0.14/en-GB.xpi) = 08135275e32c31181add22eee8176fa6
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/en-GB.xpi) = 8c21d28d9a41f2581dac4e3f3c6997e257d55d64d250338f20dfe9431fec6498
-SIZE (xpi/thunderbird-i18n-2.0.0.14/en-GB.xpi) = 173045
-MD5 (xpi/thunderbird-i18n-2.0.0.14/es-AR.xpi) = fe56b96e17d553df6e554b96070a2c3f
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/es-AR.xpi) = 05af8d78d311aa4125c471438548d3d8279007419a03421bd9bf02268c2e2fdc
-SIZE (xpi/thunderbird-i18n-2.0.0.14/es-AR.xpi) = 184676
-MD5 (xpi/thunderbird-i18n-2.0.0.14/es-ES.xpi) = bb12dbbd45536a671c5b8c95122db2e5
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/es-ES.xpi) = eb4cb7b76af716cc249e5f0aa208e6a54db4a5b7b7e0183df31732b607228433
-SIZE (xpi/thunderbird-i18n-2.0.0.14/es-ES.xpi) = 149562
-MD5 (xpi/thunderbird-i18n-2.0.0.14/eu.xpi) = 0938bf890919f38ef37677b438991880
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/eu.xpi) = da1dad7f9de9bcb83d6350f2707eee11cb244fcdbf0e1abc2c195052edb72a4a
-SIZE (xpi/thunderbird-i18n-2.0.0.14/eu.xpi) = 181786
-MD5 (xpi/thunderbird-i18n-2.0.0.14/fi.xpi) = 7ea31300b7e809b3df5ff5c08b340a44
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/fi.xpi) = 018d332b4822130564ef38288b7284049db0470e6c0bb4a4c7df4b3f72dc59c4
-SIZE (xpi/thunderbird-i18n-2.0.0.14/fi.xpi) = 187727
-MD5 (xpi/thunderbird-i18n-2.0.0.14/fr.xpi) = acdba8b704f0ff54834179b624c46576
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/fr.xpi) = dd4d316e7291960db7c82b95fd3e98a8574a64096bc66ff345bbee4ce2f6b2a5
-SIZE (xpi/thunderbird-i18n-2.0.0.14/fr.xpi) = 190909
-MD5 (xpi/thunderbird-i18n-2.0.0.14/ga-IE.xpi) = 418bee5d601fef52144750e35700e2d1
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/ga-IE.xpi) = 07214a9999337f9f755c1041a7dd44c7a53cbde4ca2f9ad97ef3f25662c02b3f
-SIZE (xpi/thunderbird-i18n-2.0.0.14/ga-IE.xpi) = 185957
-MD5 (xpi/thunderbird-i18n-2.0.0.14/he.xpi) = e6f6a54873de59bc82ff69a52d58e851
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/he.xpi) = a56ac1cdc0049bf0d3e704b7f95daf5fb524cecf5a024c25f1cb8555b3228995
-SIZE (xpi/thunderbird-i18n-2.0.0.14/he.xpi) = 157238
-MD5 (xpi/thunderbird-i18n-2.0.0.14/hu.xpi) = 4ae6fb11ce6920b9046f7738124127f5
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/hu.xpi) = fef28df073b6db89de730afa2429e28f04d4ae012c219a04a4ad0d3f7c540981
-SIZE (xpi/thunderbird-i18n-2.0.0.14/hu.xpi) = 191689
-MD5 (xpi/thunderbird-i18n-2.0.0.14/it.xpi) = 3ed85525eb0cc59fdd3623232299964e
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/it.xpi) = 66d83219e6d6a6090301146a0b749376f3bfa0abf9ee8527d1e20aabb95a00c8
-SIZE (xpi/thunderbird-i18n-2.0.0.14/it.xpi) = 152548
-MD5 (xpi/thunderbird-i18n-2.0.0.14/ja.xpi) = 584d632305d18a0644c19fe5f54d941b
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/ja.xpi) = 07214b85cd2d78a050cd056ae4d69eaedd7dfd91065126e8d964d7f5344825a5
-SIZE (xpi/thunderbird-i18n-2.0.0.14/ja.xpi) = 199403
-MD5 (xpi/thunderbird-i18n-2.0.0.14/ko.xpi) = 2f6d215758d55fe469b4c378a868f997
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/ko.xpi) = b95751a9b79168fca716532e18fd9dc94d1b649b5b08c9b0085e118c8bc8f3de
-SIZE (xpi/thunderbird-i18n-2.0.0.14/ko.xpi) = 170158
-MD5 (xpi/thunderbird-i18n-2.0.0.14/lt.xpi) = 6d848ff47b77e7b8f9427dd7cd160c7d
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/lt.xpi) = 4cf8f66af2e66ee7ae0cdd56049ee6991c7c1170a8f9f5ac8f72cba9377f87e8
-SIZE (xpi/thunderbird-i18n-2.0.0.14/lt.xpi) = 189449
-MD5 (xpi/thunderbird-i18n-2.0.0.14/mk.xpi) = 422efd77d635c9171c9da2f971371346
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/mk.xpi) = 24e14cca2fab179f24718b32b6b46942f2243f2b151d9e6ae33888c60ee678fa
-SIZE (xpi/thunderbird-i18n-2.0.0.14/mk.xpi) = 196434
-MD5 (xpi/thunderbird-i18n-2.0.0.14/nb-NO.xpi) = e9261600ea0cf9b3f9ad0b636df1e3b2
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/nb-NO.xpi) = e5ce019616f89422a4df7353aca0a82dfba723bd7c6c689ac40a703b58f8121d
-SIZE (xpi/thunderbird-i18n-2.0.0.14/nb-NO.xpi) = 183236
-MD5 (xpi/thunderbird-i18n-2.0.0.14/nl.xpi) = 56cbc3c1463c08c77d43548c99888d4d
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/nl.xpi) = 6b123a5e3cb677473d40a689811579ac23c80f4eb1fbd11c385c587f699b1577
-SIZE (xpi/thunderbird-i18n-2.0.0.14/nl.xpi) = 184158
-MD5 (xpi/thunderbird-i18n-2.0.0.14/nn-NO.xpi) = 6e02f10c471e8731e5fefd16ed300a89
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/nn-NO.xpi) = f9e85e049739e12c284f282995d47a95ecdf9e1abc708a3647b8dbef6bb1768a
-SIZE (xpi/thunderbird-i18n-2.0.0.14/nn-NO.xpi) = 184112
-MD5 (xpi/thunderbird-i18n-2.0.0.14/pa-IN.xpi) = 5505731d18a906fdf77c880baaf32094
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/pa-IN.xpi) = 4a3baf3c2df78533938f59a3eb87ad83b9fd5896578aa31f5223a269003cccac
-SIZE (xpi/thunderbird-i18n-2.0.0.14/pa-IN.xpi) = 205014
-MD5 (xpi/thunderbird-i18n-2.0.0.14/pl.xpi) = 9e8f7ee13949ea2e50bda06646632950
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/pl.xpi) = c3bde253893f9a54a176d19aa2a37782991c32a9ef33d4c69d258d0a98e2e496
-SIZE (xpi/thunderbird-i18n-2.0.0.14/pl.xpi) = 177401
-MD5 (xpi/thunderbird-i18n-2.0.0.14/pt-BR.xpi) = ecba9fed2950bd46c3869e6a9dfb8d0a
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/pt-BR.xpi) = b414c30e35a9d0674fefd322d287c538874764c111445cbffb819be826fdf145
-SIZE (xpi/thunderbird-i18n-2.0.0.14/pt-BR.xpi) = 183069
-MD5 (xpi/thunderbird-i18n-2.0.0.14/pt-PT.xpi) = 499c584c3fcced568d51fbed84e5839c
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/pt-PT.xpi) = bc357087e59823b9226684efc49190fca4655d531c6afa684c0f1a260a2b7d40
-SIZE (xpi/thunderbird-i18n-2.0.0.14/pt-PT.xpi) = 183921
-MD5 (xpi/thunderbird-i18n-2.0.0.14/ru.xpi) = f8a840048f2e0a4203af5531502ed76c
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/ru.xpi) = c0ea92b3d6b318b98e0bee5470668c864b37420b15aab51dca9d53a32370a515
-SIZE (xpi/thunderbird-i18n-2.0.0.14/ru.xpi) = 174224
-MD5 (xpi/thunderbird-i18n-2.0.0.14/sk.xpi) = cc298296650340a934a5d1db19bb1789
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/sk.xpi) = 23c4ae5b027c59eb1d3cc3729ab2ece81af94227f260734c80b3a2729d3e6272
-SIZE (xpi/thunderbird-i18n-2.0.0.14/sk.xpi) = 191719
-MD5 (xpi/thunderbird-i18n-2.0.0.14/sl.xpi) = eb639a3a4c0227cdcdd33bbf7c48659f
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/sl.xpi) = 92c148afe5eb968c0755bec05003e3fa0b6c2258385cefc731951ed64ba4044b
-SIZE (xpi/thunderbird-i18n-2.0.0.14/sl.xpi) = 188017
-MD5 (xpi/thunderbird-i18n-2.0.0.14/sv-SE.xpi) = 2929b6a4c8a459530dcb6df221931991
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/sv-SE.xpi) = fc0511fce50fae1eeb26b1b5edfc92eeec0922ac6f6920cfc9e6afc35bc52619
-SIZE (xpi/thunderbird-i18n-2.0.0.14/sv-SE.xpi) = 191926
-MD5 (xpi/thunderbird-i18n-2.0.0.14/tr.xpi) = c38c2980be531f5eac09a6ecfc710a7d
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/tr.xpi) = 81ef7c93e89c2b9d05bef41dc2c254e81ccbbc57373372f3529986d97a99a54d
-SIZE (xpi/thunderbird-i18n-2.0.0.14/tr.xpi) = 157693
-MD5 (xpi/thunderbird-i18n-2.0.0.14/uk.xpi) = d3da5d5cb696b407ea5add241f42af23
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/uk.xpi) = ef08772f67a278926158c4f9dc50d89e3f74292f191d1a3e83e302a3259e6f47
-SIZE (xpi/thunderbird-i18n-2.0.0.14/uk.xpi) = 194499
-MD5 (xpi/thunderbird-i18n-2.0.0.14/zh-CN.xpi) = 45cb170591ea69d308e964898dd92596
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/zh-CN.xpi) = 3c0749b7ea18bb37133cbfce8893d22d1ed2284f91c3409702bbc242cece9796
-SIZE (xpi/thunderbird-i18n-2.0.0.14/zh-CN.xpi) = 147619
-MD5 (xpi/thunderbird-i18n-2.0.0.14/zh-TW.xpi) = a4f605a6e209e6ea09292c4b95ea9949
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/zh-TW.xpi) = 4bef053f11b814b7f9502770c40710a000ae39740692071470facfd80364a237
-SIZE (xpi/thunderbird-i18n-2.0.0.14/zh-TW.xpi) = 153697
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 ba3512675f62..000000000000
--- a/mail/thunderbird-esr/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-# New ports collection makefile for: mozilla-thunderbird
-# Date created: 4 September 2003
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/mail/thunderbird/Makefile,v 1.28 2008/01/10 17:58:39 mezz Exp $
-#
-
-PORTNAME= thunderbird
-DISTVERSION= 2.0.0.14
-CATEGORIES= mail ipv6
-MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source
-DISTNAME= ${PORTNAME}-${DISTVERSION}-source
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
-
-CONFLICTS= lightning-0.[0-9]*
-WANT_GNOME= yes
-ALL_TARGET= default
-CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
-HAS_CONFIGURE= yes
-USE_BZIP2= yes
-USE_GMAKE= yes
-USE_GCC= 3.4+
-WANT_PERL= yes
-
-MOZ_EXTENSIONS= wallet,spellcheck,xmlextras,webservices,auth,transformiix
-MOZ_PROTOCOLS= http,file,jar,viewsource,res,data
-MOZ_GRAPHICS= default,-xbm
-MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
- --enable-single-profile --disable-profilesharing \
- --enable-application=mail --enable-official-branding
-MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1
-MOZ_EXPORT= MOZ_THUNDERBIRD=1
-
-PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/icons/default.xpm
-
-SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
-MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
-
-OPTIONS=
-
-.include <bsd.port.pre.mk>
-
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-
-.if (${ARCH}=="sparc64" && ${OSVERSION} < 601101)
-IGNORE= core dumps on ${ARCH}, kern.osreldate>=601101 needed
-.endif
-
-post-extract::
- @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
- <${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop
-
-post-patch:
- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
- ${WRKSRC}/security/manager/ssl/src/Makefile.in
- @${REINPLACE_CMD} -e 's|--without-nss||' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
- ${WRKSRC}/storage/build/Makefile.in
- @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \
- -e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
- ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
- @${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \
- '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
- /dom.disable_window_open_feature.toolbar/s/false/true/'
- @${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
- ${WRKSRC}/configure \
- ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
- ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
-
-port-pre-install:
- ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
- ${FAKEDIR}/bin/thunderbird-config ${FAKEDIR}/bin/thunderbird
- ${RM} -f ${FAKEDIR}/bin/*.bak
- ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
- ${CP} -RL ${WRKSRC}/dist/bin/isp \
- ${FAKEDIR}/lib/${PORTNAME}
-
-pre-install:
- @${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
- @${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST}
-
-post-install:
- ${MKDIR} ${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \
- ${PORTNAME_ICON}
-
-.include "${PORTSDIR}/www/mozilla/Makefile.common"
-.include <bsd.port.post.mk>
diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo
deleted file mode 100644
index a09404855468..000000000000
--- a/mail/thunderbird-esr/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (thunderbird-2.0.0.14-source.tar.bz2) = e304510d08f7e226bbfff8e7e549232f
-SHA256 (thunderbird-2.0.0.14-source.tar.bz2) = deae3f00be4734c8a4dd6480639d253f0606bd0df6ef3e4432210d449d789730
-SIZE (thunderbird-2.0.0.14-source.tar.bz2) = 37473129
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-Double.cpp b/mail/thunderbird-esr/files/patch-Double.cpp
deleted file mode 100644
index ac04c24a6ac1..000000000000
--- a/mail/thunderbird-esr/files/patch-Double.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- extensions/transformiix/source/base/Double.cpp.orig 2006-06-22 12:13:00.000000000 -0700
-+++ extensions/transformiix/source/base/Double.cpp 2008-04-21 14:04:37.540570448 -0700
-@@ -52,10 +52,10 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
--#else
-+#if defined(__i386__) || defined(__amd64__)
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#else
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
-@@ -115,22 +115,31 @@
- #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000
- #define TX_DOUBLE_HI32_MANTMASK 0x000fffff
-
-+union ui32dun {
-+ PRUint32 i[2];
-+ double d;
-+};
-+
- //-- Initialize Double related constants
- #ifdef IS_BIG_ENDIAN
--const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
-- 0xffffffff};
--const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0};
--const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
-+const union ui32dun nanMask =
-+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}};
-+const union ui32dun infMask =
-+ {{TX_DOUBLE_HI32_EXPMASK, 0}};
-+const union ui32dun negInfMask =
-+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}};
- #else
--const PRUint32 nanMask[2] = {0xffffffff,
-- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
--const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK};
--const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
-+const union ui32dun nanMask =
-+ {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}};
-+const union ui32dun infMask =
-+ {{0, TX_DOUBLE_HI32_EXPMASK}};
-+const union ui32dun negInfMask =
-+ {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}};
- #endif
-
--const double Double::NaN = *((double*)nanMask);
--const double Double::POSITIVE_INFINITY = *((double*)infMask);
--const double Double::NEGATIVE_INFINITY = *((double*)negInfMask);
-+const double Double::NaN = nanMask.d;
-+const double Double::POSITIVE_INFINITY = infMask.d;
-+const double Double::NEGATIVE_INFINITY = negInfMask.d;
-
- /*
- * Determines whether the given double represents positive or negative
diff --git a/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh
deleted file mode 100644
index 7e038a39d310..000000000000
--- a/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/unix/run-mozilla.sh.orig Mon Dec 15 18:27:28 2003
-+++ build/unix/run-mozilla.sh Fri Feb 27 11:54:10 2004
-@@ -355,7 +355,7 @@
- fi
- ##
- ## Set LD_LIBRARY_PATH
--LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
-+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
- if [ -n "$LD_LIBRARYN32_PATH" ]
- then
- LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
diff --git a/mail/thunderbird-esr/files/patch-config-mkdepend-imakemdep.h b/mail/thunderbird-esr/files/patch-config-mkdepend-imakemdep.h
deleted file mode 100644
index b688e664475d..000000000000
--- a/mail/thunderbird-esr/files/patch-config-mkdepend-imakemdep.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998
-+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003
-@@ -278,4 +278,7 @@
- "-D__i386__",
- # endif
-+# if defined(__amd64__) || defined(__x86_64__)
-+ "-D__amd64__ -D__x86_64__",
-+# endif
- # ifdef __GNUC__
- "-traditional",
diff --git a/mail/thunderbird-esr/files/patch-config-rules.mk b/mail/thunderbird-esr/files/patch-config-rules.mk
deleted file mode 100644
index 8ab35f5a8326..000000000000
--- a/mail/thunderbird-esr/files/patch-config-rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- config/rules.mk.orig Thu Sep 14 14:07:03 2006
-+++ config/rules.mk Wed Oct 18 11:00:09 2006
-@@ -442,9 +442,7 @@
- endif
-
- ifeq ($(OS_ARCH),FreeBSD)
--ifdef IS_COMPONENT
--EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
--endif
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
- endif
-
- ifeq ($(OS_ARCH),NetBSD)
diff --git a/mail/thunderbird-esr/files/patch-config_autoconf.mk.in b/mail/thunderbird-esr/files/patch-config_autoconf.mk.in
deleted file mode 100644
index 29fe7f8fbde0..000000000000
--- a/mail/thunderbird-esr/files/patch-config_autoconf.mk.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- config/autoconf.mk.in.orig Thu Jul 14 00:50:06 2005
-+++ config/autoconf.mk.in Thu Jul 14 00:50:40 2005
-@@ -50,13 +50,13 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
--includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir = @includedir@/%%MOZILLA%%
- libdir = @libdir@
- datadir = @datadir@
- mandir = @mandir@
- idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-
--mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir = $(libdir)/%%MOZILLA%%
- mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir = $(mredir)/lib
-
diff --git a/mail/thunderbird-esr/files/patch-configure b/mail/thunderbird-esr/files/patch-configure
deleted file mode 100644
index f38bd5ee88b5..000000000000
--- a/mail/thunderbird-esr/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2007-07-30 02:45:45.000000000 -0400
-+++ configure 2007-07-30 02:46:26.000000000 -0400
-@@ -20025,7 +20025,7 @@ MOZILLA_1_8_BRANCH=1
- LIBS_PATH=
- for lib_arg in $NSPR_LIBS $TK_LIBS; do
- case $lib_arg in
-- -L* ) LIBS_PATH="${LIBS_PATH:+$LIBS_PATH:}"`expr $lib_arg : "-L\(.*\)"` ;;
-+ -L* ) LIBS_PATH="${LIBS_PATH:+$LIBS_PATH:}"`expr -- $lib_arg : "-L\(.*\)"` ;;
- * ) ;;
- esac
- done
diff --git a/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
deleted file mode 100644
index 41c462d74f62..000000000000
--- a/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Wed Nov 19 01:20:47 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Tue Feb 10 02:52:26 2004
-@@ -323,11 +323,11 @@
- prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly",
- &mStartLinksOnlyPref);
-
-- PRBool isSoundEnabled = PR_TRUE;
-+ mIsSoundEnabled = PR_TRUE;
- prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound",
-- &isSoundEnabled);
-+ &mIsSoundEnabled);
- nsXPIDLCString soundStr;
-- if (isSoundEnabled) {
-+ if (mIsSoundEnabled && mIsSoundEnabled) {
- prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL",
- getter_Copies(soundStr));
- }
-@@ -758,7 +758,7 @@
- }
- else {
- // No find string to backspace in!
-- if (mIsBackspaceProtectOn) {
-+ if (mIsBackspaceProtectOn && mIsSoundEnabled) {
- // This flag should be on only if the last key was a backspace.
- // It keeps us from accidentally hitting backspace too many times and
- // going back in history when we really just wanted to clear
-@@ -1012,7 +1012,9 @@
-
- // Error sound (don't fire when backspace is pressed, they're
- // trying to correct the mistake!)
-- PlayNotFoundSound();
-+ if (mIsSoundEnabled) {
-+ PlayNotFoundSound();
-+ }
-
- // Remove bad character from buffer, so we can continue typing from
- // last matched character
-@@ -1059,7 +1061,7 @@
- void
- nsTypeAheadFind::PlayNotFoundSound()
- {
-- if (mNotFoundSoundURL.IsEmpty()) // no sound
-+ if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled) // no sound
- return;
- if (!mSoundInterface) {
- mSoundInterface = do_CreateInstance("@mozilla.org/sound;1");
diff --git a/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
deleted file mode 100644
index 07ad43b4334d..000000000000
--- a/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Fri May 23 22:00:33 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.h Mon Feb 9 22:21:43 2004
-@@ -194,6 +194,9 @@
-
- nsCString mNotFoundSoundURL;
-
-+ // Move the sound enabled boolean out for all methods to access.
-+ PRBool mIsSoundEnabled;
-+
- // PRBool's are used instead of PRPackedBool's where the address of the
- // boolean variable is getting passed into a method. For example:
- // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref);
diff --git a/mail/thunderbird-esr/files/patch-js_src_Makefile.in b/mail/thunderbird-esr/files/patch-js_src_Makefile.in
deleted file mode 100644
index fb0bd7f1986b..000000000000
--- a/mail/thunderbird-esr/files/patch-js_src_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- js/src/Makefile.in.orig Wed Oct 18 09:23:09 2006
-+++ js/src/Makefile.in Wed Oct 18 09:27:27 2006
-@@ -244,6 +244,7 @@
- endif
-
- LDFLAGS += $(pathsubst -l%,$(NSPR_STATIC_PATH)/%.a,$(NSPR_LIBS))
-+LDFLAGS += -lc
-
- # BeOS and HP-UX do not require the extra linking of "-lm"
- ifeq (,$(filter BeOS HP-UX WINNT WINCE OpenVMS,$(OS_ARCH)))
diff --git a/mail/thunderbird-esr/files/patch-mail_app_mozilla.in b/mail/thunderbird-esr/files/patch-mail_app_mozilla.in
deleted file mode 100644
index 7fcb98bd28d7..000000000000
--- a/mail/thunderbird-esr/files/patch-mail_app_mozilla.in
+++ /dev/null
@@ -1,124 +0,0 @@
---- mail/app/mozilla.in.orig Mon Apr 4 15:08:49 2005
-+++ mail/app/mozilla.in Fri Jun 10 06:18:49 2005
-@@ -49,51 +49,82 @@
- ## the mozilla-bin binary to work.
- ##
-
-+#
-+# MOZ_PIS, "Mozilla Plugable Init Scripts"
-+# MOZ_PIS_ is the name space used
-+# These variables and there meaning are specified in
-+# mozilla/xpfe/bootstrap/init.d/README
- moz_pis_startstop_scripts()
- {
-- MOZ_USER_DIR="%MOZ_USER_DIR%"
-- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts"
-- # These variables and there meaning are specified in
-- # mozilla/xpfe/bootstrap/init.d/README
-- MOZ_PIS_API=2
-- MOZ_PIS_MOZBINDIR="${dist_bin}"
-- MOZ_PIS_SESSION_PID="$$"
-- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
-- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
--
-- case "${1}" in
-- "start")
-- for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do
-- if [ -x "${curr_pis}" ] ; then
-- case "${curr_pis}" in
-- *.sh) . "${curr_pis}" ;;
-- *) "${curr_pis}" "start" ;;
-- esac
-- fi
-- done
-- ;;
-- "stop")
-- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do
-- if [ -x "${curr_pis}" ] ; then
-- case "${curr_pis}" in
-- *.sh) . "${curr_pis}" ;;
-- *) "${curr_pis}" "stop" ;;
-- esac
-- fi
-- done
-- ;;
-- *)
-- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts."
-- exit 1
-- ;;
-- esac
-+ MOZ_PIS_API=2
-+ MOZ_PIS_MOZBINDIR="${dist_bin}"
-+ MOZ_PIS_SESSION_PID="$$"
-+ MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
-+ export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
-+
-+ case "${1}" in
-+ "start")
-+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \
-+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do
-+ if [ -x "${curr_pis}" ]; then
-+ case "${curr_pis}" in
-+ *.sh)
-+ . "${curr_pis}"
-+ ;;
-+ *)
-+ ${curr_pis} "start"
-+ ;;
-+ esac
-+ fi
-+ done
-+ ;;
-+ "stop")
-+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \
-+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do
-+ if [ -x "${curr_pis}" ]; then
-+ case "${curr_pis}" in
-+ *.sh)
-+ . "${curr_pis}"
-+ ;;
-+ *)
-+ ${curr_pis} "stop"
-+ ;;
-+ esac
-+ fi
-+ done
-+ ;;
-+ *)
-+ echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2
-+ exit 1
-+ ;;
-+ esac
- }
-
--#uncomment for debugging
-+# uncomment for debugging
- #set -x
-
--moz_libdir=%MOZAPPDIR%
--MRE_HOME=%MREDIR%
-+#
-+# variables
-+#
-+#location="new-tab"
-+#MOZILLA_UILOCALE="en-US"
-+#MOZILLA_UIREGION="US"
-+
-+#
-+# working definitions
-+#
-+MOZ_USER_DIR="%MOZ_USER_DIR%"
-+moz_libdir="%MOZAPPDIR%"
-+MRE_HOME="%MREDIR%"
-+
-+debugging= # set the debugging level
-+here=`pwd`
-+
-+if [ ! -d "${MRE_HOME}" ]; then
-+ # use moz_libdir as MRE_HOME
-+ MRE_HOME="${moz_libdir}"
-+fi
-+export MRE_HOME
-
- # Use run-mozilla.sh in the current dir if it exists
- # If not, then start resolving symlinks until we find run-mozilla.sh
diff --git a/mail/thunderbird-esr/files/patch-security-coreconf-FreeBSD.mk b/mail/thunderbird-esr/files/patch-security-coreconf-FreeBSD.mk
deleted file mode 100644
index 0f7a04a0279f..000000000000
--- a/mail/thunderbird-esr/files/patch-security-coreconf-FreeBSD.mk
+++ /dev/null
@@ -1,24 +0,0 @@
---- security/coreconf/FreeBSD.mk.orig Mon Sep 25 18:26:23 2006
-+++ security/coreconf/FreeBSD.mk Mon Sep 25 18:27:03 2006
-@@ -45,8 +45,12 @@
- ifeq ($(OS_TEST),alpha)
- CPU_ARCH = alpha
- else
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH = amd64
-+else
- CPU_ARCH = x86
- endif
-+endif
-
- OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-@@ -73,7 +77,7 @@
- DLL_SUFFIX = so.1.0
- endif
-
--MKSHLIB = $(CC) $(DSO_LDOPTS)
-+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
- ifdef MAPFILE
- MKSHLIB += -Wl,--version-script,$(MAPFILE)
- endif
diff --git a/mail/thunderbird-esr/files/patch-storage_build_Makefile.in b/mail/thunderbird-esr/files/patch-storage_build_Makefile.in
deleted file mode 100644
index 18202a5a61d8..000000000000
--- a/mail/thunderbird-esr/files/patch-storage_build_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006
-+++ storage/build/Makefile.in Sun Nov 5 16:16:06 2006
-@@ -77,6 +77,7 @@
- $(EXTRA_DSO_LIBS) \
- $(MOZ_COMPONENT_LIBS) \
- $(MOZ_JS_LIBS) \
-+ %%PTHREAD_LIBS%% \
- $(NULL)
-
- include $(topsrcdir)/config/rules.mk
diff --git a/mail/thunderbird-esr/files/patch-sysnss b/mail/thunderbird-esr/files/patch-sysnss
deleted file mode 100644
index bd61c2660a77..000000000000
--- a/mail/thunderbird-esr/files/patch-sysnss
+++ /dev/null
@@ -1,175 +0,0 @@
---- Makefile.in Tue Sep 14 16:59:40 2004
-+++ Makefile.in Tue Aug 2 08:26:55 2005
-@@ -102,6 +102,4 @@
- # tier 1 - 3rd party individual libraries
- #
--tier_1_dirs += dbm
--
- ifndef MOZ_NATIVE_JPEG
- tier_1_dirs += jpeg
---- security/manager/Makefile.in.orig Tue Mar 28 14:36:54 2006
-+++ security/manager/Makefile.in Tue Mar 28 14:40:29 2006
-@@ -54,22 +54,13 @@
- SSL3_LIB \
- SOFTOKEN3_LIB \
- SOFTOKEN3_CHK \
-- LOADABLE_ROOT_MODULE \
- HAVE_FREEBL_LIBS \
- HAVE_FREEBL_LIBS_32 \
- HAVE_FREEBL_LIBS_32INT64 \
- HAVE_FREEBL_LIBS_64 \
- $(NULL)
--
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
- endif
-
--NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
--SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
--SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
--SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
--SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
--
- # Default
- HAVE_FREEBL_LIBS = 1
-
-@@ -217,11 +208,6 @@
- .nss.cleaned: .nss.checkout
- ifndef MOZ_NATIVE_NSS
- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
-- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- touch $@
- endif
-
-@@ -248,47 +234,6 @@
- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
- endif
- ifndef MOZ_NATIVE_NSS
-- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
--ifndef SKIP_CHK
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
--endif
-- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
--ifndef SKIP_CHK
-- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
--endif
-- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
--ifdef HAVE_FREEBL_LIBS
--ifndef SKIP_CHK
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
--endif
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_32
--ifndef SKIP_CHK
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
--endif
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_32INT64
--ifndef SKIP_CHK
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
--endif
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_64
--ifndef SKIP_CHK
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
--endif
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
--endif
- endif
- $(MAKE) -C boot $@
- $(MAKE) -C ssl $@
-@@ -299,42 +244,6 @@
-
- install::
- ifndef MOZ_NATIVE_NSS
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
--ifndef SKIP_CHK
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
--endif
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
--ifdef HAVE_FREEBL_LIBS
--ifndef SKIP_CHK
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
--endif
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
--endif
--ifdef HAVE_FREEBL_LIBS_32
--ifndef SKIP_CHK
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
--endif
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
--endif
--ifdef HAVE_FREEBL_LIBS_32INT64
--ifndef SKIP_CHK
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
--endif
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
--endif
--ifdef HAVE_FREEBL_LIBS_64
--ifndef SKIP_CHK
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
--endif
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
--endif
- endif
- $(MAKE) -C boot $@
- $(MAKE) -C ssl $@
-@@ -351,12 +260,6 @@
- $(MAKE) -C pki $@
- endif
- ifndef MOZ_NATIVE_NSS
-- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
-- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- endif
-
- echo-requires-recursive::
---- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006
-+++ security/manager/ssl/src/Makefile.in Wed Apr 18 20:16:36 2007
-@@ -124,19 +124,20 @@
- pipboot \
- $(NULL)
-
--EXTRA_DEPS = $(NSS_DEP_LIBS)
-
- DEFINES += -DNSS_ENABLE_ECC
-
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += $(NSS_CFLAGS)
-+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss
-
- EXTRA_DSO_LDOPTS += \
- $(MOZ_UNICHARUTIL_LIBS) \
- $(MOZ_COMPONENT_LIBS) \
- $(MOZ_JS_LIBS) \
- $(NSS_LIBS) \
-+ -L%%LOCALBASE%%/lib/nss \
-+ $(LOCAL_INCLUDES) \
- $(NULL)
-
- include $(topsrcdir)/config/rules.mk
diff --git a/mail/thunderbird-esr/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/mail/thunderbird-esr/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
deleted file mode 100644
index 7f8e55f536df..000000000000
--- a/mail/thunderbird-esr/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004
-+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004
-@@ -143,7 +143,7 @@
- PR_END_MACRO
-
- // Attempt to open libgconf
-- gconfLib = LoadVersionedLibrary("gconf-2", ".4");
-+ gconfLib = PR_LoadLibrary("libgconf-2.so");
- ENSURE_LIB(gconfLib);
-
- GET_LIB_FUNCTION(gconf, gconf_client_get_default);
-@@ -151,7 +151,7 @@
- GET_LIB_FUNCTION(gconf, gconf_client_get_bool);
-
- // Attempt to open libgnome
-- gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
-+ gnomeLib = PR_LoadLibrary("libgnome-2.so");
- ENSURE_LIB(gnomeLib);
-
- GET_LIB_FUNCTION(gnome, gnome_url_show);
-@@ -160,7 +160,7 @@
- GET_LIB_FUNCTION(gnome, gnome_program_get);
-
- // Attempt to open libgnomevfs
-- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
-+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so");
- ENSURE_LIB(vfsLib);
-
- GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name);
diff --git a/mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
deleted file mode 100644
index ac8cab896d48..000000000000
--- a/mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Mon May 3 13:05:12 2004
-@@ -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-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
deleted file mode 100644
index 51edeb95a7a7..000000000000
--- a/mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004
-@@ -49,6 +49,9 @@
- ifeq (86,$(findstring 86,$(OS_TEST)))
- CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
- endif
-+ifeq (amd64,$(OS_TEST))
-+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+endif
- endif
- #
- # New code for Linux, et. al., with gcc
-@@ -60,7 +63,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
-@@ -106,9 +109,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
- #
-@@ -294,6 +303,15 @@
- ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
- CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
- ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
-+endif
-+#
-+# FreeBSD/SPARC64
-+#
-+ifeq ($(OS_ARCH),FreeBSD)
-+ifneq (,$(findstring sparc,$(OS_TEST)))
-+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
-+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
-+endif
- endif
- #
- # Solaris/SPARC
diff --git a/mail/thunderbird-esr/files/patch-xptcall-alpha b/mail/thunderbird-esr/files/patch-xptcall-alpha
deleted file mode 100644
index 29631a98e61e..000000000000
--- a/mail/thunderbird-esr/files/patch-xptcall-alpha
+++ /dev/null
@@ -1,459 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003
-@@ -0,0 +1,184 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+__asm__("invoke_copy_to_stack") __attribute__((unused));
-+
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer
-+
-+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++)
-+ {
-+ if(s->IsPtrData())
-+ {
-+ *d = (PRUint64)s->ptr;
-+ continue;
-+ }
-+ switch(s->type)
-+ {
-+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break;
-+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break;
-+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break;
-+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break;
-+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break;
-+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break;
-+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break;
-+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break;
-+ case nsXPTType::T_FLOAT :
-+ if(i < NUM_ARG_REGS)
-+ {
-+ // convert floats to doubles if they are to be passed
-+ // via registers so we can just deal with doubles later
-+ union { PRUint64 u64; double d; } t;
-+ t.d = (double)s->val.f;
-+ *d = t.u64;
-+ }
-+ else
-+ // otherwise copy to stack normally
-+ *d = (PRUint64)s->val.u32;
-+ break;
-+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break;
-+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break;
-+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break;
-+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break;
-+ default:
-+ // all the others are plain pointer types
-+ *d = (PRUint64)s->val.p;
-+ break;
-+ }
-+ }
-+}
-+
-+/*
-+ * XPTC_PUBLIC_API(nsresult)
-+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt)
-+ */
-+__asm__(
-+ "#### XPTC_InvokeByIndex ####\n"
-+".text\n\t"
-+ ".align 5\n\t"
-+ ".globl XPTC_InvokeByIndex\n\t"
-+ ".ent XPTC_InvokeByIndex\n"
-+"XPTC_InvokeByIndex:\n\t"
-+ ".frame $15,32,$26,0\n\t"
-+ ".mask 0x4008000,-32\n\t"
-+ "ldgp $29,0($27)\n"
-+"$XPTC_InvokeByIndex..ng:\n\t"
-+ "subq $30,32,$30\n\t"
-+ "stq $26,0($30)\n\t"
-+ "stq $15,8($30)\n\t"
-+ "bis $30,$30,$15\n\t"
-+ ".prologue 1\n\t"
-+
-+ /*
-+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1
-+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters
-+ * is required for storage of those passed via registers.
-+ */
-+
-+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */
-+ "cmplt $2,$18,$1\n\t"
-+ "cmovne $1,$18,$2\n\t"
-+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */
-+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */
-+ "subq $30,$1,$30\n\t"
-+
-+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */
-+ "stq $17,16($15)\n\t" /* save "methodIndex" */
-+
-+ "addq $30,8,$16\n\t" /* pass stack pointer */
-+ "bis $18,$18,$17\n\t" /* pass "paramCount" */
-+ "bis $19,$19,$18\n\t" /* pass "params" */
-+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */
-+
-+ /*
-+ * Copy the first 6 parameters to registers and remove from stack frame.
-+ * Both the integer and floating point registers are set for each parameter
-+ * except the first which is the "this" pointer. (integer only)
-+ * The floating point registers are all set as doubles since the
-+ * invoke_copy_to_stack function should have converted the floats.
-+ */
-+ "ldq $16,0($30)\n\t" /* integer registers */
-+ "ldq $17,8($30)\n\t"
-+ "ldq $18,16($30)\n\t"
-+ "ldq $19,24($30)\n\t"
-+ "ldq $20,32($30)\n\t"
-+ "ldq $21,40($30)\n\t"
-+ "ldt $f17,8($30)\n\t" /* floating point registers */
-+ "ldt $f18,16($30)\n\t"
-+ "ldt $f19,24($30)\n\t"
-+ "ldt $f20,32($30)\n\t"
-+ "ldt $f21,40($30)\n\t"
-+
-+ "addq $30,48,$30\n\t" /* remove params from stack */
-+
-+ /*
-+ * Call the virtual function with the constructed stack frame.
-+ */
-+ "bis $16,$16,$1\n\t" /* load "this" */
-+ "ldq $2,16($15)\n\t" /* load "methodIndex" */
-+ "ldq $1,0($1)\n\t" /* load vtable */
-+#if 0
-+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */
-+#else
-+ "mulq $2, 8, $2\n\t"
-+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */
-+#endif
-+ "addq $1,$2,$1\n\t"
-+ "ldq $27,0($1)\n\t" /* load address of function */
-+ "jsr $26,($27),0\n\t" /* call virtual function */
-+ "ldgp $29,0($26)\n\t"
-+
-+ "bis $15,$15,$30\n\t"
-+ "ldq $26,0($30)\n\t"
-+ "ldq $15,8($30)\n\t"
-+ "addq $30,32,$30\n\t"
-+ "ret $31,($26),1\n\t"
-+ ".end XPTC_InvokeByIndex"
-+ );
-+
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003
-@@ -0,0 +1,269 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1999
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Implement shared vtbl methods. */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include <sys/types.h>
-+#include <machine/cpu.h>
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+__asm__("PrepareAndDispatch") __attribute__((unused));
-+
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+{
-+ const PRUint8 PARAM_BUFFER_COUNT = 16;
-+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer
-+
-+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+ nsXPTCMiniVariant* dispatchParams = NULL;
-+ nsIInterfaceInfo* iface_info = NULL;
-+ const nsXPTMethodInfo* info;
-+ PRUint8 paramCount;
-+ PRUint8 i;
-+ nsresult result = NS_ERROR_FAILURE;
-+
-+ NS_ASSERTION(self,"no self");
-+
-+ self->GetInterfaceInfo(&iface_info);
-+ NS_ASSERTION(iface_info,"no interface info");
-+
-+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+ NS_ASSERTION(info,"no interface info");
-+
-+ paramCount = info->GetParamCount();
-+
-+ // setup variant array pointer
-+ if(paramCount > PARAM_BUFFER_COUNT)
-+ dispatchParams = new nsXPTCMiniVariant[paramCount];
-+ else
-+ dispatchParams = paramBuffer;
-+ NS_ASSERTION(dispatchParams,"no place for params");
-+
-+ // args[0] to args[NUM_ARG_REGS] hold floating point register values
-+ PRUint64* ap = args + NUM_ARG_REGS;
-+ for(i = 0; i < paramCount; i++, ap++)
-+ {
-+ const nsXPTParamInfo& param = info->GetParam(i);
-+ const nsXPTType& type = param.GetType();
-+ nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+ if(param.IsOut() || !type.IsArithmetic())
-+ {
-+ dp->val.p = (void*) *ap;
-+ continue;
-+ }
-+ // else
-+ switch(type)
-+ {
-+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break;
-+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break;
-+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break;
-+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break;
-+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break;
-+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break;
-+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break;
-+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break;
-+ case nsXPTType::T_FLOAT :
-+ if(i < NUM_ARG_REGS)
-+ {
-+ // floats passed via registers are stored as doubles
-+ // in the first NUM_ARG_REGS entries in args
-+ dp->val.u64 = (PRUint64) args[i];
-+ dp->val.f = (float) dp->val.d; // convert double to float
-+ }
-+ else
-+ dp->val.u32 = (PRUint32) *ap;
-+ break;
-+ case nsXPTType::T_DOUBLE :
-+ // doubles passed via registers are also stored
-+ // in the first NUM_ARG_REGS entries in args
-+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap;
-+ break;
-+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break;
-+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break;
-+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break;
-+ default:
-+ NS_ASSERTION(0, "bad type");
-+ break;
-+ }
-+ }
-+
-+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+ NS_RELEASE(iface_info);
-+
-+ if(dispatchParams != paramBuffer)
-+ delete [] dispatchParams;
-+
-+ return result;
-+}
-+
-+/*
-+ * SharedStub()
-+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is
-+ * passed to this function via $1 to preserve the argument registers.
-+ */
-+__asm__(
-+ "#### SharedStub ####\n"
-+".text\n\t"
-+ ".align 5\n\t"
-+ ".ent SharedStub\n"
-+"SharedStub:\n\t"
-+ ".frame $30,96,$26,0\n\t"
-+ ".mask 0x4000000,-96\n\t"
-+ "ldgp $29,0($27)\n"
-+"$SharedStub..ng:\n\t"
-+ "subq $30,96,$30\n\t"
-+ "stq $26,0($30)\n\t"
-+ ".prologue 1\n\t"
-+
-+ /*
-+ * Store arguments passed via registers to the stack.
-+ * Floating point registers are stored as doubles and converted
-+ * to floats in PrepareAndDispatch if necessary.
-+ */
-+ "stt $f17,16($30)\n\t" /* floating point registers */
-+ "stt $f18,24($30)\n\t"
-+ "stt $f19,32($30)\n\t"
-+ "stt $f20,40($30)\n\t"
-+ "stt $f21,48($30)\n\t"
-+ "stq $17,56($30)\n\t" /* integer registers */
-+ "stq $18,64($30)\n\t"
-+ "stq $19,72($30)\n\t"
-+ "stq $20,80($30)\n\t"
-+ "stq $21,88($30)\n\t"
-+
-+ /*
-+ * Call PrepareAndDispatch function.
-+ */
-+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */
-+ "addq $30,16,$18\n\t" /* pass "args" */
-+ "bsr $26,$PrepareAndDispatch..ng\n\t"
-+
-+ "ldq $26,0($30)\n\t"
-+ "addq $30,96,$30\n\t"
-+ "ret $31,($26),1\n\t"
-+ ".end SharedStub"
-+ );
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ * Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+__asm__( \
-+ "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+ ".align 5\n\t" \
-+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \
-+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \
-+ ".frame $30,0,$26,0\n\t" \
-+ "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \
-+ ".prologue 1\n\t" \
-+ "lda $1,"#n"\n\t" \
-+ "br $31,$SharedStub..ng\n\t" \
-+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \
-+ ); \
-+__asm__( \
-+ "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+ ".align 5\n\t" \
-+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \
-+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \
-+ ".frame $30,0,$26,0\n\t" \
-+ "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \
-+ ".prologue 1\n\t" \
-+ "lda $1,"#n"\n\t" \
-+ "br $31,$SharedStub..ng\n\t" \
-+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \
-+ ); \
-+__asm__( \
-+ "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+ ".align 5\n\t" \
-+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \
-+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \
-+ ".frame $30,0,$26,0\n\t" \
-+ "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \
-+ ".prologue 1\n\t" \
-+ "lda $1,"#n"\n\t" \
-+ "br $31,$SharedStub..ng\n\t" \
-+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \
-+ );
-+#else
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ * Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+ nsresult result; \
-+__asm__ __volatile__( \
-+ "ldah $29,0($27)\n\t" \
-+ "lda $29,0($29)\n\t" \
-+ "lda $1, "#n"\n\t" \
-+ "br $31, $SharedStub..ng\n\t" \
-+ "mov $0, %0\n\t" \
-+ : "=r" (result) \
-+ ); \
-+ return result; \
-+}
-+#endif
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+ return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
diff --git a/mail/thunderbird-esr/files/patch-xptcall-sparc64 b/mail/thunderbird-esr/files/patch-xptcall-sparc64
deleted file mode 100644
index 9599a8a71336..000000000000
--- a/mail/thunderbird-esr/files/patch-xptcall-sparc64
+++ /dev/null
@@ -1,327 +0,0 @@
---- /dev/null Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003
-@@ -0,0 +1,123 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Stuart Parmenter <pavlov@netscape.com>
-+ */
-+
-+/* Implement shared vtbl methods. */
-+
-+#include "xptcprivate.h"
-+
-+#if defined(sparc) || defined(__sparc__)
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args)
-+{
-+
-+#define PARAM_BUFFER_COUNT 16
-+
-+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+ nsXPTCMiniVariant* dispatchParams = NULL;
-+ nsIInterfaceInfo* iface_info = NULL;
-+ const nsXPTMethodInfo* info;
-+ PRUint8 paramCount;
-+ PRUint8 i;
-+ nsresult result = NS_ERROR_FAILURE;
-+
-+ NS_ASSERTION(self,"no self");
-+
-+ self->GetInterfaceInfo(&iface_info);
-+ NS_ASSERTION(iface_info,"no interface info");
-+
-+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+ NS_ASSERTION(info,"no interface info");
-+
-+ paramCount = info->GetParamCount();
-+
-+ // setup variant array pointer
-+ if(paramCount > PARAM_BUFFER_COUNT)
-+ dispatchParams = new nsXPTCMiniVariant[paramCount];
-+ else
-+ dispatchParams = paramBuffer;
-+ NS_ASSERTION(dispatchParams,"no place for params");
-+
-+ PRUint64* ap = args;
-+ for(i = 0; i < paramCount; i++, ap++)
-+ {
-+ const nsXPTParamInfo& param = info->GetParam(i);
-+ const nsXPTType& type = param.GetType();
-+ nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+ if(param.IsOut() || !type.IsArithmetic())
-+ {
-+ dp->val.p = (void*) *ap;
-+ continue;
-+ }
-+ // else
-+ switch(type)
-+ {
-+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break;
-+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break;
-+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break;
-+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break;
-+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break;
-+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break;
-+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break;
-+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break;
-+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break;
-+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break;
-+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break;
-+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break;
-+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break;
-+ default:
-+ NS_ASSERTION(0, "bad type");
-+ break;
-+ }
-+ }
-+
-+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+ NS_RELEASE(iface_info);
-+
-+ if(dispatchParams != paramBuffer)
-+ delete [] dispatchParams;
-+
-+ return result;
-+}
-+
-+extern "C" int SharedStub(int, int*);
-+
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+ int dummy; /* defeat tail-call optimization */ \
-+ return SharedStub(n, &dummy); \
-+}
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+ return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#endif /* sparc || __sparc__ */
---- /dev/null Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003
-@@ -0,0 +1,104 @@
-+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Stuart Parmenter <pavlov@netscape.com>
-+ * Chris Seawood <cls@seawood.org>
-+ */
-+
-+/*
-+ Platform specific code to invoke XPCOM methods on native objects
-+ for sparcv9 Solaris.
-+
-+ See the SPARC Compliance Definition (SCD) Chapter 3
-+ for more information about what is going on here, including
-+ the use of BIAS (0x7ff).
-+ The SCD is available from http://www.sparc.com/.
-+*/
-+
-+ .global XPTC_InvokeByIndex
-+ .type XPTC_InvokeByIndex, #function
-+
-+/*
-+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+ PRUint32 paramCount, nsXPTCVariant* params);
-+
-+*/
-+XPTC_InvokeByIndex:
-+ save %sp,-(128 + 64),%sp ! room for the register window and
-+ ! struct pointer, rounded up to 0 % 64
-+ sll %i2,4,%l0 ! assume the worst case
-+ ! paramCount * 2 * 8 bytes
-+ cmp %l0, 0 ! are there any args? If not,
-+ be .invoke ! no need to copy args to stack
-+ nop
-+
-+ sub %sp,%l0,%sp ! create the additional stack space
-+ add %sp,0x7ff+136,%o0 ! step past the register window, the
-+ ! struct result pointer and the 'this' slot
-+ mov %i2,%o1 ! paramCount
-+ call invoke_copy_to_stack
-+ mov %i3,%o2 ! params
-+
-+!
-+! load arguments from stack into the outgoing registers
-+! BIAS is 0x7ff (2047)
-+!
-+
-+! load the %o1..5 64bit (extended word) output registers registers
-+ ldx [%sp + 0x7ff + 136],%o1 ! %i1
-+ ldx [%sp + 0x7ff + 144],%o2 ! %i2
-+ ldx [%sp + 0x7ff + 152],%o3 ! %i3
-+ ldx [%sp + 0x7ff + 160],%o4 ! %i4
-+ ldx [%sp + 0x7ff + 168],%o5 ! %i5
-+
-+! load the even number double registers starting with %d2
-+ ldd [%sp + 0x7ff + 136],%f2
-+ ldd [%sp + 0x7ff + 144],%f4
-+ ldd [%sp + 0x7ff + 152],%f6
-+ ldd [%sp + 0x7ff + 160],%f8
-+ ldd [%sp + 0x7ff + 168],%f10
-+ ldd [%sp + 0x7ff + 176],%f12
-+ ldd [%sp + 0x7ff + 184],%f14
-+ ldd [%sp + 0x7ff + 192],%f16
-+ ldd [%sp + 0x7ff + 200],%f18
-+ ldd [%sp + 0x7ff + 208],%f20
-+ ldd [%sp + 0x7ff + 216],%f22
-+ ldd [%sp + 0x7ff + 224],%f24
-+ ldd [%sp + 0x7ff + 232],%f26
-+ ldd [%sp + 0x7ff + 240],%f28
-+ ldd [%sp + 0x7ff + 248],%f30
-+
-+!
-+! calculate the target address from the vtable
-+!
-+.invoke:
-+ sll %i1,3,%l0 ! index *= 8
-+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes)
-+ ldx [%i0],%l1 ! *that --> address of vtable
-+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address
-+
-+ jmpl %l0,%o7 ! call the routine
-+ mov %i0,%o0 ! move 'this' pointer to out register
-+
-+ mov %o0,%i0 ! propagate return value
-+ ret
-+ restore
-+
-+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex
---- /dev/null Mon May 26 14:00:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003
-@@ -0,0 +1,91 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Stuart Parmenter <pavlov@netscape.com>
-+ * Chris Seawood <cls@seawood.org>
-+ */
-+
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+#include "xptcprivate.h"
-+
-+#if !defined(__sparc) && !defined(__sparc__)
-+#error "This code is for Sparc only"
-+#endif
-+
-+/* Prototype specifies unmangled function name */
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s);
-+
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+ /*
-+ We need to copy the parameters for this function to locals and use them
-+ from there since the parameters occupy the same stack space as the stack
-+ we're trying to populate.
-+ */
-+ PRUint64 *l_d = d;
-+ nsXPTCVariant *l_s = s;
-+ PRUint64 l_paramCount = paramCount;
-+ PRUint64 regCount = 0; // return the number of registers to load from the stack
-+
-+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++)
-+ {
-+ if (regCount < 5) regCount++;
-+
-+ if (l_s->IsPtrData())
-+ {
-+ *l_d = (PRUint64)l_s->ptr;
-+ continue;
-+ }
-+ switch (l_s->type)
-+ {
-+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break;
-+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break;
-+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break;
-+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break;
-+
-+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break;
-+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break;
-+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break;
-+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break;
-+
-+ /* in the case of floats, we want to put the bits in to the
-+ 64bit space right justified... floats in the paramter array on
-+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip
-+ the space that would be occupied by %f0, %f2, etc.
-+ */
-+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break;
-+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break;
-+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break;
-+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break;
-+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break;
-+
-+ default:
-+ // all the others are plain pointer types
-+ *((void**)l_d) = l_s->val.p;
-+ break;
-+ }
-+ }
-+
-+ return regCount;
-+}
diff --git a/mail/thunderbird-esr/files/thunderbird.desktop.in b/mail/thunderbird-esr/files/thunderbird.desktop.in
deleted file mode 100644
index b8730d2f50ea..000000000000
--- a/mail/thunderbird-esr/files/thunderbird.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Thunderbird
-GenericName=Mail Client
-Comment=Mail client and News Reader
-Exec=thunderbird %U
-Icon=@PORTNAME_ICON@
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Application;Network;
diff --git a/mail/thunderbird-esr/pkg-descr b/mail/thunderbird-esr/pkg-descr
deleted file mode 100644
index 9ef9a8246af4..000000000000
--- a/mail/thunderbird-esr/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Mozilla Thunderbird is a redesign of the Mozilla mail component with the goal
-of becoming a cross-platform stand alone mail application using the XUL
-user interface language. See the Mozilla Thunderbird project page for
-more details.
-
-WWW: http://www.mozilla.com/thunderbird/
diff --git a/mail/thunderbird3-i18n/Makefile b/mail/thunderbird3-i18n/Makefile
deleted file mode 100644
index 08d0da756d3d..000000000000
--- a/mail/thunderbird3-i18n/Makefile
+++ /dev/null
@@ -1,80 +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= 2.0.0.14
-CATEGORIES= mail
-MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/linux-i686/xpi
-PKGNAMEPREFIX=
-DISTFILES= ${THUNDERBIRD_I18N_:S/$/.xpi/}
-DIST_SUBDIR= xpi/${DISTNAME}
-
-MAINTAINER= infofarmer@FreeBSD.org
-COMMENT= Localized interface for Thunderbird
-
-.ifndef WITHOUT_SWITCHER
-RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
-.endif
-
-NO_BUILD= yes
-USE_XPI= *thunderbird
-
-THUNDERBIRD_I18N_ALL= af be bg ca cs da de el en-GB es-AR es-ES eu fi fr ga-IE \
- he hu it ja ko lt mk nb-NO nl nn-NO pa-IN pl pt-BR \
- pt-PT ru sk sl sv-SE tr uk zh-CN zh-TW
-.ifdef PACKAGE_BUILDING
-THUNDERBIRD_I18N?= all
-.else
-THUNDERBIRD_I18N?= zh-CN es-ES pt-BR ru ja de fr pa-IN 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 chrome/chromelist.txt
-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 \
- 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} ; { ${RM} -f $$_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/thunderbird3-i18n/distinfo b/mail/thunderbird3-i18n/distinfo
deleted file mode 100644
index 6754fd4468f7..000000000000
--- a/mail/thunderbird3-i18n/distinfo
+++ /dev/null
@@ -1,111 +0,0 @@
-MD5 (xpi/thunderbird-i18n-2.0.0.14/af.xpi) = 8abd235f8e9424a480bb405335378052
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/af.xpi) = 19e53210571813d535bcf82a16d113dac128a682894ffdec2d327f5a77557c44
-SIZE (xpi/thunderbird-i18n-2.0.0.14/af.xpi) = 177928
-MD5 (xpi/thunderbird-i18n-2.0.0.14/be.xpi) = 41d6524bd0332d379cc611f80b881ce8
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/be.xpi) = 38893491714332190e1e437d2b32fb43381a0431642d0f355501967ccfd006d2
-SIZE (xpi/thunderbird-i18n-2.0.0.14/be.xpi) = 184809
-MD5 (xpi/thunderbird-i18n-2.0.0.14/bg.xpi) = 905f5f8d2c66f01e45f0749a2b3200b6
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/bg.xpi) = 21d011527c3559a449eeb30d1c2f4382134c118449dcb1801589cd36bbde341e
-SIZE (xpi/thunderbird-i18n-2.0.0.14/bg.xpi) = 196474
-MD5 (xpi/thunderbird-i18n-2.0.0.14/ca.xpi) = 6295db083b0a8c9cae9092974e0818a5
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/ca.xpi) = 3ae09fea20813e72313a7d6b9d37f0ba1ba3c8fe28af0379886724455cac120a
-SIZE (xpi/thunderbird-i18n-2.0.0.14/ca.xpi) = 184224
-MD5 (xpi/thunderbird-i18n-2.0.0.14/cs.xpi) = dd1a5ea4d231716a84f141c97ed64250
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/cs.xpi) = 98662802a343cd9883ede48205deb1c798c3146e24eee7ca83cad3396287f1f1
-SIZE (xpi/thunderbird-i18n-2.0.0.14/cs.xpi) = 186154
-MD5 (xpi/thunderbird-i18n-2.0.0.14/da.xpi) = a4706cac43ea80719e70f8bcbf67b078
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/da.xpi) = 6cc0207f4163b357db82af8aca6bdb02fd9e4cf858682652edc31d063fe0bd85
-SIZE (xpi/thunderbird-i18n-2.0.0.14/da.xpi) = 179128
-MD5 (xpi/thunderbird-i18n-2.0.0.14/de.xpi) = 778cceddb518a83fee186cc88ffac101
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/de.xpi) = 1390b462c3b23db48927d762d6c0e85e6c42155e8f06988689921bf72e707a2b
-SIZE (xpi/thunderbird-i18n-2.0.0.14/de.xpi) = 159069
-MD5 (xpi/thunderbird-i18n-2.0.0.14/el.xpi) = e0b5d08e76c2805a2558dc8a9bcec38e
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/el.xpi) = 48b74e0c82b730451cb82fabfc98f1ff972b1a0bb43b748b5de8bb1607a56456
-SIZE (xpi/thunderbird-i18n-2.0.0.14/el.xpi) = 183063
-MD5 (xpi/thunderbird-i18n-2.0.0.14/en-GB.xpi) = 08135275e32c31181add22eee8176fa6
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/en-GB.xpi) = 8c21d28d9a41f2581dac4e3f3c6997e257d55d64d250338f20dfe9431fec6498
-SIZE (xpi/thunderbird-i18n-2.0.0.14/en-GB.xpi) = 173045
-MD5 (xpi/thunderbird-i18n-2.0.0.14/es-AR.xpi) = fe56b96e17d553df6e554b96070a2c3f
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/es-AR.xpi) = 05af8d78d311aa4125c471438548d3d8279007419a03421bd9bf02268c2e2fdc
-SIZE (xpi/thunderbird-i18n-2.0.0.14/es-AR.xpi) = 184676
-MD5 (xpi/thunderbird-i18n-2.0.0.14/es-ES.xpi) = bb12dbbd45536a671c5b8c95122db2e5
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/es-ES.xpi) = eb4cb7b76af716cc249e5f0aa208e6a54db4a5b7b7e0183df31732b607228433
-SIZE (xpi/thunderbird-i18n-2.0.0.14/es-ES.xpi) = 149562
-MD5 (xpi/thunderbird-i18n-2.0.0.14/eu.xpi) = 0938bf890919f38ef37677b438991880
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/eu.xpi) = da1dad7f9de9bcb83d6350f2707eee11cb244fcdbf0e1abc2c195052edb72a4a
-SIZE (xpi/thunderbird-i18n-2.0.0.14/eu.xpi) = 181786
-MD5 (xpi/thunderbird-i18n-2.0.0.14/fi.xpi) = 7ea31300b7e809b3df5ff5c08b340a44
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/fi.xpi) = 018d332b4822130564ef38288b7284049db0470e6c0bb4a4c7df4b3f72dc59c4
-SIZE (xpi/thunderbird-i18n-2.0.0.14/fi.xpi) = 187727
-MD5 (xpi/thunderbird-i18n-2.0.0.14/fr.xpi) = acdba8b704f0ff54834179b624c46576
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/fr.xpi) = dd4d316e7291960db7c82b95fd3e98a8574a64096bc66ff345bbee4ce2f6b2a5
-SIZE (xpi/thunderbird-i18n-2.0.0.14/fr.xpi) = 190909
-MD5 (xpi/thunderbird-i18n-2.0.0.14/ga-IE.xpi) = 418bee5d601fef52144750e35700e2d1
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/ga-IE.xpi) = 07214a9999337f9f755c1041a7dd44c7a53cbde4ca2f9ad97ef3f25662c02b3f
-SIZE (xpi/thunderbird-i18n-2.0.0.14/ga-IE.xpi) = 185957
-MD5 (xpi/thunderbird-i18n-2.0.0.14/he.xpi) = e6f6a54873de59bc82ff69a52d58e851
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/he.xpi) = a56ac1cdc0049bf0d3e704b7f95daf5fb524cecf5a024c25f1cb8555b3228995
-SIZE (xpi/thunderbird-i18n-2.0.0.14/he.xpi) = 157238
-MD5 (xpi/thunderbird-i18n-2.0.0.14/hu.xpi) = 4ae6fb11ce6920b9046f7738124127f5
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/hu.xpi) = fef28df073b6db89de730afa2429e28f04d4ae012c219a04a4ad0d3f7c540981
-SIZE (xpi/thunderbird-i18n-2.0.0.14/hu.xpi) = 191689
-MD5 (xpi/thunderbird-i18n-2.0.0.14/it.xpi) = 3ed85525eb0cc59fdd3623232299964e
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/it.xpi) = 66d83219e6d6a6090301146a0b749376f3bfa0abf9ee8527d1e20aabb95a00c8
-SIZE (xpi/thunderbird-i18n-2.0.0.14/it.xpi) = 152548
-MD5 (xpi/thunderbird-i18n-2.0.0.14/ja.xpi) = 584d632305d18a0644c19fe5f54d941b
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/ja.xpi) = 07214b85cd2d78a050cd056ae4d69eaedd7dfd91065126e8d964d7f5344825a5
-SIZE (xpi/thunderbird-i18n-2.0.0.14/ja.xpi) = 199403
-MD5 (xpi/thunderbird-i18n-2.0.0.14/ko.xpi) = 2f6d215758d55fe469b4c378a868f997
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/ko.xpi) = b95751a9b79168fca716532e18fd9dc94d1b649b5b08c9b0085e118c8bc8f3de
-SIZE (xpi/thunderbird-i18n-2.0.0.14/ko.xpi) = 170158
-MD5 (xpi/thunderbird-i18n-2.0.0.14/lt.xpi) = 6d848ff47b77e7b8f9427dd7cd160c7d
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/lt.xpi) = 4cf8f66af2e66ee7ae0cdd56049ee6991c7c1170a8f9f5ac8f72cba9377f87e8
-SIZE (xpi/thunderbird-i18n-2.0.0.14/lt.xpi) = 189449
-MD5 (xpi/thunderbird-i18n-2.0.0.14/mk.xpi) = 422efd77d635c9171c9da2f971371346
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/mk.xpi) = 24e14cca2fab179f24718b32b6b46942f2243f2b151d9e6ae33888c60ee678fa
-SIZE (xpi/thunderbird-i18n-2.0.0.14/mk.xpi) = 196434
-MD5 (xpi/thunderbird-i18n-2.0.0.14/nb-NO.xpi) = e9261600ea0cf9b3f9ad0b636df1e3b2
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/nb-NO.xpi) = e5ce019616f89422a4df7353aca0a82dfba723bd7c6c689ac40a703b58f8121d
-SIZE (xpi/thunderbird-i18n-2.0.0.14/nb-NO.xpi) = 183236
-MD5 (xpi/thunderbird-i18n-2.0.0.14/nl.xpi) = 56cbc3c1463c08c77d43548c99888d4d
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/nl.xpi) = 6b123a5e3cb677473d40a689811579ac23c80f4eb1fbd11c385c587f699b1577
-SIZE (xpi/thunderbird-i18n-2.0.0.14/nl.xpi) = 184158
-MD5 (xpi/thunderbird-i18n-2.0.0.14/nn-NO.xpi) = 6e02f10c471e8731e5fefd16ed300a89
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/nn-NO.xpi) = f9e85e049739e12c284f282995d47a95ecdf9e1abc708a3647b8dbef6bb1768a
-SIZE (xpi/thunderbird-i18n-2.0.0.14/nn-NO.xpi) = 184112
-MD5 (xpi/thunderbird-i18n-2.0.0.14/pa-IN.xpi) = 5505731d18a906fdf77c880baaf32094
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/pa-IN.xpi) = 4a3baf3c2df78533938f59a3eb87ad83b9fd5896578aa31f5223a269003cccac
-SIZE (xpi/thunderbird-i18n-2.0.0.14/pa-IN.xpi) = 205014
-MD5 (xpi/thunderbird-i18n-2.0.0.14/pl.xpi) = 9e8f7ee13949ea2e50bda06646632950
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/pl.xpi) = c3bde253893f9a54a176d19aa2a37782991c32a9ef33d4c69d258d0a98e2e496
-SIZE (xpi/thunderbird-i18n-2.0.0.14/pl.xpi) = 177401
-MD5 (xpi/thunderbird-i18n-2.0.0.14/pt-BR.xpi) = ecba9fed2950bd46c3869e6a9dfb8d0a
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/pt-BR.xpi) = b414c30e35a9d0674fefd322d287c538874764c111445cbffb819be826fdf145
-SIZE (xpi/thunderbird-i18n-2.0.0.14/pt-BR.xpi) = 183069
-MD5 (xpi/thunderbird-i18n-2.0.0.14/pt-PT.xpi) = 499c584c3fcced568d51fbed84e5839c
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/pt-PT.xpi) = bc357087e59823b9226684efc49190fca4655d531c6afa684c0f1a260a2b7d40
-SIZE (xpi/thunderbird-i18n-2.0.0.14/pt-PT.xpi) = 183921
-MD5 (xpi/thunderbird-i18n-2.0.0.14/ru.xpi) = f8a840048f2e0a4203af5531502ed76c
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/ru.xpi) = c0ea92b3d6b318b98e0bee5470668c864b37420b15aab51dca9d53a32370a515
-SIZE (xpi/thunderbird-i18n-2.0.0.14/ru.xpi) = 174224
-MD5 (xpi/thunderbird-i18n-2.0.0.14/sk.xpi) = cc298296650340a934a5d1db19bb1789
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/sk.xpi) = 23c4ae5b027c59eb1d3cc3729ab2ece81af94227f260734c80b3a2729d3e6272
-SIZE (xpi/thunderbird-i18n-2.0.0.14/sk.xpi) = 191719
-MD5 (xpi/thunderbird-i18n-2.0.0.14/sl.xpi) = eb639a3a4c0227cdcdd33bbf7c48659f
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/sl.xpi) = 92c148afe5eb968c0755bec05003e3fa0b6c2258385cefc731951ed64ba4044b
-SIZE (xpi/thunderbird-i18n-2.0.0.14/sl.xpi) = 188017
-MD5 (xpi/thunderbird-i18n-2.0.0.14/sv-SE.xpi) = 2929b6a4c8a459530dcb6df221931991
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/sv-SE.xpi) = fc0511fce50fae1eeb26b1b5edfc92eeec0922ac6f6920cfc9e6afc35bc52619
-SIZE (xpi/thunderbird-i18n-2.0.0.14/sv-SE.xpi) = 191926
-MD5 (xpi/thunderbird-i18n-2.0.0.14/tr.xpi) = c38c2980be531f5eac09a6ecfc710a7d
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/tr.xpi) = 81ef7c93e89c2b9d05bef41dc2c254e81ccbbc57373372f3529986d97a99a54d
-SIZE (xpi/thunderbird-i18n-2.0.0.14/tr.xpi) = 157693
-MD5 (xpi/thunderbird-i18n-2.0.0.14/uk.xpi) = d3da5d5cb696b407ea5add241f42af23
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/uk.xpi) = ef08772f67a278926158c4f9dc50d89e3f74292f191d1a3e83e302a3259e6f47
-SIZE (xpi/thunderbird-i18n-2.0.0.14/uk.xpi) = 194499
-MD5 (xpi/thunderbird-i18n-2.0.0.14/zh-CN.xpi) = 45cb170591ea69d308e964898dd92596
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/zh-CN.xpi) = 3c0749b7ea18bb37133cbfce8893d22d1ed2284f91c3409702bbc242cece9796
-SIZE (xpi/thunderbird-i18n-2.0.0.14/zh-CN.xpi) = 147619
-MD5 (xpi/thunderbird-i18n-2.0.0.14/zh-TW.xpi) = a4f605a6e209e6ea09292c4b95ea9949
-SHA256 (xpi/thunderbird-i18n-2.0.0.14/zh-TW.xpi) = 4bef053f11b814b7f9502770c40710a000ae39740692071470facfd80364a237
-SIZE (xpi/thunderbird-i18n-2.0.0.14/zh-TW.xpi) = 153697
diff --git a/mail/thunderbird3-i18n/pkg-descr b/mail/thunderbird3-i18n/pkg-descr
deleted file mode 100644
index e5842d14f281..000000000000
--- a/mail/thunderbird3-i18n/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Language packs for Thunderbird
-
-WWW: http://www.mozilla.org/projects/l10n/
diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile
deleted file mode 100644
index ba3512675f62..000000000000
--- a/mail/thunderbird3/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-# New ports collection makefile for: mozilla-thunderbird
-# Date created: 4 September 2003
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/mail/thunderbird/Makefile,v 1.28 2008/01/10 17:58:39 mezz Exp $
-#
-
-PORTNAME= thunderbird
-DISTVERSION= 2.0.0.14
-CATEGORIES= mail ipv6
-MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source
-DISTNAME= ${PORTNAME}-${DISTVERSION}-source
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
-
-CONFLICTS= lightning-0.[0-9]*
-WANT_GNOME= yes
-ALL_TARGET= default
-CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
-HAS_CONFIGURE= yes
-USE_BZIP2= yes
-USE_GMAKE= yes
-USE_GCC= 3.4+
-WANT_PERL= yes
-
-MOZ_EXTENSIONS= wallet,spellcheck,xmlextras,webservices,auth,transformiix
-MOZ_PROTOCOLS= http,file,jar,viewsource,res,data
-MOZ_GRAPHICS= default,-xbm
-MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
- --enable-single-profile --disable-profilesharing \
- --enable-application=mail --enable-official-branding
-MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1
-MOZ_EXPORT= MOZ_THUNDERBIRD=1
-
-PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/icons/default.xpm
-
-SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
-MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
-
-OPTIONS=
-
-.include <bsd.port.pre.mk>
-
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-
-.if (${ARCH}=="sparc64" && ${OSVERSION} < 601101)
-IGNORE= core dumps on ${ARCH}, kern.osreldate>=601101 needed
-.endif
-
-post-extract::
- @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
- <${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop
-
-post-patch:
- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
- ${WRKSRC}/security/manager/ssl/src/Makefile.in
- @${REINPLACE_CMD} -e 's|--without-nss||' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
- ${WRKSRC}/storage/build/Makefile.in
- @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \
- -e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
- ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
- @${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \
- '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
- /dom.disable_window_open_feature.toolbar/s/false/true/'
- @${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
- ${WRKSRC}/configure \
- ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
- ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
-
-port-pre-install:
- ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
- ${FAKEDIR}/bin/thunderbird-config ${FAKEDIR}/bin/thunderbird
- ${RM} -f ${FAKEDIR}/bin/*.bak
- ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
- ${CP} -RL ${WRKSRC}/dist/bin/isp \
- ${FAKEDIR}/lib/${PORTNAME}
-
-pre-install:
- @${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
- @${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST}
-
-post-install:
- ${MKDIR} ${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \
- ${PORTNAME_ICON}
-
-.include "${PORTSDIR}/www/mozilla/Makefile.common"
-.include <bsd.port.post.mk>
diff --git a/mail/thunderbird3/distinfo b/mail/thunderbird3/distinfo
deleted file mode 100644
index a09404855468..000000000000
--- a/mail/thunderbird3/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (thunderbird-2.0.0.14-source.tar.bz2) = e304510d08f7e226bbfff8e7e549232f
-SHA256 (thunderbird-2.0.0.14-source.tar.bz2) = deae3f00be4734c8a4dd6480639d253f0606bd0df6ef3e4432210d449d789730
-SIZE (thunderbird-2.0.0.14-source.tar.bz2) = 37473129
diff --git a/mail/thunderbird3/files/moz_pis_S50cleanhome b/mail/thunderbird3/files/moz_pis_S50cleanhome
deleted file mode 100644
index 348592392043..000000000000
--- a/mail/thunderbird3/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/thunderbird3/files/patch-Double.cpp b/mail/thunderbird3/files/patch-Double.cpp
deleted file mode 100644
index ac04c24a6ac1..000000000000
--- a/mail/thunderbird3/files/patch-Double.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- extensions/transformiix/source/base/Double.cpp.orig 2006-06-22 12:13:00.000000000 -0700
-+++ extensions/transformiix/source/base/Double.cpp 2008-04-21 14:04:37.540570448 -0700
-@@ -52,10 +52,10 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
--#else
-+#if defined(__i386__) || defined(__amd64__)
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#else
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
-@@ -115,22 +115,31 @@
- #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000
- #define TX_DOUBLE_HI32_MANTMASK 0x000fffff
-
-+union ui32dun {
-+ PRUint32 i[2];
-+ double d;
-+};
-+
- //-- Initialize Double related constants
- #ifdef IS_BIG_ENDIAN
--const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
-- 0xffffffff};
--const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0};
--const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
-+const union ui32dun nanMask =
-+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}};
-+const union ui32dun infMask =
-+ {{TX_DOUBLE_HI32_EXPMASK, 0}};
-+const union ui32dun negInfMask =
-+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}};
- #else
--const PRUint32 nanMask[2] = {0xffffffff,
-- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
--const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK};
--const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
-+const union ui32dun nanMask =
-+ {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}};
-+const union ui32dun infMask =
-+ {{0, TX_DOUBLE_HI32_EXPMASK}};
-+const union ui32dun negInfMask =
-+ {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}};
- #endif
-
--const double Double::NaN = *((double*)nanMask);
--const double Double::POSITIVE_INFINITY = *((double*)infMask);
--const double Double::NEGATIVE_INFINITY = *((double*)negInfMask);
-+const double Double::NaN = nanMask.d;
-+const double Double::POSITIVE_INFINITY = infMask.d;
-+const double Double::NEGATIVE_INFINITY = negInfMask.d;
-
- /*
- * Determines whether the given double represents positive or negative
diff --git a/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh
deleted file mode 100644
index 7e038a39d310..000000000000
--- a/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/unix/run-mozilla.sh.orig Mon Dec 15 18:27:28 2003
-+++ build/unix/run-mozilla.sh Fri Feb 27 11:54:10 2004
-@@ -355,7 +355,7 @@
- fi
- ##
- ## Set LD_LIBRARY_PATH
--LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
-+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
- if [ -n "$LD_LIBRARYN32_PATH" ]
- then
- LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
diff --git a/mail/thunderbird3/files/patch-config-mkdepend-imakemdep.h b/mail/thunderbird3/files/patch-config-mkdepend-imakemdep.h
deleted file mode 100644
index b688e664475d..000000000000
--- a/mail/thunderbird3/files/patch-config-mkdepend-imakemdep.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998
-+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003
-@@ -278,4 +278,7 @@
- "-D__i386__",
- # endif
-+# if defined(__amd64__) || defined(__x86_64__)
-+ "-D__amd64__ -D__x86_64__",
-+# endif
- # ifdef __GNUC__
- "-traditional",
diff --git a/mail/thunderbird3/files/patch-config-rules.mk b/mail/thunderbird3/files/patch-config-rules.mk
deleted file mode 100644
index 8ab35f5a8326..000000000000
--- a/mail/thunderbird3/files/patch-config-rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- config/rules.mk.orig Thu Sep 14 14:07:03 2006
-+++ config/rules.mk Wed Oct 18 11:00:09 2006
-@@ -442,9 +442,7 @@
- endif
-
- ifeq ($(OS_ARCH),FreeBSD)
--ifdef IS_COMPONENT
--EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
--endif
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
- endif
-
- ifeq ($(OS_ARCH),NetBSD)
diff --git a/mail/thunderbird3/files/patch-config_autoconf.mk.in b/mail/thunderbird3/files/patch-config_autoconf.mk.in
deleted file mode 100644
index 29fe7f8fbde0..000000000000
--- a/mail/thunderbird3/files/patch-config_autoconf.mk.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- config/autoconf.mk.in.orig Thu Jul 14 00:50:06 2005
-+++ config/autoconf.mk.in Thu Jul 14 00:50:40 2005
-@@ -50,13 +50,13 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
--includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir = @includedir@/%%MOZILLA%%
- libdir = @libdir@
- datadir = @datadir@
- mandir = @mandir@
- idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-
--mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir = $(libdir)/%%MOZILLA%%
- mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir = $(mredir)/lib
-
diff --git a/mail/thunderbird3/files/patch-configure b/mail/thunderbird3/files/patch-configure
deleted file mode 100644
index f38bd5ee88b5..000000000000
--- a/mail/thunderbird3/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2007-07-30 02:45:45.000000000 -0400
-+++ configure 2007-07-30 02:46:26.000000000 -0400
-@@ -20025,7 +20025,7 @@ MOZILLA_1_8_BRANCH=1
- LIBS_PATH=
- for lib_arg in $NSPR_LIBS $TK_LIBS; do
- case $lib_arg in
-- -L* ) LIBS_PATH="${LIBS_PATH:+$LIBS_PATH:}"`expr $lib_arg : "-L\(.*\)"` ;;
-+ -L* ) LIBS_PATH="${LIBS_PATH:+$LIBS_PATH:}"`expr -- $lib_arg : "-L\(.*\)"` ;;
- * ) ;;
- esac
- done
diff --git a/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
deleted file mode 100644
index 41c462d74f62..000000000000
--- a/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Wed Nov 19 01:20:47 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Tue Feb 10 02:52:26 2004
-@@ -323,11 +323,11 @@
- prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly",
- &mStartLinksOnlyPref);
-
-- PRBool isSoundEnabled = PR_TRUE;
-+ mIsSoundEnabled = PR_TRUE;
- prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound",
-- &isSoundEnabled);
-+ &mIsSoundEnabled);
- nsXPIDLCString soundStr;
-- if (isSoundEnabled) {
-+ if (mIsSoundEnabled && mIsSoundEnabled) {
- prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL",
- getter_Copies(soundStr));
- }
-@@ -758,7 +758,7 @@
- }
- else {
- // No find string to backspace in!
-- if (mIsBackspaceProtectOn) {
-+ if (mIsBackspaceProtectOn && mIsSoundEnabled) {
- // This flag should be on only if the last key was a backspace.
- // It keeps us from accidentally hitting backspace too many times and
- // going back in history when we really just wanted to clear
-@@ -1012,7 +1012,9 @@
-
- // Error sound (don't fire when backspace is pressed, they're
- // trying to correct the mistake!)
-- PlayNotFoundSound();
-+ if (mIsSoundEnabled) {
-+ PlayNotFoundSound();
-+ }
-
- // Remove bad character from buffer, so we can continue typing from
- // last matched character
-@@ -1059,7 +1061,7 @@
- void
- nsTypeAheadFind::PlayNotFoundSound()
- {
-- if (mNotFoundSoundURL.IsEmpty()) // no sound
-+ if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled) // no sound
- return;
- if (!mSoundInterface) {
- mSoundInterface = do_CreateInstance("@mozilla.org/sound;1");
diff --git a/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
deleted file mode 100644
index 07ad43b4334d..000000000000
--- a/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Fri May 23 22:00:33 2003
-+++ extensions/typeaheadfind/src/nsTypeAheadFind.h Mon Feb 9 22:21:43 2004
-@@ -194,6 +194,9 @@
-
- nsCString mNotFoundSoundURL;
-
-+ // Move the sound enabled boolean out for all methods to access.
-+ PRBool mIsSoundEnabled;
-+
- // PRBool's are used instead of PRPackedBool's where the address of the
- // boolean variable is getting passed into a method. For example:
- // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref);
diff --git a/mail/thunderbird3/files/patch-js_src_Makefile.in b/mail/thunderbird3/files/patch-js_src_Makefile.in
deleted file mode 100644
index fb0bd7f1986b..000000000000
--- a/mail/thunderbird3/files/patch-js_src_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- js/src/Makefile.in.orig Wed Oct 18 09:23:09 2006
-+++ js/src/Makefile.in Wed Oct 18 09:27:27 2006
-@@ -244,6 +244,7 @@
- endif
-
- LDFLAGS += $(pathsubst -l%,$(NSPR_STATIC_PATH)/%.a,$(NSPR_LIBS))
-+LDFLAGS += -lc
-
- # BeOS and HP-UX do not require the extra linking of "-lm"
- ifeq (,$(filter BeOS HP-UX WINNT WINCE OpenVMS,$(OS_ARCH)))
diff --git a/mail/thunderbird3/files/patch-mail_app_mozilla.in b/mail/thunderbird3/files/patch-mail_app_mozilla.in
deleted file mode 100644
index 7fcb98bd28d7..000000000000
--- a/mail/thunderbird3/files/patch-mail_app_mozilla.in
+++ /dev/null
@@ -1,124 +0,0 @@
---- mail/app/mozilla.in.orig Mon Apr 4 15:08:49 2005
-+++ mail/app/mozilla.in Fri Jun 10 06:18:49 2005
-@@ -49,51 +49,82 @@
- ## the mozilla-bin binary to work.
- ##
-
-+#
-+# MOZ_PIS, "Mozilla Plugable Init Scripts"
-+# MOZ_PIS_ is the name space used
-+# These variables and there meaning are specified in
-+# mozilla/xpfe/bootstrap/init.d/README
- moz_pis_startstop_scripts()
- {
-- MOZ_USER_DIR="%MOZ_USER_DIR%"
-- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts"
-- # These variables and there meaning are specified in
-- # mozilla/xpfe/bootstrap/init.d/README
-- MOZ_PIS_API=2
-- MOZ_PIS_MOZBINDIR="${dist_bin}"
-- MOZ_PIS_SESSION_PID="$$"
-- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
-- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
--
-- case "${1}" in
-- "start")
-- for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do
-- if [ -x "${curr_pis}" ] ; then
-- case "${curr_pis}" in
-- *.sh) . "${curr_pis}" ;;
-- *) "${curr_pis}" "start" ;;
-- esac
-- fi
-- done
-- ;;
-- "stop")
-- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do
-- if [ -x "${curr_pis}" ] ; then
-- case "${curr_pis}" in
-- *.sh) . "${curr_pis}" ;;
-- *) "${curr_pis}" "stop" ;;
-- esac
-- fi
-- done
-- ;;
-- *)
-- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts."
-- exit 1
-- ;;
-- esac
-+ MOZ_PIS_API=2
-+ MOZ_PIS_MOZBINDIR="${dist_bin}"
-+ MOZ_PIS_SESSION_PID="$$"
-+ MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
-+ export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
-+
-+ case "${1}" in
-+ "start")
-+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \
-+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do
-+ if [ -x "${curr_pis}" ]; then
-+ case "${curr_pis}" in
-+ *.sh)
-+ . "${curr_pis}"
-+ ;;
-+ *)
-+ ${curr_pis} "start"
-+ ;;
-+ esac
-+ fi
-+ done
-+ ;;
-+ "stop")
-+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \
-+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do
-+ if [ -x "${curr_pis}" ]; then
-+ case "${curr_pis}" in
-+ *.sh)
-+ . "${curr_pis}"
-+ ;;
-+ *)
-+ ${curr_pis} "stop"
-+ ;;
-+ esac
-+ fi
-+ done
-+ ;;
-+ *)
-+ echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2
-+ exit 1
-+ ;;
-+ esac
- }
-
--#uncomment for debugging
-+# uncomment for debugging
- #set -x
-
--moz_libdir=%MOZAPPDIR%
--MRE_HOME=%MREDIR%
-+#
-+# variables
-+#
-+#location="new-tab"
-+#MOZILLA_UILOCALE="en-US"
-+#MOZILLA_UIREGION="US"
-+
-+#
-+# working definitions
-+#
-+MOZ_USER_DIR="%MOZ_USER_DIR%"
-+moz_libdir="%MOZAPPDIR%"
-+MRE_HOME="%MREDIR%"
-+
-+debugging= # set the debugging level
-+here=`pwd`
-+
-+if [ ! -d "${MRE_HOME}" ]; then
-+ # use moz_libdir as MRE_HOME
-+ MRE_HOME="${moz_libdir}"
-+fi
-+export MRE_HOME
-
- # Use run-mozilla.sh in the current dir if it exists
- # If not, then start resolving symlinks until we find run-mozilla.sh
diff --git a/mail/thunderbird3/files/patch-security-coreconf-FreeBSD.mk b/mail/thunderbird3/files/patch-security-coreconf-FreeBSD.mk
deleted file mode 100644
index 0f7a04a0279f..000000000000
--- a/mail/thunderbird3/files/patch-security-coreconf-FreeBSD.mk
+++ /dev/null
@@ -1,24 +0,0 @@
---- security/coreconf/FreeBSD.mk.orig Mon Sep 25 18:26:23 2006
-+++ security/coreconf/FreeBSD.mk Mon Sep 25 18:27:03 2006
-@@ -45,8 +45,12 @@
- ifeq ($(OS_TEST),alpha)
- CPU_ARCH = alpha
- else
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH = amd64
-+else
- CPU_ARCH = x86
- endif
-+endif
-
- OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-
-@@ -73,7 +77,7 @@
- DLL_SUFFIX = so.1.0
- endif
-
--MKSHLIB = $(CC) $(DSO_LDOPTS)
-+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
- ifdef MAPFILE
- MKSHLIB += -Wl,--version-script,$(MAPFILE)
- endif
diff --git a/mail/thunderbird3/files/patch-storage_build_Makefile.in b/mail/thunderbird3/files/patch-storage_build_Makefile.in
deleted file mode 100644
index 18202a5a61d8..000000000000
--- a/mail/thunderbird3/files/patch-storage_build_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006
-+++ storage/build/Makefile.in Sun Nov 5 16:16:06 2006
-@@ -77,6 +77,7 @@
- $(EXTRA_DSO_LIBS) \
- $(MOZ_COMPONENT_LIBS) \
- $(MOZ_JS_LIBS) \
-+ %%PTHREAD_LIBS%% \
- $(NULL)
-
- include $(topsrcdir)/config/rules.mk
diff --git a/mail/thunderbird3/files/patch-sysnss b/mail/thunderbird3/files/patch-sysnss
deleted file mode 100644
index bd61c2660a77..000000000000
--- a/mail/thunderbird3/files/patch-sysnss
+++ /dev/null
@@ -1,175 +0,0 @@
---- Makefile.in Tue Sep 14 16:59:40 2004
-+++ Makefile.in Tue Aug 2 08:26:55 2005
-@@ -102,6 +102,4 @@
- # tier 1 - 3rd party individual libraries
- #
--tier_1_dirs += dbm
--
- ifndef MOZ_NATIVE_JPEG
- tier_1_dirs += jpeg
---- security/manager/Makefile.in.orig Tue Mar 28 14:36:54 2006
-+++ security/manager/Makefile.in Tue Mar 28 14:40:29 2006
-@@ -54,22 +54,13 @@
- SSL3_LIB \
- SOFTOKEN3_LIB \
- SOFTOKEN3_CHK \
-- LOADABLE_ROOT_MODULE \
- HAVE_FREEBL_LIBS \
- HAVE_FREEBL_LIBS_32 \
- HAVE_FREEBL_LIBS_32INT64 \
- HAVE_FREEBL_LIBS_64 \
- $(NULL)
--
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
- endif
-
--NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
--SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
--SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
--SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
--SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
--
- # Default
- HAVE_FREEBL_LIBS = 1
-
-@@ -217,11 +208,6 @@
- .nss.cleaned: .nss.checkout
- ifndef MOZ_NATIVE_NSS
- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
-- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- touch $@
- endif
-
-@@ -248,47 +234,6 @@
- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
- endif
- ifndef MOZ_NATIVE_NSS
-- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
--ifndef SKIP_CHK
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
--endif
-- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
--ifndef SKIP_CHK
-- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
--endif
-- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
--ifdef HAVE_FREEBL_LIBS
--ifndef SKIP_CHK
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
--endif
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_32
--ifndef SKIP_CHK
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
--endif
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_32INT64
--ifndef SKIP_CHK
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
--endif
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
--endif
--ifdef HAVE_FREEBL_LIBS_64
--ifndef SKIP_CHK
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
-- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
--endif
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
-- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
--endif
- endif
- $(MAKE) -C boot $@
- $(MAKE) -C ssl $@
-@@ -299,42 +244,6 @@
-
- install::
- ifndef MOZ_NATIVE_NSS
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
--ifndef SKIP_CHK
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
--endif
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
--ifdef HAVE_FREEBL_LIBS
--ifndef SKIP_CHK
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
--endif
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
--endif
--ifdef HAVE_FREEBL_LIBS_32
--ifndef SKIP_CHK
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
--endif
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
--endif
--ifdef HAVE_FREEBL_LIBS_32INT64
--ifndef SKIP_CHK
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
--endif
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
--endif
--ifdef HAVE_FREEBL_LIBS_64
--ifndef SKIP_CHK
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
--endif
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
-- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
--endif
- endif
- $(MAKE) -C boot $@
- $(MAKE) -C ssl $@
-@@ -351,12 +260,6 @@
- $(MAKE) -C pki $@
- endif
- ifndef MOZ_NATIVE_NSS
-- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
-- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
-- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- endif
-
- echo-requires-recursive::
---- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006
-+++ security/manager/ssl/src/Makefile.in Wed Apr 18 20:16:36 2007
-@@ -124,19 +124,20 @@
- pipboot \
- $(NULL)
-
--EXTRA_DEPS = $(NSS_DEP_LIBS)
-
- DEFINES += -DNSS_ENABLE_ECC
-
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += $(NSS_CFLAGS)
-+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss
-
- EXTRA_DSO_LDOPTS += \
- $(MOZ_UNICHARUTIL_LIBS) \
- $(MOZ_COMPONENT_LIBS) \
- $(MOZ_JS_LIBS) \
- $(NSS_LIBS) \
-+ -L%%LOCALBASE%%/lib/nss \
-+ $(LOCAL_INCLUDES) \
- $(NULL)
-
- include $(topsrcdir)/config/rules.mk
diff --git a/mail/thunderbird3/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/mail/thunderbird3/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
deleted file mode 100644
index 7f8e55f536df..000000000000
--- a/mail/thunderbird3/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004
-+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004
-@@ -143,7 +143,7 @@
- PR_END_MACRO
-
- // Attempt to open libgconf
-- gconfLib = LoadVersionedLibrary("gconf-2", ".4");
-+ gconfLib = PR_LoadLibrary("libgconf-2.so");
- ENSURE_LIB(gconfLib);
-
- GET_LIB_FUNCTION(gconf, gconf_client_get_default);
-@@ -151,7 +151,7 @@
- GET_LIB_FUNCTION(gconf, gconf_client_get_bool);
-
- // Attempt to open libgnome
-- gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
-+ gnomeLib = PR_LoadLibrary("libgnome-2.so");
- ENSURE_LIB(gnomeLib);
-
- GET_LIB_FUNCTION(gnome, gnome_url_show);
-@@ -160,7 +160,7 @@
- GET_LIB_FUNCTION(gnome, gnome_program_get);
-
- // Attempt to open libgnomevfs
-- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
-+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so");
- ENSURE_LIB(vfsLib);
-
- GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name);
diff --git a/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
deleted file mode 100644
index ac8cab896d48..000000000000
--- a/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004
-+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Mon May 3 13:05:12 2004
-@@ -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/thunderbird3/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
deleted file mode 100644
index 51edeb95a7a7..000000000000
--- a/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004
-@@ -49,6 +49,9 @@
- ifeq (86,$(findstring 86,$(OS_TEST)))
- CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
- endif
-+ifeq (amd64,$(OS_TEST))
-+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+endif
- endif
- #
- # New code for Linux, et. al., with gcc
-@@ -60,7 +63,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
-@@ -106,9 +109,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
- #
-@@ -294,6 +303,15 @@
- ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
- CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
- ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
-+endif
-+#
-+# FreeBSD/SPARC64
-+#
-+ifeq ($(OS_ARCH),FreeBSD)
-+ifneq (,$(findstring sparc,$(OS_TEST)))
-+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
-+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
-+endif
- endif
- #
- # Solaris/SPARC
diff --git a/mail/thunderbird3/files/patch-xptcall-alpha b/mail/thunderbird3/files/patch-xptcall-alpha
deleted file mode 100644
index 29631a98e61e..000000000000
--- a/mail/thunderbird3/files/patch-xptcall-alpha
+++ /dev/null
@@ -1,459 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003
-@@ -0,0 +1,184 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+__asm__("invoke_copy_to_stack") __attribute__((unused));
-+
-+static void
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer
-+
-+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++)
-+ {
-+ if(s->IsPtrData())
-+ {
-+ *d = (PRUint64)s->ptr;
-+ continue;
-+ }
-+ switch(s->type)
-+ {
-+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break;
-+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break;
-+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break;
-+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break;
-+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break;
-+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break;
-+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break;
-+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break;
-+ case nsXPTType::T_FLOAT :
-+ if(i < NUM_ARG_REGS)
-+ {
-+ // convert floats to doubles if they are to be passed
-+ // via registers so we can just deal with doubles later
-+ union { PRUint64 u64; double d; } t;
-+ t.d = (double)s->val.f;
-+ *d = t.u64;
-+ }
-+ else
-+ // otherwise copy to stack normally
-+ *d = (PRUint64)s->val.u32;
-+ break;
-+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break;
-+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break;
-+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break;
-+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break;
-+ default:
-+ // all the others are plain pointer types
-+ *d = (PRUint64)s->val.p;
-+ break;
-+ }
-+ }
-+}
-+
-+/*
-+ * XPTC_PUBLIC_API(nsresult)
-+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt)
-+ */
-+__asm__(
-+ "#### XPTC_InvokeByIndex ####\n"
-+".text\n\t"
-+ ".align 5\n\t"
-+ ".globl XPTC_InvokeByIndex\n\t"
-+ ".ent XPTC_InvokeByIndex\n"
-+"XPTC_InvokeByIndex:\n\t"
-+ ".frame $15,32,$26,0\n\t"
-+ ".mask 0x4008000,-32\n\t"
-+ "ldgp $29,0($27)\n"
-+"$XPTC_InvokeByIndex..ng:\n\t"
-+ "subq $30,32,$30\n\t"
-+ "stq $26,0($30)\n\t"
-+ "stq $15,8($30)\n\t"
-+ "bis $30,$30,$15\n\t"
-+ ".prologue 1\n\t"
-+
-+ /*
-+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1
-+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters
-+ * is required for storage of those passed via registers.
-+ */
-+
-+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */
-+ "cmplt $2,$18,$1\n\t"
-+ "cmovne $1,$18,$2\n\t"
-+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */
-+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */
-+ "subq $30,$1,$30\n\t"
-+
-+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */
-+ "stq $17,16($15)\n\t" /* save "methodIndex" */
-+
-+ "addq $30,8,$16\n\t" /* pass stack pointer */
-+ "bis $18,$18,$17\n\t" /* pass "paramCount" */
-+ "bis $19,$19,$18\n\t" /* pass "params" */
-+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */
-+
-+ /*
-+ * Copy the first 6 parameters to registers and remove from stack frame.
-+ * Both the integer and floating point registers are set for each parameter
-+ * except the first which is the "this" pointer. (integer only)
-+ * The floating point registers are all set as doubles since the
-+ * invoke_copy_to_stack function should have converted the floats.
-+ */
-+ "ldq $16,0($30)\n\t" /* integer registers */
-+ "ldq $17,8($30)\n\t"
-+ "ldq $18,16($30)\n\t"
-+ "ldq $19,24($30)\n\t"
-+ "ldq $20,32($30)\n\t"
-+ "ldq $21,40($30)\n\t"
-+ "ldt $f17,8($30)\n\t" /* floating point registers */
-+ "ldt $f18,16($30)\n\t"
-+ "ldt $f19,24($30)\n\t"
-+ "ldt $f20,32($30)\n\t"
-+ "ldt $f21,40($30)\n\t"
-+
-+ "addq $30,48,$30\n\t" /* remove params from stack */
-+
-+ /*
-+ * Call the virtual function with the constructed stack frame.
-+ */
-+ "bis $16,$16,$1\n\t" /* load "this" */
-+ "ldq $2,16($15)\n\t" /* load "methodIndex" */
-+ "ldq $1,0($1)\n\t" /* load vtable */
-+#if 0
-+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */
-+#else
-+ "mulq $2, 8, $2\n\t"
-+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */
-+#endif
-+ "addq $1,$2,$1\n\t"
-+ "ldq $27,0($1)\n\t" /* load address of function */
-+ "jsr $26,($27),0\n\t" /* call virtual function */
-+ "ldgp $29,0($26)\n\t"
-+
-+ "bis $15,$15,$30\n\t"
-+ "ldq $26,0($30)\n\t"
-+ "ldq $15,8($30)\n\t"
-+ "addq $30,32,$30\n\t"
-+ "ret $31,($26),1\n\t"
-+ ".end XPTC_InvokeByIndex"
-+ );
-+
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003
-@@ -0,0 +1,269 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Netscape Public License
-+ * Version 1.1 (the "License"); you may not use this file except in
-+ * compliance with the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/NPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1999
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the NPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the NPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+/* Implement shared vtbl methods. */
-+
-+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */
-+
-+#include <sys/types.h>
-+#include <machine/cpu.h>
-+#include "xptcprivate.h"
-+
-+/* Prototype specifies unmangled function name and disables unused warning */
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+__asm__("PrepareAndDispatch") __attribute__((unused));
-+
-+static nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args)
-+{
-+ const PRUint8 PARAM_BUFFER_COUNT = 16;
-+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer
-+
-+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+ nsXPTCMiniVariant* dispatchParams = NULL;
-+ nsIInterfaceInfo* iface_info = NULL;
-+ const nsXPTMethodInfo* info;
-+ PRUint8 paramCount;
-+ PRUint8 i;
-+ nsresult result = NS_ERROR_FAILURE;
-+
-+ NS_ASSERTION(self,"no self");
-+
-+ self->GetInterfaceInfo(&iface_info);
-+ NS_ASSERTION(iface_info,"no interface info");
-+
-+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+ NS_ASSERTION(info,"no interface info");
-+
-+ paramCount = info->GetParamCount();
-+
-+ // setup variant array pointer
-+ if(paramCount > PARAM_BUFFER_COUNT)
-+ dispatchParams = new nsXPTCMiniVariant[paramCount];
-+ else
-+ dispatchParams = paramBuffer;
-+ NS_ASSERTION(dispatchParams,"no place for params");
-+
-+ // args[0] to args[NUM_ARG_REGS] hold floating point register values
-+ PRUint64* ap = args + NUM_ARG_REGS;
-+ for(i = 0; i < paramCount; i++, ap++)
-+ {
-+ const nsXPTParamInfo& param = info->GetParam(i);
-+ const nsXPTType& type = param.GetType();
-+ nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+ if(param.IsOut() || !type.IsArithmetic())
-+ {
-+ dp->val.p = (void*) *ap;
-+ continue;
-+ }
-+ // else
-+ switch(type)
-+ {
-+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break;
-+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break;
-+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break;
-+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break;
-+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break;
-+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break;
-+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break;
-+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break;
-+ case nsXPTType::T_FLOAT :
-+ if(i < NUM_ARG_REGS)
-+ {
-+ // floats passed via registers are stored as doubles
-+ // in the first NUM_ARG_REGS entries in args
-+ dp->val.u64 = (PRUint64) args[i];
-+ dp->val.f = (float) dp->val.d; // convert double to float
-+ }
-+ else
-+ dp->val.u32 = (PRUint32) *ap;
-+ break;
-+ case nsXPTType::T_DOUBLE :
-+ // doubles passed via registers are also stored
-+ // in the first NUM_ARG_REGS entries in args
-+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap;
-+ break;
-+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break;
-+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break;
-+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break;
-+ default:
-+ NS_ASSERTION(0, "bad type");
-+ break;
-+ }
-+ }
-+
-+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+ NS_RELEASE(iface_info);
-+
-+ if(dispatchParams != paramBuffer)
-+ delete [] dispatchParams;
-+
-+ return result;
-+}
-+
-+/*
-+ * SharedStub()
-+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is
-+ * passed to this function via $1 to preserve the argument registers.
-+ */
-+__asm__(
-+ "#### SharedStub ####\n"
-+".text\n\t"
-+ ".align 5\n\t"
-+ ".ent SharedStub\n"
-+"SharedStub:\n\t"
-+ ".frame $30,96,$26,0\n\t"
-+ ".mask 0x4000000,-96\n\t"
-+ "ldgp $29,0($27)\n"
-+"$SharedStub..ng:\n\t"
-+ "subq $30,96,$30\n\t"
-+ "stq $26,0($30)\n\t"
-+ ".prologue 1\n\t"
-+
-+ /*
-+ * Store arguments passed via registers to the stack.
-+ * Floating point registers are stored as doubles and converted
-+ * to floats in PrepareAndDispatch if necessary.
-+ */
-+ "stt $f17,16($30)\n\t" /* floating point registers */
-+ "stt $f18,24($30)\n\t"
-+ "stt $f19,32($30)\n\t"
-+ "stt $f20,40($30)\n\t"
-+ "stt $f21,48($30)\n\t"
-+ "stq $17,56($30)\n\t" /* integer registers */
-+ "stq $18,64($30)\n\t"
-+ "stq $19,72($30)\n\t"
-+ "stq $20,80($30)\n\t"
-+ "stq $21,88($30)\n\t"
-+
-+ /*
-+ * Call PrepareAndDispatch function.
-+ */
-+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */
-+ "addq $30,16,$18\n\t" /* pass "args" */
-+ "bsr $26,$PrepareAndDispatch..ng\n\t"
-+
-+ "ldq $26,0($30)\n\t"
-+ "addq $30,96,$30\n\t"
-+ "ret $31,($26),1\n\t"
-+ ".end SharedStub"
-+ );
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ * Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+__asm__( \
-+ "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+ ".align 5\n\t" \
-+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \
-+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \
-+ ".frame $30,0,$26,0\n\t" \
-+ "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \
-+ ".prologue 1\n\t" \
-+ "lda $1,"#n"\n\t" \
-+ "br $31,$SharedStub..ng\n\t" \
-+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \
-+ ); \
-+__asm__( \
-+ "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+ ".align 5\n\t" \
-+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \
-+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \
-+ ".frame $30,0,$26,0\n\t" \
-+ "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \
-+ ".prologue 1\n\t" \
-+ "lda $1,"#n"\n\t" \
-+ "br $31,$SharedStub..ng\n\t" \
-+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \
-+ ); \
-+__asm__( \
-+ "#### Stub"#n" ####\n" \
-+".text\n\t" \
-+ ".align 5\n\t" \
-+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \
-+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \
-+ ".frame $30,0,$26,0\n\t" \
-+ "ldgp $29,0($27)\n" \
-+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \
-+ ".prologue 1\n\t" \
-+ "lda $1,"#n"\n\t" \
-+ "br $31,$SharedStub..ng\n\t" \
-+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \
-+ );
-+#else
-+/*
-+ * nsresult nsXPTCStubBase::Stub##n()
-+ * Sets register $1 to "methodIndex" and jumps to SharedStub.
-+ */
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+ nsresult result; \
-+__asm__ __volatile__( \
-+ "ldah $29,0($27)\n\t" \
-+ "lda $29,0($29)\n\t" \
-+ "lda $1, "#n"\n\t" \
-+ "br $31, $SharedStub..ng\n\t" \
-+ "mov $0, %0\n\t" \
-+ : "=r" (result) \
-+ ); \
-+ return result; \
-+}
-+#endif
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+ return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
diff --git a/mail/thunderbird3/files/patch-xptcall-sparc64 b/mail/thunderbird3/files/patch-xptcall-sparc64
deleted file mode 100644
index 9599a8a71336..000000000000
--- a/mail/thunderbird3/files/patch-xptcall-sparc64
+++ /dev/null
@@ -1,327 +0,0 @@
---- /dev/null Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003
-@@ -0,0 +1,123 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Stuart Parmenter <pavlov@netscape.com>
-+ */
-+
-+/* Implement shared vtbl methods. */
-+
-+#include "xptcprivate.h"
-+
-+#if defined(sparc) || defined(__sparc__)
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args)
-+{
-+
-+#define PARAM_BUFFER_COUNT 16
-+
-+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+ nsXPTCMiniVariant* dispatchParams = NULL;
-+ nsIInterfaceInfo* iface_info = NULL;
-+ const nsXPTMethodInfo* info;
-+ PRUint8 paramCount;
-+ PRUint8 i;
-+ nsresult result = NS_ERROR_FAILURE;
-+
-+ NS_ASSERTION(self,"no self");
-+
-+ self->GetInterfaceInfo(&iface_info);
-+ NS_ASSERTION(iface_info,"no interface info");
-+
-+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+ NS_ASSERTION(info,"no interface info");
-+
-+ paramCount = info->GetParamCount();
-+
-+ // setup variant array pointer
-+ if(paramCount > PARAM_BUFFER_COUNT)
-+ dispatchParams = new nsXPTCMiniVariant[paramCount];
-+ else
-+ dispatchParams = paramBuffer;
-+ NS_ASSERTION(dispatchParams,"no place for params");
-+
-+ PRUint64* ap = args;
-+ for(i = 0; i < paramCount; i++, ap++)
-+ {
-+ const nsXPTParamInfo& param = info->GetParam(i);
-+ const nsXPTType& type = param.GetType();
-+ nsXPTCMiniVariant* dp = &dispatchParams[i];
-+
-+ if(param.IsOut() || !type.IsArithmetic())
-+ {
-+ dp->val.p = (void*) *ap;
-+ continue;
-+ }
-+ // else
-+ switch(type)
-+ {
-+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break;
-+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break;
-+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break;
-+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break;
-+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break;
-+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break;
-+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break;
-+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break;
-+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break;
-+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break;
-+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break;
-+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break;
-+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break;
-+ default:
-+ NS_ASSERTION(0, "bad type");
-+ break;
-+ }
-+ }
-+
-+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-+
-+ NS_RELEASE(iface_info);
-+
-+ if(dispatchParams != paramBuffer)
-+ delete [] dispatchParams;
-+
-+ return result;
-+}
-+
-+extern "C" int SharedStub(int, int*);
-+
-+#define STUB_ENTRY(n) \
-+nsresult nsXPTCStubBase::Stub##n() \
-+{ \
-+ int dummy; /* defeat tail-call optimization */ \
-+ return SharedStub(n, &dummy); \
-+}
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+ return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#endif /* sparc || __sparc__ */
---- /dev/null Mon May 26 13:22:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003
-@@ -0,0 +1,104 @@
-+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Stuart Parmenter <pavlov@netscape.com>
-+ * Chris Seawood <cls@seawood.org>
-+ */
-+
-+/*
-+ Platform specific code to invoke XPCOM methods on native objects
-+ for sparcv9 Solaris.
-+
-+ See the SPARC Compliance Definition (SCD) Chapter 3
-+ for more information about what is going on here, including
-+ the use of BIAS (0x7ff).
-+ The SCD is available from http://www.sparc.com/.
-+*/
-+
-+ .global XPTC_InvokeByIndex
-+ .type XPTC_InvokeByIndex, #function
-+
-+/*
-+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+ PRUint32 paramCount, nsXPTCVariant* params);
-+
-+*/
-+XPTC_InvokeByIndex:
-+ save %sp,-(128 + 64),%sp ! room for the register window and
-+ ! struct pointer, rounded up to 0 % 64
-+ sll %i2,4,%l0 ! assume the worst case
-+ ! paramCount * 2 * 8 bytes
-+ cmp %l0, 0 ! are there any args? If not,
-+ be .invoke ! no need to copy args to stack
-+ nop
-+
-+ sub %sp,%l0,%sp ! create the additional stack space
-+ add %sp,0x7ff+136,%o0 ! step past the register window, the
-+ ! struct result pointer and the 'this' slot
-+ mov %i2,%o1 ! paramCount
-+ call invoke_copy_to_stack
-+ mov %i3,%o2 ! params
-+
-+!
-+! load arguments from stack into the outgoing registers
-+! BIAS is 0x7ff (2047)
-+!
-+
-+! load the %o1..5 64bit (extended word) output registers registers
-+ ldx [%sp + 0x7ff + 136],%o1 ! %i1
-+ ldx [%sp + 0x7ff + 144],%o2 ! %i2
-+ ldx [%sp + 0x7ff + 152],%o3 ! %i3
-+ ldx [%sp + 0x7ff + 160],%o4 ! %i4
-+ ldx [%sp + 0x7ff + 168],%o5 ! %i5
-+
-+! load the even number double registers starting with %d2
-+ ldd [%sp + 0x7ff + 136],%f2
-+ ldd [%sp + 0x7ff + 144],%f4
-+ ldd [%sp + 0x7ff + 152],%f6
-+ ldd [%sp + 0x7ff + 160],%f8
-+ ldd [%sp + 0x7ff + 168],%f10
-+ ldd [%sp + 0x7ff + 176],%f12
-+ ldd [%sp + 0x7ff + 184],%f14
-+ ldd [%sp + 0x7ff + 192],%f16
-+ ldd [%sp + 0x7ff + 200],%f18
-+ ldd [%sp + 0x7ff + 208],%f20
-+ ldd [%sp + 0x7ff + 216],%f22
-+ ldd [%sp + 0x7ff + 224],%f24
-+ ldd [%sp + 0x7ff + 232],%f26
-+ ldd [%sp + 0x7ff + 240],%f28
-+ ldd [%sp + 0x7ff + 248],%f30
-+
-+!
-+! calculate the target address from the vtable
-+!
-+.invoke:
-+ sll %i1,3,%l0 ! index *= 8
-+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes)
-+ ldx [%i0],%l1 ! *that --> address of vtable
-+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address
-+
-+ jmpl %l0,%o7 ! call the routine
-+ mov %i0,%o0 ! move 'this' pointer to out register
-+
-+ mov %o0,%i0 ! propagate return value
-+ ret
-+ restore
-+
-+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex
---- /dev/null Mon May 26 14:00:00 2003
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003
-@@ -0,0 +1,91 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-+ *
-+ * The contents of this file are subject to the Mozilla Public
-+ * License Version 1.1 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS
-+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ * implied. See the License for the specific language governing
-+ * rights and limitations under the License.
-+ *
-+ * The Original Code is mozilla.org code.
-+ *
-+ * The Initial Developer of the Original Code is Netscape
-+ * Communications Corporation. Portions created by Netscape are
-+ * Copyright (C) 2001 Netscape Communications Corporation. All
-+ * Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Stuart Parmenter <pavlov@netscape.com>
-+ * Chris Seawood <cls@seawood.org>
-+ */
-+
-+
-+/* Platform specific code to invoke XPCOM methods on native objects */
-+
-+#include "xptcprivate.h"
-+
-+#if !defined(__sparc) && !defined(__sparc__)
-+#error "This code is for Sparc only"
-+#endif
-+
-+/* Prototype specifies unmangled function name */
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s);
-+
-+extern "C" PRUint64
-+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s)
-+{
-+ /*
-+ We need to copy the parameters for this function to locals and use them
-+ from there since the parameters occupy the same stack space as the stack
-+ we're trying to populate.
-+ */
-+ PRUint64 *l_d = d;
-+ nsXPTCVariant *l_s = s;
-+ PRUint64 l_paramCount = paramCount;
-+ PRUint64 regCount = 0; // return the number of registers to load from the stack
-+
-+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++)
-+ {
-+ if (regCount < 5) regCount++;
-+
-+ if (l_s->IsPtrData())
-+ {
-+ *l_d = (PRUint64)l_s->ptr;
-+ continue;
-+ }
-+ switch (l_s->type)
-+ {
-+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break;
-+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break;
-+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break;
-+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break;
-+
-+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break;
-+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break;
-+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break;
-+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break;
-+
-+ /* in the case of floats, we want to put the bits in to the
-+ 64bit space right justified... floats in the paramter array on
-+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip
-+ the space that would be occupied by %f0, %f2, etc.
-+ */
-+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break;
-+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break;
-+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break;
-+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break;
-+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break;
-+
-+ default:
-+ // all the others are plain pointer types
-+ *((void**)l_d) = l_s->val.p;
-+ break;
-+ }
-+ }
-+
-+ return regCount;
-+}
diff --git a/mail/thunderbird3/files/thunderbird.desktop.in b/mail/thunderbird3/files/thunderbird.desktop.in
deleted file mode 100644
index b8730d2f50ea..000000000000
--- a/mail/thunderbird3/files/thunderbird.desktop.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Thunderbird
-GenericName=Mail Client
-Comment=Mail client and News Reader
-Exec=thunderbird %U
-Icon=@PORTNAME_ICON@
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Application;Network;
diff --git a/mail/thunderbird3/pkg-descr b/mail/thunderbird3/pkg-descr
deleted file mode 100644
index 9ef9a8246af4..000000000000
--- a/mail/thunderbird3/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/