This commit was manufactured by cvs2svn to create tag 'RELEASE_4_1_0'.release/4.1.0

393 files changed, 2 insertions, 15673 deletions

diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
deleted file mode 100644
index 855dc9b1865f..000000000000
--- a/mail/balsa2/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:	balsa
-# Date created:				02 December 1998
-# Whom:					Glenn Johnson <gljohns@bellsouth.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	balsa
-PORTVERSION= 	0.9.0
-CATEGORIES=	mail gnome
-MASTER_SITES=	ftp://ftp.newton.cx/pub/balsa/ \
-		http://www.theochem.kth.se/~pawsa/balsa/
-
-MAINTAINER=	ports@FreeBSD.org
-
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		PropList.2:${PORTSDIR}/devel/libPropList
-RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-
-USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
-LIBTOOLFILES=	configure libmutt/configure
-CONFIGURE_ENV=	CPPFLAGS='-I${LOCALBASE}/include' \
-		GTK_CONFIG='${GTK_CONFIG}' \
-		GLIB_CONFIG='${GLIB_CONFIG}' \
-		LIBS='-L${LOCALBASE}/lib'
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${PREFIX} \
-		--enable-threads
-
-MAN1=		balsa.1
-
-.include <bsd.port.mk>
diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
deleted file mode 100644
index 93588b7f0cc0..000000000000
--- a/mail/balsa2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (balsa-0.9.0.tar.gz) = 19c8a615b3949bcb5ccbc006d1e5d122
diff --git a/mail/balsa2/files/patch-ai b/mail/balsa2/files/patch-ai
deleted file mode 100644
index ff6f252bd129..000000000000
--- a/mail/balsa2/files/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
---- libmutt/rfc1524.c.orig	Fri Jan  3 23:18:25 1997
-+++ libmutt/rfc1524.c	Thu Dec 23 05:14:52 1999
-@@ -455,7 +455,7 @@
-   if (s[0] == '\0')
-   {
-     snprintf (s, l, "%s/muttXXXXXX", buf);
--    mktemp (s);
-+    mkstemp (s);
-   }
-   else
-   {
-@@ -466,7 +466,7 @@
-     if ((period = strrchr (tmp, '.')) != NULL)
-       *period = 0;
-     snprintf (s, l, "%s/%s.XXXXXX", buf, tmp);
--    mktemp (s);
-+    mkstemp (s);
-     if (period != NULL)
-     {
-       *period = '.';
diff --git a/mail/balsa2/pkg-comment b/mail/balsa2/pkg-comment
deleted file mode 100644
index 150a5e184dd1..000000000000
--- a/mail/balsa2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mail reader for the gnome interface
diff --git a/mail/balsa2/pkg-descr b/mail/balsa2/pkg-descr
deleted file mode 100644
index 484e6febcc10..000000000000
--- a/mail/balsa2/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-A mail reader for gnome. It supports local mail, pop3, and IMAP. It can
-view mail files in mbox, maildir, and mh format.
-
-The pop3 support is not complete. All mail retrieved will be left on the
-server, and hence retrieved again if not deleted through some other pop3
-client. Using fetchmail would be recommended to retrieve pop3 mail.
-
-Balsa is probably not fully usable as one's primary mail client at this
-time.  However, it is under active development and fits with other gnome
-applications.
-
-WWW: http://www.balsa.net/
diff --git a/mail/balsa2/pkg-plist b/mail/balsa2/pkg-plist
deleted file mode 100644
index 501e7e723e97..000000000000
--- a/mail/balsa2/pkg-plist
+++ /dev/null
@@ -1,84 +0,0 @@
-bin/balsa
-etc/sound/events/balsa.soundlist
-etc/sound/events/email.soundlist
-@exec ln -sf t1.html %D/share/gnome/help/balsa/C/index.html
-@unexec rm -f %D/share/gnome/help/balsa/C/index.html
-share/gnome/apps/Internet/balsa.desktop
-share/gnome/help/balsa/C/authours.html
-share/gnome/help/balsa/C/common-tasks.html
-share/gnome/help/balsa/C/getting-started.html
-share/gnome/help/balsa/C/glossary.html
-share/gnome/help/balsa/C/images/balsa_logo.png
-share/gnome/help/balsa/C/images/druid-start.png
-share/gnome/help/balsa/C/images/main-window-toolbar.png
-share/gnome/help/balsa/C/images/main-window.png
-share/gnome/help/balsa/C/images/newmsg-window-attachments.png
-share/gnome/help/balsa/C/images/newmsg-window-toolbar.png
-share/gnome/help/balsa/C/images/newmsg-window.png
-share/gnome/help/balsa/C/its-not-working.html
-share/gnome/help/balsa/C/stylesheet-images/caution.gif
-share/gnome/help/balsa/C/stylesheet-images/home.gif
-share/gnome/help/balsa/C/stylesheet-images/important.gif
-share/gnome/help/balsa/C/stylesheet-images/next.gif
-share/gnome/help/balsa/C/stylesheet-images/note.gif
-share/gnome/help/balsa/C/stylesheet-images/prev.gif
-share/gnome/help/balsa/C/stylesheet-images/tip.gif
-share/gnome/help/balsa/C/stylesheet-images/toc-blank.gif
-share/gnome/help/balsa/C/stylesheet-images/toc-minus.gif
-share/gnome/help/balsa/C/stylesheet-images/toc-plus.gif
-share/gnome/help/balsa/C/stylesheet-images/up.gif
-share/gnome/help/balsa/C/stylesheet-images/warning.gif
-share/gnome/help/balsa/C/topic.dat
-share/gnome/help/balsa/C/win-composer.html
-share/gnome/help/balsa/C/win-config-0.html
-share/gnome/help/balsa/C/win-config-1.html
-share/gnome/help/balsa/C/win-config-2.html
-share/gnome/help/balsa/C/win-config-3.html
-share/gnome/help/balsa/C/win-config-4.html
-share/gnome/help/balsa/C/win-config-5.html
-share/gnome/help/balsa/C/win-config-6.html
-share/gnome/help/balsa/C/win-config-7.html
-share/gnome/help/balsa/C/win-config-8.html
-share/gnome/help/balsa/C/win-config.html
-share/gnome/help/balsa/C/win-main.html
-share/gnome/pixmaps/gnome-balsa2.png
-share/gnome/pixmaps/balsa/attachment.png
-share/gnome/pixmaps/balsa/balsa-logo.png
-share/gnome/pixmaps/balsa/balsa-top.png
-share/gnome/pixmaps/balsa/balsa-watermark.png
-share/gnome/pixmaps/balsa/balsa_icon.png
-share/gnome/pixmaps/balsa/balsa_logo.png
-share/gnome/sounds/balsa/newmail.wav
-share/gnome/sounds/balsa/startup.wav
-share/locale/ca/LC_MESSAGES/balsa.mo
-share/locale/da/LC_MESSAGES/balsa.mo
-share/locale/de/LC_MESSAGES/balsa.mo
-share/locale/el/LC_MESSAGES/balsa.mo
-share/locale/es/LC_MESSAGES/balsa.mo
-share/locale/es_ES/LC_MESSAGES/balsa.mo
-share/locale/et/LC_MESSAGES/balsa.mo
-share/locale/fi/LC_MESSAGES/balsa.mo
-share/locale/fr/LC_MESSAGES/balsa.mo
-share/locale/ga/LC_MESSAGES/balsa.mo
-share/locale/hu/LC_MESSAGES/balsa.mo
-share/locale/it/LC_MESSAGES/balsa.mo
-share/locale/ja/LC_MESSAGES/balsa.mo
-share/locale/ko/LC_MESSAGES/balsa.mo
-share/locale/lt/LC_MESSAGES/balsa.mo
-share/locale/nl/LC_MESSAGES/balsa.mo
-share/locale/no/LC_MESSAGES/balsa.mo
-share/locale/pl/LC_MESSAGES/balsa.mo
-share/locale/pt/LC_MESSAGES/balsa.mo
-share/locale/pt_BR/LC_MESSAGES/balsa.mo
-share/locale/ru/LC_MESSAGES/balsa.mo
-share/locale/sl/LC_MESSAGES/balsa.mo
-share/locale/sv/LC_MESSAGES/balsa.mo
-share/locale/tr/LC_MESSAGES/balsa.mo
-share/locale/uk/LC_MESSAGES/balsa.mo
-share/locale/zh_CN/LC_MESSAGES/balsa.mo
-@dirrm share/gnome/sounds/balsa
-@dirrm share/gnome/pixmaps/balsa
-@dirrm share/gnome/help/balsa/C/stylesheet-images
-@dirrm share/gnome/help/balsa/C/images
-@dirrm share/gnome/help/balsa/C
-@dirrm share/gnome/help/balsa
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
deleted file mode 100644
index 6952c7485338..000000000000
--- a/mail/cyrus-imapd2/Makefile
+++ /dev/null
@@ -1,106 +0,0 @@
-# New ports collection makefile for:		cyrus
-# Date created:					May 4th 1997
-# Whom:						jfitz@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	cyrus
-PORTVERSION= 	1.6.22
-CATEGORIES=	mail tcl82
-MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-		${MASTER_SITE_LOCAL} \
-		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
-MASTER_SITE_SUBDIR=	stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
-DISTNAME=	${PORTNAME}-imapd-${PORTVERSION}
-
-MAINTAINER=	stb@FreeBSD.org
-
-Y2K=		http://andrew2.andrew.cmu.edu/cyrus/imapd/y2k.html
-
-LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
-		pwcheck:${PORTSDIR}/security/cyrus-sasl
-
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
-		--with-cyrus-group=cyrus \
-		--with-sasldir=/usr/local \
-		--with-tclsh=${PREFIX}/bin/tclsh8.2 \
-		--with-auth=unix \
-		--with-com-err
-
-MAN1=		cyradm.1
-MAN3=		imclient.3
-MAN5=		imapd.conf.5
-MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \
-		pop3d.8 reconstruct.8 rmnews.8 syncnews.8
-
-post-configure:
-		@ ${SETENV} ${MAKE_ENV} perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
-
-pre-install:
-		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
-		@${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
-
-DOCS=	README acl-extension anoncvs bugs changes copyrights install \
-	mailing-list overview quota-extension server-design
-HTDOCS=	anoncvs bugs changes index install mailing-list overview \
-	questions readme sieve-protocol sieve
-post-install:
-		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
-.if !defined(NOPORTDOCS)
-		${MKDIR} ${PREFIX}/share/doc/cyrus/html
-.for file in ${DOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/${file} \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO} share/doc/cyrus/${file} >>${TMPPLIST}
-.endfor
-.for file in ${HTDOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/html/${file}.html \
-			${PREFIX}/share/doc/cyrus/html
-		@${ECHO} share/doc/cyrus/html/${file}.html >>${TMPPLIST}
-.endfor
-		@${ECHO} "@dirrm share/doc/cyrus/html" >>${TMPPLIST}
-		@${ECHO} "@dirrm share/doc/cyrus" >>${TMPPLIST}
-.endif
-		${INSTALL_DATA} ${FILESDIR}/imapd.conf \
-			${PREFIX}/etc/imapd.conf.dist
-		${INSTALL_DATA} ${FILESDIR}/inetd.conf.cyrus \
-			${PREFIX}/etc/
-		${INSTALL} -d -m 750 -o cyrus -g cyrus \
-			/var/spool/imap \
-			${PREFIX}/etc/imap \
-			${PREFIX}/etc/imap/user \
-			${PREFIX}/etc/imap/quota \
-			${PREFIX}/etc/imap/proc \
-			${PREFIX}/etc/imap/log \
-			${PREFIX}/etc/imap/msg
-		${INSTALL} -d -m 700 -o cyrus -g cyrus /var/pwcheck
-		${TOUCH} ${PREFIX}/etc/imap/mailboxes
-		${CHMOD} 640 ${PREFIX}/etc/imap/mailboxes
-		chown cyrus:cyrus ${PREFIX}/etc/imap/mailboxes
-		@${ECHO} "@exec mkdir %D/etc/imap" >>${TMPPLIST}
-.for dir in user quota proc log msg
-		@${ECHO} "@exec mkdir %D/etc/imap/${dir}" >>${TMPPLIST}
-		@${ECHO} "@dirrm etc/imap/${dir}" >>${TMPPLIST}
-.endfor
-		@${ECHO} "@exec cp /dev/null %D/etc/imap/mailboxes" >>${TMPPLIST}
-		@${ECHO} "@exec chown -R cyrus:cyrus %D/etc/imap" >>${TMPPLIST}
-		@${ECHO} "@exec chmod -R g-w,o= %D/etc/imap" >>${TMPPLIST}
-		@${ECHO} "@mode u=rwx,go=" >>${TMPPLIST}
-		@${ECHO} "@exec mkdir /var/pwcheck" >>${TMPPLIST}
-		@${ECHO} "@exec chown cyrus:cyrus /var/pwcheck" >>${TMPPLIST}
-		@${ECHO} "@exec chmod go= /var/pwcheck" >>${TMPPLIST}
-		@${ECHO} "@exec mkdir /var/spool/imap" >>${TMPPLIST}
-		@${ECHO} "@exec chown cyrus:cyrus /var/spool/imap" >>${TMPPLIST}
-		@${ECHO} "@exec chmod g-w,o= /var/spool/imap" >>${TMPPLIST}
-		@${ECHO} "@cwd /var" >>${TMPPLIST}
-		@${ECHO} "@dirrm pwcheck" >>${TMPPLIST}
-		@${ECHO} "@dirrm spool/imap" >>${TMPPLIST}
-		@${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \
-			>${PREFIX}/etc/rc.d/cyrus.sh
-		@${CHMOD} 0755 ${PREFIX}/etc/rc.d/cyrus.sh
-		@PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd2/distinfo b/mail/cyrus-imapd2/distinfo
deleted file mode 100644
index 6993ccc0d37d..000000000000
--- a/mail/cyrus-imapd2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (cyrus-imapd-1.6.22.tar.gz) = 1a0b4d466c8662a60313a0bb51a65ea2
diff --git a/mail/cyrus-imapd2/files/cyrus.sh b/mail/cyrus-imapd2/files/cyrus.sh
deleted file mode 100644
index 9248623a8fe2..000000000000
--- a/mail/cyrus-imapd2/files/cyrus.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-PREFIX=%%PREFIX%%
-
-case "$1" in
-
-start)
-	if [ -x ${PREFIX}/cyrus/bin/pwcheck ]
-	then
-		${PREFIX}/cyrus/bin/pwcheck & && echo -n " pwcheck"
-	fi
-	;;
-
-stop)
-	if [ -r /var/run/pwcheck.pid ]
-	then
-		kill `cat /var/run/pwcheck.pid` && echo -n " pwcheck"
-	fi
-	;;
-
-*)
-	echo "usage: $0 {start|stop}" 1>&2
-	exit 64
-	;;
-
-esac
-
diff --git a/mail/cyrus-imapd2/files/imapd.conf b/mail/cyrus-imapd2/files/imapd.conf
deleted file mode 100644
index f9ff5924f0af..000000000000
--- a/mail/cyrus-imapd2/files/imapd.conf
+++ /dev/null
@@ -1,112 +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: /usr/local/etc/imap
-
-# The partition name used by default for new mailboxes
-#
-#defaultpartition: default
-
-# The directory for the different partitions
-#
-partition-default: /var/spool/imap
-
-# The umask value used by various Cyrus IMAP programs
-#
-#umask: 077
-
-# Whether to allow anonymous logins
-#
-#allowanonymouslogin: no
-
-# 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
-
-# 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 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>
-
-# The list of the host names of the mail domain's IMSP servers.  Separate each
-# host name with a space.  The Kerberos identities of these servers may login
-# as any user in order to perform commands by proxy.
-#
-#imspservers: <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 only used when the server is compiled with Kerberos
-# authentication.
-#
-#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
-
-#
-# EOF
diff --git a/mail/cyrus-imapd2/files/inetd.conf.cyrus b/mail/cyrus-imapd2/files/inetd.conf.cyrus
deleted file mode 100644
index f2878fac7aa6..000000000000
--- a/mail/cyrus-imapd2/files/inetd.conf.cyrus
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Example entry for inetd.conf for the Cyrus IMAP server.
-# $FreeBSD$
-#
-# Replace /usr/local with the path where you've installed the package.
-#
-# The IMAP-4 server.
-imap4	stream	tcp	nowait	cyrus	/usr/local/cyrus/bin/imapd	imapd
-#
-# To be able to access the IMAP mailbox by POP-3, use this line.
-pop3	stream	tcp	nowait	cyrus	/usr/local/cyrus/bin/pop3d	pop3d
-#
diff --git a/mail/cyrus-imapd2/files/patch-aa b/mail/cyrus-imapd2/files/patch-aa
deleted file mode 100644
index 34dc4a7d4d9b..000000000000
--- a/mail/cyrus-imapd2/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- man/Makefile.in.orig	Tue Sep  1 03:49:14 1998
-+++ man/Makefile.in	Mon May 10 02:27:39 1999
-@@ -52,7 +52,7 @@
- MAN3 = $(srcdir)/imclient.3
- MAN5 = $(srcdir)/imapd.conf.5 $(srcdir)/krb.equiv.5
- MAN8 = $(srcdir)/arbitron.8 $(srcdir)/collectnews.8 $(srcdir)/deliver.8 \
--	$(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
-+	$(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
- 	$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \
-	$(srcdir)/mbpath.8 $(srcdir)/timsieved.8
- 
- 
diff --git a/mail/cyrus-imapd2/files/patch-ab b/mail/cyrus-imapd2/files/patch-ab
deleted file mode 100644
index 1fc68c171063..000000000000
--- a/mail/cyrus-imapd2/files/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
---- man/quota.8.orig	Sun May  4 22:26:33 1997
-+++ man/quota.8	Sun May  4 22:27:24 1997
-@@ -11,9 +11,9 @@
- .\" use of the code for commercial purposes or benefits by anyone
- .\" without specific, additional permission by the owner of the code.
- .SH NAME
--quota \- report and optionally fix quota usage
-+cyrquota \- report and optionally fix quota usage
- .SH SYNOPSIS
--.B quota
-+.B cyrquota
- [
- .B \-f
- ]
-@@ -21,12 +21,12 @@
- .IR mailbox-prefix ...
- ]
- .SH DESCRIPTION
--.I Quota
-+.I Cyrquota
- generates a report listing quota roots, giving their limits and usage.
- If the
- .I \-f
- option is given, 
--.I quota
-+.I cyrquota
- first fixes any inconsistencies in the quota subsystem, such as
- mailboxes with the wrong quota root or quota roots with the wrong
- quota usage reported.
-@@ -37,7 +37,7 @@
- prefixes.
- .PP
- Running
--.I quota
-+.I cyrquota
- with both the 
- .I \-f
- option and
diff --git a/mail/cyrus-imapd2/files/patch-ac b/mail/cyrus-imapd2/files/patch-ac
deleted file mode 100644
index ab7854846479..000000000000
--- a/mail/cyrus-imapd2/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure	Thu Jan  6 22:28:51 2000
-+++ /tmp/configure.new	Sat Apr  8 20:55:29 2000
-@@ -4951,7 +4951,7 @@
-     # try the user-specified path --- too lazy to test for it right now
-     LIB_SASL="-L$sasldir/lib -lsasl"
-     
--    SASLFLAGS="-I$sasldir/include"
-+    SASLFLAGS="-I$sasldir/include/sasl"
-         
-   fi
- 
diff --git a/mail/cyrus-imapd2/files/patch-ad b/mail/cyrus-imapd2/files/patch-ad
deleted file mode 100644
index bcd310e991d3..000000000000
--- a/mail/cyrus-imapd2/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Sun Apr  9 01:13:23 2000
-+++ configure.in	Sun Apr  9 01:13:43 2000
-@@ -528,7 +528,7 @@
-       # filename, it should be safe to add it (to the front of the line --
-       # somef vendors have older, badly installed tclshs that we want to avoid
-       # if we can)
--      AC_PATH_PROGS(TCLSH, [tclsh8.1 tclsh8.0 tclsh], "unknown")
-+      AC_PATH_PROGS(TCLSH, [tclsh8.2 tclsh8.1 tclsh8.0 tclsh], "unknown")
-     fi
- 
-     # Do we know where to get a tclsh?
diff --git a/mail/cyrus-imapd2/files/patch-bb b/mail/cyrus-imapd2/files/patch-bb
deleted file mode 100644
index 11f8698c92eb..000000000000
--- a/mail/cyrus-imapd2/files/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
---- cyradm/Makefile.in.orig	Fri Aug  7 08:48:26 1998
-+++ cyradm/Makefile.in	Mon May 10 02:40:06 1999
-@@ -33,8 +33,8 @@
- RANLIB = @RANLIB@
- 
- DEFS = @DEFS@ @TCL_DEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@
--LIBS =  @TCL_LIBS@ @IMAP_LIBS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ @SASLFLAGS@
-+LIBS =  @TCL_LIBS@ -lm @IMAP_LIBS@
- DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ 
- 
- CFLAGS = @CFLAGS@
diff --git a/mail/cyrus-imapd2/files/patch-bc b/mail/cyrus-imapd2/files/patch-bc
deleted file mode 100644
index 5310441ee96c..000000000000
--- a/mail/cyrus-imapd2/files/patch-bc
+++ /dev/null
@@ -1,19 +0,0 @@
-*** imap/Makefile.in.orig	Fri Nov  5 01:00:34 1999
---- imap/Makefile.in	Thu Mar  9 18:59:14 2000
-***************
-*** 45,51 ****
-  CYRUS_USER=@cyrus_user@
-  CYRUS_GROUP=@cyrus_group@
-  
-! DEFS = @DEFS@ @LOCALDEFS@
-  CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-  IMAP_LIBS = @IMAP_LIBS@
-  SIEVE_LIBS = @SIEVE_LIBS@
---- 45,51 ----
-  CYRUS_USER=@cyrus_user@
-  CYRUS_GROUP=@cyrus_group@
-  
-! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
-  CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-  IMAP_LIBS = @IMAP_LIBS@
-  SIEVE_LIBS = @SIEVE_LIBS@
diff --git a/mail/cyrus-imapd2/files/patch-bd b/mail/cyrus-imapd2/files/patch-bd
deleted file mode 100644
index 83a7d53f4c40..000000000000
--- a/mail/cyrus-imapd2/files/patch-bd
+++ /dev/null
@@ -1,14 +0,0 @@
-*** imap/config.c.orig	Thu Mar  9 19:07:14 2000
---- imap/config.c	Thu Mar  9 19:06:48 2000
-***************
-*** 39,45 ****
---- 39,47 ----
-  
-  extern int errno;
-  
-+ #if !defined(CONFIG_FILENAME)
-  #define CONFIG_FILENAME "/etc/imapd.conf"
-+ #endif
-  
-  struct configlist {
-      char *key;
diff --git a/mail/cyrus-imapd2/files/patch-be b/mail/cyrus-imapd2/files/patch-be
deleted file mode 100644
index 707298b92662..000000000000
--- a/mail/cyrus-imapd2/files/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
---- imap/krbck.c.orig	Sat Dec 21 02:08:21 1996
-+++ imap/krbck.c	Wed Oct  8 13:56:58 1997
-@@ -29,7 +29,9 @@
- 
- #define EXIT_CHOKE (int) 10
- 
--#define CONFIG_FILENAME "/etc/imapd.conf"
-+#if !defined(CONFIG_FILENAME)
-+	#define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
- #define MAX_FILENAME_LEN 255
- 
- int errno;
diff --git a/mail/cyrus-imapd2/files/patch-bf b/mail/cyrus-imapd2/files/patch-bf
deleted file mode 100644
index 0252ec589130..000000000000
--- a/mail/cyrus-imapd2/files/patch-bf
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Fri Dec  4 11:34:53 1998
-+++ configure.in	Sun Apr  9 12:16:24 2000
-@@ -698,6 +698,8 @@
- 
-     dnl Kerberos wants this so we might as well check on it first
-     AC_CHECK_FUNC(res_search,,AC_CHECK_LIB(resolv,res_search))
-+    dnl Kerberos IV on FreeBSD depends on libcom_err, so check for it
-+    AC_CHECK_LIB(com_err, init_error_table)
- 
-     dnl gotta do this: crypt is used by sasl_krb_server.c
-     AC_CHECK_FUNC(crypt,,AC_CHECK_LIB(crypt, crypt))
diff --git a/mail/cyrus-imapd2/files/patch-bg b/mail/cyrus-imapd2/files/patch-bg
deleted file mode 100644
index 964814930475..000000000000
--- a/mail/cyrus-imapd2/files/patch-bg
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	Fri Dec  4 12:03:58 1998
-+++ configure	Sat Apr 15 11:44:42 2000
-@@ -3348,6 +3348,9 @@
- 
- fi
- 
-+# Kerberos IV on FreeBSD depends on libcom_err.
-+LIBS="-lcom_err $LIBS" 
-+echo '#define HAVE_LIBCOM_ERR 1' >> confdefs.h
- 
-         echo $ac_n "checking for crypt""... $ac_c" 1>&6
- echo "configure:3354: checking for crypt" >&5
diff --git a/mail/cyrus-imapd2/files/patch-bh b/mail/cyrus-imapd2/files/patch-bh
deleted file mode 100644
index d9fcb4716f4d..000000000000
--- a/mail/cyrus-imapd2/files/patch-bh
+++ /dev/null
@@ -1,11 +0,0 @@
---- timsieved/Makefile.in.orig	Sun Apr  9 01:52:10 2000
-+++ timsieved/Makefile.in	Sun Apr  9 01:52:37 2000
-@@ -34,7 +34,7 @@
- CYRUS_GROUP=@cyrus_group@
- 
- DEFS = @DEFS@ @LOCALDEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
- 
diff --git a/mail/cyrus-imapd2/files/patch-bi b/mail/cyrus-imapd2/files/patch-bi
deleted file mode 100644
index 38f5bb4ad0e7..000000000000
--- a/mail/cyrus-imapd2/files/patch-bi
+++ /dev/null
@@ -1,11 +0,0 @@
---- installsieve/Makefile.in.orig	Sun Apr  9 01:58:03 2000
-+++ installsieve/Makefile.in	Sun Apr  9 01:58:35 2000
-@@ -28,7 +28,7 @@
- CC = @CC@
- 
- DEFS = @DEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
- 
diff --git a/mail/cyrus-imapd2/files/patch-bj b/mail/cyrus-imapd2/files/patch-bj
deleted file mode 100644
index adc8e7e3274d..000000000000
--- a/mail/cyrus-imapd2/files/patch-bj
+++ /dev/null
@@ -1,11 +0,0 @@
---- timsieved/config.c	Sun Apr  9 07:58:37 2000
-+++ config.c	Sun Apr  9 07:58:47 2000
-@@ -41,7 +41,7 @@
- 
- extern int errno;
- 
--#define CONFIG_FILENAME "/etc/imapd.conf"
-+#define CONFIG_FILENAME "/usr/local/etc/imapd.conf"
- 
- struct configlist {
-     char *key;
diff --git a/mail/cyrus-imapd2/pkg-comment b/mail/cyrus-imapd2/pkg-comment
deleted file mode 100644
index b26e555b2c72..000000000000
--- a/mail/cyrus-imapd2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols
diff --git a/mail/cyrus-imapd2/pkg-descr b/mail/cyrus-imapd2/pkg-descr
deleted file mode 100644
index 1fbdb1cb67ff..000000000000
--- a/mail/cyrus-imapd2/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://andrew2.andrew.cmu.edu/cyrus/imapd/
diff --git a/mail/cyrus-imapd2/pkg-install b/mail/cyrus-imapd2/pkg-install
deleted file mode 100644
index 93e91ebc4dae..000000000000
--- a/mail/cyrus-imapd2/pkg-install
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-#set -vx
-
-#
-# create 'cyrus' user and group before installing
-#
-
-create() {
-	if [ ! -x /usr/sbin/pw ]; then
-		echo "*** Please add a user and a group named \`cyrus' before installing this package."
-		exit 69
-	fi
-
-	if ! pw show group cyrus -q >/dev/null; then
-		gid=60
-		while pw show group -g ${gid} -q >/dev/null; do
-			gid=`expr ${gid} + 1`
-		done
-		if ! pw add group cyrus -g ${gid}; then
-			e=$?
-			echo "*** Failed to add group \`cyrus'. Please add it manually."
-			exit ${e}
-		fi
-		echo "*** Added group \`cyrus' (id ${gid})"
-	else
-		gid=`pw show group cyrus 2>/dev/null | cut -d: -f3`
-	fi
-
-	if [ -x /sbin/nologin ]; then
-		shell=/sbin/nologin
-	else
-		shell=/nonexistent
-	fi
-	if ! pw show user cyrus -q >/dev/null; then
-		uid=60
-		while pw show user -u ${uid} -q >/dev/null; do
-			uid=`expr ${uid} + 1`
-		done
-		if ! pw add user cyrus -u ${uid} -g ${gid} -d "/nonexistent" \
-				-c "the cyrus mail server" -s "${shell}" -p "*" \
-				; then
-			e=$?
-			echo "*** Failed to add user \`cyrus'. Please add it manually."
-			exit ${e}
-		fi
-		echo "*** Added user \`cyrus' (id ${uid})"
-	else
-		if ! pw mod user cyrus -g ${gid} -d "/nonexistent" \
-				-c "the cyrus mail server" -s "${shell}" -p "*" \
-				; then
-			e=$?
-			echo "*** Failed to update user \`cyrus'."
-			exit ${e}
-		fi
-		echo "*** Updated user \`cyrus'."
-	fi
-	if ! pw group mod cyrus -m daemon; then
-		echo "*** can't add user \`daemon' to group \`cyrus'"
-	fi
-}
-
-
-checkfile() {
-	diff -bBqw $1 $1.dist >/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 $1.dist $1
-			;;
-	esac
-}
-
-
-case $2 in
-	PRE-INSTALL)
-		create
-		;;
-
-	POST-INSTALL)
-		cd ${PKG_PREFIX}
-		checkfile ${PKG_PREFIX}/etc/imapd.conf
-		if grep '^imap4' /etc/inetd.conf; then
-			echo "** Please check that your /etc/inetd.conf entry for \`imap4'"
-			echo "   is suitable for the Cyrus IMAP server."
-		else
-			echo "** Please add an entry for the imap4 protocol to /etc/inetd.conf."
-		fi
-		echo "   An example can be found in ${PKG_PREFIX}/etc/inetd.conf.cyrus."
-		;;
-esac
diff --git a/mail/cyrus-imapd2/pkg-plist b/mail/cyrus-imapd2/pkg-plist
deleted file mode 100644
index 0bd7bbeedb62..000000000000
--- a/mail/cyrus-imapd2/pkg-plist
+++ /dev/null
@@ -1,45 +0,0 @@
-bin/imtest
-bin/cyradm
-bin/installsieve
-cyrus/bin/collectnews
-cyrus/bin/syncnews
-cyrus/bin/imapd
-cyrus/bin/pop3d
-cyrus/bin/arbitron
-cyrus/bin/fud
-cyrus/bin/reconstruct
-cyrus/bin/dump_deliverdb
-cyrus/bin/mbpath
-cyrus/bin/deliver
-cyrus/bin/feedcyrus
-cyrus/bin/timsieved
-cyrus/bin/cyrquota
-etc/rc.d/cyrus.sh
-etc/imapd.conf.dist
-etc/inetd.conf.cyrus
-etc/imap/mailboxes
-etc/imapd.conf
-include/cyrus/acl.h
-include/cyrus/assert.h
-include/cyrus/auth.h
-include/cyrus/bsearch.h
-include/cyrus/charset.h
-include/cyrus/glob.h
-include/cyrus/gmtoff.h
-include/cyrus/imclient.h
-include/cyrus/imparse.h
-include/cyrus/lock.h
-include/cyrus/map.h
-include/cyrus/mkgmtime.h
-include/cyrus/nonblock.h
-include/cyrus/parseaddr.h
-include/cyrus/prot.h
-include/cyrus/retry.h
-include/cyrus/sysexits.h
-include/cyrus/util.h
-include/cyrus/xmalloc.h
-lib/libcyrus.a
-@dirrm cyrus/bin
-@dirrm cyrus
-@dirrm etc/imap
-@dirrm include/cyrus
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
deleted file mode 100644
index 6952c7485338..000000000000
--- a/mail/cyrus-imapd22/Makefile
+++ /dev/null
@@ -1,106 +0,0 @@
-# New ports collection makefile for:		cyrus
-# Date created:					May 4th 1997
-# Whom:						jfitz@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	cyrus
-PORTVERSION= 	1.6.22
-CATEGORIES=	mail tcl82
-MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-		${MASTER_SITE_LOCAL} \
-		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
-MASTER_SITE_SUBDIR=	stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
-DISTNAME=	${PORTNAME}-imapd-${PORTVERSION}
-
-MAINTAINER=	stb@FreeBSD.org
-
-Y2K=		http://andrew2.andrew.cmu.edu/cyrus/imapd/y2k.html
-
-LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
-		pwcheck:${PORTSDIR}/security/cyrus-sasl
-
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
-		--with-cyrus-group=cyrus \
-		--with-sasldir=/usr/local \
-		--with-tclsh=${PREFIX}/bin/tclsh8.2 \
-		--with-auth=unix \
-		--with-com-err
-
-MAN1=		cyradm.1
-MAN3=		imclient.3
-MAN5=		imapd.conf.5
-MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \
-		pop3d.8 reconstruct.8 rmnews.8 syncnews.8
-
-post-configure:
-		@ ${SETENV} ${MAKE_ENV} perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
-
-pre-install:
-		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
-		@${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
-
-DOCS=	README acl-extension anoncvs bugs changes copyrights install \
-	mailing-list overview quota-extension server-design
-HTDOCS=	anoncvs bugs changes index install mailing-list overview \
-	questions readme sieve-protocol sieve
-post-install:
-		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
-.if !defined(NOPORTDOCS)
-		${MKDIR} ${PREFIX}/share/doc/cyrus/html
-.for file in ${DOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/${file} \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO} share/doc/cyrus/${file} >>${TMPPLIST}
-.endfor
-.for file in ${HTDOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/html/${file}.html \
-			${PREFIX}/share/doc/cyrus/html
-		@${ECHO} share/doc/cyrus/html/${file}.html >>${TMPPLIST}
-.endfor
-		@${ECHO} "@dirrm share/doc/cyrus/html" >>${TMPPLIST}
-		@${ECHO} "@dirrm share/doc/cyrus" >>${TMPPLIST}
-.endif
-		${INSTALL_DATA} ${FILESDIR}/imapd.conf \
-			${PREFIX}/etc/imapd.conf.dist
-		${INSTALL_DATA} ${FILESDIR}/inetd.conf.cyrus \
-			${PREFIX}/etc/
-		${INSTALL} -d -m 750 -o cyrus -g cyrus \
-			/var/spool/imap \
-			${PREFIX}/etc/imap \
-			${PREFIX}/etc/imap/user \
-			${PREFIX}/etc/imap/quota \
-			${PREFIX}/etc/imap/proc \
-			${PREFIX}/etc/imap/log \
-			${PREFIX}/etc/imap/msg
-		${INSTALL} -d -m 700 -o cyrus -g cyrus /var/pwcheck
-		${TOUCH} ${PREFIX}/etc/imap/mailboxes
-		${CHMOD} 640 ${PREFIX}/etc/imap/mailboxes
-		chown cyrus:cyrus ${PREFIX}/etc/imap/mailboxes
-		@${ECHO} "@exec mkdir %D/etc/imap" >>${TMPPLIST}
-.for dir in user quota proc log msg
-		@${ECHO} "@exec mkdir %D/etc/imap/${dir}" >>${TMPPLIST}
-		@${ECHO} "@dirrm etc/imap/${dir}" >>${TMPPLIST}
-.endfor
-		@${ECHO} "@exec cp /dev/null %D/etc/imap/mailboxes" >>${TMPPLIST}
-		@${ECHO} "@exec chown -R cyrus:cyrus %D/etc/imap" >>${TMPPLIST}
-		@${ECHO} "@exec chmod -R g-w,o= %D/etc/imap" >>${TMPPLIST}
-		@${ECHO} "@mode u=rwx,go=" >>${TMPPLIST}
-		@${ECHO} "@exec mkdir /var/pwcheck" >>${TMPPLIST}
-		@${ECHO} "@exec chown cyrus:cyrus /var/pwcheck" >>${TMPPLIST}
-		@${ECHO} "@exec chmod go= /var/pwcheck" >>${TMPPLIST}
-		@${ECHO} "@exec mkdir /var/spool/imap" >>${TMPPLIST}
-		@${ECHO} "@exec chown cyrus:cyrus /var/spool/imap" >>${TMPPLIST}
-		@${ECHO} "@exec chmod g-w,o= /var/spool/imap" >>${TMPPLIST}
-		@${ECHO} "@cwd /var" >>${TMPPLIST}
-		@${ECHO} "@dirrm pwcheck" >>${TMPPLIST}
-		@${ECHO} "@dirrm spool/imap" >>${TMPPLIST}
-		@${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \
-			>${PREFIX}/etc/rc.d/cyrus.sh
-		@${CHMOD} 0755 ${PREFIX}/etc/rc.d/cyrus.sh
-		@PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo
deleted file mode 100644
index 6993ccc0d37d..000000000000
--- a/mail/cyrus-imapd22/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (cyrus-imapd-1.6.22.tar.gz) = 1a0b4d466c8662a60313a0bb51a65ea2
diff --git a/mail/cyrus-imapd22/files/cyrus.sh b/mail/cyrus-imapd22/files/cyrus.sh
deleted file mode 100644
index 9248623a8fe2..000000000000
--- a/mail/cyrus-imapd22/files/cyrus.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-PREFIX=%%PREFIX%%
-
-case "$1" in
-
-start)
-	if [ -x ${PREFIX}/cyrus/bin/pwcheck ]
-	then
-		${PREFIX}/cyrus/bin/pwcheck & && echo -n " pwcheck"
-	fi
-	;;
-
-stop)
-	if [ -r /var/run/pwcheck.pid ]
-	then
-		kill `cat /var/run/pwcheck.pid` && echo -n " pwcheck"
-	fi
-	;;
-
-*)
-	echo "usage: $0 {start|stop}" 1>&2
-	exit 64
-	;;
-
-esac
-
diff --git a/mail/cyrus-imapd22/files/imapd.conf b/mail/cyrus-imapd22/files/imapd.conf
deleted file mode 100644
index f9ff5924f0af..000000000000
--- a/mail/cyrus-imapd22/files/imapd.conf
+++ /dev/null
@@ -1,112 +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: /usr/local/etc/imap
-
-# The partition name used by default for new mailboxes
-#
-#defaultpartition: default
-
-# The directory for the different partitions
-#
-partition-default: /var/spool/imap
-
-# The umask value used by various Cyrus IMAP programs
-#
-#umask: 077
-
-# Whether to allow anonymous logins
-#
-#allowanonymouslogin: no
-
-# 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
-
-# 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 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>
-
-# The list of the host names of the mail domain's IMSP servers.  Separate each
-# host name with a space.  The Kerberos identities of these servers may login
-# as any user in order to perform commands by proxy.
-#
-#imspservers: <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 only used when the server is compiled with Kerberos
-# authentication.
-#
-#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
-
-#
-# EOF
diff --git a/mail/cyrus-imapd22/files/inetd.conf.cyrus b/mail/cyrus-imapd22/files/inetd.conf.cyrus
deleted file mode 100644
index f2878fac7aa6..000000000000
--- a/mail/cyrus-imapd22/files/inetd.conf.cyrus
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Example entry for inetd.conf for the Cyrus IMAP server.
-# $FreeBSD$
-#
-# Replace /usr/local with the path where you've installed the package.
-#
-# The IMAP-4 server.
-imap4	stream	tcp	nowait	cyrus	/usr/local/cyrus/bin/imapd	imapd
-#
-# To be able to access the IMAP mailbox by POP-3, use this line.
-pop3	stream	tcp	nowait	cyrus	/usr/local/cyrus/bin/pop3d	pop3d
-#
diff --git a/mail/cyrus-imapd22/files/patch-aa b/mail/cyrus-imapd22/files/patch-aa
deleted file mode 100644
index 34dc4a7d4d9b..000000000000
--- a/mail/cyrus-imapd22/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- man/Makefile.in.orig	Tue Sep  1 03:49:14 1998
-+++ man/Makefile.in	Mon May 10 02:27:39 1999
-@@ -52,7 +52,7 @@
- MAN3 = $(srcdir)/imclient.3
- MAN5 = $(srcdir)/imapd.conf.5 $(srcdir)/krb.equiv.5
- MAN8 = $(srcdir)/arbitron.8 $(srcdir)/collectnews.8 $(srcdir)/deliver.8 \
--	$(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
-+	$(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
- 	$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \
-	$(srcdir)/mbpath.8 $(srcdir)/timsieved.8
- 
- 
diff --git a/mail/cyrus-imapd22/files/patch-ab b/mail/cyrus-imapd22/files/patch-ab
deleted file mode 100644
index 1fc68c171063..000000000000
--- a/mail/cyrus-imapd22/files/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
---- man/quota.8.orig	Sun May  4 22:26:33 1997
-+++ man/quota.8	Sun May  4 22:27:24 1997
-@@ -11,9 +11,9 @@
- .\" use of the code for commercial purposes or benefits by anyone
- .\" without specific, additional permission by the owner of the code.
- .SH NAME
--quota \- report and optionally fix quota usage
-+cyrquota \- report and optionally fix quota usage
- .SH SYNOPSIS
--.B quota
-+.B cyrquota
- [
- .B \-f
- ]
-@@ -21,12 +21,12 @@
- .IR mailbox-prefix ...
- ]
- .SH DESCRIPTION
--.I Quota
-+.I Cyrquota
- generates a report listing quota roots, giving their limits and usage.
- If the
- .I \-f
- option is given, 
--.I quota
-+.I cyrquota
- first fixes any inconsistencies in the quota subsystem, such as
- mailboxes with the wrong quota root or quota roots with the wrong
- quota usage reported.
-@@ -37,7 +37,7 @@
- prefixes.
- .PP
- Running
--.I quota
-+.I cyrquota
- with both the 
- .I \-f
- option and
diff --git a/mail/cyrus-imapd22/files/patch-ac b/mail/cyrus-imapd22/files/patch-ac
deleted file mode 100644
index ab7854846479..000000000000
--- a/mail/cyrus-imapd22/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure	Thu Jan  6 22:28:51 2000
-+++ /tmp/configure.new	Sat Apr  8 20:55:29 2000
-@@ -4951,7 +4951,7 @@
-     # try the user-specified path --- too lazy to test for it right now
-     LIB_SASL="-L$sasldir/lib -lsasl"
-     
--    SASLFLAGS="-I$sasldir/include"
-+    SASLFLAGS="-I$sasldir/include/sasl"
-         
-   fi
- 
diff --git a/mail/cyrus-imapd22/files/patch-ad b/mail/cyrus-imapd22/files/patch-ad
deleted file mode 100644
index bcd310e991d3..000000000000
--- a/mail/cyrus-imapd22/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Sun Apr  9 01:13:23 2000
-+++ configure.in	Sun Apr  9 01:13:43 2000
-@@ -528,7 +528,7 @@
-       # filename, it should be safe to add it (to the front of the line --
-       # somef vendors have older, badly installed tclshs that we want to avoid
-       # if we can)
--      AC_PATH_PROGS(TCLSH, [tclsh8.1 tclsh8.0 tclsh], "unknown")
-+      AC_PATH_PROGS(TCLSH, [tclsh8.2 tclsh8.1 tclsh8.0 tclsh], "unknown")
-     fi
- 
-     # Do we know where to get a tclsh?
diff --git a/mail/cyrus-imapd22/files/patch-bb b/mail/cyrus-imapd22/files/patch-bb
deleted file mode 100644
index 11f8698c92eb..000000000000
--- a/mail/cyrus-imapd22/files/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
---- cyradm/Makefile.in.orig	Fri Aug  7 08:48:26 1998
-+++ cyradm/Makefile.in	Mon May 10 02:40:06 1999
-@@ -33,8 +33,8 @@
- RANLIB = @RANLIB@
- 
- DEFS = @DEFS@ @TCL_DEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@
--LIBS =  @TCL_LIBS@ @IMAP_LIBS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ @SASLFLAGS@
-+LIBS =  @TCL_LIBS@ -lm @IMAP_LIBS@
- DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ 
- 
- CFLAGS = @CFLAGS@
diff --git a/mail/cyrus-imapd22/files/patch-bc b/mail/cyrus-imapd22/files/patch-bc
deleted file mode 100644
index 5310441ee96c..000000000000
--- a/mail/cyrus-imapd22/files/patch-bc
+++ /dev/null
@@ -1,19 +0,0 @@
-*** imap/Makefile.in.orig	Fri Nov  5 01:00:34 1999
---- imap/Makefile.in	Thu Mar  9 18:59:14 2000
-***************
-*** 45,51 ****
-  CYRUS_USER=@cyrus_user@
-  CYRUS_GROUP=@cyrus_group@
-  
-! DEFS = @DEFS@ @LOCALDEFS@
-  CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-  IMAP_LIBS = @IMAP_LIBS@
-  SIEVE_LIBS = @SIEVE_LIBS@
---- 45,51 ----
-  CYRUS_USER=@cyrus_user@
-  CYRUS_GROUP=@cyrus_group@
-  
-! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
-  CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-  IMAP_LIBS = @IMAP_LIBS@
-  SIEVE_LIBS = @SIEVE_LIBS@
diff --git a/mail/cyrus-imapd22/files/patch-bd b/mail/cyrus-imapd22/files/patch-bd
deleted file mode 100644
index 83a7d53f4c40..000000000000
--- a/mail/cyrus-imapd22/files/patch-bd
+++ /dev/null
@@ -1,14 +0,0 @@
-*** imap/config.c.orig	Thu Mar  9 19:07:14 2000
---- imap/config.c	Thu Mar  9 19:06:48 2000
-***************
-*** 39,45 ****
---- 39,47 ----
-  
-  extern int errno;
-  
-+ #if !defined(CONFIG_FILENAME)
-  #define CONFIG_FILENAME "/etc/imapd.conf"
-+ #endif
-  
-  struct configlist {
-      char *key;
diff --git a/mail/cyrus-imapd22/files/patch-be b/mail/cyrus-imapd22/files/patch-be
deleted file mode 100644
index 707298b92662..000000000000
--- a/mail/cyrus-imapd22/files/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
---- imap/krbck.c.orig	Sat Dec 21 02:08:21 1996
-+++ imap/krbck.c	Wed Oct  8 13:56:58 1997
-@@ -29,7 +29,9 @@
- 
- #define EXIT_CHOKE (int) 10
- 
--#define CONFIG_FILENAME "/etc/imapd.conf"
-+#if !defined(CONFIG_FILENAME)
-+	#define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
- #define MAX_FILENAME_LEN 255
- 
- int errno;
diff --git a/mail/cyrus-imapd22/files/patch-bf b/mail/cyrus-imapd22/files/patch-bf
deleted file mode 100644
index 0252ec589130..000000000000
--- a/mail/cyrus-imapd22/files/patch-bf
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Fri Dec  4 11:34:53 1998
-+++ configure.in	Sun Apr  9 12:16:24 2000
-@@ -698,6 +698,8 @@
- 
-     dnl Kerberos wants this so we might as well check on it first
-     AC_CHECK_FUNC(res_search,,AC_CHECK_LIB(resolv,res_search))
-+    dnl Kerberos IV on FreeBSD depends on libcom_err, so check for it
-+    AC_CHECK_LIB(com_err, init_error_table)
- 
-     dnl gotta do this: crypt is used by sasl_krb_server.c
-     AC_CHECK_FUNC(crypt,,AC_CHECK_LIB(crypt, crypt))
diff --git a/mail/cyrus-imapd22/files/patch-bg b/mail/cyrus-imapd22/files/patch-bg
deleted file mode 100644
index 964814930475..000000000000
--- a/mail/cyrus-imapd22/files/patch-bg
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	Fri Dec  4 12:03:58 1998
-+++ configure	Sat Apr 15 11:44:42 2000
-@@ -3348,6 +3348,9 @@
- 
- fi
- 
-+# Kerberos IV on FreeBSD depends on libcom_err.
-+LIBS="-lcom_err $LIBS" 
-+echo '#define HAVE_LIBCOM_ERR 1' >> confdefs.h
- 
-         echo $ac_n "checking for crypt""... $ac_c" 1>&6
- echo "configure:3354: checking for crypt" >&5
diff --git a/mail/cyrus-imapd22/files/patch-bh b/mail/cyrus-imapd22/files/patch-bh
deleted file mode 100644
index d9fcb4716f4d..000000000000
--- a/mail/cyrus-imapd22/files/patch-bh
+++ /dev/null
@@ -1,11 +0,0 @@
---- timsieved/Makefile.in.orig	Sun Apr  9 01:52:10 2000
-+++ timsieved/Makefile.in	Sun Apr  9 01:52:37 2000
-@@ -34,7 +34,7 @@
- CYRUS_GROUP=@cyrus_group@
- 
- DEFS = @DEFS@ @LOCALDEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
- 
diff --git a/mail/cyrus-imapd22/files/patch-bi b/mail/cyrus-imapd22/files/patch-bi
deleted file mode 100644
index 38f5bb4ad0e7..000000000000
--- a/mail/cyrus-imapd22/files/patch-bi
+++ /dev/null
@@ -1,11 +0,0 @@
---- installsieve/Makefile.in.orig	Sun Apr  9 01:58:03 2000
-+++ installsieve/Makefile.in	Sun Apr  9 01:58:35 2000
-@@ -28,7 +28,7 @@
- CC = @CC@
- 
- DEFS = @DEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
- 
diff --git a/mail/cyrus-imapd22/files/patch-bj b/mail/cyrus-imapd22/files/patch-bj
deleted file mode 100644
index adc8e7e3274d..000000000000
--- a/mail/cyrus-imapd22/files/patch-bj
+++ /dev/null
@@ -1,11 +0,0 @@
---- timsieved/config.c	Sun Apr  9 07:58:37 2000
-+++ config.c	Sun Apr  9 07:58:47 2000
-@@ -41,7 +41,7 @@
- 
- extern int errno;
- 
--#define CONFIG_FILENAME "/etc/imapd.conf"
-+#define CONFIG_FILENAME "/usr/local/etc/imapd.conf"
- 
- struct configlist {
-     char *key;
diff --git a/mail/cyrus-imapd22/pkg-comment b/mail/cyrus-imapd22/pkg-comment
deleted file mode 100644
index b26e555b2c72..000000000000
--- a/mail/cyrus-imapd22/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols
diff --git a/mail/cyrus-imapd22/pkg-descr b/mail/cyrus-imapd22/pkg-descr
deleted file mode 100644
index 1fbdb1cb67ff..000000000000
--- a/mail/cyrus-imapd22/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://andrew2.andrew.cmu.edu/cyrus/imapd/
diff --git a/mail/cyrus-imapd22/pkg-install b/mail/cyrus-imapd22/pkg-install
deleted file mode 100644
index 93e91ebc4dae..000000000000
--- a/mail/cyrus-imapd22/pkg-install
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-#set -vx
-
-#
-# create 'cyrus' user and group before installing
-#
-
-create() {
-	if [ ! -x /usr/sbin/pw ]; then
-		echo "*** Please add a user and a group named \`cyrus' before installing this package."
-		exit 69
-	fi
-
-	if ! pw show group cyrus -q >/dev/null; then
-		gid=60
-		while pw show group -g ${gid} -q >/dev/null; do
-			gid=`expr ${gid} + 1`
-		done
-		if ! pw add group cyrus -g ${gid}; then
-			e=$?
-			echo "*** Failed to add group \`cyrus'. Please add it manually."
-			exit ${e}
-		fi
-		echo "*** Added group \`cyrus' (id ${gid})"
-	else
-		gid=`pw show group cyrus 2>/dev/null | cut -d: -f3`
-	fi
-
-	if [ -x /sbin/nologin ]; then
-		shell=/sbin/nologin
-	else
-		shell=/nonexistent
-	fi
-	if ! pw show user cyrus -q >/dev/null; then
-		uid=60
-		while pw show user -u ${uid} -q >/dev/null; do
-			uid=`expr ${uid} + 1`
-		done
-		if ! pw add user cyrus -u ${uid} -g ${gid} -d "/nonexistent" \
-				-c "the cyrus mail server" -s "${shell}" -p "*" \
-				; then
-			e=$?
-			echo "*** Failed to add user \`cyrus'. Please add it manually."
-			exit ${e}
-		fi
-		echo "*** Added user \`cyrus' (id ${uid})"
-	else
-		if ! pw mod user cyrus -g ${gid} -d "/nonexistent" \
-				-c "the cyrus mail server" -s "${shell}" -p "*" \
-				; then
-			e=$?
-			echo "*** Failed to update user \`cyrus'."
-			exit ${e}
-		fi
-		echo "*** Updated user \`cyrus'."
-	fi
-	if ! pw group mod cyrus -m daemon; then
-		echo "*** can't add user \`daemon' to group \`cyrus'"
-	fi
-}
-
-
-checkfile() {
-	diff -bBqw $1 $1.dist >/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 $1.dist $1
-			;;
-	esac
-}
-
-
-case $2 in
-	PRE-INSTALL)
-		create
-		;;
-
-	POST-INSTALL)
-		cd ${PKG_PREFIX}
-		checkfile ${PKG_PREFIX}/etc/imapd.conf
-		if grep '^imap4' /etc/inetd.conf; then
-			echo "** Please check that your /etc/inetd.conf entry for \`imap4'"
-			echo "   is suitable for the Cyrus IMAP server."
-		else
-			echo "** Please add an entry for the imap4 protocol to /etc/inetd.conf."
-		fi
-		echo "   An example can be found in ${PKG_PREFIX}/etc/inetd.conf.cyrus."
-		;;
-esac
diff --git a/mail/cyrus-imapd22/pkg-plist b/mail/cyrus-imapd22/pkg-plist
deleted file mode 100644
index 0bd7bbeedb62..000000000000
--- a/mail/cyrus-imapd22/pkg-plist
+++ /dev/null
@@ -1,45 +0,0 @@
-bin/imtest
-bin/cyradm
-bin/installsieve
-cyrus/bin/collectnews
-cyrus/bin/syncnews
-cyrus/bin/imapd
-cyrus/bin/pop3d
-cyrus/bin/arbitron
-cyrus/bin/fud
-cyrus/bin/reconstruct
-cyrus/bin/dump_deliverdb
-cyrus/bin/mbpath
-cyrus/bin/deliver
-cyrus/bin/feedcyrus
-cyrus/bin/timsieved
-cyrus/bin/cyrquota
-etc/rc.d/cyrus.sh
-etc/imapd.conf.dist
-etc/inetd.conf.cyrus
-etc/imap/mailboxes
-etc/imapd.conf
-include/cyrus/acl.h
-include/cyrus/assert.h
-include/cyrus/auth.h
-include/cyrus/bsearch.h
-include/cyrus/charset.h
-include/cyrus/glob.h
-include/cyrus/gmtoff.h
-include/cyrus/imclient.h
-include/cyrus/imparse.h
-include/cyrus/lock.h
-include/cyrus/map.h
-include/cyrus/mkgmtime.h
-include/cyrus/nonblock.h
-include/cyrus/parseaddr.h
-include/cyrus/prot.h
-include/cyrus/retry.h
-include/cyrus/sysexits.h
-include/cyrus/util.h
-include/cyrus/xmalloc.h
-lib/libcyrus.a
-@dirrm cyrus/bin
-@dirrm cyrus
-@dirrm etc/imap
-@dirrm include/cyrus
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
deleted file mode 100644
index 6952c7485338..000000000000
--- a/mail/cyrus-imapd23/Makefile
+++ /dev/null
@@ -1,106 +0,0 @@
-# New ports collection makefile for:		cyrus
-# Date created:					May 4th 1997
-# Whom:						jfitz@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	cyrus
-PORTVERSION= 	1.6.22
-CATEGORIES=	mail tcl82
-MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-		${MASTER_SITE_LOCAL} \
-		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
-MASTER_SITE_SUBDIR=	stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
-DISTNAME=	${PORTNAME}-imapd-${PORTVERSION}
-
-MAINTAINER=	stb@FreeBSD.org
-
-Y2K=		http://andrew2.andrew.cmu.edu/cyrus/imapd/y2k.html
-
-LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
-		pwcheck:${PORTSDIR}/security/cyrus-sasl
-
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
-		--with-cyrus-group=cyrus \
-		--with-sasldir=/usr/local \
-		--with-tclsh=${PREFIX}/bin/tclsh8.2 \
-		--with-auth=unix \
-		--with-com-err
-
-MAN1=		cyradm.1
-MAN3=		imclient.3
-MAN5=		imapd.conf.5
-MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \
-		pop3d.8 reconstruct.8 rmnews.8 syncnews.8
-
-post-configure:
-		@ ${SETENV} ${MAKE_ENV} perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
-
-pre-install:
-		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
-		@${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
-
-DOCS=	README acl-extension anoncvs bugs changes copyrights install \
-	mailing-list overview quota-extension server-design
-HTDOCS=	anoncvs bugs changes index install mailing-list overview \
-	questions readme sieve-protocol sieve
-post-install:
-		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
-.if !defined(NOPORTDOCS)
-		${MKDIR} ${PREFIX}/share/doc/cyrus/html
-.for file in ${DOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/${file} \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO} share/doc/cyrus/${file} >>${TMPPLIST}
-.endfor
-.for file in ${HTDOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/html/${file}.html \
-			${PREFIX}/share/doc/cyrus/html
-		@${ECHO} share/doc/cyrus/html/${file}.html >>${TMPPLIST}
-.endfor
-		@${ECHO} "@dirrm share/doc/cyrus/html" >>${TMPPLIST}
-		@${ECHO} "@dirrm share/doc/cyrus" >>${TMPPLIST}
-.endif
-		${INSTALL_DATA} ${FILESDIR}/imapd.conf \
-			${PREFIX}/etc/imapd.conf.dist
-		${INSTALL_DATA} ${FILESDIR}/inetd.conf.cyrus \
-			${PREFIX}/etc/
-		${INSTALL} -d -m 750 -o cyrus -g cyrus \
-			/var/spool/imap \
-			${PREFIX}/etc/imap \
-			${PREFIX}/etc/imap/user \
-			${PREFIX}/etc/imap/quota \
-			${PREFIX}/etc/imap/proc \
-			${PREFIX}/etc/imap/log \
-			${PREFIX}/etc/imap/msg
-		${INSTALL} -d -m 700 -o cyrus -g cyrus /var/pwcheck
-		${TOUCH} ${PREFIX}/etc/imap/mailboxes
-		${CHMOD} 640 ${PREFIX}/etc/imap/mailboxes
-		chown cyrus:cyrus ${PREFIX}/etc/imap/mailboxes
-		@${ECHO} "@exec mkdir %D/etc/imap" >>${TMPPLIST}
-.for dir in user quota proc log msg
-		@${ECHO} "@exec mkdir %D/etc/imap/${dir}" >>${TMPPLIST}
-		@${ECHO} "@dirrm etc/imap/${dir}" >>${TMPPLIST}
-.endfor
-		@${ECHO} "@exec cp /dev/null %D/etc/imap/mailboxes" >>${TMPPLIST}
-		@${ECHO} "@exec chown -R cyrus:cyrus %D/etc/imap" >>${TMPPLIST}
-		@${ECHO} "@exec chmod -R g-w,o= %D/etc/imap" >>${TMPPLIST}
-		@${ECHO} "@mode u=rwx,go=" >>${TMPPLIST}
-		@${ECHO} "@exec mkdir /var/pwcheck" >>${TMPPLIST}
-		@${ECHO} "@exec chown cyrus:cyrus /var/pwcheck" >>${TMPPLIST}
-		@${ECHO} "@exec chmod go= /var/pwcheck" >>${TMPPLIST}
-		@${ECHO} "@exec mkdir /var/spool/imap" >>${TMPPLIST}
-		@${ECHO} "@exec chown cyrus:cyrus /var/spool/imap" >>${TMPPLIST}
-		@${ECHO} "@exec chmod g-w,o= /var/spool/imap" >>${TMPPLIST}
-		@${ECHO} "@cwd /var" >>${TMPPLIST}
-		@${ECHO} "@dirrm pwcheck" >>${TMPPLIST}
-		@${ECHO} "@dirrm spool/imap" >>${TMPPLIST}
-		@${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \
-			>${PREFIX}/etc/rc.d/cyrus.sh
-		@${CHMOD} 0755 ${PREFIX}/etc/rc.d/cyrus.sh
-		@PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo
deleted file mode 100644
index 6993ccc0d37d..000000000000
--- a/mail/cyrus-imapd23/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (cyrus-imapd-1.6.22.tar.gz) = 1a0b4d466c8662a60313a0bb51a65ea2
diff --git a/mail/cyrus-imapd23/files/cyrus.sh b/mail/cyrus-imapd23/files/cyrus.sh
deleted file mode 100644
index 9248623a8fe2..000000000000
--- a/mail/cyrus-imapd23/files/cyrus.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-PREFIX=%%PREFIX%%
-
-case "$1" in
-
-start)
-	if [ -x ${PREFIX}/cyrus/bin/pwcheck ]
-	then
-		${PREFIX}/cyrus/bin/pwcheck & && echo -n " pwcheck"
-	fi
-	;;
-
-stop)
-	if [ -r /var/run/pwcheck.pid ]
-	then
-		kill `cat /var/run/pwcheck.pid` && echo -n " pwcheck"
-	fi
-	;;
-
-*)
-	echo "usage: $0 {start|stop}" 1>&2
-	exit 64
-	;;
-
-esac
-
diff --git a/mail/cyrus-imapd23/files/imapd.conf b/mail/cyrus-imapd23/files/imapd.conf
deleted file mode 100644
index f9ff5924f0af..000000000000
--- a/mail/cyrus-imapd23/files/imapd.conf
+++ /dev/null
@@ -1,112 +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: /usr/local/etc/imap
-
-# The partition name used by default for new mailboxes
-#
-#defaultpartition: default
-
-# The directory for the different partitions
-#
-partition-default: /var/spool/imap
-
-# The umask value used by various Cyrus IMAP programs
-#
-#umask: 077
-
-# Whether to allow anonymous logins
-#
-#allowanonymouslogin: no
-
-# 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
-
-# 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 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>
-
-# The list of the host names of the mail domain's IMSP servers.  Separate each
-# host name with a space.  The Kerberos identities of these servers may login
-# as any user in order to perform commands by proxy.
-#
-#imspservers: <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 only used when the server is compiled with Kerberos
-# authentication.
-#
-#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
-
-#
-# EOF
diff --git a/mail/cyrus-imapd23/files/inetd.conf.cyrus b/mail/cyrus-imapd23/files/inetd.conf.cyrus
deleted file mode 100644
index f2878fac7aa6..000000000000
--- a/mail/cyrus-imapd23/files/inetd.conf.cyrus
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Example entry for inetd.conf for the Cyrus IMAP server.
-# $FreeBSD$
-#
-# Replace /usr/local with the path where you've installed the package.
-#
-# The IMAP-4 server.
-imap4	stream	tcp	nowait	cyrus	/usr/local/cyrus/bin/imapd	imapd
-#
-# To be able to access the IMAP mailbox by POP-3, use this line.
-pop3	stream	tcp	nowait	cyrus	/usr/local/cyrus/bin/pop3d	pop3d
-#
diff --git a/mail/cyrus-imapd23/files/patch-aa b/mail/cyrus-imapd23/files/patch-aa
deleted file mode 100644
index 34dc4a7d4d9b..000000000000
--- a/mail/cyrus-imapd23/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- man/Makefile.in.orig	Tue Sep  1 03:49:14 1998
-+++ man/Makefile.in	Mon May 10 02:27:39 1999
-@@ -52,7 +52,7 @@
- MAN3 = $(srcdir)/imclient.3
- MAN5 = $(srcdir)/imapd.conf.5 $(srcdir)/krb.equiv.5
- MAN8 = $(srcdir)/arbitron.8 $(srcdir)/collectnews.8 $(srcdir)/deliver.8 \
--	$(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
-+	$(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
- 	$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \
-	$(srcdir)/mbpath.8 $(srcdir)/timsieved.8
- 
- 
diff --git a/mail/cyrus-imapd23/files/patch-ab b/mail/cyrus-imapd23/files/patch-ab
deleted file mode 100644
index 1fc68c171063..000000000000
--- a/mail/cyrus-imapd23/files/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
---- man/quota.8.orig	Sun May  4 22:26:33 1997
-+++ man/quota.8	Sun May  4 22:27:24 1997
-@@ -11,9 +11,9 @@
- .\" use of the code for commercial purposes or benefits by anyone
- .\" without specific, additional permission by the owner of the code.
- .SH NAME
--quota \- report and optionally fix quota usage
-+cyrquota \- report and optionally fix quota usage
- .SH SYNOPSIS
--.B quota
-+.B cyrquota
- [
- .B \-f
- ]
-@@ -21,12 +21,12 @@
- .IR mailbox-prefix ...
- ]
- .SH DESCRIPTION
--.I Quota
-+.I Cyrquota
- generates a report listing quota roots, giving their limits and usage.
- If the
- .I \-f
- option is given, 
--.I quota
-+.I cyrquota
- first fixes any inconsistencies in the quota subsystem, such as
- mailboxes with the wrong quota root or quota roots with the wrong
- quota usage reported.
-@@ -37,7 +37,7 @@
- prefixes.
- .PP
- Running
--.I quota
-+.I cyrquota
- with both the 
- .I \-f
- option and
diff --git a/mail/cyrus-imapd23/files/patch-ac b/mail/cyrus-imapd23/files/patch-ac
deleted file mode 100644
index ab7854846479..000000000000
--- a/mail/cyrus-imapd23/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure	Thu Jan  6 22:28:51 2000
-+++ /tmp/configure.new	Sat Apr  8 20:55:29 2000
-@@ -4951,7 +4951,7 @@
-     # try the user-specified path --- too lazy to test for it right now
-     LIB_SASL="-L$sasldir/lib -lsasl"
-     
--    SASLFLAGS="-I$sasldir/include"
-+    SASLFLAGS="-I$sasldir/include/sasl"
-         
-   fi
- 
diff --git a/mail/cyrus-imapd23/files/patch-ad b/mail/cyrus-imapd23/files/patch-ad
deleted file mode 100644
index bcd310e991d3..000000000000
--- a/mail/cyrus-imapd23/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Sun Apr  9 01:13:23 2000
-+++ configure.in	Sun Apr  9 01:13:43 2000
-@@ -528,7 +528,7 @@
-       # filename, it should be safe to add it (to the front of the line --
-       # somef vendors have older, badly installed tclshs that we want to avoid
-       # if we can)
--      AC_PATH_PROGS(TCLSH, [tclsh8.1 tclsh8.0 tclsh], "unknown")
-+      AC_PATH_PROGS(TCLSH, [tclsh8.2 tclsh8.1 tclsh8.0 tclsh], "unknown")
-     fi
- 
-     # Do we know where to get a tclsh?
diff --git a/mail/cyrus-imapd23/files/patch-bb b/mail/cyrus-imapd23/files/patch-bb
deleted file mode 100644
index 11f8698c92eb..000000000000
--- a/mail/cyrus-imapd23/files/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
---- cyradm/Makefile.in.orig	Fri Aug  7 08:48:26 1998
-+++ cyradm/Makefile.in	Mon May 10 02:40:06 1999
-@@ -33,8 +33,8 @@
- RANLIB = @RANLIB@
- 
- DEFS = @DEFS@ @TCL_DEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@
--LIBS =  @TCL_LIBS@ @IMAP_LIBS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ @SASLFLAGS@
-+LIBS =  @TCL_LIBS@ -lm @IMAP_LIBS@
- DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ 
- 
- CFLAGS = @CFLAGS@
diff --git a/mail/cyrus-imapd23/files/patch-bc b/mail/cyrus-imapd23/files/patch-bc
deleted file mode 100644
index 5310441ee96c..000000000000
--- a/mail/cyrus-imapd23/files/patch-bc
+++ /dev/null
@@ -1,19 +0,0 @@
-*** imap/Makefile.in.orig	Fri Nov  5 01:00:34 1999
---- imap/Makefile.in	Thu Mar  9 18:59:14 2000
-***************
-*** 45,51 ****
-  CYRUS_USER=@cyrus_user@
-  CYRUS_GROUP=@cyrus_group@
-  
-! DEFS = @DEFS@ @LOCALDEFS@
-  CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-  IMAP_LIBS = @IMAP_LIBS@
-  SIEVE_LIBS = @SIEVE_LIBS@
---- 45,51 ----
-  CYRUS_USER=@cyrus_user@
-  CYRUS_GROUP=@cyrus_group@
-  
-! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
-  CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-  IMAP_LIBS = @IMAP_LIBS@
-  SIEVE_LIBS = @SIEVE_LIBS@
diff --git a/mail/cyrus-imapd23/files/patch-bd b/mail/cyrus-imapd23/files/patch-bd
deleted file mode 100644
index 83a7d53f4c40..000000000000
--- a/mail/cyrus-imapd23/files/patch-bd
+++ /dev/null
@@ -1,14 +0,0 @@
-*** imap/config.c.orig	Thu Mar  9 19:07:14 2000
---- imap/config.c	Thu Mar  9 19:06:48 2000
-***************
-*** 39,45 ****
---- 39,47 ----
-  
-  extern int errno;
-  
-+ #if !defined(CONFIG_FILENAME)
-  #define CONFIG_FILENAME "/etc/imapd.conf"
-+ #endif
-  
-  struct configlist {
-      char *key;
diff --git a/mail/cyrus-imapd23/files/patch-be b/mail/cyrus-imapd23/files/patch-be
deleted file mode 100644
index 707298b92662..000000000000
--- a/mail/cyrus-imapd23/files/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
---- imap/krbck.c.orig	Sat Dec 21 02:08:21 1996
-+++ imap/krbck.c	Wed Oct  8 13:56:58 1997
-@@ -29,7 +29,9 @@
- 
- #define EXIT_CHOKE (int) 10
- 
--#define CONFIG_FILENAME "/etc/imapd.conf"
-+#if !defined(CONFIG_FILENAME)
-+	#define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
- #define MAX_FILENAME_LEN 255
- 
- int errno;
diff --git a/mail/cyrus-imapd23/files/patch-bf b/mail/cyrus-imapd23/files/patch-bf
deleted file mode 100644
index 0252ec589130..000000000000
--- a/mail/cyrus-imapd23/files/patch-bf
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Fri Dec  4 11:34:53 1998
-+++ configure.in	Sun Apr  9 12:16:24 2000
-@@ -698,6 +698,8 @@
- 
-     dnl Kerberos wants this so we might as well check on it first
-     AC_CHECK_FUNC(res_search,,AC_CHECK_LIB(resolv,res_search))
-+    dnl Kerberos IV on FreeBSD depends on libcom_err, so check for it
-+    AC_CHECK_LIB(com_err, init_error_table)
- 
-     dnl gotta do this: crypt is used by sasl_krb_server.c
-     AC_CHECK_FUNC(crypt,,AC_CHECK_LIB(crypt, crypt))
diff --git a/mail/cyrus-imapd23/files/patch-bg b/mail/cyrus-imapd23/files/patch-bg
deleted file mode 100644
index 964814930475..000000000000
--- a/mail/cyrus-imapd23/files/patch-bg
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	Fri Dec  4 12:03:58 1998
-+++ configure	Sat Apr 15 11:44:42 2000
-@@ -3348,6 +3348,9 @@
- 
- fi
- 
-+# Kerberos IV on FreeBSD depends on libcom_err.
-+LIBS="-lcom_err $LIBS" 
-+echo '#define HAVE_LIBCOM_ERR 1' >> confdefs.h
- 
-         echo $ac_n "checking for crypt""... $ac_c" 1>&6
- echo "configure:3354: checking for crypt" >&5
diff --git a/mail/cyrus-imapd23/files/patch-bh b/mail/cyrus-imapd23/files/patch-bh
deleted file mode 100644
index d9fcb4716f4d..000000000000
--- a/mail/cyrus-imapd23/files/patch-bh
+++ /dev/null
@@ -1,11 +0,0 @@
---- timsieved/Makefile.in.orig	Sun Apr  9 01:52:10 2000
-+++ timsieved/Makefile.in	Sun Apr  9 01:52:37 2000
-@@ -34,7 +34,7 @@
- CYRUS_GROUP=@cyrus_group@
- 
- DEFS = @DEFS@ @LOCALDEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
- 
diff --git a/mail/cyrus-imapd23/files/patch-bi b/mail/cyrus-imapd23/files/patch-bi
deleted file mode 100644
index 38f5bb4ad0e7..000000000000
--- a/mail/cyrus-imapd23/files/patch-bi
+++ /dev/null
@@ -1,11 +0,0 @@
---- installsieve/Makefile.in.orig	Sun Apr  9 01:58:03 2000
-+++ installsieve/Makefile.in	Sun Apr  9 01:58:35 2000
-@@ -28,7 +28,7 @@
- CC = @CC@
- 
- DEFS = @DEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
- 
diff --git a/mail/cyrus-imapd23/files/patch-bj b/mail/cyrus-imapd23/files/patch-bj
deleted file mode 100644
index adc8e7e3274d..000000000000
--- a/mail/cyrus-imapd23/files/patch-bj
+++ /dev/null
@@ -1,11 +0,0 @@
---- timsieved/config.c	Sun Apr  9 07:58:37 2000
-+++ config.c	Sun Apr  9 07:58:47 2000
-@@ -41,7 +41,7 @@
- 
- extern int errno;
- 
--#define CONFIG_FILENAME "/etc/imapd.conf"
-+#define CONFIG_FILENAME "/usr/local/etc/imapd.conf"
- 
- struct configlist {
-     char *key;
diff --git a/mail/cyrus-imapd23/pkg-comment b/mail/cyrus-imapd23/pkg-comment
deleted file mode 100644
index b26e555b2c72..000000000000
--- a/mail/cyrus-imapd23/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols
diff --git a/mail/cyrus-imapd23/pkg-descr b/mail/cyrus-imapd23/pkg-descr
deleted file mode 100644
index 1fbdb1cb67ff..000000000000
--- a/mail/cyrus-imapd23/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://andrew2.andrew.cmu.edu/cyrus/imapd/
diff --git a/mail/cyrus-imapd23/pkg-install b/mail/cyrus-imapd23/pkg-install
deleted file mode 100644
index 93e91ebc4dae..000000000000
--- a/mail/cyrus-imapd23/pkg-install
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-#set -vx
-
-#
-# create 'cyrus' user and group before installing
-#
-
-create() {
-	if [ ! -x /usr/sbin/pw ]; then
-		echo "*** Please add a user and a group named \`cyrus' before installing this package."
-		exit 69
-	fi
-
-	if ! pw show group cyrus -q >/dev/null; then
-		gid=60
-		while pw show group -g ${gid} -q >/dev/null; do
-			gid=`expr ${gid} + 1`
-		done
-		if ! pw add group cyrus -g ${gid}; then
-			e=$?
-			echo "*** Failed to add group \`cyrus'. Please add it manually."
-			exit ${e}
-		fi
-		echo "*** Added group \`cyrus' (id ${gid})"
-	else
-		gid=`pw show group cyrus 2>/dev/null | cut -d: -f3`
-	fi
-
-	if [ -x /sbin/nologin ]; then
-		shell=/sbin/nologin
-	else
-		shell=/nonexistent
-	fi
-	if ! pw show user cyrus -q >/dev/null; then
-		uid=60
-		while pw show user -u ${uid} -q >/dev/null; do
-			uid=`expr ${uid} + 1`
-		done
-		if ! pw add user cyrus -u ${uid} -g ${gid} -d "/nonexistent" \
-				-c "the cyrus mail server" -s "${shell}" -p "*" \
-				; then
-			e=$?
-			echo "*** Failed to add user \`cyrus'. Please add it manually."
-			exit ${e}
-		fi
-		echo "*** Added user \`cyrus' (id ${uid})"
-	else
-		if ! pw mod user cyrus -g ${gid} -d "/nonexistent" \
-				-c "the cyrus mail server" -s "${shell}" -p "*" \
-				; then
-			e=$?
-			echo "*** Failed to update user \`cyrus'."
-			exit ${e}
-		fi
-		echo "*** Updated user \`cyrus'."
-	fi
-	if ! pw group mod cyrus -m daemon; then
-		echo "*** can't add user \`daemon' to group \`cyrus'"
-	fi
-}
-
-
-checkfile() {
-	diff -bBqw $1 $1.dist >/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 $1.dist $1
-			;;
-	esac
-}
-
-
-case $2 in
-	PRE-INSTALL)
-		create
-		;;
-
-	POST-INSTALL)
-		cd ${PKG_PREFIX}
-		checkfile ${PKG_PREFIX}/etc/imapd.conf
-		if grep '^imap4' /etc/inetd.conf; then
-			echo "** Please check that your /etc/inetd.conf entry for \`imap4'"
-			echo "   is suitable for the Cyrus IMAP server."
-		else
-			echo "** Please add an entry for the imap4 protocol to /etc/inetd.conf."
-		fi
-		echo "   An example can be found in ${PKG_PREFIX}/etc/inetd.conf.cyrus."
-		;;
-esac
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
deleted file mode 100644
index 0bd7bbeedb62..000000000000
--- a/mail/cyrus-imapd23/pkg-plist
+++ /dev/null
@@ -1,45 +0,0 @@
-bin/imtest
-bin/cyradm
-bin/installsieve
-cyrus/bin/collectnews
-cyrus/bin/syncnews
-cyrus/bin/imapd
-cyrus/bin/pop3d
-cyrus/bin/arbitron
-cyrus/bin/fud
-cyrus/bin/reconstruct
-cyrus/bin/dump_deliverdb
-cyrus/bin/mbpath
-cyrus/bin/deliver
-cyrus/bin/feedcyrus
-cyrus/bin/timsieved
-cyrus/bin/cyrquota
-etc/rc.d/cyrus.sh
-etc/imapd.conf.dist
-etc/inetd.conf.cyrus
-etc/imap/mailboxes
-etc/imapd.conf
-include/cyrus/acl.h
-include/cyrus/assert.h
-include/cyrus/auth.h
-include/cyrus/bsearch.h
-include/cyrus/charset.h
-include/cyrus/glob.h
-include/cyrus/gmtoff.h
-include/cyrus/imclient.h
-include/cyrus/imparse.h
-include/cyrus/lock.h
-include/cyrus/map.h
-include/cyrus/mkgmtime.h
-include/cyrus/nonblock.h
-include/cyrus/parseaddr.h
-include/cyrus/prot.h
-include/cyrus/retry.h
-include/cyrus/sysexits.h
-include/cyrus/util.h
-include/cyrus/xmalloc.h
-lib/libcyrus.a
-@dirrm cyrus/bin
-@dirrm cyrus
-@dirrm etc/imap
-@dirrm include/cyrus
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
deleted file mode 100644
index 6952c7485338..000000000000
--- a/mail/cyrus-imapd24/Makefile
+++ /dev/null
@@ -1,106 +0,0 @@
-# New ports collection makefile for:		cyrus
-# Date created:					May 4th 1997
-# Whom:						jfitz@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	cyrus
-PORTVERSION= 	1.6.22
-CATEGORIES=	mail tcl82
-MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-		${MASTER_SITE_LOCAL} \
-		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
-MASTER_SITE_SUBDIR=	stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail
-DISTNAME=	${PORTNAME}-imapd-${PORTVERSION}
-
-MAINTAINER=	stb@FreeBSD.org
-
-Y2K=		http://andrew2.andrew.cmu.edu/cyrus/imapd/y2k.html
-
-LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
-		pwcheck:${PORTSDIR}/security/cyrus-sasl
-
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
-		--with-cyrus-group=cyrus \
-		--with-sasldir=/usr/local \
-		--with-tclsh=${PREFIX}/bin/tclsh8.2 \
-		--with-auth=unix \
-		--with-com-err
-
-MAN1=		cyradm.1
-MAN3=		imclient.3
-MAN5=		imapd.conf.5
-MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \
-		pop3d.8 reconstruct.8 rmnews.8 syncnews.8
-
-post-configure:
-		@ ${SETENV} ${MAKE_ENV} perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
-
-pre-install:
-		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
-		@${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
-
-DOCS=	README acl-extension anoncvs bugs changes copyrights install \
-	mailing-list overview quota-extension server-design
-HTDOCS=	anoncvs bugs changes index install mailing-list overview \
-	questions readme sieve-protocol sieve
-post-install:
-		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
-.if !defined(NOPORTDOCS)
-		${MKDIR} ${PREFIX}/share/doc/cyrus/html
-.for file in ${DOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/${file} \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO} share/doc/cyrus/${file} >>${TMPPLIST}
-.endfor
-.for file in ${HTDOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/html/${file}.html \
-			${PREFIX}/share/doc/cyrus/html
-		@${ECHO} share/doc/cyrus/html/${file}.html >>${TMPPLIST}
-.endfor
-		@${ECHO} "@dirrm share/doc/cyrus/html" >>${TMPPLIST}
-		@${ECHO} "@dirrm share/doc/cyrus" >>${TMPPLIST}
-.endif
-		${INSTALL_DATA} ${FILESDIR}/imapd.conf \
-			${PREFIX}/etc/imapd.conf.dist
-		${INSTALL_DATA} ${FILESDIR}/inetd.conf.cyrus \
-			${PREFIX}/etc/
-		${INSTALL} -d -m 750 -o cyrus -g cyrus \
-			/var/spool/imap \
-			${PREFIX}/etc/imap \
-			${PREFIX}/etc/imap/user \
-			${PREFIX}/etc/imap/quota \
-			${PREFIX}/etc/imap/proc \
-			${PREFIX}/etc/imap/log \
-			${PREFIX}/etc/imap/msg
-		${INSTALL} -d -m 700 -o cyrus -g cyrus /var/pwcheck
-		${TOUCH} ${PREFIX}/etc/imap/mailboxes
-		${CHMOD} 640 ${PREFIX}/etc/imap/mailboxes
-		chown cyrus:cyrus ${PREFIX}/etc/imap/mailboxes
-		@${ECHO} "@exec mkdir %D/etc/imap" >>${TMPPLIST}
-.for dir in user quota proc log msg
-		@${ECHO} "@exec mkdir %D/etc/imap/${dir}" >>${TMPPLIST}
-		@${ECHO} "@dirrm etc/imap/${dir}" >>${TMPPLIST}
-.endfor
-		@${ECHO} "@exec cp /dev/null %D/etc/imap/mailboxes" >>${TMPPLIST}
-		@${ECHO} "@exec chown -R cyrus:cyrus %D/etc/imap" >>${TMPPLIST}
-		@${ECHO} "@exec chmod -R g-w,o= %D/etc/imap" >>${TMPPLIST}
-		@${ECHO} "@mode u=rwx,go=" >>${TMPPLIST}
-		@${ECHO} "@exec mkdir /var/pwcheck" >>${TMPPLIST}
-		@${ECHO} "@exec chown cyrus:cyrus /var/pwcheck" >>${TMPPLIST}
-		@${ECHO} "@exec chmod go= /var/pwcheck" >>${TMPPLIST}
-		@${ECHO} "@exec mkdir /var/spool/imap" >>${TMPPLIST}
-		@${ECHO} "@exec chown cyrus:cyrus /var/spool/imap" >>${TMPPLIST}
-		@${ECHO} "@exec chmod g-w,o= /var/spool/imap" >>${TMPPLIST}
-		@${ECHO} "@cwd /var" >>${TMPPLIST}
-		@${ECHO} "@dirrm pwcheck" >>${TMPPLIST}
-		@${ECHO} "@dirrm spool/imap" >>${TMPPLIST}
-		@${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \
-			>${PREFIX}/etc/rc.d/cyrus.sh
-		@${CHMOD} 0755 ${PREFIX}/etc/rc.d/cyrus.sh
-		@PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
deleted file mode 100644
index 6993ccc0d37d..000000000000
--- a/mail/cyrus-imapd24/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (cyrus-imapd-1.6.22.tar.gz) = 1a0b4d466c8662a60313a0bb51a65ea2
diff --git a/mail/cyrus-imapd24/files/cyrus.sh b/mail/cyrus-imapd24/files/cyrus.sh
deleted file mode 100644
index 9248623a8fe2..000000000000
--- a/mail/cyrus-imapd24/files/cyrus.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-PREFIX=%%PREFIX%%
-
-case "$1" in
-
-start)
-	if [ -x ${PREFIX}/cyrus/bin/pwcheck ]
-	then
-		${PREFIX}/cyrus/bin/pwcheck & && echo -n " pwcheck"
-	fi
-	;;
-
-stop)
-	if [ -r /var/run/pwcheck.pid ]
-	then
-		kill `cat /var/run/pwcheck.pid` && echo -n " pwcheck"
-	fi
-	;;
-
-*)
-	echo "usage: $0 {start|stop}" 1>&2
-	exit 64
-	;;
-
-esac
-
diff --git a/mail/cyrus-imapd24/files/imapd.conf b/mail/cyrus-imapd24/files/imapd.conf
deleted file mode 100644
index f9ff5924f0af..000000000000
--- a/mail/cyrus-imapd24/files/imapd.conf
+++ /dev/null
@@ -1,112 +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: /usr/local/etc/imap
-
-# The partition name used by default for new mailboxes
-#
-#defaultpartition: default
-
-# The directory for the different partitions
-#
-partition-default: /var/spool/imap
-
-# The umask value used by various Cyrus IMAP programs
-#
-#umask: 077
-
-# Whether to allow anonymous logins
-#
-#allowanonymouslogin: no
-
-# 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
-
-# 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 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>
-
-# The list of the host names of the mail domain's IMSP servers.  Separate each
-# host name with a space.  The Kerberos identities of these servers may login
-# as any user in order to perform commands by proxy.
-#
-#imspservers: <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 only used when the server is compiled with Kerberos
-# authentication.
-#
-#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
-
-#
-# EOF
diff --git a/mail/cyrus-imapd24/files/inetd.conf.cyrus b/mail/cyrus-imapd24/files/inetd.conf.cyrus
deleted file mode 100644
index f2878fac7aa6..000000000000
--- a/mail/cyrus-imapd24/files/inetd.conf.cyrus
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Example entry for inetd.conf for the Cyrus IMAP server.
-# $FreeBSD$
-#
-# Replace /usr/local with the path where you've installed the package.
-#
-# The IMAP-4 server.
-imap4	stream	tcp	nowait	cyrus	/usr/local/cyrus/bin/imapd	imapd
-#
-# To be able to access the IMAP mailbox by POP-3, use this line.
-pop3	stream	tcp	nowait	cyrus	/usr/local/cyrus/bin/pop3d	pop3d
-#
diff --git a/mail/cyrus-imapd24/files/patch-aa b/mail/cyrus-imapd24/files/patch-aa
deleted file mode 100644
index 34dc4a7d4d9b..000000000000
--- a/mail/cyrus-imapd24/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- man/Makefile.in.orig	Tue Sep  1 03:49:14 1998
-+++ man/Makefile.in	Mon May 10 02:27:39 1999
-@@ -52,7 +52,7 @@
- MAN3 = $(srcdir)/imclient.3
- MAN5 = $(srcdir)/imapd.conf.5 $(srcdir)/krb.equiv.5
- MAN8 = $(srcdir)/arbitron.8 $(srcdir)/collectnews.8 $(srcdir)/deliver.8 \
--	$(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
-+	$(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
- 	$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \
-	$(srcdir)/mbpath.8 $(srcdir)/timsieved.8
- 
- 
diff --git a/mail/cyrus-imapd24/files/patch-ab b/mail/cyrus-imapd24/files/patch-ab
deleted file mode 100644
index 1fc68c171063..000000000000
--- a/mail/cyrus-imapd24/files/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
---- man/quota.8.orig	Sun May  4 22:26:33 1997
-+++ man/quota.8	Sun May  4 22:27:24 1997
-@@ -11,9 +11,9 @@
- .\" use of the code for commercial purposes or benefits by anyone
- .\" without specific, additional permission by the owner of the code.
- .SH NAME
--quota \- report and optionally fix quota usage
-+cyrquota \- report and optionally fix quota usage
- .SH SYNOPSIS
--.B quota
-+.B cyrquota
- [
- .B \-f
- ]
-@@ -21,12 +21,12 @@
- .IR mailbox-prefix ...
- ]
- .SH DESCRIPTION
--.I Quota
-+.I Cyrquota
- generates a report listing quota roots, giving their limits and usage.
- If the
- .I \-f
- option is given, 
--.I quota
-+.I cyrquota
- first fixes any inconsistencies in the quota subsystem, such as
- mailboxes with the wrong quota root or quota roots with the wrong
- quota usage reported.
-@@ -37,7 +37,7 @@
- prefixes.
- .PP
- Running
--.I quota
-+.I cyrquota
- with both the 
- .I \-f
- option and
diff --git a/mail/cyrus-imapd24/files/patch-ac b/mail/cyrus-imapd24/files/patch-ac
deleted file mode 100644
index ab7854846479..000000000000
--- a/mail/cyrus-imapd24/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure	Thu Jan  6 22:28:51 2000
-+++ /tmp/configure.new	Sat Apr  8 20:55:29 2000
-@@ -4951,7 +4951,7 @@
-     # try the user-specified path --- too lazy to test for it right now
-     LIB_SASL="-L$sasldir/lib -lsasl"
-     
--    SASLFLAGS="-I$sasldir/include"
-+    SASLFLAGS="-I$sasldir/include/sasl"
-         
-   fi
- 
diff --git a/mail/cyrus-imapd24/files/patch-ad b/mail/cyrus-imapd24/files/patch-ad
deleted file mode 100644
index bcd310e991d3..000000000000
--- a/mail/cyrus-imapd24/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Sun Apr  9 01:13:23 2000
-+++ configure.in	Sun Apr  9 01:13:43 2000
-@@ -528,7 +528,7 @@
-       # filename, it should be safe to add it (to the front of the line --
-       # somef vendors have older, badly installed tclshs that we want to avoid
-       # if we can)
--      AC_PATH_PROGS(TCLSH, [tclsh8.1 tclsh8.0 tclsh], "unknown")
-+      AC_PATH_PROGS(TCLSH, [tclsh8.2 tclsh8.1 tclsh8.0 tclsh], "unknown")
-     fi
- 
-     # Do we know where to get a tclsh?
diff --git a/mail/cyrus-imapd24/files/patch-bb b/mail/cyrus-imapd24/files/patch-bb
deleted file mode 100644
index 11f8698c92eb..000000000000
--- a/mail/cyrus-imapd24/files/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
---- cyradm/Makefile.in.orig	Fri Aug  7 08:48:26 1998
-+++ cyradm/Makefile.in	Mon May 10 02:40:06 1999
-@@ -33,8 +33,8 @@
- RANLIB = @RANLIB@
- 
- DEFS = @DEFS@ @TCL_DEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@
--LIBS =  @TCL_LIBS@ @IMAP_LIBS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../et @CPPFLAGS@ @TCL_CPPFLAGS@ @SASLFLAGS@
-+LIBS =  @TCL_LIBS@ -lm @IMAP_LIBS@
- DEPLIBS = ../lib/libcyrus.a @DEPLIBS@ 
- 
- CFLAGS = @CFLAGS@
diff --git a/mail/cyrus-imapd24/files/patch-bc b/mail/cyrus-imapd24/files/patch-bc
deleted file mode 100644
index 5310441ee96c..000000000000
--- a/mail/cyrus-imapd24/files/patch-bc
+++ /dev/null
@@ -1,19 +0,0 @@
-*** imap/Makefile.in.orig	Fri Nov  5 01:00:34 1999
---- imap/Makefile.in	Thu Mar  9 18:59:14 2000
-***************
-*** 45,51 ****
-  CYRUS_USER=@cyrus_user@
-  CYRUS_GROUP=@cyrus_group@
-  
-! DEFS = @DEFS@ @LOCALDEFS@
-  CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-  IMAP_LIBS = @IMAP_LIBS@
-  SIEVE_LIBS = @SIEVE_LIBS@
---- 45,51 ----
-  CYRUS_USER=@cyrus_user@
-  CYRUS_GROUP=@cyrus_group@
-  
-! DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
-  CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
-  IMAP_LIBS = @IMAP_LIBS@
-  SIEVE_LIBS = @SIEVE_LIBS@
diff --git a/mail/cyrus-imapd24/files/patch-bd b/mail/cyrus-imapd24/files/patch-bd
deleted file mode 100644
index 83a7d53f4c40..000000000000
--- a/mail/cyrus-imapd24/files/patch-bd
+++ /dev/null
@@ -1,14 +0,0 @@
-*** imap/config.c.orig	Thu Mar  9 19:07:14 2000
---- imap/config.c	Thu Mar  9 19:06:48 2000
-***************
-*** 39,45 ****
---- 39,47 ----
-  
-  extern int errno;
-  
-+ #if !defined(CONFIG_FILENAME)
-  #define CONFIG_FILENAME "/etc/imapd.conf"
-+ #endif
-  
-  struct configlist {
-      char *key;
diff --git a/mail/cyrus-imapd24/files/patch-be b/mail/cyrus-imapd24/files/patch-be
deleted file mode 100644
index 707298b92662..000000000000
--- a/mail/cyrus-imapd24/files/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
---- imap/krbck.c.orig	Sat Dec 21 02:08:21 1996
-+++ imap/krbck.c	Wed Oct  8 13:56:58 1997
-@@ -29,7 +29,9 @@
- 
- #define EXIT_CHOKE (int) 10
- 
--#define CONFIG_FILENAME "/etc/imapd.conf"
-+#if !defined(CONFIG_FILENAME)
-+	#define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
- #define MAX_FILENAME_LEN 255
- 
- int errno;
diff --git a/mail/cyrus-imapd24/files/patch-bf b/mail/cyrus-imapd24/files/patch-bf
deleted file mode 100644
index 0252ec589130..000000000000
--- a/mail/cyrus-imapd24/files/patch-bf
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Fri Dec  4 11:34:53 1998
-+++ configure.in	Sun Apr  9 12:16:24 2000
-@@ -698,6 +698,8 @@
- 
-     dnl Kerberos wants this so we might as well check on it first
-     AC_CHECK_FUNC(res_search,,AC_CHECK_LIB(resolv,res_search))
-+    dnl Kerberos IV on FreeBSD depends on libcom_err, so check for it
-+    AC_CHECK_LIB(com_err, init_error_table)
- 
-     dnl gotta do this: crypt is used by sasl_krb_server.c
-     AC_CHECK_FUNC(crypt,,AC_CHECK_LIB(crypt, crypt))
diff --git a/mail/cyrus-imapd24/files/patch-bg b/mail/cyrus-imapd24/files/patch-bg
deleted file mode 100644
index 964814930475..000000000000
--- a/mail/cyrus-imapd24/files/patch-bg
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.orig	Fri Dec  4 12:03:58 1998
-+++ configure	Sat Apr 15 11:44:42 2000
-@@ -3348,6 +3348,9 @@
- 
- fi
- 
-+# Kerberos IV on FreeBSD depends on libcom_err.
-+LIBS="-lcom_err $LIBS" 
-+echo '#define HAVE_LIBCOM_ERR 1' >> confdefs.h
- 
-         echo $ac_n "checking for crypt""... $ac_c" 1>&6
- echo "configure:3354: checking for crypt" >&5
diff --git a/mail/cyrus-imapd24/files/patch-bh b/mail/cyrus-imapd24/files/patch-bh
deleted file mode 100644
index d9fcb4716f4d..000000000000
--- a/mail/cyrus-imapd24/files/patch-bh
+++ /dev/null
@@ -1,11 +0,0 @@
---- timsieved/Makefile.in.orig	Sun Apr  9 01:52:10 2000
-+++ timsieved/Makefile.in	Sun Apr  9 01:52:37 2000
-@@ -34,7 +34,7 @@
- CYRUS_GROUP=@cyrus_group@
- 
- DEFS = @DEFS@ @LOCALDEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
- 
diff --git a/mail/cyrus-imapd24/files/patch-bi b/mail/cyrus-imapd24/files/patch-bi
deleted file mode 100644
index 38f5bb4ad0e7..000000000000
--- a/mail/cyrus-imapd24/files/patch-bi
+++ /dev/null
@@ -1,11 +0,0 @@
---- installsieve/Makefile.in.orig	Sun Apr  9 01:58:03 2000
-+++ installsieve/Makefile.in	Sun Apr  9 01:58:35 2000
-@@ -28,7 +28,7 @@
- CC = @CC@
- 
- DEFS = @DEFS@
--CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@
-+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
- 
diff --git a/mail/cyrus-imapd24/files/patch-bj b/mail/cyrus-imapd24/files/patch-bj
deleted file mode 100644
index adc8e7e3274d..000000000000
--- a/mail/cyrus-imapd24/files/patch-bj
+++ /dev/null
@@ -1,11 +0,0 @@
---- timsieved/config.c	Sun Apr  9 07:58:37 2000
-+++ config.c	Sun Apr  9 07:58:47 2000
-@@ -41,7 +41,7 @@
- 
- extern int errno;
- 
--#define CONFIG_FILENAME "/etc/imapd.conf"
-+#define CONFIG_FILENAME "/usr/local/etc/imapd.conf"
- 
- struct configlist {
-     char *key;
diff --git a/mail/cyrus-imapd24/pkg-comment b/mail/cyrus-imapd24/pkg-comment
deleted file mode 100644
index b26e555b2c72..000000000000
--- a/mail/cyrus-imapd24/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The cyrus mail server, supporting POP3, KPOP, and IMAP4 protocols
diff --git a/mail/cyrus-imapd24/pkg-descr b/mail/cyrus-imapd24/pkg-descr
deleted file mode 100644
index 1fbdb1cb67ff..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://andrew2.andrew.cmu.edu/cyrus/imapd/
diff --git a/mail/cyrus-imapd24/pkg-install b/mail/cyrus-imapd24/pkg-install
deleted file mode 100644
index 93e91ebc4dae..000000000000
--- a/mail/cyrus-imapd24/pkg-install
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-#set -vx
-
-#
-# create 'cyrus' user and group before installing
-#
-
-create() {
-	if [ ! -x /usr/sbin/pw ]; then
-		echo "*** Please add a user and a group named \`cyrus' before installing this package."
-		exit 69
-	fi
-
-	if ! pw show group cyrus -q >/dev/null; then
-		gid=60
-		while pw show group -g ${gid} -q >/dev/null; do
-			gid=`expr ${gid} + 1`
-		done
-		if ! pw add group cyrus -g ${gid}; then
-			e=$?
-			echo "*** Failed to add group \`cyrus'. Please add it manually."
-			exit ${e}
-		fi
-		echo "*** Added group \`cyrus' (id ${gid})"
-	else
-		gid=`pw show group cyrus 2>/dev/null | cut -d: -f3`
-	fi
-
-	if [ -x /sbin/nologin ]; then
-		shell=/sbin/nologin
-	else
-		shell=/nonexistent
-	fi
-	if ! pw show user cyrus -q >/dev/null; then
-		uid=60
-		while pw show user -u ${uid} -q >/dev/null; do
-			uid=`expr ${uid} + 1`
-		done
-		if ! pw add user cyrus -u ${uid} -g ${gid} -d "/nonexistent" \
-				-c "the cyrus mail server" -s "${shell}" -p "*" \
-				; then
-			e=$?
-			echo "*** Failed to add user \`cyrus'. Please add it manually."
-			exit ${e}
-		fi
-		echo "*** Added user \`cyrus' (id ${uid})"
-	else
-		if ! pw mod user cyrus -g ${gid} -d "/nonexistent" \
-				-c "the cyrus mail server" -s "${shell}" -p "*" \
-				; then
-			e=$?
-			echo "*** Failed to update user \`cyrus'."
-			exit ${e}
-		fi
-		echo "*** Updated user \`cyrus'."
-	fi
-	if ! pw group mod cyrus -m daemon; then
-		echo "*** can't add user \`daemon' to group \`cyrus'"
-	fi
-}
-
-
-checkfile() {
-	diff -bBqw $1 $1.dist >/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 $1.dist $1
-			;;
-	esac
-}
-
-
-case $2 in
-	PRE-INSTALL)
-		create
-		;;
-
-	POST-INSTALL)
-		cd ${PKG_PREFIX}
-		checkfile ${PKG_PREFIX}/etc/imapd.conf
-		if grep '^imap4' /etc/inetd.conf; then
-			echo "** Please check that your /etc/inetd.conf entry for \`imap4'"
-			echo "   is suitable for the Cyrus IMAP server."
-		else
-			echo "** Please add an entry for the imap4 protocol to /etc/inetd.conf."
-		fi
-		echo "   An example can be found in ${PKG_PREFIX}/etc/inetd.conf.cyrus."
-		;;
-esac
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
deleted file mode 100644
index 0bd7bbeedb62..000000000000
--- a/mail/cyrus-imapd24/pkg-plist
+++ /dev/null
@@ -1,45 +0,0 @@
-bin/imtest
-bin/cyradm
-bin/installsieve
-cyrus/bin/collectnews
-cyrus/bin/syncnews
-cyrus/bin/imapd
-cyrus/bin/pop3d
-cyrus/bin/arbitron
-cyrus/bin/fud
-cyrus/bin/reconstruct
-cyrus/bin/dump_deliverdb
-cyrus/bin/mbpath
-cyrus/bin/deliver
-cyrus/bin/feedcyrus
-cyrus/bin/timsieved
-cyrus/bin/cyrquota
-etc/rc.d/cyrus.sh
-etc/imapd.conf.dist
-etc/inetd.conf.cyrus
-etc/imap/mailboxes
-etc/imapd.conf
-include/cyrus/acl.h
-include/cyrus/assert.h
-include/cyrus/auth.h
-include/cyrus/bsearch.h
-include/cyrus/charset.h
-include/cyrus/glob.h
-include/cyrus/gmtoff.h
-include/cyrus/imclient.h
-include/cyrus/imparse.h
-include/cyrus/lock.h
-include/cyrus/map.h
-include/cyrus/mkgmtime.h
-include/cyrus/nonblock.h
-include/cyrus/parseaddr.h
-include/cyrus/prot.h
-include/cyrus/retry.h
-include/cyrus/sysexits.h
-include/cyrus/util.h
-include/cyrus/xmalloc.h
-lib/libcyrus.a
-@dirrm cyrus/bin
-@dirrm cyrus
-@dirrm etc/imap
-@dirrm include/cyrus
diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
deleted file mode 100644
index f2749823c1db..000000000000
--- a/mail/evolution-devel/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# New ports collection makefile for:	evolution
-# Date created:				28th June 2000
-# Whom:					Ade Lovett <ade@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	evolution
-PORTVERSION=	0.2
-CATEGORIES=	mail gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/evolution
-
-MAINTAINER=	ade@FreeBSD.org
-
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		xml.5:${PORTSDIR}/textproc/libxml \
-		glade.4:${PORTSDIR}/devel/libglade \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
-		gnomeprint.9:${PORTSDIR}/print/gnomeprint \
-		oaf.0:${PORTSDIR}/devel/oaf \
-		bonobo.2:${PORTSDIR}/devel/bonobo \
-		gnomevfs.0:${PORTSDIR}/devel/gnomevfs \
-		unicode.0:${PORTSDIR}/devel/libunicode \
-		gtkhtml.3:${PORTSDIR}/www/gtkhtml \
-		ldap.1:${PORTSDIR}/net/openldap \
-		capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
-		gpilotd.0:${PORTSDIR}/palm/gnomepilot
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
-LIBTOOLFILES=	configure libical/configure
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-pisock=${LOCALBASE}/pilot
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib"
-
-PLIST_SUB=	VERSION=${PORTVERSION}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/mail/evolution-devel/distinfo b/mail/evolution-devel/distinfo
deleted file mode 100644
index 712134bc17b8..000000000000
--- a/mail/evolution-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (evolution-0.2.tar.gz) = 65b5eaa61dd2afc920210c0c45acd253
diff --git a/mail/evolution-devel/files/patch-aa b/mail/evolution-devel/files/patch-aa
deleted file mode 100644
index 0b720b181274..000000000000
--- a/mail/evolution-devel/files/patch-aa
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.orig	Mon Jul 10 20:48:19 2000
-+++ configure	Tue Jul 11 19:15:28 2000
-@@ -4116,7 +4116,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
-@@ -5795,8 +5795,8 @@
-     { echo "configure: error: Did not find gdkpixbuf installed" 1>&2; exit 1; }
- fi
- 
--GLIB_CFLAGS="`glib-config --cflags`"
--GLIB_LIBS="`glib-config --libs`"
-+GLIB_CFLAGS="`$GLIB_CONFIG --cflags`"
-+GLIB_LIBS="`$GLIB_CONFIG --libs`"
- 
- 
- 
-@@ -7583,10 +7583,10 @@
-       *) # Relative path.
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
-       esac
--  case "$ac_given_INSTALL" in
--        [/$]*) INSTALL="$ac_given_INSTALL" ;;
--        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--        esac
-+#  case "$ac_given_INSTALL" in
-+#        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-+#        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+#        esac
- 
-       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-       # The eval makes quoting arguments work.
diff --git a/mail/evolution-devel/files/patch-ab b/mail/evolution-devel/files/patch-ab
deleted file mode 100644
index 33e776273e14..000000000000
--- a/mail/evolution-devel/files/patch-ab
+++ /dev/null
@@ -1,101 +0,0 @@
---- addressbook/ename/Makefile.in.orig	Fri Jun  2 15:48:59 2000
-+++ addressbook/ename/Makefile.in	Wed Jun 28 18:13:26 2000
-@@ -149,3 +149,3 @@
- 
--INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        	-DG_LOG_DOMAIN=\"EName\"				-I$(srcdir)						-I$(srcdir)/..						-I$(top_srcdir) 					-I. 							-I.. 							-I$(top_builddir)				        -I$(includedir)                                         $(GNOME_INCLUDEDIR)
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-DG_LOG_DOMAIN=\"EName\"				-I$(srcdir)						-I$(srcdir)/..						-I$(top_srcdir) 					-I. 							-I.. 							-I$(top_builddir)				        -I$(includedir)                                         $(GNOME_INCLUDEDIR)
- 
---- addressbook/backend/ebook/Makefile.in.orig	Fri Jun  2 15:49:01 2000
-+++ addressbook/backend/ebook/Makefile.in	Wed Jun 28 18:18:09 2000
-@@ -159,3 +159,3 @@
- 
--INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        	-DG_LOG_DOMAIN=\"EBook\"				-I$(top_srcdir) 					-I$(top_srcdir)/addressbook/backend			-I$(top_srcdir)/addressbook/ename			-I$(top_builddir)/addressbook/backend			-I$(top_builddir)/addressbook/ename		        $(BONOBO_GNOME_CFLAGS)
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-DG_LOG_DOMAIN=\"EBook\"				-I$(top_srcdir) 					-I$(top_srcdir)/addressbook/backend			-I$(top_srcdir)/addressbook/ename			-I$(top_builddir)/addressbook/backend			-I$(top_builddir)/addressbook/ename		        $(BONOBO_GNOME_CFLAGS)
- 
---- addressbook/backend/pas/Makefile.in.orig	Fri Jun  2 15:49:02 2000
-+++ addressbook/backend/pas/Makefile.in	Wed Jun 28 18:20:11 2000
-@@ -157,3 +157,3 @@
- 
--INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        	-DG_LOG_DOMAIN=\"wombat-pas\"				-I$(top_srcdir) 					-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend		        $(BONOBO_GNOME_CFLAGS)
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-DG_LOG_DOMAIN=\"wombat-pas\"				-I$(top_srcdir) 					-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend		        $(BONOBO_GNOME_CFLAGS)
- 
---- addressbook/gui/component/Makefile.in.orig	Mon Jul 10 21:34:24 2000
-+++ addressbook/gui/component/Makefile.in	Tue Jul 11 19:32:26 2000
-@@ -168,3 +168,3 @@
- 
--INCLUDES =  	-DG_LOG_DOMAIN=\"evolution-addressbook\"		$(EXTRA_GNOME_CFLAGS)					$(GNOME_INCLUDEDIR)					-I$(top_srcdir)						-I$(top_builddir)					-I$(top_srcdir)/shell					-I$(top_builddir)/shell					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)/widgets/e-table				-I$(top_srcdir)/widgets/misc				-I$(top_srcdir)/addressbook/gui/minicard		-I$(top_srcdir)/addressbook/contact-editor		-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			$(BONOBO_HTML_GNOME_CFLAGS)				-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"		-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
-+INCLUDES =  	-DG_LOG_DOMAIN=\"evolution-addressbook\"		$(EXTRA_GNOME_CFLAGS)					$(GNOME_INCLUDEDIR)					-I$(top_srcdir)						-I$(top_builddir)					-I$(top_srcdir)/shell					-I$(top_builddir)/shell					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)/widgets/e-table				-I$(top_srcdir)/widgets/misc				-I$(top_srcdir)/addressbook/gui/minicard		-I$(top_srcdir)/addressbook/contact-editor		-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			$(BONOBO_HTML_GNOME_CFLAGS)				-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"		-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
-
---- addressbook/gui/component/select-names/Makefile.in.orig	Mon Jul 10 21:34:25 2000
-+++ addressbook/gui/component/select-names/Makefile.in	Tue Jul 11 22:42:25 2000
-@@ -179,3 +179,3 @@
- 
--INCLUDES =  	-DG_LOG_DOMAIN=\"evolution-addressbook\"		$(EXTRA_GNOME_CFLAGS)					$(GNOME_INCLUDEDIR)					-I$(top_srcdir)						-I$(top_builddir)					-I$(top_srcdir)/shell					-I$(top_builddir)/shell					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)/widgets/e-table				-I$(top_srcdir)/addressbook/gui/minicard		-I$(top_srcdir)/addressbook/contact-editor		-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			$(BONOBO_HTML_GNOME_CFLAGS)				-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"		-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
-+INCLUDES =  	-DG_LOG_DOMAIN=\"evolution-addressbook\"		$(EXTRA_GNOME_CFLAGS)					$(GNOME_INCLUDEDIR)					-I$(top_srcdir)						-I$(top_builddir)					-I$(top_srcdir)/shell					-I$(top_builddir)/shell					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)/widgets/e-table				-I$(top_srcdir)/addressbook/gui/minicard		-I$(top_srcdir)/addressbook/contact-editor		-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			$(BONOBO_HTML_GNOME_CFLAGS)				-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"		-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
- 
---- calendar/cal-client/Makefile.in.orig	Mon Jul 10 21:34:30 2000
-+++ calendar/cal-client/Makefile.in	Tue Jul 11 19:33:16 2000
-@@ -175,3 +175,3 @@
- 
--INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        	-DG_LOG_DOMAIN=\"cal-client\"				-I$(top_srcdir)/calendar				-I$(srcdir) -I$(top_srcdir) 				-I. 							-I.. 							-I$(top_builddir)					-I$(top_builddir)/libical/src/libical			-I$(top_srcdir)/libical/src/libical			$(BONOBO_GNOME_CFLAGS)
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-DG_LOG_DOMAIN=\"cal-client\"				-I$(top_srcdir)/calendar				-I$(srcdir) -I$(top_srcdir) 				-I. 							-I.. 							-I$(top_builddir)					-I$(top_builddir)/libical/src/libical			-I$(top_srcdir)/libical/src/libical			$(BONOBO_GNOME_CFLAGS)
- 
---- calendar/cal-util/Makefile.in.orig	Mon Jul 10 21:34:29 2000
-+++ calendar/cal-util/Makefile.in	Tue Jul 11 19:34:04 2000
-@@ -165,3 +165,3 @@
- 
--INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DG_LOG_DOMAIN=\"cal-util\"				-I$(top_srcdir) 					-I$(top_srcdir)/calendar				-I. 							-I.. 							-I$(top_builddir)					-I$(top_srcdir)/libical/src/libical			-I$(top_builddir)/libical/src/libical		        $(GNOME_INCLUDEDIR)
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-DG_LOG_DOMAIN=\"cal-util\"				-I$(top_srcdir) 					-I$(top_srcdir)/calendar				-I. 							-I.. 							-I$(top_builddir)					-I$(top_srcdir)/libical/src/libical			-I$(top_builddir)/libical/src/libical		        $(GNOME_INCLUDEDIR)
- 
---- calendar/gui/Makefile.in.orig	Mon Jul 10 21:34:31 2000
-+++ calendar/gui/Makefile.in	Tue Jul 11 22:41:10 2000
-@@ -165,3 +165,3 @@
- 
--help_base = $(datadir)/gnome/help/cal
-+help_base = $(datadir)/help/cal
- 
-@@ -172,3 +172,3 @@
- 
--INCLUDES =  	-DG_LOG_DOMAIN=\"calendar-gui\"				-I$(top_builddir)/shell					-I$(top_srcdir)/shell					-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(top_srcdir)/widgets					-I$(includedir)						$(BONOBO_VFS_GNOME_CFLAGS)				-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-+INCLUDES =  	-DG_LOG_DOMAIN=\"calendar-gui\"				-I$(top_builddir)/shell					-I$(top_srcdir)/shell					-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(top_srcdir)/widgets					-I$(includedir)						$(BONOBO_VFS_GNOME_CFLAGS)				-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
- 
-@@ -593,3 +593,3 @@
- install-data-local:
--	$(mkinstalldirs) $(DESTDIR)$(help_base)/C
-+#	$(mkinstalldirs) $(DESTDIR)$(help_base)/C
- 	$(mkinstalldirs) $(Conduitsdir)
---- calendar/gui/dialogs/Makefile.in.orig	Fri Jun  2 15:49:12 2000
-+++ calendar/gui/dialogs/Makefile.in	Wed Jun 28 18:24:00 2000
-@@ -151,3 +151,3 @@
- 
--INCLUDES =  	-DG_LOG_DOMAIN=\"calendar-gui\"				-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(includedir)						-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			$(BONOBO_VFS_GNOME_CFLAGS)			        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-+INCLUDES =  	-DG_LOG_DOMAIN=\"calendar-gui\"				-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(includedir)						-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			$(BONOBO_VFS_GNOME_CFLAGS)			        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
- 
---- calendar/pcs/Makefile.in.orig	Mon Jul 10 21:34:30 2000
-+++ calendar/pcs/Makefile.in	Tue Jul 11 19:35:14 2000
-@@ -163,3 +163,3 @@
- 
--INCLUDES =  	-DG_LOG_DOMAIN=\"wombat-pcs\"				-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(top_builddir)/libical/src/libical			$(BONOBO_VFS_GNOME_CFLAGS)			        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-+INCLUDES =  	-DG_LOG_DOMAIN=\"wombat-pcs\"				-I$(top_srcdir)						-I$(top_srcdir)/calendar				-I$(top_srcdir)/libical/src/libical			-I$(top_builddir)/libical/src/libical			$(BONOBO_VFS_GNOME_CFLAGS)			        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
- 
---- mail/Makefile.in.orig	Mon Jul 10 21:34:09 2000
-+++ mail/Makefile.in	Tue Jul 11 19:36:13 2000
-@@ -169,3 +169,3 @@
- 
--INCLUDES =  	-I$(top_srcdir)/widgets					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)						-I$(top_srcdir)/camel					-I$(top_builddir)/shell					-I$(top_srcdir)/shell					$(BONOBO_HTML_GNOME_CFLAGS)				$(GNOME_VFS_CFLAGS)					$(GCONF_CFLAGS)						-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"		-DEVOLUTION_DATADIR=\""$(datadir)"\"            	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"		-DG_LOG_DOMAIN=\"evolution-mail\"			$(THREADS_CFLAGS)
-+INCLUDES =  	-I$(top_srcdir)/widgets					-I$(top_srcdir)/widgets/e-text				-I$(top_srcdir)						-I$(top_srcdir)/camel					-I$(top_builddir)/shell					-I$(top_srcdir)/shell					$(BONOBO_HTML_GNOME_CFLAGS)				$(GNOME_VFS_CFLAGS)					$(GCONF_CFLAGS)						-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"		-DEVOLUTION_DATADIR=\""$(datadir)"\"            	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"		-DG_LOG_DOMAIN=\"evolution-mail\"			$(THREADS_CFLAGS)
- 
---- shell/Makefile.in.orig	Mon Jul 10 21:33:55 2000
-+++ shell/Makefile.in	Tue Jul 11 19:36:47 2000
-@@ -165,3 +165,3 @@
- 
--INCLUDES =  	-I$(top_srcdir)/widgets							-I$(top_srcdir)/widgets/misc						-I$(top_srcdir)								$(BONOBO_GNOME_CFLAGS)							$(GCONF_CFLAGS)								-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\"			-DEVOLUTION_VERSION=\""$(VERSION)"\"					-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"   			-DEVOLUTION_DATADIR=\""$(datadir)"\"            			-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\"			-DG_LOG_DOMAIN=\"evolution-shell\"
-+INCLUDES =  	-I$(top_srcdir)/widgets							-I$(top_srcdir)/widgets/misc						-I$(top_srcdir)								$(BONOBO_GNOME_CFLAGS)							$(GCONF_CFLAGS)								-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\"			-DEVOLUTION_VERSION=\""$(VERSION)"\"					-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"   			-DEVOLUTION_DATADIR=\""$(datadir)"\"            			-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\"			-DG_LOG_DOMAIN=\"evolution-shell\"
-
---- wombat/Makefile.in.orig	Mon Jul 10 21:34:33 2000
-+++ wombat/Makefile.in	Tue Jul 11 19:37:30 2000
-@@ -163,3 +163,3 @@
- 
--INCLUDES =  	-DG_LOG_DOMAIN=\"wombat\"				-I$(top_srcdir)/e-util					-I$(top_srcdir)						-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			-I$(top_srcdir)/calendar				-I$(top_srcdir)/calendar/pcs				$(GNOME_INCLUDEDIR)					$(BONOBO_VFS_GNOME_CFLAGS)					-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"
-+INCLUDES =  	-DG_LOG_DOMAIN=\"wombat\"				-I$(top_srcdir)/e-util					-I$(top_srcdir)						-I$(top_srcdir)/addressbook/backend			-I$(top_builddir)/addressbook/backend			-I$(top_srcdir)/calendar				-I$(top_srcdir)/calendar/pcs				$(GNOME_INCLUDEDIR)					$(BONOBO_VFS_GNOME_CFLAGS)					-DEVOLUTION_VERSION=\""$(VERSION)"\"			-DEVOLUTION_LOCALEDIR=\""$(prefix)/share/locale"\"
- 
diff --git a/mail/evolution-devel/files/patch-ac b/mail/evolution-devel/files/patch-ac
deleted file mode 100644
index ea9826796d7b..000000000000
--- a/mail/evolution-devel/files/patch-ac
+++ /dev/null
@@ -1,42 +0,0 @@
---- camel/providers/imap/Makefile.in.orig	Mon Jul 10 21:34:06 2000
-+++ camel/providers/imap/Makefile.in	Tue Jul 11 19:17:54 2000
-@@ -181,3 +181,3 @@
- 
--libcamelimap_la_LDFLAGS = -version-info 0:0:0
-+libcamelimap_la_LDFLAGS = -avoid-version
- 
---- camel/providers/mbox/Makefile.in.orig	Fri Jun  2 15:48:47 2000
-+++ camel/providers/mbox/Makefile.in	Wed Jun 28 18:54:19 2000
-@@ -167,3 +167,3 @@
- 
--libcamelmbox_la_LDFLAGS = -version-info 0:0:0
-+libcamelmbox_la_LDFLAGS = -avoid-version
- 
---- camel/providers/pop3/Makefile.in.orig	Fri Jun  2 15:48:48 2000
-+++ camel/providers/pop3/Makefile.in	Wed Jun 28 18:54:35 2000
-@@ -167,3 +167,3 @@
- 
--libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -version-info 0:0:0
-+libcamelpop3_la_LDFLAGS = $(KRB4_LDFLAGS) -avoid-version
- 
---- camel/providers/sendmail/Makefile.in.orig	Fri Jun  2 15:48:49 2000
-+++ camel/providers/sendmail/Makefile.in	Wed Jun 28 18:54:52 2000
-@@ -167,3 +167,3 @@
- 
--libcamelsendmail_la_LDFLAGS = -version-info 0:0:0
-+libcamelsendmail_la_LDFLAGS = -avoid-version
- 
---- camel/providers/smtp/Makefile.in.orig	Fri Jun  2 15:48:49 2000
-+++ camel/providers/smtp/Makefile.in	Wed Jun 28 18:55:06 2000
-@@ -167,3 +167,3 @@
- 
--libcamelsmtp_la_LDFLAGS = -version-info 0:0:0
-+libcamelsmtp_la_LDFLAGS = -avoid-version
- 
---- camel/providers/vee/Makefile.in.orig	Fri Jun  2 15:48:50 2000
-+++ camel/providers/vee/Makefile.in	Wed Jun 28 18:55:19 2000
-@@ -167,3 +167,3 @@
- 
--libcamelvee_la_LDFLAGS = -version-info 0:0:0
-+libcamelvee_la_LDFLAGS = -avoid-version
- 
diff --git a/mail/evolution-devel/pkg-comment b/mail/evolution-devel/pkg-comment
deleted file mode 100644
index 017eaee53071..000000000000
--- a/mail/evolution-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An integrated mail, calendar and address book distributed suite
diff --git a/mail/evolution-devel/pkg-descr b/mail/evolution-devel/pkg-descr
deleted file mode 100644
index a158def801a0..000000000000
--- a/mail/evolution-devel/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Evolution is the integrated mail, calendar and address book
-distributed suite from Helix Code, Inc.
-
-Note that Evolution is still beta. This means it may delete all of
-your mail if you give it the chance.
-
-WWW: http://www.helixcode.com/apps/evolution.php3
diff --git a/mail/evolution-devel/pkg-plist b/mail/evolution-devel/pkg-plist
deleted file mode 100644
index e892124a8a1d..000000000000
--- a/mail/evolution-devel/pkg-plist
+++ /dev/null
@@ -1,244 +0,0 @@
-bin/evolution
-bin/evolution-addressbook
-bin/evolution-calendar
-bin/evolution-mail
-bin/killev
-bin/wombat
-include/camel/broken-date-parser.h
-include/camel/camel-address.h
-include/camel/camel-data-wrapper.h
-include/camel/camel-exception-list.def
-include/camel/camel-exception.h
-include/camel/camel-folder-search.h
-include/camel/camel-folder-summary.h
-include/camel/camel-folder.h
-include/camel/camel-imap-folder.h
-include/camel/camel-imap-store.h
-include/camel/camel-imap-stream.h
-include/camel/camel-internet-address.h
-include/camel/camel-mbox-folder.h
-include/camel/camel-mbox-store.h
-include/camel/camel-mbox-summary.h
-include/camel/camel-medium.h
-include/camel/camel-mime-filter-basic.h
-include/camel/camel-mime-filter-charset.h
-include/camel/camel-mime-filter-crlf.h
-include/camel/camel-mime-filter-from.h
-include/camel/camel-mime-filter-index.h
-include/camel/camel-mime-filter-save.h
-include/camel/camel-mime-filter.h
-include/camel/camel-mime-message.h
-include/camel/camel-mime-parser.h
-include/camel/camel-mime-part-utils.h
-include/camel/camel-mime-part.h
-include/camel/camel-mime-utils.h
-include/camel/camel-movemail.h
-include/camel/camel-multipart.h
-include/camel/camel-object.h
-include/camel/camel-pop3-folder.h
-include/camel/camel-pop3-store.h
-include/camel/camel-provider.h
-include/camel/camel-seekable-stream.h
-include/camel/camel-seekable-substream.h
-include/camel/camel-sendmail-transport.h
-include/camel/camel-service.h
-include/camel/camel-session.h
-include/camel/camel-smtp-transport.h
-include/camel/camel-store.h
-include/camel/camel-stream-buffer.h
-include/camel/camel-stream-filter.h
-include/camel/camel-stream-fs.h
-include/camel/camel-stream-mem.h
-include/camel/camel-stream.h
-include/camel/camel-transport.h
-include/camel/camel-types.h
-include/camel/camel-url.h
-include/camel/camel-vee-folder.h
-include/camel/camel-vee-store.h
-include/camel/camel.h
-include/camel/gmime-content-field.h
-include/camel/gstring-util.h
-include/camel/hash-table-utils.h
-include/camel/md5-utils.h
-include/camel/string-utils.h
-include/ename/e-name-western-tables.h
-include/ename/e-name-western.h
-include/evolution/cal-client/cal-client.h
-include/evolution/cal-util/cal-component.h
-include/evolution/cal-util/cal-recur.h
-include/evolution/cal-util/cal-util.h
-include/evolution/cal-util/calobj.h
-include/evolution/cal-util/timeutil.h
-include/evolution/ebook/e-book-listener.h
-include/evolution/ebook/e-book-types.h
-include/evolution/ebook/e-book-view-listener.h
-include/evolution/ebook/e-book-view.h
-include/evolution/ebook/e-book.h
-include/evolution/ebook/e-card-cursor.h
-include/evolution/ebook/e-card-pairs.h
-include/evolution/ebook/e-card-simple.h
-include/evolution/ebook/e-card-types.h
-include/evolution/ebook/e-card.h
-include/ical.h
-include/icalcalendar.h
-include/icalcluster.h
-include/icalcomponent.h
-include/icalenums.h
-include/icalerror.h
-include/icalmemory.h
-include/icalparameter.h
-include/icalparser.h
-include/icalproperty.h
-include/icalrestriction.h
-include/icalstore.h
-include/icaltypes.h
-include/icalvalue.h
-include/icalvcal.h
-include/icalversion.h
-include/pvl.h
-lib/evolution/camel-providers/%%VERSION%%/libcamelimap.so
-lib/evolution/camel-providers/%%VERSION%%/libcamelimap.urls
-lib/evolution/camel-providers/%%VERSION%%/libcamelmbox.so
-lib/evolution/camel-providers/%%VERSION%%/libcamelmbox.urls
-lib/evolution/camel-providers/%%VERSION%%/libcamelpop3.so
-lib/evolution/camel-providers/%%VERSION%%/libcamelpop3.urls
-lib/evolution/camel-providers/%%VERSION%%/libcamelsendmail.so
-lib/evolution/camel-providers/%%VERSION%%/libcamelsendmail.urls
-lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.so
-lib/evolution/camel-providers/%%VERSION%%/libcamelsmtp.urls
-lib/evolution/camel-providers/%%VERSION%%/libcamelvee.so
-lib/evolution/camel-providers/%%VERSION%%/libcamelvee.urls
-lib/libcal-client.a
-lib/libcal-client.so
-lib/libcal-client.so.0
-lib/libcal-util.a
-lib/libcal-util.so
-lib/libcal-util.so.0
-lib/libcamel.a
-lib/libcamel.so
-lib/libcamel.so.0
-lib/libebook.a
-lib/libebook.so
-lib/libebook.so.0
-lib/libename.a
-lib/libename.so
-lib/libename.so.0
-lib/libeselectnames.a
-lib/libeselectnames.so
-lib/libeselectnames.so.0
-lib/libical.a
-lib/libicalss.a
-share/evolution/default_user/ldapservers.xml
-share/evolution/default_user/shortcuts.xml
-share/evolution/filtertypes.xml
-share/evolution/vfoldertypes.xml
-share/gnome/apps/Applications/evolution.desktop
-share/gnome/evolution/default_user/local/Calendar/folder-metadata.xml
-share/gnome/evolution/default_user/local/Contacts/folder-metadata.xml
-share/gnome/evolution/default_user/local/Drafts/folder-metadata.xml
-share/gnome/evolution/default_user/local/Inbox/folder-metadata.xml
-share/gnome/evolution/default_user/local/Inbox/mbox
-share/gnome/evolution/default_user/local/Outbox/folder-metadata.xml
-share/gnome/evolution/default_user/local/Trash/folder-metadata.xml
-share/gnome/evolution/ecps/medbook.ecps
-share/gnome/evolution/ecps/phonelist.ecps
-share/gnome/evolution/ecps/smallbook.ecps
-share/gnome/evolution/glade/alarm-notify.glade
-share/gnome/evolution/glade/alphabet.glade
-share/gnome/evolution/glade/categories.glade
-share/gnome/evolution/glade/contact-editor.glade
-share/gnome/evolution/glade/e-contact-print.glade
-share/gnome/evolution/glade/e-contact-print.glade.h
-share/gnome/evolution/glade/e-msg-composer-address-dialog.glade
-share/gnome/evolution/glade/e-msg-composer-address-dialog.glade.h
-share/gnome/evolution/glade/e-msg-composer-attachment.glade
-share/gnome/evolution/glade/e-msg-composer-attachment.glade.h
-share/gnome/evolution/glade/e-shell-folder-creation-dialog.glade
-share/gnome/evolution/glade/e-table-config.glade
-share/gnome/evolution/glade/e-table-field-chooser.glade
-share/gnome/evolution/glade/e-table-group.glade
-share/gnome/evolution/glade/event-editor-dialog.glade
-share/gnome/evolution/glade/fullname.glade
-share/gnome/evolution/glade/ldap-server-dialog.glade
-share/gnome/evolution/glade/ldap-server-dialog.glade.h
-share/gnome/evolution/glade/mail-config.glade
-share/gnome/evolution/glade/select-names.glade
-share/gnome/help/evolution/C/fig/calendar.png
-share/gnome/help/evolution/C/fig/config-cal.png
-share/gnome/help/evolution/C/fig/config-mail.png
-share/gnome/help/evolution/C/fig/contact.png
-share/gnome/help/evolution/C/fig/filter-new-fig.png
-share/gnome/help/evolution/C/fig/mail-druid-pic.png
-share/gnome/help/evolution/C/fig/mainwindow-pic.png
-share/gnome/help/evolution/C/fig/vfolder-createrule-fig.png
-share/gnome/idl/addressbook.idl
-share/gnome/idl/evolution-calendar.idl
-share/gnome/images/evolution/briefcase.png
-share/gnome/images/evolution/cellphone.png
-share/gnome/images/evolution/envelope.png
-share/gnome/images/evolution/evolution-calendar-mini.png
-share/gnome/images/evolution/evolution-calendar.png
-share/gnome/images/evolution/evolution-contacts-mini.png
-share/gnome/images/evolution/evolution-contacts.png
-share/gnome/images/evolution/evolution-inbox-mini.png
-share/gnome/images/evolution/evolution-inbox.png
-share/gnome/images/evolution/evolution-notes-mini.png
-share/gnome/images/evolution/evolution-notes.png
-share/gnome/images/evolution/evolution-tasks-mini.png
-share/gnome/images/evolution/evolution-tasks.png
-share/gnome/images/evolution/evolution-today.png
-share/gnome/images/evolution/globe.png
-share/gnome/images/evolution/house.png
-share/gnome/images/evolution/malehead.png
-share/gnome/oaf/addressbook.oafinfo
-share/gnome/oaf/calendar-control.oafinfo
-share/gnome/oaf/evolution-addressbook-select-names.oafinfo
-share/gnome/oaf/evolution-calendar.oafinfo
-share/gnome/oaf/evolution-mail.oafinfo
-share/gnome/oaf/wombat.oafinfo
-share/gnome/pixmaps/evolution.png
-share/locale/da/LC_MESSAGES/evolution.mo
-share/locale/de/LC_MESSAGES/evolution.mo
-share/locale/el/LC_MESSAGES/evolution.mo
-share/locale/es/LC_MESSAGES/evolution.mo
-share/locale/fr/LC_MESSAGES/evolution.mo
-share/locale/gl/LC_MESSAGES/evolution.mo
-share/locale/hu/LC_MESSAGES/evolution.mo
-share/locale/it/LC_MESSAGES/evolution.mo
-share/locale/ja/LC_MESSAGES/evolution.mo
-share/locale/ko/LC_MESSAGES/evolution.mo
-share/locale/nl/LC_MESSAGES/evolution.mo
-share/locale/no/LC_MESSAGES/evolution.mo
-share/locale/ru/LC_MESSAGES/evolution.mo
-share/locale/pl/LC_MESSAGES/evolution.mo
-share/locale/sl/LC_MESSAGES/evolution.mo
-share/locale/sv/LC_MESSAGES/evolution.mo
-share/locale/tr/LC_MESSAGES/evolution.mo
-share/locale/uk/LC_MESSAGES/evolution.mo
-@dirrm share/gnome/images/evolution
-@dirrm share/gnome/images
-@dirrm share/gnome/help/evolution/C/fig
-@dirrm share/gnome/help/evolution/C
-@dirrm share/gnome/help/evolution
-@dirrm share/gnome/evolution/glade
-@dirrm share/gnome/evolution/ecps
-@dirrm share/gnome/evolution/default_user/local/Trash
-@dirrm share/gnome/evolution/default_user/local/Outbox
-@dirrm share/gnome/evolution/default_user/local/Inbox
-@dirrm share/gnome/evolution/default_user/local/Drafts
-@dirrm share/gnome/evolution/default_user/local/Contacts
-@dirrm share/gnome/evolution/default_user/local/Calendar
-@dirrm share/gnome/evolution/default_user/local
-@dirrm share/gnome/evolution/default_user
-@dirrm share/gnome/evolution
-@dirrm share/evolution/default_user
-@dirrm share/evolution
-@dirrm lib/evolution/camel-providers/%%VERSION%%
-@dirrm lib/evolution/camel-providers
-@dirrm lib/evolution
-@dirrm include/evolution/ebook
-@dirrm include/evolution/cal-util
-@dirrm include/evolution/cal-client
-@dirrm include/evolution
-@dirrm include/ename
-@dirrm include/camel
diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
deleted file mode 100644
index 7a343dc74718..000000000000
--- a/mail/exim-devel/Makefile
+++ /dev/null
@@ -1,144 +0,0 @@
-# New ports collection makefile for:	exim
-# Date created:		23 June 1996
-# Whom:			markm@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	exim
-PORTVERSION= 	3.15
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \
-		http://www.exim.org/ftp/ \
-		ftp://ftp.is.co.za/networking/mail/transport/exim/
-DISTFILES=	exim-3.15.tar.gz exim-texinfo-3.10.tar.gz
-
-MAINTAINER=	sheldonh@FreeBSD.org
-
-# If WITHOUT_X11 is not defined, the eximon monitor, which requires X, will
-# be built. Comment it out unless you have or want XFree86 installed!
-.if !defined(WITHOUT_X11)
-USE_XLIB=	yes
-.endif
-
-USE_PERL5=	yes
-
-MAKE_ENV+=	OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH}
-
-# Uncomment the WITH_LDAP, WITH_MYSQL, WITH_PAM and WITH_PGSQL definitions
-# to link against libmysqlclient, libpam and libpq respectively.
-# The libpam linkage is required for SMTP AUTH support.
-#WITH_LDAP=	yes
-#WITH_MYSQL=	yes
-#WITH_PAM=	yes
-#WITH_PGSQL=	yes
-
-# Enable the embedded Perl interpreter, allowing Perl subroutines to be
-# called during string expansion.
-WITH_PERL=	yes
-
-# If WITH_PAM is defined then one or more of PAM_CRAM_MD5 and PAM_PLAINTEXT
-# must be left uncommented.
-PAM_CRAM_MD5=	yes
-PAM_PLAINTEXT=	yes
-
-# If WITH_LDAP is defined, LDAP_LIB_TYPE must be one of UMICHIGAN,
-# NETSCAPE or SOLARIS7.
-LDAP_LIB_TYPE=UMICHIGAN
-
-# Uncomment to compile support for non-standard mailbox formats.
-#WITH_MAILDIR=	yes
-#WITH_MAILSTORE=	yes
-#WITH_MBX=	yes
-
-# You should not need to fiddle with anything below this point.
-
-SEDLIST=	-e 's,XX_PREFIX_XX,${PREFIX},' \
-		-e 's,XX_BINOWN_XX,${BINOWN},'
-.if !defined(USE_XLIB)
-SEDLIST+=	-e 's,^EXIM_MONITOR,\#EXIM_MONITOR,'
-.endif
-
-.if !defined(WITH_PERL)
-SEDLIST+=	-e 's,^EXIM_PERL,\#EXIM_PERL,'
-.endif
-
-.if defined(WITH_LDAP)
-LIB_DEPENDS+=	lber.1:${PORTSDIR}/net/openldap
-SEDLIST+=	-e 's,XX_LDAP_LIBS_XX,-L${PREFIX}/lib -llber -lldap,' \
-		-e 's,XX_LDAP_INCLUDE_XX,-I${PREFIX}/include,' \
-		-e 's,XX_LDAP_TYPE_XX,${LDAP_LIB_TYPE},' \
-		-e 's,^\# LOOKUP_LDAP,LOOKUP_LDAP,'
-.else
-SEDLIST+=	-e 's,XX_LDAP_[^ ]*_XX,,' \
-		-e 's,^LDAP_LIB_TYPE,\#LDAP_LIB_TYPE,'
-.endif
-
-.if defined(WITH_MYSQL)
-LIB_DEPENDS+=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
-SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
-		-e 's,XX_MYSQL_INCLUDE_XX,-I${PREFIX}/include/mysql,' \
-		-e 's,^\# LOOKUP_MYSQL,LOOKUP_MYSQL,'
-.else
-SEDLIST+=	-e 's,XX_MYSQL_[^ ]*_XX,,'
-.endif
-
-.if defined(WITH_PAM)
-SEDLIST+=	-e 's,XX_PAM_LIBS_XX,-lpam,'
-.else
-SEDLIST+=	-e 's,XX_PAM_LIBS_XX,,' \
-		-e 's,^SUPPORT_PAM,\#SUPPORT_PAM,' 
-.endif
-
-.if !defined(WITH_PAM) || !defined(PAM_CRAM_MD5)
-SEDLIST+=	-e 's,^AUTH_CRAM_MD5,\#AUTH_CRAM_MD5,'
-.endif
-
-.if !defined(WITH_PAM) || !defined(PAM_PLAINTEXT)
-SEDLIST+=	-e 's,^AUTH_PLAINTEXT,\#AUTH_PLAINTEXT,'
-.endif
-
-.if defined(WITH_PGSQL)
-LIB_DEPENDS+=	pq.2:${PORTSDIR}/databases/postgresql
-SEDLIST+=	-e 's,XX_PGSQL_LIBS_XX,-L${PREFIX}/pgsql/lib -lpq,' \
-		-e 's,XX_PGSQL_INCLUDE_XX,-I${PREFIX}/pgsql/include,' \
-		-e 's,^\# LOOKUP_PGSQL,LOOKUP_PGSQL,'
-.else
-SEDLIST+=	-e 's,XX_PGSQL_[^ ]*_XX,,'
-.endif
-
-.if !defined(WITH_PGSQL) && !defined(WITH_MYSQL) && !defined(WITH_LDAP)
-SEDLIST+=	-e 's,^LOOKUP_LIBS,\#LOOKUP_LIBS,' \
-		-e 's,^LOOKUP_INCLUDE,\#LOOKUP_INCLUDE,'
-.endif
-
-.if defined(WITH_MAILDIR)
-SEDLIST+=	-e 's,^\# SUPPORT_MAILDIR,SUPPORT_MAILDIR,'
-.endif
-
-.if defined(WITH_MAILSTORE)
-SEDLIST+=	-e 's,^\# SUPPORT_MAILSTORE,SUPPORT_MAILSTORE,'
-.endif
-
-.if defined(WITH_MBX)
-SEDLIST+=	-e 's,^\# SUPPORT_MBX,SUPPORT_MBX,'
-.endif
-
-do-configure:
-	${MKDIR} ${WRKSRC}/Local
-	${SED} ${SEDLIST} < ${FILESDIR}/Makefile > ${WRKSRC}/Local/Makefile
-	${SED} ${SEDLIST} < ${FILESDIR}/configure.default \
-	    > ${WRKSRC}/src/configure.default
-	${CP} ${FILESDIR}/eximon.conf ${WRKSRC}/Local
-	cd ${WRKSRC}/doc && \
-	for i in ../../exim-texinfo-3.10/doc/* ; do \
-		${LN} -sf $$i ; \
-	done
-
-post-build:
-	${INSTALL_SCRIPT} ${FILESDIR}/exim.sh \
-		${WRKSRC}/build-${OPSYS}-${MACHINE_ARCH}
-	${TOUCH} ${WRKSRC}/build-${OPSYS}-${MACHINE_ARCH}/eximon.bin
-	${TOUCH} ${WRKSRC}/build-${OPSYS}-${MACHINE_ARCH}/eximon
-
-.include <bsd.port.mk>
diff --git a/mail/exim-devel/distinfo b/mail/exim-devel/distinfo
deleted file mode 100644
index a090af811d3a..000000000000
--- a/mail/exim-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (exim-3.15.tar.gz) = ee9cc11d3f4f3ec0ff40ea609e122e14
-MD5 (exim-texinfo-3.10.tar.gz) = c8c2596e6a303f774e0a627e61b4dffc
diff --git a/mail/exim-devel/files/Makefile b/mail/exim-devel/files/Makefile
deleted file mode 100644
index 63021a5cd58a..000000000000
--- a/mail/exim-devel/files/Makefile
+++ /dev/null
@@ -1,542 +0,0 @@
-##################################################
-#          The Exim mail transport agent         #
-##################################################
-# $FreeBSD$
-
-# This is the template for Exim's main build-time configuration file. It
-# contains settings that are independent of any operating system. It should
-# be edited and then saved to a file called Local/Makefile before first running
-# the make command.
-
-# Things that depend on the operating system have default settings in
-# OS/Makefile-Default, but these are overridden for some OS by files called
-# called OS/Makefile-<osname>. You can further override these by creating files
-# called Local/Makefile-<osname>, where "<osname>" stands for the name of your
-# operating system - look at the names in the OS directory to see which names
-# are recognized.
-
-# However, if you are building Exim for a single OS only, you can place all the
-# configuration settings in the one file called Local/Makefile; only if you are
-# building for several OS from the same source files do you need to worry
-# about splitting off the OS-dependent settings into separate files.
-
-# One OS-specific thing is the C compiler; the overall default is gcc, but
-# some OS Makefiles specify cc. You can override anything that is set by
-# putting CC=whatever in your Local/Makefile.
-
-# NOTE: You should never need to edit any of the distributed Makefiles; all
-# overriding can be done in your Local/Makefile(s). This will make it easier
-# for you when the next release comes along.
-
-# The location of the X11 libraries is something else that is quite variable
-# even between different versions of the same operation system (and indeed
-# there are different versions of X11 as well, of course). The four settings
-# concerned here are X11, XINCLUDE, XLFLAGS (linking flags) and X11_LD_LIB
-# (dynamic run-time library).
-
-# Another area of variability between systems is the type and location of the
-# dbm library package. Exim has support for ndbm, gdbm, and Berkeley DB. By
-# default it assumes ndbm; this often works with gdbm or DB, provided they
-# are correctly installed, via their compatibility interfaces. However, Exim
-# can also be configured to use the native calls for Berkeley DB 1.85 or
-# Berkeley DB version 2.x, and this is defaulted for some operating systems.
-# The defaults are set in OS/Makefile-Default, and can be changed by putting
-# things into an OS-specific Makefile, or indeed into the main Local/Makefile
-# if Exim is being compiled for a single OS only.
-
-# See also the file doc/dbm.discuss.txt for discussion about different dbm
-# libraries.
-
-# In Local/Makefiles blank lines and lines starting with # are ignored. It is
-# also permitted to use the # character to add a comment to a setting, for
-# example
-#
-# EXIM_GID=42   # the "mail" group
-#
-# However, with some versions of "make" this works only if there is no white
-# space between the end of the setting and the #, so it is probably best
-# avoided. However, a consequence of this facility is that it is not possible
-# to have the # character present in any setting, but I can't think of any
-# cases where this would be wanted.
-###############################################################################
-
-
-# /bin/sh is normally used as the shell in which to run commands that are
-# defined in the makefiles. This can be changed if necessary, but note that
-# a Bourne-compatible shell is expected.
-
-# MAKE_SHELL=/bin/sh
-
-
-# The following commands live in different places in some OS. The OS-specific
-# files should normally point to the right place, but they can be overridden
-# here if necessary. Perl is not necessary for running Exim unless you set
-# EXIM_PERL (see below) to get it embedded, but there are some Perl utilities
-# for processing log files. If you haven't got Perl, Exim will still build and
-# run; you just won't be able to run those utilities.
-
-# CHOWN_COMMAND=/usr/bin/chown
-# CHGRP_COMMAND=/usr/bin/chgrp
-# MV_COMMAND=/bin/mv
-# RM_COMMAND=/bin/rm
-# PERL_COMMAND=/usr/bin/perl
-
-
-# The following macro can be used to change the command for building a library
-# of functions. By default the "ar" command is used, with options "cq".
-
-# AR=ar cq
-
-
-# Exim has some support for the AUTH extension of SMTP (RFC 2554). If you want
-# to use this you must uncomment at least one of the following macros so that
-# appropriate code is included in the binary. You then need to set up the
-# runtime configuration to make use of the mechanism(s) selected.
-
-AUTH_CRAM_MD5=yes
-AUTH_PLAINTEXT=yes
-
-
-# The binary directory: This variable defines where the exim binary will be
-# installed by "make install" or "exim_install". It is also used internally
-# by exim when it needs to re-invoke itself, either to send an error message,
-# or to recover root privilege. Exim's utility binaries and scripts are also
-# installed in this directory. There is no default for this variable built into
-# the source files; it must be set in one of the local configuration files.
-
-BIN_DIRECTORY=XX_PREFIX_XX/sbin
-
-
-# The default distribution of Exim contains only the plain text form of the
-# documentation. Other forms are available separately. If you want to install
-# the documentation in "info" format, first fetch the Texinfo documentation
-# sources from the ftp directory and unpack them, which should create files
-# with the extension "texinfo" in the doc directory. Then set INFO_DIRECTORY to
-# your info directory; "make install" will then build the info files and
-# install them there.
-
-INFO_DIRECTORY=XX_PREFIX_XX/info
-
-
-# The compress command is used by the exicyclog script to compress old log
-# files. Both the name of the command and the suffix that it adds to files
-# need to be defined here. See also the EXICYCLOG_MAX configuration.
-
-COMPRESS_COMMAND=/usr/bin/gzip
-COMPRESS_SUFFIX=gz
-
-
-# If the exigrep utility is fed compressed log files, it tries to uncompress
-# them using this command.
-
-ZCAT_COMMAND=/usr/bin/zcat
-
-
-# The runtime configuration file: This variable defines where Exim's runtime
-# configuration file is. There is no default built into the source files, so
-# there must be a setting in one of the local configuration files. The
-# location of all other runtime files and directories can be changed in the
-# runtime configuration file.
-
-CONFIGURE_FILE=XX_PREFIX_XX/etc/exim/configure
-
-
-# In some installations there may be multiple machines sharing file systems,
-# where a different configuration file is required for Exim on the different
-# machines. If CONFIGURE_FILE_USE_NODE is defined, then Exim will first look
-# for a configuration file whose name is that defined by CONFIGURE_FILE,
-# with the node name obtained by uname() tacked on the end, separated by a
-# period (for example, /usr/exim/configure.host.in.some.domain. If this file
-# does not exist, then the bare configuration file name is tried.
-
-# CONFIGURE_FILE_USE_NODE=yes
-
-
-# In some esoteric configurations two different versions of Exim are run,
-# with different setuid values, and different configuration files are required
-# to handle the different cases. If CONFIGURE_FILE_USE_EUID is defined, then
-# Exim will first look for a configuration file whose name is that defined
-# by CONFIGURE_FILE, with the effective uid tacked on the end, separated by
-# a period (for eximple, /usr/exim/configure.0). If this file does not exist,
-# then the bare configuration file name is tried. In the case when both
-# CONFIGURE_FILE_USE_EUID and CONFIGURE_FILE_USE_NODE are set, four files
-# are tried: <name>.<euid>.<node>, <name>.<node>, <name>.<euid>, and <name>.
-
-# CONFIGURE_FILE_USE_EUID=yes
-
-
-# The size of the delivery buffer: This specifies the size of buffer which is
-# used when copying a message from the spool to a destination. The default
-# value built into the source is 8192.
-
-# DELIVER_BUFFER_SIZE=8192
-
-
-# Included directors: These variables determine which individual director
-# drivers are included in the Exim binary. There are no defaults; those that
-# are wanted must be defined here by setting the appropriate variables to the
-# value "yes". The actions of each director are described in a separate chapter
-# in the manual. Including a director in the binary does not cause it to
-# be used automatically. It has also to be specified in the runtime
-# configuration file.
-
-DIRECTOR_ALIASFILE=yes
-DIRECTOR_FORWARDFILE=yes
-DIRECTOR_LOCALUSER=yes
-DIRECTOR_SMARTUSER=yes
-
-
-# The mode of the database directory: Exim creates a directory called "db"
-# in its spool directory, to hold its databases of hints. This variable
-# determines the mode of the created directory. The default value in the
-# source is 0750.
-
-# DB_DIRECTORY_MODE=0750
-
-
-# Database file mode: The mode of files created in the "db" directory defaults
-# to 0640 in the source, and can be changed here.
-
-# DB_MODE=0640
-
-
-# Database lock file mode: The mode of zero-length files created in the "db"
-# directory to use for locking purposes defaults to 0640 in the source, and
-# can be changed here.
-
-# DB_LOCKFILE_MODE=0640
-
-
-# Cycling log files: this variable specifies the maximum number of old
-# log files that are kept by the exicyclog log-cycling script.
-
-EXICYCLOG_MAX=10
-
-
-# Running Exim without it being root all the time: A uid and gid for Exim can
-# be specified here, and this is strongly recommended. These values are
-# compiled into the binary. It is possible to change them by settings in the
-# runtime configuration file, but setting them here is preferred. If EXIM_UID
-# is not defined, the default in the code is to run as root (unless specified
-# otherwise at run time) except when doing local deliveries, when it always
-# runs as the appropriate local user. Specifying 0 at run time has the effect
-# of unsetting the values build into the binary.
-
-# The settings here must be numeric; the run time file allows names to
-# be used. When this uid and gid are set, the Exim binary still has to be
-# setuid root if local deliveries are to be performed or a listener on port
-# 25 is to be run, but it gives up its privilege when possible. There is a
-# trade-off between security and efficiency, controlled by the runtime
-# "security" setting, which controls how privilege is released (setuid vs
-# seteuid).
-
-# EXIM_UID=
-# EXIM_GID=
-
-
-# Compiling the Exim monitor: If you want to compile the Exim monitor,
-# a program that requires an X11 display, then EXIM_MONITOR should be
-# set to the value "eximon.bin". Comment out this setting to disable
-# compilation of the binary file that is run by the eximon script. The
-# locations of various X11 directories for libraries and include files
-# are defaulted in the OS/Makefile-Default file, and can be overridden
-# in local OS-specific make files.
-
-EXIM_MONITOR=eximon.bin
-
-
-# Compiling in support for embedded Perl: If you want to be able to
-# use Perl code in Exim's string manipulation language and you have Perl
-# (version 5.004 or later) installed, set EXIM_PERL to perl.o.
-
-EXIM_PERL=perl.o
-
-
-# There are also three options which are used when compiling the Perl interface
-# and when linking with Perl. The default values for these are placed
-# automatically at the head of the Makefile by the script which builds it.
-# However, if you want to override them, you can do so here.
-
-# PERL_CC=
-# PERL_CCOPTS=
-# PERL_LIBS=
-
-
-# This parameter sets the maximum length of the header portion of a message
-# that Exim is prepared to process. The default setting is one megabyte. There
-# is a limit in order to catch rogue mailers that might connect to your SMTP
-# port, start off a header line, and then just pump junk at it for ever. The
-# message_size_limit option would also catch this, but it may not be set.
-
-# HEADER_MAXSIZE="(1024*1024)"
-
-
-# The mode of the input directory: The input directory is where messages are
-# kept while awaiting delivery. Exim creates it if necessary, using a mode
-# which can be defined here (default 0750).
-
-# INPUT_DIRECTORY_MODE=0750
-
-
-# Exim log directory and files: Exim creates several log files inside a
-# single log directory. You can define the directory and the form of the
-# log file name here, by setting LOG_FILE_PATH to a path name containing one
-# occurrence of %s. This will be replaced by one of the strings "main",
-# "panic", or "reject" to form the final file name. For example, some
-# installations may want something like this:
-
-LOG_FILE_PATH=/var/log/exim_%slog
-
-# which results in files with names /var/log/exim_mainlog, etc. The directory
-# in which the log files are placed must exist; Exim does not try to create
-# it for itself. It is also your responsibility to ensure that Exim is capable
-# of writing files using this path name. If you have defined EXIM_UID and
-# EXIM_GID above, then that uid and gid must be able to create files in the
-# directory you have specified.
-
-# You can also configure Exim to use syslog, instead of or as well as log
-# files, by settings such as these
-
-# LOG_FILE_PATH=syslog
-# LOG_FILE_PATH=syslog:/var/log/exim_%slog
-
-# Do not include white space in such a setting as it messes up the building
-# process.
-
-# You do not have to define the log file path here; an option in the runtime
-# configuration file can also set it, and that overrides any setting here.
-# However, it is recommended that you set it here if it is a fixed path, so
-# that it is available right from the start of Exim's execution. Otherwise,
-# errors detected early on, for example errors in the configuration file,
-# cannot be logged.
-
-# If you do not set LOG_FILE_PATH here or in the runtime configuration, Exim
-# creates a directory called "log" inside its spool directory (see
-# SPOOL_DIRECTORY below) and uses that with filenames "mainlog", "paniclog",
-# etc. Its mode defaults to 0750 but that can be changed here.
-
-# LOG_DIRECTORY_MODE=0750
-
-# This value is used only when Exim creates the directory for itself.
-
-# The log files themselves are created as required, with a mode that defaults
-# to 0640, but which can be changed here.
-
-# LOG_MODE=0640
-
-
-# Included file and database lookup methods. See the manual chapter entitled
-# "File and database lookups" for discussion. DBM and lsearch (linear search)
-# are included by default. LOOKUP_DNSDB does *not* refer to general mail
-# routing using the DNS. It is for the specialist case of using the DNS as
-# a general database facility (not common). For details of cdb files and the
-# tools to build them, see http://www.pobox.com/~djb/cdb.html.
-
-LOOKUP_DBM=yes
-LOOKUP_LSEARCH=yes
-
-# LOOKUP_CDB=yes
-# LOOKUP_DNSDB=yes
-# LOOKUP_LDAP=yes
-# LOOKUP_MYSQL=yes
-# LOOKUP_NIS=yes
-# LOOKUP_NISPLUS=yes
-# LOOKUP_PGSQL=yes
-
-# Additional libraries and include directories may be required for some
-# lookup styles, e.g. LDAP, MYSQL or PGSQL. LOOKUP_LIBS is included only on
-# the command for linking Exim itself, not on any auxiliary programs. You
-# don't need to set LOOKUP_INCLUDE if the relevant directories are already
-# specified in INCLUDE.
-
-# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq
-LOOKUP_INCLUDE=XX_MYSQL_INCLUDE_XX XX_PGSQL_INCLUDE_XX XX_LDAP_INCLUDE_XX
-LOOKUP_LIBS=XX_MYSQL_LIBS_XX XX_PGSQL_LIBS_XX XX_LDAP_LIBS_XX
-
-# If you have set LDAP=yes, you should set LDAP_LIB_TYPE to indicate which LDAP
-# library you have. Unfortunately, though most of their functions are the
-# same, there is a difference in error handling. Currently Exim knows about
-# three LDAP libraries: the one from the University of Michigan, the Netscape
-# SDK library, and the library that comes with Solaris 7. Uncomment whichever
-# of these you are using.
-
-# LDAP_LIB_TYPE=UMICHIGAN
-# LDAP_LIB_TYPE=NETSCAPE
-# LDAP_LIB_TYPE=SOLARIS7
-LDAP_LIB_TYPE=XX_LDAP_TYPE_XX
-
-# If you don't set any of these, Exim applies a heuristic to distinguish the
-# University of Michigan library, but it cannot distinguish between the other
-# two.
-
-# The TESTDB lookup is for performing tests on the handling of lookup
-# results, and is not useful for general running. It should be included
-# only when debugging the code of Exim.
-
-# LOOKUP_TESTDB=yes
-
-
-# Network interfaces: Unless you set the local_interfaces option in the runtime
-# configuration file to restrict Exim to certain interfaces only, it will run
-# code to find all the interfaces there are on your host. Unfortunately,
-# the call to the OS that does this requires a buffer large enough to hold
-# data for all the interfaces - it was designed of course in the days when a
-# host rarely had more than three or four at most. Nowadays hosts can have
-# very many virtual interfaces running on the same hardware. If you have more
-# than 250 virtual interfaces, you will need to uncomment this setting and
-# increase the value.
-
-# MAXINTERFACES=250
-
-
-# Per-message logs: While a message is in the process of being delivered,
-# comments on its progress are written to a message log, for the benefit of
-# human administrators. These logs are held in a directory called "msglog"
-# in the spool directory. Its mode defaults to 0750, but can be changed here.
-# The message log directory is also used for storing files that are used by
-# transports for returning data to a message's sender (see the "return_output"
-# option for transports).
-
-# MSGLOG_DIRECTORY_MODE=0750
-
-
-# Identifying the daemon: When an Exim daemon starts up, it writes its pid to
-# a file so that it can easily be identified. The path of the file can be
-# specified here. It must contain precisely one occurrence of "%s". When
-# a daemon is run on the default SMTP port, this is replaced with the null
-# string, but when it is run with some explicit port specified, "%s" is
-# replaced with the port number preceded by a dot. If a daemon is run with
-# only one of -bd and -q<time>, then that option is added on to the end of
-# the file name, allowing sites that run two separate daemons to distinguish
-# them. Some installations may want something like this
-
-# PID_FILE_PATH=/var/run/exim%s.pid
-
-# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
-# (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard
-# daemon, or "exim-daemon.<port>.pid" for a daemon listening on a non-standard
-# port. If you run a daemon that does not have both the -bd and -q options,
-# then whichever of the two options it does have is added to the file name,
-# whether obtained from PID_FILE_PATH or by default.
-
-# The pid file path does not have to be set here; it can be also be set by an
-# option in the runtime configuration file, which takes precedence over any
-# setting here.
-
-
-# Included routers: These variables determine which individual router drivers
-# are included in the Exim binary. There are no defaults; those that are
-# wanted must be defined here by setting the appropriate variables to the value
-# "yes". The actions of each router are described in a separate chapter
-# in the manual. Including a router in the binary does not cause it to
-# be used automatically. It has also to be specified in the runtime
-# configuration file. Those routers that are *not* wanted must not be defined
-# here at all - comment them out.
-
-ROUTER_DOMAINLIST=yes
-ROUTER_IPLITERAL=yes
-ROUTER_LOOKUPHOST=yes
-ROUTER_QUERYPROGRAM=yes
-
-# This one is very special-purpose, so is not included by default.
-
-# ROUTER_IPLOOKUP=yes
-
-
-# The spool directory: This directory is where all the data for messages in
-# transit is kept. There is no default in the source, so its location must be
-# defined in a local compile-time configuration file, or in the runtime
-# configuration. It is recommended (but not mandatory) that you define it here
-# if it is a fixed path, especially if you have not defined LOG_FILE_PATH. Log
-# files are then written in a sub-directory of the spool directory, and it is
-# helpful to have this defined right from the start of execution so that, for
-# example, errors in reading the runtime configuration file can be logged.
-
-# Exim creates the spool directory if it does not exist. If a non-root uid and
-# gid have been defined for Exim (either in this configuration file, or by the
-# runtime configuration options), then this directory and all sub-directories
-# and their files will be created with their owners and groups set to Exim's
-# uid and gid.
-
-# Many installations will want something like this:
-SPOOL_DIRECTORY=/var/spool/exim
-
-# Others may prefer to keep all Exim things under one directory:
-# SPOOL_DIRECTORY=/usr/exim/spool
-
-
-# If Exim creates the spool directory, it is given this mode, defaulting in the
-# source to 0750.
-
-# SPOOL_DIRECTORY_MODE=0750
-
-
-# The mode of files on the input spool which hold the contents of message can
-# be changed here. The default is 0600. If you have defined a uid and gid for
-# Exim and want information from the spool to be available to anyone who is a
-# member of the Exim group, change the value to 0640. This is particularly
-# relevant if you are going to run the Exim monitor.
-
-# SPOOL_MODE=0600
-
-
-# If STDERR_FILE is defined then the -df command line option causes Exim to
-# redirect stderr to the named file. This is useful for catching debugging
-# output when starting Exim via inetd.
-
-# STDERR_FILE=
-
-
-# The appendfile transport can write messages as individual files in a number
-# of formats. The code for three specialist formats, maildir, mailstore, and
-# MBX, is included only when requested by the following settings:
-
-# SUPPORT_MAILDIR=yes
-# SUPPORT_MAILSTORE=yes
-# SUPPORT_MBX=yes
-
-
-# Moving frozen messages: If the following is uncommented, Exim is compiled
-# with support for automatically moving frozen messages out of the main spool
-# directory, a facility that is found useful by some large installations. A
-# runtime option is required to cause the moving actually to occur. Such
-# messages become "invisible" to the normal management tools.
-
-# SUPPORT_MOVE_FROZEN_MESSAGES=yes
-
-
-# Support for PAM (Pluggable Authentication Modules), a facility
-# which is available in the latest releases of Solaris and in some GNU/Linux
-# distributions (see http://ftp.at.kernel.org/pub/linux/libs/pam/). The Exim
-# support, which is intended for use in conjunction with the SMTP AUTH
-# facilities, is included only when requested by the following setting:
-
-SUPPORT_PAM=yes
-
-# You probably need to add -lpam to EXTRALIBS, and in some releases of
-# GNU/Linux -ldl is also needed.
-
-
-# Included transports: These variables determine which individual transport
-# drivers are included in the Exim binary. There are no defaults; those that
-# are wanted must be defined here by setting the appropriate variables to the
-# value "yes". The actions of each transport are described in a separate chapter
-# in the manual. Including a transport in the binary does not cause it to
-# be used automatically. It has also to be specified in the runtime
-# configuration file.
-
-TRANSPORT_APPENDFILE=yes
-TRANSPORT_AUTOREPLY=yes
-TRANSPORT_PIPE=yes
-TRANSPORT_SMTP=yes
-
-
-# TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment
-# this setting. See the manual section entitled "Use of tcpwrappers" in the
-# chapter on building and installing Exim.
-
-USE_TCP_WRAPPERS=yes
-EXTRALIBS=-lwrap XX_PAM_LIBS_XX
-
-# End of EDITME
diff --git a/mail/exim-devel/files/configure.default b/mail/exim-devel/files/configure.default
deleted file mode 100644
index 2a3d30528ead..000000000000
--- a/mail/exim-devel/files/configure.default
+++ /dev/null
@@ -1,370 +0,0 @@
-######################################################################
-#                  Runtime configuration file for Exim               #
-######################################################################
-
-
-# This is a default configuration file which will operate correctly in
-# uncomplicated installations. Please see the manual for a complete list
-# of all the runtime configuration options that can be included in a
-# configuration file. There are many more than are mentioned here. The
-# manual is in the file doc/spec.txt in the Exim distribution as a plain
-# ASCII file. Other formats (PostScript, Texinfo, HTML, PDF) are available
-# from the Exim ftp sites. The manual is also online via the Exim web sites.
-
-
-# This file is divided into several parts, all but the last of which are
-# terminated by a line containing the word "end". The parts must appear
-# in the correct order, and all must be present (even if some of them are
-# in fact empty). Blank lines, and lines starting with # are ignored.
-
-
-
-######################################################################
-#                    MAIN CONFIGURATION SETTINGS                     #
-######################################################################
-
-# Specify your host's canonical name here. This should normally be the fully
-# qualified "official" name of your host. If this option is not set, the
-# uname() function is called to obtain the name.
-
-# primary_hostname =
-
-
-# Specify the domain you want to be added to all unqualified addresses
-# here. An unqualified address is one that does not contain an "@" character
-# followed by a domain. For example, "caesar@rome.ex" is a fully qualified
-# address, but the string "caesar" (i.e. just a login name) is an unqualified
-# email address. Unqualified addresses are accepted only from local callers by
-# default. See the receiver_unqualified_{hosts,nets} options if you want
-# to permit unqualified addresses from remote sources. If this option is
-# not set, the primary_hostname value is used for qualification.
-
-# qualify_domain =
-
-
-# If you want unqualified recipient addresses to be qualified with a different
-# domain to unqualified sender addresses, specify the recipient domain here.
-# If this option is not set, the qualify_domain value is used.
-
-# qualify_recipient =
-
-
-# Specify your local domains as a colon-separated list here. If this option
-# is not set (i.e. not mentioned in the configuration file), the
-# qualify_recipient value is used as the only local domain. If you do not want
-# to do any local deliveries, uncomment the following line, but do not supply
-# any data for it. This sets local_domains to an empty string, which is not
-# the same as not mentioning it at all. An empty string specifies that there
-# are no local domains; not setting it at all causes the default value (the
-# setting of qualify_recipient) to be used.
-
-# local_domains =
-
-
-# If you want to accept mail addressed to your host's literal IP address, for
-# example, mail addressed to "user@[111.111.111.111]", then uncomment the
-# following line, or supply the literal domain(s) as part of "local_domains"
-# above.
-
-# local_domains_include_host_literals
-
-
-# No local deliveries will ever be run under the uids of these users (a colon-
-# separated list). An attempt to do so gets changed so that it runs under the
-# uid of "nobody" instead. This is a paranoic safety catch. Note the default
-# setting means you cannot deliver mail addressed to root as if it were a
-# normal user. This isn't usually a problem, as most sites have an alias for
-# root that redirects such mail to a human administrator.
-
-exim_user = XX_BINOWN_XX
-exim_group = mail
-never_users = root : XX_BINOWN_XX
-
-
-# The use of your host as a mail relay by any host, including the local host
-# calling its own SMTP port, is locked out by default. If you want to permit
-# relaying from the local host, you should set
-#
-# host_accept_relay = localhost
-#
-# If you want to permit relaying through your host from certain hosts or IP
-# networks, you need to set the option appropriately, for example
-#
-# host_accept_relay = my.friends.host : 131.111.0.0/16
-#
-# If you are an MX backup or gateway of some kind for some domains, you must
-# set relay_domains to match those domains. This will allow any host to
-# relay through your host to those domains.
-#
-# See the section of the manual entitled "Control of relaying" for more
-# information.
-
-host_accept_relay = "127.0.0.1/32"
-
-
-# The setting below causes Exim to do a reverse DNS lookup on all incoming
-# IP calls, in order to get the true host name. If you feel this is too
-# expensive, you can specify the networks for which a lookup is done, or
-# remove the setting entirely.
-
-host_lookup = 0.0.0.0/0
-
-
-# By default, Exim expects all envelope addresses to be fully qualified, that
-# is, they must contain both a local part and a domain. If you want to accept
-# unqualified addresses (just a local part) from certain hosts, you can specify
-# these hosts by setting one or both of
-#
-# receiver_unqualified_hosts =
-# sender_unqualified_hosts =
-#
-# to control sender and receiver addresses, respectively. When this is done,
-# unqualified addresses are qualified using the settings of qualify_domain
-# and/or qualify_recipient (see above).
-
-
-# By default, Exim does not make any checks, other than syntactic ones, on
-# incoming addresses during the SMTP dialogue. This reduces delays in SMTP
-# transactions, but it does mean that you might accept messages with unknown
-# recipients, and/or bad senders.
-
-# Uncomment this line if you want incoming recipient addresses to be verified
-# during the SMTP dialogue. Unknown recipients are then rejected at this stage,
-# and the generation of a failure message is the job of the sending host.
-
-# receiver_verify
-
-# Uncomment this line if you want incoming sender addresses (return-paths) to
-# be verified during the SMTP dialogue. Verification can normally only check
-# that the domain exists.
-
-# sender_verify
-
-
-# Exim contains support for the Realtime Blocking List (RBL) that is being
-# maintained as part of the DNS. See http://maps.vix.com/rbl/ for background.
-# Uncommenting the first line below will make Exim reject mail from any
-# host whose IP address is blacklisted in the RBL at maps.vix.com. Some
-# others have followed the RBL lead and have produced other lists: DUL is
-# a list of dial-up addresses, and ORBS is a list of open relay systems. The
-# second line below checks all three lists.
-
-# rbl_domains = rbl.maps.vix.com
-# rbl_domains = rbl.maps.vix.com:dul.maps.vix.com:relays.orbs.org
-
-
-# If you want Exim to support the "percent hack" for all your local domains,
-# uncomment the following line. This is the feature by which mail addressed
-# to x%y@z (where z is one of your local domains) is locally rerouted to
-# x@y and sent on. Otherwise x%y is treated as an ordinary local part.
-
-# percent_hack_domains = *
-
-pid_file_path = /var/run/exim%s.pid
-
-
-end
-
-
-
-######################################################################
-#                      TRANSPORTS CONFIGURATION                      #
-######################################################################
-#                       ORDER DOES NOT MATTER                        #
-#     Only one appropriate transport is called for each delivery.    #
-######################################################################
-
-# A transport is used only when referenced from a director or a router that
-# successfully handles an address.
-
-
-# This transport is used for delivering messages over SMTP connections.
-
-remote_smtp:
-  driver = smtp
-
-
-# This transport is used for local delivery to user mailboxes. By default
-# it will be run under the uid and gid of the local user, and requires
-# the sticky bit to be set on the /var/mail directory. Some systems use
-# the alternative approach of running mail deliveries under a particular
-# group instead of using the sticky bit. The commented options below show
-# how this can be done.
-
-local_delivery:
-  driver = appendfile
-  file = /var/mail/${local_part}
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-  group = mail
-  mode = 0660
-
-
-# This transport is used for handling pipe deliveries generated by alias
-# or .forward files. If the pipe generates any standard output, it is returned
-# to the sender of the message as a delivery error. Set return_fail_output
-# instead of return_output if you want this to happen only when the pipe fails
-# to complete normally. You can set different transports for aliases and
-# forwards if you want to - see the references to address_pipe below.
-
-address_pipe:
-  driver = pipe
-  return_output
-
-
-# This transport is used for handling deliveries directly to files that are
-# generated by aliassing or forwarding.
-
-address_file:
-  driver = appendfile
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-
-
-# This transport is used for handling autoreplies generated by the filtering
-# option of the forwardfile director.
-
-address_reply:
-  driver = autoreply
-
-
-end
-
-
-
-######################################################################
-#                      DIRECTORS CONFIGURATION                       #
-#             Specifies how local addresses are handled              #
-######################################################################
-#                          ORDER DOES MATTER                         #
-#   A local address is passed to each in turn until it is accepted.  #
-######################################################################
-
-# Local addresses are those with a domain that matches some item in the
-# "local_domains" setting above, or those which are passed back from the
-# routers because of a "self=local" setting (not used in this configuration).
-
-
-# This director handles aliasing using a traditional /etc/aliases file.
-# If any of your aliases expand to pipes or files, you will need to set
-# up a user and a group for these deliveries to run under. You can do
-# this by uncommenting the "user" option below (changing the user name
-# as appropriate) and adding a "group" option if necessary. Alternatively, you
-# can specify "user" on the transports that are used. Note that those
-# listed below are the same as are used for .forward files; you might want
-# to set up different ones for pipe and file deliveries from aliases.
-
-system_aliases:
-  driver = aliasfile
-  file = /etc/aliases
-  search_type = lsearch
-  file_transport = address_file
-  pipe_transport = address_pipe
-  user = XX_BINOWN_XX
-
-
-# This director handles forwarding using traditional .forward files.
-# If you want it also to allow mail filtering when a forward file
-# starts with the string "# Exim filter", uncomment the "filter" option.
-
-# The no_verify setting means that this director will be skipped when
-# verifying addresses if sender_verify or receiver_verify is set (though
-# they are not set by default). Similarly, no_expn means that this director
-# will be skipped if smtp_expn_hosts is set to allow any hosts to use the
-# EXPN command.
-
-# The check_ancestor option means that if the forward file generates an
-# address that is an ancestor of the current one, the current one gets
-# passed on instead. This covers the case where A is aliased to B and B
-# has a .forward file pointing to A.
-
-# The three transports specified at the end are those that are used when
-# forwarding generates a direct delivery to a file, or to a pipe, or sets
-# up an auto-reply, respectively.
-
-userforward:
-  driver = forwardfile
-  file = .forward
-  no_verify
-  no_expn
-  check_ancestor
-# filter
-  file_transport = address_file
-  pipe_transport = address_pipe
-  reply_transport = address_reply
-
-
-# This director matches local user mailboxes.
-
-localuser:
-  driver = localuser
-  transport = local_delivery
-
-
-end
-
-
-
-######################################################################
-#                      ROUTERS CONFIGURATION                         #
-#            Specifies how remote addresses are handled              #
-######################################################################
-#                          ORDER DOES MATTER                         #
-#  A remote address is passed to each in turn until it is accepted.  #
-######################################################################
-
-# Remote addresses are those with a domain that does not match any item
-# in the "local_domains" setting above.
-
-
-# This router routes to remote hosts over SMTP using a DNS lookup with
-# default options.
-
-lookuphost:
-  driver = lookuphost
-  transport = remote_smtp
-
-
-# This router routes to remote hosts over SMTP by explicit IP address,
-# given as a "domain literal" in the form [nnn.nnn.nnn.nnn]. The RFCs
-# require this facility, which is why it is enabled by default in Exim.
-# If you want to lock it out, set forbid_domain_literals in the main
-# configuration section above.
-
-literal:
-  driver = ipliteral
-  transport = remote_smtp
-
-
-end
-
-
-
-######################################################################
-#                      RETRY CONFIGURATION                           #
-######################################################################
-
-# This single retry rule applies to all domains and all errors. It specifies
-# retries every 15 minutes for 2 hours, then increasing retry intervals,
-# starting at 1 hour and increasing each time by a factor of 1.5, up to 16
-# hours, then retries every 8 hours until 4 days have passed since the first
-# failed delivery.
-
-# Domain               Error       Retries
-# ------               -----       -------
-
-*                      *           F,2h,15m; G,16h,1h,1.5; F,4d,8h
-
-end
-
-
-
-######################################################################
-#                      REWRITE CONFIGURATION                         #
-######################################################################
-
-# There are no rewriting specifications in this default configuration file.
-
-# End of Exim configuration file
diff --git a/mail/exim-devel/files/exim.sh b/mail/exim-devel/files/exim.sh
deleted file mode 100644
index 6e25c5a56d0b..000000000000
--- a/mail/exim-devel/files/exim.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-args='-bd -q30m'
-
-case "$1" in
-start)
-	[ -x /usr/local/sbin/exim ] && /usr/local/sbin/exim $args && echo -n ' exim'
-	;;
-stop)
-	killall exim && echo -n ' exim'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
diff --git a/mail/exim-devel/files/eximon.conf b/mail/exim-devel/files/eximon.conf
deleted file mode 100644
index 9a9931490377..000000000000
--- a/mail/exim-devel/files/eximon.conf
+++ /dev/null
@@ -1,172 +0,0 @@
-##################################################
-#                The Exim Monitor                #
-##################################################
-
-# This is the template for the Exim monitor's main build-time configuration
-# file. It contains settings that are independent of any operating system. It
-# should be edited and then saved to a file called Local/eximon.conf before
-# running the make command to build the monitor, if any settings are required.
-# Local/eximon.conf can be empty if no changes are needed. The examples given
-# here (commented out) are the default settings.
-
-# Any settings made in the configuration file can be overridden at run time
-# by setting up an environment variable with the same name as any of these
-# options, but preceded by EXIMON_, for example, EXIMON_WINDOW_TITLE.
-
-
-##################################################################
-#      Set these variables as appropriate for your system        #
-##################################################################
-
-# The qualifying name for your domain. The only use made of this is for
-# testing that certain addresses are the same when displaying the
-# log tail, and for shortening sender addresses in the queue display.
-
-# QUALIFY_DOMAIN=
-
-# The default minimum width and height for the whole window are 103 and
-# 162 pixels respectively. This is enough to hold the left-most stripchart
-# and the quit button. The values can be changed here.
-
-MIN_HEIGHT=162
-MIN_WIDTH=103
-
-# The title for eximon's main display window. It is possible to have
-# host name of the machine you are running on substituted into the
-# title string. If you include the string ${fullhostname} then the
-# complete name is used. If you include ${hostname} then the full
-# host name will have the string contained in the DOMAIN variable
-# stripped from its right-hand end before being substituted. Any other
-# shell or environment variables may also be included.
-
-# If you use any substitutions, remember to ensure that the $ and {}
-# characters are escaped from the shell, e.g. by using single quotes.
-
-WINDOW_TITLE="${hostname} eximon"
-
-# The domain that you want to be stripped from the machine's full hostname
-# when forming the short host name for the eximon window title, as
-# described above.
-
-# DOMAIN=
-
-# Parameters for the rolling display of the tail of the exim log file.
-# The width and depth are measured in pixels; LOG_BUFFER specifies the
-# amount of store to set aside for holding the log tail, which is displayed
-# in a scrolling window. When this store is full, the earlier 50% of it
-# is discarded - this is much more efficient that throwing it away line
-# by line. The number given can be followed by the letter K to indicate
-# that the value is in kilobytes. A minimum value of 1K is enforced.
-
-LOG_DEPTH=300
-LOG_WIDTH=950
-LOG_BUFFER=20K
-
-# The font which is used in the log tail display. This is defined in
-# the normal X manner. It must be a "character cell" font, because this
-# is required by the text widget.
-
-# LOG_FONT=-misc-fixed-medium-r-normal-*-14-140-*-*-*-*-iso8859-1
-
-# Parameters for the display of message that are on the exim queue.
-# The width and depth are measured in pixels.
-
-QUEUE_DEPTH=200
-QUEUE_WIDTH=950
-
-# The font which is used in the queue display.
-
-# QUEUE_FONT=$LOG_FONT
-
-# When a message has more than one undelivered address, they are listed
-# one below the other. A limit can be placed on the number of addresses
-# displayed for any one message. If there are more, then "..." is used
-# to indicate this.
-
-QUEUE_MAX_ADDRESSES=10
-
-# The display of the contents of the queue is updated every QUEUE_INTERVAL
-# seconds by default (there is a button to request update).
-
-QUEUE_INTERVAL=300
-
-# The size of the popup text window that is used for looking at the
-# contents of messages, etc.
-
-# TEXT_DEPTH=200
-
-# The keystroke/mouse-operation that is used to pop up the menu in the
-# queue window is configurable. The default is Shift with the lefthand
-# mouse button. The name of an alternative can be specified in the standard
-# X way of naming these things. With the default configuration for the monitor,
-# individuals can override this by setting the EXIMON_MENU_EVENT environment
-# variable.
-
-MENU_EVENT='Shift<Btn1Down>'
-
-# When the menu is used to perform an operation on a message, the output
-# from the exim command that is generated is displayed in a separate window
-# by default. Set this option to "no" if you don't want to see the output -
-# the result of the operation is normally visible in the log window in any
-# case. This does not apply to the output generated from attempting to
-# deliver a message. That is always shown.
-
-ACTION_OUTPUT=yes
-
-# When some action is taken on a message, such as freezing it, or changing
-# its recipients, the queue display is normally automatically updated. On
-# systems that have very large queues, this can take some time and be dis-
-# tracting. If this option is set to "no", the queue display is no longer
-# automatically updated after an action is applied to a message.
-
-ACTION_QUEUE_UPDATE=yes
-
-# When the menu item to display a message's body is invoked, the amount
-# of data is limited to BODY_MAX bytes. This limit is a safety precaution
-# to save the screen scrolling for ever on an enormous message.
-
-BODY_MAX=20000
-
-# The stripcharts are updated every STRIPCHART_INTERVAL seconds.
-
-STRIPCHART_INTERVAL=60
-
-# A stripchart showing the count of messages in the queue is always
-# displayed on the left of eximon's window. Its name is "queue" by
-# default, but can be changed by this variable.
-
-QUEUE_STRIPCHART_NAME=queue
-
-# The following variable may be set to the name of a disc partition. If
-# it is, a stripchart showing the percentage fullness of the partition
-# will be displayed as the second stripchart. This can be used to keep
-# a display of a mail spool partition on the screen.
-
-# SIZE_STRIPCHART=/var/mail
-
-# The name of the size stripchar will be the last component of SIZE_STRIPCHART
-# unless the following variable is set to override it.
-
-# SIZE_STRIPCHART_NAME=space
-
-# The following variable contains a specification of which stripcharts
-# you want eximon to display based on log entries. The string consists of
-# pairs of strings, delimited by slash characters. The first string in each
-# pair is a regular expression that matches some distinguishing feature in a
-# exim log entry.
-
-# Entries that match the expression will be counted and displayed in a
-# stripchart whose title is given by the second string. The string may
-# be continued over several input lines, provided that it is split
-# after a slash, and an additional slash (optionally preceded by white
-# space) is included at the start of the continuation line.
-
-# Stripcharts configured by the following parameter are displayed to the
-# right of the queue and size stripcharts, in the order defined here.
-
-LOG_STRIPCHARTS='/ <= /in/
-                 / => /out/
-                 / => .+ D=/local/
-                 / => .+ T=[^ ]*smtp/smtp/'
-
-# End of exim_monitor/EDITME
diff --git a/mail/exim-devel/files/patch-aa b/mail/exim-devel/files/patch-aa
deleted file mode 100644
index 64e87ce18a9d..000000000000
--- a/mail/exim-devel/files/patch-aa
+++ /dev/null
@@ -1,89 +0,0 @@
---- scripts/exim_install.orig	Mon Aug  2 17:43:03 1999
-+++ scripts/exim_install	Tue Aug  3 14:31:20 1999
-@@ -142,9 +142,9 @@
-     from=../util/
-   fi
- 
--  if [ ! -s ${from}${name} ]; then
-+  if [ ! -r ${from}${name} ]; then
-     echo $com ""
--    echo $com "*** `pwd`/${from}${name} does not exist or is empty"
-+    echo $com "*** `pwd`/${from}${name} does not exist"
-     echo $com "*** Have you built Exim successfully?"
-     echo $com "*** Exim installation ${ver}failed ***"
-     exit 1
-@@ -195,25 +195,40 @@
-   fi
- done
- 
-+# Install exim.sh startup script in FreeBSD's ${PREFIX}/etc/rc.d so that
-+# exim will start up on boot once sendmail is disabled and
-+# ${PREFIX}/etc/exim/configure is in place.
- 
-+echo $com ""
- 
--# If there is no configuration file, install the default.
-+if [ -f ${PREFIX}/etc/rc.d/exim.sh ]; then
-+  echo $com "${PREFIX}/etc/rc.d/exim.sh exists, not overwritten"
-+else
-+  echo $com "Installing exim.sh startup script in ${PREFIX}/etc/rc.d"
-+  ${real} mkdir -p ${PREFIX}/etc/rc.d
-+  echo ${CP} -p exim.sh ${PREFIX}/etc/rc.d/
-+  ${real} ${CP} -p exim.sh ${PREFIX}/etc/rc.d/
-+  if [ $? -ne 0 ]; then
-+    echo $com ""
-+    echo $com "**** Exim installation ${ver}failed ****"
-+    exit 1
-+  fi
-+fi
-+
-+# Install only a sample configuration, which encourages the admin to look
-+# at it, since Exim won't run without a configure file.
- 
- echo $com ""
- 
--if [ ! -f ${CONFIGURE_FILE} ]; then
--  echo $com Installing default configuration in ${CONFIGURE_FILE}
--  echo $com because there is no existing configuration file.
--  echo ${CP} ../src/configure.default ${CONFIGURE_FILE}
--  ${real} ${CP} ../src/configure.default ${CONFIGURE_FILE}
-+  echo $com Installing sample configuration file
-+  ${real} mkdir -p ${CONFIGURE_FILE%/*}
-+  echo ${CP} ../src/configure.default ${CONFIGURE_FILE}.sample
-+  ${real} ${CP} ../src/configure.default ${CONFIGURE_FILE}.sample
-   if [ $? -ne 0 ]; then
-     echo $com ""
-     echo $com "*** Exim installation ${ver}failed ***"
-     exit 1
-   fi
--else
--  echo $com Configuration file ${CONFIGURE_FILE} already exists
--fi
- 
- # Install info files if the directory is defined and the Texinfo
- # source documentation is present.
-@@ -235,19 +250,21 @@
-   echo $com Info installation directory is ${INFO_DIRECTORY}
-   echo $com ""
- 
--  makeinfo --no-split --output exim_overview.info ../doc/oview.texinfo
-+  makeinfo --no-validate --no-split --output exim_overview.info \
-+      ../doc/oview.texinfo
-   echo ${CP} exim_overview.info ${INFO_DIRECTORY}
-   ${real} ${CP} exim_overview.info ${INFO_DIRECTORY}
-   install-info --section="Exim" \
-       --entry "* Overview: (exim_overview).    Overview of the Exim system" \
-       ${INFO_DIRECTORY}/exim_overview.info ${INFO_DIRECTORY}/dir
--  makeinfo --no-split --output exim.info ../doc/spec.texinfo
-+  makeinfo --no-validate --no-split --output exim.info ../doc/spec.texinfo
-   echo ${CP} exim.info ${INFO_DIRECTORY}
-   ${real} ${CP} exim.info ${INFO_DIRECTORY}
-   install-info --section="Exim" \
-       --entry "* User guide: (exim).           Exim manual" \
-       ${INFO_DIRECTORY}/exim.info ${INFO_DIRECTORY}/dir
--  makeinfo --no-split --output exim_filter.info ../doc/filter.texinfo
-+  makeinfo --no-validate --no-split --output exim_filter.info \
-+      ../doc/filter.texinfo
-   echo ${CP} exim_filter.info ${INFO_DIRECTORY}
-   ${real} ${CP} exim_filter.info ${INFO_DIRECTORY}
-   install-info --section="Exim" \
diff --git a/mail/exim-devel/pkg-comment b/mail/exim-devel/pkg-comment
deleted file mode 100644
index a862bdff5618..000000000000
--- a/mail/exim-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-High performance MTA for Unix systems on the Internet
diff --git a/mail/exim-devel/pkg-descr b/mail/exim-devel/pkg-descr
deleted file mode 100644
index 70a4562b517e..000000000000
--- a/mail/exim-devel/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-Exim is a mail transfer agent for Unix systems connected to the Internet.
-
- .   Exim is intended for use as an Internet mailer, and therefore handles
-     addresses in RFC 822 domain format only. (No bangpaths!)
-
- .   The only external transport currently implemented is an SMTP transport
-     over a TCP/IP network (using sockets). A pipe transport is available,
-     and this could be used to send messages to some other transport mechanism.
-
- .   Exim is very configurable, and its management is very powerful. It can
-     be configured to be "fussy" about certain hosts or domains, and
-     can easily serve multiple domains.
-
- .   Exim is an excellent mailer for an ISP, as its control and flexibility
-     are very good.
-
- .   Its requeuing and retry algorithms are very powerful.
-
-WWW: http://www.exim.org/
diff --git a/mail/exim-devel/pkg-plist b/mail/exim-devel/pkg-plist
deleted file mode 100644
index 908d6b1db1be..000000000000
--- a/mail/exim-devel/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-sbin/exim
-sbin/eximon
-sbin/eximon.bin
-sbin/exim_dumpdb
-sbin/exim_fixdb
-sbin/exim_lock
-sbin/exim_tidydb
-sbin/exinext
-sbin/exiwhat
-sbin/exim_dbmbuild
-sbin/exicyclog
-sbin/exigrep
-sbin/eximstats
-sbin/exiqsumm
-etc/exim/configure.sample
-etc/rc.d/exim.sh
-@unexec install-info --delete %D/info/exim_overview.info %D/info/dir
-@unexec install-info --delete %D/info/exim.info %D/info/dir
-@unexec install-info --delete %D/info/exim_filter.info %D/info/dir
-info/exim_overview.info
-info/exim.info
-info/exim_filter.info
-@exec install-info --section="Exim" --entry "* Overview: (exim_overview).    Overview of the Exim system" %D/info/exim_overview.info %D/info/dir
-@exec install-info --section="Exim" --entry "* User guide: (exim).           Exim manual" %D/info/exim.info %D/info/dir
-@exec install-info --section="Exim" --entry "* Filtering: (exim_filter).     Filtering mail with Exim" %D/info/exim_filter.info %D/info/dir
-@dirrm etc/exim
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
deleted file mode 100644
index 7a343dc74718..000000000000
--- a/mail/exim-old/Makefile
+++ /dev/null
@@ -1,144 +0,0 @@
-# New ports collection makefile for:	exim
-# Date created:		23 June 1996
-# Whom:			markm@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	exim
-PORTVERSION= 	3.15
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \
-		http://www.exim.org/ftp/ \
-		ftp://ftp.is.co.za/networking/mail/transport/exim/
-DISTFILES=	exim-3.15.tar.gz exim-texinfo-3.10.tar.gz
-
-MAINTAINER=	sheldonh@FreeBSD.org
-
-# If WITHOUT_X11 is not defined, the eximon monitor, which requires X, will
-# be built. Comment it out unless you have or want XFree86 installed!
-.if !defined(WITHOUT_X11)
-USE_XLIB=	yes
-.endif
-
-USE_PERL5=	yes
-
-MAKE_ENV+=	OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH}
-
-# Uncomment the WITH_LDAP, WITH_MYSQL, WITH_PAM and WITH_PGSQL definitions
-# to link against libmysqlclient, libpam and libpq respectively.
-# The libpam linkage is required for SMTP AUTH support.
-#WITH_LDAP=	yes
-#WITH_MYSQL=	yes
-#WITH_PAM=	yes
-#WITH_PGSQL=	yes
-
-# Enable the embedded Perl interpreter, allowing Perl subroutines to be
-# called during string expansion.
-WITH_PERL=	yes
-
-# If WITH_PAM is defined then one or more of PAM_CRAM_MD5 and PAM_PLAINTEXT
-# must be left uncommented.
-PAM_CRAM_MD5=	yes
-PAM_PLAINTEXT=	yes
-
-# If WITH_LDAP is defined, LDAP_LIB_TYPE must be one of UMICHIGAN,
-# NETSCAPE or SOLARIS7.
-LDAP_LIB_TYPE=UMICHIGAN
-
-# Uncomment to compile support for non-standard mailbox formats.
-#WITH_MAILDIR=	yes
-#WITH_MAILSTORE=	yes
-#WITH_MBX=	yes
-
-# You should not need to fiddle with anything below this point.
-
-SEDLIST=	-e 's,XX_PREFIX_XX,${PREFIX},' \
-		-e 's,XX_BINOWN_XX,${BINOWN},'
-.if !defined(USE_XLIB)
-SEDLIST+=	-e 's,^EXIM_MONITOR,\#EXIM_MONITOR,'
-.endif
-
-.if !defined(WITH_PERL)
-SEDLIST+=	-e 's,^EXIM_PERL,\#EXIM_PERL,'
-.endif
-
-.if defined(WITH_LDAP)
-LIB_DEPENDS+=	lber.1:${PORTSDIR}/net/openldap
-SEDLIST+=	-e 's,XX_LDAP_LIBS_XX,-L${PREFIX}/lib -llber -lldap,' \
-		-e 's,XX_LDAP_INCLUDE_XX,-I${PREFIX}/include,' \
-		-e 's,XX_LDAP_TYPE_XX,${LDAP_LIB_TYPE},' \
-		-e 's,^\# LOOKUP_LDAP,LOOKUP_LDAP,'
-.else
-SEDLIST+=	-e 's,XX_LDAP_[^ ]*_XX,,' \
-		-e 's,^LDAP_LIB_TYPE,\#LDAP_LIB_TYPE,'
-.endif
-
-.if defined(WITH_MYSQL)
-LIB_DEPENDS+=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
-SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
-		-e 's,XX_MYSQL_INCLUDE_XX,-I${PREFIX}/include/mysql,' \
-		-e 's,^\# LOOKUP_MYSQL,LOOKUP_MYSQL,'
-.else
-SEDLIST+=	-e 's,XX_MYSQL_[^ ]*_XX,,'
-.endif
-
-.if defined(WITH_PAM)
-SEDLIST+=	-e 's,XX_PAM_LIBS_XX,-lpam,'
-.else
-SEDLIST+=	-e 's,XX_PAM_LIBS_XX,,' \
-		-e 's,^SUPPORT_PAM,\#SUPPORT_PAM,' 
-.endif
-
-.if !defined(WITH_PAM) || !defined(PAM_CRAM_MD5)
-SEDLIST+=	-e 's,^AUTH_CRAM_MD5,\#AUTH_CRAM_MD5,'
-.endif
-
-.if !defined(WITH_PAM) || !defined(PAM_PLAINTEXT)
-SEDLIST+=	-e 's,^AUTH_PLAINTEXT,\#AUTH_PLAINTEXT,'
-.endif
-
-.if defined(WITH_PGSQL)
-LIB_DEPENDS+=	pq.2:${PORTSDIR}/databases/postgresql
-SEDLIST+=	-e 's,XX_PGSQL_LIBS_XX,-L${PREFIX}/pgsql/lib -lpq,' \
-		-e 's,XX_PGSQL_INCLUDE_XX,-I${PREFIX}/pgsql/include,' \
-		-e 's,^\# LOOKUP_PGSQL,LOOKUP_PGSQL,'
-.else
-SEDLIST+=	-e 's,XX_PGSQL_[^ ]*_XX,,'
-.endif
-
-.if !defined(WITH_PGSQL) && !defined(WITH_MYSQL) && !defined(WITH_LDAP)
-SEDLIST+=	-e 's,^LOOKUP_LIBS,\#LOOKUP_LIBS,' \
-		-e 's,^LOOKUP_INCLUDE,\#LOOKUP_INCLUDE,'
-.endif
-
-.if defined(WITH_MAILDIR)
-SEDLIST+=	-e 's,^\# SUPPORT_MAILDIR,SUPPORT_MAILDIR,'
-.endif
-
-.if defined(WITH_MAILSTORE)
-SEDLIST+=	-e 's,^\# SUPPORT_MAILSTORE,SUPPORT_MAILSTORE,'
-.endif
-
-.if defined(WITH_MBX)
-SEDLIST+=	-e 's,^\# SUPPORT_MBX,SUPPORT_MBX,'
-.endif
-
-do-configure:
-	${MKDIR} ${WRKSRC}/Local
-	${SED} ${SEDLIST} < ${FILESDIR}/Makefile > ${WRKSRC}/Local/Makefile
-	${SED} ${SEDLIST} < ${FILESDIR}/configure.default \
-	    > ${WRKSRC}/src/configure.default
-	${CP} ${FILESDIR}/eximon.conf ${WRKSRC}/Local
-	cd ${WRKSRC}/doc && \
-	for i in ../../exim-texinfo-3.10/doc/* ; do \
-		${LN} -sf $$i ; \
-	done
-
-post-build:
-	${INSTALL_SCRIPT} ${FILESDIR}/exim.sh \
-		${WRKSRC}/build-${OPSYS}-${MACHINE_ARCH}
-	${TOUCH} ${WRKSRC}/build-${OPSYS}-${MACHINE_ARCH}/eximon.bin
-	${TOUCH} ${WRKSRC}/build-${OPSYS}-${MACHINE_ARCH}/eximon
-
-.include <bsd.port.mk>
diff --git a/mail/exim-old/distinfo b/mail/exim-old/distinfo
deleted file mode 100644
index a090af811d3a..000000000000
--- a/mail/exim-old/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (exim-3.15.tar.gz) = ee9cc11d3f4f3ec0ff40ea609e122e14
-MD5 (exim-texinfo-3.10.tar.gz) = c8c2596e6a303f774e0a627e61b4dffc
diff --git a/mail/exim-old/files/Makefile b/mail/exim-old/files/Makefile
deleted file mode 100644
index 63021a5cd58a..000000000000
--- a/mail/exim-old/files/Makefile
+++ /dev/null
@@ -1,542 +0,0 @@
-##################################################
-#          The Exim mail transport agent         #
-##################################################
-# $FreeBSD$
-
-# This is the template for Exim's main build-time configuration file. It
-# contains settings that are independent of any operating system. It should
-# be edited and then saved to a file called Local/Makefile before first running
-# the make command.
-
-# Things that depend on the operating system have default settings in
-# OS/Makefile-Default, but these are overridden for some OS by files called
-# called OS/Makefile-<osname>. You can further override these by creating files
-# called Local/Makefile-<osname>, where "<osname>" stands for the name of your
-# operating system - look at the names in the OS directory to see which names
-# are recognized.
-
-# However, if you are building Exim for a single OS only, you can place all the
-# configuration settings in the one file called Local/Makefile; only if you are
-# building for several OS from the same source files do you need to worry
-# about splitting off the OS-dependent settings into separate files.
-
-# One OS-specific thing is the C compiler; the overall default is gcc, but
-# some OS Makefiles specify cc. You can override anything that is set by
-# putting CC=whatever in your Local/Makefile.
-
-# NOTE: You should never need to edit any of the distributed Makefiles; all
-# overriding can be done in your Local/Makefile(s). This will make it easier
-# for you when the next release comes along.
-
-# The location of the X11 libraries is something else that is quite variable
-# even between different versions of the same operation system (and indeed
-# there are different versions of X11 as well, of course). The four settings
-# concerned here are X11, XINCLUDE, XLFLAGS (linking flags) and X11_LD_LIB
-# (dynamic run-time library).
-
-# Another area of variability between systems is the type and location of the
-# dbm library package. Exim has support for ndbm, gdbm, and Berkeley DB. By
-# default it assumes ndbm; this often works with gdbm or DB, provided they
-# are correctly installed, via their compatibility interfaces. However, Exim
-# can also be configured to use the native calls for Berkeley DB 1.85 or
-# Berkeley DB version 2.x, and this is defaulted for some operating systems.
-# The defaults are set in OS/Makefile-Default, and can be changed by putting
-# things into an OS-specific Makefile, or indeed into the main Local/Makefile
-# if Exim is being compiled for a single OS only.
-
-# See also the file doc/dbm.discuss.txt for discussion about different dbm
-# libraries.
-
-# In Local/Makefiles blank lines and lines starting with # are ignored. It is
-# also permitted to use the # character to add a comment to a setting, for
-# example
-#
-# EXIM_GID=42   # the "mail" group
-#
-# However, with some versions of "make" this works only if there is no white
-# space between the end of the setting and the #, so it is probably best
-# avoided. However, a consequence of this facility is that it is not possible
-# to have the # character present in any setting, but I can't think of any
-# cases where this would be wanted.
-###############################################################################
-
-
-# /bin/sh is normally used as the shell in which to run commands that are
-# defined in the makefiles. This can be changed if necessary, but note that
-# a Bourne-compatible shell is expected.
-
-# MAKE_SHELL=/bin/sh
-
-
-# The following commands live in different places in some OS. The OS-specific
-# files should normally point to the right place, but they can be overridden
-# here if necessary. Perl is not necessary for running Exim unless you set
-# EXIM_PERL (see below) to get it embedded, but there are some Perl utilities
-# for processing log files. If you haven't got Perl, Exim will still build and
-# run; you just won't be able to run those utilities.
-
-# CHOWN_COMMAND=/usr/bin/chown
-# CHGRP_COMMAND=/usr/bin/chgrp
-# MV_COMMAND=/bin/mv
-# RM_COMMAND=/bin/rm
-# PERL_COMMAND=/usr/bin/perl
-
-
-# The following macro can be used to change the command for building a library
-# of functions. By default the "ar" command is used, with options "cq".
-
-# AR=ar cq
-
-
-# Exim has some support for the AUTH extension of SMTP (RFC 2554). If you want
-# to use this you must uncomment at least one of the following macros so that
-# appropriate code is included in the binary. You then need to set up the
-# runtime configuration to make use of the mechanism(s) selected.
-
-AUTH_CRAM_MD5=yes
-AUTH_PLAINTEXT=yes
-
-
-# The binary directory: This variable defines where the exim binary will be
-# installed by "make install" or "exim_install". It is also used internally
-# by exim when it needs to re-invoke itself, either to send an error message,
-# or to recover root privilege. Exim's utility binaries and scripts are also
-# installed in this directory. There is no default for this variable built into
-# the source files; it must be set in one of the local configuration files.
-
-BIN_DIRECTORY=XX_PREFIX_XX/sbin
-
-
-# The default distribution of Exim contains only the plain text form of the
-# documentation. Other forms are available separately. If you want to install
-# the documentation in "info" format, first fetch the Texinfo documentation
-# sources from the ftp directory and unpack them, which should create files
-# with the extension "texinfo" in the doc directory. Then set INFO_DIRECTORY to
-# your info directory; "make install" will then build the info files and
-# install them there.
-
-INFO_DIRECTORY=XX_PREFIX_XX/info
-
-
-# The compress command is used by the exicyclog script to compress old log
-# files. Both the name of the command and the suffix that it adds to files
-# need to be defined here. See also the EXICYCLOG_MAX configuration.
-
-COMPRESS_COMMAND=/usr/bin/gzip
-COMPRESS_SUFFIX=gz
-
-
-# If the exigrep utility is fed compressed log files, it tries to uncompress
-# them using this command.
-
-ZCAT_COMMAND=/usr/bin/zcat
-
-
-# The runtime configuration file: This variable defines where Exim's runtime
-# configuration file is. There is no default built into the source files, so
-# there must be a setting in one of the local configuration files. The
-# location of all other runtime files and directories can be changed in the
-# runtime configuration file.
-
-CONFIGURE_FILE=XX_PREFIX_XX/etc/exim/configure
-
-
-# In some installations there may be multiple machines sharing file systems,
-# where a different configuration file is required for Exim on the different
-# machines. If CONFIGURE_FILE_USE_NODE is defined, then Exim will first look
-# for a configuration file whose name is that defined by CONFIGURE_FILE,
-# with the node name obtained by uname() tacked on the end, separated by a
-# period (for example, /usr/exim/configure.host.in.some.domain. If this file
-# does not exist, then the bare configuration file name is tried.
-
-# CONFIGURE_FILE_USE_NODE=yes
-
-
-# In some esoteric configurations two different versions of Exim are run,
-# with different setuid values, and different configuration files are required
-# to handle the different cases. If CONFIGURE_FILE_USE_EUID is defined, then
-# Exim will first look for a configuration file whose name is that defined
-# by CONFIGURE_FILE, with the effective uid tacked on the end, separated by
-# a period (for eximple, /usr/exim/configure.0). If this file does not exist,
-# then the bare configuration file name is tried. In the case when both
-# CONFIGURE_FILE_USE_EUID and CONFIGURE_FILE_USE_NODE are set, four files
-# are tried: <name>.<euid>.<node>, <name>.<node>, <name>.<euid>, and <name>.
-
-# CONFIGURE_FILE_USE_EUID=yes
-
-
-# The size of the delivery buffer: This specifies the size of buffer which is
-# used when copying a message from the spool to a destination. The default
-# value built into the source is 8192.
-
-# DELIVER_BUFFER_SIZE=8192
-
-
-# Included directors: These variables determine which individual director
-# drivers are included in the Exim binary. There are no defaults; those that
-# are wanted must be defined here by setting the appropriate variables to the
-# value "yes". The actions of each director are described in a separate chapter
-# in the manual. Including a director in the binary does not cause it to
-# be used automatically. It has also to be specified in the runtime
-# configuration file.
-
-DIRECTOR_ALIASFILE=yes
-DIRECTOR_FORWARDFILE=yes
-DIRECTOR_LOCALUSER=yes
-DIRECTOR_SMARTUSER=yes
-
-
-# The mode of the database directory: Exim creates a directory called "db"
-# in its spool directory, to hold its databases of hints. This variable
-# determines the mode of the created directory. The default value in the
-# source is 0750.
-
-# DB_DIRECTORY_MODE=0750
-
-
-# Database file mode: The mode of files created in the "db" directory defaults
-# to 0640 in the source, and can be changed here.
-
-# DB_MODE=0640
-
-
-# Database lock file mode: The mode of zero-length files created in the "db"
-# directory to use for locking purposes defaults to 0640 in the source, and
-# can be changed here.
-
-# DB_LOCKFILE_MODE=0640
-
-
-# Cycling log files: this variable specifies the maximum number of old
-# log files that are kept by the exicyclog log-cycling script.
-
-EXICYCLOG_MAX=10
-
-
-# Running Exim without it being root all the time: A uid and gid for Exim can
-# be specified here, and this is strongly recommended. These values are
-# compiled into the binary. It is possible to change them by settings in the
-# runtime configuration file, but setting them here is preferred. If EXIM_UID
-# is not defined, the default in the code is to run as root (unless specified
-# otherwise at run time) except when doing local deliveries, when it always
-# runs as the appropriate local user. Specifying 0 at run time has the effect
-# of unsetting the values build into the binary.
-
-# The settings here must be numeric; the run time file allows names to
-# be used. When this uid and gid are set, the Exim binary still has to be
-# setuid root if local deliveries are to be performed or a listener on port
-# 25 is to be run, but it gives up its privilege when possible. There is a
-# trade-off between security and efficiency, controlled by the runtime
-# "security" setting, which controls how privilege is released (setuid vs
-# seteuid).
-
-# EXIM_UID=
-# EXIM_GID=
-
-
-# Compiling the Exim monitor: If you want to compile the Exim monitor,
-# a program that requires an X11 display, then EXIM_MONITOR should be
-# set to the value "eximon.bin". Comment out this setting to disable
-# compilation of the binary file that is run by the eximon script. The
-# locations of various X11 directories for libraries and include files
-# are defaulted in the OS/Makefile-Default file, and can be overridden
-# in local OS-specific make files.
-
-EXIM_MONITOR=eximon.bin
-
-
-# Compiling in support for embedded Perl: If you want to be able to
-# use Perl code in Exim's string manipulation language and you have Perl
-# (version 5.004 or later) installed, set EXIM_PERL to perl.o.
-
-EXIM_PERL=perl.o
-
-
-# There are also three options which are used when compiling the Perl interface
-# and when linking with Perl. The default values for these are placed
-# automatically at the head of the Makefile by the script which builds it.
-# However, if you want to override them, you can do so here.
-
-# PERL_CC=
-# PERL_CCOPTS=
-# PERL_LIBS=
-
-
-# This parameter sets the maximum length of the header portion of a message
-# that Exim is prepared to process. The default setting is one megabyte. There
-# is a limit in order to catch rogue mailers that might connect to your SMTP
-# port, start off a header line, and then just pump junk at it for ever. The
-# message_size_limit option would also catch this, but it may not be set.
-
-# HEADER_MAXSIZE="(1024*1024)"
-
-
-# The mode of the input directory: The input directory is where messages are
-# kept while awaiting delivery. Exim creates it if necessary, using a mode
-# which can be defined here (default 0750).
-
-# INPUT_DIRECTORY_MODE=0750
-
-
-# Exim log directory and files: Exim creates several log files inside a
-# single log directory. You can define the directory and the form of the
-# log file name here, by setting LOG_FILE_PATH to a path name containing one
-# occurrence of %s. This will be replaced by one of the strings "main",
-# "panic", or "reject" to form the final file name. For example, some
-# installations may want something like this:
-
-LOG_FILE_PATH=/var/log/exim_%slog
-
-# which results in files with names /var/log/exim_mainlog, etc. The directory
-# in which the log files are placed must exist; Exim does not try to create
-# it for itself. It is also your responsibility to ensure that Exim is capable
-# of writing files using this path name. If you have defined EXIM_UID and
-# EXIM_GID above, then that uid and gid must be able to create files in the
-# directory you have specified.
-
-# You can also configure Exim to use syslog, instead of or as well as log
-# files, by settings such as these
-
-# LOG_FILE_PATH=syslog
-# LOG_FILE_PATH=syslog:/var/log/exim_%slog
-
-# Do not include white space in such a setting as it messes up the building
-# process.
-
-# You do not have to define the log file path here; an option in the runtime
-# configuration file can also set it, and that overrides any setting here.
-# However, it is recommended that you set it here if it is a fixed path, so
-# that it is available right from the start of Exim's execution. Otherwise,
-# errors detected early on, for example errors in the configuration file,
-# cannot be logged.
-
-# If you do not set LOG_FILE_PATH here or in the runtime configuration, Exim
-# creates a directory called "log" inside its spool directory (see
-# SPOOL_DIRECTORY below) and uses that with filenames "mainlog", "paniclog",
-# etc. Its mode defaults to 0750 but that can be changed here.
-
-# LOG_DIRECTORY_MODE=0750
-
-# This value is used only when Exim creates the directory for itself.
-
-# The log files themselves are created as required, with a mode that defaults
-# to 0640, but which can be changed here.
-
-# LOG_MODE=0640
-
-
-# Included file and database lookup methods. See the manual chapter entitled
-# "File and database lookups" for discussion. DBM and lsearch (linear search)
-# are included by default. LOOKUP_DNSDB does *not* refer to general mail
-# routing using the DNS. It is for the specialist case of using the DNS as
-# a general database facility (not common). For details of cdb files and the
-# tools to build them, see http://www.pobox.com/~djb/cdb.html.
-
-LOOKUP_DBM=yes
-LOOKUP_LSEARCH=yes
-
-# LOOKUP_CDB=yes
-# LOOKUP_DNSDB=yes
-# LOOKUP_LDAP=yes
-# LOOKUP_MYSQL=yes
-# LOOKUP_NIS=yes
-# LOOKUP_NISPLUS=yes
-# LOOKUP_PGSQL=yes
-
-# Additional libraries and include directories may be required for some
-# lookup styles, e.g. LDAP, MYSQL or PGSQL. LOOKUP_LIBS is included only on
-# the command for linking Exim itself, not on any auxiliary programs. You
-# don't need to set LOOKUP_INCLUDE if the relevant directories are already
-# specified in INCLUDE.
-
-# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq
-LOOKUP_INCLUDE=XX_MYSQL_INCLUDE_XX XX_PGSQL_INCLUDE_XX XX_LDAP_INCLUDE_XX
-LOOKUP_LIBS=XX_MYSQL_LIBS_XX XX_PGSQL_LIBS_XX XX_LDAP_LIBS_XX
-
-# If you have set LDAP=yes, you should set LDAP_LIB_TYPE to indicate which LDAP
-# library you have. Unfortunately, though most of their functions are the
-# same, there is a difference in error handling. Currently Exim knows about
-# three LDAP libraries: the one from the University of Michigan, the Netscape
-# SDK library, and the library that comes with Solaris 7. Uncomment whichever
-# of these you are using.
-
-# LDAP_LIB_TYPE=UMICHIGAN
-# LDAP_LIB_TYPE=NETSCAPE
-# LDAP_LIB_TYPE=SOLARIS7
-LDAP_LIB_TYPE=XX_LDAP_TYPE_XX
-
-# If you don't set any of these, Exim applies a heuristic to distinguish the
-# University of Michigan library, but it cannot distinguish between the other
-# two.
-
-# The TESTDB lookup is for performing tests on the handling of lookup
-# results, and is not useful for general running. It should be included
-# only when debugging the code of Exim.
-
-# LOOKUP_TESTDB=yes
-
-
-# Network interfaces: Unless you set the local_interfaces option in the runtime
-# configuration file to restrict Exim to certain interfaces only, it will run
-# code to find all the interfaces there are on your host. Unfortunately,
-# the call to the OS that does this requires a buffer large enough to hold
-# data for all the interfaces - it was designed of course in the days when a
-# host rarely had more than three or four at most. Nowadays hosts can have
-# very many virtual interfaces running on the same hardware. If you have more
-# than 250 virtual interfaces, you will need to uncomment this setting and
-# increase the value.
-
-# MAXINTERFACES=250
-
-
-# Per-message logs: While a message is in the process of being delivered,
-# comments on its progress are written to a message log, for the benefit of
-# human administrators. These logs are held in a directory called "msglog"
-# in the spool directory. Its mode defaults to 0750, but can be changed here.
-# The message log directory is also used for storing files that are used by
-# transports for returning data to a message's sender (see the "return_output"
-# option for transports).
-
-# MSGLOG_DIRECTORY_MODE=0750
-
-
-# Identifying the daemon: When an Exim daemon starts up, it writes its pid to
-# a file so that it can easily be identified. The path of the file can be
-# specified here. It must contain precisely one occurrence of "%s". When
-# a daemon is run on the default SMTP port, this is replaced with the null
-# string, but when it is run with some explicit port specified, "%s" is
-# replaced with the port number preceded by a dot. If a daemon is run with
-# only one of -bd and -q<time>, then that option is added on to the end of
-# the file name, allowing sites that run two separate daemons to distinguish
-# them. Some installations may want something like this
-
-# PID_FILE_PATH=/var/run/exim%s.pid
-
-# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
-# (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard
-# daemon, or "exim-daemon.<port>.pid" for a daemon listening on a non-standard
-# port. If you run a daemon that does not have both the -bd and -q options,
-# then whichever of the two options it does have is added to the file name,
-# whether obtained from PID_FILE_PATH or by default.
-
-# The pid file path does not have to be set here; it can be also be set by an
-# option in the runtime configuration file, which takes precedence over any
-# setting here.
-
-
-# Included routers: These variables determine which individual router drivers
-# are included in the Exim binary. There are no defaults; those that are
-# wanted must be defined here by setting the appropriate variables to the value
-# "yes". The actions of each router are described in a separate chapter
-# in the manual. Including a router in the binary does not cause it to
-# be used automatically. It has also to be specified in the runtime
-# configuration file. Those routers that are *not* wanted must not be defined
-# here at all - comment them out.
-
-ROUTER_DOMAINLIST=yes
-ROUTER_IPLITERAL=yes
-ROUTER_LOOKUPHOST=yes
-ROUTER_QUERYPROGRAM=yes
-
-# This one is very special-purpose, so is not included by default.
-
-# ROUTER_IPLOOKUP=yes
-
-
-# The spool directory: This directory is where all the data for messages in
-# transit is kept. There is no default in the source, so its location must be
-# defined in a local compile-time configuration file, or in the runtime
-# configuration. It is recommended (but not mandatory) that you define it here
-# if it is a fixed path, especially if you have not defined LOG_FILE_PATH. Log
-# files are then written in a sub-directory of the spool directory, and it is
-# helpful to have this defined right from the start of execution so that, for
-# example, errors in reading the runtime configuration file can be logged.
-
-# Exim creates the spool directory if it does not exist. If a non-root uid and
-# gid have been defined for Exim (either in this configuration file, or by the
-# runtime configuration options), then this directory and all sub-directories
-# and their files will be created with their owners and groups set to Exim's
-# uid and gid.
-
-# Many installations will want something like this:
-SPOOL_DIRECTORY=/var/spool/exim
-
-# Others may prefer to keep all Exim things under one directory:
-# SPOOL_DIRECTORY=/usr/exim/spool
-
-
-# If Exim creates the spool directory, it is given this mode, defaulting in the
-# source to 0750.
-
-# SPOOL_DIRECTORY_MODE=0750
-
-
-# The mode of files on the input spool which hold the contents of message can
-# be changed here. The default is 0600. If you have defined a uid and gid for
-# Exim and want information from the spool to be available to anyone who is a
-# member of the Exim group, change the value to 0640. This is particularly
-# relevant if you are going to run the Exim monitor.
-
-# SPOOL_MODE=0600
-
-
-# If STDERR_FILE is defined then the -df command line option causes Exim to
-# redirect stderr to the named file. This is useful for catching debugging
-# output when starting Exim via inetd.
-
-# STDERR_FILE=
-
-
-# The appendfile transport can write messages as individual files in a number
-# of formats. The code for three specialist formats, maildir, mailstore, and
-# MBX, is included only when requested by the following settings:
-
-# SUPPORT_MAILDIR=yes
-# SUPPORT_MAILSTORE=yes
-# SUPPORT_MBX=yes
-
-
-# Moving frozen messages: If the following is uncommented, Exim is compiled
-# with support for automatically moving frozen messages out of the main spool
-# directory, a facility that is found useful by some large installations. A
-# runtime option is required to cause the moving actually to occur. Such
-# messages become "invisible" to the normal management tools.
-
-# SUPPORT_MOVE_FROZEN_MESSAGES=yes
-
-
-# Support for PAM (Pluggable Authentication Modules), a facility
-# which is available in the latest releases of Solaris and in some GNU/Linux
-# distributions (see http://ftp.at.kernel.org/pub/linux/libs/pam/). The Exim
-# support, which is intended for use in conjunction with the SMTP AUTH
-# facilities, is included only when requested by the following setting:
-
-SUPPORT_PAM=yes
-
-# You probably need to add -lpam to EXTRALIBS, and in some releases of
-# GNU/Linux -ldl is also needed.
-
-
-# Included transports: These variables determine which individual transport
-# drivers are included in the Exim binary. There are no defaults; those that
-# are wanted must be defined here by setting the appropriate variables to the
-# value "yes". The actions of each transport are described in a separate chapter
-# in the manual. Including a transport in the binary does not cause it to
-# be used automatically. It has also to be specified in the runtime
-# configuration file.
-
-TRANSPORT_APPENDFILE=yes
-TRANSPORT_AUTOREPLY=yes
-TRANSPORT_PIPE=yes
-TRANSPORT_SMTP=yes
-
-
-# TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment
-# this setting. See the manual section entitled "Use of tcpwrappers" in the
-# chapter on building and installing Exim.
-
-USE_TCP_WRAPPERS=yes
-EXTRALIBS=-lwrap XX_PAM_LIBS_XX
-
-# End of EDITME
diff --git a/mail/exim-old/files/configure.default b/mail/exim-old/files/configure.default
deleted file mode 100644
index 2a3d30528ead..000000000000
--- a/mail/exim-old/files/configure.default
+++ /dev/null
@@ -1,370 +0,0 @@
-######################################################################
-#                  Runtime configuration file for Exim               #
-######################################################################
-
-
-# This is a default configuration file which will operate correctly in
-# uncomplicated installations. Please see the manual for a complete list
-# of all the runtime configuration options that can be included in a
-# configuration file. There are many more than are mentioned here. The
-# manual is in the file doc/spec.txt in the Exim distribution as a plain
-# ASCII file. Other formats (PostScript, Texinfo, HTML, PDF) are available
-# from the Exim ftp sites. The manual is also online via the Exim web sites.
-
-
-# This file is divided into several parts, all but the last of which are
-# terminated by a line containing the word "end". The parts must appear
-# in the correct order, and all must be present (even if some of them are
-# in fact empty). Blank lines, and lines starting with # are ignored.
-
-
-
-######################################################################
-#                    MAIN CONFIGURATION SETTINGS                     #
-######################################################################
-
-# Specify your host's canonical name here. This should normally be the fully
-# qualified "official" name of your host. If this option is not set, the
-# uname() function is called to obtain the name.
-
-# primary_hostname =
-
-
-# Specify the domain you want to be added to all unqualified addresses
-# here. An unqualified address is one that does not contain an "@" character
-# followed by a domain. For example, "caesar@rome.ex" is a fully qualified
-# address, but the string "caesar" (i.e. just a login name) is an unqualified
-# email address. Unqualified addresses are accepted only from local callers by
-# default. See the receiver_unqualified_{hosts,nets} options if you want
-# to permit unqualified addresses from remote sources. If this option is
-# not set, the primary_hostname value is used for qualification.
-
-# qualify_domain =
-
-
-# If you want unqualified recipient addresses to be qualified with a different
-# domain to unqualified sender addresses, specify the recipient domain here.
-# If this option is not set, the qualify_domain value is used.
-
-# qualify_recipient =
-
-
-# Specify your local domains as a colon-separated list here. If this option
-# is not set (i.e. not mentioned in the configuration file), the
-# qualify_recipient value is used as the only local domain. If you do not want
-# to do any local deliveries, uncomment the following line, but do not supply
-# any data for it. This sets local_domains to an empty string, which is not
-# the same as not mentioning it at all. An empty string specifies that there
-# are no local domains; not setting it at all causes the default value (the
-# setting of qualify_recipient) to be used.
-
-# local_domains =
-
-
-# If you want to accept mail addressed to your host's literal IP address, for
-# example, mail addressed to "user@[111.111.111.111]", then uncomment the
-# following line, or supply the literal domain(s) as part of "local_domains"
-# above.
-
-# local_domains_include_host_literals
-
-
-# No local deliveries will ever be run under the uids of these users (a colon-
-# separated list). An attempt to do so gets changed so that it runs under the
-# uid of "nobody" instead. This is a paranoic safety catch. Note the default
-# setting means you cannot deliver mail addressed to root as if it were a
-# normal user. This isn't usually a problem, as most sites have an alias for
-# root that redirects such mail to a human administrator.
-
-exim_user = XX_BINOWN_XX
-exim_group = mail
-never_users = root : XX_BINOWN_XX
-
-
-# The use of your host as a mail relay by any host, including the local host
-# calling its own SMTP port, is locked out by default. If you want to permit
-# relaying from the local host, you should set
-#
-# host_accept_relay = localhost
-#
-# If you want to permit relaying through your host from certain hosts or IP
-# networks, you need to set the option appropriately, for example
-#
-# host_accept_relay = my.friends.host : 131.111.0.0/16
-#
-# If you are an MX backup or gateway of some kind for some domains, you must
-# set relay_domains to match those domains. This will allow any host to
-# relay through your host to those domains.
-#
-# See the section of the manual entitled "Control of relaying" for more
-# information.
-
-host_accept_relay = "127.0.0.1/32"
-
-
-# The setting below causes Exim to do a reverse DNS lookup on all incoming
-# IP calls, in order to get the true host name. If you feel this is too
-# expensive, you can specify the networks for which a lookup is done, or
-# remove the setting entirely.
-
-host_lookup = 0.0.0.0/0
-
-
-# By default, Exim expects all envelope addresses to be fully qualified, that
-# is, they must contain both a local part and a domain. If you want to accept
-# unqualified addresses (just a local part) from certain hosts, you can specify
-# these hosts by setting one or both of
-#
-# receiver_unqualified_hosts =
-# sender_unqualified_hosts =
-#
-# to control sender and receiver addresses, respectively. When this is done,
-# unqualified addresses are qualified using the settings of qualify_domain
-# and/or qualify_recipient (see above).
-
-
-# By default, Exim does not make any checks, other than syntactic ones, on
-# incoming addresses during the SMTP dialogue. This reduces delays in SMTP
-# transactions, but it does mean that you might accept messages with unknown
-# recipients, and/or bad senders.
-
-# Uncomment this line if you want incoming recipient addresses to be verified
-# during the SMTP dialogue. Unknown recipients are then rejected at this stage,
-# and the generation of a failure message is the job of the sending host.
-
-# receiver_verify
-
-# Uncomment this line if you want incoming sender addresses (return-paths) to
-# be verified during the SMTP dialogue. Verification can normally only check
-# that the domain exists.
-
-# sender_verify
-
-
-# Exim contains support for the Realtime Blocking List (RBL) that is being
-# maintained as part of the DNS. See http://maps.vix.com/rbl/ for background.
-# Uncommenting the first line below will make Exim reject mail from any
-# host whose IP address is blacklisted in the RBL at maps.vix.com. Some
-# others have followed the RBL lead and have produced other lists: DUL is
-# a list of dial-up addresses, and ORBS is a list of open relay systems. The
-# second line below checks all three lists.
-
-# rbl_domains = rbl.maps.vix.com
-# rbl_domains = rbl.maps.vix.com:dul.maps.vix.com:relays.orbs.org
-
-
-# If you want Exim to support the "percent hack" for all your local domains,
-# uncomment the following line. This is the feature by which mail addressed
-# to x%y@z (where z is one of your local domains) is locally rerouted to
-# x@y and sent on. Otherwise x%y is treated as an ordinary local part.
-
-# percent_hack_domains = *
-
-pid_file_path = /var/run/exim%s.pid
-
-
-end
-
-
-
-######################################################################
-#                      TRANSPORTS CONFIGURATION                      #
-######################################################################
-#                       ORDER DOES NOT MATTER                        #
-#     Only one appropriate transport is called for each delivery.    #
-######################################################################
-
-# A transport is used only when referenced from a director or a router that
-# successfully handles an address.
-
-
-# This transport is used for delivering messages over SMTP connections.
-
-remote_smtp:
-  driver = smtp
-
-
-# This transport is used for local delivery to user mailboxes. By default
-# it will be run under the uid and gid of the local user, and requires
-# the sticky bit to be set on the /var/mail directory. Some systems use
-# the alternative approach of running mail deliveries under a particular
-# group instead of using the sticky bit. The commented options below show
-# how this can be done.
-
-local_delivery:
-  driver = appendfile
-  file = /var/mail/${local_part}
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-  group = mail
-  mode = 0660
-
-
-# This transport is used for handling pipe deliveries generated by alias
-# or .forward files. If the pipe generates any standard output, it is returned
-# to the sender of the message as a delivery error. Set return_fail_output
-# instead of return_output if you want this to happen only when the pipe fails
-# to complete normally. You can set different transports for aliases and
-# forwards if you want to - see the references to address_pipe below.
-
-address_pipe:
-  driver = pipe
-  return_output
-
-
-# This transport is used for handling deliveries directly to files that are
-# generated by aliassing or forwarding.
-
-address_file:
-  driver = appendfile
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-
-
-# This transport is used for handling autoreplies generated by the filtering
-# option of the forwardfile director.
-
-address_reply:
-  driver = autoreply
-
-
-end
-
-
-
-######################################################################
-#                      DIRECTORS CONFIGURATION                       #
-#             Specifies how local addresses are handled              #
-######################################################################
-#                          ORDER DOES MATTER                         #
-#   A local address is passed to each in turn until it is accepted.  #
-######################################################################
-
-# Local addresses are those with a domain that matches some item in the
-# "local_domains" setting above, or those which are passed back from the
-# routers because of a "self=local" setting (not used in this configuration).
-
-
-# This director handles aliasing using a traditional /etc/aliases file.
-# If any of your aliases expand to pipes or files, you will need to set
-# up a user and a group for these deliveries to run under. You can do
-# this by uncommenting the "user" option below (changing the user name
-# as appropriate) and adding a "group" option if necessary. Alternatively, you
-# can specify "user" on the transports that are used. Note that those
-# listed below are the same as are used for .forward files; you might want
-# to set up different ones for pipe and file deliveries from aliases.
-
-system_aliases:
-  driver = aliasfile
-  file = /etc/aliases
-  search_type = lsearch
-  file_transport = address_file
-  pipe_transport = address_pipe
-  user = XX_BINOWN_XX
-
-
-# This director handles forwarding using traditional .forward files.
-# If you want it also to allow mail filtering when a forward file
-# starts with the string "# Exim filter", uncomment the "filter" option.
-
-# The no_verify setting means that this director will be skipped when
-# verifying addresses if sender_verify or receiver_verify is set (though
-# they are not set by default). Similarly, no_expn means that this director
-# will be skipped if smtp_expn_hosts is set to allow any hosts to use the
-# EXPN command.
-
-# The check_ancestor option means that if the forward file generates an
-# address that is an ancestor of the current one, the current one gets
-# passed on instead. This covers the case where A is aliased to B and B
-# has a .forward file pointing to A.
-
-# The three transports specified at the end are those that are used when
-# forwarding generates a direct delivery to a file, or to a pipe, or sets
-# up an auto-reply, respectively.
-
-userforward:
-  driver = forwardfile
-  file = .forward
-  no_verify
-  no_expn
-  check_ancestor
-# filter
-  file_transport = address_file
-  pipe_transport = address_pipe
-  reply_transport = address_reply
-
-
-# This director matches local user mailboxes.
-
-localuser:
-  driver = localuser
-  transport = local_delivery
-
-
-end
-
-
-
-######################################################################
-#                      ROUTERS CONFIGURATION                         #
-#            Specifies how remote addresses are handled              #
-######################################################################
-#                          ORDER DOES MATTER                         #
-#  A remote address is passed to each in turn until it is accepted.  #
-######################################################################
-
-# Remote addresses are those with a domain that does not match any item
-# in the "local_domains" setting above.
-
-
-# This router routes to remote hosts over SMTP using a DNS lookup with
-# default options.
-
-lookuphost:
-  driver = lookuphost
-  transport = remote_smtp
-
-
-# This router routes to remote hosts over SMTP by explicit IP address,
-# given as a "domain literal" in the form [nnn.nnn.nnn.nnn]. The RFCs
-# require this facility, which is why it is enabled by default in Exim.
-# If you want to lock it out, set forbid_domain_literals in the main
-# configuration section above.
-
-literal:
-  driver = ipliteral
-  transport = remote_smtp
-
-
-end
-
-
-
-######################################################################
-#                      RETRY CONFIGURATION                           #
-######################################################################
-
-# This single retry rule applies to all domains and all errors. It specifies
-# retries every 15 minutes for 2 hours, then increasing retry intervals,
-# starting at 1 hour and increasing each time by a factor of 1.5, up to 16
-# hours, then retries every 8 hours until 4 days have passed since the first
-# failed delivery.
-
-# Domain               Error       Retries
-# ------               -----       -------
-
-*                      *           F,2h,15m; G,16h,1h,1.5; F,4d,8h
-
-end
-
-
-
-######################################################################
-#                      REWRITE CONFIGURATION                         #
-######################################################################
-
-# There are no rewriting specifications in this default configuration file.
-
-# End of Exim configuration file
diff --git a/mail/exim-old/files/exim.sh b/mail/exim-old/files/exim.sh
deleted file mode 100644
index 6e25c5a56d0b..000000000000
--- a/mail/exim-old/files/exim.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-args='-bd -q30m'
-
-case "$1" in
-start)
-	[ -x /usr/local/sbin/exim ] && /usr/local/sbin/exim $args && echo -n ' exim'
-	;;
-stop)
-	killall exim && echo -n ' exim'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
diff --git a/mail/exim-old/files/eximon.conf b/mail/exim-old/files/eximon.conf
deleted file mode 100644
index 9a9931490377..000000000000
--- a/mail/exim-old/files/eximon.conf
+++ /dev/null
@@ -1,172 +0,0 @@
-##################################################
-#                The Exim Monitor                #
-##################################################
-
-# This is the template for the Exim monitor's main build-time configuration
-# file. It contains settings that are independent of any operating system. It
-# should be edited and then saved to a file called Local/eximon.conf before
-# running the make command to build the monitor, if any settings are required.
-# Local/eximon.conf can be empty if no changes are needed. The examples given
-# here (commented out) are the default settings.
-
-# Any settings made in the configuration file can be overridden at run time
-# by setting up an environment variable with the same name as any of these
-# options, but preceded by EXIMON_, for example, EXIMON_WINDOW_TITLE.
-
-
-##################################################################
-#      Set these variables as appropriate for your system        #
-##################################################################
-
-# The qualifying name for your domain. The only use made of this is for
-# testing that certain addresses are the same when displaying the
-# log tail, and for shortening sender addresses in the queue display.
-
-# QUALIFY_DOMAIN=
-
-# The default minimum width and height for the whole window are 103 and
-# 162 pixels respectively. This is enough to hold the left-most stripchart
-# and the quit button. The values can be changed here.
-
-MIN_HEIGHT=162
-MIN_WIDTH=103
-
-# The title for eximon's main display window. It is possible to have
-# host name of the machine you are running on substituted into the
-# title string. If you include the string ${fullhostname} then the
-# complete name is used. If you include ${hostname} then the full
-# host name will have the string contained in the DOMAIN variable
-# stripped from its right-hand end before being substituted. Any other
-# shell or environment variables may also be included.
-
-# If you use any substitutions, remember to ensure that the $ and {}
-# characters are escaped from the shell, e.g. by using single quotes.
-
-WINDOW_TITLE="${hostname} eximon"
-
-# The domain that you want to be stripped from the machine's full hostname
-# when forming the short host name for the eximon window title, as
-# described above.
-
-# DOMAIN=
-
-# Parameters for the rolling display of the tail of the exim log file.
-# The width and depth are measured in pixels; LOG_BUFFER specifies the
-# amount of store to set aside for holding the log tail, which is displayed
-# in a scrolling window. When this store is full, the earlier 50% of it
-# is discarded - this is much more efficient that throwing it away line
-# by line. The number given can be followed by the letter K to indicate
-# that the value is in kilobytes. A minimum value of 1K is enforced.
-
-LOG_DEPTH=300
-LOG_WIDTH=950
-LOG_BUFFER=20K
-
-# The font which is used in the log tail display. This is defined in
-# the normal X manner. It must be a "character cell" font, because this
-# is required by the text widget.
-
-# LOG_FONT=-misc-fixed-medium-r-normal-*-14-140-*-*-*-*-iso8859-1
-
-# Parameters for the display of message that are on the exim queue.
-# The width and depth are measured in pixels.
-
-QUEUE_DEPTH=200
-QUEUE_WIDTH=950
-
-# The font which is used in the queue display.
-
-# QUEUE_FONT=$LOG_FONT
-
-# When a message has more than one undelivered address, they are listed
-# one below the other. A limit can be placed on the number of addresses
-# displayed for any one message. If there are more, then "..." is used
-# to indicate this.
-
-QUEUE_MAX_ADDRESSES=10
-
-# The display of the contents of the queue is updated every QUEUE_INTERVAL
-# seconds by default (there is a button to request update).
-
-QUEUE_INTERVAL=300
-
-# The size of the popup text window that is used for looking at the
-# contents of messages, etc.
-
-# TEXT_DEPTH=200
-
-# The keystroke/mouse-operation that is used to pop up the menu in the
-# queue window is configurable. The default is Shift with the lefthand
-# mouse button. The name of an alternative can be specified in the standard
-# X way of naming these things. With the default configuration for the monitor,
-# individuals can override this by setting the EXIMON_MENU_EVENT environment
-# variable.
-
-MENU_EVENT='Shift<Btn1Down>'
-
-# When the menu is used to perform an operation on a message, the output
-# from the exim command that is generated is displayed in a separate window
-# by default. Set this option to "no" if you don't want to see the output -
-# the result of the operation is normally visible in the log window in any
-# case. This does not apply to the output generated from attempting to
-# deliver a message. That is always shown.
-
-ACTION_OUTPUT=yes
-
-# When some action is taken on a message, such as freezing it, or changing
-# its recipients, the queue display is normally automatically updated. On
-# systems that have very large queues, this can take some time and be dis-
-# tracting. If this option is set to "no", the queue display is no longer
-# automatically updated after an action is applied to a message.
-
-ACTION_QUEUE_UPDATE=yes
-
-# When the menu item to display a message's body is invoked, the amount
-# of data is limited to BODY_MAX bytes. This limit is a safety precaution
-# to save the screen scrolling for ever on an enormous message.
-
-BODY_MAX=20000
-
-# The stripcharts are updated every STRIPCHART_INTERVAL seconds.
-
-STRIPCHART_INTERVAL=60
-
-# A stripchart showing the count of messages in the queue is always
-# displayed on the left of eximon's window. Its name is "queue" by
-# default, but can be changed by this variable.
-
-QUEUE_STRIPCHART_NAME=queue
-
-# The following variable may be set to the name of a disc partition. If
-# it is, a stripchart showing the percentage fullness of the partition
-# will be displayed as the second stripchart. This can be used to keep
-# a display of a mail spool partition on the screen.
-
-# SIZE_STRIPCHART=/var/mail
-
-# The name of the size stripchar will be the last component of SIZE_STRIPCHART
-# unless the following variable is set to override it.
-
-# SIZE_STRIPCHART_NAME=space
-
-# The following variable contains a specification of which stripcharts
-# you want eximon to display based on log entries. The string consists of
-# pairs of strings, delimited by slash characters. The first string in each
-# pair is a regular expression that matches some distinguishing feature in a
-# exim log entry.
-
-# Entries that match the expression will be counted and displayed in a
-# stripchart whose title is given by the second string. The string may
-# be continued over several input lines, provided that it is split
-# after a slash, and an additional slash (optionally preceded by white
-# space) is included at the start of the continuation line.
-
-# Stripcharts configured by the following parameter are displayed to the
-# right of the queue and size stripcharts, in the order defined here.
-
-LOG_STRIPCHARTS='/ <= /in/
-                 / => /out/
-                 / => .+ D=/local/
-                 / => .+ T=[^ ]*smtp/smtp/'
-
-# End of exim_monitor/EDITME
diff --git a/mail/exim-old/files/patch-aa b/mail/exim-old/files/patch-aa
deleted file mode 100644
index 64e87ce18a9d..000000000000
--- a/mail/exim-old/files/patch-aa
+++ /dev/null
@@ -1,89 +0,0 @@
---- scripts/exim_install.orig	Mon Aug  2 17:43:03 1999
-+++ scripts/exim_install	Tue Aug  3 14:31:20 1999
-@@ -142,9 +142,9 @@
-     from=../util/
-   fi
- 
--  if [ ! -s ${from}${name} ]; then
-+  if [ ! -r ${from}${name} ]; then
-     echo $com ""
--    echo $com "*** `pwd`/${from}${name} does not exist or is empty"
-+    echo $com "*** `pwd`/${from}${name} does not exist"
-     echo $com "*** Have you built Exim successfully?"
-     echo $com "*** Exim installation ${ver}failed ***"
-     exit 1
-@@ -195,25 +195,40 @@
-   fi
- done
- 
-+# Install exim.sh startup script in FreeBSD's ${PREFIX}/etc/rc.d so that
-+# exim will start up on boot once sendmail is disabled and
-+# ${PREFIX}/etc/exim/configure is in place.
- 
-+echo $com ""
- 
--# If there is no configuration file, install the default.
-+if [ -f ${PREFIX}/etc/rc.d/exim.sh ]; then
-+  echo $com "${PREFIX}/etc/rc.d/exim.sh exists, not overwritten"
-+else
-+  echo $com "Installing exim.sh startup script in ${PREFIX}/etc/rc.d"
-+  ${real} mkdir -p ${PREFIX}/etc/rc.d
-+  echo ${CP} -p exim.sh ${PREFIX}/etc/rc.d/
-+  ${real} ${CP} -p exim.sh ${PREFIX}/etc/rc.d/
-+  if [ $? -ne 0 ]; then
-+    echo $com ""
-+    echo $com "**** Exim installation ${ver}failed ****"
-+    exit 1
-+  fi
-+fi
-+
-+# Install only a sample configuration, which encourages the admin to look
-+# at it, since Exim won't run without a configure file.
- 
- echo $com ""
- 
--if [ ! -f ${CONFIGURE_FILE} ]; then
--  echo $com Installing default configuration in ${CONFIGURE_FILE}
--  echo $com because there is no existing configuration file.
--  echo ${CP} ../src/configure.default ${CONFIGURE_FILE}
--  ${real} ${CP} ../src/configure.default ${CONFIGURE_FILE}
-+  echo $com Installing sample configuration file
-+  ${real} mkdir -p ${CONFIGURE_FILE%/*}
-+  echo ${CP} ../src/configure.default ${CONFIGURE_FILE}.sample
-+  ${real} ${CP} ../src/configure.default ${CONFIGURE_FILE}.sample
-   if [ $? -ne 0 ]; then
-     echo $com ""
-     echo $com "*** Exim installation ${ver}failed ***"
-     exit 1
-   fi
--else
--  echo $com Configuration file ${CONFIGURE_FILE} already exists
--fi
- 
- # Install info files if the directory is defined and the Texinfo
- # source documentation is present.
-@@ -235,19 +250,21 @@
-   echo $com Info installation directory is ${INFO_DIRECTORY}
-   echo $com ""
- 
--  makeinfo --no-split --output exim_overview.info ../doc/oview.texinfo
-+  makeinfo --no-validate --no-split --output exim_overview.info \
-+      ../doc/oview.texinfo
-   echo ${CP} exim_overview.info ${INFO_DIRECTORY}
-   ${real} ${CP} exim_overview.info ${INFO_DIRECTORY}
-   install-info --section="Exim" \
-       --entry "* Overview: (exim_overview).    Overview of the Exim system" \
-       ${INFO_DIRECTORY}/exim_overview.info ${INFO_DIRECTORY}/dir
--  makeinfo --no-split --output exim.info ../doc/spec.texinfo
-+  makeinfo --no-validate --no-split --output exim.info ../doc/spec.texinfo
-   echo ${CP} exim.info ${INFO_DIRECTORY}
-   ${real} ${CP} exim.info ${INFO_DIRECTORY}
-   install-info --section="Exim" \
-       --entry "* User guide: (exim).           Exim manual" \
-       ${INFO_DIRECTORY}/exim.info ${INFO_DIRECTORY}/dir
--  makeinfo --no-split --output exim_filter.info ../doc/filter.texinfo
-+  makeinfo --no-validate --no-split --output exim_filter.info \
-+      ../doc/filter.texinfo
-   echo ${CP} exim_filter.info ${INFO_DIRECTORY}
-   ${real} ${CP} exim_filter.info ${INFO_DIRECTORY}
-   install-info --section="Exim" \
diff --git a/mail/exim-old/pkg-comment b/mail/exim-old/pkg-comment
deleted file mode 100644
index a862bdff5618..000000000000
--- a/mail/exim-old/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-High performance MTA for Unix systems on the Internet
diff --git a/mail/exim-old/pkg-descr b/mail/exim-old/pkg-descr
deleted file mode 100644
index 70a4562b517e..000000000000
--- a/mail/exim-old/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-Exim is a mail transfer agent for Unix systems connected to the Internet.
-
- .   Exim is intended for use as an Internet mailer, and therefore handles
-     addresses in RFC 822 domain format only. (No bangpaths!)
-
- .   The only external transport currently implemented is an SMTP transport
-     over a TCP/IP network (using sockets). A pipe transport is available,
-     and this could be used to send messages to some other transport mechanism.
-
- .   Exim is very configurable, and its management is very powerful. It can
-     be configured to be "fussy" about certain hosts or domains, and
-     can easily serve multiple domains.
-
- .   Exim is an excellent mailer for an ISP, as its control and flexibility
-     are very good.
-
- .   Its requeuing and retry algorithms are very powerful.
-
-WWW: http://www.exim.org/
diff --git a/mail/exim-old/pkg-plist b/mail/exim-old/pkg-plist
deleted file mode 100644
index 908d6b1db1be..000000000000
--- a/mail/exim-old/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-sbin/exim
-sbin/eximon
-sbin/eximon.bin
-sbin/exim_dumpdb
-sbin/exim_fixdb
-sbin/exim_lock
-sbin/exim_tidydb
-sbin/exinext
-sbin/exiwhat
-sbin/exim_dbmbuild
-sbin/exicyclog
-sbin/exigrep
-sbin/eximstats
-sbin/exiqsumm
-etc/exim/configure.sample
-etc/rc.d/exim.sh
-@unexec install-info --delete %D/info/exim_overview.info %D/info/dir
-@unexec install-info --delete %D/info/exim.info %D/info/dir
-@unexec install-info --delete %D/info/exim_filter.info %D/info/dir
-info/exim_overview.info
-info/exim.info
-info/exim_filter.info
-@exec install-info --section="Exim" --entry "* Overview: (exim_overview).    Overview of the Exim system" %D/info/exim_overview.info %D/info/dir
-@exec install-info --section="Exim" --entry "* User guide: (exim).           Exim manual" %D/info/exim.info %D/info/dir
-@exec install-info --section="Exim" --entry "* Filtering: (exim_filter).     Filtering mail with Exim" %D/info/exim_filter.info %D/info/dir
-@dirrm etc/exim
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 7a343dc74718..bfd403dfd1ac 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -15,6 +15,8 @@ DISTFILES=	exim-3.15.tar.gz exim-texinfo-3.10.tar.gz
 
 MAINTAINER=	sheldonh@FreeBSD.org
 
+FORBIDDEN=	Bug with system filters used to freeze messages for manual thawing
+
 # If WITHOUT_X11 is not defined, the eximon monitor, which requires X, will
 # be built. Comment it out unless you have or want XFree86 installed!
 .if !defined(WITHOUT_X11)
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
deleted file mode 100644
index b66c9af42ecc..000000000000
--- a/mail/mutt-devel/Makefile
+++ /dev/null
@@ -1,114 +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.2.4
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/  \
-		ftp://ftp.uib.no/pub/mutt/  \
-		ftp://pgp.rasip.fer.hr/pub/mutt/international/  \
-		ftp://ftp.gbnet.net/pub/mutt-international/  \
-		ftp://riemann.iam.uni-bonn.de/pub/mutt/  \
-		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/mutt-international/ \
-		ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/  \
-		ftp://ftp.iks-jena.de/pub/mitarb/lutz/crypt/software/pgp/mutt/
-DISTNAME=	${PKGNAME}i
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} charmaps-0.0.tar.gz
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
-PATCH_SITES=	http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/  \
-		http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/  \
-		http://www.efrei.fr/~parmelan/mutt/${PKGNAME:S/^mutt-//}/  \
-		ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/  \
-		ftp://riemann.iam.uni-bonn.de/pub/mutt/
-PATCHFILES=
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER=	obrien@FreeBSD.org
-
-LIB_DEPENDS=    intl.1:${PORTSDIR}/devel/gettext
-.if defined(BATCH)
-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
-BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
-.if ${MACHINE_ARCH} != "alpha"
-#  coredump in sgmls
-BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
-.endif
-RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
-.elif defined(WITH_NCURSES_PORT)
-LIB_DEPENDS=	ncurses.4:${PORTSDIR}/devel/ncurses
-.elif defined(WITH_SLANG)
-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
-.endif
-.if defined(WITH_SSL)
-USE_OPENSSL=    RSA
-.endif
-.if defined(PACKAGE_BUILDING)
-RUN_DEPENDS+=	urlview:${PORTSDIR}/textproc/urlview
-.endif
-
-DIST_SUBDIR=	mutt
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=  CC="${CC} -I${LOCALBASE}/include" LDFLAGS=-L${LOCALBASE}/lib
-CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl  \
-		--with-sharedir=${PREFIX}/share/mutt \
-		--with-docdir=${PREFIX}/share/doc/mutt --with-charmaps
-.if defined(WITH_LOCALES_FIX)
-CONFIGURE_ARGS+=	--enable-locales-fix
-.endif
-.if defined(BATCH) || defined(WITH_SLANG)
-CONFIGURE_ARGS+=	--with-slang=${PREFIX}
-.elif defined(WITH_NCURSES_PORT)
-CONFIGURE_ARGS+=	--with-curses=${PREFIX}
-.endif
-.if defined(WITH_SSL)
-CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
-.endif
-WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
-MAN1=		mutt.1 mutt_dotlock.1
-MAN5=		muttrc.5
-
-pre-patch:
-	(cd ${WRKSRC}; ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/charmaps-0.0.tar.gz)
-
-post-patch:
-	cd ${WRKSRC}/charmaps/maps; ${LN} CP1251 WINDOWS-1251
-	cd ${WRKSRC}/charmaps/maps; ${RM} -f *.orig
-
-.if !defined(NOPORTDOCS)
-post-build:
-	${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
-	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-doc-ref
-	printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
-		ed -s ${WRKSRC}/doc/mutt.man
-.if defined(BATCH)
-PLIST:=		${WRKDIR}/PLIST
-pre-install:
-	@${CAT} ${PKGDIR}/PLIST.htmlfiles >> ${PLIST}
-	@${CAT} ${PKGDIR}/PLIST >> ${PLIST}
-.endif
-.endif
-
-post-install:
-	@strip ${PREFIX}/bin/mutt
-.if !defined(NOPORTDOCS)
-	@${ECHO} "===>   Installing Mutt documentation"
-	@${MKDIR} ${PREFIX}/share/doc/mutt && ${CHMOD} a+rx ${PREFIX}/share/doc/mutt
-	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
-		${PREFIX}/share/doc/mutt
-.if defined(BATCH)
-	${INSTALL_MAN} -d ${PREFIX}/share/doc/mutt/html
-	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html
-	${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt
-.endif
-	@cd ${WRKSRC}/contrib ; ${INSTALL_DATA} sample.muttrc Mush.rc Pine.rc \
-		${PREFIX}/share/doc/mutt
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
deleted file mode 100644
index 9e1f1fda9191..000000000000
--- a/mail/mutt-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (mutt/mutt-1.2.4i.tar.gz) = 30968eeb985c074d03078a3d6ae982c9
-MD5 (mutt/charmaps-0.0.tar.gz) = e79b9f57da1f6a4d0a63ff60a4ef7da8
diff --git a/mail/mutt-devel/files/extra-patch-doc-ref b/mail/mutt-devel/files/extra-patch-doc-ref
deleted file mode 100644
index ee044b188b0b..000000000000
--- a/mail/mutt-devel/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${PREFIX}/share/doc/mutt/\fP.
- .SH OPTIONS
- .IP "-a \fIfile\fP"
- Attach a file to your message using MIME.
diff --git a/mail/mutt-devel/files/patch-01 b/mail/mutt-devel/files/patch-01
deleted file mode 100644
index 836dbb773b2c..000000000000
--- a/mail/mutt-devel/files/patch-01
+++ /dev/null
@@ -1,11 +0,0 @@
---- charmaps/maps/KOI8-R.bak	Wed Jan 20 01:30:20 1999
-+++ charmaps/maps/KOI8-R	Sat May 13 21:27:42 2000
-@@ -157,7 +157,7 @@
- <?S>                   /x92   <U2593> DARK SHADE
- <Iu>                   /x93   <U2320> TOP HALF INTEGRAL
- <fS>                   /x94   <U25A0> BLACK SQUARE
--<sb>                   /x95   <U2022> BULLET
-+<Sb>                   /x95   <U2219> BULLET OPERATOR
- <RT>                   /x96   <U221A> SQUARE ROOT
- <?2>                   /x97   <U2248> ALMOST EQUAL TO
- <=<>                   /x98   <U2264> LESS-THAN OR EQUAL TO
diff --git a/mail/mutt-devel/files/patch-02 b/mail/mutt-devel/files/patch-02
deleted file mode 100644
index 84fd2e11b1da..000000000000
--- a/mail/mutt-devel/files/patch-02
+++ /dev/null
@@ -1,68 +0,0 @@
---- doc/Makefile.in.orig	Wed Mar 29 11:42:49 2000
-+++ doc/Makefile.in	Mon Jun 12 16:50:51 2000
-@@ -58,13 +58,16 @@
- topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
- 	README NEWS TODO README.SECURITY README.SSL README.UPGRADE
- 
--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 ./
-+	$(MAKE) manual.html || cp $(srcdir)/manual*.html ./
- 
- try-txt: ../makedoc
--	test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+	$(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+
-+try-latin1: 
-+	$(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./
- 
- install: all
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -75,16 +78,16 @@
- 	$(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
- 	for f in $(srcdir_DOCFILES) ; do \
--		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
-+	 	$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
- 	done
- 	for f in $(topsrcdir_DOCFILES) ; do \
--		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
-+	 	$(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
-@@ -93,14 +96,18 @@
- 	-rm -rf $(DESTDIR)$(docdir)
- 
- 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/mutt-devel/files/patch-03 b/mail/mutt-devel/files/patch-03
deleted file mode 100644
index b870f7f7aaec..000000000000
--- a/mail/mutt-devel/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/mutt-devel/files/patch-04 b/mail/mutt-devel/files/patch-04
deleted file mode 100644
index f0763a9c7060..000000000000
--- a/mail/mutt-devel/files/patch-04
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig	Tue Jan 18 14:19:14 2000
-+++ configure	Tue Feb 29 01:47:49 2000
-@@ -1925,6 +1925,9 @@
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char $ac_func();
-+#ifdef __FreeBSD__
-+#define bkgdset initscr
-+#endif
- 
- int main() {
- 
-@@ -5710,7 +5713,7 @@
- s%@FFLAGS@%$FFLAGS%g
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
--s%@LIBS@%$LIBS%g
-+s%@LIBS@%$LIBS -lxpg4%g
- s%@exec_prefix@%$exec_prefix%g
- s%@prefix@%$prefix%g
- s%@program_transform_name@%$program_transform_name%g
diff --git a/mail/mutt-devel/files/patch-05 b/mail/mutt-devel/files/patch-05
deleted file mode 100644
index 364bc49a259d..000000000000
--- a/mail/mutt-devel/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	Wed Aug 25 10:23:12 1999
-+++ compose.c	Sun Sep 26 23:46:25 1999
-@@ -130,7 +130,7 @@
-   struct pgp_vinfo *pgp = pgp_get_vinfo(PGP_SIGN);
- 
-   switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, select (m)ic algorithm, or (f)orget it? "),
--			     _("esabmf")))
-+			     N_("esabmf")))
-   {
-   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/mutt-devel/files/patch-08 b/mail/mutt-devel/files/patch-08
deleted file mode 100644
index 3e50cbd13779..000000000000
--- a/mail/mutt-devel/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/mutt-devel/files/patch-Makefile.in b/mail/mutt-devel/files/patch-Makefile.in
deleted file mode 100644
index 5e33d7c1abdf..000000000000
--- a/mail/mutt-devel/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Tue May  9 17:15:37 2000
-+++ Makefile.in	Fri May 12 13:53:08 2000
-@@ -210,7 +210,7 @@
- SOURCES = $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES)
- OBJECTS = $(mutt_dotlock_OBJECTS) $(pgpring_OBJECTS) $(makedoc_OBJECTS) $(mutt_OBJECTS)
- 
--all: all-redirect
-+all: $(BUILT_SOURCES) all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .o .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
diff --git a/mail/mutt-devel/pkg-comment b/mail/mutt-devel/pkg-comment
deleted file mode 100644
index c04a3dff7269..000000000000
--- a/mail/mutt-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-"The Mongrel of Mail User Agents" (part Elm, Pine, mh)
diff --git a/mail/mutt-devel/pkg-descr b/mail/mutt-devel/pkg-descr
deleted file mode 100644
index 68d853aebed8..000000000000
--- a/mail/mutt-devel/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/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
deleted file mode 100644
index 217ea723e999..000000000000
--- a/mail/mutt-devel/pkg-plist
+++ /dev/null
@@ -1,215 +0,0 @@
-bin/mutt
-bin/mutt_dotlock
-bin/muttbug
-bin/pgpewrap
-bin/pgpring
-etc/Muttrc
-etc/mime.types
-share/mutt/charmaps/ANSI_X3.110-1983
-share/mutt/charmaps/ANSI_X3.4-1968
-share/mutt/charmaps/ASMO_449
-share/mutt/charmaps/BALTIC
-share/mutt/charmaps/BS_4730
-share/mutt/charmaps/BS_VIEWDATA
-share/mutt/charmaps/CP1250
-share/mutt/charmaps/CP1251
-share/mutt/charmaps/CP1252
-share/mutt/charmaps/CP1253
-share/mutt/charmaps/CP1254
-share/mutt/charmaps/CP1255
-share/mutt/charmaps/CP1256
-share/mutt/charmaps/CP1257
-share/mutt/charmaps/CSA_Z243.4-1985-1
-share/mutt/charmaps/CSA_Z243.4-1985-2
-share/mutt/charmaps/CSA_Z243.4-1985-GR
-share/mutt/charmaps/CSN_369103
-share/mutt/charmaps/CWI
-share/mutt/charmaps/DEC-MCS
-share/mutt/charmaps/DIN_66003
-share/mutt/charmaps/DS_2089
-share/mutt/charmaps/EBCDIC-AT-DE
-share/mutt/charmaps/EBCDIC-AT-DE-A
-share/mutt/charmaps/EBCDIC-CA-FR
-share/mutt/charmaps/EBCDIC-DK-NO
-share/mutt/charmaps/EBCDIC-DK-NO-A
-share/mutt/charmaps/EBCDIC-ES
-share/mutt/charmaps/EBCDIC-ES-A
-share/mutt/charmaps/EBCDIC-ES-S
-share/mutt/charmaps/EBCDIC-FI-SE
-share/mutt/charmaps/EBCDIC-FI-SE-A
-share/mutt/charmaps/EBCDIC-FR
-share/mutt/charmaps/EBCDIC-IS-FRISS
-share/mutt/charmaps/EBCDIC-IT
-share/mutt/charmaps/EBCDIC-PT
-share/mutt/charmaps/EBCDIC-UK
-share/mutt/charmaps/EBCDIC-US
-share/mutt/charmaps/ECMA-CYRILLIC
-share/mutt/charmaps/ES
-share/mutt/charmaps/ES2
-share/mutt/charmaps/GB_1988-80
-share/mutt/charmaps/GOST_19768-74
-share/mutt/charmaps/GREEK-CCITT
-share/mutt/charmaps/GREEK7
-share/mutt/charmaps/GREEK7-OLD
-share/mutt/charmaps/HP-ROMAN8
-share/mutt/charmaps/IBM037
-share/mutt/charmaps/IBM038
-share/mutt/charmaps/IBM1004
-share/mutt/charmaps/IBM1026
-share/mutt/charmaps/IBM1047
-share/mutt/charmaps/IBM256
-share/mutt/charmaps/IBM273
-share/mutt/charmaps/IBM274
-share/mutt/charmaps/IBM275
-share/mutt/charmaps/IBM277
-share/mutt/charmaps/IBM278
-share/mutt/charmaps/IBM280
-share/mutt/charmaps/IBM281
-share/mutt/charmaps/IBM284
-share/mutt/charmaps/IBM285
-share/mutt/charmaps/IBM290
-share/mutt/charmaps/IBM297
-share/mutt/charmaps/IBM420
-share/mutt/charmaps/IBM423
-share/mutt/charmaps/IBM424
-share/mutt/charmaps/IBM437
-share/mutt/charmaps/IBM500
-share/mutt/charmaps/IBM850
-share/mutt/charmaps/IBM851
-share/mutt/charmaps/IBM852
-share/mutt/charmaps/IBM855
-share/mutt/charmaps/IBM857
-share/mutt/charmaps/IBM860
-share/mutt/charmaps/IBM861
-share/mutt/charmaps/IBM862
-share/mutt/charmaps/IBM863
-share/mutt/charmaps/IBM864
-share/mutt/charmaps/IBM865
-share/mutt/charmaps/IBM868
-share/mutt/charmaps/IBM869
-share/mutt/charmaps/IBM870
-share/mutt/charmaps/IBM871
-share/mutt/charmaps/IBM875
-share/mutt/charmaps/IBM880
-share/mutt/charmaps/IBM891
-share/mutt/charmaps/IBM903
-share/mutt/charmaps/IBM904
-share/mutt/charmaps/IBM905
-share/mutt/charmaps/IBM918
-share/mutt/charmaps/IEC_P27-1
-share/mutt/charmaps/INIS
-share/mutt/charmaps/INIS-8
-share/mutt/charmaps/INIS-CYRILLIC
-share/mutt/charmaps/INVARIANT
-share/mutt/charmaps/ISO-8859-1
-share/mutt/charmaps/ISO-8859-10
-share/mutt/charmaps/ISO-8859-2
-share/mutt/charmaps/ISO-8859-3
-share/mutt/charmaps/ISO-8859-4
-share/mutt/charmaps/ISO-8859-5
-share/mutt/charmaps/ISO-8859-6
-share/mutt/charmaps/ISO-8859-7
-share/mutt/charmaps/ISO-8859-8
-share/mutt/charmaps/ISO-8859-9
-share/mutt/charmaps/ISO-IR-90
-share/mutt/charmaps/ISO_10367-BOX
-share/mutt/charmaps/ISO_10646
-share/mutt/charmaps/ISO_2033-1983
-share/mutt/charmaps/ISO_5427
-share/mutt/charmaps/ISO_5427-EXT
-share/mutt/charmaps/ISO_5428
-share/mutt/charmaps/ISO_646.BASIC
-share/mutt/charmaps/ISO_646.IRV
-share/mutt/charmaps/ISO_6937
-share/mutt/charmaps/ISO_6937-2-25
-share/mutt/charmaps/ISO_6937-2-ADD
-share/mutt/charmaps/ISO_8859-1,GL
-share/mutt/charmaps/ISO_8859-SUPP
-share/mutt/charmaps/IT
-share/mutt/charmaps/JIS_C6220-1969-JP
-share/mutt/charmaps/JIS_C6220-1969-RO
-share/mutt/charmaps/JIS_C6229-1984-A
-share/mutt/charmaps/JIS_C6229-1984-B
-share/mutt/charmaps/JIS_C6229-1984-B-ADD
-share/mutt/charmaps/JIS_C6229-1984-HAND
-share/mutt/charmaps/JIS_C6229-1984-HAND-ADD
-share/mutt/charmaps/JIS_C6229-1984-KANA
-share/mutt/charmaps/JIS_X0201
-share/mutt/charmaps/JUS_I.B1.002
-share/mutt/charmaps/JUS_I.B1.003-MAC
-share/mutt/charmaps/JUS_I.B1.003-SERB
-share/mutt/charmaps/KOI-8
-share/mutt/charmaps/KOI8-R
-share/mutt/charmaps/KSC5636
-share/mutt/charmaps/LATIN-GREEK
-share/mutt/charmaps/LATIN-GREEK-1
-share/mutt/charmaps/MAC-IS
-share/mutt/charmaps/MACINTOSH
-share/mutt/charmaps/MSZ_7795.3
-share/mutt/charmaps/NATS-DANO
-share/mutt/charmaps/NATS-DANO-ADD
-share/mutt/charmaps/NATS-SEFI
-share/mutt/charmaps/NATS-SEFI-ADD
-share/mutt/charmaps/NC_NC00-10
-share/mutt/charmaps/NEXTSTEP
-share/mutt/charmaps/NF_Z_62-010
-share/mutt/charmaps/NF_Z_62-010-1973
-share/mutt/charmaps/NS_4551-1
-share/mutt/charmaps/NS_4551-2
-share/mutt/charmaps/PT
-share/mutt/charmaps/PT2
-share/mutt/charmaps/SAMI
-share/mutt/charmaps/SEN_850200_B
-share/mutt/charmaps/SEN_850200_C
-share/mutt/charmaps/T.101-G2
-share/mutt/charmaps/T.61-7BIT
-share/mutt/charmaps/T.61-8BIT
-share/mutt/charmaps/VIDEOTEX-SUPPL
-share/mutt/charmaps/WINDOWS-1251
-share/locale/cs/LC_MESSAGES/mutt.mo
-share/locale/da/LC_MESSAGES/mutt.mo
-share/locale/de/LC_MESSAGES/mutt.mo
-share/locale/el/LC_MESSAGES/mutt.mo
-share/locale/eo/LC_MESSAGES/mutt.mo
-share/locale/es/LC_MESSAGES/mutt.mo
-share/locale/fr/LC_MESSAGES/mutt.mo
-share/locale/gl/LC_MESSAGES/mutt.mo
-share/locale/id/LC_MESSAGES/mutt.mo
-share/locale/it/LC_MESSAGES/mutt.mo
-share/locale/ko/LC_MESSAGES/mutt.mo
-share/locale/nl/LC_MESSAGES/mutt.mo
-share/locale/pl/LC_MESSAGES/mutt.mo
-share/locale/pt_BR/LC_MESSAGES/mutt.mo
-share/locale/ru/LC_MESSAGES/mutt.mo
-share/locale/sk/LC_MESSAGES/mutt.mo
-share/locale/sv/LC_MESSAGES/mutt.mo
-share/locale/uk/LC_MESSAGES/mutt.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
-share/doc/mutt/manual.txt
-share/doc/mutt/COPYRIGHT
-share/doc/mutt/ChangeLog
-share/doc/mutt/GPL
-share/doc/mutt/INSTALL
-share/doc/mutt/NEWS
-share/doc/mutt/PGP-Notes.txt
-share/doc/mutt/README
-share/doc/mutt/README.SECURITY
-share/doc/mutt/README.SSL
-share/doc/mutt/README.UPGRADE
-share/doc/mutt/TODO
-share/doc/mutt/applying-patches.txt
-share/doc/mutt/devel-notes.txt
-share/doc/mutt/samples/Mush.rc
-share/doc/mutt/samples/Pine.rc
-share/doc/mutt/samples/Tin.rc
-share/doc/mutt/samples/gpg.rc
-share/doc/mutt/samples/pgp2.rc
-share/doc/mutt/samples/pgp5.rc
-share/doc/mutt/samples/pgp6.rc
-share/doc/mutt/samples/sample.mailcap
-share/doc/mutt/samples/sample.muttrc
-share/doc/mutt/samples/sample.muttrc-tlr
-@dirrm share/mutt/charmaps
-@dirrm share/mutt
-@dirrm share/doc/mutt/samples
-@dirrm share/doc/mutt
diff --git a/mail/mutt-devel/pkg-plist.htmlfiles b/mail/mutt-devel/pkg-plist.htmlfiles
deleted file mode 100644
index 12f5d96710f1..000000000000
--- a/mail/mutt-devel/pkg-plist.htmlfiles
+++ /dev/null
@@ -1,315 +0,0 @@
-share/doc/mutt/manual.latin1
-share/doc/mutt/html/manual-1.html
-share/doc/mutt/html/manual-2.html
-share/doc/mutt/html/manual-3.html
-share/doc/mutt/html/manual-4.html
-share/doc/mutt/html/manual-5.html
-share/doc/mutt/html/manual-6.html
-share/doc/mutt/html/manual-7.html
-share/doc/mutt/html/manual.html
-share/doc/mutt/html/manual1.html
-share/doc/mutt/html/manual10.html
-share/doc/mutt/html/manual100.html
-share/doc/mutt/html/manual101.html
-share/doc/mutt/html/manual102.html
-share/doc/mutt/html/manual103.html
-share/doc/mutt/html/manual104.html
-share/doc/mutt/html/manual105.html
-share/doc/mutt/html/manual106.html
-share/doc/mutt/html/manual107.html
-share/doc/mutt/html/manual108.html
-share/doc/mutt/html/manual109.html
-share/doc/mutt/html/manual11.html
-share/doc/mutt/html/manual110.html
-share/doc/mutt/html/manual111.html
-share/doc/mutt/html/manual112.html
-share/doc/mutt/html/manual113.html
-share/doc/mutt/html/manual114.html
-share/doc/mutt/html/manual115.html
-share/doc/mutt/html/manual116.html
-share/doc/mutt/html/manual117.html
-share/doc/mutt/html/manual118.html
-share/doc/mutt/html/manual119.html
-share/doc/mutt/html/manual12.html
-share/doc/mutt/html/manual120.html
-share/doc/mutt/html/manual121.html
-share/doc/mutt/html/manual122.html
-share/doc/mutt/html/manual123.html
-share/doc/mutt/html/manual124.html
-share/doc/mutt/html/manual125.html
-share/doc/mutt/html/manual126.html
-share/doc/mutt/html/manual127.html
-share/doc/mutt/html/manual128.html
-share/doc/mutt/html/manual129.html
-share/doc/mutt/html/manual13.html
-share/doc/mutt/html/manual130.html
-share/doc/mutt/html/manual131.html
-share/doc/mutt/html/manual132.html
-share/doc/mutt/html/manual133.html
-share/doc/mutt/html/manual134.html
-share/doc/mutt/html/manual135.html
-share/doc/mutt/html/manual136.html
-share/doc/mutt/html/manual137.html
-share/doc/mutt/html/manual138.html
-share/doc/mutt/html/manual139.html
-share/doc/mutt/html/manual14.html
-share/doc/mutt/html/manual140.html
-share/doc/mutt/html/manual141.html
-share/doc/mutt/html/manual142.html
-share/doc/mutt/html/manual143.html
-share/doc/mutt/html/manual144.html
-share/doc/mutt/html/manual145.html
-share/doc/mutt/html/manual146.html
-share/doc/mutt/html/manual147.html
-share/doc/mutt/html/manual148.html
-share/doc/mutt/html/manual149.html
-share/doc/mutt/html/manual15.html
-share/doc/mutt/html/manual150.html
-share/doc/mutt/html/manual151.html
-share/doc/mutt/html/manual152.html
-share/doc/mutt/html/manual153.html
-share/doc/mutt/html/manual154.html
-share/doc/mutt/html/manual155.html
-share/doc/mutt/html/manual156.html
-share/doc/mutt/html/manual157.html
-share/doc/mutt/html/manual158.html
-share/doc/mutt/html/manual159.html
-share/doc/mutt/html/manual16.html
-share/doc/mutt/html/manual160.html
-share/doc/mutt/html/manual161.html
-share/doc/mutt/html/manual162.html
-share/doc/mutt/html/manual163.html
-share/doc/mutt/html/manual164.html
-share/doc/mutt/html/manual165.html
-share/doc/mutt/html/manual166.html
-share/doc/mutt/html/manual167.html
-share/doc/mutt/html/manual168.html
-share/doc/mutt/html/manual169.html
-share/doc/mutt/html/manual17.html
-share/doc/mutt/html/manual170.html
-share/doc/mutt/html/manual171.html
-share/doc/mutt/html/manual172.html
-share/doc/mutt/html/manual173.html
-share/doc/mutt/html/manual174.html
-share/doc/mutt/html/manual175.html
-share/doc/mutt/html/manual176.html
-share/doc/mutt/html/manual177.html
-share/doc/mutt/html/manual178.html
-share/doc/mutt/html/manual179.html
-share/doc/mutt/html/manual18.html
-share/doc/mutt/html/manual180.html
-share/doc/mutt/html/manual181.html
-share/doc/mutt/html/manual182.html
-share/doc/mutt/html/manual183.html
-share/doc/mutt/html/manual184.html
-share/doc/mutt/html/manual185.html
-share/doc/mutt/html/manual186.html
-share/doc/mutt/html/manual187.html
-share/doc/mutt/html/manual188.html
-share/doc/mutt/html/manual189.html
-share/doc/mutt/html/manual19.html
-share/doc/mutt/html/manual190.html
-share/doc/mutt/html/manual191.html
-share/doc/mutt/html/manual192.html
-share/doc/mutt/html/manual193.html
-share/doc/mutt/html/manual194.html
-share/doc/mutt/html/manual195.html
-share/doc/mutt/html/manual196.html
-share/doc/mutt/html/manual197.html
-share/doc/mutt/html/manual198.html
-share/doc/mutt/html/manual199.html
-share/doc/mutt/html/manual2.html
-share/doc/mutt/html/manual20.html
-share/doc/mutt/html/manual200.html
-share/doc/mutt/html/manual201.html
-share/doc/mutt/html/manual202.html
-share/doc/mutt/html/manual203.html
-share/doc/mutt/html/manual204.html
-share/doc/mutt/html/manual205.html
-share/doc/mutt/html/manual206.html
-share/doc/mutt/html/manual207.html
-share/doc/mutt/html/manual208.html
-share/doc/mutt/html/manual209.html
-share/doc/mutt/html/manual21.html
-share/doc/mutt/html/manual210.html
-share/doc/mutt/html/manual211.html
-share/doc/mutt/html/manual212.html
-share/doc/mutt/html/manual213.html
-share/doc/mutt/html/manual214.html
-share/doc/mutt/html/manual215.html
-share/doc/mutt/html/manual216.html
-share/doc/mutt/html/manual217.html
-share/doc/mutt/html/manual218.html
-share/doc/mutt/html/manual219.html
-share/doc/mutt/html/manual22.html
-share/doc/mutt/html/manual220.html
-share/doc/mutt/html/manual221.html
-share/doc/mutt/html/manual222.html
-share/doc/mutt/html/manual223.html
-share/doc/mutt/html/manual224.html
-share/doc/mutt/html/manual225.html
-share/doc/mutt/html/manual226.html
-share/doc/mutt/html/manual227.html
-share/doc/mutt/html/manual228.html
-share/doc/mutt/html/manual229.html
-share/doc/mutt/html/manual23.html
-share/doc/mutt/html/manual230.html
-share/doc/mutt/html/manual231.html
-share/doc/mutt/html/manual232.html
-share/doc/mutt/html/manual233.html
-share/doc/mutt/html/manual234.html
-share/doc/mutt/html/manual235.html
-share/doc/mutt/html/manual236.html
-share/doc/mutt/html/manual237.html
-share/doc/mutt/html/manual238.html
-share/doc/mutt/html/manual239.html
-share/doc/mutt/html/manual24.html
-share/doc/mutt/html/manual240.html
-share/doc/mutt/html/manual241.html
-share/doc/mutt/html/manual242.html
-share/doc/mutt/html/manual243.html
-share/doc/mutt/html/manual244.html
-share/doc/mutt/html/manual245.html
-share/doc/mutt/html/manual246.html
-share/doc/mutt/html/manual247.html
-share/doc/mutt/html/manual248.html
-share/doc/mutt/html/manual249.html
-share/doc/mutt/html/manual25.html
-share/doc/mutt/html/manual250.html
-share/doc/mutt/html/manual251.html
-share/doc/mutt/html/manual252.html
-share/doc/mutt/html/manual253.html
-share/doc/mutt/html/manual254.html
-share/doc/mutt/html/manual255.html
-share/doc/mutt/html/manual256.html
-share/doc/mutt/html/manual257.html
-share/doc/mutt/html/manual258.html             
-share/doc/mutt/html/manual259.html             
-share/doc/mutt/html/manual26.html
-share/doc/mutt/html/manual260.html
-share/doc/mutt/html/manual261.html
-share/doc/mutt/html/manual262.html
-share/doc/mutt/html/manual263.html
-share/doc/mutt/html/manual264.html
-share/doc/mutt/html/manual265.html
-share/doc/mutt/html/manual266.html
-share/doc/mutt/html/manual267.html
-share/doc/mutt/html/manual268.html
-share/doc/mutt/html/manual269.html
-share/doc/mutt/html/manual27.html
-share/doc/mutt/html/manual270.html
-share/doc/mutt/html/manual271.html
-share/doc/mutt/html/manual272.html
-share/doc/mutt/html/manual273.html
-share/doc/mutt/html/manual274.html
-share/doc/mutt/html/manual275.html
-share/doc/mutt/html/manual276.html
-share/doc/mutt/html/manual277.html
-share/doc/mutt/html/manual278.html
-share/doc/mutt/html/manual279.html
-share/doc/mutt/html/manual28.html
-share/doc/mutt/html/manual280.html
-share/doc/mutt/html/manual281.html
-share/doc/mutt/html/manual282.html
-share/doc/mutt/html/manual283.html
-share/doc/mutt/html/manual284.html
-share/doc/mutt/html/manual285.html
-share/doc/mutt/html/manual286.html
-share/doc/mutt/html/manual287.html
-share/doc/mutt/html/manual288.html
-share/doc/mutt/html/manual289.html
-share/doc/mutt/html/manual29.html
-share/doc/mutt/html/manual290.html
-share/doc/mutt/html/manual291.html
-share/doc/mutt/html/manual292.html
-share/doc/mutt/html/manual293.html
-share/doc/mutt/html/manual294.html
-share/doc/mutt/html/manual295.html
-share/doc/mutt/html/manual296.html
-share/doc/mutt/html/manual297.html
-share/doc/mutt/html/manual298.html
-share/doc/mutt/html/manual299.html
-share/doc/mutt/html/manual3.html
-share/doc/mutt/html/manual30.html
-share/doc/mutt/html/manual300.html
-share/doc/mutt/html/manual301.html
-share/doc/mutt/html/manual302.html
-share/doc/mutt/html/manual303.html
-share/doc/mutt/html/manual304.html
-share/doc/mutt/html/manual31.html
-share/doc/mutt/html/manual32.html
-share/doc/mutt/html/manual33.html
-share/doc/mutt/html/manual34.html
-share/doc/mutt/html/manual35.html
-share/doc/mutt/html/manual36.html
-share/doc/mutt/html/manual37.html
-share/doc/mutt/html/manual38.html
-share/doc/mutt/html/manual39.html
-share/doc/mutt/html/manual4.html
-share/doc/mutt/html/manual40.html
-share/doc/mutt/html/manual41.html
-share/doc/mutt/html/manual42.html
-share/doc/mutt/html/manual43.html
-share/doc/mutt/html/manual44.html
-share/doc/mutt/html/manual45.html
-share/doc/mutt/html/manual46.html
-share/doc/mutt/html/manual47.html
-share/doc/mutt/html/manual48.html
-share/doc/mutt/html/manual49.html
-share/doc/mutt/html/manual5.html
-share/doc/mutt/html/manual50.html
-share/doc/mutt/html/manual51.html
-share/doc/mutt/html/manual52.html
-share/doc/mutt/html/manual53.html
-share/doc/mutt/html/manual54.html
-share/doc/mutt/html/manual55.html
-share/doc/mutt/html/manual56.html
-share/doc/mutt/html/manual57.html
-share/doc/mutt/html/manual58.html
-share/doc/mutt/html/manual59.html
-share/doc/mutt/html/manual6.html
-share/doc/mutt/html/manual60.html
-share/doc/mutt/html/manual61.html
-share/doc/mutt/html/manual62.html
-share/doc/mutt/html/manual63.html
-share/doc/mutt/html/manual64.html
-share/doc/mutt/html/manual65.html
-share/doc/mutt/html/manual66.html
-share/doc/mutt/html/manual67.html
-share/doc/mutt/html/manual68.html
-share/doc/mutt/html/manual69.html
-share/doc/mutt/html/manual7.html
-share/doc/mutt/html/manual70.html
-share/doc/mutt/html/manual71.html
-share/doc/mutt/html/manual72.html
-share/doc/mutt/html/manual73.html
-share/doc/mutt/html/manual74.html
-share/doc/mutt/html/manual75.html
-share/doc/mutt/html/manual76.html
-share/doc/mutt/html/manual77.html
-share/doc/mutt/html/manual78.html
-share/doc/mutt/html/manual79.html
-share/doc/mutt/html/manual8.html
-share/doc/mutt/html/manual80.html
-share/doc/mutt/html/manual81.html
-share/doc/mutt/html/manual82.html
-share/doc/mutt/html/manual83.html
-share/doc/mutt/html/manual84.html
-share/doc/mutt/html/manual85.html
-share/doc/mutt/html/manual86.html
-share/doc/mutt/html/manual87.html
-share/doc/mutt/html/manual88.html
-share/doc/mutt/html/manual89.html
-share/doc/mutt/html/manual9.html
-share/doc/mutt/html/manual90.html
-share/doc/mutt/html/manual91.html
-share/doc/mutt/html/manual92.html
-share/doc/mutt/html/manual93.html
-share/doc/mutt/html/manual94.html
-share/doc/mutt/html/manual95.html
-share/doc/mutt/html/manual96.html
-share/doc/mutt/html/manual97.html
-share/doc/mutt/html/manual98.html
-share/doc/mutt/html/manual99.html
-share/doc/mutt/html/manual_toc.html
-@dirrm share/doc/mutt/html
diff --git a/mail/mutt/patches/patch-09 b/mail/mutt/patches/patch-09
deleted file mode 100644
index 1e585b79d328..000000000000
--- a/mail/mutt/patches/patch-09
+++ /dev/null
@@ -1,16 +0,0 @@
---- po/zh_TW.Big5.po.orig	Fri Oct 22 00:47:15 1999
-+++ po/zh_TW.Big5.po	Sun Oct 24 20:40:31 1999
-@@ -555,11 +555,11 @@
- 
- #: curs_lib.c:136
- msgid "yes"
--msgstr ""
-+msgstr "y¬O"
- 
- #: curs_lib.c:137
- msgid "no"
--msgstr ""
-+msgstr "n§_"
- 
- #. restore blocking operation
- #: curs_lib.c:176
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
deleted file mode 100644
index b66c9af42ecc..000000000000
--- a/mail/mutt14/Makefile
+++ /dev/null
@@ -1,114 +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.2.4
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/  \
-		ftp://ftp.uib.no/pub/mutt/  \
-		ftp://pgp.rasip.fer.hr/pub/mutt/international/  \
-		ftp://ftp.gbnet.net/pub/mutt-international/  \
-		ftp://riemann.iam.uni-bonn.de/pub/mutt/  \
-		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/mutt-international/ \
-		ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/  \
-		ftp://ftp.iks-jena.de/pub/mitarb/lutz/crypt/software/pgp/mutt/
-DISTNAME=	${PKGNAME}i
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} charmaps-0.0.tar.gz
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
-PATCH_SITES=	http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/  \
-		http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/  \
-		http://www.efrei.fr/~parmelan/mutt/${PKGNAME:S/^mutt-//}/  \
-		ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/  \
-		ftp://riemann.iam.uni-bonn.de/pub/mutt/
-PATCHFILES=
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER=	obrien@FreeBSD.org
-
-LIB_DEPENDS=    intl.1:${PORTSDIR}/devel/gettext
-.if defined(BATCH)
-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
-BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
-.if ${MACHINE_ARCH} != "alpha"
-#  coredump in sgmls
-BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
-.endif
-RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
-.elif defined(WITH_NCURSES_PORT)
-LIB_DEPENDS=	ncurses.4:${PORTSDIR}/devel/ncurses
-.elif defined(WITH_SLANG)
-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
-.endif
-.if defined(WITH_SSL)
-USE_OPENSSL=    RSA
-.endif
-.if defined(PACKAGE_BUILDING)
-RUN_DEPENDS+=	urlview:${PORTSDIR}/textproc/urlview
-.endif
-
-DIST_SUBDIR=	mutt
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=  CC="${CC} -I${LOCALBASE}/include" LDFLAGS=-L${LOCALBASE}/lib
-CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl  \
-		--with-sharedir=${PREFIX}/share/mutt \
-		--with-docdir=${PREFIX}/share/doc/mutt --with-charmaps
-.if defined(WITH_LOCALES_FIX)
-CONFIGURE_ARGS+=	--enable-locales-fix
-.endif
-.if defined(BATCH) || defined(WITH_SLANG)
-CONFIGURE_ARGS+=	--with-slang=${PREFIX}
-.elif defined(WITH_NCURSES_PORT)
-CONFIGURE_ARGS+=	--with-curses=${PREFIX}
-.endif
-.if defined(WITH_SSL)
-CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
-.endif
-WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
-MAN1=		mutt.1 mutt_dotlock.1
-MAN5=		muttrc.5
-
-pre-patch:
-	(cd ${WRKSRC}; ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/charmaps-0.0.tar.gz)
-
-post-patch:
-	cd ${WRKSRC}/charmaps/maps; ${LN} CP1251 WINDOWS-1251
-	cd ${WRKSRC}/charmaps/maps; ${RM} -f *.orig
-
-.if !defined(NOPORTDOCS)
-post-build:
-	${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
-	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-doc-ref
-	printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
-		ed -s ${WRKSRC}/doc/mutt.man
-.if defined(BATCH)
-PLIST:=		${WRKDIR}/PLIST
-pre-install:
-	@${CAT} ${PKGDIR}/PLIST.htmlfiles >> ${PLIST}
-	@${CAT} ${PKGDIR}/PLIST >> ${PLIST}
-.endif
-.endif
-
-post-install:
-	@strip ${PREFIX}/bin/mutt
-.if !defined(NOPORTDOCS)
-	@${ECHO} "===>   Installing Mutt documentation"
-	@${MKDIR} ${PREFIX}/share/doc/mutt && ${CHMOD} a+rx ${PREFIX}/share/doc/mutt
-	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
-		${PREFIX}/share/doc/mutt
-.if defined(BATCH)
-	${INSTALL_MAN} -d ${PREFIX}/share/doc/mutt/html
-	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html
-	${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt
-.endif
-	@cd ${WRKSRC}/contrib ; ${INSTALL_DATA} sample.muttrc Mush.rc Pine.rc \
-		${PREFIX}/share/doc/mutt
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo
deleted file mode 100644
index 9e1f1fda9191..000000000000
--- a/mail/mutt14/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (mutt/mutt-1.2.4i.tar.gz) = 30968eeb985c074d03078a3d6ae982c9
-MD5 (mutt/charmaps-0.0.tar.gz) = e79b9f57da1f6a4d0a63ff60a4ef7da8
diff --git a/mail/mutt14/files/extra-patch-doc-ref b/mail/mutt14/files/extra-patch-doc-ref
deleted file mode 100644
index ee044b188b0b..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${PREFIX}/share/doc/mutt/\fP.
- .SH OPTIONS
- .IP "-a \fIfile\fP"
- Attach a file to your message using MIME.
diff --git a/mail/mutt14/files/patch-01 b/mail/mutt14/files/patch-01
deleted file mode 100644
index 836dbb773b2c..000000000000
--- a/mail/mutt14/files/patch-01
+++ /dev/null
@@ -1,11 +0,0 @@
---- charmaps/maps/KOI8-R.bak	Wed Jan 20 01:30:20 1999
-+++ charmaps/maps/KOI8-R	Sat May 13 21:27:42 2000
-@@ -157,7 +157,7 @@
- <?S>                   /x92   <U2593> DARK SHADE
- <Iu>                   /x93   <U2320> TOP HALF INTEGRAL
- <fS>                   /x94   <U25A0> BLACK SQUARE
--<sb>                   /x95   <U2022> BULLET
-+<Sb>                   /x95   <U2219> BULLET OPERATOR
- <RT>                   /x96   <U221A> SQUARE ROOT
- <?2>                   /x97   <U2248> ALMOST EQUAL TO
- <=<>                   /x98   <U2264> LESS-THAN OR EQUAL TO
diff --git a/mail/mutt14/files/patch-02 b/mail/mutt14/files/patch-02
deleted file mode 100644
index 84fd2e11b1da..000000000000
--- a/mail/mutt14/files/patch-02
+++ /dev/null
@@ -1,68 +0,0 @@
---- doc/Makefile.in.orig	Wed Mar 29 11:42:49 2000
-+++ doc/Makefile.in	Mon Jun 12 16:50:51 2000
-@@ -58,13 +58,16 @@
- topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
- 	README NEWS TODO README.SECURITY README.SSL README.UPGRADE
- 
--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 ./
-+	$(MAKE) manual.html || cp $(srcdir)/manual*.html ./
- 
- try-txt: ../makedoc
--	test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+	$(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+
-+try-latin1: 
-+	$(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./
- 
- install: all
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -75,16 +78,16 @@
- 	$(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
- 	for f in $(srcdir_DOCFILES) ; do \
--		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
-+	 	$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
- 	done
- 	for f in $(topsrcdir_DOCFILES) ; do \
--		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
-+	 	$(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
-@@ -93,14 +96,18 @@
- 	-rm -rf $(DESTDIR)$(docdir)
- 
- 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-04 b/mail/mutt14/files/patch-04
deleted file mode 100644
index f0763a9c7060..000000000000
--- a/mail/mutt14/files/patch-04
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig	Tue Jan 18 14:19:14 2000
-+++ configure	Tue Feb 29 01:47:49 2000
-@@ -1925,6 +1925,9 @@
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char $ac_func();
-+#ifdef __FreeBSD__
-+#define bkgdset initscr
-+#endif
- 
- int main() {
- 
-@@ -5710,7 +5713,7 @@
- s%@FFLAGS@%$FFLAGS%g
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
--s%@LIBS@%$LIBS%g
-+s%@LIBS@%$LIBS -lxpg4%g
- s%@exec_prefix@%$exec_prefix%g
- s%@prefix@%$prefix%g
- s%@program_transform_name@%$program_transform_name%g
diff --git a/mail/mutt14/files/patch-05 b/mail/mutt14/files/patch-05
deleted file mode 100644
index 364bc49a259d..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	Wed Aug 25 10:23:12 1999
-+++ compose.c	Sun Sep 26 23:46:25 1999
-@@ -130,7 +130,7 @@
-   struct pgp_vinfo *pgp = pgp_get_vinfo(PGP_SIGN);
- 
-   switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, select (m)ic algorithm, or (f)orget it? "),
--			     _("esabmf")))
-+			     N_("esabmf")))
-   {
-   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-Makefile.in b/mail/mutt14/files/patch-Makefile.in
deleted file mode 100644
index 5e33d7c1abdf..000000000000
--- a/mail/mutt14/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Tue May  9 17:15:37 2000
-+++ Makefile.in	Fri May 12 13:53:08 2000
-@@ -210,7 +210,7 @@
- SOURCES = $(mutt_dotlock_SOURCES) $(pgpring_SOURCES) $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES)
- OBJECTS = $(mutt_dotlock_OBJECTS) $(pgpring_OBJECTS) $(makedoc_OBJECTS) $(mutt_OBJECTS)
- 
--all: all-redirect
-+all: $(BUILT_SOURCES) all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .o .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
diff --git a/mail/mutt14/patches/patch-09 b/mail/mutt14/patches/patch-09
deleted file mode 100644
index 1e585b79d328..000000000000
--- a/mail/mutt14/patches/patch-09
+++ /dev/null
@@ -1,16 +0,0 @@
---- po/zh_TW.Big5.po.orig	Fri Oct 22 00:47:15 1999
-+++ po/zh_TW.Big5.po	Sun Oct 24 20:40:31 1999
-@@ -555,11 +555,11 @@
- 
- #: curs_lib.c:136
- msgid "yes"
--msgstr ""
-+msgstr "y¬O"
- 
- #: curs_lib.c:137
- msgid "no"
--msgstr ""
-+msgstr "n§_"
- 
- #. restore blocking operation
- #: curs_lib.c:176
diff --git a/mail/mutt14/pkg-comment b/mail/mutt14/pkg-comment
deleted file mode 100644
index c04a3dff7269..000000000000
--- a/mail/mutt14/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-"The Mongrel of Mail User Agents" (part Elm, Pine, mh)
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 217ea723e999..000000000000
--- a/mail/mutt14/pkg-plist
+++ /dev/null
@@ -1,215 +0,0 @@
-bin/mutt
-bin/mutt_dotlock
-bin/muttbug
-bin/pgpewrap
-bin/pgpring
-etc/Muttrc
-etc/mime.types
-share/mutt/charmaps/ANSI_X3.110-1983
-share/mutt/charmaps/ANSI_X3.4-1968
-share/mutt/charmaps/ASMO_449
-share/mutt/charmaps/BALTIC
-share/mutt/charmaps/BS_4730
-share/mutt/charmaps/BS_VIEWDATA
-share/mutt/charmaps/CP1250
-share/mutt/charmaps/CP1251
-share/mutt/charmaps/CP1252
-share/mutt/charmaps/CP1253
-share/mutt/charmaps/CP1254
-share/mutt/charmaps/CP1255
-share/mutt/charmaps/CP1256
-share/mutt/charmaps/CP1257
-share/mutt/charmaps/CSA_Z243.4-1985-1
-share/mutt/charmaps/CSA_Z243.4-1985-2
-share/mutt/charmaps/CSA_Z243.4-1985-GR
-share/mutt/charmaps/CSN_369103
-share/mutt/charmaps/CWI
-share/mutt/charmaps/DEC-MCS
-share/mutt/charmaps/DIN_66003
-share/mutt/charmaps/DS_2089
-share/mutt/charmaps/EBCDIC-AT-DE
-share/mutt/charmaps/EBCDIC-AT-DE-A
-share/mutt/charmaps/EBCDIC-CA-FR
-share/mutt/charmaps/EBCDIC-DK-NO
-share/mutt/charmaps/EBCDIC-DK-NO-A
-share/mutt/charmaps/EBCDIC-ES
-share/mutt/charmaps/EBCDIC-ES-A
-share/mutt/charmaps/EBCDIC-ES-S
-share/mutt/charmaps/EBCDIC-FI-SE
-share/mutt/charmaps/EBCDIC-FI-SE-A
-share/mutt/charmaps/EBCDIC-FR
-share/mutt/charmaps/EBCDIC-IS-FRISS
-share/mutt/charmaps/EBCDIC-IT
-share/mutt/charmaps/EBCDIC-PT
-share/mutt/charmaps/EBCDIC-UK
-share/mutt/charmaps/EBCDIC-US
-share/mutt/charmaps/ECMA-CYRILLIC
-share/mutt/charmaps/ES
-share/mutt/charmaps/ES2
-share/mutt/charmaps/GB_1988-80
-share/mutt/charmaps/GOST_19768-74
-share/mutt/charmaps/GREEK-CCITT
-share/mutt/charmaps/GREEK7
-share/mutt/charmaps/GREEK7-OLD
-share/mutt/charmaps/HP-ROMAN8
-share/mutt/charmaps/IBM037
-share/mutt/charmaps/IBM038
-share/mutt/charmaps/IBM1004
-share/mutt/charmaps/IBM1026
-share/mutt/charmaps/IBM1047
-share/mutt/charmaps/IBM256
-share/mutt/charmaps/IBM273
-share/mutt/charmaps/IBM274
-share/mutt/charmaps/IBM275
-share/mutt/charmaps/IBM277
-share/mutt/charmaps/IBM278
-share/mutt/charmaps/IBM280
-share/mutt/charmaps/IBM281
-share/mutt/charmaps/IBM284
-share/mutt/charmaps/IBM285
-share/mutt/charmaps/IBM290
-share/mutt/charmaps/IBM297
-share/mutt/charmaps/IBM420
-share/mutt/charmaps/IBM423
-share/mutt/charmaps/IBM424
-share/mutt/charmaps/IBM437
-share/mutt/charmaps/IBM500
-share/mutt/charmaps/IBM850
-share/mutt/charmaps/IBM851
-share/mutt/charmaps/IBM852
-share/mutt/charmaps/IBM855
-share/mutt/charmaps/IBM857
-share/mutt/charmaps/IBM860
-share/mutt/charmaps/IBM861
-share/mutt/charmaps/IBM862
-share/mutt/charmaps/IBM863
-share/mutt/charmaps/IBM864
-share/mutt/charmaps/IBM865
-share/mutt/charmaps/IBM868
-share/mutt/charmaps/IBM869
-share/mutt/charmaps/IBM870
-share/mutt/charmaps/IBM871
-share/mutt/charmaps/IBM875
-share/mutt/charmaps/IBM880
-share/mutt/charmaps/IBM891
-share/mutt/charmaps/IBM903
-share/mutt/charmaps/IBM904
-share/mutt/charmaps/IBM905
-share/mutt/charmaps/IBM918
-share/mutt/charmaps/IEC_P27-1
-share/mutt/charmaps/INIS
-share/mutt/charmaps/INIS-8
-share/mutt/charmaps/INIS-CYRILLIC
-share/mutt/charmaps/INVARIANT
-share/mutt/charmaps/ISO-8859-1
-share/mutt/charmaps/ISO-8859-10
-share/mutt/charmaps/ISO-8859-2
-share/mutt/charmaps/ISO-8859-3
-share/mutt/charmaps/ISO-8859-4
-share/mutt/charmaps/ISO-8859-5
-share/mutt/charmaps/ISO-8859-6
-share/mutt/charmaps/ISO-8859-7
-share/mutt/charmaps/ISO-8859-8
-share/mutt/charmaps/ISO-8859-9
-share/mutt/charmaps/ISO-IR-90
-share/mutt/charmaps/ISO_10367-BOX
-share/mutt/charmaps/ISO_10646
-share/mutt/charmaps/ISO_2033-1983
-share/mutt/charmaps/ISO_5427
-share/mutt/charmaps/ISO_5427-EXT
-share/mutt/charmaps/ISO_5428
-share/mutt/charmaps/ISO_646.BASIC
-share/mutt/charmaps/ISO_646.IRV
-share/mutt/charmaps/ISO_6937
-share/mutt/charmaps/ISO_6937-2-25
-share/mutt/charmaps/ISO_6937-2-ADD
-share/mutt/charmaps/ISO_8859-1,GL
-share/mutt/charmaps/ISO_8859-SUPP
-share/mutt/charmaps/IT
-share/mutt/charmaps/JIS_C6220-1969-JP
-share/mutt/charmaps/JIS_C6220-1969-RO
-share/mutt/charmaps/JIS_C6229-1984-A
-share/mutt/charmaps/JIS_C6229-1984-B
-share/mutt/charmaps/JIS_C6229-1984-B-ADD
-share/mutt/charmaps/JIS_C6229-1984-HAND
-share/mutt/charmaps/JIS_C6229-1984-HAND-ADD
-share/mutt/charmaps/JIS_C6229-1984-KANA
-share/mutt/charmaps/JIS_X0201
-share/mutt/charmaps/JUS_I.B1.002
-share/mutt/charmaps/JUS_I.B1.003-MAC
-share/mutt/charmaps/JUS_I.B1.003-SERB
-share/mutt/charmaps/KOI-8
-share/mutt/charmaps/KOI8-R
-share/mutt/charmaps/KSC5636
-share/mutt/charmaps/LATIN-GREEK
-share/mutt/charmaps/LATIN-GREEK-1
-share/mutt/charmaps/MAC-IS
-share/mutt/charmaps/MACINTOSH
-share/mutt/charmaps/MSZ_7795.3
-share/mutt/charmaps/NATS-DANO
-share/mutt/charmaps/NATS-DANO-ADD
-share/mutt/charmaps/NATS-SEFI
-share/mutt/charmaps/NATS-SEFI-ADD
-share/mutt/charmaps/NC_NC00-10
-share/mutt/charmaps/NEXTSTEP
-share/mutt/charmaps/NF_Z_62-010
-share/mutt/charmaps/NF_Z_62-010-1973
-share/mutt/charmaps/NS_4551-1
-share/mutt/charmaps/NS_4551-2
-share/mutt/charmaps/PT
-share/mutt/charmaps/PT2
-share/mutt/charmaps/SAMI
-share/mutt/charmaps/SEN_850200_B
-share/mutt/charmaps/SEN_850200_C
-share/mutt/charmaps/T.101-G2
-share/mutt/charmaps/T.61-7BIT
-share/mutt/charmaps/T.61-8BIT
-share/mutt/charmaps/VIDEOTEX-SUPPL
-share/mutt/charmaps/WINDOWS-1251
-share/locale/cs/LC_MESSAGES/mutt.mo
-share/locale/da/LC_MESSAGES/mutt.mo
-share/locale/de/LC_MESSAGES/mutt.mo
-share/locale/el/LC_MESSAGES/mutt.mo
-share/locale/eo/LC_MESSAGES/mutt.mo
-share/locale/es/LC_MESSAGES/mutt.mo
-share/locale/fr/LC_MESSAGES/mutt.mo
-share/locale/gl/LC_MESSAGES/mutt.mo
-share/locale/id/LC_MESSAGES/mutt.mo
-share/locale/it/LC_MESSAGES/mutt.mo
-share/locale/ko/LC_MESSAGES/mutt.mo
-share/locale/nl/LC_MESSAGES/mutt.mo
-share/locale/pl/LC_MESSAGES/mutt.mo
-share/locale/pt_BR/LC_MESSAGES/mutt.mo
-share/locale/ru/LC_MESSAGES/mutt.mo
-share/locale/sk/LC_MESSAGES/mutt.mo
-share/locale/sv/LC_MESSAGES/mutt.mo
-share/locale/uk/LC_MESSAGES/mutt.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
-share/doc/mutt/manual.txt
-share/doc/mutt/COPYRIGHT
-share/doc/mutt/ChangeLog
-share/doc/mutt/GPL
-share/doc/mutt/INSTALL
-share/doc/mutt/NEWS
-share/doc/mutt/PGP-Notes.txt
-share/doc/mutt/README
-share/doc/mutt/README.SECURITY
-share/doc/mutt/README.SSL
-share/doc/mutt/README.UPGRADE
-share/doc/mutt/TODO
-share/doc/mutt/applying-patches.txt
-share/doc/mutt/devel-notes.txt
-share/doc/mutt/samples/Mush.rc
-share/doc/mutt/samples/Pine.rc
-share/doc/mutt/samples/Tin.rc
-share/doc/mutt/samples/gpg.rc
-share/doc/mutt/samples/pgp2.rc
-share/doc/mutt/samples/pgp5.rc
-share/doc/mutt/samples/pgp6.rc
-share/doc/mutt/samples/sample.mailcap
-share/doc/mutt/samples/sample.muttrc
-share/doc/mutt/samples/sample.muttrc-tlr
-@dirrm share/mutt/charmaps
-@dirrm share/mutt
-@dirrm share/doc/mutt/samples
-@dirrm share/doc/mutt
diff --git a/mail/mutt14/pkg-plist.htmlfiles b/mail/mutt14/pkg-plist.htmlfiles
deleted file mode 100644
index 12f5d96710f1..000000000000
--- a/mail/mutt14/pkg-plist.htmlfiles
+++ /dev/null
@@ -1,315 +0,0 @@
-share/doc/mutt/manual.latin1
-share/doc/mutt/html/manual-1.html
-share/doc/mutt/html/manual-2.html
-share/doc/mutt/html/manual-3.html
-share/doc/mutt/html/manual-4.html
-share/doc/mutt/html/manual-5.html
-share/doc/mutt/html/manual-6.html
-share/doc/mutt/html/manual-7.html
-share/doc/mutt/html/manual.html
-share/doc/mutt/html/manual1.html
-share/doc/mutt/html/manual10.html
-share/doc/mutt/html/manual100.html
-share/doc/mutt/html/manual101.html
-share/doc/mutt/html/manual102.html
-share/doc/mutt/html/manual103.html
-share/doc/mutt/html/manual104.html
-share/doc/mutt/html/manual105.html
-share/doc/mutt/html/manual106.html
-share/doc/mutt/html/manual107.html
-share/doc/mutt/html/manual108.html
-share/doc/mutt/html/manual109.html
-share/doc/mutt/html/manual11.html
-share/doc/mutt/html/manual110.html
-share/doc/mutt/html/manual111.html
-share/doc/mutt/html/manual112.html
-share/doc/mutt/html/manual113.html
-share/doc/mutt/html/manual114.html
-share/doc/mutt/html/manual115.html
-share/doc/mutt/html/manual116.html
-share/doc/mutt/html/manual117.html
-share/doc/mutt/html/manual118.html
-share/doc/mutt/html/manual119.html
-share/doc/mutt/html/manual12.html
-share/doc/mutt/html/manual120.html
-share/doc/mutt/html/manual121.html
-share/doc/mutt/html/manual122.html
-share/doc/mutt/html/manual123.html
-share/doc/mutt/html/manual124.html
-share/doc/mutt/html/manual125.html
-share/doc/mutt/html/manual126.html
-share/doc/mutt/html/manual127.html
-share/doc/mutt/html/manual128.html
-share/doc/mutt/html/manual129.html
-share/doc/mutt/html/manual13.html
-share/doc/mutt/html/manual130.html
-share/doc/mutt/html/manual131.html
-share/doc/mutt/html/manual132.html
-share/doc/mutt/html/manual133.html
-share/doc/mutt/html/manual134.html
-share/doc/mutt/html/manual135.html
-share/doc/mutt/html/manual136.html
-share/doc/mutt/html/manual137.html
-share/doc/mutt/html/manual138.html
-share/doc/mutt/html/manual139.html
-share/doc/mutt/html/manual14.html
-share/doc/mutt/html/manual140.html
-share/doc/mutt/html/manual141.html
-share/doc/mutt/html/manual142.html
-share/doc/mutt/html/manual143.html
-share/doc/mutt/html/manual144.html
-share/doc/mutt/html/manual145.html
-share/doc/mutt/html/manual146.html
-share/doc/mutt/html/manual147.html
-share/doc/mutt/html/manual148.html
-share/doc/mutt/html/manual149.html
-share/doc/mutt/html/manual15.html
-share/doc/mutt/html/manual150.html
-share/doc/mutt/html/manual151.html
-share/doc/mutt/html/manual152.html
-share/doc/mutt/html/manual153.html
-share/doc/mutt/html/manual154.html
-share/doc/mutt/html/manual155.html
-share/doc/mutt/html/manual156.html
-share/doc/mutt/html/manual157.html
-share/doc/mutt/html/manual158.html
-share/doc/mutt/html/manual159.html
-share/doc/mutt/html/manual16.html
-share/doc/mutt/html/manual160.html
-share/doc/mutt/html/manual161.html
-share/doc/mutt/html/manual162.html
-share/doc/mutt/html/manual163.html
-share/doc/mutt/html/manual164.html
-share/doc/mutt/html/manual165.html
-share/doc/mutt/html/manual166.html
-share/doc/mutt/html/manual167.html
-share/doc/mutt/html/manual168.html
-share/doc/mutt/html/manual169.html
-share/doc/mutt/html/manual17.html
-share/doc/mutt/html/manual170.html
-share/doc/mutt/html/manual171.html
-share/doc/mutt/html/manual172.html
-share/doc/mutt/html/manual173.html
-share/doc/mutt/html/manual174.html
-share/doc/mutt/html/manual175.html
-share/doc/mutt/html/manual176.html
-share/doc/mutt/html/manual177.html
-share/doc/mutt/html/manual178.html
-share/doc/mutt/html/manual179.html
-share/doc/mutt/html/manual18.html
-share/doc/mutt/html/manual180.html
-share/doc/mutt/html/manual181.html
-share/doc/mutt/html/manual182.html
-share/doc/mutt/html/manual183.html
-share/doc/mutt/html/manual184.html
-share/doc/mutt/html/manual185.html
-share/doc/mutt/html/manual186.html
-share/doc/mutt/html/manual187.html
-share/doc/mutt/html/manual188.html
-share/doc/mutt/html/manual189.html
-share/doc/mutt/html/manual19.html
-share/doc/mutt/html/manual190.html
-share/doc/mutt/html/manual191.html
-share/doc/mutt/html/manual192.html
-share/doc/mutt/html/manual193.html
-share/doc/mutt/html/manual194.html
-share/doc/mutt/html/manual195.html
-share/doc/mutt/html/manual196.html
-share/doc/mutt/html/manual197.html
-share/doc/mutt/html/manual198.html
-share/doc/mutt/html/manual199.html
-share/doc/mutt/html/manual2.html
-share/doc/mutt/html/manual20.html
-share/doc/mutt/html/manual200.html
-share/doc/mutt/html/manual201.html
-share/doc/mutt/html/manual202.html
-share/doc/mutt/html/manual203.html
-share/doc/mutt/html/manual204.html
-share/doc/mutt/html/manual205.html
-share/doc/mutt/html/manual206.html
-share/doc/mutt/html/manual207.html
-share/doc/mutt/html/manual208.html
-share/doc/mutt/html/manual209.html
-share/doc/mutt/html/manual21.html
-share/doc/mutt/html/manual210.html
-share/doc/mutt/html/manual211.html
-share/doc/mutt/html/manual212.html
-share/doc/mutt/html/manual213.html
-share/doc/mutt/html/manual214.html
-share/doc/mutt/html/manual215.html
-share/doc/mutt/html/manual216.html
-share/doc/mutt/html/manual217.html
-share/doc/mutt/html/manual218.html
-share/doc/mutt/html/manual219.html
-share/doc/mutt/html/manual22.html
-share/doc/mutt/html/manual220.html
-share/doc/mutt/html/manual221.html
-share/doc/mutt/html/manual222.html
-share/doc/mutt/html/manual223.html
-share/doc/mutt/html/manual224.html
-share/doc/mutt/html/manual225.html
-share/doc/mutt/html/manual226.html
-share/doc/mutt/html/manual227.html
-share/doc/mutt/html/manual228.html
-share/doc/mutt/html/manual229.html
-share/doc/mutt/html/manual23.html
-share/doc/mutt/html/manual230.html
-share/doc/mutt/html/manual231.html
-share/doc/mutt/html/manual232.html
-share/doc/mutt/html/manual233.html
-share/doc/mutt/html/manual234.html
-share/doc/mutt/html/manual235.html
-share/doc/mutt/html/manual236.html
-share/doc/mutt/html/manual237.html
-share/doc/mutt/html/manual238.html
-share/doc/mutt/html/manual239.html
-share/doc/mutt/html/manual24.html
-share/doc/mutt/html/manual240.html
-share/doc/mutt/html/manual241.html
-share/doc/mutt/html/manual242.html
-share/doc/mutt/html/manual243.html
-share/doc/mutt/html/manual244.html
-share/doc/mutt/html/manual245.html
-share/doc/mutt/html/manual246.html
-share/doc/mutt/html/manual247.html
-share/doc/mutt/html/manual248.html
-share/doc/mutt/html/manual249.html
-share/doc/mutt/html/manual25.html
-share/doc/mutt/html/manual250.html
-share/doc/mutt/html/manual251.html
-share/doc/mutt/html/manual252.html
-share/doc/mutt/html/manual253.html
-share/doc/mutt/html/manual254.html
-share/doc/mutt/html/manual255.html
-share/doc/mutt/html/manual256.html
-share/doc/mutt/html/manual257.html
-share/doc/mutt/html/manual258.html             
-share/doc/mutt/html/manual259.html             
-share/doc/mutt/html/manual26.html
-share/doc/mutt/html/manual260.html
-share/doc/mutt/html/manual261.html
-share/doc/mutt/html/manual262.html
-share/doc/mutt/html/manual263.html
-share/doc/mutt/html/manual264.html
-share/doc/mutt/html/manual265.html
-share/doc/mutt/html/manual266.html
-share/doc/mutt/html/manual267.html
-share/doc/mutt/html/manual268.html
-share/doc/mutt/html/manual269.html
-share/doc/mutt/html/manual27.html
-share/doc/mutt/html/manual270.html
-share/doc/mutt/html/manual271.html
-share/doc/mutt/html/manual272.html
-share/doc/mutt/html/manual273.html
-share/doc/mutt/html/manual274.html
-share/doc/mutt/html/manual275.html
-share/doc/mutt/html/manual276.html
-share/doc/mutt/html/manual277.html
-share/doc/mutt/html/manual278.html
-share/doc/mutt/html/manual279.html
-share/doc/mutt/html/manual28.html
-share/doc/mutt/html/manual280.html
-share/doc/mutt/html/manual281.html
-share/doc/mutt/html/manual282.html
-share/doc/mutt/html/manual283.html
-share/doc/mutt/html/manual284.html
-share/doc/mutt/html/manual285.html
-share/doc/mutt/html/manual286.html
-share/doc/mutt/html/manual287.html
-share/doc/mutt/html/manual288.html
-share/doc/mutt/html/manual289.html
-share/doc/mutt/html/manual29.html
-share/doc/mutt/html/manual290.html
-share/doc/mutt/html/manual291.html
-share/doc/mutt/html/manual292.html
-share/doc/mutt/html/manual293.html
-share/doc/mutt/html/manual294.html
-share/doc/mutt/html/manual295.html
-share/doc/mutt/html/manual296.html
-share/doc/mutt/html/manual297.html
-share/doc/mutt/html/manual298.html
-share/doc/mutt/html/manual299.html
-share/doc/mutt/html/manual3.html
-share/doc/mutt/html/manual30.html
-share/doc/mutt/html/manual300.html
-share/doc/mutt/html/manual301.html
-share/doc/mutt/html/manual302.html
-share/doc/mutt/html/manual303.html
-share/doc/mutt/html/manual304.html
-share/doc/mutt/html/manual31.html
-share/doc/mutt/html/manual32.html
-share/doc/mutt/html/manual33.html
-share/doc/mutt/html/manual34.html
-share/doc/mutt/html/manual35.html
-share/doc/mutt/html/manual36.html
-share/doc/mutt/html/manual37.html
-share/doc/mutt/html/manual38.html
-share/doc/mutt/html/manual39.html
-share/doc/mutt/html/manual4.html
-share/doc/mutt/html/manual40.html
-share/doc/mutt/html/manual41.html
-share/doc/mutt/html/manual42.html
-share/doc/mutt/html/manual43.html
-share/doc/mutt/html/manual44.html
-share/doc/mutt/html/manual45.html
-share/doc/mutt/html/manual46.html
-share/doc/mutt/html/manual47.html
-share/doc/mutt/html/manual48.html
-share/doc/mutt/html/manual49.html
-share/doc/mutt/html/manual5.html
-share/doc/mutt/html/manual50.html
-share/doc/mutt/html/manual51.html
-share/doc/mutt/html/manual52.html
-share/doc/mutt/html/manual53.html
-share/doc/mutt/html/manual54.html
-share/doc/mutt/html/manual55.html
-share/doc/mutt/html/manual56.html
-share/doc/mutt/html/manual57.html
-share/doc/mutt/html/manual58.html
-share/doc/mutt/html/manual59.html
-share/doc/mutt/html/manual6.html
-share/doc/mutt/html/manual60.html
-share/doc/mutt/html/manual61.html
-share/doc/mutt/html/manual62.html
-share/doc/mutt/html/manual63.html
-share/doc/mutt/html/manual64.html
-share/doc/mutt/html/manual65.html
-share/doc/mutt/html/manual66.html
-share/doc/mutt/html/manual67.html
-share/doc/mutt/html/manual68.html
-share/doc/mutt/html/manual69.html
-share/doc/mutt/html/manual7.html
-share/doc/mutt/html/manual70.html
-share/doc/mutt/html/manual71.html
-share/doc/mutt/html/manual72.html
-share/doc/mutt/html/manual73.html
-share/doc/mutt/html/manual74.html
-share/doc/mutt/html/manual75.html
-share/doc/mutt/html/manual76.html
-share/doc/mutt/html/manual77.html
-share/doc/mutt/html/manual78.html
-share/doc/mutt/html/manual79.html
-share/doc/mutt/html/manual8.html
-share/doc/mutt/html/manual80.html
-share/doc/mutt/html/manual81.html
-share/doc/mutt/html/manual82.html
-share/doc/mutt/html/manual83.html
-share/doc/mutt/html/manual84.html
-share/doc/mutt/html/manual85.html
-share/doc/mutt/html/manual86.html
-share/doc/mutt/html/manual87.html
-share/doc/mutt/html/manual88.html
-share/doc/mutt/html/manual89.html
-share/doc/mutt/html/manual9.html
-share/doc/mutt/html/manual90.html
-share/doc/mutt/html/manual91.html
-share/doc/mutt/html/manual92.html
-share/doc/mutt/html/manual93.html
-share/doc/mutt/html/manual94.html
-share/doc/mutt/html/manual95.html
-share/doc/mutt/html/manual96.html
-share/doc/mutt/html/manual97.html
-share/doc/mutt/html/manual98.html
-share/doc/mutt/html/manual99.html
-share/doc/mutt/html/manual_toc.html
-@dirrm share/doc/mutt/html
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
deleted file mode 100644
index 2cef938289a9..000000000000
--- a/mail/postfix1/Makefile
+++ /dev/null
@@ -1,150 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:		18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-PORTNAME=	postfix
-PORTVERSION= 	19991231.08
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
-		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
-		ftp://ftp.reverse.net/pub/postfix/official/ \
-		ftp://postfix.eu.org/pub/postfix/official/ \
-		ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
-		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
-		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-DISTNAME=	${PORTNAME}-19991231-pl08
-
-MAINTAINER=	torstenb@FreeBSD.org
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
-POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
-.endif
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_LDAP)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-.endif
-
-ALL_TARGET=	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}"
-
-SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-MAKE_ENV+=	"OPT=${CFLAGS}"
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
-	sendmail.1
-MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
-MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
-	showq.8 smtp.8 smtpd.8 trivial-rewrite.8 error.8
-
-SHAREMODE=	0444
-PDOC=		${PREFIX}/share/doc/postfix
-
-do-install:
-	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
-	@${CHOWN} root:wheel ${PREFIX}/etc/postfix
-	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
-		${PREFIX}/etc/postfix/LICENSE
-	@for f in access main.cf master.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/sample-$$f ; \
-	done
-	@for f in sample-aliases.cf sample-canonical.cf sample-debug.cf \
-		sample-ldap.cf sample-local.cf sample-misc.cf sample-pcre.cf \
-		sample-rate.cf sample-relocated.cf sample-resource.cf \
-		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
-		sample-transport.cf sample-virtual.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/$$f ;\
-	done
-	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
-		${PREFIX}/etc/postfix/postfix-script
-	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
-	@for f in bounce cleanup error local master pickup pipe qmgr \
-		 showq smtp smtpd trivial-rewrite ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s \
-			${WRKSRC}/libexec/$$f ${PREFIX}/libexec/postfix/$$f ;\
-	done
-	@for f in postalias postcat postconf postfix postkick postlock postlog\
-		postmap postsuper sendmail smtp-sink smtp-source ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s ${WRKSRC}/bin/$$f \
-			${PREFIX}/sbin/$$f ;\
-	done
-	@${INSTALL} -C -o root -g maildrop -m 2755 -s ${WRKSRC}/bin/postdrop \
-		${PREFIX}/sbin/postdrop
-	@for f in ${MAN1} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
-			${PREFIX}/man/man1/$$f ;\
-	done
-	@for f in ${MAN5} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
-			${PREFIX}/man/man5/$$f ;\
-	done
-	@for f in ${MAN8} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
-			${PREFIX}/man/man8/$$f ;\
-	done
-	@${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${PDOC}
-	@cd ${WRKSRC} && ${INSTALL_DATA} \
-		html/*.html html/*.gif ${PDOC} && \
-		${ECHO_MSG} "Installed HTML documentation in ${PDOC}"
-	@${MKDIR} -m 0755 /var/spool/postfix
-	@${ECHO_MSG} "--------------------------------------------------"
-	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
-	@${ECHO_MSG} "- type \"make replace\"                          -"
-	@${ECHO_MSG} "--------------------------------------------------"
-
-pre-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
-
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.pre.mk>
-
-replace:
-.if ${OSVERSION} >= 400014
-	@${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf"
-	${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak
-	${ECHO} 'sendmail	${PREFIX}/sbin/sendmail' > /etc/mail/mailer.conf
-	${ECHO} 'send-mail	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'mailq		${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'newaliases	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-.else
-	@${ECHO_MSG} "===> Replacing sendmail"
-	@if [ -e /usr/sbin/sendmail ]; then \
-		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
-		${CHMOD} 0 /usr/sbin/sendmail.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
-	fi
-	@${ECHO_MSG} "===> Replacing mailq"
-	@if [ -e /usr/bin/mailq ]; then \
-		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
-		${CHMOD} 0 /usr/bin/mailq.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
-	fi
-	@${ECHO_MSG} "===> Replacing newaliases"
-	@if [ -e /usr/bin/newaliases ]; then \
-		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
-		${CHMOD} 0 /usr/bin/newaliases.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
-	fi
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/postfix1/distinfo b/mail/postfix1/distinfo
deleted file mode 100644
index c8a018d3ad7f..000000000000
--- a/mail/postfix1/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (postfix-19991231-pl08.tar.gz) = 0461524d91c87b03c80cc640ec953a63
diff --git a/mail/postfix1/files/patch-aa b/mail/postfix1/files/patch-aa
deleted file mode 100644
index 3af6375f1959..000000000000
--- a/mail/postfix1/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-*** global/mail_params.h.orig	Sat Mar 20 15:09:46 1999
---- global/mail_params.h	Sat Mar 20 15:10:46 1999
-***************
-*** 127,133 ****
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
---- 127,133 ----
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
-***************
-*** 161,167 ****
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
---- 161,167 ----
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
diff --git a/mail/postfix1/files/patch-ab b/mail/postfix1/files/patch-ab
deleted file mode 100644
index 32a96b27bbc0..000000000000
--- a/mail/postfix1/files/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
---- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
-+++ conf/main.cf	Sun Jan  2 21:31:24 2000
-@@ -17,14 +17,14 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.  The default value is $program_directory.
- #
--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). The
- # default value is $program_directory. This directory must be owned
- # by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -41,7 +41,7 @@
- # These rights are used in the absence of a recipient user context.
- # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
- #
--#default_privs = nobody
-+default_privs = nobody
- 
- # INTERNET HOST AND DOMAIN NAMES
- # 
diff --git a/mail/postfix1/files/patch-ba b/mail/postfix1/files/patch-ba
deleted file mode 100644
index 73feeef81f27..000000000000
--- a/mail/postfix1/files/patch-ba
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man1/postdrop.1.orig	Mon Mar 29 22:35:14 1999
---- man/man1/postdrop.1	Mon Mar 29 22:35:25 1999
-***************
-*** 51,57 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 51,57 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix1/files/patch-bb b/mail/postfix1/files/patch-bb
deleted file mode 100644
index af024b23b3d9..000000000000
--- a/mail/postfix1/files/patch-bb
+++ /dev/null
@@ -1,36 +0,0 @@
-*** man/man1/sendmail.1.orig	Mon Mar 29 22:35:30 1999
---- man/man1/sendmail.1	Mon Mar 29 22:35:44 1999
-***************
-*** 60,66 ****
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
---- 60,66 ----
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
-***************
-*** 164,170 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 164,170 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix1/files/patch-bc b/mail/postfix1/files/patch-bc
deleted file mode 100644
index 12a369684c8f..000000000000
--- a/mail/postfix1/files/patch-bc
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/access.5.orig	Mon Mar 29 22:35:58 1999
---- man/man5/access.5	Mon Mar 29 22:36:13 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix1/files/patch-bd b/mail/postfix1/files/patch-bd
deleted file mode 100644
index 2b2f30f720f5..000000000000
--- a/mail/postfix1/files/patch-bd
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/canonical.5.orig	Mon Mar 29 22:36:25 1999
---- man/man5/canonical.5	Mon Mar 29 22:36:32 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix1/files/patch-be b/mail/postfix1/files/patch-be
deleted file mode 100644
index 354737c7e68d..000000000000
--- a/mail/postfix1/files/patch-be
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/relocated.5.orig	Mon Mar 29 22:36:36 1999
---- man/man5/relocated.5	Mon Mar 29 22:36:47 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix1/files/patch-bf b/mail/postfix1/files/patch-bf
deleted file mode 100644
index 4de817826469..000000000000
--- a/mail/postfix1/files/patch-bf
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/virtual.5.orig	Mon Mar 29 22:36:55 1999
---- man/man5/virtual.5	Mon Mar 29 22:37:02 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix1/files/patch-bg b/mail/postfix1/files/patch-bg
deleted file mode 100644
index fb2b093bff0f..000000000000
--- a/mail/postfix1/files/patch-bg
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man8/local.8.orig	Mon Mar 29 22:37:14 1999
---- man/man8/local.8	Mon Mar 29 22:37:44 1999
-***************
-*** 75,81 ****
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR or \fB/var/spool/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
---- 75,81 ----
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
diff --git a/mail/postfix1/files/patch-bh b/mail/postfix1/files/patch-bh
deleted file mode 100644
index 42b7373d3fb5..000000000000
--- a/mail/postfix1/files/patch-bh
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/cleanup.8.orig	Mon Mar 29 22:37:59 1999
---- man/man8/cleanup.8	Mon Mar 29 22:38:13 1999
-***************
-*** 118,125 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/canonical*, canonical mapping table
-! /etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
---- 118,125 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
diff --git a/mail/postfix1/files/patch-bi b/mail/postfix1/files/patch-bi
deleted file mode 100644
index 2b57467ed976..000000000000
--- a/mail/postfix1/files/patch-bi
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/master.8.orig	Mon Mar 29 22:38:17 1999
---- man/man8/master.8	Mon Mar 29 22:38:46 1999
-***************
-*** 116,123 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/main.cf: global configuration file.
-! /etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
---- 116,123 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/main.cf: global configuration file.
-! !!PREFIX!!/etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
diff --git a/mail/postfix1/files/patch-bj b/mail/postfix1/files/patch-bj
deleted file mode 100644
index 99c521341ca5..000000000000
--- a/mail/postfix1/files/patch-bj
+++ /dev/null
@@ -1,20 +0,0 @@
---- makedefs.orig	Sun Jan 23 03:04:27 2000
-+++ makedefs	Mon Apr  3 08:59:17 2000
-@@ -89,6 +89,8 @@
- 		;;
-   FreeBSD.4*)	SYSTYPE=FREEBSD4
- 		;;
-+  FreeBSD.5*)	SYSTYPE=FREEBSD5
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-    NetBSD.1*)	SYSTYPE=NETBSD1
-@@ -244,7 +246,7 @@
-         *) : ${OPT='-O'};;
- esac
- 
--: ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk}
-+: ${CC='gcc $(WARN)'} ${OPT='-O'} ${AWK=awk}
- 
- export SYSTYPE AR ARFL RANLIB SYSLIBS CC OPT DEBUG AWK OPTS
- 
diff --git a/mail/postfix1/files/patch-bk b/mail/postfix1/files/patch-bk
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix1/files/patch-bk
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig	Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h	Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
-   * makedefs script, and adding a section below for the new system.
-   */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+    || defined(FREEBSD5) \
-     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
-     || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix1/pkg-comment b/mail/postfix1/pkg-comment
deleted file mode 100644
index 2afe8fab5cff..000000000000
--- a/mail/postfix1/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Good alternative to sendmail
diff --git a/mail/postfix1/pkg-descr b/mail/postfix1/pkg-descr
deleted file mode 100644
index f5136efff0fb..000000000000
--- a/mail/postfix1/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix aims to be an alternative to the widely-used sendmail
-program.  Sendmail is responsible for 70% of all e-mail delivered
-on the Internet.  With an estimated 100 million users, that's an
-estimated 10 billion (10^10) messages daily. A stunning number.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix1/pkg-install b/mail/postfix1/pkg-install
deleted file mode 100644
index dcc7c370d885..000000000000
--- a/mail/postfix1/pkg-install
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-user=postfix
-group=postfix
-group2=maildrop
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-        answer=$(ask "${question}" "${dflt}")
-        case "${answer}" in
-        [Yy]*)          return 0;;
-        [Nn]*)          return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then
-        echo "You already have a group \"${group}\", so I will use it."
-    else
-        echo "You need a group \"${group}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a group \"${group2}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group2} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a user \"${user}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \
-                -s /nonexistent -c "Postfix Mail System" || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/main.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-main.cf \
-	    ${PKG_PREFIX}/etc/postfix/main.cf
-    fi
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/master.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-master.cf \
-	    ${PKG_PREFIX}/etc/postfix/master.cf
-    fi
-    chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
-    chmod 2755 ${PKG_PREFIX}/sbin/postdrop
-fi
diff --git a/mail/postfix1/pkg-plist b/mail/postfix1/pkg-plist
deleted file mode 100644
index 943a3766560b..000000000000
--- a/mail/postfix1/pkg-plist
+++ /dev/null
@@ -1,102 +0,0 @@
-etc/postfix/LICENSE
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-relocated.cf
-etc/postfix/sample-resource.cf
-etc/postfix/sample-rewrite.cf
-etc/postfix/sample-smtp.cf
-etc/postfix/sample-smtpd.cf
-etc/postfix/sample-transport.cf
-etc/postfix/sample-virtual.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/qmgr
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/trivial-rewrite
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postsuper
-sbin/sendmail
-sbin/smtp-sink
-sbin/smtp-source
-share/doc/postfix/access.5.html
-share/doc/postfix/aliases.5.html
-share/doc/postfix/architecture.html
-share/doc/postfix/backstage.html
-share/doc/postfix/basic.html
-share/doc/postfix/big-picture.gif
-share/doc/postfix/big-picture.html
-share/doc/postfix/bounce.8.html
-share/doc/postfix/canonical.5.html
-share/doc/postfix/cleanup.8.html
-share/doc/postfix/commands.html
-share/doc/postfix/defer.8.html
-share/doc/postfix/delivering.html
-share/doc/postfix/error.8.html
-share/doc/postfix/faq.html
-share/doc/postfix/goals.html
-share/doc/postfix/inbound.gif
-share/doc/postfix/index.html
-share/doc/postfix/local.8.html
-share/doc/postfix/mailq.1.html
-share/doc/postfix/master.8.html
-share/doc/postfix/motivation.html
-share/doc/postfix/newaliases.1.html
-share/doc/postfix/outbound.gif
-share/doc/postfix/pickup.8.html
-share/doc/postfix/pipe.8.html
-share/doc/postfix/postalias.1.html
-share/doc/postfix/postcat.1.html
-share/doc/postfix/postconf.1.html
-share/doc/postfix/postdrop.1.html
-share/doc/postfix/postfix.1.html
-share/doc/postfix/postkick.1.html
-share/doc/postfix/postlock.1.html
-share/doc/postfix/postlog.1.html
-share/doc/postfix/postmap.1.html
-share/doc/postfix/postsuper.1.html
-share/doc/postfix/qmgr.8.html
-share/doc/postfix/queuing.html
-share/doc/postfix/rate.html
-share/doc/postfix/receiving.html
-share/doc/postfix/relocated.5.html
-share/doc/postfix/resource.html
-share/doc/postfix/rewrite.html
-share/doc/postfix/security.html
-share/doc/postfix/sendmail.1.html
-share/doc/postfix/showq.8.html
-share/doc/postfix/small-picture.gif
-share/doc/postfix/smtp.8.html
-share/doc/postfix/smtpd.8.html
-share/doc/postfix/transport.5.html
-share/doc/postfix/trivial-rewrite.8.html
-share/doc/postfix/uce.html
-share/doc/postfix/virtual.5.html
-@exec mkdir -p -m 0755 /var/spool/postfix
-@exec chown root:wheel /var/spool/postfix
-@dirrm libexec/postfix
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
diff --git a/mail/postfix1/scripts/configure b/mail/postfix1/scripts/configure
deleted file mode 100644
index a46faa92015c..000000000000
--- a/mail/postfix1/scripts/configure
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-mv ${WRKSRC}/global/mail_params.h ${WRKSRC}/global/mail_params.h.bak
-sed <${WRKSRC}/global/mail_params.h.bak >${WRKSRC}/global/mail_params.h s+!!PREFIX!!+$PREFIX+g
-
-mv ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.bak
-sed s+!!PREFIX!!+$PREFIX+g <${WRKSRC}/conf/main.cf.bak >${WRKSRC}/conf/main.cf
-
-cd ${WRKSRC}/man
-
-for f in ${MAN1} ; do
-	mv man1/$f man1/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man1/$f.bak | soelim >man1/$f
-done
-	
-for f in ${MAN5} ; do
-	mv man5/$f man5/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man5/$f.bak | soelim >man5/$f
-done
-	
-for f in ${MAN8} ; do
-	mv man8/$f man8/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man8/$f.bak | soelim >man8/$f
-done
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
deleted file mode 100644
index 2cef938289a9..000000000000
--- a/mail/postfix20/Makefile
+++ /dev/null
@@ -1,150 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:		18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-PORTNAME=	postfix
-PORTVERSION= 	19991231.08
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
-		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
-		ftp://ftp.reverse.net/pub/postfix/official/ \
-		ftp://postfix.eu.org/pub/postfix/official/ \
-		ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
-		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
-		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-DISTNAME=	${PORTNAME}-19991231-pl08
-
-MAINTAINER=	torstenb@FreeBSD.org
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
-POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
-.endif
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_LDAP)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-.endif
-
-ALL_TARGET=	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}"
-
-SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-MAKE_ENV+=	"OPT=${CFLAGS}"
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
-	sendmail.1
-MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
-MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
-	showq.8 smtp.8 smtpd.8 trivial-rewrite.8 error.8
-
-SHAREMODE=	0444
-PDOC=		${PREFIX}/share/doc/postfix
-
-do-install:
-	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
-	@${CHOWN} root:wheel ${PREFIX}/etc/postfix
-	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
-		${PREFIX}/etc/postfix/LICENSE
-	@for f in access main.cf master.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/sample-$$f ; \
-	done
-	@for f in sample-aliases.cf sample-canonical.cf sample-debug.cf \
-		sample-ldap.cf sample-local.cf sample-misc.cf sample-pcre.cf \
-		sample-rate.cf sample-relocated.cf sample-resource.cf \
-		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
-		sample-transport.cf sample-virtual.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/$$f ;\
-	done
-	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
-		${PREFIX}/etc/postfix/postfix-script
-	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
-	@for f in bounce cleanup error local master pickup pipe qmgr \
-		 showq smtp smtpd trivial-rewrite ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s \
-			${WRKSRC}/libexec/$$f ${PREFIX}/libexec/postfix/$$f ;\
-	done
-	@for f in postalias postcat postconf postfix postkick postlock postlog\
-		postmap postsuper sendmail smtp-sink smtp-source ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s ${WRKSRC}/bin/$$f \
-			${PREFIX}/sbin/$$f ;\
-	done
-	@${INSTALL} -C -o root -g maildrop -m 2755 -s ${WRKSRC}/bin/postdrop \
-		${PREFIX}/sbin/postdrop
-	@for f in ${MAN1} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
-			${PREFIX}/man/man1/$$f ;\
-	done
-	@for f in ${MAN5} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
-			${PREFIX}/man/man5/$$f ;\
-	done
-	@for f in ${MAN8} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
-			${PREFIX}/man/man8/$$f ;\
-	done
-	@${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${PDOC}
-	@cd ${WRKSRC} && ${INSTALL_DATA} \
-		html/*.html html/*.gif ${PDOC} && \
-		${ECHO_MSG} "Installed HTML documentation in ${PDOC}"
-	@${MKDIR} -m 0755 /var/spool/postfix
-	@${ECHO_MSG} "--------------------------------------------------"
-	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
-	@${ECHO_MSG} "- type \"make replace\"                          -"
-	@${ECHO_MSG} "--------------------------------------------------"
-
-pre-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
-
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.pre.mk>
-
-replace:
-.if ${OSVERSION} >= 400014
-	@${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf"
-	${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak
-	${ECHO} 'sendmail	${PREFIX}/sbin/sendmail' > /etc/mail/mailer.conf
-	${ECHO} 'send-mail	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'mailq		${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'newaliases	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-.else
-	@${ECHO_MSG} "===> Replacing sendmail"
-	@if [ -e /usr/sbin/sendmail ]; then \
-		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
-		${CHMOD} 0 /usr/sbin/sendmail.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
-	fi
-	@${ECHO_MSG} "===> Replacing mailq"
-	@if [ -e /usr/bin/mailq ]; then \
-		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
-		${CHMOD} 0 /usr/bin/mailq.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
-	fi
-	@${ECHO_MSG} "===> Replacing newaliases"
-	@if [ -e /usr/bin/newaliases ]; then \
-		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
-		${CHMOD} 0 /usr/bin/newaliases.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
-	fi
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/postfix20/distinfo b/mail/postfix20/distinfo
deleted file mode 100644
index c8a018d3ad7f..000000000000
--- a/mail/postfix20/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (postfix-19991231-pl08.tar.gz) = 0461524d91c87b03c80cc640ec953a63
diff --git a/mail/postfix20/files/patch-aa b/mail/postfix20/files/patch-aa
deleted file mode 100644
index 3af6375f1959..000000000000
--- a/mail/postfix20/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-*** global/mail_params.h.orig	Sat Mar 20 15:09:46 1999
---- global/mail_params.h	Sat Mar 20 15:10:46 1999
-***************
-*** 127,133 ****
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
---- 127,133 ----
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
-***************
-*** 161,167 ****
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
---- 161,167 ----
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
diff --git a/mail/postfix20/files/patch-ab b/mail/postfix20/files/patch-ab
deleted file mode 100644
index 32a96b27bbc0..000000000000
--- a/mail/postfix20/files/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
---- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
-+++ conf/main.cf	Sun Jan  2 21:31:24 2000
-@@ -17,14 +17,14 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.  The default value is $program_directory.
- #
--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). The
- # default value is $program_directory. This directory must be owned
- # by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -41,7 +41,7 @@
- # These rights are used in the absence of a recipient user context.
- # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
- #
--#default_privs = nobody
-+default_privs = nobody
- 
- # INTERNET HOST AND DOMAIN NAMES
- # 
diff --git a/mail/postfix20/files/patch-ba b/mail/postfix20/files/patch-ba
deleted file mode 100644
index 73feeef81f27..000000000000
--- a/mail/postfix20/files/patch-ba
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man1/postdrop.1.orig	Mon Mar 29 22:35:14 1999
---- man/man1/postdrop.1	Mon Mar 29 22:35:25 1999
-***************
-*** 51,57 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 51,57 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix20/files/patch-bb b/mail/postfix20/files/patch-bb
deleted file mode 100644
index af024b23b3d9..000000000000
--- a/mail/postfix20/files/patch-bb
+++ /dev/null
@@ -1,36 +0,0 @@
-*** man/man1/sendmail.1.orig	Mon Mar 29 22:35:30 1999
---- man/man1/sendmail.1	Mon Mar 29 22:35:44 1999
-***************
-*** 60,66 ****
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
---- 60,66 ----
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
-***************
-*** 164,170 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 164,170 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix20/files/patch-bc b/mail/postfix20/files/patch-bc
deleted file mode 100644
index 12a369684c8f..000000000000
--- a/mail/postfix20/files/patch-bc
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/access.5.orig	Mon Mar 29 22:35:58 1999
---- man/man5/access.5	Mon Mar 29 22:36:13 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix20/files/patch-bd b/mail/postfix20/files/patch-bd
deleted file mode 100644
index 2b2f30f720f5..000000000000
--- a/mail/postfix20/files/patch-bd
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/canonical.5.orig	Mon Mar 29 22:36:25 1999
---- man/man5/canonical.5	Mon Mar 29 22:36:32 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix20/files/patch-be b/mail/postfix20/files/patch-be
deleted file mode 100644
index 354737c7e68d..000000000000
--- a/mail/postfix20/files/patch-be
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/relocated.5.orig	Mon Mar 29 22:36:36 1999
---- man/man5/relocated.5	Mon Mar 29 22:36:47 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix20/files/patch-bf b/mail/postfix20/files/patch-bf
deleted file mode 100644
index 4de817826469..000000000000
--- a/mail/postfix20/files/patch-bf
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/virtual.5.orig	Mon Mar 29 22:36:55 1999
---- man/man5/virtual.5	Mon Mar 29 22:37:02 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix20/files/patch-bg b/mail/postfix20/files/patch-bg
deleted file mode 100644
index fb2b093bff0f..000000000000
--- a/mail/postfix20/files/patch-bg
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man8/local.8.orig	Mon Mar 29 22:37:14 1999
---- man/man8/local.8	Mon Mar 29 22:37:44 1999
-***************
-*** 75,81 ****
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR or \fB/var/spool/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
---- 75,81 ----
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
diff --git a/mail/postfix20/files/patch-bh b/mail/postfix20/files/patch-bh
deleted file mode 100644
index 42b7373d3fb5..000000000000
--- a/mail/postfix20/files/patch-bh
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/cleanup.8.orig	Mon Mar 29 22:37:59 1999
---- man/man8/cleanup.8	Mon Mar 29 22:38:13 1999
-***************
-*** 118,125 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/canonical*, canonical mapping table
-! /etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
---- 118,125 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
diff --git a/mail/postfix20/files/patch-bi b/mail/postfix20/files/patch-bi
deleted file mode 100644
index 2b57467ed976..000000000000
--- a/mail/postfix20/files/patch-bi
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/master.8.orig	Mon Mar 29 22:38:17 1999
---- man/man8/master.8	Mon Mar 29 22:38:46 1999
-***************
-*** 116,123 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/main.cf: global configuration file.
-! /etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
---- 116,123 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/main.cf: global configuration file.
-! !!PREFIX!!/etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
diff --git a/mail/postfix20/files/patch-bj b/mail/postfix20/files/patch-bj
deleted file mode 100644
index 99c521341ca5..000000000000
--- a/mail/postfix20/files/patch-bj
+++ /dev/null
@@ -1,20 +0,0 @@
---- makedefs.orig	Sun Jan 23 03:04:27 2000
-+++ makedefs	Mon Apr  3 08:59:17 2000
-@@ -89,6 +89,8 @@
- 		;;
-   FreeBSD.4*)	SYSTYPE=FREEBSD4
- 		;;
-+  FreeBSD.5*)	SYSTYPE=FREEBSD5
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-    NetBSD.1*)	SYSTYPE=NETBSD1
-@@ -244,7 +246,7 @@
-         *) : ${OPT='-O'};;
- esac
- 
--: ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk}
-+: ${CC='gcc $(WARN)'} ${OPT='-O'} ${AWK=awk}
- 
- export SYSTYPE AR ARFL RANLIB SYSLIBS CC OPT DEBUG AWK OPTS
- 
diff --git a/mail/postfix20/files/patch-bk b/mail/postfix20/files/patch-bk
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix20/files/patch-bk
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig	Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h	Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
-   * makedefs script, and adding a section below for the new system.
-   */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+    || defined(FREEBSD5) \
-     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
-     || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix20/pkg-comment b/mail/postfix20/pkg-comment
deleted file mode 100644
index 2afe8fab5cff..000000000000
--- a/mail/postfix20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Good alternative to sendmail
diff --git a/mail/postfix20/pkg-descr b/mail/postfix20/pkg-descr
deleted file mode 100644
index f5136efff0fb..000000000000
--- a/mail/postfix20/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix aims to be an alternative to the widely-used sendmail
-program.  Sendmail is responsible for 70% of all e-mail delivered
-on the Internet.  With an estimated 100 million users, that's an
-estimated 10 billion (10^10) messages daily. A stunning number.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix20/pkg-install b/mail/postfix20/pkg-install
deleted file mode 100644
index dcc7c370d885..000000000000
--- a/mail/postfix20/pkg-install
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-user=postfix
-group=postfix
-group2=maildrop
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-        answer=$(ask "${question}" "${dflt}")
-        case "${answer}" in
-        [Yy]*)          return 0;;
-        [Nn]*)          return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then
-        echo "You already have a group \"${group}\", so I will use it."
-    else
-        echo "You need a group \"${group}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a group \"${group2}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group2} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a user \"${user}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \
-                -s /nonexistent -c "Postfix Mail System" || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/main.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-main.cf \
-	    ${PKG_PREFIX}/etc/postfix/main.cf
-    fi
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/master.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-master.cf \
-	    ${PKG_PREFIX}/etc/postfix/master.cf
-    fi
-    chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
-    chmod 2755 ${PKG_PREFIX}/sbin/postdrop
-fi
diff --git a/mail/postfix20/pkg-plist b/mail/postfix20/pkg-plist
deleted file mode 100644
index 943a3766560b..000000000000
--- a/mail/postfix20/pkg-plist
+++ /dev/null
@@ -1,102 +0,0 @@
-etc/postfix/LICENSE
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-relocated.cf
-etc/postfix/sample-resource.cf
-etc/postfix/sample-rewrite.cf
-etc/postfix/sample-smtp.cf
-etc/postfix/sample-smtpd.cf
-etc/postfix/sample-transport.cf
-etc/postfix/sample-virtual.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/qmgr
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/trivial-rewrite
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postsuper
-sbin/sendmail
-sbin/smtp-sink
-sbin/smtp-source
-share/doc/postfix/access.5.html
-share/doc/postfix/aliases.5.html
-share/doc/postfix/architecture.html
-share/doc/postfix/backstage.html
-share/doc/postfix/basic.html
-share/doc/postfix/big-picture.gif
-share/doc/postfix/big-picture.html
-share/doc/postfix/bounce.8.html
-share/doc/postfix/canonical.5.html
-share/doc/postfix/cleanup.8.html
-share/doc/postfix/commands.html
-share/doc/postfix/defer.8.html
-share/doc/postfix/delivering.html
-share/doc/postfix/error.8.html
-share/doc/postfix/faq.html
-share/doc/postfix/goals.html
-share/doc/postfix/inbound.gif
-share/doc/postfix/index.html
-share/doc/postfix/local.8.html
-share/doc/postfix/mailq.1.html
-share/doc/postfix/master.8.html
-share/doc/postfix/motivation.html
-share/doc/postfix/newaliases.1.html
-share/doc/postfix/outbound.gif
-share/doc/postfix/pickup.8.html
-share/doc/postfix/pipe.8.html
-share/doc/postfix/postalias.1.html
-share/doc/postfix/postcat.1.html
-share/doc/postfix/postconf.1.html
-share/doc/postfix/postdrop.1.html
-share/doc/postfix/postfix.1.html
-share/doc/postfix/postkick.1.html
-share/doc/postfix/postlock.1.html
-share/doc/postfix/postlog.1.html
-share/doc/postfix/postmap.1.html
-share/doc/postfix/postsuper.1.html
-share/doc/postfix/qmgr.8.html
-share/doc/postfix/queuing.html
-share/doc/postfix/rate.html
-share/doc/postfix/receiving.html
-share/doc/postfix/relocated.5.html
-share/doc/postfix/resource.html
-share/doc/postfix/rewrite.html
-share/doc/postfix/security.html
-share/doc/postfix/sendmail.1.html
-share/doc/postfix/showq.8.html
-share/doc/postfix/small-picture.gif
-share/doc/postfix/smtp.8.html
-share/doc/postfix/smtpd.8.html
-share/doc/postfix/transport.5.html
-share/doc/postfix/trivial-rewrite.8.html
-share/doc/postfix/uce.html
-share/doc/postfix/virtual.5.html
-@exec mkdir -p -m 0755 /var/spool/postfix
-@exec chown root:wheel /var/spool/postfix
-@dirrm libexec/postfix
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
diff --git a/mail/postfix20/scripts/configure b/mail/postfix20/scripts/configure
deleted file mode 100644
index a46faa92015c..000000000000
--- a/mail/postfix20/scripts/configure
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-mv ${WRKSRC}/global/mail_params.h ${WRKSRC}/global/mail_params.h.bak
-sed <${WRKSRC}/global/mail_params.h.bak >${WRKSRC}/global/mail_params.h s+!!PREFIX!!+$PREFIX+g
-
-mv ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.bak
-sed s+!!PREFIX!!+$PREFIX+g <${WRKSRC}/conf/main.cf.bak >${WRKSRC}/conf/main.cf
-
-cd ${WRKSRC}/man
-
-for f in ${MAN1} ; do
-	mv man1/$f man1/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man1/$f.bak | soelim >man1/$f
-done
-	
-for f in ${MAN5} ; do
-	mv man5/$f man5/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man5/$f.bak | soelim >man5/$f
-done
-	
-for f in ${MAN8} ; do
-	mv man8/$f man8/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man8/$f.bak | soelim >man8/$f
-done
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
deleted file mode 100644
index 2cef938289a9..000000000000
--- a/mail/postfix21/Makefile
+++ /dev/null
@@ -1,150 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:		18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-PORTNAME=	postfix
-PORTVERSION= 	19991231.08
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
-		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
-		ftp://ftp.reverse.net/pub/postfix/official/ \
-		ftp://postfix.eu.org/pub/postfix/official/ \
-		ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
-		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
-		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-DISTNAME=	${PORTNAME}-19991231-pl08
-
-MAINTAINER=	torstenb@FreeBSD.org
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
-POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
-.endif
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_LDAP)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-.endif
-
-ALL_TARGET=	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}"
-
-SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-MAKE_ENV+=	"OPT=${CFLAGS}"
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
-	sendmail.1
-MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
-MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
-	showq.8 smtp.8 smtpd.8 trivial-rewrite.8 error.8
-
-SHAREMODE=	0444
-PDOC=		${PREFIX}/share/doc/postfix
-
-do-install:
-	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
-	@${CHOWN} root:wheel ${PREFIX}/etc/postfix
-	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
-		${PREFIX}/etc/postfix/LICENSE
-	@for f in access main.cf master.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/sample-$$f ; \
-	done
-	@for f in sample-aliases.cf sample-canonical.cf sample-debug.cf \
-		sample-ldap.cf sample-local.cf sample-misc.cf sample-pcre.cf \
-		sample-rate.cf sample-relocated.cf sample-resource.cf \
-		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
-		sample-transport.cf sample-virtual.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/$$f ;\
-	done
-	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
-		${PREFIX}/etc/postfix/postfix-script
-	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
-	@for f in bounce cleanup error local master pickup pipe qmgr \
-		 showq smtp smtpd trivial-rewrite ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s \
-			${WRKSRC}/libexec/$$f ${PREFIX}/libexec/postfix/$$f ;\
-	done
-	@for f in postalias postcat postconf postfix postkick postlock postlog\
-		postmap postsuper sendmail smtp-sink smtp-source ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s ${WRKSRC}/bin/$$f \
-			${PREFIX}/sbin/$$f ;\
-	done
-	@${INSTALL} -C -o root -g maildrop -m 2755 -s ${WRKSRC}/bin/postdrop \
-		${PREFIX}/sbin/postdrop
-	@for f in ${MAN1} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
-			${PREFIX}/man/man1/$$f ;\
-	done
-	@for f in ${MAN5} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
-			${PREFIX}/man/man5/$$f ;\
-	done
-	@for f in ${MAN8} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
-			${PREFIX}/man/man8/$$f ;\
-	done
-	@${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${PDOC}
-	@cd ${WRKSRC} && ${INSTALL_DATA} \
-		html/*.html html/*.gif ${PDOC} && \
-		${ECHO_MSG} "Installed HTML documentation in ${PDOC}"
-	@${MKDIR} -m 0755 /var/spool/postfix
-	@${ECHO_MSG} "--------------------------------------------------"
-	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
-	@${ECHO_MSG} "- type \"make replace\"                          -"
-	@${ECHO_MSG} "--------------------------------------------------"
-
-pre-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
-
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.pre.mk>
-
-replace:
-.if ${OSVERSION} >= 400014
-	@${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf"
-	${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak
-	${ECHO} 'sendmail	${PREFIX}/sbin/sendmail' > /etc/mail/mailer.conf
-	${ECHO} 'send-mail	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'mailq		${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'newaliases	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-.else
-	@${ECHO_MSG} "===> Replacing sendmail"
-	@if [ -e /usr/sbin/sendmail ]; then \
-		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
-		${CHMOD} 0 /usr/sbin/sendmail.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
-	fi
-	@${ECHO_MSG} "===> Replacing mailq"
-	@if [ -e /usr/bin/mailq ]; then \
-		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
-		${CHMOD} 0 /usr/bin/mailq.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
-	fi
-	@${ECHO_MSG} "===> Replacing newaliases"
-	@if [ -e /usr/bin/newaliases ]; then \
-		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
-		${CHMOD} 0 /usr/bin/newaliases.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
-	fi
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/postfix21/distinfo b/mail/postfix21/distinfo
deleted file mode 100644
index c8a018d3ad7f..000000000000
--- a/mail/postfix21/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (postfix-19991231-pl08.tar.gz) = 0461524d91c87b03c80cc640ec953a63
diff --git a/mail/postfix21/files/patch-aa b/mail/postfix21/files/patch-aa
deleted file mode 100644
index 3af6375f1959..000000000000
--- a/mail/postfix21/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-*** global/mail_params.h.orig	Sat Mar 20 15:09:46 1999
---- global/mail_params.h	Sat Mar 20 15:10:46 1999
-***************
-*** 127,133 ****
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
---- 127,133 ----
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
-***************
-*** 161,167 ****
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
---- 161,167 ----
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
diff --git a/mail/postfix21/files/patch-ab b/mail/postfix21/files/patch-ab
deleted file mode 100644
index 32a96b27bbc0..000000000000
--- a/mail/postfix21/files/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
---- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
-+++ conf/main.cf	Sun Jan  2 21:31:24 2000
-@@ -17,14 +17,14 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.  The default value is $program_directory.
- #
--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). The
- # default value is $program_directory. This directory must be owned
- # by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -41,7 +41,7 @@
- # These rights are used in the absence of a recipient user context.
- # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
- #
--#default_privs = nobody
-+default_privs = nobody
- 
- # INTERNET HOST AND DOMAIN NAMES
- # 
diff --git a/mail/postfix21/files/patch-ba b/mail/postfix21/files/patch-ba
deleted file mode 100644
index 73feeef81f27..000000000000
--- a/mail/postfix21/files/patch-ba
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man1/postdrop.1.orig	Mon Mar 29 22:35:14 1999
---- man/man1/postdrop.1	Mon Mar 29 22:35:25 1999
-***************
-*** 51,57 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 51,57 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix21/files/patch-bb b/mail/postfix21/files/patch-bb
deleted file mode 100644
index af024b23b3d9..000000000000
--- a/mail/postfix21/files/patch-bb
+++ /dev/null
@@ -1,36 +0,0 @@
-*** man/man1/sendmail.1.orig	Mon Mar 29 22:35:30 1999
---- man/man1/sendmail.1	Mon Mar 29 22:35:44 1999
-***************
-*** 60,66 ****
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
---- 60,66 ----
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
-***************
-*** 164,170 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 164,170 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix21/files/patch-bc b/mail/postfix21/files/patch-bc
deleted file mode 100644
index 12a369684c8f..000000000000
--- a/mail/postfix21/files/patch-bc
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/access.5.orig	Mon Mar 29 22:35:58 1999
---- man/man5/access.5	Mon Mar 29 22:36:13 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix21/files/patch-bd b/mail/postfix21/files/patch-bd
deleted file mode 100644
index 2b2f30f720f5..000000000000
--- a/mail/postfix21/files/patch-bd
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/canonical.5.orig	Mon Mar 29 22:36:25 1999
---- man/man5/canonical.5	Mon Mar 29 22:36:32 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix21/files/patch-be b/mail/postfix21/files/patch-be
deleted file mode 100644
index 354737c7e68d..000000000000
--- a/mail/postfix21/files/patch-be
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/relocated.5.orig	Mon Mar 29 22:36:36 1999
---- man/man5/relocated.5	Mon Mar 29 22:36:47 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix21/files/patch-bf b/mail/postfix21/files/patch-bf
deleted file mode 100644
index 4de817826469..000000000000
--- a/mail/postfix21/files/patch-bf
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/virtual.5.orig	Mon Mar 29 22:36:55 1999
---- man/man5/virtual.5	Mon Mar 29 22:37:02 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix21/files/patch-bg b/mail/postfix21/files/patch-bg
deleted file mode 100644
index fb2b093bff0f..000000000000
--- a/mail/postfix21/files/patch-bg
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man8/local.8.orig	Mon Mar 29 22:37:14 1999
---- man/man8/local.8	Mon Mar 29 22:37:44 1999
-***************
-*** 75,81 ****
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR or \fB/var/spool/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
---- 75,81 ----
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
diff --git a/mail/postfix21/files/patch-bh b/mail/postfix21/files/patch-bh
deleted file mode 100644
index 42b7373d3fb5..000000000000
--- a/mail/postfix21/files/patch-bh
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/cleanup.8.orig	Mon Mar 29 22:37:59 1999
---- man/man8/cleanup.8	Mon Mar 29 22:38:13 1999
-***************
-*** 118,125 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/canonical*, canonical mapping table
-! /etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
---- 118,125 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
diff --git a/mail/postfix21/files/patch-bi b/mail/postfix21/files/patch-bi
deleted file mode 100644
index 2b57467ed976..000000000000
--- a/mail/postfix21/files/patch-bi
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/master.8.orig	Mon Mar 29 22:38:17 1999
---- man/man8/master.8	Mon Mar 29 22:38:46 1999
-***************
-*** 116,123 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/main.cf: global configuration file.
-! /etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
---- 116,123 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/main.cf: global configuration file.
-! !!PREFIX!!/etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
diff --git a/mail/postfix21/files/patch-bj b/mail/postfix21/files/patch-bj
deleted file mode 100644
index 99c521341ca5..000000000000
--- a/mail/postfix21/files/patch-bj
+++ /dev/null
@@ -1,20 +0,0 @@
---- makedefs.orig	Sun Jan 23 03:04:27 2000
-+++ makedefs	Mon Apr  3 08:59:17 2000
-@@ -89,6 +89,8 @@
- 		;;
-   FreeBSD.4*)	SYSTYPE=FREEBSD4
- 		;;
-+  FreeBSD.5*)	SYSTYPE=FREEBSD5
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-    NetBSD.1*)	SYSTYPE=NETBSD1
-@@ -244,7 +246,7 @@
-         *) : ${OPT='-O'};;
- esac
- 
--: ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk}
-+: ${CC='gcc $(WARN)'} ${OPT='-O'} ${AWK=awk}
- 
- export SYSTYPE AR ARFL RANLIB SYSLIBS CC OPT DEBUG AWK OPTS
- 
diff --git a/mail/postfix21/files/patch-bk b/mail/postfix21/files/patch-bk
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix21/files/patch-bk
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig	Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h	Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
-   * makedefs script, and adding a section below for the new system.
-   */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+    || defined(FREEBSD5) \
-     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
-     || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix21/pkg-comment b/mail/postfix21/pkg-comment
deleted file mode 100644
index 2afe8fab5cff..000000000000
--- a/mail/postfix21/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Good alternative to sendmail
diff --git a/mail/postfix21/pkg-descr b/mail/postfix21/pkg-descr
deleted file mode 100644
index f5136efff0fb..000000000000
--- a/mail/postfix21/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix aims to be an alternative to the widely-used sendmail
-program.  Sendmail is responsible for 70% of all e-mail delivered
-on the Internet.  With an estimated 100 million users, that's an
-estimated 10 billion (10^10) messages daily. A stunning number.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix21/pkg-install b/mail/postfix21/pkg-install
deleted file mode 100644
index dcc7c370d885..000000000000
--- a/mail/postfix21/pkg-install
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-user=postfix
-group=postfix
-group2=maildrop
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-        answer=$(ask "${question}" "${dflt}")
-        case "${answer}" in
-        [Yy]*)          return 0;;
-        [Nn]*)          return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then
-        echo "You already have a group \"${group}\", so I will use it."
-    else
-        echo "You need a group \"${group}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a group \"${group2}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group2} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a user \"${user}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \
-                -s /nonexistent -c "Postfix Mail System" || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/main.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-main.cf \
-	    ${PKG_PREFIX}/etc/postfix/main.cf
-    fi
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/master.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-master.cf \
-	    ${PKG_PREFIX}/etc/postfix/master.cf
-    fi
-    chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
-    chmod 2755 ${PKG_PREFIX}/sbin/postdrop
-fi
diff --git a/mail/postfix21/pkg-plist b/mail/postfix21/pkg-plist
deleted file mode 100644
index 943a3766560b..000000000000
--- a/mail/postfix21/pkg-plist
+++ /dev/null
@@ -1,102 +0,0 @@
-etc/postfix/LICENSE
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-relocated.cf
-etc/postfix/sample-resource.cf
-etc/postfix/sample-rewrite.cf
-etc/postfix/sample-smtp.cf
-etc/postfix/sample-smtpd.cf
-etc/postfix/sample-transport.cf
-etc/postfix/sample-virtual.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/qmgr
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/trivial-rewrite
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postsuper
-sbin/sendmail
-sbin/smtp-sink
-sbin/smtp-source
-share/doc/postfix/access.5.html
-share/doc/postfix/aliases.5.html
-share/doc/postfix/architecture.html
-share/doc/postfix/backstage.html
-share/doc/postfix/basic.html
-share/doc/postfix/big-picture.gif
-share/doc/postfix/big-picture.html
-share/doc/postfix/bounce.8.html
-share/doc/postfix/canonical.5.html
-share/doc/postfix/cleanup.8.html
-share/doc/postfix/commands.html
-share/doc/postfix/defer.8.html
-share/doc/postfix/delivering.html
-share/doc/postfix/error.8.html
-share/doc/postfix/faq.html
-share/doc/postfix/goals.html
-share/doc/postfix/inbound.gif
-share/doc/postfix/index.html
-share/doc/postfix/local.8.html
-share/doc/postfix/mailq.1.html
-share/doc/postfix/master.8.html
-share/doc/postfix/motivation.html
-share/doc/postfix/newaliases.1.html
-share/doc/postfix/outbound.gif
-share/doc/postfix/pickup.8.html
-share/doc/postfix/pipe.8.html
-share/doc/postfix/postalias.1.html
-share/doc/postfix/postcat.1.html
-share/doc/postfix/postconf.1.html
-share/doc/postfix/postdrop.1.html
-share/doc/postfix/postfix.1.html
-share/doc/postfix/postkick.1.html
-share/doc/postfix/postlock.1.html
-share/doc/postfix/postlog.1.html
-share/doc/postfix/postmap.1.html
-share/doc/postfix/postsuper.1.html
-share/doc/postfix/qmgr.8.html
-share/doc/postfix/queuing.html
-share/doc/postfix/rate.html
-share/doc/postfix/receiving.html
-share/doc/postfix/relocated.5.html
-share/doc/postfix/resource.html
-share/doc/postfix/rewrite.html
-share/doc/postfix/security.html
-share/doc/postfix/sendmail.1.html
-share/doc/postfix/showq.8.html
-share/doc/postfix/small-picture.gif
-share/doc/postfix/smtp.8.html
-share/doc/postfix/smtpd.8.html
-share/doc/postfix/transport.5.html
-share/doc/postfix/trivial-rewrite.8.html
-share/doc/postfix/uce.html
-share/doc/postfix/virtual.5.html
-@exec mkdir -p -m 0755 /var/spool/postfix
-@exec chown root:wheel /var/spool/postfix
-@dirrm libexec/postfix
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
diff --git a/mail/postfix21/scripts/configure b/mail/postfix21/scripts/configure
deleted file mode 100644
index a46faa92015c..000000000000
--- a/mail/postfix21/scripts/configure
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-mv ${WRKSRC}/global/mail_params.h ${WRKSRC}/global/mail_params.h.bak
-sed <${WRKSRC}/global/mail_params.h.bak >${WRKSRC}/global/mail_params.h s+!!PREFIX!!+$PREFIX+g
-
-mv ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.bak
-sed s+!!PREFIX!!+$PREFIX+g <${WRKSRC}/conf/main.cf.bak >${WRKSRC}/conf/main.cf
-
-cd ${WRKSRC}/man
-
-for f in ${MAN1} ; do
-	mv man1/$f man1/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man1/$f.bak | soelim >man1/$f
-done
-	
-for f in ${MAN5} ; do
-	mv man5/$f man5/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man5/$f.bak | soelim >man5/$f
-done
-	
-for f in ${MAN8} ; do
-	mv man8/$f man8/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man8/$f.bak | soelim >man8/$f
-done
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
deleted file mode 100644
index 2cef938289a9..000000000000
--- a/mail/postfix22/Makefile
+++ /dev/null
@@ -1,150 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:		18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-PORTNAME=	postfix
-PORTVERSION= 	19991231.08
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
-		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
-		ftp://ftp.reverse.net/pub/postfix/official/ \
-		ftp://postfix.eu.org/pub/postfix/official/ \
-		ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
-		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
-		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-DISTNAME=	${PORTNAME}-19991231-pl08
-
-MAINTAINER=	torstenb@FreeBSD.org
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
-POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
-.endif
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_LDAP)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-.endif
-
-ALL_TARGET=	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}"
-
-SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-MAKE_ENV+=	"OPT=${CFLAGS}"
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
-	sendmail.1
-MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
-MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
-	showq.8 smtp.8 smtpd.8 trivial-rewrite.8 error.8
-
-SHAREMODE=	0444
-PDOC=		${PREFIX}/share/doc/postfix
-
-do-install:
-	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
-	@${CHOWN} root:wheel ${PREFIX}/etc/postfix
-	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
-		${PREFIX}/etc/postfix/LICENSE
-	@for f in access main.cf master.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/sample-$$f ; \
-	done
-	@for f in sample-aliases.cf sample-canonical.cf sample-debug.cf \
-		sample-ldap.cf sample-local.cf sample-misc.cf sample-pcre.cf \
-		sample-rate.cf sample-relocated.cf sample-resource.cf \
-		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
-		sample-transport.cf sample-virtual.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/$$f ;\
-	done
-	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
-		${PREFIX}/etc/postfix/postfix-script
-	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
-	@for f in bounce cleanup error local master pickup pipe qmgr \
-		 showq smtp smtpd trivial-rewrite ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s \
-			${WRKSRC}/libexec/$$f ${PREFIX}/libexec/postfix/$$f ;\
-	done
-	@for f in postalias postcat postconf postfix postkick postlock postlog\
-		postmap postsuper sendmail smtp-sink smtp-source ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s ${WRKSRC}/bin/$$f \
-			${PREFIX}/sbin/$$f ;\
-	done
-	@${INSTALL} -C -o root -g maildrop -m 2755 -s ${WRKSRC}/bin/postdrop \
-		${PREFIX}/sbin/postdrop
-	@for f in ${MAN1} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
-			${PREFIX}/man/man1/$$f ;\
-	done
-	@for f in ${MAN5} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
-			${PREFIX}/man/man5/$$f ;\
-	done
-	@for f in ${MAN8} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
-			${PREFIX}/man/man8/$$f ;\
-	done
-	@${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${PDOC}
-	@cd ${WRKSRC} && ${INSTALL_DATA} \
-		html/*.html html/*.gif ${PDOC} && \
-		${ECHO_MSG} "Installed HTML documentation in ${PDOC}"
-	@${MKDIR} -m 0755 /var/spool/postfix
-	@${ECHO_MSG} "--------------------------------------------------"
-	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
-	@${ECHO_MSG} "- type \"make replace\"                          -"
-	@${ECHO_MSG} "--------------------------------------------------"
-
-pre-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
-
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.pre.mk>
-
-replace:
-.if ${OSVERSION} >= 400014
-	@${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf"
-	${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak
-	${ECHO} 'sendmail	${PREFIX}/sbin/sendmail' > /etc/mail/mailer.conf
-	${ECHO} 'send-mail	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'mailq		${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'newaliases	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-.else
-	@${ECHO_MSG} "===> Replacing sendmail"
-	@if [ -e /usr/sbin/sendmail ]; then \
-		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
-		${CHMOD} 0 /usr/sbin/sendmail.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
-	fi
-	@${ECHO_MSG} "===> Replacing mailq"
-	@if [ -e /usr/bin/mailq ]; then \
-		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
-		${CHMOD} 0 /usr/bin/mailq.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
-	fi
-	@${ECHO_MSG} "===> Replacing newaliases"
-	@if [ -e /usr/bin/newaliases ]; then \
-		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
-		${CHMOD} 0 /usr/bin/newaliases.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
-	fi
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/postfix22/distinfo b/mail/postfix22/distinfo
deleted file mode 100644
index c8a018d3ad7f..000000000000
--- a/mail/postfix22/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (postfix-19991231-pl08.tar.gz) = 0461524d91c87b03c80cc640ec953a63
diff --git a/mail/postfix22/files/patch-aa b/mail/postfix22/files/patch-aa
deleted file mode 100644
index 3af6375f1959..000000000000
--- a/mail/postfix22/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-*** global/mail_params.h.orig	Sat Mar 20 15:09:46 1999
---- global/mail_params.h	Sat Mar 20 15:10:46 1999
-***************
-*** 127,133 ****
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
---- 127,133 ----
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
-***************
-*** 161,167 ****
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
---- 161,167 ----
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
diff --git a/mail/postfix22/files/patch-ab b/mail/postfix22/files/patch-ab
deleted file mode 100644
index 32a96b27bbc0..000000000000
--- a/mail/postfix22/files/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
---- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
-+++ conf/main.cf	Sun Jan  2 21:31:24 2000
-@@ -17,14 +17,14 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.  The default value is $program_directory.
- #
--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). The
- # default value is $program_directory. This directory must be owned
- # by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -41,7 +41,7 @@
- # These rights are used in the absence of a recipient user context.
- # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
- #
--#default_privs = nobody
-+default_privs = nobody
- 
- # INTERNET HOST AND DOMAIN NAMES
- # 
diff --git a/mail/postfix22/files/patch-ba b/mail/postfix22/files/patch-ba
deleted file mode 100644
index 73feeef81f27..000000000000
--- a/mail/postfix22/files/patch-ba
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man1/postdrop.1.orig	Mon Mar 29 22:35:14 1999
---- man/man1/postdrop.1	Mon Mar 29 22:35:25 1999
-***************
-*** 51,57 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 51,57 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix22/files/patch-bb b/mail/postfix22/files/patch-bb
deleted file mode 100644
index af024b23b3d9..000000000000
--- a/mail/postfix22/files/patch-bb
+++ /dev/null
@@ -1,36 +0,0 @@
-*** man/man1/sendmail.1.orig	Mon Mar 29 22:35:30 1999
---- man/man1/sendmail.1	Mon Mar 29 22:35:44 1999
-***************
-*** 60,66 ****
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
---- 60,66 ----
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
-***************
-*** 164,170 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 164,170 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix22/files/patch-bc b/mail/postfix22/files/patch-bc
deleted file mode 100644
index 12a369684c8f..000000000000
--- a/mail/postfix22/files/patch-bc
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/access.5.orig	Mon Mar 29 22:35:58 1999
---- man/man5/access.5	Mon Mar 29 22:36:13 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix22/files/patch-bd b/mail/postfix22/files/patch-bd
deleted file mode 100644
index 2b2f30f720f5..000000000000
--- a/mail/postfix22/files/patch-bd
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/canonical.5.orig	Mon Mar 29 22:36:25 1999
---- man/man5/canonical.5	Mon Mar 29 22:36:32 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix22/files/patch-be b/mail/postfix22/files/patch-be
deleted file mode 100644
index 354737c7e68d..000000000000
--- a/mail/postfix22/files/patch-be
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/relocated.5.orig	Mon Mar 29 22:36:36 1999
---- man/man5/relocated.5	Mon Mar 29 22:36:47 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix22/files/patch-bf b/mail/postfix22/files/patch-bf
deleted file mode 100644
index 4de817826469..000000000000
--- a/mail/postfix22/files/patch-bf
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/virtual.5.orig	Mon Mar 29 22:36:55 1999
---- man/man5/virtual.5	Mon Mar 29 22:37:02 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix22/files/patch-bg b/mail/postfix22/files/patch-bg
deleted file mode 100644
index fb2b093bff0f..000000000000
--- a/mail/postfix22/files/patch-bg
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man8/local.8.orig	Mon Mar 29 22:37:14 1999
---- man/man8/local.8	Mon Mar 29 22:37:44 1999
-***************
-*** 75,81 ****
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR or \fB/var/spool/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
---- 75,81 ----
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
diff --git a/mail/postfix22/files/patch-bh b/mail/postfix22/files/patch-bh
deleted file mode 100644
index 42b7373d3fb5..000000000000
--- a/mail/postfix22/files/patch-bh
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/cleanup.8.orig	Mon Mar 29 22:37:59 1999
---- man/man8/cleanup.8	Mon Mar 29 22:38:13 1999
-***************
-*** 118,125 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/canonical*, canonical mapping table
-! /etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
---- 118,125 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
diff --git a/mail/postfix22/files/patch-bi b/mail/postfix22/files/patch-bi
deleted file mode 100644
index 2b57467ed976..000000000000
--- a/mail/postfix22/files/patch-bi
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/master.8.orig	Mon Mar 29 22:38:17 1999
---- man/man8/master.8	Mon Mar 29 22:38:46 1999
-***************
-*** 116,123 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/main.cf: global configuration file.
-! /etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
---- 116,123 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/main.cf: global configuration file.
-! !!PREFIX!!/etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
diff --git a/mail/postfix22/files/patch-bj b/mail/postfix22/files/patch-bj
deleted file mode 100644
index 99c521341ca5..000000000000
--- a/mail/postfix22/files/patch-bj
+++ /dev/null
@@ -1,20 +0,0 @@
---- makedefs.orig	Sun Jan 23 03:04:27 2000
-+++ makedefs	Mon Apr  3 08:59:17 2000
-@@ -89,6 +89,8 @@
- 		;;
-   FreeBSD.4*)	SYSTYPE=FREEBSD4
- 		;;
-+  FreeBSD.5*)	SYSTYPE=FREEBSD5
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-    NetBSD.1*)	SYSTYPE=NETBSD1
-@@ -244,7 +246,7 @@
-         *) : ${OPT='-O'};;
- esac
- 
--: ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk}
-+: ${CC='gcc $(WARN)'} ${OPT='-O'} ${AWK=awk}
- 
- export SYSTYPE AR ARFL RANLIB SYSLIBS CC OPT DEBUG AWK OPTS
- 
diff --git a/mail/postfix22/files/patch-bk b/mail/postfix22/files/patch-bk
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix22/files/patch-bk
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig	Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h	Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
-   * makedefs script, and adding a section below for the new system.
-   */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+    || defined(FREEBSD5) \
-     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
-     || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix22/pkg-comment b/mail/postfix22/pkg-comment
deleted file mode 100644
index 2afe8fab5cff..000000000000
--- a/mail/postfix22/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Good alternative to sendmail
diff --git a/mail/postfix22/pkg-descr b/mail/postfix22/pkg-descr
deleted file mode 100644
index f5136efff0fb..000000000000
--- a/mail/postfix22/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix aims to be an alternative to the widely-used sendmail
-program.  Sendmail is responsible for 70% of all e-mail delivered
-on the Internet.  With an estimated 100 million users, that's an
-estimated 10 billion (10^10) messages daily. A stunning number.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix22/pkg-install b/mail/postfix22/pkg-install
deleted file mode 100644
index dcc7c370d885..000000000000
--- a/mail/postfix22/pkg-install
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-user=postfix
-group=postfix
-group2=maildrop
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-        answer=$(ask "${question}" "${dflt}")
-        case "${answer}" in
-        [Yy]*)          return 0;;
-        [Nn]*)          return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then
-        echo "You already have a group \"${group}\", so I will use it."
-    else
-        echo "You need a group \"${group}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a group \"${group2}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group2} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a user \"${user}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \
-                -s /nonexistent -c "Postfix Mail System" || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/main.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-main.cf \
-	    ${PKG_PREFIX}/etc/postfix/main.cf
-    fi
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/master.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-master.cf \
-	    ${PKG_PREFIX}/etc/postfix/master.cf
-    fi
-    chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
-    chmod 2755 ${PKG_PREFIX}/sbin/postdrop
-fi
diff --git a/mail/postfix22/pkg-plist b/mail/postfix22/pkg-plist
deleted file mode 100644
index 943a3766560b..000000000000
--- a/mail/postfix22/pkg-plist
+++ /dev/null
@@ -1,102 +0,0 @@
-etc/postfix/LICENSE
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-relocated.cf
-etc/postfix/sample-resource.cf
-etc/postfix/sample-rewrite.cf
-etc/postfix/sample-smtp.cf
-etc/postfix/sample-smtpd.cf
-etc/postfix/sample-transport.cf
-etc/postfix/sample-virtual.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/qmgr
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/trivial-rewrite
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postsuper
-sbin/sendmail
-sbin/smtp-sink
-sbin/smtp-source
-share/doc/postfix/access.5.html
-share/doc/postfix/aliases.5.html
-share/doc/postfix/architecture.html
-share/doc/postfix/backstage.html
-share/doc/postfix/basic.html
-share/doc/postfix/big-picture.gif
-share/doc/postfix/big-picture.html
-share/doc/postfix/bounce.8.html
-share/doc/postfix/canonical.5.html
-share/doc/postfix/cleanup.8.html
-share/doc/postfix/commands.html
-share/doc/postfix/defer.8.html
-share/doc/postfix/delivering.html
-share/doc/postfix/error.8.html
-share/doc/postfix/faq.html
-share/doc/postfix/goals.html
-share/doc/postfix/inbound.gif
-share/doc/postfix/index.html
-share/doc/postfix/local.8.html
-share/doc/postfix/mailq.1.html
-share/doc/postfix/master.8.html
-share/doc/postfix/motivation.html
-share/doc/postfix/newaliases.1.html
-share/doc/postfix/outbound.gif
-share/doc/postfix/pickup.8.html
-share/doc/postfix/pipe.8.html
-share/doc/postfix/postalias.1.html
-share/doc/postfix/postcat.1.html
-share/doc/postfix/postconf.1.html
-share/doc/postfix/postdrop.1.html
-share/doc/postfix/postfix.1.html
-share/doc/postfix/postkick.1.html
-share/doc/postfix/postlock.1.html
-share/doc/postfix/postlog.1.html
-share/doc/postfix/postmap.1.html
-share/doc/postfix/postsuper.1.html
-share/doc/postfix/qmgr.8.html
-share/doc/postfix/queuing.html
-share/doc/postfix/rate.html
-share/doc/postfix/receiving.html
-share/doc/postfix/relocated.5.html
-share/doc/postfix/resource.html
-share/doc/postfix/rewrite.html
-share/doc/postfix/security.html
-share/doc/postfix/sendmail.1.html
-share/doc/postfix/showq.8.html
-share/doc/postfix/small-picture.gif
-share/doc/postfix/smtp.8.html
-share/doc/postfix/smtpd.8.html
-share/doc/postfix/transport.5.html
-share/doc/postfix/trivial-rewrite.8.html
-share/doc/postfix/uce.html
-share/doc/postfix/virtual.5.html
-@exec mkdir -p -m 0755 /var/spool/postfix
-@exec chown root:wheel /var/spool/postfix
-@dirrm libexec/postfix
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
diff --git a/mail/postfix22/scripts/configure b/mail/postfix22/scripts/configure
deleted file mode 100644
index a46faa92015c..000000000000
--- a/mail/postfix22/scripts/configure
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-mv ${WRKSRC}/global/mail_params.h ${WRKSRC}/global/mail_params.h.bak
-sed <${WRKSRC}/global/mail_params.h.bak >${WRKSRC}/global/mail_params.h s+!!PREFIX!!+$PREFIX+g
-
-mv ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.bak
-sed s+!!PREFIX!!+$PREFIX+g <${WRKSRC}/conf/main.cf.bak >${WRKSRC}/conf/main.cf
-
-cd ${WRKSRC}/man
-
-for f in ${MAN1} ; do
-	mv man1/$f man1/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man1/$f.bak | soelim >man1/$f
-done
-	
-for f in ${MAN5} ; do
-	mv man5/$f man5/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man5/$f.bak | soelim >man5/$f
-done
-	
-for f in ${MAN8} ; do
-	mv man8/$f man8/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man8/$f.bak | soelim >man8/$f
-done
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
deleted file mode 100644
index 2cef938289a9..000000000000
--- a/mail/postfix23/Makefile
+++ /dev/null
@@ -1,150 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:		18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-PORTNAME=	postfix
-PORTVERSION= 	19991231.08
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
-		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
-		ftp://ftp.reverse.net/pub/postfix/official/ \
-		ftp://postfix.eu.org/pub/postfix/official/ \
-		ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
-		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
-		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-DISTNAME=	${PORTNAME}-19991231-pl08
-
-MAINTAINER=	torstenb@FreeBSD.org
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
-POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
-.endif
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_LDAP)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-.endif
-
-ALL_TARGET=	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}"
-
-SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-MAKE_ENV+=	"OPT=${CFLAGS}"
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
-	sendmail.1
-MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
-MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
-	showq.8 smtp.8 smtpd.8 trivial-rewrite.8 error.8
-
-SHAREMODE=	0444
-PDOC=		${PREFIX}/share/doc/postfix
-
-do-install:
-	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
-	@${CHOWN} root:wheel ${PREFIX}/etc/postfix
-	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
-		${PREFIX}/etc/postfix/LICENSE
-	@for f in access main.cf master.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/sample-$$f ; \
-	done
-	@for f in sample-aliases.cf sample-canonical.cf sample-debug.cf \
-		sample-ldap.cf sample-local.cf sample-misc.cf sample-pcre.cf \
-		sample-rate.cf sample-relocated.cf sample-resource.cf \
-		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
-		sample-transport.cf sample-virtual.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/$$f ;\
-	done
-	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
-		${PREFIX}/etc/postfix/postfix-script
-	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
-	@for f in bounce cleanup error local master pickup pipe qmgr \
-		 showq smtp smtpd trivial-rewrite ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s \
-			${WRKSRC}/libexec/$$f ${PREFIX}/libexec/postfix/$$f ;\
-	done
-	@for f in postalias postcat postconf postfix postkick postlock postlog\
-		postmap postsuper sendmail smtp-sink smtp-source ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s ${WRKSRC}/bin/$$f \
-			${PREFIX}/sbin/$$f ;\
-	done
-	@${INSTALL} -C -o root -g maildrop -m 2755 -s ${WRKSRC}/bin/postdrop \
-		${PREFIX}/sbin/postdrop
-	@for f in ${MAN1} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
-			${PREFIX}/man/man1/$$f ;\
-	done
-	@for f in ${MAN5} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
-			${PREFIX}/man/man5/$$f ;\
-	done
-	@for f in ${MAN8} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
-			${PREFIX}/man/man8/$$f ;\
-	done
-	@${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${PDOC}
-	@cd ${WRKSRC} && ${INSTALL_DATA} \
-		html/*.html html/*.gif ${PDOC} && \
-		${ECHO_MSG} "Installed HTML documentation in ${PDOC}"
-	@${MKDIR} -m 0755 /var/spool/postfix
-	@${ECHO_MSG} "--------------------------------------------------"
-	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
-	@${ECHO_MSG} "- type \"make replace\"                          -"
-	@${ECHO_MSG} "--------------------------------------------------"
-
-pre-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
-
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.pre.mk>
-
-replace:
-.if ${OSVERSION} >= 400014
-	@${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf"
-	${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak
-	${ECHO} 'sendmail	${PREFIX}/sbin/sendmail' > /etc/mail/mailer.conf
-	${ECHO} 'send-mail	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'mailq		${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'newaliases	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-.else
-	@${ECHO_MSG} "===> Replacing sendmail"
-	@if [ -e /usr/sbin/sendmail ]; then \
-		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
-		${CHMOD} 0 /usr/sbin/sendmail.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
-	fi
-	@${ECHO_MSG} "===> Replacing mailq"
-	@if [ -e /usr/bin/mailq ]; then \
-		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
-		${CHMOD} 0 /usr/bin/mailq.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
-	fi
-	@${ECHO_MSG} "===> Replacing newaliases"
-	@if [ -e /usr/bin/newaliases ]; then \
-		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
-		${CHMOD} 0 /usr/bin/newaliases.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
-	fi
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/postfix23/distinfo b/mail/postfix23/distinfo
deleted file mode 100644
index c8a018d3ad7f..000000000000
--- a/mail/postfix23/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (postfix-19991231-pl08.tar.gz) = 0461524d91c87b03c80cc640ec953a63
diff --git a/mail/postfix23/files/patch-aa b/mail/postfix23/files/patch-aa
deleted file mode 100644
index 3af6375f1959..000000000000
--- a/mail/postfix23/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-*** global/mail_params.h.orig	Sat Mar 20 15:09:46 1999
---- global/mail_params.h	Sat Mar 20 15:10:46 1999
-***************
-*** 127,133 ****
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
---- 127,133 ----
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
-***************
-*** 161,167 ****
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
---- 161,167 ----
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
diff --git a/mail/postfix23/files/patch-ab b/mail/postfix23/files/patch-ab
deleted file mode 100644
index 32a96b27bbc0..000000000000
--- a/mail/postfix23/files/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
---- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
-+++ conf/main.cf	Sun Jan  2 21:31:24 2000
-@@ -17,14 +17,14 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.  The default value is $program_directory.
- #
--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). The
- # default value is $program_directory. This directory must be owned
- # by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -41,7 +41,7 @@
- # These rights are used in the absence of a recipient user context.
- # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
- #
--#default_privs = nobody
-+default_privs = nobody
- 
- # INTERNET HOST AND DOMAIN NAMES
- # 
diff --git a/mail/postfix23/files/patch-ba b/mail/postfix23/files/patch-ba
deleted file mode 100644
index 73feeef81f27..000000000000
--- a/mail/postfix23/files/patch-ba
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man1/postdrop.1.orig	Mon Mar 29 22:35:14 1999
---- man/man1/postdrop.1	Mon Mar 29 22:35:25 1999
-***************
-*** 51,57 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 51,57 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix23/files/patch-bb b/mail/postfix23/files/patch-bb
deleted file mode 100644
index af024b23b3d9..000000000000
--- a/mail/postfix23/files/patch-bb
+++ /dev/null
@@ -1,36 +0,0 @@
-*** man/man1/sendmail.1.orig	Mon Mar 29 22:35:30 1999
---- man/man1/sendmail.1	Mon Mar 29 22:35:44 1999
-***************
-*** 60,66 ****
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
---- 60,66 ----
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
-***************
-*** 164,170 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 164,170 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix23/files/patch-bc b/mail/postfix23/files/patch-bc
deleted file mode 100644
index 12a369684c8f..000000000000
--- a/mail/postfix23/files/patch-bc
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/access.5.orig	Mon Mar 29 22:35:58 1999
---- man/man5/access.5	Mon Mar 29 22:36:13 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix23/files/patch-bd b/mail/postfix23/files/patch-bd
deleted file mode 100644
index 2b2f30f720f5..000000000000
--- a/mail/postfix23/files/patch-bd
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/canonical.5.orig	Mon Mar 29 22:36:25 1999
---- man/man5/canonical.5	Mon Mar 29 22:36:32 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix23/files/patch-be b/mail/postfix23/files/patch-be
deleted file mode 100644
index 354737c7e68d..000000000000
--- a/mail/postfix23/files/patch-be
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/relocated.5.orig	Mon Mar 29 22:36:36 1999
---- man/man5/relocated.5	Mon Mar 29 22:36:47 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix23/files/patch-bf b/mail/postfix23/files/patch-bf
deleted file mode 100644
index 4de817826469..000000000000
--- a/mail/postfix23/files/patch-bf
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/virtual.5.orig	Mon Mar 29 22:36:55 1999
---- man/man5/virtual.5	Mon Mar 29 22:37:02 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix23/files/patch-bg b/mail/postfix23/files/patch-bg
deleted file mode 100644
index fb2b093bff0f..000000000000
--- a/mail/postfix23/files/patch-bg
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man8/local.8.orig	Mon Mar 29 22:37:14 1999
---- man/man8/local.8	Mon Mar 29 22:37:44 1999
-***************
-*** 75,81 ****
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR or \fB/var/spool/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
---- 75,81 ----
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
diff --git a/mail/postfix23/files/patch-bh b/mail/postfix23/files/patch-bh
deleted file mode 100644
index 42b7373d3fb5..000000000000
--- a/mail/postfix23/files/patch-bh
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/cleanup.8.orig	Mon Mar 29 22:37:59 1999
---- man/man8/cleanup.8	Mon Mar 29 22:38:13 1999
-***************
-*** 118,125 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/canonical*, canonical mapping table
-! /etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
---- 118,125 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
diff --git a/mail/postfix23/files/patch-bi b/mail/postfix23/files/patch-bi
deleted file mode 100644
index 2b57467ed976..000000000000
--- a/mail/postfix23/files/patch-bi
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/master.8.orig	Mon Mar 29 22:38:17 1999
---- man/man8/master.8	Mon Mar 29 22:38:46 1999
-***************
-*** 116,123 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/main.cf: global configuration file.
-! /etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
---- 116,123 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/main.cf: global configuration file.
-! !!PREFIX!!/etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
diff --git a/mail/postfix23/files/patch-bj b/mail/postfix23/files/patch-bj
deleted file mode 100644
index 99c521341ca5..000000000000
--- a/mail/postfix23/files/patch-bj
+++ /dev/null
@@ -1,20 +0,0 @@
---- makedefs.orig	Sun Jan 23 03:04:27 2000
-+++ makedefs	Mon Apr  3 08:59:17 2000
-@@ -89,6 +89,8 @@
- 		;;
-   FreeBSD.4*)	SYSTYPE=FREEBSD4
- 		;;
-+  FreeBSD.5*)	SYSTYPE=FREEBSD5
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-    NetBSD.1*)	SYSTYPE=NETBSD1
-@@ -244,7 +246,7 @@
-         *) : ${OPT='-O'};;
- esac
- 
--: ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk}
-+: ${CC='gcc $(WARN)'} ${OPT='-O'} ${AWK=awk}
- 
- export SYSTYPE AR ARFL RANLIB SYSLIBS CC OPT DEBUG AWK OPTS
- 
diff --git a/mail/postfix23/files/patch-bk b/mail/postfix23/files/patch-bk
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix23/files/patch-bk
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig	Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h	Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
-   * makedefs script, and adding a section below for the new system.
-   */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+    || defined(FREEBSD5) \
-     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
-     || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix23/pkg-comment b/mail/postfix23/pkg-comment
deleted file mode 100644
index 2afe8fab5cff..000000000000
--- a/mail/postfix23/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Good alternative to sendmail
diff --git a/mail/postfix23/pkg-descr b/mail/postfix23/pkg-descr
deleted file mode 100644
index f5136efff0fb..000000000000
--- a/mail/postfix23/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix aims to be an alternative to the widely-used sendmail
-program.  Sendmail is responsible for 70% of all e-mail delivered
-on the Internet.  With an estimated 100 million users, that's an
-estimated 10 billion (10^10) messages daily. A stunning number.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix23/pkg-install b/mail/postfix23/pkg-install
deleted file mode 100644
index dcc7c370d885..000000000000
--- a/mail/postfix23/pkg-install
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-user=postfix
-group=postfix
-group2=maildrop
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-        answer=$(ask "${question}" "${dflt}")
-        case "${answer}" in
-        [Yy]*)          return 0;;
-        [Nn]*)          return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then
-        echo "You already have a group \"${group}\", so I will use it."
-    else
-        echo "You need a group \"${group}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a group \"${group2}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group2} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a user \"${user}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \
-                -s /nonexistent -c "Postfix Mail System" || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/main.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-main.cf \
-	    ${PKG_PREFIX}/etc/postfix/main.cf
-    fi
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/master.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-master.cf \
-	    ${PKG_PREFIX}/etc/postfix/master.cf
-    fi
-    chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
-    chmod 2755 ${PKG_PREFIX}/sbin/postdrop
-fi
diff --git a/mail/postfix23/pkg-plist b/mail/postfix23/pkg-plist
deleted file mode 100644
index 943a3766560b..000000000000
--- a/mail/postfix23/pkg-plist
+++ /dev/null
@@ -1,102 +0,0 @@
-etc/postfix/LICENSE
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-relocated.cf
-etc/postfix/sample-resource.cf
-etc/postfix/sample-rewrite.cf
-etc/postfix/sample-smtp.cf
-etc/postfix/sample-smtpd.cf
-etc/postfix/sample-transport.cf
-etc/postfix/sample-virtual.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/qmgr
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/trivial-rewrite
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postsuper
-sbin/sendmail
-sbin/smtp-sink
-sbin/smtp-source
-share/doc/postfix/access.5.html
-share/doc/postfix/aliases.5.html
-share/doc/postfix/architecture.html
-share/doc/postfix/backstage.html
-share/doc/postfix/basic.html
-share/doc/postfix/big-picture.gif
-share/doc/postfix/big-picture.html
-share/doc/postfix/bounce.8.html
-share/doc/postfix/canonical.5.html
-share/doc/postfix/cleanup.8.html
-share/doc/postfix/commands.html
-share/doc/postfix/defer.8.html
-share/doc/postfix/delivering.html
-share/doc/postfix/error.8.html
-share/doc/postfix/faq.html
-share/doc/postfix/goals.html
-share/doc/postfix/inbound.gif
-share/doc/postfix/index.html
-share/doc/postfix/local.8.html
-share/doc/postfix/mailq.1.html
-share/doc/postfix/master.8.html
-share/doc/postfix/motivation.html
-share/doc/postfix/newaliases.1.html
-share/doc/postfix/outbound.gif
-share/doc/postfix/pickup.8.html
-share/doc/postfix/pipe.8.html
-share/doc/postfix/postalias.1.html
-share/doc/postfix/postcat.1.html
-share/doc/postfix/postconf.1.html
-share/doc/postfix/postdrop.1.html
-share/doc/postfix/postfix.1.html
-share/doc/postfix/postkick.1.html
-share/doc/postfix/postlock.1.html
-share/doc/postfix/postlog.1.html
-share/doc/postfix/postmap.1.html
-share/doc/postfix/postsuper.1.html
-share/doc/postfix/qmgr.8.html
-share/doc/postfix/queuing.html
-share/doc/postfix/rate.html
-share/doc/postfix/receiving.html
-share/doc/postfix/relocated.5.html
-share/doc/postfix/resource.html
-share/doc/postfix/rewrite.html
-share/doc/postfix/security.html
-share/doc/postfix/sendmail.1.html
-share/doc/postfix/showq.8.html
-share/doc/postfix/small-picture.gif
-share/doc/postfix/smtp.8.html
-share/doc/postfix/smtpd.8.html
-share/doc/postfix/transport.5.html
-share/doc/postfix/trivial-rewrite.8.html
-share/doc/postfix/uce.html
-share/doc/postfix/virtual.5.html
-@exec mkdir -p -m 0755 /var/spool/postfix
-@exec chown root:wheel /var/spool/postfix
-@dirrm libexec/postfix
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
diff --git a/mail/postfix23/scripts/configure b/mail/postfix23/scripts/configure
deleted file mode 100644
index a46faa92015c..000000000000
--- a/mail/postfix23/scripts/configure
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-mv ${WRKSRC}/global/mail_params.h ${WRKSRC}/global/mail_params.h.bak
-sed <${WRKSRC}/global/mail_params.h.bak >${WRKSRC}/global/mail_params.h s+!!PREFIX!!+$PREFIX+g
-
-mv ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.bak
-sed s+!!PREFIX!!+$PREFIX+g <${WRKSRC}/conf/main.cf.bak >${WRKSRC}/conf/main.cf
-
-cd ${WRKSRC}/man
-
-for f in ${MAN1} ; do
-	mv man1/$f man1/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man1/$f.bak | soelim >man1/$f
-done
-	
-for f in ${MAN5} ; do
-	mv man5/$f man5/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man5/$f.bak | soelim >man5/$f
-done
-	
-for f in ${MAN8} ; do
-	mv man8/$f man8/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man8/$f.bak | soelim >man8/$f
-done
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
deleted file mode 100644
index 2cef938289a9..000000000000
--- a/mail/postfix24/Makefile
+++ /dev/null
@@ -1,150 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:		18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-PORTNAME=	postfix
-PORTVERSION= 	19991231.08
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
-		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
-		ftp://ftp.reverse.net/pub/postfix/official/ \
-		ftp://postfix.eu.org/pub/postfix/official/ \
-		ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
-		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
-		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-DISTNAME=	${PORTNAME}-19991231-pl08
-
-MAINTAINER=	torstenb@FreeBSD.org
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
-POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
-.endif
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_LDAP)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-.endif
-
-ALL_TARGET=	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}"
-
-SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-MAKE_ENV+=	"OPT=${CFLAGS}"
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
-	sendmail.1
-MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
-MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
-	showq.8 smtp.8 smtpd.8 trivial-rewrite.8 error.8
-
-SHAREMODE=	0444
-PDOC=		${PREFIX}/share/doc/postfix
-
-do-install:
-	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
-	@${CHOWN} root:wheel ${PREFIX}/etc/postfix
-	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
-		${PREFIX}/etc/postfix/LICENSE
-	@for f in access main.cf master.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/sample-$$f ; \
-	done
-	@for f in sample-aliases.cf sample-canonical.cf sample-debug.cf \
-		sample-ldap.cf sample-local.cf sample-misc.cf sample-pcre.cf \
-		sample-rate.cf sample-relocated.cf sample-resource.cf \
-		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
-		sample-transport.cf sample-virtual.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/$$f ;\
-	done
-	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
-		${PREFIX}/etc/postfix/postfix-script
-	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
-	@for f in bounce cleanup error local master pickup pipe qmgr \
-		 showq smtp smtpd trivial-rewrite ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s \
-			${WRKSRC}/libexec/$$f ${PREFIX}/libexec/postfix/$$f ;\
-	done
-	@for f in postalias postcat postconf postfix postkick postlock postlog\
-		postmap postsuper sendmail smtp-sink smtp-source ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s ${WRKSRC}/bin/$$f \
-			${PREFIX}/sbin/$$f ;\
-	done
-	@${INSTALL} -C -o root -g maildrop -m 2755 -s ${WRKSRC}/bin/postdrop \
-		${PREFIX}/sbin/postdrop
-	@for f in ${MAN1} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
-			${PREFIX}/man/man1/$$f ;\
-	done
-	@for f in ${MAN5} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
-			${PREFIX}/man/man5/$$f ;\
-	done
-	@for f in ${MAN8} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
-			${PREFIX}/man/man8/$$f ;\
-	done
-	@${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${PDOC}
-	@cd ${WRKSRC} && ${INSTALL_DATA} \
-		html/*.html html/*.gif ${PDOC} && \
-		${ECHO_MSG} "Installed HTML documentation in ${PDOC}"
-	@${MKDIR} -m 0755 /var/spool/postfix
-	@${ECHO_MSG} "--------------------------------------------------"
-	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
-	@${ECHO_MSG} "- type \"make replace\"                          -"
-	@${ECHO_MSG} "--------------------------------------------------"
-
-pre-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
-
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.pre.mk>
-
-replace:
-.if ${OSVERSION} >= 400014
-	@${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf"
-	${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak
-	${ECHO} 'sendmail	${PREFIX}/sbin/sendmail' > /etc/mail/mailer.conf
-	${ECHO} 'send-mail	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'mailq		${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'newaliases	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-.else
-	@${ECHO_MSG} "===> Replacing sendmail"
-	@if [ -e /usr/sbin/sendmail ]; then \
-		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
-		${CHMOD} 0 /usr/sbin/sendmail.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
-	fi
-	@${ECHO_MSG} "===> Replacing mailq"
-	@if [ -e /usr/bin/mailq ]; then \
-		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
-		${CHMOD} 0 /usr/bin/mailq.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
-	fi
-	@${ECHO_MSG} "===> Replacing newaliases"
-	@if [ -e /usr/bin/newaliases ]; then \
-		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
-		${CHMOD} 0 /usr/bin/newaliases.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
-	fi
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/postfix24/distinfo b/mail/postfix24/distinfo
deleted file mode 100644
index c8a018d3ad7f..000000000000
--- a/mail/postfix24/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (postfix-19991231-pl08.tar.gz) = 0461524d91c87b03c80cc640ec953a63
diff --git a/mail/postfix24/files/patch-aa b/mail/postfix24/files/patch-aa
deleted file mode 100644
index 3af6375f1959..000000000000
--- a/mail/postfix24/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-*** global/mail_params.h.orig	Sat Mar 20 15:09:46 1999
---- global/mail_params.h	Sat Mar 20 15:10:46 1999
-***************
-*** 127,133 ****
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
---- 127,133 ----
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
-***************
-*** 161,167 ****
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
---- 161,167 ----
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
diff --git a/mail/postfix24/files/patch-ab b/mail/postfix24/files/patch-ab
deleted file mode 100644
index 32a96b27bbc0..000000000000
--- a/mail/postfix24/files/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
---- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
-+++ conf/main.cf	Sun Jan  2 21:31:24 2000
-@@ -17,14 +17,14 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.  The default value is $program_directory.
- #
--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). The
- # default value is $program_directory. This directory must be owned
- # by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -41,7 +41,7 @@
- # These rights are used in the absence of a recipient user context.
- # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
- #
--#default_privs = nobody
-+default_privs = nobody
- 
- # INTERNET HOST AND DOMAIN NAMES
- # 
diff --git a/mail/postfix24/files/patch-ba b/mail/postfix24/files/patch-ba
deleted file mode 100644
index 73feeef81f27..000000000000
--- a/mail/postfix24/files/patch-ba
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man1/postdrop.1.orig	Mon Mar 29 22:35:14 1999
---- man/man1/postdrop.1	Mon Mar 29 22:35:25 1999
-***************
-*** 51,57 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 51,57 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix24/files/patch-bb b/mail/postfix24/files/patch-bb
deleted file mode 100644
index af024b23b3d9..000000000000
--- a/mail/postfix24/files/patch-bb
+++ /dev/null
@@ -1,36 +0,0 @@
-*** man/man1/sendmail.1.orig	Mon Mar 29 22:35:30 1999
---- man/man1/sendmail.1	Mon Mar 29 22:35:44 1999
-***************
-*** 60,66 ****
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
---- 60,66 ----
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
-***************
-*** 164,170 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 164,170 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix24/files/patch-bc b/mail/postfix24/files/patch-bc
deleted file mode 100644
index 12a369684c8f..000000000000
--- a/mail/postfix24/files/patch-bc
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/access.5.orig	Mon Mar 29 22:35:58 1999
---- man/man5/access.5	Mon Mar 29 22:36:13 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix24/files/patch-bd b/mail/postfix24/files/patch-bd
deleted file mode 100644
index 2b2f30f720f5..000000000000
--- a/mail/postfix24/files/patch-bd
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/canonical.5.orig	Mon Mar 29 22:36:25 1999
---- man/man5/canonical.5	Mon Mar 29 22:36:32 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix24/files/patch-be b/mail/postfix24/files/patch-be
deleted file mode 100644
index 354737c7e68d..000000000000
--- a/mail/postfix24/files/patch-be
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/relocated.5.orig	Mon Mar 29 22:36:36 1999
---- man/man5/relocated.5	Mon Mar 29 22:36:47 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix24/files/patch-bf b/mail/postfix24/files/patch-bf
deleted file mode 100644
index 4de817826469..000000000000
--- a/mail/postfix24/files/patch-bf
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/virtual.5.orig	Mon Mar 29 22:36:55 1999
---- man/man5/virtual.5	Mon Mar 29 22:37:02 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix24/files/patch-bg b/mail/postfix24/files/patch-bg
deleted file mode 100644
index fb2b093bff0f..000000000000
--- a/mail/postfix24/files/patch-bg
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man8/local.8.orig	Mon Mar 29 22:37:14 1999
---- man/man8/local.8	Mon Mar 29 22:37:44 1999
-***************
-*** 75,81 ****
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR or \fB/var/spool/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
---- 75,81 ----
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
diff --git a/mail/postfix24/files/patch-bh b/mail/postfix24/files/patch-bh
deleted file mode 100644
index 42b7373d3fb5..000000000000
--- a/mail/postfix24/files/patch-bh
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/cleanup.8.orig	Mon Mar 29 22:37:59 1999
---- man/man8/cleanup.8	Mon Mar 29 22:38:13 1999
-***************
-*** 118,125 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/canonical*, canonical mapping table
-! /etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
---- 118,125 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
diff --git a/mail/postfix24/files/patch-bi b/mail/postfix24/files/patch-bi
deleted file mode 100644
index 2b57467ed976..000000000000
--- a/mail/postfix24/files/patch-bi
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/master.8.orig	Mon Mar 29 22:38:17 1999
---- man/man8/master.8	Mon Mar 29 22:38:46 1999
-***************
-*** 116,123 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/main.cf: global configuration file.
-! /etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
---- 116,123 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/main.cf: global configuration file.
-! !!PREFIX!!/etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
diff --git a/mail/postfix24/files/patch-bj b/mail/postfix24/files/patch-bj
deleted file mode 100644
index 99c521341ca5..000000000000
--- a/mail/postfix24/files/patch-bj
+++ /dev/null
@@ -1,20 +0,0 @@
---- makedefs.orig	Sun Jan 23 03:04:27 2000
-+++ makedefs	Mon Apr  3 08:59:17 2000
-@@ -89,6 +89,8 @@
- 		;;
-   FreeBSD.4*)	SYSTYPE=FREEBSD4
- 		;;
-+  FreeBSD.5*)	SYSTYPE=FREEBSD5
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-    NetBSD.1*)	SYSTYPE=NETBSD1
-@@ -244,7 +246,7 @@
-         *) : ${OPT='-O'};;
- esac
- 
--: ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk}
-+: ${CC='gcc $(WARN)'} ${OPT='-O'} ${AWK=awk}
- 
- export SYSTYPE AR ARFL RANLIB SYSLIBS CC OPT DEBUG AWK OPTS
- 
diff --git a/mail/postfix24/files/patch-bk b/mail/postfix24/files/patch-bk
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix24/files/patch-bk
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig	Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h	Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
-   * makedefs script, and adding a section below for the new system.
-   */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+    || defined(FREEBSD5) \
-     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
-     || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix24/pkg-comment b/mail/postfix24/pkg-comment
deleted file mode 100644
index 2afe8fab5cff..000000000000
--- a/mail/postfix24/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Good alternative to sendmail
diff --git a/mail/postfix24/pkg-descr b/mail/postfix24/pkg-descr
deleted file mode 100644
index f5136efff0fb..000000000000
--- a/mail/postfix24/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix aims to be an alternative to the widely-used sendmail
-program.  Sendmail is responsible for 70% of all e-mail delivered
-on the Internet.  With an estimated 100 million users, that's an
-estimated 10 billion (10^10) messages daily. A stunning number.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix24/pkg-install b/mail/postfix24/pkg-install
deleted file mode 100644
index dcc7c370d885..000000000000
--- a/mail/postfix24/pkg-install
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-user=postfix
-group=postfix
-group2=maildrop
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-        answer=$(ask "${question}" "${dflt}")
-        case "${answer}" in
-        [Yy]*)          return 0;;
-        [Nn]*)          return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then
-        echo "You already have a group \"${group}\", so I will use it."
-    else
-        echo "You need a group \"${group}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a group \"${group2}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group2} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a user \"${user}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \
-                -s /nonexistent -c "Postfix Mail System" || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/main.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-main.cf \
-	    ${PKG_PREFIX}/etc/postfix/main.cf
-    fi
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/master.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-master.cf \
-	    ${PKG_PREFIX}/etc/postfix/master.cf
-    fi
-    chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
-    chmod 2755 ${PKG_PREFIX}/sbin/postdrop
-fi
diff --git a/mail/postfix24/pkg-plist b/mail/postfix24/pkg-plist
deleted file mode 100644
index 943a3766560b..000000000000
--- a/mail/postfix24/pkg-plist
+++ /dev/null
@@ -1,102 +0,0 @@
-etc/postfix/LICENSE
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-relocated.cf
-etc/postfix/sample-resource.cf
-etc/postfix/sample-rewrite.cf
-etc/postfix/sample-smtp.cf
-etc/postfix/sample-smtpd.cf
-etc/postfix/sample-transport.cf
-etc/postfix/sample-virtual.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/qmgr
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/trivial-rewrite
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postsuper
-sbin/sendmail
-sbin/smtp-sink
-sbin/smtp-source
-share/doc/postfix/access.5.html
-share/doc/postfix/aliases.5.html
-share/doc/postfix/architecture.html
-share/doc/postfix/backstage.html
-share/doc/postfix/basic.html
-share/doc/postfix/big-picture.gif
-share/doc/postfix/big-picture.html
-share/doc/postfix/bounce.8.html
-share/doc/postfix/canonical.5.html
-share/doc/postfix/cleanup.8.html
-share/doc/postfix/commands.html
-share/doc/postfix/defer.8.html
-share/doc/postfix/delivering.html
-share/doc/postfix/error.8.html
-share/doc/postfix/faq.html
-share/doc/postfix/goals.html
-share/doc/postfix/inbound.gif
-share/doc/postfix/index.html
-share/doc/postfix/local.8.html
-share/doc/postfix/mailq.1.html
-share/doc/postfix/master.8.html
-share/doc/postfix/motivation.html
-share/doc/postfix/newaliases.1.html
-share/doc/postfix/outbound.gif
-share/doc/postfix/pickup.8.html
-share/doc/postfix/pipe.8.html
-share/doc/postfix/postalias.1.html
-share/doc/postfix/postcat.1.html
-share/doc/postfix/postconf.1.html
-share/doc/postfix/postdrop.1.html
-share/doc/postfix/postfix.1.html
-share/doc/postfix/postkick.1.html
-share/doc/postfix/postlock.1.html
-share/doc/postfix/postlog.1.html
-share/doc/postfix/postmap.1.html
-share/doc/postfix/postsuper.1.html
-share/doc/postfix/qmgr.8.html
-share/doc/postfix/queuing.html
-share/doc/postfix/rate.html
-share/doc/postfix/receiving.html
-share/doc/postfix/relocated.5.html
-share/doc/postfix/resource.html
-share/doc/postfix/rewrite.html
-share/doc/postfix/security.html
-share/doc/postfix/sendmail.1.html
-share/doc/postfix/showq.8.html
-share/doc/postfix/small-picture.gif
-share/doc/postfix/smtp.8.html
-share/doc/postfix/smtpd.8.html
-share/doc/postfix/transport.5.html
-share/doc/postfix/trivial-rewrite.8.html
-share/doc/postfix/uce.html
-share/doc/postfix/virtual.5.html
-@exec mkdir -p -m 0755 /var/spool/postfix
-@exec chown root:wheel /var/spool/postfix
-@dirrm libexec/postfix
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
diff --git a/mail/postfix24/scripts/configure b/mail/postfix24/scripts/configure
deleted file mode 100644
index a46faa92015c..000000000000
--- a/mail/postfix24/scripts/configure
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-mv ${WRKSRC}/global/mail_params.h ${WRKSRC}/global/mail_params.h.bak
-sed <${WRKSRC}/global/mail_params.h.bak >${WRKSRC}/global/mail_params.h s+!!PREFIX!!+$PREFIX+g
-
-mv ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.bak
-sed s+!!PREFIX!!+$PREFIX+g <${WRKSRC}/conf/main.cf.bak >${WRKSRC}/conf/main.cf
-
-cd ${WRKSRC}/man
-
-for f in ${MAN1} ; do
-	mv man1/$f man1/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man1/$f.bak | soelim >man1/$f
-done
-	
-for f in ${MAN5} ; do
-	mv man5/$f man5/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man5/$f.bak | soelim >man5/$f
-done
-	
-for f in ${MAN8} ; do
-	mv man8/$f man8/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man8/$f.bak | soelim >man8/$f
-done
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
deleted file mode 100644
index 2cef938289a9..000000000000
--- a/mail/postfix25/Makefile
+++ /dev/null
@@ -1,150 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:		18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-PORTNAME=	postfix
-PORTVERSION= 	19991231.08
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
-		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
-		ftp://ftp.reverse.net/pub/postfix/official/ \
-		ftp://postfix.eu.org/pub/postfix/official/ \
-		ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
-		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
-		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-DISTNAME=	${PORTNAME}-19991231-pl08
-
-MAINTAINER=	torstenb@FreeBSD.org
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
-POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
-.endif
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_LDAP)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-.endif
-
-ALL_TARGET=	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}"
-
-SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-MAKE_ENV+=	"OPT=${CFLAGS}"
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
-	sendmail.1
-MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
-MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
-	showq.8 smtp.8 smtpd.8 trivial-rewrite.8 error.8
-
-SHAREMODE=	0444
-PDOC=		${PREFIX}/share/doc/postfix
-
-do-install:
-	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
-	@${CHOWN} root:wheel ${PREFIX}/etc/postfix
-	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
-		${PREFIX}/etc/postfix/LICENSE
-	@for f in access main.cf master.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/sample-$$f ; \
-	done
-	@for f in sample-aliases.cf sample-canonical.cf sample-debug.cf \
-		sample-ldap.cf sample-local.cf sample-misc.cf sample-pcre.cf \
-		sample-rate.cf sample-relocated.cf sample-resource.cf \
-		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
-		sample-transport.cf sample-virtual.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/$$f ;\
-	done
-	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
-		${PREFIX}/etc/postfix/postfix-script
-	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
-	@for f in bounce cleanup error local master pickup pipe qmgr \
-		 showq smtp smtpd trivial-rewrite ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s \
-			${WRKSRC}/libexec/$$f ${PREFIX}/libexec/postfix/$$f ;\
-	done
-	@for f in postalias postcat postconf postfix postkick postlock postlog\
-		postmap postsuper sendmail smtp-sink smtp-source ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s ${WRKSRC}/bin/$$f \
-			${PREFIX}/sbin/$$f ;\
-	done
-	@${INSTALL} -C -o root -g maildrop -m 2755 -s ${WRKSRC}/bin/postdrop \
-		${PREFIX}/sbin/postdrop
-	@for f in ${MAN1} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
-			${PREFIX}/man/man1/$$f ;\
-	done
-	@for f in ${MAN5} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
-			${PREFIX}/man/man5/$$f ;\
-	done
-	@for f in ${MAN8} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
-			${PREFIX}/man/man8/$$f ;\
-	done
-	@${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${PDOC}
-	@cd ${WRKSRC} && ${INSTALL_DATA} \
-		html/*.html html/*.gif ${PDOC} && \
-		${ECHO_MSG} "Installed HTML documentation in ${PDOC}"
-	@${MKDIR} -m 0755 /var/spool/postfix
-	@${ECHO_MSG} "--------------------------------------------------"
-	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
-	@${ECHO_MSG} "- type \"make replace\"                          -"
-	@${ECHO_MSG} "--------------------------------------------------"
-
-pre-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
-
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.pre.mk>
-
-replace:
-.if ${OSVERSION} >= 400014
-	@${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf"
-	${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak
-	${ECHO} 'sendmail	${PREFIX}/sbin/sendmail' > /etc/mail/mailer.conf
-	${ECHO} 'send-mail	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'mailq		${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'newaliases	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-.else
-	@${ECHO_MSG} "===> Replacing sendmail"
-	@if [ -e /usr/sbin/sendmail ]; then \
-		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
-		${CHMOD} 0 /usr/sbin/sendmail.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
-	fi
-	@${ECHO_MSG} "===> Replacing mailq"
-	@if [ -e /usr/bin/mailq ]; then \
-		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
-		${CHMOD} 0 /usr/bin/mailq.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
-	fi
-	@${ECHO_MSG} "===> Replacing newaliases"
-	@if [ -e /usr/bin/newaliases ]; then \
-		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
-		${CHMOD} 0 /usr/bin/newaliases.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
-	fi
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo
deleted file mode 100644
index c8a018d3ad7f..000000000000
--- a/mail/postfix25/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (postfix-19991231-pl08.tar.gz) = 0461524d91c87b03c80cc640ec953a63
diff --git a/mail/postfix25/files/patch-aa b/mail/postfix25/files/patch-aa
deleted file mode 100644
index 3af6375f1959..000000000000
--- a/mail/postfix25/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-*** global/mail_params.h.orig	Sat Mar 20 15:09:46 1999
---- global/mail_params.h	Sat Mar 20 15:10:46 1999
-***************
-*** 127,133 ****
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
---- 127,133 ----
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
-***************
-*** 161,167 ****
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
---- 161,167 ----
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
diff --git a/mail/postfix25/files/patch-ab b/mail/postfix25/files/patch-ab
deleted file mode 100644
index 32a96b27bbc0..000000000000
--- a/mail/postfix25/files/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
---- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
-+++ conf/main.cf	Sun Jan  2 21:31:24 2000
-@@ -17,14 +17,14 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.  The default value is $program_directory.
- #
--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). The
- # default value is $program_directory. This directory must be owned
- # by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -41,7 +41,7 @@
- # These rights are used in the absence of a recipient user context.
- # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
- #
--#default_privs = nobody
-+default_privs = nobody
- 
- # INTERNET HOST AND DOMAIN NAMES
- # 
diff --git a/mail/postfix25/files/patch-ba b/mail/postfix25/files/patch-ba
deleted file mode 100644
index 73feeef81f27..000000000000
--- a/mail/postfix25/files/patch-ba
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man1/postdrop.1.orig	Mon Mar 29 22:35:14 1999
---- man/man1/postdrop.1	Mon Mar 29 22:35:25 1999
-***************
-*** 51,57 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 51,57 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix25/files/patch-bb b/mail/postfix25/files/patch-bb
deleted file mode 100644
index af024b23b3d9..000000000000
--- a/mail/postfix25/files/patch-bb
+++ /dev/null
@@ -1,36 +0,0 @@
-*** man/man1/sendmail.1.orig	Mon Mar 29 22:35:30 1999
---- man/man1/sendmail.1	Mon Mar 29 22:35:44 1999
-***************
-*** 60,66 ****
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
---- 60,66 ----
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
-***************
-*** 164,170 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 164,170 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix25/files/patch-bc b/mail/postfix25/files/patch-bc
deleted file mode 100644
index 12a369684c8f..000000000000
--- a/mail/postfix25/files/patch-bc
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/access.5.orig	Mon Mar 29 22:35:58 1999
---- man/man5/access.5	Mon Mar 29 22:36:13 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix25/files/patch-bd b/mail/postfix25/files/patch-bd
deleted file mode 100644
index 2b2f30f720f5..000000000000
--- a/mail/postfix25/files/patch-bd
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/canonical.5.orig	Mon Mar 29 22:36:25 1999
---- man/man5/canonical.5	Mon Mar 29 22:36:32 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix25/files/patch-be b/mail/postfix25/files/patch-be
deleted file mode 100644
index 354737c7e68d..000000000000
--- a/mail/postfix25/files/patch-be
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/relocated.5.orig	Mon Mar 29 22:36:36 1999
---- man/man5/relocated.5	Mon Mar 29 22:36:47 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix25/files/patch-bf b/mail/postfix25/files/patch-bf
deleted file mode 100644
index 4de817826469..000000000000
--- a/mail/postfix25/files/patch-bf
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/virtual.5.orig	Mon Mar 29 22:36:55 1999
---- man/man5/virtual.5	Mon Mar 29 22:37:02 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix25/files/patch-bg b/mail/postfix25/files/patch-bg
deleted file mode 100644
index fb2b093bff0f..000000000000
--- a/mail/postfix25/files/patch-bg
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man8/local.8.orig	Mon Mar 29 22:37:14 1999
---- man/man8/local.8	Mon Mar 29 22:37:44 1999
-***************
-*** 75,81 ****
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR or \fB/var/spool/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
---- 75,81 ----
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
diff --git a/mail/postfix25/files/patch-bh b/mail/postfix25/files/patch-bh
deleted file mode 100644
index 42b7373d3fb5..000000000000
--- a/mail/postfix25/files/patch-bh
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/cleanup.8.orig	Mon Mar 29 22:37:59 1999
---- man/man8/cleanup.8	Mon Mar 29 22:38:13 1999
-***************
-*** 118,125 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/canonical*, canonical mapping table
-! /etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
---- 118,125 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
diff --git a/mail/postfix25/files/patch-bi b/mail/postfix25/files/patch-bi
deleted file mode 100644
index 2b57467ed976..000000000000
--- a/mail/postfix25/files/patch-bi
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/master.8.orig	Mon Mar 29 22:38:17 1999
---- man/man8/master.8	Mon Mar 29 22:38:46 1999
-***************
-*** 116,123 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/main.cf: global configuration file.
-! /etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
---- 116,123 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/main.cf: global configuration file.
-! !!PREFIX!!/etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
diff --git a/mail/postfix25/files/patch-bj b/mail/postfix25/files/patch-bj
deleted file mode 100644
index 99c521341ca5..000000000000
--- a/mail/postfix25/files/patch-bj
+++ /dev/null
@@ -1,20 +0,0 @@
---- makedefs.orig	Sun Jan 23 03:04:27 2000
-+++ makedefs	Mon Apr  3 08:59:17 2000
-@@ -89,6 +89,8 @@
- 		;;
-   FreeBSD.4*)	SYSTYPE=FREEBSD4
- 		;;
-+  FreeBSD.5*)	SYSTYPE=FREEBSD5
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-    NetBSD.1*)	SYSTYPE=NETBSD1
-@@ -244,7 +246,7 @@
-         *) : ${OPT='-O'};;
- esac
- 
--: ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk}
-+: ${CC='gcc $(WARN)'} ${OPT='-O'} ${AWK=awk}
- 
- export SYSTYPE AR ARFL RANLIB SYSLIBS CC OPT DEBUG AWK OPTS
- 
diff --git a/mail/postfix25/files/patch-bk b/mail/postfix25/files/patch-bk
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix25/files/patch-bk
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig	Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h	Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
-   * makedefs script, and adding a section below for the new system.
-   */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+    || defined(FREEBSD5) \
-     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
-     || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix25/pkg-comment b/mail/postfix25/pkg-comment
deleted file mode 100644
index 2afe8fab5cff..000000000000
--- a/mail/postfix25/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Good alternative to sendmail
diff --git a/mail/postfix25/pkg-descr b/mail/postfix25/pkg-descr
deleted file mode 100644
index f5136efff0fb..000000000000
--- a/mail/postfix25/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix aims to be an alternative to the widely-used sendmail
-program.  Sendmail is responsible for 70% of all e-mail delivered
-on the Internet.  With an estimated 100 million users, that's an
-estimated 10 billion (10^10) messages daily. A stunning number.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix25/pkg-install b/mail/postfix25/pkg-install
deleted file mode 100644
index dcc7c370d885..000000000000
--- a/mail/postfix25/pkg-install
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-user=postfix
-group=postfix
-group2=maildrop
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-        answer=$(ask "${question}" "${dflt}")
-        case "${answer}" in
-        [Yy]*)          return 0;;
-        [Nn]*)          return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then
-        echo "You already have a group \"${group}\", so I will use it."
-    else
-        echo "You need a group \"${group}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a group \"${group2}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group2} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a user \"${user}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \
-                -s /nonexistent -c "Postfix Mail System" || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/main.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-main.cf \
-	    ${PKG_PREFIX}/etc/postfix/main.cf
-    fi
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/master.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-master.cf \
-	    ${PKG_PREFIX}/etc/postfix/master.cf
-    fi
-    chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
-    chmod 2755 ${PKG_PREFIX}/sbin/postdrop
-fi
diff --git a/mail/postfix25/pkg-plist b/mail/postfix25/pkg-plist
deleted file mode 100644
index 943a3766560b..000000000000
--- a/mail/postfix25/pkg-plist
+++ /dev/null
@@ -1,102 +0,0 @@
-etc/postfix/LICENSE
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-relocated.cf
-etc/postfix/sample-resource.cf
-etc/postfix/sample-rewrite.cf
-etc/postfix/sample-smtp.cf
-etc/postfix/sample-smtpd.cf
-etc/postfix/sample-transport.cf
-etc/postfix/sample-virtual.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/qmgr
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/trivial-rewrite
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postsuper
-sbin/sendmail
-sbin/smtp-sink
-sbin/smtp-source
-share/doc/postfix/access.5.html
-share/doc/postfix/aliases.5.html
-share/doc/postfix/architecture.html
-share/doc/postfix/backstage.html
-share/doc/postfix/basic.html
-share/doc/postfix/big-picture.gif
-share/doc/postfix/big-picture.html
-share/doc/postfix/bounce.8.html
-share/doc/postfix/canonical.5.html
-share/doc/postfix/cleanup.8.html
-share/doc/postfix/commands.html
-share/doc/postfix/defer.8.html
-share/doc/postfix/delivering.html
-share/doc/postfix/error.8.html
-share/doc/postfix/faq.html
-share/doc/postfix/goals.html
-share/doc/postfix/inbound.gif
-share/doc/postfix/index.html
-share/doc/postfix/local.8.html
-share/doc/postfix/mailq.1.html
-share/doc/postfix/master.8.html
-share/doc/postfix/motivation.html
-share/doc/postfix/newaliases.1.html
-share/doc/postfix/outbound.gif
-share/doc/postfix/pickup.8.html
-share/doc/postfix/pipe.8.html
-share/doc/postfix/postalias.1.html
-share/doc/postfix/postcat.1.html
-share/doc/postfix/postconf.1.html
-share/doc/postfix/postdrop.1.html
-share/doc/postfix/postfix.1.html
-share/doc/postfix/postkick.1.html
-share/doc/postfix/postlock.1.html
-share/doc/postfix/postlog.1.html
-share/doc/postfix/postmap.1.html
-share/doc/postfix/postsuper.1.html
-share/doc/postfix/qmgr.8.html
-share/doc/postfix/queuing.html
-share/doc/postfix/rate.html
-share/doc/postfix/receiving.html
-share/doc/postfix/relocated.5.html
-share/doc/postfix/resource.html
-share/doc/postfix/rewrite.html
-share/doc/postfix/security.html
-share/doc/postfix/sendmail.1.html
-share/doc/postfix/showq.8.html
-share/doc/postfix/small-picture.gif
-share/doc/postfix/smtp.8.html
-share/doc/postfix/smtpd.8.html
-share/doc/postfix/transport.5.html
-share/doc/postfix/trivial-rewrite.8.html
-share/doc/postfix/uce.html
-share/doc/postfix/virtual.5.html
-@exec mkdir -p -m 0755 /var/spool/postfix
-@exec chown root:wheel /var/spool/postfix
-@dirrm libexec/postfix
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
diff --git a/mail/postfix25/scripts/configure b/mail/postfix25/scripts/configure
deleted file mode 100644
index a46faa92015c..000000000000
--- a/mail/postfix25/scripts/configure
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-mv ${WRKSRC}/global/mail_params.h ${WRKSRC}/global/mail_params.h.bak
-sed <${WRKSRC}/global/mail_params.h.bak >${WRKSRC}/global/mail_params.h s+!!PREFIX!!+$PREFIX+g
-
-mv ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.bak
-sed s+!!PREFIX!!+$PREFIX+g <${WRKSRC}/conf/main.cf.bak >${WRKSRC}/conf/main.cf
-
-cd ${WRKSRC}/man
-
-for f in ${MAN1} ; do
-	mv man1/$f man1/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man1/$f.bak | soelim >man1/$f
-done
-	
-for f in ${MAN5} ; do
-	mv man5/$f man5/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man5/$f.bak | soelim >man5/$f
-done
-	
-for f in ${MAN8} ; do
-	mv man8/$f man8/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man8/$f.bak | soelim >man8/$f
-done
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
deleted file mode 100644
index 2cef938289a9..000000000000
--- a/mail/postfix26/Makefile
+++ /dev/null
@@ -1,150 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:		18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-PORTNAME=	postfix
-PORTVERSION= 	19991231.08
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
-		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
-		ftp://ftp.reverse.net/pub/postfix/official/ \
-		ftp://postfix.eu.org/pub/postfix/official/ \
-		ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
-		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
-		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-DISTNAME=	${PORTNAME}-19991231-pl08
-
-MAINTAINER=	torstenb@FreeBSD.org
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
-POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
-.endif
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_LDAP)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-.endif
-
-ALL_TARGET=	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}"
-
-SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-MAKE_ENV+=	"OPT=${CFLAGS}"
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
-	sendmail.1
-MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
-MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
-	showq.8 smtp.8 smtpd.8 trivial-rewrite.8 error.8
-
-SHAREMODE=	0444
-PDOC=		${PREFIX}/share/doc/postfix
-
-do-install:
-	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
-	@${CHOWN} root:wheel ${PREFIX}/etc/postfix
-	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
-		${PREFIX}/etc/postfix/LICENSE
-	@for f in access main.cf master.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/sample-$$f ; \
-	done
-	@for f in sample-aliases.cf sample-canonical.cf sample-debug.cf \
-		sample-ldap.cf sample-local.cf sample-misc.cf sample-pcre.cf \
-		sample-rate.cf sample-relocated.cf sample-resource.cf \
-		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
-		sample-transport.cf sample-virtual.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/$$f ;\
-	done
-	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
-		${PREFIX}/etc/postfix/postfix-script
-	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
-	@for f in bounce cleanup error local master pickup pipe qmgr \
-		 showq smtp smtpd trivial-rewrite ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s \
-			${WRKSRC}/libexec/$$f ${PREFIX}/libexec/postfix/$$f ;\
-	done
-	@for f in postalias postcat postconf postfix postkick postlock postlog\
-		postmap postsuper sendmail smtp-sink smtp-source ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s ${WRKSRC}/bin/$$f \
-			${PREFIX}/sbin/$$f ;\
-	done
-	@${INSTALL} -C -o root -g maildrop -m 2755 -s ${WRKSRC}/bin/postdrop \
-		${PREFIX}/sbin/postdrop
-	@for f in ${MAN1} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
-			${PREFIX}/man/man1/$$f ;\
-	done
-	@for f in ${MAN5} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
-			${PREFIX}/man/man5/$$f ;\
-	done
-	@for f in ${MAN8} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
-			${PREFIX}/man/man8/$$f ;\
-	done
-	@${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${PDOC}
-	@cd ${WRKSRC} && ${INSTALL_DATA} \
-		html/*.html html/*.gif ${PDOC} && \
-		${ECHO_MSG} "Installed HTML documentation in ${PDOC}"
-	@${MKDIR} -m 0755 /var/spool/postfix
-	@${ECHO_MSG} "--------------------------------------------------"
-	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
-	@${ECHO_MSG} "- type \"make replace\"                          -"
-	@${ECHO_MSG} "--------------------------------------------------"
-
-pre-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
-
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.pre.mk>
-
-replace:
-.if ${OSVERSION} >= 400014
-	@${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf"
-	${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak
-	${ECHO} 'sendmail	${PREFIX}/sbin/sendmail' > /etc/mail/mailer.conf
-	${ECHO} 'send-mail	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'mailq		${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'newaliases	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-.else
-	@${ECHO_MSG} "===> Replacing sendmail"
-	@if [ -e /usr/sbin/sendmail ]; then \
-		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
-		${CHMOD} 0 /usr/sbin/sendmail.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
-	fi
-	@${ECHO_MSG} "===> Replacing mailq"
-	@if [ -e /usr/bin/mailq ]; then \
-		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
-		${CHMOD} 0 /usr/bin/mailq.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
-	fi
-	@${ECHO_MSG} "===> Replacing newaliases"
-	@if [ -e /usr/bin/newaliases ]; then \
-		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
-		${CHMOD} 0 /usr/bin/newaliases.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
-	fi
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo
deleted file mode 100644
index c8a018d3ad7f..000000000000
--- a/mail/postfix26/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (postfix-19991231-pl08.tar.gz) = 0461524d91c87b03c80cc640ec953a63
diff --git a/mail/postfix26/files/patch-aa b/mail/postfix26/files/patch-aa
deleted file mode 100644
index 3af6375f1959..000000000000
--- a/mail/postfix26/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-*** global/mail_params.h.orig	Sat Mar 20 15:09:46 1999
---- global/mail_params.h	Sat Mar 20 15:10:46 1999
-***************
-*** 127,133 ****
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
---- 127,133 ----
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
-***************
-*** 161,167 ****
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
---- 161,167 ----
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
diff --git a/mail/postfix26/files/patch-ab b/mail/postfix26/files/patch-ab
deleted file mode 100644
index 32a96b27bbc0..000000000000
--- a/mail/postfix26/files/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
---- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
-+++ conf/main.cf	Sun Jan  2 21:31:24 2000
-@@ -17,14 +17,14 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.  The default value is $program_directory.
- #
--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). The
- # default value is $program_directory. This directory must be owned
- # by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -41,7 +41,7 @@
- # These rights are used in the absence of a recipient user context.
- # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
- #
--#default_privs = nobody
-+default_privs = nobody
- 
- # INTERNET HOST AND DOMAIN NAMES
- # 
diff --git a/mail/postfix26/files/patch-ba b/mail/postfix26/files/patch-ba
deleted file mode 100644
index 73feeef81f27..000000000000
--- a/mail/postfix26/files/patch-ba
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man1/postdrop.1.orig	Mon Mar 29 22:35:14 1999
---- man/man1/postdrop.1	Mon Mar 29 22:35:25 1999
-***************
-*** 51,57 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 51,57 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix26/files/patch-bb b/mail/postfix26/files/patch-bb
deleted file mode 100644
index af024b23b3d9..000000000000
--- a/mail/postfix26/files/patch-bb
+++ /dev/null
@@ -1,36 +0,0 @@
-*** man/man1/sendmail.1.orig	Mon Mar 29 22:35:30 1999
---- man/man1/sendmail.1	Mon Mar 29 22:35:44 1999
-***************
-*** 60,66 ****
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
---- 60,66 ----
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
-***************
-*** 164,170 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 164,170 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix26/files/patch-bc b/mail/postfix26/files/patch-bc
deleted file mode 100644
index 12a369684c8f..000000000000
--- a/mail/postfix26/files/patch-bc
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/access.5.orig	Mon Mar 29 22:35:58 1999
---- man/man5/access.5	Mon Mar 29 22:36:13 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix26/files/patch-bd b/mail/postfix26/files/patch-bd
deleted file mode 100644
index 2b2f30f720f5..000000000000
--- a/mail/postfix26/files/patch-bd
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/canonical.5.orig	Mon Mar 29 22:36:25 1999
---- man/man5/canonical.5	Mon Mar 29 22:36:32 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix26/files/patch-be b/mail/postfix26/files/patch-be
deleted file mode 100644
index 354737c7e68d..000000000000
--- a/mail/postfix26/files/patch-be
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/relocated.5.orig	Mon Mar 29 22:36:36 1999
---- man/man5/relocated.5	Mon Mar 29 22:36:47 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix26/files/patch-bf b/mail/postfix26/files/patch-bf
deleted file mode 100644
index 4de817826469..000000000000
--- a/mail/postfix26/files/patch-bf
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/virtual.5.orig	Mon Mar 29 22:36:55 1999
---- man/man5/virtual.5	Mon Mar 29 22:37:02 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix26/files/patch-bg b/mail/postfix26/files/patch-bg
deleted file mode 100644
index fb2b093bff0f..000000000000
--- a/mail/postfix26/files/patch-bg
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man8/local.8.orig	Mon Mar 29 22:37:14 1999
---- man/man8/local.8	Mon Mar 29 22:37:44 1999
-***************
-*** 75,81 ****
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR or \fB/var/spool/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
---- 75,81 ----
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
diff --git a/mail/postfix26/files/patch-bh b/mail/postfix26/files/patch-bh
deleted file mode 100644
index 42b7373d3fb5..000000000000
--- a/mail/postfix26/files/patch-bh
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/cleanup.8.orig	Mon Mar 29 22:37:59 1999
---- man/man8/cleanup.8	Mon Mar 29 22:38:13 1999
-***************
-*** 118,125 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/canonical*, canonical mapping table
-! /etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
---- 118,125 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
diff --git a/mail/postfix26/files/patch-bi b/mail/postfix26/files/patch-bi
deleted file mode 100644
index 2b57467ed976..000000000000
--- a/mail/postfix26/files/patch-bi
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/master.8.orig	Mon Mar 29 22:38:17 1999
---- man/man8/master.8	Mon Mar 29 22:38:46 1999
-***************
-*** 116,123 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/main.cf: global configuration file.
-! /etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
---- 116,123 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/main.cf: global configuration file.
-! !!PREFIX!!/etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
diff --git a/mail/postfix26/files/patch-bj b/mail/postfix26/files/patch-bj
deleted file mode 100644
index 99c521341ca5..000000000000
--- a/mail/postfix26/files/patch-bj
+++ /dev/null
@@ -1,20 +0,0 @@
---- makedefs.orig	Sun Jan 23 03:04:27 2000
-+++ makedefs	Mon Apr  3 08:59:17 2000
-@@ -89,6 +89,8 @@
- 		;;
-   FreeBSD.4*)	SYSTYPE=FREEBSD4
- 		;;
-+  FreeBSD.5*)	SYSTYPE=FREEBSD5
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-    NetBSD.1*)	SYSTYPE=NETBSD1
-@@ -244,7 +246,7 @@
-         *) : ${OPT='-O'};;
- esac
- 
--: ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk}
-+: ${CC='gcc $(WARN)'} ${OPT='-O'} ${AWK=awk}
- 
- export SYSTYPE AR ARFL RANLIB SYSLIBS CC OPT DEBUG AWK OPTS
- 
diff --git a/mail/postfix26/files/patch-bk b/mail/postfix26/files/patch-bk
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix26/files/patch-bk
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig	Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h	Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
-   * makedefs script, and adding a section below for the new system.
-   */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+    || defined(FREEBSD5) \
-     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
-     || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix26/pkg-comment b/mail/postfix26/pkg-comment
deleted file mode 100644
index 2afe8fab5cff..000000000000
--- a/mail/postfix26/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Good alternative to sendmail
diff --git a/mail/postfix26/pkg-descr b/mail/postfix26/pkg-descr
deleted file mode 100644
index f5136efff0fb..000000000000
--- a/mail/postfix26/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix aims to be an alternative to the widely-used sendmail
-program.  Sendmail is responsible for 70% of all e-mail delivered
-on the Internet.  With an estimated 100 million users, that's an
-estimated 10 billion (10^10) messages daily. A stunning number.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix26/pkg-install b/mail/postfix26/pkg-install
deleted file mode 100644
index dcc7c370d885..000000000000
--- a/mail/postfix26/pkg-install
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-user=postfix
-group=postfix
-group2=maildrop
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-        answer=$(ask "${question}" "${dflt}")
-        case "${answer}" in
-        [Yy]*)          return 0;;
-        [Nn]*)          return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then
-        echo "You already have a group \"${group}\", so I will use it."
-    else
-        echo "You need a group \"${group}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a group \"${group2}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group2} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a user \"${user}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \
-                -s /nonexistent -c "Postfix Mail System" || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/main.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-main.cf \
-	    ${PKG_PREFIX}/etc/postfix/main.cf
-    fi
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/master.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-master.cf \
-	    ${PKG_PREFIX}/etc/postfix/master.cf
-    fi
-    chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
-    chmod 2755 ${PKG_PREFIX}/sbin/postdrop
-fi
diff --git a/mail/postfix26/pkg-plist b/mail/postfix26/pkg-plist
deleted file mode 100644
index 943a3766560b..000000000000
--- a/mail/postfix26/pkg-plist
+++ /dev/null
@@ -1,102 +0,0 @@
-etc/postfix/LICENSE
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-relocated.cf
-etc/postfix/sample-resource.cf
-etc/postfix/sample-rewrite.cf
-etc/postfix/sample-smtp.cf
-etc/postfix/sample-smtpd.cf
-etc/postfix/sample-transport.cf
-etc/postfix/sample-virtual.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/qmgr
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/trivial-rewrite
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postsuper
-sbin/sendmail
-sbin/smtp-sink
-sbin/smtp-source
-share/doc/postfix/access.5.html
-share/doc/postfix/aliases.5.html
-share/doc/postfix/architecture.html
-share/doc/postfix/backstage.html
-share/doc/postfix/basic.html
-share/doc/postfix/big-picture.gif
-share/doc/postfix/big-picture.html
-share/doc/postfix/bounce.8.html
-share/doc/postfix/canonical.5.html
-share/doc/postfix/cleanup.8.html
-share/doc/postfix/commands.html
-share/doc/postfix/defer.8.html
-share/doc/postfix/delivering.html
-share/doc/postfix/error.8.html
-share/doc/postfix/faq.html
-share/doc/postfix/goals.html
-share/doc/postfix/inbound.gif
-share/doc/postfix/index.html
-share/doc/postfix/local.8.html
-share/doc/postfix/mailq.1.html
-share/doc/postfix/master.8.html
-share/doc/postfix/motivation.html
-share/doc/postfix/newaliases.1.html
-share/doc/postfix/outbound.gif
-share/doc/postfix/pickup.8.html
-share/doc/postfix/pipe.8.html
-share/doc/postfix/postalias.1.html
-share/doc/postfix/postcat.1.html
-share/doc/postfix/postconf.1.html
-share/doc/postfix/postdrop.1.html
-share/doc/postfix/postfix.1.html
-share/doc/postfix/postkick.1.html
-share/doc/postfix/postlock.1.html
-share/doc/postfix/postlog.1.html
-share/doc/postfix/postmap.1.html
-share/doc/postfix/postsuper.1.html
-share/doc/postfix/qmgr.8.html
-share/doc/postfix/queuing.html
-share/doc/postfix/rate.html
-share/doc/postfix/receiving.html
-share/doc/postfix/relocated.5.html
-share/doc/postfix/resource.html
-share/doc/postfix/rewrite.html
-share/doc/postfix/security.html
-share/doc/postfix/sendmail.1.html
-share/doc/postfix/showq.8.html
-share/doc/postfix/small-picture.gif
-share/doc/postfix/smtp.8.html
-share/doc/postfix/smtpd.8.html
-share/doc/postfix/transport.5.html
-share/doc/postfix/trivial-rewrite.8.html
-share/doc/postfix/uce.html
-share/doc/postfix/virtual.5.html
-@exec mkdir -p -m 0755 /var/spool/postfix
-@exec chown root:wheel /var/spool/postfix
-@dirrm libexec/postfix
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
diff --git a/mail/postfix26/scripts/configure b/mail/postfix26/scripts/configure
deleted file mode 100644
index a46faa92015c..000000000000
--- a/mail/postfix26/scripts/configure
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-mv ${WRKSRC}/global/mail_params.h ${WRKSRC}/global/mail_params.h.bak
-sed <${WRKSRC}/global/mail_params.h.bak >${WRKSRC}/global/mail_params.h s+!!PREFIX!!+$PREFIX+g
-
-mv ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.bak
-sed s+!!PREFIX!!+$PREFIX+g <${WRKSRC}/conf/main.cf.bak >${WRKSRC}/conf/main.cf
-
-cd ${WRKSRC}/man
-
-for f in ${MAN1} ; do
-	mv man1/$f man1/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man1/$f.bak | soelim >man1/$f
-done
-	
-for f in ${MAN5} ; do
-	mv man5/$f man5/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man5/$f.bak | soelim >man5/$f
-done
-	
-for f in ${MAN8} ; do
-	mv man8/$f man8/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man8/$f.bak | soelim >man8/$f
-done
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
deleted file mode 100644
index 2cef938289a9..000000000000
--- a/mail/postfix27/Makefile
+++ /dev/null
@@ -1,150 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:		18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-PORTNAME=	postfix
-PORTVERSION= 	19991231.08
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
-		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
-		ftp://ftp.reverse.net/pub/postfix/official/ \
-		ftp://postfix.eu.org/pub/postfix/official/ \
-		ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
-		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
-		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-DISTNAME=	${PORTNAME}-19991231-pl08
-
-MAINTAINER=	torstenb@FreeBSD.org
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
-POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
-.endif
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_LDAP)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-.endif
-
-ALL_TARGET=	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}"
-
-SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-MAKE_ENV+=	"OPT=${CFLAGS}"
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
-	sendmail.1
-MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
-MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
-	showq.8 smtp.8 smtpd.8 trivial-rewrite.8 error.8
-
-SHAREMODE=	0444
-PDOC=		${PREFIX}/share/doc/postfix
-
-do-install:
-	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
-	@${CHOWN} root:wheel ${PREFIX}/etc/postfix
-	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
-		${PREFIX}/etc/postfix/LICENSE
-	@for f in access main.cf master.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/sample-$$f ; \
-	done
-	@for f in sample-aliases.cf sample-canonical.cf sample-debug.cf \
-		sample-ldap.cf sample-local.cf sample-misc.cf sample-pcre.cf \
-		sample-rate.cf sample-relocated.cf sample-resource.cf \
-		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
-		sample-transport.cf sample-virtual.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/$$f ;\
-	done
-	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
-		${PREFIX}/etc/postfix/postfix-script
-	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
-	@for f in bounce cleanup error local master pickup pipe qmgr \
-		 showq smtp smtpd trivial-rewrite ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s \
-			${WRKSRC}/libexec/$$f ${PREFIX}/libexec/postfix/$$f ;\
-	done
-	@for f in postalias postcat postconf postfix postkick postlock postlog\
-		postmap postsuper sendmail smtp-sink smtp-source ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s ${WRKSRC}/bin/$$f \
-			${PREFIX}/sbin/$$f ;\
-	done
-	@${INSTALL} -C -o root -g maildrop -m 2755 -s ${WRKSRC}/bin/postdrop \
-		${PREFIX}/sbin/postdrop
-	@for f in ${MAN1} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
-			${PREFIX}/man/man1/$$f ;\
-	done
-	@for f in ${MAN5} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
-			${PREFIX}/man/man5/$$f ;\
-	done
-	@for f in ${MAN8} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
-			${PREFIX}/man/man8/$$f ;\
-	done
-	@${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${PDOC}
-	@cd ${WRKSRC} && ${INSTALL_DATA} \
-		html/*.html html/*.gif ${PDOC} && \
-		${ECHO_MSG} "Installed HTML documentation in ${PDOC}"
-	@${MKDIR} -m 0755 /var/spool/postfix
-	@${ECHO_MSG} "--------------------------------------------------"
-	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
-	@${ECHO_MSG} "- type \"make replace\"                          -"
-	@${ECHO_MSG} "--------------------------------------------------"
-
-pre-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
-
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.pre.mk>
-
-replace:
-.if ${OSVERSION} >= 400014
-	@${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf"
-	${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak
-	${ECHO} 'sendmail	${PREFIX}/sbin/sendmail' > /etc/mail/mailer.conf
-	${ECHO} 'send-mail	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'mailq		${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'newaliases	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-.else
-	@${ECHO_MSG} "===> Replacing sendmail"
-	@if [ -e /usr/sbin/sendmail ]; then \
-		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
-		${CHMOD} 0 /usr/sbin/sendmail.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
-	fi
-	@${ECHO_MSG} "===> Replacing mailq"
-	@if [ -e /usr/bin/mailq ]; then \
-		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
-		${CHMOD} 0 /usr/bin/mailq.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
-	fi
-	@${ECHO_MSG} "===> Replacing newaliases"
-	@if [ -e /usr/bin/newaliases ]; then \
-		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
-		${CHMOD} 0 /usr/bin/newaliases.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
-	fi
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo
deleted file mode 100644
index c8a018d3ad7f..000000000000
--- a/mail/postfix27/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (postfix-19991231-pl08.tar.gz) = 0461524d91c87b03c80cc640ec953a63
diff --git a/mail/postfix27/files/patch-aa b/mail/postfix27/files/patch-aa
deleted file mode 100644
index 3af6375f1959..000000000000
--- a/mail/postfix27/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-*** global/mail_params.h.orig	Sat Mar 20 15:09:46 1999
---- global/mail_params.h	Sat Mar 20 15:10:46 1999
-***************
-*** 127,133 ****
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
---- 127,133 ----
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
-***************
-*** 161,167 ****
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
---- 161,167 ----
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
diff --git a/mail/postfix27/files/patch-ab b/mail/postfix27/files/patch-ab
deleted file mode 100644
index 32a96b27bbc0..000000000000
--- a/mail/postfix27/files/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
---- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
-+++ conf/main.cf	Sun Jan  2 21:31:24 2000
-@@ -17,14 +17,14 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.  The default value is $program_directory.
- #
--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). The
- # default value is $program_directory. This directory must be owned
- # by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -41,7 +41,7 @@
- # These rights are used in the absence of a recipient user context.
- # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
- #
--#default_privs = nobody
-+default_privs = nobody
- 
- # INTERNET HOST AND DOMAIN NAMES
- # 
diff --git a/mail/postfix27/files/patch-ba b/mail/postfix27/files/patch-ba
deleted file mode 100644
index 73feeef81f27..000000000000
--- a/mail/postfix27/files/patch-ba
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man1/postdrop.1.orig	Mon Mar 29 22:35:14 1999
---- man/man1/postdrop.1	Mon Mar 29 22:35:25 1999
-***************
-*** 51,57 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 51,57 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix27/files/patch-bb b/mail/postfix27/files/patch-bb
deleted file mode 100644
index af024b23b3d9..000000000000
--- a/mail/postfix27/files/patch-bb
+++ /dev/null
@@ -1,36 +0,0 @@
-*** man/man1/sendmail.1.orig	Mon Mar 29 22:35:30 1999
---- man/man1/sendmail.1	Mon Mar 29 22:35:44 1999
-***************
-*** 60,66 ****
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
---- 60,66 ----
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
-***************
-*** 164,170 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 164,170 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix27/files/patch-bc b/mail/postfix27/files/patch-bc
deleted file mode 100644
index 12a369684c8f..000000000000
--- a/mail/postfix27/files/patch-bc
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/access.5.orig	Mon Mar 29 22:35:58 1999
---- man/man5/access.5	Mon Mar 29 22:36:13 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix27/files/patch-bd b/mail/postfix27/files/patch-bd
deleted file mode 100644
index 2b2f30f720f5..000000000000
--- a/mail/postfix27/files/patch-bd
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/canonical.5.orig	Mon Mar 29 22:36:25 1999
---- man/man5/canonical.5	Mon Mar 29 22:36:32 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix27/files/patch-be b/mail/postfix27/files/patch-be
deleted file mode 100644
index 354737c7e68d..000000000000
--- a/mail/postfix27/files/patch-be
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/relocated.5.orig	Mon Mar 29 22:36:36 1999
---- man/man5/relocated.5	Mon Mar 29 22:36:47 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix27/files/patch-bf b/mail/postfix27/files/patch-bf
deleted file mode 100644
index 4de817826469..000000000000
--- a/mail/postfix27/files/patch-bf
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/virtual.5.orig	Mon Mar 29 22:36:55 1999
---- man/man5/virtual.5	Mon Mar 29 22:37:02 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix27/files/patch-bg b/mail/postfix27/files/patch-bg
deleted file mode 100644
index fb2b093bff0f..000000000000
--- a/mail/postfix27/files/patch-bg
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man8/local.8.orig	Mon Mar 29 22:37:14 1999
---- man/man8/local.8	Mon Mar 29 22:37:44 1999
-***************
-*** 75,81 ****
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR or \fB/var/spool/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
---- 75,81 ----
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
diff --git a/mail/postfix27/files/patch-bh b/mail/postfix27/files/patch-bh
deleted file mode 100644
index 42b7373d3fb5..000000000000
--- a/mail/postfix27/files/patch-bh
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/cleanup.8.orig	Mon Mar 29 22:37:59 1999
---- man/man8/cleanup.8	Mon Mar 29 22:38:13 1999
-***************
-*** 118,125 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/canonical*, canonical mapping table
-! /etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
---- 118,125 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
diff --git a/mail/postfix27/files/patch-bi b/mail/postfix27/files/patch-bi
deleted file mode 100644
index 2b57467ed976..000000000000
--- a/mail/postfix27/files/patch-bi
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/master.8.orig	Mon Mar 29 22:38:17 1999
---- man/man8/master.8	Mon Mar 29 22:38:46 1999
-***************
-*** 116,123 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/main.cf: global configuration file.
-! /etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
---- 116,123 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/main.cf: global configuration file.
-! !!PREFIX!!/etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
diff --git a/mail/postfix27/files/patch-bj b/mail/postfix27/files/patch-bj
deleted file mode 100644
index 99c521341ca5..000000000000
--- a/mail/postfix27/files/patch-bj
+++ /dev/null
@@ -1,20 +0,0 @@
---- makedefs.orig	Sun Jan 23 03:04:27 2000
-+++ makedefs	Mon Apr  3 08:59:17 2000
-@@ -89,6 +89,8 @@
- 		;;
-   FreeBSD.4*)	SYSTYPE=FREEBSD4
- 		;;
-+  FreeBSD.5*)	SYSTYPE=FREEBSD5
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-    NetBSD.1*)	SYSTYPE=NETBSD1
-@@ -244,7 +246,7 @@
-         *) : ${OPT='-O'};;
- esac
- 
--: ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk}
-+: ${CC='gcc $(WARN)'} ${OPT='-O'} ${AWK=awk}
- 
- export SYSTYPE AR ARFL RANLIB SYSLIBS CC OPT DEBUG AWK OPTS
- 
diff --git a/mail/postfix27/files/patch-bk b/mail/postfix27/files/patch-bk
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix27/files/patch-bk
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig	Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h	Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
-   * makedefs script, and adding a section below for the new system.
-   */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+    || defined(FREEBSD5) \
-     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
-     || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix27/pkg-comment b/mail/postfix27/pkg-comment
deleted file mode 100644
index 2afe8fab5cff..000000000000
--- a/mail/postfix27/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Good alternative to sendmail
diff --git a/mail/postfix27/pkg-descr b/mail/postfix27/pkg-descr
deleted file mode 100644
index f5136efff0fb..000000000000
--- a/mail/postfix27/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix aims to be an alternative to the widely-used sendmail
-program.  Sendmail is responsible for 70% of all e-mail delivered
-on the Internet.  With an estimated 100 million users, that's an
-estimated 10 billion (10^10) messages daily. A stunning number.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix27/pkg-install b/mail/postfix27/pkg-install
deleted file mode 100644
index dcc7c370d885..000000000000
--- a/mail/postfix27/pkg-install
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-user=postfix
-group=postfix
-group2=maildrop
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-        answer=$(ask "${question}" "${dflt}")
-        case "${answer}" in
-        [Yy]*)          return 0;;
-        [Nn]*)          return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then
-        echo "You already have a group \"${group}\", so I will use it."
-    else
-        echo "You need a group \"${group}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a group \"${group2}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group2} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a user \"${user}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \
-                -s /nonexistent -c "Postfix Mail System" || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/main.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-main.cf \
-	    ${PKG_PREFIX}/etc/postfix/main.cf
-    fi
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/master.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-master.cf \
-	    ${PKG_PREFIX}/etc/postfix/master.cf
-    fi
-    chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
-    chmod 2755 ${PKG_PREFIX}/sbin/postdrop
-fi
diff --git a/mail/postfix27/pkg-plist b/mail/postfix27/pkg-plist
deleted file mode 100644
index 943a3766560b..000000000000
--- a/mail/postfix27/pkg-plist
+++ /dev/null
@@ -1,102 +0,0 @@
-etc/postfix/LICENSE
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-relocated.cf
-etc/postfix/sample-resource.cf
-etc/postfix/sample-rewrite.cf
-etc/postfix/sample-smtp.cf
-etc/postfix/sample-smtpd.cf
-etc/postfix/sample-transport.cf
-etc/postfix/sample-virtual.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/qmgr
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/trivial-rewrite
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postsuper
-sbin/sendmail
-sbin/smtp-sink
-sbin/smtp-source
-share/doc/postfix/access.5.html
-share/doc/postfix/aliases.5.html
-share/doc/postfix/architecture.html
-share/doc/postfix/backstage.html
-share/doc/postfix/basic.html
-share/doc/postfix/big-picture.gif
-share/doc/postfix/big-picture.html
-share/doc/postfix/bounce.8.html
-share/doc/postfix/canonical.5.html
-share/doc/postfix/cleanup.8.html
-share/doc/postfix/commands.html
-share/doc/postfix/defer.8.html
-share/doc/postfix/delivering.html
-share/doc/postfix/error.8.html
-share/doc/postfix/faq.html
-share/doc/postfix/goals.html
-share/doc/postfix/inbound.gif
-share/doc/postfix/index.html
-share/doc/postfix/local.8.html
-share/doc/postfix/mailq.1.html
-share/doc/postfix/master.8.html
-share/doc/postfix/motivation.html
-share/doc/postfix/newaliases.1.html
-share/doc/postfix/outbound.gif
-share/doc/postfix/pickup.8.html
-share/doc/postfix/pipe.8.html
-share/doc/postfix/postalias.1.html
-share/doc/postfix/postcat.1.html
-share/doc/postfix/postconf.1.html
-share/doc/postfix/postdrop.1.html
-share/doc/postfix/postfix.1.html
-share/doc/postfix/postkick.1.html
-share/doc/postfix/postlock.1.html
-share/doc/postfix/postlog.1.html
-share/doc/postfix/postmap.1.html
-share/doc/postfix/postsuper.1.html
-share/doc/postfix/qmgr.8.html
-share/doc/postfix/queuing.html
-share/doc/postfix/rate.html
-share/doc/postfix/receiving.html
-share/doc/postfix/relocated.5.html
-share/doc/postfix/resource.html
-share/doc/postfix/rewrite.html
-share/doc/postfix/security.html
-share/doc/postfix/sendmail.1.html
-share/doc/postfix/showq.8.html
-share/doc/postfix/small-picture.gif
-share/doc/postfix/smtp.8.html
-share/doc/postfix/smtpd.8.html
-share/doc/postfix/transport.5.html
-share/doc/postfix/trivial-rewrite.8.html
-share/doc/postfix/uce.html
-share/doc/postfix/virtual.5.html
-@exec mkdir -p -m 0755 /var/spool/postfix
-@exec chown root:wheel /var/spool/postfix
-@dirrm libexec/postfix
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
diff --git a/mail/postfix27/scripts/configure b/mail/postfix27/scripts/configure
deleted file mode 100644
index a46faa92015c..000000000000
--- a/mail/postfix27/scripts/configure
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-mv ${WRKSRC}/global/mail_params.h ${WRKSRC}/global/mail_params.h.bak
-sed <${WRKSRC}/global/mail_params.h.bak >${WRKSRC}/global/mail_params.h s+!!PREFIX!!+$PREFIX+g
-
-mv ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.bak
-sed s+!!PREFIX!!+$PREFIX+g <${WRKSRC}/conf/main.cf.bak >${WRKSRC}/conf/main.cf
-
-cd ${WRKSRC}/man
-
-for f in ${MAN1} ; do
-	mv man1/$f man1/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man1/$f.bak | soelim >man1/$f
-done
-	
-for f in ${MAN5} ; do
-	mv man5/$f man5/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man5/$f.bak | soelim >man5/$f
-done
-	
-for f in ${MAN8} ; do
-	mv man8/$f man8/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man8/$f.bak | soelim >man8/$f
-done
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
deleted file mode 100644
index 2cef938289a9..000000000000
--- a/mail/postfix28/Makefile
+++ /dev/null
@@ -1,150 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:		18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-PORTNAME=	postfix
-PORTVERSION= 	19991231.08
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.merit.edu/postfix/official/ \
-		ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
-		ftp://ftp.reverse.net/pub/postfix/official/ \
-		ftp://postfix.eu.org/pub/postfix/official/ \
-		ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
-		ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
-		ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-DISTNAME=	${PORTNAME}-19991231-pl08
-
-MAINTAINER=	torstenb@FreeBSD.org
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_MYSQL)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
-POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
-.endif
-
-# WARNING: this is based on a patch submitted by a user and has not been
-# tested. Use it at your own risk !
-.if defined(WITH_LDAP)
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
-POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
-.endif
-
-ALL_TARGET=	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}"
-
-SCRIPTS_ENV+=	MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}"
-MAKE_ENV+=	"OPT=${CFLAGS}"
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postsuper.1 \
-	sendmail.1
-MAN5=	access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5
-MAN8=	bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \
-	showq.8 smtp.8 smtpd.8 trivial-rewrite.8 error.8
-
-SHAREMODE=	0444
-PDOC=		${PREFIX}/share/doc/postfix
-
-do-install:
-	@${MKDIR} -m 755 ${PREFIX}/etc/postfix
-	@${CHOWN} root:wheel ${PREFIX}/etc/postfix
-	@${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \
-		${PREFIX}/etc/postfix/LICENSE
-	@for f in access main.cf master.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/sample-$$f ; \
-	done
-	@for f in sample-aliases.cf sample-canonical.cf sample-debug.cf \
-		sample-ldap.cf sample-local.cf sample-misc.cf sample-pcre.cf \
-		sample-rate.cf sample-relocated.cf sample-resource.cf \
-		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
-		sample-transport.cf sample-virtual.cf ; do \
-		${INSTALL} -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \
-		${PREFIX}/etc/postfix/$$f ;\
-	done
-	@${INSTALL} -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \
-		${PREFIX}/etc/postfix/postfix-script
-	@${MKDIR} -m 0755 ${PREFIX}/libexec/postfix
-	@for f in bounce cleanup error local master pickup pipe qmgr \
-		 showq smtp smtpd trivial-rewrite ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s \
-			${WRKSRC}/libexec/$$f ${PREFIX}/libexec/postfix/$$f ;\
-	done
-	@for f in postalias postcat postconf postfix postkick postlock postlog\
-		postmap postsuper sendmail smtp-sink smtp-source ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 -s ${WRKSRC}/bin/$$f \
-			${PREFIX}/sbin/$$f ;\
-	done
-	@${INSTALL} -C -o root -g maildrop -m 2755 -s ${WRKSRC}/bin/postdrop \
-		${PREFIX}/sbin/postdrop
-	@for f in ${MAN1} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \
-			${PREFIX}/man/man1/$$f ;\
-	done
-	@for f in ${MAN5} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \
-			${PREFIX}/man/man5/$$f ;\
-	done
-	@for f in ${MAN8} ; do \
-		${INSTALL} -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \
-			${PREFIX}/man/man8/$$f ;\
-	done
-	@${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${PDOC}
-	@cd ${WRKSRC} && ${INSTALL_DATA} \
-		html/*.html html/*.gif ${PDOC} && \
-		${ECHO_MSG} "Installed HTML documentation in ${PDOC}"
-	@${MKDIR} -m 0755 /var/spool/postfix
-	@${ECHO_MSG} "--------------------------------------------------"
-	@${ECHO_MSG} "- To replace your existing sendmail with postfix -"
-	@${ECHO_MSG} "- type \"make replace\"                          -"
-	@${ECHO_MSG} "--------------------------------------------------"
-
-pre-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
-
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.pre.mk>
-
-replace:
-.if ${OSVERSION} >= 400014
-	@${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf"
-	${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak
-	${ECHO} 'sendmail	${PREFIX}/sbin/sendmail' > /etc/mail/mailer.conf
-	${ECHO} 'send-mail	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'mailq		${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-	${ECHO} 'newaliases	${PREFIX}/sbin/sendmail' >>/etc/mail/mailer.conf
-.else
-	@${ECHO_MSG} "===> Replacing sendmail"
-	@if [ -e /usr/sbin/sendmail ]; then \
-		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \
-		${CHMOD} 0 /usr/sbin/sendmail.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \
-	fi
-	@${ECHO_MSG} "===> Replacing mailq"
-	@if [ -e /usr/bin/mailq ]; then \
-		${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \
-		${CHMOD} 0 /usr/bin/mailq.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \
-	fi
-	@${ECHO_MSG} "===> Replacing newaliases"
-	@if [ -e /usr/bin/newaliases ]; then \
-		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \
-		${CHMOD} 0 /usr/bin/newaliases.OFF; \
-	fi
-	@if [ -e ${PREFIX}/sbin/sendmail ]; then \
-		${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \
-	fi
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo
deleted file mode 100644
index c8a018d3ad7f..000000000000
--- a/mail/postfix28/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (postfix-19991231-pl08.tar.gz) = 0461524d91c87b03c80cc640ec953a63
diff --git a/mail/postfix28/files/patch-aa b/mail/postfix28/files/patch-aa
deleted file mode 100644
index 3af6375f1959..000000000000
--- a/mail/postfix28/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-*** global/mail_params.h.orig	Sat Mar 20 15:09:46 1999
---- global/mail_params.h	Sat Mar 20 15:10:46 1999
-***************
-*** 127,133 ****
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
---- 127,133 ----
-    */
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-  #define VAR_DAEMON_DIR		"daemon_directory"
-***************
-*** 161,167 ****
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
---- 161,167 ----
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
diff --git a/mail/postfix28/files/patch-ab b/mail/postfix28/files/patch-ab
deleted file mode 100644
index 32a96b27bbc0..000000000000
--- a/mail/postfix28/files/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
---- conf/main.cf.orig	Tue Dec 28 05:03:38 1999
-+++ conf/main.cf	Sun Jan  2 21:31:24 2000
-@@ -17,14 +17,14 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.  The default value is $program_directory.
- #
--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). The
- # default value is $program_directory. This directory must be owned
- # by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -41,7 +41,7 @@
- # These rights are used in the absence of a recipient user context.
- # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
- #
--#default_privs = nobody
-+default_privs = nobody
- 
- # INTERNET HOST AND DOMAIN NAMES
- # 
diff --git a/mail/postfix28/files/patch-ba b/mail/postfix28/files/patch-ba
deleted file mode 100644
index 73feeef81f27..000000000000
--- a/mail/postfix28/files/patch-ba
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man1/postdrop.1.orig	Mon Mar 29 22:35:14 1999
---- man/man1/postdrop.1	Mon Mar 29 22:35:25 1999
-***************
-*** 51,57 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 51,57 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix28/files/patch-bb b/mail/postfix28/files/patch-bb
deleted file mode 100644
index af024b23b3d9..000000000000
--- a/mail/postfix28/files/patch-bb
+++ /dev/null
@@ -1,36 +0,0 @@
-*** man/man1/sendmail.1.orig	Mon Mar 29 22:35:30 1999
---- man/man1/sendmail.1	Mon Mar 29 22:35:44 1999
-***************
-*** 60,66 ****
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
---- 60,66 ----
-  \fBjust-send-eight\fR.
-  .IP "\fB-C \fIconfig_file\fR (ignored :-)"
-  The path name of the \fBsendmail.cf\fR file. Postfix configuration
-! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
-  .IP "\fB-F \fIfull_name\fR
-  Set the sender full name. This is used only with messages that
-  have no \fBFrom:\fR message header.
-***************
-*** 164,170 ****
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! /etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
---- 164,170 ----
-  .na
-  .nf
-  /var/spool/postfix, mail queue
-! !!PREFIX!!/etc/postfix, configuration files
-  .SH CONFIGURATION PARAMETERS
-  .na
-  .nf
diff --git a/mail/postfix28/files/patch-bc b/mail/postfix28/files/patch-bc
deleted file mode 100644
index 12a369684c8f..000000000000
--- a/mail/postfix28/files/patch-bc
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/access.5.orig	Mon Mar 29 22:35:58 1999
---- man/man5/access.5	Mon Mar 29 22:36:13 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix28/files/patch-bd b/mail/postfix28/files/patch-bd
deleted file mode 100644
index 2b2f30f720f5..000000000000
--- a/mail/postfix28/files/patch-bd
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/canonical.5.orig	Mon Mar 29 22:36:25 1999
---- man/man5/canonical.5	Mon Mar 29 22:36:32 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix28/files/patch-be b/mail/postfix28/files/patch-be
deleted file mode 100644
index 354737c7e68d..000000000000
--- a/mail/postfix28/files/patch-be
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/relocated.5.orig	Mon Mar 29 22:36:36 1999
---- man/man5/relocated.5	Mon Mar 29 22:36:47 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix28/files/patch-bf b/mail/postfix28/files/patch-bf
deleted file mode 100644
index 4de817826469..000000000000
--- a/mail/postfix28/files/patch-bf
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man5/virtual.5.orig	Mon Mar 29 22:36:55 1999
---- man/man5/virtual.5	Mon Mar 29 22:37:02 1999
-***************
-*** 8,14 ****
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap /etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
---- 8,14 ----
-  .SH SYNOPSIS
-  .na
-  .nf
-! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
-  .SH DESCRIPTION
-  .ad
-  .fi
diff --git a/mail/postfix28/files/patch-bg b/mail/postfix28/files/patch-bg
deleted file mode 100644
index fb2b093bff0f..000000000000
--- a/mail/postfix28/files/patch-bg
+++ /dev/null
@@ -1,19 +0,0 @@
-*** man/man8/local.8.orig	Mon Mar 29 22:37:14 1999
---- man/man8/local.8	Mon Mar 29 22:37:44 1999
-***************
-*** 75,81 ****
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR or \fB/var/spool/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
---- 75,81 ----
-  .ad
-  .fi
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
-  configuration parameter.
-  
diff --git a/mail/postfix28/files/patch-bh b/mail/postfix28/files/patch-bh
deleted file mode 100644
index 42b7373d3fb5..000000000000
--- a/mail/postfix28/files/patch-bh
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/cleanup.8.orig	Mon Mar 29 22:37:59 1999
---- man/man8/cleanup.8	Mon Mar 29 22:38:13 1999
-***************
-*** 118,125 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/canonical*, canonical mapping table
-! /etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
---- 118,125 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  .SH LICENSE
-  .na
-  .nf
diff --git a/mail/postfix28/files/patch-bi b/mail/postfix28/files/patch-bi
deleted file mode 100644
index 2b57467ed976..000000000000
--- a/mail/postfix28/files/patch-bi
+++ /dev/null
@@ -1,21 +0,0 @@
-*** man/man8/master.8.orig	Mon Mar 29 22:38:17 1999
---- man/man8/master.8	Mon Mar 29 22:38:46 1999
-***************
-*** 116,123 ****
-  .SH FILES
-  .na
-  .nf
-! /etc/postfix/main.cf: global configuration file.
-! /etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
---- 116,123 ----
-  .SH FILES
-  .na
-  .nf
-! !!PREFIX!!/etc/postfix/main.cf: global configuration file.
-! !!PREFIX!!/etc/postfix/master.cf: master process configuration file.
-  /var/spool/postfix/pid/master.pid: master lock file.
-  .SH SEE ALSO
-  .na
diff --git a/mail/postfix28/files/patch-bj b/mail/postfix28/files/patch-bj
deleted file mode 100644
index 99c521341ca5..000000000000
--- a/mail/postfix28/files/patch-bj
+++ /dev/null
@@ -1,20 +0,0 @@
---- makedefs.orig	Sun Jan 23 03:04:27 2000
-+++ makedefs	Mon Apr  3 08:59:17 2000
-@@ -89,6 +89,8 @@
- 		;;
-   FreeBSD.4*)	SYSTYPE=FREEBSD4
- 		;;
-+  FreeBSD.5*)	SYSTYPE=FREEBSD5
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-    NetBSD.1*)	SYSTYPE=NETBSD1
-@@ -244,7 +246,7 @@
-         *) : ${OPT='-O'};;
- esac
- 
--: ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk}
-+: ${CC='gcc $(WARN)'} ${OPT='-O'} ${AWK=awk}
- 
- export SYSTYPE AR ARFL RANLIB SYSLIBS CC OPT DEBUG AWK OPTS
- 
diff --git a/mail/postfix28/files/patch-bk b/mail/postfix28/files/patch-bk
deleted file mode 100644
index 3350e88273f3..000000000000
--- a/mail/postfix28/files/patch-bk
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/sys_defs.h.orig	Sat Jan 22 16:03:31 2000
-+++ util/sys_defs.h	Sat Mar 25 09:19:31 2000
-@@ -20,6 +20,7 @@
-   * makedefs script, and adding a section below for the new system.
-   */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-+    || defined(FREEBSD5) \
-     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
-     || defined(OPENBSD2) || defined(NETBSD1) || defined(RHAPSODY5)
- #define SUPPORTED
diff --git a/mail/postfix28/pkg-comment b/mail/postfix28/pkg-comment
deleted file mode 100644
index 2afe8fab5cff..000000000000
--- a/mail/postfix28/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Good alternative to sendmail
diff --git a/mail/postfix28/pkg-descr b/mail/postfix28/pkg-descr
deleted file mode 100644
index f5136efff0fb..000000000000
--- a/mail/postfix28/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix aims to be an alternative to the widely-used sendmail
-program.  Sendmail is responsible for 70% of all e-mail delivered
-on the Internet.  With an estimated 100 million users, that's an
-estimated 10 billion (10^10) messages daily. A stunning number.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix28/pkg-install b/mail/postfix28/pkg-install
deleted file mode 100644
index dcc7c370d885..000000000000
--- a/mail/postfix28/pkg-install
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-user=postfix
-group=postfix
-group2=maildrop
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-        answer=$(ask "${question}" "${dflt}")
-        case "${answer}" in
-        [Yy]*)          return 0;;
-        [Nn]*)          return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    if /usr/sbin/pw groupshow "${group}" 2>/dev/null; then
-        echo "You already have a group \"${group}\", so I will use it."
-    else
-        echo "You need a group \"${group}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a group \"${group2}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group2} -h - || exit
-            echo "Done."
-        else
-            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
-        echo "You need a user \"${user}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw useradd ${user} -g ${group} -h - -d /nonexistent \
-                -s /nonexistent -c "Postfix Mail System" || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/main.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-main.cf \
-	    ${PKG_PREFIX}/etc/postfix/main.cf
-    fi
-    if [ ! -e ${PKG_PREFIX}/etc/postfix/master.cf ]; then
-        cp -p ${PKG_PREFIX}/etc/postfix/sample-master.cf \
-	    ${PKG_PREFIX}/etc/postfix/master.cf
-    fi
-    chown root:maildrop ${PKG_PREFIX}/sbin/postdrop
-    chmod 2755 ${PKG_PREFIX}/sbin/postdrop
-fi
diff --git a/mail/postfix28/pkg-plist b/mail/postfix28/pkg-plist
deleted file mode 100644
index 943a3766560b..000000000000
--- a/mail/postfix28/pkg-plist
+++ /dev/null
@@ -1,102 +0,0 @@
-etc/postfix/LICENSE
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-relocated.cf
-etc/postfix/sample-resource.cf
-etc/postfix/sample-rewrite.cf
-etc/postfix/sample-smtp.cf
-etc/postfix/sample-smtpd.cf
-etc/postfix/sample-transport.cf
-etc/postfix/sample-virtual.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/qmgr
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/trivial-rewrite
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postsuper
-sbin/sendmail
-sbin/smtp-sink
-sbin/smtp-source
-share/doc/postfix/access.5.html
-share/doc/postfix/aliases.5.html
-share/doc/postfix/architecture.html
-share/doc/postfix/backstage.html
-share/doc/postfix/basic.html
-share/doc/postfix/big-picture.gif
-share/doc/postfix/big-picture.html
-share/doc/postfix/bounce.8.html
-share/doc/postfix/canonical.5.html
-share/doc/postfix/cleanup.8.html
-share/doc/postfix/commands.html
-share/doc/postfix/defer.8.html
-share/doc/postfix/delivering.html
-share/doc/postfix/error.8.html
-share/doc/postfix/faq.html
-share/doc/postfix/goals.html
-share/doc/postfix/inbound.gif
-share/doc/postfix/index.html
-share/doc/postfix/local.8.html
-share/doc/postfix/mailq.1.html
-share/doc/postfix/master.8.html
-share/doc/postfix/motivation.html
-share/doc/postfix/newaliases.1.html
-share/doc/postfix/outbound.gif
-share/doc/postfix/pickup.8.html
-share/doc/postfix/pipe.8.html
-share/doc/postfix/postalias.1.html
-share/doc/postfix/postcat.1.html
-share/doc/postfix/postconf.1.html
-share/doc/postfix/postdrop.1.html
-share/doc/postfix/postfix.1.html
-share/doc/postfix/postkick.1.html
-share/doc/postfix/postlock.1.html
-share/doc/postfix/postlog.1.html
-share/doc/postfix/postmap.1.html
-share/doc/postfix/postsuper.1.html
-share/doc/postfix/qmgr.8.html
-share/doc/postfix/queuing.html
-share/doc/postfix/rate.html
-share/doc/postfix/receiving.html
-share/doc/postfix/relocated.5.html
-share/doc/postfix/resource.html
-share/doc/postfix/rewrite.html
-share/doc/postfix/security.html
-share/doc/postfix/sendmail.1.html
-share/doc/postfix/showq.8.html
-share/doc/postfix/small-picture.gif
-share/doc/postfix/smtp.8.html
-share/doc/postfix/smtpd.8.html
-share/doc/postfix/transport.5.html
-share/doc/postfix/trivial-rewrite.8.html
-share/doc/postfix/uce.html
-share/doc/postfix/virtual.5.html
-@exec mkdir -p -m 0755 /var/spool/postfix
-@exec chown root:wheel /var/spool/postfix
-@dirrm libexec/postfix
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
diff --git a/mail/postfix28/scripts/configure b/mail/postfix28/scripts/configure
deleted file mode 100644
index a46faa92015c..000000000000
--- a/mail/postfix28/scripts/configure
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-mv ${WRKSRC}/global/mail_params.h ${WRKSRC}/global/mail_params.h.bak
-sed <${WRKSRC}/global/mail_params.h.bak >${WRKSRC}/global/mail_params.h s+!!PREFIX!!+$PREFIX+g
-
-mv ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.bak
-sed s+!!PREFIX!!+$PREFIX+g <${WRKSRC}/conf/main.cf.bak >${WRKSRC}/conf/main.cf
-
-cd ${WRKSRC}/man
-
-for f in ${MAN1} ; do
-	mv man1/$f man1/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man1/$f.bak | soelim >man1/$f
-done
-	
-for f in ${MAN5} ; do
-	mv man5/$f man5/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man5/$f.bak | soelim >man5/$f
-done
-	
-for f in ${MAN8} ; do
-	mv man8/$f man8/$f.bak && \
-		sed s+!!PREFIX!!+$PREFIX+g <man8/$f.bak | soelim >man8/$f
-done
diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
deleted file mode 100644
index 4a24888c83a6..000000000000
--- a/mail/sylpheed2-devel/Makefile
+++ /dev/null
@@ -1,41 +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=	0.3.20
-CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/
-
-MAINTAINER=	shigeri@m10.alpha-net.ne.jp
-
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --disable-glibtest --disable-gtktest
-
-DOCS=		ABOUT-NLS COPYING ChangeLog ChangeLog.jp INSTALL INSTALL.jp \
-		README README.jp TODO.jp
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/sylpheed
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/sylpheed
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/sylpheed2-devel/distinfo b/mail/sylpheed2-devel/distinfo
deleted file mode 100644
index 1e07fb63e758..000000000000
--- a/mail/sylpheed2-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (sylpheed-0.3.20.tar.bz2) = e9501776b7958e86eb942a76b3ec461a
diff --git a/mail/sylpheed2-devel/files/patch-ac b/mail/sylpheed2-devel/files/patch-ac
deleted file mode 100644
index 8f77933908b3..000000000000
--- a/mail/sylpheed2-devel/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/main.h.orig	Fri Apr 21 02:44:30 2000
-+++ src/main.h	Wed May  3 21:00:00 2000
-@@ -34,11 +34,15 @@
- #define MARK_VERSION		2
- 
- #define DEFAULT_SIGNATURE	".signature"
--#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" */
-+#if defined(__FreeBSD__)
-+#define DEFAULT_SPOOL_PATH	"/var/mail"
-+#else
- #define DEFAULT_SPOOL_PATH	"/var/spool/mail"
-+#endif
- 
- #define BUFFSIZE			8192
- #define MAXPATHLEN			4095
diff --git a/mail/sylpheed2-devel/pkg-comment b/mail/sylpheed2-devel/pkg-comment
deleted file mode 100644
index b677f5028775..000000000000
--- a/mail/sylpheed2-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ based, lightweight, and fast e-mail client
diff --git a/mail/sylpheed2-devel/pkg-descr b/mail/sylpheed2-devel/pkg-descr
deleted file mode 100644
index 21f2c3ffcf9e..000000000000
--- a/mail/sylpheed2-devel/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This program is a GTK+ based, lightweight, and fast e-mail client.
-
-WWW: http://sylpheed.good-day.net
diff --git a/mail/sylpheed2-devel/pkg-plist b/mail/sylpheed2-devel/pkg-plist
deleted file mode 100644
index 1b7e4c343bcc..000000000000
--- a/mail/sylpheed2-devel/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/sylpheed
-share/doc/sylpheed/ABOUT-NLS
-share/doc/sylpheed/COPYING
-share/doc/sylpheed/ChangeLog
-share/doc/sylpheed/ChangeLog.jp
-share/doc/sylpheed/INSTALL
-share/doc/sylpheed/INSTALL.jp
-share/doc/sylpheed/README
-share/doc/sylpheed/README.jp
-share/doc/sylpheed/TODO.jp
-share/locale/ja/LC_MESSAGES/sylpheed.mo
-@dirrm share/doc/sylpheed
diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile
deleted file mode 100644
index 4a24888c83a6..000000000000
--- a/mail/sylpheed2/Makefile
+++ /dev/null
@@ -1,41 +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=	0.3.20
-CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/
-
-MAINTAINER=	shigeri@m10.alpha-net.ne.jp
-
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --disable-glibtest --disable-gtktest
-
-DOCS=		ABOUT-NLS COPYING ChangeLog ChangeLog.jp INSTALL INSTALL.jp \
-		README README.jp TODO.jp
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/sylpheed
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/sylpheed
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/sylpheed2/distinfo b/mail/sylpheed2/distinfo
deleted file mode 100644
index 1e07fb63e758..000000000000
--- a/mail/sylpheed2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (sylpheed-0.3.20.tar.bz2) = e9501776b7958e86eb942a76b3ec461a
diff --git a/mail/sylpheed2/files/patch-ac b/mail/sylpheed2/files/patch-ac
deleted file mode 100644
index 8f77933908b3..000000000000
--- a/mail/sylpheed2/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/main.h.orig	Fri Apr 21 02:44:30 2000
-+++ src/main.h	Wed May  3 21:00:00 2000
-@@ -34,11 +34,15 @@
- #define MARK_VERSION		2
- 
- #define DEFAULT_SIGNATURE	".signature"
--#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" */
-+#if defined(__FreeBSD__)
-+#define DEFAULT_SPOOL_PATH	"/var/mail"
-+#else
- #define DEFAULT_SPOOL_PATH	"/var/spool/mail"
-+#endif
- 
- #define BUFFSIZE			8192
- #define MAXPATHLEN			4095
diff --git a/mail/sylpheed2/pkg-comment b/mail/sylpheed2/pkg-comment
deleted file mode 100644
index b677f5028775..000000000000
--- a/mail/sylpheed2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ based, lightweight, and fast e-mail client
diff --git a/mail/sylpheed2/pkg-descr b/mail/sylpheed2/pkg-descr
deleted file mode 100644
index 21f2c3ffcf9e..000000000000
--- a/mail/sylpheed2/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This program is a GTK+ based, lightweight, and fast e-mail client.
-
-WWW: http://sylpheed.good-day.net
diff --git a/mail/sylpheed2/pkg-plist b/mail/sylpheed2/pkg-plist
deleted file mode 100644
index 1b7e4c343bcc..000000000000
--- a/mail/sylpheed2/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/sylpheed
-share/doc/sylpheed/ABOUT-NLS
-share/doc/sylpheed/COPYING
-share/doc/sylpheed/ChangeLog
-share/doc/sylpheed/ChangeLog.jp
-share/doc/sylpheed/INSTALL
-share/doc/sylpheed/INSTALL.jp
-share/doc/sylpheed/README
-share/doc/sylpheed/README.jp
-share/doc/sylpheed/TODO.jp
-share/locale/ja/LC_MESSAGES/sylpheed.mo
-@dirrm share/doc/sylpheed
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
deleted file mode 100644
index 4a24888c83a6..000000000000
--- a/mail/sylpheed3/Makefile
+++ /dev/null
@@ -1,41 +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=	0.3.20
-CATEGORIES=	mail
-MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/
-
-MAINTAINER=	shigeri@m10.alpha-net.ne.jp
-
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --disable-glibtest --disable-gtktest
-
-DOCS=		ABOUT-NLS COPYING ChangeLog ChangeLog.jp INSTALL INSTALL.jp \
-		README README.jp TODO.jp
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/sylpheed
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/sylpheed
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/sylpheed3/distinfo b/mail/sylpheed3/distinfo
deleted file mode 100644
index 1e07fb63e758..000000000000
--- a/mail/sylpheed3/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (sylpheed-0.3.20.tar.bz2) = e9501776b7958e86eb942a76b3ec461a
diff --git a/mail/sylpheed3/files/patch-ac b/mail/sylpheed3/files/patch-ac
deleted file mode 100644
index 8f77933908b3..000000000000
--- a/mail/sylpheed3/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/main.h.orig	Fri Apr 21 02:44:30 2000
-+++ src/main.h	Wed May  3 21:00:00 2000
-@@ -34,11 +34,15 @@
- #define MARK_VERSION		2
- 
- #define DEFAULT_SIGNATURE	".signature"
--#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" */
-+#if defined(__FreeBSD__)
-+#define DEFAULT_SPOOL_PATH	"/var/mail"
-+#else
- #define DEFAULT_SPOOL_PATH	"/var/spool/mail"
-+#endif
- 
- #define BUFFSIZE			8192
- #define MAXPATHLEN			4095
diff --git a/mail/sylpheed3/pkg-comment b/mail/sylpheed3/pkg-comment
deleted file mode 100644
index b677f5028775..000000000000
--- a/mail/sylpheed3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ based, lightweight, and fast e-mail client
diff --git a/mail/sylpheed3/pkg-descr b/mail/sylpheed3/pkg-descr
deleted file mode 100644
index 21f2c3ffcf9e..000000000000
--- a/mail/sylpheed3/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This program is a GTK+ based, lightweight, and fast e-mail client.
-
-WWW: http://sylpheed.good-day.net
diff --git a/mail/sylpheed3/pkg-plist b/mail/sylpheed3/pkg-plist
deleted file mode 100644
index 1b7e4c343bcc..000000000000
--- a/mail/sylpheed3/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/sylpheed
-share/doc/sylpheed/ABOUT-NLS
-share/doc/sylpheed/COPYING
-share/doc/sylpheed/ChangeLog
-share/doc/sylpheed/ChangeLog.jp
-share/doc/sylpheed/INSTALL
-share/doc/sylpheed/INSTALL.jp
-share/doc/sylpheed/README
-share/doc/sylpheed/README.jp
-share/doc/sylpheed/TODO.jp
-share/locale/ja/LC_MESSAGES/sylpheed.mo
-@dirrm share/doc/sylpheed
diff --git a/mail/teapop-devel/Makefile b/mail/teapop-devel/Makefile
deleted file mode 100644
index e3e2d1adfe7a..000000000000
--- a/mail/teapop-devel/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for:	teapop
-# Date created:			18 May 2000
-# Whom:				Jim Mock <jim@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	teapop
-PORTVERSION= 	0.25
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.toontown.org/pub/teapop/ \
-		http://www.toontown.org/pub/teapop/
-DISTNAME=	${PORTNAME}-latest
-
-MAINTAINER=	jim@FreeBSD.org
-
-.if defined(WITH_PGSQL)
-LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql
-.endif
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=		--enable-flock
-
-.if defined(WITHOUT_APOP)
-CONFIGURE_ARGS+=	--disable-apop
-.endif
-
-.if defined(WITHOUT_VPOP)
-CONFIGURE_ARGS+=	--disable-vpop
-.endif
-
-.if defined(WITH_PGSQL)
-CONFIGURE_ARGS+=	--with-pgsql=${PREFIX}/pgsql
-.endif
-
-MAN8=		teapop.8
-
-.include <bsd.port.mk>
diff --git a/mail/teapop-devel/distinfo b/mail/teapop-devel/distinfo
deleted file mode 100644
index 3641e453f46b..000000000000
--- a/mail/teapop-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (teapop-latest.tar.gz) = f862783be16a0542531dc09eacb53b02
diff --git a/mail/teapop-devel/pkg-comment b/mail/teapop-devel/pkg-comment
deleted file mode 100644
index daca3c48c049..000000000000
--- a/mail/teapop-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another RFC1939 compliant POP3 server
diff --git a/mail/teapop-devel/pkg-descr b/mail/teapop-devel/pkg-descr
deleted file mode 100644
index b6155738a302..000000000000
--- a/mail/teapop-devel/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Teapop is yet another RFC1939 compliant POP3 server.  It includes
-flexible virtual domain support that distinguishes it from all other
-POP3 servers.
-
-WWW:	http://www.toontown.org/teapop/
-
-- jim <jim@FreeBSD.org>
diff --git a/mail/teapop-devel/pkg-plist b/mail/teapop-devel/pkg-plist
deleted file mode 100644
index 285abda1f705..000000000000
--- a/mail/teapop-devel/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-libexec/teapop
-etc/teapop.passwd
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
deleted file mode 100644
index 6988aa9f9ff5..000000000000
--- a/mail/wanderlust/Makefile
+++ /dev/null
@@ -1,167 +0,0 @@
-# New ports collection makefile for:	Wanderlust (for emacs)
-# Date created:		7 Apr 1999
-# Whom: 		MANTANI Nobutaka <nobutaka@nobutaka.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	wanderlust
-PORTVERSION=	1.1.1
-CATEGORIES=	mail elisp
-MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/ \
-		ftp://ftp.ring.gr.jp/pub/text/elisp/wl/stable/ \
-		ftp://ftp.jaist.ac.jp/pub/GNU/elisp/ftp.gohome.org/wl/stable/ \
-		ftp://daidai.kuis.kyoto-u.ac.jp/pub/mirror/ftp.gohome.org/pub/elisp/wl/stable/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	wl-${PORTVERSION}
-
-MAINTAINER=	nobutaka@nobutaka.com
-
-MIMEUI_PRODUCT?=	semi
-MIMEUI_VERSION?=	1.13.7
-MIMEUI_PORT_NAME?=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-current
-MIMEUI_COOKIE=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
-
-.if !defined (IS_SLAVE)
-# for emacs19
-EMACS_PORT_NAME=	emacs
-.endif
-
-.if (${EMACS_PORT_NAME} == "emacs20" || ${EMACS_PORT_NAME} == "mule" || \
-     ${EMACS_PORT_NAME} == "xemacs21-mule")
-WITH_MULE=yes
-.else
-WITHOUT_MULE=yes
-.endif
-
-# depends on semi
-BUILD_DEPENDS+=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
-RUN_DEPENDS+=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
-
-.if defined(EMACS_PACKAGESDIR)
-ALL_TARGET=	package
-INSTALL_TARGET=	install-package
-UTILSDIR=	${EMACS_PACKAGESDIR}/lisp/wl
-STARTUPDIR=	${EMACS_PACKAGESDIR}/lisp/wl
-.else
-ALL_TARGET=	all info
-INSTALL_TARGET= install install-info
-INFODIR=	${PREFIX}/info
-UTILSDIR=	${EMACS_SITE_LISPDIR}/wl
-.if (${EMACS_PORT_NAME} == "xemacs20")
-STARTUPDIR=	${EMACS_SITE_LISPDIR}
-.else
-STARTUPDIR=	${EMACS_VERSION_SITE_LISPDIR}
-.endif
-.endif
-
-DIRSECTION=	"The Emacs editor and associated tools"
-PORTDOCDIR=	share/doc/wanderlust
-DOCS=		README README.ja ChangeLog BUGS BUGS.ja \
-		NEWS NEWS.ja doc/wl-ja.texi doc/wl.texi
-SAMPLESDIR=	share/examples/wanderlust
-SAMPLESLANG=	en ja
-SAMPLES=	dot.addresses dot.folders dot.wl
-UTILS=		bbdb-wl.el im-wl.el ssl.el
-
-PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} \
-		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
-		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
-		DIRSECTION=${DIRSECTION}
-
-PLIST=		${PKGDIR}/PLIST.${EMACS_PORT_NAME}
-MAKE_ARGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD} \
-		LISPDIR=${PREFIX}/${EMACS_SITE_LISPDIR} \
-		FLAGS="-batch -q -no-site-file -l ${WRKDIR}/wanderlust-startup.el"
-.if defined(EMACS_PACKAGESDIR)
-MAKE_ARGS+=	PACKAGEDIR=${PREFIX}/${EMACS_PACKAGESDIR}
-.else
-MAKE_ARGS+=	INFODIR=${INFODIR}
-.endif
-
-post-extract:
-	@${CP} ${FILESDIR}/WL-CFG ${WRKSRC}
-.if defined(WITH_MULE) && !defined(WITHOUT_MULE)
-	@${ECHO} '(setq wl-info-lang (list "en" "ja"))' >> ${WRKSRC}/WL-CFG
-.else
-	@${ECHO} '(setq wl-info-lang "en")' >> ${WRKSRC}/WL-CFG
-.endif
-
-post-configure:
-	@${SED} \
-		-e "s,%%PREFIX%%,${PREFIX},g" \
-		-e "s,%%EMACS_LIBDIR%%,${EMACS_LIBDIR},g" \
-		-e "s,%%EMACS_LIBDIR_WITH_VER%%,${EMACS_LIBDIR_WITH_VER},g" \
-		-e "s,%%EMACS_PACKAGESDIR%%,${EMACS_PACKAGESDIR},g" \
-		< ${FILESDIR}/wanderlust-startup.${EMACS_PORT_NAME}.el.tmpl > ${WRKDIR}/wanderlust-startup.el
-
-pre-build:
-.if defined(EMACS_PACKAGESDIR)
-	@${CP} ${FILESDIR}/_pkg.el ${WRKSRC}
-.endif
-
-post-install:
-.if !defined(EMACS_PACKAGESDIR)
-	@${MAKE} install-info
-.endif
-.if !defined(NOPORTDOCS)
-	@${MAKE} install-docs
-.endif
-.if (${EMACS_PORT_NAME} == "xemacs20")
-	@${MAKE} install-icons
-.endif
-	@${MAKE} install-samples
-	@${MAKE} install-utils
-.if defined(EMACS_PACKAGESDIR)
-	@${MAKE} install-manifest
-.endif
-	@${CAT} ${PKGMESSAGE}
-
-# local targets
-install-info:
-	@install-info --section=${DIRSECTION} ${WRKSRC}/doc/wl.info ${INFODIR}/dir
-.if defined(WITH_MULE) && !defined(WITHOUT_MULE)
-	@install-info --section=${DIRSECTION} ${WRKSRC}/doc/wl-ja.info ${INFODIR}/dir
-.endif
-
-install-docs:
-	@${MKDIR} ${PREFIX}/${PORTDOCDIR}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${PORTDOCDIR}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/elmo/ChangeLog ${PREFIX}/${PORTDOCDIR}/ChangeLog.elmo
-	${INSTALL_DATA} ${WRKSRC}/wl/ChangeLog ${PREFIX}/${PORTDOCDIR}/ChangeLog.wl
-
-install-icons:
-	@${MKDIR} ${PREFIX}/${EMACS_LIBDIR}/etc/wl
-	cd ${WRKSRC}/etc/icons ; \
-	for i in *.xpm ; do \
-		${INSTALL_DATA} $$i ${PREFIX}/${EMACS_LIBDIR}/etc/wl ; \
-	done
-
-install-samples:
-.for l in ${SAMPLESLANG}
-	${MKDIR} ${PREFIX}/${SAMPLESDIR}/$l
-	for i in ${SAMPLES} ; do \
-		${INSTALL_DATA} ${WRKSRC}/samples/$l/$$i ${PREFIX}/${SAMPLESDIR}/$l; \
-	done
-.endfor
-
-install-utils:
-	@${MKDIR} ${PREFIX}/${UTILSDIR}
-.for i in ${UTILS}
-	${INSTALL_DATA} ${WRKSRC}/utils/${i} ${PREFIX}/${UTILSDIR}
-.endfor
-.if (${EMACS_PORT_NAME} == "emacs")
-	@${INSTALL_DATA} ${WRKSRC}/wl/wl-mule.el ${PREFIX}/${EMACS_SITE_LISPDIR}/wl
-.endif
-	@${MKDIR} ${PREFIX}/${STARTUPDIR}
-	@${INSTALL_DATA} ${WRKDIR}/wanderlust-startup.el ${PREFIX}/${STARTUPDIR}
-
-install-manifest:
-	@${CAT} ${PKGDIR}/PLIST.${EMACS_PORT_NAME} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
-		${SED} -e "s!^%%EMACS_PACKAGESDIR%%!!" > ${WRKDIR}/${MANIFEST}
-	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
-	@${INSTALL_DATA} ${FILESDIR}/_pkg.el ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/wl
-
-.include <bsd.port.mk>
diff --git a/mail/wanderlust/distinfo b/mail/wanderlust/distinfo
deleted file mode 100644
index c9517e7e0a9e..000000000000
--- a/mail/wanderlust/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (wl-1.1.1.tar.gz) = fc8ba89ad178b8e968e25bb394a71a31
diff --git a/mail/wanderlust/files/WL-CFG b/mail/wanderlust/files/WL-CFG
deleted file mode 100644
index b5e3a444ece0..000000000000
--- a/mail/wanderlust/files/WL-CFG
+++ /dev/null
@@ -1,2 +0,0 @@
-(setq wl-install-utils t)
-(setq wl-install-sasl t)
diff --git a/mail/wanderlust/files/_pkg.el b/mail/wanderlust/files/_pkg.el
deleted file mode 100644
index c8414973c3c3..000000000000
--- a/mail/wanderlust/files/_pkg.el
+++ /dev/null
@@ -1,4 +0,0 @@
-;;;###autoload
-(package-provide 'wl
-                 :version 1.11
-                 :type 'regular)
diff --git a/mail/wanderlust/files/wanderlust-startup.emacs.el.tmpl b/mail/wanderlust/files/wanderlust-startup.emacs.el.tmpl
deleted file mode 100644
index b635021cd1f5..000000000000
--- a/mail/wanderlust/files/wanderlust-startup.emacs.el.tmpl
+++ /dev/null
@@ -1,15 +0,0 @@
-(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
-(setq load-path (cons "%%PREFIX%%/%%EMACS_LIBDIR%%/site-lisp/wl" load-path))
-(require 'semi-setupel)
-(require 'flim-setupel)
-(require 'apel-setupel)
-(load "mime-setup")
-(setq wl-summary-weekday-name-lang "en")
-(setq wl-thread-indent-level 2)
-(setq wl-thread-have-younger-brother-str "+")
-(setq wl-thread-youngest-child-str       "+")
-(setq wl-thread-vertical-str             "|")
-(setq wl-thread-horizontal-str           "-")
-(setq wl-thread-space-str                " ")
-(provide 'wanderlust-startup)
diff --git a/mail/wanderlust/files/wanderlust-startup.emacs20.el.tmpl b/mail/wanderlust/files/wanderlust-startup.emacs20.el.tmpl
deleted file mode 100644
index e9ef833c9671..000000000000
--- a/mail/wanderlust/files/wanderlust-startup.emacs20.el.tmpl
+++ /dev/null
@@ -1,4 +0,0 @@
-(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
-(load "mime-setup")
-(provide 'wanderlust-startup)
diff --git a/mail/wanderlust/files/wanderlust-startup.mule.el.tmpl b/mail/wanderlust/files/wanderlust-startup.mule.el.tmpl
deleted file mode 100644
index 16d63384a0ba..000000000000
--- a/mail/wanderlust/files/wanderlust-startup.mule.el.tmpl
+++ /dev/null
@@ -1,8 +0,0 @@
-(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
-(setq load-path (cons "%%PREFIX%%/%%EMACS_LIBDIR%%/site-lisp/wl" load-path))
-(require 'semi-setupel)
-(require 'flim-setupel)
-(require 'apel-setupel)
-(load "mime-setup")
-(provide 'wanderlust-startup)
diff --git a/mail/wanderlust/files/wanderlust-startup.xemacs20.el.tmpl b/mail/wanderlust/files/wanderlust-startup.xemacs20.el.tmpl
deleted file mode 100644
index 423395b5a2f1..000000000000
--- a/mail/wanderlust/files/wanderlust-startup.xemacs20.el.tmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
-(setq load-path (cons "%%PREFIX%%/%%EMACS_VER_LIBDIR%%/site-lisp/emu" load-path))
-(load "browse-url")
-(load "mime-setup")
-(setq wl-icon-dir "%%PREFIX%%/%%EMACS_LIBDIR%%/etc/wl")
-(setq wl-summary-weekday-name-lang "en")
-(setq wl-thread-indent-level 2)
-(setq wl-thread-have-younger-brother-str "+")
-(setq wl-thread-youngest-child-str       "+")
-(setq wl-thread-vertical-str             "|")
-(setq wl-thread-horizontal-str           "-")
-(setq wl-thread-space-str                " ")
-(provide 'wanderlust-startup)
diff --git a/mail/wanderlust/files/wanderlust-startup.xemacs21-mule.el.tmpl b/mail/wanderlust/files/wanderlust-startup.xemacs21-mule.el.tmpl
deleted file mode 100644
index 169ef4c1a972..000000000000
--- a/mail/wanderlust/files/wanderlust-startup.xemacs21-mule.el.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
-(load "browse-url")
-(load "mime-setup")
-(setq wl-icon-dir "%%PREFIX%%/%%EMACS_PACKAGESDIR%%/etc/wl")
-(provide 'wanderlust-startup)
diff --git a/mail/wanderlust/pkg-comment b/mail/wanderlust/pkg-comment
deleted file mode 100644
index 871135496765..000000000000
--- a/mail/wanderlust/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another message interface on Emacsen
diff --git a/mail/wanderlust/pkg-descr b/mail/wanderlust/pkg-descr
deleted file mode 100644
index 6a4b6c65acdf..000000000000
--- a/mail/wanderlust/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-Wanderlust is a mail/news agent on Emacs/XEmacs.
-
-The features of Wanderlust are as follows:
- * Implementation in elisp only.
- * Support of IMAP4rev1, NNTP, POP(POP3/APOP) and MH format.
- * Integrated access to messages based on Folder Specifications like Mew.
- * Key bindings and mark processing like Mew.
- * Management of threads and unread messages.
- * Folder mode that displays all folder you read.
- * Message cache, Disconnected Operation.
- * MH-like FCC (FCC: %Backup is possible).
- * Support of MIME (by SEMI or tm).
- * Draft editing of mail and news as a same interface.
- * Icon based interface for the list of Folder (XEmacs).
- * Non-fetched operations for a big message part of MIME (IMAP4).
- * Server side search (IMAP4), also various charset support.
- * Virtual Folder.
- * Compression Folder.
- * Automatic expiration of old messages.
-
-WWW:	http://www.gohome.org/wl/index-e.html
---
-MANTANI Nobutaka <nobutaka@nobutaka.com>
diff --git a/mail/wanderlust/pkg-message b/mail/wanderlust/pkg-message
deleted file mode 100644
index add3dd434ba1..000000000000
--- a/mail/wanderlust/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-************************************************************
-* Before using Wanderlust, you must set following elisp    *
-* to your own .emacs file.                                 *
-*                                                          *
-* (require 'wanderlust-startup)                            *
-*                                                          *
-* Sample configuration files are installed into            *
-* ${PREFIX}/share/examples/wanderlust.  Please copy to     *
-* your home directory and edit them.                       *
-************************************************************
diff --git a/mail/wanderlust/pkg-plist.emacs b/mail/wanderlust/pkg-plist.emacs
deleted file mode 100644
index ae3842ae6ba9..000000000000
--- a/mail/wanderlust/pkg-plist.emacs
+++ /dev/null
@@ -1,145 +0,0 @@
-@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl.info %D/info/dir
-info/wl.info
-@exec install-info --section="%%DIRSECTION%%" %D/info/wl.info %D/info/dir
-share/doc/wanderlust/BUGS
-share/doc/wanderlust/BUGS.ja
-share/doc/wanderlust/README
-share/doc/wanderlust/README.ja
-share/doc/wanderlust/ChangeLog
-share/doc/wanderlust/ChangeLog.elmo
-share/doc/wanderlust/ChangeLog.wl
-share/doc/wanderlust/NEWS
-share/doc/wanderlust/NEWS.ja
-share/doc/wanderlust/wl-ja.texi
-share/doc/wanderlust/wl.texi
-%%EMACS_LIBDIR%%/site-lisp/wl/bbdb-wl.el
-@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/wl/bbdb-wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-cache.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-cache.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-date.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-date.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-dop.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-dop.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-filter.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-filter.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-imap4.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-internal.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-internal.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localdir.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localdir.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localnews.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localnews.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-maildir.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-maildir.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pop3.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pop3.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/im-wl.el
-@unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.el
-%%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/ssl.el
-@unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/ssl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/utf7.el
-%%EMACS_LIBDIR%%/site-lisp/wl/utf7.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-address.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-address.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-demo.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-demo.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-draft.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-draft.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-expire.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-expire.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-fldmgr.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-fldmgr.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-folder.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-folder.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-highlight.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-highlight.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mailto.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mailto.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-message.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-message.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mime.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mime.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mule.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-refile.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-refile.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-score.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-score.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-summary.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-summary.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-template.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-template.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-thread.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-thread.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-util.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-sha1.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hex-util.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hex-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-dl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-dl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-el.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-el.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-dl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-dl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-el.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-el.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.el
-%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
-share/examples/wanderlust/en/dot.addresses
-share/examples/wanderlust/en/dot.folders
-share/examples/wanderlust/en/dot.wl
-share/examples/wanderlust/ja/dot.addresses
-share/examples/wanderlust/ja/dot.folders
-share/examples/wanderlust/ja/dot.wl
-@dirrm %%EMACS_LIBDIR%%/site-lisp/wl
-@dirrm share/doc/wanderlust
-@dirrm share/examples/wanderlust/en
-@dirrm share/examples/wanderlust/ja
-@dirrm share/examples/wanderlust
diff --git a/mail/wanderlust/pkg-plist.emacs20 b/mail/wanderlust/pkg-plist.emacs20
deleted file mode 100644
index 717bf7d17354..000000000000
--- a/mail/wanderlust/pkg-plist.emacs20
+++ /dev/null
@@ -1,149 +0,0 @@
-@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl.info %D/info/dir
-info/wl.info
-@exec install-info --section="%%DIRSECTION%%" %D/info/wl.info %D/info/dir
-@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl-ja.info %D/info/dir
-info/wl-ja.info
-@exec install-info --section="%%DIRSECTION%%" %D/info/wl-ja.info %D/info/dir
-share/doc/wanderlust/BUGS
-share/doc/wanderlust/BUGS.ja
-share/doc/wanderlust/README
-share/doc/wanderlust/README.ja
-share/doc/wanderlust/ChangeLog
-share/doc/wanderlust/ChangeLog.elmo
-share/doc/wanderlust/ChangeLog.wl
-share/doc/wanderlust/NEWS
-share/doc/wanderlust/NEWS.ja
-share/doc/wanderlust/wl-ja.texi
-share/doc/wanderlust/wl.texi
-%%EMACS_LIBDIR%%/site-lisp/wl/bbdb-wl.el
-@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/wl/bbdb-wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-cache.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-cache.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-date.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-date.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-dop.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-dop.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-filter.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-filter.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-imap4.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-internal.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-internal.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localdir.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localdir.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localnews.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localnews.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-maildir.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-maildir.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pop3.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pop3.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/im-wl.el
-@unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.el
-%%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/ssl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/ssl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/utf7.el
-%%EMACS_LIBDIR%%/site-lisp/wl/utf7.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-address.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-address.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-demo.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-demo.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-draft.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-draft.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-expire.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-expire.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-fldmgr.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-fldmgr.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-folder.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-folder.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-highlight.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-highlight.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mailto.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mailto.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-message.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-message.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mime.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mime.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mule.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mule.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-refile.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-refile.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-score.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-score.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-summary.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-summary.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-template.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-template.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-thread.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-thread.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-util.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-sha1.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hex-util.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hex-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-dl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-dl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-el.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-el.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-dl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-dl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-el.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-el.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.el
-%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
-share/examples/wanderlust/en/dot.addresses
-share/examples/wanderlust/en/dot.folders
-share/examples/wanderlust/en/dot.wl
-share/examples/wanderlust/ja/dot.addresses
-share/examples/wanderlust/ja/dot.folders
-share/examples/wanderlust/ja/dot.wl
-@dirrm %%EMACS_LIBDIR%%/site-lisp/wl
-@dirrm share/doc/wanderlust
-@dirrm share/examples/wanderlust/en
-@dirrm share/examples/wanderlust/ja
-@dirrm share/examples/wanderlust
diff --git a/mail/wanderlust/pkg-plist.mule b/mail/wanderlust/pkg-plist.mule
deleted file mode 100644
index d75049f60191..000000000000
--- a/mail/wanderlust/pkg-plist.mule
+++ /dev/null
@@ -1,149 +0,0 @@
-@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl.info %D/info/dir
-info/wl.info
-@exec install-info --section="%%DIRSECTION%%" %D/info/wl.info %D/info/dir
-@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl-ja.info %D/info/dir
-info/wl-ja.info
-@exec install-info --section="%%DIRSECTION%%" %D/info/wl-ja.info %D/info/dir
-share/doc/wanderlust/BUGS
-share/doc/wanderlust/BUGS.ja
-share/doc/wanderlust/README
-share/doc/wanderlust/README.ja
-share/doc/wanderlust/ChangeLog
-share/doc/wanderlust/ChangeLog.elmo
-share/doc/wanderlust/ChangeLog.wl
-share/doc/wanderlust/NEWS
-share/doc/wanderlust/NEWS.ja
-share/doc/wanderlust/wl-ja.texi
-share/doc/wanderlust/wl.texi
-%%EMACS_LIBDIR%%/site-lisp/wl/bbdb-wl.el
-@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/wl/bbdb-wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-cache.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-cache.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-date.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-date.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-dop.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-dop.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-filter.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-filter.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-imap4.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-internal.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-internal.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localdir.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localdir.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localnews.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localnews.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-maildir.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-maildir.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pop3.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pop3.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/im-wl.el
-@unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.el
-%%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/ssl.el
-@unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/ssl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/utf7.el
-%%EMACS_LIBDIR%%/site-lisp/wl/utf7.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-address.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-address.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-demo.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-demo.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-draft.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-draft.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-expire.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-expire.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-fldmgr.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-fldmgr.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-folder.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-folder.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-highlight.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-highlight.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mailto.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mailto.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-message.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-message.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mime.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mime.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mule.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mule.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-refile.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-refile.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-score.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-score.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-summary.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-summary.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-template.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-template.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-thread.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-thread.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-util.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-sha1.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hex-util.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hex-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-dl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-dl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-el.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-el.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-dl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-dl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-el.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-el.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.el
-%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/wanderlust-startup.el
-share/examples/wanderlust/en/dot.addresses
-share/examples/wanderlust/en/dot.folders
-share/examples/wanderlust/en/dot.wl
-share/examples/wanderlust/ja/dot.addresses
-share/examples/wanderlust/ja/dot.folders
-share/examples/wanderlust/ja/dot.wl
-@dirrm %%EMACS_LIBDIR%%/site-lisp/wl
-@dirrm share/doc/wanderlust
-@dirrm share/examples/wanderlust/en
-@dirrm share/examples/wanderlust/ja
-@dirrm share/examples/wanderlust
diff --git a/mail/wanderlust/pkg-plist.xemacs20 b/mail/wanderlust/pkg-plist.xemacs20
deleted file mode 100644
index ac9404f4985e..000000000000
--- a/mail/wanderlust/pkg-plist.xemacs20
+++ /dev/null
@@ -1,208 +0,0 @@
-%%EMACS_LIBDIR%%/etc/wl/archive.xpm
-%%EMACS_LIBDIR%%/etc/wl/closed.xpm
-%%EMACS_LIBDIR%%/etc/wl/draft.xpm
-%%EMACS_LIBDIR%%/etc/wl/elmo.xpm
-%%EMACS_LIBDIR%%/etc/wl/filter.xpm
-%%EMACS_LIBDIR%%/etc/wl/imap.xpm
-%%EMACS_LIBDIR%%/etc/wl/internal.xpm
-%%EMACS_LIBDIR%%/etc/wl/local.xpm
-%%EMACS_LIBDIR%%/etc/wl/localnews.xpm
-%%EMACS_LIBDIR%%/etc/wl/maildir.xpm
-%%EMACS_LIBDIR%%/etc/wl/multi.xpm
-%%EMACS_LIBDIR%%/etc/wl/news.xpm
-%%EMACS_LIBDIR%%/etc/wl/opened.xpm
-%%EMACS_LIBDIR%%/etc/wl/pipe.xpm
-%%EMACS_LIBDIR%%/etc/wl/plugged.xpm
-%%EMACS_LIBDIR%%/etc/wl/pop.xpm
-%%EMACS_LIBDIR%%/etc/wl/queue.xpm
-%%EMACS_LIBDIR%%/etc/wl/trash-e.xpm
-%%EMACS_LIBDIR%%/etc/wl/trash.xpm
-%%EMACS_LIBDIR%%/etc/wl/unplugged.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-insert-signature-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-kill-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-send-from-toolbar-down.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-send-from-toolbar-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-draft-yank-original-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-exit-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-check-current-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-empty-trash-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-jump-to-current-entity-no-sync-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-jump-to-current-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-next-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-prev-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-read-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-select-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-sync-current-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-folder-zoom-entity-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-logo.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-extract-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-next-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-play-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-prev-content-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-quit-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-message-read-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-delete-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-exit-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-forward-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-jump-to-current-message-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-mark-as-important-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-next-page-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-next-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-prev-page-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-prev-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-read-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-reply-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-reply-with-citation-up.xpm
-%%EMACS_LIBDIR%%/etc/wl/wl-summary-sync-force-update-up.xpm
-%%EMACS_LIBDIR%%/site-lisp/wl/bbdb-wl.el
-@unexec rm -f %D/%%EMACS_LIBDIR%%/site-lisp/wl/bbdb-wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-archive.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-cache.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-cache.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-database.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-database.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-date.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-date.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-dop.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-dop.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-filter.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-filter.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-imap4.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-internal.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-internal.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localdir.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localdir.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localnews.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-localnews.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-maildir.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-maildir.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-msgdb.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-multi.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-nntp.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pipe.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pop3.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-pop3.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/elmo2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/im-wl.el
-@unexec rm -f %%EMACS_LIBDIR%%/site-lisp/wl/im-wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4-2.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo-imap4.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.el
-%%EMACS_LIBDIR%%/site-lisp/wl/mmelmo.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.el
-%%EMACS_LIBDIR%%/site-lisp/wl/rfc2368.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/ssl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/ssl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/utf7.el
-%%EMACS_LIBDIR%%/site-lisp/wl/utf7.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-address.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-address.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-demo.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-demo.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-dnd.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-dnd.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-draft.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-draft.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-expire.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-expire.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-fldmgr.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-fldmgr.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-folder.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-folder.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-highlight.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-highlight.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mailto.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mailto.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-message.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-message.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mime.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-mime.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-refile.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-refile.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-score.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-score.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-summary.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-summary.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-template.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-template.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-thread.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-thread.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-util.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-xmas.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl-xmas.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/wl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/wl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-def.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-sha1.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hmac-sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/hex-util.el
-%%EMACS_LIBDIR%%/site-lisp/wl/hex-util.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-dl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-dl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-el.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5-el.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-dl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-dl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-el.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1-el.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sha1.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl.el
-%%EMACS_LIBDIR%%/site-lisp/wl/sasl.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/digest-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.el
-%%EMACS_LIBDIR%%/site-lisp/wl/scram-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.el
-%%EMACS_LIBDIR%%/site-lisp/wl/unique-id.elc
-%%EMACS_LIBDIR%%/site-lisp/wanderlust-startup.el
-@unexec install-info --section="%%DIRSECTION%%" --delete %D/info/wl.info %D/info/dir
-info/wl.info
-@exec install-info --section="%%DIRSECTION%%" %D/info/wl.info %D/info/dir
-share/doc/wanderlust/BUGS
-share/doc/wanderlust/BUGS.ja
-share/doc/wanderlust/README
-share/doc/wanderlust/README.ja
-share/doc/wanderlust/ChangeLog
-share/doc/wanderlust/ChangeLog.elmo
-share/doc/wanderlust/ChangeLog.wl
-share/doc/wanderlust/NEWS
-share/doc/wanderlust/NEWS.ja
-share/doc/wanderlust/wl-ja.texi
-share/doc/wanderlust/wl.texi
-share/examples/wanderlust/en/dot.addresses
-share/examples/wanderlust/en/dot.folders
-share/examples/wanderlust/en/dot.wl
-share/examples/wanderlust/ja/dot.addresses
-share/examples/wanderlust/ja/dot.folders
-share/examples/wanderlust/ja/dot.wl
-@dirrm %%EMACS_LIBDIR%%/etc/wl
-@dirrm %%EMACS_LIBDIR%%/site-lisp/wl
-@dirrm share/doc/wanderlust
-@dirrm share/examples/wanderlust/en
-@dirrm share/examples/wanderlust/ja
-@dirrm share/examples/wanderlust
diff --git a/mail/wanderlust/pkg-plist.xemacs21-mule b/mail/wanderlust/pkg-plist.xemacs21-mule
deleted file mode 100644
index f6ede5eaef79..000000000000
--- a/mail/wanderlust/pkg-plist.xemacs21-mule
+++ /dev/null
@@ -1,213 +0,0 @@
-%%EMACS_PACKAGESDIR%%/etc/wl/archive.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/closed.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/draft.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/elmo.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/filter.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/imap.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/internal.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/local.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/localnews.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/maildir.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/multi.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/news.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/opened.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/pipe.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/plugged.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/pop.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/queue.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/trash-e.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/trash.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/unplugged.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-draft-insert-signature-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-draft-kill-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-draft-send-from-toolbar-down.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-draft-send-from-toolbar-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-draft-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-draft-yank-original-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-exit-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-check-current-entity-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-empty-trash-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-jump-to-current-entity-no-sync-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-jump-to-current-entity-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-next-entity-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-prev-entity-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-read-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-select-entity-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-sync-current-entity-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-folder-zoom-entity-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-logo.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-message-extract-content-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-message-next-content-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-message-play-content-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-message-prev-content-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-message-quit-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-message-read-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-delete-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-exit-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-forward-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-jump-to-current-message-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-mark-as-important-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-next-page-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-next-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-prev-page-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-prev-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-read-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-reply-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-reply-with-citation-up.xpm
-%%EMACS_PACKAGESDIR%%/etc/wl/wl-summary-sync-force-update-up.xpm
-%%EMACS_PACKAGESDIR%%/lisp/wl/_pkg.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/auto-autoloads.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/auto-autoloads.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/bbdb-wl.el
-@unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/wl/bbdb-wl.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/custom-load.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/custom-load.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-archive.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-archive.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-cache.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-cache.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-database.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-database.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-date.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-date.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-dop.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-dop.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-filter.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-filter.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-imap4.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-imap4.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-internal.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-internal.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-localdir.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-localdir.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-localnews.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-localnews.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-maildir.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-maildir.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-msgdb.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-msgdb.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-multi.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-multi.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-nntp.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-nntp.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-pipe.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-pipe.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-pop3.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-pop3.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-util.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-util.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-vars.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo-vars.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo2.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/elmo2.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/im-wl.el
-@unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/wl/im-wl.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-2.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-2.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4-2.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4-2.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo-imap4.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/mmelmo.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/rfc2368.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/rfc2368.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/ssl.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/ssl.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/utf7.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/utf7.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-address.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-address.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-demo.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-demo.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-dnd.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-dnd.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-draft.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-draft.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-expire.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-expire.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-fldmgr.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-fldmgr.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-folder.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-folder.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-highlight.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-highlight.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-mailto.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-mailto.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-message.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-message.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-mime.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-mime.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-refile.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-refile.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-score.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-score.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-summary.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-summary.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-template.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-template.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-thread.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-thread.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-util.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-util.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-vars.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-vars.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-xmas.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl-xmas.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/wl.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/hmac-def.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/hmac-def.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/hmac-md5.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/hmac-md5.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/hmac-sha1.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/hmac-sha1.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/hex-util.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/hex-util.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/md5-dl.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/md5-dl.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/md5-el.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/md5-el.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/md5.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/md5.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/sha1-dl.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/sha1-dl.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/sha1-el.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/sha1-el.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/sha1.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/sha1.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/sasl.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/sasl.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/digest-md5.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/digest-md5.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/scram-md5.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/scram-md5.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/unique-id.el
-%%EMACS_PACKAGESDIR%%/lisp/wl/unique-id.elc
-%%EMACS_PACKAGESDIR%%/lisp/wl/wanderlust-startup.el
-%%EMACS_PACKAGESDIR%%/info/wl-ja.info
-%%EMACS_PACKAGESDIR%%/info/wl.info
-%%EMACS_PACKAGESDIR%%/pkginfo/MANIFEST.wl
-share/doc/wanderlust/BUGS
-share/doc/wanderlust/BUGS.ja
-share/doc/wanderlust/README
-share/doc/wanderlust/README.ja
-share/doc/wanderlust/ChangeLog
-share/doc/wanderlust/ChangeLog.elmo
-share/doc/wanderlust/ChangeLog.wl
-share/doc/wanderlust/NEWS
-share/doc/wanderlust/NEWS.ja
-share/doc/wanderlust/wl-ja.texi
-share/doc/wanderlust/wl.texi
-share/examples/wanderlust/en/dot.addresses
-share/examples/wanderlust/en/dot.folders
-share/examples/wanderlust/en/dot.wl
-share/examples/wanderlust/ja/dot.addresses
-share/examples/wanderlust/ja/dot.folders
-share/examples/wanderlust/ja/dot.wl
-@dirrm %%EMACS_PACKAGESDIR%%/etc/wl
-@dirrm %%EMACS_PACKAGESDIR%%/lisp/wl
-@dirrm share/doc/wanderlust
-@dirrm share/examples/wanderlust/en
-@dirrm share/examples/wanderlust/ja
-@dirrm share/examples/wanderlust