33 files changed, 132 insertions, 187 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 0d4cc9cedc7b..5acef00fe967 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.12
+PORTVERSION=	2.0.13
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -29,7 +29,7 @@ DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
+COMMENT=	A secure alternative to widely-used Sendmail
 
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index fcef28da48f1..1a4d11248e8e 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.12.tar.gz) = 94ce611b6f3e169caee2b4634c6b5370
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.12.patch.gz) = 54549f53e22765dc92ffac0e67998964
-MD5 (postfix/ipv6-1.15-pf-2.0.12.patch.gz) = 55f89bd48b33334f85645adc43a1b4f1
+MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
 MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
+MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
+MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
diff --git a/mail/postfix/scripts/configure.postfix b/mail/postfix/scripts/configure.postfix
index 4022fc1d8fd5..6903b19e3655 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.35 2003-06-27 17:41:09 obraun Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.36 2003-07-02 11:23:10 daichi Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -22,6 +22,7 @@ Please select desired options:" -1 -1 16 \
 NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
 SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
 SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
+SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 TLS		"SSL and TLS" "$status_TLS" \
 IPv6		"IPv6 support" "$status_IPv6" \
 IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
@@ -80,13 +81,7 @@ while [ "$1" ]; do
                                         echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
                                         echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                                 fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                         fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
                         SUB_SASL=""
                         ;;
 		SASL2)
@@ -99,15 +94,15 @@ while [ "$1" ]; do
 					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			fi
 			echo ".if exists(/usr/lib/libkrb.a)"
 			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
+		SASLKRB)
+                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
+			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
 			echo "USE_OPENSSL=	yes"
@@ -210,7 +205,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -227,7 +222,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index 0d4cc9cedc7b..5acef00fe967 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.12
+PORTVERSION=	2.0.13
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -29,7 +29,7 @@ DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
+COMMENT=	A secure alternative to widely-used Sendmail
 
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/mail/postfix1/distinfo b/mail/postfix1/distinfo
index fcef28da48f1..1a4d11248e8e 100644
--- a/mail/postfix1/distinfo
+++ b/mail/postfix1/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.12.tar.gz) = 94ce611b6f3e169caee2b4634c6b5370
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.12.patch.gz) = 54549f53e22765dc92ffac0e67998964
-MD5 (postfix/ipv6-1.15-pf-2.0.12.patch.gz) = 55f89bd48b33334f85645adc43a1b4f1
+MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
 MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
+MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
+MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
diff --git a/mail/postfix1/scripts/configure.postfix b/mail/postfix1/scripts/configure.postfix
index a5c8fb60ffb3..0d1ae33a3575 100644
--- a/mail/postfix1/scripts/configure.postfix
+++ b/mail/postfix1/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix1/scripts/Attic/configure.postfix,v 1.35 2003-06-27 17:41:09 obraun Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix1/scripts/Attic/configure.postfix,v 1.36 2003-07-02 11:23:10 daichi Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -22,6 +22,7 @@ Please select desired options:" -1 -1 16 \
 NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
 SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
 SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
+SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 TLS		"SSL and TLS" "$status_TLS" \
 IPv6		"IPv6 support" "$status_IPv6" \
 IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
@@ -80,13 +81,7 @@ while [ "$1" ]; do
                                         echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
                                         echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                                 fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                         fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
                         SUB_SASL=""
                         ;;
 		SASL2)
@@ -99,15 +94,15 @@ while [ "$1" ]; do
 					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			fi
 			echo ".if exists(/usr/lib/libkrb.a)"
 			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
+		SASLKRB)
+                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
+			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
 			echo "USE_OPENSSL=	yes"
@@ -210,7 +205,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -227,7 +222,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index 0d4cc9cedc7b..5acef00fe967 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.12
+PORTVERSION=	2.0.13
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -29,7 +29,7 @@ DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
+COMMENT=	A secure alternative to widely-used Sendmail
 
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/mail/postfix20/distinfo b/mail/postfix20/distinfo
index fcef28da48f1..1a4d11248e8e 100644
--- a/mail/postfix20/distinfo
+++ b/mail/postfix20/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.12.tar.gz) = 94ce611b6f3e169caee2b4634c6b5370
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.12.patch.gz) = 54549f53e22765dc92ffac0e67998964
-MD5 (postfix/ipv6-1.15-pf-2.0.12.patch.gz) = 55f89bd48b33334f85645adc43a1b4f1
+MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
 MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
+MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
+MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
diff --git a/mail/postfix20/scripts/configure.postfix b/mail/postfix20/scripts/configure.postfix
index f9f652c59e62..555b6fcf3e6f 100644
--- a/mail/postfix20/scripts/configure.postfix
+++ b/mail/postfix20/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.35 2003-06-27 17:41:09 obraun Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.36 2003-07-02 11:23:10 daichi Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -22,6 +22,7 @@ Please select desired options:" -1 -1 16 \
 NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
 SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
 SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
+SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 TLS		"SSL and TLS" "$status_TLS" \
 IPv6		"IPv6 support" "$status_IPv6" \
 IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
@@ -80,13 +81,7 @@ while [ "$1" ]; do
                                         echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
                                         echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                                 fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                         fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
                         SUB_SASL=""
                         ;;
 		SASL2)
@@ -99,15 +94,15 @@ while [ "$1" ]; do
 					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			fi
 			echo ".if exists(/usr/lib/libkrb.a)"
 			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
+		SASLKRB)
+                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
+			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
 			echo "USE_OPENSSL=	yes"
@@ -210,7 +205,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -227,7 +222,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index 0d4cc9cedc7b..5acef00fe967 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.12
+PORTVERSION=	2.0.13
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -29,7 +29,7 @@ DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
+COMMENT=	A secure alternative to widely-used Sendmail
 
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/mail/postfix21/distinfo b/mail/postfix21/distinfo
index fcef28da48f1..1a4d11248e8e 100644
--- a/mail/postfix21/distinfo
+++ b/mail/postfix21/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.12.tar.gz) = 94ce611b6f3e169caee2b4634c6b5370
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.12.patch.gz) = 54549f53e22765dc92ffac0e67998964
-MD5 (postfix/ipv6-1.15-pf-2.0.12.patch.gz) = 55f89bd48b33334f85645adc43a1b4f1
+MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
 MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
+MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
+MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
diff --git a/mail/postfix21/scripts/configure.postfix b/mail/postfix21/scripts/configure.postfix
index b1828569657d..7f164b089235 100644
--- a/mail/postfix21/scripts/configure.postfix
+++ b/mail/postfix21/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.35 2003-06-27 17:41:09 obraun Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.36 2003-07-02 11:23:10 daichi Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -22,6 +22,7 @@ Please select desired options:" -1 -1 16 \
 NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
 SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
 SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
+SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 TLS		"SSL and TLS" "$status_TLS" \
 IPv6		"IPv6 support" "$status_IPv6" \
 IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
@@ -80,13 +81,7 @@ while [ "$1" ]; do
                                         echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
                                         echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                                 fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                         fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
                         SUB_SASL=""
                         ;;
 		SASL2)
@@ -99,15 +94,15 @@ while [ "$1" ]; do
 					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			fi
 			echo ".if exists(/usr/lib/libkrb.a)"
 			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
+		SASLKRB)
+                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
+			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
 			echo "USE_OPENSSL=	yes"
@@ -210,7 +205,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -227,7 +222,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index 0d4cc9cedc7b..5acef00fe967 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.12
+PORTVERSION=	2.0.13
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -29,7 +29,7 @@ DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
+COMMENT=	A secure alternative to widely-used Sendmail
 
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/mail/postfix22/distinfo b/mail/postfix22/distinfo
index fcef28da48f1..1a4d11248e8e 100644
--- a/mail/postfix22/distinfo
+++ b/mail/postfix22/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.12.tar.gz) = 94ce611b6f3e169caee2b4634c6b5370
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.12.patch.gz) = 54549f53e22765dc92ffac0e67998964
-MD5 (postfix/ipv6-1.15-pf-2.0.12.patch.gz) = 55f89bd48b33334f85645adc43a1b4f1
+MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
 MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
+MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
+MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix
index 8c01907e1b8d..9e673a578a78 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.35 2003-06-27 17:41:09 obraun Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.36 2003-07-02 11:23:10 daichi Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -22,6 +22,7 @@ Please select desired options:" -1 -1 16 \
 NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
 SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
 SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
+SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 TLS		"SSL and TLS" "$status_TLS" \
 IPv6		"IPv6 support" "$status_IPv6" \
 IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
@@ -80,13 +81,7 @@ while [ "$1" ]; do
                                         echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
                                         echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                                 fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                         fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
                         SUB_SASL=""
                         ;;
 		SASL2)
@@ -99,15 +94,15 @@ while [ "$1" ]; do
 					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			fi
 			echo ".if exists(/usr/lib/libkrb.a)"
 			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
+		SASLKRB)
+                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
+			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
 			echo "USE_OPENSSL=	yes"
@@ -210,7 +205,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -227,7 +222,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index 0d4cc9cedc7b..5acef00fe967 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.12
+PORTVERSION=	2.0.13
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -29,7 +29,7 @@ DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
+COMMENT=	A secure alternative to widely-used Sendmail
 
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/mail/postfix23/distinfo b/mail/postfix23/distinfo
index fcef28da48f1..1a4d11248e8e 100644
--- a/mail/postfix23/distinfo
+++ b/mail/postfix23/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.12.tar.gz) = 94ce611b6f3e169caee2b4634c6b5370
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.12.patch.gz) = 54549f53e22765dc92ffac0e67998964
-MD5 (postfix/ipv6-1.15-pf-2.0.12.patch.gz) = 55f89bd48b33334f85645adc43a1b4f1
+MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
 MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
+MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
+MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
diff --git a/mail/postfix23/scripts/configure.postfix b/mail/postfix23/scripts/configure.postfix
index fe2cbf071697..6354d5273577 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.35 2003-06-27 17:41:09 obraun Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.36 2003-07-02 11:23:10 daichi Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -22,6 +22,7 @@ Please select desired options:" -1 -1 16 \
 NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
 SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
 SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
+SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 TLS		"SSL and TLS" "$status_TLS" \
 IPv6		"IPv6 support" "$status_IPv6" \
 IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
@@ -80,13 +81,7 @@ while [ "$1" ]; do
                                         echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
                                         echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                                 fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                         fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
                         SUB_SASL=""
                         ;;
 		SASL2)
@@ -99,15 +94,15 @@ while [ "$1" ]; do
 					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			fi
 			echo ".if exists(/usr/lib/libkrb.a)"
 			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
+		SASLKRB)
+                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
+			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
 			echo "USE_OPENSSL=	yes"
@@ -210,7 +205,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -227,7 +222,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index 0d4cc9cedc7b..5acef00fe967 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.12
+PORTVERSION=	2.0.13
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -29,7 +29,7 @@ DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
+COMMENT=	A secure alternative to widely-used Sendmail
 
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/mail/postfix24/distinfo b/mail/postfix24/distinfo
index fcef28da48f1..1a4d11248e8e 100644
--- a/mail/postfix24/distinfo
+++ b/mail/postfix24/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.12.tar.gz) = 94ce611b6f3e169caee2b4634c6b5370
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.12.patch.gz) = 54549f53e22765dc92ffac0e67998964
-MD5 (postfix/ipv6-1.15-pf-2.0.12.patch.gz) = 55f89bd48b33334f85645adc43a1b4f1
+MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
 MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
+MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
+MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
diff --git a/mail/postfix24/scripts/configure.postfix b/mail/postfix24/scripts/configure.postfix
index 450f8000f3db..d6b7c797be0c 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.35 2003-06-27 17:41:09 obraun Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.36 2003-07-02 11:23:10 daichi Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -22,6 +22,7 @@ Please select desired options:" -1 -1 16 \
 NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
 SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
 SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
+SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 TLS		"SSL and TLS" "$status_TLS" \
 IPv6		"IPv6 support" "$status_IPv6" \
 IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
@@ -80,13 +81,7 @@ while [ "$1" ]; do
                                         echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
                                         echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                                 fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                         fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
                         SUB_SASL=""
                         ;;
 		SASL2)
@@ -99,15 +94,15 @@ while [ "$1" ]; do
 					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			fi
 			echo ".if exists(/usr/lib/libkrb.a)"
 			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
