24 files changed, 168 insertions, 120 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index eb05e92c6c76..c103e45f1ebe 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -16,7 +16,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.2.4
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -37,18 +37,24 @@ CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 \
-	postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
+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 body_checks.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
+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 defer.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 trace.8 trivial-rewrite.8 \
-	verify.8 virtual.8
+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
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index eefe919dab32..3485280dffd9 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -2,5 +2,5 @@ MD5 (postfix/postfix-2.2.4.tar.gz) = 77394db3a4ebe578fa453502040698ac
 SIZE (postfix/postfix-2.2.4.tar.gz) = 2427281
 MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115
 SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077
-MD5 (postfix/postfix-2.2.3-vda.patch.gz) = fcc8b7e7d94a9ce2d97453da0e6cd7c9
-SIZE (postfix/postfix-2.2.3-vda.patch.gz) = 7748
+MD5 (postfix/postfix-2.2.4-vda.patch.gz) = 7049364c6476edf80d6ff861ca37936f
+SIZE (postfix/postfix-2.2.4-vda.patch.gz) = 7712
diff --git a/mail/postfix/scripts/configure.postfix b/mail/postfix/scripts/configure.postfix
index 3c0b19e1740a..03240dff8e97 100644
--- a/mail/postfix/scripts/configure.postfix
+++ b/mail/postfix/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.62 2005-05-10 16:09:48 jylefort Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.63 2005-07-06 16:37:35 jylefort Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -211,7 +211,7 @@ while [ "$1" ]; do
 			;;
 		VDA)
 			/bin/echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
-			/bin/echo "PATCHFILES+=		postfix-2.2.3-vda.patch.gz"
+			/bin/echo "PATCHFILES+=		postfix-2.2.4-vda.patch.gz"
 			/bin/echo "PATCH_DIST_STRIP=	-p1"
 			;;
 		Test)
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index eb05e92c6c76..c103e45f1ebe 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -16,7 +16,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.2.4
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -37,18 +37,24 @@ CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 \
-	postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
+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 body_checks.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
+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 defer.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 trace.8 trivial-rewrite.8 \
-	verify.8 virtual.8
+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
diff --git a/mail/postfix22/distinfo b/mail/postfix22/distinfo
index eefe919dab32..3485280dffd9 100644
--- a/mail/postfix22/distinfo
+++ b/mail/postfix22/distinfo
@@ -2,5 +2,5 @@ MD5 (postfix/postfix-2.2.4.tar.gz) = 77394db3a4ebe578fa453502040698ac
 SIZE (postfix/postfix-2.2.4.tar.gz) = 2427281
 MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115
 SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077
-MD5 (postfix/postfix-2.2.3-vda.patch.gz) = fcc8b7e7d94a9ce2d97453da0e6cd7c9
-SIZE (postfix/postfix-2.2.3-vda.patch.gz) = 7748
+MD5 (postfix/postfix-2.2.4-vda.patch.gz) = 7049364c6476edf80d6ff861ca37936f
+SIZE (postfix/postfix-2.2.4-vda.patch.gz) = 7712
diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix
index c1a599e2e608..8fe06f2de9ae 100644
--- a/mail/postfix22/scripts/configure.postfix
+++ b/mail/postfix22/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.62 2005-05-10 16:09:48 jylefort Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.63 2005-07-06 16:37:35 jylefort Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -211,7 +211,7 @@ while [ "$1" ]; do
 			;;
 		VDA)
 			/bin/echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
