update postfix to 2.0.7

1. SSL linking fix
2. specific openldap depedency (ports/48621)
3. Kerberos linking fix

PR:		50964
Submitted by:	Vivek Khera <khera@kcilink.com>
Obtained from:	1. dirk.meyer@dinoex.sub.org
		2. Christian Kratzer <ck@cksoft.de>
		3. Miles Egan <miles@caddr.com>

33 files changed, 374 insertions, 198 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 8e805122bc8a..4e1b98538f6f 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.6
+PORTVERSION=	2.0.7
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 67eb13e955c1..7dee132275d5 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/postfix-2.0.6.tar.gz) = 31a49ed9970cd2abe63e4d3d7851e5f7
-MD5 (postfix/pfixtls-0.8.13-2.0.3-0.9.7.tar.gz) = 72ff441a6e43bf00a8a1d8691ffae1de
-MD5 (postfix/tls+ipv6-1.12-pf-2.0.3.patch.gz) = 7eb7b6dd6d651f722e5da7dc3aa43cc1
+MD5 (postfix/postfix-2.0.7.tar.gz) = 38697ae27e80fe83352aa04ec6175dd4
+MD5 (postfix/tls+ipv6-1.13-pf-2.0.7.patch.gz) = b2bec23a55360ac5bfa55426ecb5f1e3
+MD5 (postfix/pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz) = 42e3c15c5d9b59eb4cd15304f9c11627
diff --git a/mail/postfix/scripts/configure.postfix b/mail/postfix/scripts/configure.postfix
index 72a555b00d9e..2c5bfbea5577 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.31 2003-03-04 07:31:25 leeym Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.32 2003-04-15 07:44:41 leeym Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -30,7 +30,9 @@ DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
 DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 MySQL		"MySQL map lookups" "$status_MySQL" \
 PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
+OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
+OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
 Test		"SMTP/LMTP test server and generator" "$status_Test" \
 2> $tempfile
 
@@ -82,7 +84,7 @@ while [ "$1" ]; do
                                 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 "POSTFIX_AUXLIBS+= -lkrb -lcrypto -ldes -lcom_err"
                         echo ".endif"
                         SUB_SASL=""
                         ;;
@@ -101,16 +103,17 @@ while [ "$1" ]; do
 				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 "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -ldes -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.3-0.9.7.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.3-0.9.7/pfixtls.diff"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.6-0.9.7a/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -167,11 +170,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		OpenLDAP)
+		OpenLDAP12)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap"
+			echo "OPENLDAP_SUFFIX=	+openldap12"
+			;;
+		OpenLDAP20)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+			echo "OPENLDAP_SUFFIX=	+openldap20"
+			;;
+		OpenLDAP21)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+ 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+ 			echo "OPENLDAP_SUFFIX=	+openldap21"
 			;;
 		Test)
 			echo "BIN1=		smtp-sink smtp-source"
@@ -202,10 +217,11 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.12/"
-			echo "PATCHFILES+=	tls+ipv6-1.12-pf-2.0.3.patch.gz"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.13/"
+			echo "PATCHFILES+=	tls+ipv6-1.13-pf-2.0.7.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 8e805122bc8a..4e1b98538f6f 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.6
+PORTVERSION=	2.0.7
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix1/distinfo b/mail/postfix1/distinfo
index 67eb13e955c1..7dee132275d5 100644
--- a/mail/postfix1/distinfo
+++ b/mail/postfix1/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/postfix-2.0.6.tar.gz) = 31a49ed9970cd2abe63e4d3d7851e5f7
-MD5 (postfix/pfixtls-0.8.13-2.0.3-0.9.7.tar.gz) = 72ff441a6e43bf00a8a1d8691ffae1de
-MD5 (postfix/tls+ipv6-1.12-pf-2.0.3.patch.gz) = 7eb7b6dd6d651f722e5da7dc3aa43cc1
+MD5 (postfix/postfix-2.0.7.tar.gz) = 38697ae27e80fe83352aa04ec6175dd4
+MD5 (postfix/tls+ipv6-1.13-pf-2.0.7.patch.gz) = b2bec23a55360ac5bfa55426ecb5f1e3
+MD5 (postfix/pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz) = 42e3c15c5d9b59eb4cd15304f9c11627
diff --git a/mail/postfix1/scripts/configure.postfix b/mail/postfix1/scripts/configure.postfix
index 45ed7d0fbcb2..b577d62109ea 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.31 2003-03-04 07:31:25 leeym Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix1/scripts/Attic/configure.postfix,v 1.32 2003-04-15 07:44:41 leeym Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -30,7 +30,9 @@ DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
 DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 MySQL		"MySQL map lookups" "$status_MySQL" \
 PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
+OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
+OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
 Test		"SMTP/LMTP test server and generator" "$status_Test" \
 2> $tempfile
 
@@ -82,7 +84,7 @@ while [ "$1" ]; do
                                 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 "POSTFIX_AUXLIBS+= -lkrb -lcrypto -ldes -lcom_err"
                         echo ".endif"
                         SUB_SASL=""
                         ;;
@@ -101,16 +103,17 @@ while [ "$1" ]; do
 				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 "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -ldes -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.3-0.9.7.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.3-0.9.7/pfixtls.diff"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.6-0.9.7a/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -167,11 +170,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		OpenLDAP)
+		OpenLDAP12)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap"
+			echo "OPENLDAP_SUFFIX=	+openldap12"
+			;;
+		OpenLDAP20)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+			echo "OPENLDAP_SUFFIX=	+openldap20"
+			;;
+		OpenLDAP21)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+ 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+ 			echo "OPENLDAP_SUFFIX=	+openldap21"
 			;;
 		Test)
 			echo "BIN1=		smtp-sink smtp-source"
@@ -202,10 +217,11 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.12/"
-			echo "PATCHFILES+=	tls+ipv6-1.12-pf-2.0.3.patch.gz"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.13/"
+			echo "PATCHFILES+=	tls+ipv6-1.13-pf-2.0.7.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 8e805122bc8a..4e1b98538f6f 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.6
+PORTVERSION=	2.0.7
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix20/distinfo b/mail/postfix20/distinfo
index 67eb13e955c1..7dee132275d5 100644
--- a/mail/postfix20/distinfo
+++ b/mail/postfix20/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/postfix-2.0.6.tar.gz) = 31a49ed9970cd2abe63e4d3d7851e5f7
-MD5 (postfix/pfixtls-0.8.13-2.0.3-0.9.7.tar.gz) = 72ff441a6e43bf00a8a1d8691ffae1de
-MD5 (postfix/tls+ipv6-1.12-pf-2.0.3.patch.gz) = 7eb7b6dd6d651f722e5da7dc3aa43cc1
+MD5 (postfix/postfix-2.0.7.tar.gz) = 38697ae27e80fe83352aa04ec6175dd4
+MD5 (postfix/tls+ipv6-1.13-pf-2.0.7.patch.gz) = b2bec23a55360ac5bfa55426ecb5f1e3
+MD5 (postfix/pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz) = 42e3c15c5d9b59eb4cd15304f9c11627
diff --git a/mail/postfix20/scripts/configure.postfix b/mail/postfix20/scripts/configure.postfix
index c88a54868ed9..808d152cfd33 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.31 2003-03-04 07:31:25 leeym Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.32 2003-04-15 07:44:41 leeym Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -30,7 +30,9 @@ DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
 DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 MySQL		"MySQL map lookups" "$status_MySQL" \
 PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
+OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
+OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
 Test		"SMTP/LMTP test server and generator" "$status_Test" \
 2> $tempfile
 
@@ -82,7 +84,7 @@ while [ "$1" ]; do
                                 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 "POSTFIX_AUXLIBS+= -lkrb -lcrypto -ldes -lcom_err"
                         echo ".endif"
                         SUB_SASL=""
                         ;;
@@ -101,16 +103,17 @@ while [ "$1" ]; do
 				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 "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -ldes -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.3-0.9.7.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.3-0.9.7/pfixtls.diff"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.6-0.9.7a/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -167,11 +170,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		OpenLDAP)