+		SASLKRB)
+                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
+			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
 			echo "USE_OPENSSL=	yes"
@@ -210,7 +205,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -227,7 +222,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index 0d4cc9cedc7b..5acef00fe967 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.12
+PORTVERSION=	2.0.13
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -29,7 +29,7 @@ DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
+COMMENT=	A secure alternative to widely-used Sendmail
 
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo
index fcef28da48f1..1a4d11248e8e 100644
--- a/mail/postfix25/distinfo
+++ b/mail/postfix25/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.12.tar.gz) = 94ce611b6f3e169caee2b4634c6b5370
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.12.patch.gz) = 54549f53e22765dc92ffac0e67998964
-MD5 (postfix/ipv6-1.15-pf-2.0.12.patch.gz) = 55f89bd48b33334f85645adc43a1b4f1
+MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
 MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
+MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
+MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
diff --git a/mail/postfix25/scripts/configure.postfix b/mail/postfix25/scripts/configure.postfix
index 6d9fe41712ac..38658be9efe0 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.35 2003-06-27 17:41:09 obraun Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.36 2003-07-02 11:23:10 daichi Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -22,6 +22,7 @@ Please select desired options:" -1 -1 16 \
 NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
 SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
 SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
+SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 TLS		"SSL and TLS" "$status_TLS" \
 IPv6		"IPv6 support" "$status_IPv6" \
 IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
@@ -80,13 +81,7 @@ while [ "$1" ]; do
                                         echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
                                         echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                                 fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                         fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
                         SUB_SASL=""
                         ;;
 		SASL2)
@@ -99,15 +94,15 @@ while [ "$1" ]; do
 					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			fi
 			echo ".if exists(/usr/lib/libkrb.a)"
 			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
+		SASLKRB)
+                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
+			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
 			echo "USE_OPENSSL=	yes"
@@ -210,7 +205,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -227,7 +222,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index 0d4cc9cedc7b..5acef00fe967 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.12
+PORTVERSION=	2.0.13
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -29,7 +29,7 @@ DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
+COMMENT=	A secure alternative to widely-used Sendmail
 
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo
index fcef28da48f1..1a4d11248e8e 100644
--- a/mail/postfix26/distinfo
+++ b/mail/postfix26/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.12.tar.gz) = 94ce611b6f3e169caee2b4634c6b5370
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.12.patch.gz) = 54549f53e22765dc92ffac0e67998964
-MD5 (postfix/ipv6-1.15-pf-2.0.12.patch.gz) = 55f89bd48b33334f85645adc43a1b4f1
+MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
 MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
+MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
+MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
diff --git a/mail/postfix26/scripts/configure.postfix b/mail/postfix26/scripts/configure.postfix
index 54cf6497dc33..8664b5870129 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.35 2003-06-27 17:41:09 obraun Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.36 2003-07-02 11:23:10 daichi Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -22,6 +22,7 @@ Please select desired options:" -1 -1 16 \
 NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
 SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
 SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
+SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 TLS		"SSL and TLS" "$status_TLS" \
 IPv6		"IPv6 support" "$status_IPv6" \
 IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
@@ -80,13 +81,7 @@ while [ "$1" ]; do
                                         echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
                                         echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                                 fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                         fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
                         SUB_SASL=""
                         ;;
 		SASL2)
@@ -99,15 +94,15 @@ while [ "$1" ]; do
 					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			fi
 			echo ".if exists(/usr/lib/libkrb.a)"
 			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
+		SASLKRB)
+                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
+			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
 			echo "USE_OPENSSL=	yes"
@@ -210,7 +205,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -227,7 +222,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index 0d4cc9cedc7b..5acef00fe967 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.12
+PORTVERSION=	2.0.13
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -29,7 +29,7 @@ DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
+COMMENT=	A secure alternative to widely-used Sendmail
 
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo
index fcef28da48f1..1a4d11248e8e 100644
--- a/mail/postfix27/distinfo
+++ b/mail/postfix27/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.12.tar.gz) = 94ce611b6f3e169caee2b4634c6b5370
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.12.patch.gz) = 54549f53e22765dc92ffac0e67998964
-MD5 (postfix/ipv6-1.15-pf-2.0.12.patch.gz) = 55f89bd48b33334f85645adc43a1b4f1
+MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
 MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
+MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
+MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
diff --git a/mail/postfix27/scripts/configure.postfix b/mail/postfix27/scripts/configure.postfix
index 3679a7d60cb6..c127a3b5fec6 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.35 2003-06-27 17:41:09 obraun Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.36 2003-07-02 11:23:10 daichi Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -22,6 +22,7 @@ Please select desired options:" -1 -1 16 \
 NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
 SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
 SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
+SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 TLS		"SSL and TLS" "$status_TLS" \
 IPv6		"IPv6 support" "$status_IPv6" \
 IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
@@ -80,13 +81,7 @@ while [ "$1" ]; do
                                         echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
                                         echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                                 fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                         fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
                         SUB_SASL=""
                         ;;
 		SASL2)
@@ -99,15 +94,15 @@ while [ "$1" ]; do
 					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			fi
 			echo ".if exists(/usr/lib/libkrb.a)"
 			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
+		SASLKRB)
+                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
+			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
 			echo "USE_OPENSSL=	yes"
@@ -210,7 +205,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -227,7 +222,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index 0d4cc9cedc7b..5acef00fe967 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-PORTVERSION=	2.0.12
+PORTVERSION=	2.0.13
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -29,7 +29,7 @@ DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	khera@kciLink.com
-COMMENT=	An alternative to widely-used Sendmail
+COMMENT=	A secure alternative to widely-used Sendmail
 
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo
index fcef28da48f1..1a4d11248e8e 100644
--- a/mail/postfix28/distinfo
+++ b/mail/postfix28/distinfo
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.0.12.tar.gz) = 94ce611b6f3e169caee2b4634c6b5370
-MD5 (postfix/tls+ipv6-1.15-pf-2.0.12.patch.gz) = 54549f53e22765dc92ffac0e67998964
-MD5 (postfix/ipv6-1.15-pf-2.0.12.patch.gz) = 55f89bd48b33334f85645adc43a1b4f1
+MD5 (postfix/postfix-2.0.13.tar.gz) = f4f2b4b930a7a32b1df475d87143269f
 MD5 (postfix/pfixtls-0.8.14-2.0.12-0.9.7b.tar.gz) = 42533d651553e97920b011dbf5812f4e
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
+MD5 (postfix/ipv6-1.15-pf-2.0.13.patch.gz) = 29201023f371176af986efbd95eb2392
+MD5 (postfix/tls+ipv6-1.15-pf-2.0.13.patch.gz) = 227ec4958e5f415024655147df75669a
diff --git a/mail/postfix28/scripts/configure.postfix b/mail/postfix28/scripts/configure.postfix
index e1de87b76524..d623bcf4bff5 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.35 2003-06-27 17:41:09 obraun Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.36 2003-07-02 11:23:10 daichi Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -22,6 +22,7 @@ Please select desired options:" -1 -1 16 \
 NOPCRE		"DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
 SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
 SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
+SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
 TLS		"SSL and TLS" "$status_TLS" \
 IPv6		"IPv6 support" "$status_IPv6" \
 IPv6TLS		"IPv6 support with SSL and TLS" "$status_IPv6TLS" \
@@ -80,13 +81,7 @@ while [ "$1" ]; do
                                         echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
                                         echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                                 fi
-                        else
-                                echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-                                echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
                         fi
-                        echo ".if exists(/usr/lib/libkrb.a)"
-                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
-                        echo ".endif"
                         SUB_SASL=""
                         ;;
 		SASL2)
@@ -99,15 +94,15 @@ while [ "$1" ]; do
 					echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
 					echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 				fi
-			else
-				echo "POSTFIX_CCARGS+=  -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-				echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz"
 			fi
 			echo ".if exists(/usr/lib/libkrb.a)"
 			echo "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
+		SASLKRB)
+                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
+			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
 			echo "USE_OPENSSL=	yes"
@@ -210,7 +205,7 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "IPv6_SUFFIX=	+ipv6"
 			echo ""
@@ -227,7 +222,7 @@ while [ "$1" ]; do
 			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
 			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
-			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.12.patch.gz"
+			echo "PATCHFILES+=	tls+ipv6-1.15-pf-2.0.13.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""