-			/bin/echo "PATCHFILES+=		postfix-2.2.3-vda.patch.gz"
+			/bin/echo "PATCHFILES+=		postfix-2.2.4-vda.patch.gz"
 			/bin/echo "PATCH_DIST_STRIP=	-p1"
 			;;
 		Test)
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index eb05e92c6c76..c103e45f1ebe 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -16,7 +16,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.2.4
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -37,18 +37,24 @@ CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 \
-	postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
+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 body_checks.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
+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 defer.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 trace.8 trivial-rewrite.8 \
-	verify.8 virtual.8
+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
diff --git a/mail/postfix23/distinfo b/mail/postfix23/distinfo
index eefe919dab32..3485280dffd9 100644
--- a/mail/postfix23/distinfo
+++ b/mail/postfix23/distinfo
@@ -2,5 +2,5 @@ MD5 (postfix/postfix-2.2.4.tar.gz) = 77394db3a4ebe578fa453502040698ac
 SIZE (postfix/postfix-2.2.4.tar.gz) = 2427281
 MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115
 SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077
-MD5 (postfix/postfix-2.2.3-vda.patch.gz) = fcc8b7e7d94a9ce2d97453da0e6cd7c9
-SIZE (postfix/postfix-2.2.3-vda.patch.gz) = 7748
+MD5 (postfix/postfix-2.2.4-vda.patch.gz) = 7049364c6476edf80d6ff861ca37936f
+SIZE (postfix/postfix-2.2.4-vda.patch.gz) = 7712
diff --git a/mail/postfix23/scripts/configure.postfix b/mail/postfix23/scripts/configure.postfix
index d9a8758021e0..e1d1d1c52d83 100644
--- a/mail/postfix23/scripts/configure.postfix
+++ b/mail/postfix23/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.62 2005-05-10 16:09:48 jylefort Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.63 2005-07-06 16:37:35 jylefort Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -211,7 +211,7 @@ while [ "$1" ]; do
 			;;
 		VDA)
 			/bin/echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
-			/bin/echo "PATCHFILES+=		postfix-2.2.3-vda.patch.gz"
+			/bin/echo "PATCHFILES+=		postfix-2.2.4-vda.patch.gz"
 			/bin/echo "PATCH_DIST_STRIP=	-p1"
 			;;
 		Test)
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index eb05e92c6c76..c103e45f1ebe 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -16,7 +16,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.2.4
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -37,18 +37,24 @@ CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 \
-	postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
+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 body_checks.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
+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 defer.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 trace.8 trivial-rewrite.8 \
-	verify.8 virtual.8
+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
diff --git a/mail/postfix24/distinfo b/mail/postfix24/distinfo
index eefe919dab32..3485280dffd9 100644
--- a/mail/postfix24/distinfo
+++ b/mail/postfix24/distinfo
@@ -2,5 +2,5 @@ MD5 (postfix/postfix-2.2.4.tar.gz) = 77394db3a4ebe578fa453502040698ac
 SIZE (postfix/postfix-2.2.4.tar.gz) = 2427281
 MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115
 SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077
-MD5 (postfix/postfix-2.2.3-vda.patch.gz) = fcc8b7e7d94a9ce2d97453da0e6cd7c9
-SIZE (postfix/postfix-2.2.3-vda.patch.gz) = 7748
+MD5 (postfix/postfix-2.2.4-vda.patch.gz) = 7049364c6476edf80d6ff861ca37936f
+SIZE (postfix/postfix-2.2.4-vda.patch.gz) = 7712
diff --git a/mail/postfix24/scripts/configure.postfix b/mail/postfix24/scripts/configure.postfix
index 8a7c231063db..71991cf9b8e6 100644
--- a/mail/postfix24/scripts/configure.postfix
+++ b/mail/postfix24/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.62 2005-05-10 16:09:48 jylefort Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.63 2005-07-06 16:37:35 jylefort Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -211,7 +211,7 @@ while [ "$1" ]; do
 			;;
 		VDA)
 			/bin/echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