+		OpenLDAP12)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap"
+			echo "OPENLDAP_SUFFIX=	+openldap12"
+			;;
+		OpenLDAP20)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+			echo "OPENLDAP_SUFFIX=	+openldap20"
+			;;
+		OpenLDAP21)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+ 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+ 			echo "OPENLDAP_SUFFIX=	+openldap21"
 			;;
 		Test)
 			echo "BIN1=		smtp-sink smtp-source"
@@ -202,10 +217,11 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.12/"
-			echo "PATCHFILES+=	tls+ipv6-1.12-pf-2.0.3.patch.gz"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.13/"
+			echo "PATCHFILES+=	tls+ipv6-1.13-pf-2.0.7.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 8e805122bc8a..4e1b98538f6f 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.6
+PORTVERSION=	2.0.7
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix21/distinfo b/mail/postfix21/distinfo
index 67eb13e955c1..7dee132275d5 100644
--- a/mail/postfix21/distinfo
+++ b/mail/postfix21/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/postfix-2.0.6.tar.gz) = 31a49ed9970cd2abe63e4d3d7851e5f7
-MD5 (postfix/pfixtls-0.8.13-2.0.3-0.9.7.tar.gz) = 72ff441a6e43bf00a8a1d8691ffae1de
-MD5 (postfix/tls+ipv6-1.12-pf-2.0.3.patch.gz) = 7eb7b6dd6d651f722e5da7dc3aa43cc1
+MD5 (postfix/postfix-2.0.7.tar.gz) = 38697ae27e80fe83352aa04ec6175dd4
+MD5 (postfix/tls+ipv6-1.13-pf-2.0.7.patch.gz) = b2bec23a55360ac5bfa55426ecb5f1e3
+MD5 (postfix/pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz) = 42e3c15c5d9b59eb4cd15304f9c11627
diff --git a/mail/postfix21/scripts/configure.postfix b/mail/postfix21/scripts/configure.postfix
index 8d5a8b9fa1ba..9b24e6a89273 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.31 2003-03-04 07:31:25 leeym Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.32 2003-04-15 07:44:41 leeym Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -30,7 +30,9 @@ DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
 DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 MySQL		"MySQL map lookups" "$status_MySQL" \
 PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
+OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
+OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
 Test		"SMTP/LMTP test server and generator" "$status_Test" \
 2> $tempfile
 
@@ -82,7 +84,7 @@ while [ "$1" ]; do
                                 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 "POSTFIX_AUXLIBS+= -lkrb -lcrypto -ldes -lcom_err"
                         echo ".endif"
                         SUB_SASL=""
                         ;;
@@ -101,16 +103,17 @@ while [ "$1" ]; do
 				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 "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -ldes -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.3-0.9.7.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.3-0.9.7/pfixtls.diff"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.6-0.9.7a/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -167,11 +170,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		OpenLDAP)
+		OpenLDAP12)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap"
+			echo "OPENLDAP_SUFFIX=	+openldap12"
+			;;
+		OpenLDAP20)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+			echo "OPENLDAP_SUFFIX=	+openldap20"
+			;;
+		OpenLDAP21)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+ 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+ 			echo "OPENLDAP_SUFFIX=	+openldap21"
 			;;
 		Test)
 			echo "BIN1=		smtp-sink smtp-source"
@@ -202,10 +217,11 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.12/"
-			echo "PATCHFILES+=	tls+ipv6-1.12-pf-2.0.3.patch.gz"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.13/"
+			echo "PATCHFILES+=	tls+ipv6-1.13-pf-2.0.7.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 8e805122bc8a..4e1b98538f6f 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.6
+PORTVERSION=	2.0.7
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix22/distinfo b/mail/postfix22/distinfo
index 67eb13e955c1..7dee132275d5 100644
--- a/mail/postfix22/distinfo
+++ b/mail/postfix22/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/postfix-2.0.6.tar.gz) = 31a49ed9970cd2abe63e4d3d7851e5f7
-MD5 (postfix/pfixtls-0.8.13-2.0.3-0.9.7.tar.gz) = 72ff441a6e43bf00a8a1d8691ffae1de
-MD5 (postfix/tls+ipv6-1.12-pf-2.0.3.patch.gz) = 7eb7b6dd6d651f722e5da7dc3aa43cc1
+MD5 (postfix/postfix-2.0.7.tar.gz) = 38697ae27e80fe83352aa04ec6175dd4
+MD5 (postfix/tls+ipv6-1.13-pf-2.0.7.patch.gz) = b2bec23a55360ac5bfa55426ecb5f1e3
+MD5 (postfix/pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz) = 42e3c15c5d9b59eb4cd15304f9c11627
diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix
index 8c8bd60686bb..c51a81da9372 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.31 2003-03-04 07:31:25 leeym Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.32 2003-04-15 07:44:41 leeym Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -30,7 +30,9 @@ DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
 DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 MySQL		"MySQL map lookups" "$status_MySQL" \
 PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
+OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
+OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
 Test		"SMTP/LMTP test server and generator" "$status_Test" \
 2> $tempfile
 
@@ -82,7 +84,7 @@ while [ "$1" ]; do
                                 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 "POSTFIX_AUXLIBS+= -lkrb -lcrypto -ldes -lcom_err"
                         echo ".endif"
                         SUB_SASL=""
                         ;;
@@ -101,16 +103,17 @@ while [ "$1" ]; do
 				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 "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -ldes -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.3-0.9.7.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.3-0.9.7/pfixtls.diff"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.6-0.9.7a/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -167,11 +170,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		OpenLDAP)
+		OpenLDAP12)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap"
+			echo "OPENLDAP_SUFFIX=	+openldap12"
+			;;
+		OpenLDAP20)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+			echo "OPENLDAP_SUFFIX=	+openldap20"
+			;;
+		OpenLDAP21)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+ 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+ 			echo "OPENLDAP_SUFFIX=	+openldap21"
 			;;
 		Test)
 			echo "BIN1=		smtp-sink smtp-source"
@@ -202,10 +217,11 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.12/"
-			echo "PATCHFILES+=	tls+ipv6-1.12-pf-2.0.3.patch.gz"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.13/"
+			echo "PATCHFILES+=	tls+ipv6-1.13-pf-2.0.7.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 8e805122bc8a..4e1b98538f6f 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.6
+PORTVERSION=	2.0.7
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix23/distinfo b/mail/postfix23/distinfo
index 67eb13e955c1..7dee132275d5 100644
--- a/mail/postfix23/distinfo
+++ b/mail/postfix23/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/postfix-2.0.6.tar.gz) = 31a49ed9970cd2abe63e4d3d7851e5f7
-MD5 (postfix/pfixtls-0.8.13-2.0.3-0.9.7.tar.gz) = 72ff441a6e43bf00a8a1d8691ffae1de
-MD5 (postfix/tls+ipv6-1.12-pf-2.0.3.patch.gz) = 7eb7b6dd6d651f722e5da7dc3aa43cc1
+MD5 (postfix/postfix-2.0.7.tar.gz) = 38697ae27e80fe83352aa04ec6175dd4
+MD5 (postfix/tls+ipv6-1.13-pf-2.0.7.patch.gz) = b2bec23a55360ac5bfa55426ecb5f1e3
+MD5 (postfix/pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz) = 42e3c15c5d9b59eb4cd15304f9c11627
diff --git a/mail/postfix23/scripts/configure.postfix b/mail/postfix23/scripts/configure.postfix
index 799065060e4f..fa65ece7cbbe 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.31 2003-03-04 07:31:25 leeym Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.32 2003-04-15 07:44:41 leeym Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -30,7 +30,9 @@ DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
 DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 MySQL		"MySQL map lookups" "$status_MySQL" \
 PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
+OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
+OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
 Test		"SMTP/LMTP test server and generator" "$status_Test" \
 2> $tempfile
 
@@ -82,7 +84,7 @@ while [ "$1" ]; do
                                 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 "POSTFIX_AUXLIBS+= -lkrb -lcrypto -ldes -lcom_err"
                         echo ".endif"
                         SUB_SASL=""
                         ;;
