10 files changed, 55 insertions, 50 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 9b0ef79fc94f..c58c31083ab8 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	2.6.2
-PORTREVISION=	1
+PORTVERSION=	2.6.3
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -23,6 +22,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	sahil@tandon.net
 COMMENT=	A secure alternative to widely-used Sendmail
 
+VDAVERSION=	2.6.2
 CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
@@ -55,9 +55,11 @@ OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
-		VDA		"VDA (Virtual Delivery Agent)"				${STATUS_VDA} \
+		VDA		"VDA (Virtual Delivery Agent 32Bit)"				${STATUS_VDA} \
 		TEST		"SMTP/LMTP test server and generator"			${STATUS_Test}
 
+.include <bsd.port.options.mk>
+
 MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
 	postlock.1 postlog.1 postmap.1 postmulti.1 postqueue.1 postsuper.1 \
 	sendmail.1 qshape.1
@@ -87,8 +89,6 @@ MAKEFILEFLAGS+=	DEBUG=
 
 MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
 
-.include <bsd.port.pre.mk>
-
 POSTFIX_CCARGS+=	-DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
 			-DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \
 			-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
@@ -195,9 +195,10 @@ POSTFIX_CCARGS+=	-DHAS_NIS
 _REQUIRE+=		ypserv
 .endif
 
+# 32Bit VDA patch (64Bit has different patch)
 .if defined(WITH_VDA)
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
-PATCHFILES+=		postfix-${PORTVERSION}-vda-ng.patch.gz
+PATCHFILES+=		postfix-${VDAVERSION}-vda-ng.patch.gz
 PATCH_DIST_STRIP=	-p1
 PLIST_SUB+=	VDA=""
 .else