-			/bin/echo "PATCHFILES+=		postfix-2.2.3-vda.patch.gz"
+			/bin/echo "PATCHFILES+=		postfix-2.2.4-vda.patch.gz"
 			/bin/echo "PATCH_DIST_STRIP=	-p1"
 			;;
 		Test)
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index eb05e92c6c76..c103e45f1ebe 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -16,7 +16,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.2.4
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -37,18 +37,24 @@ CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 \
-	postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
+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 body_checks.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
+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 defer.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 trace.8 trivial-rewrite.8 \
-	verify.8 virtual.8
+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
diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo
index eefe919dab32..3485280dffd9 100644
--- a/mail/postfix25/distinfo
+++ b/mail/postfix25/distinfo
@@ -2,5 +2,5 @@ MD5 (postfix/postfix-2.2.4.tar.gz) = 77394db3a4ebe578fa453502040698ac
 SIZE (postfix/postfix-2.2.4.tar.gz) = 2427281
 MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115
 SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077
-MD5 (postfix/postfix-2.2.3-vda.patch.gz) = fcc8b7e7d94a9ce2d97453da0e6cd7c9
-SIZE (postfix/postfix-2.2.3-vda.patch.gz) = 7748
+MD5 (postfix/postfix-2.2.4-vda.patch.gz) = 7049364c6476edf80d6ff861ca37936f
+SIZE (postfix/postfix-2.2.4-vda.patch.gz) = 7712
diff --git a/mail/postfix25/scripts/configure.postfix b/mail/postfix25/scripts/configure.postfix
index 0af7c306f120..b24ecf11af85 100644
--- a/mail/postfix25/scripts/configure.postfix
+++ b/mail/postfix25/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.62 2005-05-10 16:09:48 jylefort Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.63 2005-07-06 16:37:35 jylefort Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -211,7 +211,7 @@ while [ "$1" ]; do
 			;;
 		VDA)
 			/bin/echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
-			/bin/echo "PATCHFILES+=		postfix-2.2.3-vda.patch.gz"
+			/bin/echo "PATCHFILES+=		postfix-2.2.4-vda.patch.gz"
 			/bin/echo "PATCH_DIST_STRIP=	-p1"
 			;;
 		Test)
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index eb05e92c6c76..c103e45f1ebe 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -16,7 +16,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.2.4
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -37,18 +37,24 @@ CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 \
-	postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
+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 body_checks.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
+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 defer.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 trace.8 trivial-rewrite.8 \
-	verify.8 virtual.8
+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
diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo
index eefe919dab32..3485280dffd9 100644
--- a/mail/postfix26/distinfo
+++ b/mail/postfix26/distinfo
@@ -2,5 +2,5 @@ MD5 (postfix/postfix-2.2.4.tar.gz) = 77394db3a4ebe578fa453502040698ac
 SIZE (postfix/postfix-2.2.4.tar.gz) = 2427281
 MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115
 SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077
-MD5 (postfix/postfix-2.2.3-vda.patch.gz) = fcc8b7e7d94a9ce2d97453da0e6cd7c9
-SIZE (postfix/postfix-2.2.3-vda.patch.gz) = 7748
+MD5 (postfix/postfix-2.2.4-vda.patch.gz) = 7049364c6476edf80d6ff861ca37936f
+SIZE (postfix/postfix-2.2.4-vda.patch.gz) = 7712
diff --git a/mail/postfix26/scripts/configure.postfix b/mail/postfix26/scripts/configure.postfix
index 2636901ddb94..e34694ca7318 100644
--- a/mail/postfix26/scripts/configure.postfix
+++ b/mail/postfix26/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.62 2005-05-10 16:09:48 jylefort Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.63 2005-07-06 16:37:35 jylefort Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -211,7 +211,7 @@ while [ "$1" ]; do
 			;;
 		VDA)
 			/bin/echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