@@ -101,16 +103,17 @@ while [ "$1" ]; do
 				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 "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -ldes -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.3-0.9.7.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.3-0.9.7/pfixtls.diff"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.6-0.9.7a/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -167,11 +170,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		OpenLDAP)
+		OpenLDAP12)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap"
+			echo "OPENLDAP_SUFFIX=	+openldap12"
+			;;
+		OpenLDAP20)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+			echo "OPENLDAP_SUFFIX=	+openldap20"
+			;;
+		OpenLDAP21)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+ 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+ 			echo "OPENLDAP_SUFFIX=	+openldap21"
 			;;
 		Test)
 			echo "BIN1=		smtp-sink smtp-source"
@@ -202,10 +217,11 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.12/"
-			echo "PATCHFILES+=	tls+ipv6-1.12-pf-2.0.3.patch.gz"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.13/"
+			echo "PATCHFILES+=	tls+ipv6-1.13-pf-2.0.7.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 8e805122bc8a..4e1b98538f6f 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.6
+PORTVERSION=	2.0.7
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix24/distinfo b/mail/postfix24/distinfo
index 67eb13e955c1..7dee132275d5 100644
--- a/mail/postfix24/distinfo
+++ b/mail/postfix24/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/postfix-2.0.6.tar.gz) = 31a49ed9970cd2abe63e4d3d7851e5f7
-MD5 (postfix/pfixtls-0.8.13-2.0.3-0.9.7.tar.gz) = 72ff441a6e43bf00a8a1d8691ffae1de
-MD5 (postfix/tls+ipv6-1.12-pf-2.0.3.patch.gz) = 7eb7b6dd6d651f722e5da7dc3aa43cc1
+MD5 (postfix/postfix-2.0.7.tar.gz) = 38697ae27e80fe83352aa04ec6175dd4
+MD5 (postfix/tls+ipv6-1.13-pf-2.0.7.patch.gz) = b2bec23a55360ac5bfa55426ecb5f1e3
+MD5 (postfix/pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz) = 42e3c15c5d9b59eb4cd15304f9c11627
diff --git a/mail/postfix24/scripts/configure.postfix b/mail/postfix24/scripts/configure.postfix
index 000a5f356ebe..50f98681d15c 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.31 2003-03-04 07:31:25 leeym Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.32 2003-04-15 07:44:41 leeym Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -30,7 +30,9 @@ DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
 DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 MySQL		"MySQL map lookups" "$status_MySQL" \
 PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
+OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
+OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
 Test		"SMTP/LMTP test server and generator" "$status_Test" \
 2> $tempfile
 
@@ -82,7 +84,7 @@ while [ "$1" ]; do
                                 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 "POSTFIX_AUXLIBS+= -lkrb -lcrypto -ldes -lcom_err"
                         echo ".endif"
                         SUB_SASL=""
                         ;;
@@ -101,16 +103,17 @@ while [ "$1" ]; do
 				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 "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -ldes -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.3-0.9.7.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.3-0.9.7/pfixtls.diff"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.6-0.9.7a/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -167,11 +170,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		OpenLDAP)
+		OpenLDAP12)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap"
+			echo "OPENLDAP_SUFFIX=	+openldap12"
+			;;
+		OpenLDAP20)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+			echo "OPENLDAP_SUFFIX=	+openldap20"
+			;;
+		OpenLDAP21)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+ 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+ 			echo "OPENLDAP_SUFFIX=	+openldap21"
 			;;
 		Test)
 			echo "BIN1=		smtp-sink smtp-source"
