44 files changed, 0 insertions, 3117 deletions

diff --git a/mail/Makefile b/mail/Makefile
index c7b7a07991dd..14838222605d 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -485,9 +485,6 @@
     SUBDIR += postfix-policyd-spf-perl
     SUBDIR += postfix-policyd-weight
     SUBDIR += postfix-postfwd
-    SUBDIR += postfix1
-    SUBDIR += postfix21
-    SUBDIR += postfix22
     SUBDIR += postfix23
     SUBDIR += postfix24
     SUBDIR += postfixadmin
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
deleted file mode 100644
index 8fdb2323ed18..000000000000
--- a/mail/postfix1/Makefile
+++ /dev/null
@@ -1,240 +0,0 @@
-# New ports collection makefile for:	postfix-current
-# Date created: 	18 Mar 1999
-# Whom:			torstenb
-#
-# $FreeBSD$
-#
-
-PORTNAME=	postfix
-PORTVERSION=	1.1.13
-PORTREVISION=	3
-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}
-
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER=	mnag@FreeBSD.org
-COMMENT=	An alternative to widely-used Sendmail
-
-CONFLICTS=	courier-0.* postfix-2.* postfix-current-2.* sendmail-8.* \
-		sendmail-*-8.* smail-3.* zmailer-2.*
-
-LATEST_LINK=	${PORTNAME}1
-USE_SUBMAKE=	yes
-USE_RC_SUBR=	postfix.sh
-
-PATCH_STRIP=	-p1
-
-OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
-		TLS		"Enable SSL and TLS support"				off \
-		DB3		"Berkeley DB3 (required if SASL built with DB3)"	off \
-		MYSQL		"MySQL maps lookups"					off \
-		PGSQL		"PostgreSQL maps lookups"				off \
-		OPENLDAP	"OpenLDAP maps lookups (BROKEN)"			off \
-		IPV6		"IPv6 support (not KAME official)"			off \
-		TEST		"SMTP/LMTP test server and generator"			off
-
-DEPRECATED=	Not supported anymore by vendor. Please choose a new one version.
-EXPIRATION_DATE=	2009-03-08
-
-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 qmgr.8 qmqpd.8 showq.8 smtp.8 \
-	smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
-
-CONF1=	main.cf master.cf access aliases canonical pcre_table regexp_table \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-.include <bsd.port.pre.mk>
-
-# Default requirement for postfix rc.d script
-_REQUIRE=	DAEMON
-
-.if !defined(WITHOUT_PCRE)
-LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
-POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
-.else
-POSTFIX_CCARGS+=	-DNO_PCRE
-.endif
-
-.if defined(WITH_TLS)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-MAN8+=			tlsmgr.8
-POSTFIX_CCARGS+=	-DHAS_SSL -I${OPENSSLINC}
-POSTFIX_AUXLIBS+=	-L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
-DISTFILES+=		${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz
-EXTRA_PATCHES+=		${WRKDIR}/pfixtls-0.8.11a-1.1.11-0.9.6g/pfixtls.diff
-PLIST_SUB+=		SUB_TLS=""
-.else
-PLIST_SUB+=		SUB_TLS="@comment "
-.endif
-
-.if defined(WITH_DB3)
-LIB_DEPENDS+=		db3.3:${PORTSDIR}/databases/db3
-POSTFIX_CCARGS+=	-I${LOCALBASE}/include/db3
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -ldb3
-.endif
-
-.if defined(WITH_MYSQL)
-USE_MYSQL=		yes
-POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lcrypt -lm
-_REQUIRE+=		mysql
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PGSQL=		yes
-POSTFIX_CCARGS+=	-DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt
-PATCH_SITES+=		http://mat.cc/postfix/
-PATCHFILES+=		postfix-pg.postfix-1.1.8.patch
-_REQUIRE+=		postgresql
-.endif
-
-.if defined(WITH_OPENLDAP)
-BROKEN=			does not support OPENLDAP
-USE_OPENLDAP=		yes
-POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
-POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lldap -llber
-_REQUIRE+=		slapd
-.endif
-
-.if defined(WITH_IPV6)
-.if ${ARCH} != i386
-BROKEN=			only supported in i386
-.endif
-.if defined(WITH_TLS)
-BROKEN=			IPv6 and TLS patch cannot be used simultaneously
-.endif
-PATCH_SITES+=		http://www.uinet.or.jp/~taka/misc/
-PATCHFILES+=		postfix-1.1.11+ipv6.patch.gz
-.endif
-
-.if defined(WITH_TEST)
-BIN1=			smtp-sink smtp-source
-PLIST_SUB+=		SUB_TEST=""
-.else
-BIN1=			# empty
-PLIST_SUB+=		SUB_TEST="@comment "
-.endif
-
-.if defined(NOPORTDOCS)
-READMEDIR=		no
-.else
-READMEDIR=		${PREFIX}/share/doc/postfix
-.endif
-
-SUB_LIST+=		REQUIRE="${_REQUIRE}"
-
-pre-patch:
-.if defined(POSTFIX_OPTIONS)
-		@${ECHO_MSG}
-		@${ECHO_MSG}
-		@${ECHO_MSG}
-		@${ECHO_MSG} "***** ALERT *****"
-		@${ECHO_MSG} "POSTFIX_OPTIONS don't work anymore, now"
-		@${ECHO_MSG} "${PORTNAME} use OPTIONS, consider use:"
-		@${ECHO_MSG} "# make config"
-		@${ECHO_MSG}
-		@${ECHO_MSG}
-		@${ECHO_MSG}
-		@sleep 10
-.endif
-.for f in ${MAN1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man1/${f} ${WRKSRC}/html/${f}.html
-.endfor
-.for f in ${MAN5}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man5/${f} ${WRKSRC}/html/${f}.html
-.endfor
-.for f in ${MAN8base}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/man/man8/${f} ${WRKSRC}/html/${f}.html
-.endfor
-.for f in faq rate rewrite uce
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-		${WRKSRC}/html/${f}.html
-.endfor
-.for f in ${CONF1}
-	@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${f}
-.endfor
-
-post-patch:
-# All files modified with ${FILESDIR}/patch-* to use !!PREFIX!! need REINPLACE. Put below.
-	@${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" \
-		${WRKSRC}/conf/main.cf ${WRKSRC}/src/global/mail_params.h
-
-do-configure:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-		CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-		${ECHO_CMD} "all: default" >> Makefile)
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
-	(cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-		config_directory=${PREFIX}/etc/postfix \
-		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 f in ${CONF1}
-	${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/sample-${f}
-.endfor
-
-	@${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
-
-# optional TEST binaries
-.for f in ${BIN1}
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/smtpstone/${f} ${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
-	@# Fix compressed man pages
-	@${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files
-	@${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/mail/postfix1/distinfo b/mail/postfix1/distinfo
deleted file mode 100644
index bb0290c16726..000000000000
--- a/mail/postfix1/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 (postfix/postfix-1.1.13.tar.gz) = 772f193d768a5e37b60aef37f865589c
-SHA256 (postfix/postfix-1.1.13.tar.gz) = c800196f83043dbf0dd96a02d27598dfb6810a7a72450b78c75ac075b6f6172d
-SIZE (postfix/postfix-1.1.13.tar.gz) = 1190791
-MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
-SHA256 (postfix/postfix-pg.postfix-1.1.8.patch) = 52debd6164d831a766062a9d62fba9a4d6538cfbf5963880d2792c2a2e12a59c
-SIZE (postfix/postfix-pg.postfix-1.1.8.patch) = 27331
-MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
-SHA256 (postfix/postfix-1.1.11+ipv6.patch.gz) = 2641500dcc528c5d698184b05720e901f45f4214da0b5df7d3e1b307dc00772f
-SIZE (postfix/postfix-1.1.11+ipv6.patch.gz) = 22964
-MD5 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 11d82e9a3482f64af9d228f7a4319566
-SHA256 (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = c49c2532d1f4aec626e622269f292ec75db668adaf6d70def6e458b32aa35d16
-SIZE (postfix/pfixtls-0.8.11a-1.1.11-0.9.6g.tar.gz) = 196093
diff --git a/mail/postfix1/files/patch-bd b/mail/postfix1/files/patch-bd
deleted file mode 100644
index 5c8a2600d459..000000000000
--- a/mail/postfix1/files/patch-bd
+++ /dev/null
@@ -1,11 +0,0 @@
-*** postfix-1.1.13/html/local.8.html.orig	Thu Feb  3 21:15:02 2000
---- postfix-1.1.13/html/local.8.html	Thu Jun  1 22:22:30 2000
-***************
-*** 99,101 ****
-         The default per-user mailbox is a file in  the  UNIX  mail
-!        spool  directory (<b>/var/mail/</b><i>user</i> or <b>/var/spool/mail/</b><i>user</i>);
-         the location can be specified with  the  <b>mail</b><i>_</i><b>spool</b><i>_</i><b>direc-</b>
---- 99,101 ----
-         The default per-user mailbox is a file in  the  UNIX  mail
-!        spool  directory (<b>/var/mail/</b><i>user</i>);
-         the location can be specified with  the  <b>mail</b><i>_</i><b>spool</b><i>_</i><b>direc-</b>
diff --git a/mail/postfix1/files/patch-ck b/mail/postfix1/files/patch-ck
deleted file mode 100644
index 1a246c52b13d..000000000000
--- a/mail/postfix1/files/patch-ck
+++ /dev/null
@@ -1,11 +0,0 @@
-*** postfix-1.1.13/man/man8/local.8.orig	Thu Feb  3 21:14:53 2000
---- postfix-1.1.13/man/man8/local.8	Thu Jun  1 22:42:43 2000
-***************
-*** 96,98 ****
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR or \fB/var/spool/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
---- 96,98 ----
-  The default per-user mailbox is a file in the UNIX mail spool
-! directory (\fB/var/mail/\fIuser\fR);
-  the location can be specified with the \fBmail_spool_directory\fR
diff --git a/mail/postfix1/files/patch-conf-main.cf b/mail/postfix1/files/patch-conf-main.cf
deleted file mode 100644
index 361383c41878..000000000000
--- a/mail/postfix1/files/patch-conf-main.cf
+++ /dev/null
@@ -1,59 +0,0 @@
---- postfix-1.1.13/conf/main.cf.orig	Tue May 28 14:35:57 2002
-+++ postfix-1.1.13/conf/main.cf	Wed Aug 10 19:28:08 2005
-@@ -31,14 +31,14 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.  The default value is $program_directory.
- #
--command_directory = /usr/sbin
-+command_directory = !!PREFIX!!/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). The
- # default value is $program_directory. This directory must be owned
- # by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -508,32 +508,32 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = !!PREFIX!!/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = !!PREFIX!!/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = !!PREFIX!!/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = !!PREFIX!!/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- #
--sample_directory =
-+sample_directory = !!PREFIX!!/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix1/files/patch-ec b/mail/postfix1/files/patch-ec
deleted file mode 100644
index 4ff251d7d640..000000000000
--- a/mail/postfix1/files/patch-ec
+++ /dev/null
@@ -1,41 +0,0 @@
-*** postfix-1.1.13/src/global/mail_params.h.orig	Thu Jan  3 13:13:37 2002
---- postfix-1.1.13/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 7373bb600e1d..000000000000
--- a/mail/postfix1/files/patch-ed
+++ /dev/null
@@ -1,11 +0,0 @@
-*** postfix-1.1.13/src/local/mailbox.c.orig	Fri Apr 28 16:55:53 2000
---- postfix-1.1.13/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-ei b/mail/postfix1/files/patch-ei
deleted file mode 100644
index c70973d876e4..000000000000
--- a/mail/postfix1/files/patch-ei
+++ /dev/null
@@ -1,21 +0,0 @@
-*** postfix-1.1.13/src/smtpd/smtpd.h.orig	Thu Sep 14 10:17:23 2000
---- postfix-1.1.13/src/smtpd/smtpd.h	Thu Sep 14 10:17:38 2000
-***************
-*** 12,19 ****
-    * SASL library.
-    */
-  #ifdef USE_SASL_AUTH
-! #include <sasl.h>
-! #include <saslutil.h>
-  #endif
-  
-   /*
---- 12,19 ----
-    * SASL library.
-    */
-  #ifdef USE_SASL_AUTH
-! #include <sasl1/sasl.h>
-! #include <sasl1/saslutil.h>
-  #endif
-  
-   /*
diff --git a/mail/postfix1/files/patch-ej b/mail/postfix1/files/patch-ej
deleted file mode 100644
index bae6dd4cf397..000000000000
--- a/mail/postfix1/files/patch-ej
+++ /dev/null
@@ -1,21 +0,0 @@
-*** postfix-1.1.13/src/smtp/smtp.h.orig	Thu Sep 14 13:04:43 2000
---- postfix-1.1.13/src/smtp/smtp.h	Thu Sep 14 13:04:53 2000
-***************
-*** 12,19 ****
-    * SASL library.
-    */
-  #ifdef USE_SASL_AUTH
-! #include <sasl.h>
-! #include <saslutil.h>
-  #endif
-  
-   /*
---- 12,19 ----
-    * SASL library.
-    */
-  #ifdef USE_SASL_AUTH
-! #include <sasl1/sasl.h>
-! #include <sasl1/saslutil.h>
-  #endif
-  
-   /*
diff --git a/mail/postfix1/files/patch-lmtp.h b/mail/postfix1/files/patch-lmtp.h
deleted file mode 100644
index e9e3bff0f19d..000000000000
--- a/mail/postfix1/files/patch-lmtp.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- postfix-1.1.13/src/lmtp/lmtp.h.orig	Fri Jan 19 15:43:06 2001
-+++ postfix-1.1.13/src/lmtp/lmtp.h	Sat Feb  3 14:01:09 2001
-@@ -12,8 +12,8 @@
-   * SASL library.
-   */
- #ifdef USE_SASL_AUTH
--#include <sasl.h>
--#include <saslutil.h>
-+#include <sasl1/sasl.h>
-+#include <sasl1/saslutil.h>
- #endif
- 
-  /*
diff --git a/mail/postfix1/files/patch-makedefs b/mail/postfix1/files/patch-makedefs
deleted file mode 100644
index f261ac4c4c1f..000000000000
--- a/mail/postfix1/files/patch-makedefs
+++ /dev/null
@@ -1,15 +0,0 @@
---- makedefs.orig	2007-12-13 14:33:11.000000000 -0200
-+++ makedefs	2007-12-13 14:33:31.000000000 -0200
-@@ -90,6 +90,12 @@
- 		;;
-   FreeBSD.5*)	SYSTYPE=FREEBSD5
- 		;;
-+  FreeBSD.6*)	SYSTYPE=FREEBSD5
-+		;;
-+  FreeBSD.7*)	SYSTYPE=FREEBSD5
-+		;;
-+  FreeBSD.8*)	SYSTYPE=FREEBSD5
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-   OpenBSD.3*)	SYSTYPE=OPENBSD3
diff --git a/mail/postfix1/files/patch-post-install b/mail/postfix1/files/patch-post-install
deleted file mode 100644
index 58fc1c53a00f..000000000000
--- a/mail/postfix1/files/patch-post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- postfix-1.1.13/conf/#post-install~	Fri Jan 18 12:32:54 2002
-+++ postfix-1.1.13/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/files/postfix.sh.in b/mail/postfix1/files/postfix.sh.in
deleted file mode 100644
index f178a8ae4ed6..000000000000
--- a/mail/postfix1/files/postfix.sh.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: postfix mail
-# REQUIRE: %%REQUIRE%%
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable postfix:
-# postfix_enable (bool):	Set it to "YES" to enable postfix.
-#				Default is "NO".
-# postfix_pidfile (path):	Set full path to master.pid.
-#				Default is "/var/spool/postfix/pid/master.pid".
-# postfix_procname (command):	Set command that start master. Used to verify if
-#				postfix is running.
-#				Default is "%%PREFIX%%/libexec/postfix/master".
-#
-
-. %%RC_SUBR%%
-
-name="postfix"
-rcvar=${name}_enable
-
-start_cmd=${name}_start
-stop_cmd=${name}_stop
-extra_commands="reload"
-
-pidfile=${postfix_pidfile}
-procname=${postfix_procname}
-
-postfix_start() {
-	%%PREFIX%%/sbin/postfix start
-}
-
-postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
-}
-
-load_rc_config $name
-
-: ${postfix_enable="NO"}
-: ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
-: ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
-
-run_rc_command "$1"
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 e95e57d20a01..000000000000
--- a/mail/postfix1/pkg-install
+++ /dev/null
@@ -1,155 +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 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
-fi
diff --git a/mail/postfix1/pkg-message b/mail/postfix1/pkg-message
deleted file mode 100644
index b2ee82ee4e9d..000000000000
--- a/mail/postfix1/pkg-message
+++ /dev/null
@@ -1,22 +0,0 @@
-To enable postfix rc.d startup script please add postfix_enable="YES" in
-your rc.conf
-
-If you not need sendmail anymore, please add in your rc.conf:
-
-sendmail_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_outbound_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-And you can disable some sendmail specific daily maintenance routines in your
-/etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
diff --git a/mail/postfix1/pkg-plist b/mail/postfix1/pkg-plist
deleted file mode 100644
index 7a37ab352bfa..000000000000
--- a/mail/postfix1/pkg-plist
+++ /dev/null
@@ -1,173 +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-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/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%%%%DOCSDIR%%/DB_README
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
-%%PORTDOCS%%%%DOCSDIR%%/MACOSX_README
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
-%%PORTDOCS%%%%DOCSDIR%%/access.5.html
-%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
-%%PORTDOCS%%%%DOCSDIR%%/architecture.html
-%%PORTDOCS%%%%DOCSDIR%%/backstage.html
-%%PORTDOCS%%%%DOCSDIR%%/basic.html
-%%PORTDOCS%%%%DOCSDIR%%/big-picture.gif
-%%PORTDOCS%%%%DOCSDIR%%/big-picture.html
-%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
-%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/commands.html
-%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
-%%PORTDOCS%%%%DOCSDIR%%/delivering.html
-%%PORTDOCS%%%%DOCSDIR%%/error.8.html
-%%PORTDOCS%%%%DOCSDIR%%/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
-%%PORTDOCS%%%%DOCSDIR%%/goals.html
-%%PORTDOCS%%%%DOCSDIR%%/inbound.gif
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/local.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
-%%PORTDOCS%%%%DOCSDIR%%/master.8.html
-%%PORTDOCS%%%%DOCSDIR%%/motivation.html
-%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
-%%PORTDOCS%%%%DOCSDIR%%/nqmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/outbound.gif
-%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
-%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/queuing.html
-%%PORTDOCS%%%%DOCSDIR%%/rate.html
-%%PORTDOCS%%%%DOCSDIR%%/receiving.html
-%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
-%%PORTDOCS%%%%DOCSDIR%%/resource.html
-%%PORTDOCS%%%%DOCSDIR%%/rewrite.html
-%%PORTDOCS%%%%DOCSDIR%%/security.html
-%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
-%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
-%%PORTDOCS%%%%DOCSDIR%%/small-picture.gif
-%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
-%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
-%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
-%%PORTDOCS%%%%DOCSDIR%%/uce.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/postfix
-@dirrmtry etc/postfix
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
deleted file mode 100644
index 50ec04dfb3a1..000000000000
--- a/mail/postfix21/Makefile
+++ /dev/null
@@ -1,196 +0,0 @@
-# New ports collection makefile for:	postfix
-# 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.1.6
-PORTREVISION=	2
-PORTEPOCH=	1
-CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/:postfix \
-		ftp://ftp.tux.org/pub/net/postfix/official/:postfix \
-		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/:postfix \
-		ftp://ftp.samurai.com/pub/postfix/official/:postfix \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}:postfix \
-		http://mirror.inerd.com/FreeBSD/distfiles/postfix21/:pfix
-MASTER_SITE_SUBDIR=	. old related/postfix
-DISTNAME=	postfix-${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:postfix
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	mnag@FreeBSD.org
-COMMENT=	A secure alternative to widely-used Sendmail
-
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.[02-9].* postfix-current-2.* \
-		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
-
-NO_LATEST_LINK=	yes
-USE_SUBMAKE=	yes
-USE_RC_SUBR=	postfix.sh
-
-DEPRECATED=	Not supported anymore by vendor. Please choose a new one version.
-EXPIRATION_DATE=	2009-03-08
-
-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 cidr_table.5 ldap_table.5 \
-	mysql_table.5 pgsql_table.5 postconf.5 pcre_table.5 \
-	regexp_table.5 relocated.5 transport.5 virtual.5 \
-	header_checks.5 body_checks.5
-
-MAN8=	bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
-	smtp.8 smtpd.8 spawn.8 trace.8 trivial-rewrite.8 verify.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 header_checks relocated \
-	transport virtual
-
-README=	ADDRESS_CLASS_README ADDRESS_REWRITING_README \
-	ADDRESS_VERIFICATION_README BACKSCATTER_README \
-	BASIC_CONFIGURATION_README BUILTIN_FILTER_README \
-	CONTENT_INSPECTION_README CYRUS_README DATABASE_README DB_README \
-	DEBUG_README ETRN_README FILTER_README INSTALL LDAP_README \
-	LINUX_README LMTP_README LOCAL_RECIPIENT_README MAILDROP_README \
-	MYSQL_README NFS_README OVERVIEW PACKAGE_README PCRE_README \
-	PGSQL_README QMQP_README QSHAPE_README RESTRICTION_CLASS_README \
-	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
-	SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \
-	ULTRIX_README UUCP_README VERP_README VIRTUAL_README \
-	XCLIENT_README XFORWARD_README
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-# Default requirement for postfix rc script
-_REQUIRE=	DAEMON
-
-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
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-SUB_LIST+=	REQUIRE="${_REQUIRE}"
-
-pre-patch:
-	${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \
-		> ${WRKSRC}/html/body_checks.5.html
-.	for f in ${MAN1}
-		@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-			${WRKSRC}/man/man1/${f} ${WRKSRC}/html/${f}.html
-.	endfor
-.	for f in ${MAN5}
-		@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-			${WRKSRC}/man/man5/${f} ${WRKSRC}/html/${f}.html
-.	endfor
-.	for f in ${MAN8base}
-		@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-			${WRKSRC}/man/man8/${f} ${WRKSRC}/html/${f}.html
-.	endfor
-.	for f in ${README}
-		@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-			${WRKSRC}/html/${f}.html
-		@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
-			${WRKSRC}/README_FILES/${f}
-.	endfor
-.	for f in ${CONF1}
-		@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${f}
-.	endfor
-
-post-patch:
-# All files modified with ${FILESDIR}/patch-* to use !!PREFIX!! need REINPLACE. Put below.
-	@${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" \
-		${WRKSRC}/conf/main.cf ${WRKSRC}/src/global/mail_params.h
-
-do-configure:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	config_directory=${PREFIX}/etc/postfix \
-	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}
-
-	@${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
-
-.	for f in ${BINTEST}
-		@${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/sbin
-.	endfor
-
-.	for f in ${CONF1}
-		${INSTALL_DATA} ${WRKSRC}/conf/${f} \
-			${PREFIX}/etc/postfix/dist-${f}
-.	endfor
-
-.	if !defined(NOPORTDOCS)
-		@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-		@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
-			${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.	endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# Fix compressed man pages
-	@${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files
-	@${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak
-	@${CAT} ${PKGMESSAGE}
-
-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 ff926a1d434c..000000000000
--- a/mail/postfix21/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 (postfix/postfix-2.1.6.tar.gz) = 91c976fe69ff33f487cd6eee9c343999
-SHA256 (postfix/postfix-2.1.6.tar.gz) = 0f049090e7991c49ab5bc766c6ff947945200d67f2794347068d78bcb382586d
-SIZE (postfix/postfix-2.1.6.tar.gz) = 1973068
-MD5 (postfix/postfix-libspf2-2.1.5-5.patch) = c6ac24b91af6c575ec787110a2df8a24
-SHA256 (postfix/postfix-libspf2-2.1.5-5.patch) = dad356266b24c89eb0196bf5667c3d529c2d59c6011b92db832b78a7d093ff73
-SIZE (postfix/postfix-libspf2-2.1.5-5.patch) = 25889
-MD5 (postfix/tls+ipv6-1.25-pf-2.1.5.patch.gz) = 5b02ebf2ec104c43f805d2bcb7bb16ef
-SHA256 (postfix/tls+ipv6-1.25-pf-2.1.5.patch.gz) = 7d5962330abf8cbacf9af394e7383a2844852c61ac33577bcbeb0263e7c6c1a0
-SIZE (postfix/tls+ipv6-1.25-pf-2.1.5.patch.gz) = 251571
-MD5 (postfix/postfix-2.1.6-vda.patch.gz) = 26f1d0899fa2af41967e64dc633924d1
-SHA256 (postfix/postfix-2.1.6-vda.patch.gz) = 0bcd54daf76fa9ea3cc8c129108fa778e6e0dd7cd54802c29d87b26a91235c5a
-SIZE (postfix/postfix-2.1.6-vda.patch.gz) = 7795
-MD5 (postfix/pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz) = d3211ebd4d2fbbc9c78235666ed355ac
-SHA256 (postfix/pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz) = a6e7261ced89c746444fbc7dda9978f49010c56e0d0eca27438fe940f1c4c8f1
-SIZE (postfix/pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz) = 239141
-MD5 (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = c1c5a84b6c04bde0df7100cf05abb54c
-SHA256 (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = 4258922922fe1d8587388e23cbc50a8ed395e3ad546f5ebce51b43a20d246f51
-SIZE (postfix/ipv6-1.25-pf-2.1.5.patch.gz) = 48228
diff --git a/mail/postfix21/files/extra_ipv6.patch b/mail/postfix21/files/extra_ipv6.patch
deleted file mode 100644
index 3549880b76f2..000000000000
--- a/mail/postfix21/files/extra_ipv6.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- src/util/inet_addr_list.c.old	Thu Aug 18 11:09:16 2005
-+++ src/util/inet_addr_list.c	Thu Aug 18 11:09:53 2005
-@@ -133,7 +133,11 @@
- #ifdef INET6
-     char   ha[NI_MAXHOST], hb[NI_MAXHOST];
-     int    nierr;
-+#ifdef NI_WITHSCOPEID
-     int    niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
-+#else
-+    int    niflags = NI_NUMERICHOST;
-+#endif
-     struct sockaddr *sa, *sb;
- 
-     sa = (struct sockaddr *)a, sb = (struct sockaddr *)b;
---- src/global/wildcard_inet_addr.c.old	Thu Aug 18 11:10:42 2005
-+++ src/global/wildcard_inet_addr.c	Thu Aug 18 11:11:05 2005
-@@ -38,7 +38,11 @@
-     struct addrinfo hints, *res, *res0;
-     char hbuf[NI_MAXHOST];
-     int error;
-+#ifdef NI_WITHSCOPEID
-     const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
-+#else
-+    const int niflags = NI_NUMERICHOST;
-+#endif
- 
-     inet_addr_list_init(addr_list);
- 
---- src/smtpd/smtpd_peer.c.old	Thu Aug 18 11:11:44 2005
-+++ src/smtpd/smtpd_peer.c	Thu Aug 18 11:13:37 2005
-@@ -163,7 +163,11 @@
- 
- #ifdef INET6
- 	error = getnameinfo(sa, len, abuf, sizeof(abuf), NULL, 0,
-+#ifdef NI_WITHSCOPEID
- 			    NI_NUMERICHOST | NI_WITHSCOPEID);
-+#else
-+			    NI_NUMERICHOST);
-+#endif
- 	if (error)
- 	    msg_fatal("%s: numeric getnameinfo lookup for peer: error %s",
- 		      myname, GAI_STRERROR(error));
-@@ -277,7 +281,11 @@
- 			continue;
- 		    error = getnameinfo(res->ai_addr, res->ai_addrlen,
- 					rabuf, sizeof(rabuf), NULL, 0,
-+#ifdef NI_WITHSCOPEID
- 					NI_NUMERICHOST | NI_WITHSCOPEID);
-+#else
-+					NI_NUMERICHOST);
-+#endif
- 		    if (error) {
- 			msg_warn("%s: %s: hostname %s verification failed: %s",
- 				 myname, state->addr, state->name,
---- src/lmtp/lmtp_connect.c.old	Thu Aug 18 11:14:16 2005
-+++ src/lmtp/lmtp_connect.c	Thu Aug 18 11:15:07 2005
-@@ -202,7 +202,11 @@
- 	return;
-     }
-     aierr = getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),
-+#ifdef NI_WITHSCOPEID
- 			NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID);
-+#else
-+			NULL, 0, NI_NUMERICHOST);
-+#endif
-     if (aierr != 0) {
- 	msg_warn("%s: getnameinfo(): %s",
- 		 myname, GAI_STRERROR(aierr));
-@@ -276,7 +280,11 @@
- 
-     sa = (struct sockaddr *)&addr_list->addrs[i - 1];
-     aierr = getnameinfo(sa, SA_LEN(sa), hbuf, sizeof(hbuf),
-+#ifdef NI_WITHSCOPEID
- 			NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID);
-+#else
-+			NULL, 0, NI_NUMERICHOST);
-+#endif
-     if (aierr != 0)
- 	msg_fatal("%s: getnameinfo() (AF=%d): %s",
- 		  myname, af, GAI_STRERROR(aierr));
---- src/smtp/smtp_connect.c.old	Thu Aug 18 11:15:43 2005
-+++ src/smtp/smtp_connect.c	Thu Aug 18 11:16:28 2005
-@@ -135,7 +135,11 @@
- 	return;
-     }
-     aierr = getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf),
-+#ifdef NI_WITHSCOPEID
- 			NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID);
-+#else
-+			NULL, 0, NI_NUMERICHOST);
-+#endif
-     if (aierr != 0) {
- 	msg_warn("%s: getnameinfo(): %s",
- 		 myname, GAI_STRERROR(aierr));
-@@ -210,7 +214,11 @@
- 
-     sa = (struct sockaddr *)&addr_list->addrs[pos];
-     aierr = getnameinfo(sa, SA_LEN(sa), hbuf, sizeof(hbuf),
-+#ifdef NI_WITHSCOPEID
- 			NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID);
-+#else
-+			NULL, 0, NI_NUMERICHOST);
-+#endif
-     if (aierr != 0)
- 	msg_fatal("%s: getnameinfo() (AF=%d): %s",
- 		  myname, af, GAI_STRERROR(aierr));
---- src/qmqpd/qmqpd_peer.c.old	Thu Aug 18 11:17:03 2005
-+++ src/qmqpd/qmqpd_peer.c	Thu Aug 18 11:17:49 2005
-@@ -146,7 +146,11 @@
- 
- #ifdef INET6
- 	error = getnameinfo(sa, len, abuf, sizeof(abuf), NULL, 0,
-+#ifdef NI_WITHSCOPEID
- 			    NI_NUMERICHOST | NI_WITHSCOPEID);
-+#else
-+			    NI_NUMERICHOST);
-+#endif
- 	if (error)
- 	    msg_fatal("%s: numeric getnameinfo lookup for peer: error %s",
- 		      myname, GAI_STRERROR(error));
-@@ -216,7 +220,11 @@
- 			continue;
- 		    error = getnameinfo(res->ai_addr, res->ai_addrlen,
- 			    rabuf, sizeof(rabuf), NULL, 0,
-+#ifdef NI_WITHSCOPEID
- 			    NI_NUMERICHOST | NI_WITHSCOPEID);
-+#else
-+			    NI_NUMERICHOST);
-+#endif
- 		    if (error) {
- 			msg_warn("%s: %s: hostname %s verification failed: %s",
- 				 myname, state->addr, state->name,
diff --git a/mail/postfix21/files/patch-ec b/mail/postfix21/files/patch-ec
deleted file mode 100644
index a3f617235fba..000000000000
--- a/mail/postfix21/files/patch-ec
+++ /dev/null
@@ -1,53 +0,0 @@
-*** ./src/global/mail_params.h.orig	Sat Jan 17 10:04:00 2004
---- ./src/global/mail_params.h	Fri Jan 30 14:48:23 2004
-***************
-*** 64,70 ****
-  extern gid_t var_owner_gid;
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"postdrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
-  
---- 64,70 ----
-  extern gid_t var_owner_gid;
-  
-  #define VAR_SGID_GROUP		"setgid_group"
-! #define DEF_SGID_GROUP		"maildrop"
-  extern char *var_sgid_group;
-  extern gid_t var_sgid_gid;
-  
-***************
-*** 202,208 ****
-    */
-  #define VAR_DAEMON_DIR		"daemon_directory"
-  #ifndef DEF_DAEMON_DIR
-! #define DEF_DAEMON_DIR		"/usr/libexec/postfix"
-  #endif
-  extern char *var_daemon_dir;
-  
---- 202,208 ----
-    */
-  #define VAR_DAEMON_DIR		"daemon_directory"
-  #ifndef DEF_DAEMON_DIR
-! #define DEF_DAEMON_DIR		"!!PREFIX!!/libexec/postfix"
-  #endif
-  extern char *var_daemon_dir;
-  
-***************
-*** 231,237 ****
-    */
-  #define VAR_CONFIG_DIR		"config_directory"
-  #ifndef DEF_CONFIG_DIR
-! #define DEF_CONFIG_DIR		"/etc/postfix"
-  #endif
-  extern char *var_config_dir;
-  
---- 231,237 ----
-    */
-  #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-main.cf b/mail/postfix21/files/patch-main.cf
deleted file mode 100644
index 7775cd80efb2..000000000000
--- a/mail/postfix21/files/patch-main.cf
+++ /dev/null
@@ -1,108 +0,0 @@
-*** ./conf/main.cf~	Mon Apr 26 16:54:42 2004
---- ./conf/main.cf	Mon Apr 26 16:54:42 2004
-***************
-*** 32,44 ****
-  # The command_directory parameter specifies the location of all
-  # postXXX commands.
-  #
-! command_directory = /usr/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
-  
-  # QUEUE AND PROCESS OWNERSHIP
-  #
---- 32,44 ----
-  # The command_directory parameter specifies the location of all
-  # postXXX commands.
-  #
-! command_directory = !!PREFIX!!/sbin
-  
-  # The daemon_directory parameter specifies the location of all Postfix
-  # daemon programs (i.e. programs listed in the master.cf file). This
-  # directory must be owned by root.
-  #
-! daemon_directory = !!PREFIX!!/libexec/postfix
-  
-  # QUEUE AND PROCESS OWNERSHIP
-  #
-***************
-*** 595,631 ****
-  # sendmail_path: The full pathname of the Postfix sendmail command.
-  # This is the Sendmail-compatible mail posting interface.
-  # 
-! sendmail_path =
-  
-  # newaliases_path: The full pathname of the Postfix newaliases command.
-  # This is the Sendmail-compatible command to build alias databases.
-  #
-! newaliases_path =
-  
-  # mailq_path: The full pathname of the Postfix mailq command.  This
-  # is the Sendmail-compatible mail queue listing command.
-  # 
-! mailq_path =
-  
-  # 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 =
-  
-  # html_directory: The location of the Postfix HTML documentation.
-  #
-! html_directory =
-  
-  # manpage_directory: The location of the Postfix on-line manual pages.
-  #
-! manpage_directory =
-  
-  # sample_directory: The location of the Postfix sample configuration files.
-  # This parameter is obsolete as of Postfix 2.1.
-  #
-! sample_directory =
-  
-  # readme_directory: The location of the Postfix README files.
-  #
-! readme_directory =
---- 595,631 ----
-  # sendmail_path: The full pathname of the Postfix sendmail command.
-  # This is the Sendmail-compatible mail posting interface.
-  # 
-! sendmail_path = !!PREFIX!!/sbin/sendmail
-  
-  # newaliases_path: The full pathname of the Postfix newaliases command.
-  # This is the Sendmail-compatible command to build alias databases.
-  #
-! newaliases_path = !!PREFIX!!/bin/newaliases
-  
-  # mailq_path: The full pathname of the Postfix mailq command.  This
-  # is the Sendmail-compatible mail queue listing command.
-  # 
-! mailq_path = !!PREFIX!!/bin/mailq
-  
-  # setgid_group: The group for mail submission and queue management
-  # commands.  This must be a group name with a numerical group ID that
-  # is not shared with other accounts, not even with the Postfix account.
-  #
-! setgid_group = maildrop
-  
-  # html_directory: The location of the Postfix HTML documentation.
-  #
-! html_directory = no
-  
-  # manpage_directory: The location of the Postfix on-line manual pages.
-  #
-! manpage_directory = !!PREFIX!!/man
-  
-  # sample_directory: The location of the Postfix sample configuration files.
-  # This parameter is obsolete as of Postfix 2.1.
-  #
-! sample_directory = !!PREFIX!!/etc/postfix
-  
-  # readme_directory: The location of the Postfix README files.
-  #
-! readme_directory = no
diff --git a/mail/postfix21/files/patch-makedefs b/mail/postfix21/files/patch-makedefs
deleted file mode 100644
index 36ecc70c3a58..000000000000
--- a/mail/postfix21/files/patch-makedefs
+++ /dev/null
@@ -1,15 +0,0 @@
---- makedefs.orig	2007-12-13 14:29:44.000000000 -0200
-+++ makedefs	2007-12-13 14:30:13.000000000 -0200
-@@ -93,6 +93,12 @@
- 		;;
-   FreeBSD.5*)	SYSTYPE=FREEBSD5
- 		;;
-+  FreeBSD.6*)	SYSTYPE=FREEBSD5
-+		;;
-+  FreeBSD.7*)	SYSTYPE=FREEBSD5
-+		;;
-+  FreeBSD.8*)	SYSTYPE=FREEBSD5
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-   OpenBSD.3*)	SYSTYPE=OPENBSD3
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/files/patch-src::util::sys_defs.h b/mail/postfix21/files/patch-src::util::sys_defs.h
deleted file mode 100644
index 4323acbde64a..000000000000
--- a/mail/postfix21/files/patch-src::util::sys_defs.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/util/sys_defs.h.orig	Wed Aug 25 06:15:02 2004
-+++ ./src/util/sys_defs.h	Wed Aug 25 06:15:18 2004
-@@ -24,7 +24,7 @@
-   * 4.4BSD and close derivatives.
-   */
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
--    || defined(FREEBSD5) \
-+    || defined(FREEBSD5) || defined(FREEBSD6) \
-     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
-     || defined(OPENBSD2) || defined(OPENBSD3) \
-     || defined(NETBSD1) || defined(NETBSD2) \
diff --git a/mail/postfix21/files/postfix.sh.in b/mail/postfix21/files/postfix.sh.in
deleted file mode 100644
index a65057423de3..000000000000
--- a/mail/postfix21/files/postfix.sh.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: postfix mail
-# REQUIRE: %%REQUIRE%%
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable postfix:
-# postfix_enable (bool):	Set it to "YES" to enable postfix.
-#				Default is "NO".
-# postfix_pidfile (path):	Set full path to master.pid.
-#				Default is "/var/spool/postfix/pid/master.pid".
-# postfix_procname (command):	Set command that start master. Used to verify if
-#				postfix is running.
-#				Default is "%%PREFIX%%/libexec/postfix/master".
-#
-
-. %%RC_SUBR%%
-
-name="postfix"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-: ${postfix_enable="NO"}
-: ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
-: ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
-
-start_cmd=${name}_start
-stop_cmd=${name}_stop
-extra_commands="reload"
-
-pidfile=${postfix_pidfile}
-procname=${postfix_procname}
-
-postfix_start() {
-	%%PREFIX%%/sbin/postfix start
-}
-
-postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
-}
-
-run_rc_command "$1"
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 ab10d3b4865b..000000000000
--- a/mail/postfix21/pkg-install
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
-# will make the port/package use defaults which make postfix replace
-# sendmail as much as possible.
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
-
-if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then
-	DEFAULT_REPLACE_MAILERCONF=n
-else
-	DEFAULT_REPLACE_MAILERCONF=y
-fi
-
-if [ -x /usr/sbin/nologin ]; then
-	NOLOGIN=/usr/sbin/nologin
-else
-	NOLOGIN=/sbin/nologin
-fi
-
-ask() {
-	local question default answer
-
-	question=$1
-	default=$2
-	if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-		read -p "${question} [${default}]? " answer
-	fi
-	if [ x${answer} = x ]; then
-		answer=${default}
-	fi
-	echo ${answer}
-}
-
-yesno() {
-	local question default answer
-
-	question=$1
-	default=$2
-	while :; do
-		answer=$(ask "${question}" "${default}")
-		case "${answer}" in
-			[Yy]*)	return 0;;
-			[Nn]*)	return 1;;
-		esac
-		echo "Please answer yes or no."
-	done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-	USER=postfix
-	UID=125
-	GROUP=postfix
-	GID=125
-	GROUP2=maildrop
-	GID2=126
-
-	if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP2}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
-			echo "Added group \"${GROUP2}\"."
-		else
-			echo "Adding group \"${GROUP2}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-		echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-		echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-	else
-		echo "You need user \"${USER}\" added to group \"mail\"."
-		if yesno "Would you like me to add it" y; then
-			/usr/sbin/pw groupmod mail -m ${USER} || exit
-			echo "Done."
-		else
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	# CONF1 copied from Makefile.  Keep consistent!
-	CONF1="main.cf master.cf access aliases canonical \
-	header_checks relocated transport virtual"
-
-	for file in $CONF1; do
-		if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then
-			cp ${PKG_PREFIX}/etc/postfix/dist-$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 yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; 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
-fi
diff --git a/mail/postfix21/pkg-message b/mail/postfix21/pkg-message
deleted file mode 100644
index 3b23f15a2cac..000000000000
--- a/mail/postfix21/pkg-message
+++ /dev/null
@@ -1,25 +0,0 @@
-To enable postfix startup script please add postfix_enable="YES" in
-your rc.conf
-
-If you not need sendmail anymore, please add in your rc.conf:
-
-sendmail_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_outbound_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-And you can disable some sendmail specific daily maintenance routines in your
-/etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix21/pkg-plist b/mail/postfix21/pkg-plist
deleted file mode 100644
index 5d207a1b7c58..000000000000
--- a/mail/postfix21/pkg-plist
+++ /dev/null
@@ -1,211 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist-main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist-master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist-access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist-aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist-canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist-header_checks; then rm -f %D/etc/postfix/header_checks; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist-relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist-transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist-virtual; then rm -f %D/etc/postfix/virtual; fi
-etc/postfix/LICENSE
-etc/postfix/main.cf.default
-etc/postfix/makedefs.out
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/dist-main.cf
-etc/postfix/dist-master.cf
-etc/postfix/dist-access
-etc/postfix/dist-aliases
-etc/postfix/dist-canonical
-etc/postfix/dist-header_checks
-etc/postfix/dist-relocated
-etc/postfix/dist-transport
-etc/postfix/dist-virtual
-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/oqmgr
-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/verify
-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
-%%SUB_TEST%%sbin/qmqp-source
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-bin/rmail
-bin/newaliases
-bin/mailq
-%%PORTDOCS%%%%DOCSDIR%%/AAAREADME
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DB_README
-%%PORTDOCS%%%%DOCSDIR%%/DB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
-%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
-%%PORTDOCS%%%%SUB_SPF%%%%DOCSDIR%%/SPF_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html
-%%PORTDOCS%%%%DOCSDIR%%/access.5.html
-%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
-%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
-%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
-%%PORTDOCS%%%%DOCSDIR%%/error.8.html
-%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
-%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/local.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
-%%PORTDOCS%%%%DOCSDIR%%/master.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
-%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
-%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html
-%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg
-%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png
-%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
-%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
-%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
-%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
-%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
-%%PORTDOCS%%%%DOCSDIR%%/trace.8.html
-%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
-%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
-%%PORTDOCS%%%%DOCSDIR%%/verify.8.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/postfix
-@dirrmtry etc/postfix
diff --git a/mail/postfix21/scripts/configure.postfix b/mail/postfix21/scripts/configure.postfix
deleted file mode 100644
index 509dbf78fad4..000000000000
--- a/mail/postfix21/scripts/configure.postfix
+++ /dev/null
@@ -1,256 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.65 2007-04-14 16:45:08 mnag 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" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
-SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
-TLS		"SSL and TLS" "$status_TLS" \
-IPv6		"IPv6 support" "$status_IPv6" \
-IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
-SPF		"SPF support" "$status_SPF" \
-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" \
-DB42		"Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \
-MySQL		"MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
-VDA		"VDA (Virtual Delivery Agent)" "$status_VDA" \
-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 "
-SUB_IPV6="@comment "
-SUB_SPF="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-		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 "USE_MYSQL=YES"
-					echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-					echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-				fi
-			fi
-			SUB_SASL=""
-			;;
-		SASLKRB)
-			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
-			;;
-		SASLKRB5)
-			echo "POSTFIX_AUXLIBS+=	-lkrb5 -lcrypto -lcom_err -lasn1 -lroken"
-			;;
-		TLS)
-			echo "MAN8+=		tlsmgr.8"
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-			echo "DISTFILES+=	pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz:pfix"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.18-2.1.3-0.9.7d/pfixtls.diff"
-			echo "PATCH_STRIP=	-p1"
-			echo "TLS_SUFFIX=	+tls"
-			SUB_TLS=""
-			;;
-		DB3)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 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"
-			BDB_SELECTED="3"
-			;;
-		DB40)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 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"
-			BDB_SELECTED="40"
-			;;
-		DB41)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 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"
-			BDB_SELECTED="41"
-			;;
-		DB42)
-			if [ "X$BDB_SELECTED" != "X" ]; then
-				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			echo "LIB_DEPENDS+=	db-4.2.2:\${PORTSDIR}/databases/db42"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db42"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db42/ -ldb"
-			echo "DB_SUFFIX=	+db42"
-			BDB_SELECTED="42"
-			;;
-		MySQL)
-			echo "USE_MYSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
-			echo "MYSQL_SUFFIX=	+mysql"
-			echo "_REQUIRE+=	mysql"
-			;;
-		PgSQL)
-			echo "USE_PGSQL=YES"
-			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 "PGSQL_SUFFIX=	+pgsql"
-			echo "_REQUIRE+=	postgresql"
-			;;
-		OpenLDAP)
-			echo "USE_OPENLDAP=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap"
-			echo "_REQUIRE+=	slapd"
-			echo ".if defined(WITH_OPENLDAP_VER)"
-			echo "WANT_OPENLDAP_VER=\${WITH_OPENLDAP_VER}"
-			echo ".endif"
-			;;
-		Test)
-			echo "BINTEST=		smtp-sink smtp-source qmqp-source"
-			SUB_TEST=""
-			;;
-		IPv6)
-			if [ X$SUB_TLS = "X" ]; then
-				/usr/bin/dialog --msgbox "Select one of the IPv6 and TLS patches or select IPv6TLS patch" 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.25/"
-			echo "PATCHFILES+=	ipv6-1.25-pf-2.1.5.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "EXTRA_PATCHES+=	\${PATCHDIR}/extra_ipv6.patch"
-			echo "IPv6_SUFFIX=	+ipv6"
-			echo ""
-			IPv6SELECTED=YES
-			SUB_IPV6=""
-			;;
-		IPv6TLS)
-			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
-				/usr/bin/dialog --msgbox "Select one of the IPv6 and TLS patches or select IPv6TLS patch" 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} \${LDFLAGS} -lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.25/"
-			echo "PATCHFILES+=	tls+ipv6-1.25-pf-2.1.5.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "EXTRA_PATCHES+=	\${PATCHDIR}/extra_ipv6.patch"
-			echo "TLS_SUFFIX=	+tls+ipv6"
-			IPv6TLSSELECTED=YES
-			SUB_TLS=""
-			SUB_IPV6=""
-			;;
-		SPF)
-			if [ X$SUB_TLS = "X" -o X$IPv6TLSSELECTED != X ]; then
-				/usr/bin/dialog --msgbox "SPF patch don't apply cleany with TLS or IPv6TLS" 5 60 > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-				exit 1
-			fi
-			# see http://www.ipnet6.org/postfix/spf/
-			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2-10"
-			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	postfix-libspf2-2.1.5-5.patch"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
-			echo "SPF_SUFFIX=	+spf"
-			SUB_SPF=""
-			;;
-		VDA)
-			echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
-			echo "PATCHFILES+=	postfix-2.1.6-vda.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			;;
-		*)
-			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}\""
-echo "PLIST_SUB+=	SUB_IPV6=\"${SUB_IPV6}\""
-echo "PLIST_SUB+=	SUB_SPF=\"${SUB_SPF}\""
-
-# 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}\${SPF_SUFFIX}"
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
deleted file mode 100644
index cbd4b663cfc3..000000000000
--- a/mail/postfix22/Makefile
+++ /dev/null
@@ -1,174 +0,0 @@
-# New ports collection makefile for:	postfix
-# Date created:				18 Mar 1999
-# Whom:					torstenb
-#
-# $FreeBSD$
-#
-
-# To pre-select options in batch mode, run make like this:
-#
-#  make -DBATCH POSTFIX_OPTIONS="BDB TLS"
-#
-# 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.2.12
-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=	mnag@FreeBSD.org
-COMMENT=	A secure alternative to widely-used Sendmail
-
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-13-9].* postfix-current-2.* \
-		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
-
-NO_LATEST_LINK=	yes
-USE_SUBMAKE=	yes
-USE_RC_SUBR=	postfix.sh
-
-DEPRECATED=	Not supported anymore by vendor. Please choose a new one version.
-EXPIRATION_DATE=	2009-03-08
-
-MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
-	postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
-
-MAN5=	access.5 aliases.5 canonical.5 cidr_table.5 generic.5 header_checks.5 \
-	ldap_table.5 master.5 mysql_table.5 nisplus_table.5 pcre_table.5 \
-	pgsql_table.5 postconf.5 regexp_table.5 relocated.5 transport.5 \
-	virtual.5
-
-MAN8=	anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 lmtp.8 local.8 \
-	master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 \
-	showq.8 smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 \
-	virtual.8
-
-MLINKS=	sendmail.1 mailq.1 \
-	sendmail.1 newaliases.1 \
-	header_checks.5 body_checks.5 \
-	bounce.8 defer.8 \
-	bounce.8 trace.8
-
-CONF1=	access aliases canonical generic header_checks main.cf master.cf \
-	relocated transport virtual
-
-.if !defined(DEBUG)
-MAKEFILEFLAGS+=	DEBUG=
-.endif
-
-MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		POSTFIX_OPTIONS="${POSTFIX_OPTIONS}"
-
-# Default requirement for postfix rc script
-_REQUIRE=	DAEMON
-
-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
-
-.if defined(NOPORTDOCS)
-READMEDIR=no
-.else
-READMEDIR=${PREFIX}/share/doc/postfix
-.endif
-
-SUB_LIST+=	REQUIRE="${_REQUIRE}"
-
-pre-patch:
-	@${ECHO} "<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>" \
-		> ${WRKSRC}/html/body_checks.5.html
-	@for f in `${FIND} -P ${WRKSRC}/man -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-	@for f in `${FIND} -P ${WRKSRC}/README_FILES -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-	@for f in `${FIND} -P ${WRKSRC}/conf -type f`; do \
-		${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \
-	done
-
-post-patch:
-# All files modified with ${FILESDIR}/patch-* to use !!PREFIX!! need REINPLACE. Put below.
-	@${REINPLACE_CMD} -e "s,!!PREFIX!!,${PREFIX},g" \
-		${WRKSRC}/conf/main.cf ${WRKSRC}/src/global/mail_params.h
-
-do-configure:
-	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
-	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
-	${ECHO} "all: default" >> Makefile)
-
-pre-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-do-install:
-	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
-	config_directory=${PREFIX}/etc/postfix \
-	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}
-
-	@${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
-
-.	for f in ${BINTEST}
-		@${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/sbin
-.	endfor
-.	for f in ${MANTEST}
-		@${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MANPREFIX}/man/man1
-.	endfor
-
-	@${MKDIR} ${PREFIX}/etc/postfix/dist
-.	for f in ${CONF1}
-		${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist
-.	endfor
-
-.	if !defined(NOPORTDOCS)
-		@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR}
-		@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
-			${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
-.	endif
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# Fix compressed man pages
-	@${REINPLACE_CMD} -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/etc/postfix/postfix-files
-	@${RM} -f ${PREFIX}/etc/postfix/postfix-files.bak
-	@${CAT} ${PKGMESSAGE}
-
-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 5ffd57ada742..000000000000
--- a/mail/postfix22/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 (postfix/postfix-2.2.12.tar.gz) = e73299c07407da60a53c0cf089b4abe8
-SHA256 (postfix/postfix-2.2.12.tar.gz) = a736ed4936ad20c2b012fde699a033360c38ae6201ebb8a98d3bfaca6737d4b3
-SIZE (postfix/postfix-2.2.12.tar.gz) = 2445491
-MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115
-SHA256 (postfix/postfix-libspf2-2.2.0-5.patch) = b43c29d3424a552ea990dca8031bd4110cb49b3ecb927f6bacc4cd1442f2dbed
-SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077
-MD5 (postfix/postfix-2.2.10-vda.patch.gz) = 8237cd654eb116d35785b11de6e5ca9c
-SHA256 (postfix/postfix-2.2.10-vda.patch.gz) = 32aa3f7219e3da3bda362223ee34d6571c796f601b565de1890bce628446e0cc
-SIZE (postfix/postfix-2.2.10-vda.patch.gz) = 7799
diff --git a/mail/postfix22/files/patch-conf::main.cf b/mail/postfix22/files/patch-conf::main.cf
deleted file mode 100644
index 7e3397f23a5d..000000000000
--- a/mail/postfix22/files/patch-conf::main.cf
+++ /dev/null
@@ -1,73 +0,0 @@
---- conf/main.cf.orig	Thu Apr  6 18:26:05 2006
-+++ conf/main.cf	Thu Apr  6 18:27:10 2006
-@@ -32,13 +32,13 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.
- #
--command_directory = /usr/sbin
-+command_directory = !!PREFIX!!/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = !!PREFIX!!/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -237,7 +237,7 @@
- # 
- #mynetworks_style = class
- #mynetworks_style = subnet
--#mynetworks_style = host
-+mynetworks_style = host
- 
- # Alternatively, you can specify the mynetworks list by hand, in
- # which case Postfix ignores the mynetworks_style setting.
-@@ -608,37 +608,37 @@
- # sendmail_path: The full pathname of the Postfix sendmail command.
- # This is the Sendmail-compatible mail posting interface.
- # 
--sendmail_path =
-+sendmail_path = !!PREFIX!!/sbin/sendmail
- 
- # newaliases_path: The full pathname of the Postfix newaliases command.
- # This is the Sendmail-compatible command to build alias databases.
- #
--newaliases_path =
-+newaliases_path = !!PREFIX!!/bin/newaliases
- 
- # mailq_path: The full pathname of the Postfix mailq command.  This
- # is the Sendmail-compatible mail queue listing command.
- # 
--mailq_path =
-+mailq_path = !!PREFIX!!/bin/mailq
- 
- # setgid_group: The group for mail submission and queue management
- # commands.  This must be a group name with a numerical group ID that
- # is not shared with other accounts, not even with the Postfix account.
- #
--setgid_group =
-+setgid_group = maildrop
- 
- # html_directory: The location of the Postfix HTML documentation.
- #
--html_directory =
-+html_directory = no
- 
- # manpage_directory: The location of the Postfix on-line manual pages.
- #
--manpage_directory =
-+manpage_directory = !!PREFIX!!/man
- 
- # sample_directory: The location of the Postfix sample configuration files.
- # This parameter is obsolete as of Postfix 2.1.
- #
--sample_directory =
-+sample_directory = !!PREFIX!!/etc/postfix
- 
- # readme_directory: The location of the Postfix README files.
- #
--readme_directory =
-+readme_directory = no
diff --git a/mail/postfix22/files/patch-conf::post-install b/mail/postfix22/files/patch-conf::post-install
deleted file mode 100644
index 78401de5bdf3..000000000000
--- a/mail/postfix22/files/patch-conf::post-install
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf/post-install.orig	Thu Feb 24 08:06:08 2005
-+++ conf/post-install	Sat Mar  5 11:53:42 2005
-@@ -185,7 +185,7 @@
- 
- umask 022
- 
--PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd
-+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin
- SHELL=/bin/sh
- IFS=" 	
- "
diff --git a/mail/postfix22/files/patch-makedefs b/mail/postfix22/files/patch-makedefs
deleted file mode 100644
index e7a6437e4fd0..000000000000
--- a/mail/postfix22/files/patch-makedefs
+++ /dev/null
@@ -1,13 +0,0 @@
---- makedefs.orig	2006-01-03 19:50:25.000000000 -0200
-+++ makedefs	2007-10-22 17:00:38.000000000 -0200
-@@ -118,6 +118,10 @@
- 		;;
-   FreeBSD.6*)	SYSTYPE=FREEBSD6
- 		;;
-+  FreeBSD.7*)	SYSTYPE=FREEBSD6
-+		;;
-+  FreeBSD.8*)	SYSTYPE=FREEBSD6
-+		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-   OpenBSD.3*)	SYSTYPE=OPENBSD3
diff --git a/mail/postfix22/files/patch-src::global::mail_params.h b/mail/postfix22/files/patch-src::global::mail_params.h
deleted file mode 100644
index 52ea5e9e5c35..000000000000
--- a/mail/postfix22/files/patch-src::global::mail_params.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/global/mail_params.h.orig	Fri Feb 11 21:53:21 2005
-+++ src/global/mail_params.h	Sat Mar  5 11:53:42 2005
-@@ -64,7 +64,7 @@
- extern gid_t var_owner_gid;
- 
- #define VAR_SGID_GROUP		"setgid_group"
--#define DEF_SGID_GROUP		"postdrop"
-+#define DEF_SGID_GROUP		"maildrop"
- extern char *var_sgid_group;
- extern gid_t var_sgid_gid;
- 
-@@ -221,7 +221,7 @@
-   */
- #define VAR_DAEMON_DIR		"daemon_directory"
- #ifndef DEF_DAEMON_DIR
--#define DEF_DAEMON_DIR		"/usr/libexec/postfix"
-+#define DEF_DAEMON_DIR		"!!PREFIX!!/libexec/postfix"
- #endif
- extern char *var_daemon_dir;
- 
-@@ -250,7 +250,7 @@
-   */
- #define VAR_CONFIG_DIR		"config_directory"
- #ifndef DEF_CONFIG_DIR
--#define DEF_CONFIG_DIR		"/etc/postfix"
-+#define DEF_CONFIG_DIR		"!!PREFIX!!/etc/postfix"
- #endif
- extern char *var_config_dir;
- 
diff --git a/mail/postfix22/files/postfix.sh.in b/mail/postfix22/files/postfix.sh.in
deleted file mode 100644
index a65057423de3..000000000000
--- a/mail/postfix22/files/postfix.sh.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: postfix mail
-# REQUIRE: %%REQUIRE%%
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable postfix:
-# postfix_enable (bool):	Set it to "YES" to enable postfix.
-#				Default is "NO".
-# postfix_pidfile (path):	Set full path to master.pid.
-#				Default is "/var/spool/postfix/pid/master.pid".
-# postfix_procname (command):	Set command that start master. Used to verify if
-#				postfix is running.
-#				Default is "%%PREFIX%%/libexec/postfix/master".
-#
-
-. %%RC_SUBR%%
-
-name="postfix"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-: ${postfix_enable="NO"}
-: ${postfix_pidfile="/var/spool/postfix/pid/master.pid"}
-: ${postfix_procname="%%PREFIX%%/libexec/postfix/master"}
-
-start_cmd=${name}_start
-stop_cmd=${name}_stop
-extra_commands="reload"
-
-pidfile=${postfix_pidfile}
-procname=${postfix_procname}
-
-postfix_start() {
-	%%PREFIX%%/sbin/postfix start
-}
-
-postfix_stop() {
-	%%PREFIX%%/sbin/postfix stop
-}
-
-run_rc_command "$1"
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 30b1a214b64e..000000000000
--- a/mail/postfix22/pkg-install
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD$
-#
-
-# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
-# will make the port/package use defaults which make postfix replace
-# sendmail as much as possible.
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
-
-if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then
-	DEFAULT_REPLACE_MAILERCONF=n
-else
-	DEFAULT_REPLACE_MAILERCONF=y
-fi
-
-if [ -x /usr/sbin/nologin ]; then
-	NOLOGIN=/usr/sbin/nologin
-else
-	NOLOGIN=/sbin/nologin
-fi
-
-ask() {
-	local question default answer
-
-	question=$1
-	default=$2
-	if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
-		read -p "${question} [${default}]? " answer
-	fi
-	if [ x${answer} = x ]; then
-		answer=${default}
-	fi
-	echo ${answer}
-}
-
-yesno() {
-	local question default answer
-
-	question=$1
-	default=$2
-	while :; do
-		answer=$(ask "${question}" "${default}")
-		case "${answer}" in
-			[Yy]*)	return 0;;
-			[Nn]*)	return 1;;
-		esac
-		echo "Please answer yes or no."
-	done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-	USER=postfix
-	UID=125
-	GROUP=postfix
-	GID=125
-	GROUP2=maildrop
-	GID2=126
-
-	if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP} -g ${GID}
-		then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP2}\", so I will use it."
-	else
-		if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
-			echo "Added group \"${GROUP2}\"."
-		else
-			echo "Adding group \"${GROUP2}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-		 echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-
-	if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
-		echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
-	else
-		echo "You need user \"${USER}\" added to group \"mail\"."
-		if yesno "Would you like me to add it" y; then
-			/usr/sbin/pw groupmod mail -m ${USER} || exit
-			echo "Done."
-		else
-			echo "Please create it, and try again."
-			exit 1
-		fi
-	fi
-fi
-
-if [ x"$2" = xPOST-INSTALL ]; then
-	if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then
-		for file in ${PKG_PREFIX}/etc/postfix/dist/*; do
-			if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then
-				cp $file ${PKG_PREFIX}/etc/postfix/
-			fi
-		done
-	fi
-
-	/bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \
-	config_directory=${PKG_PREFIX}/etc/postfix \
-	daemon_directory=${PKG_PREFIX}/libexec/postfix \
-	command_directory=${PKG_PREFIX}/sbin \
-	queue_directory=/var/spool/postfix \
-	sendmail_path=${PKG_PREFIX}/sbin/sendmail \
-	newaliases_path=${PKG_PREFIX}/bin/newaliases \
-	mailq_path=${PKG_PREFIX}/bin/mailq \
-	mail_owner=postfix \
-	setgid_group=maildrop \
-	manpage_directory=${PKG_PREFIX}/man \
-	sample_directory=${PKG_PREFIX}/etc/postfix \
-	readme_directory=no \
-	upgrade-package
-fi
-# readme_directory is "no" above since the package will have correct perms
-# already, and we don't know if they had PORTDOCS.
-
-replace() {
-	local orig repl
-
-	orig=$1
-	repl=$2
-	if [ -e ${orig} ]; then
-		/bin/mv -f ${orig} ${orig}.OFF
-		/bin/chmod 0 ${orig}.OFF
-	fi
-	if [ -e ${repl} ]; then
-		/bin/ln -s ${repl} ${orig}
-	fi
-}
-
-if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
-	if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
-		mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
-		echo "#"						>  /etc/mail/mailer.conf
-		echo -n "# Execute the Postfix sendmail program"	>> /etc/mail/mailer.conf
-		echo ", named ${PKG_PREFIX}/sbin/sendmail"		>> /etc/mail/mailer.conf
-		echo "#"						>> /etc/mail/mailer.conf
-		echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-		echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-		echo "mailq	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-		echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>> /etc/mail/mailer.conf
-	fi
-fi
diff --git a/mail/postfix22/pkg-message b/mail/postfix22/pkg-message
deleted file mode 100644
index 3b23f15a2cac..000000000000
--- a/mail/postfix22/pkg-message
+++ /dev/null
@@ -1,25 +0,0 @@
-To enable postfix startup script please add postfix_enable="YES" in
-your rc.conf
-
-If you not need sendmail anymore, please add in your rc.conf:
-
-sendmail_enable="NO"
-sendmail_submit_enable="NO"
-sendmail_outbound_enable="NO"
-sendmail_msp_queue_enable="NO"
-
-And you can disable some sendmail specific daily maintenance routines in your
-/etc/periodic.conf file:
-
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"
-
-If you are using SASL, you need to make sure that postfix has access to read
-the sasldb file.  This is accomplished by adding postfix to group mail and
-making the /usr/local/etc/sasldb* file(s) readable by group mail (this should
-be the default for new installs).
-
-If you are upgrading from postfix version prior to 2.0, please see the README
-files for recommended changes to your configuration.
diff --git a/mail/postfix22/pkg-plist b/mail/postfix22/pkg-plist
deleted file mode 100644
index 779dff1908ea..000000000000
--- a/mail/postfix22/pkg-plist
+++ /dev/null
@@ -1,234 +0,0 @@
-@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi
-@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi
-@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi
-@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi
-@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi
-@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi
-@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi
-@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi
-@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi
-@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi
-etc/postfix/LICENSE
-etc/postfix/TLS_LICENSE
-etc/postfix/main.cf.default
-etc/postfix/makedefs.out
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/dist/main.cf
-etc/postfix/dist/master.cf
-etc/postfix/dist/access
-etc/postfix/dist/aliases
-etc/postfix/dist/canonical
-etc/postfix/dist/header_checks
-etc/postfix/dist/relocated
-etc/postfix/dist/transport
-etc/postfix/dist/virtual
-etc/postfix/dist/generic
-libexec/postfix/anvil
-libexec/postfix/bounce
-libexec/postfix/cleanup
-libexec/postfix/discard
-libexec/postfix/error
-libexec/postfix/flush
-libexec/postfix/lmtp
-libexec/postfix/local
-libexec/postfix/master
-libexec/postfix/nqmgr
-libexec/postfix/oqmgr
-libexec/postfix/pickup
-libexec/postfix/pipe
-libexec/postfix/proxymap
-libexec/postfix/qmgr
-libexec/postfix/qmqpd
-libexec/postfix/scache
-libexec/postfix/showq
-libexec/postfix/smtp
-libexec/postfix/smtpd
-libexec/postfix/spawn
-libexec/postfix/trivial-rewrite
-libexec/postfix/verify
-libexec/postfix/virtual
-libexec/postfix/tlsmgr
-sbin/postalias
-sbin/postcat
-sbin/postconf
-sbin/postdrop
-sbin/postfix
-sbin/postkick
-sbin/postlock
-sbin/postlog
-sbin/postmap
-sbin/postqueue
-sbin/postsuper
-sbin/sendmail
-%%SUB_TEST%%sbin/qmqp-sink
-%%SUB_TEST%%sbin/qmqp-source
-%%SUB_TEST%%sbin/smtp-sink
-%%SUB_TEST%%sbin/smtp-source
-bin/rmail
-bin/newaliases
-bin/mailq
-%%PORTDOCS%%%%DOCSDIR%%/AAAREADME
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README
-%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README
-%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
-%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
-%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DB_README
-%%PORTDOCS%%%%DOCSDIR%%/DB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
-%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README
-%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README
-%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
-%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
-%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README
-%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
-%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
-%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README
-%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
-%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README
-%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW
-%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
-%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README
-%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
-%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README
-%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
-%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
-%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README
-%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README
-%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README
-%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
-%%PORTDOCS%%%%SUB_SPF%%%%DOCSDIR%%/SPF_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
-%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README
-%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
-%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README
-%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README
-%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
-%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README
-%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README
-%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html
-%%PORTDOCS%%%%DOCSDIR%%/access.5.html
-%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
-%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html
-%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
-%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/defer.8.html
-%%PORTDOCS%%%%DOCSDIR%%/discard.8.html
-%%PORTDOCS%%%%DOCSDIR%%/error.8.html
-%%PORTDOCS%%%%DOCSDIR%%/flush.8.html
-%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/local.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
-%%PORTDOCS%%%%DOCSDIR%%/master.5.html
-%%PORTDOCS%%%%DOCSDIR%%/master.8.html
-%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
-%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
-%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
-%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html
-%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg
-%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html
-%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png
-%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
-%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
-%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
-%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
-%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
-%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
-%%PORTDOCS%%%%DOCSDIR%%/scache.8.html
-%%PORTDOCS%%%%DOCSDIR%%/showq.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html
-%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
-%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
-%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
-%%PORTDOCS%%%%DOCSDIR%%/trace.8.html
-%%PORTDOCS%%%%DOCSDIR%%/transport.5.html
-%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
-%%PORTDOCS%%%%DOCSDIR%%/verify.8.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
-%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
-%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
-%%PORTDOCS%%%%DOCSDIR%%/generic.5.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/postfix
-@dirrm etc/postfix/dist
-@dirrmtry etc/postfix
diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix
deleted file mode 100644
index 72fe0afd9e5d..000000000000
--- a/mail/postfix22/scripts/configure.postfix
+++ /dev/null
@@ -1,205 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.76 2007-04-14 16:45:08 mnag Exp $
-
-if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`/usr/bin/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" \
-SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
-SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
-SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
-SASLKRB5MIT	"If your SASL requires MIT Kerberos5 select this option" "$status_SASLKRB5MIT" \
-SPF		"SPF support" "$status_SPF" \
-TLS		"SSL and TLS" "$status_TLS" \
-BDB		"Berkeley DB (select version using WITH_BDB_VER variable)" "$status_BDB" \
-MySQL		"MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
-PgSQL		"PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
-CDB		"CDB map lookups" "$status_CDB" \
-NIS		"NIS map lookups" "$status_NIS" \
-VDA		"VDA (Virtual Delivery Agent)" "$status_VDA" \
-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_TEST="@comment "
-SUB_SPF="@comment "
-
-while [ "$1" ]; do
-	case $1 in
-		NOPCRE)
-			echo "WITHOUT_PCRE=	yes"
-			echo "NOPCRE_SUFFIX=	+nopcre"
-			SUB_NOPCRE=""
-			;;
-		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 ${LOCALBASE}/lib/libsasl2.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then
-					SASL_USE_MYSQL="YES"
-				fi
-			fi
-			;;
-		SASLKRB)
-			echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-			;;
-		SASLKRB5)
-			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
-			;;
-		SASLKRB5MIT)
-			echo "LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5"
-			echo "POSTFIX_AUXLIBS+= -Wl,--rpath,\$\${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err"
-			;;
-		SPF)
-			# see http://www.ipnet6.org/postfix/spf/
-			echo "LIB_DEPENDS+=	spf2.1:\${PORTSDIR}/mail/libspf2-10"
-			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	postfix-libspf2-2.2.0-5.patch"
-			echo "PATCH_DIST_STRIP=	-p1"
-			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include"
-			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lspf2"
-			echo "SPF_SUFFIX=	+spf"
-			echo ""
-			SUB_SPF=""
-			;;
-		TLS)
-			echo "USE_OPENSSL=	yes"
-			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
-			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-			echo "TLS_SUFFIX=	+tls"
-			;;
-		BDB)
-			echo "USE_BDB=		yes"
-			echo "POSTFIX_CCARGS+=	-I\${BDB_INCLUDE_DIR}"
-			echo "POSTFIX_AUXLIBS+=	-L\${BDB_LIB_DIR} -l\${BDB_LIB_NAME}"
-			echo "DB_SUFFIX=	+${BDB_LIB_NAME}"
-			;;
-		MySQL)
-			echo "USE_MYSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
-			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
-					echo "USE_OPENSSL=	yes"
-					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-				fi
-			fi
-			echo "MYSQL_SUFFIX=	+mysql"
-			echo "_REQUIRE+=	mysql"
-			MYSQL_SELECTED="YES"
-			;;
-		PgSQL)
-			echo "USE_PGSQL=YES"
-			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 "PGSQL_SUFFIX=	+pgsql"
-			echo "_REQUIRE+=	postgresql"
-			;;
-		OpenLDAP)
-			echo "USE_OPENLDAP=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lldap -llber"
-			echo "OPENLDAP_SUFFIX=	+openldap"
-			echo "_REQUIRE+=	slapd"
-			echo ".if defined(WITH_OPENLDAP_VER)"
-			echo "WANT_OPENLDAP_VER=\${WITH_OPENLDAP_VER}"
-			echo ".endif"
-			;;
-		CDB)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libcdb.a:\${PORTSDIR}/databases/tinycdb"
-			echo "POSTFIX_CCARGS+=	-DHAS_CDB -I\${LOCALBASE}/include"
- 			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lcdb"
-			echo "CDB_SUFFIX=	+cdb"
-			;;
-		NIS)
-			echo "POSTFIX_CCARGS+=	-DHAS_NIS"
-			echo "NIS_SUFFIX=	+nis"
-			echo "_REQUIRE+=	ypserv"
-			;;
-		VDA)
-			echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
-			echo "PATCHFILES+=	postfix-2.2.10-vda.patch.gz"
-			echo "PATCH_DIST_STRIP=	-p1"
-			;;
-		Test)
-			echo "BINTEST=		qmqp-sink qmqp-source smtp-sink smtp-source"
-			echo "MANTEST=		qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1"
-			echo "MAN1+=		\${MANTEST}"
-			SUB_TEST=""
-			;;
-		*)
-			echo "Unknown option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-if [ -z "${BATCH}" ]; then
-	if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then
-		/usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr
-		if [ $? = 0 ]; then
-			echo "USE_MYSQL=YES"
-			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
-			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
-				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
-					echo "USE_OPENSSL=	yes"
-					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} \${LDFLAGS} -lssl -lcrypto"
-				fi
-			fi
-		fi
-	fi
-fi
-
-echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
-echo "PLIST_SUB+=	SUB_SPF=\"${SUB_SPF}\""
-
-# 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}\${NIS_SUFFIX}\${SPF_SUFFIX}"