release/5.1.0

430 files changed, 0 insertions, 23491 deletions

diff --git a/mail/bogofilter-current/Makefile b/mail/bogofilter-current/Makefile
deleted file mode 100644
index e55ae7a4ec63..000000000000
--- a/mail/bogofilter-current/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# ports collection Makefile for: bogofilter
-# Whom:		Matthias Andree <matthias.andree@web.de>
-# Date created:	2002-10-17
-#
-# $FreeBSD$
-#
-
-PORTNAME=	bogofilter
-PORTVERSION=	0.13.0
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	matthias.andree@web.de
-COMMENT=	"Fast, teachable, learning spam detector"
-
-LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
-
-USE_PERL5_RUN=	yes
-GNU_CONFIGURE=	yes
-PATCH_STRIP=	-p1
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/db4" \
-		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-ldb4"
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-MAN1=		bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1
-
-post-build::
-	cd ${WRKSRC} && make check SHELL=${SH}
-
-do-install:
-	cd ${WRKSRC} && make install-strip prefix=${PREFIX}
-
-.if !defined(NOPORTDOCS)
-post-install::
-	@${MKDIR} ${DOCSDIR}
-	@${MKDIR} ${DOCSDIR}/contrib
-	@${MKDIR} ${DOCSDIR}/html
-	@${MKDIR} ${DOCSDIR}/programmer
-	@${MKDIR} ${DOCSDIR}/tuning
-	@${MKDIR} ${DOCSDIR}/xml
-.for i in AUTHORS COPYING INSTALL NEWS README README.cvs \
-	TODO UPGRADE \
-	CHANGES-0.10 CHANGES-0.11 CHANGES-0.12 CHANGES-0.13 \
-	RELEASE.NOTES-0.11 RELEASE.NOTES-0.12 RELEASE.NOTES-0.13 \
-	doc/integrating-with-postfix doc/integrating-with-qmail \
-	doc/bogofilter-tuning.HOWTO doc/bogofilter-SA-2002-01 METHODS
-	  ${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.for i in README setR smindev.R
-	${INSTALL_MAN} ${WRKSRC}/tuning/${i} ${DOCSDIR}/tuning/
-.endfor
-.for i in bogolex.sh distrib mkdb sizes smindev.sh
-	${INSTALL_SCRIPT} ${WRKSRC}/tuning/${i} ${DOCSDIR}/tuning/
-.endfor
-.for i in contrib/bogo.R contrib/bogofilter-qfe \
-		contrib/randomtrain contrib/scramble \
-		contrib/mime.get.rfc822 contrib/printmaildir.pl
-	  ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}/contrib
-.endfor
-.for i in contrib/README.randomtrain contrib/dot-qmail-bogofilter-default
-	${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}/contrib
-.endfor
-	${INSTALL_PROGRAM} ${WRKSRC}/contrib/bogogrep ${DOCSDIR}/contrib
-	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
-	${INSTALL_MAN} ${WRKSRC}/doc/*.xml ${DOCSDIR}/xml
-	${INSTALL_MAN} ${WRKSRC}/doc/programmer/README.* ${DOCSDIR}/programmer
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/bogofilter-current/distinfo b/mail/bogofilter-current/distinfo
deleted file mode 100644
index 66b01d26a053..000000000000
--- a/mail/bogofilter-current/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (bogofilter-0.13.0.tar.gz) = cb3c397520d6001985deaba6d2e788de
diff --git a/mail/bogofilter-current/files/patch-aa b/mail/bogofilter-current/files/patch-aa
deleted file mode 100644
index 14ac4b513380..000000000000
--- a/mail/bogofilter-current/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u -r1.8 t.frame
---- ./src/tests/t.frame	19 May 2003 22:05:24 -0000	1.8
-+++ ./src/tests/t.frame	22 May 2003 03:14:17 -0000
-@@ -99,5 +99,7 @@
-     export EF_ALIGNMENT
- fi
- 
--DIFF_BRIEF=""
--[ "`uname -s`" = "Linux" ] && DIFF_BRIEF="--brief -s"
-+case `uname -s` in
-+    Linux)  DIFF_BRIEF="--brief -s" ;;
-+    *)      DIFF_BRIEF="" ;;
-+esac
diff --git a/mail/bogofilter-current/pkg-descr b/mail/bogofilter-current/pkg-descr
deleted file mode 100644
index dfbd62a10800..000000000000
--- a/mail/bogofilter-current/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Bogofilter takes an email message or other text on standard input, parses it
-into words, does a statistical check against data bases of "good" and "bad"
-words, and returns a status code indicating whether or not the message is spam.
-Bogofilter decodes base64 or quoted-printable encoded texts and ignores non-text
-attachments and HTML comments.
-
-WWW: http://bogofilter.sourceforge.net/
diff --git a/mail/bogofilter-current/pkg-plist b/mail/bogofilter-current/pkg-plist
deleted file mode 100644
index 183d918e5d0a..000000000000
--- a/mail/bogofilter-current/pkg-plist
+++ /dev/null
@@ -1,60 +0,0 @@
-bin/bogofilter
-bin/bogolexer
-bin/bogoutil
-bin/bogoupgrade
-etc/bogofilter.cf.example
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.10
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.11
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.12
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.13
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/METHODS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/bogofilter-tuning.HOWTO
-%%PORTDOCS%%%%DOCSDIR%%/README.cvs
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.11
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.12
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES-0.13
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCSDIR%%/bogofilter-SA-2002-01
-%%PORTDOCS%%%%DOCSDIR%%/contrib/README.randomtrain
-%%PORTDOCS%%%%DOCSDIR%%/contrib/bogo.R
-%%PORTDOCS%%%%DOCSDIR%%/contrib/bogofilter-qfe
-%%PORTDOCS%%%%DOCSDIR%%/contrib/bogogrep
-%%PORTDOCS%%%%DOCSDIR%%/contrib/dot-qmail-bogofilter-default
-%%PORTDOCS%%%%DOCSDIR%%/contrib/mime.get.rfc822
-%%PORTDOCS%%%%DOCSDIR%%/contrib/printmaildir.pl
-%%PORTDOCS%%%%DOCSDIR%%/contrib/randomtrain
-%%PORTDOCS%%%%DOCSDIR%%/contrib/scramble
-%%PORTDOCS%%%%DOCSDIR%%/html/bogofilter-faq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogofilter.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogolexer.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogoupgrade.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bogoutil.html
-%%PORTDOCS%%%%DOCSDIR%%/integrating-with-postfix
-%%PORTDOCS%%%%DOCSDIR%%/integrating-with-qmail
-%%PORTDOCS%%%%DOCSDIR%%/programmer/README.dcdflib
-%%PORTDOCS%%%%DOCSDIR%%/programmer/README.freebsd
-%%PORTDOCS%%%%DOCSDIR%%/programmer/README.hp-ux
-%%PORTDOCS%%%%DOCSDIR%%/tuning/README
-%%PORTDOCS%%%%DOCSDIR%%/tuning/bogolex.sh
-%%PORTDOCS%%%%DOCSDIR%%/tuning/distrib
-%%PORTDOCS%%%%DOCSDIR%%/tuning/mkdb
-%%PORTDOCS%%%%DOCSDIR%%/tuning/setR
-%%PORTDOCS%%%%DOCSDIR%%/tuning/sizes
-%%PORTDOCS%%%%DOCSDIR%%/tuning/smindev.R
-%%PORTDOCS%%%%DOCSDIR%%/tuning/smindev.sh
-%%PORTDOCS%%%%DOCSDIR%%/xml/bogofilter.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/bogolexer.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/bogoupgrade.xml
-%%PORTDOCS%%%%DOCSDIR%%/xml/bogoutil.xml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/xml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tuning
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/programmer
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
deleted file mode 100644
index 980ec750e2c4..000000000000
--- a/mail/claws-mail/Makefile
+++ /dev/null
@@ -1,155 +0,0 @@
-# New ports collection makefile for:	sylpheed-claws
-# Date created:		3 January 2002
-# Whom:			Simon 'corecode' Schubert <corecode@corecode.ath.cx>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	sylpheed-claws
-PORTVERSION=	0.8.10
-CATEGORIES=	mail news ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	sylpheed-claws
-DISTNAME=	sylpheed-${PORTVERSION}claws
-DISTFILES=	${EXTRACT_ONLY} \
-		${THEMEFILE}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER=	corecode@corecode.ath.cx
-COMMENT=	A lightweight and very featurefull GTK+ based e-mail and news client
-
-LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
-
-THEMEVERSION=	0.8.7
-THEMEFILE=	sylpheed-${THEMEVERSION}claws-iconset.tar.gz
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
-USE_GNOME=	gtk12
-USE_REINPLACE=	yes
-
-MAN1=		sylpheed-claws.1
-
-CONFIGURE_ARGS=	--program-suffix="-claws" --enable-ipv6
-
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
-
-.if defined(WITH_PIXBUF) || defined(WITH_ALL)
-USE_GNOME+=		gdkpixbuf
-CONFIGURE_ARGS+=	--disable-imlib
-.else
-USE_GNOME+=		imlib
-CONFIGURE_ARGS+=	--disable-gdk-pixbuf
-.endif
-.if defined(WITH_GPGME) || defined(WITH_ALL)
-LIB_DEPENDS+=		gpgme.9:${PORTSDIR}/security/gpgme
-RUN_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
-CONFIGURE_ARGS+=	--enable-gpgme
-.endif
-.if defined(WITH_COMPFACE) || defined(WITH_ALL)
-LIB_DEPENDS+=		compface.1:${PORTSDIR}/mail/faces
-.else
-CONFIGURE_ARGS+=	--disable-compface
-.endif
-.if defined(WITH_JCONV) || defined(WITH_ALL)
-LIB_DEPENDS+=		jconv.0:${PORTSDIR}/japanese/libjconv
-.else
-CONFIGURE_ARGS+=	--disable-jconv
-.endif
-.if defined(WITH_ASPELL) || defined(WITH_ALL)
-LIB_DEPENDS+=		pspell.15:${PORTSDIR}/textproc/aspell
-CONFIGURE_ARGS+=	--enable-aspell
-.endif
-.if defined(WITH_JPILOT) || defined(WITH_ALL)
-LIB_DEPENDS+=		pisock.8:${PORTSDIR}/palm/pilot-link
-RUN_DEPENDS+=		jpilot:${PORTSDIR}/palm/jpilot
-CONFIGURE_ARGS+=	--enable-jpilot
-.endif
-.if defined(WITH_LDAP) || defined(WITH_ALL)
-LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap20
-CONFIGURE_ARGS+=	--enable-ldap
-CONFIGURE_ENV+=		PTHREAD_LIBS=${PTHREAD_LIBS:S/"//g}
-.endif
-.if defined(WITH_SA_PLUG) || defined(WITH_ALL)
-RUN_DEPENDS+=		spamd:${PORTSDIR}/mail/p5-Mail-SpamAssassin
-CONFIGURE_ARGS+=	--enable-spamassassin-plugin
-PLIST_SUB+=		SA_PLUG=""
-.else
-PLIST_SUB+=		SA_PLUG="@comment "
-.endif
-.if !defined(WITHOUT_SSL)
-USE_OPENSSL=		yes
-CONFIGURE_ARGS+=	--enable-openssl
-.endif
-.if defined(WITHOUT_THEMES)
-PLIST_SUB+=	THEMES="@comment "
-.else
-PLIST_SUB+=	THEMES=""
-.endif
-
-pre-everything::
-	@${ECHO} ""
-	@${ECHO} "You may define the following build options:"
-	@${ECHO} ""
-	@${ECHO} "      WITH_ALL       Enable all options below"
-	@${ECHO} ""
-	@${ECHO} "      WITH_PIXBUF    Enable GDK Pixbuf support"
-	@${ECHO} "      WITH_GPGME     Enable GnuPG support using GPGME"
-	@${ECHO} "      WITH_COMPFACE  Enable compface (X-Face) support"
-	@${ECHO} "      WITH_JCONV     Enable enhanced charset conversion"
-	@${ECHO} "      WITH_ASPELL    Enable spell-checking support"
-	@${ECHO} "      WITH_JPILOT    Enable JPilot support"
-	@${ECHO} "      WITH_LDAP      Enable LDAP access support"
-	@${ECHO} "      WITH_SA_PLUG   Build Spamassassin plugin"
-	@${ECHO} ""
-	@${ECHO} "      WITHOUT_SSL    Disable OpenSSL support"
-	@${ECHO} "      WITHOUT_THEMES Don't install additional themes"
-	@${ECHO} ""
-
-post-extract:
-.if !defined(WITHOUT_THEMES)
-	@${MKDIR} ${WRKSRC}/themes
-	@cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${THEMEFILE} ${EXTRACT_AFTER_ARGS}
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
-		${WRKSRC}/tools/README.sylprint ${WRKSRC}/tools/sylprint.pl
-	@${REINPLACE_CMD} -e "s|po intl src|po src|" ${WRKSRC}/Makefile.in
-	@for f in ${WRKSRC}/tools/*; do \
-		${REINPLACE_CMD} -e "s|/usr/bin/perl|${PERL}|" $$f; done
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|src manual faq tools|src tools|' ${WRKSRC}/Makefile.in
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
-.for i in NEWS README README.jp README.claws RELEASE_NOTES.claws TODO TODO.jp tools/README.sylprint
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-	@${INSTALL_DATA} ${WRKSRC}/tools/README ${DOCSDIR}/README.tools
-.endif
-	@${MKDIR} ${DATADIR}
-	@cd ${WRKSRC}/tools && \
-		${INSTALL_SCRIPT} OOo2sylpheed.pl calypso_convert.pl \
-		eud2gc.py filter_conv.pl gif2xface.pl google_msgid.pl \
-		gpg-sign-syl kmail2sylpheed.pl kmail2sylpheed_v2.pl \
-		launch_phoenix newscache_clean.pl outlook2sylpheed.pl \
-		tb2sylpheed update-po uudec ${DATADIR}
-.if !defined(WITHOUT_THEMES)
-	@${MKDIR} ${DATADIR}/themes
-	@cd ${WRKDIR}/${THEMEFILE:C/.tar.gz//} && for d in `find .`; do \
-		if ${TEST} -d $${d}; then ${MKDIR} ${DATADIR}/themes/$${d}; else \
-		${INSTALL_DATA} $${d} ${DATADIR}/themes/$${d}; fi; \
-	done
-.endif
-	@${INSTALL_SCRIPT} ${WRKSRC}/tools/sylpheed-switcher ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/tools/sylprint.pl ${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/tools/sylprint.rc ${PREFIX}/etc/sylprint.rc.example
-	@${MKDIR} ${PREFIX}/share/pixmaps
-	@${INSTALL_DATA} ${WRKSRC}/sylpheed.png ${PREFIX}/share/pixmaps/sylpheed-claws.png
-
-.include <bsd.port.mk>
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
deleted file mode 100644
index c4763ea8ef7e..000000000000
--- a/mail/claws-mail/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (sylpheed-0.8.10claws.tar.bz2) = 08645275c58d63929f2a6224dc684d05
-MD5 (sylpheed-0.8.7claws-iconset.tar.gz) = 8159ffe656dc4256c1648fdd458945fb
diff --git a/mail/claws-mail/files/patch-configure b/mail/claws-mail/files/patch-configure
deleted file mode 100644
index 4ad7933e4f6f..000000000000
--- a/mail/claws-mail/files/patch-configure
+++ /dev/null
@@ -1,40 +0,0 @@
---- configure.orig	Fri Jan 24 13:41:56 2003
-+++ configure	Thu Jan 30 03:24:00 2003
-@@ -1502,7 +1502,7 @@
- ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
- 
- 
--PACKAGE=sylpheed
-+PACKAGE=sylpheed-claws
- 
- MAJOR_VERSION=0
- MINOR_VERSION=8
-@@ -2000,7 +2000,7 @@
- fi
- 
- 
--if test -d "$gnomedir"; then
-+if false; then
-   SYLPHEED_GNOME_TRUE=
-   SYLPHEED_GNOME_FALSE='#'
- else
-@@ -8472,6 +8472,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12094,9 +12095,9 @@
- localedir='${prefix}/${DATADIRNAME}/locale'
- 
- 
--manualdir='${prefix}/${DATADIRNAME}/${PACKAGE}/manual'
-+manualdir='${prefix}/${DATADIRNAME}/doc/${PACKAGE}/manual'
- 
--faqdir='${prefix}/${DATADIRNAME}/${PACKAGE}/faq'
-+faqdir='${prefix}/${DATADIRNAME}/doc/${PACKAGE}/faq'
- 
- 
- if test "x${datadir}" = 'x${prefix}/share'; then
diff --git a/mail/claws-mail/files/patch-src-common-Makefile.in b/mail/claws-mail/files/patch-src-common-Makefile.in
deleted file mode 100644
index 4b2e83567aab..000000000000
--- a/mail/claws-mail/files/patch-src-common-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/Makefile.in.orig	Fri Jan 24 13:41:49 2003
-+++ src/common/Makefile.in	Thu Jan 30 01:34:01 2003
-@@ -58,7 +58,7 @@
- CFLAGS = @CFLAGS@
- CPP = @CPP@
- 
--CPPFLAGS = \
-+CPPFLAGS = @CPPFLAGS@ \
- 	$(GLIB_CFLAGS) \
- 	$(OPENSSL_CFLAGS) \
- 	-DLOCALEDIR=\""$(localedir)"\"
diff --git a/mail/claws-mail/files/patch-tools-README.sylprint b/mail/claws-mail/files/patch-tools-README.sylprint
deleted file mode 100644
index 22b5e00325d4..000000000000
--- a/mail/claws-mail/files/patch-tools-README.sylprint
+++ /dev/null
@@ -1,18 +0,0 @@
---- tools/README.sylprint.orig	Sun Jan  6 17:05:30 2002
-+++ tools/README.sylprint	Tue Jan 15 00:19:12 2002
-@@ -144,11 +144,12 @@
- 	sylprint.pl
- 		The script itself.
- 
--	sylprint.rc
-+	%%PREFIX%%/etc/sylprint.rc
-+	~/.sylpheed/sylprint.rc
- 		Stores user default preferred configuration for the
- 		script. Settings in this file may be overriden by
--		command line options. Must be stored in the same
--		directory of the script and/or in the ~/.sylpheed
-+		command line options. Must be stored in the local
-+		configuration directory and/or in the ~/.sylpheed
- 		one (Sylpheed user's configuration directory).
- 	
- 	/tmp/sylprint.username.number
diff --git a/mail/claws-mail/files/patch-tools-launch_phoenix b/mail/claws-mail/files/patch-tools-launch_phoenix
deleted file mode 100644
index be8bb323529d..000000000000
--- a/mail/claws-mail/files/patch-tools-launch_phoenix
+++ /dev/null
@@ -1,17 +0,0 @@
---- tools/launch_phoenix.orig	Wed Jan  8 10:53:19 2003
-+++ tools/launch_phoenix	Thu Jan 30 01:31:21 2003
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- # Copyright © 2002 Mohammed Sameer <Uniball@linux-egypt.org> 
- #
-@@ -39,7 +39,7 @@
- 
- STR=`phoenix -remote "ping()" 2>&1 | grep No`
- #echo $STR
--if [[ "$STR" == "No running window found." ]]; then
-+if [ "$STR" = "No running window found." ]; then
- phoenix_new;
- else
- phoenix_running;
diff --git a/mail/claws-mail/files/patch-tools-sylprint.pl b/mail/claws-mail/files/patch-tools-sylprint.pl
deleted file mode 100644
index fce5e4ec5bbe..000000000000
--- a/mail/claws-mail/files/patch-tools-sylprint.pl
+++ /dev/null
@@ -1,14 +0,0 @@
---- tools/sylprint.pl.orig	Tue Jan  8 20:34:37 2002
-+++ tools/sylprint.pl	Tue Jan 15 00:13:15 2002
-@@ -36,10 +36,7 @@
- # get user config
- if (defined($ARGV[1]) && $ARGV[1] eq '-r') { $a++; }
- else {
--	@spp = split('/',$0); 
--	$spp[$#spp] = ''; 
--	$spp = join('/',@spp);  
--	$rcf="$spp$rc"; 
-+	$rcf="%%PREFIX%%/etc/$rc"; 
- 	if (-x $rcf) { do $rcf; }
- 	$rcf="$ENV{'HOME'}/.sylpheed/$rc";
- 	if (-x $rcf) { do $rcf; }
diff --git a/mail/claws-mail/pkg-descr b/mail/claws-mail/pkg-descr
deleted file mode 100644
index b156b40ecf6c..000000000000
--- a/mail/claws-mail/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-Sylpheed is an e-mail client (and news reader) based on GTK+
-
-Currently, many features are supported including POP3, IMAP, NNTP,
-multiple accounts, threading, filtering, MIME attachments, APOP, SMTP
-AUTH, SSL, IPv6, GnuPG, internalization, and more.
-
-In addition to the above, Sylpheed-claws has the following extra features:
-* allow colour labeling of emails based on filtering rules
-* automatic mailing list reply, allow ignoring of mail threads
-* selectable fonts, compface support, spell checking, SMTP AUTH
-* encryption/decryption of GPG/PGP ascii-armored messages is supported
-* folder properties: associate certain options per folder,
-	'Request Return Receipt', 'Default To', and 'Default account'
-* subject simplification for changing the display of subject lines via RegExp
-* pixmap themes, delete news postings, new mail notification
-* selectable pop download of messages, store GPG passphrase in memory
-and much more...
-
-WWW: http://sylpheed-claws.sourceforge.net/
-
-- Simon 'corecode' Schubert
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
deleted file mode 100644
index b8fd73d0a3f4..000000000000
--- a/mail/claws-mail/pkg-plist
+++ /dev/null
@@ -1,777 +0,0 @@
-bin/sylpheed-claws
-bin/sylpheed-switcher
-bin/sylprint.pl
-etc/sylprint.rc.example
-%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.so
-%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin_gtk.so
-%%PORTDOCS%%share/doc/sylpheed-claws/NEWS
-%%PORTDOCS%%share/doc/sylpheed-claws/README
-%%PORTDOCS%%share/doc/sylpheed-claws/README.claws
-%%PORTDOCS%%share/doc/sylpheed-claws/README.jp
-%%PORTDOCS%%share/doc/sylpheed-claws/README.sylprint
-%%PORTDOCS%%share/doc/sylpheed-claws/README.tools
-%%PORTDOCS%%share/doc/sylpheed-claws/RELEASE_NOTES.claws
-%%PORTDOCS%%share/doc/sylpheed-claws/TODO
-%%PORTDOCS%%share/doc/sylpheed-claws/TODO.jp
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/de/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/de/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/de/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/de/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/en/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/en/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/en/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/en/sylpheed-faq-4.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/en/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/es/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/es/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/es/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/es/sylpheed-faq-4.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/es/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/fr/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/fr/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/fr/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/fr/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/it/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/it/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/it/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed-claws/faq/it/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-1.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-10.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-11.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-12.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-13.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-14.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-15.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-16.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-17.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-18.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-19.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-2.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-20.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-3.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-4.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-5.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-6.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-7.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-8.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed-9.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/de/sylpheed.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-1.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-10.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-11.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-12.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-13.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-14.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-15.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-16.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-17.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-18.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-19.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-2.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-20.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-21.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-3.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-4.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-5.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-6.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-7.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-8.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed-9.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/en/sylpheed.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-1.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-10.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-11.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-12.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-13.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-14.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-15.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-16.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-17.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-18.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-19.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-2.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-20.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-3.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-4.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-5.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-6.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-7.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-8.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed-9.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/es/sylpheed.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-1.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-10.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-11.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-12.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-13.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-14.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-15.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-16.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-17.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-18.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-19.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-2.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-20.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-3.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-4.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-5.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-6.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-7.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-8.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed-9.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/fr/sylpheed.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed-1.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed-10.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed-11.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed-12.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed-13.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed-14.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed-15.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed-16.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed-17.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed-2.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed-3.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed-4.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed-5.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed-6.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed-7.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed-8.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed-9.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed.html
-%%PORTDOCS%%share/doc/sylpheed-claws/manual/ja/sylpheed.sgml
-share/locale/bg/LC_MESSAGES/sylpheed-claws.mo
-share/locale/cs/LC_MESSAGES/sylpheed-claws.mo
-share/locale/de/LC_MESSAGES/sylpheed-claws.mo
-share/locale/el/LC_MESSAGES/sylpheed-claws.mo
-share/locale/en_GB/LC_MESSAGES/sylpheed-claws.mo
-share/locale/es/LC_MESSAGES/sylpheed-claws.mo
-share/locale/fr/LC_MESSAGES/sylpheed-claws.mo
-share/locale/hr/LC_MESSAGES/sylpheed-claws.mo
-share/locale/hu/LC_MESSAGES/sylpheed-claws.mo
-share/locale/it/LC_MESSAGES/sylpheed-claws.mo
-share/locale/ja/LC_MESSAGES/sylpheed-claws.mo
-share/locale/ko/LC_MESSAGES/sylpheed-claws.mo
-share/locale/nl/LC_MESSAGES/sylpheed-claws.mo
-share/locale/pl/LC_MESSAGES/sylpheed-claws.mo
-share/locale/pt_BR/LC_MESSAGES/sylpheed-claws.mo
-share/locale/ru/LC_MESSAGES/sylpheed-claws.mo
-share/locale/sr/LC_MESSAGES/sylpheed-claws.mo
-share/locale/sv/LC_MESSAGES/sylpheed-claws.mo
-share/pixmaps/sylpheed-claws.png
-share/sylpheed-claws/OOo2sylpheed.pl
-share/sylpheed-claws/calypso_convert.pl
-share/sylpheed-claws/eud2gc.py
-share/sylpheed-claws/filter_conv.pl
-share/sylpheed-claws/gif2xface.pl
-share/sylpheed-claws/google_msgid.pl
-share/sylpheed-claws/gpg-sign-syl
-share/sylpheed-claws/kmail2sylpheed.pl
-share/sylpheed-claws/kmail2sylpheed_v2.pl
-share/sylpheed-claws/launch_phoenix
-share/sylpheed-claws/newscache_clean.pl
-share/sylpheed-claws/outlook2sylpheed.pl
-share/sylpheed-claws/tb2sylpheed
-%%THEMES%%share/sylpheed-claws/themes/Crystal/.directory
-%%THEMES%%share/sylpheed-claws/themes/Crystal/close.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/continue.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/dir-close.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/dir-open.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/dir_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/dir_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/down_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/error.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/exec.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/mail.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/mail_attach.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/mail_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/mail_forward.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/mail_receive.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/mail_receive_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/mail_reply.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/mail_reply_to_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/mail_send.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/mail_send_queue.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/paste.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/preferences.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/properties.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/search.xpm
-%%THEMES%%share/sylpheed-claws/themes/Crystal/up_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/address.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/address_book.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/close.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/dir_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/dir_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/dir_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/dir_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/down_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/edit_extern.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/exec.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/forwarded.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/ignorethread.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/inbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/inbox_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/inbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/inbox_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/insert_file.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/mail.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/mail_attach.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/mail_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/mail_forward.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/mail_receive.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/mail_receive_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/mail_reply.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/mail_reply_to_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/mail_reply_to_author.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/mail_send.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/mail_send_queue.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/mail_sign.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/new.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/news_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/outbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/outbox_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/outbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/outbox_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/paste.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/queue_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/queue_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/queue_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/queue_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/replied.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/trash_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/trash_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/trash_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/trash_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/unread.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/up_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/Kovico-sylpheed/vcard.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/Readme.txt
-%%THEMES%%share/sylpheed-claws/themes/New_Session/address.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/address_book.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/close.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/dir_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/dir_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/dir_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/dir_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/down_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/edit_extern.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/exec.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/forwarded.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/ignorethread.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/inbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/inbox_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/inbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/inbox_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/insert_file.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/mail.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/mail_attach.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/mail_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/mail_forward.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/mail_receive.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/mail_receive_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/mail_reply.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/mail_reply_to_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/mail_reply_to_author.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/mail_send.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/mail_send_queue.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/mail_sign.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/new.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/news_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/outbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/outbox_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/outbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/outbox_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/paste.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/queue_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/queue_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/queue_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/queue_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/replied.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/trash_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/trash_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/trash_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/trash_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/unread.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/up_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/New_Session/vcard.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/address.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/address_book.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/close.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/dir_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/dir_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/dir_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/dir_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/down_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/edit_extern.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/exec.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/forwarded.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/ignorethread.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/inbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/inbox_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/inbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/inbox_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/insert_file.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/mail.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/mail_attach.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/mail_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/mail_forward.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/mail_receive.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/mail_receive_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/mail_reply.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/mail_reply_to_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/mail_reply_to_author.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/mail_send.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/mail_send_queue.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/mail_sign.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/new.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/news_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/outbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/outbox_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/outbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/outbox_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/paste.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/queue_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/queue_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/queue_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/queue_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/replied.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/trash_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/trash_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/trash_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/trash_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/unread.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/up_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/Plain_and_Bluish/vcard.xpm
-%%THEMES%%share/sylpheed-claws/themes/README
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/README
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/address.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/address_book.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/close.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/dir_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/dir_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/dir_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/dir_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/down_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/edit_extern.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/exec.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/forwarded.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/ignorethread.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/inbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/inbox_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/inbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/inbox_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/insert_file.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/mail.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/mail_attach.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/mail_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/mail_forward.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/mail_receive.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/mail_receive_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/mail_reply.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/mail_reply_to_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/mail_reply_to_author.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/mail_send.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/mail_send_queue.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/mail_sign.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/new.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/news_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/outbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/outbox_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/outbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/outbox_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/paste.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/queue_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/queue_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/queue_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/queue_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/replied.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/trash_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/trash_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/trash_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/trash_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/unread.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/up_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/XeNtish/vcard.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/README
-%%THEMES%%share/sylpheed-claws/themes/black/address.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/address_book.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/book.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/clip.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/clipkey.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/close.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/continue.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/deleted.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/dir_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/dir_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/dir_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/dir_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/down_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/edit_extern.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/error.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/exec.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/forwarded.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/group.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/ignorethread.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/inbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/inbox_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/inbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/inbox_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/insert_file.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/interface.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/key.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/linewrap.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/locked.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/mail.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/mail_attach.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/mail_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/mail_forward.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/mail_receive.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/mail_receive_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/mail_reply.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/mail_reply_to_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/mail_reply_to_author.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/mail_send.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/mail_send_queue.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/mail_sign.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/mark.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/new.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/news_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/outbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/outbox_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/outbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/outbox_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/paste.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/queue_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/queue_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/queue_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/queue_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/replied.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/trash_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/trash_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/trash_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/trash_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/unread.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/up_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/black/vcard.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/Readme.txt
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/address.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/address_book.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/close.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/dir-close.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/dir-open.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/dir_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/dir_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/down_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/edit_extern.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/exec.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/forwarded.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/ignorethread.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/inbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/inbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/insert_file.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/mail.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/mail_attach.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/mail_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/mail_forward.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/mail_receive.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/mail_receive_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/mail_reply.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/mail_reply_to_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/mail_reply_to_author.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/mail_send.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/mail_send_queue.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/mail_sign.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/new.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/news_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/outbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/outbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/paste.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/queue_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/queue_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/replied.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/trash_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/trash_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/unread.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/up_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/blue_anarchy/vcard.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/address_book.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/close.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/dir_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/dir_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/down_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/edit_extern.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/exec.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/insert_file.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/linewrap.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/mail.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/mail_attach.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/mail_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/mail_forward.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/mail_receive.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/mail_receive_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/mail_reply.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/mail_reply_to_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/mail_reply_to_author.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/mail_send.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/mail_send_queue.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/mail_sign.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/news_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/work_offline.xpm
-%%THEMES%%share/sylpheed-claws/themes/mongrel/work_online.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/README
-%%THEMES%%share/sylpheed-claws/themes/mozilla/address_book.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/close.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/dir_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/dir_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/down_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/edit_extern.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/exec.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/insert_file.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/linewrap.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/mail.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/mail_attach.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/mail_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/mail_forward.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/mail_receive.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/mail_receive_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/mail_reply.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/mail_reply_to_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/mail_reply_to_author.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/mail_send.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/mail_send_queue.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/mail_sign.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/news_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/work_offline.xpm
-%%THEMES%%share/sylpheed-claws/themes/mozilla/work_online.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/address.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/address_book.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/book.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/clip.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/clipkey.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/close.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/complete.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/continue.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/deleted.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/dir_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/dir_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/dir_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/dir_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/down_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/edit_extern.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/error.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/exec.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/folder.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/forwarded.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/ignorethread.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/inbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/inbox_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/inbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/inbox_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/insert_file.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/interface.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/key.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/linewrap.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/locked.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/mail.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/mail_attach.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/mail_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/mail_forward.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/mail_receive.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/mail_receive_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/mail_reply.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/mail_reply_to_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/mail_reply_to_author.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/mail_send.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/mail_send_queue.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/mail_sign.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/mark.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/new.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/news_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/outbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/outbox_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/outbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/outbox_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/queue_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/queue_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/queue_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/queue_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/replied.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/trash_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/trash_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/trash_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/trash_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/unread.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/up_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/stw/vcard.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/README
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/address.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/address_book.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/book.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/category.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/checkbox_off.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/checkbox_on.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/close.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/complete.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/continue.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/delete.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/deleted.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/dir_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/dir_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/dir_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/dir_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/down_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/edit_extern.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/error.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/exec.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/forwarded.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/group.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/ignorethread.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/inbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/inbox_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/inbox_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/inbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/inbox_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/insert_file.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/interface.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/jpilot.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/key.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/ldap.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/linewrap.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/locked.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/mail.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/mail_attach.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/mail_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/mail_forward.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/mail_receive.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/mail_receive_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/mail_reply.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/mail_reply_to_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/mail_reply_to_author.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/mail_send.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/mail_send_queue.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/mail_sign.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/mark.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/new.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/news_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/notice_error.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/notice_note.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/notice_warn.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/outbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/outbox_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/outbox_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/outbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/outbox_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/paste.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/preferences.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/properties.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/queue_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/queue_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/queue_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/queue_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/quicksearch.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/replied.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/search.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/trash_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/trash_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/trash_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/trash_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/unread.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/up_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/vcard.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/work_offline.xpm
-%%THEMES%%share/sylpheed-claws/themes/sylzilla/work_online.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/address.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/address_book.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/book.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/category.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/clip.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/clipkey.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/close.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/complete.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/continue.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/deleted.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/dir_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/dir_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/dir_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/dir_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/down_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/edit_extern.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/error.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/exec.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/forwarded.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/ignorethread.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/inbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/inbox_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/inbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/inbox_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/insert_file.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/interface.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/jpilot.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/key.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/linewrap.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/locked.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/mail.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/mail_attach.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/mail_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/mail_forward.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/mail_receive.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/mail_receive_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/mail_reply.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/mail_reply_to_all.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/mail_reply_to_author.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/mail_send.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/mail_send_queue.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/mail_sign.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/mark.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/new.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/news_compose.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/outbox_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/outbox_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/outbox_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/outbox_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/paste.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/queue_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/queue_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/queue_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/queue_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/replied.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/trash_close.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/trash_close_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/trash_open.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/trash_open_hrm.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/unread.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/up_arrow.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/vcard.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/work_offline.xpm
-%%THEMES%%share/sylpheed-claws/themes/tml02c/work_online.xpm
-share/sylpheed-claws/update-po
-share/sylpheed-claws/uudec
-%%THEMES%%@dirrm share/sylpheed-claws/themes/tml02c
-%%THEMES%%@dirrm share/sylpheed-claws/themes/sylzilla
-%%THEMES%%@dirrm share/sylpheed-claws/themes/stw
-%%THEMES%%@dirrm share/sylpheed-claws/themes/mozilla
-%%THEMES%%@dirrm share/sylpheed-claws/themes/mongrel
-%%THEMES%%@dirrm share/sylpheed-claws/themes/blue_anarchy
-%%THEMES%%@dirrm share/sylpheed-claws/themes/black
-%%THEMES%%@dirrm share/sylpheed-claws/themes/XeNtish
-%%THEMES%%@dirrm share/sylpheed-claws/themes/Plain_and_Bluish
-%%THEMES%%@dirrm share/sylpheed-claws/themes/New_Session
-%%THEMES%%@dirrm share/sylpheed-claws/themes/Kovico-sylpheed
-%%THEMES%%@dirrm share/sylpheed-claws/themes/Crystal
-%%THEMES%%@dirrm share/sylpheed-claws/themes
-@dirrm share/sylpheed-claws
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
-%%PORTDOCS%%@dirrm share/doc/sylpheed-claws/manual/ja
-%%PORTDOCS%%@dirrm share/doc/sylpheed-claws/manual/fr
-%%PORTDOCS%%@dirrm share/doc/sylpheed-claws/manual/es
-%%PORTDOCS%%@dirrm share/doc/sylpheed-claws/manual/en
-%%PORTDOCS%%@dirrm share/doc/sylpheed-claws/manual/de
-%%PORTDOCS%%@dirrm share/doc/sylpheed-claws/manual
-%%PORTDOCS%%@dirrm share/doc/sylpheed-claws/faq/it
-%%PORTDOCS%%@dirrm share/doc/sylpheed-claws/faq/fr
-%%PORTDOCS%%@dirrm share/doc/sylpheed-claws/faq/es
-%%PORTDOCS%%@dirrm share/doc/sylpheed-claws/faq/en
-%%PORTDOCS%%@dirrm share/doc/sylpheed-claws/faq/de
-%%PORTDOCS%%@dirrm share/doc/sylpheed-claws/faq
-%%PORTDOCS%%@dirrm share/doc/sylpheed-claws
-%%SA_PLUG%%@dirrm lib/sylpheed-claws/plugins
-%%SA_PLUG%%@dirrm lib/sylpheed-claws
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
deleted file mode 100644
index 5d59ceff21aa..000000000000
--- a/mail/cyrus-imapd23/Makefile
+++ /dev/null
@@ -1,224 +0,0 @@
-# New ports collection makefile for:		cyrus-imapd
-# Date created:					Jan 4th 2001
-# Whom:						ume@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.2.0.a
-#PORTREVISION=	0
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
-DISTNAME=	${PORTNAME}-2.2.0-ALPHA
-
-MAINTAINER=	ume@FreeBSD.org
-COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
-
-LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
-		${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
-
-USE_PERL5=	yes
-USE_REINPLACE=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
-		--with-cyrus-user=${CYRUS_USER} \
-		--with-cyrus-group=${CYRUS_GROUP} \
-		--with-sasl=${LOCALBASE} \
-		--with-bdb-libdir=${LOCALBASE}/lib \
-		--with-auth=unix \
-		--with-com_err \
-		--with-perl=${PERL5}
-
-.if defined(WITH_BDB_VER)
-USE_BDB_VER=	${WITH_BDB_VER}
-.else
-USE_BDB_VER=	3
-.endif
-.if ${USE_BDB_VER} == 41
-LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
-.elif ${USE_BDB_VER} == 4
-LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
-.elif ${USE_BDB_VER} == 3
-LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
-.else
-BROKEN=		"WITH_BDB_VER must be 3, 4 or 41"
-.endif
-CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${USE_BDB_VER} \
-		--with-bdb=db${USE_BDB_VER}
-
-.if defined(WITHOUT_SKIPLIST)
-CONFIGURE_ARGS+=--with-mboxlist-db=berkeley --with-seen-db=flat
-.endif
-
-.if defined(WITH_NNTP)
-CONFIGURE_ARGS+=--enable-nntp
-PLIST_SUB+=	NNTP=""
-.else
-PLIST_SUB+=	NNTP="@comment "
-.endif
-
-.if defined(WITH_MURDER)
-CONFIGURE_ARGS+=--enable-murder
-CFLAGS+=	${PTHREAD_CFLAGS}
-MAKE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS}
-PLIST_SUB+=	MURDER=""
-.else
-PLIST_SUB+=	MURDER="@comment "
-.endif
-
-.if defined(WITH_FULLDIRHASH)
-CONFIGURE_ARGS+=--enable-fulldirhash
-.endif
-
-.if defined(WITH_LISTEXT)
-CONFIGURE_ARGS+=--enable-listext
-.endif
-
-.if defined(WITH_ANNOTATEMORE)
-CONFIGURE_ARGS+=--enable-annotatemore
-.endif
-
-.if defined(WITH_NETSCAPEHACK)
-CONFIGURE_ARGS+=--enable-netscapehack
-.endif
-
-.if defined(WITH_DRAC)
-EXTRA_PATCHES+=	${FILESDIR}/drac_auth.patch \
-	${FILESDIR}/extra-patch-acconfig.h ${FILESDIR}/extra-patch-aclocal.m4
-USE_AUTOCONF=	YES
-CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
-.endif
-
-.if defined(WITH_SNMP)
-# It seems not compilable due to lack of auto_nlist_value() in libucdagent.
-LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
-#CONFIGURE_ENV=	LIBS=-lkvm
-.else
-CONFIGURE_ARGS+=--with-ucdsnmp=no
-.endif
-
-CYRUS_USER?=	cyrus
-CYRUS_GROUP?=	cyrus
-
-MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
-		nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1
-MAN3=		imclient.3
-MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
-MAN8=		arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
-		ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 deliver.8 \
-		expirenews.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 \
-		lmtpd.8 master.8 mbpath.8 notifyd.8 pop3d.8 reconstruct.8 \
-		rmnews.8 squatter.8 syncnews.8 timsieved.8 tls_prune.8
-
-DOCS=		altnamespace anoncvs bugs changes faq feedback index \
-		install install-admin-mb install-auth install-compile \
-		install-configure install-murder install-netnews \
-		install-perf install-prereq install-sieve install-snmpmon \
-		install-testing install-upgrade install-virtdomains \
-		mailing-list man notes os overview questions readme sieve \
-		sieve-protocol specs
-
-DOCSDIR=	${PREFIX}/share/doc/cyrus-imapd22
-
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-PKGINSTALL=	${WRKDIR}/pkg-install
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.endif
-.if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
-.endif
-
-.include "${PORTSDIR}/security/openssl/bsd.openssl.mk"
-.if !defined(WITH_OPENSSL_BASE)
-CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
-.endif
-
-pre-everything::
-.if !defined(WITH_BDB_VER)
-	@if ${LDCONFIG} -r | ${GREP} -qwE -e "-ldb(41|4)"; then \
-		${ECHO} ""; \
-		${ECHO} "It seems you have installed newer db than db3.  If"; \
-		${ECHO} "you are using newer db for cyrus-sasl2, you should"; \
-		${ECHO} "specify same version by WITH_BDB_VER.  For"; \
-		${ECHO} "exapmle, WITH_BDB_VER=4 for db4."; \
-		${ECHO} ""; \
-	fi
-.endif
-
-post-patch:
-		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
-			${.CURDIR}/pkg-install > ${PKGINSTALL}
-		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
-			${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
-		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
-				  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
-				  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
-			${WRKSRC}/tools/mkimap
-		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
-				  -e "s|/usr/sieve|/var/imap/sieve|g" \
-			${WRKSRC}/tools/masssievec
-		@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
-.if ${PERL_LEVEL} < 500600
-		@${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
-			${WRKSRC}/perl/sieve/scripts/sieveshell.pl
-.endif
-
-.if defined(WITH_DRAC)
-pre-configure:
-		cd ${WRKSRC} && ${AUTOHEADER}
-.endif
-
-post-install:
-		@${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
-.if !defined(NOPORTDOCS)
-		${MKDIR} ${DOCSDIR}/man
-		${MKDIR} ${DOCSDIR}/text
-.for file in ${DOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR}
-		@${ECHO} share/doc/cyrus-imapd22/${file}.html >>${TMPPLIST}
-.endfor
-.for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8}
-		ofile=`echo ${file} | ${SED} s/cyrquota/quota/`; \
-		if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \
-		${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \
-			${DOCSDIR}/man/$${ofile}.html; \
-		${ECHO} share/doc/cyrus-imapd22/man/$${ofile}.html \
-			>>${TMPPLIST}; \
-		fi
-.endfor
-.for file in cyrusv2.mc murder.png netnews.png
-		${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
-		@${ECHO} share/doc/cyrus-imapd22/${file} >>${TMPPLIST}
-.endfor
-.for file in ${DOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text
-		@${ECHO} share/doc/cyrus-imapd22/text/${file} >>${TMPPLIST}
-.endfor
-		@${ECHO} "@dirrm share/doc/cyrus-imapd22/text" >>${TMPPLIST}
-		@${ECHO} "@dirrm share/doc/cyrus-imapd22/man" >>${TMPPLIST}
-		@${ECHO} "@dirrm share/doc/cyrus-imapd22" >>${TMPPLIST}
-.endif
-		${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \
-			${PREFIX}/etc/rc.d/imapd.sh.sample
-		${INSTALL_DATA} ${FILESDIR}/imapd.conf \
-			${PREFIX}/etc/imapd.conf.dist
-		${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
-			${PREFIX}/etc/cyrus.conf.dist
-		${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
-			${PREFIX}/cyrus/bin/mkimap
-		${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
-			${PREFIX}/cyrus/bin/masssievec
-		@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
-			POST-INSTALL
-		@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo
deleted file mode 100644
index 7df5b3151e0b..000000000000
--- a/mail/cyrus-imapd23/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (cyrus-imapd-2.2.0-ALPHA.tar.gz) = bf588d15288885602675d90439500e07
diff --git a/mail/cyrus-imapd23/files/drac_auth.patch b/mail/cyrus-imapd23/files/drac_auth.patch
deleted file mode 100644
index ec1ef5e99696..000000000000
--- a/mail/cyrus-imapd23/files/drac_auth.patch
+++ /dev/null
@@ -1,308 +0,0 @@
-Index: acconfig.h
-diff -u acconfig.h.orig acconfig.h
---- acconfig.h.orig	Fri Feb 14 05:32:50 2003
-+++ acconfig.h	Fri Mar 21 20:13:20 2003
-@@ -98,6 +98,9 @@
- /* do we have SASL support for APOP? */
- #undef HAVE_APOP
- 
-+/* the Dynamic Relay Authorization Control package */
-+#undef DRAC_AUTH
-+
- /* do we have OpenSSL? */
- #undef HAVE_SSL
- 
-Index: configure.in
-diff -u configure.in.orig configure.in
---- configure.in.orig	Wed Mar 19 04:15:14 2003
-+++ configure.in	Fri Mar 21 20:20:54 2003
-@@ -981,6 +981,19 @@
- SNMP_SUBDIRS=""
- AC_SUBST(SNMP_SUBDIRS)
- 
-+dnl
-+dnl Test for DRAC
-+dnl
-+DRACLIBS=
-+AC_ARG_WITH(drac, [  --with-drac=DIR         use DRAC library in <DIR> [no] ],
-+	if test -d "$withval"; then
-+		LDFLAGS="$LDFLAGS -L${withval}"
-+		AC_CHECK_LIB(drac, dracauth,
-+			AC_DEFINE(DRAC_AUTH)
-+			DRACLIBS="-ldrac")
-+	fi)
-+AC_SUBST(DRACLIBS)
-+
- CMU_LIBWRAP
- CMU_UCDSNMP
- 
-Index: imap/Makefile.in
-diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig	Fri Feb 28 03:10:28 2003
-+++ imap/Makefile.in	Fri Mar 21 20:23:02 2003
-@@ -67,6 +67,7 @@
- SIEVE_LIBS = @SIEVE_LIBS@
- IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
- LIB_WRAP = @LIB_WRAP@
-+DRAC_LIBS = @DRACLIBS@
- LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
- DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
- 
-@@ -206,17 +207,17 @@
- imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(CC) $(LDFLAGS) -o imapd \
- 	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
--	libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+	libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
- 
- imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
- 	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
--	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+	$(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
- 
- imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
- 	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
--	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+	$(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) $(DRAC_LIBS)
- 
- proxyd: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(CC) $(LDFLAGS) -o proxyd \
-@@ -242,7 +243,7 @@
- 
- pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
--	 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+	 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
- 
- nntpd: nntpd.o backend.o index.o spool.o netnews.o wildmat.o tls.o \
- 	 mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
-Index: imap/imapd.c
-diff -u imap/imapd.c.orig imap/imapd.c
---- imap/imapd.c.orig	Thu Mar  6 03:32:05 2003
-+++ imap/imapd.c	Fri Mar 21 23:25:27 2003
-@@ -126,6 +126,18 @@
-     1, 1, &imapd_authstate, &imapd_userisadmin, &imapd_userisproxyadmin
- };
- 
-+#ifdef DRAC_AUTH
-+static struct {
-+    int interval;		/* dracd "ping" interval; 0 = disabled */
-+    unsigned long clientaddr;
-+    struct prot_waitevent *event;
-+} drac;
-+
-+extern int dracconn(char *server, char **errmsg);
-+extern int dracsend(unsigned long userip, char **errmsg);
-+extern int dracdisc(char **errmsg);
-+#endif /* DRAC_AUTH */
-+
- /* current sub-user state */
- static struct mailbox mboxstruct;
- static struct mailbox *imapd_mailbox;
-@@ -447,6 +459,23 @@
-     /* setup for sending IMAP IDLE notifications */
-     idle_enabled();
- 
-+#ifdef DRAC_AUTH
-+    /* setup for sending DRAC "pings" */
-+    drac.event = NULL;
-+    drac.interval = config_getint(IMAPOPT_DRACINTERVAL);
-+    if (drac.interval < 0) drac.interval = 0;
-+    if (drac.interval) {
-+	char *err;
-+
-+	if (dracconn((char*) config_getstring(IMAPOPT_DRACHOST), &err) != 0) {
-+	    /* disable DRAC */
-+	    drac.interval = 0;
-+	    syslog(LOG_ERR, "dracconn: %s", err);
-+	    syslog(LOG_ERR, "DRAC notifications disabled");
-+	}
-+    }
-+#endif /* DRAC_AUTH */
-+
-     /* create connection to the SNMP listener, if available. */
-     snmp_connect(); /* ignore return code */
-     snmp_set_str(SERVER_NAME_VERSION,CYRUS_VERSION);
-@@ -533,6 +562,15 @@
- 		imapd_haveaddr = 1;
- 	    }
- 	}
-+
-+#ifdef DRAC_AUTH
-+	if (((struct sockaddr *)&imapd_remoteaddr)->sa_family == AF_INET)
-+	    drac.clientaddr = ((struct sockaddr_in *)&imapd_remoteaddr)->sin_addr.s_addr;
-+	else
-+	    drac.clientaddr = 0;
-+    } else {
-+	drac.clientaddr = 0;
-+#endif /* DRAC_AUTH */
-     }
- 
-     /* create the SASL connection */
-@@ -575,6 +613,11 @@
-     prot_flush(imapd_out);
-     snmp_increment(ACTIVE_CONNECTIONS, -1);
- 
-+#ifdef DRAC_AUTH
-+    if (drac.event) prot_removewaitevent(imapd_in, drac.event);
-+    drac.event = NULL;
-+#endif /* DRAC_AUTH */
-+
-     /* cleanup */
-     imapd_reset();
- 
-@@ -645,6 +688,10 @@
- 
-     cyrus_done();
- 
-+#ifdef DRAC_AUTH
-+    if (drac.interval) (void) dracdisc((char **)NULL);
-+#endif /* DRAC_AUTH */
-+
-     exit(code);
- }
- 
-@@ -667,6 +714,35 @@
-     shut_down(code);
- }
- 
-+#ifdef DRAC_AUTH
-+/*
-+ * Ping dracd every 'drac.interval' minutes
-+ * to let it know that we are still connected
-+ */
-+struct prot_waitevent *drac_ping(struct protstream *s,
-+				 struct prot_waitevent *ev, void *rock)
-+{
-+    char *err;
-+    static int nfailure = 0;
-+
-+    if (dracsend(drac.clientaddr, &err) != 0) {
-+	syslog(LOG_ERR, "dracsend: %s", err);
-+	if (++nfailure >= 3) {
-+	    /* can't contact dracd for 3 consecutive tries - disable DRAC */
-+	    prot_removewaitevent(s, ev);
-+	    drac.event = NULL;
-+	    syslog(LOG_ERR, "DRAC notifications disabled");
-+	    return NULL;
-+	}
-+    }
-+    else
-+	nfailure = 0;
-+
-+    ev->mark = time(NULL) + (drac.interval * 60);
-+    return ev;
-+}
-+#endif /* DRAC_AUTH */
-+
- /*
-  * Top-level command loop parsing
-  */
-@@ -1664,6 +1740,11 @@
- 
-     prot_printf(imapd_out, "%s OK %s\r\n", tag, reply);
- 
-+#ifdef DRAC_AUTH
-+    if (drac.interval && drac.clientaddr)
-+	drac.event = prot_addwaitevent(imapd_in, 0 /* now */, drac_ping, NULL);
-+#endif /* DRAC_AUTH */
-+
-     /* Create telemetry log */
-     imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out);
- 
-@@ -1786,6 +1867,11 @@
- 
-     prot_setsasl(imapd_in,  imapd_saslconn);
-     prot_setsasl(imapd_out, imapd_saslconn);
-+
-+#ifdef DRAC_AUTH
-+    if (drac.interval && drac.clientaddr)
-+	drac.event = prot_addwaitevent(imapd_in, 0 /* now */, drac_ping, NULL);
-+#endif /* DRAC_AUTH */
- 
-     /* Create telemetry log */
-     imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out);
-Index: imap/pop3d.c
-diff -u imap/pop3d.c.orig imap/pop3d.c
---- imap/pop3d.c.orig	Thu Mar 13 01:38:16 2003
-+++ imap/pop3d.c	Fri Mar 21 23:37:11 2003
-@@ -101,6 +101,10 @@
- extern int opterr;
- 
- 
-+#ifdef DRAC_AUTH
-+static int drac_enabled;
-+extern int dracauth(char *server, unsigned long userip, char **errmsg);
-+#endif /* DRAC_AUTH */
- 
- #ifdef HAVE_SSL
- static SSL *tls_conn;
-@@ -395,6 +399,10 @@
-     prot_settimeout(popd_in, timeout*60);
-     prot_setflushonread(popd_in, popd_out);
- 
-+#ifdef DRAC_AUTH
-+    drac_enabled = (config_getint(IMAPOPT_DRACINTERVAL) > 0);
-+#endif /* DRAC_AUTH */
-+
-     if (kflag) kpop();
- 
-     /* we were connected on pop3s port so we should do 
-@@ -1422,6 +1430,21 @@
- 	popd_mailbox = &mboxstruct;
- 	proc_register("pop3d", popd_clienthost, popd_userid,
- 		      popd_mailbox->name);
-+
-+#ifdef DRAC_AUTH
-+	if (drac_enabled &&
-+	    ((struct sockaddr *)&popd_remoteaddr)->sa_family == AF_INET) {
-+	    char *err;
-+
-+	    if (dracauth((char*) config_getstring(IMAPOPT_DRACHOST),
-+			 ((struct sockaddr_in *)&popd_remoteaddr)->sin_addr.s_addr, &err) != 0) {
-+		/* disable DRAC */
-+		drac_enabled = 0;
-+		syslog(LOG_ERR, "dracauth: %s", err);
-+		syslog(LOG_ERR, "DRAC notifications disabled");
-+	    }
-+	}
-+#endif /* DRAC_AUTH */
-     }
-     else {
- 	/* remote mailbox */
-Index: imap/version.c
-diff -u imap/version.c.orig imap/version.c
---- imap/version.c.orig	Fri Feb 14 05:33:02 2003
-+++ imap/version.c	Fri Mar 21 20:13:21 2003
-@@ -143,6 +143,10 @@
-     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
- 	     "; %s", SIEVE_VERSION);
- #endif
-+#ifdef DRAC_AUTH
-+    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
-+	     "; DRAC");
-+#endif
- #ifdef HAVE_LIBWRAP
-     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
- 	     "; TCP Wrappers");
-Index: lib/imapoptions
-diff -u lib/imapoptions.orig lib/imapoptions
---- lib/imapoptions.orig	Thu Mar 20 04:00:39 2003
-+++ lib/imapoptions	Fri Mar 21 20:32:15 2003
-@@ -154,6 +154,14 @@
- { "deleteright", "c", STRING }
- /* The right that a user needs to delete a mailbox. */
- 
-+{ "dracinterval", 5, INT }
-+/* If nonzero, enables the use of DRAC (Dynamic Relay Authorization
-+   Control) by the pop3d and imapd daemons.  Also sets the interval
-+   (in minutes) between re-authorization requests made by imapd. */
-+
-+{ "drachost", "localhost", STRING }
-+/* Hostname of the RPC dracd server. */
-+
- { "duplicatesuppression", 1, SWITCH }
- /* If enabled, lmtpd will suppress delivery of a message to a mailbox if
-    a message with the same message-id (or resent-message-id) is recorded
diff --git a/mail/cyrus-imapd23/files/extra-patch-acconfig.h b/mail/cyrus-imapd23/files/extra-patch-acconfig.h
deleted file mode 100644
index 05e561b78963..000000000000
--- a/mail/cyrus-imapd23/files/extra-patch-acconfig.h
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: acconfig.h
-diff -u acconfig.h.orig acconfig.h
---- acconfig.h.orig	Fri Feb 14 05:32:50 2003
-+++ acconfig.h	Fri Mar 21 21:03:25 2003
-@@ -263,8 +263,12 @@
- #define FNAME_DOMAINDIR "/domain/"
- #define FNAME_LOGDIR "/log/"
- #define FNAME_PTSDB "/ptclient/ptscache.db"
-+#if !defined(CONFIG_FILENAME)
- #define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
-+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME)
- #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf"
-+#endif
- 
- #ifndef HAVE_SHUTDOWN
- #define shutdown(fd, mode) 0
diff --git a/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd23/files/extra-patch-aclocal.m4
deleted file mode 100644
index c6a3e1195b61..000000000000
--- a/mail/cyrus-imapd23/files/extra-patch-aclocal.m4
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: aclocal.m4
-diff -u aclocal.m4.orig aclocal.m4
---- aclocal.m4.orig	Thu Mar 20 04:04:34 2003
-+++ aclocal.m4	Fri Mar 21 20:09:38 2003
-@@ -453,7 +453,7 @@
- 	    BDB_LIBADD=""
- 	fi
- 
--        for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-           do
-             AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-               dblib="berkeley"; break, dblib="no")
-@@ -1574,7 +1574,7 @@
-   LIB_UCDSNMP=""
-   if test "$with_ucdsnmp" != no; then
-     AC_DEFINE(HAVE_UCDSNMP)
--    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
-     AC_CHECK_LIB(rpm, rpmdbOpen,
- 		 LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
-   fi
diff --git a/mail/cyrus-imapd23/files/imapd.conf b/mail/cyrus-imapd23/files/imapd.conf
deleted file mode 100644
index 8fbc33c976e4..000000000000
--- a/mail/cyrus-imapd23/files/imapd.conf
+++ /dev/null
@@ -1,379 +0,0 @@
-#
-# $FreeBSD$
-#
-# Sample configurations file for Cyrus IMAPd
-# Most lines in this file are commented; in this case the default is used. 
-# The commented lines (usually) contain the default value
-
-# The pathname of the IMAP configuration directory
-#
-configdirectory: /var/imap
-
-# The partition name used by default for new mailboxes
-#
-#defaultpartition: default
-
-# The directory for the different partitions
-#
-partition-default: /var/spool/imap
-
-# Use the UNIX separator character '/' for delimiting levels of
-# mailbox hierarchy.  The default is to use the netnews separator
-# character '.'.
-#unixhierarchysep: no
-
-# Use the alternate IMAP namespace, where personal folders reside at
-# the same level in the hierarchy as INBOX.
-#
-#altnamespace: no
-
-# If using the alternate IMAP namespace, the prefix for the other
-# users namespace.  The hierarchy delimiter will be automatically
-# appended.
-#
-#userprefix: Other Users
-
-# If using the alternate IMAP namespace, the prefix for the shared
-# namespace.  The hierarchy delimiter will be automatically appended.
-#
-#sharedprefix: Shared Folders
-
-# The umask value used by various Cyrus IMAP programs
-#
-#umask: 077
-
-# This is the hostname visible in the greeting messages of the POP,
-# IMAP and LMTP daemons. If it is unset, then the result returned from
-# gethostname(2) is used.
-#
-#servername: <result returned by gethostname(2)>
-
-# Whether to allow anonymous logins
-#
-#allowanonymouslogin: no
-
-# Allow the use of the SASL PLAIN mechanism.
-#
-#allowplaintext: yes
-
-# The percent  of  quota  utilization  over  which  the server generates
-# warnings.
-#
-#quotawarn: 90
-
-# The length of the IMAP server's inactivity autologout timer, in minutes.
-# The  minimum  value  is  30,  the default.
-#
-#timeout: 30
-
-# The interval (in seconds) for polling the mailbox for changes while
-# running the IDLE command.  This option is used when idled can not be
-# contacted or when polling is used exclusively.  The minimum value is
-# 1.  A value of 0 will disable polling (and disable IDLE if polling
-# is the only method available).
-#
-#imapidlepoll: 60
-
-# If enabled, the server responds to an ID command with a parameter
-# list containing: version, vendor, support-url, os, os-version,
-# command, arguments, environment.  Otherwise the server returns NIL.
-#
-#imapidresponse: yes
-
-# Set the length of the POP server's inactivity autologout timer, in
-# minutes.  The minimum value is 10, the default.
-#
-#poptimeout: 10
-
-# Set the minimum amount of time the server forces users to wait between 
-# successive POP logins, in  minutes.  The default is 0.
-#
-#popminpoll: 0
-
-# The number of days advertised as being the minimum a message may be
-# left on the POP server before it is deleted (via the CAPA command,
-# defined in the POP3 Extension Mechanism, which some clients may
-# support).  "NEVER", the default, may be specified with a negative
-# number.  The Cyrus POP3 server never deletes mail, no matter what
-# the value of this parameter is.  However, if a site implements a
-# less liberal policy, it needs to change this parameter accordingly.
-#
-#popexpiretime: 0
-
-# The list of userids with administrative rights.  Separate each userid
-# with a space.  We recommend that administrator userids be separate from 
-# standard userids.  Sites using Kerberos authentication may use separate
-# "admin" instances.
-#
-#admins: <none>
-
-# A list of users and groups that are allowed to proxy for other
-# users, seperated by spaces.  Any user listed in this will be allowed
-# to login for any other user: use with caution.
-#
-#proxyservers: <none>
-
-# The Access Control List (ACL) placed on a newly-created (non-user)
-# mailbox that does not have a parent mailbox.
-#
-#defaultacl: anyone lrs
-
-# The pathname of the news spool directory.  Only used if the partition-news
-# configuration option is set.
-#
-#newsspool: <no default>
-
-# Prefix to be prepended to newsgroup names to make the corresponding IMAP
-# mailbox names.
-#
-#newsprefix: <none>
-
-# If nonzero, normal users may create their own IMAP accounts by creating
-# the mailbox INBOX.  The user's quota is set to the value if it is positive,
-# otherwise the user has unlimited quota.
-#
-#autocreatequota: 0
-
-# Include notations in the protocol telemetry logs indicating the number
-# of seconds since the last command or response.
-#
-#logtimestamps: no
-
-# Number of seconds to pause after a successful plaintext login.  For systems
-# that support strong authentication, this permits users to perceive a cost
-# of using plaintext passwords.
-#
-#plaintextloginpause: 0
-
-# The pathname of srvtab file containing the server's private key.
-# This option is passed to the SASL library and overrides its default
-# setting.
-#
-#srvtab: /etc/srvtab
-
-# The list of remote realms whose users may log in using  cross-realm
-# authentications.   Seperate each realm name by a space.  This option is
-# only used when the server is compiled with Kerberos authentication.
-#
-#loginrealms: <none>
-
-# If enabled, any authentication identity which has a rights on a user's
-# INBOX may log in as that user.  This option is only used when the server
-# is compiled with Kerberos authentication.
-#
-#loginuseacl: no
-
-# If enabled, lmtpd attempts to only write one copy of a message per
-# partition and create hard links, resulting in a potentially large
-# disk savings.
-#
-#singleinstancestore: yes
-
-# If enabled, lmtpd will suppress delivery of a message to a mailbox
-# if a message with the same message-id (or resent-message-id) is
-# recorded as having already been delivered to the mailbox.  Records
-# the mailbox and message-id/resent-message-id of all successful
-# deliveries.
-# Note that duplicate delivery suppression is required for Sieve.
-# Disabling duplicate delivery suppression will also disable Sieve,
-# and as such should only be disabled for performance reasons.
-#
-#duplicatesuppression: yes
-
-# If enabled, lmtpd rejects messages with 8-bit characters in the
-# headers.  Otherwise, 8-bit characters are changed to `X'.  (A proper
-# soultion to non-ASCII characters in headers is offered by RFC 2047
-# and its predecessors.)
-#
-#reject8bit: no
-
-# Maximum incoming LMTP message size.  If set, lmtpd will reject
-# messages larger than maxmessagesize bytes.  The default is to allow
-# messages of any size.
-#
-#maxmessagesize: <unlimited>
-
-# Userid used to deliver messages to shared folders.  For example, if
-# set to "bb", email sent to "bb+shared.blah" would be delivered to
-# the "shared.blah" folder.  By default, an email address of
-# "+shared.blah" would be used.
-#postuser: <none>
-
-# If enabled at compile time, this specifies a URL to reply when
-# Netscape asks the server where the mail administration HTTP server
-# is.  The default is a site at CMU with a hopefully informative
-# message; administrators should set this to a local resource with
-# some information of greater use.
-#
-#netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html
-
-# Notifyd(8) method to use for "MAIL" notifications.  If not set,
-# "MAIL" notifications are disabled.
-#
-#mailnotifier: <no default>
-
-# Notifyd(8) method to use for "SIEVE" notifications.  If not set,
-# "SIEVE" notifications are disabled.
-#
-# This method is only used when no method is specified in the script.
-#
-#sievenotifier: <no default>
-
-# If enabled, lmtpd will look for Sieve scripts in user's home
-# directories: ~user/.sieve.
-#
-sieveusehomedir: false
-
-# If sieveusehomedir is false, this directory is searched for Sieve scripts.
-# The active Sieve script is s called "default", placed in the users sieve
-# sieve directory (ie. /var/imap/sieve/u/user).
-#
-sievedir: /var/imap/sieve
-
-# The pathname of the sendmail executable.  Sieve uses sendmail for
-# sending rejections, redirects and vaca- tion responses.
-#
-#sendmail: /usr/sbin/sendmail
-
-# Username that is used as the 'From' address in rejection MDNs
-# produced by sieve.
-#
-#postmaster: postmaster
-
-# If enabled, the partitions will also be hashed, in addition to the hashing
-# done on configuration directories.  This is recommended if one partition has
-# a very bushy mailbox tree.
-#
-#hashimapspool: false
-
-# Maximum size (in kilobytes) any sieve script can be, enforced at
-# submission by timsieved(8).
-#
-#sieve_maxscriptsize: 32
-
-# Maximum number of sieve scripts any user may have, enforced at
-# submission by timsieved(8).
-#
-#sieve_maxscripts: 5
-
-# Maximum SSF (security strength factor) that the server will allow a
-# client to negotiate.
-#
-#sasl_maximum_layer: 256
-
-# The minimum SSF that the server will allow a client to negotiate.  A
-# value of 1 requires integrity protection; any higher value requires
-# some amount of encryption.
-#
-#sasl_minimum_layer: 0
-
-# The mechanism used by the server to verify plaintext passwords.  Possible
-# values include "auxprop", "saslauthd", and "pwcheck"
-#
-sasl_pwcheck_method: saslauthd
-
-# If enabled,  the SASL library will automatically create authentication
-# secrets when given a plaintext password.  See the SASL documentation.
-#
-#sasl_auto_transition: no
-
-# Whitespace separated list of mechanisms to allow (e.g. 'plain otp').
-# Used to restrict the mechanisms to a subset of the installed
-# plugins. The default is all available.
-#
-#sasl_mech_list: cram-md5 digest-md5
-
-# Location of the opiekeys file
-#
-#sasl_opiekeys: /etc/opiekeys
-
-# File containing the global certificate used for ALL services (imap,
-# pop3, lmtp).
-#
-#tls_cert_file: <none>
-
-# File containing the private key belonging to the global server
-# certificate.
-#
-#tls_key_file: <none>
-
-# File containing the certificate used for imap ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable SSL/TLS for imap.
-#
-#imap_tls_cert_file: <none>
-
-# File containing the private key belonging to the imap-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable SSL/TLS for imap.
-#
-#imap_tls_key_file: <none>
-
-# File containing the certificate used for pop3 ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable SSL/TLS for pop3.
-#
-#pop3_tls_cert_file: <none>
-
-# File containing the private key belonging to the pop3-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable SSL/TLS for pop3.
-#
-#pop3_tls_key_file: <none>
-
-# File containing the certificate used for lmtp ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable TLS for lmtp.
-#
-#lmtp_tls_cert_file: <none>
-
-# File containing the private key belonging to the lmtp-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable TLS for lmtp.
-#
-#lmtp_tls_key_file: <none>
-
-# File containing the certificate used for sieve ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable TLS for sieve.
-#
-#sieve_tls_cert_file: <none>
-
-# File containing the private key belonging to the sieve-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable TLS for sieve.
-#
-#sieve_tls_key_file: <none>
-
-# File containing one or more Certificate Authority (CA) certificates.
-#
-#tls_ca_file: <none>
-
-# Path to directory with certificates of CAs.
-#
-#tls_ca_path: <none>
-
-# The length of time (in minutes) that a TLS session will be cached
-# for later reuse.  The maximum value is 1440 (24 hours), the default.
-# A value of 0 will disable session caching.
-#
-#tls_session_timeout: 1440
-
-# The right that a user needs to delete a mailbox.
-#
-#deleteright: c
-
-# Unix domain socket that lmtpd listens on, used by deliver(8).
-#
-#lmtpsocket: /var/imap/socket/lmtp
-
-# Unix domain socket that idled listens on.
-#
-#idlesocket: /var/imap/socket/idle
-
-# Unix domain socket that the new mail notification daemon listens on.
-#
-#notifysocket: /var/imap/socket/notify
-
-#
-# EOF
diff --git a/mail/cyrus-imapd23/files/imapd.sh b/mail/cyrus-imapd23/files/imapd.sh
deleted file mode 100644
index d34317dd5501..000000000000
--- a/mail/cyrus-imapd23/files/imapd.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Start or stop cyrus-imapd
-# $FreeBSD$
-
-case "$1" in
-start)
-	if [ -x /usr/local/cyrus/bin/master -a \
-	     -f /usr/local/etc/cyrus.conf -a \
-	     -f /usr/local/etc/imapd.conf ]; then
-		/usr/local/cyrus/bin/master -d
-		echo -n ' imapd'
-	fi
-	;;
-stop)
-	if [ -r /var/run/cyrus-master.pid ]; then
-		kill `cat /var/run/cyrus-master.pid` && echo -n ' imapd'
-		rm /var/run/cyrus-master.pid
-	fi
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
diff --git a/mail/cyrus-imapd23/files/patch-aa b/mail/cyrus-imapd23/files/patch-aa
deleted file mode 100644
index fccb317f9515..000000000000
--- a/mail/cyrus-imapd23/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: man/Makefile.in
-diff -u man/Makefile.in.orig man/Makefile.in
---- man/Makefile.in.orig	Fri Feb 28 03:12:33 2003
-+++ man/Makefile.in	Fri Mar 21 14:14:24 2003
-@@ -69,7 +69,7 @@
- MAN3 = $(srcdir)/imclient.3
- MAN5 = imapd.conf.5 $(srcdir)/krb.equiv.5 $(srcdir)/cyrus.conf.5
- MAN8 = $(srcdir)/arbitron.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 $(srcdir)/master.8 \
- 	$(srcdir)/lmtpd.8 $(srcdir)/idled.8 $(srcdir)/ctl_mboxlist.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 2f8bbee2aa53..000000000000
--- a/mail/cyrus-imapd23/files/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig	Tue Feb  4 16:05:15 2003
-+++ configure	Tue Feb  4 16:08:25 2003
-@@ -2760,7 +2760,7 @@
- 	    BDB_LIBADD=""
- 	fi
- 
--        for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-           do
-             echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
- echo "configure:2767: checking for db_create in -l$dbname" >&5
-@@ -6757,7 +6757,7 @@
- #define HAVE_UCDSNMP 1
- EOF
- 
--    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
-     echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6
- echo "configure:6763: checking for rpmdbOpen in -lrpm" >&5
- ac_lib_var=`echo rpm'_'rpmdbOpen | sed 'y%./+-%__p_%'`
diff --git a/mail/cyrus-imapd23/files/patch-bc b/mail/cyrus-imapd23/files/patch-bc
deleted file mode 100644
index 089a879af595..000000000000
--- a/mail/cyrus-imapd23/files/patch-bc
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: imap/Makefile.in
-diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig	Fri Feb 28 03:10:28 2003
-+++ imap/Makefile.in	Fri Mar 21 14:28:10 2003
-@@ -232,13 +232,13 @@
- 	libimap.a $(DEPLIBS)
- 	$(CC) $(LDFLAGS) -o mupdate \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
--	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
- 	libimap.a $(DEPLIBS)
- 	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
--	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
diff --git a/mail/cyrus-imapd23/files/patch-config.h.in b/mail/cyrus-imapd23/files/patch-config.h.in
deleted file mode 100644
index f49e1e525f4b..000000000000
--- a/mail/cyrus-imapd23/files/patch-config.h.in
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: config.h.in
-diff -u config.h.in.orig config.h.in
---- config.h.in.orig	Thu Mar 20 04:04:36 2003
-+++ config.h.in	Fri Mar 21 14:33:39 2003
-@@ -360,8 +360,12 @@
- #define FNAME_DOMAINDIR "/domain/"
- #define FNAME_LOGDIR "/log/"
- #define FNAME_PTSDB "/ptclient/ptscache.db"
-+#if !defined(CONFIG_FILENAME)
- #define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
-+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME)
- #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf"
-+#endif
- 
- #ifndef HAVE_SHUTDOWN
- #define shutdown(fd, mode) 0
diff --git a/mail/cyrus-imapd23/files/patch-dc b/mail/cyrus-imapd23/files/patch-dc
deleted file mode 100644
index f2f5f074e332..000000000000
--- a/mail/cyrus-imapd23/files/patch-dc
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: master/Makefile.in
-diff -u master/Makefile.in.orig master/Makefile.in
---- master/Makefile.in.orig	Fri Feb  7 07:41:03 2003
-+++ master/Makefile.in	Fri Mar 21 18:02:28 2003
-@@ -52,7 +52,8 @@
- CYRUS_USER=@cyrus_user@
- CYRUS_GROUP=@cyrus_group@
- 
--DEFS = @DEFS@ @LOCALDEFS@
-+DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" \
-+	-DDEFAULT_MASTER_CONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\"
- CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @COM_ERR_CPPFLAGS@
- DEPLIBS = ../lib/libcyrus_min.a @DEPLIBS@
- 
diff --git a/mail/cyrus-imapd23/files/patch-df b/mail/cyrus-imapd23/files/patch-df
deleted file mode 100644
index 69a0841343ee..000000000000
--- a/mail/cyrus-imapd23/files/patch-df
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: master/service.c
-diff -u master/service.c.orig master/service.c
---- master/service.c.orig	Wed Jan 22 22:52:36 2003
-+++ master/service.c	Wed Jan 22 22:57:20 2003
-@@ -102,6 +102,9 @@
-     struct sockaddr_storage sin;
-     socklen_t len = sizeof(sin);
-     
-+    /* XXX: old FreeBSD didn't fill sockaddr correctly against AF_UNIX */
-+    sin.ss_family = AF_UNIX;
-+
-     /* is this a connection from the local host? */
-     if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
- 	if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
diff --git a/mail/cyrus-imapd23/files/patch-dg b/mail/cyrus-imapd23/files/patch-dg
deleted file mode 100644
index 5c54d21287d8..000000000000
--- a/mail/cyrus-imapd23/files/patch-dg
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: tools/mkimap
-diff -u tools/mkimap.orig tools/mkimap
---- tools/mkimap.orig	Mon Mar 10 03:39:36 2003
-+++ tools/mkimap	Fri Mar 21 17:24:10 2003
-@@ -61,6 +61,9 @@
- 
- $imapdconf = shift || "/etc/imapd.conf";
- 
-+$cyrus_user = $ENV{CYRUS_USER} || "%%CYRUS_USER%%";
-+$cyrus_group = $ENV{CYRUS_GROUP} || "%%CYRUS_GROUP%%";
-+
- open CONF, $imapdconf or die "can't open $imapdconf";
- print "reading configure file...\n";
- while (<CONF>) {
-@@ -86,6 +89,7 @@
- 
- print "configuring $d...\n";
- 
-+mkdir $d, 0755;
- chdir $d or die "couldn't change to $d";
- 
- mkdir "proc", 0755;
-@@ -95,11 +99,14 @@
- mkdir "msg", 0755;
- mkdir "ptclient", 0755;
- 
-+system "/usr/sbin/chown -R $cyrus_user:$cyrus_group .";
-+
- while ($part = shift @parts) {
-     print "creating $part...\n";
-     mkdir $part, 0755;
-     chdir $part or die "couldn't change to partition $part";
-     mkdir "stage.", 0755;
-+    system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $part";
- }
- 
- print "done\n";
diff --git a/mail/cyrus-imapd23/files/patch-imap::mailbox.h b/mail/cyrus-imapd23/files/patch-imap::mailbox.h
deleted file mode 100644
index ef2941817081..000000000000
--- a/mail/cyrus-imapd23/files/patch-imap::mailbox.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- imap/mailbox.h	2003/03/12 16:38:13	1.68.4.9
-+++ imap/mailbox.h	2003/03/31 20:33:45	1.68.4.10
-@@ -1,5 +1,5 @@
- /* mailbox.h -- Mailbox format definitions
-- * $Id: mailbox.h,v 1.68.4.9 2003/03/12 16:38:13 ken3 Exp $
-+ * $Id: mailbox.h,v 1.68.4.10 2003/03/31 20:33:45 ken3 Exp $
-  *
-  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
-  *
-@@ -269,7 +269,7 @@
- 				     unsigned msgno,
- 				     struct index_record *record);
- extern int mailbox_read_quota(struct quota *quota);
--extern void mailbox_hash_quota(char *buf, unsigned size, const char *qr);
-+extern void mailbox_hash_quota(char *buf, size_t size, const char *qr);
- extern int mailbox_lock_header(struct mailbox *mailbox);
- extern int mailbox_lock_index(struct mailbox *mailbox);
- extern int mailbox_lock_pop(struct mailbox *mailbox);
diff --git a/mail/cyrus-imapd23/files/patch-imtest::imtest.c b/mail/cyrus-imapd23/files/patch-imtest::imtest.c
deleted file mode 100644
index 8e082841d319..000000000000
--- a/mail/cyrus-imapd23/files/patch-imtest::imtest.c
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: imtest/imtest.c
-diff -u imtest/imtest.c.orig imtest/imtest.c
---- imtest/imtest.c.orig	Wed Mar 19 10:29:22 2003
-+++ imtest/imtest.c	Sun May 11 16:47:11 2003
-@@ -417,8 +417,8 @@
- }
- 
- 
--char *var_tls_CAfile="";
--char *var_tls_CApath="";
-+static char *var_tls_CAfile="";
-+static char *var_tls_CApath="";
- /*
-  * This is the setup routine for the SSL client. 
-  *
diff --git a/mail/cyrus-imapd23/files/patch-lib::Makefile.in b/mail/cyrus-imapd23/files/patch-lib::Makefile.in
deleted file mode 100644
index b85111fb7723..000000000000
--- a/mail/cyrus-imapd23/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Makefile.in
-diff -u lib/Makefile.in.orig lib/Makefile.in
---- lib/Makefile.in.orig	Thu Feb 13 04:12:42 2003
-+++ lib/Makefile.in	Fri Mar 21 15:11:50 2003
-@@ -56,7 +56,7 @@
- INSTALL = @INSTALL@
- RANLIB = @RANLIB@
- 
--DEFS = @DEFS@
-+DEFS = @DEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
- CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
- LIBS = @LIBS@
- 
diff --git a/mail/cyrus-imapd23/files/patch-lib::imapoptions b/mail/cyrus-imapd23/files/patch-lib::imapoptions
deleted file mode 100644
index c46c80a342a0..000000000000
--- a/mail/cyrus-imapd23/files/patch-lib::imapoptions
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: lib/imapoptions
-diff -u lib/imapoptions.orig lib/imapoptions
---- lib/imapoptions.orig	Thu Mar 20 04:00:39 2003
-+++ lib/imapoptions	Fri Mar 21 15:27:44 2003
-@@ -454,7 +454,7 @@
- /* The mechanism used by the server to verify plaintext passwords. 
-    Possible values include "auxprop", "saslauthd", and "pwcheck". */
- 
--{ "sendmail", "/usr/lib/sendmail", STRING }
-+{ "sendmail", "/usr/sbin/sendmail", STRING }
- /* The pathname of the sendmail executable.  Sieve invokes sendmail
-    for sending rejections, redirects and vacation responses. */
- 
-@@ -475,7 +475,7 @@
- /* Maximum number of sieve scripts any user may have, enforced at
-    submission by timsieved(8). */
-    
--{ "sievedir", "/usr/sieve", STRING }
-+{ "sievedir", "/var/imap/sieve", STRING }
- /* If sieveusehomedir is false, this directory is searched for Sieve
-    scripts. */
- 
diff --git a/mail/cyrus-imapd23/files/patch-master::service-thread.c b/mail/cyrus-imapd23/files/patch-master::service-thread.c
deleted file mode 100644
index 9a2016c3c64a..000000000000
--- a/mail/cyrus-imapd23/files/patch-master::service-thread.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: master/service-thread.c
-diff -u master/service-thread.c.orig master/service-thread.c
---- master/service-thread.c.orig	Wed Jan 22 22:52:36 2003
-+++ master/service-thread.c	Wed Jan 22 23:09:52 2003
-@@ -99,6 +99,9 @@
-     struct sockaddr_storage sin;
-     socklen_t len = sizeof(sin);
-     
-+    /* XXX: old FreeBSD didn't fill sockaddr correctly against AF_UNIX */
-+    sin.ss_family = AF_UNIX;
-+
-     /* is this a connection from the local host? */
-     if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
- 	if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
diff --git a/mail/cyrus-imapd23/files/patch-sieve::Makefile.in b/mail/cyrus-imapd23/files/patch-sieve::Makefile.in
deleted file mode 100644
index cbc212929f04..000000000000
--- a/mail/cyrus-imapd23/files/patch-sieve::Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: sieve/Makefile.in
-diff -u sieve/Makefile.in.orig sieve/Makefile.in
---- sieve/Makefile.in.orig	Fri Feb 28 03:13:50 2003
-+++ sieve/Makefile.in	Mon Mar 24 02:26:24 2003
-@@ -32,6 +32,7 @@
- YACC = @YACC@
- YFLAGS = -d
- LEX = @LEX@
-+INSTALL = @INSTALL@
- RANLIB = @RANLIB@
- COMPILE_ET = @COMPILE_ET@
- 
-@@ -58,7 +59,7 @@
- 
- install: sievec
- 	$(srcdir)/../install-sh -d ${DESTDIR}$(cyrus_prefix)/bin
--	$(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit
-+	$(INSTALL) -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit
- 
- test: $(DEPLIBS) libsieve.a test.o
- 	$(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)
diff --git a/mail/cyrus-imapd23/pkg-deinstall b/mail/cyrus-imapd23/pkg-deinstall
deleted file mode 100644
index 482b69d2f5c8..000000000000
--- a/mail/cyrus-imapd23/pkg-deinstall
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-# Created by: hetzels@westbend.net
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-checkfile() {
-        diff -bBqw $1 $1.dist >/dev/null 2>&1
-        case $? in
-                0)      # config file exists, but is the same
-			rm $1
-                        ;;
-                1)      # config file exists and differs
-                        ;;
-                *)      # no config file exists
-                        ;;
-        esac
-}
-
-# Uninstall timseived's Cyrus.conf file.
-
-cyrus_conf() {
-	if [ -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then
-		echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp
-		if cmp -s ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp; then
-			rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf
-		fi
-		rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp
-	fi
-}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
-	USER=${CYRUS_USER}
-	PW=/usr/sbin/pw
-	if [ -x /sbin/nologin ]; then
-		shell=/sbin/nologin
-	else
-		shell=/nonexistent
-	fi
-	uhome=/nonexistent
-
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
-		e=$?
-		echo "*** Failed to update user \`${USER}'."
-		exit ${e}
-	fi
-	echo "*** Updated user \`${USER}'."
-}
-
-case $2 in
-	DEINSTALL)
-		cd ${PKG_PREFIX}
-		cyrus_conf
-		checkfile ${PKG_PREIFX}/etc/imapd.conf
-		checkfile ${PKG_PREIFX}/etc/cyrus.conf
-		;;
-	POST-DEINSTALL)
-		modify_cyrus_user
-		;;
-
-esac
diff --git a/mail/cyrus-imapd23/pkg-descr b/mail/cyrus-imapd23/pkg-descr
deleted file mode 100644
index 79d06da9dd9b..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://asg.web.cmu.edu/cyrus/
diff --git a/mail/cyrus-imapd23/pkg-install b/mail/cyrus-imapd23/pkg-install
deleted file mode 100644
index 21e473bac5db..000000000000
--- a/mail/cyrus-imapd23/pkg-install
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
-	USER=${CYRUS_USER}
-	PW=/usr/sbin/pw
-	shell=/bin/csh
-	uhome=${PKG_PREFIX}/cyrus
-
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
-			e=$?
-			echo "*** Failed to update user \`${USER}'."
-			exit ${e}
-	fi
-	echo "*** Updated user \`${USER}'."
-}
-
-
-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
-}
-
-# Install timseived's Cyrus.conf file
-
-cyrus_conf() {
-        if [ ! -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then
-                echo "pwcheck_method: saslauthd" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf
-        fi
-}
-
-case $2 in
-	PRE-INSTALL)
-		;;
-
-	POST-INSTALL)
-		modify_cyrus_user
-		cd ${PKG_PREFIX}
-		cyrus_conf
-		checkfile ${PKG_PREFIX}/etc/imapd.conf
-		checkfile ${PKG_PREFIX}/etc/cyrus.conf
-		if grep 'sieve' /etc/services; then
-			echo
-		else
-			echo
-			echo "** Please add an entry for the sieve protocol (2000/tcp)"
-			echo "   to /etc/services"
-			echo
-		fi
-		;;
-esac
diff --git a/mail/cyrus-imapd23/pkg-message b/mail/cyrus-imapd23/pkg-message
deleted file mode 100644
index e4429259e376..000000000000
--- a/mail/cyrus-imapd23/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
-****************************************************************************
-
-To setup mail spool, modify /usr/local/etc/imapd.conf appropriately,
-then run /usr/local/cyrus/bin/mkimap.
-
-****************************************************************************
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
deleted file mode 100644
index 768303910393..000000000000
--- a/mail/cyrus-imapd23/pkg-plist
+++ /dev/null
@@ -1,107 +0,0 @@
-bin/cyradm
-bin/imtest
-bin/installsieve
-bin/lmtptest
-bin/mupdatetest
-bin/nntptest
-bin/pop3test
-bin/sieveshell
-bin/sivtest
-bin/smtptest
-cyrus/bin/chk_cyrus
-cyrus/bin/ctl_cyrusdb
-cyrus/bin/ctl_deliver
-cyrus/bin/ctl_mboxlist
-cyrus/bin/cvt_cyrusdb
-cyrus/bin/cyrdump
-cyrus/bin/cyrquota
-cyrus/bin/deliver
-%%NNTP%%cyrus/bin/expirenews
-cyrus/bin/feedcyrus
-%%NNTP%%cyrus/bin/fetchnews
-cyrus/bin/fud
-cyrus/bin/imapd
-cyrus/bin/ipurge
-cyrus/bin/lmtpd
-%%MURDER%%cyrus/bin/lmtpproxyd
-cyrus/bin/masssievec
-cyrus/bin/master
-cyrus/bin/mbpath
-cyrus/bin/mkimap
-%%MURDER%%cyrus/bin/mupdate
-%%NNTP%%cyrus/bin/nntpd
-cyrus/bin/notifyd
-cyrus/bin/pop3d
-%%MURDER%%cyrus/bin/proxyd
-cyrus/bin/reconstruct
-cyrus/bin/sievec
-cyrus/bin/squatter
-cyrus/bin/timsieved
-cyrus/bin/tls_prune
-@unexec if cmp -s %D/etc/cyrus.conf %D/etc/cyrus.conf.dist; then rm -f %D/etc/cyrus.conf; fi
-etc/cyrus.conf.dist
-@exec [ -f %B/cyrus.conf ] || cp %B/%f %B/cyrus.conf
-@unexec if cmp -s %D/etc/imapd.conf %D/etc/imapd.conf.dist; then rm -f %D/etc/imapd.conf; fi
-etc/imapd.conf.dist
-@exec [ -f %B/imapd.conf ] || cp %B/%f %B/imapd.conf
-etc/rc.d/imapd.sh.sample
-include/cyrus/acl.h
-include/cyrus/assert.h
-include/cyrus/auth.h
-include/cyrus/bsearch.h
-include/cyrus/charset.h
-include/cyrus/cyrusdb.h
-include/cyrus/glob.h
-include/cyrus/gmtoff.h
-include/cyrus/hash.h
-include/cyrus/imapopts.h
-include/cyrus/imapurl.h
-include/cyrus/imclient.h
-include/cyrus/imparse.h
-include/cyrus/iptostring.h
-include/cyrus/libconfig.h
-include/cyrus/libcyr_cfg.h
-include/cyrus/lock.h
-include/cyrus/lsort.h
-include/cyrus/map.h
-include/cyrus/mkgmtime.h
-include/cyrus/mpool.h
-include/cyrus/nonblock.h
-include/cyrus/parseaddr.h
-include/cyrus/prot.h
-include/cyrus/retry.h
-include/cyrus/rfc822date.h
-include/cyrus/strhash.h
-include/cyrus/strhash.o
-include/cyrus/stristr.h
-include/cyrus/sysexits.h
-include/cyrus/util.h
-include/cyrus/xmalloc.h
-lib/libcyrus_min.a
-lib/libcyrus.a
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
-@dirrm cyrus/bin
-@dirrm cyrus
-@dirrm include/cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
deleted file mode 100644
index 5d59ceff21aa..000000000000
--- a/mail/cyrus-imapd24/Makefile
+++ /dev/null
@@ -1,224 +0,0 @@
-# New ports collection makefile for:		cyrus-imapd
-# Date created:					Jan 4th 2001
-# Whom:						ume@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.2.0.a
-#PORTREVISION=	0
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
-DISTNAME=	${PORTNAME}-2.2.0-ALPHA
-
-MAINTAINER=	ume@FreeBSD.org
-COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
-
-LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
-		${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
-
-USE_PERL5=	yes
-USE_REINPLACE=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
-		--with-cyrus-user=${CYRUS_USER} \
-		--with-cyrus-group=${CYRUS_GROUP} \
-		--with-sasl=${LOCALBASE} \
-		--with-bdb-libdir=${LOCALBASE}/lib \
-		--with-auth=unix \
-		--with-com_err \
-		--with-perl=${PERL5}
-
-.if defined(WITH_BDB_VER)
-USE_BDB_VER=	${WITH_BDB_VER}
-.else
-USE_BDB_VER=	3
-.endif
-.if ${USE_BDB_VER} == 41
-LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
-.elif ${USE_BDB_VER} == 4
-LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
-.elif ${USE_BDB_VER} == 3
-LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
-.else
-BROKEN=		"WITH_BDB_VER must be 3, 4 or 41"
-.endif
-CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${USE_BDB_VER} \
-		--with-bdb=db${USE_BDB_VER}
-
-.if defined(WITHOUT_SKIPLIST)
-CONFIGURE_ARGS+=--with-mboxlist-db=berkeley --with-seen-db=flat
-.endif
-
-.if defined(WITH_NNTP)
-CONFIGURE_ARGS+=--enable-nntp
-PLIST_SUB+=	NNTP=""
-.else
-PLIST_SUB+=	NNTP="@comment "
-.endif
-
-.if defined(WITH_MURDER)
-CONFIGURE_ARGS+=--enable-murder
-CFLAGS+=	${PTHREAD_CFLAGS}
-MAKE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS}
-PLIST_SUB+=	MURDER=""
-.else
-PLIST_SUB+=	MURDER="@comment "
-.endif
-
-.if defined(WITH_FULLDIRHASH)
-CONFIGURE_ARGS+=--enable-fulldirhash
-.endif
-
-.if defined(WITH_LISTEXT)
-CONFIGURE_ARGS+=--enable-listext
-.endif
-
-.if defined(WITH_ANNOTATEMORE)
-CONFIGURE_ARGS+=--enable-annotatemore
-.endif
-
-.if defined(WITH_NETSCAPEHACK)
-CONFIGURE_ARGS+=--enable-netscapehack
-.endif
-
-.if defined(WITH_DRAC)
-EXTRA_PATCHES+=	${FILESDIR}/drac_auth.patch \
-	${FILESDIR}/extra-patch-acconfig.h ${FILESDIR}/extra-patch-aclocal.m4
-USE_AUTOCONF=	YES
-CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
-.endif
-
-.if defined(WITH_SNMP)
-# It seems not compilable due to lack of auto_nlist_value() in libucdagent.
-LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
-#CONFIGURE_ENV=	LIBS=-lkvm
-.else
-CONFIGURE_ARGS+=--with-ucdsnmp=no
-.endif
-
-CYRUS_USER?=	cyrus
-CYRUS_GROUP?=	cyrus
-
-MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
-		nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1
-MAN3=		imclient.3
-MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
-MAN8=		arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
-		ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 deliver.8 \
-		expirenews.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 \
-		lmtpd.8 master.8 mbpath.8 notifyd.8 pop3d.8 reconstruct.8 \
-		rmnews.8 squatter.8 syncnews.8 timsieved.8 tls_prune.8
-
-DOCS=		altnamespace anoncvs bugs changes faq feedback index \
-		install install-admin-mb install-auth install-compile \
-		install-configure install-murder install-netnews \
-		install-perf install-prereq install-sieve install-snmpmon \
-		install-testing install-upgrade install-virtdomains \
-		mailing-list man notes os overview questions readme sieve \
-		sieve-protocol specs
-
-DOCSDIR=	${PREFIX}/share/doc/cyrus-imapd22
-
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-PKGINSTALL=	${WRKDIR}/pkg-install
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.endif
-.if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
-.endif
-
-.include "${PORTSDIR}/security/openssl/bsd.openssl.mk"
-.if !defined(WITH_OPENSSL_BASE)
-CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
-.endif
-
-pre-everything::
-.if !defined(WITH_BDB_VER)
-	@if ${LDCONFIG} -r | ${GREP} -qwE -e "-ldb(41|4)"; then \
-		${ECHO} ""; \
-		${ECHO} "It seems you have installed newer db than db3.  If"; \
-		${ECHO} "you are using newer db for cyrus-sasl2, you should"; \
-		${ECHO} "specify same version by WITH_BDB_VER.  For"; \
-		${ECHO} "exapmle, WITH_BDB_VER=4 for db4."; \
-		${ECHO} ""; \
-	fi
-.endif
-
-post-patch:
-		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
-			${.CURDIR}/pkg-install > ${PKGINSTALL}
-		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
-			${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL}
-		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
-				  -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
-				  -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
-			${WRKSRC}/tools/mkimap
-		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
-				  -e "s|/usr/sieve|/var/imap/sieve|g" \
-			${WRKSRC}/tools/masssievec
-		@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
-.if ${PERL_LEVEL} < 500600
-		@${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
-			${WRKSRC}/perl/sieve/scripts/sieveshell.pl
-.endif
-
-.if defined(WITH_DRAC)
-pre-configure:
-		cd ${WRKSRC} && ${AUTOHEADER}
-.endif
-
-post-install:
-		@${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
-.if !defined(NOPORTDOCS)
-		${MKDIR} ${DOCSDIR}/man
-		${MKDIR} ${DOCSDIR}/text
-.for file in ${DOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR}
-		@${ECHO} share/doc/cyrus-imapd22/${file}.html >>${TMPPLIST}
-.endfor
-.for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8}
-		ofile=`echo ${file} | ${SED} s/cyrquota/quota/`; \
-		if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \
-		${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \
-			${DOCSDIR}/man/$${ofile}.html; \
-		${ECHO} share/doc/cyrus-imapd22/man/$${ofile}.html \
-			>>${TMPPLIST}; \
-		fi
-.endfor
-.for file in cyrusv2.mc murder.png netnews.png
-		${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
-		@${ECHO} share/doc/cyrus-imapd22/${file} >>${TMPPLIST}
-.endfor
-.for file in ${DOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text
-		@${ECHO} share/doc/cyrus-imapd22/text/${file} >>${TMPPLIST}
-.endfor
-		@${ECHO} "@dirrm share/doc/cyrus-imapd22/text" >>${TMPPLIST}
-		@${ECHO} "@dirrm share/doc/cyrus-imapd22/man" >>${TMPPLIST}
-		@${ECHO} "@dirrm share/doc/cyrus-imapd22" >>${TMPPLIST}
-.endif
-		${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \
-			${PREFIX}/etc/rc.d/imapd.sh.sample
-		${INSTALL_DATA} ${FILESDIR}/imapd.conf \
-			${PREFIX}/etc/imapd.conf.dist
-		${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
-			${PREFIX}/etc/cyrus.conf.dist
-		${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
-			${PREFIX}/cyrus/bin/mkimap
-		${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
-			${PREFIX}/cyrus/bin/masssievec
-		@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
-			POST-INSTALL
-		@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
deleted file mode 100644
index 7df5b3151e0b..000000000000
--- a/mail/cyrus-imapd24/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (cyrus-imapd-2.2.0-ALPHA.tar.gz) = bf588d15288885602675d90439500e07
diff --git a/mail/cyrus-imapd24/files/drac_auth.patch b/mail/cyrus-imapd24/files/drac_auth.patch
deleted file mode 100644
index ec1ef5e99696..000000000000
--- a/mail/cyrus-imapd24/files/drac_auth.patch
+++ /dev/null
@@ -1,308 +0,0 @@
-Index: acconfig.h
-diff -u acconfig.h.orig acconfig.h
---- acconfig.h.orig	Fri Feb 14 05:32:50 2003
-+++ acconfig.h	Fri Mar 21 20:13:20 2003
-@@ -98,6 +98,9 @@
- /* do we have SASL support for APOP? */
- #undef HAVE_APOP
- 
-+/* the Dynamic Relay Authorization Control package */
-+#undef DRAC_AUTH
-+
- /* do we have OpenSSL? */
- #undef HAVE_SSL
- 
-Index: configure.in
-diff -u configure.in.orig configure.in
---- configure.in.orig	Wed Mar 19 04:15:14 2003
-+++ configure.in	Fri Mar 21 20:20:54 2003
-@@ -981,6 +981,19 @@
- SNMP_SUBDIRS=""
- AC_SUBST(SNMP_SUBDIRS)
- 
-+dnl
-+dnl Test for DRAC
-+dnl
-+DRACLIBS=
-+AC_ARG_WITH(drac, [  --with-drac=DIR         use DRAC library in <DIR> [no] ],
-+	if test -d "$withval"; then
-+		LDFLAGS="$LDFLAGS -L${withval}"
-+		AC_CHECK_LIB(drac, dracauth,
-+			AC_DEFINE(DRAC_AUTH)
-+			DRACLIBS="-ldrac")
-+	fi)
-+AC_SUBST(DRACLIBS)
-+
- CMU_LIBWRAP
- CMU_UCDSNMP
- 
-Index: imap/Makefile.in
-diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig	Fri Feb 28 03:10:28 2003
-+++ imap/Makefile.in	Fri Mar 21 20:23:02 2003
-@@ -67,6 +67,7 @@
- SIEVE_LIBS = @SIEVE_LIBS@
- IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
- LIB_WRAP = @LIB_WRAP@
-+DRAC_LIBS = @DRACLIBS@
- LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
- DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
- 
-@@ -206,17 +207,17 @@
- imapd: xversion $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(CC) $(LDFLAGS) -o imapd \
- 	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o \
--	libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+	libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
- 
- imapd.pure: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o imapd.pure \
- 	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
--	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+	$(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
- 
- imapd.quant: $(IMAPDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(QUANTIFY) $(QUANTOPT) $(CC) $(LDFLAGS) -o imapd.quant \
- 	 $(SERVICE) $(IMAPDOBJS) mutex_fake.o libimap.a \
--	$(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+	$(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS) $(DRAC_LIBS)
- 
- proxyd: $(PROXYDOBJS) mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(CC) $(LDFLAGS) -o proxyd \
-@@ -242,7 +243,7 @@
- 
- pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
--	 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP)
-+	 mutex_fake.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(DRAC_LIBS)
- 
- nntpd: nntpd.o backend.o index.o spool.o netnews.o wildmat.o tls.o \
- 	 mutex_fake.o nntp_err.o libimap.a $(DEPLIBS) $(SERVICE)
-Index: imap/imapd.c
-diff -u imap/imapd.c.orig imap/imapd.c
---- imap/imapd.c.orig	Thu Mar  6 03:32:05 2003
-+++ imap/imapd.c	Fri Mar 21 23:25:27 2003
-@@ -126,6 +126,18 @@
-     1, 1, &imapd_authstate, &imapd_userisadmin, &imapd_userisproxyadmin
- };
- 
-+#ifdef DRAC_AUTH
-+static struct {
-+    int interval;		/* dracd "ping" interval; 0 = disabled */
-+    unsigned long clientaddr;
-+    struct prot_waitevent *event;
-+} drac;
-+
-+extern int dracconn(char *server, char **errmsg);
-+extern int dracsend(unsigned long userip, char **errmsg);
-+extern int dracdisc(char **errmsg);
-+#endif /* DRAC_AUTH */
-+
- /* current sub-user state */
- static struct mailbox mboxstruct;
- static struct mailbox *imapd_mailbox;
-@@ -447,6 +459,23 @@
-     /* setup for sending IMAP IDLE notifications */
-     idle_enabled();
- 
-+#ifdef DRAC_AUTH
-+    /* setup for sending DRAC "pings" */
-+    drac.event = NULL;
-+    drac.interval = config_getint(IMAPOPT_DRACINTERVAL);
-+    if (drac.interval < 0) drac.interval = 0;
-+    if (drac.interval) {
-+	char *err;
-+
-+	if (dracconn((char*) config_getstring(IMAPOPT_DRACHOST), &err) != 0) {
-+	    /* disable DRAC */
-+	    drac.interval = 0;
-+	    syslog(LOG_ERR, "dracconn: %s", err);
-+	    syslog(LOG_ERR, "DRAC notifications disabled");
-+	}
-+    }
-+#endif /* DRAC_AUTH */
-+
-     /* create connection to the SNMP listener, if available. */
-     snmp_connect(); /* ignore return code */
-     snmp_set_str(SERVER_NAME_VERSION,CYRUS_VERSION);
-@@ -533,6 +562,15 @@
- 		imapd_haveaddr = 1;
- 	    }
- 	}
-+
-+#ifdef DRAC_AUTH
-+	if (((struct sockaddr *)&imapd_remoteaddr)->sa_family == AF_INET)
-+	    drac.clientaddr = ((struct sockaddr_in *)&imapd_remoteaddr)->sin_addr.s_addr;
-+	else
-+	    drac.clientaddr = 0;
-+    } else {
-+	drac.clientaddr = 0;
-+#endif /* DRAC_AUTH */
-     }
- 
-     /* create the SASL connection */
-@@ -575,6 +613,11 @@
-     prot_flush(imapd_out);
-     snmp_increment(ACTIVE_CONNECTIONS, -1);
- 
-+#ifdef DRAC_AUTH
-+    if (drac.event) prot_removewaitevent(imapd_in, drac.event);
-+    drac.event = NULL;
-+#endif /* DRAC_AUTH */
-+
-     /* cleanup */
-     imapd_reset();
- 
-@@ -645,6 +688,10 @@
- 
-     cyrus_done();
- 
-+#ifdef DRAC_AUTH
-+    if (drac.interval) (void) dracdisc((char **)NULL);
-+#endif /* DRAC_AUTH */
-+
-     exit(code);
- }
- 
-@@ -667,6 +714,35 @@
-     shut_down(code);
- }
- 
-+#ifdef DRAC_AUTH
-+/*
-+ * Ping dracd every 'drac.interval' minutes
-+ * to let it know that we are still connected
-+ */
-+struct prot_waitevent *drac_ping(struct protstream *s,
-+				 struct prot_waitevent *ev, void *rock)
-+{
-+    char *err;
-+    static int nfailure = 0;
-+
-+    if (dracsend(drac.clientaddr, &err) != 0) {
-+	syslog(LOG_ERR, "dracsend: %s", err);
-+	if (++nfailure >= 3) {
-+	    /* can't contact dracd for 3 consecutive tries - disable DRAC */
-+	    prot_removewaitevent(s, ev);
-+	    drac.event = NULL;
-+	    syslog(LOG_ERR, "DRAC notifications disabled");
-+	    return NULL;
-+	}
-+    }
-+    else
-+	nfailure = 0;
-+
-+    ev->mark = time(NULL) + (drac.interval * 60);
-+    return ev;
-+}
-+#endif /* DRAC_AUTH */
-+
- /*
-  * Top-level command loop parsing
-  */
-@@ -1664,6 +1740,11 @@
- 
-     prot_printf(imapd_out, "%s OK %s\r\n", tag, reply);
- 
-+#ifdef DRAC_AUTH
-+    if (drac.interval && drac.clientaddr)
-+	drac.event = prot_addwaitevent(imapd_in, 0 /* now */, drac_ping, NULL);
-+#endif /* DRAC_AUTH */
-+
-     /* Create telemetry log */
-     imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out);
- 
-@@ -1786,6 +1867,11 @@
- 
-     prot_setsasl(imapd_in,  imapd_saslconn);
-     prot_setsasl(imapd_out, imapd_saslconn);
-+
-+#ifdef DRAC_AUTH
-+    if (drac.interval && drac.clientaddr)
-+	drac.event = prot_addwaitevent(imapd_in, 0 /* now */, drac_ping, NULL);
-+#endif /* DRAC_AUTH */
- 
-     /* Create telemetry log */
-     imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out);
-Index: imap/pop3d.c
-diff -u imap/pop3d.c.orig imap/pop3d.c
---- imap/pop3d.c.orig	Thu Mar 13 01:38:16 2003
-+++ imap/pop3d.c	Fri Mar 21 23:37:11 2003
-@@ -101,6 +101,10 @@
- extern int opterr;
- 
- 
-+#ifdef DRAC_AUTH
-+static int drac_enabled;
-+extern int dracauth(char *server, unsigned long userip, char **errmsg);
-+#endif /* DRAC_AUTH */
- 
- #ifdef HAVE_SSL
- static SSL *tls_conn;
-@@ -395,6 +399,10 @@
-     prot_settimeout(popd_in, timeout*60);
-     prot_setflushonread(popd_in, popd_out);
- 
-+#ifdef DRAC_AUTH
-+    drac_enabled = (config_getint(IMAPOPT_DRACINTERVAL) > 0);
-+#endif /* DRAC_AUTH */
-+
-     if (kflag) kpop();
- 
-     /* we were connected on pop3s port so we should do 
-@@ -1422,6 +1430,21 @@
- 	popd_mailbox = &mboxstruct;
- 	proc_register("pop3d", popd_clienthost, popd_userid,
- 		      popd_mailbox->name);
-+
-+#ifdef DRAC_AUTH
-+	if (drac_enabled &&
-+	    ((struct sockaddr *)&popd_remoteaddr)->sa_family == AF_INET) {
-+	    char *err;
-+
-+	    if (dracauth((char*) config_getstring(IMAPOPT_DRACHOST),
-+			 ((struct sockaddr_in *)&popd_remoteaddr)->sin_addr.s_addr, &err) != 0) {
-+		/* disable DRAC */
-+		drac_enabled = 0;
-+		syslog(LOG_ERR, "dracauth: %s", err);
-+		syslog(LOG_ERR, "DRAC notifications disabled");
-+	    }
-+	}
-+#endif /* DRAC_AUTH */
-     }
-     else {
- 	/* remote mailbox */
-Index: imap/version.c
-diff -u imap/version.c.orig imap/version.c
---- imap/version.c.orig	Fri Feb 14 05:33:02 2003
-+++ imap/version.c	Fri Mar 21 20:13:21 2003
-@@ -143,6 +143,10 @@
-     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
- 	     "; %s", SIEVE_VERSION);
- #endif
-+#ifdef DRAC_AUTH
-+    snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
-+	     "; DRAC");
-+#endif
- #ifdef HAVE_LIBWRAP
-     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
- 	     "; TCP Wrappers");
-Index: lib/imapoptions
-diff -u lib/imapoptions.orig lib/imapoptions
---- lib/imapoptions.orig	Thu Mar 20 04:00:39 2003
-+++ lib/imapoptions	Fri Mar 21 20:32:15 2003
-@@ -154,6 +154,14 @@
- { "deleteright", "c", STRING }
- /* The right that a user needs to delete a mailbox. */
- 
-+{ "dracinterval", 5, INT }
-+/* If nonzero, enables the use of DRAC (Dynamic Relay Authorization
-+   Control) by the pop3d and imapd daemons.  Also sets the interval
-+   (in minutes) between re-authorization requests made by imapd. */
-+
-+{ "drachost", "localhost", STRING }
-+/* Hostname of the RPC dracd server. */
-+
- { "duplicatesuppression", 1, SWITCH }
- /* If enabled, lmtpd will suppress delivery of a message to a mailbox if
-    a message with the same message-id (or resent-message-id) is recorded
diff --git a/mail/cyrus-imapd24/files/extra-patch-acconfig.h b/mail/cyrus-imapd24/files/extra-patch-acconfig.h
deleted file mode 100644
index 05e561b78963..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-acconfig.h
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: acconfig.h
-diff -u acconfig.h.orig acconfig.h
---- acconfig.h.orig	Fri Feb 14 05:32:50 2003
-+++ acconfig.h	Fri Mar 21 21:03:25 2003
-@@ -263,8 +263,12 @@
- #define FNAME_DOMAINDIR "/domain/"
- #define FNAME_LOGDIR "/log/"
- #define FNAME_PTSDB "/ptclient/ptscache.db"
-+#if !defined(CONFIG_FILENAME)
- #define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
-+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME)
- #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf"
-+#endif
- 
- #ifndef HAVE_SHUTDOWN
- #define shutdown(fd, mode) 0
diff --git a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
deleted file mode 100644
index c6a3e1195b61..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: aclocal.m4
-diff -u aclocal.m4.orig aclocal.m4
---- aclocal.m4.orig	Thu Mar 20 04:04:34 2003
-+++ aclocal.m4	Fri Mar 21 20:09:38 2003
-@@ -453,7 +453,7 @@
- 	    BDB_LIBADD=""
- 	fi
- 
--        for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-           do
-             AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-               dblib="berkeley"; break, dblib="no")
-@@ -1574,7 +1574,7 @@
-   LIB_UCDSNMP=""
-   if test "$with_ucdsnmp" != no; then
-     AC_DEFINE(HAVE_UCDSNMP)
--    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
-     AC_CHECK_LIB(rpm, rpmdbOpen,
- 		 LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
-   fi
diff --git a/mail/cyrus-imapd24/files/imapd.conf b/mail/cyrus-imapd24/files/imapd.conf
deleted file mode 100644
index 8fbc33c976e4..000000000000
--- a/mail/cyrus-imapd24/files/imapd.conf
+++ /dev/null
@@ -1,379 +0,0 @@
-#
-# $FreeBSD$
-#
-# Sample configurations file for Cyrus IMAPd
-# Most lines in this file are commented; in this case the default is used. 
-# The commented lines (usually) contain the default value
-
-# The pathname of the IMAP configuration directory
-#
-configdirectory: /var/imap
-
-# The partition name used by default for new mailboxes
-#
-#defaultpartition: default
-
-# The directory for the different partitions
-#
-partition-default: /var/spool/imap
-
-# Use the UNIX separator character '/' for delimiting levels of
-# mailbox hierarchy.  The default is to use the netnews separator
-# character '.'.
-#unixhierarchysep: no
-
-# Use the alternate IMAP namespace, where personal folders reside at
-# the same level in the hierarchy as INBOX.
-#
-#altnamespace: no
-
-# If using the alternate IMAP namespace, the prefix for the other
-# users namespace.  The hierarchy delimiter will be automatically
-# appended.
-#
-#userprefix: Other Users
-
-# If using the alternate IMAP namespace, the prefix for the shared
-# namespace.  The hierarchy delimiter will be automatically appended.
-#
-#sharedprefix: Shared Folders
-
-# The umask value used by various Cyrus IMAP programs
-#
-#umask: 077
-
-# This is the hostname visible in the greeting messages of the POP,
-# IMAP and LMTP daemons. If it is unset, then the result returned from
-# gethostname(2) is used.
-#
-#servername: <result returned by gethostname(2)>
-
-# Whether to allow anonymous logins
-#
-#allowanonymouslogin: no
-
-# Allow the use of the SASL PLAIN mechanism.
-#
-#allowplaintext: yes
-
-# The percent  of  quota  utilization  over  which  the server generates
-# warnings.
-#
-#quotawarn: 90
-
-# The length of the IMAP server's inactivity autologout timer, in minutes.
-# The  minimum  value  is  30,  the default.
-#
-#timeout: 30
-
-# The interval (in seconds) for polling the mailbox for changes while
-# running the IDLE command.  This option is used when idled can not be
-# contacted or when polling is used exclusively.  The minimum value is
-# 1.  A value of 0 will disable polling (and disable IDLE if polling
-# is the only method available).
-#
-#imapidlepoll: 60
-
-# If enabled, the server responds to an ID command with a parameter
-# list containing: version, vendor, support-url, os, os-version,
-# command, arguments, environment.  Otherwise the server returns NIL.
-#
-#imapidresponse: yes
-
-# Set the length of the POP server's inactivity autologout timer, in
-# minutes.  The minimum value is 10, the default.
-#
-#poptimeout: 10
-
-# Set the minimum amount of time the server forces users to wait between 
-# successive POP logins, in  minutes.  The default is 0.
-#
-#popminpoll: 0
-
-# The number of days advertised as being the minimum a message may be
-# left on the POP server before it is deleted (via the CAPA command,
-# defined in the POP3 Extension Mechanism, which some clients may
-# support).  "NEVER", the default, may be specified with a negative
-# number.  The Cyrus POP3 server never deletes mail, no matter what
-# the value of this parameter is.  However, if a site implements a
-# less liberal policy, it needs to change this parameter accordingly.
-#
-#popexpiretime: 0
-
-# The list of userids with administrative rights.  Separate each userid
-# with a space.  We recommend that administrator userids be separate from 
-# standard userids.  Sites using Kerberos authentication may use separate
-# "admin" instances.
-#
-#admins: <none>
-
-# A list of users and groups that are allowed to proxy for other
-# users, seperated by spaces.  Any user listed in this will be allowed
-# to login for any other user: use with caution.
-#
-#proxyservers: <none>
-
-# The Access Control List (ACL) placed on a newly-created (non-user)
-# mailbox that does not have a parent mailbox.
-#
-#defaultacl: anyone lrs
-
-# The pathname of the news spool directory.  Only used if the partition-news
-# configuration option is set.
-#
-#newsspool: <no default>
-
-# Prefix to be prepended to newsgroup names to make the corresponding IMAP
-# mailbox names.
-#
-#newsprefix: <none>
-
-# If nonzero, normal users may create their own IMAP accounts by creating
-# the mailbox INBOX.  The user's quota is set to the value if it is positive,
-# otherwise the user has unlimited quota.
-#
-#autocreatequota: 0
-
-# Include notations in the protocol telemetry logs indicating the number
-# of seconds since the last command or response.
-#
-#logtimestamps: no
-
-# Number of seconds to pause after a successful plaintext login.  For systems
-# that support strong authentication, this permits users to perceive a cost
-# of using plaintext passwords.
-#
-#plaintextloginpause: 0
-
-# The pathname of srvtab file containing the server's private key.
-# This option is passed to the SASL library and overrides its default
-# setting.
-#
-#srvtab: /etc/srvtab
-
-# The list of remote realms whose users may log in using  cross-realm
-# authentications.   Seperate each realm name by a space.  This option is
-# only used when the server is compiled with Kerberos authentication.
-#
-#loginrealms: <none>
-
-# If enabled, any authentication identity which has a rights on a user's
-# INBOX may log in as that user.  This option is only used when the server
-# is compiled with Kerberos authentication.
-#
-#loginuseacl: no
-
-# If enabled, lmtpd attempts to only write one copy of a message per
-# partition and create hard links, resulting in a potentially large
-# disk savings.
-#
-#singleinstancestore: yes
-
-# If enabled, lmtpd will suppress delivery of a message to a mailbox
-# if a message with the same message-id (or resent-message-id) is
-# recorded as having already been delivered to the mailbox.  Records
-# the mailbox and message-id/resent-message-id of all successful
-# deliveries.
-# Note that duplicate delivery suppression is required for Sieve.
-# Disabling duplicate delivery suppression will also disable Sieve,
-# and as such should only be disabled for performance reasons.
-#
-#duplicatesuppression: yes
-
-# If enabled, lmtpd rejects messages with 8-bit characters in the
-# headers.  Otherwise, 8-bit characters are changed to `X'.  (A proper
-# soultion to non-ASCII characters in headers is offered by RFC 2047
-# and its predecessors.)
-#
-#reject8bit: no
-
-# Maximum incoming LMTP message size.  If set, lmtpd will reject
-# messages larger than maxmessagesize bytes.  The default is to allow
-# messages of any size.
-#
-#maxmessagesize: <unlimited>
-
-# Userid used to deliver messages to shared folders.  For example, if
-# set to "bb", email sent to "bb+shared.blah" would be delivered to
-# the "shared.blah" folder.  By default, an email address of
-# "+shared.blah" would be used.
-#postuser: <none>
-
-# If enabled at compile time, this specifies a URL to reply when
-# Netscape asks the server where the mail administration HTTP server
-# is.  The default is a site at CMU with a hopefully informative
-# message; administrators should set this to a local resource with
-# some information of greater use.
-#
-#netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html
-
-# Notifyd(8) method to use for "MAIL" notifications.  If not set,
-# "MAIL" notifications are disabled.
-#
-#mailnotifier: <no default>
-
-# Notifyd(8) method to use for "SIEVE" notifications.  If not set,
-# "SIEVE" notifications are disabled.
-#
-# This method is only used when no method is specified in the script.
-#
-#sievenotifier: <no default>
-
-# If enabled, lmtpd will look for Sieve scripts in user's home
-# directories: ~user/.sieve.
-#
-sieveusehomedir: false
-
-# If sieveusehomedir is false, this directory is searched for Sieve scripts.
-# The active Sieve script is s called "default", placed in the users sieve
-# sieve directory (ie. /var/imap/sieve/u/user).
-#
-sievedir: /var/imap/sieve
-
-# The pathname of the sendmail executable.  Sieve uses sendmail for
-# sending rejections, redirects and vaca- tion responses.
-#
-#sendmail: /usr/sbin/sendmail
-
-# Username that is used as the 'From' address in rejection MDNs
-# produced by sieve.
-#
-#postmaster: postmaster
-
-# If enabled, the partitions will also be hashed, in addition to the hashing
-# done on configuration directories.  This is recommended if one partition has
-# a very bushy mailbox tree.
-#
-#hashimapspool: false
-
-# Maximum size (in kilobytes) any sieve script can be, enforced at
-# submission by timsieved(8).
-#
-#sieve_maxscriptsize: 32
-
-# Maximum number of sieve scripts any user may have, enforced at
-# submission by timsieved(8).
-#
-#sieve_maxscripts: 5
-
-# Maximum SSF (security strength factor) that the server will allow a
-# client to negotiate.
-#
-#sasl_maximum_layer: 256
-
-# The minimum SSF that the server will allow a client to negotiate.  A
-# value of 1 requires integrity protection; any higher value requires
-# some amount of encryption.
-#
-#sasl_minimum_layer: 0
-
-# The mechanism used by the server to verify plaintext passwords.  Possible
-# values include "auxprop", "saslauthd", and "pwcheck"
-#
-sasl_pwcheck_method: saslauthd
-
-# If enabled,  the SASL library will automatically create authentication
-# secrets when given a plaintext password.  See the SASL documentation.
-#
-#sasl_auto_transition: no
-
-# Whitespace separated list of mechanisms to allow (e.g. 'plain otp').
-# Used to restrict the mechanisms to a subset of the installed
-# plugins. The default is all available.
-#
-#sasl_mech_list: cram-md5 digest-md5
-
-# Location of the opiekeys file
-#
-#sasl_opiekeys: /etc/opiekeys
-
-# File containing the global certificate used for ALL services (imap,
-# pop3, lmtp).
-#
-#tls_cert_file: <none>
-
-# File containing the private key belonging to the global server
-# certificate.
-#
-#tls_key_file: <none>
-
-# File containing the certificate used for imap ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable SSL/TLS for imap.
-#
-#imap_tls_cert_file: <none>
-
-# File containing the private key belonging to the imap-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable SSL/TLS for imap.
-#
-#imap_tls_key_file: <none>
-
-# File containing the certificate used for pop3 ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable SSL/TLS for pop3.
-#
-#pop3_tls_cert_file: <none>
-
-# File containing the private key belonging to the pop3-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable SSL/TLS for pop3.
-#
-#pop3_tls_key_file: <none>
-
-# File containing the certificate used for lmtp ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable TLS for lmtp.
-#
-#lmtp_tls_cert_file: <none>
-
-# File containing the private key belonging to the lmtp-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable TLS for lmtp.
-#
-#lmtp_tls_key_file: <none>
-
-# File containing the certificate used for sieve ONLY.  If not
-# specified, the global certificate is used.  A value of "disabled"
-# will disable TLS for sieve.
-#
-#sieve_tls_cert_file: <none>
-
-# File containing the private key belonging to the sieve-specific
-# server certificate.  If not specified, the global private key is
-# used.  A value of "disabled" will disable TLS for sieve.
-#
-#sieve_tls_key_file: <none>
-
-# File containing one or more Certificate Authority (CA) certificates.
-#
-#tls_ca_file: <none>
-
-# Path to directory with certificates of CAs.
-#
-#tls_ca_path: <none>
-
-# The length of time (in minutes) that a TLS session will be cached
-# for later reuse.  The maximum value is 1440 (24 hours), the default.
-# A value of 0 will disable session caching.
-#
-#tls_session_timeout: 1440
-
-# The right that a user needs to delete a mailbox.
-#
-#deleteright: c
-
-# Unix domain socket that lmtpd listens on, used by deliver(8).
-#
-#lmtpsocket: /var/imap/socket/lmtp
-
-# Unix domain socket that idled listens on.
-#
-#idlesocket: /var/imap/socket/idle
-
-# Unix domain socket that the new mail notification daemon listens on.
-#
-#notifysocket: /var/imap/socket/notify
-
-#
-# EOF
diff --git a/mail/cyrus-imapd24/files/imapd.sh b/mail/cyrus-imapd24/files/imapd.sh
deleted file mode 100644
index d34317dd5501..000000000000
--- a/mail/cyrus-imapd24/files/imapd.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Start or stop cyrus-imapd
-# $FreeBSD$
-
-case "$1" in
-start)
-	if [ -x /usr/local/cyrus/bin/master -a \
-	     -f /usr/local/etc/cyrus.conf -a \
-	     -f /usr/local/etc/imapd.conf ]; then
-		/usr/local/cyrus/bin/master -d
-		echo -n ' imapd'
-	fi
-	;;
-stop)
-	if [ -r /var/run/cyrus-master.pid ]; then
-		kill `cat /var/run/cyrus-master.pid` && echo -n ' imapd'
-		rm /var/run/cyrus-master.pid
-	fi
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
diff --git a/mail/cyrus-imapd24/files/patch-aa b/mail/cyrus-imapd24/files/patch-aa
deleted file mode 100644
index fccb317f9515..000000000000
--- a/mail/cyrus-imapd24/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: man/Makefile.in
-diff -u man/Makefile.in.orig man/Makefile.in
---- man/Makefile.in.orig	Fri Feb 28 03:12:33 2003
-+++ man/Makefile.in	Fri Mar 21 14:14:24 2003
-@@ -69,7 +69,7 @@
- MAN3 = $(srcdir)/imclient.3
- MAN5 = imapd.conf.5 $(srcdir)/krb.equiv.5 $(srcdir)/cyrus.conf.5
- MAN8 = $(srcdir)/arbitron.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 $(srcdir)/master.8 \
- 	$(srcdir)/lmtpd.8 $(srcdir)/idled.8 $(srcdir)/ctl_mboxlist.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 2f8bbee2aa53..000000000000
--- a/mail/cyrus-imapd24/files/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig	Tue Feb  4 16:05:15 2003
-+++ configure	Tue Feb  4 16:08:25 2003
-@@ -2760,7 +2760,7 @@
- 	    BDB_LIBADD=""
- 	fi
- 
--        for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-           do
-             echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
- echo "configure:2767: checking for db_create in -l$dbname" >&5
-@@ -6757,7 +6757,7 @@
- #define HAVE_UCDSNMP 1
- EOF
- 
--    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
-     echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6
- echo "configure:6763: checking for rpmdbOpen in -lrpm" >&5
- ac_lib_var=`echo rpm'_'rpmdbOpen | sed 'y%./+-%__p_%'`
diff --git a/mail/cyrus-imapd24/files/patch-bc b/mail/cyrus-imapd24/files/patch-bc
deleted file mode 100644
index 089a879af595..000000000000
--- a/mail/cyrus-imapd24/files/patch-bc
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: imap/Makefile.in
-diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig	Fri Feb 28 03:10:28 2003
-+++ imap/Makefile.in	Fri Mar 21 14:28:10 2003
-@@ -232,13 +232,13 @@
- 	libimap.a $(DEPLIBS)
- 	$(CC) $(LDFLAGS) -o mupdate \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
--	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
- 	libimap.a $(DEPLIBS)
- 	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
--	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
diff --git a/mail/cyrus-imapd24/files/patch-config.h.in b/mail/cyrus-imapd24/files/patch-config.h.in
deleted file mode 100644
index f49e1e525f4b..000000000000
--- a/mail/cyrus-imapd24/files/patch-config.h.in
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: config.h.in
-diff -u config.h.in.orig config.h.in
---- config.h.in.orig	Thu Mar 20 04:04:36 2003
-+++ config.h.in	Fri Mar 21 14:33:39 2003
-@@ -360,8 +360,12 @@
- #define FNAME_DOMAINDIR "/domain/"
- #define FNAME_LOGDIR "/log/"
- #define FNAME_PTSDB "/ptclient/ptscache.db"
-+#if !defined(CONFIG_FILENAME)
- #define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
-+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME)
- #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf"
-+#endif
- 
- #ifndef HAVE_SHUTDOWN
- #define shutdown(fd, mode) 0
diff --git a/mail/cyrus-imapd24/files/patch-dc b/mail/cyrus-imapd24/files/patch-dc
deleted file mode 100644
index f2f5f074e332..000000000000
--- a/mail/cyrus-imapd24/files/patch-dc
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: master/Makefile.in
-diff -u master/Makefile.in.orig master/Makefile.in
---- master/Makefile.in.orig	Fri Feb  7 07:41:03 2003
-+++ master/Makefile.in	Fri Mar 21 18:02:28 2003
-@@ -52,7 +52,8 @@
- CYRUS_USER=@cyrus_user@
- CYRUS_GROUP=@cyrus_group@
- 
--DEFS = @DEFS@ @LOCALDEFS@
-+DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" \
-+	-DDEFAULT_MASTER_CONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\"
- CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @COM_ERR_CPPFLAGS@
- DEPLIBS = ../lib/libcyrus_min.a @DEPLIBS@
- 
diff --git a/mail/cyrus-imapd24/files/patch-df b/mail/cyrus-imapd24/files/patch-df
deleted file mode 100644
index 69a0841343ee..000000000000
--- a/mail/cyrus-imapd24/files/patch-df
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: master/service.c
-diff -u master/service.c.orig master/service.c
---- master/service.c.orig	Wed Jan 22 22:52:36 2003
-+++ master/service.c	Wed Jan 22 22:57:20 2003
-@@ -102,6 +102,9 @@
-     struct sockaddr_storage sin;
-     socklen_t len = sizeof(sin);
-     
-+    /* XXX: old FreeBSD didn't fill sockaddr correctly against AF_UNIX */
-+    sin.ss_family = AF_UNIX;
-+
-     /* is this a connection from the local host? */
-     if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
- 	if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
diff --git a/mail/cyrus-imapd24/files/patch-dg b/mail/cyrus-imapd24/files/patch-dg
deleted file mode 100644
index 5c54d21287d8..000000000000
--- a/mail/cyrus-imapd24/files/patch-dg
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: tools/mkimap
-diff -u tools/mkimap.orig tools/mkimap
---- tools/mkimap.orig	Mon Mar 10 03:39:36 2003
-+++ tools/mkimap	Fri Mar 21 17:24:10 2003
-@@ -61,6 +61,9 @@
- 
- $imapdconf = shift || "/etc/imapd.conf";
- 
-+$cyrus_user = $ENV{CYRUS_USER} || "%%CYRUS_USER%%";
-+$cyrus_group = $ENV{CYRUS_GROUP} || "%%CYRUS_GROUP%%";
-+
- open CONF, $imapdconf or die "can't open $imapdconf";
- print "reading configure file...\n";
- while (<CONF>) {
-@@ -86,6 +89,7 @@
- 
- print "configuring $d...\n";
- 
-+mkdir $d, 0755;
- chdir $d or die "couldn't change to $d";
- 
- mkdir "proc", 0755;
-@@ -95,11 +99,14 @@
- mkdir "msg", 0755;
- mkdir "ptclient", 0755;
- 
-+system "/usr/sbin/chown -R $cyrus_user:$cyrus_group .";
-+
- while ($part = shift @parts) {
-     print "creating $part...\n";
-     mkdir $part, 0755;
-     chdir $part or die "couldn't change to partition $part";
-     mkdir "stage.", 0755;
-+    system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $part";
- }
- 
- print "done\n";
diff --git a/mail/cyrus-imapd24/files/patch-imap::mailbox.h b/mail/cyrus-imapd24/files/patch-imap::mailbox.h
deleted file mode 100644
index ef2941817081..000000000000
--- a/mail/cyrus-imapd24/files/patch-imap::mailbox.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- imap/mailbox.h	2003/03/12 16:38:13	1.68.4.9
-+++ imap/mailbox.h	2003/03/31 20:33:45	1.68.4.10
-@@ -1,5 +1,5 @@
- /* mailbox.h -- Mailbox format definitions
-- * $Id: mailbox.h,v 1.68.4.9 2003/03/12 16:38:13 ken3 Exp $
-+ * $Id: mailbox.h,v 1.68.4.10 2003/03/31 20:33:45 ken3 Exp $
-  *
-  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
-  *
-@@ -269,7 +269,7 @@
- 				     unsigned msgno,
- 				     struct index_record *record);
- extern int mailbox_read_quota(struct quota *quota);
--extern void mailbox_hash_quota(char *buf, unsigned size, const char *qr);
-+extern void mailbox_hash_quota(char *buf, size_t size, const char *qr);
- extern int mailbox_lock_header(struct mailbox *mailbox);
- extern int mailbox_lock_index(struct mailbox *mailbox);
- extern int mailbox_lock_pop(struct mailbox *mailbox);
diff --git a/mail/cyrus-imapd24/files/patch-imtest::imtest.c b/mail/cyrus-imapd24/files/patch-imtest::imtest.c
deleted file mode 100644
index 8e082841d319..000000000000
--- a/mail/cyrus-imapd24/files/patch-imtest::imtest.c
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: imtest/imtest.c
-diff -u imtest/imtest.c.orig imtest/imtest.c
---- imtest/imtest.c.orig	Wed Mar 19 10:29:22 2003
-+++ imtest/imtest.c	Sun May 11 16:47:11 2003
-@@ -417,8 +417,8 @@
- }
- 
- 
--char *var_tls_CAfile="";
--char *var_tls_CApath="";
-+static char *var_tls_CAfile="";
-+static char *var_tls_CApath="";
- /*
-  * This is the setup routine for the SSL client. 
-  *
diff --git a/mail/cyrus-imapd24/files/patch-lib::Makefile.in b/mail/cyrus-imapd24/files/patch-lib::Makefile.in
deleted file mode 100644
index b85111fb7723..000000000000
--- a/mail/cyrus-imapd24/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Makefile.in
-diff -u lib/Makefile.in.orig lib/Makefile.in
---- lib/Makefile.in.orig	Thu Feb 13 04:12:42 2003
-+++ lib/Makefile.in	Fri Mar 21 15:11:50 2003
-@@ -56,7 +56,7 @@
- INSTALL = @INSTALL@
- RANLIB = @RANLIB@
- 
--DEFS = @DEFS@
-+DEFS = @DEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
- CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
- LIBS = @LIBS@
- 
diff --git a/mail/cyrus-imapd24/files/patch-lib::imapoptions b/mail/cyrus-imapd24/files/patch-lib::imapoptions
deleted file mode 100644
index c46c80a342a0..000000000000
--- a/mail/cyrus-imapd24/files/patch-lib::imapoptions
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: lib/imapoptions
-diff -u lib/imapoptions.orig lib/imapoptions
---- lib/imapoptions.orig	Thu Mar 20 04:00:39 2003
-+++ lib/imapoptions	Fri Mar 21 15:27:44 2003
-@@ -454,7 +454,7 @@
- /* The mechanism used by the server to verify plaintext passwords. 
-    Possible values include "auxprop", "saslauthd", and "pwcheck". */
- 
--{ "sendmail", "/usr/lib/sendmail", STRING }
-+{ "sendmail", "/usr/sbin/sendmail", STRING }
- /* The pathname of the sendmail executable.  Sieve invokes sendmail
-    for sending rejections, redirects and vacation responses. */
- 
-@@ -475,7 +475,7 @@
- /* Maximum number of sieve scripts any user may have, enforced at
-    submission by timsieved(8). */
-    
--{ "sievedir", "/usr/sieve", STRING }
-+{ "sievedir", "/var/imap/sieve", STRING }
- /* If sieveusehomedir is false, this directory is searched for Sieve
-    scripts. */
- 
diff --git a/mail/cyrus-imapd24/files/patch-master::service-thread.c b/mail/cyrus-imapd24/files/patch-master::service-thread.c
deleted file mode 100644
index 9a2016c3c64a..000000000000
--- a/mail/cyrus-imapd24/files/patch-master::service-thread.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: master/service-thread.c
-diff -u master/service-thread.c.orig master/service-thread.c
---- master/service-thread.c.orig	Wed Jan 22 22:52:36 2003
-+++ master/service-thread.c	Wed Jan 22 23:09:52 2003
-@@ -99,6 +99,9 @@
-     struct sockaddr_storage sin;
-     socklen_t len = sizeof(sin);
-     
-+    /* XXX: old FreeBSD didn't fill sockaddr correctly against AF_UNIX */
-+    sin.ss_family = AF_UNIX;
-+
-     /* is this a connection from the local host? */
-     if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
- 	if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
diff --git a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
deleted file mode 100644
index cbc212929f04..000000000000
--- a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: sieve/Makefile.in
-diff -u sieve/Makefile.in.orig sieve/Makefile.in
---- sieve/Makefile.in.orig	Fri Feb 28 03:13:50 2003
-+++ sieve/Makefile.in	Mon Mar 24 02:26:24 2003
-@@ -32,6 +32,7 @@
- YACC = @YACC@
- YFLAGS = -d
- LEX = @LEX@
-+INSTALL = @INSTALL@
- RANLIB = @RANLIB@
- COMPILE_ET = @COMPILE_ET@
- 
-@@ -58,7 +59,7 @@
- 
- install: sievec
- 	$(srcdir)/../install-sh -d ${DESTDIR}$(cyrus_prefix)/bin
--	$(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit
-+	$(INSTALL) -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit
- 
- test: $(DEPLIBS) libsieve.a test.o
- 	$(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)
diff --git a/mail/cyrus-imapd24/pkg-deinstall b/mail/cyrus-imapd24/pkg-deinstall
deleted file mode 100644
index 482b69d2f5c8..000000000000
--- a/mail/cyrus-imapd24/pkg-deinstall
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-# Created by: hetzels@westbend.net
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-checkfile() {
-        diff -bBqw $1 $1.dist >/dev/null 2>&1
-        case $? in
-                0)      # config file exists, but is the same
-			rm $1
-                        ;;
-                1)      # config file exists and differs
-                        ;;
-                *)      # no config file exists
-                        ;;
-        esac
-}
-
-# Uninstall timseived's Cyrus.conf file.
-
-cyrus_conf() {
-	if [ -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then
-		echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp
-		if cmp -s ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp; then
-			rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf
-		fi
-		rm -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf.tmp
-	fi
-}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
-	USER=${CYRUS_USER}
-	PW=/usr/sbin/pw
-	if [ -x /sbin/nologin ]; then
-		shell=/sbin/nologin
-	else
-		shell=/nonexistent
-	fi
-	uhome=/nonexistent
-
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
-		e=$?
-		echo "*** Failed to update user \`${USER}'."
-		exit ${e}
-	fi
-	echo "*** Updated user \`${USER}'."
-}
-
-case $2 in
-	DEINSTALL)
-		cd ${PKG_PREFIX}
-		cyrus_conf
-		checkfile ${PKG_PREIFX}/etc/imapd.conf
-		checkfile ${PKG_PREIFX}/etc/cyrus.conf
-		;;
-	POST-DEINSTALL)
-		modify_cyrus_user
-		;;
-
-esac
diff --git a/mail/cyrus-imapd24/pkg-descr b/mail/cyrus-imapd24/pkg-descr
deleted file mode 100644
index 79d06da9dd9b..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://asg.web.cmu.edu/cyrus/
diff --git a/mail/cyrus-imapd24/pkg-install b/mail/cyrus-imapd24/pkg-install
deleted file mode 100644
index 21e473bac5db..000000000000
--- a/mail/cyrus-imapd24/pkg-install
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-
-#set -vx
-
-PKG_BATCH=${BATCH:=NO}
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%}
-
-#
-# Modify the 'cyrus' user created from the cyrus-sasl port
-#
-
-modify_cyrus_user() {
-	USER=${CYRUS_USER}
-	PW=/usr/sbin/pw
-	shell=/bin/csh
-	uhome=${PKG_PREFIX}/cyrus
-
-	if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}" \ ; then
-			e=$?
-			echo "*** Failed to update user \`${USER}'."
-			exit ${e}
-	fi
-	echo "*** Updated user \`${USER}'."
-}
-
-
-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
-}
-
-# Install timseived's Cyrus.conf file
-
-cyrus_conf() {
-        if [ ! -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then
-                echo "pwcheck_method: saslauthd" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf
-        fi
-}
-
-case $2 in
-	PRE-INSTALL)
-		;;
-
-	POST-INSTALL)
-		modify_cyrus_user
-		cd ${PKG_PREFIX}
-		cyrus_conf
-		checkfile ${PKG_PREFIX}/etc/imapd.conf
-		checkfile ${PKG_PREFIX}/etc/cyrus.conf
-		if grep 'sieve' /etc/services; then
-			echo
-		else
-			echo
-			echo "** Please add an entry for the sieve protocol (2000/tcp)"
-			echo "   to /etc/services"
-			echo
-		fi
-		;;
-esac
diff --git a/mail/cyrus-imapd24/pkg-message b/mail/cyrus-imapd24/pkg-message
deleted file mode 100644
index e4429259e376..000000000000
--- a/mail/cyrus-imapd24/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
-****************************************************************************
-
-To setup mail spool, modify /usr/local/etc/imapd.conf appropriately,
-then run /usr/local/cyrus/bin/mkimap.
-
-****************************************************************************
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
deleted file mode 100644
index 768303910393..000000000000
--- a/mail/cyrus-imapd24/pkg-plist
+++ /dev/null
@@ -1,107 +0,0 @@
-bin/cyradm
-bin/imtest
-bin/installsieve
-bin/lmtptest
-bin/mupdatetest
-bin/nntptest
-bin/pop3test
-bin/sieveshell
-bin/sivtest
-bin/smtptest
-cyrus/bin/chk_cyrus
-cyrus/bin/ctl_cyrusdb
-cyrus/bin/ctl_deliver
-cyrus/bin/ctl_mboxlist
-cyrus/bin/cvt_cyrusdb
-cyrus/bin/cyrdump
-cyrus/bin/cyrquota
-cyrus/bin/deliver
-%%NNTP%%cyrus/bin/expirenews
-cyrus/bin/feedcyrus
-%%NNTP%%cyrus/bin/fetchnews
-cyrus/bin/fud
-cyrus/bin/imapd
-cyrus/bin/ipurge
-cyrus/bin/lmtpd
-%%MURDER%%cyrus/bin/lmtpproxyd
-cyrus/bin/masssievec
-cyrus/bin/master
-cyrus/bin/mbpath
-cyrus/bin/mkimap
-%%MURDER%%cyrus/bin/mupdate
-%%NNTP%%cyrus/bin/nntpd
-cyrus/bin/notifyd
-cyrus/bin/pop3d
-%%MURDER%%cyrus/bin/proxyd
-cyrus/bin/reconstruct
-cyrus/bin/sievec
-cyrus/bin/squatter
-cyrus/bin/timsieved
-cyrus/bin/tls_prune
-@unexec if cmp -s %D/etc/cyrus.conf %D/etc/cyrus.conf.dist; then rm -f %D/etc/cyrus.conf; fi
-etc/cyrus.conf.dist
-@exec [ -f %B/cyrus.conf ] || cp %B/%f %B/cyrus.conf
-@unexec if cmp -s %D/etc/imapd.conf %D/etc/imapd.conf.dist; then rm -f %D/etc/imapd.conf; fi
-etc/imapd.conf.dist
-@exec [ -f %B/imapd.conf ] || cp %B/%f %B/imapd.conf
-etc/rc.d/imapd.sh.sample
-include/cyrus/acl.h
-include/cyrus/assert.h
-include/cyrus/auth.h
-include/cyrus/bsearch.h
-include/cyrus/charset.h
-include/cyrus/cyrusdb.h
-include/cyrus/glob.h
-include/cyrus/gmtoff.h
-include/cyrus/hash.h
-include/cyrus/imapopts.h
-include/cyrus/imapurl.h
-include/cyrus/imclient.h
-include/cyrus/imparse.h
-include/cyrus/iptostring.h
-include/cyrus/libconfig.h
-include/cyrus/libcyr_cfg.h
-include/cyrus/lock.h
-include/cyrus/lsort.h
-include/cyrus/map.h
-include/cyrus/mkgmtime.h
-include/cyrus/mpool.h
-include/cyrus/nonblock.h
-include/cyrus/parseaddr.h
-include/cyrus/prot.h
-include/cyrus/retry.h
-include/cyrus/rfc822date.h
-include/cyrus/strhash.h
-include/cyrus/strhash.o
-include/cyrus/stristr.h
-include/cyrus/sysexits.h
-include/cyrus/util.h
-include/cyrus/xmalloc.h
-lib/libcyrus_min.a
-lib/libcyrus.a
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
-@dirrm cyrus/bin
-@dirrm cyrus
-@dirrm include/cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile
deleted file mode 100644
index 29a69ca8d280..000000000000
--- a/mail/dovecot-devel/Makefile
+++ /dev/null
@@ -1,163 +0,0 @@
-# New ports collection makefile for:	dovecot
-# Date created:				12/08/2002
-# Whom:			Dominic Marks <d.marks@student.umist.ac.uk>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dovecot
-PORTVERSION=	0.99.9.1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	http://dovecot.procontrol.fi/
-
-MAINTAINER=	d.marks@student.umist.ac.uk
-COMMENT=	Secure and compact IMAP and POP3 servers
-
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
-USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--without-shadow --enable-ipv6 \
-		--localstatedir=/var --with-ssl=openssl \
-		--with-ssldir=/var/dovecot/ssl --with-pop3d \
-		--with-pam
-CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
-	LDFLAGS=-L${LOCALBASE}/lib
-
-#
-# Feature Autodetection
-#
-.if exists(${LOCALBASE}/lib/libsasl.so.2)
-WITH_SASL2=	yes
-.endif
-
-.if exists(${LOCALBASE}/vpopmail/bin/vckpw)
-WITH_VPOPMAIL=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libldap.so.2)
-WITH_LDAP2=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libpq.so.3)
-WITH_PGSQL=	yes
-.endif
-
-#
-# SASL2 support
-#
-# SASL provides authentication support to
-# session-based protocols. This is can be
-# used by dovecot for authentication sources.
-#
-.if WITH_SASL2
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-CONFIGURE_ARGS+=	--with-cyrus-sasl2
-.endif
-
-#
-# VPopMail Support
-#
-# vpopmail provides easy authentication and
-# multi-domain features. It was originally
-# created for use with Qmail.
-#
-.if WITH_VPOPMAIL
-VPOPMAIL=	${LOCALBASE}/vpopmail/bin/vchkpw
-BUILD_DEPENDS+=	${VPOPMAIL}:${PORTSDIR}/mail/vpopmail
-CONFIGURE_ARGS+=	--with-vpopmail
-.endif
-
-#
-# OpenLDAP Support
-#
-# LDAP is the light-weight directory access
-# protocol and can be used by Dovecot for its
-# user database.
-#
-.if WITH_LDAP2
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
-CONFIGURE_ARGS+=	--with-ldap
-.endif
-
-#
-# PostgreSQL Support
-#
-# PostgreSQL is a powerful SQL database which
-# can be used to store user tables.
-#
-.if WITH_PGSQL
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql
-CONFIGURE_ARGS+=	--with-pgsql
-.endif
-
-pre-everything:
-	@${ECHO_MSG} "==>  Dovecot Options"
-	@${ECHO_MSG} "==>   See the Makefile for descriptions."
-	@${ECHO_MSG} "==> ------------------------------------------"
-	@${ECHO_MSG} "==>  o SASL2 Support         + WITH_SASL2"
-	@${ECHO_MSG} "==>  o VPoPMail Support      + WITH_VPOPMAIL"
-	@${ECHO_MSG} "==>  o OpenLDAP2 Support     + WITH_LDAP2"
-	@${ECHO_MSG} "==>  o PostgreSQL Support    + WITH_PGSQL"
-	@${ECHO_MSG} "==> ------------------------------------------"
-
-pre-build:
-	@${REINPLACE_CMD} -e 's,%%SSLDIR%%,/var/dovecot/ssl,' \
-		${WRKSRC}/doc/mkcert.sh \
-		${WRKSRC}/dovecot-example.conf
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
-		${WRKSRC}/dovecot-example.conf
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" \
-		${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
-	@${MKDIR} ${PREFIX}/libexec/dovecot
-	${INSTALL_PROGRAM} \
-		${WRKSRC}/src/imap/imap \
-		${WRKSRC}/src/pop3/pop3 \
-		${WRKSRC}/src/auth/dovecot-auth \
-		${WRKSRC}/src/imap-login/imap-login \
-		${WRKSRC}/src/pop3-login/pop3-login \
-			${PREFIX}/libexec/dovecot/
-	${INSTALL_DATA} ${WRKSRC}/dovecot-example.conf ${PREFIX}/etc/
-	${INSTALL_PROGRAM} ${WRKSRC}/src/master/dovecot ${PREFIX}/sbin/
-
-post-install:
-	@${MKDIR} /var/dovecot
-	@${MKDIR} /var/dovecot/ssl
-	@${MKDIR} /var/dovecot/ssl/certs
-	@${MKDIR} /var/dovecot/ssl/private
-	@${MKDIR} /var/dovecot/auth
-	@${CHOWN} -R dovecot:dovecot /var/dovecot
-	@${MKDIR} /var/dovecot/login
-	@${CHOWN} root:dovecot /var/dovecot/login
-	@${MKDIR} /var/run/dovecot
-	@${CHMOD} 0700 /var/run/dovecot
-	@${CHOWN} root:dovecot /var/run/dovecot
-	${INSTALL_SCRIPT} -m 751 ${FILESDIR}/dovecot.sh.sample \
-		${PREFIX}/etc/rc.d/dovecot.sh.sample
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/dovecot
-	@${INSTALL_DATA} \
-		${WRKSRC}/doc/auth.txt \
-		${WRKSRC}/doc/design.txt \
-		${WRKSRC}/doc/index.txt \
-		${WRKSRC}/doc/multiaccess.txt \
-		${WRKSRC}/doc/nfs.txt \
-		${WRKSRC}/doc/configuration.txt \
-		${WRKSRC}/doc/mail-storages.txt \
-		${WRKSRC}/doc/dovecot-ldap.conf \
-		${WRKSRC}/doc/dovecot-pgsql.conf \
-		${WRKSRC}/doc/dovecot-openssl.cnf \
-		${WRKSRC}/doc/mkcert.sh \
-		${FILESDIR}/README.FreeBSD \
-			${PREFIX}/share/doc/dovecot
-.endif
-	@${CP} ${PKGMESSAGE} ${WRKDIR}/pkg-message
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
-		${WRKDIR}/pkg-message
-	@${CAT} ${WRKDIR}/pkg-message
-
-.include <bsd.port.mk>
diff --git a/mail/dovecot-devel/distinfo b/mail/dovecot-devel/distinfo
deleted file mode 100644
index 2576efd71b5e..000000000000
--- a/mail/dovecot-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (dovecot-0.99.9.1.tar.gz) = d8d51af34a3467b65b20dc9d09140fbe
diff --git a/mail/dovecot-devel/files/README.FreeBSD b/mail/dovecot-devel/files/README.FreeBSD
deleted file mode 100644
index 093fdf57ea81..000000000000
--- a/mail/dovecot-devel/files/README.FreeBSD
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# README.FreeBSD
-#
-# $FreeBSD$
-#
-
- o Dovecot currently will not allow users with a user or group id of 0
-   to login. Because of this you will not be able to open root's
-   mailbox, or any of the mailboxes of users in the wheel group. This is
-   intended as a security feature, and isn't an issue on Linux because
-   the concept of wheel is not enforced by GNU su.
-
-  + 2003/04/15
-     It is now possible to change this behavior to allow wheel users to
-     check their mailboxes with Dovecot. Add the following line to your
-     dovecot.conf:
-
-     allow_zero_gid = yes
-
- o The configuration which is supplied with this port is installed into
-   PREFIX/etc/dovecot-example.conf and PREFIX defaults to /usr/local.
-   I have attempted to choose what appears to be the best mixture of
-   performance and compatibility and set Dovecot up to start POP3 and
-   IMAP services for all the local users of the machine. This should be
-   enough for the simplest sites to get up and running straight away.
- 
- o Enabling SSL services should be easy, the Dovecot port is configured
-   by default to keep its SSL information under /var/dovecot/ssl, if you
-   already have certificates you wish to use then you can override this
-   in the configuration. If you don't have a certificate and wish to
-   make your own it should be as simple as:
-
-   # cd PREFIX/share/doc/dovecot/
-   # vi dovecot-openssl.conf
-    
-    Add information which describes your enivironment.
-    
-   # sh mkcert.sh
-
-    Execute the certificate generator. This will put a new certificate
-    and private key under /var/dovecot/ssl.
-    
-   # cd PREFIX/etc/
-   # vi dovecot.conf
-    
-    Reconfigure Dovecot to use SSL.
-
-   The variables you will want to set in dovecot.conf to allow a SSL
-   secured POP3 and IMAP service are:
-
-    + protocols = imap imaps pop3 pop3s
-    + ssl_disable = no
-
-   You may wish to also change the following variables to reflect the
-   location of SSL certificates on your system.
-   
-    + ssl_cert_file = /var/dovecot/ssl/certs/imapd.pem
-    + ssl_key_file = /var/dovecot/ssl/private/imapd.pem
diff --git a/mail/dovecot-devel/files/dovecot.sh.sample b/mail/dovecot-devel/files/dovecot.sh.sample
deleted file mode 100644
index 625021fa6def..000000000000
--- a/mail/dovecot-devel/files/dovecot.sh.sample
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-case "$1" in
-start)
-	[ -x ${PREFIX}/sbin/dovecot ] && \
-		${PREFIX}/sbin/dovecot && echo -n ' dovecot'
-	;;
-stop)
-	/usr/bin/killall dovecot && echo -n ' dovecot'
-	;;
-*)
-	echo "Usage: `basename $0` { start | stop }" >&2
-	;;
-esac
-
-exit 0
diff --git a/mail/dovecot-devel/files/patch-allow-zero-gid b/mail/dovecot-devel/files/patch-allow-zero-gid
deleted file mode 100644
index ac8f08b63cab..000000000000
--- a/mail/dovecot-devel/files/patch-allow-zero-gid
+++ /dev/null
@@ -1,172 +0,0 @@
-Index: src/lib/restrict-access.c
-===================================================================
-RCS file: /home/cvs/dovecot/src/lib/restrict-access.c,v
-retrieving revision 1.10
-diff -u -3 -p -r1.10 restrict-access.c
---- src/lib/restrict-access.c	4 Mar 2003 04:00:13 -0000	1.10
-+++ src/lib/restrict-access.c	15 Apr 2003 17:37:26 -0000
-@@ -31,12 +31,14 @@
- #include <grp.h>
- 
- void restrict_access_set_env(const char *user, uid_t uid, gid_t gid,
--			     const char *chroot_dir)
-+		 	     const char *chroot_dir, int allow_zg)
- {
- 	if (user != NULL && *user != '\0')
- 		env_put(t_strconcat("RESTRICT_USER=", user, NULL));
- 	if (chroot_dir != NULL && *chroot_dir != '\0')
- 		env_put(t_strconcat("RESTRICT_CHROOT=", chroot_dir, NULL));
-+	if (allow_zg == TRUE)
-+		env_put(t_strdup("ALLOW_ZERO_GID=TRUE"));
- 
- 	env_put(t_strdup_printf("RESTRICT_SETUID=%s", dec2str(uid)));
- 	env_put(t_strdup_printf("RESTRICT_SETGID=%s", dec2str(gid)));
-@@ -45,6 +47,7 @@ void restrict_access_set_env(const char 
- void restrict_access_by_env(int disallow_root)
- {
- 	const char *env;
-+	int allow_zero_gid;
- 	gid_t gid;
- 	uid_t uid;
- 
-@@ -97,8 +100,14 @@ void restrict_access_by_env(int disallow
- 			i_fatal("We couldn't drop root privileges");
- 	}
- 
--	if ((gid != 0 && uid != 0) || disallow_root) {
-+	/* allow users with zero group id permission for BSD */
-+	env = getenv("ALLOW_ZERO_GID");
-+	allow_zero_gid = env == NULL ? FALSE : TRUE;
-+
-+	if (allow_zero_gid == FALSE &&
-+		((gid != 0 && uid != 0) || disallow_root)) {
- 		if (getgid() == 0 || getegid() == 0 || setgid(0) == 0)
- 			i_fatal("We couldn't drop root group privileges");
- 	}
-+
- }
-Index: src/lib/restrict-access.h
-===================================================================
-RCS file: /home/cvs/dovecot/src/lib/restrict-access.h,v
-retrieving revision 1.4
-diff -u -3 -p -r1.4 restrict-access.h
---- src/lib/restrict-access.h	4 Mar 2003 04:00:13 -0000	1.4
-+++ src/lib/restrict-access.h	15 Apr 2003 17:37:26 -0000
-@@ -4,7 +4,7 @@
- /* set environment variables so they can be read with
-    restrict_access_by_env() */
- void restrict_access_set_env(const char *user, uid_t uid, gid_t gid,
--			     const char *chroot_dir);
-+			     const char *chroot_dir, int allow_zg);
- 
- /* chroot, setuid() and setgid() based on environment variables.
-    If disallow_roots is TRUE, we'll kill ourself if we didn't have the
-Index: src/master/auth-process.c
-===================================================================
-RCS file: /home/cvs/dovecot/src/master/auth-process.c,v
-retrieving revision 1.41
-diff -u -3 -p -r1.41 auth-process.c
---- src/master/auth-process.c	2 Apr 2003 02:09:41 -0000	1.41
-+++ src/master/auth-process.c	15 Apr 2003 17:37:27 -0000
-@@ -307,7 +307,7 @@ static pid_t create_auth_process(struct 
- 
- 	/* setup access environment */
- 	restrict_access_set_env(group->set->user, pwd->pw_uid, pwd->pw_gid,
--				group->set->chroot);
-+				group->set->chroot, set->allow_zero_gid);
- 
- 	/* set other environment */
- 	env_put(t_strconcat("AUTH_PROCESS=", dec2str(getpid()), NULL));
-Index: src/master/login-process.c
-===================================================================
-RCS file: /home/cvs/dovecot/src/master/login-process.c,v
-retrieving revision 1.40
-diff -u -3 -p -r1.40 login-process.c
---- src/master/login-process.c	15 Apr 2003 16:58:48 -0000	1.40
-+++ src/master/login-process.c	15 Apr 2003 17:37:27 -0000
-@@ -384,7 +384,8 @@ static void login_process_init_env(struc
- 	   clean_child_process() since it clears environment */
- 	restrict_access_set_env(group->set->user,
- 				group->set->uid, set->login_gid,
--				set->login_chroot ? set->login_dir : NULL);
-+				set->login_chroot ? set->login_dir : NULL,
-+				FALSE);
- 
- 	env_put("DOVECOT_MASTER=1");
- 
-Index: src/master/mail-process.c
-===================================================================
-RCS file: /home/cvs/dovecot/src/master/mail-process.c,v
-retrieving revision 1.13
-diff -u -3 -p -r1.13 mail-process.c
---- src/master/mail-process.c	15 Apr 2003 16:58:48 -0000	1.13
-+++ src/master/mail-process.c	15 Apr 2003 17:37:28 -0000
-@@ -25,7 +25,7 @@ static int validate_uid_gid(uid_t uid, g
- 		return FALSE;
- 	}
- 
--	if (uid != 0 && gid == 0) {
-+	if (set->allow_zero_gid == FALSE && uid != 0 && gid == 0) {
- 		i_error("mail process isn't allowed to be in group 0");
- 		return FALSE;
- 	}
-@@ -38,8 +38,9 @@ static int validate_uid_gid(uid_t uid, g
- 		return FALSE;
- 	}
- 
--	if (gid < (gid_t)set->first_valid_gid ||
--	    (set->last_valid_gid != 0 && gid > (gid_t)set->last_valid_gid)) {
-+	if (set->allow_zero_gid == FALSE &&
-+	    (gid < (gid_t)set->first_valid_gid ||
-+	    (set->last_valid_gid != 0 && gid > (gid_t)set->last_valid_gid))) {
- 		i_error("mail process isn't allowed to use "
- 			"GID %s (UID is %s)", dec2str(gid), dec2str(uid));
- 		return FALSE;
-@@ -150,7 +151,8 @@ int create_mail_process(int socket, stru
- 	   (paranoia about filling up environment without noticing) */
- 	restrict_access_set_env(data + reply->system_user_idx,
- 				reply->uid, reply->gid,
--				reply->chroot ? data + reply->home_idx : NULL);
-+				reply->chroot ? data + reply->home_idx : NULL,
-+				set->allow_zero_gid);
- 
- 	restrict_process_size(process_size, (unsigned int)-1);
- 
-Index: src/master/master-settings.c
-===================================================================
-RCS file: /home/cvs/dovecot/src/master/master-settings.c,v
-retrieving revision 1.16
-diff -u -3 -p -r1.16 master-settings.c
---- src/master/master-settings.c	2 Apr 2003 02:09:41 -0000	1.16
-+++ src/master/master-settings.c	15 Apr 2003 17:37:28 -0000
-@@ -46,6 +46,7 @@ static struct setting_def setting_defs[]
- 	DEF(SET_INT, max_mail_processes),
- 	DEF(SET_BOOL, verbose_proctitle),
- 
-+	DEF(SET_BOOL, allow_zero_gid),
- 	DEF(SET_INT, first_valid_uid),
- 	DEF(SET_INT, last_valid_uid),
- 	DEF(SET_INT, first_valid_gid),
-@@ -153,6 +154,7 @@ struct settings default_settings = {
- 	MEMBER(max_mail_processes) 1024,
- 	MEMBER(verbose_proctitle) FALSE,
- 
-+	MEMBER(allow_zero_gid) FALSE,
- 	MEMBER(first_valid_uid) 500,
- 	MEMBER(last_valid_uid) 0,
- 	MEMBER(first_valid_gid) 1,
-Index: src/master/master-settings.h
-===================================================================
-RCS file: /home/cvs/dovecot/src/master/master-settings.h,v
-retrieving revision 1.10
-diff -u -3 -p -r1.10 master-settings.h
---- src/master/master-settings.h	2 Apr 2003 02:09:41 -0000	1.10
-+++ src/master/master-settings.h	15 Apr 2003 17:37:29 -0000
-@@ -32,6 +32,7 @@ struct settings {
- 	unsigned int max_mail_processes;
- 	int verbose_proctitle;
- 
-+	int allow_zero_gid;
- 	unsigned int first_valid_uid, last_valid_uid;
- 	unsigned int first_valid_gid, last_valid_gid;
- 
diff --git a/mail/dovecot-devel/files/patch-dovecot-example.conf b/mail/dovecot-devel/files/patch-dovecot-example.conf
deleted file mode 100644
index 21bd705f7319..000000000000
--- a/mail/dovecot-devel/files/patch-dovecot-example.conf
+++ /dev/null
@@ -1,193 +0,0 @@
---- dovecot-example.conf.orig	Fri Apr  4 13:17:25 2003
-+++ dovecot-example.conf	Sat Apr 19 14:11:40 2003
-@@ -7,11 +7,11 @@
- # --with-ssldir=/etc/ssl
- 
- # Base directory where to store runtime data.
--#base_dir = /var/run/dovecot/
-+base_dir = /var/dovecot/
- 
- # Protocols we want to be serving:
- #  imap imaps pop3 pop3s
--#protocols = imap imaps
-+protocols = imap pop3
- 
- # IP or host address where to listen in for connections. It's not currently
- # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
-@@ -27,18 +27,18 @@
- #pop3s_listen = 
- 
- # Disable SSL/TLS support.
--#ssl_disable = no
-+ssl_disable = yes
- 
- # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
- # dropping root privileges, so keep the key file unreadable by anyone but
- # root. Included doc/mkcert.sh can be used to easily generate self-signed
- # certificate, just make sure to update the domains in dovecot-openssl.cnf
--#ssl_cert_file = /etc/ssl/certs/dovecot.pem
--#ssl_key_file = /etc/ssl/private/dovecot.pem
-+ssl_cert_file = %%SSLDIR%%/certs/imapd.pem
-+ssl_key_file = %%SSLDIR%%/private/imapd.pem
- 
- # SSL parameter file. Master process generates this file for login processes.
- # It contains Diffie Hellman and RSA parameters.
--#ssl_parameters_file = /var/run/dovecot/ssl-parameters.dat
-+ssl_parameters_file = %%SSLDIR%%/parameters.dat
- 
- # How often to regenerate the SSL parameters file. Generation is quite CPU
- # intensive operation. The value is in hours, 0 disables regeneration
-@@ -67,11 +67,11 @@
- # Directory where authentication process places authentication UNIX sockets
- # which login needs to be able to connect to. The sockets are created when
- # running as root, so you don't have to worry about permissions.
--#login_dir = /var/run/dovecot/login
-+login_dir = /var/dovecot/login
- 
- # chroot login process to the login_dir. Only reason not to do this is if you
- # wish to run the whole Dovecot without roots.
--#login_chroot = yes
-+login_chroot = yes
- 
- 
- ##
-@@ -81,12 +81,12 @@
- login = imap
- 
- # Executable location.
--#login_executable = /usr/libexec/dovecot/imap-login
-+login_executable = %%PREFIX%%/libexec/dovecot/imap-login
- 
- # User to use for the login process. The user must belong to a group where
- # only it has access, it's used to control access for authentication process
- # named sockets.
--#login_user = dovecot
-+login_user = dovecot
- 
- # Set max. process size in megabytes. If you don't use
- # login_process_per_connection you might need to grow this.
-@@ -100,7 +100,7 @@
- 
- # Number of login processes to create. If login_process_per_user is
- # yes, this is the number of extra processes waiting for users to log in.
--#login_processes_count = 3
-+login_processes_count = 1
- 
- # Maximum number of extra login processes to create. The extra process count
- # usually stays at login_processes_count, but when multiple users start logging
-@@ -126,7 +126,7 @@
- login = pop3
- 
- # Exception to above rule being the executable location.
--#login_executable = /usr/libexec/dovecot/pop3-login
-+login_executable = %%PREFIX%%/libexec/dovecot/pop3-login
- 
- ##
- ## Mail processes
-@@ -139,10 +139,10 @@
- # Show more verbose process titles (in ps). Currently shows user name and
- # IP address. Useful for seeing who are actually using the IMAP processes
- # (eg. shared mailboxes or if same uid is used for multiple accounts).
--#verbose_proctitle = no
-+verbose_proctitle = yes
- 
- # Show protocol level SSL errors.
--#verbose_ssl = no
-+verbose_ssl = yes
- 
- # Valid UID/GID ranges for users, defaults to 500 and above. This is mostly
- # to make sure that users can't log in as daemons or other system users.
-@@ -160,7 +160,7 @@
- # WARNING: Never add directories here which local users can modify, that
- # may lead to root exploit. Usually this should be done only if you don't
- # allow shell access for users. See doc/configuration.txt for more information.
--#valid_chroot_dirs = 
-+valid_chroot_dirs = /var/mail
- 
- # Default MAIL environment to use when it's not set. By leaving this empty
- # dovecot tries to do some automatic detection as described in
-@@ -179,7 +179,7 @@
- #   mbox:~/mail/:INBOX=/var/mail/%u
- #   mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n
- #
--#default_mail_env = 
-+default_mail_env = mbox:/var/mail/%u
- 
- # Space-separated list of fields to cache for all mails. Currently these
- # fields are allowed followed by a list of commands they speed up:
-@@ -224,7 +224,7 @@
- #     arrives in half a hour, Dovecot closes the connection. This is still
- #     fine, except Outlook doesn't connect back so you don't see if new mail
- #     arrives.
--#client_workarounds = 
-+client_workarounds = oe6-fetch-no-newmail outlook-idle
- 
- # Dovecot can notify client of new mail in selected mailbox soon after it's
- # received. This setting specifies the minimum interval in seconds between
-@@ -249,7 +249,7 @@
- # Save mails with CR+LF instead of plain LF. This makes sending those mails
- # take less CPU, especially with sendfile() syscall with Linux and FreeBSD.
- # But it also creates a bit more disk I/O which may just make it slower.
--#mail_save_crlf = no
-+mail_save_crlf = yes
- 
- # Use mmap() instead of read() to read mail files. read() seems to be a bit
- # faster with my Linux/x86 and it's better with NFS, so that's the default.
-@@ -261,7 +261,7 @@
- # know any MUA which would modify mail files directly. IMAP protocol also
- # requires that the mails don't change, so it would be problematic in any case.
- # If you care about performance, enable it.
--#maildir_copy_with_hardlinks = no
-+maildir_copy_with_hardlinks = yes
- 
- # Check if mails' content has been changed by external programs. This slows
- # down things as extra stat() needs to be called for each file. If changes are
-@@ -280,7 +280,7 @@
- # with is important to avoid deadlocks if other MTAs/MUAs are using both fcntl
- # and flock. Some operating systems don't allow using both of them
- # simultaneously, eg. BSDs. If dotlock is used, it's always created first.
--#mbox_locks = dotlock fcntl
-+mbox_locks = fcntl
- 
- # Should we create dotlock file even when we want only a read-lock? Setting
- # this to yes hurts the performance when the mailbox is accessed simultaneously
-@@ -310,7 +310,7 @@
- ##
- 
- # Executable location
--#imap_executable = /usr/libexec/dovecot/imap
-+imap_executable = %%PREFIX%%/libexec/dovecot/imap
- 
- # Set max. process size in megabytes. Most of the memory goes to mmap()ing
- # files, so it shouldn't harm much even if this limit is set pretty high.
-@@ -321,7 +321,7 @@
- ##
- 
- # Executable location
--#pop3_executable = /usr/libexec/dovecot/pop3
-+pop3_executable = %%PREFIX%%/libexec/dovecot/pop3
- 
- # Set max. process size in megabytes. Most of the memory goes to mmap()ing
- # files, so it shouldn't harm much even if this limit is set pretty high.
-@@ -374,10 +374,10 @@
- #   vpopmail: vpopmail authentication
- #   ldap <config path>: LDAP, see doc/dovecot-ldap.conf
- #   pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf
--auth_passdb = pam
-+auth_passdb = passwd
- 
- # Executable location
--#auth_executable = /usr/libexec/dovecot/dovecot-auth
-+auth_executable = %%PREFIX%%/libexec/dovecot/dovecot-auth
- 
- # Set max. process size in megabytes.
- #auth_process_size = 256
-@@ -402,7 +402,7 @@
- 
- # More verbose logging. Useful for figuring out why authentication isn't
- # working.
--#auth_verbose = no
-+auth_verbose = yes
- 
- # digest-md5 authentication process. It requires special MD5 passwords which
- # /etc/shadow and PAM doesn't support, so we never need roots to handle it.
diff --git a/mail/dovecot-devel/files/patch-mkcert.sh b/mail/dovecot-devel/files/patch-mkcert.sh
deleted file mode 100644
index 1874649612a2..000000000000
--- a/mail/dovecot-devel/files/patch-mkcert.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/mkcert.sh	Tue Apr 15 14:28:24 2003
-+++ mkcert.sh.new	Tue Apr 15 14:28:52 2003
-@@ -4,7 +4,7 @@
- # Edit dovecot-openssl.cnf before running this.
- 
- OPENSSL=${OPENSSL-openssl}
--SSLDIR=${SSLDIR-/etc/ssl}
-+SSLDIR=${SSLDIR-%%SSLDIR%%}
- OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}
- 
- CERTFILE=$SSLDIR/certs/imapd.pem
diff --git a/mail/dovecot-devel/pkg-descr b/mail/dovecot-devel/pkg-descr
deleted file mode 100644
index f0c0d704eadc..000000000000
--- a/mail/dovecot-devel/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Dovecot is a secure and compact IMAP server which is in the early stages
-of developement. It supports Maildirs and mbox formats and much of the
-IMAP v4 protocol including SSL/TLS. IPv6 support is also included.
-
-WWW: http://dovecot.procontrol.fi/
diff --git a/mail/dovecot-devel/pkg-install b/mail/dovecot-devel/pkg-install
deleted file mode 100644
index fb261c272e6a..000000000000
--- a/mail/dovecot-devel/pkg-install
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local question default answer
-
-    question=$1
-    default=$2
-    while :; do
-        answer=$(ask "${question}" "${default}")
-        case "${answer}" in
-        [Yy]*)	return 0;;
-        [Nn]*)	return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    USER=dovecot
-    GROUP=dovecot
-
-    if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP} -h -
-	then
-	    echo "Added group \"${GROUP}\"."
-	else
-	    echo "Adding group \"${GROUP}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-        echo "You already have a user \"${USER}\", so I will use it."
-    else
-        if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \
-           -s /sbin/nologin \
-           -c "Dovecot"
-	then
-	    echo "Added user \"${USER}\"."
-	else
-	    echo "Adding user \"${USER}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
diff --git a/mail/dovecot-devel/pkg-message b/mail/dovecot-devel/pkg-message
deleted file mode 100644
index 682a74cbcd56..000000000000
--- a/mail/dovecot-devel/pkg-message
+++ /dev/null
@@ -1,22 +0,0 @@
----------------------------------------------------------------------
- 
- You can get default configured IMAP and POP3 services running by
- copying the following sample files to the given locations. In this
- simple configuration Dovecot will authenticate users against the
- systems passwd file and use the default /var/mail/$USER mbox files.
-
-  %%PREFIX%%/etc/dovecot-example.conf
-   -> %%PREFIX%%/etc/dovecot.conf
-  
-  %%PREFIX%%/etc/rc.d/dovecot.sh.sample
-   -> %%PREFIX%%/etc/rc.d/dovecot.sh
- 
- Further information on configuration can be found in:
-
-  %%PREFIX%%/share/doc/dovecot/
-
- FreeBSD specific information is covered in the following file:
-
-  %%PREFIX%%/share/doc/dovecot/README.FreeBSD
-
----------------------------------------------------------------------
diff --git a/mail/dovecot-devel/pkg-plist b/mail/dovecot-devel/pkg-plist
deleted file mode 100644
index 4af41f132065..000000000000
--- a/mail/dovecot-devel/pkg-plist
+++ /dev/null
@@ -1,22 +0,0 @@
-etc/dovecot-example.conf
-etc/rc.d/dovecot.sh.sample
-libexec/dovecot/imap
-libexec/dovecot/imap-login
-libexec/dovecot/pop3
-libexec/dovecot/pop3-login
-libexec/dovecot/dovecot-auth
-sbin/dovecot
-%%PORTDOCS%%share/doc/dovecot/auth.txt
-%%PORTDOCS%%share/doc/dovecot/design.txt
-%%PORTDOCS%%share/doc/dovecot/nfs.txt
-%%PORTDOCS%%share/doc/dovecot/index.txt
-%%PORTDOCS%%share/doc/dovecot/multiaccess.txt
-%%PORTDOCS%%share/doc/dovecot/configuration.txt
-%%PORTDOCS%%share/doc/dovecot/mail-storages.txt
-%%PORTDOCS%%share/doc/dovecot/dovecot-ldap.conf
-%%PORTDOCS%%share/doc/dovecot/dovecot-pgsql.conf
-%%PORTDOCS%%share/doc/dovecot/dovecot-openssl.cnf
-%%PORTDOCS%%share/doc/dovecot/mkcert.sh
-%%PORTDOCS%%share/doc/dovecot/README.FreeBSD
-%%PORTDOCS%%@dirrm share/doc/dovecot
-@dirrm libexec/dovecot
diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile
deleted file mode 100644
index 2836dbdf43f2..000000000000
--- a/mail/heirloom-mailx/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:	nail
-# Date created:		20 October 2000
-# Whom:			Kris Kennaway <kris@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	nail
-PORTVERSION=	10.5
-CATEGORIES=	mail
-MASTER_SITES=	http://omnibus.ruf.uni-freiburg.de/~gritter/archive/nail/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	BSD mail utility with MIME extensions
-
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -liconv"
-CONFIGURE_ARGS=	--with-rcfile="${PREFIX}/etc/nail.rc"
-
-MAN1=		nail.1
-
-.include <bsd.port.mk>
diff --git a/mail/heirloom-mailx/distinfo b/mail/heirloom-mailx/distinfo
deleted file mode 100644
index 195fc6998b61..000000000000
--- a/mail/heirloom-mailx/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (nail-10.5.tar.gz) = 6ee82ef58d761190ae54ee0f50506043
diff --git a/mail/heirloom-mailx/pkg-descr b/mail/heirloom-mailx/pkg-descr
deleted file mode 100644
index 49dcf73bbaff..000000000000
--- a/mail/heirloom-mailx/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-BSD mail utility with MIME extensions
-
-WWW: http://omnibus.ruf.uni-freiburg.de/~gritter/
diff --git a/mail/heirloom-mailx/pkg-plist b/mail/heirloom-mailx/pkg-plist
deleted file mode 100644
index 1dc97bf3c1b1..000000000000
--- a/mail/heirloom-mailx/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $FreeBSD$
-bin/nail
-etc/nail.rc
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
deleted file mode 100644
index bd198fa9961f..000000000000
--- a/mail/horde-turba/Makefile
+++ /dev/null
@@ -1,125 +0,0 @@
-# Ports collection makefile for:  turba
-# Date created:			  Sat Nov 16, 2001
-# Whom:				  Thierry Thomas (<thierry@thomas.as>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	turba
-PORTVERSION=	1.2
-CATEGORIES=	mail www
-MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
-		ftp://ftp.au.horde.org/pub/horde/turba/			\
-		ftp://ftp.es.horde.org/pub/turba/			\
-		ftp://ftp.it.horde.org/pub/mirror/horde.org/turba/	\
-		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/turba/	\
-		ftp://ftp.pt.horde.org/pub/horde-ftp/turba/
-
-MAINTAINER=	thierry@pompo.net
-COMMENT=	The Horde contact management application
-
-#-----------------------------------------------------------------------
-# You may define these options:
-#
-# - WITHOUT_LDAP        : if you do not need OpenLDAP;
-# - WITH_LDAP1          : if you prefer OpenLDAP1.
-#
-# - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree;
-#
-#-----------------------------------------------------------------------
-
-.if !defined(WITHOUT_LDAP)
-.if defined(WITH_LDAP1)
-LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12 \
-		lber.1:${PORTSDIR}/net/openldap12
-.else
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20 \
-		lber.2:${PORTSDIR}/net/openldap20
-.endif
-.endif
-
-RUN_DEPENDS+=  ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
-
-NO_BUILD=	yes
-USE_REINPLACE=	yes
-
-LDD=		/usr/bin/ldd
-
-REINPLACE_ARGS=	-i.beforeTurba
-DOCS=		COPYING README docs/CHANGES docs/CREDITS \
-		docs/INSTALL docs/LDAP docs/UPDATE docs/turba.dia docs/turba.pdf
-CONFFILE=	attributes.php conf.php html.php menu.php \
-		prefs.php sources.php
-SUB_DIRS=	config graphics lib locale scripts templates po
-
-LHORDEDIR?=	www/horde
-LTURBADIR?=	${LHORDEDIR}/turba
-
-PLIST_SUB=	HORDEDIR=${LHORDEDIR} TURBADIR=${LTURBADIR}
-
-HORDEDIR=	${PREFIX}/${LHORDEDIR}
-TURBADIR=	${PREFIX}/${LTURBADIR}
-CONFDIR=	${TURBADIR}/config
-
-HORDE_INC=	${LOCALBASE}/etc/horde
-.if defined(WITH_APACHE2)
-PHPSO=		${LOCALBASE}/libexec/apache2/libphp4.so
-.else
-PHPSO=		${LOCALBASE}/libexec/apache/libphp4.so
-.endif
-
-pre-install:
-.if !defined(WITHOUT_LDAP)
-.if defined(WITH_LDAP1)
-	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libldap.so.1"; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please configure PHP with OpenLDAP support." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	fi
-.else
-	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libldap.so.2"; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please configure PHP with OpenLDAP2 support." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	fi
-.endif
-.endif
-
-do-install:
-	@${MKDIR}  ${TURBADIR}
-.for REP in ${SUB_DIRS}
-	@${CP} -Rp ${WRKSRC}/${REP} ${TURBADIR}
-.endfor
-	@${CP} -p  ${WRKSRC}/*.php ${TURBADIR}
-.for FILE in ${CONFFILE}
-	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
-	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
-	fi
-.endfor
-	@${CHOWN} -R www:www ${TURBADIR}
-	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC}
-	@${REINPLACE_CMD} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g"	\
-		${HORDE_INC}/httpd.conf.turba
-	@${RM} ${HORDE_INC}/httpd.conf.turba.beforeTurba
-	@${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTTURBA::"			\
-		${HORDEDIR}/config/registry.php
-	@${CP} -p ${HORDEDIR}/config/registry.php			\
-		${HORDEDIR}/config/registry.php.afterTurba
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
-
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE} | \
-	${SED} -e "s:%%TURBADIR%%:${TURBADIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g"
-	@${ECHO_MSG}
-
-.include <bsd.port.mk>
diff --git a/mail/horde-turba/distinfo b/mail/horde-turba/distinfo
deleted file mode 100644
index 7b0acd968a67..000000000000
--- a/mail/horde-turba/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (turba-1.2.tar.gz) = 7c082cdbeb499eef99ff4dbf6b3608f5
diff --git a/mail/horde-turba/files/httpd.conf.turba b/mail/horde-turba/files/httpd.conf.turba
deleted file mode 100644
index f6674cbb9700..000000000000
--- a/mail/horde-turba/files/httpd.conf.turba
+++ /dev/null
@@ -1,31 +0,0 @@
-# This is included in Apache's httpd.conf for Turba
-#
-# For security, don't serve pages from the Turba configuration and
-# library directories.
-#
-<Directory "/home/httpd/html/horde/turba/config">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/lib">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/locale">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/po">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/scripts">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/templates">
-    order deny,allow
-    deny from all
-</Directory>
-# End of Turba configuration ================
-
diff --git a/mail/horde-turba/files/patch-aa b/mail/horde-turba/files/patch-aa
deleted file mode 100644
index 81d0eeaf6419..000000000000
--- a/mail/horde-turba/files/patch-aa
+++ /dev/null
@@ -1,7 +0,0 @@
---- config/conf.php.dist.orig	Fri Apr 12 18:21:30 2002
-+++ config/conf.php.dist	Sun May 19 00:11:06 2002
-@@ -30,3 +30,4 @@
- // example providing a link to IMP (an email program) would be:
- // $conf['menu']['apps'] = array('imp');
- $conf['menu']['apps'] = array();
-+//UNCOMMENTWHENINSTIMP$conf['menu']['apps'] = array('imp');
diff --git a/mail/horde-turba/files/patch-ab b/mail/horde-turba/files/patch-ab
deleted file mode 100644
index 4cfdc762ef3d..000000000000
--- a/mail/horde-turba/files/patch-ab
+++ /dev/null
@@ -1,48 +0,0 @@
---- config/sources.php.dist.orig	Mon Feb 10 02:14:22 2003
-+++ config/sources.php.dist	Tue Feb 25 21:51:29 2003
-@@ -140,10 +140,11 @@
-     'title' => 'My Addressbook',
-     'type' => 'sql',
-     'params' => array(
-+//      'phptype' => 'pgsql',
-         'phptype' => 'mysql',
-         'hostspec' => 'localhost',
--        'username' => 'horde',
--        'password' => '*****',
-+        'username' => 'hordemgr',
-+        'password' => 'hordemgr',
-         'database' => 'horde',
-         'table' => 'turba_objects'
-     ),
-@@ -181,6 +182,7 @@
-  * A local address book in an LDAP directory. This implements a public
-  * (shared) address book.
-  */
-+/*
- $cfgSources['localldap'] = array(
-     'title' => 'Shared Directory',
-     'type' => 'ldap',
-@@ -219,6 +221,7 @@
-     'admin' => array(),
-     'export' => true
- );
-+*/
- 
- /**
-  * A personal adressbook. This assumes that the login is
-@@ -229,6 +232,7 @@
-  */
- 
- // First we need to get the uid.
-+/*
- $uid = Auth::getAuth();
- preg_match('/(^.*)@/', $uid, $uid);
- $uid = $uid[1];
-@@ -284,6 +288,7 @@
-     'admin' => array($uid),
-     'export' => true
- );
-+*/
- 
- /**
-  * A preferences-based adressbook. This will always be private. You
diff --git a/mail/horde-turba/files/patch-ac b/mail/horde-turba/files/patch-ac
deleted file mode 100644
index 74914cb6d40e..000000000000
--- a/mail/horde-turba/files/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
---- config/prefs.php.dist.orig	Mon Oct 22 09:09:23 2001
-+++ config/prefs.php.dist	Sun Nov 18 01:21:42 2001
-@@ -16,4 +16,13 @@
-     'type' => 'select',
-     'desc' => _("Select your preferred language:")
- );
-+
-+// Addressbook
-+$_prefs['searchsource'] = array(
-+    'value' => 'localsql',
-+    'locked' => false,
-+    'shared' => true,
-+    'type' => 'select',
-+    'desc' => _("from")
-+);
- ?>
diff --git a/mail/horde-turba/pkg-deinstall b/mail/horde-turba/pkg-deinstall
deleted file mode 100644
index b0a141eef091..000000000000
--- a/mail/horde-turba/pkg-deinstall
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Backup Turba config files, if needed.
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-fi
-
-if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls ${PKG_PREFIX}/www/horde/turba/config/*php`; do
-    diff -bBqw $cf $cf.dist >/dev/null 2>&1
-    case $? in
-      0)  # original config file, will be deleted by pkg-plist
-          ;;
-      1)  # config file has been updated, must be backuped
-          cp -p $cf $cf.previous
-          echo "===> Backing-up..."
-          echo "--->   $cf has been saved ***"
-          echo "--->      as $cf.previous ***"
-          ;;
-      *)  # not found?
-          ;;
-    esac
-  done
-fi
diff --git a/mail/horde-turba/pkg-descr b/mail/horde-turba/pkg-descr
deleted file mode 100644
index 7ad5e825db08..000000000000
--- a/mail/horde-turba/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Turba is the Horde contact management application. It makes heavy use
-of the Horde framework to provide integration with other applications.
-
-Turba is a fairly complete basic contact management application.
-SQL and LDAP backends are available.
-You can define the fields in your addressbooks in a very flexible way,
-just by changing the config files.
-And there are Horde API functions to add and search for contacts.
-
-WWW: http://horde.org/turba/
diff --git a/mail/horde-turba/pkg-message b/mail/horde-turba/pkg-message
deleted file mode 100644
index f7cbdecc9737..000000000000
--- a/mail/horde-turba/pkg-message
+++ /dev/null
@@ -1,22 +0,0 @@
-************************************************************************
-Turba has been installed in %%TURBADIR%% with your blank
-configuration files.
-
-Horde must be configured; if not, see
-%%PORTSDIR%%/www/horde2/pkg-message.
-
-Then, you will have to tune the configuration files located in
-%%CONFDIR%%/, specially the files conf.php and
-sources.php.
-
-You have to create a table in your database; please see
-%%TURBADIR%%/scripts/drivers.
-You might create a LDAP schema: please see the doc LDAP.
-
-WARNING! if you are upgrading from Turba v. 1.1, you have to alter your
-******** schemas. Please read the doc UPDATE. An example is given for
-         MySQL in %%TURBADIR%%/scripts/drivers/:
-         - mysql_upgrade_1.1_to_1.2.sql.
-
-To protect your configuration files, you have to restart Apache.
-************************************************************************
diff --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist
deleted file mode 100644
index 0fd8edc857c5..000000000000
--- a/mail/horde-turba/pkg-plist
+++ /dev/null
@@ -1,276 +0,0 @@
-%%PORTDOCS%%share/doc/turba/CHANGES
-%%PORTDOCS%%share/doc/turba/COPYING
-%%PORTDOCS%%share/doc/turba/CREDITS
-%%PORTDOCS%%share/doc/turba/INSTALL
-%%PORTDOCS%%share/doc/turba/LDAP
-%%PORTDOCS%%share/doc/turba/README
-%%PORTDOCS%%share/doc/turba/UPDATE
-%%PORTDOCS%%share/doc/turba/turba.dia
-%%PORTDOCS%%share/doc/turba/turba.pdf
-%%TURBADIR%%/addobject.php
-%%TURBADIR%%/addobjectaction.php
-%%TURBADIR%%/advanced.php
-%%TURBADIR%%/browse.php
-%%TURBADIR%%/config/.htaccess
-%%TURBADIR%%/config/attributes.php
-%%TURBADIR%%/config/attributes.php.dist
-%%TURBADIR%%/config/conf.php
-%%TURBADIR%%/config/conf.php.dist
-%%TURBADIR%%/config/conf.php.dist.orig
-%%TURBADIR%%/config/html.php
-%%TURBADIR%%/config/html.php.dist
-%%TURBADIR%%/config/menu.php
-%%TURBADIR%%/config/menu.php.dist
-%%TURBADIR%%/config/prefs.php
-%%TURBADIR%%/config/prefs.php.dist
-%%TURBADIR%%/config/prefs.php.dist.orig
-%%TURBADIR%%/config/sources.php
-%%TURBADIR%%/config/sources.php.dist
-%%TURBADIR%%/config/sources.php.dist.orig
-%%TURBADIR%%/data.php
-%%TURBADIR%%/deleteobject.php
-%%TURBADIR%%/displayobject.php
-%%TURBADIR%%/editobject.php
-%%TURBADIR%%/editobjectaction.php
-%%TURBADIR%%/graphics/add.gif
-%%TURBADIR%%/graphics/checkbox.gif
-%%TURBADIR%%/graphics/close.gif
-%%TURBADIR%%/graphics/down.gif
-%%TURBADIR%%/graphics/group.gif
-%%TURBADIR%%/graphics/lhand.gif
-%%TURBADIR%%/graphics/map.gif
-%%TURBADIR%%/graphics/rhand.gif
-%%TURBADIR%%/graphics/search.gif
-%%TURBADIR%%/graphics/turba.gif
-%%TURBADIR%%/graphics/up.gif
-%%TURBADIR%%/graphics/user.gif
-%%TURBADIR%%/index.php
-%%TURBADIR%%/lib/.htaccess
-%%TURBADIR%%/lib/AbstractObject.php
-%%TURBADIR%%/lib/Driver.php
-%%TURBADIR%%/lib/Driver/ldap.php
-%%TURBADIR%%/lib/Driver/prefs.php
-%%TURBADIR%%/lib/Driver/sql.php
-%%TURBADIR%%/lib/Group.php
-%%TURBADIR%%/lib/List.php
-%%TURBADIR%%/lib/List/Plain.php
-%%TURBADIR%%/lib/List/Tree.php
-%%TURBADIR%%/lib/ListView.php
-%%TURBADIR%%/lib/ListView/Rolodex.php
-%%TURBADIR%%/lib/ListView/Tree.php
-%%TURBADIR%%/lib/Object.php
-%%TURBADIR%%/lib/ObjectView.php
-%%TURBADIR%%/lib/ObjectView/List.php
-%%TURBADIR%%/lib/ObjectView/PhotoID.php
-%%TURBADIR%%/lib/Source.php
-%%TURBADIR%%/lib/Turba.php
-%%TURBADIR%%/lib/api.php
-%%TURBADIR%%/lib/base.php
-%%TURBADIR%%/lib/version.php
-%%TURBADIR%%/locale/.htaccess
-%%TURBADIR%%/locale/bg_BG/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ca_ES/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/da_DK/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/de_DE/help.xml
-%%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/el_GR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/en_US/help.xml
-%%TURBADIR%%/locale/es_ES/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/et_EE/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/fi_FI/help.xml
-%%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ja_JP/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/lt_LT/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/lv_LV/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/nb_NO/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/nn_NO/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/pl_PL/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/pt_BR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/pt_PT/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ru_RU/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/sk_SK/help.xml
-%%TURBADIR%%/locale/sk_SK/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/sl_SI/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/sv_SE/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/uk_UA/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo
-%%TURBADIR%%/menu.php
-%%TURBADIR%%/po/.htaccess
-%%TURBADIR%%/po/Makefile
-%%TURBADIR%%/po/README
-%%TURBADIR%%/po/bg_BG.po
-%%TURBADIR%%/po/ca_ES.po
-%%TURBADIR%%/po/cs_CZ.po
-%%TURBADIR%%/po/da_DK.po
-%%TURBADIR%%/po/de_DE.po
-%%TURBADIR%%/po/el_GR.po
-%%TURBADIR%%/po/es_ES.po
-%%TURBADIR%%/po/et_EE.po
-%%TURBADIR%%/po/extract.pl
-%%TURBADIR%%/po/fi_FI.po
-%%TURBADIR%%/po/fr_FR.po
-%%TURBADIR%%/po/hu_HU.po
-%%TURBADIR%%/po/it_IT.po
-%%TURBADIR%%/po/ja_JP.po
-%%TURBADIR%%/po/ko_KR.po
-%%TURBADIR%%/po/lt_LT.po
-%%TURBADIR%%/po/lv_LV.po
-%%TURBADIR%%/po/nb_NO.po
-%%TURBADIR%%/po/nl_NL.po
-%%TURBADIR%%/po/nn_NO.po
-%%TURBADIR%%/po/pl_PL.po
-%%TURBADIR%%/po/pt_BR.po
-%%TURBADIR%%/po/pt_PT.po
-%%TURBADIR%%/po/ru_RU.po
-%%TURBADIR%%/po/ru_RU.KOI8-R.po
-%%TURBADIR%%/po/shtool
-%%TURBADIR%%/po/sk_SK.po
-%%TURBADIR%%/po/sl_SI.po
-%%TURBADIR%%/po/sv_SE.po
-%%TURBADIR%%/po/turba.pot
-%%TURBADIR%%/po/uk_UA.po
-%%TURBADIR%%/po/xgettext.sh
-%%TURBADIR%%/po/zh_CN.po
-%%TURBADIR%%/po/zh_TW.po
-%%TURBADIR%%/prefs.php
-%%TURBADIR%%/scripts/.htaccess
-%%TURBADIR%%/scripts/Turba.reg
-%%TURBADIR%%/scripts/drivers/mysql_create.sql
-%%TURBADIR%%/scripts/drivers/mysql_upgrade_1.1_to_1.2.sql
-%%TURBADIR%%/scripts/drivers/pgsql_create.sql
-%%TURBADIR%%/scripts/drivers/turba.sql
-%%TURBADIR%%/scripts/ldap/addou
-%%TURBADIR%%/scripts/ldap/addou.pl
-%%TURBADIR%%/scripts/ldap/core.schema.patch
-%%TURBADIR%%/search.php
-%%TURBADIR%%/status.php
-%%TURBADIR%%/templates/.htaccess
-%%TURBADIR%%/templates/add/add.inc
-%%TURBADIR%%/templates/add/noadd.inc
-%%TURBADIR%%/templates/add/select.inc
-%%TURBADIR%%/templates/advanced/criteria.inc
-%%TURBADIR%%/templates/advanced/foot.inc
-%%TURBADIR%%/templates/advanced/head.inc
-%%TURBADIR%%/templates/advanced/results_head.inc
-%%TURBADIR%%/templates/browse/actions.inc
-%%TURBADIR%%/templates/browse/column_footers.inc
-%%TURBADIR%%/templates/browse/column_headers.inc
-%%TURBADIR%%/templates/browse/contactrow.inc
-%%TURBADIR%%/templates/browse/footer.inc
-%%TURBADIR%%/templates/browse/header.inc
-%%TURBADIR%%/templates/browse/javascript.inc
-%%TURBADIR%%/templates/browse/search.inc
-%%TURBADIR%%/templates/browse/select.inc
-%%TURBADIR%%/templates/common-footer.inc
-%%TURBADIR%%/templates/common-header.inc
-%%TURBADIR%%/templates/data/export.inc
-%%TURBADIR%%/templates/data/import.inc
-%%TURBADIR%%/templates/display/display.inc
-%%TURBADIR%%/templates/edit/edit.inc
-%%TURBADIR%%/templates/index/css.inc
-%%TURBADIR%%/templates/index/notconfigured.inc
-%%TURBADIR%%/templates/menu/menu.inc
-%%TURBADIR%%/templates/miniwindow/frames.inc
-%%TURBADIR%%/templates/miniwindow/menu.inc
-%%TURBADIR%%/templates/prefs/columnselect.inc
-%%TURBADIR%%/templates/search/foot.inc
-%%TURBADIR%%/templates/search/head.inc
-%%TURBADIR%%/templates/search/row.inc
-%%TURBADIR%%/miniwindow.php
-etc/horde/httpd.conf.turba
-%%PORTDOCS%%@dirrm share/doc/turba
-@dirrm %%TURBADIR%%/config
-@dirrm %%TURBADIR%%/graphics
-@dirrm %%TURBADIR%%/lib/Driver
-@dirrm %%TURBADIR%%/lib/List
-@dirrm %%TURBADIR%%/lib/ListView
-@dirrm %%TURBADIR%%/lib/ObjectView
-@dirrm %%TURBADIR%%/lib
-@dirrm %%TURBADIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/bg_BG
-@dirrm %%TURBADIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ca_ES
-@dirrm %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/cs_CZ
-@dirrm %%TURBADIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/da_DK
-@dirrm %%TURBADIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/de_DE
-@dirrm %%TURBADIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/el_GR
-@dirrm %%TURBADIR%%/locale/en_US
-@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/es_ES
-@dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/et_EE
-@dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fi_FI
-@dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fr_FR
-@dirrm %%TURBADIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/hu_HU
-@dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/it_IT
-@dirrm %%TURBADIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ja_JP
-@dirrm %%TURBADIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ko_KR
-@dirrm %%TURBADIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/lt_LT
-@dirrm %%TURBADIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/lv_LV
-@dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nb_NO
-@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nl_NL
-@dirrm %%TURBADIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nn_NO
-@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pl_PL
-@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pt_BR
-@dirrm %%TURBADIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pt_PT
-@dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ru_RU
-@dirrm %%TURBADIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ru_RU.KOI8-R
-@dirrm %%TURBADIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sk_SK
-@dirrm %%TURBADIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sl_SI
-@dirrm %%TURBADIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sv_SE
-@dirrm %%TURBADIR%%/locale/uk_UA/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/uk_UA
-@dirrm %%TURBADIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/zh_CN
-@dirrm %%TURBADIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/zh_TW
-@dirrm %%TURBADIR%%/locale
-@dirrm %%TURBADIR%%/po
-@dirrm %%TURBADIR%%/scripts/drivers
-@dirrm %%TURBADIR%%/scripts/ldap
-@dirrm %%TURBADIR%%/scripts
-@dirrm %%TURBADIR%%/templates/add
-@dirrm %%TURBADIR%%/templates/advanced
-@dirrm %%TURBADIR%%/templates/browse
-@dirrm %%TURBADIR%%/templates/data
-@dirrm %%TURBADIR%%/templates/display
-@dirrm %%TURBADIR%%/templates/edit
-@dirrm %%TURBADIR%%/templates/index
-@dirrm %%TURBADIR%%/templates/menu
-@dirrm %%TURBADIR%%/templates/miniwindow
-@dirrm %%TURBADIR%%/templates/prefs
-@dirrm %%TURBADIR%%/templates/search
-@dirrm %%TURBADIR%%/templates
-@dirrm %%TURBADIR%%
-@unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterTurba; then rm -f %D/www/horde/config/registry.php.afterTurba; mv %D/www/horde/config/registry.php.beforeTurba %D/www/horde/config/registry.php; fi
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
deleted file mode 100644
index bd198fa9961f..000000000000
--- a/mail/horde4-turba/Makefile
+++ /dev/null
@@ -1,125 +0,0 @@
-# Ports collection makefile for:  turba
-# Date created:			  Sat Nov 16, 2001
-# Whom:				  Thierry Thomas (<thierry@thomas.as>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	turba
-PORTVERSION=	1.2
-CATEGORIES=	mail www
-MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
-		ftp://ftp.au.horde.org/pub/horde/turba/			\
-		ftp://ftp.es.horde.org/pub/turba/			\
-		ftp://ftp.it.horde.org/pub/mirror/horde.org/turba/	\
-		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/turba/	\
-		ftp://ftp.pt.horde.org/pub/horde-ftp/turba/
-
-MAINTAINER=	thierry@pompo.net
-COMMENT=	The Horde contact management application
-
-#-----------------------------------------------------------------------
-# You may define these options:
-#
-# - WITHOUT_LDAP        : if you do not need OpenLDAP;
-# - WITH_LDAP1          : if you prefer OpenLDAP1.
-#
-# - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree;
-#
-#-----------------------------------------------------------------------
-
-.if !defined(WITHOUT_LDAP)
-.if defined(WITH_LDAP1)
-LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12 \
-		lber.1:${PORTSDIR}/net/openldap12
-.else
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20 \
-		lber.2:${PORTSDIR}/net/openldap20
-.endif
-.endif
-
-RUN_DEPENDS+=  ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
-
-NO_BUILD=	yes
-USE_REINPLACE=	yes
-
-LDD=		/usr/bin/ldd
-
-REINPLACE_ARGS=	-i.beforeTurba
-DOCS=		COPYING README docs/CHANGES docs/CREDITS \
-		docs/INSTALL docs/LDAP docs/UPDATE docs/turba.dia docs/turba.pdf
-CONFFILE=	attributes.php conf.php html.php menu.php \
-		prefs.php sources.php
-SUB_DIRS=	config graphics lib locale scripts templates po
-
-LHORDEDIR?=	www/horde
-LTURBADIR?=	${LHORDEDIR}/turba
-
-PLIST_SUB=	HORDEDIR=${LHORDEDIR} TURBADIR=${LTURBADIR}
-
-HORDEDIR=	${PREFIX}/${LHORDEDIR}
-TURBADIR=	${PREFIX}/${LTURBADIR}
-CONFDIR=	${TURBADIR}/config
-
-HORDE_INC=	${LOCALBASE}/etc/horde
-.if defined(WITH_APACHE2)
-PHPSO=		${LOCALBASE}/libexec/apache2/libphp4.so
-.else
-PHPSO=		${LOCALBASE}/libexec/apache/libphp4.so
-.endif
-
-pre-install:
-.if !defined(WITHOUT_LDAP)
-.if defined(WITH_LDAP1)
-	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libldap.so.1"; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please configure PHP with OpenLDAP support." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	fi
-.else
-	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libldap.so.2"; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please configure PHP with OpenLDAP2 support." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	fi
-.endif
-.endif
-
-do-install:
-	@${MKDIR}  ${TURBADIR}
-.for REP in ${SUB_DIRS}
-	@${CP} -Rp ${WRKSRC}/${REP} ${TURBADIR}
-.endfor
-	@${CP} -p  ${WRKSRC}/*.php ${TURBADIR}
-.for FILE in ${CONFFILE}
-	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
-	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
-	fi
-.endfor
-	@${CHOWN} -R www:www ${TURBADIR}
-	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC}
-	@${REINPLACE_CMD} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g"	\
-		${HORDE_INC}/httpd.conf.turba
-	@${RM} ${HORDE_INC}/httpd.conf.turba.beforeTurba
-	@${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTTURBA::"			\
-		${HORDEDIR}/config/registry.php
-	@${CP} -p ${HORDEDIR}/config/registry.php			\
-		${HORDEDIR}/config/registry.php.afterTurba
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
-
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE} | \
-	${SED} -e "s:%%TURBADIR%%:${TURBADIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g"
-	@${ECHO_MSG}
-
-.include <bsd.port.mk>
diff --git a/mail/horde4-turba/distinfo b/mail/horde4-turba/distinfo
deleted file mode 100644
index 7b0acd968a67..000000000000
--- a/mail/horde4-turba/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (turba-1.2.tar.gz) = 7c082cdbeb499eef99ff4dbf6b3608f5
diff --git a/mail/horde4-turba/files/httpd.conf.turba b/mail/horde4-turba/files/httpd.conf.turba
deleted file mode 100644
index f6674cbb9700..000000000000
--- a/mail/horde4-turba/files/httpd.conf.turba
+++ /dev/null
@@ -1,31 +0,0 @@
-# This is included in Apache's httpd.conf for Turba
-#
-# For security, don't serve pages from the Turba configuration and
-# library directories.
-#
-<Directory "/home/httpd/html/horde/turba/config">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/lib">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/locale">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/po">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/scripts">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/turba/templates">
-    order deny,allow
-    deny from all
-</Directory>
-# End of Turba configuration ================
-
diff --git a/mail/horde4-turba/files/patch-aa b/mail/horde4-turba/files/patch-aa
deleted file mode 100644
index 81d0eeaf6419..000000000000
--- a/mail/horde4-turba/files/patch-aa
+++ /dev/null
@@ -1,7 +0,0 @@
---- config/conf.php.dist.orig	Fri Apr 12 18:21:30 2002
-+++ config/conf.php.dist	Sun May 19 00:11:06 2002
-@@ -30,3 +30,4 @@
- // example providing a link to IMP (an email program) would be:
- // $conf['menu']['apps'] = array('imp');
- $conf['menu']['apps'] = array();
-+//UNCOMMENTWHENINSTIMP$conf['menu']['apps'] = array('imp');
diff --git a/mail/horde4-turba/files/patch-ab b/mail/horde4-turba/files/patch-ab
deleted file mode 100644
index 4cfdc762ef3d..000000000000
--- a/mail/horde4-turba/files/patch-ab
+++ /dev/null
@@ -1,48 +0,0 @@
---- config/sources.php.dist.orig	Mon Feb 10 02:14:22 2003
-+++ config/sources.php.dist	Tue Feb 25 21:51:29 2003
-@@ -140,10 +140,11 @@
-     'title' => 'My Addressbook',
-     'type' => 'sql',
-     'params' => array(
-+//      'phptype' => 'pgsql',
-         'phptype' => 'mysql',
-         'hostspec' => 'localhost',
--        'username' => 'horde',
--        'password' => '*****',
-+        'username' => 'hordemgr',
-+        'password' => 'hordemgr',
-         'database' => 'horde',
-         'table' => 'turba_objects'
-     ),
-@@ -181,6 +182,7 @@
-  * A local address book in an LDAP directory. This implements a public
-  * (shared) address book.
-  */
-+/*
- $cfgSources['localldap'] = array(
-     'title' => 'Shared Directory',
-     'type' => 'ldap',
-@@ -219,6 +221,7 @@
-     'admin' => array(),
-     'export' => true
- );
-+*/
- 
- /**
-  * A personal adressbook. This assumes that the login is
-@@ -229,6 +232,7 @@
-  */
- 
- // First we need to get the uid.
-+/*
- $uid = Auth::getAuth();
- preg_match('/(^.*)@/', $uid, $uid);
- $uid = $uid[1];
-@@ -284,6 +288,7 @@
-     'admin' => array($uid),
-     'export' => true
- );
-+*/
- 
- /**
-  * A preferences-based adressbook. This will always be private. You
diff --git a/mail/horde4-turba/files/patch-ac b/mail/horde4-turba/files/patch-ac
deleted file mode 100644
index 74914cb6d40e..000000000000
--- a/mail/horde4-turba/files/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
---- config/prefs.php.dist.orig	Mon Oct 22 09:09:23 2001
-+++ config/prefs.php.dist	Sun Nov 18 01:21:42 2001
-@@ -16,4 +16,13 @@
-     'type' => 'select',
-     'desc' => _("Select your preferred language:")
- );
-+
-+// Addressbook
-+$_prefs['searchsource'] = array(
-+    'value' => 'localsql',
-+    'locked' => false,
-+    'shared' => true,
-+    'type' => 'select',
-+    'desc' => _("from")
-+);
- ?>
diff --git a/mail/horde4-turba/pkg-deinstall b/mail/horde4-turba/pkg-deinstall
deleted file mode 100644
index b0a141eef091..000000000000
--- a/mail/horde4-turba/pkg-deinstall
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Backup Turba config files, if needed.
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-fi
-
-if [ -z "${PACKAGE_BUILDING}" ]; then
-  for cf in `ls ${PKG_PREFIX}/www/horde/turba/config/*php`; do
-    diff -bBqw $cf $cf.dist >/dev/null 2>&1
-    case $? in
-      0)  # original config file, will be deleted by pkg-plist
-          ;;
-      1)  # config file has been updated, must be backuped
-          cp -p $cf $cf.previous
-          echo "===> Backing-up..."
-          echo "--->   $cf has been saved ***"
-          echo "--->      as $cf.previous ***"
-          ;;
-      *)  # not found?
-          ;;
-    esac
-  done
-fi
diff --git a/mail/horde4-turba/pkg-descr b/mail/horde4-turba/pkg-descr
deleted file mode 100644
index 7ad5e825db08..000000000000
--- a/mail/horde4-turba/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Turba is the Horde contact management application. It makes heavy use
-of the Horde framework to provide integration with other applications.
-
-Turba is a fairly complete basic contact management application.
-SQL and LDAP backends are available.
-You can define the fields in your addressbooks in a very flexible way,
-just by changing the config files.
-And there are Horde API functions to add and search for contacts.
-
-WWW: http://horde.org/turba/
diff --git a/mail/horde4-turba/pkg-message b/mail/horde4-turba/pkg-message
deleted file mode 100644
index f7cbdecc9737..000000000000
--- a/mail/horde4-turba/pkg-message
+++ /dev/null
@@ -1,22 +0,0 @@
-************************************************************************
-Turba has been installed in %%TURBADIR%% with your blank
-configuration files.
-
-Horde must be configured; if not, see
-%%PORTSDIR%%/www/horde2/pkg-message.
-
-Then, you will have to tune the configuration files located in
-%%CONFDIR%%/, specially the files conf.php and
-sources.php.
-
-You have to create a table in your database; please see
-%%TURBADIR%%/scripts/drivers.
-You might create a LDAP schema: please see the doc LDAP.
-
-WARNING! if you are upgrading from Turba v. 1.1, you have to alter your
-******** schemas. Please read the doc UPDATE. An example is given for
-         MySQL in %%TURBADIR%%/scripts/drivers/:
-         - mysql_upgrade_1.1_to_1.2.sql.
-
-To protect your configuration files, you have to restart Apache.
-************************************************************************
diff --git a/mail/horde4-turba/pkg-plist b/mail/horde4-turba/pkg-plist
deleted file mode 100644
index 0fd8edc857c5..000000000000
--- a/mail/horde4-turba/pkg-plist
+++ /dev/null
@@ -1,276 +0,0 @@
-%%PORTDOCS%%share/doc/turba/CHANGES
-%%PORTDOCS%%share/doc/turba/COPYING
-%%PORTDOCS%%share/doc/turba/CREDITS
-%%PORTDOCS%%share/doc/turba/INSTALL
-%%PORTDOCS%%share/doc/turba/LDAP
-%%PORTDOCS%%share/doc/turba/README
-%%PORTDOCS%%share/doc/turba/UPDATE
-%%PORTDOCS%%share/doc/turba/turba.dia
-%%PORTDOCS%%share/doc/turba/turba.pdf
-%%TURBADIR%%/addobject.php
-%%TURBADIR%%/addobjectaction.php
-%%TURBADIR%%/advanced.php
-%%TURBADIR%%/browse.php
-%%TURBADIR%%/config/.htaccess
-%%TURBADIR%%/config/attributes.php
-%%TURBADIR%%/config/attributes.php.dist
-%%TURBADIR%%/config/conf.php
-%%TURBADIR%%/config/conf.php.dist
-%%TURBADIR%%/config/conf.php.dist.orig
-%%TURBADIR%%/config/html.php
-%%TURBADIR%%/config/html.php.dist
-%%TURBADIR%%/config/menu.php
-%%TURBADIR%%/config/menu.php.dist
-%%TURBADIR%%/config/prefs.php
-%%TURBADIR%%/config/prefs.php.dist
-%%TURBADIR%%/config/prefs.php.dist.orig
-%%TURBADIR%%/config/sources.php
-%%TURBADIR%%/config/sources.php.dist
-%%TURBADIR%%/config/sources.php.dist.orig
-%%TURBADIR%%/data.php
-%%TURBADIR%%/deleteobject.php
-%%TURBADIR%%/displayobject.php
-%%TURBADIR%%/editobject.php
-%%TURBADIR%%/editobjectaction.php
-%%TURBADIR%%/graphics/add.gif
-%%TURBADIR%%/graphics/checkbox.gif
-%%TURBADIR%%/graphics/close.gif
-%%TURBADIR%%/graphics/down.gif
-%%TURBADIR%%/graphics/group.gif
-%%TURBADIR%%/graphics/lhand.gif
-%%TURBADIR%%/graphics/map.gif
-%%TURBADIR%%/graphics/rhand.gif
-%%TURBADIR%%/graphics/search.gif
-%%TURBADIR%%/graphics/turba.gif
-%%TURBADIR%%/graphics/up.gif
-%%TURBADIR%%/graphics/user.gif
-%%TURBADIR%%/index.php
-%%TURBADIR%%/lib/.htaccess
-%%TURBADIR%%/lib/AbstractObject.php
-%%TURBADIR%%/lib/Driver.php
-%%TURBADIR%%/lib/Driver/ldap.php
-%%TURBADIR%%/lib/Driver/prefs.php
-%%TURBADIR%%/lib/Driver/sql.php
-%%TURBADIR%%/lib/Group.php
-%%TURBADIR%%/lib/List.php
-%%TURBADIR%%/lib/List/Plain.php
-%%TURBADIR%%/lib/List/Tree.php
-%%TURBADIR%%/lib/ListView.php
-%%TURBADIR%%/lib/ListView/Rolodex.php
-%%TURBADIR%%/lib/ListView/Tree.php
-%%TURBADIR%%/lib/Object.php
-%%TURBADIR%%/lib/ObjectView.php
-%%TURBADIR%%/lib/ObjectView/List.php
-%%TURBADIR%%/lib/ObjectView/PhotoID.php
-%%TURBADIR%%/lib/Source.php
-%%TURBADIR%%/lib/Turba.php
-%%TURBADIR%%/lib/api.php
-%%TURBADIR%%/lib/base.php
-%%TURBADIR%%/lib/version.php
-%%TURBADIR%%/locale/.htaccess
-%%TURBADIR%%/locale/bg_BG/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ca_ES/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/da_DK/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/de_DE/help.xml
-%%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/el_GR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/en_US/help.xml
-%%TURBADIR%%/locale/es_ES/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/et_EE/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/fi_FI/help.xml
-%%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ja_JP/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/lt_LT/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/lv_LV/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/nb_NO/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/nn_NO/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/pl_PL/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/pt_BR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/pt_PT/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ru_RU/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/sk_SK/help.xml
-%%TURBADIR%%/locale/sk_SK/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/sl_SI/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/sv_SE/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/uk_UA/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo
-%%TURBADIR%%/menu.php
-%%TURBADIR%%/po/.htaccess
-%%TURBADIR%%/po/Makefile
-%%TURBADIR%%/po/README
-%%TURBADIR%%/po/bg_BG.po
-%%TURBADIR%%/po/ca_ES.po
-%%TURBADIR%%/po/cs_CZ.po
-%%TURBADIR%%/po/da_DK.po
-%%TURBADIR%%/po/de_DE.po
-%%TURBADIR%%/po/el_GR.po
-%%TURBADIR%%/po/es_ES.po
-%%TURBADIR%%/po/et_EE.po
-%%TURBADIR%%/po/extract.pl
-%%TURBADIR%%/po/fi_FI.po
-%%TURBADIR%%/po/fr_FR.po
-%%TURBADIR%%/po/hu_HU.po
-%%TURBADIR%%/po/it_IT.po
-%%TURBADIR%%/po/ja_JP.po
-%%TURBADIR%%/po/ko_KR.po
-%%TURBADIR%%/po/lt_LT.po
-%%TURBADIR%%/po/lv_LV.po
-%%TURBADIR%%/po/nb_NO.po
-%%TURBADIR%%/po/nl_NL.po
-%%TURBADIR%%/po/nn_NO.po
-%%TURBADIR%%/po/pl_PL.po
-%%TURBADIR%%/po/pt_BR.po
-%%TURBADIR%%/po/pt_PT.po
-%%TURBADIR%%/po/ru_RU.po
-%%TURBADIR%%/po/ru_RU.KOI8-R.po
-%%TURBADIR%%/po/shtool
-%%TURBADIR%%/po/sk_SK.po
-%%TURBADIR%%/po/sl_SI.po
-%%TURBADIR%%/po/sv_SE.po
-%%TURBADIR%%/po/turba.pot
-%%TURBADIR%%/po/uk_UA.po
-%%TURBADIR%%/po/xgettext.sh
-%%TURBADIR%%/po/zh_CN.po
-%%TURBADIR%%/po/zh_TW.po
-%%TURBADIR%%/prefs.php
-%%TURBADIR%%/scripts/.htaccess
-%%TURBADIR%%/scripts/Turba.reg
-%%TURBADIR%%/scripts/drivers/mysql_create.sql
-%%TURBADIR%%/scripts/drivers/mysql_upgrade_1.1_to_1.2.sql
-%%TURBADIR%%/scripts/drivers/pgsql_create.sql
-%%TURBADIR%%/scripts/drivers/turba.sql
-%%TURBADIR%%/scripts/ldap/addou
-%%TURBADIR%%/scripts/ldap/addou.pl
-%%TURBADIR%%/scripts/ldap/core.schema.patch
-%%TURBADIR%%/search.php
-%%TURBADIR%%/status.php
-%%TURBADIR%%/templates/.htaccess
-%%TURBADIR%%/templates/add/add.inc
-%%TURBADIR%%/templates/add/noadd.inc
-%%TURBADIR%%/templates/add/select.inc
-%%TURBADIR%%/templates/advanced/criteria.inc
-%%TURBADIR%%/templates/advanced/foot.inc
-%%TURBADIR%%/templates/advanced/head.inc
-%%TURBADIR%%/templates/advanced/results_head.inc
-%%TURBADIR%%/templates/browse/actions.inc
-%%TURBADIR%%/templates/browse/column_footers.inc
-%%TURBADIR%%/templates/browse/column_headers.inc
-%%TURBADIR%%/templates/browse/contactrow.inc
-%%TURBADIR%%/templates/browse/footer.inc
-%%TURBADIR%%/templates/browse/header.inc
-%%TURBADIR%%/templates/browse/javascript.inc
-%%TURBADIR%%/templates/browse/search.inc
-%%TURBADIR%%/templates/browse/select.inc
-%%TURBADIR%%/templates/common-footer.inc
-%%TURBADIR%%/templates/common-header.inc
-%%TURBADIR%%/templates/data/export.inc
-%%TURBADIR%%/templates/data/import.inc
-%%TURBADIR%%/templates/display/display.inc
-%%TURBADIR%%/templates/edit/edit.inc
-%%TURBADIR%%/templates/index/css.inc
-%%TURBADIR%%/templates/index/notconfigured.inc
-%%TURBADIR%%/templates/menu/menu.inc
-%%TURBADIR%%/templates/miniwindow/frames.inc
-%%TURBADIR%%/templates/miniwindow/menu.inc
-%%TURBADIR%%/templates/prefs/columnselect.inc
-%%TURBADIR%%/templates/search/foot.inc
-%%TURBADIR%%/templates/search/head.inc
-%%TURBADIR%%/templates/search/row.inc
-%%TURBADIR%%/miniwindow.php
-etc/horde/httpd.conf.turba
-%%PORTDOCS%%@dirrm share/doc/turba
-@dirrm %%TURBADIR%%/config
-@dirrm %%TURBADIR%%/graphics
-@dirrm %%TURBADIR%%/lib/Driver
-@dirrm %%TURBADIR%%/lib/List
-@dirrm %%TURBADIR%%/lib/ListView
-@dirrm %%TURBADIR%%/lib/ObjectView
-@dirrm %%TURBADIR%%/lib
-@dirrm %%TURBADIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/bg_BG
-@dirrm %%TURBADIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ca_ES
-@dirrm %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/cs_CZ
-@dirrm %%TURBADIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/da_DK
-@dirrm %%TURBADIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/de_DE
-@dirrm %%TURBADIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/el_GR
-@dirrm %%TURBADIR%%/locale/en_US
-@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/es_ES
-@dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/et_EE
-@dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fi_FI
-@dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/fr_FR
-@dirrm %%TURBADIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/hu_HU
-@dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/it_IT
-@dirrm %%TURBADIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ja_JP
-@dirrm %%TURBADIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ko_KR
-@dirrm %%TURBADIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/lt_LT
-@dirrm %%TURBADIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/lv_LV
-@dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nb_NO
-@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nl_NL
-@dirrm %%TURBADIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nn_NO
-@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pl_PL
-@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pt_BR
-@dirrm %%TURBADIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/pt_PT
-@dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ru_RU
-@dirrm %%TURBADIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/ru_RU.KOI8-R
-@dirrm %%TURBADIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sk_SK
-@dirrm %%TURBADIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sl_SI
-@dirrm %%TURBADIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/sv_SE
-@dirrm %%TURBADIR%%/locale/uk_UA/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/uk_UA
-@dirrm %%TURBADIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/zh_CN
-@dirrm %%TURBADIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/zh_TW
-@dirrm %%TURBADIR%%/locale
-@dirrm %%TURBADIR%%/po
-@dirrm %%TURBADIR%%/scripts/drivers
-@dirrm %%TURBADIR%%/scripts/ldap
-@dirrm %%TURBADIR%%/scripts
-@dirrm %%TURBADIR%%/templates/add
-@dirrm %%TURBADIR%%/templates/advanced
-@dirrm %%TURBADIR%%/templates/browse
-@dirrm %%TURBADIR%%/templates/data
-@dirrm %%TURBADIR%%/templates/display
-@dirrm %%TURBADIR%%/templates/edit
-@dirrm %%TURBADIR%%/templates/index
-@dirrm %%TURBADIR%%/templates/menu
-@dirrm %%TURBADIR%%/templates/miniwindow
-@dirrm %%TURBADIR%%/templates/prefs
-@dirrm %%TURBADIR%%/templates/search
-@dirrm %%TURBADIR%%/templates
-@dirrm %%TURBADIR%%
-@unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterTurba; then rm -f %D/www/horde/config/registry.php.afterTurba; mv %D/www/horde/config/registry.php.beforeTurba %D/www/horde/config/registry.php; fi
diff --git a/mail/mew3-emacs20/Makefile b/mail/mew3-emacs20/Makefile
deleted file mode 100644
index edd292160546..000000000000
--- a/mail/mew3-emacs20/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# New ports collection makefile for: Mew (for xemacs21)
-# Date created:		21 November 1997
-# Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
-#
-# $FreeBSD$
-#
-
-MAINTAINER?=	kiri@FreeBSD.org
-COMMENT=	Message interface to Emacs Window (version 2) for emacs20
-
-# Mew major version
-MEW_MAJOR_VER?=	2
-
-# This is a slave port.
-MASTERDIR=	${.CURDIR}/../mew${MEW_MAJOR_VER}
-
-# use pkg-* files in ${.CURDIR}
-PKGDIR=		${.CURDIR}
-
-# set emacs port
-EMACS_PORT_NAME=	emacs20
-
-.include "${MASTERDIR}/Makefile"
diff --git a/mail/mew3-emacs20/pkg-descr b/mail/mew3-emacs20/pkg-descr
deleted file mode 100644
index eb6791574b91..000000000000
--- a/mail/mew3-emacs20/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-Mew is a "Message interface to Emacs Window" to integrate
-
-   - Email
-   - MIME(Multipurpose Internet Mail Extensions)
-   - PGP(Pretty Good Privacy)
-
-and to make it easy to view and compose them. With Mew you can send a
-picture of a birthday cake with the song "Happy Birthday to you" to your
-friend, which is encrypted by strong cryptograph.
-
-This port is the Mew2(Mew with version 2) for emacs-20.7(editors/emacs20). 
-The Mew2 port and corresponding Emacs port are listed bellow and elisp
-`site-lisp' directory(elisp load path), info path and etc directory(only
-effective for xemacs ports) are shown as well. 
-
-mail/mew2-emacs20(mew-emacs20-2.0) ===> editors/emacs20(emacs-20.7) 
-	Lisp directory : /usr/local/share/emacs/site-lisp/mew
-	Info directory : /usr/local/info
-	ETC directory  : /usr/local/share/emacs/etc/mew
diff --git a/mail/mew3-emacs20/pkg-message b/mail/mew3-emacs20/pkg-message
deleted file mode 100644
index 7e59eb498790..000000000000
--- a/mail/mew3-emacs20/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-*************************************************************************
-* You must set at least following elisps to your own dot.emacs file:    *
-*                                                                       *
-*       (autoload 'mew "mew" nil t)                                     *
-*       (autoload 'mew-send "mew" nil t)                                *
-*       (setq mew-mail-domain "domain of e-mail address")               *
-*       (setq mew-pop-server "your POP server")     ;; if not localhost *
-*       (setq mew-smtp-server "your SMTP server")   ;; if not localhost *
-*       (setq mew-prog-pgpkey      "fetch")         ;; for PGP use      *
-*       (setq mew-prog-pgpkey-arg  '("-q" "-o" "-"));; for PGP use      *
-*                                                                       *
-*************************************************************************
diff --git a/mail/mew3-emacs20/pkg-plist b/mail/mew3-emacs20/pkg-plist
deleted file mode 100644
index 2e7a38b4494e..000000000000
--- a/mail/mew3-emacs20/pkg-plist
+++ /dev/null
@@ -1,177 +0,0 @@
-bin/incm
-bin/mewcat
-bin/mewdecode
-bin/mewencode
-bin/mewls
-@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
-@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
-info/mew%%MEW_MAJOR_VER%%.info
-info/mew%%MEW_MAJOR_VER%%.info-1
-info/mew%%MEW_MAJOR_VER%%.info-2
-info/mew%%MEW_MAJOR_VER%%.info-3
-info/mew%%MEW_MAJOR_VER%%.jis.info
-info/mew%%MEW_MAJOR_VER%%.jis.info-1
-info/mew%%MEW_MAJOR_VER%%.jis.info-2
-info/mew%%MEW_MAJOR_VER%%.jis.info-3
-@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
-@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
-share/doc/mew%%MEW_MAJOR_VER%%/00api
-share/doc/mew%%MEW_MAJOR_VER%%/00changes
-share/doc/mew%%MEW_MAJOR_VER%%/00copyright
-share/doc/mew%%MEW_MAJOR_VER%%/00copyright.jis
-share/doc/mew%%MEW_MAJOR_VER%%/00diff
-share/doc/mew%%MEW_MAJOR_VER%%/00readme
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme-namazu.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-browse.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-caesar.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-fancy-summary.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-gnus.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz-fixer.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-refile-view.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-smime-ja.texi
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.img
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.png
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.xbm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/COLOR
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-Plain.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-curr.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-folder.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-inc2.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-kill.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Audio.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Blank.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-External.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Folder.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Image.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Octet-Stream.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Postscript.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Rfc822.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Text.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Unknown.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Video.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-attach.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-cite.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-comp.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-forward.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-inc.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-next.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-pgp-enc.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-pgp-sigenc.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-pgp-sign.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-prev.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-queue.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-refile.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-reply.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-send.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-sep.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-show.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-write.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-yank.xpm
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-addrbook.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-addrbook.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-attach.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-attach.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-auth.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-auth.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-blvs.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-blvs.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-bq.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-bq.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-cache.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-cache.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-complete.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-complete.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-config.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-config.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-const.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-const.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-decode.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-decode.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-demo.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-demo.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-draft.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-draft.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-edit.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-edit.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-encode.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-encode.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-env.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-env.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-ext.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-ext.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-fib.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-fib.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-func.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-func.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-gemacs.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-header.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-header.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-highlight.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-highlight.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-key.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-key.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-lang-jp.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mark.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mark.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-md5.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-message.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-message.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mime.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mime.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-minibuf.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-minibuf.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mule.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mule0.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mule3.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-nntp.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-nntp.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-pgp.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-pgp.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-pick.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-pick.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-pop.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-pop.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-refile.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-refile.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-scan.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-scan.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-smime.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-smime.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-smtp.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-smtp.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-sort.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-sort.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-ssh.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-ssh.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-summary.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-summary.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-syntax.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-syntax.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-temacs.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-theme.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-theme.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-thread.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-thread.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-unix.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-vars.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-vars2.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-vars2.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-virtual.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-virtual.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-win32.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-xemacs.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_LIBDIR%%/site-lisp 2>/dev/null || true
-@dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc
-@dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true
-@dirrm share/doc/mew%%MEW_MAJOR_VER%%/contrib
-@dirrm share/doc/mew%%MEW_MAJOR_VER%%
diff --git a/mail/mew3-xemacs21-mule/Makefile b/mail/mew3-xemacs21-mule/Makefile
deleted file mode 100644
index c2459f27255e..000000000000
--- a/mail/mew3-xemacs21-mule/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# New ports collection makefile for: Mew (for xemacs21-mule)
-# Date created:		17 January 1998
-# Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
-#
-# $FreeBSD$
-#
-
-MAINTAINER=	kiri@FreeBSD.org
-COMMENT=	Message interface to Emacs Window (version 2) for xemacs21-mule
-
-# Mew major version
-MEW_MAJOR_VER=	2
-
-# This is a slave port.
-MASTERDIR=	${.CURDIR}/../mew${MEW_MAJOR_VER}
-
-# Set emacs port
-EMACS_PORT_NAME=	xemacs21-mule
-EMACS_PACKAGESDIR=	${EMACS_LIBDIR}/site-packages
-
-# Has common part
-EMACS_COMMON_PORT=	YES
-
-SCRIPTS_ENV=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
-MAKE_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} XEMACS_PKGNAME=${XEMACS_PKGNAME} \
-		XEMACS_PKGVER=${XEMACS_PKGVER} \
-		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
-PLIST_SUB=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
-
-# use pkg-* files in ${.CURDIR}
-PKGDIR=		${.CURDIR}
-
-# how to install
-ALL_TARGET=	package info jinfo
-INSTALL_TARGET=	install-mule-package
-
-# for xemacs package
-XEMACS_PKGNAME=	mew${MEW_MAJOR_VER}
-XEMACS_PKGVER=	2.00
-#MEW_DOCDIR=	${EMACS_PACKAGESDIR}/etc/${XEMACS_PKGNAME}
-
-.include "${MASTERDIR}/Makefile"
diff --git a/mail/mew3-xemacs21-mule/pkg-descr b/mail/mew3-xemacs21-mule/pkg-descr
deleted file mode 100644
index f08121f9940a..000000000000
--- a/mail/mew3-xemacs21-mule/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-Mew is a "Message interface to Emacs Window" to integrate
-
-   - Email
-   - MIME(Multipurpose Internet Mail Extensions)
-   - PGP(Pretty Good Privacy)
-
-and to make it easy to view and compose them. With Mew you can send a
-picture of a birthday cake with the song "Happy Birthday to you" to your
-friend, which is encrypted by strong cryptograph.
-
-This port is the Mew2(Mew with version 2) for xemacs-21.1.14(editors/xemacs21-mule). 
-The Mew2 port and corresponding Emacs port are listed bellow and elisp
-`site-lisp' directory(elisp load path), info path and etc directory(only
-effective for xemacs ports) are shown as well. 
-
-mail/mew2-xemacs21-mule(mew-xemacs21-mule-2.0) ===> editors/xemacs21-mule(xemacs-21.1.14) 
-	Lisp directory : /usr/local/lib/xemacs/site-packages/lisp/mew2
-	Info directory : /usr/local/lib/xemacs/site-packages/info
-	ETC directory  : /usr/local/lib/xemacs/site-packages/etc/mew2
diff --git a/mail/mew3-xemacs21-mule/pkg-message b/mail/mew3-xemacs21-mule/pkg-message
deleted file mode 100644
index 575fbc4093d6..000000000000
--- a/mail/mew3-xemacs21-mule/pkg-message
+++ /dev/null
@@ -1,13 +0,0 @@
-*************************************************************************
-* You must set at least following elisps to your own dot.emacs file:    *
-*                                                                       *
-*       (autoload 'mew "mew" nil t)                                     *
-*       (autoload 'mew-send "mew" nil t)                                *
-*       (setq mew-mail-domain "domain of e-mail address")               *
-*       (setq mew-pop-server "your POP server")    ;; if not localhost  *
-*       (setq mew-smtp-server "your SMTP server")  ;; if not localhost  *
-*       (setq mew-icon-directory "icon directory") ;; if using XEmacs   *
-*       (setq mew-prog-pgpkey      "fetch")         ;; for PGP use      *
-*       (setq mew-prog-pgpkey-arg  '("-q" "-o" "-"));; for PGP use      *
-*                                                                       *
-*************************************************************************
diff --git a/mail/mew3-xemacs21-mule/pkg-plist b/mail/mew3-xemacs21-mule/pkg-plist
deleted file mode 100644
index d0fb8163dc30..000000000000
--- a/mail/mew3-xemacs21-mule/pkg-plist
+++ /dev/null
@@ -1,186 +0,0 @@
-bin/incm
-bin/mewcat
-bin/mewdecode
-bin/mewencode
-bin/mewls
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.img
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.png
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.xbm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/COLOR
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-Plain.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-curr.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-folder.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-inc2.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-kill.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Audio.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Blank.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-External.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Folder.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Image.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Octet-Stream.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Postscript.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Rfc82%%MEW_MAJOR_VER%%.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Text.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Unknown.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Video.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-attach.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-cite.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-comp.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-forward.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-inc.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-next.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-pgp-enc.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-pgp-sigenc.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-pgp-sign.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-prev.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-queue.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-refile.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-reply.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-send.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-sep.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-show.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-write.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-yank.xpm
-%%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.info
-%%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.info-1
-%%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.info-2
-%%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.info-3
-%%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.jis.info
-%%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.jis.info-1
-%%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.jis.info-2
-%%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.jis.info-3
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/_pkg.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/auto-autoloads.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/auto-autoloads.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/custom-load.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/custom-load.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-addrbook.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-addrbook.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-attach.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-attach.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-auth.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-auth.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-blvs.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-blvs.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-bq.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-bq.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-cache.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-cache.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-complete.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-complete.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-config.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-config.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-const.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-const.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-decode.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-decode.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-demo.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-demo.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-draft.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-draft.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-edit.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-edit.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-encode.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-encode.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-env.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-env.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-ext.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-ext.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-fib.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-fib.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-func.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-func.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-gemacs.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-header.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-header.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-highlight.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-highlight.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-key.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-key.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-lang-jp.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-mark.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-mark.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-md5.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-md5.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-message.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-message.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-mime.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-mime.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-minibuf.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-minibuf.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-mule.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-mule0.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-mule3.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-nntp.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-nntp.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-pgp.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-pgp.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-pick.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-pick.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-pop.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-pop.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-refile.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-refile.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-scan.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-scan.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-smime.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-smime.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-smtp.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-smtp.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-sort.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-sort.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-ssh.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-ssh.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-summary.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-summary.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-syntax.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-syntax.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-temacs.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-theme.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-theme.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-thread.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-thread.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-unix.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-vars.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-vars.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-vars2.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-vars2.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-virtual.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-virtual.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-win32.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-xemacs.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew.elc
-%%EMACS_PACKAGESDIR%%/man/mew%%MEW_MAJOR_VER%%/00readme
-%%EMACS_PACKAGESDIR%%/man/mew%%MEW_MAJOR_VER%%/mew.texi
-%%EMACS_PACKAGESDIR%%/pkginfo/MANIFEST.mew%%MEW_MAJOR_VER%%
-share/doc/mew%%MEW_MAJOR_VER%%/00api
-share/doc/mew%%MEW_MAJOR_VER%%/00changes
-share/doc/mew%%MEW_MAJOR_VER%%/00copyright
-share/doc/mew%%MEW_MAJOR_VER%%/00copyright.jis
-share/doc/mew%%MEW_MAJOR_VER%%/00diff
-share/doc/mew%%MEW_MAJOR_VER%%/00readme
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme-namazu.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-browse.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-caesar.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-fancy-summary.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-gnus.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz-fixer.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-refile-view.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-smime-ja.texi
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
-@dirrm share/doc/mew%%MEW_MAJOR_VER%%/contrib
-@dirrm share/doc/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/pkginfo 2>/dev/null || true
-@dirrm %%EMACS_PACKAGESDIR%%/man/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/man 2>/dev/null || true
-@dirrm %%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/lisp 2>/dev/null || true
-@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/info 2>/dev/null || true
-@dirrm %%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc
-@dirrm %%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/etc 2>/dev/null || true
-@unexec rmdir %D/%%EMACS_PACKAGESDIR%% 2>/dev/null || true
diff --git a/mail/mew3-xemacs21/Makefile b/mail/mew3-xemacs21/Makefile
deleted file mode 100644
index 124b260b4488..000000000000
--- a/mail/mew3-xemacs21/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for: Mew (for xemacs21)
-# Date created:		17 January 1998
-# Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
-#
-# $FreeBSD$
-#
-
-MAINTAINER=	kiri@FreeBSD.org
-COMMENT=	Message interface to Emacs Window (version 2) for xemacs21
-
-# Mew major version
-MEW_MAJOR_VER=	2
-
-# This is a slave port.
-MASTERDIR=	${.CURDIR}/../mew${MEW_MAJOR_VER}
-
-# set emacs port
-EMACS_PORT_NAME=	xemacs21
-EMACS_PACKAGESDIR=	${EMACS_LIBDIR}/site-packages
-
-SCRIPTS_ENV=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
-MAKE_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} XEMACS_PKGNAME=${XEMACS_PKGNAME} \
-		XEMACS_PKGVER=${XEMACS_PKGVER} \
-		EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
-PLIST_SUB=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
-
-# use pkg-* files in ${.CURDIR}
-PKGDIR=		${.CURDIR}
-
-# how to install
-ALL_TARGET=	package info
-INSTALL_TARGET=	install-package
-
-# for xemacs package
-XEMACS_PKGNAME=	mew${MEW_MAJOR_VER}
-XEMACS_PKGVER=	2.00
-#MEW_DOCDIR=	${EMACS_PACKAGESDIR}/etc/${XEMACS_PKGNAME}
-
-.include "${MASTERDIR}/Makefile"
diff --git a/mail/mew3-xemacs21/pkg-descr b/mail/mew3-xemacs21/pkg-descr
deleted file mode 100644
index 28249daa43cd..000000000000
--- a/mail/mew3-xemacs21/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-Mew is a "Message interface to Emacs Window" to integrate
-
-   - Email
-   - MIME(Multipurpose Internet Mail Extensions)
-   - PGP(Pretty Good Privacy)
-
-and to make it easy to view and compose them. With Mew you can send a
-picture of a birthday cake with the song "Happy Birthday to you" to your
-friend, which is encrypted by strong cryptograph.
-
-This port is the Mew2(Mew with version 2) for xemacs-21.1.14(editors/xemacs21). 
-The Mew2 port and corresponding Emacs port are listed bellow and elisp
-`site-lisp' directory(elisp load path), info path and etc directory(only
-effective for xemacs ports) are shown as well. 
-
-mail/mew2-xemacs21(mew-xemacs21-2.0) ===> editors/xemacs21(xemacs-21.1.14) 
-	Lisp directory : /usr/local/lib/xemacs/site-packages/lisp/mew2
-	Info directory : /usr/local/lib/xemacs/site-packages/info
-	ETC directory  : /usr/local/lib/xemacs/site-packages/etc/mew2
diff --git a/mail/mew3-xemacs21/pkg-message b/mail/mew3-xemacs21/pkg-message
deleted file mode 100644
index 575fbc4093d6..000000000000
--- a/mail/mew3-xemacs21/pkg-message
+++ /dev/null
@@ -1,13 +0,0 @@
-*************************************************************************
-* You must set at least following elisps to your own dot.emacs file:    *
-*                                                                       *
-*       (autoload 'mew "mew" nil t)                                     *
-*       (autoload 'mew-send "mew" nil t)                                *
-*       (setq mew-mail-domain "domain of e-mail address")               *
-*       (setq mew-pop-server "your POP server")    ;; if not localhost  *
-*       (setq mew-smtp-server "your SMTP server")  ;; if not localhost  *
-*       (setq mew-icon-directory "icon directory") ;; if using XEmacs   *
-*       (setq mew-prog-pgpkey      "fetch")         ;; for PGP use      *
-*       (setq mew-prog-pgpkey-arg  '("-q" "-o" "-"));; for PGP use      *
-*                                                                       *
-*************************************************************************
diff --git a/mail/mew3-xemacs21/pkg-plist b/mail/mew3-xemacs21/pkg-plist
deleted file mode 100644
index 7e5b2d7b4d2a..000000000000
--- a/mail/mew3-xemacs21/pkg-plist
+++ /dev/null
@@ -1,182 +0,0 @@
-bin/incm
-bin/mewcat
-bin/mewdecode
-bin/mewencode
-bin/mewls
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.img
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.png
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.xbm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/COLOR
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-Plain.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-curr.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-folder.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-inc2.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-kill.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Audio.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Blank.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-External.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Folder.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Image.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Octet-Stream.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Postscript.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Rfc82%%MEW_MAJOR_VER%%.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Text.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Unknown.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Video.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-attach.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-cite.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-comp.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-forward.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-inc.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-next.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-pgp-enc.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-pgp-sigenc.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-pgp-sign.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-prev.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-queue.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-refile.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-reply.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-send.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-sep.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-show.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-write.xpm
-%%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-yank.xpm
-%%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.info
-%%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.info-1
-%%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.info-2
-%%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.info-3
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/_pkg.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/auto-autoloads.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/auto-autoloads.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/custom-load.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/custom-load.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-addrbook.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-addrbook.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-attach.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-attach.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-auth.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-auth.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-blvs.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-blvs.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-bq.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-bq.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-cache.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-cache.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-complete.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-complete.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-config.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-config.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-const.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-const.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-decode.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-decode.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-demo.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-demo.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-draft.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-draft.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-edit.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-edit.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-encode.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-encode.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-env.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-env.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-ext.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-ext.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-fib.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-fib.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-func.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-func.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-gemacs.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-header.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-header.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-highlight.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-highlight.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-key.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-key.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-lang-jp.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-mark.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-mark.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-md5.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-md5.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-message.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-message.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-mime.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-mime.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-minibuf.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-minibuf.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-mule.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-mule0.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-mule3.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-nntp.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-nntp.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-pgp.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-pgp.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-pick.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-pick.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-pop.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-pop.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-refile.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-refile.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-scan.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-scan.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-smime.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-smime.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-smtp.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-smtp.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-sort.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-sort.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-ssh.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-ssh.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-summary.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-summary.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-syntax.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-syntax.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-temacs.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-theme.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-theme.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-thread.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-thread.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-unix.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-vars.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-vars.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-vars2.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-vars2.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-virtual.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-virtual.elc
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-win32.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew-xemacs.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew.el
-%%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/mew.elc
-%%EMACS_PACKAGESDIR%%/man/mew%%MEW_MAJOR_VER%%/00readme
-%%EMACS_PACKAGESDIR%%/man/mew%%MEW_MAJOR_VER%%/mew.texi
-%%EMACS_PACKAGESDIR%%/pkginfo/MANIFEST.mew%%MEW_MAJOR_VER%%
-share/doc/mew%%MEW_MAJOR_VER%%/00api
-share/doc/mew%%MEW_MAJOR_VER%%/00changes
-share/doc/mew%%MEW_MAJOR_VER%%/00copyright
-share/doc/mew%%MEW_MAJOR_VER%%/00copyright.jis
-share/doc/mew%%MEW_MAJOR_VER%%/00diff
-share/doc/mew%%MEW_MAJOR_VER%%/00readme
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme-namazu.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-browse.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-caesar.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-fancy-summary.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-gnus.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz-fixer.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-refile-view.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-smime-ja.texi
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
-@dirrm share/doc/mew%%MEW_MAJOR_VER%%/contrib
-@dirrm share/doc/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/pkginfo 2>/dev/null || true
-@dirrm %%EMACS_PACKAGESDIR%%/man/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/man 2>/dev/null || true
-@dirrm %%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/lisp 2>/dev/null || true
-@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/info 2>/dev/null || true
-@dirrm %%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc
-@dirrm %%EMACS_PACKAGESDIR%%/etc/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/etc 2>/dev/null || true
-@unexec rmdir %D/%%EMACS_PACKAGESDIR%% 2>/dev/null || true
diff --git a/mail/mew3/Makefile b/mail/mew3/Makefile
deleted file mode 100644
index 5713d111199f..000000000000
--- a/mail/mew3/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-# New ports collection makefile for: Mew
-# Date created:		21 November 1997
-# Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mew
-PORTVERSION=	${MEW_VER}
-CATEGORIES=	mail elisp
-MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/ \
-		ftp://ftp.kyushu-u.ac.jp/pub/Misc/mew/ \
-		${MASTER_SITE_PORTS_JP}
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-
-MAINTAINER?=	kiri@FreeBSD.org
-COMMENT?=	Message interface to Emacs Window (version 2) for emacs21
-
-# Mew major version
-MEW_MAJOR_VER?=	2
-
-# distfile version
-MEW_VER=	${MEW_MAJOR_VER}.2
-
-# document install directory by install-doc target
-MEW_DOCDIR?=	share/doc/${PORTNAME}${MEW_MAJOR_VER}
-
-# emacs port setup
-EMACS_PORT_NAME?=	emacs21
-
-# target name for make build and install
-ALL_TARGET?=	all info jinfo
-INSTALL_TARGET?=	install install-info install-jinfo install-etc
-
-# environments
-MAKE_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} MEW_MAJOR_VER=${MEW_MAJOR_VER}
-PLIST_SUB+=	MEW_MAJOR_VER=${MEW_MAJOR_VER}
-
-# manuals
-MAN1=		mewcat.1 mewdecode.1 mewencode.1 mewls.1 incm.1
-
-post-patch:
-	for f in mew-key.el info/mew.texi; do \
-		${PERL} -i -pe 's,%%MEW_MAJOR_VER%%,${MEW_MAJOR_VER},g' ${WRKSRC}/$${f}; \
-	done
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/${MEW_DOCDIR}
-	(cd ${WRKSRC} ; \
-		${INSTALL_DATA} 00* ${PREFIX}/${MEW_DOCDIR}/ ; \
-		for dir in contrib; do \
-			${CP} -R $${dir} ${PREFIX}/${MEW_DOCDIR}/ ; \
-		done)
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${MEW_DOCDIR}
-.endif
-
-############################################################
-## Make DESCR and PLIST (only for MAINTAINER use)
-############################################################
-#.if ${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule"
-#ELISPDIR=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${PORTNAME}${MEW_MAJOR_VER}
-#INFODIR=	${PREFIX}/${EMACS_PACKAGESDIR}/info
-#ETCDIR=		${PREFIX}/${EMACS_PACKAGESDIR}/etc/${PORTNAME}${MEW_MAJOR_VER}
-#.else
-#ELISPDIR=	${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}${MEW_MAJOR_VER}
-#INFODIR=	${PREFIX}/info
-#ETCDIR=		${PREFIX}/${EMACS_LIBDIR}/etc/${PORTNAME}${MEW_MAJOR_VER}
-#.endif
-#SCRIPTS_ENV+=	EMACS_PORTSDIR=${EMACS_PORTSDIR:S,^${PORTSDIR}/,,} \
-#		PKGNAME=${PKGNAME} ELISPDIR=${ELISPDIR} INFODIR=${INFODIR} \
-#		ETCDIR=${ETCDIR} EMACS_CMD=${EMACS_CMD:S,${PREFIX}/bin/,,} \
-#		PORTNAME=${PORTNAME} EMACS_PORT_NAME=${EMACS_PORT_NAME}
-#
-#pre-plist:
-#	mkdir -p ${ELISPDIR} ${INFODIR} ${ETCDIR} \
-#		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
-#
-#pre-arrange:
-#	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=pkg-descr \
-#		MEW_MAJOR_VER=${MEW_MAJOR_VER} \
-#		${SH} ${FILESDIR}/tmpl2file.sh
-#	${SETENV} EMACS_PORT_NAME=${EMACS_PORT_NAME} WRKTMPDIR=${PKGDIR} \
-#		${SH} ${FILESDIR}/message.sh
-#	${CHOWN} kiri:staff ${PKGDIR}/pkg-comment ${PKGDIR}/pkg-descr ${PKGDIR}/pkg-message
-#
-#arrange:
-#.if ${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule"
-#	${MAKE} PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS}" \
-#		DIRRM2RMDIRS="${ETCDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
-#			${ELISPDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
-#			${EMACS_PACKAGESDIR} ${EMACS_PACKAGESDIR}/lisp \
-#			${EMACS_PACKAGESDIR}/info ${EMACS_PACKAGESDIR}/etc \
-#			${EMACS_PACKAGESDIR}/man ${EMACS_PACKAGESDIR}/pkginfo" \
-#		DIRRMDEPTH=2 plist
-#.else
-#	${MAKE} PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS}" \
-#		DIRRM2RMDIRS="${ETCDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
-#			${ELISPDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
-#			${EMACS_LIBDIR}/${EMACS_VER}/site-lisp \
-#			${EMACS_LIBDIR}/${EMACS_VER}" \
-#		INFOFILES="mew.info mew.jis.info" DIRRMDEPTH=2 plist
-#.endif
-#	${INSTALL} -c -m 644 -o kiri -g staff ${WRKPLIST} ${PLIST}
-#	${PERL} -i -pe 's@((?!mew)...|^.{0,2})%%MEW_MAJOR_VER%%@$$1\x32@g' ${PLIST}
-
-.include <bsd.port.mk>
diff --git a/mail/mew3/distinfo b/mail/mew3/distinfo
deleted file mode 100644
index 268e0c1cdc02..000000000000
--- a/mail/mew3/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (mew-2.2.tar.gz) = 2758098d970f253fa5bb8cf86244c0d7
diff --git a/mail/mew3/files/Addrbook b/mail/mew3/files/Addrbook
deleted file mode 100644
index 45ad31e9223c..000000000000
--- a/mail/mew3/files/Addrbook
+++ /dev/null
@@ -1,25 +0,0 @@
-; See comments at end of this file
-; This file is almost empty as MH now supports personal aliases.
-
-;everyone: *
-
-; Blank lines and lines beginning with a ; are ignored.
-; < file	-> read more aliases from "file"
-; foo: fum      -> simple replacement
-; foo: fum, fie -> list replacement
-; foo: < file   -> list replacement from "file"
-; foo: = group  -> list replacement from UNIX group
-; foo: + group  -> list replacement by ALL users in /etc/passwd
-;		      with gid == group
-; foo: *        -> list replacement by ALL users in /etc/passwd
-;                     with uid >= 200
-; foo*: fum     -> matches foo<string> (including the empty string)
-;
-; using a ';' instead of a ':' indicates that the alias should be displayed
-; along with the addresses used (normally, the addresses replace the alias
-; completely)
-ML-FreeBSD: FreeBSD-users-jp@jp.freebsd.org
-ML-fvwm:    fvwm-users-jp@skylark.ics.es.osaka-u.ac.jp
-ML-SKK:     skk@sato.kuis.kyoto-u.ac.jp
-ML-infotalk:infotalk-request@square.brl.ntt.jp
-ML-skkfep:  skkfep@chanchan.suri.co.jp
diff --git a/mail/mew3/files/dot.emacs.el.in b/mail/mew3/files/dot.emacs.el.in
deleted file mode 100644
index 8cfe348595fa..000000000000
--- a/mail/mew3/files/dot.emacs.el.in
+++ /dev/null
@@ -1,95 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Mew ;;;;;;;;;
-;;;       Mew (Ver.%%version%%)                                             ;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;
-;;; Site configuration
-;;;
-%%REQUIRE%%
-(autoload 'mew "mew" nil t)
-(autoload 'mew-send "mew" nil t)
-(setq mew-mail-domain-list '("%%nameserver%%"))
-(setq mew-icon-directory "%%emacsdir%%/etc/mew")
-;;;
-;;; Window tips
-;;;
-;; If you use XEmacs and your video chip provides only limited
-;; color map(e.g. 256), put the following line to avoid exhaustion
-;; of colors.
-;(setq mew-demo-picture nil)
-(cond
- ((string-match "XEmacs" emacs-version)
-;  (setq url-be-asynchronous t)
-;  (setq-default buffer-file-coding-system 'iso-2022-jp)
-;  (setq keyboard-coding-system    'iso-2022-jp)
-;  (setq terminal-coding-system    'iso-2022-jp)
-  (add-menu-item '("Apps") "Read Mail (Mew)" 'mew t "Read Mail (VM)...")
-  (add-menu-item '("Apps") "Send Mail (Mew)" 'mew-send t "Read Mail (VM)...")
-;  (delete-menu-item '("Apps" "Read Mail (VM)..."))
-;  (delete-menu-item '("Apps" "Read Mail (MH)..."))
-;  (delete-menu-item '("Apps" "Send mail..."))
-  (setq toolbar-mail-reader 'Mew)
-  (setq toolbar-mail-commands-alist
-	(cons '(Mew . mew) toolbar-mail-commands-alist))
-  )
- ((string< "20" emacs-version)
-;  (setq standard-fontset-spec14
-;	"-*-fixed-medium-r-normal-*-14-*-*-*-*-*-fontset-standard")
-;  (create-fontset-from-fontset-spec standard-fontset-spec14 nil 'noerror)
-;  (set-default-font standard-fontset-spec14)
-  (setup-japanese-environment)
-  )
- (t ;; Mule 2.3 or Emacs 19
-  )
- )
-;;;
-;;; Citation tip
-;;;
-(setq mew-cite-fields '("From:" "Subject:" "Date:" "Message-ID:"))
-(setq mew-cite-format "From: %s\nSubject: %s\nDate: %s\nMessage-ID: %s\n\n")
-(setq mew-cite-prefix-function 'mew-cite-prefix-username)
-;(setq mew-cite-fields '("Message-ID:" "From:"))
-;(setq mew-cite-format "Message-ID: %s ¤Îµ­»ö¤Ë¤Æ\n%s ¤µ¤ó¤Ï½ñ¤«¤ì¤Þ¤·¤¿ :\n\n")
-;; Change citation according to the message body language.
-;(setq mew-cite-fields '("Message-ID:" "From:"))
-;(defadvice mew-draft-cite (before my-add activate)
-;  (save-excursion
-;    (set-buffer (or mew-message-citation-buffer (mew-buffer-message)))
-;    (if (string= (mew-charset-guess-region (point-min) (point-max))
-;                 "us-ascii" )
-;        ;; us-ascii
-;        (setq mew-cite-format "In Message-ID: %s\n%s wrote  :\n\n")
-;      ;; others
-;      (setq mew-cite-format "Message-ID: %s ¤Îµ­»ö¤Ë¤Æ\n%s ¤µ¤ó¤Ï½ñ¤«¤ì¤Þ¤·¤¿ :\n\n") )))
-;;;
-;;; Signature tip
-;;;
-;; Change signature according to the message body language.
-;(setq mew-signature-file "~/.signature")
-;(make-local-variable 'mew-signature-file)
-;(defadvice mew-draft-insert-signature (before my-add activate)
-;  ;; ËÜʸ¤¬±Ñ¸ì¤Ê¤é mew-signature-file ¤Ë ~/.signature.eng ¤òÂåÆþ¤¹¤ë¡£
-;  ;; ËÜʸ¤¬±Ñ¸ì°Ê³°¤Ê¤é mew-signature-file ¤Ë ~/.signature ¤òÂåÆþ¤¹¤ë¡£
-;  ;; ~/.signature.eng ¤Ë±Ñ¸ìÍѤνð̾¤ò½ñ¤¤¤Æ¤ª¤¯¤³¤È¡£
-;  (save-match-data
-;    (let ((eng (string-match "\\.eng$" mew-signature-file)))
-;      (if (string= (mew-charset-guess-region (point-min) (point-max))
-;                   "us-ascii" )
-;          (if (not eng)
-;              (setq mew-signature-file (concat mew-signature-file ".eng")) )
-;        (if eng
-;            (setq mew-signature-file (substring mew-signature-file 0 -4)) )))))
-;
-(setq mew-signature-insert-last t)
-(add-hook 'mew-send-hook 'mew-draft-insert-signature)
-;;;
-;;; Thread tip
-;;;
-;; Now threading is insufficient,but partially makes enough by comment out following line.
-;(setq mew-prog-imls-arg-list '("--thread=yes" "--indent=2"))
-;;;
-;;; Miscellaneous
-;;;
-(setq mew-underline-lines-use t)
-(setq mew-use-highlight-body t)
-;; If you use Wnn4/6,sj3 or Canna, comment out following line.
-;(setq mew-use-overlay-keymap nil)
diff --git a/mail/mew3/files/message.sh b/mail/mew3/files/message.sh
deleted file mode 100644
index c4941cbfed1b..000000000000
--- a/mail/mew3/files/message.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
- 
-case ${EMACS_PORT_NAME} in
-    emacs20)
-	cat <<EOF > ${WRKTMPDIR}/pkg-message
-*************************************************************************
-* You must set at least following elisps to your own dot.emacs file:    *
-*                                                                       *
-*       (autoload 'mew "mew" nil t)                                     *
-*       (autoload 'mew-send "mew" nil t)                                *
-*       (setq mew-mail-domain "domain of e-mail address")               *
-*       (setq mew-pop-server "your POP server")    ;; if not localhost  *
-*       (setq mew-smtp-server "your SMTP server")  ;; if not localhost  *
-*       (setq mew-prog-pgpkey      "fetch")         ;; for PGP use      *
-*       (setq mew-prog-pgpkey-arg  '("-q" "-o" "-"));; for PGP use      *
-*                                                                       *
-*************************************************************************
-EOF
-	;;
-    xemacs21*)
-	cat <<EOF > ${WRKTMPDIR}/pkg-message
-*************************************************************************
-* You must set at least following elisps to your own dot.emacs file:    *
-*                                                                       *
-*       (autoload 'mew "mew" nil t)                                     *
-*       (autoload 'mew-send "mew" nil t)                                *
-*       (setq mew-mail-domain "domain of e-mail address")               *
-*       (setq mew-pop-server "your POP server")    ;; if not localhost  *
-*       (setq mew-smtp-server "your SMTP server")  ;; if not localhost  *
-*       (setq mew-icon-directory "icon directory") ;; if using XEmacs   *
-*       (setq mew-prog-pgpkey      "fetch")         ;; for PGP use      *
-*       (setq mew-prog-pgpkey-arg  '("-q" "-o" "-"));; for PGP use      *
-*                                                                       *
-*************************************************************************
-EOF
-	;;
-esac
diff --git a/mail/mew3/files/patch-aa b/mail/mew3/files/patch-aa
deleted file mode 100644
index ba398cffa9ea..000000000000
--- a/mail/mew3/files/patch-aa
+++ /dev/null
@@ -1,171 +0,0 @@
---- Makefile.orig	Wed Jul 18 08:20:40 2001
-+++ Makefile	Fri Aug  3 22:18:35 2001
-@@ -19,14 +19,14 @@
- ## EDIT THE FOLLOWINGS
- ##
- 
--prefix=/usr/local
-+prefix=${PREFIX}
- infodir=$(prefix)/info
- 
- ##
- ## Compile engines
- ##
- 
--EMACS = emacs
-+EMACS = ${EMACS_CMD}
- #EMACS = xemacs
- #EMACS = mule
- 
-@@ -34,7 +34,7 @@
- ## A directory where mew*.el[c] will be installed.
- ##
- 
--elispdir = $(prefix)/share/emacs/site-lisp/mew
-+elispdir = $(prefix)/${EMACS_LIBDIR}/site-lisp/mew${MEW_MAJOR_VER}
- #elispdir  = $(prefix)/lib/$(EMACS)/site-lisp
- #elispdir = $(prefix)/lib/emacs
- 
-@@ -42,7 +42,10 @@
- ## A directory where etc file will be installed.
- ##
- 
--etcdir = $(prefix)/lib/$(EMACS)/etc/Mew
-+etcdir = $(prefix)/${EMACS_LIBDIR}/etc/mew${MEW_MAJOR_VER}
-+
-+# For XEmacs packages
-+XPKGDIR=	$(prefix)/${EMACS_PACKAGESDIR}
- 
- ################################################################
- ##
-@@ -67,6 +70,8 @@
- 	mew-key.elc     mew-thread.elc  mew-smime.elc	\
- 	mew-theme.elc	mew.elc
- 
-+OBJS_PKG=	 auto-autoloads.elc custom-load.elc
-+
- SRCS =	mew-addrbook.el	mew-attach.el	mew-blvs.el	\
- 	mew-bq.el	mew-cache.el	mew-complete.el	\
- 	mew-config.el	mew-const.el	mew-decode.el	\
-@@ -87,6 +92,8 @@
- 	mew-thread.el	mew-smime.el	mew-theme.el	\
- 	mew.el
- 
-+SRCS_PKG=	auto-autoloads.el custom-load.el
-+
- TEMPFILE = temp.el
- 
- CP = cp
-@@ -103,7 +110,9 @@
- 
- ################################################################
- 
--el: $(TEMPFILE) mew.el
-+el: $(OBJS)
-+
-+$(OBJS): $(TEMPFILE) mew.el
- 	@echo 'Compiling EL files of Mew ... '
- 	@echo 'PLEASE IGNORE WARNINGS IF DISPLAYED. TAKE IT EASY!'
- 	$(EMACS) -batch -q -no-site-file -l ./$(TEMPFILE) -f mew-compile
-@@ -116,11 +125,11 @@
- 	@echo ')))' >> $(TEMPFILE)
- 
- install-el: $(OBJS)
--	-@if [ ! -d $(elispdir) ]; then \
-+	if [ ! -d $(elispdir) ]; then \
- 		$(MKDIR) $(elispdir); \
- 	fi
--	$(CP) $(SRCS) $(elispdir)
--	$(CP) $(OBJS) $(elispdir)
-+	${BSD_INSTALL_DATA} $(SRCS) $(elispdir)
-+	${BSD_INSTALL_DATA} $(OBJS) $(elispdir)
- 
- ################################################################
- 
-@@ -136,7 +145,9 @@
- 	cd info; $(MAKE) info EMACS=$(EMACS)
- 
- install-info:
--	cd info; $(MAKE) install-info infodir=$(infodir)
-+	${MKDIR} $(infodir)
-+	cd info; $(MAKE) install-info infodir=$(infodir) \
-+		XEMACS_VER_OVER20="${XEMACS_VER_OVER20}"
- 
- ################################################################
- 
-@@ -144,15 +155,72 @@
- 	cd info; $(MAKE) jinfo EMACS=$(EMACS)
- 
- install-jinfo:
--	cd info; $(MAKE) install-jinfo infodir=$(infodir)
-+	${MKDIR} $(infodir)
-+	cd info; $(MAKE) install-jinfo infodir=$(infodir) \
-+		XEMACS_VER_OVER20="${XEMACS_VER_OVER20}"
-+
-+install-man:
-+	${MKDIR} ${MANDIR}
-+	cd info; $(MAKE) install-man MANDIR=$(MANDIR)
- 
- ################################################################
- 
- install-etc:
--	-@if [ ! -d $(etcdir) ]; then \
-+	if [ ! -d $(etcdir) ]; then \
- 		$(MKDIR) $(etcdir); \
- 	fi
--	cd etc; $(CP) -r * $(etcdir)/
-+	cd etc; $(CP) -R * $(etcdir)/
-+
-+################################################################
-+
-+package: ${OBJS} ${OBJS_PKG} bin
-+
-+${OBJS_PKG}: ${SRCS_PKG}
-+	${EMACS} -vanilla -batch -eval "(push \"./\" load-path)" -l bytecomp \
-+		-f batch-byte-compile ${.ALLSRC}
-+
-+auto-autoloads.el : ${OBJS} _pkg.el
-+	${EMACS} -vanilla -batch \
-+		-eval "(setq autoload-package-name \"${XEMACS_PKGNAME}\")" \
-+		-l autoload -f batch-update-directory .
-+	${RM} -f auto-autoloads.el~
-+
-+custom-load.el : ${OBJS}
-+	${EMACS} -vanilla -batch -l cus-dep -f Custom-make-dependencies .
-+	if [ ! -f ${.TARGET} ]; then \
-+		touch ${.TARGET}; \
-+	fi
-+
-+_pkg.el:
-+	@echo Creating _pkg.el
-+	@echo ";;;###autoload" 				>  _pkg.el
-+	@echo "(package-provide '${XEMACS_PKGNAME}" 	>> _pkg.el
-+	@echo "		 :version $(XEMACS_PKGVER)"	>> _pkg.el
-+	@echo "		 :type 'regular)" 		>> _pkg.el
-+
-+install-mule-package: install-package
-+	${MAKE} infodir=${XPKGDIR}/info XEMACS_VER_OVER20="yes" install-jinfo
-+	${MAKE} manifest
-+
-+install-package:
-+	${MKDIR} ${XPKGDIR}/pkginfo
-+	${MAKE} install-bin
-+	${MAKE} elispdir=${XPKGDIR}/lisp/mew${MEW_MAJOR_VER} install-el
-+	${BSD_INSTALL_DATA} _pkg.el ${OBJS_PKG} ${SRCS_PKG} \
-+		${XPKGDIR}/lisp/mew${MEW_MAJOR_VER}
-+	${MAKE} infodir=${XPKGDIR}/info XEMACS_VER_OVER20="yes" \
-+						install-info
-+	${MAKE} MANDIR=${XPKGDIR}/man/mew${MEW_MAJOR_VER} install-man
-+	${MAKE} etcdir=${XPKGDIR}/etc/mew${MEW_MAJOR_VER} install-etc
-+	${MAKE} manifest
-+
-+manifest:
-+	(cd ${XPKGDIR}; \
-+		ls -d1 lisp/mew${MEW_MAJOR_VER}/* info/mew${MEW_MAJOR_VER}.* \
-+			man/mew${MEW_MAJOR_VER}/* etc/mew${MEW_MAJOR_VER}/* \
-+			> ${XPKGDIR}/pkginfo/MANIFEST.mew${MEW_MAJOR_VER})
-+	${ECHO} "pkginfo/MANIFEST.mew${MEW_MAJOR_VER}" \
-+		>> ${XPKGDIR}/pkginfo/MANIFEST.mew${MEW_MAJOR_VER}
- 
- ################################################################
- 
diff --git a/mail/mew3/files/patch-ab b/mail/mew3/files/patch-ab
deleted file mode 100644
index c62db0f83d4a..000000000000
--- a/mail/mew3/files/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
---- bin/Makefile.in.orig	Thu Jan 17 20:26:55 2002
-+++ bin/Makefile.in	Sun Feb  3 18:19:20 2002
-@@ -69,7 +69,7 @@
- 	$(CC) $(COFLAG) $(OBJ1) $(LIBS)
- 	$(RM) $(ALT)
- 	for f in $(ALT); do \
--	  $(LN) $(PRG1) $${f}; done
-+	  $(LN) -sf $(PRG1) $${f}; done
- 
- $(PRG2): $(OBJ2)
- 	$(CC) $(COFLAG) $(CFLAGS) $(OBJ2)
-@@ -95,7 +95,7 @@
- 	fi
- 	$(INSTALL) -m 555 $(PRG1) $(bindir)
- 	for f in $(ALT); do \
--	  $(RM) $(bindir)/$${f}; $(LN) $(bindir)/$(PRG1) $(bindir)/$${f}; done
-+	  $(RM) $(bindir)/$${f}; $(LN) -sf $(bindir)/$(PRG1) $(bindir)/$${f}; done
- 	$(INSTALL) -m 555 $(PRG2) $(bindir)
- 	$(INSTALL) -m 555 $(PRG3) $(bindir)
- 	-@if [ ! -d $(mandir) ]; then \
-@@ -103,7 +103,7 @@
- 	fi
- 	$(INSTALL) -m 444 $(MAN1) $(mandir)
- 	for f in $(MALT); do \
--	  $(RM) $(mandir)/$${f}; $(LN) $(mandir)/$(MAN1) $(mandir)/$${f}; done
-+	  $(RM) $(mandir)/$${f}; $(LN) -sf $(mandir)/$(MAN1) $(mandir)/$${f}; done
- 	$(INSTALL) -m 444 $(MAN2) $(mandir)
- 	$(INSTALL) -m 444 $(MAN3) $(mandir)
- 
diff --git a/mail/mew3/files/patch-ac b/mail/mew3/files/patch-ac
deleted file mode 100644
index 6f0863d8ccd4..000000000000
--- a/mail/mew3/files/patch-ac
+++ /dev/null
@@ -1,95 +0,0 @@
---- info/Makefile.orig	Fri Aug 17 21:26:00 2001
-+++ info/Makefile	Tue Nov 20 10:18:58 2001
-@@ -28,9 +28,9 @@
- #INSTALLINFO_OPTIONS = --section Emacs Emacs
- #INSTALLINFO_JOPTIONS =
- #infodir = 
--INSTALLINFO_ARGS  = mew.info $(infodir)/dir
-+INSTALLINFO_ARGS  = mew${MEW_MAJOR_VER}.info $(infodir)/dir
- #INSTALLINFO_ARGS  = mew.info 
--INSTALLINFO_JARGS = mew.jis.info $(infodir)/dir
-+INSTALLINFO_JARGS = mew${MEW_MAJOR_VER}.jis.info $(infodir)/dir
- 
- 
- RM = rm -f
-@@ -44,50 +44,60 @@
- ## DO NOT EDIT THE FOLLOWINGS
- ##
- 
--INFO  = mew.info mew.info-1 mew.info-2 mew.info-3
--JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2 mew.jis.info-3
-+INFO  = mew${MEW_MAJOR_VER}.info mew${MEW_MAJOR_VER}.info-1 mew${MEW_MAJOR_VER}.info-2 mew${MEW_MAJOR_VER}.info-3
-+JINFO = mew${MEW_MAJOR_VER}.jis.info mew${MEW_MAJOR_VER}.jis.info-1 mew${MEW_MAJOR_VER}.jis.info-2 mew${MEW_MAJOR_VER}.jis.info-3
-+MANUALS= 00readme mew.texi
- 
- all: info
- info:
--	sed -e 's/@setfilename mew.jis.info/@setfilename mew.info/' \
-+	sed -e "s/@setfilename mew${MEW_MAJOR_VER}\.jis\.info/@setfilename mew${MEW_MAJOR_VER}\.info/" \
- 	    -e 's/@set jp/@set us/' mew.texi > tmp.texi
- 	mv tmp.texi mew.texi
--	$(RM) mew.info*
--	$(TOUCH) mew.info
-+	$(RM) mew${MEW_MAJOR_VER}.info*
-+	$(TOUCH) mew${MEW_MAJOR_VER}.info
- 	$(EMACS) -batch -q -no-site-file -l texinfmt \
- 		-f batch-texinfo-format mew.texi
- 
- jinfo:
--	sed -e 's/@setfilename mew.info/@setfilename mew.jis.info/' \
-+	sed -e "s/@setfilename mew${MEW_MAJOR_VER}\.info/@setfilename mew${MEW_MAJOR_VER}\.jis.info/" \
- 	    -e 's/@set us/@set jp/' mew.texi > tmp.texi
- 	mv tmp.texi mew.texi
--	$(RM) mew.jis.info*
--	$(TOUCH) mew.jis.info
-+	$(RM) mew${MEW_MAJOR_VER}.jis.info*
-+	$(TOUCH) mew${MEW_MAJOR_VER}.jis.info
- 	$(EMACS) -batch -q -no-site-file -l texinfmt \
- 		-f batch-texinfo-format mew.texi
- 
- install: install-info
- install-info:
--	-@if [ ! -d $(infodir) ]; then \
-+	-if [ ! -d $(infodir) ]; then \
- 		$(MKDIR) $(infodir); \
- 	fi; \
--	cp $(INFO) $(infodir)
--	-@if [ -x "$(INSTALLINFO)" ]; then \
--		$(INSTALLINFO) $(INSTALLINFO_OPTIONS) $(INSTALLINFO_ARGS); \
--	else \
--		echo "Don't forget to edit $(infodir)/dir for Mew."; \
-+	${BSD_INSTALL_DATA} $(INFO) $(infodir)/
-+	-if [ -z "${XEMACS_VER_OVER20}" ]; then \
-+		if [ -x "$(INSTALLINFO)" ]; then \
-+			$(INSTALLINFO) $(INSTALLINFO_OPTIONS) $(INSTALLINFO_ARGS); \
-+		else \
-+			echo "Don't forget to edit $(infodir)/dir for Mew."; \
-+		fi; \
- 	fi
- 
- install-jinfo:
--	-@if [ ! -d $(infodir) ]; then \
-+	-if [ ! -d $(infodir) ]; then \
- 		$(MKDIR) $(infodir); \
- 	fi; \
--	cp $(JINFO) $(infodir)
--	-@if [ -x "$(INSTALLINFO)" ]; then \
--		$(INSTALLINFO) $(INSTALLINFO_JOPTIONS) $(INSTALLINFO_JARGS); \
--	else \
--		echo "Don't forget to edit $(infodir)/dir for Mew."; \
-+	${BSD_INSTALL_DATA} $(JINFO) $(infodir)/
-+	-if [ -z "${XEMACS_VER_OVER20}" ]; then \
-+		if [ -x "$(INSTALLINFO)" ]; then \
-+			$(INSTALLINFO) $(INSTALLINFO_JOPTIONS) $(INSTALLINFO_JARGS); \
-+		else \
-+			echo "Don't forget to edit $(infodir)/dir for Mew."; \
-+		fi; \
- 	fi
-+
-+install-man:
-+	${MKDIR} ${MANDIR}
-+	${BSD_INSTALL_DATA} ${MANUALS} ${MANDIR}
-+
- ##
- ## End of Makefile
- ##
diff --git a/mail/mew3/files/patch-ad b/mail/mew3/files/patch-ad
deleted file mode 100644
index 933ef45d9e73..000000000000
--- a/mail/mew3/files/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
---- info/mew.texi~	Thu Aug  2 22:31:28 2001
-+++ info/mew.texi	Fri Aug  3 11:01:40 2001
-@@ -1,6 +1,6 @@
- \input texinfo  @c -*-texinfo-*-
- @c %**start of header
--@setfilename mew.jis.info
-+@setfilename mew%%MEW_MAJOR_VER%%.jis.info
- @settitle Mew (Messaging in the Emacs World)
- @c %**end of header
- 
-@@ -41,14 +41,14 @@
- @ifset jp
- @dircategory Message User Agent
- @direntry
--* Mew-J: (mew.jis.info).     Messaging in the Emacs World.
-+* Mew-J: (mew%%MEW_MAJOR_VER%%.jis.info).     Messaging in the Emacs World.
- @end direntry
- @end ifset
- 
- @ifset us
- @dircategory Message User Agent
- @direntry
--* Mew: (mew.info).           Messaging in the Emacs World.
-+* Mew: (mew%%MEW_MAJOR_VER%%.info).           Messaging in the Emacs World.
- @end direntry
- @end ifset
- 
diff --git a/mail/mew3/files/patch-ae b/mail/mew3/files/patch-ae
deleted file mode 100644
index d1647a30fb9c..000000000000
--- a/mail/mew3/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- mew-key.el~	Wed Jul 18 08:19:11 2001
-+++ mew-key.el	Fri Aug  3 11:30:10 2001
-@@ -507,7 +507,7 @@
- ;;;
- 
- (defvar mew-icon-directory (if (fboundp 'locate-data-directory)
--			       (locate-data-directory "mew") nil))
-+			       (locate-data-directory "mew%%MEW_MAJOR_VER%%") nil))
- 
- (defvar mew-icon-separate nil)
- (defvar mew-icon-blank nil)
diff --git a/mail/mew3/files/pkg-descr.tmpl b/mail/mew3/files/pkg-descr.tmpl
deleted file mode 100644
index 60fa7d3f4f6e..000000000000
--- a/mail/mew3/files/pkg-descr.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-Mew is a "Message interface to Emacs Window" to integrate
-
-   - Email
-   - MIME(Multipurpose Internet Mail Extensions)
-   - PGP(Pretty Good Privacy)
-
-and to make it easy to view and compose them. With Mew you can send a
-picture of a birthday cake with the song "Happy Birthday to you" to your
-friend, which is encrypted by strong cryptograph.
-
-This port is the Mew%%MEW_MAJOR_VER%%(Mew with version %%MEW_MAJOR_VER%%) for %%EMACS_CMD%%(%%EMACS_PORTSDIR%%). 
-The Mew%%MEW_MAJOR_VER%% port and corresponding Emacs port are listed bellow and elisp
-`site-lisp' directory(elisp load path), info path and etc directory(only
-effective for xemacs ports) are shown as well. 
-
-mail/%%PORTNAME%%%%MEW_MAJOR_VER%%-%%EMACS_PORT_NAME%%(%%PKGNAME%%) ===> %%EMACS_PORTSDIR%%(%%EMACS_CMD%%) 
-	Lisp directory : %%ELISPDIR%%
-	Info directory : %%INFODIR%%
-	ETC directory  : %%ETCDIR%%
diff --git a/mail/mew3/files/tmpl2file.sh b/mail/mew3/files/tmpl2file.sh
deleted file mode 100644
index d8e1a662ca53..000000000000
--- a/mail/mew3/files/tmpl2file.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-for f in ${TMPL_FILES}; do
-	sed \
-		-e "s,%%EMACS_CMD%%,${EMACS_CMD},g" \
-		-e "s,%%EMACS_PORTSDIR%%,${EMACS_PORTSDIR},g" \
-		-e "s,%%PKGNAME%%,${PKGNAME},g" \
-		-e "s,%%EMACS_PORT_NAME%%,${EMACS_PORT_NAME},g" \
-		-e "s,%%MEW_MAJOR_VER%%,${MEW_MAJOR_VER},g" \
-		-e "s,%%PORTNAME%%,${PORTNAME},g" \
-		-e "s,%%ELISPDIR%%,${ELISPDIR},g" \
-		-e "s,%%INFODIR%%,${INFODIR},g" \
-		-e "s,%%ETCDIR%%,${ETCDIR},g" \
-		< ${FILESDIR}/${f}.tmpl > ${WRKTMPDIR}/${f}
-done
diff --git a/mail/mew3/files/user-install.in b/mail/mew3/files/user-install.in
deleted file mode 100644
index ee1a7ad4d9f4..000000000000
--- a/mail/mew3/files/user-install.in
+++ /dev/null
@@ -1,374 +0,0 @@
-#!/bin/sh
-
-PREFIX=%%PREFIX%%
-EMACSDIR=%%EMACSDIR%%
-ELISPDIR=%%ELISPDIR%%
-SAMPLEDIR=%%SAMPLEDIR%%
-
-AWK=%%AWK%%
-CAT=%%CAT%%
-CP=%%CP%%
-ECHO=%%ECHO%%
-MKDIR="%%MKDIR%%"
-RM=%%RM%%
-SED=%%SED%%
-TOUCH=%%TOUCH%%
-DIALOG=/usr/bin/dialog
-
-select()
-{
-	local Language key
-	Language="\
-Choose a language when you write mails.\n\
-    (Now is \"${language}\" selected.)"
-	${DIALOG} --title "Choose the Language" \
-	--hline "Select Items and Quit when finished" \
-	--menu "${Language}" -1 -1 2 \
-	English		"English" \
-	Japanese	"japanese" \
-		2>	/tmp/menu.$$
-	retval=$?
-	key=`${CAT} /tmp/menu.$$|${SED} -e 's/\"//g'`
-	${RM} -f /tmp/menu.$$
-	case $retval in
-		0) if [ -z ${key} ]; then return; fi ;;
-		1) return ;;
-		255) return ;;
-	esac
-	language=${key}
-#	echo citation:key=${key},dot_emacs=${dot_emacs}>>/tmp/temp
-}
-
-input_data()
-# argument No.1 ($1) : Key words (string)
-# argument No.2 ($2) : Variable for the Key words (string)
-# argument No.3 ($3) : unit for the variable (string)
-{
-	local key
-#	echo '$1='$1
-#	echo '$2='$2
-#	echo '$3='$3
-#	exit 1
-#	echo '${nameserver}='${mail_address}
-#	eval echo '${'$2'}'
-	eval key='${'$2'}'
-#	echo key=${key}
-#	exit 1
-	if [ ! -z ${key} ]; then
-		${DIALOG} --title "Confirm $1" \
-		--hline "Press Yes/No" \
-		--yesno "$1 $3 has set \"${key}\". Is this OK?" -1 -1
-		retval=$?
-		if [ X"${retval}" = "X0" -o X"${retval}" = "X255" ]; then  return; fi
-	fi
-	${DIALOG} --title "Set $1 $3" \
-	--hline "Write $1 $3" \
-	--inputbox "Specify $1 $3" -1 -1 \
-		2>  /tmp/input.$$
-	eval $2=`${CAT} /tmp/input.$$`
-	${RM} -f /tmp/input.$$
-}
-
-options()
-{
-	local Options keys del_keys
-	Options="\
-Please select Mew functions that you want to. To select a function, \n\
-use the arrow keys to move to it and press [SPACE]. To de-select it, \n\
-press [SPACE] again.  Select OK or Cancel to leave this menu."
-	del_keys="Highlight Citation Cite_Change Sign_Change"
-	${DIALOG} --title "Select Mew functions" \
-	--hline "" \
-	--checklist "${Options}" -1 -1 4 \
-	Highlight	"highlight body for Mew(Japanese)" ${options_Highlight} \
-	Citation	"Citation with the mail." ${options_Citation} \
-	Cite_Change	"Change citation English <--> Japanese." ${options_Cite_Change} \
-	Sign_Change	"Change signature English <--> Japanese." ${options_Sign_Change} \
-		2> /tmp/checklist.$$
-	retval=$?
-	keys=`${CAT} /tmp/checklist.$$|${SED} -e 's/\"//g'`
-	${RM} -f /tmp/checklist.$$
-	case $retval in
-		1)   return ;;
-		255) return ;;
-	esac
-	dot_emacs=""
-#	echo keys=$keys
-	for k in ${keys}; do
-		del_keys=`${ECHO} ${del_keys}|${SED} -e "s/ *${k}//g"`
-#		echo del_keys=${del_keys}
-#		echo k=$k
-		case ${k} in
-		Highlight)
-			dot_emacs="${dot_emacs} dot.emacs-highlight-body.el"
-			options_Highlight=ON
-			;;
-		Citation)
-			citation
-#			echo options:key=${k},dot_emacs=${dot_emacs}>>/tmp/temp
-			options_Citation=ON
-			;;
-		Cite_Change)
-			dot_emacs="${dot_emacs} dot.emacs-cite-change.el"
-			options_Cite_Change=ON
-			;;
-		Sign_Change)
-			dot_emacs="${dot_emacs} dot.emacs-signature-change.el"
-			options_Sign_Change=ON
-			;;
-		esac
-	done
-#	exit 1
-	for k in ${del_keys}; do
-#		echo k=$k
-		case ${k} in
-		Highlight)
-			dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-highlight-body\.el//"`
-			options_Highlight=OFF
-			;;
-		Citation)
-			options_Citation=OFF
-			;;
-		Cite_Change)
-			dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-cite-change\.el//"`
-			options_Cite_Change=OFF
-			;;
-		Sign_Change)
-			dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-signature-change\.el//"`
-			options_Sign_Change=OFF
-			;;
-		esac
-	done
-#	echo dot_emacs=${dot_emacs}
-#	echo del_keys=${del_keys}
-#	exit 1
-}
-
-citation()
-{
-	dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-cite.[a-z]*//g"`
-	case ${language} in
-	English)
-		dot_emacs="${dot_emacs} dot.emacs-cite.el"
-		;;
-	Japanese)
-		dot_emacs="${dot_emacs} dot.emacs-cite.ja.el"
-		;;
-	esac
-#	echo citation:key=${key},dot_emacs=${dot_emacs}>>/tmp/temp
-}
-
-case ${TERM} in
-emacs)
-	${ECHO} "Here is \"Emacs\" shell. Try on other terminal."
-	exit 1
-	;;
-esac
-
-version="%%VERSION%%"
-#version="1.92"
-
-SEDCMD='${SED}
-	-e "s,%%prefix%%,${PREFIX},g"
-	-e "s,%%emacsdir%%,${EMACSDIR},g"
-	-e "s,%%elispdir%%,${ELISPDIR},g"
-	-e "s,%%version%%,${version},g"
-	-e "s,%%nameserver%%,${nameserver},g"
-	-e "s,%%mail_address%%,${mail_address},g"
-	-e "s,%%domain_name%%,${domain_name},g"
-	-e "s,%%default_domain_name%%,${default_domain_name},g"
-	-e "s,%%signature%%,${signature},g"'
-
-###
-# Check ~/.backup directory exist.
-#
-${MKDIR} ${HOME}/.backup
-
-###
-# Backup all files.
-#
-${CP} ${HOME}/${dot_emacs_file} ${HOME}/.backup/${dot_emacs_file}.$$
-${CP} ${HOME}/.im/Config ${HOME}/.backup/Config.$$
-
-###
-# Check ~/.im/Config file exist.
-#
-if [ ! -f ${HOME}/.im/Config ]; then
-	${ECHO} "${HOME}/.im/Config: Not found. Do imsetup first."
-	exit 1
-else
-	mail_address=`${AWK} '/^Address=/{sub(/^Address=/,"");print}' ${HOME}/.im/Config`
-	domain_name=`${AWK} '/^FromDomain=/{sub(/^FromDomain=/,"");print}' ${HOME}/.im/Config`
-	default_domain_name=`${AWK} '/^ToDomain=/{sub(/^ToDomain=/,"");print}' ${HOME}/.im/Config`
-	if [ X"${mail_address}" = "X%%mail_address%%" ]; then
-		mail_address=""
-	else
-		${CP} ${HOME}/.im/Config ${HOME}/.backup/Config
-		${SED} -e 's/^\(Address=\).*$/\1%%mail_address%%/' \
-			< ${HOME}/.backup/Config > ${HOME}/.im/Config
-	fi
-	if [ X"${domain_name}" = "X%%domain_name%%" ]; then
-		domain_name=""
-	else
-		${CP} ${HOME}/.im/Config ${HOME}/.backup/Config
-		${SED} -e 's/^\(FromDomain=\).*$/\1%%domain_name%%/' \
-			< ${HOME}/.backup/Config > ${HOME}/.im/Config
-	fi
-	if [ X"${default_domain_name}" = "X%%default_domain_name%%" ]; then
-		default_domain_name=""
-	else
-		${CP} ${HOME}/.im/Config ${HOME}/.backup/Config
-		${SED} -e 's/^\(ToDomain=\).*$/\1%%default_domain_name%%/' \
-			< ${HOME}/.backup/Config > ${HOME}/.im/Config
-	fi
-fi
-
-###
-# Copy "aliases" if none
-#
-if [ ! -f ${HOME}/.im/Aliases ]; then	
-	${CP} ${SAMPLEDIR}/Aliases ${HOME}/.im
-fi
-
-###
-# Set user environment : nameserver, signature
-#
-options_Highlight=OFF
-options_Citation=OFF
-options_Cite_Change=OFF
-options_Sign_Change=OFF
-language=English
-dot_emacs_file=.emacs
-
-PreSet="\
-This is the main menu of the Mew configuration pre-settings. Please \n\
-select one of the options below by using the arrow keys or typing the \n\
-first character of the option name you intend to set. Invoke an option \n\
-by pressing [ENTER] or [TAB-ENTER] to exit the settings."
-
-answer=None
-while [ ! X"${answer}" = "XQuit" ]; do
-	${DIALOG} --title "Pre-set Mew configurations" \
-	--hline "To select an item press [Enter] on the item" \
-	--menu "${PreSet}" -1 -1 3 \
-	Language	"Determine language in use on Mew" \
-	DotEmacs	"Choose dot.emacs files being to use" \
-	Quit		"Quit this menu" \
-		2>	/tmp/menu.$$
-	retval=$?
-	answer=`${CAT} /tmp/menu.$$|${SED} -e 's/\"//g'`
-	${RM} -f /tmp/menu.$$
-	case $retval in
-		0) if [ -z ${answer} ]; then ${ECHO} "Nothing selected"; contiue; fi ;;
-		1) break ;;
-		255) break ;;
-	esac
-	case ${answer} in
-		Language)
-			select
-			;;
-		DotEmacs)
-			input_data "Emacs dot.emacs file name" "dot_emacs_file" ""
-			;;
-		Quit)
-			answer=Quit
-			;;
-	esac
-done
-
-#echo language=${language}
-#echo dot_emacs_file=${dot_emacs_file}
-#exit 1
-
-MainMenu="\
-This is the main menu of the Mew configuration settings. Please select \n\
-one of the options below by using the arrow keys or typing the first \n\
-character of the option name you intend to set. Invoke an option by \n\
-pressing [ENTER] or [TAB-ENTER] to exit the settings."
-
-answer=None
-while [ ! X"${answer}" = "XQuit" ]; do
-	${DIALOG} --title "Set Mew configurations" \
-	--hline "Select Items and Quit when finished" \
-	--menu "${MainMenu}" -1 -1 6 \
-	NameServer	"Name server Domain name" \
-	MailAddress	"Your mail address (with FQDN)" \
-	DomainName	"Your domain name" \
-	DefaultDomain	"Default domain name in abbrivation" \
-	Options		"Various options on using Mew" \
-	Quit		"Quit this menu" \
-		2>	/tmp/menu.$$
-	retval=$?
-	answer=`${CAT} /tmp/menu.$$`
-	${RM} -f /tmp/menu.$$
-	case $retval in
-		0)	if [ -z ${answer} ]; then
-				${ECHO} "Nothing selected"
-				exit 1
-			fi
-			;;
-		1)	${ECHO} "Cancel pressed."
-			exit 1
-			;;
-		255)	${ECHO} "ESC pressed."
-			exit 1
-			;;
-	esac
-	case ${answer} in
-		NameServer)
-			input_data "Name Server" "nameserver" ""
-			;;
-		MailAddress)
-			input_data "Mail Address" "mail_address" ""
-			;;
-		DomainName)
-			input_data "Domain Name" "domain_name" ""
-			;;
-		DefaultDomain)
-			input_data "Default Domain Name" "default_domain_name" ""
-			;;
-		Options)
-#			options
-			;;
-		Quit)
-			answer=Quit
-			;;
-	esac
-done
-
-#echo 'nameserver='${nameserver}
-#echo 'mail_address='${mail_address}
-#echo 'domain_name='${domain_name}
-#echo 'defaut_domain_name='${default_domain_name}
-
-#exit 1
-
-###
-# Custumize startup files with selected options.
-#
-dot_emacs="dot.emacs.el ${dot_emacs}"
-eval ${SEDCMD} < ${HOME}/.im/Config > ${HOME}/.backup/Config
-
-###
-# Add Mew startup setting to ~/.emacs
-#
-if [ -f ${dot_emacs_file} ]; then
-    ${SED} -e '/^;;;* Mew ;*$/,/^;;; *Mew end$/d' < ${HOME}/${dot_emacs_file} \
-	> ${HOME}/.backup/${dot_emacs_file}
-else
-    ${ECHO} "Create new \"dot.emacs\" file: ${dot_emacs_file}"
-fi
-
-#echo 'dot_emacs='${dot_emacs}
-for f in ${dot_emacs}; do
-	${CAT} ${SAMPLEDIR}/dot.emacs/${f} |\
-		eval ${SEDCMD} >> ${HOME}/.backup/${dot_emacs_file}
-done
-${ECHO} ";;;                                                       Mew end" \
-	>> ${HOME}/.backup/${dot_emacs_file}
-${CP} ${HOME}/.backup/${dot_emacs_file} ${HOME}/${dot_emacs_file}
-
-###
-# Copy im Config file  to ~/.im
-#
-${CP} ${HOME}/.backup/Config ${HOME}/.im/Config
diff --git a/mail/mew3/pkg-descr b/mail/mew3/pkg-descr
deleted file mode 100644
index a1ee92480f9b..000000000000
--- a/mail/mew3/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-Mew is a "Message interface to Emacs Window" to integrate
-
-   - Email
-   - MIME(Multipurpose Internet Mail Extensions)
-   - PGP(Pretty Good Privacy)
-
-and to make it easy to view and compose them. With Mew you can send a
-picture of a birthday cake with the song "Happy Birthday to you" to your
-friend, which is encrypted by strong cryptograph.
-
-This port is the Mew2(Mew with version 2) for emacs-21.x (editors/emacs21). 
-The Mew2 port and corresponding Emacs port are listed bellow and elisp
-`site-lisp' directory(elisp load path), info path and etc directory(only
-effective for xemacs ports) are shown as well. 
-
-mail/mew2 (mew-emacs21-2.x) ===> editors/emacs21 (emacs-21.x) 
-	Lisp directory : /usr/local/share/emacs/site-lisp/mew
-	Info directory : /usr/local/info
-	ETC directory  : /usr/local/share/emacs/etc/mew
diff --git a/mail/mew3/pkg-message b/mail/mew3/pkg-message
deleted file mode 100644
index 7e59eb498790..000000000000
--- a/mail/mew3/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-*************************************************************************
-* You must set at least following elisps to your own dot.emacs file:    *
-*                                                                       *
-*       (autoload 'mew "mew" nil t)                                     *
-*       (autoload 'mew-send "mew" nil t)                                *
-*       (setq mew-mail-domain "domain of e-mail address")               *
-*       (setq mew-pop-server "your POP server")     ;; if not localhost *
-*       (setq mew-smtp-server "your SMTP server")   ;; if not localhost *
-*       (setq mew-prog-pgpkey      "fetch")         ;; for PGP use      *
-*       (setq mew-prog-pgpkey-arg  '("-q" "-o" "-"));; for PGP use      *
-*                                                                       *
-*************************************************************************
diff --git a/mail/mew3/pkg-plist b/mail/mew3/pkg-plist
deleted file mode 100644
index 2e7a38b4494e..000000000000
--- a/mail/mew3/pkg-plist
+++ /dev/null
@@ -1,177 +0,0 @@
-bin/incm
-bin/mewcat
-bin/mewdecode
-bin/mewencode
-bin/mewls
-@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
-@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
-info/mew%%MEW_MAJOR_VER%%.info
-info/mew%%MEW_MAJOR_VER%%.info-1
-info/mew%%MEW_MAJOR_VER%%.info-2
-info/mew%%MEW_MAJOR_VER%%.info-3
-info/mew%%MEW_MAJOR_VER%%.jis.info
-info/mew%%MEW_MAJOR_VER%%.jis.info-1
-info/mew%%MEW_MAJOR_VER%%.jis.info-2
-info/mew%%MEW_MAJOR_VER%%.jis.info-3
-@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
-@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
-share/doc/mew%%MEW_MAJOR_VER%%/00api
-share/doc/mew%%MEW_MAJOR_VER%%/00changes
-share/doc/mew%%MEW_MAJOR_VER%%/00copyright
-share/doc/mew%%MEW_MAJOR_VER%%/00copyright.jis
-share/doc/mew%%MEW_MAJOR_VER%%/00diff
-share/doc/mew%%MEW_MAJOR_VER%%/00readme
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme-namazu.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-browse.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-caesar.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-fancy-summary.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-gnus.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz-fixer.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-refile-view.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-smime-ja.texi
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.img
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.png
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.xbm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/COLOR
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-Plain.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-curr.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-folder.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-inc2.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc/mew-kill.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Audio.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Blank.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-External.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Folder.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Image.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Octet-Stream.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Postscript.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Rfc822.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Text.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Unknown.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-Video.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-attach.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-cite.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-comp.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-forward.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-inc.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-next.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-pgp-enc.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-pgp-sigenc.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-pgp-sign.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-prev.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-queue.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-refile.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-reply.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-send.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-sep.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-show.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-write.xpm
-%%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/mew-yank.xpm
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-addrbook.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-addrbook.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-attach.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-attach.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-auth.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-auth.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-blvs.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-blvs.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-bq.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-bq.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-cache.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-cache.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-complete.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-complete.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-config.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-config.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-const.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-const.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-decode.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-decode.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-demo.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-demo.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-draft.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-draft.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-edit.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-edit.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-encode.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-encode.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-env.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-env.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-ext.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-ext.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-fib.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-fib.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-func.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-func.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-gemacs.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-header.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-header.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-highlight.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-highlight.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-key.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-key.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-lang-jp.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mark.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mark.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-md5.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-md5.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-message.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-message.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mime.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mime.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-minibuf.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-minibuf.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mule.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mule0.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-mule3.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-nntp.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-nntp.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-pgp.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-pgp.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-pick.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-pick.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-pop.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-pop.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-refile.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-refile.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-scan.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-scan.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-smime.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-smime.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-smtp.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-smtp.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-sort.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-sort.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-ssh.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-ssh.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-summary.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-summary.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-syntax.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-syntax.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-temacs.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-theme.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-theme.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-thread.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-thread.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-unix.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-vars.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-vars2.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-vars2.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-virtual.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-virtual.elc
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-win32.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew-xemacs.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.el
-%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_LIBDIR%%/site-lisp 2>/dev/null || true
-@dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc
-@dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true
-@dirrm share/doc/mew%%MEW_MAJOR_VER%%/contrib
-@dirrm share/doc/mew%%MEW_MAJOR_VER%%
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
deleted file mode 100644
index 83a0aeaaab62..000000000000
--- a/mail/mutt14/Makefile
+++ /dev/null
@@ -1,153 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:  mutt w/pgp hooks
-# Date created:			  Thur July 25, 1996
-# Whom:				  David O'Brien (obrien@NUXI.com)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mutt
-PORTVERSION=	1.4.1
-PORTREVISION=	1
-CATEGORIES+=	mail
-MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
-		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/mutt/ \
-		ftp://ftp.parodius.com/pub/mutt/
-DISTFILES=	${DISTNAME}i${EXTRACT_SUFX}
-
-PATCH_SITES=	http://www.spinnaker.de/mutt/compressed/:spinnaker \
-		http://www.mutt.org.ua/download/mutt-${PORTVERSION}/:vvv \
-		http://www2.mutt.org.ua/download/mutt-${PORTVERSION}/:vvv \
-		ftp://ftp.mutt.org.ua/pub/mutt/mutt-${PORTVERSION}/:vvv \
-		ftp://ftp2.mutt.org.ua/pub/mutt/mutt-${PORTVERSION}/:vvv
-PATCHFILES=	patch-${PORTVERSION}.rr.compressed.1.gz:spinnaker \
-		patch-${PORTVERSION}.vvv.initials.gz:vvv
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER?=	udo.schweigert@siemens.com
-COMMENT?=	The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.)
-
-.if defined(PACKAGE_BUILDING)
-WITH_SLANG=	yes
-BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
-RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell \
-		urlview:${PORTSDIR}/textproc/urlview
-.endif
-.if ${MACHINE_ARCH} != "alpha"
-#  coredump in sgmls
-WITH_SGML_DOCS?=yes
-.endif
-
-LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
-.if defined(WITH_SLANG)
-LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
-.elif defined(WITH_NCURSES_PORT)
-LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
-.endif
-.if defined(WITH_MUTT_CYRUS_SASL)
-LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-.endif
-.if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no"
-BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
-.endif
-.if defined(WITH_MUTT_XFACE)
-PATCH_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/news/slrnface:extract
-RUN_DEPENDS+=	slrnface:${PORTSDIR}/news/slrnface
-.endif
-
-DIST_SUBDIR=	mutt
-WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
-USE_OPENSSL=	yes
-GNU_CONFIGURE=	yes
-USE_AUTOMAKE=	yes	# configure.in is patched by <PATCHFILES>
-USE_REINPLACE=	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-ssl=${OPENSSLBASE} --sysconfdir=${PREFIX}/etc \
-		--with-sharedir=${PREFIX}/share/mutt \
-		--with-docdir=${PREFIX}/share/doc/mutt --with-charmaps \
-		--with-libiconv-prefix=${PREFIX} \
-		--enable-compressed
-.if defined(MUTT_CONFIGURE_ARGS)
-CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
-.endif
-.if defined(WITH_LOCALES_FIX)
-CONFIGURE_ARGS+=	--enable-locales-fix
-.endif
-.if defined(WITH_SLANG)
-CONFIGURE_ARGS+=	--with-slang=${PREFIX}
-.elif defined(WITH_NCURSES_PORT)
-CONFIGURE_ARGS+=	--with-curses=${PREFIX}
-CFLAGS+=	-I${PREFIX}/include/ncurses -I${PREFIX}/include
-.endif
-.if defined(WITH_MUTT_CYRUS_SASL)
-CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
-.endif
-MAN1=		flea.1 mutt.1 mutt_dotlock.1 muttbug.1
-MAN5=		mbox.5 muttrc.5
-
-post-patch::
-	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
-		${WRKSRC}/contrib/gpg.rc
-
-.if defined(WITH_MUTT_XFACE)
-post-patch::
-	@${ECHO} "===>  Applying XFACE patch"
-	slrnface_dir=`${FIND} ${PORTSDIR}/news/slrnface/work -type d \
-			-name slrnface-\*`; \
-	cd ${BUILD_WRKSRC}; ${PATCH} ${PATCH_ARGS} < $$slrnface_dir/mutt.patch
-.endif
-
-# XXX
-# this should be done automagically by aclocal but ....
-# for now, this will have to do
-pre-build:
-	${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \
-			-e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \
-			-e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \
-			-e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \
-		${BUILD_WRKSRC}/Makefile
-
-.if !defined(NOPORTDOCS)
-post-build:
-	${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
-	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
-	printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
-		ed -s ${WRKSRC}/doc/mutt.man
-.if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no"
-PLIST:=		${WRKDIR}/PLIST
-pre-install:
-	@${CAT} ${PKGDIR}/pkg-plist.htmlfiles > ${PLIST}
-	@${CAT} ${PKGDIR}/pkg-plist >> ${PLIST}
-.endif
-.endif
-
-post-install:
-	@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(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no"
-	${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m 0755 \
-	    -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
-.endif
-
-.if defined(WITH_MUTT_XFACE)
-	@${ECHO} ""
-	@${ECHO} "************************************************************"
-	@${ECHO} "  To enable the XFACE support in mutt you also have to add"
-	@${ECHO} "        set xface=yes"
-	@${ECHO} "  to your ~/.muttrc"
-	@${ECHO} "  Additional information is provided by news/slrnface"
-	@${ECHO} "************************************************************"
-	@${ECHO} ""
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo
deleted file mode 100644
index bb75b8c019b2..000000000000
--- a/mail/mutt14/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (mutt/mutt-1.4.1i.tar.gz) = fb5418135c5be2638964eef2f654f847
-MD5 (mutt/patch-1.4.1.rr.compressed.1.gz) = b50484f8b12328c3ee69222a3eb1da11
-MD5 (mutt/patch-1.4.1.vvv.initials.gz) = 467a4ba3a0aae4ea94ab4d31a94540ab
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-02 b/mail/mutt14/files/patch-02
deleted file mode 100644
index 3717189e334f..000000000000
--- a/mail/mutt14/files/patch-02
+++ /dev/null
@@ -1,63 +0,0 @@
---- doc/Makefile.in.orig	Tue Nov  6 11:12:31 2001
-+++ doc/Makefile.in	Fri Jun 21 12:00:28 2002
-@@ -60,13 +60,19 @@
- topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
- 	README NEWS TODO README.SECURITY README.SSL 
- 
--all: muttrc.man try-html try-txt
-+all: muttrc.man try-html try-txt try-latin1
- 
- try-html: ../makedoc
--	test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-+	rm -f *.html && $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-+	touch $@
- 
- try-txt: ../makedoc
--	test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+	$(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
-+	touch $@
-+
-+try-latin1: 
-+	$(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./
-+	touch $@
- 
- install: all instdoc
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -86,10 +92,10 @@
- 		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
- 	done
- 	$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
--	for file in manual*.html ; do	\
--		$(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
--	done
-+	# $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
-+	# for file in manual*.html ; do	\
-+	# 	$(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
-+	# done
- 
- uninstall:
- 	-rm -f $(DESTDIR)$(mandir)/man1/mutt.1
-@@ -99,14 +105,18 @@
- 
- check:
- manual.txt: manual.sgml
--	if sgml2txt -c latin manual ; then \
--		uniq < manual.txt | expand > _manual.txt ; \
--		rm manual.txt ; \
-+	if sgmlfmt -f ascii manual; then \
-+		uniq < manual.ascii | expand > _manual.txt ; \
-+		rm -f manual.txt manual.ascii; \
- 		mv _manual.txt manual.txt ;\
- 	fi
- 
- manual.html: manual.sgml
--	sgml2html manual  || true
-+	@# sgml2html manual  || true
-+	sgmlfmt -f html manual  || true
-+
-+manual.latin1: manual.sgml
-+	sgmlfmt -f latin1 manual  || true
- 
- manual.ps: manual.sgml
- 	sgml2latex --output=ps manual || true
diff --git a/mail/mutt14/files/patch-03 b/mail/mutt14/files/patch-03
deleted file mode 100644
index b870f7f7aaec..000000000000
--- a/mail/mutt14/files/patch-03
+++ /dev/null
@@ -1,13 +0,0 @@
---- doc/manual.sgml.orig	Tue May  9 17:15:26 2000
-+++ doc/manual.sgml	Fri May 12 11:05:40 2000
-@@ -1,5 +1,8 @@
--<!doctype linuxdoc system>
--
-+<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
-+<!ENTITY dquot "&#34;">
-+]>
-+<linuxdoc>
-+  
- <article>
- 
- <title>The Mutt E-Mail Client
diff --git a/mail/mutt14/files/patch-05 b/mail/mutt14/files/patch-05
deleted file mode 100644
index 13a52d9daa40..000000000000
--- a/mail/mutt14/files/patch-05
+++ /dev/null
@@ -1,87 +0,0 @@
---- curs_lib.c.old	Wed Sep  1 19:39:20 1999
-+++ curs_lib.c	Sun Sep 26 23:47:03 1999
-@@ -156,6 +156,16 @@
-       def = 0;
-       break;
-     }
-+    else if (tolower(ch.ch) == 'y')
-+    {
-+      def = 1;
-+      break;
-+    }
-+    else if (tolower(ch.ch) == 'n')
-+    {
-+      def = 0;
-+      break;
-+    }
-     else
-     {
-       BEEP();
-@@ -413,8 +423,9 @@
- {
-   event_t ch;
-   int choice;
--  char *p;
-+  char *p, *nletters;
- 
-+  nletters = _(letters);
-   mvaddstr (LINES - 1, 0, prompt);
-   clrtoeol ();
-   FOREVER
-@@ -428,6 +439,12 @@
-     }
-     else
-     {
-+      p = strchr (nletters, ch.ch);
-+      if (p)
-+      {
-+	choice = p - nletters + 1;
-+	break;
-+      }
-       p = strchr (letters, ch.ch);
-       if (p)
-       {
---- browser.c.orig	Fri Sep 24 01:08:08 1999
-+++ browser.c	Sun Sep 26 23:46:25 1999
-@@ -750,7 +750,7 @@
- 	  switch (mutt_multi_choice ((reverse) ?
- 	      _("Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? ") :
- 	      _("Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "),
--	      _("dazn")))
-+	      N_("dazn")))
- 	  {
- 	    case -1: /* abort */
- 	      resort = 0;
---- commands.c.orig	Wed Jul  7 02:56:24 1999
-+++ commands.c	Sun Sep 26 23:46:25 1999
-@@ -337,7 +337,7 @@
-   switch (mutt_multi_choice (reverse ?
- 			     _("Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: ") :
- 			     _("Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "),
--			     _("dfrsotuzc")))
-+			     N_("dfrsotuzc")))
-   {
-   case -1: /* abort - don't resort */
-     return -1;
---- compose.c.orig	Mon Feb 12 18:02:38 2001
-+++ compose.c	Fri Mar 30 17:04:09 2001
-@@ -130,7 +130,7 @@
-   char input_signas[SHORT_STRING];
- 
-   switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "),
--			     _("esabf")))
-+			     N_("esabf")))
-   {
-   case 1: /* (e)ncrypt */
-     bits |= PGPENCRYPT;
---- muttlib.c.orig	Sun Apr  9 14:39:02 2000
-+++ muttlib.c	Fri May 12 11:26:58 2000
-@@ -671,7 +671,7 @@
-   if (*append == 0 && access (fname, F_OK) == 0)
-   {
-     switch (mutt_multi_choice
--	    (_("File exists, (o)verwrite, (a)ppend, or (c)ancel?"), _("oac")))
-+	    (_("File exists, (o)verwrite, (a)ppend, or (c)ancel?"), N_("oac")))
-     {
-       case -1: /* abort */
-       case 3:  /* cancel */
diff --git a/mail/mutt14/files/patch-08 b/mail/mutt14/files/patch-08
deleted file mode 100644
index 3e50cbd13779..000000000000
--- a/mail/mutt14/files/patch-08
+++ /dev/null
@@ -1,10 +0,0 @@
---- Muttrc.orig	Sat May 13 08:30:44 2000
-+++ Muttrc	Sat May 13 08:32:05 2000
-@@ -629,6 +629,7 @@
- # Type: boolean
- # Default: yes
- # 
-+set followup_to=no
- # 
- # Controls whether or not the Mail-Followup-To header field is
- # generated when sending mail.  When set, Mutt will generate this
diff --git a/mail/mutt14/files/patch-aclocal.m4 b/mail/mutt14/files/patch-aclocal.m4
deleted file mode 100644
index 6635a1a90fa6..000000000000
--- a/mail/mutt14/files/patch-aclocal.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- aclocal.m4.orig	Fri Jul 28 11:50:25 2000
-+++ aclocal.m4	Wed Dec  5 12:10:16 2001
-@@ -62,4 +62,4 @@
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-+AM_MISSING_PROG(ACLOCAL, aclocal14, $missing_dir)
-+AM_MISSING_PROG(AUTOCONF, autoconf213, $missing_dir)
-+AM_MISSING_PROG(AUTOMAKE, automake14, $missing_dir)
-+AM_MISSING_PROG(AUTOHEADER, autoheader213, $missing_dir)
diff --git a/mail/mutt14/files/patch-configure.in b/mail/mutt14/files/patch-configure.in
deleted file mode 100644
index 0b37933c1c62..000000000000
--- a/mail/mutt14/files/patch-configure.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.in.orig	Mon Nov 11 14:11:26 2002
-+++ configure.in	Mon Nov 11 14:12:09 2002
-@@ -515,7 +515,7 @@
-            AC_MSG_ERROR([SSL support is only useful with POP or IMAP support])
-           fi
- 
--          if test "$with_ssl" != "yes"
-+          if test "$with_ssl" != "yes" && x$withval != x/usr
-           then
-            LDFLAGS="$LDFLAGS -L$withval/lib"
-            CPPFLAGS="$CPPFLAGS -I$withval/include"
-@@ -572,7 +572,7 @@
-         then
-           if test "$with_sasl" != "yes"
-           then
--            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
-+            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl1"
-             LDFLAGS="$LDFLAGS -L$with_sasl/lib"
-           fi
- 
-@@ -625,7 +625,7 @@
- fi])
- 
- if test x$GCC = xyes -a $mutt_cv_warnings = yes; then
--        CFLAGS="-Wall -pedantic $CFLAGS"
-+        CFLAGS="-Wall $CFLAGS"
- fi
- 
- AC_ARG_ENABLE(nfs-fix, [  --enable-nfs-fix           Work around an NFS with broken attributes caching ],
diff --git a/mail/mutt14/files/patch-examples b/mail/mutt14/files/patch-examples
deleted file mode 100644
index 26db7d6c955f..000000000000
--- a/mail/mutt14/files/patch-examples
+++ /dev/null
@@ -1,50 +0,0 @@
---- contrib/Makefile.in.orig	Mon Jun  4 19:14:31 2001
-+++ contrib/Makefile.in	Wed Mar 26 11:45:15 2003
-@@ -12,6 +12,7 @@
- mandir = @mandir@
- srcdir = @srcdir@
- docdir = @docdir@
-+samplesdir = @prefix@/share/examples/mutt
- top_srcdir = @top_srcdir@
- top_builddir = ..
- INSTALL = @INSTALL@
-@@ -37,12 +38,12 @@
- check:
- 
- install:
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(samplesdir) $(DESTDIR)$(samplesdir)/iconv
- 	for f in $(SAMPLES) ; do \
--		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ;	\
-+		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(samplesdir);	\
- 	done
- 	for f in $(srcdir)/iconv/*.rc ; do					\
--		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv	  ;	\
-+		$(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv	  ;	\
- 	done
- 
- # Nothing needs to be done - uninstall in doc removes samples as well.
---- init.h.orig	Wed Mar 26 11:50:36 2003
-+++ init.h	Wed Mar 26 12:54:37 2003
-@@ -1347,8 +1347,8 @@
-   ** .pp
-   ** For examples on how to configure these formats for the various versions
-   ** of PGP which are floating around, see the pgp*.rc and gpg.rc files in
--  ** the samples/ subdirectory which has been installed on your system
--  ** alongside the documentation.
-+  ** the share/examples/mutt subdirectory which has been installed on your
-+  ** system.
-   */
-   { "pgp_getkeys_command",	DT_STR, R_NONE, UL &PgpGetkeysCommand, 0},
-   /*
---- Makefile.am.orig	Wed Mar 26 13:13:10 2003
-+++ Makefile.am	Wed Mar 26 13:25:40 2003
-@@ -13,7 +13,7 @@
- 
- bin_SCRIPTS = muttbug flea
- 
--BUILT_SOURCES = keymap_defs.h patchlist.c
-+BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc
- 
- bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
- mutt_SOURCES = $(BUILT_SOURCES) \
diff --git a/mail/mutt14/files/patch-init.c b/mail/mutt14/files/patch-init.c
deleted file mode 100644
index 389b682cfa11..000000000000
--- a/mail/mutt14/files/patch-init.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- init.c.orig	Wed Jul 24 10:41:29 2002
-+++ init.c	Sat May  3 08:46:29 2003
-@@ -1707,7 +1707,11 @@
- void mutt_init (int skip_sys_rc, LIST *commands)
- {
-   struct passwd *pw;
-+#if __FreeBSD_version < 500000
-+  char nodename[STRING];
-+#else
-   struct utsname utsname;
-+#endif
-   char *p, buffer[STRING], error[STRING];
-   int i, default_rc = 0, need_pause = 0;
-   BUFFER err;
-@@ -1765,16 +1769,21 @@
- #endif
- 
-   /* And about the host... */
-+#if __FreeBSD_version < 500000
-+  gethostname(nodename, sizeof (nodename));
-+#else
-   uname (&utsname);
-+  strfcpy (nodename, utsname.nodename, sizeof (nodename));
-+#endif
-   /* some systems report the FQDN instead of just the hostname */
--  if ((p = strchr (utsname.nodename, '.')))
-+  if ((p = strchr (nodename, '.')))
-   {
--    Hostname = mutt_substrdup (utsname.nodename, p);
-+    Hostname = mutt_substrdup (nodename, p);
-     p++;
-     strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
-   }
-   else
--    Hostname = safe_strdup (utsname.nodename);
-+    Hostname = safe_strdup (nodename);
- 
- #ifndef DOMAIN
- #define DOMAIN buffer
diff --git a/mail/mutt14/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 12eee9d360f8..000000000000
--- a/mail/mutt14/pkg-plist
+++ /dev/null
@@ -1,81 +0,0 @@
-@comment $FreeBSD$
-bin/flea
-bin/mutt
-bin/mutt_dotlock
-bin/muttbug
-bin/pgpewrap
-bin/pgpring
-etc/Muttrc
-etc/mime.types
-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/TODO
-share/doc/mutt/applying-patches.txt
-share/doc/mutt/devel-notes.txt
-share/doc/mutt/manual.txt
-share/doc/mutt/patch-notes.txt
-share/examples/mutt/Mush.rc
-share/examples/mutt/Pine.rc
-share/examples/mutt/Tin.rc
-share/examples/mutt/gpg.rc
-share/examples/mutt/iconv/iconv.aix-3.2.5.rc
-share/examples/mutt/iconv/iconv.aix-4.1.5.rc
-share/examples/mutt/iconv/iconv.aix-4.2.0.rc
-share/examples/mutt/iconv/iconv.aix-4.3.2.rc
-share/examples/mutt/iconv/iconv.freebsd-3.3.rc
-share/examples/mutt/iconv/iconv.glibc-2.1.3.rc
-share/examples/mutt/iconv/iconv.glibc-2.1.90.rc
-share/examples/mutt/iconv/iconv.hpux-10.01.rc
-share/examples/mutt/iconv/iconv.hpux-10.20.rc
-share/examples/mutt/iconv/iconv.hpux-11.00.rc
-share/examples/mutt/iconv/iconv.irix-6.5.rc
-share/examples/mutt/iconv/iconv.osf1-4.0a.rc
-share/examples/mutt/iconv/iconv.osf1-4.0d.rc
-share/examples/mutt/iconv/iconv.solaris-2.4.rc
-share/examples/mutt/iconv/iconv.solaris-2.5.1.rc
-share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc
-share/examples/mutt/iconv/iconv.solaris-2.6.rc
-share/examples/mutt/iconv/iconv.solaris-2.7.rc
-share/examples/mutt/pgp2.rc
-share/examples/mutt/pgp5.rc
-share/examples/mutt/pgp6.rc
-share/examples/mutt/sample.mailcap
-share/examples/mutt/sample.muttrc
-share/examples/mutt/sample.muttrc-tlr
-share/locale/bg/LC_MESSAGES/mutt.mo
-share/locale/ca/LC_MESSAGES/mutt.mo
-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/et/LC_MESSAGES/mutt.mo
-share/locale/fr/LC_MESSAGES/mutt.mo
-share/locale/gl/LC_MESSAGES/mutt.mo
-share/locale/hu/LC_MESSAGES/mutt.mo
-share/locale/id/LC_MESSAGES/mutt.mo
-share/locale/it/LC_MESSAGES/mutt.mo
-share/locale/ja/LC_MESSAGES/mutt.mo
-share/locale/ko/LC_MESSAGES/mutt.mo
-share/locale/lt/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/tr/LC_MESSAGES/mutt.mo
-share/locale/uk/LC_MESSAGES/mutt.mo
-share/locale/zh_CN/LC_MESSAGES/mutt.mo
-share/locale/zh_TW/LC_MESSAGES/mutt.mo
-@dirrm share/examples/mutt/iconv
-@dirrm share/examples/mutt
-@dirrm share/doc/mutt
diff --git a/mail/mutt14/pkg-plist.htmlfiles b/mail/mutt14/pkg-plist.htmlfiles
deleted file mode 100644
index baabdf27f412..000000000000
--- a/mail/mutt14/pkg-plist.htmlfiles
+++ /dev/null
@@ -1,346 +0,0 @@
-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/manual305.html
-share/doc/mutt/html/manual306.html
-share/doc/mutt/html/manual307.html
-share/doc/mutt/html/manual308.html
-share/doc/mutt/html/manual309.html
-share/doc/mutt/html/manual31.html
-share/doc/mutt/html/manual310.html
-share/doc/mutt/html/manual311.html
-share/doc/mutt/html/manual312.html
-share/doc/mutt/html/manual313.html
-share/doc/mutt/html/manual314.html
-share/doc/mutt/html/manual315.html
-share/doc/mutt/html/manual316.html
-share/doc/mutt/html/manual317.html
-share/doc/mutt/html/manual318.html
-share/doc/mutt/html/manual319.html
-share/doc/mutt/html/manual32.html
-share/doc/mutt/html/manual320.html
-share/doc/mutt/html/manual321.html
-share/doc/mutt/html/manual322.html
-share/doc/mutt/html/manual323.html
-share/doc/mutt/html/manual324.html
-share/doc/mutt/html/manual325.html
-share/doc/mutt/html/manual326.html
-share/doc/mutt/html/manual327.html
-share/doc/mutt/html/manual328.html
-share/doc/mutt/html/manual329.html
-share/doc/mutt/html/manual33.html
-share/doc/mutt/html/manual330.html
-share/doc/mutt/html/manual331.html
-share/doc/mutt/html/manual332.html
-share/doc/mutt/html/manual333.html
-share/doc/mutt/html/manual334.html
-share/doc/mutt/html/manual335.html
-share/doc/mutt/html/manual336.html
-share/doc/mutt/html/manual337.html
-share/doc/mutt/html/manual338.html
-share/doc/mutt/html/manual339.html
-share/doc/mutt/html/manual34.html
-share/doc/mutt/html/manual340.html
-share/doc/mutt/html/manual341.html
-share/doc/mutt/html/manual342.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
-share/doc/mutt/manual.latin1
-@dirrm share/doc/mutt/html
diff --git a/mail/p5-POE-Component-Client-POP3/Makefile b/mail/p5-POE-Component-Client-POP3/Makefile
deleted file mode 100644
index 30c1e7e23624..000000000000
--- a/mail/p5-POE-Component-Client-POP3/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# New ports collection makefile for:	POE-Component-Client-POP3
-# Date created:	   17 March 2002
-# Whom:		   Sergey Skvortsov <skv@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	POE-Component-Client-POP3
-PORTVERSION=	0.02
-CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	POE
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	skv@FreeBSD.org
-COMMENT=	Impliment a POP3 client POE component
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
-PERL_CONFIGURE=	yes
-
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=		POE::Component::Client::POP3.3
-
-post-install:
-.ifndef(NOPORTDOCS)
-	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/samples/* ${EXAMPLESDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/p5-POE-Component-Client-POP3/distinfo b/mail/p5-POE-Component-Client-POP3/distinfo
deleted file mode 100644
index a4ee1217272c..000000000000
--- a/mail/p5-POE-Component-Client-POP3/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (POE-Component-Client-POP3-0.02.tar.gz) = 95728dfddce8af663ea61449beb265f1
diff --git a/mail/p5-POE-Component-Client-POP3/pkg-descr b/mail/p5-POE-Component-Client-POP3/pkg-descr
deleted file mode 100644
index 8d4662304ba0..000000000000
--- a/mail/p5-POE-Component-Client-POP3/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-POE::Component::Client::POP3 is a POE component for interacting with a
-POP3 server.  This means it is an event driven way to communicate with a
-server that impliments Post Office Protocol Version 3 see rfc 1939 for
-details on the protocol.
-
-WWW: http://search.cpan.org/search?dist=POE-Component-Client-POP3
-
--- Sergey Skvortsov
-skv@FreeBSD.org
diff --git a/mail/p5-POE-Component-Client-POP3/pkg-plist b/mail/p5-POE-Component-Client-POP3/pkg-plist
deleted file mode 100644
index eed6aad99217..000000000000
--- a/mail/p5-POE-Component-Client-POP3/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/POE/Component/Client/POP3.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/test.perl
-%%PORTDOCS%%%%EXAMPLESDIR%%/term.perl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
diff --git a/mail/pecl-mailparse/Makefile b/mail/pecl-mailparse/Makefile
deleted file mode 100644
index d401f211d2f1..000000000000
--- a/mail/pecl-mailparse/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# Ports collection makefile for:  pear-mailparse
-# Date created:			  09 January 2003
-# Whom:				  Thierry Thomas (<thierry@pompo.net>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mailparse
-PORTVERSION=	0.9.1
-CATEGORIES=	mail www
-MASTER_SITES=	http://pear.php.net/get/
-PKGNAMEPREFIX=	pear-
-EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	PEAR
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	PEAR classes to create and decode MIME messages
-
-BUILD_DEPENDS=	${LOCALBASE}/bin/phpize:${PORTSDIR}/www/mod_php4	\
-		${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
-RUN_DEPENDS=	${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
-
-USE_AUTOMAKE=	yes
-USE_AUTOCONF=	yes
-
-.include <bsd.port.pre.mk>
-
-# Don't call autoconf directly, ./buildconf does this
-GNU_CONFIGURE=	yes
-USE_AUTOCONF=	no
-USE_LIBTOOL=	no
-USE_REINPLACE=	yes
-
-REINPLACE_ARGS=	-i.before_mailparse
-
-.if exists(${LOCALBASE}/bin/php-config)
-PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
-EXT_DIR!=	${LOCALBASE}/bin/php-config --extension-dir | ${SED} -e \
-			"s:${PHP_BASE}/::"
-.else
-PHP_BASE=	${LOCALBASE}
-.endif
-PEAR=		${LOCALBASE}/bin/pear
-LPHP_LIB=	lib/php
-PHP_DIR?=	${LOCALBASE}/etc
-PHP_INI=	${PHP_DIR}/php.ini
-PEARDIR=	${PHP_BASE}/${LPHP_LIB}
-PLIST_SUB=	EXTDIR=${EXT_DIR} PEARDIR=${LPHP_LIB}
-
-DOCSDIR=	${PEARDIR}/docs/${PORTNAME}
-DOCS=		CREDITS README try.php
-TESTDIR=	${PEARDIR}/tests/${PORTNAME}
-
-post-patch:
-	(cd ${WRKSRC} && ${LOCALBASE}/bin/phpize)
-
-pre-configure:
-	@if ! ${LOCALBASE}/bin/php -i | ${GREP} -q -e "--enable-mbstring"; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please configure PHP with mbstring support." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	fi
-
-post-install:
-	@${STRIP_CMD} ${PHP_BASE}/${EXT_DIR}/mailparse.so
-# Configure extension_dir
-	@if [ ! -f ${PHP_INI} ]; then \
-		${ECHO_MSG} "===>   Creating ${PHP_INI} for PHP" ; \
-		${CP} -p ${PHP_INI}-dist ${PHP_INI} ; \
-	fi
-	@if ${GREP} -q -e '^extension_dir = ./' ${PHP_INI} ; then \
-		${ECHO_MSG} "===>   Configuring ${PHP_INI}" ; \
-		${REINPLACE_CMD} -e 's!^extension_dir = ./!extension_dir = ${PHP_BASE}/${EXT_DIR}!' \
-			${PHP_INI} ; \
-	fi
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-	@${MKDIR} ${TESTDIR}
-	@${CP} -Rp ${WRKSRC}/tests ${TESTDIR}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TESTDIR}
-	@${ECHO_MSG} "===> Examples installed in ${TESTDIR}."
-.endif
-# Register a new package
-	@${PEAR} install -r -f ${WRKDIR}/package.xml
-
-.include <bsd.port.post.mk>
diff --git a/mail/pecl-mailparse/distinfo b/mail/pecl-mailparse/distinfo
deleted file mode 100644
index 0cc7b93aa6a2..000000000000
--- a/mail/pecl-mailparse/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (PEAR/mailparse-0.9.1.tgz) = ae18c2fed49946bce049414b4cee3747
diff --git a/mail/pecl-mailparse/pkg-deinstall b/mail/pecl-mailparse/pkg-deinstall
deleted file mode 100644
index c17e9d19ced0..000000000000
--- a/mail/pecl-mailparse/pkg-deinstall
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Remove package declaration from PEAR's registry.
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-fi
-PKG_NAME=${1%%-[0-9._]*}
-PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
-
-${PKG_PREFIX}/bin/pear uninstall -r ${PACKAGE} || true
diff --git a/mail/pecl-mailparse/pkg-descr b/mail/pecl-mailparse/pkg-descr
deleted file mode 100644
index 93a57a80f100..000000000000
--- a/mail/pecl-mailparse/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Mailparse is an extension for parsing and working with email messages.
-It can deal with rfc822 and rfc2045 (MIME) compliant messages.
-Mailparse is stream based, which means that it does not keep in-memory
-copies of the files it processes - so it is very resource efficient
-when dealing with large messages.
-
-WWW: http://www.php.net/manual/en/ref.mailparse.php
diff --git a/mail/pecl-mailparse/pkg-plist b/mail/pecl-mailparse/pkg-plist
deleted file mode 100644
index a22d5cbce5da..000000000000
--- a/mail/pecl-mailparse/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-%%EXTDIR%%/mailparse.so
-%%PORTDOCS%%%%PEARDIR%%/docs/mailparse/CREDITS
-%%PORTDOCS%%%%PEARDIR%%/docs/mailparse/README
-%%PORTDOCS%%%%PEARDIR%%/docs/mailparse/try.php
-%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/tests/testdata/mime.exp
-%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/tests/testdata/mime.txt
-%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/tests/testdata/phpcvs1.exp
-%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/tests/testdata/phpcvs1.txt
-%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/tests/testdata/qp.exp
-%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/tests/testdata/qp.txt
-%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/tests/testdata/uue.exp
-%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/tests/testdata/uue.txt
-%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/tests/001.phpt
-%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/tests/002.phpt
-%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/tests/003.phpt
-%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/tests/004.phpt
-%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/tests/005.phpt
-%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/tests/006.phpt
-%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/tests/007.phpt
-%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/tests/008.phpt
-%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/tests/parse_test_messages.phpt
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/mailparse
-%%PORTDOCS%%@dirrm %%PEARDIR%%/tests/mailparse/tests/testdata
-%%PORTDOCS%%@dirrm %%PEARDIR%%/tests/mailparse/tests/
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
deleted file mode 100644
index 63539a865545..000000000000
--- a/mail/postfix1/Makefile
+++ /dev/null
@@ -1,166 +0,0 @@
-# New ports collection makefile for:	postfix-current
-# Date created: 	18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
-#
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
-
-PORTNAME=	postfix
-PORTVERSION=	2.0.9
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
-
-USE_SUBMAKE=	yes
-USE_REINPLACE=	yes
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \
-	postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \
-	relocated.5 transport.5 virtual.5
-
-MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
-	smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
-
-# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
-# patch it.
-MAN8base=$(MAN8:S/tlsmgr.8//)
-
-CONF1=	main.cf master.cf access aliases canonical pcre_table regexp_table \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-
-post-patch:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-patch:
-.for file in ${MAN1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN5}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN8base}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in faq rate rewrite uce
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${CONF1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file}
-.endfor
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	 config_directory=${PREFIX}/etc/postfix \
-	 daemon_directory=${PREFIX}/libexec/postfix \
-	 command_directory=${PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PREFIX}/sbin/sendmail \
-	 newaliases_path=${PREFIX}/bin/newaliases \
-	 mailq_path=${PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PREFIX}/man \
-	 sample_directory=${PREFIX}/etc/postfix \
-	 readme_directory=${READMEDIR}
-
-.for file in ${CONF1}
-	${INSTALL_DATA} ${WRKSRC}/conf/${file} \
-		${PREFIX}/etc/postfix/sample-${file}
-.endfor
-
-	@${INSTALL_SCRIPT} \
-		${WRKSRC}/auxiliary/rmail/rmail \
-		${PREFIX}/bin/rmail
-
-# optional TEST binaries
-.for file in ${BIN1}
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/src/smtpstone/${file} \
-		${PREFIX}/sbin
-.endfor
-
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \
-		${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them after this step, and
-# if we run etc/postfix/post-install again during package installation,
-# it will complain about missing files.
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/mail/postfix1/distinfo b/mail/postfix1/distinfo
deleted file mode 100644
index 61274400cc23..000000000000
--- a/mail/postfix1/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 (postfix/postfix-2.0.9.tar.gz) = c1ad12edfa19c23579b251078c464651
-MD5 (postfix/tls+ipv6-1.14-pf-2.0.9.patch.gz) = 6c55e142fc4b6ebf5e5ee707574446ba
-MD5 (postfix/ipv6-1.14-pf-2.0.9.patch.gz) = a449622b4a822a726065c8f2a960bbad
-MD5 (postfix/pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz) = f34a4b7e55a02675d04358e036f1362d
-MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
diff --git a/mail/postfix1/files/patch-ea b/mail/postfix1/files/patch-ea
deleted file mode 100644
index 6c3f98d2af4f..000000000000
--- a/mail/postfix1/files/patch-ea
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000
---- ./src/cleanup/cleanup.c	Thu Jun  1 21:52:22 2000
-***************
-*** 118,121 ****
-  /* FILES
-! /*	/etc/postfix/canonical*, canonical mapping table
-! /*	/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
---- 118,121 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! /*	!!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
diff --git a/mail/postfix1/files/patch-eb b/mail/postfix1/files/patch-eb
deleted file mode 100644
index e67680963d2d..000000000000
--- a/mail/postfix1/files/patch-eb
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/global/mail_conf.c.orig	Sun May  7 18:51:16 2000
---- ./src/global/mail_conf.c	Thu Jun  1 22:16:29 2000
-***************
-*** 53,55 ****
-  /* FILES
-! /*	/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
---- 53,55 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
diff --git a/mail/postfix1/files/patch-ec b/mail/postfix1/files/patch-ec
deleted file mode 100644
index 5f5d1ad9cadc..000000000000
--- a/mail/postfix1/files/patch-ec
+++ /dev/null
@@ -1,41 +0,0 @@
-*** ./src/global/mail_params.h.orig	Thu Jan  3 13:13:37 2002
---- ./src/global/mail_params.h	Tue Jan  8 22:18:22 2002
-***************
-*** 51,55 ****
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"postdrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
---- 51,55 ----
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"maildrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
-***************
-*** 170,174 ****
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
---- 170,174 ----
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-***************
-*** 204,208 ****
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
---- 204,208 ----
-  #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-ed b/mail/postfix1/files/patch-ed
deleted file mode 100644
index f971b62720d8..000000000000
--- a/mail/postfix1/files/patch-ed
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
---- ./src/local/mailbox.c	Thu Jun  1 22:37:48 2000
-***************
-*** 15,17 ****
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/[spool/]mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
---- 15,17 ----
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
diff --git a/mail/postfix1/files/patch-ee b/mail/postfix1/files/patch-ee
deleted file mode 100644
index ef44eac24b73..000000000000
--- a/mail/postfix1/files/patch-ee
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/master/master.c.orig	Tue Mar  7 10:25:07 2000
---- ./src/master/master.c	Thu Jun  1 22:43:50 2000
-***************
-*** 104,107 ****
-  /* FILES
-! /*	/etc/postfix/main.cf: global configuration file.
-! /*	/etc/postfix/master.cf: master process configuration file.
-  /*	/var/spool/postfix/pid/master.pid: master lock file.
---- 104,107 ----
-  /* FILES
-! /*	!!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.
diff --git a/mail/postfix1/files/patch-ef b/mail/postfix1/files/patch-ef
deleted file mode 100644
index 586b304a103d..000000000000
--- a/mail/postfix1/files/patch-ef
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999
---- ./src/postdrop/postdrop.c	Thu Jun  1 22:44:22 2000
-***************
-*** 39,41 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 39,41 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix1/files/patch-eg b/mail/postfix1/files/patch-eg
deleted file mode 100644
index 2983bbfd86ea..000000000000
--- a/mail/postfix1/files/patch-eg
+++ /dev/null
@@ -1,20 +0,0 @@
-*** ./src/sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000
---- ./src/sendmail/sendmail.c	Thu Jun  1 22:47:24 2000
-***************
-*** 57,59 ****
-  /*	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
---- 57,59 ----
-  /*	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
-***************
-*** 159,161 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 159,161 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix1/files/patch-eh b/mail/postfix1/files/patch-eh
deleted file mode 100644
index c104c3680d21..000000000000
--- a/mail/postfix1/files/patch-eh
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999
---- ./src/trivial-rewrite/transport.c	Thu Jun  1 22:47:49 2000
-***************
-*** 32,34 ****
-  /* FILES
-! /*	/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
---- 32,34 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix1/files/patch-main.cf b/mail/postfix1/files/patch-main.cf
deleted file mode 100644
index 95fb2feaca0a..000000000000
--- a/mail/postfix1/files/patch-main.cf
+++ /dev/null
@@ -1,58 +0,0 @@
---- ./conf/main.cf	Wed Jan  8 22:11:52 2003
-+++ ./conf/main.cf	Wed Jan  8 22:11:53 2003
-@@ -31,13 +31,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = /usr/local/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = /usr/local/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -590,32 +590,32 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = /usr/local/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = /usr/local/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = /usr/local/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = /usr/local/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- #
--sample_directory =
-+sample_directory = /usr/local/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix1/files/patch-post-install b/mail/postfix1/files/patch-post-install
deleted file mode 100644
index 92b2d4c2c6eb..000000000000
--- a/mail/postfix1/files/patch-post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./conf/#post-install~	Fri Jan 18 12:32:54 2002
-+++ ./conf/post-install	Fri Jan 18 12:32:54 2002
-@@ -183,7 +183,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix1/pkg-descr b/mail/postfix1/pkg-descr
deleted file mode 100644
index 1f335ce6820c..000000000000
--- a/mail/postfix1/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time being sendmail-compatible enough to not upset existing
-users. It also offers QMQP and VERP support to let Postfix act as delivery
-daemon for ezmlm-idx.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix1/pkg-install b/mail/postfix1/pkg-install
deleted file mode 100644
index 1ef1fb5b2089..000000000000
--- a/mail/postfix1/pkg-install
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local question default answer
-
-    question=$1
-    default=$2
-    while :; do
-        answer=$(ask "${question}" "${default}")
-        case "${answer}" in
-        [Yy]*)	return 0;;
-        [Nn]*)	return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    USER=postfix
-    GROUP=postfix
-    GROUP2=maildrop
-
-    if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP} -h -
-	then
-	    echo "Added group \"${GROUP}\"."
-	else
-	    echo "Adding group \"${GROUP}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP2}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP2} -h -
-	then
-	    echo "Added group \"${GROUP2}\"."
-	else
-	    echo "Adding group \"${GROUP2}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-        echo "You already have a user \"${USER}\", so I will use it."
-    else
-        if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \
-           -d /var/spool/postfix \
-           -s /sbin/nologin \
-           -c "Postfix Mail System"
-	then
-	    echo "Added user \"${USER}\"."
-	else
-	    echo "Adding user \"${USER}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-        echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-    else
-        echo "You need user \"${USER}\" added to group \"mail\"."
-        if yesno "Would you like me to add it" y; then
-            /usr/sbin/pw groupmod mail -m ${USER} || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	CONF1="main.cf master.cf access aliases canonical pcre_table \
-	regexp_table relocated transport virtual"
-
-	for file in $CONF1
-	do
-	        if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then
-        	        cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file
-	        fi
-	done
-
-	sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	 config_directory=${PKG_PREFIX}/etc/postfix \
-	 daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	 command_directory=${PKG_PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	 newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	 mailq_path=${PKG_PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PKG_PREFIX}/man \
-	 sample_directory=${PKG_PREFIX}/etc/postfix \
-	 readme_directory=no \
-	 upgrade-package
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-fi
-
-replace() {
-    local orig repl
-    
-    orig=$1
-    repl=$2
-    if [ -e ${orig} ]; then
-        mv -f ${orig} ${orig}.OFF
-        chmod 0 ${orig}.OFF
-    fi
-    if [ -e ${repl} ]; then
-        ln -s ${repl} ${orig}
-    fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-    if [ -x /sbin/sysctl ]; then
-        OSVERSION=`/sbin/sysctl -n kern.osreldate`
-    else
-        OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-    fi
-    if [ ${OSVERSION} -ge 400014 ]; then
-        if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" n; then
-            mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-            echo "#"						>  /etc/mail/mailer.conf
-            echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-            echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-            echo "#"						>> /etc/mail/mailer.conf
-            echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "mailq		${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-        fi
-    else
-        if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
-            replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/mailq	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
-            echo "Done."
-        fi
-    fi
-fi
diff --git a/mail/postfix1/pkg-message b/mail/postfix1/pkg-message
deleted file mode 100644
index 1c9fd6699bb9..000000000000
--- a/mail/postfix1/pkg-message
+++ /dev/null
@@ -1,40 +0,0 @@
-If you have postfix configured in your /etc/mail/mailer.conf (answered yes to
-the previous question) and would like to enable postfix to start at boot time,
-please set these variables in your /etc/rc.conf file:
-
-sendmail_enable="YES"
-sendmail_flags="-bd"
-sendmail_outbound_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-This will disable Sendmail completely.
-
-Alternatively to the above settings, you can enable postfix to start with
-the other local services, for example, after your database server starts if
-you need it to be running for postfix.  To do this, set in your rc.conf file:
-
-sendmail_enable="NONE"                                
-
-Then make the following symbolic link:
-
-cd /usr/local/etc/rc.d
-ln -s /usr/local/sbin/postfix postfix.sh
-
-
-Also, you will want to disable some Sendmail-specific daily maintenance
-routines in your /etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"                                      
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix1/pkg-plist b/mail/postfix1/pkg-plist
deleted file mode 100644
index c102595ef4bf..000000000000
--- a/mail/postfix1/pkg-plist
+++ /dev/null
@@ -1,180 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi
-@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi
-bin/rmail
-etc/postfix/LICENSE
-etc/postfix/main.cf.default
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases
-etc/postfix/sample-canonical
-etc/postfix/sample-pcre_table
-etc/postfix/sample-regexp_table
-etc/postfix/sample-relocated
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-auth.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-compatibility.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-filter.cf
-etc/postfix/sample-flush.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-lmtp.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-mime.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre-access.cf
-etc/postfix/sample-pcre-body.cf
-etc/postfix/sample-pcre-header.cf
-etc/postfix/sample-qmqpd.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-regexp-access.cf
-etc/postfix/sample-regexp-body.cf
-etc/postfix/sample-regexp-header.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
-etc/postfix/sample-transport
-etc/postfix/sample-virtual
-%%SUB_TLS%%etc/postfix/sample-tls.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/virtual
-%%SUB_TLS%%libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-bin/newaliases
-bin/mailq
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/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 93c5b95ec561..000000000000
--- a/mail/postfix1/scripts/configure
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \
-	mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \
-		rm $f.orig
-done
diff --git a/mail/postfix1/scripts/configure.postfix b/mail/postfix1/scripts/configure.postfix
deleted file mode 100644
index d0de8ebb1990..000000000000
--- a/mail/postfix1/scripts/configure.postfix
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix1/scripts/Attic/configure.postfix,v 1.33 2003-05-12 21:02:53 obraun Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-TLS		"SSL and TLS" "$status_TLS" \
-IPv6		"IPv6 support" "$status_IPv6" \
-IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-MySQL		"MySQL map lookups" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
-OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
-OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TLS="@comment "
-SUB_TEST="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-                SASL)
-                        echo "LIB_DEPENDS+=     sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-                        echo "POSTFIX_CCARGS+=  -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-                        echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-                        echo "SASL_SUFFIX=      +sasl"
-                        if [ -f ${PREFIX}/lib/libsasl.a ]; then
-                                if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then
-                                        echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                        echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                                fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                        fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
-                        SUB_SASL=""
-                        ;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${PREFIX}/lib/libsasl2.a ]; then
-				if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then
-					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			fi
-			echo ".if exists(/usr/lib/libkrb.a)"
-			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
-			echo ".endif"
-			SUB_SASL=""
-			;;
-		TLS)
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.9-0.9.7b/pfixtls.diff"
-			echo "PATCH_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls"
-			SUB_TLS=""
-			;;
-		DB3)
-			if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			DB3_SELECTED="YES"
-			;;
-		DB40)
-			if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			DB40_SELECTED="YES"
-			;;
-		DB41)
-			if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			DB41_SELECTED="YES"
-			;;
-		MySQL)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			echo "MYSQL_SUFFIX=	+mysql"
-			;;
-		PgSQL)
-			echo "POSTGRESQL_PORT?=	databases/postgresql7"
-			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PATCH_SITES+=	http://mat.cc/postfix/"
-			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
-			echo "PATCH_DIST_STRIP= -p1"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			;;
-		OpenLDAP12)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap12"
-			;;
-		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap20"
-			;;
-		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
- 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
- 			echo "OPENLDAP_SUFFIX=	+openldap21"
-			;;
-		Test)
-			echo "BIN1=		smtp-sink smtp-source"
-			SUB_TEST=""
-			;;
-		IPv6)
-			if [ X$SUB_TLS = "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "IPv6_SUFFIX=	+ipv6"
-			echo ""
-			IPv6SELECTED=YES
-			;;
-		IPv6TLS)
-			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	tls+ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls+ipv6"
-			SUB_TLS=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will.  so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"
diff --git a/mail/postfix1/scripts/fix-files-list b/mail/postfix1/scripts/fix-files-list
deleted file mode 100644
index cc4a1083a814..000000000000
--- a/mail/postfix1/scripts/fix-files-list
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them later, and if we
-# run post-install it will complain about missing files
-# (script from Simon J. Mudd)
-
-ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1
-%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/
-w
-q
-EOF
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
deleted file mode 100644
index 63539a865545..000000000000
--- a/mail/postfix20/Makefile
+++ /dev/null
@@ -1,166 +0,0 @@
-# New ports collection makefile for:	postfix-current
-# Date created: 	18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
-#
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
-
-PORTNAME=	postfix
-PORTVERSION=	2.0.9
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
-
-USE_SUBMAKE=	yes
-USE_REINPLACE=	yes
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \
-	postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \
-	relocated.5 transport.5 virtual.5
-
-MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
-	smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
-
-# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
-# patch it.
-MAN8base=$(MAN8:S/tlsmgr.8//)
-
-CONF1=	main.cf master.cf access aliases canonical pcre_table regexp_table \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-
-post-patch:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-patch:
-.for file in ${MAN1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN5}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN8base}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in faq rate rewrite uce
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${CONF1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file}
-.endfor
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	 config_directory=${PREFIX}/etc/postfix \
-	 daemon_directory=${PREFIX}/libexec/postfix \
-	 command_directory=${PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PREFIX}/sbin/sendmail \
-	 newaliases_path=${PREFIX}/bin/newaliases \
-	 mailq_path=${PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PREFIX}/man \
-	 sample_directory=${PREFIX}/etc/postfix \
-	 readme_directory=${READMEDIR}
-
-.for file in ${CONF1}
-	${INSTALL_DATA} ${WRKSRC}/conf/${file} \
-		${PREFIX}/etc/postfix/sample-${file}
-.endfor
-
-	@${INSTALL_SCRIPT} \
-		${WRKSRC}/auxiliary/rmail/rmail \
-		${PREFIX}/bin/rmail
-
-# optional TEST binaries
-.for file in ${BIN1}
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/src/smtpstone/${file} \
-		${PREFIX}/sbin
-.endfor
-
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \
-		${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them after this step, and
-# if we run etc/postfix/post-install again during package installation,
-# it will complain about missing files.
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/mail/postfix20/distinfo b/mail/postfix20/distinfo
deleted file mode 100644
index 61274400cc23..000000000000
--- a/mail/postfix20/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 (postfix/postfix-2.0.9.tar.gz) = c1ad12edfa19c23579b251078c464651
-MD5 (postfix/tls+ipv6-1.14-pf-2.0.9.patch.gz) = 6c55e142fc4b6ebf5e5ee707574446ba
-MD5 (postfix/ipv6-1.14-pf-2.0.9.patch.gz) = a449622b4a822a726065c8f2a960bbad
-MD5 (postfix/pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz) = f34a4b7e55a02675d04358e036f1362d
-MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
diff --git a/mail/postfix20/files/patch-ea b/mail/postfix20/files/patch-ea
deleted file mode 100644
index 6c3f98d2af4f..000000000000
--- a/mail/postfix20/files/patch-ea
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000
---- ./src/cleanup/cleanup.c	Thu Jun  1 21:52:22 2000
-***************
-*** 118,121 ****
-  /* FILES
-! /*	/etc/postfix/canonical*, canonical mapping table
-! /*	/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
---- 118,121 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! /*	!!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
diff --git a/mail/postfix20/files/patch-eb b/mail/postfix20/files/patch-eb
deleted file mode 100644
index e67680963d2d..000000000000
--- a/mail/postfix20/files/patch-eb
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/global/mail_conf.c.orig	Sun May  7 18:51:16 2000
---- ./src/global/mail_conf.c	Thu Jun  1 22:16:29 2000
-***************
-*** 53,55 ****
-  /* FILES
-! /*	/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
---- 53,55 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
diff --git a/mail/postfix20/files/patch-ec b/mail/postfix20/files/patch-ec
deleted file mode 100644
index 5f5d1ad9cadc..000000000000
--- a/mail/postfix20/files/patch-ec
+++ /dev/null
@@ -1,41 +0,0 @@
-*** ./src/global/mail_params.h.orig	Thu Jan  3 13:13:37 2002
---- ./src/global/mail_params.h	Tue Jan  8 22:18:22 2002
-***************
-*** 51,55 ****
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"postdrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
---- 51,55 ----
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"maildrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
-***************
-*** 170,174 ****
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
---- 170,174 ----
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-***************
-*** 204,208 ****
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
---- 204,208 ----
-  #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-ed b/mail/postfix20/files/patch-ed
deleted file mode 100644
index f971b62720d8..000000000000
--- a/mail/postfix20/files/patch-ed
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
---- ./src/local/mailbox.c	Thu Jun  1 22:37:48 2000
-***************
-*** 15,17 ****
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/[spool/]mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
---- 15,17 ----
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
diff --git a/mail/postfix20/files/patch-ee b/mail/postfix20/files/patch-ee
deleted file mode 100644
index ef44eac24b73..000000000000
--- a/mail/postfix20/files/patch-ee
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/master/master.c.orig	Tue Mar  7 10:25:07 2000
---- ./src/master/master.c	Thu Jun  1 22:43:50 2000
-***************
-*** 104,107 ****
-  /* FILES
-! /*	/etc/postfix/main.cf: global configuration file.
-! /*	/etc/postfix/master.cf: master process configuration file.
-  /*	/var/spool/postfix/pid/master.pid: master lock file.
---- 104,107 ----
-  /* FILES
-! /*	!!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.
diff --git a/mail/postfix20/files/patch-ef b/mail/postfix20/files/patch-ef
deleted file mode 100644
index 586b304a103d..000000000000
--- a/mail/postfix20/files/patch-ef
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999
---- ./src/postdrop/postdrop.c	Thu Jun  1 22:44:22 2000
-***************
-*** 39,41 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 39,41 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix20/files/patch-eg b/mail/postfix20/files/patch-eg
deleted file mode 100644
index 2983bbfd86ea..000000000000
--- a/mail/postfix20/files/patch-eg
+++ /dev/null
@@ -1,20 +0,0 @@
-*** ./src/sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000
---- ./src/sendmail/sendmail.c	Thu Jun  1 22:47:24 2000
-***************
-*** 57,59 ****
-  /*	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
---- 57,59 ----
-  /*	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
-***************
-*** 159,161 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 159,161 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix20/files/patch-eh b/mail/postfix20/files/patch-eh
deleted file mode 100644
index c104c3680d21..000000000000
--- a/mail/postfix20/files/patch-eh
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999
---- ./src/trivial-rewrite/transport.c	Thu Jun  1 22:47:49 2000
-***************
-*** 32,34 ****
-  /* FILES
-! /*	/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
---- 32,34 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix20/files/patch-main.cf b/mail/postfix20/files/patch-main.cf
deleted file mode 100644
index 95fb2feaca0a..000000000000
--- a/mail/postfix20/files/patch-main.cf
+++ /dev/null
@@ -1,58 +0,0 @@
---- ./conf/main.cf	Wed Jan  8 22:11:52 2003
-+++ ./conf/main.cf	Wed Jan  8 22:11:53 2003
-@@ -31,13 +31,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = /usr/local/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = /usr/local/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -590,32 +590,32 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = /usr/local/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = /usr/local/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = /usr/local/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = /usr/local/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- #
--sample_directory =
-+sample_directory = /usr/local/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix20/files/patch-post-install b/mail/postfix20/files/patch-post-install
deleted file mode 100644
index 92b2d4c2c6eb..000000000000
--- a/mail/postfix20/files/patch-post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./conf/#post-install~	Fri Jan 18 12:32:54 2002
-+++ ./conf/post-install	Fri Jan 18 12:32:54 2002
-@@ -183,7 +183,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix20/pkg-descr b/mail/postfix20/pkg-descr
deleted file mode 100644
index 1f335ce6820c..000000000000
--- a/mail/postfix20/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time being sendmail-compatible enough to not upset existing
-users. It also offers QMQP and VERP support to let Postfix act as delivery
-daemon for ezmlm-idx.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix20/pkg-install b/mail/postfix20/pkg-install
deleted file mode 100644
index 1ef1fb5b2089..000000000000
--- a/mail/postfix20/pkg-install
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local question default answer
-
-    question=$1
-    default=$2
-    while :; do
-        answer=$(ask "${question}" "${default}")
-        case "${answer}" in
-        [Yy]*)	return 0;;
-        [Nn]*)	return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    USER=postfix
-    GROUP=postfix
-    GROUP2=maildrop
-
-    if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP} -h -
-	then
-	    echo "Added group \"${GROUP}\"."
-	else
-	    echo "Adding group \"${GROUP}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP2}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP2} -h -
-	then
-	    echo "Added group \"${GROUP2}\"."
-	else
-	    echo "Adding group \"${GROUP2}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-        echo "You already have a user \"${USER}\", so I will use it."
-    else
-        if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \
-           -d /var/spool/postfix \
-           -s /sbin/nologin \
-           -c "Postfix Mail System"
-	then
-	    echo "Added user \"${USER}\"."
-	else
-	    echo "Adding user \"${USER}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-        echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-    else
-        echo "You need user \"${USER}\" added to group \"mail\"."
-        if yesno "Would you like me to add it" y; then
-            /usr/sbin/pw groupmod mail -m ${USER} || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	CONF1="main.cf master.cf access aliases canonical pcre_table \
-	regexp_table relocated transport virtual"
-
-	for file in $CONF1
-	do
-	        if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then
-        	        cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file
-	        fi
-	done
-
-	sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	 config_directory=${PKG_PREFIX}/etc/postfix \
-	 daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	 command_directory=${PKG_PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	 newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	 mailq_path=${PKG_PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PKG_PREFIX}/man \
-	 sample_directory=${PKG_PREFIX}/etc/postfix \
-	 readme_directory=no \
-	 upgrade-package
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-fi
-
-replace() {
-    local orig repl
-    
-    orig=$1
-    repl=$2
-    if [ -e ${orig} ]; then
-        mv -f ${orig} ${orig}.OFF
-        chmod 0 ${orig}.OFF
-    fi
-    if [ -e ${repl} ]; then
-        ln -s ${repl} ${orig}
-    fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-    if [ -x /sbin/sysctl ]; then
-        OSVERSION=`/sbin/sysctl -n kern.osreldate`
-    else
-        OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-    fi
-    if [ ${OSVERSION} -ge 400014 ]; then
-        if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" n; then
-            mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-            echo "#"						>  /etc/mail/mailer.conf
-            echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-            echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-            echo "#"						>> /etc/mail/mailer.conf
-            echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "mailq		${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-        fi
-    else
-        if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
-            replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/mailq	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
-            echo "Done."
-        fi
-    fi
-fi
diff --git a/mail/postfix20/pkg-message b/mail/postfix20/pkg-message
deleted file mode 100644
index 1c9fd6699bb9..000000000000
--- a/mail/postfix20/pkg-message
+++ /dev/null
@@ -1,40 +0,0 @@
-If you have postfix configured in your /etc/mail/mailer.conf (answered yes to
-the previous question) and would like to enable postfix to start at boot time,
-please set these variables in your /etc/rc.conf file:
-
-sendmail_enable="YES"
-sendmail_flags="-bd"
-sendmail_outbound_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-This will disable Sendmail completely.
-
-Alternatively to the above settings, you can enable postfix to start with
-the other local services, for example, after your database server starts if
-you need it to be running for postfix.  To do this, set in your rc.conf file:
-
-sendmail_enable="NONE"                                
-
-Then make the following symbolic link:
-
-cd /usr/local/etc/rc.d
-ln -s /usr/local/sbin/postfix postfix.sh
-
-
-Also, you will want to disable some Sendmail-specific daily maintenance
-routines in your /etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"                                      
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix20/pkg-plist b/mail/postfix20/pkg-plist
deleted file mode 100644
index c102595ef4bf..000000000000
--- a/mail/postfix20/pkg-plist
+++ /dev/null
@@ -1,180 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi
-@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi
-bin/rmail
-etc/postfix/LICENSE
-etc/postfix/main.cf.default
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases
-etc/postfix/sample-canonical
-etc/postfix/sample-pcre_table
-etc/postfix/sample-regexp_table
-etc/postfix/sample-relocated
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-auth.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-compatibility.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-filter.cf
-etc/postfix/sample-flush.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-lmtp.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-mime.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre-access.cf
-etc/postfix/sample-pcre-body.cf
-etc/postfix/sample-pcre-header.cf
-etc/postfix/sample-qmqpd.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-regexp-access.cf
-etc/postfix/sample-regexp-body.cf
-etc/postfix/sample-regexp-header.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
-etc/postfix/sample-transport
-etc/postfix/sample-virtual
-%%SUB_TLS%%etc/postfix/sample-tls.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/virtual
-%%SUB_TLS%%libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-bin/newaliases
-bin/mailq
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/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 93c5b95ec561..000000000000
--- a/mail/postfix20/scripts/configure
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \
-	mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \
-		rm $f.orig
-done
diff --git a/mail/postfix20/scripts/configure.postfix b/mail/postfix20/scripts/configure.postfix
deleted file mode 100644
index df679db50fea..000000000000
--- a/mail/postfix20/scripts/configure.postfix
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.33 2003-05-12 21:02:53 obraun Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-TLS		"SSL and TLS" "$status_TLS" \
-IPv6		"IPv6 support" "$status_IPv6" \
-IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-MySQL		"MySQL map lookups" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
-OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
-OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TLS="@comment "
-SUB_TEST="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-                SASL)
-                        echo "LIB_DEPENDS+=     sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-                        echo "POSTFIX_CCARGS+=  -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-                        echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-                        echo "SASL_SUFFIX=      +sasl"
-                        if [ -f ${PREFIX}/lib/libsasl.a ]; then
-                                if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then
-                                        echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                        echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                                fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                        fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
-                        SUB_SASL=""
-                        ;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${PREFIX}/lib/libsasl2.a ]; then
-				if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then
-					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			fi
-			echo ".if exists(/usr/lib/libkrb.a)"
-			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
-			echo ".endif"
-			SUB_SASL=""
-			;;
-		TLS)
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.9-0.9.7b/pfixtls.diff"
-			echo "PATCH_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls"
-			SUB_TLS=""
-			;;
-		DB3)
-			if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			DB3_SELECTED="YES"
-			;;
-		DB40)
-			if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			DB40_SELECTED="YES"
-			;;
-		DB41)
-			if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			DB41_SELECTED="YES"
-			;;
-		MySQL)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			echo "MYSQL_SUFFIX=	+mysql"
-			;;
-		PgSQL)
-			echo "POSTGRESQL_PORT?=	databases/postgresql7"
-			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PATCH_SITES+=	http://mat.cc/postfix/"
-			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
-			echo "PATCH_DIST_STRIP= -p1"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			;;
-		OpenLDAP12)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap12"
-			;;
-		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap20"
-			;;
-		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
- 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
- 			echo "OPENLDAP_SUFFIX=	+openldap21"
-			;;
-		Test)
-			echo "BIN1=		smtp-sink smtp-source"
-			SUB_TEST=""
-			;;
-		IPv6)
-			if [ X$SUB_TLS = "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "IPv6_SUFFIX=	+ipv6"
-			echo ""
-			IPv6SELECTED=YES
-			;;
-		IPv6TLS)
-			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	tls+ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls+ipv6"
-			SUB_TLS=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will.  so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"
diff --git a/mail/postfix20/scripts/fix-files-list b/mail/postfix20/scripts/fix-files-list
deleted file mode 100644
index cc4a1083a814..000000000000
--- a/mail/postfix20/scripts/fix-files-list
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them later, and if we
-# run post-install it will complain about missing files
-# (script from Simon J. Mudd)
-
-ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1
-%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/
-w
-q
-EOF
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
deleted file mode 100644
index 63539a865545..000000000000
--- a/mail/postfix21/Makefile
+++ /dev/null
@@ -1,166 +0,0 @@
-# New ports collection makefile for:	postfix-current
-# Date created: 	18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
-#
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
-
-PORTNAME=	postfix
-PORTVERSION=	2.0.9
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
-
-USE_SUBMAKE=	yes
-USE_REINPLACE=	yes
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \
-	postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \
-	relocated.5 transport.5 virtual.5
-
-MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
-	smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
-
-# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
-# patch it.
-MAN8base=$(MAN8:S/tlsmgr.8//)
-
-CONF1=	main.cf master.cf access aliases canonical pcre_table regexp_table \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-
-post-patch:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-patch:
-.for file in ${MAN1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN5}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN8base}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in faq rate rewrite uce
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${CONF1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file}
-.endfor
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	 config_directory=${PREFIX}/etc/postfix \
-	 daemon_directory=${PREFIX}/libexec/postfix \
-	 command_directory=${PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PREFIX}/sbin/sendmail \
-	 newaliases_path=${PREFIX}/bin/newaliases \
-	 mailq_path=${PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PREFIX}/man \
-	 sample_directory=${PREFIX}/etc/postfix \
-	 readme_directory=${READMEDIR}
-
-.for file in ${CONF1}
-	${INSTALL_DATA} ${WRKSRC}/conf/${file} \
-		${PREFIX}/etc/postfix/sample-${file}
-.endfor
-
-	@${INSTALL_SCRIPT} \
-		${WRKSRC}/auxiliary/rmail/rmail \
-		${PREFIX}/bin/rmail
-
-# optional TEST binaries
-.for file in ${BIN1}
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/src/smtpstone/${file} \
-		${PREFIX}/sbin
-.endfor
-
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \
-		${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them after this step, and
-# if we run etc/postfix/post-install again during package installation,
-# it will complain about missing files.
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/mail/postfix21/distinfo b/mail/postfix21/distinfo
deleted file mode 100644
index 61274400cc23..000000000000
--- a/mail/postfix21/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 (postfix/postfix-2.0.9.tar.gz) = c1ad12edfa19c23579b251078c464651
-MD5 (postfix/tls+ipv6-1.14-pf-2.0.9.patch.gz) = 6c55e142fc4b6ebf5e5ee707574446ba
-MD5 (postfix/ipv6-1.14-pf-2.0.9.patch.gz) = a449622b4a822a726065c8f2a960bbad
-MD5 (postfix/pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz) = f34a4b7e55a02675d04358e036f1362d
-MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
diff --git a/mail/postfix21/files/patch-ea b/mail/postfix21/files/patch-ea
deleted file mode 100644
index 6c3f98d2af4f..000000000000
--- a/mail/postfix21/files/patch-ea
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000
---- ./src/cleanup/cleanup.c	Thu Jun  1 21:52:22 2000
-***************
-*** 118,121 ****
-  /* FILES
-! /*	/etc/postfix/canonical*, canonical mapping table
-! /*	/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
---- 118,121 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! /*	!!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
diff --git a/mail/postfix21/files/patch-eb b/mail/postfix21/files/patch-eb
deleted file mode 100644
index e67680963d2d..000000000000
--- a/mail/postfix21/files/patch-eb
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/global/mail_conf.c.orig	Sun May  7 18:51:16 2000
---- ./src/global/mail_conf.c	Thu Jun  1 22:16:29 2000
-***************
-*** 53,55 ****
-  /* FILES
-! /*	/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
---- 53,55 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
diff --git a/mail/postfix21/files/patch-ec b/mail/postfix21/files/patch-ec
deleted file mode 100644
index 5f5d1ad9cadc..000000000000
--- a/mail/postfix21/files/patch-ec
+++ /dev/null
@@ -1,41 +0,0 @@
-*** ./src/global/mail_params.h.orig	Thu Jan  3 13:13:37 2002
---- ./src/global/mail_params.h	Tue Jan  8 22:18:22 2002
-***************
-*** 51,55 ****
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"postdrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
---- 51,55 ----
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"maildrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
-***************
-*** 170,174 ****
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
---- 170,174 ----
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-***************
-*** 204,208 ****
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
---- 204,208 ----
-  #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-ed b/mail/postfix21/files/patch-ed
deleted file mode 100644
index f971b62720d8..000000000000
--- a/mail/postfix21/files/patch-ed
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
---- ./src/local/mailbox.c	Thu Jun  1 22:37:48 2000
-***************
-*** 15,17 ****
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/[spool/]mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
---- 15,17 ----
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
diff --git a/mail/postfix21/files/patch-ee b/mail/postfix21/files/patch-ee
deleted file mode 100644
index ef44eac24b73..000000000000
--- a/mail/postfix21/files/patch-ee
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/master/master.c.orig	Tue Mar  7 10:25:07 2000
---- ./src/master/master.c	Thu Jun  1 22:43:50 2000
-***************
-*** 104,107 ****
-  /* FILES
-! /*	/etc/postfix/main.cf: global configuration file.
-! /*	/etc/postfix/master.cf: master process configuration file.
-  /*	/var/spool/postfix/pid/master.pid: master lock file.
---- 104,107 ----
-  /* FILES
-! /*	!!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.
diff --git a/mail/postfix21/files/patch-ef b/mail/postfix21/files/patch-ef
deleted file mode 100644
index 586b304a103d..000000000000
--- a/mail/postfix21/files/patch-ef
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999
---- ./src/postdrop/postdrop.c	Thu Jun  1 22:44:22 2000
-***************
-*** 39,41 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 39,41 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix21/files/patch-eg b/mail/postfix21/files/patch-eg
deleted file mode 100644
index 2983bbfd86ea..000000000000
--- a/mail/postfix21/files/patch-eg
+++ /dev/null
@@ -1,20 +0,0 @@
-*** ./src/sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000
---- ./src/sendmail/sendmail.c	Thu Jun  1 22:47:24 2000
-***************
-*** 57,59 ****
-  /*	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
---- 57,59 ----
-  /*	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
-***************
-*** 159,161 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 159,161 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix21/files/patch-eh b/mail/postfix21/files/patch-eh
deleted file mode 100644
index c104c3680d21..000000000000
--- a/mail/postfix21/files/patch-eh
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999
---- ./src/trivial-rewrite/transport.c	Thu Jun  1 22:47:49 2000
-***************
-*** 32,34 ****
-  /* FILES
-! /*	/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
---- 32,34 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix21/files/patch-main.cf b/mail/postfix21/files/patch-main.cf
deleted file mode 100644
index 95fb2feaca0a..000000000000
--- a/mail/postfix21/files/patch-main.cf
+++ /dev/null
@@ -1,58 +0,0 @@
---- ./conf/main.cf	Wed Jan  8 22:11:52 2003
-+++ ./conf/main.cf	Wed Jan  8 22:11:53 2003
-@@ -31,13 +31,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = /usr/local/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = /usr/local/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -590,32 +590,32 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = /usr/local/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = /usr/local/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = /usr/local/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = /usr/local/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- #
--sample_directory =
-+sample_directory = /usr/local/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix21/files/patch-post-install b/mail/postfix21/files/patch-post-install
deleted file mode 100644
index 92b2d4c2c6eb..000000000000
--- a/mail/postfix21/files/patch-post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./conf/#post-install~	Fri Jan 18 12:32:54 2002
-+++ ./conf/post-install	Fri Jan 18 12:32:54 2002
-@@ -183,7 +183,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix21/pkg-descr b/mail/postfix21/pkg-descr
deleted file mode 100644
index 1f335ce6820c..000000000000
--- a/mail/postfix21/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time being sendmail-compatible enough to not upset existing
-users. It also offers QMQP and VERP support to let Postfix act as delivery
-daemon for ezmlm-idx.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix21/pkg-install b/mail/postfix21/pkg-install
deleted file mode 100644
index 1ef1fb5b2089..000000000000
--- a/mail/postfix21/pkg-install
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local question default answer
-
-    question=$1
-    default=$2
-    while :; do
-        answer=$(ask "${question}" "${default}")
-        case "${answer}" in
-        [Yy]*)	return 0;;
-        [Nn]*)	return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    USER=postfix
-    GROUP=postfix
-    GROUP2=maildrop
-
-    if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP} -h -
-	then
-	    echo "Added group \"${GROUP}\"."
-	else
-	    echo "Adding group \"${GROUP}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP2}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP2} -h -
-	then
-	    echo "Added group \"${GROUP2}\"."
-	else
-	    echo "Adding group \"${GROUP2}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-        echo "You already have a user \"${USER}\", so I will use it."
-    else
-        if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \
-           -d /var/spool/postfix \
-           -s /sbin/nologin \
-           -c "Postfix Mail System"
-	then
-	    echo "Added user \"${USER}\"."
-	else
-	    echo "Adding user \"${USER}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-        echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-    else
-        echo "You need user \"${USER}\" added to group \"mail\"."
-        if yesno "Would you like me to add it" y; then
-            /usr/sbin/pw groupmod mail -m ${USER} || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	CONF1="main.cf master.cf access aliases canonical pcre_table \
-	regexp_table relocated transport virtual"
-
-	for file in $CONF1
-	do
-	        if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then
-        	        cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file
-	        fi
-	done
-
-	sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	 config_directory=${PKG_PREFIX}/etc/postfix \
-	 daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	 command_directory=${PKG_PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	 newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	 mailq_path=${PKG_PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PKG_PREFIX}/man \
-	 sample_directory=${PKG_PREFIX}/etc/postfix \
-	 readme_directory=no \
-	 upgrade-package
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-fi
-
-replace() {
-    local orig repl
-    
-    orig=$1
-    repl=$2
-    if [ -e ${orig} ]; then
-        mv -f ${orig} ${orig}.OFF
-        chmod 0 ${orig}.OFF
-    fi
-    if [ -e ${repl} ]; then
-        ln -s ${repl} ${orig}
-    fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-    if [ -x /sbin/sysctl ]; then
-        OSVERSION=`/sbin/sysctl -n kern.osreldate`
-    else
-        OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-    fi
-    if [ ${OSVERSION} -ge 400014 ]; then
-        if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" n; then
-            mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-            echo "#"						>  /etc/mail/mailer.conf
-            echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-            echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-            echo "#"						>> /etc/mail/mailer.conf
-            echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "mailq		${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-        fi
-    else
-        if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
-            replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/mailq	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
-            echo "Done."
-        fi
-    fi
-fi
diff --git a/mail/postfix21/pkg-message b/mail/postfix21/pkg-message
deleted file mode 100644
index 1c9fd6699bb9..000000000000
--- a/mail/postfix21/pkg-message
+++ /dev/null
@@ -1,40 +0,0 @@
-If you have postfix configured in your /etc/mail/mailer.conf (answered yes to
-the previous question) and would like to enable postfix to start at boot time,
-please set these variables in your /etc/rc.conf file:
-
-sendmail_enable="YES"
-sendmail_flags="-bd"
-sendmail_outbound_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-This will disable Sendmail completely.
-
-Alternatively to the above settings, you can enable postfix to start with
-the other local services, for example, after your database server starts if
-you need it to be running for postfix.  To do this, set in your rc.conf file:
-
-sendmail_enable="NONE"                                
-
-Then make the following symbolic link:
-
-cd /usr/local/etc/rc.d
-ln -s /usr/local/sbin/postfix postfix.sh
-
-
-Also, you will want to disable some Sendmail-specific daily maintenance
-routines in your /etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"                                      
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix21/pkg-plist b/mail/postfix21/pkg-plist
deleted file mode 100644
index c102595ef4bf..000000000000
--- a/mail/postfix21/pkg-plist
+++ /dev/null
@@ -1,180 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi
-@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi
-bin/rmail
-etc/postfix/LICENSE
-etc/postfix/main.cf.default
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases
-etc/postfix/sample-canonical
-etc/postfix/sample-pcre_table
-etc/postfix/sample-regexp_table
-etc/postfix/sample-relocated
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-auth.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-compatibility.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-filter.cf
-etc/postfix/sample-flush.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-lmtp.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-mime.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre-access.cf
-etc/postfix/sample-pcre-body.cf
-etc/postfix/sample-pcre-header.cf
-etc/postfix/sample-qmqpd.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-regexp-access.cf
-etc/postfix/sample-regexp-body.cf
-etc/postfix/sample-regexp-header.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
-etc/postfix/sample-transport
-etc/postfix/sample-virtual
-%%SUB_TLS%%etc/postfix/sample-tls.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/virtual
-%%SUB_TLS%%libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-bin/newaliases
-bin/mailq
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/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 93c5b95ec561..000000000000
--- a/mail/postfix21/scripts/configure
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \
-	mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \
-		rm $f.orig
-done
diff --git a/mail/postfix21/scripts/configure.postfix b/mail/postfix21/scripts/configure.postfix
deleted file mode 100644
index 6f4e37afe533..000000000000
--- a/mail/postfix21/scripts/configure.postfix
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.33 2003-05-12 21:02:53 obraun Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-TLS		"SSL and TLS" "$status_TLS" \
-IPv6		"IPv6 support" "$status_IPv6" \
-IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-MySQL		"MySQL map lookups" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
-OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
-OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TLS="@comment "
-SUB_TEST="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-                SASL)
-                        echo "LIB_DEPENDS+=     sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-                        echo "POSTFIX_CCARGS+=  -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-                        echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-                        echo "SASL_SUFFIX=      +sasl"
-                        if [ -f ${PREFIX}/lib/libsasl.a ]; then
-                                if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then
-                                        echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                        echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                                fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                        fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
-                        SUB_SASL=""
-                        ;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${PREFIX}/lib/libsasl2.a ]; then
-				if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then
-					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			fi
-			echo ".if exists(/usr/lib/libkrb.a)"
-			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
-			echo ".endif"
-			SUB_SASL=""
-			;;
-		TLS)
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.9-0.9.7b/pfixtls.diff"
-			echo "PATCH_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls"
-			SUB_TLS=""
-			;;
-		DB3)
-			if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			DB3_SELECTED="YES"
-			;;
-		DB40)
-			if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			DB40_SELECTED="YES"
-			;;
-		DB41)
-			if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			DB41_SELECTED="YES"
-			;;
-		MySQL)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			echo "MYSQL_SUFFIX=	+mysql"
-			;;
-		PgSQL)
-			echo "POSTGRESQL_PORT?=	databases/postgresql7"
-			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PATCH_SITES+=	http://mat.cc/postfix/"
-			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
-			echo "PATCH_DIST_STRIP= -p1"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			;;
-		OpenLDAP12)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap12"
-			;;
-		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap20"
-			;;
-		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
- 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
- 			echo "OPENLDAP_SUFFIX=	+openldap21"
-			;;
-		Test)
-			echo "BIN1=		smtp-sink smtp-source"
-			SUB_TEST=""
-			;;
-		IPv6)
-			if [ X$SUB_TLS = "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "IPv6_SUFFIX=	+ipv6"
-			echo ""
-			IPv6SELECTED=YES
-			;;
-		IPv6TLS)
-			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	tls+ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls+ipv6"
-			SUB_TLS=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will.  so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"
diff --git a/mail/postfix21/scripts/fix-files-list b/mail/postfix21/scripts/fix-files-list
deleted file mode 100644
index cc4a1083a814..000000000000
--- a/mail/postfix21/scripts/fix-files-list
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them later, and if we
-# run post-install it will complain about missing files
-# (script from Simon J. Mudd)
-
-ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1
-%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/
-w
-q
-EOF
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
deleted file mode 100644
index 63539a865545..000000000000
--- a/mail/postfix22/Makefile
+++ /dev/null
@@ -1,166 +0,0 @@
-# New ports collection makefile for:	postfix-current
-# Date created: 	18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
-#
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
-
-PORTNAME=	postfix
-PORTVERSION=	2.0.9
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
-
-USE_SUBMAKE=	yes
-USE_REINPLACE=	yes
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \
-	postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \
-	relocated.5 transport.5 virtual.5
-
-MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
-	smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
-
-# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
-# patch it.
-MAN8base=$(MAN8:S/tlsmgr.8//)
-
-CONF1=	main.cf master.cf access aliases canonical pcre_table regexp_table \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-
-post-patch:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-patch:
-.for file in ${MAN1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN5}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN8base}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in faq rate rewrite uce
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${CONF1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file}
-.endfor
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	 config_directory=${PREFIX}/etc/postfix \
-	 daemon_directory=${PREFIX}/libexec/postfix \
-	 command_directory=${PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PREFIX}/sbin/sendmail \
-	 newaliases_path=${PREFIX}/bin/newaliases \
-	 mailq_path=${PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PREFIX}/man \
-	 sample_directory=${PREFIX}/etc/postfix \
-	 readme_directory=${READMEDIR}
-
-.for file in ${CONF1}
-	${INSTALL_DATA} ${WRKSRC}/conf/${file} \
-		${PREFIX}/etc/postfix/sample-${file}
-.endfor
-
-	@${INSTALL_SCRIPT} \
-		${WRKSRC}/auxiliary/rmail/rmail \
-		${PREFIX}/bin/rmail
-
-# optional TEST binaries
-.for file in ${BIN1}
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/src/smtpstone/${file} \
-		${PREFIX}/sbin
-.endfor
-
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \
-		${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them after this step, and
-# if we run etc/postfix/post-install again during package installation,
-# it will complain about missing files.
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/mail/postfix22/distinfo b/mail/postfix22/distinfo
deleted file mode 100644
index 61274400cc23..000000000000
--- a/mail/postfix22/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 (postfix/postfix-2.0.9.tar.gz) = c1ad12edfa19c23579b251078c464651
-MD5 (postfix/tls+ipv6-1.14-pf-2.0.9.patch.gz) = 6c55e142fc4b6ebf5e5ee707574446ba
-MD5 (postfix/ipv6-1.14-pf-2.0.9.patch.gz) = a449622b4a822a726065c8f2a960bbad
-MD5 (postfix/pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz) = f34a4b7e55a02675d04358e036f1362d
-MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
diff --git a/mail/postfix22/files/patch-ea b/mail/postfix22/files/patch-ea
deleted file mode 100644
index 6c3f98d2af4f..000000000000
--- a/mail/postfix22/files/patch-ea
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000
---- ./src/cleanup/cleanup.c	Thu Jun  1 21:52:22 2000
-***************
-*** 118,121 ****
-  /* FILES
-! /*	/etc/postfix/canonical*, canonical mapping table
-! /*	/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
---- 118,121 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! /*	!!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
diff --git a/mail/postfix22/files/patch-eb b/mail/postfix22/files/patch-eb
deleted file mode 100644
index e67680963d2d..000000000000
--- a/mail/postfix22/files/patch-eb
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/global/mail_conf.c.orig	Sun May  7 18:51:16 2000
---- ./src/global/mail_conf.c	Thu Jun  1 22:16:29 2000
-***************
-*** 53,55 ****
-  /* FILES
-! /*	/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
---- 53,55 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
diff --git a/mail/postfix22/files/patch-ec b/mail/postfix22/files/patch-ec
deleted file mode 100644
index 5f5d1ad9cadc..000000000000
--- a/mail/postfix22/files/patch-ec
+++ /dev/null
@@ -1,41 +0,0 @@
-*** ./src/global/mail_params.h.orig	Thu Jan  3 13:13:37 2002
---- ./src/global/mail_params.h	Tue Jan  8 22:18:22 2002
-***************
-*** 51,55 ****
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"postdrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
---- 51,55 ----
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"maildrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
-***************
-*** 170,174 ****
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
---- 170,174 ----
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-***************
-*** 204,208 ****
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
---- 204,208 ----
-  #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-ed b/mail/postfix22/files/patch-ed
deleted file mode 100644
index f971b62720d8..000000000000
--- a/mail/postfix22/files/patch-ed
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
---- ./src/local/mailbox.c	Thu Jun  1 22:37:48 2000
-***************
-*** 15,17 ****
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/[spool/]mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
---- 15,17 ----
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
diff --git a/mail/postfix22/files/patch-ee b/mail/postfix22/files/patch-ee
deleted file mode 100644
index ef44eac24b73..000000000000
--- a/mail/postfix22/files/patch-ee
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/master/master.c.orig	Tue Mar  7 10:25:07 2000
---- ./src/master/master.c	Thu Jun  1 22:43:50 2000
-***************
-*** 104,107 ****
-  /* FILES
-! /*	/etc/postfix/main.cf: global configuration file.
-! /*	/etc/postfix/master.cf: master process configuration file.
-  /*	/var/spool/postfix/pid/master.pid: master lock file.
---- 104,107 ----
-  /* FILES
-! /*	!!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.
diff --git a/mail/postfix22/files/patch-ef b/mail/postfix22/files/patch-ef
deleted file mode 100644
index 586b304a103d..000000000000
--- a/mail/postfix22/files/patch-ef
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999
---- ./src/postdrop/postdrop.c	Thu Jun  1 22:44:22 2000
-***************
-*** 39,41 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 39,41 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix22/files/patch-eg b/mail/postfix22/files/patch-eg
deleted file mode 100644
index 2983bbfd86ea..000000000000
--- a/mail/postfix22/files/patch-eg
+++ /dev/null
@@ -1,20 +0,0 @@
-*** ./src/sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000
---- ./src/sendmail/sendmail.c	Thu Jun  1 22:47:24 2000
-***************
-*** 57,59 ****
-  /*	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
---- 57,59 ----
-  /*	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
-***************
-*** 159,161 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 159,161 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix22/files/patch-eh b/mail/postfix22/files/patch-eh
deleted file mode 100644
index c104c3680d21..000000000000
--- a/mail/postfix22/files/patch-eh
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999
---- ./src/trivial-rewrite/transport.c	Thu Jun  1 22:47:49 2000
-***************
-*** 32,34 ****
-  /* FILES
-! /*	/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
---- 32,34 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix22/files/patch-main.cf b/mail/postfix22/files/patch-main.cf
deleted file mode 100644
index 95fb2feaca0a..000000000000
--- a/mail/postfix22/files/patch-main.cf
+++ /dev/null
@@ -1,58 +0,0 @@
---- ./conf/main.cf	Wed Jan  8 22:11:52 2003
-+++ ./conf/main.cf	Wed Jan  8 22:11:53 2003
-@@ -31,13 +31,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = /usr/local/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = /usr/local/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -590,32 +590,32 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = /usr/local/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = /usr/local/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = /usr/local/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = /usr/local/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- #
--sample_directory =
-+sample_directory = /usr/local/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix22/files/patch-post-install b/mail/postfix22/files/patch-post-install
deleted file mode 100644
index 92b2d4c2c6eb..000000000000
--- a/mail/postfix22/files/patch-post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./conf/#post-install~	Fri Jan 18 12:32:54 2002
-+++ ./conf/post-install	Fri Jan 18 12:32:54 2002
-@@ -183,7 +183,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix22/pkg-descr b/mail/postfix22/pkg-descr
deleted file mode 100644
index 1f335ce6820c..000000000000
--- a/mail/postfix22/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time being sendmail-compatible enough to not upset existing
-users. It also offers QMQP and VERP support to let Postfix act as delivery
-daemon for ezmlm-idx.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix22/pkg-install b/mail/postfix22/pkg-install
deleted file mode 100644
index 1ef1fb5b2089..000000000000
--- a/mail/postfix22/pkg-install
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local question default answer
-
-    question=$1
-    default=$2
-    while :; do
-        answer=$(ask "${question}" "${default}")
-        case "${answer}" in
-        [Yy]*)	return 0;;
-        [Nn]*)	return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    USER=postfix
-    GROUP=postfix
-    GROUP2=maildrop
-
-    if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP} -h -
-	then
-	    echo "Added group \"${GROUP}\"."
-	else
-	    echo "Adding group \"${GROUP}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP2}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP2} -h -
-	then
-	    echo "Added group \"${GROUP2}\"."
-	else
-	    echo "Adding group \"${GROUP2}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-        echo "You already have a user \"${USER}\", so I will use it."
-    else
-        if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \
-           -d /var/spool/postfix \
-           -s /sbin/nologin \
-           -c "Postfix Mail System"
-	then
-	    echo "Added user \"${USER}\"."
-	else
-	    echo "Adding user \"${USER}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-        echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-    else
-        echo "You need user \"${USER}\" added to group \"mail\"."
-        if yesno "Would you like me to add it" y; then
-            /usr/sbin/pw groupmod mail -m ${USER} || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	CONF1="main.cf master.cf access aliases canonical pcre_table \
-	regexp_table relocated transport virtual"
-
-	for file in $CONF1
-	do
-	        if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then
-        	        cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file
-	        fi
-	done
-
-	sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	 config_directory=${PKG_PREFIX}/etc/postfix \
-	 daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	 command_directory=${PKG_PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	 newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	 mailq_path=${PKG_PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PKG_PREFIX}/man \
-	 sample_directory=${PKG_PREFIX}/etc/postfix \
-	 readme_directory=no \
-	 upgrade-package
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-fi
-
-replace() {
-    local orig repl
-    
-    orig=$1
-    repl=$2
-    if [ -e ${orig} ]; then
-        mv -f ${orig} ${orig}.OFF
-        chmod 0 ${orig}.OFF
-    fi
-    if [ -e ${repl} ]; then
-        ln -s ${repl} ${orig}
-    fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-    if [ -x /sbin/sysctl ]; then
-        OSVERSION=`/sbin/sysctl -n kern.osreldate`
-    else
-        OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-    fi
-    if [ ${OSVERSION} -ge 400014 ]; then
-        if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" n; then
-            mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-            echo "#"						>  /etc/mail/mailer.conf
-            echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-            echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-            echo "#"						>> /etc/mail/mailer.conf
-            echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "mailq		${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-        fi
-    else
-        if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
-            replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/mailq	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
-            echo "Done."
-        fi
-    fi
-fi
diff --git a/mail/postfix22/pkg-message b/mail/postfix22/pkg-message
deleted file mode 100644
index 1c9fd6699bb9..000000000000
--- a/mail/postfix22/pkg-message
+++ /dev/null
@@ -1,40 +0,0 @@
-If you have postfix configured in your /etc/mail/mailer.conf (answered yes to
-the previous question) and would like to enable postfix to start at boot time,
-please set these variables in your /etc/rc.conf file:
-
-sendmail_enable="YES"
-sendmail_flags="-bd"
-sendmail_outbound_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-This will disable Sendmail completely.
-
-Alternatively to the above settings, you can enable postfix to start with
-the other local services, for example, after your database server starts if
-you need it to be running for postfix.  To do this, set in your rc.conf file:
-
-sendmail_enable="NONE"                                
-
-Then make the following symbolic link:
-
-cd /usr/local/etc/rc.d
-ln -s /usr/local/sbin/postfix postfix.sh
-
-
-Also, you will want to disable some Sendmail-specific daily maintenance
-routines in your /etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"                                      
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix22/pkg-plist b/mail/postfix22/pkg-plist
deleted file mode 100644
index c102595ef4bf..000000000000
--- a/mail/postfix22/pkg-plist
+++ /dev/null
@@ -1,180 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi
-@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi
-bin/rmail
-etc/postfix/LICENSE
-etc/postfix/main.cf.default
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases
-etc/postfix/sample-canonical
-etc/postfix/sample-pcre_table
-etc/postfix/sample-regexp_table
-etc/postfix/sample-relocated
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-auth.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-compatibility.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-filter.cf
-etc/postfix/sample-flush.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-lmtp.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-mime.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre-access.cf
-etc/postfix/sample-pcre-body.cf
-etc/postfix/sample-pcre-header.cf
-etc/postfix/sample-qmqpd.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-regexp-access.cf
-etc/postfix/sample-regexp-body.cf
-etc/postfix/sample-regexp-header.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
-etc/postfix/sample-transport
-etc/postfix/sample-virtual
-%%SUB_TLS%%etc/postfix/sample-tls.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/virtual
-%%SUB_TLS%%libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-bin/newaliases
-bin/mailq
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/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 93c5b95ec561..000000000000
--- a/mail/postfix22/scripts/configure
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \
-	mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \
-		rm $f.orig
-done
diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix
deleted file mode 100644
index b6683a1c2fdc..000000000000
--- a/mail/postfix22/scripts/configure.postfix
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.33 2003-05-12 21:02:53 obraun Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-TLS		"SSL and TLS" "$status_TLS" \
-IPv6		"IPv6 support" "$status_IPv6" \
-IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-MySQL		"MySQL map lookups" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
-OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
-OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TLS="@comment "
-SUB_TEST="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-                SASL)
-                        echo "LIB_DEPENDS+=     sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-                        echo "POSTFIX_CCARGS+=  -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-                        echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-                        echo "SASL_SUFFIX=      +sasl"
-                        if [ -f ${PREFIX}/lib/libsasl.a ]; then
-                                if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then
-                                        echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                        echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                                fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                        fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
-                        SUB_SASL=""
-                        ;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${PREFIX}/lib/libsasl2.a ]; then
-				if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then
-					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			fi
-			echo ".if exists(/usr/lib/libkrb.a)"
-			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
-			echo ".endif"
-			SUB_SASL=""
-			;;
-		TLS)
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.9-0.9.7b/pfixtls.diff"
-			echo "PATCH_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls"
-			SUB_TLS=""
-			;;
-		DB3)
-			if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			DB3_SELECTED="YES"
-			;;
-		DB40)
-			if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			DB40_SELECTED="YES"
-			;;
-		DB41)
-			if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			DB41_SELECTED="YES"
-			;;
-		MySQL)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			echo "MYSQL_SUFFIX=	+mysql"
-			;;
-		PgSQL)
-			echo "POSTGRESQL_PORT?=	databases/postgresql7"
-			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PATCH_SITES+=	http://mat.cc/postfix/"
-			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
-			echo "PATCH_DIST_STRIP= -p1"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			;;
-		OpenLDAP12)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap12"
-			;;
-		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap20"
-			;;
-		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
- 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
- 			echo "OPENLDAP_SUFFIX=	+openldap21"
-			;;
-		Test)
-			echo "BIN1=		smtp-sink smtp-source"
-			SUB_TEST=""
-			;;
-		IPv6)
-			if [ X$SUB_TLS = "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "IPv6_SUFFIX=	+ipv6"
-			echo ""
-			IPv6SELECTED=YES
-			;;
-		IPv6TLS)
-			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	tls+ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls+ipv6"
-			SUB_TLS=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will.  so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"
diff --git a/mail/postfix22/scripts/fix-files-list b/mail/postfix22/scripts/fix-files-list
deleted file mode 100644
index cc4a1083a814..000000000000
--- a/mail/postfix22/scripts/fix-files-list
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them later, and if we
-# run post-install it will complain about missing files
-# (script from Simon J. Mudd)
-
-ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1
-%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/
-w
-q
-EOF
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
deleted file mode 100644
index 63539a865545..000000000000
--- a/mail/postfix23/Makefile
+++ /dev/null
@@ -1,166 +0,0 @@
-# New ports collection makefile for:	postfix-current
-# Date created: 	18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
-#
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
-
-PORTNAME=	postfix
-PORTVERSION=	2.0.9
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
-
-USE_SUBMAKE=	yes
-USE_REINPLACE=	yes
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \
-	postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \
-	relocated.5 transport.5 virtual.5
-
-MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
-	smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
-
-# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
-# patch it.
-MAN8base=$(MAN8:S/tlsmgr.8//)
-
-CONF1=	main.cf master.cf access aliases canonical pcre_table regexp_table \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-
-post-patch:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-patch:
-.for file in ${MAN1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN5}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN8base}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in faq rate rewrite uce
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${CONF1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file}
-.endfor
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	 config_directory=${PREFIX}/etc/postfix \
-	 daemon_directory=${PREFIX}/libexec/postfix \
-	 command_directory=${PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PREFIX}/sbin/sendmail \
-	 newaliases_path=${PREFIX}/bin/newaliases \
-	 mailq_path=${PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PREFIX}/man \
-	 sample_directory=${PREFIX}/etc/postfix \
-	 readme_directory=${READMEDIR}
-
-.for file in ${CONF1}
-	${INSTALL_DATA} ${WRKSRC}/conf/${file} \
-		${PREFIX}/etc/postfix/sample-${file}
-.endfor
-
-	@${INSTALL_SCRIPT} \
-		${WRKSRC}/auxiliary/rmail/rmail \
-		${PREFIX}/bin/rmail
-
-# optional TEST binaries
-.for file in ${BIN1}
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/src/smtpstone/${file} \
-		${PREFIX}/sbin
-.endfor
-
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \
-		${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them after this step, and
-# if we run etc/postfix/post-install again during package installation,
-# it will complain about missing files.
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/mail/postfix23/distinfo b/mail/postfix23/distinfo
deleted file mode 100644
index 61274400cc23..000000000000
--- a/mail/postfix23/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 (postfix/postfix-2.0.9.tar.gz) = c1ad12edfa19c23579b251078c464651
-MD5 (postfix/tls+ipv6-1.14-pf-2.0.9.patch.gz) = 6c55e142fc4b6ebf5e5ee707574446ba
-MD5 (postfix/ipv6-1.14-pf-2.0.9.patch.gz) = a449622b4a822a726065c8f2a960bbad
-MD5 (postfix/pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz) = f34a4b7e55a02675d04358e036f1362d
-MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
diff --git a/mail/postfix23/files/patch-ea b/mail/postfix23/files/patch-ea
deleted file mode 100644
index 6c3f98d2af4f..000000000000
--- a/mail/postfix23/files/patch-ea
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000
---- ./src/cleanup/cleanup.c	Thu Jun  1 21:52:22 2000
-***************
-*** 118,121 ****
-  /* FILES
-! /*	/etc/postfix/canonical*, canonical mapping table
-! /*	/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
---- 118,121 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! /*	!!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
diff --git a/mail/postfix23/files/patch-eb b/mail/postfix23/files/patch-eb
deleted file mode 100644
index e67680963d2d..000000000000
--- a/mail/postfix23/files/patch-eb
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/global/mail_conf.c.orig	Sun May  7 18:51:16 2000
---- ./src/global/mail_conf.c	Thu Jun  1 22:16:29 2000
-***************
-*** 53,55 ****
-  /* FILES
-! /*	/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
---- 53,55 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
diff --git a/mail/postfix23/files/patch-ec b/mail/postfix23/files/patch-ec
deleted file mode 100644
index 5f5d1ad9cadc..000000000000
--- a/mail/postfix23/files/patch-ec
+++ /dev/null
@@ -1,41 +0,0 @@
-*** ./src/global/mail_params.h.orig	Thu Jan  3 13:13:37 2002
---- ./src/global/mail_params.h	Tue Jan  8 22:18:22 2002
-***************
-*** 51,55 ****
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"postdrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
---- 51,55 ----
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"maildrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
-***************
-*** 170,174 ****
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
---- 170,174 ----
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-***************
-*** 204,208 ****
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
---- 204,208 ----
-  #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-ed b/mail/postfix23/files/patch-ed
deleted file mode 100644
index f971b62720d8..000000000000
--- a/mail/postfix23/files/patch-ed
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
---- ./src/local/mailbox.c	Thu Jun  1 22:37:48 2000
-***************
-*** 15,17 ****
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/[spool/]mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
---- 15,17 ----
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
diff --git a/mail/postfix23/files/patch-ee b/mail/postfix23/files/patch-ee
deleted file mode 100644
index ef44eac24b73..000000000000
--- a/mail/postfix23/files/patch-ee
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/master/master.c.orig	Tue Mar  7 10:25:07 2000
---- ./src/master/master.c	Thu Jun  1 22:43:50 2000
-***************
-*** 104,107 ****
-  /* FILES
-! /*	/etc/postfix/main.cf: global configuration file.
-! /*	/etc/postfix/master.cf: master process configuration file.
-  /*	/var/spool/postfix/pid/master.pid: master lock file.
---- 104,107 ----
-  /* FILES
-! /*	!!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.
diff --git a/mail/postfix23/files/patch-ef b/mail/postfix23/files/patch-ef
deleted file mode 100644
index 586b304a103d..000000000000
--- a/mail/postfix23/files/patch-ef
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999
---- ./src/postdrop/postdrop.c	Thu Jun  1 22:44:22 2000
-***************
-*** 39,41 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 39,41 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix23/files/patch-eg b/mail/postfix23/files/patch-eg
deleted file mode 100644
index 2983bbfd86ea..000000000000
--- a/mail/postfix23/files/patch-eg
+++ /dev/null
@@ -1,20 +0,0 @@
-*** ./src/sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000
---- ./src/sendmail/sendmail.c	Thu Jun  1 22:47:24 2000
-***************
-*** 57,59 ****
-  /*	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
---- 57,59 ----
-  /*	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
-***************
-*** 159,161 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 159,161 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix23/files/patch-eh b/mail/postfix23/files/patch-eh
deleted file mode 100644
index c104c3680d21..000000000000
--- a/mail/postfix23/files/patch-eh
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999
---- ./src/trivial-rewrite/transport.c	Thu Jun  1 22:47:49 2000
-***************
-*** 32,34 ****
-  /* FILES
-! /*	/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
---- 32,34 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix23/files/patch-main.cf b/mail/postfix23/files/patch-main.cf
deleted file mode 100644
index 95fb2feaca0a..000000000000
--- a/mail/postfix23/files/patch-main.cf
+++ /dev/null
@@ -1,58 +0,0 @@
---- ./conf/main.cf	Wed Jan  8 22:11:52 2003
-+++ ./conf/main.cf	Wed Jan  8 22:11:53 2003
-@@ -31,13 +31,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = /usr/local/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = /usr/local/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -590,32 +590,32 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = /usr/local/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = /usr/local/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = /usr/local/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = /usr/local/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- #
--sample_directory =
-+sample_directory = /usr/local/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix23/files/patch-post-install b/mail/postfix23/files/patch-post-install
deleted file mode 100644
index 92b2d4c2c6eb..000000000000
--- a/mail/postfix23/files/patch-post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./conf/#post-install~	Fri Jan 18 12:32:54 2002
-+++ ./conf/post-install	Fri Jan 18 12:32:54 2002
-@@ -183,7 +183,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix23/pkg-descr b/mail/postfix23/pkg-descr
deleted file mode 100644
index 1f335ce6820c..000000000000
--- a/mail/postfix23/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time being sendmail-compatible enough to not upset existing
-users. It also offers QMQP and VERP support to let Postfix act as delivery
-daemon for ezmlm-idx.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix23/pkg-install b/mail/postfix23/pkg-install
deleted file mode 100644
index 1ef1fb5b2089..000000000000
--- a/mail/postfix23/pkg-install
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local question default answer
-
-    question=$1
-    default=$2
-    while :; do
-        answer=$(ask "${question}" "${default}")
-        case "${answer}" in
-        [Yy]*)	return 0;;
-        [Nn]*)	return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    USER=postfix
-    GROUP=postfix
-    GROUP2=maildrop
-
-    if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP} -h -
-	then
-	    echo "Added group \"${GROUP}\"."
-	else
-	    echo "Adding group \"${GROUP}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP2}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP2} -h -
-	then
-	    echo "Added group \"${GROUP2}\"."
-	else
-	    echo "Adding group \"${GROUP2}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-        echo "You already have a user \"${USER}\", so I will use it."
-    else
-        if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \
-           -d /var/spool/postfix \
-           -s /sbin/nologin \
-           -c "Postfix Mail System"
-	then
-	    echo "Added user \"${USER}\"."
-	else
-	    echo "Adding user \"${USER}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-        echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-    else
-        echo "You need user \"${USER}\" added to group \"mail\"."
-        if yesno "Would you like me to add it" y; then
-            /usr/sbin/pw groupmod mail -m ${USER} || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	CONF1="main.cf master.cf access aliases canonical pcre_table \
-	regexp_table relocated transport virtual"
-
-	for file in $CONF1
-	do
-	        if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then
-        	        cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file
-	        fi
-	done
-
-	sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	 config_directory=${PKG_PREFIX}/etc/postfix \
-	 daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	 command_directory=${PKG_PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	 newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	 mailq_path=${PKG_PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PKG_PREFIX}/man \
-	 sample_directory=${PKG_PREFIX}/etc/postfix \
-	 readme_directory=no \
-	 upgrade-package
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-fi
-
-replace() {
-    local orig repl
-    
-    orig=$1
-    repl=$2
-    if [ -e ${orig} ]; then
-        mv -f ${orig} ${orig}.OFF
-        chmod 0 ${orig}.OFF
-    fi
-    if [ -e ${repl} ]; then
-        ln -s ${repl} ${orig}
-    fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-    if [ -x /sbin/sysctl ]; then
-        OSVERSION=`/sbin/sysctl -n kern.osreldate`
-    else
-        OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-    fi
-    if [ ${OSVERSION} -ge 400014 ]; then
-        if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" n; then
-            mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-            echo "#"						>  /etc/mail/mailer.conf
-            echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-            echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-            echo "#"						>> /etc/mail/mailer.conf
-            echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "mailq		${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-        fi
-    else
-        if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
-            replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/mailq	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
-            echo "Done."
-        fi
-    fi
-fi
diff --git a/mail/postfix23/pkg-message b/mail/postfix23/pkg-message
deleted file mode 100644
index 1c9fd6699bb9..000000000000
--- a/mail/postfix23/pkg-message
+++ /dev/null
@@ -1,40 +0,0 @@
-If you have postfix configured in your /etc/mail/mailer.conf (answered yes to
-the previous question) and would like to enable postfix to start at boot time,
-please set these variables in your /etc/rc.conf file:
-
-sendmail_enable="YES"
-sendmail_flags="-bd"
-sendmail_outbound_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-This will disable Sendmail completely.
-
-Alternatively to the above settings, you can enable postfix to start with
-the other local services, for example, after your database server starts if
-you need it to be running for postfix.  To do this, set in your rc.conf file:
-
-sendmail_enable="NONE"                                
-
-Then make the following symbolic link:
-
-cd /usr/local/etc/rc.d
-ln -s /usr/local/sbin/postfix postfix.sh
-
-
-Also, you will want to disable some Sendmail-specific daily maintenance
-routines in your /etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"                                      
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix23/pkg-plist b/mail/postfix23/pkg-plist
deleted file mode 100644
index c102595ef4bf..000000000000
--- a/mail/postfix23/pkg-plist
+++ /dev/null
@@ -1,180 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi
-@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi
-bin/rmail
-etc/postfix/LICENSE
-etc/postfix/main.cf.default
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases
-etc/postfix/sample-canonical
-etc/postfix/sample-pcre_table
-etc/postfix/sample-regexp_table
-etc/postfix/sample-relocated
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-auth.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-compatibility.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-filter.cf
-etc/postfix/sample-flush.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-lmtp.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-mime.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre-access.cf
-etc/postfix/sample-pcre-body.cf
-etc/postfix/sample-pcre-header.cf
-etc/postfix/sample-qmqpd.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-regexp-access.cf
-etc/postfix/sample-regexp-body.cf
-etc/postfix/sample-regexp-header.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
-etc/postfix/sample-transport
-etc/postfix/sample-virtual
-%%SUB_TLS%%etc/postfix/sample-tls.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/virtual
-%%SUB_TLS%%libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-bin/newaliases
-bin/mailq
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/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 93c5b95ec561..000000000000
--- a/mail/postfix23/scripts/configure
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \
-	mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \
-		rm $f.orig
-done
diff --git a/mail/postfix23/scripts/configure.postfix b/mail/postfix23/scripts/configure.postfix
deleted file mode 100644
index 77cb96f4b846..000000000000
--- a/mail/postfix23/scripts/configure.postfix
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.33 2003-05-12 21:02:53 obraun Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-TLS		"SSL and TLS" "$status_TLS" \
-IPv6		"IPv6 support" "$status_IPv6" \
-IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-MySQL		"MySQL map lookups" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
-OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
-OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TLS="@comment "
-SUB_TEST="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-                SASL)
-                        echo "LIB_DEPENDS+=     sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-                        echo "POSTFIX_CCARGS+=  -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-                        echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-                        echo "SASL_SUFFIX=      +sasl"
-                        if [ -f ${PREFIX}/lib/libsasl.a ]; then
-                                if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then
-                                        echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                        echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                                fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                        fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
-                        SUB_SASL=""
-                        ;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${PREFIX}/lib/libsasl2.a ]; then
-				if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then
-					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			fi
-			echo ".if exists(/usr/lib/libkrb.a)"
-			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
-			echo ".endif"
-			SUB_SASL=""
-			;;
-		TLS)
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.9-0.9.7b/pfixtls.diff"
-			echo "PATCH_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls"
-			SUB_TLS=""
-			;;
-		DB3)
-			if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			DB3_SELECTED="YES"
-			;;
-		DB40)
-			if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			DB40_SELECTED="YES"
-			;;
-		DB41)
-			if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			DB41_SELECTED="YES"
-			;;
-		MySQL)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			echo "MYSQL_SUFFIX=	+mysql"
-			;;
-		PgSQL)
-			echo "POSTGRESQL_PORT?=	databases/postgresql7"
-			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PATCH_SITES+=	http://mat.cc/postfix/"
-			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
-			echo "PATCH_DIST_STRIP= -p1"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			;;
-		OpenLDAP12)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap12"
-			;;
-		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap20"
-			;;
-		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
- 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
- 			echo "OPENLDAP_SUFFIX=	+openldap21"
-			;;
-		Test)
-			echo "BIN1=		smtp-sink smtp-source"
-			SUB_TEST=""
-			;;
-		IPv6)
-			if [ X$SUB_TLS = "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "IPv6_SUFFIX=	+ipv6"
-			echo ""
-			IPv6SELECTED=YES
-			;;
-		IPv6TLS)
-			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	tls+ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls+ipv6"
-			SUB_TLS=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will.  so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"
diff --git a/mail/postfix23/scripts/fix-files-list b/mail/postfix23/scripts/fix-files-list
deleted file mode 100644
index cc4a1083a814..000000000000
--- a/mail/postfix23/scripts/fix-files-list
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them later, and if we
-# run post-install it will complain about missing files
-# (script from Simon J. Mudd)
-
-ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1
-%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/
-w
-q
-EOF
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
deleted file mode 100644
index 63539a865545..000000000000
--- a/mail/postfix24/Makefile
+++ /dev/null
@@ -1,166 +0,0 @@
-# New ports collection makefile for:	postfix-current
-# Date created: 	18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
-#
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
-
-PORTNAME=	postfix
-PORTVERSION=	2.0.9
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
-
-USE_SUBMAKE=	yes
-USE_REINPLACE=	yes
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \
-	postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \
-	relocated.5 transport.5 virtual.5
-
-MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
-	smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
-
-# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
-# patch it.
-MAN8base=$(MAN8:S/tlsmgr.8//)
-
-CONF1=	main.cf master.cf access aliases canonical pcre_table regexp_table \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-
-post-patch:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-patch:
-.for file in ${MAN1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN5}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN8base}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in faq rate rewrite uce
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${CONF1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file}
-.endfor
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	 config_directory=${PREFIX}/etc/postfix \
-	 daemon_directory=${PREFIX}/libexec/postfix \
-	 command_directory=${PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PREFIX}/sbin/sendmail \
-	 newaliases_path=${PREFIX}/bin/newaliases \
-	 mailq_path=${PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PREFIX}/man \
-	 sample_directory=${PREFIX}/etc/postfix \
-	 readme_directory=${READMEDIR}
-
-.for file in ${CONF1}
-	${INSTALL_DATA} ${WRKSRC}/conf/${file} \
-		${PREFIX}/etc/postfix/sample-${file}
-.endfor
-
-	@${INSTALL_SCRIPT} \
-		${WRKSRC}/auxiliary/rmail/rmail \
-		${PREFIX}/bin/rmail
-
-# optional TEST binaries
-.for file in ${BIN1}
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/src/smtpstone/${file} \
-		${PREFIX}/sbin
-.endfor
-
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \
-		${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them after this step, and
-# if we run etc/postfix/post-install again during package installation,
-# it will complain about missing files.
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/mail/postfix24/distinfo b/mail/postfix24/distinfo
deleted file mode 100644
index 61274400cc23..000000000000
--- a/mail/postfix24/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 (postfix/postfix-2.0.9.tar.gz) = c1ad12edfa19c23579b251078c464651
-MD5 (postfix/tls+ipv6-1.14-pf-2.0.9.patch.gz) = 6c55e142fc4b6ebf5e5ee707574446ba
-MD5 (postfix/ipv6-1.14-pf-2.0.9.patch.gz) = a449622b4a822a726065c8f2a960bbad
-MD5 (postfix/pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz) = f34a4b7e55a02675d04358e036f1362d
-MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
diff --git a/mail/postfix24/files/patch-ea b/mail/postfix24/files/patch-ea
deleted file mode 100644
index 6c3f98d2af4f..000000000000
--- a/mail/postfix24/files/patch-ea
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000
---- ./src/cleanup/cleanup.c	Thu Jun  1 21:52:22 2000
-***************
-*** 118,121 ****
-  /* FILES
-! /*	/etc/postfix/canonical*, canonical mapping table
-! /*	/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
---- 118,121 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! /*	!!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
diff --git a/mail/postfix24/files/patch-eb b/mail/postfix24/files/patch-eb
deleted file mode 100644
index e67680963d2d..000000000000
--- a/mail/postfix24/files/patch-eb
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/global/mail_conf.c.orig	Sun May  7 18:51:16 2000
---- ./src/global/mail_conf.c	Thu Jun  1 22:16:29 2000
-***************
-*** 53,55 ****
-  /* FILES
-! /*	/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
---- 53,55 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
diff --git a/mail/postfix24/files/patch-ec b/mail/postfix24/files/patch-ec
deleted file mode 100644
index 5f5d1ad9cadc..000000000000
--- a/mail/postfix24/files/patch-ec
+++ /dev/null
@@ -1,41 +0,0 @@
-*** ./src/global/mail_params.h.orig	Thu Jan  3 13:13:37 2002
---- ./src/global/mail_params.h	Tue Jan  8 22:18:22 2002
-***************
-*** 51,55 ****
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"postdrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
---- 51,55 ----
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"maildrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
-***************
-*** 170,174 ****
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
---- 170,174 ----
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-***************
-*** 204,208 ****
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
---- 204,208 ----
-  #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-ed b/mail/postfix24/files/patch-ed
deleted file mode 100644
index f971b62720d8..000000000000
--- a/mail/postfix24/files/patch-ed
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
---- ./src/local/mailbox.c	Thu Jun  1 22:37:48 2000
-***************
-*** 15,17 ****
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/[spool/]mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
---- 15,17 ----
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
diff --git a/mail/postfix24/files/patch-ee b/mail/postfix24/files/patch-ee
deleted file mode 100644
index ef44eac24b73..000000000000
--- a/mail/postfix24/files/patch-ee
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/master/master.c.orig	Tue Mar  7 10:25:07 2000
---- ./src/master/master.c	Thu Jun  1 22:43:50 2000
-***************
-*** 104,107 ****
-  /* FILES
-! /*	/etc/postfix/main.cf: global configuration file.
-! /*	/etc/postfix/master.cf: master process configuration file.
-  /*	/var/spool/postfix/pid/master.pid: master lock file.
---- 104,107 ----
-  /* FILES
-! /*	!!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.
diff --git a/mail/postfix24/files/patch-ef b/mail/postfix24/files/patch-ef
deleted file mode 100644
index 586b304a103d..000000000000
--- a/mail/postfix24/files/patch-ef
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999
---- ./src/postdrop/postdrop.c	Thu Jun  1 22:44:22 2000
-***************
-*** 39,41 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 39,41 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix24/files/patch-eg b/mail/postfix24/files/patch-eg
deleted file mode 100644
index 2983bbfd86ea..000000000000
--- a/mail/postfix24/files/patch-eg
+++ /dev/null
@@ -1,20 +0,0 @@
-*** ./src/sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000
---- ./src/sendmail/sendmail.c	Thu Jun  1 22:47:24 2000
-***************
-*** 57,59 ****
-  /*	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
---- 57,59 ----
-  /*	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
-***************
-*** 159,161 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 159,161 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix24/files/patch-eh b/mail/postfix24/files/patch-eh
deleted file mode 100644
index c104c3680d21..000000000000
--- a/mail/postfix24/files/patch-eh
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999
---- ./src/trivial-rewrite/transport.c	Thu Jun  1 22:47:49 2000
-***************
-*** 32,34 ****
-  /* FILES
-! /*	/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
---- 32,34 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix24/files/patch-main.cf b/mail/postfix24/files/patch-main.cf
deleted file mode 100644
index 95fb2feaca0a..000000000000
--- a/mail/postfix24/files/patch-main.cf
+++ /dev/null
@@ -1,58 +0,0 @@
---- ./conf/main.cf	Wed Jan  8 22:11:52 2003
-+++ ./conf/main.cf	Wed Jan  8 22:11:53 2003
-@@ -31,13 +31,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = /usr/local/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = /usr/local/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -590,32 +590,32 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = /usr/local/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = /usr/local/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = /usr/local/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = /usr/local/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- #
--sample_directory =
-+sample_directory = /usr/local/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix24/files/patch-post-install b/mail/postfix24/files/patch-post-install
deleted file mode 100644
index 92b2d4c2c6eb..000000000000
--- a/mail/postfix24/files/patch-post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./conf/#post-install~	Fri Jan 18 12:32:54 2002
-+++ ./conf/post-install	Fri Jan 18 12:32:54 2002
-@@ -183,7 +183,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix24/pkg-descr b/mail/postfix24/pkg-descr
deleted file mode 100644
index 1f335ce6820c..000000000000
--- a/mail/postfix24/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time being sendmail-compatible enough to not upset existing
-users. It also offers QMQP and VERP support to let Postfix act as delivery
-daemon for ezmlm-idx.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix24/pkg-install b/mail/postfix24/pkg-install
deleted file mode 100644
index 1ef1fb5b2089..000000000000
--- a/mail/postfix24/pkg-install
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local question default answer
-
-    question=$1
-    default=$2
-    while :; do
-        answer=$(ask "${question}" "${default}")
-        case "${answer}" in
-        [Yy]*)	return 0;;
-        [Nn]*)	return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    USER=postfix
-    GROUP=postfix
-    GROUP2=maildrop
-
-    if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP} -h -
-	then
-	    echo "Added group \"${GROUP}\"."
-	else
-	    echo "Adding group \"${GROUP}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP2}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP2} -h -
-	then
-	    echo "Added group \"${GROUP2}\"."
-	else
-	    echo "Adding group \"${GROUP2}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-        echo "You already have a user \"${USER}\", so I will use it."
-    else
-        if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \
-           -d /var/spool/postfix \
-           -s /sbin/nologin \
-           -c "Postfix Mail System"
-	then
-	    echo "Added user \"${USER}\"."
-	else
-	    echo "Adding user \"${USER}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-        echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-    else
-        echo "You need user \"${USER}\" added to group \"mail\"."
-        if yesno "Would you like me to add it" y; then
-            /usr/sbin/pw groupmod mail -m ${USER} || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	CONF1="main.cf master.cf access aliases canonical pcre_table \
-	regexp_table relocated transport virtual"
-
-	for file in $CONF1
-	do
-	        if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then
-        	        cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file
-	        fi
-	done
-
-	sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	 config_directory=${PKG_PREFIX}/etc/postfix \
-	 daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	 command_directory=${PKG_PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	 newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	 mailq_path=${PKG_PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PKG_PREFIX}/man \
-	 sample_directory=${PKG_PREFIX}/etc/postfix \
-	 readme_directory=no \
-	 upgrade-package
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-fi
-
-replace() {
-    local orig repl
-    
-    orig=$1
-    repl=$2
-    if [ -e ${orig} ]; then
-        mv -f ${orig} ${orig}.OFF
-        chmod 0 ${orig}.OFF
-    fi
-    if [ -e ${repl} ]; then
-        ln -s ${repl} ${orig}
-    fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-    if [ -x /sbin/sysctl ]; then
-        OSVERSION=`/sbin/sysctl -n kern.osreldate`
-    else
-        OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-    fi
-    if [ ${OSVERSION} -ge 400014 ]; then
-        if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" n; then
-            mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-            echo "#"						>  /etc/mail/mailer.conf
-            echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-            echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-            echo "#"						>> /etc/mail/mailer.conf
-            echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "mailq		${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-        fi
-    else
-        if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
-            replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/mailq	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
-            echo "Done."
-        fi
-    fi
-fi
diff --git a/mail/postfix24/pkg-message b/mail/postfix24/pkg-message
deleted file mode 100644
index 1c9fd6699bb9..000000000000
--- a/mail/postfix24/pkg-message
+++ /dev/null
@@ -1,40 +0,0 @@
-If you have postfix configured in your /etc/mail/mailer.conf (answered yes to
-the previous question) and would like to enable postfix to start at boot time,
-please set these variables in your /etc/rc.conf file:
-
-sendmail_enable="YES"
-sendmail_flags="-bd"
-sendmail_outbound_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-This will disable Sendmail completely.
-
-Alternatively to the above settings, you can enable postfix to start with
-the other local services, for example, after your database server starts if
-you need it to be running for postfix.  To do this, set in your rc.conf file:
-
-sendmail_enable="NONE"                                
-
-Then make the following symbolic link:
-
-cd /usr/local/etc/rc.d
-ln -s /usr/local/sbin/postfix postfix.sh
-
-
-Also, you will want to disable some Sendmail-specific daily maintenance
-routines in your /etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"                                      
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix24/pkg-plist b/mail/postfix24/pkg-plist
deleted file mode 100644
index c102595ef4bf..000000000000
--- a/mail/postfix24/pkg-plist
+++ /dev/null
@@ -1,180 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi
-@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi
-bin/rmail
-etc/postfix/LICENSE
-etc/postfix/main.cf.default
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases
-etc/postfix/sample-canonical
-etc/postfix/sample-pcre_table
-etc/postfix/sample-regexp_table
-etc/postfix/sample-relocated
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-auth.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-compatibility.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-filter.cf
-etc/postfix/sample-flush.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-lmtp.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-mime.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre-access.cf
-etc/postfix/sample-pcre-body.cf
-etc/postfix/sample-pcre-header.cf
-etc/postfix/sample-qmqpd.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-regexp-access.cf
-etc/postfix/sample-regexp-body.cf
-etc/postfix/sample-regexp-header.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
-etc/postfix/sample-transport
-etc/postfix/sample-virtual
-%%SUB_TLS%%etc/postfix/sample-tls.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/virtual
-%%SUB_TLS%%libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-bin/newaliases
-bin/mailq
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/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 93c5b95ec561..000000000000
--- a/mail/postfix24/scripts/configure
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \
-	mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \
-		rm $f.orig
-done
diff --git a/mail/postfix24/scripts/configure.postfix b/mail/postfix24/scripts/configure.postfix
deleted file mode 100644
index a94ebb758681..000000000000
--- a/mail/postfix24/scripts/configure.postfix
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.33 2003-05-12 21:02:53 obraun Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-TLS		"SSL and TLS" "$status_TLS" \
-IPv6		"IPv6 support" "$status_IPv6" \
-IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-MySQL		"MySQL map lookups" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
-OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
-OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TLS="@comment "
-SUB_TEST="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-                SASL)
-                        echo "LIB_DEPENDS+=     sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-                        echo "POSTFIX_CCARGS+=  -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-                        echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-                        echo "SASL_SUFFIX=      +sasl"
-                        if [ -f ${PREFIX}/lib/libsasl.a ]; then
-                                if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then
-                                        echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                        echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                                fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                        fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
-                        SUB_SASL=""
-                        ;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${PREFIX}/lib/libsasl2.a ]; then
-				if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then
-					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			fi
-			echo ".if exists(/usr/lib/libkrb.a)"
-			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
-			echo ".endif"
-			SUB_SASL=""
-			;;
-		TLS)
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.9-0.9.7b/pfixtls.diff"
-			echo "PATCH_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls"
-			SUB_TLS=""
-			;;
-		DB3)
-			if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			DB3_SELECTED="YES"
-			;;
-		DB40)
-			if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			DB40_SELECTED="YES"
-			;;
-		DB41)
-			if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			DB41_SELECTED="YES"
-			;;
-		MySQL)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			echo "MYSQL_SUFFIX=	+mysql"
-			;;
-		PgSQL)
-			echo "POSTGRESQL_PORT?=	databases/postgresql7"
-			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PATCH_SITES+=	http://mat.cc/postfix/"
-			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
-			echo "PATCH_DIST_STRIP= -p1"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			;;
-		OpenLDAP12)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap12"
-			;;
-		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap20"
-			;;
-		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
- 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
- 			echo "OPENLDAP_SUFFIX=	+openldap21"
-			;;
-		Test)
-			echo "BIN1=		smtp-sink smtp-source"
-			SUB_TEST=""
-			;;
-		IPv6)
-			if [ X$SUB_TLS = "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "IPv6_SUFFIX=	+ipv6"
-			echo ""
-			IPv6SELECTED=YES
-			;;
-		IPv6TLS)
-			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	tls+ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls+ipv6"
-			SUB_TLS=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will.  so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"
diff --git a/mail/postfix24/scripts/fix-files-list b/mail/postfix24/scripts/fix-files-list
deleted file mode 100644
index cc4a1083a814..000000000000
--- a/mail/postfix24/scripts/fix-files-list
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them later, and if we
-# run post-install it will complain about missing files
-# (script from Simon J. Mudd)
-
-ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1
-%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/
-w
-q
-EOF
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
deleted file mode 100644
index 63539a865545..000000000000
--- a/mail/postfix25/Makefile
+++ /dev/null
@@ -1,166 +0,0 @@
-# New ports collection makefile for:	postfix-current
-# Date created: 	18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
-#
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
-
-PORTNAME=	postfix
-PORTVERSION=	2.0.9
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
-
-USE_SUBMAKE=	yes
-USE_REINPLACE=	yes
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \
-	postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \
-	relocated.5 transport.5 virtual.5
-
-MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
-	smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
-
-# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
-# patch it.
-MAN8base=$(MAN8:S/tlsmgr.8//)
-
-CONF1=	main.cf master.cf access aliases canonical pcre_table regexp_table \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-
-post-patch:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-patch:
-.for file in ${MAN1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN5}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN8base}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in faq rate rewrite uce
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${CONF1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file}
-.endfor
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	 config_directory=${PREFIX}/etc/postfix \
-	 daemon_directory=${PREFIX}/libexec/postfix \
-	 command_directory=${PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PREFIX}/sbin/sendmail \
-	 newaliases_path=${PREFIX}/bin/newaliases \
-	 mailq_path=${PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PREFIX}/man \
-	 sample_directory=${PREFIX}/etc/postfix \
-	 readme_directory=${READMEDIR}
-
-.for file in ${CONF1}
-	${INSTALL_DATA} ${WRKSRC}/conf/${file} \
-		${PREFIX}/etc/postfix/sample-${file}
-.endfor
-
-	@${INSTALL_SCRIPT} \
-		${WRKSRC}/auxiliary/rmail/rmail \
-		${PREFIX}/bin/rmail
-
-# optional TEST binaries
-.for file in ${BIN1}
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/src/smtpstone/${file} \
-		${PREFIX}/sbin
-.endfor
-
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \
-		${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them after this step, and
-# if we run etc/postfix/post-install again during package installation,
-# it will complain about missing files.
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo
deleted file mode 100644
index 61274400cc23..000000000000
--- a/mail/postfix25/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 (postfix/postfix-2.0.9.tar.gz) = c1ad12edfa19c23579b251078c464651
-MD5 (postfix/tls+ipv6-1.14-pf-2.0.9.patch.gz) = 6c55e142fc4b6ebf5e5ee707574446ba
-MD5 (postfix/ipv6-1.14-pf-2.0.9.patch.gz) = a449622b4a822a726065c8f2a960bbad
-MD5 (postfix/pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz) = f34a4b7e55a02675d04358e036f1362d
-MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
diff --git a/mail/postfix25/files/patch-ea b/mail/postfix25/files/patch-ea
deleted file mode 100644
index 6c3f98d2af4f..000000000000
--- a/mail/postfix25/files/patch-ea
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000
---- ./src/cleanup/cleanup.c	Thu Jun  1 21:52:22 2000
-***************
-*** 118,121 ****
-  /* FILES
-! /*	/etc/postfix/canonical*, canonical mapping table
-! /*	/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
---- 118,121 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! /*	!!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
diff --git a/mail/postfix25/files/patch-eb b/mail/postfix25/files/patch-eb
deleted file mode 100644
index e67680963d2d..000000000000
--- a/mail/postfix25/files/patch-eb
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/global/mail_conf.c.orig	Sun May  7 18:51:16 2000
---- ./src/global/mail_conf.c	Thu Jun  1 22:16:29 2000
-***************
-*** 53,55 ****
-  /* FILES
-! /*	/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
---- 53,55 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
diff --git a/mail/postfix25/files/patch-ec b/mail/postfix25/files/patch-ec
deleted file mode 100644
index 5f5d1ad9cadc..000000000000
--- a/mail/postfix25/files/patch-ec
+++ /dev/null
@@ -1,41 +0,0 @@
-*** ./src/global/mail_params.h.orig	Thu Jan  3 13:13:37 2002
---- ./src/global/mail_params.h	Tue Jan  8 22:18:22 2002
-***************
-*** 51,55 ****
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"postdrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
---- 51,55 ----
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"maildrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
-***************
-*** 170,174 ****
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
---- 170,174 ----
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-***************
-*** 204,208 ****
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
---- 204,208 ----
-  #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-ed b/mail/postfix25/files/patch-ed
deleted file mode 100644
index f971b62720d8..000000000000
--- a/mail/postfix25/files/patch-ed
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
---- ./src/local/mailbox.c	Thu Jun  1 22:37:48 2000
-***************
-*** 15,17 ****
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/[spool/]mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
---- 15,17 ----
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
diff --git a/mail/postfix25/files/patch-ee b/mail/postfix25/files/patch-ee
deleted file mode 100644
index ef44eac24b73..000000000000
--- a/mail/postfix25/files/patch-ee
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/master/master.c.orig	Tue Mar  7 10:25:07 2000
---- ./src/master/master.c	Thu Jun  1 22:43:50 2000
-***************
-*** 104,107 ****
-  /* FILES
-! /*	/etc/postfix/main.cf: global configuration file.
-! /*	/etc/postfix/master.cf: master process configuration file.
-  /*	/var/spool/postfix/pid/master.pid: master lock file.
---- 104,107 ----
-  /* FILES
-! /*	!!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.
diff --git a/mail/postfix25/files/patch-ef b/mail/postfix25/files/patch-ef
deleted file mode 100644
index 586b304a103d..000000000000
--- a/mail/postfix25/files/patch-ef
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999
---- ./src/postdrop/postdrop.c	Thu Jun  1 22:44:22 2000
-***************
-*** 39,41 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 39,41 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix25/files/patch-eg b/mail/postfix25/files/patch-eg
deleted file mode 100644
index 2983bbfd86ea..000000000000
--- a/mail/postfix25/files/patch-eg
+++ /dev/null
@@ -1,20 +0,0 @@
-*** ./src/sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000
---- ./src/sendmail/sendmail.c	Thu Jun  1 22:47:24 2000
-***************
-*** 57,59 ****
-  /*	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
---- 57,59 ----
-  /*	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
-***************
-*** 159,161 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 159,161 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix25/files/patch-eh b/mail/postfix25/files/patch-eh
deleted file mode 100644
index c104c3680d21..000000000000
--- a/mail/postfix25/files/patch-eh
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999
---- ./src/trivial-rewrite/transport.c	Thu Jun  1 22:47:49 2000
-***************
-*** 32,34 ****
-  /* FILES
-! /*	/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
---- 32,34 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix25/files/patch-main.cf b/mail/postfix25/files/patch-main.cf
deleted file mode 100644
index 95fb2feaca0a..000000000000
--- a/mail/postfix25/files/patch-main.cf
+++ /dev/null
@@ -1,58 +0,0 @@
---- ./conf/main.cf	Wed Jan  8 22:11:52 2003
-+++ ./conf/main.cf	Wed Jan  8 22:11:53 2003
-@@ -31,13 +31,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = /usr/local/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = /usr/local/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -590,32 +590,32 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = /usr/local/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = /usr/local/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = /usr/local/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = /usr/local/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- #
--sample_directory =
-+sample_directory = /usr/local/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix25/files/patch-post-install b/mail/postfix25/files/patch-post-install
deleted file mode 100644
index 92b2d4c2c6eb..000000000000
--- a/mail/postfix25/files/patch-post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./conf/#post-install~	Fri Jan 18 12:32:54 2002
-+++ ./conf/post-install	Fri Jan 18 12:32:54 2002
-@@ -183,7 +183,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix25/pkg-descr b/mail/postfix25/pkg-descr
deleted file mode 100644
index 1f335ce6820c..000000000000
--- a/mail/postfix25/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time being sendmail-compatible enough to not upset existing
-users. It also offers QMQP and VERP support to let Postfix act as delivery
-daemon for ezmlm-idx.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix25/pkg-install b/mail/postfix25/pkg-install
deleted file mode 100644
index 1ef1fb5b2089..000000000000
--- a/mail/postfix25/pkg-install
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local question default answer
-
-    question=$1
-    default=$2
-    while :; do
-        answer=$(ask "${question}" "${default}")
-        case "${answer}" in
-        [Yy]*)	return 0;;
-        [Nn]*)	return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    USER=postfix
-    GROUP=postfix
-    GROUP2=maildrop
-
-    if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP} -h -
-	then
-	    echo "Added group \"${GROUP}\"."
-	else
-	    echo "Adding group \"${GROUP}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP2}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP2} -h -
-	then
-	    echo "Added group \"${GROUP2}\"."
-	else
-	    echo "Adding group \"${GROUP2}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-        echo "You already have a user \"${USER}\", so I will use it."
-    else
-        if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \
-           -d /var/spool/postfix \
-           -s /sbin/nologin \
-           -c "Postfix Mail System"
-	then
-	    echo "Added user \"${USER}\"."
-	else
-	    echo "Adding user \"${USER}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-        echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-    else
-        echo "You need user \"${USER}\" added to group \"mail\"."
-        if yesno "Would you like me to add it" y; then
-            /usr/sbin/pw groupmod mail -m ${USER} || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	CONF1="main.cf master.cf access aliases canonical pcre_table \
-	regexp_table relocated transport virtual"
-
-	for file in $CONF1
-	do
-	        if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then
-        	        cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file
-	        fi
-	done
-
-	sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	 config_directory=${PKG_PREFIX}/etc/postfix \
-	 daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	 command_directory=${PKG_PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	 newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	 mailq_path=${PKG_PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PKG_PREFIX}/man \
-	 sample_directory=${PKG_PREFIX}/etc/postfix \
-	 readme_directory=no \
-	 upgrade-package
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-fi
-
-replace() {
-    local orig repl
-    
-    orig=$1
-    repl=$2
-    if [ -e ${orig} ]; then
-        mv -f ${orig} ${orig}.OFF
-        chmod 0 ${orig}.OFF
-    fi
-    if [ -e ${repl} ]; then
-        ln -s ${repl} ${orig}
-    fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-    if [ -x /sbin/sysctl ]; then
-        OSVERSION=`/sbin/sysctl -n kern.osreldate`
-    else
-        OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-    fi
-    if [ ${OSVERSION} -ge 400014 ]; then
-        if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" n; then
-            mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-            echo "#"						>  /etc/mail/mailer.conf
-            echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-            echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-            echo "#"						>> /etc/mail/mailer.conf
-            echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "mailq		${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-        fi
-    else
-        if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
-            replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/mailq	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
-            echo "Done."
-        fi
-    fi
-fi
diff --git a/mail/postfix25/pkg-message b/mail/postfix25/pkg-message
deleted file mode 100644
index 1c9fd6699bb9..000000000000
--- a/mail/postfix25/pkg-message
+++ /dev/null
@@ -1,40 +0,0 @@
-If you have postfix configured in your /etc/mail/mailer.conf (answered yes to
-the previous question) and would like to enable postfix to start at boot time,
-please set these variables in your /etc/rc.conf file:
-
-sendmail_enable="YES"
-sendmail_flags="-bd"
-sendmail_outbound_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-This will disable Sendmail completely.
-
-Alternatively to the above settings, you can enable postfix to start with
-the other local services, for example, after your database server starts if
-you need it to be running for postfix.  To do this, set in your rc.conf file:
-
-sendmail_enable="NONE"                                
-
-Then make the following symbolic link:
-
-cd /usr/local/etc/rc.d
-ln -s /usr/local/sbin/postfix postfix.sh
-
-
-Also, you will want to disable some Sendmail-specific daily maintenance
-routines in your /etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"                                      
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix25/pkg-plist b/mail/postfix25/pkg-plist
deleted file mode 100644
index c102595ef4bf..000000000000
--- a/mail/postfix25/pkg-plist
+++ /dev/null
@@ -1,180 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi
-@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi
-bin/rmail
-etc/postfix/LICENSE
-etc/postfix/main.cf.default
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases
-etc/postfix/sample-canonical
-etc/postfix/sample-pcre_table
-etc/postfix/sample-regexp_table
-etc/postfix/sample-relocated
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-auth.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-compatibility.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-filter.cf
-etc/postfix/sample-flush.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-lmtp.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-mime.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre-access.cf
-etc/postfix/sample-pcre-body.cf
-etc/postfix/sample-pcre-header.cf
-etc/postfix/sample-qmqpd.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-regexp-access.cf
-etc/postfix/sample-regexp-body.cf
-etc/postfix/sample-regexp-header.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
-etc/postfix/sample-transport
-etc/postfix/sample-virtual
-%%SUB_TLS%%etc/postfix/sample-tls.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/virtual
-%%SUB_TLS%%libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-bin/newaliases
-bin/mailq
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/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 93c5b95ec561..000000000000
--- a/mail/postfix25/scripts/configure
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \
-	mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \
-		rm $f.orig
-done
diff --git a/mail/postfix25/scripts/configure.postfix b/mail/postfix25/scripts/configure.postfix
deleted file mode 100644
index 747bc7412f58..000000000000
--- a/mail/postfix25/scripts/configure.postfix
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.33 2003-05-12 21:02:53 obraun Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-TLS		"SSL and TLS" "$status_TLS" \
-IPv6		"IPv6 support" "$status_IPv6" \
-IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-MySQL		"MySQL map lookups" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
-OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
-OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TLS="@comment "
-SUB_TEST="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-                SASL)
-                        echo "LIB_DEPENDS+=     sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-                        echo "POSTFIX_CCARGS+=  -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-                        echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-                        echo "SASL_SUFFIX=      +sasl"
-                        if [ -f ${PREFIX}/lib/libsasl.a ]; then
-                                if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then
-                                        echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                        echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                                fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                        fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
-                        SUB_SASL=""
-                        ;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${PREFIX}/lib/libsasl2.a ]; then
-				if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then
-					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			fi
-			echo ".if exists(/usr/lib/libkrb.a)"
-			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
-			echo ".endif"
-			SUB_SASL=""
-			;;
-		TLS)
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.9-0.9.7b/pfixtls.diff"
-			echo "PATCH_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls"
-			SUB_TLS=""
-			;;
-		DB3)
-			if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			DB3_SELECTED="YES"
-			;;
-		DB40)
-			if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			DB40_SELECTED="YES"
-			;;
-		DB41)
-			if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			DB41_SELECTED="YES"
-			;;
-		MySQL)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			echo "MYSQL_SUFFIX=	+mysql"
-			;;
-		PgSQL)
-			echo "POSTGRESQL_PORT?=	databases/postgresql7"
-			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PATCH_SITES+=	http://mat.cc/postfix/"
-			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
-			echo "PATCH_DIST_STRIP= -p1"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			;;
-		OpenLDAP12)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap12"
-			;;
-		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap20"
-			;;
-		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
- 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
- 			echo "OPENLDAP_SUFFIX=	+openldap21"
-			;;
-		Test)
-			echo "BIN1=		smtp-sink smtp-source"
-			SUB_TEST=""
-			;;
-		IPv6)
-			if [ X$SUB_TLS = "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "IPv6_SUFFIX=	+ipv6"
-			echo ""
-			IPv6SELECTED=YES
-			;;
-		IPv6TLS)
-			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	tls+ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls+ipv6"
-			SUB_TLS=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will.  so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"
diff --git a/mail/postfix25/scripts/fix-files-list b/mail/postfix25/scripts/fix-files-list
deleted file mode 100644
index cc4a1083a814..000000000000
--- a/mail/postfix25/scripts/fix-files-list
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them later, and if we
-# run post-install it will complain about missing files
-# (script from Simon J. Mudd)
-
-ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1
-%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/
-w
-q
-EOF
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
deleted file mode 100644
index 63539a865545..000000000000
--- a/mail/postfix26/Makefile
+++ /dev/null
@@ -1,166 +0,0 @@
-# New ports collection makefile for:	postfix-current
-# Date created: 	18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
-#
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
-
-PORTNAME=	postfix
-PORTVERSION=	2.0.9
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
-
-USE_SUBMAKE=	yes
-USE_REINPLACE=	yes
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \
-	postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \
-	relocated.5 transport.5 virtual.5
-
-MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
-	smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
-
-# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
-# patch it.
-MAN8base=$(MAN8:S/tlsmgr.8//)
-
-CONF1=	main.cf master.cf access aliases canonical pcre_table regexp_table \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-
-post-patch:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-patch:
-.for file in ${MAN1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN5}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN8base}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in faq rate rewrite uce
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${CONF1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file}
-.endfor
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	 config_directory=${PREFIX}/etc/postfix \
-	 daemon_directory=${PREFIX}/libexec/postfix \
-	 command_directory=${PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PREFIX}/sbin/sendmail \
-	 newaliases_path=${PREFIX}/bin/newaliases \
-	 mailq_path=${PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PREFIX}/man \
-	 sample_directory=${PREFIX}/etc/postfix \
-	 readme_directory=${READMEDIR}
-
-.for file in ${CONF1}
-	${INSTALL_DATA} ${WRKSRC}/conf/${file} \
-		${PREFIX}/etc/postfix/sample-${file}
-.endfor
-
-	@${INSTALL_SCRIPT} \
-		${WRKSRC}/auxiliary/rmail/rmail \
-		${PREFIX}/bin/rmail
-
-# optional TEST binaries
-.for file in ${BIN1}
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/src/smtpstone/${file} \
-		${PREFIX}/sbin
-.endfor
-
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \
-		${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them after this step, and
-# if we run etc/postfix/post-install again during package installation,
-# it will complain about missing files.
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo
deleted file mode 100644
index 61274400cc23..000000000000
--- a/mail/postfix26/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 (postfix/postfix-2.0.9.tar.gz) = c1ad12edfa19c23579b251078c464651
-MD5 (postfix/tls+ipv6-1.14-pf-2.0.9.patch.gz) = 6c55e142fc4b6ebf5e5ee707574446ba
-MD5 (postfix/ipv6-1.14-pf-2.0.9.patch.gz) = a449622b4a822a726065c8f2a960bbad
-MD5 (postfix/pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz) = f34a4b7e55a02675d04358e036f1362d
-MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
diff --git a/mail/postfix26/files/patch-ea b/mail/postfix26/files/patch-ea
deleted file mode 100644
index 6c3f98d2af4f..000000000000
--- a/mail/postfix26/files/patch-ea
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000
---- ./src/cleanup/cleanup.c	Thu Jun  1 21:52:22 2000
-***************
-*** 118,121 ****
-  /* FILES
-! /*	/etc/postfix/canonical*, canonical mapping table
-! /*	/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
---- 118,121 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! /*	!!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
diff --git a/mail/postfix26/files/patch-eb b/mail/postfix26/files/patch-eb
deleted file mode 100644
index e67680963d2d..000000000000
--- a/mail/postfix26/files/patch-eb
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/global/mail_conf.c.orig	Sun May  7 18:51:16 2000
---- ./src/global/mail_conf.c	Thu Jun  1 22:16:29 2000
-***************
-*** 53,55 ****
-  /* FILES
-! /*	/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
---- 53,55 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
diff --git a/mail/postfix26/files/patch-ec b/mail/postfix26/files/patch-ec
deleted file mode 100644
index 5f5d1ad9cadc..000000000000
--- a/mail/postfix26/files/patch-ec
+++ /dev/null
@@ -1,41 +0,0 @@
-*** ./src/global/mail_params.h.orig	Thu Jan  3 13:13:37 2002
---- ./src/global/mail_params.h	Tue Jan  8 22:18:22 2002
-***************
-*** 51,55 ****
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"postdrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
---- 51,55 ----
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"maildrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
-***************
-*** 170,174 ****
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
---- 170,174 ----
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-***************
-*** 204,208 ****
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
---- 204,208 ----
-  #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-ed b/mail/postfix26/files/patch-ed
deleted file mode 100644
index f971b62720d8..000000000000
--- a/mail/postfix26/files/patch-ed
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
---- ./src/local/mailbox.c	Thu Jun  1 22:37:48 2000
-***************
-*** 15,17 ****
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/[spool/]mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
---- 15,17 ----
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
diff --git a/mail/postfix26/files/patch-ee b/mail/postfix26/files/patch-ee
deleted file mode 100644
index ef44eac24b73..000000000000
--- a/mail/postfix26/files/patch-ee
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/master/master.c.orig	Tue Mar  7 10:25:07 2000
---- ./src/master/master.c	Thu Jun  1 22:43:50 2000
-***************
-*** 104,107 ****
-  /* FILES
-! /*	/etc/postfix/main.cf: global configuration file.
-! /*	/etc/postfix/master.cf: master process configuration file.
-  /*	/var/spool/postfix/pid/master.pid: master lock file.
---- 104,107 ----
-  /* FILES
-! /*	!!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.
diff --git a/mail/postfix26/files/patch-ef b/mail/postfix26/files/patch-ef
deleted file mode 100644
index 586b304a103d..000000000000
--- a/mail/postfix26/files/patch-ef
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999
---- ./src/postdrop/postdrop.c	Thu Jun  1 22:44:22 2000
-***************
-*** 39,41 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 39,41 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix26/files/patch-eg b/mail/postfix26/files/patch-eg
deleted file mode 100644
index 2983bbfd86ea..000000000000
--- a/mail/postfix26/files/patch-eg
+++ /dev/null
@@ -1,20 +0,0 @@
-*** ./src/sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000
---- ./src/sendmail/sendmail.c	Thu Jun  1 22:47:24 2000
-***************
-*** 57,59 ****
-  /*	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
---- 57,59 ----
-  /*	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
-***************
-*** 159,161 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 159,161 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix26/files/patch-eh b/mail/postfix26/files/patch-eh
deleted file mode 100644
index c104c3680d21..000000000000
--- a/mail/postfix26/files/patch-eh
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999
---- ./src/trivial-rewrite/transport.c	Thu Jun  1 22:47:49 2000
-***************
-*** 32,34 ****
-  /* FILES
-! /*	/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
---- 32,34 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix26/files/patch-main.cf b/mail/postfix26/files/patch-main.cf
deleted file mode 100644
index 95fb2feaca0a..000000000000
--- a/mail/postfix26/files/patch-main.cf
+++ /dev/null
@@ -1,58 +0,0 @@
---- ./conf/main.cf	Wed Jan  8 22:11:52 2003
-+++ ./conf/main.cf	Wed Jan  8 22:11:53 2003
-@@ -31,13 +31,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = /usr/local/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = /usr/local/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -590,32 +590,32 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = /usr/local/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = /usr/local/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = /usr/local/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = /usr/local/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- #
--sample_directory =
-+sample_directory = /usr/local/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix26/files/patch-post-install b/mail/postfix26/files/patch-post-install
deleted file mode 100644
index 92b2d4c2c6eb..000000000000
--- a/mail/postfix26/files/patch-post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./conf/#post-install~	Fri Jan 18 12:32:54 2002
-+++ ./conf/post-install	Fri Jan 18 12:32:54 2002
-@@ -183,7 +183,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix26/pkg-descr b/mail/postfix26/pkg-descr
deleted file mode 100644
index 1f335ce6820c..000000000000
--- a/mail/postfix26/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time being sendmail-compatible enough to not upset existing
-users. It also offers QMQP and VERP support to let Postfix act as delivery
-daemon for ezmlm-idx.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix26/pkg-install b/mail/postfix26/pkg-install
deleted file mode 100644
index 1ef1fb5b2089..000000000000
--- a/mail/postfix26/pkg-install
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local question default answer
-
-    question=$1
-    default=$2
-    while :; do
-        answer=$(ask "${question}" "${default}")
-        case "${answer}" in
-        [Yy]*)	return 0;;
-        [Nn]*)	return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    USER=postfix
-    GROUP=postfix
-    GROUP2=maildrop
-
-    if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP} -h -
-	then
-	    echo "Added group \"${GROUP}\"."
-	else
-	    echo "Adding group \"${GROUP}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP2}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP2} -h -
-	then
-	    echo "Added group \"${GROUP2}\"."
-	else
-	    echo "Adding group \"${GROUP2}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-        echo "You already have a user \"${USER}\", so I will use it."
-    else
-        if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \
-           -d /var/spool/postfix \
-           -s /sbin/nologin \
-           -c "Postfix Mail System"
-	then
-	    echo "Added user \"${USER}\"."
-	else
-	    echo "Adding user \"${USER}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-        echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-    else
-        echo "You need user \"${USER}\" added to group \"mail\"."
-        if yesno "Would you like me to add it" y; then
-            /usr/sbin/pw groupmod mail -m ${USER} || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	CONF1="main.cf master.cf access aliases canonical pcre_table \
-	regexp_table relocated transport virtual"
-
-	for file in $CONF1
-	do
-	        if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then
-        	        cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file
-	        fi
-	done
-
-	sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	 config_directory=${PKG_PREFIX}/etc/postfix \
-	 daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	 command_directory=${PKG_PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	 newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	 mailq_path=${PKG_PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PKG_PREFIX}/man \
-	 sample_directory=${PKG_PREFIX}/etc/postfix \
-	 readme_directory=no \
-	 upgrade-package
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-fi
-
-replace() {
-    local orig repl
-    
-    orig=$1
-    repl=$2
-    if [ -e ${orig} ]; then
-        mv -f ${orig} ${orig}.OFF
-        chmod 0 ${orig}.OFF
-    fi
-    if [ -e ${repl} ]; then
-        ln -s ${repl} ${orig}
-    fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-    if [ -x /sbin/sysctl ]; then
-        OSVERSION=`/sbin/sysctl -n kern.osreldate`
-    else
-        OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-    fi
-    if [ ${OSVERSION} -ge 400014 ]; then
-        if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" n; then
-            mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-            echo "#"						>  /etc/mail/mailer.conf
-            echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-            echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-            echo "#"						>> /etc/mail/mailer.conf
-            echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "mailq		${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-        fi
-    else
-        if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
-            replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/mailq	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
-            echo "Done."
-        fi
-    fi
-fi
diff --git a/mail/postfix26/pkg-message b/mail/postfix26/pkg-message
deleted file mode 100644
index 1c9fd6699bb9..000000000000
--- a/mail/postfix26/pkg-message
+++ /dev/null
@@ -1,40 +0,0 @@
-If you have postfix configured in your /etc/mail/mailer.conf (answered yes to
-the previous question) and would like to enable postfix to start at boot time,
-please set these variables in your /etc/rc.conf file:
-
-sendmail_enable="YES"
-sendmail_flags="-bd"
-sendmail_outbound_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-This will disable Sendmail completely.
-
-Alternatively to the above settings, you can enable postfix to start with
-the other local services, for example, after your database server starts if
-you need it to be running for postfix.  To do this, set in your rc.conf file:
-
-sendmail_enable="NONE"                                
-
-Then make the following symbolic link:
-
-cd /usr/local/etc/rc.d
-ln -s /usr/local/sbin/postfix postfix.sh
-
-
-Also, you will want to disable some Sendmail-specific daily maintenance
-routines in your /etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"                                      
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix26/pkg-plist b/mail/postfix26/pkg-plist
deleted file mode 100644
index c102595ef4bf..000000000000
--- a/mail/postfix26/pkg-plist
+++ /dev/null
@@ -1,180 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi
-@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi
-bin/rmail
-etc/postfix/LICENSE
-etc/postfix/main.cf.default
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases
-etc/postfix/sample-canonical
-etc/postfix/sample-pcre_table
-etc/postfix/sample-regexp_table
-etc/postfix/sample-relocated
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-auth.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-compatibility.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-filter.cf
-etc/postfix/sample-flush.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-lmtp.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-mime.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre-access.cf
-etc/postfix/sample-pcre-body.cf
-etc/postfix/sample-pcre-header.cf
-etc/postfix/sample-qmqpd.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-regexp-access.cf
-etc/postfix/sample-regexp-body.cf
-etc/postfix/sample-regexp-header.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
-etc/postfix/sample-transport
-etc/postfix/sample-virtual
-%%SUB_TLS%%etc/postfix/sample-tls.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/virtual
-%%SUB_TLS%%libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-bin/newaliases
-bin/mailq
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/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 93c5b95ec561..000000000000
--- a/mail/postfix26/scripts/configure
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \
-	mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \
-		rm $f.orig
-done
diff --git a/mail/postfix26/scripts/configure.postfix b/mail/postfix26/scripts/configure.postfix
deleted file mode 100644
index 07ec1fd67a5a..000000000000
--- a/mail/postfix26/scripts/configure.postfix
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.33 2003-05-12 21:02:53 obraun Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-TLS		"SSL and TLS" "$status_TLS" \
-IPv6		"IPv6 support" "$status_IPv6" \
-IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-MySQL		"MySQL map lookups" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
-OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
-OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TLS="@comment "
-SUB_TEST="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-                SASL)
-                        echo "LIB_DEPENDS+=     sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-                        echo "POSTFIX_CCARGS+=  -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-                        echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-                        echo "SASL_SUFFIX=      +sasl"
-                        if [ -f ${PREFIX}/lib/libsasl.a ]; then
-                                if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then
-                                        echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                        echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                                fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                        fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
-                        SUB_SASL=""
-                        ;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${PREFIX}/lib/libsasl2.a ]; then
-				if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then
-					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			fi
-			echo ".if exists(/usr/lib/libkrb.a)"
-			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
-			echo ".endif"
-			SUB_SASL=""
-			;;
-		TLS)
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.9-0.9.7b/pfixtls.diff"
-			echo "PATCH_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls"
-			SUB_TLS=""
-			;;
-		DB3)
-			if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			DB3_SELECTED="YES"
-			;;
-		DB40)
-			if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			DB40_SELECTED="YES"
-			;;
-		DB41)
-			if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			DB41_SELECTED="YES"
-			;;
-		MySQL)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			echo "MYSQL_SUFFIX=	+mysql"
-			;;
-		PgSQL)
-			echo "POSTGRESQL_PORT?=	databases/postgresql7"
-			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PATCH_SITES+=	http://mat.cc/postfix/"
-			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
-			echo "PATCH_DIST_STRIP= -p1"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			;;
-		OpenLDAP12)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap12"
-			;;
-		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap20"
-			;;
-		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
- 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
- 			echo "OPENLDAP_SUFFIX=	+openldap21"
-			;;
-		Test)
-			echo "BIN1=		smtp-sink smtp-source"
-			SUB_TEST=""
-			;;
-		IPv6)
-			if [ X$SUB_TLS = "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "IPv6_SUFFIX=	+ipv6"
-			echo ""
-			IPv6SELECTED=YES
-			;;
-		IPv6TLS)
-			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	tls+ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls+ipv6"
-			SUB_TLS=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will.  so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"
diff --git a/mail/postfix26/scripts/fix-files-list b/mail/postfix26/scripts/fix-files-list
deleted file mode 100644
index cc4a1083a814..000000000000
--- a/mail/postfix26/scripts/fix-files-list
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them later, and if we
-# run post-install it will complain about missing files
-# (script from Simon J. Mudd)
-
-ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1
-%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/
-w
-q
-EOF
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
deleted file mode 100644
index 63539a865545..000000000000
--- a/mail/postfix27/Makefile
+++ /dev/null
@@ -1,166 +0,0 @@
-# New ports collection makefile for:	postfix-current
-# Date created: 	18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
-#
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
-
-PORTNAME=	postfix
-PORTVERSION=	2.0.9
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
-
-USE_SUBMAKE=	yes
-USE_REINPLACE=	yes
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \
-	postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \
-	relocated.5 transport.5 virtual.5
-
-MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
-	smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
-
-# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
-# patch it.
-MAN8base=$(MAN8:S/tlsmgr.8//)
-
-CONF1=	main.cf master.cf access aliases canonical pcre_table regexp_table \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-
-post-patch:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-patch:
-.for file in ${MAN1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN5}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN8base}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in faq rate rewrite uce
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${CONF1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file}
-.endfor
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	 config_directory=${PREFIX}/etc/postfix \
-	 daemon_directory=${PREFIX}/libexec/postfix \
-	 command_directory=${PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PREFIX}/sbin/sendmail \
-	 newaliases_path=${PREFIX}/bin/newaliases \
-	 mailq_path=${PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PREFIX}/man \
-	 sample_directory=${PREFIX}/etc/postfix \
-	 readme_directory=${READMEDIR}
-
-.for file in ${CONF1}
-	${INSTALL_DATA} ${WRKSRC}/conf/${file} \
-		${PREFIX}/etc/postfix/sample-${file}
-.endfor
-
-	@${INSTALL_SCRIPT} \
-		${WRKSRC}/auxiliary/rmail/rmail \
-		${PREFIX}/bin/rmail
-
-# optional TEST binaries
-.for file in ${BIN1}
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/src/smtpstone/${file} \
-		${PREFIX}/sbin
-.endfor
-
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \
-		${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them after this step, and
-# if we run etc/postfix/post-install again during package installation,
-# it will complain about missing files.
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo
deleted file mode 100644
index 61274400cc23..000000000000
--- a/mail/postfix27/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 (postfix/postfix-2.0.9.tar.gz) = c1ad12edfa19c23579b251078c464651
-MD5 (postfix/tls+ipv6-1.14-pf-2.0.9.patch.gz) = 6c55e142fc4b6ebf5e5ee707574446ba
-MD5 (postfix/ipv6-1.14-pf-2.0.9.patch.gz) = a449622b4a822a726065c8f2a960bbad
-MD5 (postfix/pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz) = f34a4b7e55a02675d04358e036f1362d
-MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
diff --git a/mail/postfix27/files/patch-ea b/mail/postfix27/files/patch-ea
deleted file mode 100644
index 6c3f98d2af4f..000000000000
--- a/mail/postfix27/files/patch-ea
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000
---- ./src/cleanup/cleanup.c	Thu Jun  1 21:52:22 2000
-***************
-*** 118,121 ****
-  /* FILES
-! /*	/etc/postfix/canonical*, canonical mapping table
-! /*	/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
---- 118,121 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! /*	!!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
diff --git a/mail/postfix27/files/patch-eb b/mail/postfix27/files/patch-eb
deleted file mode 100644
index e67680963d2d..000000000000
--- a/mail/postfix27/files/patch-eb
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/global/mail_conf.c.orig	Sun May  7 18:51:16 2000
---- ./src/global/mail_conf.c	Thu Jun  1 22:16:29 2000
-***************
-*** 53,55 ****
-  /* FILES
-! /*	/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
---- 53,55 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
diff --git a/mail/postfix27/files/patch-ec b/mail/postfix27/files/patch-ec
deleted file mode 100644
index 5f5d1ad9cadc..000000000000
--- a/mail/postfix27/files/patch-ec
+++ /dev/null
@@ -1,41 +0,0 @@
-*** ./src/global/mail_params.h.orig	Thu Jan  3 13:13:37 2002
---- ./src/global/mail_params.h	Tue Jan  8 22:18:22 2002
-***************
-*** 51,55 ****
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"postdrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
---- 51,55 ----
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"maildrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
-***************
-*** 170,174 ****
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
---- 170,174 ----
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-***************
-*** 204,208 ****
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
---- 204,208 ----
-  #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-ed b/mail/postfix27/files/patch-ed
deleted file mode 100644
index f971b62720d8..000000000000
--- a/mail/postfix27/files/patch-ed
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
---- ./src/local/mailbox.c	Thu Jun  1 22:37:48 2000
-***************
-*** 15,17 ****
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/[spool/]mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
---- 15,17 ----
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
diff --git a/mail/postfix27/files/patch-ee b/mail/postfix27/files/patch-ee
deleted file mode 100644
index ef44eac24b73..000000000000
--- a/mail/postfix27/files/patch-ee
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/master/master.c.orig	Tue Mar  7 10:25:07 2000
---- ./src/master/master.c	Thu Jun  1 22:43:50 2000
-***************
-*** 104,107 ****
-  /* FILES
-! /*	/etc/postfix/main.cf: global configuration file.
-! /*	/etc/postfix/master.cf: master process configuration file.
-  /*	/var/spool/postfix/pid/master.pid: master lock file.
---- 104,107 ----
-  /* FILES
-! /*	!!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.
diff --git a/mail/postfix27/files/patch-ef b/mail/postfix27/files/patch-ef
deleted file mode 100644
index 586b304a103d..000000000000
--- a/mail/postfix27/files/patch-ef
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999
---- ./src/postdrop/postdrop.c	Thu Jun  1 22:44:22 2000
-***************
-*** 39,41 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 39,41 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix27/files/patch-eg b/mail/postfix27/files/patch-eg
deleted file mode 100644
index 2983bbfd86ea..000000000000
--- a/mail/postfix27/files/patch-eg
+++ /dev/null
@@ -1,20 +0,0 @@
-*** ./src/sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000
---- ./src/sendmail/sendmail.c	Thu Jun  1 22:47:24 2000
-***************
-*** 57,59 ****
-  /*	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
---- 57,59 ----
-  /*	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
-***************
-*** 159,161 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 159,161 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix27/files/patch-eh b/mail/postfix27/files/patch-eh
deleted file mode 100644
index c104c3680d21..000000000000
--- a/mail/postfix27/files/patch-eh
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999
---- ./src/trivial-rewrite/transport.c	Thu Jun  1 22:47:49 2000
-***************
-*** 32,34 ****
-  /* FILES
-! /*	/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
---- 32,34 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix27/files/patch-main.cf b/mail/postfix27/files/patch-main.cf
deleted file mode 100644
index 95fb2feaca0a..000000000000
--- a/mail/postfix27/files/patch-main.cf
+++ /dev/null
@@ -1,58 +0,0 @@
---- ./conf/main.cf	Wed Jan  8 22:11:52 2003
-+++ ./conf/main.cf	Wed Jan  8 22:11:53 2003
-@@ -31,13 +31,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = /usr/local/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = /usr/local/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -590,32 +590,32 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = /usr/local/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = /usr/local/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = /usr/local/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = /usr/local/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- #
--sample_directory =
-+sample_directory = /usr/local/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix27/files/patch-post-install b/mail/postfix27/files/patch-post-install
deleted file mode 100644
index 92b2d4c2c6eb..000000000000
--- a/mail/postfix27/files/patch-post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./conf/#post-install~	Fri Jan 18 12:32:54 2002
-+++ ./conf/post-install	Fri Jan 18 12:32:54 2002
-@@ -183,7 +183,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix27/pkg-descr b/mail/postfix27/pkg-descr
deleted file mode 100644
index 1f335ce6820c..000000000000
--- a/mail/postfix27/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time being sendmail-compatible enough to not upset existing
-users. It also offers QMQP and VERP support to let Postfix act as delivery
-daemon for ezmlm-idx.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix27/pkg-install b/mail/postfix27/pkg-install
deleted file mode 100644
index 1ef1fb5b2089..000000000000
--- a/mail/postfix27/pkg-install
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local question default answer
-
-    question=$1
-    default=$2
-    while :; do
-        answer=$(ask "${question}" "${default}")
-        case "${answer}" in
-        [Yy]*)	return 0;;
-        [Nn]*)	return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    USER=postfix
-    GROUP=postfix
-    GROUP2=maildrop
-
-    if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP} -h -
-	then
-	    echo "Added group \"${GROUP}\"."
-	else
-	    echo "Adding group \"${GROUP}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP2}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP2} -h -
-	then
-	    echo "Added group \"${GROUP2}\"."
-	else
-	    echo "Adding group \"${GROUP2}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-        echo "You already have a user \"${USER}\", so I will use it."
-    else
-        if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \
-           -d /var/spool/postfix \
-           -s /sbin/nologin \
-           -c "Postfix Mail System"
-	then
-	    echo "Added user \"${USER}\"."
-	else
-	    echo "Adding user \"${USER}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-        echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-    else
-        echo "You need user \"${USER}\" added to group \"mail\"."
-        if yesno "Would you like me to add it" y; then
-            /usr/sbin/pw groupmod mail -m ${USER} || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	CONF1="main.cf master.cf access aliases canonical pcre_table \
-	regexp_table relocated transport virtual"
-
-	for file in $CONF1
-	do
-	        if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then
-        	        cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file
-	        fi
-	done
-
-	sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	 config_directory=${PKG_PREFIX}/etc/postfix \
-	 daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	 command_directory=${PKG_PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	 newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	 mailq_path=${PKG_PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PKG_PREFIX}/man \
-	 sample_directory=${PKG_PREFIX}/etc/postfix \
-	 readme_directory=no \
-	 upgrade-package
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-fi
-
-replace() {
-    local orig repl
-    
-    orig=$1
-    repl=$2
-    if [ -e ${orig} ]; then
-        mv -f ${orig} ${orig}.OFF
-        chmod 0 ${orig}.OFF
-    fi
-    if [ -e ${repl} ]; then
-        ln -s ${repl} ${orig}
-    fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-    if [ -x /sbin/sysctl ]; then
-        OSVERSION=`/sbin/sysctl -n kern.osreldate`
-    else
-        OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-    fi
-    if [ ${OSVERSION} -ge 400014 ]; then
-        if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" n; then
-            mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-            echo "#"						>  /etc/mail/mailer.conf
-            echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-            echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-            echo "#"						>> /etc/mail/mailer.conf
-            echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "mailq		${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-        fi
-    else
-        if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
-            replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/mailq	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
-            echo "Done."
-        fi
-    fi
-fi
diff --git a/mail/postfix27/pkg-message b/mail/postfix27/pkg-message
deleted file mode 100644
index 1c9fd6699bb9..000000000000
--- a/mail/postfix27/pkg-message
+++ /dev/null
@@ -1,40 +0,0 @@
-If you have postfix configured in your /etc/mail/mailer.conf (answered yes to
-the previous question) and would like to enable postfix to start at boot time,
-please set these variables in your /etc/rc.conf file:
-
-sendmail_enable="YES"
-sendmail_flags="-bd"
-sendmail_outbound_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-This will disable Sendmail completely.
-
-Alternatively to the above settings, you can enable postfix to start with
-the other local services, for example, after your database server starts if
-you need it to be running for postfix.  To do this, set in your rc.conf file:
-
-sendmail_enable="NONE"                                
-
-Then make the following symbolic link:
-
-cd /usr/local/etc/rc.d
-ln -s /usr/local/sbin/postfix postfix.sh
-
-
-Also, you will want to disable some Sendmail-specific daily maintenance
-routines in your /etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"                                      
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix27/pkg-plist b/mail/postfix27/pkg-plist
deleted file mode 100644
index c102595ef4bf..000000000000
--- a/mail/postfix27/pkg-plist
+++ /dev/null
@@ -1,180 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi
-@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi
-bin/rmail
-etc/postfix/LICENSE
-etc/postfix/main.cf.default
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases
-etc/postfix/sample-canonical
-etc/postfix/sample-pcre_table
-etc/postfix/sample-regexp_table
-etc/postfix/sample-relocated
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-auth.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-compatibility.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-filter.cf
-etc/postfix/sample-flush.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-lmtp.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-mime.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre-access.cf
-etc/postfix/sample-pcre-body.cf
-etc/postfix/sample-pcre-header.cf
-etc/postfix/sample-qmqpd.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-regexp-access.cf
-etc/postfix/sample-regexp-body.cf
-etc/postfix/sample-regexp-header.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
-etc/postfix/sample-transport
-etc/postfix/sample-virtual
-%%SUB_TLS%%etc/postfix/sample-tls.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/virtual
-%%SUB_TLS%%libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-bin/newaliases
-bin/mailq
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/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 93c5b95ec561..000000000000
--- a/mail/postfix27/scripts/configure
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \
-	mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \
-		rm $f.orig
-done
diff --git a/mail/postfix27/scripts/configure.postfix b/mail/postfix27/scripts/configure.postfix
deleted file mode 100644
index c0c7c7c91366..000000000000
--- a/mail/postfix27/scripts/configure.postfix
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.33 2003-05-12 21:02:53 obraun Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-TLS		"SSL and TLS" "$status_TLS" \
-IPv6		"IPv6 support" "$status_IPv6" \
-IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-MySQL		"MySQL map lookups" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
-OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
-OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TLS="@comment "
-SUB_TEST="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-                SASL)
-                        echo "LIB_DEPENDS+=     sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-                        echo "POSTFIX_CCARGS+=  -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-                        echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-                        echo "SASL_SUFFIX=      +sasl"
-                        if [ -f ${PREFIX}/lib/libsasl.a ]; then
-                                if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then
-                                        echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                        echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                                fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                        fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
-                        SUB_SASL=""
-                        ;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${PREFIX}/lib/libsasl2.a ]; then
-				if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then
-					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			fi
-			echo ".if exists(/usr/lib/libkrb.a)"
-			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
-			echo ".endif"
-			SUB_SASL=""
-			;;
-		TLS)
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.9-0.9.7b/pfixtls.diff"
-			echo "PATCH_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls"
-			SUB_TLS=""
-			;;
-		DB3)
-			if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			DB3_SELECTED="YES"
-			;;
-		DB40)
-			if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			DB40_SELECTED="YES"
-			;;
-		DB41)
-			if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			DB41_SELECTED="YES"
-			;;
-		MySQL)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			echo "MYSQL_SUFFIX=	+mysql"
-			;;
-		PgSQL)
-			echo "POSTGRESQL_PORT?=	databases/postgresql7"
-			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PATCH_SITES+=	http://mat.cc/postfix/"
-			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
-			echo "PATCH_DIST_STRIP= -p1"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			;;
-		OpenLDAP12)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap12"
-			;;
-		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap20"
-			;;
-		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
- 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
- 			echo "OPENLDAP_SUFFIX=	+openldap21"
-			;;
-		Test)
-			echo "BIN1=		smtp-sink smtp-source"
-			SUB_TEST=""
-			;;
-		IPv6)
-			if [ X$SUB_TLS = "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "IPv6_SUFFIX=	+ipv6"
-			echo ""
-			IPv6SELECTED=YES
-			;;
-		IPv6TLS)
-			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	tls+ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls+ipv6"
-			SUB_TLS=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will.  so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"
diff --git a/mail/postfix27/scripts/fix-files-list b/mail/postfix27/scripts/fix-files-list
deleted file mode 100644
index cc4a1083a814..000000000000
--- a/mail/postfix27/scripts/fix-files-list
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them later, and if we
-# run post-install it will complain about missing files
-# (script from Simon J. Mudd)
-
-ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1
-%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/
-w
-q
-EOF
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
deleted file mode 100644
index 63539a865545..000000000000
--- a/mail/postfix28/Makefile
+++ /dev/null
@@ -1,166 +0,0 @@
-# New ports collection makefile for:	postfix-current
-# Date created: 	18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
-#
-# the options are the same names as in the scripts/configure.postfix file.
-# POSTFIX_OPTIONS can be set in /etc/make.conf also.
-
-# NOTE: PCRE is enabled by default unless you specifically disable it.
-
-PORTNAME=	postfix
-PORTVERSION=	2.0.9
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
-		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
-		ftp://ftp.tux.org/pub/net/postfix/official/ \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
-		ftp://ftp.samurai.com/pub/postfix/official/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
-
-USE_SUBMAKE=	yes
-USE_REINPLACE=	yes
-
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
-	postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \
-	postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \
-	relocated.5 transport.5 virtual.5
-
-MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
-	smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
-
-# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
-# patch it.
-MAN8base=$(MAN8:S/tlsmgr.8//)
-
-CONF1=	main.cf master.cf access aliases canonical pcre_table regexp_table \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix
-
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-.if defined(WITHOUT_PCRE)
-POSTFIX_CCARGS+=	-DNO_PCRE
-.else
-LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.endif
-
-
-post-patch:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-patch:
-.for file in ${MAN1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN5}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${MAN8base}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html
-.endfor
-.for file in faq rate rewrite uce
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/html/${file}.html
-.endfor
-.for file in ${CONF1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file}
-.endfor
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	 config_directory=${PREFIX}/etc/postfix \
-	 daemon_directory=${PREFIX}/libexec/postfix \
-	 command_directory=${PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PREFIX}/sbin/sendmail \
-	 newaliases_path=${PREFIX}/bin/newaliases \
-	 mailq_path=${PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PREFIX}/man \
-	 sample_directory=${PREFIX}/etc/postfix \
-	 readme_directory=${READMEDIR}
-
-.for file in ${CONF1}
-	${INSTALL_DATA} ${WRKSRC}/conf/${file} \
-		${PREFIX}/etc/postfix/sample-${file}
-.endfor
-
-	@${INSTALL_SCRIPT} \
-		${WRKSRC}/auxiliary/rmail/rmail \
-		${PREFIX}/bin/rmail
-
-# optional TEST binaries
-.for file in ${BIN1}
-	@${INSTALL_PROGRAM} \
-		${WRKSRC}/src/smtpstone/${file} \
-		${PREFIX}/sbin
-.endfor
-
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \
-		${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them after this step, and
-# if we run etc/postfix/post-install again during package installation,
-# it will complain about missing files.
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list
-	@${CAT} ${PKGMESSAGE}
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
-
-.include <bsd.port.mk>
diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo
deleted file mode 100644
index 61274400cc23..000000000000
--- a/mail/postfix28/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 (postfix/postfix-2.0.9.tar.gz) = c1ad12edfa19c23579b251078c464651
-MD5 (postfix/tls+ipv6-1.14-pf-2.0.9.patch.gz) = 6c55e142fc4b6ebf5e5ee707574446ba
-MD5 (postfix/ipv6-1.14-pf-2.0.9.patch.gz) = a449622b4a822a726065c8f2a960bbad
-MD5 (postfix/pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz) = f34a4b7e55a02675d04358e036f1362d
-MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
diff --git a/mail/postfix28/files/patch-ea b/mail/postfix28/files/patch-ea
deleted file mode 100644
index 6c3f98d2af4f..000000000000
--- a/mail/postfix28/files/patch-ea
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/cleanup/cleanup.c.orig	Sun May 28 18:33:41 2000
---- ./src/cleanup/cleanup.c	Thu Jun  1 21:52:22 2000
-***************
-*** 118,121 ****
-  /* FILES
-! /*	/etc/postfix/canonical*, canonical mapping table
-! /*	/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
---- 118,121 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/canonical*, canonical mapping table
-! /*	!!PREFIX!!/etc/postfix/virtual*, virtual mapping table
-  /* LICENSE
diff --git a/mail/postfix28/files/patch-eb b/mail/postfix28/files/patch-eb
deleted file mode 100644
index e67680963d2d..000000000000
--- a/mail/postfix28/files/patch-eb
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/global/mail_conf.c.orig	Sun May  7 18:51:16 2000
---- ./src/global/mail_conf.c	Thu Jun  1 22:16:29 2000
-***************
-*** 53,55 ****
-  /* FILES
-! /*	/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
---- 53,55 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix: default Postfix configuration directory.
-  /* ENVIRONMENT
diff --git a/mail/postfix28/files/patch-ec b/mail/postfix28/files/patch-ec
deleted file mode 100644
index 5f5d1ad9cadc..000000000000
--- a/mail/postfix28/files/patch-ec
+++ /dev/null
@@ -1,41 +0,0 @@
-*** ./src/global/mail_params.h.orig	Thu Jan  3 13:13:37 2002
---- ./src/global/mail_params.h	Tue Jan  8 22:18:22 2002
-***************
-*** 51,55 ****
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"postdrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
---- 51,55 ----
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"maildrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
-***************
-*** 170,174 ****
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
-  #endif
-  
---- 170,174 ----
-  #define VAR_PROGRAM_DIR		"program_directory"
-  #ifndef DEF_PROGRAM_DIR
-! #define DEF_PROGRAM_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  
-***************
-*** 204,208 ****
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
---- 204,208 ----
-  #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-ed b/mail/postfix28/files/patch-ed
deleted file mode 100644
index f971b62720d8..000000000000
--- a/mail/postfix28/files/patch-ed
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
---- ./src/local/mailbox.c	Thu Jun  1 22:37:48 2000
-***************
-*** 15,17 ****
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/[spool/]mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
---- 15,17 ----
-  /*	suppression. The default is direct mailbox delivery to
-! /*	/var/mail/\fIuser\fR; when a \fIhome_mailbox\fR
-  /*	has been configured, mail is delivered to ~/$\fIhome_mailbox\fR;
diff --git a/mail/postfix28/files/patch-ee b/mail/postfix28/files/patch-ee
deleted file mode 100644
index ef44eac24b73..000000000000
--- a/mail/postfix28/files/patch-ee
+++ /dev/null
@@ -1,13 +0,0 @@
-*** ./src/master/master.c.orig	Tue Mar  7 10:25:07 2000
---- ./src/master/master.c	Thu Jun  1 22:43:50 2000
-***************
-*** 104,107 ****
-  /* FILES
-! /*	/etc/postfix/main.cf: global configuration file.
-! /*	/etc/postfix/master.cf: master process configuration file.
-  /*	/var/spool/postfix/pid/master.pid: master lock file.
---- 104,107 ----
-  /* FILES
-! /*	!!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.
diff --git a/mail/postfix28/files/patch-ef b/mail/postfix28/files/patch-ef
deleted file mode 100644
index 586b304a103d..000000000000
--- a/mail/postfix28/files/patch-ef
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/postdrop/postdrop.c.orig	Sun Apr 25 18:05:43 1999
---- ./src/postdrop/postdrop.c	Thu Jun  1 22:44:22 2000
-***************
-*** 39,41 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 39,41 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix28/files/patch-eg b/mail/postfix28/files/patch-eg
deleted file mode 100644
index 2983bbfd86ea..000000000000
--- a/mail/postfix28/files/patch-eg
+++ /dev/null
@@ -1,20 +0,0 @@
-*** ./src/sendmail/sendmail.c.orig	Tue Mar 14 10:42:06 2000
---- ./src/sendmail/sendmail.c	Thu Jun  1 22:47:24 2000
-***************
-*** 57,59 ****
-  /*	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
---- 57,59 ----
-  /*	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
-***************
-*** 159,161 ****
-  /*	/var/spool/postfix, mail queue
-! /*	/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
---- 159,161 ----
-  /*	/var/spool/postfix, mail queue
-! /*	!!PREFIX!!/etc/postfix, configuration files
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix28/files/patch-eh b/mail/postfix28/files/patch-eh
deleted file mode 100644
index c104c3680d21..000000000000
--- a/mail/postfix28/files/patch-eh
+++ /dev/null
@@ -1,11 +0,0 @@
-*** ./src/trivial-rewrite/transport.c.orig	Tue Nov 16 19:15:41 1999
---- ./src/trivial-rewrite/transport.c	Thu Jun  1 22:47:49 2000
-***************
-*** 32,34 ****
-  /* FILES
-! /*	/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
---- 32,34 ----
-  /* FILES
-! /*	!!PREFIX!!/etc/postfix/transport*
-  /* CONFIGURATION PARAMETERS
diff --git a/mail/postfix28/files/patch-main.cf b/mail/postfix28/files/patch-main.cf
deleted file mode 100644
index 95fb2feaca0a..000000000000
--- a/mail/postfix28/files/patch-main.cf
+++ /dev/null
@@ -1,58 +0,0 @@
---- ./conf/main.cf	Wed Jan  8 22:11:52 2003
-+++ ./conf/main.cf	Wed Jan  8 22:11:53 2003
-@@ -31,13 +31,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = /usr/local/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = /usr/local/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -590,32 +590,32 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = /usr/local/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = /usr/local/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = /usr/local/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = /usr/local/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- #
--sample_directory =
-+sample_directory = /usr/local/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix28/files/patch-post-install b/mail/postfix28/files/patch-post-install
deleted file mode 100644
index 92b2d4c2c6eb..000000000000
--- a/mail/postfix28/files/patch-post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./conf/#post-install~	Fri Jan 18 12:32:54 2002
-+++ ./conf/post-install	Fri Jan 18 12:32:54 2002
-@@ -183,7 +183,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix28/pkg-descr b/mail/postfix28/pkg-descr
deleted file mode 100644
index 1f335ce6820c..000000000000
--- a/mail/postfix28/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Postfix attempts to be fast, easy to administer, and secure, while at
-the same time being sendmail-compatible enough to not upset existing
-users. It also offers QMQP and VERP support to let Postfix act as delivery
-daemon for ezmlm-idx.
-
-WWW: http://www.postfix.org/
diff --git a/mail/postfix28/pkg-install b/mail/postfix28/pkg-install
deleted file mode 100644
index 1ef1fb5b2089..000000000000
--- a/mail/postfix28/pkg-install
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-        read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-        answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local question default answer
-
-    question=$1
-    default=$2
-    while :; do
-        answer=$(ask "${question}" "${default}")
-        case "${answer}" in
-        [Yy]*)	return 0;;
-        [Nn]*)	return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    USER=postfix
-    GROUP=postfix
-    GROUP2=maildrop
-
-    if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP} -h -
-	then
-	    echo "Added group \"${GROUP}\"."
-	else
-	    echo "Adding group \"${GROUP}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP2}\", so I will use it."
-    else
-        if /usr/sbin/pw groupadd ${GROUP2} -h -
-	then
-	    echo "Added group \"${GROUP2}\"."
-	else
-	    echo "Adding group \"${GROUP2}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-        echo "You already have a user \"${USER}\", so I will use it."
-    else
-        if /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - \
-           -d /var/spool/postfix \
-           -s /sbin/nologin \
-           -c "Postfix Mail System"
-	then
-	    echo "Added user \"${USER}\"."
-	else
-	    echo "Adding user \"${USER}\" failed..."
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-        echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-    else
-        echo "You need user \"${USER}\" added to group \"mail\"."
-        if yesno "Would you like me to add it" y; then
-            /usr/sbin/pw groupmod mail -m ${USER} || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	CONF1="main.cf master.cf access aliases canonical pcre_table \
-	regexp_table relocated transport virtual"
-
-	for file in $CONF1
-	do
-	        if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then
-        	        cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file
-	        fi
-	done
-
-	sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	 config_directory=${PKG_PREFIX}/etc/postfix \
-	 daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	 command_directory=${PKG_PREFIX}/sbin \
-	 queue_directory=/var/spool/postfix \
-	 sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	 newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	 mailq_path=${PKG_PREFIX}/bin/mailq \
-	 mail_owner=postfix \
-	 setgid_group=maildrop \
-	 manpage_directory=${PKG_PREFIX}/man \
-	 sample_directory=${PKG_PREFIX}/etc/postfix \
-	 readme_directory=no \
-	 upgrade-package
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-fi
-
-replace() {
-    local orig repl
-    
-    orig=$1
-    repl=$2
-    if [ -e ${orig} ]; then
-        mv -f ${orig} ${orig}.OFF
-        chmod 0 ${orig}.OFF
-    fi
-    if [ -e ${repl} ]; then
-        ln -s ${repl} ${orig}
-    fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-    if [ -x /sbin/sysctl ]; then
-        OSVERSION=`/sbin/sysctl -n kern.osreldate`
-    else
-        OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
-    fi
-    if [ ${OSVERSION} -ge 400014 ]; then
-        if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" n; then
-            mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-            echo "#"						>  /etc/mail/mailer.conf
-            echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-            echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-            echo "#"						>> /etc/mail/mailer.conf
-            echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "mailq		${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-            echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-        fi
-    else
-        if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
-            replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/mailq	${PKG_PREFIX}/sbin/sendmail
-            replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
-            echo "Done."
-        fi
-    fi
-fi
diff --git a/mail/postfix28/pkg-message b/mail/postfix28/pkg-message
deleted file mode 100644
index 1c9fd6699bb9..000000000000
--- a/mail/postfix28/pkg-message
+++ /dev/null
@@ -1,40 +0,0 @@
-If you have postfix configured in your /etc/mail/mailer.conf (answered yes to
-the previous question) and would like to enable postfix to start at boot time,
-please set these variables in your /etc/rc.conf file:
-
-sendmail_enable="YES"
-sendmail_flags="-bd"
-sendmail_outbound_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-This will disable Sendmail completely.
-
-Alternatively to the above settings, you can enable postfix to start with
-the other local services, for example, after your database server starts if
-you need it to be running for postfix.  To do this, set in your rc.conf file:
-
-sendmail_enable="NONE"                                
-
-Then make the following symbolic link:
-
-cd /usr/local/etc/rc.d
-ln -s /usr/local/sbin/postfix postfix.sh
-
-
-Also, you will want to disable some Sendmail-specific daily maintenance
-routines in your /etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"                                      
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix28/pkg-plist b/mail/postfix28/pkg-plist
deleted file mode 100644
index c102595ef4bf..000000000000
--- a/mail/postfix28/pkg-plist
+++ /dev/null
@@ -1,180 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi
-@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi
-bin/rmail
-etc/postfix/LICENSE
-etc/postfix/main.cf.default
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/sample-access
-etc/postfix/sample-aliases
-etc/postfix/sample-canonical
-etc/postfix/sample-pcre_table
-etc/postfix/sample-regexp_table
-etc/postfix/sample-relocated
-etc/postfix/sample-aliases.cf
-etc/postfix/sample-auth.cf
-etc/postfix/sample-canonical.cf
-etc/postfix/sample-compatibility.cf
-etc/postfix/sample-debug.cf
-etc/postfix/sample-filter.cf
-etc/postfix/sample-flush.cf
-etc/postfix/sample-ldap.cf
-etc/postfix/sample-lmtp.cf
-etc/postfix/sample-local.cf
-etc/postfix/sample-main.cf
-etc/postfix/sample-master.cf
-etc/postfix/sample-mime.cf
-etc/postfix/sample-misc.cf
-etc/postfix/sample-pcre-access.cf
-etc/postfix/sample-pcre-body.cf
-etc/postfix/sample-pcre-header.cf
-etc/postfix/sample-qmqpd.cf
-etc/postfix/sample-rate.cf
-etc/postfix/sample-regexp-access.cf
-etc/postfix/sample-regexp-body.cf
-etc/postfix/sample-regexp-header.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
-etc/postfix/sample-transport
-etc/postfix/sample-virtual
-%%SUB_TLS%%etc/postfix/sample-tls.cf
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/virtual
-%%SUB_TLS%%libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-bin/newaliases
-bin/mailq
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-%%PORTDOCS%%share/doc/postfix/ADDRESS_CLASS_README
-%%PORTDOCS%%share/doc/postfix/DB_README
-%%PORTDOCS%%share/doc/postfix/DEBUG_README
-%%PORTDOCS%%share/doc/postfix/ETRN_README
-%%PORTDOCS%%share/doc/postfix/FILTER_README
-%%PORTDOCS%%share/doc/postfix/INSTALL
-%%PORTDOCS%%share/doc/postfix/LDAP_README
-%%PORTDOCS%%share/doc/postfix/LINUX_README
-%%PORTDOCS%%share/doc/postfix/LOCAL_RECIPIENT_README
-%%PORTDOCS%%share/doc/postfix/LMTP_README
-%%PORTDOCS%%share/doc/postfix/MACOSX_README
-%%PORTDOCS%%share/doc/postfix/MAILDROP_README
-%%PORTDOCS%%share/doc/postfix/MYSQL_README
-%%PORTDOCS%%share/doc/postfix/NFS_README
-%%PORTDOCS%%share/doc/postfix/PACKAGE_README
-%%PORTDOCS%%share/doc/postfix/PCRE_README
-%%PORTDOCS%%share/doc/postfix/QMQP_README
-%%PORTDOCS%%share/doc/postfix/RELEASE_NOTES
-%%PORTDOCS%%share/doc/postfix/RESTRICTION_CLASS_README
-%%PORTDOCS%%share/doc/postfix/SASL_README
-%%PORTDOCS%%share/doc/postfix/ULTRIX_README
-%%PORTDOCS%%share/doc/postfix/UUCP_README
-%%PORTDOCS%%share/doc/postfix/VERP_README
-%%PORTDOCS%%share/doc/postfix/VIRTUAL_README
-%%PORTDOCS%%share/doc/postfix/access.5.html
-%%PORTDOCS%%share/doc/postfix/aliases.5.html
-%%PORTDOCS%%share/doc/postfix/architecture.html
-%%PORTDOCS%%share/doc/postfix/backstage.html
-%%PORTDOCS%%share/doc/postfix/basic.html
-%%PORTDOCS%%share/doc/postfix/big-picture.gif
-%%PORTDOCS%%share/doc/postfix/big-picture.html
-%%PORTDOCS%%share/doc/postfix/bounce.8.html
-%%PORTDOCS%%share/doc/postfix/canonical.5.html
-%%PORTDOCS%%share/doc/postfix/cleanup.8.html
-%%PORTDOCS%%share/doc/postfix/commands.html
-%%PORTDOCS%%share/doc/postfix/defer.8.html
-%%PORTDOCS%%share/doc/postfix/delivering.html
-%%PORTDOCS%%share/doc/postfix/error.8.html
-%%PORTDOCS%%share/doc/postfix/faq.html
-%%PORTDOCS%%share/doc/postfix/flush.8.html
-%%PORTDOCS%%share/doc/postfix/goals.html
-%%PORTDOCS%%share/doc/postfix/inbound.gif
-%%PORTDOCS%%share/doc/postfix/index.html
-%%PORTDOCS%%share/doc/postfix/lmtp.8.html
-%%PORTDOCS%%share/doc/postfix/local.8.html
-%%PORTDOCS%%share/doc/postfix/mailq.1.html
-%%PORTDOCS%%share/doc/postfix/master.8.html
-%%PORTDOCS%%share/doc/postfix/motivation.html
-%%PORTDOCS%%share/doc/postfix/newaliases.1.html
-%%PORTDOCS%%share/doc/postfix/nqmgr.8.html
-%%PORTDOCS%%share/doc/postfix/outbound.gif
-%%PORTDOCS%%share/doc/postfix/pcre_table.5.html
-%%PORTDOCS%%share/doc/postfix/pickup.8.html
-%%PORTDOCS%%share/doc/postfix/pipe.8.html
-%%PORTDOCS%%share/doc/postfix/postalias.1.html
-%%PORTDOCS%%share/doc/postfix/postcat.1.html
-%%PORTDOCS%%share/doc/postfix/postconf.1.html
-%%PORTDOCS%%share/doc/postfix/postdrop.1.html
-%%PORTDOCS%%share/doc/postfix/postfix.1.html
-%%PORTDOCS%%share/doc/postfix/postkick.1.html
-%%PORTDOCS%%share/doc/postfix/postlock.1.html
-%%PORTDOCS%%share/doc/postfix/postlog.1.html
-%%PORTDOCS%%share/doc/postfix/postmap.1.html
-%%PORTDOCS%%share/doc/postfix/postqueue.1.html
-%%PORTDOCS%%share/doc/postfix/postsuper.1.html
-%%PORTDOCS%%share/doc/postfix/proxymap.8.html
-%%PORTDOCS%%share/doc/postfix/qmgr.8.html
-%%PORTDOCS%%share/doc/postfix/qmqpd.8.html
-%%PORTDOCS%%share/doc/postfix/queuing.html
-%%PORTDOCS%%share/doc/postfix/rate.html
-%%PORTDOCS%%share/doc/postfix/receiving.html
-%%PORTDOCS%%share/doc/postfix/regexp_table.5.html
-%%PORTDOCS%%share/doc/postfix/relocated.5.html
-%%PORTDOCS%%share/doc/postfix/resource.html
-%%PORTDOCS%%share/doc/postfix/rewrite.html
-%%PORTDOCS%%share/doc/postfix/security.html
-%%PORTDOCS%%share/doc/postfix/sendmail.1.html
-%%PORTDOCS%%share/doc/postfix/showq.8.html
-%%PORTDOCS%%share/doc/postfix/small-picture.gif
-%%PORTDOCS%%share/doc/postfix/smtp.8.html
-%%PORTDOCS%%share/doc/postfix/smtpd.8.html
-%%PORTDOCS%%share/doc/postfix/spawn.8.html
-%%PORTDOCS%%share/doc/postfix/transport.5.html
-%%PORTDOCS%%share/doc/postfix/trivial-rewrite.8.html
-%%PORTDOCS%%share/doc/postfix/uce.html
-%%PORTDOCS%%share/doc/postfix/virtual.5.html
-%%PORTDOCS%%share/doc/postfix/virtual.8.html
-%%PORTDOCS%%@dirrm share/doc/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 93c5b95ec561..000000000000
--- a/mail/postfix28/scripts/configure
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \
-	mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \
-		rm $f.orig
-done
diff --git a/mail/postfix28/scripts/configure.postfix b/mail/postfix28/scripts/configure.postfix
deleted file mode 100644
index fe8862273c23..000000000000
--- a/mail/postfix28/scripts/configure.postfix
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.33 2003-05-12 21:02:53 obraun Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-if [ "${POSTFIX_OPTIONS}" ]; then
-	set ${POSTFIX_OPTIONS}
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "Postfix configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
-SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-TLS		"SSL and TLS" "$status_TLS" \
-IPv6		"IPv6 support" "$status_IPv6" \
-IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
-DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
-DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
-DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
-MySQL		"MySQL map lookups" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
-OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
-OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
-Test		"SMTP/LMTP test server and generator" "$status_Test" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${CURDIR}
-exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-
-echo "PREFIX=	${PREFIX}"
-
-SUB_TLS="@comment "
-SUB_TEST="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-                SASL)
-                        echo "LIB_DEPENDS+=     sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-                        echo "POSTFIX_CCARGS+=  -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-                        echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-                        echo "SASL_SUFFIX=      +sasl"
-                        if [ -f ${PREFIX}/lib/libsasl.a ]; then
-                                if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then
-                                        echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                        echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                                fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-                        fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
-                        SUB_SASL=""
-                        ;;
-		SASL2)
-			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			echo "SASL_SUFFIX=	+sasl2"
-			if [ -f ${PREFIX}/lib/libsasl2.a ]; then
-				if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then
-					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			fi
-			echo ".if exists(/usr/lib/libkrb.a)"
-			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
-			echo ".endif"
-			SUB_SASL=""
-			;;
-		TLS)
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.9-0.9.7b.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.9-0.9.7b/pfixtls.diff"
-			echo "PATCH_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls"
-			SUB_TLS=""
-			;;
-		DB3)
-			if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			echo "DB_SUFFIX=	+db3"
-			DB3_SELECTED="YES"
-			;;
-		DB40)
-			if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			echo "DB_SUFFIX=	+db40"
-			DB40_SELECTED="YES"
-			;;
-		DB41)
-			if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			echo "DB_SUFFIX=	+db41"
-			DB41_SELECTED="YES"
-			;;
-		MySQL)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			echo "MYSQL_SUFFIX=	+mysql"
-			;;
-		PgSQL)
-			echo "POSTGRESQL_PORT?=	databases/postgresql7"
-			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
-			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			echo "PATCH_SITES+=	http://mat.cc/postfix/"
-			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
-			echo "PATCH_DIST_STRIP= -p1"
-			echo "PGSQL_SUFFIX=	+pgsql"
-			;;
-		OpenLDAP12)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap12"
-			;;
-		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap20"
-			;;
-		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
- 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
- 			echo "OPENLDAP_SUFFIX=	+openldap21"
-			;;
-		Test)
-			echo "BIN1=		smtp-sink smtp-source"
-			SUB_TEST=""
-			;;
-		IPv6)
-			if [ X$SUB_TLS = "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "IPv6_SUFFIX=	+ipv6"
-			echo ""
-			IPv6SELECTED=YES
-			;;
-		IPv6TLS)
-			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.14/"
-			echo "PATCHFILES+=	tls+ipv6-1.14-pf-2.0.9.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls+ipv6"
-			SUB_TLS=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-
-# for some reason, if we alter the pkg name this way, the first build (where
-# we ask the configure questions) doesn't pick up the extensions, but
-# any subsequent build will.  so "make; make install" will build twice.
-# don't do this for now.
-#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"
diff --git a/mail/postfix28/scripts/fix-files-list b/mail/postfix28/scripts/fix-files-list
deleted file mode 100644
index cc4a1083a814..000000000000
--- a/mail/postfix28/scripts/fix-files-list
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed
-# man pages, since the ports software compresses them later, and if we
-# run post-install it will complain about missing files
-# (script from Simon J. Mudd)
-
-ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1
-%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/
-w
-q
-EOF
diff --git a/mail/qmail-smtp_auth+tls/Makefile b/mail/qmail-smtp_auth+tls/Makefile
deleted file mode 100644
index d295799e61f1..000000000000
--- a/mail/qmail-smtp_auth+tls/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-# New ports collection makefile for:	qmail-tls
-# Date created:				03 Dec 2000
-# Whom:					Mario S F Ferreira <lioux@linf.unb.br> et al.
-#
-# $FreeBSD$
-#
-
-PORTNAME=	qmail
-PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
-CATEGORIES=	mail
-PKGNAMESUFFIX=	-tls
-
-PATCH_SITES+=	http://www.esat.kuleuven.ac.be/~vermeule/qmail/:tls
-PATCHFILES+=	tls.patch:tls
-PATCH_DIST_STRIP+=	-p1
-
-MAINTAINER=	lioux@FreeBSD.org
-COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH TLS support
-
-USE_OPENSSL=	YES
-
-# Patches from the main qmail port are not wanted
-MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER=	yes
-
-TLS_PATCH_DATE=	20020825
-
-# Using default from master port, i.e., /var/qmail
-PREFIX?=	${QMAIL_PORT_PREFIX}
-#PREFIX=		/var/qmail-tls
-
-.if !defined(PRE_MK_INCLUDED)
-.include <bsd.port.pre.mk>
-.endif
-
-CFLAGS+=	-I${OPENSSLBASE}/include -L${OPENSSLBASE}/lib -DTLS
-
-.if defined(WITH_TLS_DEBUG)
-CFLAGS+=	-DDEBUG
-.endif # WITH_TLS_DEBUG
-
-#QMAIL_PORT=	${PORTSDIR}/mail/qmail
-QMAIL_PORT=	${.CURDIR}/../qmail
-QMAIL_PORT_PREFIX!=	cd ${QMAIL_PORT} && ${MAKE} -V PREFIX
-
-DOCFILES+=	${WRKDIR}/TLS.readme
-
-slaveport-pre-fetch: qmail-tls-pre-fetch
-
-qmail-tls-pre-fetch:
-	@${ECHO_MSG} "WITH_TLS_DEBUG=yes		enable additional debug information"
-
-slaveport-post-patch: qmail-tls-post-patch
-
-qmail-tls-post-patch:
-	@${HEAD} -74 ${DISTDIR}/tls.patch > ${WRKDIR}/TLS.readme
-	@${PERL} -pi -ne "s|/usr/local/ssl|${OPENSSLBASE}|" ${WRKSRC}/Makefile
-
-# Primary Ugh... ;-)
-# idea stolen from www/apache13-ssl, a target written by adam@algroup.co.uk
-# internal code ripped from tls.patch guts ;-) written by Frederik Vermeulen <jos-tls@kotnet.org>
-
-certificate:
-	@if [ -f ${OPENSSLDIR}/openssl.cnf ]; \
-	then \
-		if [ ! -d ${WRKDIR} ]; \
-		then \
-			${MKDIR} ${WRKDIR} ; \
-		fi ; \
-		${OPENSSLBASE}/bin/openssl req -new -x509 -nodes \
-			-out ${WRKDIR}/servercert.pem -days 366 \
-			-keyout ${WRKDIR}/servercert.pem ; \
-		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
-		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
-	else \
-		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
-	fi
-
-certificate-req:
-	@if [ -f ${OPENSSLDIR}/openssl.cnf ]; \
-	then \
-		if [ ! -d ${WRKDIR} ]; \
-		then \
-			${MKDIR} ${WRKDIR} ; \
-		fi ; \
-		${OPENSSLBASE}/bin/openssl req -new -nodes \
-			-out ${WRKDIR}/req.pem \
-			-keyout ${WRKDIR}/servercert.pem ; \
-		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
-		${ECHO_MSG} ; \
-		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
-		${ECHO_MSG} "===> Send ${WRKDIR}/req.pem to your CA to obtain signed_req.pem, and do:" ; \
-		${ECHO_MSG} "===> cat signed_req.pem >> ${PREFIX}/control/servercert.pem" ; \
-	else \
-		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
-	fi
-
-# Local overrides
-MASTERDIR=	${QMAIL_PORT}
-PKGDIR_LOCAL=	${.CURDIR}
-DESCR=		${PKGDIR_LOCAL}/pkg-descr
-PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
-PLIST=		${PKGDIR_LOCAL}/pkg-plist
-
-.include "${MASTERDIR}/Makefile"
diff --git a/mail/qmail-smtp_auth+tls/pkg-descr b/mail/qmail-smtp_auth+tls/pkg-descr
deleted file mode 100644
index 0bb7b139ef7d..000000000000
--- a/mail/qmail-smtp_auth+tls/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-What is is: [excerpt taken from tls patch]
-
-Frederik Vermeulen <jos-tls@kotnet.org> 20000823
-http://www.esat.kuleuven.ac.be/~vermeule/qmail/tls.patch
-
-This patch implements RFC2487 in qmail. This means you can
-get SSL or TLS encrypted and authenticated SMTP between
-the MTAs and between MTA and an MUA like Netscape4.5 TM.
-The code is considered experimental.
-
-WWW: http://www.qmail.org/
diff --git a/mail/qmail-smtp_auth+tls/pkg-message b/mail/qmail-smtp_auth+tls/pkg-message
deleted file mode 100644
index 48b6d844ca57..000000000000
--- a/mail/qmail-smtp_auth+tls/pkg-message
+++ /dev/null
@@ -1,27 +0,0 @@
-	ATTENTIONATTENTION:
-
-Please make sure that you read /var/qmail/doc/PORT_NOTES.
-It contains important information about testing and configuring
-qmail, and finally replacing sendmail with qmail.
-
-You should also add /var/qmail/man to your MANPATH (see manpath(1)
-or login.conf(5)).
-
-Do not forget to read /var/qmail/doc/TLS.readme. After all,
-this is NOT our old stock qmail.
-
-==> You can enable qmail as your default mailer:
-
-# this will disable the default MTA
-1) do "make disable-sendmail"
-
-# enable qmail as your default MTA
-2) do "make enable-qmail"
-
-==> As you need to provide a working certificate in /var/qmail/control/cert.pem :
-
-# makes a self-signed certificate
-3) do "make certificate"
-
-# makes a certificate request
-4) do "make certificate-req"
diff --git a/mail/qmail-smtp_auth+tls/pkg-plist b/mail/qmail-smtp_auth+tls/pkg-plist
deleted file mode 100644
index e561e624d46c..000000000000
--- a/mail/qmail-smtp_auth+tls/pkg-plist
+++ /dev/null
@@ -1,162 +0,0 @@
-%%PORTDOCS%%%%DOCDIR%%/FAQ
-%%PORTDOCS%%%%DOCDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
-%%PORTDOCS%%%%DOCDIR%%/INSTALL
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
-%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
-%%PORTDOCS%%%%DOCDIR%%/TEST.receive
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
-%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
-%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
-%%PORTDOCS%%%%DOCDIR%%/TLS.readme
-boot/home
-boot/home+df
-boot/proc
-boot/proc+df
-boot/binm1
-boot/binm1+df
-boot/binm2
-boot/binm2+df
-boot/binm3
-boot/binm3+df
-
-@group qmail
-@mode 04711
-@comment *** NOTE different owner
-@owner qmailq
-bin/qmail-queue
-@owner
-@mode 0700
-bin/qmail-lspawn
-@mode 0700
-bin/qmail-start
-@mode 0711
-bin/qmail-getpw
-@mode 0711
-bin/qmail-local
-@mode 0711
-bin/qmail-remote
-@mode 0711
-bin/qmail-rspawn
-@mode 0711
-bin/qmail-clean
-@mode 0711
-bin/qmail-send
-@mode 0711
-bin/splogger
-@mode 0700
-bin/qmail-newu
-@mode 0700
-bin/qmail-newmrh
-@mode 0711
-bin/qmail-pw2u
-@mode 0755
-bin/qmail-inject
-@mode 0755
-bin/predate
-@mode 0755
-bin/datemail
-@mode 0755
-bin/mailsubj
-@mode 0755
-bin/qmail-showctl
-@mode 0755
-bin/qmail-qread
-@mode 0755
-bin/qmail-qstat
-@mode 0755
-bin/qmail-tcpto
-@mode 0755
-bin/qmail-tcpok
-@mode 0755
-bin/qmail-pop3d
-@mode 0711
-bin/qmail-popup
-@mode 0755
-bin/qmail-qmqpc
-@mode 0755
-bin/qmail-qmqpd
-@mode 0755
-bin/qmail-qmtpd
-@mode 0755
-bin/qmail-smtpd
-@mode 0755
-bin/sendmail
-@mode 0755
-bin/tcp-env
-@mode 0755
-bin/qreceipt
-@mode 0755
-bin/qsmhook
-@mode 0755
-bin/qbiff
-@mode 0755
-bin/forward
-@mode 0755
-bin/preline
-@mode 0755
-bin/condredirect
-@mode 0755
-bin/bouncesaying
-@mode 0755
-bin/except
-@mode 0755
-bin/maildirmake
-@mode 0755
-bin/maildir2mbox
-@mode 0755
-bin/maildirwatch
-@mode 0755
-bin/qail
-@mode 0755
-bin/elq
-@mode 0755
-bin/pinq
-
-@group
-@owner
-@mode
-
-@comment This port installs the following manually (ie. not through qmail-hier)
-configure/install
-configure/config
-configure/config-fast
-configure/dnsfq
-configure/hostname
-configure/dnsip
-configure/ipmeprint
-configure/dnsptr
-%%PORTDOCS%%%%DOCDIR%%/BLURB
-%%PORTDOCS%%%%DOCDIR%%/BLURB2
-%%PORTDOCS%%%%DOCDIR%%/BLURB3
-%%PORTDOCS%%%%DOCDIR%%/BLURB4
-%%PORTDOCS%%%%DOCDIR%%/INTERNALS
-%%PORTDOCS%%%%DOCDIR%%/SECURITY
-%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
-%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
-%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
-%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
-%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
-%%PORTDOCS%%%%DOCDIR%%/mkaliasdir
-boot/maildir
-%%PORTDOCS%%@dirrm %%DOCDIR%%
-@dirrm configure
-@dirrm boot
-@dirrm bin
-
-@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt
-@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt
-@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. Go to mail/qmail portsdir and do a 'make enable-sendmail'" | /usr/bin/fmt
diff --git a/mail/qmail-smtp_auth/Makefile b/mail/qmail-smtp_auth/Makefile
deleted file mode 100644
index d295799e61f1..000000000000
--- a/mail/qmail-smtp_auth/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-# New ports collection makefile for:	qmail-tls
-# Date created:				03 Dec 2000
-# Whom:					Mario S F Ferreira <lioux@linf.unb.br> et al.
-#
-# $FreeBSD$
-#
-
-PORTNAME=	qmail
-PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
-CATEGORIES=	mail
-PKGNAMESUFFIX=	-tls
-
-PATCH_SITES+=	http://www.esat.kuleuven.ac.be/~vermeule/qmail/:tls
-PATCHFILES+=	tls.patch:tls
-PATCH_DIST_STRIP+=	-p1
-
-MAINTAINER=	lioux@FreeBSD.org
-COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH TLS support
-
-USE_OPENSSL=	YES
-
-# Patches from the main qmail port are not wanted
-MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER=	yes
-
-TLS_PATCH_DATE=	20020825
-
-# Using default from master port, i.e., /var/qmail
-PREFIX?=	${QMAIL_PORT_PREFIX}
-#PREFIX=		/var/qmail-tls
-
-.if !defined(PRE_MK_INCLUDED)
-.include <bsd.port.pre.mk>
-.endif
-
-CFLAGS+=	-I${OPENSSLBASE}/include -L${OPENSSLBASE}/lib -DTLS
-
-.if defined(WITH_TLS_DEBUG)
-CFLAGS+=	-DDEBUG
-.endif # WITH_TLS_DEBUG
-
-#QMAIL_PORT=	${PORTSDIR}/mail/qmail
-QMAIL_PORT=	${.CURDIR}/../qmail
-QMAIL_PORT_PREFIX!=	cd ${QMAIL_PORT} && ${MAKE} -V PREFIX
-
-DOCFILES+=	${WRKDIR}/TLS.readme
-
-slaveport-pre-fetch: qmail-tls-pre-fetch
-
-qmail-tls-pre-fetch:
-	@${ECHO_MSG} "WITH_TLS_DEBUG=yes		enable additional debug information"
-
-slaveport-post-patch: qmail-tls-post-patch
-
-qmail-tls-post-patch:
-	@${HEAD} -74 ${DISTDIR}/tls.patch > ${WRKDIR}/TLS.readme
-	@${PERL} -pi -ne "s|/usr/local/ssl|${OPENSSLBASE}|" ${WRKSRC}/Makefile
-
-# Primary Ugh... ;-)
-# idea stolen from www/apache13-ssl, a target written by adam@algroup.co.uk
-# internal code ripped from tls.patch guts ;-) written by Frederik Vermeulen <jos-tls@kotnet.org>
-
-certificate:
-	@if [ -f ${OPENSSLDIR}/openssl.cnf ]; \
-	then \
-		if [ ! -d ${WRKDIR} ]; \
-		then \
-			${MKDIR} ${WRKDIR} ; \
-		fi ; \
-		${OPENSSLBASE}/bin/openssl req -new -x509 -nodes \
-			-out ${WRKDIR}/servercert.pem -days 366 \
-			-keyout ${WRKDIR}/servercert.pem ; \
-		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
-		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
-	else \
-		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
-	fi
-
-certificate-req:
-	@if [ -f ${OPENSSLDIR}/openssl.cnf ]; \
-	then \
-		if [ ! -d ${WRKDIR} ]; \
-		then \
-			${MKDIR} ${WRKDIR} ; \
-		fi ; \
-		${OPENSSLBASE}/bin/openssl req -new -nodes \
-			-out ${WRKDIR}/req.pem \
-			-keyout ${WRKDIR}/servercert.pem ; \
-		${INSTALL} -o qmaild -g qmail -m 0640 ${WRKDIR}/servercert.pem ${PREFIX}/control/servercert.pem ; \
-		${ECHO_MSG} ; \
-		${ECHO_MSG} "===> Do not forget to do 'make clean' to clean up temporary files" ; \
-		${ECHO_MSG} "===> Send ${WRKDIR}/req.pem to your CA to obtain signed_req.pem, and do:" ; \
-		${ECHO_MSG} "===> cat signed_req.pem >> ${PREFIX}/control/servercert.pem" ; \
-	else \
-		${ECHO_MSG} "===> You must create the file ${OPENSSLDIR}/openssl.cnf first." ; \
-	fi
-
-# Local overrides
-MASTERDIR=	${QMAIL_PORT}
-PKGDIR_LOCAL=	${.CURDIR}
-DESCR=		${PKGDIR_LOCAL}/pkg-descr
-PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
-PLIST=		${PKGDIR_LOCAL}/pkg-plist
-
-.include "${MASTERDIR}/Makefile"
diff --git a/mail/qmail-smtp_auth/pkg-descr b/mail/qmail-smtp_auth/pkg-descr
deleted file mode 100644
index 0bb7b139ef7d..000000000000
--- a/mail/qmail-smtp_auth/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-What is is: [excerpt taken from tls patch]
-
-Frederik Vermeulen <jos-tls@kotnet.org> 20000823
-http://www.esat.kuleuven.ac.be/~vermeule/qmail/tls.patch
-
-This patch implements RFC2487 in qmail. This means you can
-get SSL or TLS encrypted and authenticated SMTP between
-the MTAs and between MTA and an MUA like Netscape4.5 TM.
-The code is considered experimental.
-
-WWW: http://www.qmail.org/
diff --git a/mail/qmail-smtp_auth/pkg-message b/mail/qmail-smtp_auth/pkg-message
deleted file mode 100644
index 48b6d844ca57..000000000000
--- a/mail/qmail-smtp_auth/pkg-message
+++ /dev/null
@@ -1,27 +0,0 @@
-	ATTENTIONATTENTION:
-
-Please make sure that you read /var/qmail/doc/PORT_NOTES.
-It contains important information about testing and configuring
-qmail, and finally replacing sendmail with qmail.
-
-You should also add /var/qmail/man to your MANPATH (see manpath(1)
-or login.conf(5)).
-
-Do not forget to read /var/qmail/doc/TLS.readme. After all,
-this is NOT our old stock qmail.
-
-==> You can enable qmail as your default mailer:
-
-# this will disable the default MTA
-1) do "make disable-sendmail"
-
-# enable qmail as your default MTA
-2) do "make enable-qmail"
-
-==> As you need to provide a working certificate in /var/qmail/control/cert.pem :
-
-# makes a self-signed certificate
-3) do "make certificate"
-
-# makes a certificate request
-4) do "make certificate-req"
diff --git a/mail/qmail-smtp_auth/pkg-plist b/mail/qmail-smtp_auth/pkg-plist
deleted file mode 100644
index e561e624d46c..000000000000
--- a/mail/qmail-smtp_auth/pkg-plist
+++ /dev/null
@@ -1,162 +0,0 @@
-%%PORTDOCS%%%%DOCDIR%%/FAQ
-%%PORTDOCS%%%%DOCDIR%%/UPGRADE
-%%PORTDOCS%%%%DOCDIR%%/SENDMAIL
-%%PORTDOCS%%%%DOCDIR%%/INSTALL
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.alias
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ctl
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.ids
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.maildir
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.mbox
-%%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
-%%PORTDOCS%%%%DOCDIR%%/TEST.deliver
-%%PORTDOCS%%%%DOCDIR%%/TEST.receive
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
-%%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2ext
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2local
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2rem
-%%PORTDOCS%%%%DOCDIR%%/PIC.local2virt
-%%PORTDOCS%%%%DOCDIR%%/PIC.nullclient
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaybad
-%%PORTDOCS%%%%DOCDIR%%/PIC.relaygood
-%%PORTDOCS%%%%DOCDIR%%/PIC.rem2local
-%%PORTDOCS%%%%DOCDIR%%/TLS.readme
-boot/home
-boot/home+df
-boot/proc
-boot/proc+df
-boot/binm1
-boot/binm1+df
-boot/binm2
-boot/binm2+df
-boot/binm3
-boot/binm3+df
-
-@group qmail
-@mode 04711
-@comment *** NOTE different owner
-@owner qmailq
-bin/qmail-queue
-@owner
-@mode 0700
-bin/qmail-lspawn
-@mode 0700
-bin/qmail-start
-@mode 0711
-bin/qmail-getpw
-@mode 0711
-bin/qmail-local
-@mode 0711
-bin/qmail-remote
-@mode 0711
-bin/qmail-rspawn
-@mode 0711
-bin/qmail-clean
-@mode 0711
-bin/qmail-send
-@mode 0711
-bin/splogger
-@mode 0700
-bin/qmail-newu
-@mode 0700
-bin/qmail-newmrh
-@mode 0711
-bin/qmail-pw2u
-@mode 0755
-bin/qmail-inject
-@mode 0755
-bin/predate
-@mode 0755
-bin/datemail
-@mode 0755
-bin/mailsubj
-@mode 0755
-bin/qmail-showctl
-@mode 0755
-bin/qmail-qread
-@mode 0755
-bin/qmail-qstat
-@mode 0755
-bin/qmail-tcpto
-@mode 0755
-bin/qmail-tcpok
-@mode 0755
-bin/qmail-pop3d
-@mode 0711
-bin/qmail-popup
-@mode 0755
-bin/qmail-qmqpc
-@mode 0755
-bin/qmail-qmqpd
-@mode 0755
-bin/qmail-qmtpd
-@mode 0755
-bin/qmail-smtpd
-@mode 0755
-bin/sendmail
-@mode 0755
-bin/tcp-env
-@mode 0755
-bin/qreceipt
-@mode 0755
-bin/qsmhook
-@mode 0755
-bin/qbiff
-@mode 0755
-bin/forward
-@mode 0755
-bin/preline
-@mode 0755
-bin/condredirect
-@mode 0755
-bin/bouncesaying
-@mode 0755
-bin/except
-@mode 0755
-bin/maildirmake
-@mode 0755
-bin/maildir2mbox
-@mode 0755
-bin/maildirwatch
-@mode 0755
-bin/qail
-@mode 0755
-bin/elq
-@mode 0755
-bin/pinq
-
-@group
-@owner
-@mode
-
-@comment This port installs the following manually (ie. not through qmail-hier)
-configure/install
-configure/config
-configure/config-fast
-configure/dnsfq
-configure/hostname
-configure/dnsip
-configure/ipmeprint
-configure/dnsptr
-%%PORTDOCS%%%%DOCDIR%%/BLURB
-%%PORTDOCS%%%%DOCDIR%%/BLURB2
-%%PORTDOCS%%%%DOCDIR%%/BLURB3
-%%PORTDOCS%%%%DOCDIR%%/BLURB4
-%%PORTDOCS%%%%DOCDIR%%/INTERNALS
-%%PORTDOCS%%%%DOCDIR%%/SECURITY
-%%PORTDOCS%%%%DOCDIR%%/THOUGHTS
-%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES
-%%PORTDOCS%%%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
-%%PORTDOCS%%%%DOCDIR%%/SYSDEPS
-%%PORTDOCS%%%%DOCDIR%%/mailer.conf.sample
-%%PORTDOCS%%%%DOCDIR%%/mkaliasdir
-boot/maildir
-%%PORTDOCS%%@dirrm %%DOCDIR%%
-@dirrm configure
-@dirrm boot
-@dirrm bin
-
-@unexec echo "1) If you are permanently removing qmail, you should also ``rm -Rf ${PKG_PREFIX}/alias ${PKG_PREFIX}/control ${PKG_PREFIX}/queue ${PKG_PREFIX}/users'' and remove the qmail users/groups." | /usr/bin/fmt
-@unexec echo "2) Do not forget to reconfigure your /etc/mail/mailer.conf to use your older MTA, or reconfigure your old MTA binaries if you decided to replace them." | /usr/bin/fmt
-@unexec echo "3) Do not forget to enable sendmail as your default MTA if you have to. Go to mail/qmail portsdir and do a 'make enable-sendmail'" | /usr/bin/fmt
diff --git a/mail/qmailadmin-devel/Makefile b/mail/qmailadmin-devel/Makefile
deleted file mode 100644
index 5e81822a89a4..000000000000
--- a/mail/qmailadmin-devel/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-# New ports collection makefile for: qmailadmin
-# Date created:		23 Sep 2000
-# Whom:			Neil Blakey-Milner
-#
-# $FreeBSD$
-#
-
-PORTNAME=	qmailadmin
-PORTVERSION=	1.0.12
-CATEGORIES=	mail www
-MASTER_SITES=	http://www.inter7.com/devel/
-
-MAINTAINER=	roam@FreeBSD.org
-COMMENT=	"CGI program for administering Qmail with vchkpw/vpopmail"
-
-BUILD_DEPENDS= \
-	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
-	autorespond:${PORTSDIR}/mail/autorespond \
-	ezmlm-idx:${PORTSDIR}/mail/ezmlm-idx \
-	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
-RUN_DEPENDS= \
-	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
-	autorespond:${PORTSDIR}/mail/autorespond \
-	ezmlm-idx:${PORTSDIR}/mail/ezmlm-idx \
-	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
-
-GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
-
-#
-# User-configurable variables
-#
-# CGIBINDIR     - location of your cgi directory
-# CGIBINSUBDIR  - subdirectory to place cgi scripts in
-# CGIBINURL     - location of your cgi directory in a URL
-# WEBDATADIR    - location of your html files
-# WEBDATASUBDIR - subdirectory to place html files in (not working yet)
-#
-# WITHOUT_IPAUTH	- disable the IP address check after login
-# WITHOUT_USER_INDEX	- disable the user index display, which might
-#			  confuse earlier versions of Internet Explorer
-#
-
-CGIBINDIR?=	www/cgi-bin.default
-CGIBINSUBDIR?=	qmailadmin
-CGIBINURL?=	cgi-bin
-WEBDATADIR?=	www/data.default
-WEBDATASUBDIR?=
-
-# I'm working on this..
-.if ${WEBDATASUBDIR} != ""
-BROKEN=	do not set WEBDATASUBDIR: qmailadmin is a bit buggy in that respect
-.endif
-
-PLIST_SUB+=	CGIBINDIR="${CGIBINDIR}" CGIBINSUBDIR="${CGIBINSUBDIR}" \
-		WEBDATADIR="${WEBDATADIR}" WEBDATASUBDIR="${WEBDATASUBDIR}"
-
-#
-# QMAIL_DIR     - location of qmail directory
-#
-
-.if exists(${LOCALBASE}/qmail/bin/qmail-send)
-QMAIL_DIR?=	${LOCALBASE}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-.endif
-
-# End of user-configurable variables
-
-CONFIGURE_ARGS+=	\
-	--enable-htmldir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \
-	--enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \
-	--enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR}/images \
-	--with-htmllibdir=${PREFIX}/share/qmailadmin \
-	--enable-cgipath=/${CGIBINURL}/${CGIBINSUBDIR}/qmailadmin \
-	--enable-ezmlmidx=y
-
-.if defined(WITHOUT_IPAUTH)
-CONFIGURE_ARGS+=	--enable-ipauth=n
-.endif
-
-.if defined(WITHOUT_USER_INDEX)
-CONFIGURE_ARGS+=	--enable-user-index=n
-.endif
-
-pre-install:
-	@${MKDIR} ${PREFIX}/share/qmailadmin/html
-
-.include <bsd.port.mk>
diff --git a/mail/qmailadmin-devel/distinfo b/mail/qmailadmin-devel/distinfo
deleted file mode 100644
index e4c62e7a1c7d..000000000000
--- a/mail/qmailadmin-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (qmailadmin-1.0.12.tar.gz) = ca86deaf100296872391e40b2cb79325
diff --git a/mail/qmailadmin-devel/pkg-descr b/mail/qmailadmin-devel/pkg-descr
deleted file mode 100644
index 5ff40bf2cab5..000000000000
--- a/mail/qmailadmin-devel/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-QmailAdmin is a cgi program for administering Qmail with vchkpw.
-
-WWW:	http://www.inter7.com/qmailadmin/
diff --git a/mail/qmailadmin-devel/pkg-plist b/mail/qmailadmin-devel/pkg-plist
deleted file mode 100644
index 1e9a574b03d8..000000000000
--- a/mail/qmailadmin-devel/pkg-plist
+++ /dev/null
@@ -1,82 +0,0 @@
-share/qmailadmin/html/add_alias.html
-share/qmailadmin/html/add_autorespond.html
-share/qmailadmin/html/add_forward.html
-share/qmailadmin/html/add_listmod.html
-share/qmailadmin/html/add_listdig.html
-share/qmailadmin/html/add_listuser.html
-share/qmailadmin/html/add_mailinglist-idx.html
-share/qmailadmin/html/add_mailinglist-no-idx.html
-share/qmailadmin/html/add_user_noquota.html
-share/qmailadmin/html/add_user_quota.html
-share/qmailadmin/html/colortable
-share/qmailadmin/html/da
-share/qmailadmin/html/de
-share/qmailadmin/html/del_alias_confirm.html
-share/qmailadmin/html/del_autorespond_confirm.html
-share/qmailadmin/html/del_forward_confirm.html
-share/qmailadmin/html/del_listdig.html
-share/qmailadmin/html/del_listmod.html
-share/qmailadmin/html/del_listuser.html
-share/qmailadmin/html/del_mailinglist_confirm.html
-share/qmailadmin/html/del_mod.html
-share/qmailadmin/html/del_user_confirm.html
-share/qmailadmin/html/en
-share/qmailadmin/html/en-us
-share/qmailadmin/html/es
-share/qmailadmin/html/footer.html
-share/qmailadmin/html/fr
-share/qmailadmin/html/header.html
-share/qmailadmin/html/hu
-share/qmailadmin/html/it
-share/qmailadmin/html/ja
-share/qmailadmin/html/main_menu.html
-share/qmailadmin/html/mod_autorespond.html
-share/qmailadmin/html/mod_dotqmail.html
-share/qmailadmin/html/mod_mailinglist-idx.html
-share/qmailadmin/html/mod_user_quota.html
-share/qmailadmin/html/mod_user_noquota.html
-share/qmailadmin/html/no
-share/qmailadmin/html/pt-BR
-share/qmailadmin/html/pl
-share/qmailadmin/html/ru
-share/qmailadmin/html/setremotecatchall.html
-share/qmailadmin/html/show_alias.html
-share/qmailadmin/html/show_autorespond.html
-share/qmailadmin/html/show_digest_subscribers.html
-share/qmailadmin/html/show_forwards.html
-share/qmailadmin/html/show_login.html
-share/qmailadmin/html/show_login_help.html
-share/qmailadmin/html/show_mailinglist.html
-share/qmailadmin/html/show_moderators.html
-share/qmailadmin/html/show_subscribers.html
-share/qmailadmin/html/show_users.html
-share/qmailadmin/html/sv
-share/qmailadmin/html/tr
-%%CGIBINDIR%%/%%CGIBINSUBDIR%%/qmailadmin
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/delete.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/disabled.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/lowerleft.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/lowermiddle.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/lowerright.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/main1.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/main2.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/middleleft1.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/middleleft2.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/middlelogin.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/middleright1.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/modify.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/pixel.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/radio-on.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/radio-off.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/trash.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/upperleft.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/uppermiddle1.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/uppermiddle2.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/upperright.png
-@dirrm %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin
-@dirrm %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images
-@unexec /bin/rmdir %%WEBDATADIR%% 2> /dev/null || true
-@dirrm %%CGIBINDIR%%/%%CGIBINSUBDIR%%
-@unexec /bin/rmdir %%CGIBINDIR%% 2> /dev/null || true
-@dirrm share/qmailadmin/html
-@dirrm share/qmailadmin
diff --git a/mail/qmhandle/Makefile b/mail/qmhandle/Makefile
deleted file mode 100644
index 0182ecdd7e2c..000000000000
--- a/mail/qmhandle/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# New ports collection makefile for:	qmHandle
-# Date created:				17 August 2001
-# Whom:					petef
-#
-# $FreeBSD$
-#
-
-PORTNAME=	qmHandle
-PORTVERSION=	1.0.0
-PORTREVISION=	1
-CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	qmhandle
-
-MAINTAINER=	petef@FreeBSD.org
-COMMENT=	Tool to view and manage a qmail queue
-
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-qstat:${PORTSDIR}/mail/qmail
-
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
-USE_PERL5=	yes
-
-.if exists(${LOCALBASE}/qmail/bin/qmail-qstat)
-QMAIL_DIR?=	${LOCALBASE}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-.endif
-
-post-patch:
-	@${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},; \
-		s,%%LOCALBASE%%,${LOCALBASE},g' ${WRKSRC}/qmHandle
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/qmHandle ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in HISTORY README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/qmhandle/distinfo b/mail/qmhandle/distinfo
deleted file mode 100644
index e9998a12e777..000000000000
--- a/mail/qmhandle/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (qmHandle-1.0.0.tar.gz) = 4522172ffaba5830757b2f1730ecb534
diff --git a/mail/qmhandle/files/patch-qmHandle b/mail/qmhandle/files/patch-qmHandle
deleted file mode 100644
index f894d23c0365..000000000000
--- a/mail/qmhandle/files/patch-qmHandle
+++ /dev/null
@@ -1,34 +0,0 @@
-$FreeBSD$
-
---- qmHandle.orig	Thu Jan 16 10:05:21 2003
-+++ qmHandle	Thu Jan 16 10:31:33 2003
-@@ -26,8 +26,12 @@
- #my ($startqmail) = '/usr/local/bin/svc -u /service/qmail-send';
- 
- # While this is if you have a Debian GNU/Linux with its qmail package
--my ($stopqmail) = '/etc/init.d/qmail stop';
--my ($startqmail) = '/etc/init.d/qmail start';
-+#my ($stopqmail) = '/etc/init.d/qmail stop';
-+#my ($startqmail) = '/etc/init.d/qmail start';
-+
-+# This is if you have FreeBSD with its qmail package
-+my ($stopqmail) = '%%LOCALBASE%%/etc/rc.d/qmail.sh stop';
-+my ($startqmail) = '%%LOCALBASE%%/etc/rc.d/qmail.sh start';
- 
- # If you don't have scripts, leave $stopqmail blank (the process will
- # be hunted and killed by qmHandle):
-@@ -43,7 +47,10 @@
- #####
- # Enter here the system command which returns qmail PID. The following
- # should work on most Unixes:
--my ($pidcmd) = 'pidof qmail-send';
-+#my ($pidcmd) = 'pidof qmail-send';
-+# This is for FreeBSD with a standard qmail installation:
-+my ($pidcmd) = 'ps -U qmails | grep qmail-send | cut -s -d " " -f 3';
-+
- 
- ####################  USER CONFIGURATION END  ####################
- 
-
-
-
diff --git a/mail/qmhandle/pkg-descr b/mail/qmhandle/pkg-descr
deleted file mode 100644
index 9802349bd5de..000000000000
--- a/mail/qmhandle/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-qmHandle is a simple program which allows you to view and manage a qmail
-message queue.
-
-The key features of qmHandle are:
-  * You can read the qmail queue, like you do with the qmail-qread program.
-    However, the output of this program is improved over qmail-qread, with
-    the output of the message subjects and color capabilities;
-  * You can print queue statistics, like qmail-qstat, with color capabilities;
-  * You can view a message in the queue;
-  * You can remove a message from the queue.
-
-WWW: http://qmhandle.sourceforge.net/
-
-- Pete
-petef@FreeBSD.org
diff --git a/mail/qmhandle/pkg-plist b/mail/qmhandle/pkg-plist
deleted file mode 100644
index 2bb092b008dd..000000000000
--- a/mail/qmhandle/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/qmHandle
-%%PORTDOCS%%share/doc/qmHandle/HISTORY
-%%PORTDOCS%%share/doc/qmHandle/README
-%%PORTDOCS%%@dirrm share/doc/qmHandle
diff --git a/mail/rubygem-tmail/Makefile b/mail/rubygem-tmail/Makefile
deleted file mode 100644
index 4be998b62f42..000000000000
--- a/mail/rubygem-tmail/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:	Ruby-TMail
-# Date created:		22 Aug 2000
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	tmail
-PORTVERSION=	0.10.6
-PORTREVISION=	1
-CATEGORIES=	mail ruby
-MASTER_SITES=	http://www.loveruby.net/archive/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTNAME}
-PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-all
-DIST_SUBDIR=	ruby
-
-MAINTAINER=	knu@FreeBSD.org
-COMMENT=	A RFC2822/MIME compliant mail manipulating library for Ruby
-
-USE_RUBY=	yes
-USE_RUBY_SETUP=	yes
-USE_RUBY_FEATURES=	racc-runtime
-
-CONFIGURE_ARGS=	--with=tmail
-
-WRKDIR_TMAIL=	${WRKSRC}/packages/tmail
-
-do-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_MODEXAMPLESDIR}
-	${CP} -R ${WRKDIR_TMAIL}/sample/ ${RUBY_MODEXAMPLESDIR}/
-	${MKDIR} ${RUBY_MODDOCDIR}/ja
-	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities ${WRKDIR_TMAIL}/README.en ${WRKDIR_TMAIL}/doc.en/* ${RUBY_MODDOCDIR}/
-	${CP} -R ${WRKDIR_TMAIL}/Incompatibilities.ja ${WRKDIR_TMAIL}/README.ja ${WRKDIR_TMAIL}/doc.ja/* ${RUBY_MODDOCDIR}/ja/
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/rubygem-tmail/distinfo b/mail/rubygem-tmail/distinfo
deleted file mode 100644
index b85b252d5afc..000000000000
--- a/mail/rubygem-tmail/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ruby/tmail-0.10.6-all.tar.gz) = 375513dbba2c3fa157bcf59a557a85f6
diff --git a/mail/rubygem-tmail/files/patch-mails.c b/mail/rubygem-tmail/files/patch-mails.c
deleted file mode 100644
index 75d704eda870..000000000000
--- a/mail/rubygem-tmail/files/patch-mails.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- packages/tmail/ext/tmail/mails/mails.c.orig	Sun Nov 10 23:18:39 2002
-+++ packages/tmail/ext/tmail/mails/mails.c	Sat Nov 16 04:55:28 2002
-@@ -58,7 +58,7 @@
- 
- static VALUE
- mails_s_new(klass, str, ident, cmt)
--    VALUE klass;
-+    VALUE klass, str, ident, cmt;
- {
-     struct scanner *sc;
-     const char *tmp;
diff --git a/mail/rubygem-tmail/pkg-descr b/mail/rubygem-tmail/pkg-descr
deleted file mode 100644
index 659655c1c621..000000000000
--- a/mail/rubygem-tmail/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-TMail is a mail manipulating library for Ruby, with RFC822 and MIME
-multipart support.
-
-Author:	Minero Aoki <aamine@loveruby.net>
-WWW:	http://www.loveruby.net/en/tmail.html
diff --git a/mail/rubygem-tmail/pkg-plist b/mail/rubygem-tmail/pkg-plist
deleted file mode 100644
index da1dd82034c3..000000000000
--- a/mail/rubygem-tmail/pkg-plist
+++ /dev/null
@@ -1,65 +0,0 @@
-%%RUBY_SITEARCHLIBDIR%%/tmail/cmails.so
-%%RUBY_SITEARCHLIBDIR%%/tmail/tmbase64.so
-%%RUBY_SITELIBDIR%%/tmail.rb
-@dirrm %%RUBY_SITEARCHLIBDIR%%/tmail
-%%RUBY_SITELIBDIR%%/tmail/_loadlib.rb
-%%RUBY_SITELIBDIR%%/tmail/address.rb
-%%RUBY_SITELIBDIR%%/tmail/base64.rb
-%%RUBY_SITELIBDIR%%/tmail/config.rb
-%%RUBY_SITELIBDIR%%/tmail/encode.rb
-%%RUBY_SITELIBDIR%%/tmail/facade.rb
-%%RUBY_SITELIBDIR%%/tmail/header.rb
-%%RUBY_SITELIBDIR%%/tmail/info.rb
-%%RUBY_SITELIBDIR%%/tmail/loader.rb
-%%RUBY_SITELIBDIR%%/tmail/mail.rb
-%%RUBY_SITELIBDIR%%/tmail/mbox.rb
-%%RUBY_SITELIBDIR%%/tmail/net.rb
-%%RUBY_SITELIBDIR%%/tmail/obsolete.rb
-%%RUBY_SITELIBDIR%%/tmail/parser.rb
-%%RUBY_SITELIBDIR%%/tmail/port.rb
-%%RUBY_SITELIBDIR%%/tmail/rmails.rb
-%%RUBY_SITELIBDIR%%/tmail/scanner.rb
-%%RUBY_SITELIBDIR%%/tmail/stringio.rb
-%%RUBY_SITELIBDIR%%/tmail/tmail.rb
-%%RUBY_SITELIBDIR%%/tmail/utils.rb
-@dirrm %%RUBY_SITELIBDIR%%/tmail
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/from-check.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/multipart.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/parse-bench.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/parse-test.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sendmail.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/multipart
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/normal
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/sendtest
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/simple
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/test
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/data
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Incompatibilities
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/address.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/basics.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/config.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/details.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mail.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mbox.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/notes.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/port.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/tmail.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/usage.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Incompatibilities.ja
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/address.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/basics.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/config.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/details.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mail.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mbox.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/notes.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/port.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/tmail.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/usage.html
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/mail/sendmail811/Makefile b/mail/sendmail811/Makefile
deleted file mode 100644
index ff0ba8ac9a42..000000000000
--- a/mail/sendmail811/Makefile
+++ /dev/null
@@ -1,185 +0,0 @@
-# New ports collection makefile for:	sendmail
-# Date created:				20 Apr 2000
-# Whom:					dirk.meyer@dinoex.sub.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	sendmail
-PORTVERSION=	8.11.7
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/sendmail/&,}
-DISTNAME=	${PORTNAME}.${PORTVERSION}
-
-MAINTAINER=	dinoex@FreeBSD.org
-COMMENT=	Reliable, highly configurable mail transfer agent with utilities
-
-NO_LATEST_LINK=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-WCONF=		${WRKSRC}/devtools/Site
-SITE=		${FILESDIR}/site.config.m4.pre4
-PLIST=		${WRKDIR}/.PLIST.more
-DOCS=		KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES \
-		sendmail/TRACEFLAGS
-MAN1=		mailq.1 newaliases.1 vacation.1
-MAN5=		aliases.5
-MAN8=		sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \
-		mail.local.8 rmail.8
-
-# Options to define Features:
-# SENDMAIL_WITHOUT_IPV6=yes
-# SENDMAIL_WITHOUT_MILTER=yes
-# SENDMAIL_WITH_TLS=yes
-# SENDMAIL_WITH_SASL=yes
-# SENDMAIL_WITH_SFIO=yes
-# SENDMAIL_WITH_LDAP=yes
-
-.if defined(SENDMAIL_WITH_LDAP)
-PKGNAMESUFFIX?=	-ldap
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
-LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
-.endif
-.if defined(SENDMAIL_WITH_SASL)
-LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-PKGNAMESUFFIX?=	-sasl
-.endif
-.if defined(SENDMAIL_WITH_TLS) || defined(WITH_TLS)
-PKGNAMESUFFIX?=	-tls
-.endif
-.if defined(SENDMAIL_WITH_SFIO)
-PKGNAMESUFFIX?=	-sfio
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libsfio.a:${PORTSDIR}/devel/sfio
-.endif
-
-# Build site.config.m4
-.if exists(${DESTDIR}/etc/mail/mailer.conf)
-SITE+=	${FILESDIR}/site.config.m4
-.if ! defined(SENDMAIL_WITHOUT_IPV6)
-SITE+=	${FILESDIR}/site.config.m4.ipv6
-.endif
-.endif
-.if defined(SENDMAIL_WITH_SFIO)
-SITE+=	${FILESDIR}/site.config.m4.sfio
-.endif
-.if defined(SENDMAIL_WITH_SASL)
-SITE+=	${FILESDIR}/site.config.m4.sasl
-.endif
-.if defined(SENDMAIL_WITH_LDAP)
-SITE+=	${FILESDIR}/site.config.m4.ldap
-.endif
-.if ! defined(SENDMAIL_WITHOUT_MILTER)
-SITE+=	${FILESDIR}/site.config.m4.milter
-.endif
-
-# install directly if no mailwrapper support
-.if ! exists(${DESTDIR}/etc/mail/mailer.conf)
-PREFIX?=	${DESTDIR}/usr
-MANPREFIX?=	${DESTDIR}/usr/share
-.endif
-PLIST_SUB+=	PREFIX=${PREFIX:S=${PREFIX}/==}
-SENDMAIL=	${PREFIX}/sbin/sendmail
-
-do-configure:
-	@${MV} ${WRKSRC}/devtools/OS/FreeBSD ${WRKSRC}/devtools/OS/FreeBSD.sed
-	${SED} -e "s;\`-pthread\';\`${PTHREAD_LIBS}\';" \
-		-e "s;\`-O\';\`${CFLAGS}\';" \
-		${WRKSRC}/devtools/OS/FreeBSD.sed \
-		> ${WRKSRC}/devtools/OS/FreeBSD
-	${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
-		-e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
-		${SITE} > ${WCONF}/site.config.m4
-
-.if ! defined(SENDMAIL_WITHOUT_MILTER)
-post-build:
-	( cd ${WRKSRC}/libmilter && ${MAKE} )
-.endif
-
-pre-install:
-	@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
-.if ! defined(SENDMAIL_WITHOUT_MILTER)
-	@${CAT} ${FILESDIR}/pkg-milter >>${PLIST}
-.endif
-.if !defined(NOPORTDOCS)
-	@cd ${WRKSRC} && find cf -type f | \
-	${AWK} '{print "share/sendmail/" $$1}' >>${PLIST}
-	@cd ${WRKSRC} && find -d cf -type d | \
-	${AWK} '{print "@dirrm share/sendmail/" $$1}' >>${PLIST}
-	@${ECHO_CMD} "@dirrm share/sendmail" >>${PLIST}
-.for i in ${DOCS}
-	@${ECHO_CMD} `${BASENAME} ${i}` | \
-	${AWK} '{print "share/doc/sendmail/" $$1}' >>${PLIST}
-.endfor
-	@${ECHO_CMD} "@dirrm share/doc/sendmail" >>${PLIST}
-.endif
-
-# We want mail.local and rmail for our system.
-# the build install catmans only, we have to fix this.
-post-install:
-	( cd ${WRKSRC}/mail.local && ${MAKE} force-install )
-	( cd ${WRKSRC}/rmail && ${MAKE} force-install )
-.if ! defined(SENDMAIL_WITHOUT_MILTER)
-	${MKDIR} ${PREFIX}/include/libmilter
-	${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \
-		${PREFIX}/include/libmilter/
-	${INSTALL_DATA} \
-	 ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libmilter/libmilter.a \
-	 ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libsmutil/libsmutil.a \
-	 ${PREFIX}/lib/
-.endif
-.for i in ${MAN8}
-	@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
-	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8
-.endfor
-.for i in ${MAN5}
-	@${RM} -f ${MANPREFIX}/man/cat5/${i} ${MANPREFIX}/man/cat5/${i}.gz
-	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man5
-.endfor
-.for i in ${MAN1}
-	@${RM} -f ${MANPREFIX}/man/cat1/${i} ${MANPREFIX}/man/cat1/${i}.gz
-	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man1
-.endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/sendmail ${DOCSDIR}
-	@${TAR} -C ${WRKSRC} -cf - cf | \
-		${TAR} -C ${PREFIX}/share/sendmail -xf -
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/devtools/README ${DOCSDIR}/DEVTOOLS
-	${INSTALL_DATA} ${WRKSRC}/sendmail/README ${DOCSDIR}/SENDMAIL
-	${INSTALL_DATA} ${WRKSRC}/mail.local/README ${DOCSDIR}/MAIL.LOCAL
-	${INSTALL_DATA} ${WRKSRC}/smrsh/README ${DOCSDIR}/SMRSH
-.if ! defined(SENDMAIL_WITHOUT_MILTER)
-	${INSTALL_DATA} ${WRKSRC}/libmilter/README ${DOCSDIR}/MILTER
-.endif
-.endif
-.if exists(${DESTDIR}/etc/mail/mailer.conf)
-	@${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
-
-mailer.conf:
-	@${SED} \
-	-e "s=^sendmail[ 	]*/.*$$=sendmail	${SENDMAIL}=" \
-	-e "s=^send-mail[ 	]*/.*$$=send-mail	${SENDMAIL}=" \
-	-e "s=^mailq[ 	]*/.*$$=mailq		${SENDMAIL}=" \
-	-e "s=^newaliases[ 	]*/.*$$=newaliases	${SENDMAIL}=" \
-	-e "s=^hoststat[ 	]*/.*$$=hoststat	${SENDMAIL}=" \
-	-e "s=^purgestat[ 	]*/.*$$=purgestat	${SENDMAIL}=" \
-	 ${DESTDIR}/etc/mail/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new
-	${MV} ${DESTDIR}/etc/mail/mailer.conf.new \
-		${DESTDIR}/etc/mail/mailer.conf
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if defined(SENDMAIL_WITH_TLS) || defined(WITH_TLS)
-.include "${PORTSDIR}/security/openssl/bsd.openssl.mk"
-.if ! defined(WITH_OPENSSL_BASE)
-SITE+=	${FILESDIR}/site.config.m4.ssl
-.endif
-SITE+=	${FILESDIR}/site.config.m4.tls
-.endif
-
-.if exists(${FILESDIR}/site.config.m4.local)
-SITE+=	${FILESDIR}/site.config.m4.local
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/sendmail811/distinfo b/mail/sendmail811/distinfo
deleted file mode 100644
index b09cad9feb25..000000000000
--- a/mail/sendmail811/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (sendmail.8.11.7.tar.gz) = 96437c0ffdc23b02a5d3757017c295ec
diff --git a/mail/sendmail811/files/patch-aa b/mail/sendmail811/files/patch-aa
deleted file mode 100644
index 1bbc4bb837e1..000000000000
--- a/mail/sendmail811/files/patch-aa
+++ /dev/null
@@ -1,263 +0,0 @@
-diff -ur cf/m4/cfhead.m4 src/contrib/sendmail/cf/m4/cfhead.m4
---- cf/m4/cfhead.m4	Thu Aug 24 19:09:50 2000
-+++ src/contrib/sendmail/cf/m4/cfhead.m4	Mon Nov  6 11:23:40 2000
-@@ -214,7 +215,8 @@
- define(`_REC_FULL_AUTH_', `$.$?{auth_type}(authenticated as ${auth_authen} $?{auth_author}for ${auth_author} $.with ${auth_type}')
- define(`_REC_HDR_', `$?sfrom $s $.$?_($?s$|from $.$_)')
- define(`_REC_END_', `for $u; $|;
--	$.$b')
-+	$.$b$?g
-+	(envelope-from $g)$.')
- define(`_REC_TLS_', `(using ${tls_version} with cipher ${cipher} (${cipher_bits} bits) verified ${verify})$.$?u')
- define(`_REC_BY_', `$.by $j ($v/$Z)$?r with $r$. id $i$?{tls_version}')
- define(`confRECEIVED_HEADER', `_REC_HDR_
-diff -ur cf/ostype/bsd4.4.m4 src/contrib/sendmail/cf/ostype/bsd4.4.m4
---- cf/ostype/bsd4.4.m4	Sun Apr 25 22:00:56 1999
-+++ src/contrib/sendmail/cf/ostype/bsd4.4.m4	Wed Oct  4 23:19:29 2000
-@@ -16,5 +16,6 @@
- divert(0)
- VERSIONID(`$Id: bsd4.4.m4,v 8.14 1999/04/24 05:37:40 gshapiro Exp $')
- ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl
- ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)')dnl
-+ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail $u')')dnl
- ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$g $h!rmail ($u)')')dnl
-diff -ur cf/sh/makeinfo.sh src/contrib/sendmail/cf/sh/makeinfo.sh
---- cf/sh/makeinfo.sh	Sun Feb  7 08:26:25 1999
-+++ src/contrib/sendmail/cf/sh/makeinfo.sh	Wed Oct  4 23:19:29 2000
-@@ -52,7 +54,7 @@
- else
- 	host=`uname -n`
- fi
--echo '#####' built by $user@$host on `date`
-+echo '#####' built by $user@$host on `LC_ALL=C LC_TIME=C date`
- echo '#####' in `pwd` | sed 's/\/tmp_mnt//'
- echo '#####' using $1 as configuration include directory | sed 's/\/tmp_mnt//'
- echo "define(\`__HOST__', $host)dnl"
-diff -ur mail.local/mail.local.8 src/contrib/sendmail/mail.local/mail.local.8
---- mail.local/mail.local.8.orig	Fri Dec 29 19:12:16 2000
-+++ mail.local/mail.local.8	Sun Dec 31 10:27:40 2000
-@@ -16,7 +16,7 @@
- \- store mail in a mailbox
- .SH SYNOPSIS
- .B mail.local
--.RB [ \-7 "] [" \-b "] [" \-d "] [" \-l "] [" \-f
-+.RB [ \-7 "] [" \-B "] [" \-b "] [" \-d "] [" \-l "] [" \-s "] [" \-f
- .IR from "] "
- .RB [ \-r 
- .IR from "] " "user ..."
-@@ -34,6 +36,11 @@
- .B \-7
- Do not advertise 8BITMIME support in LMTP mode.
- .TP 
-+.B \-B
-+Turn off the attempts to notify the
-+.Dq biff
-+service.
-+.TP 
- .B \-b
- Return a permanent error instead of a temporary error
- if a mailbox exceeds quota.
-@@ -46,6 +53,13 @@
- .TP
- .B \-l
- Turn on LMTP mode.
-+.TP
-+.B \-s
-+Turn off the
-+.Xr fsync 2
-+call that forces the mailbox to be committed to disk before returning a
-+.Dq success
-+status.
- .TP 
- .BI \-r " from"
- Specify the sender's name (for backward compatibility).
-@@ -93,7 +107,6 @@
- .PD
- .SH SEE ALSO
- mail(1), 
--xsend(1), 
- flock(2), 
- getservbyname(3), 
- comsat(8), 
-diff -ur mail.local/mail.local.c src/contrib/sendmail/mail.local/mail.local.c
---- mail.local/mail.local.c	Sun Feb 11 21:08:20 2001
-+++ src/contrib/sendmail/mail.local/mail.local.c	Mon Mar  5 21:48:22 2001
-@@ -154,7 +156,7 @@
- 
- # if defined(BSD4_4) || defined(__GLIBC__)
- #   include <paths.h>
--#  define _PATH_LOCTMP	"/tmp/local.XXXXXX"
-+#  define _PATH_LOCTMP	"/var/tmp/local.XXXXXX"
- # endif /* defined(BSD4_4) || defined(__GLIBC__) */
- 
- # ifdef BSD4_4
-@@ -215,7 +217,7 @@
- # endif /* USE_SETRESUID */
- 
- # ifndef _PATH_LOCTMP
--#  define _PATH_LOCTMP	"/tmp/local.XXXXXX"
-+#  define _PATH_LOCTMP	"/var/tmp/local.XXXXXX"
- # endif /* ! _PATH_LOCTMP */
- #  ifndef _PATH_MAILDIR
- #   define _PATH_MAILDIR	"/var/spool/mail"
-@@ -252,6 +254,8 @@
- bool	HoldErrs = FALSE;		/* Hold errors in ErrBuf */
- bool	LMTPMode = FALSE;
- bool	BounceQuota = FALSE;		/* permanent error when over quota */
-+bool	nobiff = FALSE;
-+bool	nofsync = FALSE;
- 
- void	deliver __P((int, char *));
- int	e_to_sys __P((int));
-@@ -291,7 +295,7 @@
- # endif /* LOG_MAIL */
- 
- 	from = NULL;
--	while ((ch = getopt(argc, argv, "7bdf:r:l")) != -1)
-+	while ((ch = getopt(argc, argv, "7Bbdf:r:ls")) != -1)
- 	{
- 		switch(ch)
- 		{
-@@ -299,6 +303,10 @@
- 			EightBitMime = FALSE;
- 			break;
- 
-+		  case 'B':
-+			nobiff = TRUE;
-+			break;
-+
- 		  case 'b':		/* bounce mail when over quota. */
- 			BounceQuota = TRUE;
- 			break;
-@@ -320,6 +328,10 @@
- 			LMTPMode = TRUE;
- 			break;
- 
-+		  case 's':
-+			nofsync++;
-+			break;
-+
- 		  case '?':
- 		  default:
- 			usage();
-@@ -329,7 +341,8 @@
- 	argv += optind;
- 
- 	/* initialize biff structures */
--	notifybiff(NULL);
-+	if (!nobiff)
-+		notifybiff(NULL);
- 
- 	if (LMTPMode)
- 	{
-@@ -1135,14 +1148,17 @@
- 		goto err1;
- 	}
- 
--	/* Get the starting offset of the new message for biff. */
--	curoff = lseek(mbfd, (off_t) 0, SEEK_END);
--	if (sizeof curoff > sizeof(long))
--		(void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
--				name, quad_to_string(curoff));
--	else
--		(void) snprintf(biffmsg, sizeof(biffmsg), "%s@%ld\n",
--				name, (long) curoff);
-+	if (!nobiff)
-+	{
-+		/* Get the starting offset of the new message for biff. */
-+		curoff = lseek(mbfd, (off_t) 0, SEEK_END);
-+		if (sizeof curoff > sizeof(long))
-+			(void) snprintf(biffmsg, sizeof(biffmsg), "%s@%s\n",
-+					name, quad_to_string(curoff));
-+		else
-+			(void) snprintf(biffmsg, sizeof(biffmsg), "%s@%ld\n",
-+					name, (long) curoff);
-+	}
- 
- 	/* Copy the message into the file. */
- 	if (lseek(fd, (off_t) 0, SEEK_SET) == (off_t) -1)
-@@ -1203,7 +1219,7 @@
- 	}
- 
- 	/* Flush to disk, don't wait for update. */
--	if (fsync(mbfd) < 0)
-+	if (!nofsync && fsync(mbfd) < 0)
- 	{
- 		mailerr("450 4.2.0", "%s: %s", path, errstring(errno));
- err3:
-@@ -1229,7 +1245,7 @@
- 		mailerr(errcode, "%s: %s", path, errstring(errno));
- 		(void) truncate(path, curoff);
- 	}
--	else
-+	else if (!nobiff)
- 		notifybiff(biffmsg);
- 
- 	if (setreuid(0, 0) < 0)
-@@ -1408,7 +1424,7 @@
- usage()
- {
- 	ExitVal = EX_USAGE;
--	mailerr(NULL, "usage: mail.local [-7] [-b] [-l] [-f from] user ...");
-+	mailerr(NULL, "usage: mail.local [-7] [-B] [-b] [-l] [-f from] [-s] user ...");
- 	exit(ExitVal);
- }
- 
-diff -ur rmail/rmail.c src/contrib/sendmail/rmail/rmail.c
---- rmail/rmail.c	Sun Sep 17 00:20:25 2000
-+++ src/contrib/sendmail/rmail/rmail.c	Mon Nov  6 11:23:42 2000
-@@ -318,7 +320,11 @@
- 	args[i++] = _PATH_SENDMAIL;	/* Build sendmail's argument list. */
- 	args[i++] = "-G";		/* relay submission */
- 	args[i++] = "-oee";		/* No errors, just status. */
-+#ifdef QUEUE_ONLY
- 	args[i++] = "-odq";		/* Queue it, don't try to deliver. */
-+#else
-+	args[i++] = "-odi";		/* Deliver in foreground. */
-+#endif
- 	args[i++] = "-oi";		/* Ignore '.' on a line by itself. */
- 
- 	/* set from system and protocol used */
-diff -ur smrsh/smrsh.8 src/contrib/sendmail/smrsh/smrsh.8
---- smrsh/smrsh.8.orig	Sat Dec 16 00:18:40 2000
-+++ smrsh/smrsh.8	Sun Dec 31 10:37:02 2000
-@@ -39,7 +41,7 @@
- .I smrsh
- limits programs to be in a single directory,
- by default
--/usr/adm/sm.bin,
-+/usr/libexec/sm.bin,
- allowing the system administrator to choose the set of acceptable commands,
- and to the shell builtin commands ``exec'', ``exit'', and ``echo''.
- It also rejects any commands with the characters
-@@ -50,13 +52,12 @@
- ``"|exec /usr/local/bin/procmail -f- /etc/procmailrcs/user || exit 75"''
- .PP
- Initial pathnames on programs are stripped,
--so forwarding to ``/usr/ucb/vacation'',
--``/usr/bin/vacation'',
-+so forwarding to ``/usr/bin/vacation'',
- ``/home/server/mydir/bin/vacation'',
- and
- ``vacation''
- all actually forward to
--``/usr/adm/sm.bin/vacation''.
-+``/usr/libexec/sm.bin/vacation''.
- .PP
- System administrators should be conservative about populating
- the sm.bin directory.
-@@ -78,11 +79,11 @@
- Compilation should be trivial on most systems.
- You may need to use \-DPATH=\e"\fIpath\fP\e"
- to adjust the default search path
--(defaults to ``/bin:/usr/bin:/usr/ucb'')
-+(defaults to ``/bin:/usr/bin'')
- and/or \-DCMDBIN=\e"\fIdir\fP\e"
- to change the default program directory
--(defaults to ``/usr/adm/sm.bin'').
-+(defaults to ``/usr/libexec/sm.bin'').
- .SH FILES
--/usr/adm/sm.bin \- directory for restricted programs
-+/usr/libexec/sm.bin \- directory for restricted programs
- .SH SEE ALSO
- sendmail(8)
diff --git a/mail/sendmail811/files/patch-daemon.c b/mail/sendmail811/files/patch-daemon.c
deleted file mode 100644
index 5ed34a14e2c8..000000000000
--- a/mail/sendmail811/files/patch-daemon.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- sendmail/daemon.c	2001/08/01 03:19:45	1.1.1.3.2.6
-+++ sendmail/daemon.c	2001/09/09 19:31:37
-@@ -1877,17 +1877,6 @@
- gothostent:
- 		if (hp == NULL)
- 		{
--# if NAMED_BIND
--			/* check for name server timeouts */
--			if (errno == ETIMEDOUT || h_errno == TRY_AGAIN ||
--			    (errno == ECONNREFUSED && UseNameServer))
--			{
--				save_errno = errno;
--				mci_setstat(mci, EX_TEMPFAIL, "4.4.3", NULL);
--				errno = save_errno;
--				return EX_TEMPFAIL;
--			}
--# endif /* NAMED_BIND */
- # if NETINET6
- 			/*
- 			**  Try v6 first, then fall back to v4.
-@@ -1903,6 +1892,17 @@
- 			if (v6found)
- 				goto v6tempfail;
- # endif /* NETINET6 */
-+# if NAMED_BIND
-+			/* check for name server timeouts */
-+			if (errno == ETIMEDOUT || h_errno == TRY_AGAIN ||
-+			    (errno == ECONNREFUSED && UseNameServer))
-+			{
-+				save_errno = errno;
-+				mci_setstat(mci, EX_TEMPFAIL, "4.4.3", NULL);
-+				errno = save_errno;
-+				return EX_TEMPFAIL;
-+			}
-+# endif /* NAMED_BIND */
- 			save_errno = errno;
- 			mci_setstat(mci, EX_NOHOST, "5.1.2", NULL);
- 			errno = save_errno;
-
diff --git a/mail/sendmail811/files/patch-vacation.1 b/mail/sendmail811/files/patch-vacation.1
deleted file mode 100644
index c120a23fb873..000000000000
--- a/mail/sendmail811/files/patch-vacation.1
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ur vacation/vacation.1 src/contrib/sendmail/vacation/vacation.1
---- vacation/vacation.1	Fri Dec 29 19:12:23 2000
-+++ vacation/vacation.1	Sat Mar  3 11:27:12 2001
-@@ -24,8 +26,10 @@
- .RB [ \-x ]
- .RB [ \-a
- .IR alias ]
-+.RB [ \-d ]
- .RB [ \-f
- .IR database ]
-+.RB [ \-l ]
- .RB [ \-m
- .IR message ]
- .RB [ \-s
-@@ -59,6 +63,15 @@
- in the same manner as those received for the user's
- login name.
- .TP
-+.B \-d
-+Send error/debug messages to stdout instead of syslog.
-+Otherwise, fatal errors, such as calling
-+.B vacation
-+with incorrect arguments, or with non-existent
-+.IR login s,
-+are logged in the system log file, using
-+syslog(8).
-+.TP
- .BI \-f " filename"
- Use
- .I filename
-@@ -78,6 +91,10 @@
- Same as
- .B \-i
- (for backwards compatibility).
-+.TP
-+.B \-l
-+List the content of the vacation database file including the address
-+and the associated time of the last auto-response to that address.
- .TP
- .BI \-m " filename"
- Use
diff --git a/mail/sendmail811/files/pkg-milter b/mail/sendmail811/files/pkg-milter
deleted file mode 100644
index 78d9d64c0a6f..000000000000
--- a/mail/sendmail811/files/pkg-milter
+++ /dev/null
@@ -1,5 +0,0 @@
-include/libmilter/mfapi.h
-lib/libmilter.a
-lib/libsmutil.a
-@dirrm include/libmilter
-%%PORTDOCS%%share/doc/sendmail/MILTER
diff --git a/mail/sendmail811/files/site.config.m4 b/mail/sendmail811/files/site.config.m4
deleted file mode 100644
index adc2b11bf108..000000000000
--- a/mail/sendmail811/files/site.config.m4
+++ /dev/null
@@ -1,8 +0,0 @@
-define(`confEBINDIR',`%%PREFIX%%/libexec')
-define(`confMANROOT',`%%PREFIX%%/man/cat')
-define(`confMANROOTMAN',`%%PREFIX%%/man/man')
-define(`confMBINDIR',`%%PREFIX%%/sbin')
-define(`confSBINDIR',`%%PREFIX%%/sbin')
-define(`confUBINDIR',`%%PREFIX%%/bin')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DTCPWRAPPERS')
-APPENDDEF(`conf_sendmail_LIBS', `-lwrap')"
diff --git a/mail/sendmail811/files/site.config.m4.ipv6 b/mail/sendmail811/files/site.config.m4.ipv6
deleted file mode 100644
index 41f0cccf3a1d..000000000000
--- a/mail/sendmail811/files/site.config.m4.ipv6
+++ /dev/null
@@ -1,2 +0,0 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-DNETINET6')
-APPENDDEF(`conf_libmilter_ENVDEF', `-DNETINET6')
diff --git a/mail/sendmail811/files/site.config.m4.ldap b/mail/sendmail811/files/site.config.m4.ldap
deleted file mode 100644
index c03a8749c808..000000000000
--- a/mail/sendmail811/files/site.config.m4.ldap
+++ /dev/null
@@ -1,5 +0,0 @@
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
-APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DLDAPMAP')     
-APPENDDEF(`conf_sendmail_LIBS', `-lldap')
-APPENDDEF(`conf_sendmail_LIBS', `-llber')
diff --git a/mail/sendmail811/files/site.config.m4.milter b/mail/sendmail811/files/site.config.m4.milter
deleted file mode 100644
index 6fa49ec50d17..000000000000
--- a/mail/sendmail811/files/site.config.m4.milter
+++ /dev/null
@@ -1,2 +0,0 @@
-APPENDDEF(`conf_libmilter_ENVDEF', `-D_FFR_MILTER=1')
-APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_MILTER=1')
diff --git a/mail/sendmail811/files/site.config.m4.pre4 b/mail/sendmail811/files/site.config.m4.pre4
deleted file mode 100644
index 6edccedcdf8e..000000000000
--- a/mail/sendmail811/files/site.config.m4.pre4
+++ /dev/null
@@ -1,4 +0,0 @@
-APPENDDEF(`conf_mail_local_ENVDEF', `-DQUEUE_ONLY')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DPICKY_HELO_CHECK')
-APPENDDEF(`conf_smrsh_ENVDEF', `-DCMDDIR="\"%%PREFIX%%/libexec/sm.bin\""')
-APPENDDEF(`conf_smrsh_ENVDEF', `-DPATH="\"/bin:/usr/bin\""')
diff --git a/mail/sendmail811/files/site.config.m4.sasl b/mail/sendmail811/files/site.config.m4.sasl
deleted file mode 100644
index c1140b4d19f3..000000000000
--- a/mail/sendmail811/files/site.config.m4.sasl
+++ /dev/null
@@ -1,5 +0,0 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl1')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL')
-APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_UNSAFE_SASL -D_FFR_SASL_OPTS')
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
-APPENDDEF(`conf_sendmail_LIBS', `-lsasl')
diff --git a/mail/sendmail811/files/site.config.m4.sfio b/mail/sendmail811/files/site.config.m4.sfio
deleted file mode 100644
index 9abe6d48d7b3..000000000000
--- a/mail/sendmail811/files/site.config.m4.sfio
+++ /dev/null
@@ -1,6 +0,0 @@
-define(`confSTDIO_TYPE', `portable')
-APPENDDEF(`confENVDEF', `-U_FFR_TLS_TOREK -DSFIO')
-APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include/sfio')
-APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include')
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
-APPENDDEF(`confLIBS', `-lsfio')
diff --git a/mail/sendmail811/files/site.config.m4.ssl b/mail/sendmail811/files/site.config.m4.ssl
deleted file mode 100644
index 801030866543..000000000000
--- a/mail/sendmail811/files/site.config.m4.ssl
+++ /dev/null
@@ -1,3 +0,0 @@
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib' -rpath=%%LOCALBASE%%/lib )
-APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DHASSRANDOMDEV')
diff --git a/mail/sendmail811/files/site.config.m4.tls b/mail/sendmail811/files/site.config.m4.tls
deleted file mode 100644
index 40cfc2e0f1c5..000000000000
--- a/mail/sendmail811/files/site.config.m4.tls
+++ /dev/null
@@ -1,5 +0,0 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS')
-APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_TLS_O_T')
-APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_TLS_1')
-APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_TLS_TOREK')
-APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto')
diff --git a/mail/sendmail811/pkg-descr b/mail/sendmail811/pkg-descr
deleted file mode 100644
index 21e2ecf498f9..000000000000
--- a/mail/sendmail811/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Sendmail implements a general purpose internetwork mail routing facility
-under the UNIX operating system.  It is not tied to any one transport
-protocol - its function may be likened to a crossbar switch, relaying
-messages from one domain into another.  In the process, it can do a limited
-amount of message header editing to put the message into a format that is
-appropriate for the receiving domain.  All of this is done under the
-control of a configuration file.
-
-Sendmail is a trademark of Sendmail, Inc.
-
-WWW: http://www.sendmail.org/
diff --git a/mail/sendmail811/pkg-message b/mail/sendmail811/pkg-message
deleted file mode 100644
index 3182ce372cfa..000000000000
--- a/mail/sendmail811/pkg-message
+++ /dev/null
@@ -1,29 +0,0 @@
-
----------------------------------------------------
-
-If you update your configuration from 8.9.x add the following to your
-'*.mc' file(s):
-
-MODIFY_MAILER_FLAGS(`LOCAL', `+S')dnl
-
-because mail.local is no longer installed set-user-id root.  This is not
-needed if you are using FEATURE(`local_lmtp').
-
-To activate sendmail as your default mailer, call the target 'mailer.conf':
-
-$ make mailer.conf
-
-Your '/etc/mail/mailer.conf' should look like this:
-
-#
-# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
-#
-sendmail	%%PREFIX%%/sbin/sendmail
-send-mail	%%PREFIX%%/sbin/sendmail
-mailq		%%PREFIX%%/sbin/sendmail
-newaliases	%%PREFIX%%/sbin/sendmail
-
-You may also need to update /etc/rc.conf.
-
----------------------------------------------------
-
diff --git a/mail/sendmail811/pkg-plist b/mail/sendmail811/pkg-plist
deleted file mode 100644
index 24e59e173c9d..000000000000
--- a/mail/sendmail811/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail811/Attic/pkg-plist,v 1.5 2001-10-09 19:16:58 dinoex Exp $
-bin/hoststat
-bin/mailq
-bin/newaliases
-bin/purgestat
-bin/rmail
-bin/vacation
-libexec/mail.local
-libexec/smrsh
-sbin/mailstats
-sbin/makemap
-sbin/praliases
-sbin/sendmail
-%%PORTDOCS%%share/doc/sendmail/DEVTOOLS
-%%PORTDOCS%%share/doc/sendmail/SENDMAIL
-%%PORTDOCS%%share/doc/sendmail/MAIL.LOCAL
-%%PORTDOCS%%share/doc/sendmail/SMRSH
diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile
deleted file mode 100644
index 35e6ebdeb35c..000000000000
--- a/mail/sendmail812/Makefile
+++ /dev/null
@@ -1,259 +0,0 @@
-# New ports collection makefile for:	sendmail
-# Date created:				20 Apr 2000
-# Whom:					dirk.meyer@dinoex.sub.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	sendmail
-PORTVERSION=	8.12.9
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/sendmail/&,}
-DISTNAME=	${PORTNAME}.${PORTVERSION}
-
-MAINTAINER=	dinoex@FreeBSD.org
-COMMENT=	Reliable, highly configurable mail transfer agent with utilities
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-WCONF=		${WRKSRC}/devtools/Site
-SITE=		${FILESDIR}/site.config.m4.pre4
-PLIST=		${WRKDIR}/.PLIST.more
-DOCS=		KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES \
-		sendmail/TRACEFLAGS sendmail/SECURITY sendmail/TUNING
-MAN1=		mailq.1 newaliases.1 vacation.1
-MAN5=		aliases.5
-MAN8=		sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \
-		mail.local.8 rmail.8 editmap.8
-SENDMAIL=	${PREFIX}/sbin/sendmail
-PLIST_SUB+=	PREFIX=${PREFIX:S=${PREFIX}/==}
-
-# Options to define Features:
-# SENDMAIL_WITHOUT_IPV6=yes
-# SENDMAIL_WITHOUT_MILTER=yes
-# SENDMAIL_WITH_TLS=yes
-# SENDMAIL_WITH_SMTPS=yes
-# SENDMAIL_WITH_SASL=yes
-# SENDMAIL_WITH_SASL2=yes
-# SENDMAIL_WITH_LDAP=yes
-# SENDMAIL_WITH_PICKY_HELO_CHECK=yes
-
-.if defined(SENDMAIL_WITH_SMTPS)
-.if !defined(SENDMAIL_WITH_TLS) && !defined(WITH_TLS)
-.BEGIN:
-	@${ECHO_CMD} "DEPENDENCY NOTE: SENDMAIL_WITH_TLS will be enabled to support SENDMAIL_WITH_SMTPS"
-SENDMAIL_WITH_TLS=yes
-.endif
-.endif
-
-.if defined(SENDMAIL_WITH_LDAP)
-PKGNAMESUFFIX?=	-ldap
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
-LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
-.endif
-.if defined(SENDMAIL_WITH_SASL)
-LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-PKGNAMESUFFIX?=	-sasl
-.endif
-.if defined(SENDMAIL_WITH_SASL2)
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-PKGNAMESUFFIX?=	-sasl2
-.endif
-.if defined(SENDMAIL_WITH_TLS) || defined(WITH_TLS)
-PKGNAMESUFFIX?=	-tls
-.endif
-
-# Build site.config.m4
-.if exists(${DESTDIR}/etc/mail/mailer.conf)
-SITE+=	${FILESDIR}/site.config.m4
-.if ! defined(SENDMAIL_WITHOUT_IPV6)
-SITE+=	${FILESDIR}/site.config.m4.ipv6
-.endif
-.endif
-.if defined(SENDMAIL_WITH_SASL)
-SITE+=	${FILESDIR}/site.config.m4.sasl
-.endif
-.if defined(SENDMAIL_WITH_SASL2)
-SITE+=	${FILESDIR}/site.config.m4.sasl2
-.endif
-.if defined(SENDMAIL_WITH_LDAP)
-SITE+=	${FILESDIR}/site.config.m4.ldap
-.endif
-.if ! defined(SENDMAIL_WITHOUT_MILTER)
-SITE+=	${FILESDIR}/site.config.m4.milter
-.endif
-
-# install directly if no mailwrapper support
-.if ! exists(${DESTDIR}/etc/mail/mailer.conf)
-PREFIX?=	${DESTDIR}/usr
-MANPREFIX?=	${DESTDIR}/usr/share
-PLIST_SUB+=	ETCPORT="@comment "
-.else
-PLIST_SUB+=	ETCPORT=""
-.endif
-
-post-extract:
-	@${SED} -e "s=%%PREFIX%%=${PREFIX}=" ${FILESDIR}/sm-client.sh \
-		> ${WRKSRC}/sm-client.sh
-	@${SED} -e "s=%%PREFIX%%=${PREFIX}=" ${FILESDIR}/sendmail.sh \
-		> ${WRKSRC}/sendmail.sh
-
-do-configure:
-	@${MV} ${WRKSRC}/devtools/OS/FreeBSD ${WRKSRC}/devtools/OS/FreeBSD.sed
-	${SED} -e "s;\`-pthread\';\`${PTHREAD_LIBS}\';" \
-		-e "s;\`-O\';\`${CFLAGS}\';" \
-		${WRKSRC}/devtools/OS/FreeBSD.sed \
-		> ${WRKSRC}/devtools/OS/FreeBSD
-	${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
-		-e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
-		${SITE} > ${WCONF}/site.config.m4
-.if defined(SENDMAIL_WITH_PICKY_HELO_CHECK)
-	${ECHO_CMD} \
-	 'APPENDDEF(`conf_sendmail_ENVDEF'\'', `-DPICKY_HELO_CHECK'\'')'  \
-		>> ${WCONF}/site.config.m4
-.endif
-
-post-build:
-	( cd ${WRKSRC}/doc/op && ${MAKE} op.txt )
-.if ! defined(SENDMAIL_WITHOUT_MILTER)
-	( cd ${WRKSRC}/libmilter && ${MAKE} )
-.endif
-
-pre-install:
-	@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
-.if ! defined(SENDMAIL_WITHOUT_MILTER)
-	@${CAT} ${FILESDIR}/pkg-milter >>${PLIST}
-.endif
-	if ! pw groupshow smmsp; then pw groupadd smmsp -g 25; fi
-	if ! pw usershow smmsp; then pw useradd smmsp -g smmsp -u 25 \
-		-h - -d /nonexistent -s /nonexistent -c "Sendmail Queue"; fi
-.if !defined(NOPORTDOCS)
-	@cd ${WRKSRC} && find cf -type f | \
-	${AWK} '{print "share/sendmail/" $$1}' >>${PLIST}
-	@cd ${WRKSRC} && find -d cf -type d | \
-	${AWK} '{print "@dirrm share/sendmail/" $$1}' >>${PLIST}
-	@${ECHO_CMD} "@dirrm share/sendmail" >>${PLIST}
-.for i in ${DOCS}
-	@${ECHO_CMD} `${BASENAME} ${i}` | \
-	${AWK} '{print "share/doc/sendmail/" $$1}' >>${PLIST}
-.endfor
-	@${ECHO_CMD} "@dirrm share/doc/sendmail" >>${PLIST}
-.endif
-
-# We want mail.local and rmail for our system.
-# the build install catmans only, we have to fix this.
-post-install:
-	( cd ${WRKSRC}/mail.local && ${MAKE} force-install )
-	( cd ${WRKSRC}/rmail && ${MAKE} force-install )
-.if ! defined(SENDMAIL_WITHOUT_MILTER)
-	${MKDIR} ${PREFIX}/include/libmilter
-	${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \
-		${WRKSRC}/include/libmilter/mfdef.h \
-		${PREFIX}/include/libmilter/
-	${INSTALL_DATA} \
-	 ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libmilter/libmilter.a \
-	 ${PREFIX}/lib/
-.endif
-.if exists(${DESTDIR}/etc/mail/mailer.conf)
-	${INSTALL_SCRIPT} ${WRKSRC}/sm-client.sh \
-		${LOCALBASE}/etc/rc.d/sm-client.sh.sample
-	${INSTALL_SCRIPT} ${WRKSRC}/sendmail.sh \
-		${LOCALBASE}/etc/rc.d/sendmail.sh.sample
-.endif
-	${CHOWN} smmsp:smmsp /var/spool/clientmqueue
-	${CHMOD} 770 /var/spool/clientmqueue
-.for i in ${MAN8}
-	@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
-	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8
-.endfor
-.for i in ${MAN5}
-	@${RM} -f ${MANPREFIX}/man/cat5/${i} ${MANPREFIX}/man/cat5/${i}.gz
-	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man5
-.endfor
-.for i in ${MAN1}
-	@${RM} -f ${MANPREFIX}/man/cat1/${i} ${MANPREFIX}/man/cat1/${i}.gz
-	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man1
-.endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/sendmail ${DOCSDIR}
-	@${TAR} -C ${WRKSRC} -cf - cf | \
-		${TAR} -C ${PREFIX}/share/sendmail -xf -
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${DOCSDIR}/op.ps
-	${INSTALL_DATA} ${WRKSRC}/doc/op/op.txt ${DOCSDIR}/op.txt
-	${INSTALL_DATA} ${WRKSRC}/devtools/README ${DOCSDIR}/DEVTOOLS
-	${INSTALL_DATA} ${WRKSRC}/sendmail/README ${DOCSDIR}/SENDMAIL
-	${INSTALL_DATA} ${WRKSRC}/mail.local/README ${DOCSDIR}/MAIL.LOCAL
-	${INSTALL_DATA} ${WRKSRC}/smrsh/README ${DOCSDIR}/SMRSH
-.if ! defined(SENDMAIL_WITHOUT_MILTER)
-	${INSTALL_DATA} ${WRKSRC}/libmilter/README ${DOCSDIR}/MILTER
-	${MKDIR} ${DOCSDIR}/libmilter
-	@${TAR} -C ${WRKSRC}/libmilter/docs -cf - . | \
-		${TAR} -C ${DOCSDIR}/libmilter -xf -
-.endif
-.endif
-.if exists(${DESTDIR}/etc/mail/mailer.conf)
-	@${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
-
-mailer.conf:
-	@${SED} \
-	-e "s=^sendmail[ 	]*/.*$$=sendmail	${SENDMAIL}=" \
-	-e "s=^send-mail[ 	]*/.*$$=send-mail	${SENDMAIL}=" \
-	-e "s=^mailq[ 	]*/.*$$=mailq		${SENDMAIL}=" \
-	-e "s=^newaliases[ 	]*/.*$$=newaliases	${SENDMAIL}=" \
-	-e "s=^hoststat[ 	]*/.*$$=hoststat	${SENDMAIL}=" \
-	-e "s=^purgestat[ 	]*/.*$$=purgestat	${SENDMAIL}=" \
-	 ${DESTDIR}/etc/mail/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new
-	${MV} ${DESTDIR}/etc/mail/mailer.conf.new \
-		${DESTDIR}/etc/mail/mailer.conf
-.endif
-
-# create sumbit.cf on older systems
-#
-submit.cf:	${DESTDIR}/etc/mail/submit.cf
-
-${DESTDIR}/etc/mail/submit.mc:
-	${INSTALL_DATA} ${PREFIX}/share/sendmail/cf/cf/submit.mc \
-		${DESTDIR}/etc/mail/submit.mc
-
-${DESTDIR}/etc/mail/submit.cf:	${DESTDIR}/etc/mail/submit.mc
-	@( cd ${DESTDIR}/etc/mail && ${MAKE} \
-		SENDMAIL_CF_DIR=${PREFIX}/share/sendmail/cf \
-		SENDMAIL_MC=submit )
-
-# create basics for smtp-auth
-#
-install-sasldb:
-	@${ECHO_CMD} "# Links:"
-	@${ECHO_CMD} "#"
-	@${ECHO_CMD} "# http://www.sendmail.org/~gshapiro/"
-	@${ECHO_CMD} "# http://www.sendmail.org/~ca/email/auth.html"
-	@${ECHO_CMD} "# http://www.asp.ogi.edu/people/paja/linux/sendmail/"
-	@${ECHO_CMD} "# http://blue-labs.org/clue/sendmail.php"
-	@${ECHO_CMD} "# http://www.digitalanswers.org/sendmail/"
-	@${ECHO_CMD} "#"
-
-# create certificates for TLS/SSL
-#
-tls-install:
-	${SETENV} DESTDIR=${DESTDIR} FILESDIR=${FILESDIR} \
-		${SH} ${FILESDIR}/tls-install.sh
-
-.include <bsd.port.pre.mk>
-
-.if defined(SENDMAIL_WITH_TLS) || defined(WITH_TLS)
-.include "${PORTSDIR}/security/openssl/bsd.openssl.mk"
-.if ! defined(WITH_OPENSSL_BASE)
-SITE+=	${FILESDIR}/site.config.m4.ssl
-.endif
-SITE+=	${FILESDIR}/site.config.m4.tls
-.if defined(SENDMAIL_WITH_SMTPS)
-SITE+=	${FILESDIR}/site.config.m4.smtps
-.endif
-.endif
-
-.if exists(${FILESDIR}/site.config.m4.local)
-SITE+=	${FILESDIR}/site.config.m4.local
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/sendmail812/distinfo b/mail/sendmail812/distinfo
deleted file mode 100644
index 7e8d81002547..000000000000
--- a/mail/sendmail812/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (sendmail.8.12.9.tar.gz) = 3dba3b6d769b3681640d0a38b0eba48c
diff --git a/mail/sendmail812/files/patch-aa b/mail/sendmail812/files/patch-aa
deleted file mode 100644
index c353c5ad932f..000000000000
--- a/mail/sendmail812/files/patch-aa
+++ /dev/null
@@ -1,237 +0,0 @@
-diff -ur cf/m4/cfhead.m4.orig cf/m4/cfhead.m4
---- cf/m4/cfhead.m4.orig	Sun Jun 10 03:45:13 2001
-+++ cf/m4/cfhead.m4	Fri Jun 15 06:47:34 2001
-@@ -260,7 +261,8 @@
- define(`_REC_FULL_AUTH_', `$.$?{auth_type}(authenticated as ${auth_authen} $?{auth_author}for ${auth_author} $.with ${auth_type}')
- define(`_REC_HDR_', `$?sfrom $s $.$?_($?s$|from $.$_)')
- define(`_REC_END_', `for $u; $|;
--	$.$b')
-+	$.$b$?g
-+	(envelope-from $g)$.')
- define(`_REC_TLS_', `(version=${tls_version} cipher=${cipher} bits=${cipher_bits} verify=${verify})$.$?u')
- define(`_REC_BY_', `$.by $j ($v/$Z)$?r with $r$. id $i$?{tls_version}')
- define(`confRECEIVED_HEADER', `_REC_HDR_
-diff -ur cf/ostype/bsd4.4.m4 src/contrib/sendmail/cf/ostype/bsd4.4.m4
---- cf/ostype/bsd4.4.m4	Sun Apr 25 22:00:56 1999
-+++ src/contrib/sendmail/cf/ostype/bsd4.4.m4	Wed Oct  4 23:19:29 2000
-@@ -16,5 +16,6 @@
- divert(0)
- VERSIONID(`$Id: bsd4.4.m4,v 8.14 1999/04/24 05:37:40 gshapiro Exp $')
- ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl
- ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)')dnl
-+ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail $u')')dnl
- ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$g $h!rmail ($u)')')dnl
-diff -ur cf/sh/makeinfo.sh src/contrib/sendmail/cf/sh/makeinfo.sh
---- cf/sh/makeinfo.sh	Sun Feb  7 08:26:25 1999
-+++ src/contrib/sendmail/cf/sh/makeinfo.sh	Wed Oct  4 23:19:29 2000
-@@ -52,7 +54,7 @@
- else
- 	host=`uname -n`
- fi
--echo '#####' built by $user@$host on `date`
-+echo '#####' built by $user@$host on `LC_TIME=C date`
- echo '#####' in `pwd` | sed 's/\/tmp_mnt//'
- echo '#####' using $1 as configuration include directory | sed 's/\/tmp_mnt//'
- echo "define(\`__HOST__', $host)dnl"
-diff -ur include/sendmail/pathnames.h.orig include/sendmail/pathnames.h
---- include/sendmail/pathnames.h.orig	Fri Mar 23 23:09:44 2001
-+++ include/sendmail/pathnames.h	Mon May  7 08:32:45 2001
-@@ -41,7 +41,7 @@
- #  endif /* ! _PATH_MAILDIR */
- 
- #  ifndef _PATH_LOCTMP
--#   define _PATH_LOCTMP		"/tmp/local.XXXXXX"
-+#   define _PATH_LOCTMP		"/var/tmp/local.XXXXXX"
- #  endif /* ! _PATH_LOCTMP */
- 
- #  ifndef _PATH_HOSTS
-diff -ur mail.local/mail.local.8.orig mail.local/mail.local.8
---- mail.local/mail.local.8.orig	Fri Apr  6 01:27:35 2001
-+++ mail.local/mail.local.8	Thu May 31 07:36:03 2001
-@@ -16,9 +16,9 @@
- \- store mail in a mailbox
- .SH SYNOPSIS
- .B mail.local
--.RB [ \-7 "] [" \-b "] [" \-d "] [" \-D
-+.RB [ \-7 "] [" \-b "] [" \-B "] [" \-d "] [" \-D
- .IR mbdb ]
--.RB [ \-l "] [" \-f 
-+.RB [ \-l "] [" \-s "] [" \-f 
- \fIfrom\fR|\fB\-r\fR
- .IR from ]
- .RB [ \-h
-@@ -38,6 +41,11 @@
- .B \-7
- Do not advertise 8BITMIME support in LMTP mode.
- .TP 
-+.B \-B
-+Turn off the attempts to notify the
-+.Dq biff
-+service.
-+.TP 
- .B \-b
- Return a permanent error instead of a temporary error
- if a mailbox exceeds quota.
-@@ -56,6 +64,13 @@
- .TP
- .B \-l
- Turn on LMTP mode.
-+.TP
-+.B \-s
-+Turn off the
-+.Xr fsync 2
-+call that forces the mailbox to be committed to disk before returning a
-+.Dq success
-+status.
- .TP 
- .BI \-r " from"
- Specify the sender's name (for backward compatibility).
-@@ -97,7 +112,7 @@
- .SH FILES
- .PD 0.2v
- .TP 2.2i
--/tmp/local.XXXXXX
-+/var/tmp/local.XXXXXX
- temporary files
- .TP
- /var/mail/user
-@@ -108,7 +123,6 @@
- .PD
- .SH SEE ALSO
- mail(1), 
--xsend(1), 
- flock(2), 
- getservbyname(3), 
- comsat(8), 
-diff -ur mail.local/mail.local.c.orig mail.local/mail.local.c
---- mail.local/mail.local.c.orig	Thu May 10 02:58:31 2001
-+++ mail.local/mail.local.c	Thu May 31 07:39:04 2001
-@@ -130,6 +132,8 @@
- bool	HoldErrs = false;		/* Hold errors in ErrBuf */
- bool	LMTPMode = false;
- bool	BounceQuota = false;		/* permanent error when over quota */
-+bool	NoBiff = false;
-+bool	NoFsync = false;
- char	*HomeMailFile = NULL;		/* store mail in homedir */
- 
- void	deliver __P((int, char *));
-@@ -172,7 +176,7 @@
- # endif /* LOG_MAIL */
- 
- 	from = NULL;
--	while ((ch = getopt(argc, argv, "7bdD:f:h:r:l")) != -1)
-+	while ((ch = getopt(argc, argv, "7bBdD:f:h:r:ls")) != -1)
- 	{
- 		switch(ch)
- 		{
-@@ -180,6 +184,10 @@
- 			EightBitMime = false;
- 			break;
- 
-+		  case 'B':
-+			NoBiff = true;
-+			break;
-+
- 		  case 'b':		/* bounce mail when over quota. */
- 			BounceQuota = true;
- 			break;
-@@ -215,6 +223,10 @@
- 			LMTPMode = true;
- 			break;
- 
-+		  case 's':
-+			NoFsync = true;
-+			break;
-+
- 		  case '?':
- 		  default:
- 			usage();
-@@ -224,7 +236,8 @@
- 	argv += optind;
- 
- 	/* initialize biff structures */
--	notifybiff(NULL);
-+	if (!NoBiff)
-+		notifybiff(NULL);
- 
- 	err = sm_mbdb_initialize(mbdbname);
- 	if (err != EX_OK)
-@@ -1128,6 +1141,7 @@
- 
- 	/* Get the starting offset of the new message for biff. */
- 	curoff = lseek(mbfd, (off_t) 0, SEEK_END);
-+	if (!NoBiff)
- 	(void) sm_snprintf(biffmsg, sizeof(biffmsg), "%s@%lld\n",
- 			   name, (LONGLONG_T) curoff);
- 
-@@ -1190,7 +1204,7 @@
- 	}
- 
- 	/* Flush to disk, don't wait for update. */
--	if (fsync(mbfd) < 0)
-+	if (!NoFsync && fsync(mbfd) < 0)
- 	{
- 		mailerr("450 4.2.0", "%s: %s", path, sm_errstring(errno));
- err3:
-@@ -1216,7 +1230,7 @@
- 		mailerr(errcode, "%s: %s", path, sm_errstring(errno));
- 		(void) truncate(path, curoff);
- 	}
--	else
-+	else if (!NoBiff)
- 		notifybiff(biffmsg);
- 
- 	if (setreuid(0, 0) < 0)
-@@ -1395,7 +1409,8 @@
- usage()
- {
- 	ExitVal = EX_USAGE;
--	mailerr(NULL, "usage: mail.local [-7] [-b] [-d] [-l] [-f from|-r from] [-h filename] user ...");
-+	mailerr(NULL, "usage: mail.local [-7] [-b] [-B] [-d] [-l] [-s] [-f from|-r from] [-h filename] user ...");
-+
- 	exit(ExitVal);
- }
- 
-diff -ur rmail/rmail.c src/contrib/sendmail/rmail/rmail.c
---- rmail/rmail.c	Sun Sep 17 00:20:25 2000
-+++ src/contrib/sendmail/rmail/rmail.c	Mon Nov  6 11:23:42 2000
-@@ -318,7 +320,11 @@
- 	args[i++] = _PATH_SENDMAIL;	/* Build sendmail's argument list. */
- 	args[i++] = "-G";		/* relay submission */
- 	args[i++] = "-oee";		/* No errors, just status. */
-+#ifdef QUEUE_ONLY
- 	args[i++] = "-odq";		/* Queue it, don't try to deliver. */
-+#else
-+	args[i++] = "-odi";		/* Deliver in foreground. */
-+#endif
- 	args[i++] = "-oi";		/* Ignore '.' on a line by itself. */
- 
- 	/* set from system and protocol used */
-diff -ur smrsh/smrsh.8.orig smrsh/smrsh.8
---- smrsh/smrsh.8.orig	Wed Jan 24 01:40:47 2001
-+++ smrsh/smrsh.8	Mon May  7 08:32:45 2001
-@@ -39,7 +41,7 @@
- .I smrsh
- limits programs to be in a single directory,
- by default
--/usr/adm/sm.bin,
-+/usr/libexec/sm.bin,
- allowing the system administrator to choose the set of acceptable commands,
- and to the shell builtin commands ``exec'', ``exit'', and ``echo''.
- It also rejects any commands with the characters
-@@ -50,13 +52,12 @@
- ``"|exec /usr/local/bin/procmail -f- /etc/procmailrcs/user || exit 75"''
- .PP
- Initial pathnames on programs are stripped,
--so forwarding to ``/usr/ucb/vacation'',
--``/usr/bin/vacation'',
-+so forwarding to ``/usr/bin/vacation'',
- ``/home/server/mydir/bin/vacation'',
- and
- ``vacation''
- all actually forward to
--``/usr/adm/sm.bin/vacation''.
-+``/usr/libexec/sm.bin/vacation''.
- .PP
- System administrators should be conservative about populating
- the sm.bin directory.
diff --git a/mail/sendmail812/files/pkg-milter b/mail/sendmail812/files/pkg-milter
deleted file mode 100644
index 374de6278e90..000000000000
--- a/mail/sendmail812/files/pkg-milter
+++ /dev/null
@@ -1,43 +0,0 @@
-include/libmilter/mfapi.h
-include/libmilter/mfdef.h
-lib/libmilter.a
-@dirrm include/libmilter
-%%PORTDOCS%%share/doc/sendmail/MILTER
-%%PORTDOCS%%share/doc/sendmail/libmilter/api.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/design.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure1.fig
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure1.jpg
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure1.ps
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure2.fig
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure2.jpg
-%%PORTDOCS%%share/doc/sendmail/libmilter/figure2.ps
-%%PORTDOCS%%share/doc/sendmail/libmilter/index.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/installation.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/other.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/overview.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/sample.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_addheader.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_addrcpt.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_chgheader.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_delrcpt.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_getpriv.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_getsymval.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_main.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_register.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_replacebody.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setbacklog.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setconn.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setpriv.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setreply.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/smfi_settimeout.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_abort.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_body.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_close.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_connect.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_envfrom.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_envrcpt.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_eoh.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_eom.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_header.html
-%%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_helo.html
-%%PORTDOCS%%@dirrm share/doc/sendmail/libmilter
diff --git a/mail/sendmail812/files/sendmail.sh b/mail/sendmail812/files/sendmail.sh
deleted file mode 100644
index 33c01e0621a4..000000000000
--- a/mail/sendmail812/files/sendmail.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-# 
-if ! test -x %%PREFIX%%/sbin/sendmail
-then
-	exit 0
-fi
-#
-case "$1" in
-start)
-	# If there is a global system configuration file, suck it in.
-	#
-	if [ -r /etc/defaults/rc.conf ]; then
-		. /etc/defaults/rc.conf
-		source_rc_confs
-	elif [ -r /etc/rc.conf ]; then
-		. /etc/rc.conf
-	fi
-
-	# Flags to sendmail (as a server)
-	sendmail_flags="${sendmail_flags--L sm-mta -bd -q30m}"
-	# Flags for sendmail_msp_queue daemon.
-	sendmail_msp_queue_flags="
-		${sendmail_msp_queue_flags--L sm-msp-queue -Ac -q30m}"
-	#
-        %%PREFIX%%/sbin/sendmail ${sendmail_flags} &&
-        echo -n ' sendmail'
-        %%PREFIX%%/sbin/sendmail ${sendmail_msp_queue_flags} &&
-        echo -n ' sm-msp-queue'
-	;;
-stop)
-	if test -e /var/run/sendmail.pid
-	then
-		kill `head -1 /var/run/sendmail.pid`
-		rm -f /var/run/sendmail.pid
-	fi
-	if test -e /var/spool/clientmqueue/sm-client.pid
-	then
-		kill `head -1 /var/spool/clientmqueue/sm-client.pid`
-		rm -f /var/spool/clientmqueue/sm-client.pid
-	fi
-	;;
-restart)
-	if test -e /var/run/sendmail.pid
-	then
-		kill -1 `head -1 /var/run/sendmail.pid`
-	fi
-	if test -e /var/spool/clientmqueue/sm-client.pid
-	then
-		kill -1 `head -1 /var/spool/clientmqueue/sm-client.pid`
-	fi
-	;;
-*)
-	echo "Usage: ${0##*/}: { start | stop | restart }" 2>&1
-	exit 65
-	;;
-esac
diff --git a/mail/sendmail812/files/site.config.m4 b/mail/sendmail812/files/site.config.m4
deleted file mode 100644
index adc2b11bf108..000000000000
--- a/mail/sendmail812/files/site.config.m4
+++ /dev/null
@@ -1,8 +0,0 @@
-define(`confEBINDIR',`%%PREFIX%%/libexec')
-define(`confMANROOT',`%%PREFIX%%/man/cat')
-define(`confMANROOTMAN',`%%PREFIX%%/man/man')
-define(`confMBINDIR',`%%PREFIX%%/sbin')
-define(`confSBINDIR',`%%PREFIX%%/sbin')
-define(`confUBINDIR',`%%PREFIX%%/bin')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DTCPWRAPPERS')
-APPENDDEF(`conf_sendmail_LIBS', `-lwrap')"
diff --git a/mail/sendmail812/files/site.config.m4.ipv6 b/mail/sendmail812/files/site.config.m4.ipv6
deleted file mode 100644
index 41f0cccf3a1d..000000000000
--- a/mail/sendmail812/files/site.config.m4.ipv6
+++ /dev/null
@@ -1,2 +0,0 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-DNETINET6')
-APPENDDEF(`conf_libmilter_ENVDEF', `-DNETINET6')
diff --git a/mail/sendmail812/files/site.config.m4.ldap b/mail/sendmail812/files/site.config.m4.ldap
deleted file mode 100644
index 24f5ba307842..000000000000
--- a/mail/sendmail812/files/site.config.m4.ldap
+++ /dev/null
@@ -1,25 +0,0 @@
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
-APPENDDEF(`conf_libsm_ENVDEF', `-I%%LOCALBASE%%/include')
-APPENDDEF(`conf_libsm_ENVDEF', `-DLDAPMAP')     
-APPENDDEF(`conf_libsm_LIBS', `-lldap')
-APPENDDEF(`conf_libsm_LIBS', `-llber')
-APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DLDAPMAP')     
-APPENDDEF(`conf_sendmail_LIBS', `-lldap')
-APPENDDEF(`conf_sendmail_LIBS', `-llber')
-APPENDDEF(`conf_editmap_LIBS', `-lldap')
-APPENDDEF(`conf_editmap_LIBS', `-llber')
-APPENDDEF(`conf_mail_local_LIBS', `-lldap')
-APPENDDEF(`conf_mail_local_LIBS', `-llber')
-APPENDDEF(`conf_mailstats_LIBS', `-lldap')
-APPENDDEF(`conf_mailstats_LIBS', `-llber')
-APPENDDEF(`conf_makemap_LIBS', `-lldap')
-APPENDDEF(`conf_makemap_LIBS', `-llber')
-APPENDDEF(`conf_praliases_LIBS', `-lldap')
-APPENDDEF(`conf_praliases_LIBS', `-llber')
-APPENDDEF(`conf_rmail_LIBS', `-lldap')
-APPENDDEF(`conf_rmail_LIBS', `-llber')
-APPENDDEF(`conf_smrsh_LIBS', `-lldap')
-APPENDDEF(`conf_smrsh_LIBS', `-llber')
-APPENDDEF(`conf_vacation_LIBS', `-lldap')
-APPENDDEF(`conf_vacation_LIBS', `-llber')
diff --git a/mail/sendmail812/files/site.config.m4.milter b/mail/sendmail812/files/site.config.m4.milter
deleted file mode 100644
index de11295aa6f3..000000000000
--- a/mail/sendmail812/files/site.config.m4.milter
+++ /dev/null
@@ -1,2 +0,0 @@
-APPENDDEF(`conf_libmilter_ENVDEF', `-DMILTER')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DMILTER')
diff --git a/mail/sendmail812/files/site.config.m4.pre4 b/mail/sendmail812/files/site.config.m4.pre4
deleted file mode 100644
index 384a8ec2334e..000000000000
--- a/mail/sendmail812/files/site.config.m4.pre4
+++ /dev/null
@@ -1,3 +0,0 @@
-APPENDDEF(`conf_mail_local_ENVDEF', `-DQUEUE_ONLY')
-APPENDDEF(`conf_smrsh_ENVDEF', `-DCMDDIR="\"%%PREFIX%%/libexec/sm.bin\""')
-APPENDDEF(`conf_smrsh_ENVDEF', `-DPATH="\"/bin:/usr/bin\""')
diff --git a/mail/sendmail812/files/site.config.m4.sasl b/mail/sendmail812/files/site.config.m4.sasl
deleted file mode 100644
index 5c7e9ee0fac4..000000000000
--- a/mail/sendmail812/files/site.config.m4.sasl
+++ /dev/null
@@ -1,4 +0,0 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl1')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL')
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
-APPENDDEF(`conf_sendmail_LIBS', `-lsasl')
diff --git a/mail/sendmail812/files/site.config.m4.sasl2 b/mail/sendmail812/files/site.config.m4.sasl2
deleted file mode 100644
index bf1d85f38035..000000000000
--- a/mail/sendmail812/files/site.config.m4.sasl2
+++ /dev/null
@@ -1,4 +0,0 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL=2')
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
-APPENDDEF(`conf_sendmail_LIBS', `-lsasl2')
diff --git a/mail/sendmail812/files/site.config.m4.smtps b/mail/sendmail812/files/site.config.m4.smtps
deleted file mode 100644
index f66b5fa440cd..000000000000
--- a/mail/sendmail812/files/site.config.m4.smtps
+++ /dev/null
@@ -1 +0,0 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_SMTP_SSL')
diff --git a/mail/sendmail812/files/site.config.m4.ssl b/mail/sendmail812/files/site.config.m4.ssl
deleted file mode 100644
index 801030866543..000000000000
--- a/mail/sendmail812/files/site.config.m4.ssl
+++ /dev/null
@@ -1,3 +0,0 @@
-APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib' -rpath=%%LOCALBASE%%/lib )
-APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include')
-APPENDDEF(`conf_sendmail_ENVDEF', `-DHASSRANDOMDEV')
diff --git a/mail/sendmail812/files/site.config.m4.tls b/mail/sendmail812/files/site.config.m4.tls
deleted file mode 100644
index 16e2e2b2301a..000000000000
--- a/mail/sendmail812/files/site.config.m4.tls
+++ /dev/null
@@ -1,4 +0,0 @@
-APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS')
-APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_TLS_1')
-APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_SSL')
-APPENDDEF(`conf_sendmail_LIBS', `-lssl -lcrypto')
diff --git a/mail/sendmail812/files/sm-client.sh b/mail/sendmail812/files/sm-client.sh
deleted file mode 100644
index 6e5429c29303..000000000000
--- a/mail/sendmail812/files/sm-client.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/files/Attic/sm-client.sh,v 1.3 2002-04-06 08:17:34 dinoex Exp $
-# 
-if ! test -x %%PREFIX%%/sbin/sendmail
-then
-	exit 0
-fi
-case "$1" in
-start)
-	%%PREFIX%%/sbin/sendmail -L sm-msp-queue -Ac -q30m
-	echo -n ' sm-msp-queue'
-	;;
-stop)
-	if test -e /var/spool/clientmqueue/sm-client.pid
-	then
-		kill `head -1 /var/spool/clientmqueue/sm-client.pid`
-		rm -f /var/spool/clientmqueue/sm-client.pid
-	fi
-	;;
-restart)
-	if test -e /var/spool/clientmqueue/sm-client.pid
-	then
-		kill -1 `head -1 /var/spool/clientmqueue/sm-client.pid`
-	fi
-	;;
-*)
-	echo "Usage: ${0##*/}: { start | stop | restart }" 2>&1
-	exit 65
-	;;
-esac
diff --git a/mail/sendmail812/files/tls-install.sh b/mail/sendmail812/files/tls-install.sh
deleted file mode 100644
index 1efa8c570a16..000000000000
--- a/mail/sendmail812/files/tls-install.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-CADIR="${CADIR-${DESTDIR}/etc/mail/certs/CA}"
-FILSEDIR="${FILESDIR-/usr/ports/mail/sendmail/files}"
-REALM=`hostname`
-
-echo "creating: ${CADIR} on ${REALM}"
-for i in certs crl newcerts private ../private
-do
-	if test ! -d "${CADIR}/${i}"
-	then
-		mkdir -p "${CADIR}/${i}"
-	fi
-done
-chmod 0700 "${CADIR}/private" "${CADIR}/../private"
-cd "${CADIR}" || exit 65
-
-if test ! -f openssl.cnf
-then
-	echo "generating: openssl.cnf"
-	sed -e "s=./demoCA=${CADIR}=" /etc/ssl/openssl.cnf > "openssl.cnf"
-fi
-
-if test ! -f "serial"
-then
-	echo "generating: serial"
-	umask 0022
-	echo "01" > "serial"
-fi
-
-if test ! -f "index.txt"
-then
-	echo "generating: index.txt"
-	umask 0022
-	cp /dev/null "index.txt"
-fi
-
-if test ! -f "cacert.pem"
-then
-	echo "generating CA"
-	umask 0077
-	openssl req -new -x509 -config openssl.cnf \
-		-keyout private/cakey.pem \
-		-out cacert.pem
-fi
-
-if test ! -f "../sendmailcert.pem"
-then
-	if test ! -f "../private/sendmailkey.pem"
-	then
-		echo "creating cert signing request"
-		umask 0066
-		openssl req -nodes -new -x509 -config openssl.cnf \
-			-keyout ../private/sendmailkey.pem \
-			-out ../private/sendmailkey.pem
-	fi
-	if test ! -f "newcsr.pem"
-	then
-		echo "self signing cert"
-		umask 0066
-		openssl x509 -x509toreq \
-			-in ../private/sendmailkey.pem \
-			-signkey ../private/sendmailkey.pem \
-			-out newcsr.pem
-	fi
-	if test ! -f "sendmailcert.pem"
-	then
-		echo "signing cert"
-		openssl ca -config openssl.cnf -policy policy_anything \
-			-out ../sendmailcert.pem \
-			-infiles newcsr.pem
-		rm -f newcsr.pem
-	fi
-fi
-
-sed 's/^X//' << 'END-of-files/tls.m4'
-X# links:
-X# http://www.sendmail.org/~gshapiro/
-X# http://www.sendmail.org/~ca/email/starttls.html
-X# http://www.ofb.net/~jheiss/sendmail/tlsandrelay.shtml
-X#
-X# You may need to add this to your sendmail.mc file:
-X
-Xdefine(`confCACERT_PATH', `MAIL_SETTINGS_DIR`'certs')dnl
-Xdefine(`confCACERT', `confCACERT_PATH/CA/cacert.pem')dnl
-Xdefine(`confSERVER_CERT', `confCACERT_PATH/sendmailcert.pem')dnl
-Xdefine(`confSERVER_KEY', `confCACERT_PATH/private/sendmailkey.pem')dnl
-Xdefine(`confCLIENT_CERT', `confCACERT_PATH/sendmailcert.pem')dnl
-Xdefine(`confCLIENT_KEY', `confCACERT_PATH/private/sendmailkey.pem')dnl
-X
-END-of-files/tls.m4
-exit
diff --git a/mail/sendmail812/pkg-descr b/mail/sendmail812/pkg-descr
deleted file mode 100644
index 21e2ecf498f9..000000000000
--- a/mail/sendmail812/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Sendmail implements a general purpose internetwork mail routing facility
-under the UNIX operating system.  It is not tied to any one transport
-protocol - its function may be likened to a crossbar switch, relaying
-messages from one domain into another.  In the process, it can do a limited
-amount of message header editing to put the message into a format that is
-appropriate for the receiving domain.  All of this is done under the
-control of a configuration file.
-
-Sendmail is a trademark of Sendmail, Inc.
-
-WWW: http://www.sendmail.org/
diff --git a/mail/sendmail812/pkg-message b/mail/sendmail812/pkg-message
deleted file mode 100644
index ae9ace6a6fb3..000000000000
--- a/mail/sendmail812/pkg-message
+++ /dev/null
@@ -1,44 +0,0 @@
----------------------------------------------------
-If you update your configuration from 8.11.x you need to install an
-additional config file: /etc/mail/submit.cf, you can generate it
-by calling the target 'submit.cf', submit.mc will be installed too.
-/usr/ports/mail/sendmail$ make submit.cf
-
-you should add in /etc/make.conf:
-SENDMAIL_CF_DIR=	%%PREFIX%%/share/sendmail/cf
-
-To activate only the delivery from the local submission queue see:
-%%PREFIX%%/etc/rc.d/sm-client.sh.sample
-and if you use FreeBSD-RELEASE < 4.6 set your flags in /etc/rc.conf:
-sendmail_flags="-L sm-msp-queue -Ac -q1m"
-
-To activate all sendmail processes see:
-%%PREFIX%%/etc/rc.d/sendmail.sh.sample
-
-To deliver all local mail to your mailhub, edit the last line of submit.mc:
-FEATURE(`msp','[mailhub.do.main]`)dnl
-
-To update your configuration look at %%PREFIX%%/share/sendmail/cf/README.
----------------------------------------------------
-To use the ports versions you may add to your sendmail.mc file:
-
-define(`confEBINDIR', `/usr/local/libexec')dnl
-define(`UUCP_MAILER_PATH', `/usr/local/bin/uux')dnl
-
----------------------------------------------------
-To activate sendmail as your default mailer, call the target 'mailer.conf':
-/usr/ports/mail/sendmail$ make mailer.conf
-
-Your '/etc/mail/mailer.conf' should look like this:
-#
-# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
-#
-sendmail	%%PREFIX%%/sbin/sendmail
-send-mail	%%PREFIX%%/sbin/sendmail
-mailq		%%PREFIX%%/sbin/sendmail
-newaliases	%%PREFIX%%/sbin/sendmail
-hoststat	%%PREFIX%%/sbin/sendmail
-purgestat	%%PREFIX%%/sbin/sendmail
-
-You may also need to update /etc/rc.conf.
----------------------------------------------------
diff --git a/mail/sendmail812/pkg-plist b/mail/sendmail812/pkg-plist
deleted file mode 100644
index b4147a5ff8af..000000000000
--- a/mail/sendmail812/pkg-plist
+++ /dev/null
@@ -1,33 +0,0 @@
-@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/Attic/pkg-plist,v 1.15 2002-09-16 03:17:13 dinoex Exp $
-@exec if ! pw groupshow smmsp 2>/dev/null; then pw groupadd smmsp -g 25; fi
-@exec if ! pw usershow smmsp 2>/dev/null; then pw useradd smmsp -g smmsp -u 25 -h - -d /nonexistent -s /nonexistent -c "Sendmail Queue"; fi
-@exec mkdir -p /var/spool/clientmqueue
-@exec chown smmsp:smmsp /var/spool/clientmqueue
-@exec chmod 770 /var/spool/clientmqueue
-@unexec if pw usershow smmsp | grep -q 90:90; then pw userdel smmsp; fi
-@comment (removed by userdel) pw groupdel smmsp
-bin/hoststat
-bin/mailq
-bin/newaliases
-bin/purgestat
-bin/rmail
-bin/vacation
-%%ETCPORT%%etc/rc.d/sm-client.sh.sample
-%%ETCPORT%%etc/rc.d/sendmail.sh.sample
-libexec/mail.local
-libexec/smrsh
-sbin/editmap
-sbin/mailstats
-sbin/makemap
-sbin/praliases
-@group smmsp
-sbin/sendmail
-@group
-@comment (overwritten by pkg_add) chown root:smmsp sbin/sendmail
-@exec chmod 2555 %D/sbin/sendmail
-%%PORTDOCS%%share/doc/sendmail/op.ps
-%%PORTDOCS%%share/doc/sendmail/op.txt
-%%PORTDOCS%%share/doc/sendmail/DEVTOOLS
-%%PORTDOCS%%share/doc/sendmail/SENDMAIL
-%%PORTDOCS%%share/doc/sendmail/MAIL.LOCAL
-%%PORTDOCS%%share/doc/sendmail/SMRSH
diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
deleted file mode 100644
index 35122e0c0084..000000000000
--- a/mail/sylpheed2-devel/Makefile
+++ /dev/null
@@ -1,116 +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.9.0
-PORTREVISION=	0
-CATEGORIES=	mail ipv6
-MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/
-
-MAINTAINER=	oliver@freebsd.org
-COMMENT=	A lightweight, featureful, and fast GTK+ based e-mail client
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gtk12
-USE_LIBTOOL=	yes
-USE_REINPLACE=	yes
-
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS=	--enable-ipv6 --prefix=${PREFIX} --with-included-gettext \
-		--program-transform-name=''
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_PIXBUF)
-USE_GNOME+=	gdkpixbuf
-CONFIGURE_ARGS+=--disable-imlib
-.else
-USE_GNOME+=	imlib
-CONFIGURE_ARGS+=--disable-gdk-pixbuf
-.endif
-.if defined(WITH_GPGME)
-LIB_DEPENDS+=	gpgme.9:${PORTSDIR}/security/gpgme
-RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
-CONFIGURE_ARGS+=--enable-gpgme
-.else
-CONFIGURE_ARGS+=--disable-gpgme
-.endif
-.if defined(WITH_COMPFACE)
-LIB_DEPENDS+=	compface.1:${PORTSDIR}/mail/faces
-CONFIGURE_ARGS+=--enable-compface
-.else
-CONFIGURE_ARGS+=--disable-compface
-.endif
-.if defined(WITH_JPILOT)
-LIB_DEPENDS+=	pisock.8:${PORTSDIR}/palm/pilot-link
-RUN_DEPENDS+=	jpilot:${PORTSDIR}/palm/jpilot
-CONFIGURE_ARGS+=--enable-jpilot
-.else
-CONFIGURE_ARGS+=	--disable-jpilot
-.endif
-.if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
-CONFIGURE_ARGS+=--enable-ldap
-.else
-CONFIGURE_ARGS+=--disable-ldap
-.endif
-.if !defined(WITHOUT_SSL)
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=--enable-ssl
-.else
-CONFIGURE_ARGS+=--disable-ssl
-.endif
- 
-MAKEFILES=	Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \
-		faq/en/Makefile.in faq/es/Makefile.in faq/fr/Makefile.in \
-		faq/it/Makefile.in manual/Makefile.in manual/en/Makefile.in \
-		manual/ja/Makefile.in src/Makefile.in
-
-pre-everything::
-	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} ""
-	@${ECHO} "      WITH_PIXBUF=yes   Enable GDK Pixbuf support"
-	@${ECHO} "      WITH_GPGME=yes    Enable GnuPG support using GPGME."
-	@${ECHO} "      WITH_COMPFACE=yes Enable X-Face support."
-	@${ECHO} "      WITH_JPILOT=yes   Enable JPilot support."
-	@${ECHO} "      WITH_LDAP=yes     Enable LDAP support."
-	@${ECHO} ""
-	@${ECHO} "      WITHOUT_SSL=yes   Disable OpenSSL support."
-	@${ECHO} ""
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
-		s|-lresolv||g; s|-lpisock\"|-liconv &|g' ${WRKSRC}/configure
-
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|^SUBDIRS = ac po intl src manual faq$$|SUBDIRS = ac po intl src|g' \
-		${WRKSRC}/Makefile.in
-.else
-.for i in ${MAKEFILES}
-	@${REINPLACE_CMD} -e 's|^faqdir = @faqdir@$$|faqdir = ${DOCSDIR}/faq|g; \
-		s|^manualdir = @manualdir@$$|manualdir = ${DOCSDIR}/manual|g' \
-		${WRKSRC}/${i}
-.endfor
-.endif
-
-pre-build:
-	${LN} -sf ${LOCALBASE}/bin/${LIBTOOL} ${WRKSRC}/libtool
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in ChangeLog INSTALL README TODO
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${i}.jp ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/sylpheed2-devel/distinfo b/mail/sylpheed2-devel/distinfo
deleted file mode 100644
index 0fcf632552da..000000000000
--- a/mail/sylpheed2-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (sylpheed-0.9.0.tar.bz2) = 78db14617632af264494ff9968c2c93b
diff --git a/mail/sylpheed2-devel/files/patch-ac b/mail/sylpheed2-devel/files/patch-ac
deleted file mode 100644
index 86cde54e6a53..000000000000
--- a/mail/sylpheed2-devel/files/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/defs.h.orig	Mon Sep  3 01:07:32 2001
-+++ src/defs.h	Mon Sep  3 04:50:35 2001
-@@ -58,8 +58,8 @@
- #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" */
- #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t"
-@@ -67,7 +67,7 @@
- #ifdef _PATH_MAILDIR
- #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR
- #else
--#  define DEFAULT_SPOOL_PATH	"/var/spool/mail"
-+#  define DEFAULT_SPOOL_PATH	"/var/mail"
- #endif
- 
- #define BUFFSIZE			8192
diff --git a/mail/sylpheed2-devel/pkg-descr b/mail/sylpheed2-devel/pkg-descr
deleted file mode 100644
index 82e317b6d4fd..000000000000
--- a/mail/sylpheed2-devel/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Sylpheed is an e-mail client (and news reader) based on GTK+, running on
-X Window System, and aiming for:
-  * Quick response
-  * Graceful, and sophisticated interface
-  * Easy configuration, intuitive operation
-  * Abundant features
-
-Currently, many features are supported including POP3, IMAP, NNTP,
-multiple accounts, threading, filtering, MIME attachments, APOP, SMTP
-AUTH, SSL, IPv6, GnuPG, internalization, and more.
-
-WWW: http://sylpheed.good-day.net/
diff --git a/mail/sylpheed2-devel/pkg-plist b/mail/sylpheed2-devel/pkg-plist
deleted file mode 100644
index 057fddb634ac..000000000000
--- a/mail/sylpheed2-devel/pkg-plist
+++ /dev/null
@@ -1,109 +0,0 @@
-bin/sylpheed
-lib/charset.alias
-%%PORTDOCS%%share/doc/sylpheed/ChangeLog
-%%PORTDOCS%%share/doc/sylpheed/ChangeLog.jp
-%%PORTDOCS%%share/doc/sylpheed/INSTALL
-%%PORTDOCS%%share/doc/sylpheed/INSTALL.jp
-%%PORTDOCS%%share/doc/sylpheed/README
-%%PORTDOCS%%share/doc/sylpheed/README.jp
-%%PORTDOCS%%share/doc/sylpheed/TODO
-%%PORTDOCS%%share/doc/sylpheed/TODO.jp
-share/locale/cs/LC_MESSAGES/sylpheed.mo
-share/locale/da/LC_MESSAGES/sylpheed.mo
-share/locale/de/LC_MESSAGES/sylpheed.mo
-share/locale/el/LC_MESSAGES/sylpheed.mo
-share/locale/es/LC_MESSAGES/sylpheed.mo
-share/locale/et/LC_MESSAGES/sylpheed.mo
-share/locale/fr/LC_MESSAGES/sylpheed.mo
-share/locale/gl/LC_MESSAGES/sylpheed.mo
-share/locale/hr/LC_MESSAGES/sylpheed.mo
-share/locale/hu/LC_MESSAGES/sylpheed.mo
-share/locale/it/LC_MESSAGES/sylpheed.mo
-share/locale/ja/LC_MESSAGES/sylpheed.mo
-share/locale/ko/LC_MESSAGES/sylpheed.mo
-share/locale/locale.alias
-share/locale/nl/LC_MESSAGES/sylpheed.mo
-share/locale/pl/LC_MESSAGES/sylpheed.mo
-share/locale/pt_BR/LC_MESSAGES/sylpheed.mo
-share/locale/ro/LC_MESSAGES/sylpheed.mo
-share/locale/ru/LC_MESSAGES/sylpheed.mo
-share/locale/sk/LC_MESSAGES/sylpheed.mo
-share/locale/sl/LC_MESSAGES/sylpheed.mo
-share/locale/sr/LC_MESSAGES/sylpheed.mo
-share/locale/sv/LC_MESSAGES/sylpheed.mo
-share/locale/tr/LC_MESSAGES/sylpheed.mo
-share/locale/zh_CN/LC_MESSAGES/sylpheed.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo
-%%PORTDOCS%%share/doc/sylpheed/faq/de/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed/faq/de/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed/faq/de/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed/faq/de/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed/faq/en/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed/faq/en/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed/faq/en/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed/faq/en/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed/faq/es/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed/faq/es/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed/faq/es/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed/faq/es/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed/faq/fr/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed/faq/fr/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed/faq/fr/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed/faq/fr/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed/faq/it/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed/faq/it/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed/faq/it/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed/faq/it/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-1.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-10.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-11.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-12.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-13.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-14.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-15.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-16.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-17.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-18.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-19.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-2.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-20.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-3.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-4.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-5.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-6.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-7.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-8.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-9.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-1.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-10.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-11.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-12.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-13.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-14.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-15.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-16.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-17.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-18.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-19.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-2.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-20.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-3.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-4.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-5.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-6.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-7.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-8.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-9.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed.sgml
-%%PORTDOCS%%@dirrm share/doc/sylpheed/manual/ja
-%%PORTDOCS%%@dirrm share/doc/sylpheed/manual/en
-%%PORTDOCS%%@dirrm share/doc/sylpheed/manual
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq/it
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq/fr
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq/es
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq/en
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq/de
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq
-%%PORTDOCS%%@dirrm share/doc/sylpheed
diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile
deleted file mode 100644
index 35122e0c0084..000000000000
--- a/mail/sylpheed2/Makefile
+++ /dev/null
@@ -1,116 +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.9.0
-PORTREVISION=	0
-CATEGORIES=	mail ipv6
-MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/
-
-MAINTAINER=	oliver@freebsd.org
-COMMENT=	A lightweight, featureful, and fast GTK+ based e-mail client
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gtk12
-USE_LIBTOOL=	yes
-USE_REINPLACE=	yes
-
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS=	--enable-ipv6 --prefix=${PREFIX} --with-included-gettext \
-		--program-transform-name=''
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_PIXBUF)
-USE_GNOME+=	gdkpixbuf
-CONFIGURE_ARGS+=--disable-imlib
-.else
-USE_GNOME+=	imlib
-CONFIGURE_ARGS+=--disable-gdk-pixbuf
-.endif
-.if defined(WITH_GPGME)
-LIB_DEPENDS+=	gpgme.9:${PORTSDIR}/security/gpgme
-RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
-CONFIGURE_ARGS+=--enable-gpgme
-.else
-CONFIGURE_ARGS+=--disable-gpgme
-.endif
-.if defined(WITH_COMPFACE)
-LIB_DEPENDS+=	compface.1:${PORTSDIR}/mail/faces
-CONFIGURE_ARGS+=--enable-compface
-.else
-CONFIGURE_ARGS+=--disable-compface
-.endif
-.if defined(WITH_JPILOT)
-LIB_DEPENDS+=	pisock.8:${PORTSDIR}/palm/pilot-link
-RUN_DEPENDS+=	jpilot:${PORTSDIR}/palm/jpilot
-CONFIGURE_ARGS+=--enable-jpilot
-.else
-CONFIGURE_ARGS+=	--disable-jpilot
-.endif
-.if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
-CONFIGURE_ARGS+=--enable-ldap
-.else
-CONFIGURE_ARGS+=--disable-ldap
-.endif
-.if !defined(WITHOUT_SSL)
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=--enable-ssl
-.else
-CONFIGURE_ARGS+=--disable-ssl
-.endif
- 
-MAKEFILES=	Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \
-		faq/en/Makefile.in faq/es/Makefile.in faq/fr/Makefile.in \
-		faq/it/Makefile.in manual/Makefile.in manual/en/Makefile.in \
-		manual/ja/Makefile.in src/Makefile.in
-
-pre-everything::
-	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} ""
-	@${ECHO} "      WITH_PIXBUF=yes   Enable GDK Pixbuf support"
-	@${ECHO} "      WITH_GPGME=yes    Enable GnuPG support using GPGME."
-	@${ECHO} "      WITH_COMPFACE=yes Enable X-Face support."
-	@${ECHO} "      WITH_JPILOT=yes   Enable JPilot support."
-	@${ECHO} "      WITH_LDAP=yes     Enable LDAP support."
-	@${ECHO} ""
-	@${ECHO} "      WITHOUT_SSL=yes   Disable OpenSSL support."
-	@${ECHO} ""
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
-		s|-lresolv||g; s|-lpisock\"|-liconv &|g' ${WRKSRC}/configure
-
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|^SUBDIRS = ac po intl src manual faq$$|SUBDIRS = ac po intl src|g' \
-		${WRKSRC}/Makefile.in
-.else
-.for i in ${MAKEFILES}
-	@${REINPLACE_CMD} -e 's|^faqdir = @faqdir@$$|faqdir = ${DOCSDIR}/faq|g; \
-		s|^manualdir = @manualdir@$$|manualdir = ${DOCSDIR}/manual|g' \
-		${WRKSRC}/${i}
-.endfor
-.endif
-
-pre-build:
-	${LN} -sf ${LOCALBASE}/bin/${LIBTOOL} ${WRKSRC}/libtool
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in ChangeLog INSTALL README TODO
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${i}.jp ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/sylpheed2/distinfo b/mail/sylpheed2/distinfo
deleted file mode 100644
index 0fcf632552da..000000000000
--- a/mail/sylpheed2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (sylpheed-0.9.0.tar.bz2) = 78db14617632af264494ff9968c2c93b
diff --git a/mail/sylpheed2/files/patch-ac b/mail/sylpheed2/files/patch-ac
deleted file mode 100644
index 86cde54e6a53..000000000000
--- a/mail/sylpheed2/files/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/defs.h.orig	Mon Sep  3 01:07:32 2001
-+++ src/defs.h	Mon Sep  3 04:50:35 2001
-@@ -58,8 +58,8 @@
- #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" */
- #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t"
-@@ -67,7 +67,7 @@
- #ifdef _PATH_MAILDIR
- #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR
- #else
--#  define DEFAULT_SPOOL_PATH	"/var/spool/mail"
-+#  define DEFAULT_SPOOL_PATH	"/var/mail"
- #endif
- 
- #define BUFFSIZE			8192
diff --git a/mail/sylpheed2/pkg-descr b/mail/sylpheed2/pkg-descr
deleted file mode 100644
index 82e317b6d4fd..000000000000
--- a/mail/sylpheed2/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Sylpheed is an e-mail client (and news reader) based on GTK+, running on
-X Window System, and aiming for:
-  * Quick response
-  * Graceful, and sophisticated interface
-  * Easy configuration, intuitive operation
-  * Abundant features
-
-Currently, many features are supported including POP3, IMAP, NNTP,
-multiple accounts, threading, filtering, MIME attachments, APOP, SMTP
-AUTH, SSL, IPv6, GnuPG, internalization, and more.
-
-WWW: http://sylpheed.good-day.net/
diff --git a/mail/sylpheed2/pkg-plist b/mail/sylpheed2/pkg-plist
deleted file mode 100644
index 057fddb634ac..000000000000
--- a/mail/sylpheed2/pkg-plist
+++ /dev/null
@@ -1,109 +0,0 @@
-bin/sylpheed
-lib/charset.alias
-%%PORTDOCS%%share/doc/sylpheed/ChangeLog
-%%PORTDOCS%%share/doc/sylpheed/ChangeLog.jp
-%%PORTDOCS%%share/doc/sylpheed/INSTALL
-%%PORTDOCS%%share/doc/sylpheed/INSTALL.jp
-%%PORTDOCS%%share/doc/sylpheed/README
-%%PORTDOCS%%share/doc/sylpheed/README.jp
-%%PORTDOCS%%share/doc/sylpheed/TODO
-%%PORTDOCS%%share/doc/sylpheed/TODO.jp
-share/locale/cs/LC_MESSAGES/sylpheed.mo
-share/locale/da/LC_MESSAGES/sylpheed.mo
-share/locale/de/LC_MESSAGES/sylpheed.mo
-share/locale/el/LC_MESSAGES/sylpheed.mo
-share/locale/es/LC_MESSAGES/sylpheed.mo
-share/locale/et/LC_MESSAGES/sylpheed.mo
-share/locale/fr/LC_MESSAGES/sylpheed.mo
-share/locale/gl/LC_MESSAGES/sylpheed.mo
-share/locale/hr/LC_MESSAGES/sylpheed.mo
-share/locale/hu/LC_MESSAGES/sylpheed.mo
-share/locale/it/LC_MESSAGES/sylpheed.mo
-share/locale/ja/LC_MESSAGES/sylpheed.mo
-share/locale/ko/LC_MESSAGES/sylpheed.mo
-share/locale/locale.alias
-share/locale/nl/LC_MESSAGES/sylpheed.mo
-share/locale/pl/LC_MESSAGES/sylpheed.mo
-share/locale/pt_BR/LC_MESSAGES/sylpheed.mo
-share/locale/ro/LC_MESSAGES/sylpheed.mo
-share/locale/ru/LC_MESSAGES/sylpheed.mo
-share/locale/sk/LC_MESSAGES/sylpheed.mo
-share/locale/sl/LC_MESSAGES/sylpheed.mo
-share/locale/sr/LC_MESSAGES/sylpheed.mo
-share/locale/sv/LC_MESSAGES/sylpheed.mo
-share/locale/tr/LC_MESSAGES/sylpheed.mo
-share/locale/zh_CN/LC_MESSAGES/sylpheed.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo
-%%PORTDOCS%%share/doc/sylpheed/faq/de/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed/faq/de/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed/faq/de/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed/faq/de/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed/faq/en/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed/faq/en/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed/faq/en/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed/faq/en/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed/faq/es/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed/faq/es/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed/faq/es/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed/faq/es/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed/faq/fr/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed/faq/fr/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed/faq/fr/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed/faq/fr/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed/faq/it/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed/faq/it/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed/faq/it/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed/faq/it/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-1.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-10.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-11.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-12.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-13.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-14.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-15.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-16.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-17.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-18.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-19.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-2.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-20.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-3.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-4.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-5.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-6.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-7.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-8.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-9.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-1.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-10.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-11.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-12.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-13.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-14.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-15.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-16.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-17.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-18.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-19.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-2.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-20.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-3.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-4.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-5.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-6.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-7.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-8.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-9.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed.sgml
-%%PORTDOCS%%@dirrm share/doc/sylpheed/manual/ja
-%%PORTDOCS%%@dirrm share/doc/sylpheed/manual/en
-%%PORTDOCS%%@dirrm share/doc/sylpheed/manual
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq/it
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq/fr
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq/es
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq/en
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq/de
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq
-%%PORTDOCS%%@dirrm share/doc/sylpheed
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
deleted file mode 100644
index 35122e0c0084..000000000000
--- a/mail/sylpheed3/Makefile
+++ /dev/null
@@ -1,116 +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.9.0
-PORTREVISION=	0
-CATEGORIES=	mail ipv6
-MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/
-
-MAINTAINER=	oliver@freebsd.org
-COMMENT=	A lightweight, featureful, and fast GTK+ based e-mail client
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gtk12
-USE_LIBTOOL=	yes
-USE_REINPLACE=	yes
-
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS=	--enable-ipv6 --prefix=${PREFIX} --with-included-gettext \
-		--program-transform-name=''
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_PIXBUF)
-USE_GNOME+=	gdkpixbuf
-CONFIGURE_ARGS+=--disable-imlib
-.else
-USE_GNOME+=	imlib
-CONFIGURE_ARGS+=--disable-gdk-pixbuf
-.endif
-.if defined(WITH_GPGME)
-LIB_DEPENDS+=	gpgme.9:${PORTSDIR}/security/gpgme
-RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
-CONFIGURE_ARGS+=--enable-gpgme
-.else
-CONFIGURE_ARGS+=--disable-gpgme
-.endif
-.if defined(WITH_COMPFACE)
-LIB_DEPENDS+=	compface.1:${PORTSDIR}/mail/faces
-CONFIGURE_ARGS+=--enable-compface
-.else
-CONFIGURE_ARGS+=--disable-compface
-.endif
-.if defined(WITH_JPILOT)
-LIB_DEPENDS+=	pisock.8:${PORTSDIR}/palm/pilot-link
-RUN_DEPENDS+=	jpilot:${PORTSDIR}/palm/jpilot
-CONFIGURE_ARGS+=--enable-jpilot
-.else
-CONFIGURE_ARGS+=	--disable-jpilot
-.endif
-.if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
-CONFIGURE_ARGS+=--enable-ldap
-.else
-CONFIGURE_ARGS+=--disable-ldap
-.endif
-.if !defined(WITHOUT_SSL)
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=--enable-ssl
-.else
-CONFIGURE_ARGS+=--disable-ssl
-.endif
- 
-MAKEFILES=	Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \
-		faq/en/Makefile.in faq/es/Makefile.in faq/fr/Makefile.in \
-		faq/it/Makefile.in manual/Makefile.in manual/en/Makefile.in \
-		manual/ja/Makefile.in src/Makefile.in
-
-pre-everything::
-	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} ""
-	@${ECHO} "      WITH_PIXBUF=yes   Enable GDK Pixbuf support"
-	@${ECHO} "      WITH_GPGME=yes    Enable GnuPG support using GPGME."
-	@${ECHO} "      WITH_COMPFACE=yes Enable X-Face support."
-	@${ECHO} "      WITH_JPILOT=yes   Enable JPilot support."
-	@${ECHO} "      WITH_LDAP=yes     Enable LDAP support."
-	@${ECHO} ""
-	@${ECHO} "      WITHOUT_SSL=yes   Disable OpenSSL support."
-	@${ECHO} ""
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
-		s|-lresolv||g; s|-lpisock\"|-liconv &|g' ${WRKSRC}/configure
-
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|^SUBDIRS = ac po intl src manual faq$$|SUBDIRS = ac po intl src|g' \
-		${WRKSRC}/Makefile.in
-.else
-.for i in ${MAKEFILES}
-	@${REINPLACE_CMD} -e 's|^faqdir = @faqdir@$$|faqdir = ${DOCSDIR}/faq|g; \
-		s|^manualdir = @manualdir@$$|manualdir = ${DOCSDIR}/manual|g' \
-		${WRKSRC}/${i}
-.endfor
-.endif
-
-pre-build:
-	${LN} -sf ${LOCALBASE}/bin/${LIBTOOL} ${WRKSRC}/libtool
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in ChangeLog INSTALL README TODO
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${i}.jp ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/mail/sylpheed3/distinfo b/mail/sylpheed3/distinfo
deleted file mode 100644
index 0fcf632552da..000000000000
--- a/mail/sylpheed3/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (sylpheed-0.9.0.tar.bz2) = 78db14617632af264494ff9968c2c93b
diff --git a/mail/sylpheed3/files/patch-ac b/mail/sylpheed3/files/patch-ac
deleted file mode 100644
index 86cde54e6a53..000000000000
--- a/mail/sylpheed3/files/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/defs.h.orig	Mon Sep  3 01:07:32 2001
-+++ src/defs.h	Mon Sep  3 04:50:35 2001
-@@ -58,8 +58,8 @@
- #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" */
- #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t"
-@@ -67,7 +67,7 @@
- #ifdef _PATH_MAILDIR
- #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR
- #else
--#  define DEFAULT_SPOOL_PATH	"/var/spool/mail"
-+#  define DEFAULT_SPOOL_PATH	"/var/mail"
- #endif
- 
- #define BUFFSIZE			8192
diff --git a/mail/sylpheed3/pkg-descr b/mail/sylpheed3/pkg-descr
deleted file mode 100644
index 82e317b6d4fd..000000000000
--- a/mail/sylpheed3/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Sylpheed is an e-mail client (and news reader) based on GTK+, running on
-X Window System, and aiming for:
-  * Quick response
-  * Graceful, and sophisticated interface
-  * Easy configuration, intuitive operation
-  * Abundant features
-
-Currently, many features are supported including POP3, IMAP, NNTP,
-multiple accounts, threading, filtering, MIME attachments, APOP, SMTP
-AUTH, SSL, IPv6, GnuPG, internalization, and more.
-
-WWW: http://sylpheed.good-day.net/
diff --git a/mail/sylpheed3/pkg-plist b/mail/sylpheed3/pkg-plist
deleted file mode 100644
index 057fddb634ac..000000000000
--- a/mail/sylpheed3/pkg-plist
+++ /dev/null
@@ -1,109 +0,0 @@
-bin/sylpheed
-lib/charset.alias
-%%PORTDOCS%%share/doc/sylpheed/ChangeLog
-%%PORTDOCS%%share/doc/sylpheed/ChangeLog.jp
-%%PORTDOCS%%share/doc/sylpheed/INSTALL
-%%PORTDOCS%%share/doc/sylpheed/INSTALL.jp
-%%PORTDOCS%%share/doc/sylpheed/README
-%%PORTDOCS%%share/doc/sylpheed/README.jp
-%%PORTDOCS%%share/doc/sylpheed/TODO
-%%PORTDOCS%%share/doc/sylpheed/TODO.jp
-share/locale/cs/LC_MESSAGES/sylpheed.mo
-share/locale/da/LC_MESSAGES/sylpheed.mo
-share/locale/de/LC_MESSAGES/sylpheed.mo
-share/locale/el/LC_MESSAGES/sylpheed.mo
-share/locale/es/LC_MESSAGES/sylpheed.mo
-share/locale/et/LC_MESSAGES/sylpheed.mo
-share/locale/fr/LC_MESSAGES/sylpheed.mo
-share/locale/gl/LC_MESSAGES/sylpheed.mo
-share/locale/hr/LC_MESSAGES/sylpheed.mo
-share/locale/hu/LC_MESSAGES/sylpheed.mo
-share/locale/it/LC_MESSAGES/sylpheed.mo
-share/locale/ja/LC_MESSAGES/sylpheed.mo
-share/locale/ko/LC_MESSAGES/sylpheed.mo
-share/locale/locale.alias
-share/locale/nl/LC_MESSAGES/sylpheed.mo
-share/locale/pl/LC_MESSAGES/sylpheed.mo
-share/locale/pt_BR/LC_MESSAGES/sylpheed.mo
-share/locale/ro/LC_MESSAGES/sylpheed.mo
-share/locale/ru/LC_MESSAGES/sylpheed.mo
-share/locale/sk/LC_MESSAGES/sylpheed.mo
-share/locale/sl/LC_MESSAGES/sylpheed.mo
-share/locale/sr/LC_MESSAGES/sylpheed.mo
-share/locale/sv/LC_MESSAGES/sylpheed.mo
-share/locale/tr/LC_MESSAGES/sylpheed.mo
-share/locale/zh_CN/LC_MESSAGES/sylpheed.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo
-%%PORTDOCS%%share/doc/sylpheed/faq/de/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed/faq/de/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed/faq/de/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed/faq/de/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed/faq/en/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed/faq/en/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed/faq/en/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed/faq/en/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed/faq/es/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed/faq/es/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed/faq/es/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed/faq/es/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed/faq/fr/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed/faq/fr/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed/faq/fr/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed/faq/fr/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed/faq/it/sylpheed-faq-1.html
-%%PORTDOCS%%share/doc/sylpheed/faq/it/sylpheed-faq-2.html
-%%PORTDOCS%%share/doc/sylpheed/faq/it/sylpheed-faq-3.html
-%%PORTDOCS%%share/doc/sylpheed/faq/it/sylpheed-faq.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-1.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-10.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-11.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-12.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-13.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-14.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-15.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-16.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-17.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-18.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-19.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-2.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-20.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-3.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-4.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-5.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-6.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-7.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-8.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed-9.html
-%%PORTDOCS%%share/doc/sylpheed/manual/en/sylpheed.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-1.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-10.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-11.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-12.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-13.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-14.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-15.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-16.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-17.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-18.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-19.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-2.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-20.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-3.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-4.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-5.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-6.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-7.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-8.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed-9.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed.html
-%%PORTDOCS%%share/doc/sylpheed/manual/ja/sylpheed.sgml
-%%PORTDOCS%%@dirrm share/doc/sylpheed/manual/ja
-%%PORTDOCS%%@dirrm share/doc/sylpheed/manual/en
-%%PORTDOCS%%@dirrm share/doc/sylpheed/manual
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq/it
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq/fr
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq/es
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq/en
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq/de
-%%PORTDOCS%%@dirrm share/doc/sylpheed/faq
-%%PORTDOCS%%@dirrm share/doc/sylpheed
diff --git a/mail/teapop-devel/Makefile b/mail/teapop-devel/Makefile
deleted file mode 100644
index 352bef03e2bf..000000000000
--- a/mail/teapop-devel/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# New ports collection makefile for:	teapop
-# Date created:			18 May 2000
-# Whom:				Jim Mock <jim@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	teapop
-PORTVERSION=	0.3.5
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.toontown.org/pub/teapop/ \
-		http://www.toontown.org/pub/teapop/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Yet another RFC1939 compliant POP3 server
-
-.if defined(WITH_PGSQL)
-POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
-.endif
-
-.if defined(WITH_MYSQL)
-LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-.endif
-
-.if defined(WITH_DRAC)
-BUILD_DEPENDS=	${PREFIX}/lib/libdrac.a:${PORTSDIR}/mail/drac
-.endif
-
-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
-
-.if defined(WITH_MYSQL)
-CONFIGURE_ARGS+=	--with-mysql=${PREFIX}
-.endif
-
-.if defined(WITH_DRAC)
-CONFIGURE_ARGS+=	--with-drac=${PREFIX}/lib \
-			--with-dracinc=${PREFIX}/include
-.endif
-
-MAN8=		teapop.8
-
-post-install:
-	@${ECHO} "		"
-	@${ECHO} "------------------------------------------------------------------------"
-	@${ECHO} "===> Be sure to copy ${LOCALBASE}/etc/teapop.passwd.sample to"
-	@${ECHO} "===> ${LOCALBASE}/etc/teapop.passwd before using teapop"
-	@${ECHO} "------------------------------------------------------------------------"
-	@${ECHO} "		"
-
-.include <bsd.port.mk>
diff --git a/mail/teapop-devel/distinfo b/mail/teapop-devel/distinfo
deleted file mode 100644
index f81ca5c33564..000000000000
--- a/mail/teapop-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (teapop-0.3.5.tar.gz) = 65fdea12d76c1ed45d65689f48f7f994
diff --git a/mail/teapop-devel/files/patch-aa b/mail/teapop-devel/files/patch-aa
deleted file mode 100644
index a0834203cc94..000000000000
--- a/mail/teapop-devel/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
---- etc/Makefile.in.orig	Sun Jun 30 14:32:20 2002
-+++ etc/Makefile.in	Sun Jun 30 14:34:14 2002
-@@ -23,16 +23,9 @@
- 	fi
- 
- install: build
--	@ echo Checking for existing teapop.passwd;			\
--	if [ -f ${DESTDIR}/${sysconfdir}/teapop.passwd ]; then		\
--		echo "Exists...NOT installing teapop.passwd";		\
--	else								\
--		echo "Not found, installing teapop.passwd";		\
--		${INSTALL} -d ${DESTDIR}/${sysconfdir};			\
--		${INSTALL} teapop.passwd 				\
--			${DESTDIR}/${sysconfdir};			\
--		${CHMOD} 0644 ${DESTDIR}/${sysconfdir}/teapop.passwd;	\
--	fi
-+	@echo Installing teapop.passwd.sample;
-+	${INSTALL} -d ${sysconfdir}; \
-+	${INSTALL} -m 0644 teapop.passwd ${sysconfdir}/teapop.passwd.sample; \
- 
- makefile: ../config/timestamp
- 	@ echo Updating Makefile
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 d0fd80aa3a88..000000000000
--- a/mail/teapop-devel/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-libexec/teapop
-sbin/cronpopauth.pl
-etc/teapop.passwd.sample
diff --git a/mail/vpopmail-devel/Makefile b/mail/vpopmail-devel/Makefile
deleted file mode 100644
index 705b6e73b84b..000000000000
--- a/mail/vpopmail-devel/Makefile
+++ /dev/null
@@ -1,340 +0,0 @@
-# New ports collection makefile for: vpopmail
-# Date created:		21 Sep 2000
-# Whom:			Neil Blakey-Milner
-#
-# $FreeBSD$
-#
-
-PORTNAME=	vpopmail
-PORTVERSION=	5.3.20
-CATEGORIES=	mail
-MASTER_SITES=	http://www.inter7.com/devel/
-
-MAINTAINER=	roam@FreeBSD.org
-COMMENT=	"Easy virtual domain and authentication package for use with qmail"
-
-BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
-		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
-		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
-
-.if defined(WITH_VPOPMAIL_SQWEBMAIL_CREATION)
-PATCHFILES=	vpopmail-sqwebmail-config-${PORTVERSION}.patch
-PATCH_SITES=	${MASTER_SITE_LOCAL} \
-		http://people.FreeBSD.org/~roam/ports/patches/mail/vpopmail/
-PATCH_SITE_SUBDIR=	roam
-.endif
-
-GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
-USE_REINPLACE=	YES
-USE_PERL5_BUILD=	YES
-
-VCFGDIR?=	${WRKDIR}/vcfg
-VCFGFILES?=	inc_deps lib_deps tcp.smtp
-
-CONFIGURE_ENV+=	VCFGDIR="${VCFGDIR}"
-CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
-		--enable-tcprules-prog=${LOCALBASE}/bin/tcprules \
-		--enable-tcpserver-file=${PREFIX}/vpopmail/etc/tcp.smtp
-
-#
-# User-configurable variables
-#
-# Define these to change from the default behaviour
-#
-# WITH_PASSWD   - allow authentication off /etc/passwd
-# WITHOUT_MD5_PASSWORDS - store encrypted passwords in MD5 format
-# WITH_MYSQL	- allow authentitation via mysql
-# WITH_MYSQL_LARGE_SITE - enables large site layout
-# WITH_MYSQL_REPLICATION - enables MySQL database replication
-# WITH_MYSQL_LIMITS - enables the MySQL mailbox limit code
-# WITH_SYBASE   - allow authentication via Sybase (NOT TESTED!)
-# WITH_ORACLE   - allow authentication via Oracle (NOT TESTED!)
-# WITH_CLEAR_PASSWD - store passwords in plaintext into the MySQL db
-# WITH_VALIAS   - enable valias processing
-# WITHOUT_ROAMING - disallow roaming users
-# WITH_IP_ALIAS - enables IP aliasing
-# WITH_DELIVER_FILTER - enables the experimental vdelivermail filter
-# WITH_QMAIL_EXT - enables qmail-like user-* address extesions processing
-# WITHOUT_FILE_LOCKING - disable file locking
-# WITH_FILE_SYNC - enables immediate synching (may decrease performance)
-# WITHOUT_USERS_BIG_DIR - disables using big directories for users
-# WITHOUT_SEEKABLE - disables vdelivermail's attempt to make its input seekable
-#
-# Set these to the values you'd prefer
-#
-# HARDQUOTA     - size of hard quota, or 'n' for no hard quota
-# RELAYCLEAR    - time in minutes before clearing relay hole (requires roaming)
-# DEFAULT_DOMAIN - default domain for non-vhost lookups
-# WITH_SINGLE_DOMAIN - optimize for a site with many users in a single domain
-# LOGLEVEL	- n - no logging, y - log all,
-#                 e - log errors, p - log passwords in errors
-# WITHOUT_AUTH_LOG - disables authentication logging
-# WITH_MYSQL_LOG - enable logging to a MySQL database
-# QMAIL_DIR     - location of qmail directory
-# PREFIX	- installation area for vpopmail (see comment below)
-# VCHKPW_GID	- the group ID of the new vchkpw group (89)
-# VPOPMAIL_UID	- the user ID of the new vpopmail user (89)
-#
-# MySQL database configuration options
-#
-# WITH_MYSQL_SERVER - the hostname of the MySQL server (localhost)
-# WITH_MYSQL_USER - the username for connecting to the MySQL server (root)
-# WITH_MYSQL_PASSWD - the password for connecting to the MySQL server (secret)
-# WITH_MYSQL_DB - the name of the MySQL database to use (vpopmail)
-# The server, user and password variables may be defined separately
-# for read and update access, allowing you to set up a less-priviledged
-# MySQL connection account with read-only access, and another one which
-# is used for administrative purposes:
-# WITH_MYSQL_READ_SERVER, WITH_MYSQL_READ_USER, WITH_MYSQL_READ_PASSWD
-# WITH_MYSQL_UPDATE_SERVER, WITH_MYSQL_UPDATE_USER, WITH_MYSQL_UPDATE_PASSWD
-# Those variables, if defined, override WITH_MYSQL_{SERVER,USER,PASSWD}
-#
-# Oracle database configuration options
-#
-# WARNING: This is NOT TESTED, not in the least.
-# Please report any success or failure to the port maintainer,
-# Peter Pentchev <roam@FreeBSD.org>
-#
-# WITH_ORACLE_PROC - the name of the Oracle Pro-C precompiler, default 'proc'
-# WITH_ORACLE_SERVICE - the Oracle service name (jimmy)
-# WITH_ORACLE_USER - the username for connecting to the Oracle server (system)
-# WITH_ORACLE_PASSWD - the password for connecting to the Oracle server (manager)
-# WITH_ORACLE_DB  - the name of the Oracle database to connect to (orcl1)
-# WITH_ORACLE_HOME - the Oracle installation directory (/export/home/oracle)
-#
-# Sybase database configuration options
-#
-# WARNING: This is NOT TESTED, not in the least.
-# Please report any success or failure to the port maintainer,
-# Peter Pentchev <roam@FreeBSD.org>
-#
-# WITH_SYBASE_SERVER - the Sybase server name (empty)
-# WITH_SYBASE_USER - the username for connecting to the Sybase server (sa)
-# WITH_SYBASE_PASSWD - the password for connecting to the Sybase server (empty)
-# WITH_SYBASE_APP - the app for connecting to the Sybase server (vpopmail)
-# WITH_SYBASE_DB  - the name of the Sybase database to connect to (vpopmail)
-#
-
-HARDQUOTA?=	10000000
-RELAYCLEAR?=	30
-LOGLEVEL?=	y
-
-.if exists(${LOCALBASE}/qmail/bin/qmail-send)
-QMAIL_DIR?=	${LOCALBASE}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-.endif
-
-# Uncomment this, or set PREFIX to /home if you have an existing
-# vpopmail install with the vpopmail users' home directory set to
-# /home/vpopmail - package rules dictate we default to /usr/local/vpopmail
-#
-#PREFIX?=	/home
-
-# End of user-configurable variables
-
-#
-# Some suggestions from Gabriel Ambuehl <gabriel_ambuehl@buz.ch>
-#
-
-CONFIGURE_ARGS+=	--enable-defaultquota=${HARDQUOTA} \
-			--enable-logging=${LOGLEVEL}
-
-.if defined(WITH_PASSWD)
-CONFIGURE_ARGS+=	--enable-passwd=y
-.endif
-
-.if defined(WITHOUT_MD5_PASSWORDS)
-CONFIGURE_ARGS+=	--enable-md5-passwords=n
-.endif
-
-.if defined(WITH_APOP)
-BROKEN=		"The WITH_APOP option is deprecated; set WITH_CLEAR_PASSWD instead, APOP will just work"
-.endif
-
-.if defined(WITH_VALIAS)
-CONFIGURE_ARGS+=	--enable-valias=y
-.endif
-
-.if defined(WITH_SQWEBMAIL)
-CONFIGURE_ARGS+=	--enable-sqwebmail-pass=y
-.endif
-
-.if !defined(WITHOUT_ROAMING)
-CONFIGURE_ARGS+=	--enable-roaming-users=y \
-			--enable-relay-clear-minutes=${RELAYCLEAR}
-.endif
-
-.if !defined(WITH_CLEAR_PASSWD)
-CONFIGURE_ARGS+=	--enable-clear-passwd=n
-.endif
-
-.if defined(WITH_MYSQL)
-LIB_DEPENDS+=		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-CONFIGURE_ARGS+=	--enable-mysql=y \
-			--enable-sqlincdir=${LOCALBASE}/include/mysql \
-			--enable-sqllibdir=${LOCALBASE}/lib/mysql
-.if defined(WITH_MYSQL_LARGE_SITE)
-CONFIGURE_ARGS+=	--enable-large-site=y
-.endif
-.if defined(WITH_MYSQL_REPLICATION)
-CONFIGURE_ARGS+=	--enable-mysql-replication=y
-.endif
-.if defined(WITH_MYSQL_LOG)
-CONFIGURE_ARGS+=	--enable-mysql-logging=y
-.endif
-.if defined(WITH_MYSQL_LIMITS)
-CONFIGURE_ARGS+=	--enable-mysql-limits=y
-.endif
-
-.if defined(WITH_MYSQL_SERVER)
-WITH_MYSQL_READ_SERVER?=	${WITH_MYSQL_SERVER}
-WITH_MYSQL_UPDATE_SERVER?=	${WITH_MYSQL_SERVER}
-.endif
-.if defined(WITH_MYSQL_USER)
-WITH_MYSQL_READ_USER?=	${WITH_MYSQL_USER}
-WITH_MYSQL_UPDATE_USER?=	${WITH_MYSQL_USER}
-.endif
-.if defined(WITH_MYSQL_PASSWD)
-WITH_MYSQL_READ_PASSWD?=	${WITH_MYSQL_PASSWD}
-WITH_MYSQL_UPDATE_PASSWD?=	${WITH_MYSQL_PASSWD}
-.endif
-.endif
-
-.if defined(WITH_SYBASE)
-CONFIGURE_ARGS+=	--enable-sybase=y
-.endif
-
-.if defined(WITH_ORACLE)
-WITH_ORACLE_PROC?=	proc
-CONFIGURE_ARGS+=	--enable-oracle=y
-.endif
-
-.if defined(DEFAULT_DOMAIN)
-CONFIGURE_ARGS+=	--enable-default-domain=${DEFAULT_DOMAIN}
-.endif
-
-.if defined(WITH_SINGLE_DOMAIN)
-CONFIGURE_ARGS+=	--enable-many-domains=n
-.endif
-
-.if defined(WITH_IP_ALIAS)
-CONFIGURE_ARGS+=	--enable-ip-alias-domains=y
-.endif
-
-.if defined(WITH_DELIVER_FILTER)
-CONFIGURE_ARGS+=	--enable-deliver-filter=y
-.endif
-
-.if defined(WITH_QMAIL_EXT)
-CONFIGURE_ARGS+=	--enable-qmail-ext=y
-.endif
-
-.if defined(WITHOUT_FILE_LOCKING)
-CONFIGURE_ARGS+=	--enable-file-locking=n
-.endif
-
-.if defined(WITH_FILE_SYNC)
-CONFIGURE_ARGS+=	--enable-file-sync=y
-.endif
-
-.if defined(WITHOUT_AUTH_LOG)
-CONFIGURE_ARGS+=	--enable-auth-logging=n
-.endif
-
-.if defined(WITHOUT_USERS_BIG_DIR)
-CONFIGURE_ARGS+=	--enable-users-big-dir=n
-.endif
-
-.if defined(WITHOUT_SEEKABLE)
-CONFIGURE_ARGS+=	--enable-make-seekable=n
-.endif
-
-# autoconf and automake can remove our patches to the configure scripts.
-
-post-patch:
-	@${FIND} ${WRKSRC} -type f -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -E -e 's,@(ACLOCAL|AUTO(MAKE|CONF|HEADER))@,/usr/bin/true,'
-
-#
-# This port doesn't honour PREFIX, it honours vpopmail's home directory.
-# Since we create vpopmail if it doesn't exist, we set it so that it
-# does honour PREFIX. -- nbm
-#
-
-pre-configure:
-	@PKG_PREFIX=${PREFIX}/vpopmail ${PERL5} ${PKGINSTALL}
-.if defined(WITH_MYSQL)
-.if defined(WITH_MYSQL_UPDATE_SERVER)
-	${REINPLACE_CMD} -E -e "s/(#define MYSQL_UPDATE_SERVER.*)localhost(.*)/\1${WITH_MYSQL_UPDATE_SERVER}\2/" ${WRKSRC}/vmysql.h
-.endif
-.if defined(WITH_MYSQL_READ_SERVER)
-	${REINPLACE_CMD} -E -e "s/(#define MYSQL_READ_SERVER.*)localhost(.*)/\1${WITH_MYSQL_READ_SERVER}\2/" ${WRKSRC}/vmysql.h
-.endif
-.if defined(WITH_MYSQL_UPDATE_USER)
-	${REINPLACE_CMD} -E "s/(#define MYSQL_UPDATE_USER.*)root(.*)/\1${WITH_MYSQL_UPDATE_USER}\2/" ${WRKSRC}/vmysql.h
-.endif
-.if defined(WITH_MYSQL_READ_USER)
-	${REINPLACE_CMD} -E -e "s/(#define MYSQL_READ_USER.*)root(.*)/\1${WITH_MYSQL_READ_USER}\2/" ${WRKSRC}/vmysql.h
-.endif
-.if defined(WITH_MYSQL_UPDATE_PASSWD)
-	${REINPLACE_CMD} -E -e "s/(#define MYSQL_UPDATE_PASSWD.*)secret(.*)/\1${WITH_MYSQL_UPDATE_PASSWD}\2/" ${WRKSRC}/vmysql.h
-.endif
-.if defined(WITH_MYSQL_READ_PASSWD)
-	${REINPLACE_CMD} -E -e "s/(#define MYSQL_READ_PASSWD.*)secret(.*)/\1${WITH_MYSQL_READ_PASSWD}\2/" ${WRKSRC}/vmysql.h
-.endif
-.if defined(WITH_MYSQL_DB)
-	${REINPLACE_CMD} -E -e "s/(#define MYSQL_DATABASE.*)vpopmail(.*)/\1${WITH_MYSQL_DB}\2/" ${WRKSRC}/vmysql.h
-.endif
-.endif
-.if defined(WITH_ORACLE)
-.if defined(WITH_ORACLE_SERVICE)
-	${REINPLACE_CMD} -E -e "s/(#define ORACLE_SERVICE.*)jimmy(.*)/\1${WITH_ORACLE_SERVICE}\2/" ${WRKSRC}/voracle.h
-.endif
-.if defined(WITH_ORACLE_USER)
-	${REINPLACE_CMD} -E -e "s/(#define ORACLE_USER.*)system(.*)/\1${WITH_ORACLE_USER}\2/" ${WRKSRC}/voracle.h
-.endif
-.if defined(WITH_ORACLE_PASSWD)
-	${REINPLACE_CMD} -E -e "s/(#define ORACLE_PASSWD.*)manager(.*)/\1${WITH_ORACLE_PASSWD}\2/" ${WRKSRC}/voracle.h
-.endif
-.if defined(WITH_ORACLE_HOME)
-	${REINPLACE_CMD} -E -e "s@(#define ORACLE_HOME.*)/export/home/oracle(.*)@\1${WITH_ORACLE_HOME}\2@" ${WRKSRC}/voracle.h
-.endif
-.if defined(WITH_ORACLE_DB)
-	${REINPLACE_CMD} -E -e "s/(#define ORACLE_DATABASE.*)orcl1(.*)/\1${WITH_ORACLE_DB}\2/" ${WRKSRC}/voracle.h
-.endif
-	cd ${WRKSRC} && ${WITH_ORACLE_PROC} voracle.pc
-.endif
-.if defined(WITH_SYBASE)
-.if defined(WITH_SYBASE_SERVER)
-	${REINPLACE_CMD} -E -e "s/(#define SYBASE_SERVER.*)\"\"(.*)/\1\"${WITH_SYBASE_SERVER}\"\2/" ${WRKSRC}/vsybase.h
-.endif
-.if defined(WITH_SYBASE_USER)
-	${REINPLACE_CMD} -E -e "s/(#define SYBASE_USER.*)sa(.*)/\1${WITH_SYBASE_USER}\2/" ${WRKSRC}/vsybase.h
-.endif
-.if defined(WITH_SYBASE_PASSWD)
-	${REINPLACE_CMD} -E -e "s/(#define SYBASE_PASSWD.*)\"\"(.*)/\1\"${WITH_SYBASE_PASSWD}\"\2/" ${WRKSRC}/vsybase.h
-.endif
-.if defined(WITH_SYBASE_APP)
-	${REINPLACE_CMD} -E -e "s@(#define SYBASE_APP.*)vpopmail(.*)@\1${WITH_SYBASE_APP}\2@" ${WRKSRC}/vsybase.h
-.endif
-.if defined(WITH_SYBASE_DB)
-	${REINPLACE_CMD} -E -e "s/(#define SYBASE_DATABASE.*)vpopmail(.*)/\1${WITH_SYBASE_DB}\2/" ${WRKSRC}/vsybase.h
-.endif
-.endif
-	${MKDIR} ${VCFGDIR}
-
-post-install:
-	${CHMOD} o-rwx ${PREFIX}/vpopmail/bin ${PREFIX}/vpopmail/lib
-	${MKDIR} ${PREFIX}/vpopmail/etc
-	if [ ! -f "${PREFIX}/vpopmail/etc/tcp.smtp" ]; then \
-		if [ -f "${VCFGDIR}/tcp.smtp" ]; then \
-			${INSTALL_DATA} ${VCFGDIR}/tcp.smtp ${PREFIX}/vpopmail/etc/; \
-		else \
-			${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp; \
-		fi; \
-	fi
-	${INSTALL_DATA} ${VCFGDIR}/inc_deps ${VCFGDIR}/lib_deps ${PREFIX}/vpopmail/etc/
-
-.include <bsd.port.mk>
diff --git a/mail/vpopmail-devel/distinfo b/mail/vpopmail-devel/distinfo
deleted file mode 100644
index fa0f91a36066..000000000000
--- a/mail/vpopmail-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (vpopmail-5.3.20.tar.gz) = 4009fd5f6f910f1c70e58e2069d5f31d
-MD5 (vpopmail-sqwebmail-config-5.3.20.patch) = 3d89fd7b95d3aa1f6398ea8fccadefba
diff --git a/mail/vpopmail-devel/files/patch-configure b/mail/vpopmail-devel/files/patch-configure
deleted file mode 100644
index 07ab9b4f24a2..000000000000
--- a/mail/vpopmail-devel/files/patch-configure
+++ /dev/null
@@ -1,62 +0,0 @@
---- configure.old	Thu Feb 13 17:37:40 2003
-+++ configure	Thu Feb 13 17:38:32 2003
-@@ -1285,7 +1285,7 @@
-   ;;
- esac
- 
--if test `$idcommand` != "0"
-+if false && test `$idcommand` != "0"
- then
-     echo "configure: warning: === vpopmail must be configured as root. ===" 1>&2
-     echo "configure: warning: === please switch to the root user and  ===" 1>&2
-@@ -1563,15 +1563,6 @@
- rm -f vpopusername 
- 
- 
--if test ! -d $vpopmaildir/etc
--then 
--	mkdir $vpopmaildir/etc
--	chown $vpopmailuid "$vpopmaildir"/etc 
--	chgrp $vpopmailgid "$vpopmaildir"/etc 
--        chmod 755 "$vpopmaildir"/etc
--        echo "configure: warning: making a vpopmail etc directory " 1>&2
--fi
--
- # Check whether --enable-roaming-users or --disable-roaming-users was given.
- if test "${enable_roaming_users+set}" = set; then
-   enableval="$enable_roaming_users"
-@@ -1637,7 +1628,7 @@
-   
-         if test "$tcpserver_file" = ""
-         then
--	    echo "127.:allow,RELAYCLIENT=\"\"" > "$vpopmaildir"/etc/tcp.smtp
-+	    echo "127.:allow,RELAYCLIENT=\"\"" > "$VCFGDIR"/tcp.smtp
-     	    tcpserver_file="$vpopmaildir"/etc/tcp.smtp
- 	
-             echo "configure: warning: Unable to find your tcpserver relay file." 1>&2
-@@ -2142,7 +2133,7 @@
-         fi
- 		auth_libs="-L$libdir $extralibflags -lmysqlclient -lz"
- 
--		echo "-L$vpopmaildir/lib -lvpopmail -L$libdir -lmysqlclient -lz" > $vpopmaildir/etc/lib_deps
-+		echo "-L$vpopmaildir/lib -lvpopmail -L$libdir -lmysqlclient -lz" > $VCFGDIR/lib_deps
- 		
-         ;;
- *)
-@@ -2399,14 +2390,14 @@
- 		authlib=
- 		
- 		auth_inc="-Icdb"
--		echo "-L$vpopmaildir/lib -lvpopmail" > $vpopmaildir/etc/lib_deps
-+		echo "-L$vpopmaildir/lib -lvpopmail" > $VCFGDIR/lib_deps
- 		
-         ;;
- *)
-         ;;
- esac
- 
--echo "-I$vpopmaildir/include" > $vpopmaildir/etc/inc_deps
-+echo "-I$vpopmaildir/include" > $VCFGDIR/inc_deps
- 
- # Check whether --enable-qmail-ext or --disable-qmail-ext was given.
- if test "${enable_qmail_ext+set}" = set; then
diff --git a/mail/vpopmail-devel/files/patch-vdelivermail.c b/mail/vpopmail-devel/files/patch-vdelivermail.c
deleted file mode 100644
index 106281226007..000000000000
--- a/mail/vpopmail-devel/files/patch-vdelivermail.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- vdelivermail.c.orig	Sat Nov  2 22:34:39 2002
-+++ vdelivermail.c	Sat Nov  2 22:35:20 2002
-@@ -263,7 +263,7 @@
- 
-     /* check for wildcard if there's no match */
-     if(tmpstr == NULL) {
--        for(i=strlen(TheUser);i >= 0 && j != 1;--i) {
-+        for(i=strlen(TheUser);i > 0 && j != 1;--i) {
-             if(TheUser[i-1]=='-') {
-                 tmpuser[0] = '\0';
-                 strncat(tmpuser,TheUser,i); 
diff --git a/mail/vpopmail-devel/files/patch-vlimits.c b/mail/vpopmail-devel/files/patch-vlimits.c
deleted file mode 100644
index 27b078822274..000000000000
--- a/mail/vpopmail-devel/files/patch-vlimits.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- vlimits.c.old	Fri Feb 14 14:44:38 2003
-+++ vlimits.c	Fri Feb 14 14:45:21 2003
-@@ -46,7 +46,7 @@
- 
-     /* get filename */
-     vget_assign(mydomain, dir, sizeof(dir), &uid, &gid);
--    strncat(dir, "/.qmailadmin-limits", sizeof(dir));
-+    strncat(dir, "/.qmailadmin-limits", sizeof(dir) - strlen(dir) - 1);
- 
-     /* open file */
-     if ((fs = fopen(dir, "r")) != NULL) {
-@@ -209,7 +209,7 @@
- 
-     /* get filename */
-     vget_assign(mydomain, dir, sizeof(dir), &uid, &gid);
--    strncat(dir, "/.qmailadmin-limits", sizeof(dir));
-+    strncat(dir, "/.qmailadmin-limits", sizeof(dir) - strlen(dir) - 1);
- 
-     /* open file */
-     if ((fs = fopen(dir, "w+")) != NULL) {
-@@ -265,7 +265,7 @@
- 
-     /* get filename */
-     vget_assign(mydomain, dir, sizeof(dir), &uid, &gid);
--    strncat(dir, "/.qmailadmin-limits", sizeof(dir));
-+    strncat(dir, "/.qmailadmin-limits", sizeof(dir) - strlen(dir) - 1);
-     return unlink(dir);
- }
- 
diff --git a/mail/vpopmail-devel/pkg-descr b/mail/vpopmail-devel/pkg-descr
deleted file mode 100644
index a98ec621541b..000000000000
--- a/mail/vpopmail-devel/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-vpopmail provides an easy way to manage virtual domains and virtual
-accounts on a qmail mail server.
-
-Features:
-
-. Automates all qmail file modifications into documented command line
-  programs
-
-. Support for named and IP-based virtual domains
-
-. NFS safe
-
-. dynamic directory creation for scalability using fill-in balanced 3
-  level tree
-
-. understands standard qmail .qmail directives
-
-. interacts well with qmailadmin for web-based administration, courier-imap
-  for IMAP support, and sqwebmail for web-based mail.
-
-WWW:	http://inter7.com/vpopmail/
diff --git a/mail/vpopmail-devel/pkg-install b/mail/vpopmail-devel/pkg-install
deleted file mode 100644
index 101602472771..000000000000
--- a/mail/vpopmail-devel/pkg-install
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/perl
-#
-
-@groups = ("vchkpw");
-%users = ('vpopmail', "vchkpw");
-# daemon, local, pop, queue, remote, deliver, respectively.
-# alias is a special case above...
-%gids = ("vchkpw", 89);
-%uids = ('vpopmail', 89);
-
-sub checkenv () {
-	my ($u, $g);
-
-	# Users
-	foreach $u (keys %users) {
-		$var = uc($u)."_UID";
-		if (defined($ENV{$var})) {
-			$uids{$u} = $ENV{$var};
-		}
-	}
-
-	# Groups
-	foreach $g (@groups) {
-		$var = uc($g)."_GID";
-		if (defined($ENV{$var})) {
-			$gids{$g} = $ENV{$var};
-		}
-	}
-}
-
-if ($ENV{PACKAGE_BUILDING} || $ARGV[1] eq "PRE-INSTALL") {
-	$doguid=1;  # Make sure we get the assigned guids.
-}
-
-checkenv();
-
-foreach $group (@groups) {
-	if (! getgrnam ($group)) {
-		do checkrpw;  # May exit
-
-		$x = "-g $gids{$group}";
-		$result = system ("/usr/sbin/pw groupadd $group $x");
-		if ($result) {
-			die "Failed to add group $group as gid $gids{$group}\n";
-		}
-	}
-}
-
-if (! getpwnam ("alias")) {
-	do checkrpw;  # May exit
-
-	$x = "-u $uids{'alias'}";
-	$result = system ("/usr/sbin/pw useradd alias -g qnofiles -d \"$ENV{PKG_PREFIX}/alias\" -s /nonexistent $x");
-	if ($result) {
-		die "Failed to add user alias as uid $uids{'alias'}\n";
-	}
-}
-
-foreach $user (keys %users) {
-	if (! getpwnam ($user)) {
-		do checkrpw;  # May exit
-
-		$x = "-u $uids{$user}";
-		$result = system ("/usr/sbin/pw useradd $user -g $users{$user} -d \"$ENV{PKG_PREFIX}\" -s /nonexistent $x");
-		if ($result) {
-			die "Failed to add user $user as uid $uids{$user}\n";
-		}
-	}
-}
-
-# Check that all gids/uids are as they should be...
-# If we are being installed as a package...
-if ($doguid) {
-	foreach $group (@groups) {
-		if (getgrnam($group) != $gids{$group}) {
-			die "Group $group should have gid $gids{$group}\n";
-		}
-	}
-
-	foreach $user (keys %users) {
-		if (getpwnam($user) != $uids{$user}) {
-			die "User $user should have uid $uids{$user}\n";
-		}
-	}
-}
-
-exit 0;
-
-sub checkrpw {
-	if (! -x "/usr/sbin/pw") {
-		print <<'EOM';
-This system looks like a pre-2.2 version of FreeBSD.  We see that it
-is missing the "pw" utility.  We need this utility.  Please get and
-install it, and try again.  You can get the source from:
-
-  ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/usr.sbin/pw.tar.gz
-
-EOM
-		die "No /usr/sbin/pw";
-	}
-
-	if ($> != 0) {
-		print "It is necessary to add missing vpopmail users/groups at";
-		print "this stage.  Please either add them manually or retry";
-		print "as root.";
-		# Let pw(1) signal the failure so the user can see which
-		# group/user is actually missing.
-	}
-}
diff --git a/mail/vpopmail-devel/pkg-plist b/mail/vpopmail-devel/pkg-plist
deleted file mode 100644
index 80a845baa619..000000000000
--- a/mail/vpopmail-devel/pkg-plist
+++ /dev/null
@@ -1,55 +0,0 @@
-vpopmail/bin/clearopensmtp
-vpopmail/bin/vaddaliasdomain
-vpopmail/bin/vadddomain
-vpopmail/bin/vadduser
-vpopmail/bin/valias
-vpopmail/bin/vchkpw
-vpopmail/bin/vconvert
-vpopmail/bin/vdeldomain
-vpopmail/bin/vdelivermail
-vpopmail/bin/vdeloldusers
-vpopmail/bin/vdeluser
-vpopmail/bin/vdominfo
-vpopmail/bin/vipmap
-vpopmail/bin/vkill
-vpopmail/bin/vmkpasswd
-vpopmail/bin/vmoduser
-vpopmail/bin/vpasswd
-vpopmail/bin/vpopbull
-vpopmail/bin/vqmaillocal
-vpopmail/bin/vsetuserquota
-vpopmail/bin/vuserinfo
-vpopmail/doc/doc_html/vpopmail.html
-vpopmail/doc/doc_html/vpopmail5.abw
-vpopmail/doc/doc_html/vpopmailapi.png
-vpopmail/doc/man_html/clearopensmtp.html
-vpopmail/doc/man_html/index.html
-vpopmail/doc/man_html/vaddaliasdomain.html
-vpopmail/doc/man_html/vadddomain.html
-vpopmail/doc/man_html/vadduser.html
-vpopmail/doc/man_html/vchkpw.html
-vpopmail/doc/man_html/vconvert.html
-vpopmail/doc/man_html/vdeldomain.html
-vpopmail/doc/man_html/vdelivermail.html
-vpopmail/doc/man_html/vdeluser.html
-vpopmail/doc/man_html/vpasswd.html
-vpopmail/doc/man_html/vpopbull.html
-vpopmail/doc/man_html/vsetuserquota.html
-vpopmail/etc/inc_deps
-vpopmail/etc/lib_deps
-@unexec if [ -f %D/vpopmail/etc/tcp.smtp -a ! -s %D/vpopmail/etc/tcp.smtp ]; then rm -f %D/vpopmail/etc/tcp.smtp; fi
-vpopmail/include/config.h
-vpopmail/include/vauth.h
-vpopmail/include/vpopmail.h
-vpopmail/include/vpopmail_config.h
-vpopmail/lib/libvpopmail.a
-@dirrm vpopmail/users
-@dirrm vpopmail/lib
-@dirrm vpopmail/include
-@dirrm vpopmail/etc
-@dirrm vpopmail/domains
-@dirrm vpopmail/doc/man_html
-@dirrm vpopmail/doc/doc_html
-@dirrm vpopmail/doc
-@dirrm vpopmail/bin
-@dirrm vpopmail