@@ -202,10 +217,11 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.12/"
-			echo "PATCHFILES+=	tls+ipv6-1.12-pf-2.0.3.patch.gz"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.13/"
+			echo "PATCHFILES+=	tls+ipv6-1.13-pf-2.0.7.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 8e805122bc8a..4e1b98538f6f 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.6
+PORTVERSION=	2.0.7
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo
index 67eb13e955c1..7dee132275d5 100644
--- a/mail/postfix25/distinfo
+++ b/mail/postfix25/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/postfix-2.0.6.tar.gz) = 31a49ed9970cd2abe63e4d3d7851e5f7
-MD5 (postfix/pfixtls-0.8.13-2.0.3-0.9.7.tar.gz) = 72ff441a6e43bf00a8a1d8691ffae1de
-MD5 (postfix/tls+ipv6-1.12-pf-2.0.3.patch.gz) = 7eb7b6dd6d651f722e5da7dc3aa43cc1
+MD5 (postfix/postfix-2.0.7.tar.gz) = 38697ae27e80fe83352aa04ec6175dd4
+MD5 (postfix/tls+ipv6-1.13-pf-2.0.7.patch.gz) = b2bec23a55360ac5bfa55426ecb5f1e3
+MD5 (postfix/pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz) = 42e3c15c5d9b59eb4cd15304f9c11627
diff --git a/mail/postfix25/scripts/configure.postfix b/mail/postfix25/scripts/configure.postfix
index b0acb424d2dd..8ed36fe9c4ad 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.31 2003-03-04 07:31:25 leeym Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.32 2003-04-15 07:44:41 leeym Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -30,7 +30,9 @@ DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
 DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 MySQL		"MySQL map lookups" "$status_MySQL" \
 PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
+OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
+OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
 Test		"SMTP/LMTP test server and generator" "$status_Test" \
 2> $tempfile
 
@@ -82,7 +84,7 @@ while [ "$1" ]; do
                                 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 "POSTFIX_AUXLIBS+= -lkrb -lcrypto -ldes -lcom_err"
                         echo ".endif"
                         SUB_SASL=""
                         ;;
@@ -101,16 +103,17 @@ while [ "$1" ]; do
 				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 "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -ldes -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.3-0.9.7.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.3-0.9.7/pfixtls.diff"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.6-0.9.7a/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -167,11 +170,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		OpenLDAP)
+		OpenLDAP12)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap"
+			echo "OPENLDAP_SUFFIX=	+openldap12"
+			;;
+		OpenLDAP20)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+			echo "OPENLDAP_SUFFIX=	+openldap20"
+			;;
+		OpenLDAP21)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+ 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+ 			echo "OPENLDAP_SUFFIX=	+openldap21"
 			;;
 		Test)
 			echo "BIN1=		smtp-sink smtp-source"
@@ -202,10 +217,11 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.12/"
-			echo "PATCHFILES+=	tls+ipv6-1.12-pf-2.0.3.patch.gz"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.13/"
+			echo "PATCHFILES+=	tls+ipv6-1.13-pf-2.0.7.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 8e805122bc8a..4e1b98538f6f 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.6
+PORTVERSION=	2.0.7
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo
index 67eb13e955c1..7dee132275d5 100644
--- a/mail/postfix26/distinfo
+++ b/mail/postfix26/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/postfix-2.0.6.tar.gz) = 31a49ed9970cd2abe63e4d3d7851e5f7
-MD5 (postfix/pfixtls-0.8.13-2.0.3-0.9.7.tar.gz) = 72ff441a6e43bf00a8a1d8691ffae1de
-MD5 (postfix/tls+ipv6-1.12-pf-2.0.3.patch.gz) = 7eb7b6dd6d651f722e5da7dc3aa43cc1
+MD5 (postfix/postfix-2.0.7.tar.gz) = 38697ae27e80fe83352aa04ec6175dd4
+MD5 (postfix/tls+ipv6-1.13-pf-2.0.7.patch.gz) = b2bec23a55360ac5bfa55426ecb5f1e3
+MD5 (postfix/pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz) = 42e3c15c5d9b59eb4cd15304f9c11627
diff --git a/mail/postfix26/scripts/configure.postfix b/mail/postfix26/scripts/configure.postfix
index edf3954f2338..c9775abd0869 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.31 2003-03-04 07:31:25 leeym Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.32 2003-04-15 07:44:41 leeym Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -30,7 +30,9 @@ DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
 DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 MySQL		"MySQL map lookups" "$status_MySQL" \
 PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
+OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
+OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
 Test		"SMTP/LMTP test server and generator" "$status_Test" \
 2> $tempfile
 
@@ -82,7 +84,7 @@ while [ "$1" ]; do
                                 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 "POSTFIX_AUXLIBS+= -lkrb -lcrypto -ldes -lcom_err"
                         echo ".endif"
                         SUB_SASL=""
                         ;;