-			/bin/echo "PATCHFILES+=		postfix-2.2.3-vda.patch.gz"
+			/bin/echo "PATCHFILES+=		postfix-2.2.4-vda.patch.gz"
 			/bin/echo "PATCH_DIST_STRIP=	-p1"
 			;;
 		Test)
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index eb05e92c6c76..c103e45f1ebe 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -16,7 +16,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.2.4
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -37,18 +37,24 @@ CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 \
-	postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
+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 body_checks.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
+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 defer.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 trace.8 trivial-rewrite.8 \
-	verify.8 virtual.8
+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
diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo
index eefe919dab32..3485280dffd9 100644
--- a/mail/postfix27/distinfo
+++ b/mail/postfix27/distinfo
@@ -2,5 +2,5 @@ MD5 (postfix/postfix-2.2.4.tar.gz) = 77394db3a4ebe578fa453502040698ac
 SIZE (postfix/postfix-2.2.4.tar.gz) = 2427281
 MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115
 SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077
-MD5 (postfix/postfix-2.2.3-vda.patch.gz) = fcc8b7e7d94a9ce2d97453da0e6cd7c9
-SIZE (postfix/postfix-2.2.3-vda.patch.gz) = 7748
+MD5 (postfix/postfix-2.2.4-vda.patch.gz) = 7049364c6476edf80d6ff861ca37936f
+SIZE (postfix/postfix-2.2.4-vda.patch.gz) = 7712
diff --git a/mail/postfix27/scripts/configure.postfix b/mail/postfix27/scripts/configure.postfix
index 5107cb3bbaf0..c746de5f9f6e 100644
--- a/mail/postfix27/scripts/configure.postfix
+++ b/mail/postfix27/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.62 2005-05-10 16:09:48 jylefort Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.63 2005-07-06 16:37:35 jylefort Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -211,7 +211,7 @@ while [ "$1" ]; do
 			;;
 		VDA)
 			/bin/echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
-			/bin/echo "PATCHFILES+=		postfix-2.2.3-vda.patch.gz"
+			/bin/echo "PATCHFILES+=		postfix-2.2.4-vda.patch.gz"
 			/bin/echo "PATCH_DIST_STRIP=	-p1"
 			;;
 		Test)
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index eb05e92c6c76..c103e45f1ebe 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -16,7 +16,7 @@
 
 PORTNAME=	postfix
 PORTVERSION=	2.2.4
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -37,18 +37,24 @@ CONFLICTS=	courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
-MAN1=	mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 \
-	postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1
+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 body_checks.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
+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 defer.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 trace.8 trivial-rewrite.8 \
-	verify.8 virtual.8
+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
diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo
index eefe919dab32..3485280dffd9 100644
--- a/mail/postfix28/distinfo
+++ b/mail/postfix28/distinfo
@@ -2,5 +2,5 @@ MD5 (postfix/postfix-2.2.4.tar.gz) = 77394db3a4ebe578fa453502040698ac
 SIZE (postfix/postfix-2.2.4.tar.gz) = 2427281
 MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115
 SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077
-MD5 (postfix/postfix-2.2.3-vda.patch.gz) = fcc8b7e7d94a9ce2d97453da0e6cd7c9
-SIZE (postfix/postfix-2.2.3-vda.patch.gz) = 7748
+MD5 (postfix/postfix-2.2.4-vda.patch.gz) = 7049364c6476edf80d6ff861ca37936f
+SIZE (postfix/postfix-2.2.4-vda.patch.gz) = 7712
diff --git a/mail/postfix28/scripts/configure.postfix b/mail/postfix28/scripts/configure.postfix
index 23400ea72deb..e8b2cc11549a 100644
--- a/mail/postfix28/scripts/configure.postfix
+++ b/mail/postfix28/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.62 2005-05-10 16:09:48 jylefort Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.63 2005-07-06 16:37:35 jylefort Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -211,7 +211,7 @@ while [ "$1" ]; do
 			;;
 		VDA)
 			/bin/echo "PATCH_SITES+=	http://web.onda.com.br/nadal/postfix/VDA/"
-			/bin/echo "PATCHFILES+=		postfix-2.2.3-vda.patch.gz"
+			/bin/echo "PATCHFILES+=		postfix-2.2.4-vda.patch.gz"
 			/bin/echo "PATCH_DIST_STRIP=	-p1"
 			;;
 		Test)