@@ -321,4 +322,4 @@ post-install:
 	@${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${DAEMONDIR}/postfix-files
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 42cf7e3eb21d..13cf99a7a4b3 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,6 +1,6 @@
-MD5 (postfix/postfix-2.6.2.tar.gz) = 1f0edbd521d2b0473626f4d61e8bb4eb
-SHA256 (postfix/postfix-2.6.2.tar.gz) = 025acf080bbe279cbc6e8e6806ecd0f99af41c8ca384fcb2f7631988f73d5f7c
-SIZE (postfix/postfix-2.6.2.tar.gz) = 3323255
+MD5 (postfix/postfix-2.6.3.tar.gz) = 9810a52d7df6718b9e7258caba6bebab
+SHA256 (postfix/postfix-2.6.3.tar.gz) = 69e31fa939b92f4520f4699e1362abcb5bbbb82c10d03493c31eea237a14c26a
+SIZE (postfix/postfix-2.6.3.tar.gz) = 3324979
 MD5 (postfix/postfix-2.6.2-vda-ng.patch.gz) = 648f09acd31125c99d1bc36860e21910
 SHA256 (postfix/postfix-2.6.2-vda-ng.patch.gz) = 2e49d9320a38d5d7ca246320127186cfacc3aced9a47aeced61151ee6eb620a4
 SIZE (postfix/postfix-2.6.2-vda-ng.patch.gz) = 12661
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index 9b0ef79fc94f..c58c31083ab8 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	2.6.2
-PORTREVISION=	1
+PORTVERSION=	2.6.3
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -23,6 +22,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	sahil@tandon.net
 COMMENT=	A secure alternative to widely-used Sendmail
 
+VDAVERSION=	2.6.2
 CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
@@ -55,9 +55,11 @@ OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
-		VDA		"VDA (Virtual Delivery Agent)"				${STATUS_VDA} \
+		VDA		"VDA (Virtual Delivery Agent 32Bit)"				${STATUS_VDA} \
 		TEST		"SMTP/LMTP test server and generator"			${STATUS_Test}
 
+.include <bsd.port.options.mk>
+
 MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
 	postlock.1 postlog.1 postmap.1 postmulti.1 postqueue.1 postsuper.1 \
 	sendmail.1 qshape.1
@@ -87,8 +89,6 @@ MAKEFILEFLAGS+=	DEBUG=
 
 MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
 
-.include <bsd.port.pre.mk>
-
 POSTFIX_CCARGS+=	-DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
 			-DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \
 			-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
@@ -195,9 +195,10 @@ POSTFIX_CCARGS+=	-DHAS_NIS
 _REQUIRE+=		ypserv
 .endif
 
+# 32Bit VDA patch (64Bit has different patch)
 .if defined(WITH_VDA)
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
-PATCHFILES+=		postfix-${PORTVERSION}-vda-ng.patch.gz
+PATCHFILES+=		postfix-${VDAVERSION}-vda-ng.patch.gz
 PATCH_DIST_STRIP=	-p1
 PLIST_SUB+=	VDA=""
 .else
@@ -321,4 +322,4 @@ post-install:
 	@${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${DAEMONDIR}/postfix-files
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo
index 42cf7e3eb21d..13cf99a7a4b3 100644
--- a/mail/postfix25/distinfo
+++ b/mail/postfix25/distinfo
@@ -1,6 +1,6 @@
-MD5 (postfix/postfix-2.6.2.tar.gz) = 1f0edbd521d2b0473626f4d61e8bb4eb
-SHA256 (postfix/postfix-2.6.2.tar.gz) = 025acf080bbe279cbc6e8e6806ecd0f99af41c8ca384fcb2f7631988f73d5f7c
-SIZE (postfix/postfix-2.6.2.tar.gz) = 3323255
+MD5 (postfix/postfix-2.6.3.tar.gz) = 9810a52d7df6718b9e7258caba6bebab
+SHA256 (postfix/postfix-2.6.3.tar.gz) = 69e31fa939b92f4520f4699e1362abcb5bbbb82c10d03493c31eea237a14c26a
+SIZE (postfix/postfix-2.6.3.tar.gz) = 3324979
 MD5 (postfix/postfix-2.6.2-vda-ng.patch.gz) = 648f09acd31125c99d1bc36860e21910
 SHA256 (postfix/postfix-2.6.2-vda-ng.patch.gz) = 2e49d9320a38d5d7ca246320127186cfacc3aced9a47aeced61151ee6eb620a4
 SIZE (postfix/postfix-2.6.2-vda-ng.patch.gz) = 12661
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index 9b0ef79fc94f..c58c31083ab8 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	2.6.2
-PORTREVISION=	1
+PORTVERSION=	2.6.3
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -23,6 +22,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	sahil@tandon.net
 COMMENT=	A secure alternative to widely-used Sendmail
 
+VDAVERSION=	2.6.2
 CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
@@ -55,9 +55,11 @@ OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
-		VDA		"VDA (Virtual Delivery Agent)"				${STATUS_VDA} \
+		VDA		"VDA (Virtual Delivery Agent 32Bit)"				${STATUS_VDA} \
 		TEST		"SMTP/LMTP test server and generator"			${STATUS_Test}
 
+.include <bsd.port.options.mk>
+
 MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
 	postlock.1 postlog.1 postmap.1 postmulti.1 postqueue.1 postsuper.1 \
 	sendmail.1 qshape.1
@@ -87,8 +89,6 @@ MAKEFILEFLAGS+=	DEBUG=
 
 MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
 
-.include <bsd.port.pre.mk>
-
 POSTFIX_CCARGS+=	-DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
 			-DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \
 			-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
@@ -195,9 +195,10 @@ POSTFIX_CCARGS+=	-DHAS_NIS
 _REQUIRE+=		ypserv
 .endif
 
+# 32Bit VDA patch (64Bit has different patch)
 .if defined(WITH_VDA)
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
-PATCHFILES+=		postfix-${PORTVERSION}-vda-ng.patch.gz
+PATCHFILES+=		postfix-${VDAVERSION}-vda-ng.patch.gz
 PATCH_DIST_STRIP=	-p1
 PLIST_SUB+=	VDA=""
 .else
@@ -321,4 +322,4 @@ post-install:
 	@${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${DAEMONDIR}/postfix-files
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo
index 42cf7e3eb21d..13cf99a7a4b3 100644
--- a/mail/postfix26/distinfo
+++ b/mail/postfix26/distinfo
@@ -1,6 +1,6 @@
-MD5 (postfix/postfix-2.6.2.tar.gz) = 1f0edbd521d2b0473626f4d61e8bb4eb
-SHA256 (postfix/postfix-2.6.2.tar.gz) = 025acf080bbe279cbc6e8e6806ecd0f99af41c8ca384fcb2f7631988f73d5f7c
-SIZE (postfix/postfix-2.6.2.tar.gz) = 3323255
+MD5 (postfix/postfix-2.6.3.tar.gz) = 9810a52d7df6718b9e7258caba6bebab
+SHA256 (postfix/postfix-2.6.3.tar.gz) = 69e31fa939b92f4520f4699e1362abcb5bbbb82c10d03493c31eea237a14c26a
+SIZE (postfix/postfix-2.6.3.tar.gz) = 3324979
 MD5 (postfix/postfix-2.6.2-vda-ng.patch.gz) = 648f09acd31125c99d1bc36860e21910
 SHA256 (postfix/postfix-2.6.2-vda-ng.patch.gz) = 2e49d9320a38d5d7ca246320127186cfacc3aced9a47aeced61151ee6eb620a4
 SIZE (postfix/postfix-2.6.2-vda-ng.patch.gz) = 12661
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index 9b0ef79fc94f..c58c31083ab8 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	2.6.2
-PORTREVISION=	1
+PORTVERSION=	2.6.3
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -23,6 +22,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	sahil@tandon.net
 COMMENT=	A secure alternative to widely-used Sendmail
 
+VDAVERSION=	2.6.2
 CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
@@ -55,9 +55,11 @@ OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
-		VDA		"VDA (Virtual Delivery Agent)"				${STATUS_VDA} \
+		VDA		"VDA (Virtual Delivery Agent 32Bit)"				${STATUS_VDA} \
 		TEST		"SMTP/LMTP test server and generator"			${STATUS_Test}
 
+.include <bsd.port.options.mk>
+
 MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
 	postlock.1 postlog.1 postmap.1 postmulti.1 postqueue.1 postsuper.1 \
 	sendmail.1 qshape.1
@@ -87,8 +89,6 @@ MAKEFILEFLAGS+=	DEBUG=
 
 MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
 
-.include <bsd.port.pre.mk>
-
 POSTFIX_CCARGS+=	-DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
 			-DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \
 			-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
@@ -195,9 +195,10 @@ POSTFIX_CCARGS+=	-DHAS_NIS
 _REQUIRE+=		ypserv
 .endif
 
+# 32Bit VDA patch (64Bit has different patch)
 .if defined(WITH_VDA)
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
-PATCHFILES+=		postfix-${PORTVERSION}-vda-ng.patch.gz
+PATCHFILES+=		postfix-${VDAVERSION}-vda-ng.patch.gz
 PATCH_DIST_STRIP=	-p1
 PLIST_SUB+=	VDA=""
 .else
@@ -321,4 +322,4 @@ post-install:
 	@${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${DAEMONDIR}/postfix-files
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo
index 42cf7e3eb21d..13cf99a7a4b3 100644
--- a/mail/postfix27/distinfo
+++ b/mail/postfix27/distinfo
@@ -1,6 +1,6 @@
-MD5 (postfix/postfix-2.6.2.tar.gz) = 1f0edbd521d2b0473626f4d61e8bb4eb
-SHA256 (postfix/postfix-2.6.2.tar.gz) = 025acf080bbe279cbc6e8e6806ecd0f99af41c8ca384fcb2f7631988f73d5f7c
-SIZE (postfix/postfix-2.6.2.tar.gz) = 3323255
+MD5 (postfix/postfix-2.6.3.tar.gz) = 9810a52d7df6718b9e7258caba6bebab
+SHA256 (postfix/postfix-2.6.3.tar.gz) = 69e31fa939b92f4520f4699e1362abcb5bbbb82c10d03493c31eea237a14c26a
+SIZE (postfix/postfix-2.6.3.tar.gz) = 3324979
 MD5 (postfix/postfix-2.6.2-vda-ng.patch.gz) = 648f09acd31125c99d1bc36860e21910
 SHA256 (postfix/postfix-2.6.2-vda-ng.patch.gz) = 2e49d9320a38d5d7ca246320127186cfacc3aced9a47aeced61151ee6eb620a4
 SIZE (postfix/postfix-2.6.2-vda-ng.patch.gz) = 12661
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index 9b0ef79fc94f..c58c31083ab8 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	postfix
-PORTVERSION=	2.6.2
-PORTREVISION=	1
+PORTVERSION=	2.6.3
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -23,6 +22,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	sahil@tandon.net
 COMMENT=	A secure alternative to widely-used Sendmail
 
+VDAVERSION=	2.6.2
 CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
@@ -55,9 +55,11 @@ OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
-		VDA		"VDA (Virtual Delivery Agent)"				${STATUS_VDA} \
+		VDA		"VDA (Virtual Delivery Agent 32Bit)"				${STATUS_VDA} \
 		TEST		"SMTP/LMTP test server and generator"			${STATUS_Test}
 
+.include <bsd.port.options.mk>
+
 MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
 	postlock.1 postlog.1 postmap.1 postmulti.1 postqueue.1 postsuper.1 \
 	sendmail.1 qshape.1
@@ -87,8 +89,6 @@ MAKEFILEFLAGS+=	DEBUG=
 
 MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
 
-.include <bsd.port.pre.mk>
-
 POSTFIX_CCARGS+=	-DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
 			-DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \
 			-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
@@ -195,9 +195,10 @@ POSTFIX_CCARGS+=	-DHAS_NIS
 _REQUIRE+=		ypserv
 .endif
 
+# 32Bit VDA patch (64Bit has different patch)
 .if defined(WITH_VDA)
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
-PATCHFILES+=		postfix-${PORTVERSION}-vda-ng.patch.gz
+PATCHFILES+=		postfix-${VDAVERSION}-vda-ng.patch.gz
 PATCH_DIST_STRIP=	-p1
 PLIST_SUB+=	VDA=""
 .else
@@ -321,4 +322,4 @@ post-install:
 	@${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${DAEMONDIR}/postfix-files
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo
index 42cf7e3eb21d..13cf99a7a4b3 100644
--- a/mail/postfix28/distinfo
+++ b/mail/postfix28/distinfo
@@ -1,6 +1,6 @@
-MD5 (postfix/postfix-2.6.2.tar.gz) = 1f0edbd521d2b0473626f4d61e8bb4eb
-SHA256 (postfix/postfix-2.6.2.tar.gz) = 025acf080bbe279cbc6e8e6806ecd0f99af41c8ca384fcb2f7631988f73d5f7c
-SIZE (postfix/postfix-2.6.2.tar.gz) = 3323255
+MD5 (postfix/postfix-2.6.3.tar.gz) = 9810a52d7df6718b9e7258caba6bebab
+SHA256 (postfix/postfix-2.6.3.tar.gz) = 69e31fa939b92f4520f4699e1362abcb5bbbb82c10d03493c31eea237a14c26a
+SIZE (postfix/postfix-2.6.3.tar.gz) = 3324979
 MD5 (postfix/postfix-2.6.2-vda-ng.patch.gz) = 648f09acd31125c99d1bc36860e21910
 SHA256 (postfix/postfix-2.6.2-vda-ng.patch.gz) = 2e49d9320a38d5d7ca246320127186cfacc3aced9a47aeced61151ee6eb620a4
 SIZE (postfix/postfix-2.6.2-vda-ng.patch.gz) = 12661