@@ -101,16 +103,17 @@ while [ "$1" ]; do
 				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 "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -ldes -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.3-0.9.7.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.3-0.9.7/pfixtls.diff"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.6-0.9.7a/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -167,11 +170,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		OpenLDAP)
+		OpenLDAP12)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap"
+			echo "OPENLDAP_SUFFIX=	+openldap12"
+			;;
+		OpenLDAP20)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+			echo "OPENLDAP_SUFFIX=	+openldap20"
+			;;
+		OpenLDAP21)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+ 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+ 			echo "OPENLDAP_SUFFIX=	+openldap21"
 			;;
 		Test)
 			echo "BIN1=		smtp-sink smtp-source"
@@ -202,10 +217,11 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.12/"
-			echo "PATCHFILES+=	tls+ipv6-1.12-pf-2.0.3.patch.gz"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.13/"
+			echo "PATCHFILES+=	tls+ipv6-1.13-pf-2.0.7.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 8e805122bc8a..4e1b98538f6f 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.6
+PORTVERSION=	2.0.7
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo
index 67eb13e955c1..7dee132275d5 100644
--- a/mail/postfix27/distinfo
+++ b/mail/postfix27/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/postfix-2.0.6.tar.gz) = 31a49ed9970cd2abe63e4d3d7851e5f7
-MD5 (postfix/pfixtls-0.8.13-2.0.3-0.9.7.tar.gz) = 72ff441a6e43bf00a8a1d8691ffae1de
-MD5 (postfix/tls+ipv6-1.12-pf-2.0.3.patch.gz) = 7eb7b6dd6d651f722e5da7dc3aa43cc1
+MD5 (postfix/postfix-2.0.7.tar.gz) = 38697ae27e80fe83352aa04ec6175dd4
+MD5 (postfix/tls+ipv6-1.13-pf-2.0.7.patch.gz) = b2bec23a55360ac5bfa55426ecb5f1e3
+MD5 (postfix/pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz) = 42e3c15c5d9b59eb4cd15304f9c11627
diff --git a/mail/postfix27/scripts/configure.postfix b/mail/postfix27/scripts/configure.postfix
index 8d2f96f3de1c..f71491b5056e 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.31 2003-03-04 07:31:25 leeym Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.32 2003-04-15 07:44:41 leeym Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -30,7 +30,9 @@ DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
 DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 MySQL		"MySQL map lookups" "$status_MySQL" \
 PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
+OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
+OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
 Test		"SMTP/LMTP test server and generator" "$status_Test" \
 2> $tempfile
 
@@ -82,7 +84,7 @@ while [ "$1" ]; do
                                 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 "POSTFIX_AUXLIBS+= -lkrb -lcrypto -ldes -lcom_err"
                         echo ".endif"
                         SUB_SASL=""
                         ;;
@@ -101,16 +103,17 @@ while [ "$1" ]; do
 				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 "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -ldes -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.3-0.9.7.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.3-0.9.7/pfixtls.diff"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.6-0.9.7a/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -167,11 +170,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		OpenLDAP)
+		OpenLDAP12)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap"
+			echo "OPENLDAP_SUFFIX=	+openldap12"
+			;;
+		OpenLDAP20)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+			echo "OPENLDAP_SUFFIX=	+openldap20"
+			;;
+		OpenLDAP21)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+ 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+ 			echo "OPENLDAP_SUFFIX=	+openldap21"
 			;;
 		Test)
 			echo "BIN1=		smtp-sink smtp-source"
@@ -202,10 +217,11 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.12/"
-			echo "PATCHFILES+=	tls+ipv6-1.12-pf-2.0.3.patch.gz"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.13/"
+			echo "PATCHFILES+=	tls+ipv6-1.13-pf-2.0.7.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 8e805122bc8a..4e1b98538f6f 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.6
+PORTVERSION=	2.0.7
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo
index 67eb13e955c1..7dee132275d5 100644
--- a/mail/postfix28/distinfo
+++ b/mail/postfix28/distinfo
@@ -1,4 +1,4 @@
 MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4
-MD5 (postfix/postfix-2.0.6.tar.gz) = 31a49ed9970cd2abe63e4d3d7851e5f7
-MD5 (postfix/pfixtls-0.8.13-2.0.3-0.9.7.tar.gz) = 72ff441a6e43bf00a8a1d8691ffae1de
-MD5 (postfix/tls+ipv6-1.12-pf-2.0.3.patch.gz) = 7eb7b6dd6d651f722e5da7dc3aa43cc1
+MD5 (postfix/postfix-2.0.7.tar.gz) = 38697ae27e80fe83352aa04ec6175dd4
+MD5 (postfix/tls+ipv6-1.13-pf-2.0.7.patch.gz) = b2bec23a55360ac5bfa55426ecb5f1e3
+MD5 (postfix/pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz) = 42e3c15c5d9b59eb4cd15304f9c11627
diff --git a/mail/postfix28/scripts/configure.postfix b/mail/postfix28/scripts/configure.postfix
index d809c798b7a5..1edef5564ada 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.31 2003-03-04 07:31:25 leeym Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.32 2003-04-15 07:44:41 leeym Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -30,7 +30,9 @@ DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
 DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
 MySQL		"MySQL map lookups" "$status_MySQL" \
 PgSQL		"PostgreSQL map lookups" "$status_PgSQL" \
-OpenLDAP	"OpenLDAP map lookups" "$status_OpenLDAP" \
+OpenLDAP12	"OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \
+OpenLDAP20	"OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \
+OpenLDAP21	"OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \
 Test		"SMTP/LMTP test server and generator" "$status_Test" \
 2> $tempfile
 
@@ -82,7 +84,7 @@ while [ "$1" ]; do
                                 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 "POSTFIX_AUXLIBS+= -lkrb -lcrypto -ldes -lcom_err"
                         echo ".endif"
                         SUB_SASL=""
                         ;;
@@ -101,16 +103,17 @@ while [ "$1" ]; do
 				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 "POSTFIX_AUXLIBS+=	-lkrb -lcrypto -ldes -lcom_err"
 			echo ".endif"
 			SUB_SASL=""
 			;;
 		TLS)
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.3-0.9.7.tar.gz"
-			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.3-0.9.7/pfixtls.diff"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.13-2.0.6-0.9.7a.tar.gz"
+			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.13-2.0.6-0.9.7a/pfixtls.diff"
 			echo "PATCH_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls"
 			SUB_TLS=""
@@ -167,11 +170,23 @@ while [ "$1" ]; do
 			echo "PATCHFILES+=	postfix-pg.postfix-2.0.0.2.patch"
 			echo "PATCH_DIST_STRIP= -p1"
 			;;
-		OpenLDAP)
+		OpenLDAP12)
 			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
 			echo "POSTFIX_AUXLIBS+=	\${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a"
-			echo "OPENLDAP_SUFFIX=	+openldap"
+			echo "OPENLDAP_SUFFIX=	+openldap12"
+			;;
+		OpenLDAP20)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+			echo "OPENLDAP_SUFFIX=	+openldap20"
+			;;
+		OpenLDAP21)
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+ 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
+ 			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
+ 			echo "OPENLDAP_SUFFIX=	+openldap21"
 			;;
 		Test)
 			echo "BIN1=		smtp-sink smtp-source"
@@ -202,10 +217,11 @@ while [ "$1" ]; do
 				exit 1
 			fi
 			echo "MAN8+=		tlsmgr.8"
-			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I/usr/include/openssl"
-			echo "POSTFIX_AUXLIBS+=	-lssl -lcrypto"
-			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.12/"
-			echo "PATCHFILES+=	tls+ipv6-1.12-pf-2.0.3.patch.gz"
+			echo "USE_OPENSSL=	yes"
+			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
+			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+			echo "PATCH_SITES+=	ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.13/"
+			echo "PATCHFILES+=	tls+ipv6-1.13-pf-2.0.7.patch.gz"
 			echo "PATCH_DIST_STRIP=	-p1"
 			echo "TLS_SUFFIX=	+tls+ipv6"
 			SUB_TLS=""